diff --git a/asm/non_matchings/code/code_800BB0A0/func_800BB0A0.s b/asm/non_matchings/code/code_800BB0A0/func_800BB0A0.s new file mode 100644 index 0000000000..be1fbaf2b5 --- /dev/null +++ b/asm/non_matchings/code/code_800BB0A0/func_800BB0A0.s @@ -0,0 +1,144 @@ +.late_rodata + +glabel D_80143CE0 + .float 0.666666686 + +glabel D_80143CE4 + .float 0.16666667 + +.text +glabel func_800BB0A0 +/* B32240 800BB0A0 3C013F80 */ li $at, 0x3F800000 # 0.000000 +/* B32244 800BB0A4 44818000 */ mtc1 $at, $f16 +/* B32248 800BB0A8 27BDFFF0 */ addiu $sp, $sp, -0x10 +/* B3224C 800BB0AC AFA60018 */ sw $a2, 0x18($sp) +/* B32250 800BB0B0 460C803C */ c.lt.s $f16, $f12 +/* B32254 800BB0B4 00000000 */ nop +/* B32258 800BB0B8 45020003 */ bc1fl .L800BB0C8 +/* B3225C 800BB0BC 460C8001 */ sub.s $f0, $f16, $f12 +/* B32260 800BB0C0 46008306 */ mov.s $f12, $f16 +/* B32264 800BB0C4 460C8001 */ sub.s $f0, $f16, $f12 +.L800BB0C8: +/* B32268 800BB0C8 3C0140C0 */ li $at, 0x40C00000 # 0.000000 +/* B3226C 800BB0CC 44819000 */ mtc1 $at, $f18 +/* B32270 800BB0D0 3C013F00 */ li $at, 0x3F000000 # 0.000000 +/* B32274 800BB0D4 46000102 */ mul.s $f4, $f0, $f0 +/* B32278 800BB0D8 44815000 */ mtc1 $at, $f10 +/* B3227C 800BB0DC 3C018014 */ lui $at, %hi(D_80143CE0) +/* B32280 800BB0E0 8FA30020 */ lw $v1, 0x20($sp) +/* B32284 800BB0E4 8FA40024 */ lw $a0, 0x24($sp) +/* B32288 800BB0E8 8FA60028 */ lw $a2, 0x28($sp) +/* B3228C 800BB0EC 8FA2002C */ lw $v0, 0x2c($sp) +/* B32290 800BB0F0 46002182 */ mul.s $f6, $f4, $f0 +/* B32294 800BB0F4 00000000 */ nop +/* B32298 800BB0F8 460C6082 */ mul.s $f2, $f12, $f12 +/* B3229C 800BB0FC 46123203 */ div.s $f8, $f6, $f18 +/* B322A0 800BB100 460C1382 */ mul.s $f14, $f2, $f12 +/* B322A4 800BB104 00000000 */ nop +/* B322A8 800BB108 460A7102 */ mul.s $f4, $f14, $f10 +/* B322AC 800BB10C C42A3CE0 */ lwc1 $f10, %lo(D_80143CE0)($at) +/* B322B0 800BB110 3C013F00 */ li $at, 0x3F000000 # 0.000000 +/* B322B4 800BB114 E7A80000 */ swc1 $f8, ($sp) +/* B322B8 800BB118 46022181 */ sub.s $f6, $f4, $f2 +/* B322BC 800BB11C 460A3100 */ add.s $f4, $f6, $f10 +/* B322C0 800BB120 46006187 */ neg.s $f6, $f12 +/* B322C4 800BB124 E7A40004 */ swc1 $f4, 4($sp) +/* B322C8 800BB128 460C3282 */ mul.s $f10, $f6, $f12 +/* B322CC 800BB12C 00000000 */ nop +/* B322D0 800BB130 460C5182 */ mul.s $f6, $f10, $f12 +/* B322D4 800BB134 44815000 */ mtc1 $at, $f10 +/* B322D8 800BB138 00000000 */ nop +/* B322DC 800BB13C 460A3182 */ mul.s $f6, $f6, $f10 +/* B322E0 800BB140 44815000 */ mtc1 $at, $f10 +/* B322E4 800BB144 00000000 */ nop +/* B322E8 800BB148 460A1282 */ mul.s $f10, $f2, $f10 +/* B322EC 800BB14C 460A3180 */ add.s $f6, $f6, $f10 +/* B322F0 800BB150 44815000 */ mtc1 $at, $f10 +/* B322F4 800BB154 3C018014 */ lui $at, %hi(D_80143CE4) +/* B322F8 800BB158 460A6282 */ mul.s $f10, $f12, $f10 +/* B322FC 800BB15C 460A3180 */ add.s $f6, $f6, $f10 +/* B32300 800BB160 C42A3CE4 */ lwc1 $f10, %lo(D_80143CE4)($at) +/* B32304 800BB164 460A3180 */ add.s $f6, $f6, $f10 +/* B32308 800BB168 46127283 */ div.s $f10, $f14, $f18 +/* B3230C 800BB16C E7A60008 */ swc1 $f6, 8($sp) +/* B32310 800BB170 E7AA000C */ swc1 $f10, 0xc($sp) +/* B32314 800BB174 C46A0000 */ lwc1 $f10, ($v1) +/* B32318 800BB178 460A4202 */ mul.s $f8, $f8, $f10 +/* B3231C 800BB17C C48A0000 */ lwc1 $f10, ($a0) +/* B32320 800BB180 460A2102 */ mul.s $f4, $f4, $f10 +/* B32324 800BB184 46044280 */ add.s $f10, $f8, $f4 +/* B32328 800BB188 C4C80000 */ lwc1 $f8, ($a2) +/* B3232C 800BB18C 46083102 */ mul.s $f4, $f6, $f8 +/* B32330 800BB190 C4480000 */ lwc1 $f8, ($v0) +/* B32334 800BB194 46045180 */ add.s $f6, $f10, $f4 +/* B32338 800BB198 C7AA000C */ lwc1 $f10, 0xc($sp) +/* B3233C 800BB19C 460A4102 */ mul.s $f4, $f8, $f10 +/* B32340 800BB1A0 46062200 */ add.s $f8, $f4, $f6 +/* B32344 800BB1A4 E4A80000 */ swc1 $f8, ($a1) +/* B32348 800BB1A8 C7AA0000 */ lwc1 $f10, ($sp) +/* B3234C 800BB1AC C4640004 */ lwc1 $f4, 4($v1) +/* B32350 800BB1B0 C7A80004 */ lwc1 $f8, 4($sp) +/* B32354 800BB1B4 46045182 */ mul.s $f6, $f10, $f4 +/* B32358 800BB1B8 C48A0004 */ lwc1 $f10, 4($a0) +/* B3235C 800BB1BC 460A4102 */ mul.s $f4, $f8, $f10 +/* B32360 800BB1C0 C7AA0008 */ lwc1 $f10, 8($sp) +/* B32364 800BB1C4 46043200 */ add.s $f8, $f6, $f4 +/* B32368 800BB1C8 C4C60004 */ lwc1 $f6, 4($a2) +/* B3236C 800BB1CC 46065102 */ mul.s $f4, $f10, $f6 +/* B32370 800BB1D0 C4460004 */ lwc1 $f6, 4($v0) +/* B32374 800BB1D4 46044280 */ add.s $f10, $f8, $f4 +/* B32378 800BB1D8 C7A8000C */ lwc1 $f8, 0xc($sp) +/* B3237C 800BB1DC 46083102 */ mul.s $f4, $f6, $f8 +/* B32380 800BB1E0 460A2180 */ add.s $f6, $f4, $f10 +/* B32384 800BB1E4 E4A60004 */ swc1 $f6, 4($a1) +/* B32388 800BB1E8 C7A80000 */ lwc1 $f8, ($sp) +/* B3238C 800BB1EC C4640008 */ lwc1 $f4, 8($v1) +/* B32390 800BB1F0 C7A60004 */ lwc1 $f6, 4($sp) +/* B32394 800BB1F4 46044282 */ mul.s $f10, $f8, $f4 +/* B32398 800BB1F8 C4880008 */ lwc1 $f8, 8($a0) +/* B3239C 800BB1FC 46083102 */ mul.s $f4, $f6, $f8 +/* B323A0 800BB200 C7A80008 */ lwc1 $f8, 8($sp) +/* B323A4 800BB204 46045180 */ add.s $f6, $f10, $f4 +/* B323A8 800BB208 C4CA0008 */ lwc1 $f10, 8($a2) +/* B323AC 800BB20C 460A4102 */ mul.s $f4, $f8, $f10 +/* B323B0 800BB210 C44A0008 */ lwc1 $f10, 8($v0) +/* B323B4 800BB214 46043200 */ add.s $f8, $f6, $f4 +/* B323B8 800BB218 C7A6000C */ lwc1 $f6, 0xc($sp) +/* B323BC 800BB21C 46065102 */ mul.s $f4, $f10, $f6 +/* B323C0 800BB220 46082280 */ add.s $f10, $f4, $f8 +/* B323C4 800BB224 E4AA0008 */ swc1 $f10, 8($a1) +/* B323C8 800BB228 C7A60000 */ lwc1 $f6, ($sp) +/* B323CC 800BB22C C464000C */ lwc1 $f4, 0xc($v1) +/* B323D0 800BB230 C7AA0004 */ lwc1 $f10, 4($sp) +/* B323D4 800BB234 8FAE0018 */ lw $t6, 0x18($sp) +/* B323D8 800BB238 46043202 */ mul.s $f8, $f6, $f4 +/* B323DC 800BB23C C486000C */ lwc1 $f6, 0xc($a0) +/* B323E0 800BB240 46065102 */ mul.s $f4, $f10, $f6 +/* B323E4 800BB244 C7A60008 */ lwc1 $f6, 8($sp) +/* B323E8 800BB248 46044280 */ add.s $f10, $f8, $f4 +/* B323EC 800BB24C C4C8000C */ lwc1 $f8, 0xc($a2) +/* B323F0 800BB250 46083102 */ mul.s $f4, $f6, $f8 +/* B323F4 800BB254 C448000C */ lwc1 $f8, 0xc($v0) +/* B323F8 800BB258 46045180 */ add.s $f6, $f10, $f4 +/* B323FC 800BB25C C7AA000C */ lwc1 $f10, 0xc($sp) +/* B32400 800BB260 460A4102 */ mul.s $f4, $f8, $f10 +/* B32404 800BB264 46062200 */ add.s $f8, $f4, $f6 +/* B32408 800BB268 E5C80000 */ swc1 $f8, ($t6) +/* B3240C 800BB26C C7AA0000 */ lwc1 $f10, ($sp) +/* B32410 800BB270 C4640010 */ lwc1 $f4, 0x10($v1) +/* B32414 800BB274 C7A80004 */ lwc1 $f8, 4($sp) +/* B32418 800BB278 46045182 */ mul.s $f6, $f10, $f4 +/* B3241C 800BB27C C48A0010 */ lwc1 $f10, 0x10($a0) +/* B32420 800BB280 460A4102 */ mul.s $f4, $f8, $f10 +/* B32424 800BB284 C7AA0008 */ lwc1 $f10, 8($sp) +/* B32428 800BB288 46043200 */ add.s $f8, $f6, $f4 +/* B3242C 800BB28C C4C60010 */ lwc1 $f6, 0x10($a2) +/* B32430 800BB290 46065102 */ mul.s $f4, $f10, $f6 +/* B32434 800BB294 C4460010 */ lwc1 $f6, 0x10($v0) +/* B32438 800BB298 46044280 */ add.s $f10, $f8, $f4 +/* B3243C 800BB29C C7A8000C */ lwc1 $f8, 0xc($sp) +/* B32440 800BB2A0 27BD0010 */ addiu $sp, $sp, 0x10 +/* B32444 800BB2A4 46083102 */ mul.s $f4, $f6, $f8 +/* B32448 800BB2A8 460A2180 */ add.s $f6, $f4, $f10 +/* B3244C 800BB2AC 03E00008 */ jr $ra +/* B32450 800BB2B0 E4E60000 */ swc1 $f6, ($a3) diff --git a/asm/code_800BB0A0.s b/asm/non_matchings/code/code_800BB0A0/func_800BB2B4.s similarity index 52% rename from asm/code_800BB0A0.s rename to asm/non_matchings/code/code_800BB0A0/func_800BB2B4.s index 99c4db3070..a52b3d131d 100644 --- a/asm/code_800BB0A0.s +++ b/asm/non_matchings/code/code_800BB0A0/func_800BB2B4.s @@ -1,150 +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 func_800BB0A0 -/* B32240 800BB0A0 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B32244 800BB0A4 44818000 */ mtc1 $at, $f16 -/* B32248 800BB0A8 27BDFFF0 */ addiu $sp, $sp, -0x10 -/* B3224C 800BB0AC AFA60018 */ sw $a2, 0x18($sp) -/* B32250 800BB0B0 460C803C */ c.lt.s $f16, $f12 -/* B32254 800BB0B4 00000000 */ nop -/* B32258 800BB0B8 45020003 */ bc1fl .L800BB0C8 -/* B3225C 800BB0BC 460C8001 */ sub.s $f0, $f16, $f12 -/* B32260 800BB0C0 46008306 */ mov.s $f12, $f16 -/* B32264 800BB0C4 460C8001 */ sub.s $f0, $f16, $f12 -.L800BB0C8: -/* B32268 800BB0C8 3C0140C0 */ li $at, 0x40C00000 # 0.000000 -/* B3226C 800BB0CC 44819000 */ mtc1 $at, $f18 -/* B32270 800BB0D0 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B32274 800BB0D4 46000102 */ mul.s $f4, $f0, $f0 -/* B32278 800BB0D8 44815000 */ mtc1 $at, $f10 -/* B3227C 800BB0DC 3C018014 */ lui $at, %hi(D_80143CE0) -/* B32280 800BB0E0 8FA30020 */ lw $v1, 0x20($sp) -/* B32284 800BB0E4 8FA40024 */ lw $a0, 0x24($sp) -/* B32288 800BB0E8 8FA60028 */ lw $a2, 0x28($sp) -/* B3228C 800BB0EC 8FA2002C */ lw $v0, 0x2c($sp) -/* B32290 800BB0F0 46002182 */ mul.s $f6, $f4, $f0 -/* B32294 800BB0F4 00000000 */ nop -/* B32298 800BB0F8 460C6082 */ mul.s $f2, $f12, $f12 -/* B3229C 800BB0FC 46123203 */ div.s $f8, $f6, $f18 -/* B322A0 800BB100 460C1382 */ mul.s $f14, $f2, $f12 -/* B322A4 800BB104 00000000 */ nop -/* B322A8 800BB108 460A7102 */ mul.s $f4, $f14, $f10 -/* B322AC 800BB10C C42A3CE0 */ lwc1 $f10, %lo(D_80143CE0)($at) -/* B322B0 800BB110 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B322B4 800BB114 E7A80000 */ swc1 $f8, ($sp) -/* B322B8 800BB118 46022181 */ sub.s $f6, $f4, $f2 -/* B322BC 800BB11C 460A3100 */ add.s $f4, $f6, $f10 -/* B322C0 800BB120 46006187 */ neg.s $f6, $f12 -/* B322C4 800BB124 E7A40004 */ swc1 $f4, 4($sp) -/* B322C8 800BB128 460C3282 */ mul.s $f10, $f6, $f12 -/* B322CC 800BB12C 00000000 */ nop -/* B322D0 800BB130 460C5182 */ mul.s $f6, $f10, $f12 -/* B322D4 800BB134 44815000 */ mtc1 $at, $f10 -/* B322D8 800BB138 00000000 */ nop -/* B322DC 800BB13C 460A3182 */ mul.s $f6, $f6, $f10 -/* B322E0 800BB140 44815000 */ mtc1 $at, $f10 -/* B322E4 800BB144 00000000 */ nop -/* B322E8 800BB148 460A1282 */ mul.s $f10, $f2, $f10 -/* B322EC 800BB14C 460A3180 */ add.s $f6, $f6, $f10 -/* B322F0 800BB150 44815000 */ mtc1 $at, $f10 -/* B322F4 800BB154 3C018014 */ lui $at, %hi(D_80143CE4) -/* B322F8 800BB158 460A6282 */ mul.s $f10, $f12, $f10 -/* B322FC 800BB15C 460A3180 */ add.s $f6, $f6, $f10 -/* B32300 800BB160 C42A3CE4 */ lwc1 $f10, %lo(D_80143CE4)($at) -/* B32304 800BB164 460A3180 */ add.s $f6, $f6, $f10 -/* B32308 800BB168 46127283 */ div.s $f10, $f14, $f18 -/* B3230C 800BB16C E7A60008 */ swc1 $f6, 8($sp) -/* B32310 800BB170 E7AA000C */ swc1 $f10, 0xc($sp) -/* B32314 800BB174 C46A0000 */ lwc1 $f10, ($v1) -/* B32318 800BB178 460A4202 */ mul.s $f8, $f8, $f10 -/* B3231C 800BB17C C48A0000 */ lwc1 $f10, ($a0) -/* B32320 800BB180 460A2102 */ mul.s $f4, $f4, $f10 -/* B32324 800BB184 46044280 */ add.s $f10, $f8, $f4 -/* B32328 800BB188 C4C80000 */ lwc1 $f8, ($a2) -/* B3232C 800BB18C 46083102 */ mul.s $f4, $f6, $f8 -/* B32330 800BB190 C4480000 */ lwc1 $f8, ($v0) -/* B32334 800BB194 46045180 */ add.s $f6, $f10, $f4 -/* B32338 800BB198 C7AA000C */ lwc1 $f10, 0xc($sp) -/* B3233C 800BB19C 460A4102 */ mul.s $f4, $f8, $f10 -/* B32340 800BB1A0 46062200 */ add.s $f8, $f4, $f6 -/* B32344 800BB1A4 E4A80000 */ swc1 $f8, ($a1) -/* B32348 800BB1A8 C7AA0000 */ lwc1 $f10, ($sp) -/* B3234C 800BB1AC C4640004 */ lwc1 $f4, 4($v1) -/* B32350 800BB1B0 C7A80004 */ lwc1 $f8, 4($sp) -/* B32354 800BB1B4 46045182 */ mul.s $f6, $f10, $f4 -/* B32358 800BB1B8 C48A0004 */ lwc1 $f10, 4($a0) -/* B3235C 800BB1BC 460A4102 */ mul.s $f4, $f8, $f10 -/* B32360 800BB1C0 C7AA0008 */ lwc1 $f10, 8($sp) -/* B32364 800BB1C4 46043200 */ add.s $f8, $f6, $f4 -/* B32368 800BB1C8 C4C60004 */ lwc1 $f6, 4($a2) -/* B3236C 800BB1CC 46065102 */ mul.s $f4, $f10, $f6 -/* B32370 800BB1D0 C4460004 */ lwc1 $f6, 4($v0) -/* B32374 800BB1D4 46044280 */ add.s $f10, $f8, $f4 -/* B32378 800BB1D8 C7A8000C */ lwc1 $f8, 0xc($sp) -/* B3237C 800BB1DC 46083102 */ mul.s $f4, $f6, $f8 -/* B32380 800BB1E0 460A2180 */ add.s $f6, $f4, $f10 -/* B32384 800BB1E4 E4A60004 */ swc1 $f6, 4($a1) -/* B32388 800BB1E8 C7A80000 */ lwc1 $f8, ($sp) -/* B3238C 800BB1EC C4640008 */ lwc1 $f4, 8($v1) -/* B32390 800BB1F0 C7A60004 */ lwc1 $f6, 4($sp) -/* B32394 800BB1F4 46044282 */ mul.s $f10, $f8, $f4 -/* B32398 800BB1F8 C4880008 */ lwc1 $f8, 8($a0) -/* B3239C 800BB1FC 46083102 */ mul.s $f4, $f6, $f8 -/* B323A0 800BB200 C7A80008 */ lwc1 $f8, 8($sp) -/* B323A4 800BB204 46045180 */ add.s $f6, $f10, $f4 -/* B323A8 800BB208 C4CA0008 */ lwc1 $f10, 8($a2) -/* B323AC 800BB20C 460A4102 */ mul.s $f4, $f8, $f10 -/* B323B0 800BB210 C44A0008 */ lwc1 $f10, 8($v0) -/* B323B4 800BB214 46043200 */ add.s $f8, $f6, $f4 -/* B323B8 800BB218 C7A6000C */ lwc1 $f6, 0xc($sp) -/* B323BC 800BB21C 46065102 */ mul.s $f4, $f10, $f6 -/* B323C0 800BB220 46082280 */ add.s $f10, $f4, $f8 -/* B323C4 800BB224 E4AA0008 */ swc1 $f10, 8($a1) -/* B323C8 800BB228 C7A60000 */ lwc1 $f6, ($sp) -/* B323CC 800BB22C C464000C */ lwc1 $f4, 0xc($v1) -/* B323D0 800BB230 C7AA0004 */ lwc1 $f10, 4($sp) -/* B323D4 800BB234 8FAE0018 */ lw $t6, 0x18($sp) -/* B323D8 800BB238 46043202 */ mul.s $f8, $f6, $f4 -/* B323DC 800BB23C C486000C */ lwc1 $f6, 0xc($a0) -/* B323E0 800BB240 46065102 */ mul.s $f4, $f10, $f6 -/* B323E4 800BB244 C7A60008 */ lwc1 $f6, 8($sp) -/* B323E8 800BB248 46044280 */ add.s $f10, $f8, $f4 -/* B323EC 800BB24C C4C8000C */ lwc1 $f8, 0xc($a2) -/* B323F0 800BB250 46083102 */ mul.s $f4, $f6, $f8 -/* B323F4 800BB254 C448000C */ lwc1 $f8, 0xc($v0) -/* B323F8 800BB258 46045180 */ add.s $f6, $f10, $f4 -/* B323FC 800BB25C C7AA000C */ lwc1 $f10, 0xc($sp) -/* B32400 800BB260 460A4102 */ mul.s $f4, $f8, $f10 -/* B32404 800BB264 46062200 */ add.s $f8, $f4, $f6 -/* B32408 800BB268 E5C80000 */ swc1 $f8, ($t6) -/* B3240C 800BB26C C7AA0000 */ lwc1 $f10, ($sp) -/* B32410 800BB270 C4640010 */ lwc1 $f4, 0x10($v1) -/* B32414 800BB274 C7A80004 */ lwc1 $f8, 4($sp) -/* B32418 800BB278 46045182 */ mul.s $f6, $f10, $f4 -/* B3241C 800BB27C C48A0010 */ lwc1 $f10, 0x10($a0) -/* B32420 800BB280 460A4102 */ mul.s $f4, $f8, $f10 -/* B32424 800BB284 C7AA0008 */ lwc1 $f10, 8($sp) -/* B32428 800BB288 46043200 */ add.s $f8, $f6, $f4 -/* B3242C 800BB28C C4C60010 */ lwc1 $f6, 0x10($a2) -/* B32430 800BB290 46065102 */ mul.s $f4, $f10, $f6 -/* B32434 800BB294 C4460010 */ lwc1 $f6, 0x10($v0) -/* B32438 800BB298 46044280 */ add.s $f10, $f8, $f4 -/* B3243C 800BB29C C7A8000C */ lwc1 $f8, 0xc($sp) -/* B32440 800BB2A0 27BD0010 */ addiu $sp, $sp, 0x10 -/* B32444 800BB2A4 46083102 */ mul.s $f4, $f6, $f8 -/* B32448 800BB2A8 460A2180 */ add.s $f6, $f4, $f10 -/* B3244C 800BB2AC 03E00008 */ jr $ra -/* B32450 800BB2B0 E4E60000 */ swc1 $f6, ($a3) - glabel func_800BB2B4 /* B32454 800BB2B4 27BDFF60 */ addiu $sp, $sp, -0xa0 /* B32458 800BB2B8 8FAF00B0 */ lw $t7, 0xb0($sp) @@ -169,10 +22,10 @@ glabel func_800BB2B4 /* B324A0 800BB300 03191021 */ addu $v0, $t8, $t9 /* B324A4 800BB304 804B0000 */ lb $t3, ($v0) /* B324A8 800BB308 112B0009 */ beq $t1, $t3, .L800BB330 -/* B324AC 800BB30C 00000000 */ nop +/* B324AC 800BB30C 00000000 */ nop /* B324B0 800BB310 804C0010 */ lb $t4, 0x10($v0) /* B324B4 800BB314 112C0006 */ beq $t1, $t4, .L800BB330 -/* B324B8 800BB318 00000000 */ nop +/* B324B8 800BB318 00000000 */ nop /* B324BC 800BB31C 804D0020 */ lb $t5, 0x20($v0) /* B324C0 800BB320 27A2004C */ addiu $v0, $sp, 0x4c /* B324C4 800BB324 00002025 */ move $a0, $zero @@ -197,17 +50,17 @@ glabel func_800BB2B4 /* B32504 800BB364 E452FFEC */ swc1 $f18, -0x14($v0) /* B32508 800BB368 8479FFFA */ lh $t9, -6($v1) /* B3250C 800BB36C 44999000 */ mtc1 $t9, $f18 -/* B32510 800BB370 00000000 */ nop +/* B32510 800BB370 00000000 */ nop /* B32514 800BB374 468094A0 */ cvt.s.w $f18, $f18 /* B32518 800BB378 E452FFF0 */ swc1 $f18, -0x10($v0) /* B3251C 800BB37C 846BFFFC */ lh $t3, -4($v1) /* B32520 800BB380 448B9000 */ mtc1 $t3, $f18 -/* B32524 800BB384 00000000 */ nop +/* B32524 800BB384 00000000 */ nop /* B32528 800BB388 468094A0 */ cvt.s.w $f18, $f18 /* B3252C 800BB38C E452FFF4 */ swc1 $f18, -0xc($v0) /* B32530 800BB390 806CFFF1 */ lb $t4, -0xf($v1) /* B32534 800BB394 448C9000 */ mtc1 $t4, $f18 -/* B32538 800BB398 00000000 */ nop +/* B32538 800BB398 00000000 */ nop /* B3253C 800BB39C 468094A0 */ cvt.s.w $f18, $f18 /* B32540 800BB3A0 E452FFF8 */ swc1 $f18, -8($v0) /* B32544 800BB3A4 C472FFF4 */ lwc1 $f18, -0xc($v1) @@ -222,17 +75,17 @@ glabel func_800BB2B4 /* B32564 800BB3C4 E452FFEC */ swc1 $f18, -0x14($v0) /* B32568 800BB3C8 8479FFFA */ lh $t9, -6($v1) /* B3256C 800BB3CC 44999000 */ mtc1 $t9, $f18 -/* B32570 800BB3D0 00000000 */ nop +/* B32570 800BB3D0 00000000 */ nop /* B32574 800BB3D4 468094A0 */ cvt.s.w $f18, $f18 /* B32578 800BB3D8 E452FFF0 */ swc1 $f18, -0x10($v0) /* B3257C 800BB3DC 846BFFFC */ lh $t3, -4($v1) /* B32580 800BB3E0 448B9000 */ mtc1 $t3, $f18 -/* B32584 800BB3E4 00000000 */ nop +/* B32584 800BB3E4 00000000 */ nop /* B32588 800BB3E8 468094A0 */ cvt.s.w $f18, $f18 /* B3258C 800BB3EC E452FFF4 */ swc1 $f18, -0xc($v0) /* B32590 800BB3F0 806CFFF1 */ lb $t4, -0xf($v1) /* B32594 800BB3F4 448C9000 */ mtc1 $t4, $f18 -/* B32598 800BB3F8 00000000 */ nop +/* B32598 800BB3F8 00000000 */ nop /* B3259C 800BB3FC 468094A0 */ cvt.s.w $f18, $f18 /* B325A0 800BB400 E452FFF8 */ swc1 $f18, -8($v0) /* B325A4 800BB404 C472FFF4 */ lwc1 $f18, -0xc($v1) @@ -272,7 +125,7 @@ glabel func_800BB2B4 /* B3262C 800BB48C 468042A0 */ cvt.s.w $f10, $f8 /* B32630 800BB490 3C014F80 */ li $at, 0x4F800000 # 0.000000 /* B32634 800BB494 44812000 */ mtc1 $at, $f4 -/* B32638 800BB498 00000000 */ nop +/* B32638 800BB498 00000000 */ nop /* B3263C 800BB49C 46045280 */ add.s $f10, $f10, $f4 .L800BB4A0: /* B32640 800BB4A0 460A3383 */ div.s $f14, $f6, $f10 @@ -287,7 +140,7 @@ glabel func_800BB2B4 /* B32660 800BB4C0 468021A0 */ cvt.s.w $f6, $f4 /* B32664 800BB4C4 3C014F80 */ li $at, 0x4F800000 # 0.000000 /* B32668 800BB4C8 44815000 */ mtc1 $at, $f10 -/* B3266C 800BB4CC 00000000 */ nop +/* B3266C 800BB4CC 00000000 */ nop /* B32670 800BB4D0 460A3180 */ add.s $f6, $f6, $f10 .L800BB4D4: /* B32674 800BB4D4 46064403 */ div.s $f16, $f8, $f6 @@ -297,11 +150,11 @@ glabel func_800BB2B4 /* B32680 800BB4E0 46041282 */ mul.s $f10, $f2, $f4 /* B32684 800BB4E4 460E5000 */ add.s $f0, $f10, $f14 /* B32688 800BB4E8 4612003C */ c.lt.s $f0, $f18 -/* B3268C 800BB4EC 00000000 */ nop +/* B3268C 800BB4EC 00000000 */ nop /* B32690 800BB4F0 45020004 */ bc1fl .L800BB504 /* B32694 800BB4F4 46001200 */ add.s $f8, $f2, $f0 /* B32698 800BB4F8 44800000 */ mtc1 $zero, $f0 -/* B3269C 800BB4FC 00000000 */ nop +/* B3269C 800BB4FC 00000000 */ nop /* B326A0 800BB500 46001200 */ add.s $f8, $f2, $f0 .L800BB504: /* B326A4 800BB504 3C013F80 */ li $at, 0x3F800000 # 0.000000 @@ -309,7 +162,7 @@ glabel func_800BB2B4 /* B326AC 800BB50C E4880000 */ swc1 $f8, ($a0) /* B326B0 800BB510 C4860000 */ lwc1 $f6, ($a0) /* B326B4 800BB514 4606603E */ c.le.s $f12, $f6 -/* B326B8 800BB518 00000000 */ nop +/* B326B8 800BB518 00000000 */ nop /* B326BC 800BB51C 45020010 */ bc1fl .L800BB560 /* B326C0 800BB520 01401025 */ move $v0, $t2 /* B326C4 800BB524 84AC0000 */ lh $t4, ($a1) @@ -332,4 +185,4 @@ glabel func_800BB2B4 /* B32700 800BB560 8FBF0024 */ lw $ra, 0x24($sp) /* B32704 800BB564 27BD00A0 */ addiu $sp, $sp, 0xa0 /* B32708 800BB568 03E00008 */ jr $ra -/* B3270C 800BB56C 00000000 */ nop +/* B3270C 800BB56C 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/func_8004B5A0.s b/asm/non_matchings/code/z_camera/Camera_Battle1.s similarity index 99% rename from asm/non_matchings/code/z_camera/func_8004B5A0.s rename to asm/non_matchings/code/z_camera/Camera_Battle1.s index 237efd9b6f..5b81964c1f 100644 --- a/asm/non_matchings/code/z_camera/func_8004B5A0.s +++ b/asm/non_matchings/code/z_camera/Camera_Battle1.s @@ -110,7 +110,7 @@ glabel D_8013A04C .float 0.05 .text -glabel func_8004B5A0 +glabel Camera_Battle1 /* AC2740 8004B5A0 27BDFEC0 */ addiu $sp, $sp, -0x140 /* AC2744 8004B5A4 AFB00024 */ sw $s0, 0x24($sp) /* AC2748 8004B5A8 00808025 */ move $s0, $a0 @@ -148,13 +148,13 @@ glabel func_8004B5A0 /* AC27C4 8004B624 860F0142 */ lh $t7, 0x142($s0) /* AC27C8 8004B628 468021A0 */ cvt.s.w $f6, $f4 /* AC27CC 8004B62C 44812000 */ mtc1 $at, $f4 -/* AC27D0 8004B630 3C198012 */ lui $t9, %hi(D_8011D068) +/* AC27D0 8004B630 3C198012 */ lui $t9, %hi(sCameraSettings) /* AC27D4 8004B634 000FC0C0 */ sll $t8, $t7, 3 /* AC27D8 8004B638 86090144 */ lh $t1, 0x144($s0) /* AC27DC 8004B63C 0338C821 */ addu $t9, $t9, $t8 /* AC27E0 8004B640 46103082 */ mul.s $f2, $f6, $f16 /* AC27E4 8004B644 46002183 */ div.s $f6, $f4, $f0 -/* AC27E8 8004B648 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) +/* AC27E8 8004B648 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) /* AC27EC 8004B64C 000950C0 */ sll $t2, $t1, 3 /* AC27F0 8004B650 26110030 */ addiu $s1, $s0, 0x30 /* AC27F4 8004B654 032A5821 */ addu $t3, $t9, $t2 @@ -247,7 +247,7 @@ glabel func_8004B5A0 /* AC294C 8004B7AC C4309FD8 */ lwc1 $f16, %lo(D_80139FD8)($at) /* AC2950 8004B7B0 10600007 */ beqz $v1, .L8004B7D0 /* AC2954 8004B7B4 26110030 */ addiu $s1, $s0, 0x30 -/* AC2958 8004B7B8 0C011495 */ jal func_80045254 +/* AC2958 8004B7B8 0C011495 */ jal Camera_CopyPREGToModeValues /* AC295C 8004B7BC 02002025 */ move $a0, $s0 /* AC2960 8004B7C0 3C018014 */ lui $at, %hi(D_80139FDC) /* AC2964 8004B7C4 3C058016 */ lui $a1, %hi(gGameInfo) # $a1, 0x8016 diff --git a/asm/non_matchings/code/z_camera/func_8004C634.s b/asm/non_matchings/code/z_camera/Camera_Battle4.s similarity index 98% rename from asm/non_matchings/code/z_camera/func_8004C634.s rename to asm/non_matchings/code/z_camera/Camera_Battle4.s index a75a9ccd9a..875e59d60d 100644 --- a/asm/non_matchings/code/z_camera/func_8004C634.s +++ b/asm/non_matchings/code/z_camera/Camera_Battle4.s @@ -26,7 +26,7 @@ glabel D_8013A074 .float 9.99999974738e-05 .text -glabel func_8004C634 +glabel Camera_Battle4 /* AC37D4 8004C634 27BDFF88 */ addiu $sp, $sp, -0x78 /* AC37D8 8004C638 AFB00018 */ sw $s0, 0x18($sp) /* AC37DC 8004C63C 00808025 */ move $s0, $a0 @@ -55,13 +55,13 @@ glabel func_8004C634 /* AC3834 8004C694 860F0142 */ lh $t7, 0x142($s0) /* AC3838 8004C698 856C01F0 */ lh $t4, 0x1f0($t3) /* AC383C 8004C69C 46008483 */ div.s $f18, $f16, $f0 -/* AC3840 8004C6A0 3C198012 */ lui $t9, %hi(D_8011D068) +/* AC3840 8004C6A0 3C198012 */ lui $t9, %hi(sCameraSettings) /* AC3844 8004C6A4 448C2000 */ mtc1 $t4, $f4 /* AC3848 8004C6A8 000FC0C0 */ sll $t8, $t7, 3 /* AC384C 8004C6AC 86080144 */ lh $t0, 0x144($s0) /* AC3850 8004C6B0 468021A0 */ cvt.s.w $f6, $f4 /* AC3854 8004C6B4 0338C821 */ addu $t9, $t9, $t8 -/* AC3858 8004C6B8 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) +/* AC3858 8004C6B8 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) /* AC385C 8004C6BC 000848C0 */ sll $t1, $t0, 3 /* AC3860 8004C6C0 3C018014 */ lui $at, %hi(D_8013A054) /* AC3864 8004C6C4 03295021 */ addu $t2, $t9, $t1 @@ -127,7 +127,7 @@ glabel func_8004C634 .L8004C7B4: /* AC3954 8004C7B4 50600004 */ beql $v1, $zero, .L8004C7C8 /* AC3958 8004C7B8 26050050 */ addiu $a1, $s0, 0x50 -/* AC395C 8004C7BC 0C011495 */ jal func_80045254 +/* AC395C 8004C7BC 0C011495 */ jal Camera_CopyPREGToModeValues /* AC3960 8004C7C0 02002025 */ move $a0, $s0 /* AC3964 8004C7C4 26050050 */ addiu $a1, $s0, 0x50 .L8004C7C8: diff --git a/asm/non_matchings/code/z_camera/func_8005A04C.s b/asm/non_matchings/code/z_camera/Camera_ChangeMode.s similarity index 94% rename from asm/non_matchings/code/z_camera/func_8005A04C.s rename to asm/non_matchings/code/z_camera/Camera_ChangeMode.s index 33d4bac0db..5b02ab216b 100644 --- a/asm/non_matchings/code/z_camera/func_8005A04C.s +++ b/asm/non_matchings/code/z_camera/Camera_ChangeMode.s @@ -56,7 +56,7 @@ glabel jtbl_8013A49C .word L8005A318 # 19 .text -glabel func_8005A04C +glabel Camera_ChangeMode /* AD11EC 8005A04C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AD11F0 8005A050 3C0E8016 */ lui $t6, %hi(gGameInfo) # $t6, 0x8016 /* AD11F4 8005A054 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) @@ -70,11 +70,11 @@ glabel func_8005A04C /* AD1214 8005A074 24849BB4 */ addiu $a0, %lo(D_80139BB4) # addiu $a0, $a0, -0x644c /* AD1218 8005A078 87B9001E */ lh $t9, 0x1e($sp) /* AD121C 8005A07C 8CF8008C */ lw $t8, 0x8c($a3) -/* AD1220 8005A080 3C098012 */ lui $t1, %hi(D_8011A2A4) # $t1, 0x8012 +/* AD1220 8005A080 3C098012 */ lui $t1, %hi(sCameraModeNames) # $t1, 0x8012 /* AD1224 8005A084 00194080 */ sll $t0, $t9, 2 /* AD1228 8005A088 01194023 */ subu $t0, $t0, $t9 /* AD122C 8005A08C 00084080 */ sll $t0, $t0, 2 -/* AD1230 8005A090 2529A2A4 */ addiu $t1, %lo(D_8011A2A4) # addiu $t1, $t1, -0x5d5c +/* AD1230 8005A090 2529A2A4 */ addiu $t1, %lo(sCameraModeNames) # addiu $t1, $t1, -0x5d5c /* AD1234 8005A094 8F05009C */ lw $a1, 0x9c($t8) /* AD1238 8005A098 AFA70018 */ sw $a3, 0x18($sp) /* AD123C 8005A09C 0C00084C */ jal osSyncPrintf @@ -83,7 +83,7 @@ glabel func_8005A04C .L8005A0A8: /* AD1248 8005A0A8 84EA014C */ lh $t2, 0x14c($a3) /* AD124C 8005A0AC 93AC0023 */ lbu $t4, 0x23($sp) -/* AD1250 8005A0B0 3C198012 */ lui $t9, %hi(D_8011D064) +/* AD1250 8005A0B0 3C198012 */ lui $t9, %hi(sCameraSettings) /* AD1254 8005A0B4 314B0020 */ andi $t3, $t2, 0x20 /* AD1258 8005A0B8 11600008 */ beqz $t3, .L8005A0DC /* AD125C 8005A0BC 3C013FFF */ lui $at, (0x3FFFFFFF >> 16) # lui $at, 0x3fff @@ -101,7 +101,7 @@ glabel func_8005A04C /* AD1284 8005A0E4 3421FFFF */ ori $at, (0x3FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff /* AD1288 8005A0E8 000FC0C0 */ sll $t8, $t7, 3 /* AD128C 8005A0EC 0338C821 */ addu $t9, $t9, $t8 -/* AD1290 8005A0F0 8F39D064 */ lw $t9, %lo(D_8011D064)($t9) +/* AD1290 8005A0F0 8F39D064 */ lw $t9, %lo(sCameraSettings)($t9) /* AD1294 8005A0F4 240A0001 */ li $t2, 1 /* AD1298 8005A0F8 012A5804 */ sllv $t3, $t2, $t1 /* AD129C 8005A0FC 03214024 */ and $t0, $t9, $at @@ -122,25 +122,25 @@ glabel func_8005A04C /* AD12D4 8005A134 3C048014 */ lui $a0, %hi(D_80139BF0) # $a0, 0x8014 /* AD12D8 8005A138 24849BF0 */ addiu $a0, %lo(D_80139BF0) # addiu $a0, $a0, -0x6410 /* AD12DC 8005A13C 11A0001A */ beqz $t5, .L8005A1A8 -/* AD12E0 8005A140 3C188012 */ lui $t8, %hi(D_80119F8C) # $t8, 0x8012 +/* AD12E0 8005A140 3C188012 */ lui $t8, %hi(sCameraSettingNames) # $t8, 0x8012 /* AD12E4 8005A144 84EE0142 */ lh $t6, 0x142($a3) /* AD12E8 8005A148 87B9001E */ lh $t9, 0x1e($sp) -/* AD12EC 8005A14C 3C088012 */ lui $t0, %hi(D_8011A2A4) # $t0, 0x8012 +/* AD12EC 8005A14C 3C088012 */ lui $t0, %hi(sCameraModeNames) # $t0, 0x8012 /* AD12F0 8005A150 000E7880 */ sll $t7, $t6, 2 /* AD12F4 8005A154 00195080 */ sll $t2, $t9, 2 /* AD12F8 8005A158 01EE7823 */ subu $t7, $t7, $t6 /* AD12FC 8005A15C 01595023 */ subu $t2, $t2, $t9 /* AD1300 8005A160 000A5080 */ sll $t2, $t2, 2 /* AD1304 8005A164 000F7880 */ sll $t7, $t7, 2 -/* AD1308 8005A168 2508A2A4 */ addiu $t0, %lo(D_8011A2A4) # addiu $t0, $t0, -0x5d5c -/* AD130C 8005A16C 27189F8C */ addiu $t8, %lo(D_80119F8C) # addiu $t8, $t8, -0x6074 +/* AD1308 8005A168 2508A2A4 */ addiu $t0, %lo(sCameraModeNames) # addiu $t0, $t0, -0x5d5c +/* AD130C 8005A16C 27189F8C */ addiu $t8, %lo(sCameraSettingNames) # addiu $t8, $t8, -0x6074 /* AD1310 8005A170 01F82821 */ addu $a1, $t7, $t8 /* AD1314 8005A174 01483021 */ addu $a2, $t2, $t0 /* AD1318 8005A178 0C00084C */ jal osSyncPrintf /* AD131C 8005A17C AFA70018 */ sw $a3, 0x18($sp) /* AD1320 8005A180 8FA40018 */ lw $a0, 0x18($sp) /* AD1324 8005A184 A4800144 */ sh $zero, 0x144($a0) -/* AD1328 8005A188 0C01144A */ jal func_80045128 +/* AD1328 8005A188 0C01144A */ jal Camera_CopyModeValuesToPREG /* AD132C 8005A18C 84850144 */ lh $a1, 0x144($a0) /* AD1330 8005A190 0C01680B */ jal func_8005A02C /* AD1334 8005A194 8FA40018 */ lw $a0, 0x18($sp) @@ -181,7 +181,7 @@ glabel func_8005A04C /* AD13B4 8005A214 35AE0002 */ ori $t6, $t5, 2 /* AD13B8 8005A218 A4EE014A */ sh $t6, 0x14a($a3) /* AD13BC 8005A21C AFA70018 */ sw $a3, 0x18($sp) -/* AD13C0 8005A220 0C01144A */ jal func_80045128 +/* AD13C0 8005A220 0C01144A */ jal Camera_CopyModeValuesToPREG /* AD13C4 8005A224 87A5001E */ lh $a1, 0x1e($sp) /* AD13C8 8005A228 87AF001E */ lh $t7, 0x1e($sp) /* AD13CC 8005A22C 8FA70018 */ lw $a3, 0x18($sp) diff --git a/asm/non_matchings/code/z_camera/func_8005A548.s b/asm/non_matchings/code/z_camera/Camera_ChangeSetting.s similarity index 90% rename from asm/non_matchings/code/z_camera/func_8005A548.s rename to asm/non_matchings/code/z_camera/Camera_ChangeSetting.s index 6fc8970b2c..df8be0fe2d 100644 --- a/asm/non_matchings/code/z_camera/func_8005A548.s +++ b/asm/non_matchings/code/z_camera/Camera_ChangeSetting.s @@ -8,7 +8,7 @@ glabel D_80139C90 .balign 4 .text -glabel func_8005A548 +glabel Camera_ChangeSetting /* AD16E8 8005A548 27BDFFE0 */ addiu $sp, $sp, -0x20 /* AD16EC 8005A54C AFBF001C */ sw $ra, 0x1c($sp) /* AD16F0 8005A550 AFB00018 */ sw $s0, 0x18($sp) @@ -23,8 +23,8 @@ glabel func_8005A548 /* AD1714 8005A574 11C00015 */ beqz $t6, .L8005A5CC /* AD1718 8005A578 00808025 */ move $s0, $a0 /* AD171C 8005A57C 848F0142 */ lh $t7, 0x142($a0) -/* AD1720 8005A580 3C058012 */ lui $a1, %hi(D_8011D064) # $a1, 0x8012 -/* AD1724 8005A584 24A5D064 */ addiu $a1, %lo(D_8011D064) # addiu $a1, $a1, -0x2f9c +/* AD1720 8005A580 3C058012 */ lui $a1, %hi(sCameraSettings) # $a1, 0x8012 +/* AD1724 8005A584 24A5D064 */ addiu $a1, %lo(sCameraSettings) # addiu $a1, $a1, -0x2f9c /* AD1728 8005A588 000758C0 */ sll $t3, $a3, 3 /* AD172C 8005A58C 000FC0C0 */ sll $t8, $t7, 3 /* AD1730 8005A590 00B8C821 */ addu $t9, $a1, $t8 @@ -43,24 +43,24 @@ glabel func_8005A548 /* AD1764 8005A5C4 10000068 */ b .L8005A768 /* AD1768 8005A5C8 2402FFFE */ li $v0, -2 .L8005A5CC: -/* AD176C 8005A5CC 3C058012 */ lui $a1, %hi(D_8011D064) # $a1, 0x8012 +/* AD176C 8005A5CC 3C058012 */ lui $a1, %hi(sCameraSettings) # $a1, 0x8012 /* AD1770 8005A5D0 24010035 */ li $at, 53 /* AD1774 8005A5D4 10E10003 */ beq $a3, $at, .L8005A5E4 -/* AD1778 8005A5D8 24A5D064 */ addiu $a1, %lo(D_8011D064) # addiu $a1, $a1, -0x2f9c +/* AD1778 8005A5D8 24A5D064 */ addiu $a1, %lo(sCameraSettings) # addiu $a1, $a1, -0x2f9c /* AD177C 8005A5DC 24010036 */ li $at, 54 /* AD1780 8005A5E0 14E1000D */ bne $a3, $at, .L8005A618 .L8005A5E4: /* AD1784 8005A5E4 3C198016 */ lui $t9, %hi(gSaveContext+4) # $t9, 0x8016 /* AD1788 8005A5E8 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) /* AD178C 8005A5EC 1720000A */ bnez $t9, .L8005A618 -/* AD1790 8005A5F0 00000000 */ nop +/* AD1790 8005A5F0 00000000 */ nop /* AD1794 8005A5F4 8E08008C */ lw $t0, 0x8c($s0) /* AD1798 8005A5F8 24010056 */ li $at, 86 /* AD179C 8005A5FC 346B0010 */ ori $t3, $v1, 0x10 /* AD17A0 8005A600 850900A4 */ lh $t1, 0xa4($t0) /* AD17A4 8005A604 2402FFFB */ li $v0, -5 /* AD17A8 8005A608 15210003 */ bne $t1, $at, .L8005A618 -/* AD17AC 8005A60C 00000000 */ nop +/* AD17AC 8005A60C 00000000 */ nop /* AD17B0 8005A610 10000055 */ b .L8005A768 /* AD17B4 8005A614 A60B014A */ sh $t3, 0x14a($s0) .L8005A618: @@ -136,20 +136,20 @@ glabel func_8005A548 /* AD18AC 8005A70C A6070142 */ sh $a3, 0x142($s0) /* AD18B0 8005A710 86050144 */ lh $a1, 0x144($s0) /* AD18B4 8005A714 A7A70026 */ sh $a3, 0x26($sp) -/* AD18B8 8005A718 0C016813 */ jal func_8005A04C +/* AD18B8 8005A718 0C016813 */ jal Camera_ChangeMode /* AD18BC 8005A71C 02002025 */ move $a0, $s0 /* AD18C0 8005A720 04400003 */ bltz $v0, .L8005A730 /* AD18C4 8005A724 02002025 */ move $a0, $s0 -/* AD18C8 8005A728 0C01144A */ jal func_80045128 +/* AD18C8 8005A728 0C01144A */ jal Camera_CopyModeValuesToPREG /* AD18CC 8005A72C 86050144 */ lh $a1, 0x144($s0) .L8005A730: /* AD18D0 8005A730 86190142 */ lh $t9, 0x142($s0) /* AD18D4 8005A734 8E18008C */ lw $t8, 0x8c($s0) -/* AD18D8 8005A738 3C098012 */ lui $t1, %hi(D_80119F8C) # $t1, 0x8012 +/* AD18D8 8005A738 3C098012 */ lui $t1, %hi(sCameraSettingNames) # $t1, 0x8012 /* AD18DC 8005A73C 00194080 */ sll $t0, $t9, 2 /* AD18E0 8005A740 01194023 */ subu $t0, $t0, $t9 /* AD18E4 8005A744 00084080 */ sll $t0, $t0, 2 -/* AD18E8 8005A748 25299F8C */ addiu $t1, %lo(D_80119F8C) # addiu $t1, $t1, -0x6074 +/* AD18E8 8005A748 25299F8C */ addiu $t1, %lo(sCameraSettingNames) # addiu $t1, $t1, -0x6074 /* AD18EC 8005A74C 3C048014 */ lui $a0, %hi(D_80139C90) # $a0, 0x8014 /* AD18F0 8005A750 24849C90 */ addiu $a0, %lo(D_80139C90) # addiu $a0, $a0, -0x6370 /* AD18F4 8005A754 01093821 */ addu $a3, $t0, $t1 @@ -162,5 +162,5 @@ glabel func_8005A548 /* AD190C 8005A76C 8FB00018 */ lw $s0, 0x18($sp) /* AD1910 8005A770 27BD0020 */ addiu $sp, $sp, 0x20 /* AD1914 8005A774 03E00008 */ jr $ra -/* AD1918 8005A778 00000000 */ nop +/* AD1918 8005A778 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/Camera_ChangeStatus.s b/asm/non_matchings/code/z_camera/Camera_ChangeStatus.s index 2d5ff1501b..8236fe76f9 100644 --- a/asm/non_matchings/code/z_camera/Camera_ChangeStatus.s +++ b/asm/non_matchings/code/z_camera/Camera_ChangeStatus.s @@ -39,7 +39,7 @@ glabel Camera_ChangeStatus /* ACF54C 800583AC 86780140 */ lh $t8, 0x140($s3) /* ACF550 800583B0 24060078 */ li $a2, 120 /* ACF554 800583B4 12180003 */ beq $s0, $t8, .L800583C4 -/* ACF558 800583B8 00000000 */ nop +/* ACF558 800583B8 00000000 */ nop /* ACF55C 800583BC 10000001 */ b .L800583C4 /* ACF560 800583C0 2406006F */ li $a2, 111 .L800583C4: @@ -61,11 +61,11 @@ glabel Camera_ChangeStatus /* ACF598 800583F8 55100030 */ bnel $t0, $s0, .L800584BC /* ACF59C 800583FC 87AC0036 */ lh $t4, 0x36($sp) /* ACF5A0 80058400 86690140 */ lh $t1, 0x140($s3) -/* ACF5A4 80058404 3C158012 */ lui $s5, %hi(D_8011D064) # $s5, 0x8012 +/* ACF5A4 80058404 3C158012 */ lui $s5, %hi(sCameraSettings) # $s5, 0x8012 /* ACF5A8 80058408 5209002C */ beql $s0, $t1, .L800584BC /* ACF5AC 8005840C 87AC0036 */ lh $t4, 0x36($sp) /* ACF5B0 80058410 866A0142 */ lh $t2, 0x142($s3) -/* ACF5B4 80058414 26B5D064 */ addiu $s5, %lo(D_8011D064) # addiu $s5, $s5, -0x2f9c +/* ACF5B4 80058414 26B5D064 */ addiu $s5, %lo(sCameraSettings) # addiu $s5, $s5, -0x2f9c /* ACF5B8 80058418 866E0144 */ lh $t6, 0x144($s3) /* ACF5BC 8005841C 000A58C0 */ sll $t3, $t2, 3 /* ACF5C0 80058420 02AB6021 */ addu $t4, $s5, $t3 diff --git a/asm/non_matchings/code/z_camera/func_80045128.s b/asm/non_matchings/code/z_camera/Camera_CopyModeValuesToPREG.s similarity index 95% rename from asm/non_matchings/code/z_camera/func_80045128.s rename to asm/non_matchings/code/z_camera/Camera_CopyModeValuesToPREG.s index 576376d833..c72dd68b71 100644 --- a/asm/non_matchings/code/z_camera/func_80045128.s +++ b/asm/non_matchings/code/z_camera/Camera_CopyModeValuesToPREG.s @@ -2,13 +2,13 @@ glabel D_80139094 .asciz "camera: res: stat (%d/%d/%d)\n" .balign 4 - + glabel D_801390B4 .asciz "camera: res: PREG(%02d) = %d\n" .balign 4 .text -glabel func_80045128 +glabel Camera_CopyModeValuesToPREG /* ABC2C8 80045128 27BDFFC8 */ addiu $sp, $sp, -0x38 /* ABC2CC 8004512C AFB20020 */ sw $s2, 0x20($sp) /* ABC2D0 80045130 3C128016 */ lui $s2, %hi(gGameInfo) # $s2, 0x8016 @@ -35,8 +35,8 @@ glabel func_80045128 /* ABC324 80045184 02003825 */ move $a3, $s0 .L80045188: /* ABC328 80045188 86B80142 */ lh $t8, 0x142($s5) -/* ABC32C 8004518C 3C168012 */ lui $s6, %hi(D_8011D064) # $s6, 0x8012 -/* ABC330 80045190 26D6D064 */ addiu $s6, %lo(D_8011D064) # addiu $s6, $s6, -0x2f9c +/* ABC32C 8004518C 3C168012 */ lui $s6, %hi(sCameraSettings) # $s6, 0x8012 +/* ABC330 80045190 26D6D064 */ addiu $s6, %lo(sCameraSettings) # addiu $s6, $s6, -0x2f9c /* ABC334 80045194 0018C8C0 */ sll $t9, $t8, 3 /* ABC338 80045198 02D94021 */ addu $t0, $s6, $t9 /* ABC33C 8004519C 8D090004 */ lw $t1, 4($t0) diff --git a/asm/non_matchings/code/z_camera/func_80045254.s b/asm/non_matchings/code/z_camera/Camera_CopyPREGToModeValues.s similarity index 94% rename from asm/non_matchings/code/z_camera/func_80045254.s rename to asm/non_matchings/code/z_camera/Camera_CopyPREGToModeValues.s index 3193491397..95052d2d26 100644 --- a/asm/non_matchings/code/z_camera/func_80045254.s +++ b/asm/non_matchings/code/z_camera/Camera_CopyPREGToModeValues.s @@ -4,7 +4,7 @@ glabel D_801390D4 .balign 4 .text -glabel func_80045254 +glabel Camera_CopyPREGToModeValues /* ABC3F4 80045254 27BDFFD0 */ addiu $sp, $sp, -0x30 /* ABC3F8 80045258 AFBF002C */ sw $ra, 0x2c($sp) /* ABC3FC 8004525C AFB50028 */ sw $s5, 0x28($sp) @@ -14,8 +14,8 @@ glabel func_80045254 /* ABC40C 8004526C AFB10018 */ sw $s1, 0x18($sp) /* ABC410 80045270 AFB00014 */ sw $s0, 0x14($sp) /* ABC414 80045274 848E0142 */ lh $t6, 0x142($a0) -/* ABC418 80045278 3C158012 */ lui $s5, %hi(D_8011D064) # $s5, 0x8012 -/* ABC41C 8004527C 26B5D064 */ addiu $s5, %lo(D_8011D064) # addiu $s5, $s5, -0x2f9c +/* ABC418 80045278 3C158012 */ lui $s5, %hi(sCameraSettings) # $s5, 0x8012 +/* ABC41C 8004527C 26B5D064 */ addiu $s5, %lo(sCameraSettings) # addiu $s5, $s5, -0x2f9c /* ABC420 80045280 000E78C0 */ sll $t7, $t6, 3 /* ABC424 80045284 84880144 */ lh $t0, 0x144($a0) /* ABC428 80045288 02AFC021 */ addu $t8, $s5, $t7 diff --git a/asm/non_matchings/code/z_camera/func_80051250.s b/asm/non_matchings/code/z_camera/Camera_Data4.s similarity index 98% rename from asm/non_matchings/code/z_camera/func_80051250.s rename to asm/non_matchings/code/z_camera/Camera_Data4.s index 6c1bc29ef7..f3a21af8d4 100644 --- a/asm/non_matchings/code/z_camera/func_80051250.s +++ b/asm/non_matchings/code/z_camera/Camera_Data4.s @@ -12,7 +12,7 @@ glabel D_8013A1C0 .float 182.04167 .text -glabel func_80051250 +glabel Camera_Data4 /* AC83F0 80051250 27BDFF78 */ addiu $sp, $sp, -0x88 /* AC83F4 80051254 AFB00014 */ sw $s0, 0x14($sp) /* AC83F8 80051258 00808025 */ move $s0, $a0 @@ -43,13 +43,13 @@ glabel func_80051250 /* AC8458 800512B8 460A4403 */ div.s $f16, $f8, $f10 /* AC845C 800512BC 860F0142 */ lh $t7, 0x142($s0) /* AC8460 800512C0 856C01F0 */ lh $t4, 0x1f0($t3) -/* AC8464 800512C4 3C198012 */ lui $t9, %hi(D_8011D068) +/* AC8464 800512C4 3C198012 */ lui $t9, %hi(sCameraSettings) /* AC8468 800512C8 000FC0C0 */ sll $t8, $t7, 3 /* AC846C 800512CC 448C2000 */ mtc1 $t4, $f4 /* AC8470 800512D0 86080144 */ lh $t0, 0x144($s0) /* AC8474 800512D4 0338C821 */ addu $t9, $t9, $t8 /* AC8478 800512D8 468021A0 */ cvt.s.w $f6, $f4 -/* AC847C 800512DC 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) +/* AC847C 800512DC 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) /* AC8480 800512E0 000848C0 */ sll $t1, $t0, 3 /* AC8484 800512E4 3C013F80 */ li $at, 0x3F800000 # 0.000000 /* AC8488 800512E8 03295021 */ addu $t2, $t9, $t1 @@ -128,7 +128,7 @@ glabel func_80051250 /* AC85A0 80051400 AFAC0028 */ sw $t4, 0x28($sp) /* AC85A4 80051404 10400003 */ beqz $v0, .L80051414 /* AC85A8 80051408 2611000C */ addiu $s1, $s0, 0xc -/* AC85AC 8005140C 0C011495 */ jal func_80045254 +/* AC85AC 8005140C 0C011495 */ jal Camera_CopyPREGToModeValues /* AC85B0 80051410 02002025 */ move $a0, $s0 .L80051414: /* AC85B4 80051414 860D0008 */ lh $t5, 8($s0) diff --git a/asm/non_matchings/code/z_camera/func_800544D0.s b/asm/non_matchings/code/z_camera/Camera_Demo1.s similarity index 97% rename from asm/non_matchings/code/z_camera/func_800544D0.s rename to asm/non_matchings/code/z_camera/Camera_Demo1.s index 2922f804ce..226a0cea1f 100644 --- a/asm/non_matchings/code/z_camera/func_800544D0.s +++ b/asm/non_matchings/code/z_camera/Camera_Demo1.s @@ -3,7 +3,7 @@ glabel D_80139614 .asciz "\x1B[1m%06u:\x1B[m camera: spline demo: start %s \n" .balign 4 -glabel D_80139644 +glabel D_80139644 .asciz "絶対" # actually japanese? .balign 4 @@ -24,7 +24,7 @@ glabel D_80139664 .balign 4 .text -glabel func_800544D0 +glabel Camera_Demo1 /* ACB670 800544D0 27BDFF68 */ addiu $sp, $sp, -0x98 /* ACB674 800544D4 AFBF0024 */ sw $ra, 0x24($sp) /* ACB678 800544D8 AFB00020 */ sw $s0, 0x20($sp) @@ -49,11 +49,11 @@ glabel func_800544D0 .L80054524: /* ACB6C4 80054524 86090142 */ lh $t1, 0x142($s0) .L80054528: -/* ACB6C8 80054528 3C0B8012 */ lui $t3, %hi(D_8011D068) +/* ACB6C8 80054528 3C0B8012 */ lui $t3, %hi(sCameraSettings) /* ACB6CC 8005452C 860C0144 */ lh $t4, 0x144($s0) /* ACB6D0 80054530 000950C0 */ sll $t2, $t1, 3 /* ACB6D4 80054534 016A5821 */ addu $t3, $t3, $t2 -/* ACB6D8 80054538 8D6BD068 */ lw $t3, %lo(D_8011D068)($t3) +/* ACB6D8 80054538 8D6BD068 */ lw $t3, %lo(sCameraSettings+4)($t3) /* ACB6DC 8005453C 000C68C0 */ sll $t5, $t4, 3 /* ACB6E0 80054540 016D7021 */ addu $t6, $t3, $t5 /* ACB6E4 80054544 8DC20004 */ lw $v0, 4($t6) @@ -144,14 +144,14 @@ glabel func_800544D0 /* ACB81C 8005467C 26050074 */ addiu $a1, $s0, 0x74 /* ACB820 80054680 87290000 */ lh $t1, ($t9) /* ACB824 80054684 1120001C */ beqz $t1, .L800546F8 -/* ACB828 80054688 00000000 */ nop +/* ACB828 80054688 00000000 */ nop /* ACB82C 8005468C 8E050090 */ lw $a1, 0x90($s0) /* ACB830 80054690 3C048014 */ lui $a0, %hi(D_80139664) /* ACB834 80054694 10A00012 */ beqz $a1, .L800546E0 -/* ACB838 80054698 00000000 */ nop +/* ACB838 80054698 00000000 */ nop /* ACB83C 8005469C 8CAA0130 */ lw $t2, 0x130($a1) /* ACB840 800546A0 1140000F */ beqz $t2, .L800546E0 -/* ACB844 800546A4 00000000 */ nop +/* ACB844 800546A4 00000000 */ nop /* ACB848 800546A8 0C00BBC5 */ jal func_8002EF14 /* ACB84C 800546AC 27A40068 */ addiu $a0, $sp, 0x68 /* ACB850 800546B0 26060074 */ addiu $a2, $s0, 0x74 diff --git a/asm/non_matchings/code/z_camera/func_80054794.s b/asm/non_matchings/code/z_camera/Camera_Demo3.s similarity index 99% rename from asm/non_matchings/code/z_camera/func_80054794.s rename to asm/non_matchings/code/z_camera/Camera_Demo3.s index be22b0303c..36fc161207 100644 --- a/asm/non_matchings/code/z_camera/func_80054794.s +++ b/asm/non_matchings/code/z_camera/Camera_Demo3.s @@ -60,7 +60,7 @@ glabel D_8013A354 .float 0.1 .text -glabel func_80054794 +glabel Camera_Demo3 /* ACB934 80054794 27BDFF58 */ addiu $sp, $sp, -0xa8 /* ACB938 80054798 AFB10018 */ sw $s1, 0x18($sp) /* ACB93C 8005479C 00808825 */ move $s1, $a0 @@ -86,11 +86,11 @@ glabel func_80054794 /* ACB98C 800547EC 00000000 */ nop .L800547F0: /* ACB990 800547F0 86390142 */ lh $t9, 0x142($s1) -/* ACB994 800547F4 3C098012 */ lui $t1, %hi(D_8011D068) +/* ACB994 800547F4 3C098012 */ lui $t1, %hi(sCameraSettings) /* ACB998 800547F8 862A0144 */ lh $t2, 0x144($s1) /* ACB99C 800547FC 001940C0 */ sll $t0, $t9, 3 /* ACB9A0 80054800 01284821 */ addu $t1, $t1, $t0 -/* ACB9A4 80054804 8D29D068 */ lw $t1, %lo(D_8011D068)($t1) +/* ACB9A4 80054804 8D29D068 */ lw $t1, %lo(sCameraSettings+4)($t1) /* ACB9A8 80054808 000A58C0 */ sll $t3, $t2, 3 /* ACB9AC 8005480C 3C188016 */ lui $t8, %hi(gGameInfo) # $t8, 0x8016 /* ACB9B0 80054810 012B6021 */ addu $t4, $t1, $t3 @@ -113,7 +113,7 @@ glabel func_80054794 .L80054854: /* ACB9F4 80054854 10600004 */ beqz $v1, .L80054868 /* ACB9F8 80054858 02202025 */ move $a0, $s1 -/* ACB9FC 8005485C 0C011495 */ jal func_80045254 +/* ACB9FC 8005485C 0C011495 */ jal Camera_CopyPREGToModeValues /* ACBA00 80054860 E7B0004C */ swc1 $f16, 0x4c($sp) /* ACBA04 80054864 C7B0004C */ lwc1 $f16, 0x4c($sp) .L80054868: @@ -673,7 +673,7 @@ glabel L8005508C /* ACC24C 800550AC 3149FFF7 */ andi $t1, $t2, 0xfff7 /* ACC250 800550B0 04A10005 */ bgez $a1, .L800550C8 /* ACC254 800550B4 A629014C */ sh $t1, 0x14c($s1) -/* ACC258 800550B8 0C016952 */ jal func_8005A548 +/* ACC258 800550B8 0C016952 */ jal Camera_ChangeSetting /* ACC25C 800550BC 86250154 */ lh $a1, 0x154($s1) /* ACC260 800550C0 10000005 */ b .L800550D8 /* ACC264 800550C4 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/func_8005529C.s b/asm/non_matchings/code/z_camera/Camera_Demo5.s similarity index 96% rename from asm/non_matchings/code/z_camera/func_8005529C.s rename to asm/non_matchings/code/z_camera/Camera_Demo5.s index e3ecaed983..f96d4a1a63 100644 --- a/asm/non_matchings/code/z_camera/func_8005529C.s +++ b/asm/non_matchings/code/z_camera/Camera_Demo5.s @@ -24,7 +24,7 @@ glabel D_8013A368 .float 0.005 .text -glabel func_8005529C +glabel Camera_Demo5 /* ACC43C 8005529C 27BDFF68 */ addiu $sp, $sp, -0x98 /* ACC440 800552A0 AFB00018 */ sw $s0, 0x18($sp) /* ACC444 800552A4 00808025 */ move $s0, $a0 @@ -39,11 +39,11 @@ glabel func_8005529C /* ACC468 800552C8 AFAE004C */ sw $t6, 0x4c($sp) /* ACC46C 800552CC 8E0500A8 */ lw $a1, 0xa8($s0) /* ACC470 800552D0 10A00005 */ beqz $a1, .L800552E8 -/* ACC474 800552D4 00000000 */ nop +/* ACC474 800552D4 00000000 */ nop /* ACC478 800552D8 8CB80130 */ lw $t8, 0x130($a1) /* ACC47C 800552DC 260400AC */ addiu $a0, $s0, 0xac /* ACC480 800552E0 17000008 */ bnez $t8, .L80055304 -/* ACC484 800552E4 00000000 */ nop +/* ACC484 800552E4 00000000 */ nop .L800552E8: /* ACC488 800552E8 14A00003 */ bnez $a1, .L800552F8 /* ACC48C 800552EC 3C048014 */ lui $a0, %hi(D_80139690) # $a0, 0x8014 @@ -89,11 +89,11 @@ glabel func_8005529C /* ACC524 80055384 14610040 */ bne $v1, $at, .L80055488 /* ACC528 80055388 3C0141F0 */ li $at, 0x41F00000 # 0.000000 /* ACC52C 8005538C 44811000 */ mtc1 $at, $f2 -/* ACC530 80055390 00000000 */ nop +/* ACC530 80055390 00000000 */ nop /* ACC534 80055394 4604103C */ c.lt.s $f2, $f4 -/* ACC538 80055398 00000000 */ nop +/* ACC538 80055398 00000000 */ nop /* ACC53C 8005539C 45000021 */ bc1f .L80055424 -/* ACC540 800553A0 00000000 */ nop +/* ACC540 800553A0 00000000 */ nop /* ACC544 800553A4 860D0160 */ lh $t5, 0x160($s0) /* ACC548 800553A8 3C018012 */ lui $at, %hi(D_8011D6D8) # $at, 0x8012 /* ACC54C 800553AC 25AEFFFF */ addiu $t6, $t5, -1 @@ -129,7 +129,7 @@ glabel func_8005529C /* ACC5C0 80055420 A60B0160 */ sh $t3, 0x160($s0) .L80055424: /* ACC5C4 80055424 0C03F66B */ jal Math_Rand_ZeroOne -/* ACC5C8 80055428 00000000 */ nop +/* ACC5C8 80055428 00000000 */ nop /* ACC5CC 8005542C 3C014120 */ li $at, 0x41200000 # 0.000000 /* ACC5D0 80055430 44819000 */ mtc1 $at, $f18 /* ACC5D4 80055434 3C028012 */ lui $v0, %hi(D_8011D724) @@ -217,11 +217,11 @@ glabel func_8005529C /* ACC704 80055564 C7B20080 */ lwc1 $f18, 0x80($sp) /* ACC708 80055568 3C01442F */ li $at, 0x442F0000 # 0.000000 /* ACC70C 8005556C 4610603C */ c.lt.s $f12, $f16 -/* ACC710 80055570 00000000 */ nop +/* ACC710 80055570 00000000 */ nop /* ACC714 80055574 45020017 */ bc1fl .L800555D4 /* ACC718 80055578 44812000 */ mtc1 $at, $f4 /* ACC71C 8005557C 4602903C */ c.lt.s $f18, $f2 -/* ACC720 80055580 00000000 */ nop +/* ACC720 80055580 00000000 */ nop /* ACC724 80055584 45020013 */ bc1fl .L800555D4 /* ACC728 80055588 44812000 */ mtc1 $at, $f4 /* ACC72C 8005558C 860E0160 */ lh $t6, 0x160($s0) @@ -246,7 +246,7 @@ glabel func_8005529C .L800555D4: /* ACC774 800555D4 87A5004A */ lh $a1, 0x4a($sp) /* ACC778 800555D8 4604603C */ c.lt.s $f12, $f4 -/* ACC77C 800555DC 00000000 */ nop +/* ACC77C 800555DC 00000000 */ nop /* ACC780 800555E0 45020064 */ bc1fl .L80055774 /* ACC784 800555E4 2401000A */ li $at, 10 /* ACC788 800555E8 04A00003 */ bltz $a1, .L800555F8 @@ -269,9 +269,9 @@ glabel func_8005529C /* ACC7C8 80055628 10200016 */ beqz $at, .L80055684 /* ACC7CC 8005562C C7A60080 */ lwc1 $f6, 0x80($sp) /* ACC7D0 80055630 4606103C */ c.lt.s $f2, $f6 -/* ACC7D4 80055634 00000000 */ nop +/* ACC7D4 80055634 00000000 */ nop /* ACC7D8 80055638 45000012 */ bc1f .L80055684 -/* ACC7DC 8005563C 00000000 */ nop +/* ACC7DC 8005563C 00000000 */ nop /* ACC7E0 80055640 860C0160 */ lh $t4, 0x160($s0) /* ACC7E4 80055644 3C028012 */ lui $v0, %hi(D_8011D88C) # $v0, 0x8012 /* ACC7E8 80055648 2442D88C */ addiu $v0, %lo(D_8011D88C) # addiu $v0, $v0, -0x2774 @@ -334,7 +334,7 @@ glabel func_8005529C /* ACC8C0 80055720 46062202 */ mul.s $f8, $f4, $f6 /* ACC8C4 80055724 4600428D */ trunc.w.s $f10, $f8 /* ACC8C8 80055728 440B5000 */ mfc1 $t3, $f10 -/* ACC8CC 8005572C 00000000 */ nop +/* ACC8CC 8005572C 00000000 */ nop /* ACC8D0 80055730 256C0008 */ addiu $t4, $t3, 8 /* ACC8D4 80055734 A44C002C */ sh $t4, 0x2c($v0) /* ACC8D8 80055738 860E0162 */ lh $t6, 0x162($s0) @@ -403,7 +403,7 @@ glabel func_8005529C /* ACC9C0 80055820 87AA008E */ lh $t2, 0x8e($sp) /* ACC9C4 80055824 44800000 */ mtc1 $zero, $f0 .L80055828: -/* ACC9C8 80055828 00000000 */ nop +/* ACC9C8 80055828 00000000 */ nop /* ACC9CC 8005582C 87AA008E */ lh $t2, 0x8e($sp) .L80055830: /* ACC9D0 80055830 E4E0003C */ swc1 $f0, 0x3c($a3) @@ -416,11 +416,11 @@ glabel func_8005529C /* ACC9EC 8005584C 3C0141A0 */ li $at, 0x41A00000 # 0.000000 /* ACC9F0 80055850 44816000 */ mtc1 $at, $f12 /* ACC9F4 80055854 10000004 */ b .L80055868 -/* ACC9F8 80055858 00000000 */ nop +/* ACC9F8 80055858 00000000 */ nop .L8005585C: /* ACC9FC 8005585C 3C01C1A0 */ li $at, 0xC1A00000 # 0.000000 /* ACCA00 80055860 44816000 */ mtc1 $at, $f12 -/* ACCA04 80055864 00000000 */ nop +/* ACCA04 80055864 00000000 */ nop .L80055868: /* ACCA08 80055868 0C03F66B */ jal Math_Rand_ZeroOne /* ACCA0C 8005586C E7AC0030 */ swc1 $f12, 0x30($sp) @@ -443,7 +443,7 @@ glabel func_8005529C /* ACCA50 800558B0 46080282 */ mul.s $f10, $f0, $f8 /* ACCA54 800558B4 4600540D */ trunc.w.s $f16, $f10 /* ACCA58 800558B8 44028000 */ mfc1 $v0, $f16 -/* ACCA5C 800558BC 00000000 */ nop +/* ACCA5C 800558BC 00000000 */ nop /* ACCA60 800558C0 A4E2002E */ sh $v0, 0x2e($a3) /* ACCA64 800558C4 A4E20006 */ sh $v0, 6($a3) /* ACCA68 800558C8 0C00BBB9 */ jal func_8002EEE4 @@ -489,7 +489,7 @@ glabel func_8005529C /* ACCB04 80055964 46083402 */ mul.s $f16, $f6, $f8 /* ACCB08 80055968 4600828D */ trunc.w.s $f10, $f16 /* ACCB0C 8005596C 440A5000 */ mfc1 $t2, $f10 -/* ACCB10 80055970 00000000 */ nop +/* ACCB10 80055970 00000000 */ nop /* ACCB14 80055974 254B0006 */ addiu $t3, $t2, 6 /* ACCB18 80055978 A4EB0054 */ sh $t3, 0x54($a3) .L8005597C: @@ -514,7 +514,7 @@ glabel func_8005529C /* ACCB5C 800559BC 44812000 */ mtc1 $at, $f4 /* ACCB60 800559C0 3C013E80 */ lui $at, 0x3e80 /* ACCB64 800559C4 4604003C */ c.lt.s $f0, $f4 -/* ACCB68 800559C8 00000000 */ nop +/* ACCB68 800559C8 00000000 */ nop /* ACCB6C 800559CC 45020008 */ bc1fl .L800559F0 /* ACCB70 800559D0 3C0143C8 */ li $at, 0x43C80000 # 0.000000 /* ACCB74 800559D4 44819000 */ mtc1 $at, $f18 @@ -526,13 +526,13 @@ glabel func_8005529C /* ACCB8C 800559EC 3C0143C8 */ li $at, 0x43C80000 # 0.000000 .L800559F0: /* ACCB90 800559F0 44814000 */ mtc1 $at, $f8 -/* ACCB94 800559F4 00000000 */ nop +/* ACCB94 800559F4 00000000 */ nop /* ACCB98 800559F8 4608003C */ c.lt.s $f0, $f8 -/* ACCB9C 800559FC 00000000 */ nop +/* ACCB9C 800559FC 00000000 */ nop /* ACCBA0 80055A00 45000009 */ bc1f .L80055A28 -/* ACCBA4 80055A04 00000000 */ nop +/* ACCBA4 80055A04 00000000 */ nop /* ACCBA8 80055A08 0C03F66B */ jal Math_Rand_ZeroOne -/* ACCBAC 80055A0C 00000000 */ nop +/* ACCBAC 80055A0C 00000000 */ nop /* ACCBB0 80055A10 3C0141C8 */ li $at, 0x41C80000 # 0.000000 /* ACCBB4 80055A14 44818000 */ mtc1 $at, $f16 /* ACCBB8 80055A18 3C038012 */ lui $v1, %hi(D_8011D9F4) # $v1, 0x8012 @@ -568,7 +568,7 @@ glabel func_8005529C /* ACCC28 80055A88 46122182 */ mul.s $f6, $f4, $f18 /* ACCC2C 80055A8C 4600320D */ trunc.w.s $f8, $f6 /* ACCC30 80055A90 44084000 */ mfc1 $t0, $f8 -/* ACCC34 80055A94 00000000 */ nop +/* ACCC34 80055A94 00000000 */ nop /* ACCC38 80055A98 25190008 */ addiu $t9, $t0, 8 /* ACCC3C 80055A9C A479002C */ sh $t9, 0x2c($v1) .L80055AA0: @@ -613,7 +613,7 @@ glabel func_8005529C /* ACCCCC 80055B2C 10200003 */ beqz $at, .L80055B3C /* ACCCD0 80055B30 2861FFCE */ slti $at, $v1, -0x32 /* ACCCD4 80055B34 10200005 */ beqz $at, .L80055B4C -/* ACCCD8 80055B38 00000000 */ nop +/* ACCCD8 80055B38 00000000 */ nop .L80055B3C: /* ACCCDC 80055B3C 0C01E221 */ jal func_80078884 /* ACCCE0 80055B40 9604012A */ lhu $a0, 0x12a($s0) @@ -651,7 +651,7 @@ glabel func_8005529C /* ACCD58 80055BB8 3C0B8012 */ lui $t3, %hi(D_8011D3F4) # $t3, 0x8012 /* ACCD5C 80055BBC 24060001 */ li $a2, 1 /* ACCD60 80055BC0 1521001B */ bne $t1, $at, .L80055C30 -/* ACCD64 80055BC4 00000000 */ nop +/* ACCD64 80055BC4 00000000 */ nop /* ACCD68 80055BC8 8E04008C */ lw $a0, 0x8c($s0) /* ACCD6C 80055BCC 8C4C067C */ lw $t4, 0x67c($v0) /* ACCD70 80055BD0 8D6BD3F4 */ lw $t3, %lo(D_8011D3F4)($t3) @@ -671,7 +671,7 @@ glabel func_8005529C .L80055C04: /* ACCDA4 80055C04 28410BB9 */ slti $at, $v0, 0xbb9 /* ACCDA8 80055C08 14200005 */ bnez $at, .L80055C20 -/* ACCDAC 80055C0C 00000000 */ nop +/* ACCDAC 80055C0C 00000000 */ nop /* ACCDB0 80055C10 0C00B7D5 */ jal func_8002DF54 /* ACCDB4 80055C14 2406000C */ li $a2, 12 /* ACCDB8 80055C18 10000008 */ b .L80055C3C @@ -692,9 +692,9 @@ glabel func_8005529C /* ACCDE4 80055C44 8DCF009C */ lw $t7, 0x9c($t6) /* ACCDE8 80055C48 2405003C */ li $a1, 60 /* ACCDEC 80055C4C 24060005 */ li $a2, 5 -/* ACCDF0 80055C50 0C016952 */ jal func_8005A548 +/* ACCDF0 80055C50 0C016952 */ jal Camera_ChangeSetting /* ACCDF4 80055C54 AC2FD3F4 */ sw $t7, %lo(D_8011D3F4)($at) -/* ACCDF8 80055C58 0C014B83 */ jal func_80052E0C +/* ACCDF8 80055C58 0C014B83 */ jal Camera_Unique9 /* ACCDFC 80055C5C 02002025 */ move $a0, $s0 /* ACCE00 80055C60 24020001 */ li $v0, 1 .L80055C64: @@ -702,4 +702,4 @@ glabel func_8005529C /* ACCE08 80055C68 8FB00018 */ lw $s0, 0x18($sp) /* ACCE0C 80055C6C 27BD0098 */ addiu $sp, $sp, 0x98 /* ACCE10 80055C70 03E00008 */ jr $ra -/* ACCE14 80055C74 00000000 */ nop +/* ACCE14 80055C74 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/func_80055C78.s b/asm/non_matchings/code/z_camera/Camera_Demo6.s similarity index 97% rename from asm/non_matchings/code/z_camera/func_80055C78.s rename to asm/non_matchings/code/z_camera/Camera_Demo6.s index b8e29b286f..d154ed92df 100644 --- a/asm/non_matchings/code/z_camera/func_80055C78.s +++ b/asm/non_matchings/code/z_camera/Camera_Demo6.s @@ -3,7 +3,7 @@ glabel D_8013A36C .float 0.1 .text -glabel func_80055C78 +glabel Camera_Demo6 /* ACCE18 80055C78 27BDFF88 */ addiu $sp, $sp, -0x78 /* ACCE1C 80055C7C AFB00020 */ sw $s0, 0x20($sp) /* ACCE20 80055C80 00808025 */ move $s0, $a0 @@ -31,15 +31,15 @@ glabel func_80055C78 /* ACCE78 80055CD8 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) /* ACCE7C 80055CDC 85220314 */ lh $v0, 0x314($t1) /* ACCE80 80055CE0 1040000F */ beqz $v0, .L80055D20 -/* ACCE84 80055CE4 00000000 */ nop +/* ACCE84 80055CE4 00000000 */ nop .L80055CE8: /* ACCE88 80055CE8 860A0142 */ lh $t2, 0x142($s0) .L80055CEC: -/* ACCE8C 80055CEC 3C0C8012 */ lui $t4, %hi(D_8011D068) +/* ACCE8C 80055CEC 3C0C8012 */ lui $t4, %hi(sCameraSettings) /* ACCE90 80055CF0 860D0144 */ lh $t5, 0x144($s0) /* ACCE94 80055CF4 000A58C0 */ sll $t3, $t2, 3 /* ACCE98 80055CF8 018B6021 */ addu $t4, $t4, $t3 -/* ACCE9C 80055CFC 8D8CD068 */ lw $t4, %lo(D_8011D068)($t4) +/* ACCE9C 80055CFC 8D8CD068 */ lw $t4, %lo(sCameraSettings+4)($t4) /* ACCEA0 80055D00 000D70C0 */ sll $t6, $t5, 3 /* ACCEA4 80055D04 3C198016 */ lui $t9, %hi(gGameInfo) # $t9, 0x8016 /* ACCEA8 80055D08 018E7821 */ addu $t7, $t4, $t6 @@ -51,7 +51,7 @@ glabel func_80055C78 .L80055D20: /* ACCEC0 80055D20 50400004 */ beql $v0, $zero, .L80055D34 /* ACCEC4 80055D24 8603015E */ lh $v1, 0x15e($s0) -/* ACCEC8 80055D28 0C011495 */ jal func_80045254 +/* ACCEC8 80055D28 0C011495 */ jal Camera_CopyPREGToModeValues /* ACCECC 80055D2C 02002025 */ move $a0, $s0 /* ACCED0 80055D30 8603015E */ lh $v1, 0x15e($s0) .L80055D34: @@ -201,4 +201,4 @@ glabel func_80055C78 /* ACD0F4 80055F54 8FB00020 */ lw $s0, 0x20($sp) /* ACD0F8 80055F58 27BD0078 */ addiu $sp, $sp, 0x78 /* ACD0FC 80055F5C 03E00008 */ jr $ra -/* ACD100 80055F60 00000000 */ nop +/* ACD100 80055F60 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/func_80055FB8.s b/asm/non_matchings/code/z_camera/Camera_Demo9.s similarity index 98% rename from asm/non_matchings/code/z_camera/func_80055FB8.s rename to asm/non_matchings/code/z_camera/Camera_Demo9.s index 64fb472f44..fd6ab76742 100644 --- a/asm/non_matchings/code/z_camera/func_80055FB8.s +++ b/asm/non_matchings/code/z_camera/Camera_Demo9.s @@ -10,7 +10,7 @@ glabel D_8013A384 .float 0.1 .text -glabel func_80055FB8 +glabel Camera_Demo9 /* ACD158 80055FB8 27BDFF48 */ addiu $sp, $sp, -0xb8 /* ACD15C 80055FBC AFB00020 */ sw $s0, 0x20($sp) /* ACD160 80055FC0 00808025 */ move $s0, $a0 @@ -36,11 +36,11 @@ glabel func_80055FB8 .L80056010: /* ACD1B0 80056010 86180142 */ lh $t8, 0x142($s0) .L80056014: -/* ACD1B4 80056014 3C098012 */ lui $t1, %hi(D_8011D068) +/* ACD1B4 80056014 3C098012 */ lui $t1, %hi(sCameraSettings) /* ACD1B8 80056018 860A0144 */ lh $t2, 0x144($s0) /* ACD1BC 8005601C 0018C8C0 */ sll $t9, $t8, 3 /* ACD1C0 80056020 01394821 */ addu $t1, $t1, $t9 -/* ACD1C4 80056024 8D29D068 */ lw $t1, %lo(D_8011D068)($t1) +/* ACD1C4 80056024 8D29D068 */ lw $t1, %lo(sCameraSettings+4)($t1) /* ACD1C8 80056028 000A58C0 */ sll $t3, $t2, 3 /* ACD1CC 8005602C 3C0E8016 */ lui $t6, %hi(gGameInfo) # $t6, 0x8016 /* ACD1D0 80056030 012B6021 */ addu $t4, $t1, $t3 @@ -54,7 +54,7 @@ glabel func_80055FB8 /* ACD1EC 8005604C 2603000C */ addiu $v1, $s0, 0xc /* ACD1F0 80056050 02002025 */ move $a0, $s0 /* ACD1F4 80056054 AFA30034 */ sw $v1, 0x34($sp) -/* ACD1F8 80056058 0C011495 */ jal func_80045254 +/* ACD1F8 80056058 0C011495 */ jal Camera_CopyPREGToModeValues /* ACD1FC 8005605C AFA6006C */ sw $a2, 0x6c($sp) /* ACD200 80056060 8FA30034 */ lw $v1, 0x34($sp) /* ACD204 80056064 8FA6006C */ lw $a2, 0x6c($sp) diff --git a/asm/non_matchings/code/z_camera/func_8004F6A4.s b/asm/non_matchings/code/z_camera/Camera_Fixed1.s similarity index 98% rename from asm/non_matchings/code/z_camera/func_8004F6A4.s rename to asm/non_matchings/code/z_camera/Camera_Fixed1.s index b03de9b520..ac38580ae0 100644 --- a/asm/non_matchings/code/z_camera/func_8004F6A4.s +++ b/asm/non_matchings/code/z_camera/Camera_Fixed1.s @@ -15,7 +15,7 @@ glabel D_8013A17C .float 0.2 .text -glabel func_8004F6A4 +glabel Camera_Fixed1 /* AC6844 8004F6A4 27BDFF80 */ addiu $sp, $sp, -0x80 /* AC6848 8004F6A8 AFB0001C */ sw $s0, 0x1c($sp) /* AC684C 8004F6AC 00808025 */ move $s0, $a0 @@ -37,11 +37,11 @@ glabel func_8004F6A4 /* AC688C 8004F6EC 00000000 */ nop .L8004F6F0: /* AC6890 8004F6F0 860F0142 */ lh $t7, 0x142($s0) -/* AC6894 8004F6F4 3C198012 */ lui $t9, %hi(D_8011D068) +/* AC6894 8004F6F4 3C198012 */ lui $t9, %hi(sCameraSettings) /* AC6898 8004F6F8 86080144 */ lh $t0, 0x144($s0) /* AC689C 8004F6FC 000FC0C0 */ sll $t8, $t7, 3 /* AC68A0 8004F700 0338C821 */ addu $t9, $t9, $t8 -/* AC68A4 8004F704 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) +/* AC68A4 8004F704 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) /* AC68A8 8004F708 000848C0 */ sll $t1, $t0, 3 /* AC68AC 8004F70C 02002025 */ move $a0, $s0 /* AC68B0 8004F710 03295021 */ addu $t2, $t9, $t1 @@ -95,7 +95,7 @@ glabel func_8004F6A4 .L8004F7D0: /* AC6970 8004F7D0 10800003 */ beqz $a0, .L8004F7E0 /* AC6974 8004F7D4 26110010 */ addiu $s1, $s0, 0x10 -/* AC6978 8004F7D8 0C011495 */ jal func_80045254 +/* AC6978 8004F7D8 0C011495 */ jal Camera_CopyPREGToModeValues /* AC697C 8004F7DC 02002025 */ move $a0, $s0 .L8004F7E0: /* AC6980 8004F7E0 86220014 */ lh $v0, 0x14($s1) diff --git a/asm/non_matchings/code/z_camera/func_8004F9D8.s b/asm/non_matchings/code/z_camera/Camera_Fixed2.s similarity index 98% rename from asm/non_matchings/code/z_camera/func_8004F9D8.s rename to asm/non_matchings/code/z_camera/Camera_Fixed2.s index fa1a2c1433..74b5b4a065 100644 --- a/asm/non_matchings/code/z_camera/func_8004F9D8.s +++ b/asm/non_matchings/code/z_camera/Camera_Fixed2.s @@ -12,7 +12,7 @@ glabel D_8013A18C .float 0.01 .text -glabel func_8004F9D8 +glabel Camera_Fixed2 /* AC6B78 8004F9D8 27BDFF70 */ addiu $sp, $sp, -0x90 /* AC6B7C 8004F9DC AFB0001C */ sw $s0, 0x1c($sp) /* AC6B80 8004F9E0 00808025 */ move $s0, $a0 @@ -44,13 +44,13 @@ glabel func_8004F9D8 /* AC6BE4 8004FA44 86180142 */ lh $t8, 0x142($s0) /* AC6BE8 8004FA48 46008483 */ div.s $f18, $f16, $f0 /* AC6BEC 8004FA4C 858D01F0 */ lh $t5, 0x1f0($t4) -/* AC6BF0 8004FA50 3C088012 */ lui $t0, %hi(D_8011D068) +/* AC6BF0 8004FA50 3C088012 */ lui $t0, %hi(sCameraSettings) /* AC6BF4 8004FA54 0018C8C0 */ sll $t9, $t8, 3 /* AC6BF8 8004FA58 448D2000 */ mtc1 $t5, $f4 /* AC6BFC 8004FA5C 86090144 */ lh $t1, 0x144($s0) /* AC6C00 8004FA60 01194021 */ addu $t0, $t0, $t9 /* AC6C04 8004FA64 468021A0 */ cvt.s.w $f6, $f4 -/* AC6C08 8004FA68 8D08D068 */ lw $t0, %lo(D_8011D068)($t0) +/* AC6C08 8004FA68 8D08D068 */ lw $t0, %lo(sCameraSettings+4)($t0) /* AC6C0C 8004FA6C 000950C0 */ sll $t2, $t1, 3 /* AC6C10 8004FA70 3C0142C8 */ li $at, 0x42C80000 # 0.000000 /* AC6C14 8004FA74 010A5821 */ addu $t3, $t0, $t2 @@ -136,7 +136,7 @@ glabel func_8004F9D8 /* AC6D44 8004FBA4 26110014 */ addiu $s1, $s0, 0x14 /* AC6D48 8004FBA8 53000004 */ beql $t8, $zero, .L8004FBBC /* AC6D4C 8004FBAC 44801000 */ mtc1 $zero, $f2 -/* AC6D50 8004FBB0 0C011495 */ jal func_80045254 +/* AC6D50 8004FBB0 0C011495 */ jal Camera_CopyPREGToModeValues /* AC6D54 8004FBB4 02002025 */ move $a0, $s0 /* AC6D58 8004FBB8 44801000 */ mtc1 $zero, $f2 .L8004FBBC: diff --git a/asm/non_matchings/code/z_camera/func_8004FDE4.s b/asm/non_matchings/code/z_camera/Camera_Fixed3.s similarity index 97% rename from asm/non_matchings/code/z_camera/func_8004FDE4.s rename to asm/non_matchings/code/z_camera/Camera_Fixed3.s index cdafc4651c..b813c67432 100644 --- a/asm/non_matchings/code/z_camera/func_8004FDE4.s +++ b/asm/non_matchings/code/z_camera/Camera_Fixed3.s @@ -8,7 +8,7 @@ glabel D_8013A190 .float 0.01 .text -glabel func_8004FDE4 +glabel Camera_Fixed3 /* AC6F84 8004FDE4 27BDFF98 */ addiu $sp, $sp, -0x68 /* AC6F88 8004FDE8 AFBF001C */ sw $ra, 0x1c($sp) /* AC6F8C 8004FDEC AFB00018 */ sw $s0, 0x18($sp) @@ -37,11 +37,11 @@ glabel func_8004FDE4 .L8004FE48: /* AC6FE8 8004FE48 86180142 */ lh $t8, 0x142($s0) .L8004FE4C: -/* AC6FEC 8004FE4C 3C088012 */ lui $t0, %hi(D_8011D068) +/* AC6FEC 8004FE4C 3C088012 */ lui $t0, %hi(sCameraSettings) /* AC6FF0 8004FE50 86090144 */ lh $t1, 0x144($s0) /* AC6FF4 8004FE54 0018C8C0 */ sll $t9, $t8, 3 /* AC6FF8 8004FE58 01194021 */ addu $t0, $t0, $t9 -/* AC6FFC 8004FE5C 8D08D068 */ lw $t0, %lo(D_8011D068)($t0) +/* AC6FFC 8004FE5C 8D08D068 */ lw $t0, %lo(sCameraSettings+4)($t0) /* AC7000 8004FE60 000950C0 */ sll $t2, $t1, 3 /* AC7004 8004FE64 26060074 */ addiu $a2, $s0, 0x74 /* AC7008 8004FE68 010A5821 */ addu $t3, $t0, $t2 @@ -97,7 +97,7 @@ glabel func_8004FDE4 /* AC70C8 8004FF28 51A00007 */ beql $t5, $zero, .L8004FF48 /* AC70CC 8004FF2C 860E015E */ lh $t6, 0x15e($s0) /* AC70D0 8004FF30 AFA30028 */ sw $v1, 0x28($sp) -/* AC70D4 8004FF34 0C011495 */ jal func_80045254 +/* AC70D4 8004FF34 0C011495 */ jal Camera_CopyPREGToModeValues /* AC70D8 8004FF38 AFA70050 */ sw $a3, 0x50($sp) /* AC70DC 8004FF3C 8FA30028 */ lw $v1, 0x28($sp) /* AC70E0 8004FF40 8FA70050 */ lw $a3, 0x50($sp) diff --git a/asm/non_matchings/code/z_camera/func_80050068.s b/asm/non_matchings/code/z_camera/Camera_Fixed4.s similarity index 98% rename from asm/non_matchings/code/z_camera/func_80050068.s rename to asm/non_matchings/code/z_camera/Camera_Fixed4.s index 62c037b028..fc62da3653 100644 --- a/asm/non_matchings/code/z_camera/func_80050068.s +++ b/asm/non_matchings/code/z_camera/Camera_Fixed4.s @@ -6,7 +6,7 @@ glabel D_8013A198 .float 0.1 .text -glabel func_80050068 +glabel Camera_Fixed4 /* AC7208 80050068 27BDFF58 */ addiu $sp, $sp, -0xa8 /* AC720C 8005006C AFB00020 */ sw $s0, 0x20($sp) /* AC7210 80050070 00808025 */ move $s0, $a0 @@ -39,13 +39,13 @@ glabel func_80050068 /* AC7278 800500D8 860F0142 */ lh $t7, 0x142($s0) /* AC727C 800500DC 468021A0 */ cvt.s.w $f6, $f4 /* AC7280 800500E0 44812000 */ mtc1 $at, $f4 -/* AC7284 800500E4 3C198012 */ lui $t9, %hi(D_8011D068) +/* AC7284 800500E4 3C198012 */ lui $t9, %hi(sCameraSettings) /* AC7288 800500E8 000FC0C0 */ sll $t8, $t7, 3 /* AC728C 800500EC 86080144 */ lh $t0, 0x144($s0) /* AC7290 800500F0 0338C821 */ addu $t9, $t9, $t8 /* AC7294 800500F4 460C3082 */ mul.s $f2, $f6, $f12 /* AC7298 800500F8 46002183 */ div.s $f6, $f4, $f0 -/* AC729C 800500FC 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) +/* AC729C 800500FC 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) /* AC72A0 80050100 000848C0 */ sll $t1, $t0, 3 /* AC72A4 80050104 02002025 */ move $a0, $s0 /* AC72A8 80050108 03295021 */ addu $t2, $t9, $t1 @@ -106,7 +106,7 @@ glabel func_80050068 /* AC737C 800501DC AFAC0044 */ sw $t4, 0x44($sp) /* AC7380 800501E0 10600003 */ beqz $v1, .L800501F0 /* AC7384 800501E4 26120014 */ addiu $s2, $s0, 0x14 -/* AC7388 800501E8 0C011495 */ jal func_80045254 +/* AC7388 800501E8 0C011495 */ jal Camera_CopyPREGToModeValues /* AC738C 800501EC 02002025 */ move $a0, $s0 .L800501F0: /* AC7390 800501F0 860D0010 */ lh $t5, 0x10($s0) diff --git a/asm/non_matchings/code/z_camera/func_80049A48.s b/asm/non_matchings/code/z_camera/Camera_Jump1.s similarity index 99% rename from asm/non_matchings/code/z_camera/func_80049A48.s rename to asm/non_matchings/code/z_camera/Camera_Jump1.s index 58580225a5..b24b3851f0 100644 --- a/asm/non_matchings/code/z_camera/func_80049A48.s +++ b/asm/non_matchings/code/z_camera/Camera_Jump1.s @@ -41,7 +41,7 @@ glabel D_80139F7C .float 0.99 .text -glabel func_80049A48 +glabel Camera_Jump1 /* AC0BE8 80049A48 27BDFF48 */ addiu $sp, $sp, -0xb8 /* AC0BEC 80049A4C AFB0001C */ sw $s0, 0x1c($sp) /* AC0BF0 80049A50 00808025 */ move $s0, $a0 @@ -71,13 +71,13 @@ glabel func_80049A48 /* AC0C4C 80049AAC 860F0142 */ lh $t7, 0x142($s0) /* AC0C50 80049AB0 856C01F0 */ lh $t4, 0x1f0($t3) /* AC0C54 80049AB4 46008483 */ div.s $f18, $f16, $f0 -/* AC0C58 80049AB8 3C198012 */ lui $t9, %hi(D_8011D068) +/* AC0C58 80049AB8 3C198012 */ lui $t9, %hi(sCameraSettings) /* AC0C5C 80049ABC 448C2000 */ mtc1 $t4, $f4 /* AC0C60 80049AC0 000FC0C0 */ sll $t8, $t7, 3 /* AC0C64 80049AC4 86080144 */ lh $t0, 0x144($s0) /* AC0C68 80049AC8 468021A0 */ cvt.s.w $f6, $f4 /* AC0C6C 80049ACC 0338C821 */ addu $t9, $t9, $t8 -/* AC0C70 80049AD0 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) +/* AC0C70 80049AD0 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) /* AC0C74 80049AD4 000848C0 */ sll $t1, $t0, 3 /* AC0C78 80049AD8 3C0B8016 */ lui $t3, %hi(gGameInfo) # $t3, 0x8016 /* AC0C7C 80049ADC 03295021 */ addu $t2, $t9, $t1 @@ -145,7 +145,7 @@ glabel func_80049A48 .L80049BD4: /* AC0D74 80049BD4 50600004 */ beql $v1, $zero, .L80049BE8 /* AC0D78 80049BD8 27A40060 */ addiu $a0, $sp, 0x60 -/* AC0D7C 80049BDC 0C011495 */ jal func_80045254 +/* AC0D7C 80049BDC 0C011495 */ jal Camera_CopyPREGToModeValues /* AC0D80 80049BE0 02002025 */ move $a0, $s0 /* AC0D84 80049BE4 27A40060 */ addiu $a0, $sp, 0x60 .L80049BE8: diff --git a/asm/non_matchings/code/z_camera/func_8004A250.s b/asm/non_matchings/code/z_camera/Camera_Jump2.s similarity index 99% rename from asm/non_matchings/code/z_camera/func_8004A250.s rename to asm/non_matchings/code/z_camera/Camera_Jump2.s index 69f4cd6af4..291f66ba2a 100644 --- a/asm/non_matchings/code/z_camera/func_8004A250.s +++ b/asm/non_matchings/code/z_camera/Camera_Jump2.s @@ -37,7 +37,7 @@ glabel D_80139FAC .float 0.01 .text -glabel func_8004A250 +glabel Camera_Jump2 /* AC13F0 8004A250 27BDFF20 */ addiu $sp, $sp, -0xe0 /* AC13F4 8004A254 AFB00018 */ sw $s0, 0x18($sp) /* AC13F8 8004A258 00808025 */ move $s0, $a0 @@ -70,10 +70,10 @@ glabel func_8004A250 /* AC1460 8004A2C0 3C014288 */ li $at, 0x42880000 # 0.000000 /* AC1464 8004A2C4 44819000 */ mtc1 $at, $f18 /* AC1468 8004A2C8 468021A0 */ cvt.s.w $f6, $f4 -/* AC146C 8004A2CC 3C198012 */ lui $t9, %hi(D_8011D068) +/* AC146C 8004A2CC 3C198012 */ lui $t9, %hi(sCameraSettings) /* AC1470 8004A2D0 860B0144 */ lh $t3, 0x144($s0) /* AC1474 8004A2D4 0338C821 */ addu $t9, $t9, $t8 -/* AC1478 8004A2D8 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) +/* AC1478 8004A2D8 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) /* AC147C 8004A2DC 46009103 */ div.s $f4, $f18, $f0 /* AC1480 8004A2E0 C61200F4 */ lwc1 $f18, 0xf4($s0) /* AC1484 8004A2E4 000B60C0 */ sll $t4, $t3, 3 @@ -163,7 +163,7 @@ glabel func_8004A250 .L8004A42C: /* AC15CC 8004A42C 50600004 */ beql $v1, $zero, .L8004A440 /* AC15D0 8004A430 26050050 */ addiu $a1, $s0, 0x50 -/* AC15D4 8004A434 0C011495 */ jal func_80045254 +/* AC15D4 8004A434 0C011495 */ jal Camera_CopyPREGToModeValues /* AC15D8 8004A438 02002025 */ move $a0, $s0 /* AC15DC 8004A43C 26050050 */ addiu $a1, $s0, 0x50 .L8004A440: diff --git a/asm/non_matchings/code/z_camera/func_8004ACE0.s b/asm/non_matchings/code/z_camera/Camera_Jump3.s similarity index 99% rename from asm/non_matchings/code/z_camera/func_8004ACE0.s rename to asm/non_matchings/code/z_camera/Camera_Jump3.s index 28efd6f2e0..04b093c987 100644 --- a/asm/non_matchings/code/z_camera/func_8004ACE0.s +++ b/asm/non_matchings/code/z_camera/Camera_Jump3.s @@ -27,7 +27,7 @@ glabel D_80139FD0 .float 0.99 .text -glabel func_8004ACE0 +glabel Camera_Jump3 /* AC1E80 8004ACE0 27BDFF28 */ addiu $sp, $sp, -0xd8 /* AC1E84 8004ACE4 AFB0001C */ sw $s0, 0x1c($sp) /* AC1E88 8004ACE8 00808025 */ move $s0, $a0 @@ -121,13 +121,13 @@ glabel func_8004ACE0 /* AC1FD4 8004AE34 468042A0 */ cvt.s.w $f10, $f8 /* AC1FD8 8004AE38 44814000 */ mtc1 $at, $f8 /* AC1FDC 8004AE3C 860B0142 */ lh $t3, 0x142($s0) -/* AC1FE0 8004AE40 3C0D8012 */ lui $t5, %hi(D_8011D068) +/* AC1FE0 8004AE40 3C0D8012 */ lui $t5, %hi(sCameraSettings) /* AC1FE4 8004AE44 862E0022 */ lh $t6, 0x22($s1) /* AC1FE8 8004AE48 000B60C0 */ sll $t4, $t3, 3 /* AC1FEC 8004AE4C 46105082 */ mul.s $f2, $f10, $f16 /* AC1FF0 8004AE50 460E4283 */ div.s $f10, $f8, $f14 /* AC1FF4 8004AE54 01AC6821 */ addu $t5, $t5, $t4 -/* AC1FF8 8004AE58 8DADD068 */ lw $t5, %lo(D_8011D068)($t5) +/* AC1FF8 8004AE58 8DADD068 */ lw $t5, %lo(sCameraSettings+4)($t5) /* AC1FFC 8004AE5C 000E78C0 */ sll $t7, $t6, 3 /* AC2000 8004AE60 3C018014 */ lui $at, %hi(D_80139FB4) /* AC2004 8004AE64 01AFC021 */ addu $t8, $t5, $t7 @@ -208,7 +208,7 @@ glabel func_8004ACE0 /* AC212C 8004AF8C 02002025 */ move $a0, $s0 /* AC2130 8004AF90 AFAC00C8 */ sw $t4, 0xc8($sp) /* AC2134 8004AF94 862E0022 */ lh $t6, 0x22($s1) -/* AC2138 8004AF98 0C011495 */ jal func_80045254 +/* AC2138 8004AF98 0C011495 */ jal Camera_CopyPREGToModeValues /* AC213C 8004AF9C A60E0144 */ sh $t6, 0x144($s0) /* AC2140 8004AFA0 8FAD00C8 */ lw $t5, 0xc8($sp) /* AC2144 8004AFA4 3C018014 */ lui $at, %hi(D_80139FBC) diff --git a/asm/non_matchings/code/z_camera/func_8004F3A4.s b/asm/non_matchings/code/z_camera/Camera_KeepOn0.s similarity index 97% rename from asm/non_matchings/code/z_camera/func_8004F3A4.s rename to asm/non_matchings/code/z_camera/Camera_KeepOn0.s index df75dea23c..7cbf4b2b06 100644 --- a/asm/non_matchings/code/z_camera/func_8004F3A4.s +++ b/asm/non_matchings/code/z_camera/Camera_KeepOn0.s @@ -14,7 +14,7 @@ glabel D_8013A168 .float 0.01 .text -glabel func_8004F3A4 +glabel Camera_KeepOn0 /* AC6544 8004F3A4 27BDFF90 */ addiu $sp, $sp, -0x70 /* AC6548 8004F3A8 AFBF001C */ sw $ra, 0x1c($sp) /* AC654C 8004F3AC AFB00018 */ sw $s0, 0x18($sp) @@ -35,11 +35,11 @@ glabel func_8004F3A4 /* AC6588 8004F3E8 00000000 */ nop .L8004F3EC: /* AC658C 8004F3EC 86190142 */ lh $t9, 0x142($s0) -/* AC6590 8004F3F0 3C0A8012 */ lui $t2, %hi(D_8011D068) +/* AC6590 8004F3F0 3C0A8012 */ lui $t2, %hi(sCameraSettings) /* AC6594 8004F3F4 860B0144 */ lh $t3, 0x144($s0) /* AC6598 8004F3F8 001948C0 */ sll $t1, $t9, 3 /* AC659C 8004F3FC 01495021 */ addu $t2, $t2, $t1 -/* AC65A0 8004F400 8D4AD068 */ lw $t2, %lo(D_8011D068)($t2) +/* AC65A0 8004F400 8D4AD068 */ lw $t2, %lo(sCameraSettings+4)($t2) /* AC65A4 8004F404 000B60C0 */ sll $t4, $t3, 3 /* AC65A8 8004F408 3C018014 */ lui $at, %hi(D_8013A160) /* AC65AC 8004F40C 014C6821 */ addu $t5, $t2, $t4 @@ -70,7 +70,7 @@ glabel func_8004F3A4 .L8004F470: /* AC6610 8004F470 10600003 */ beqz $v1, .L8004F480 /* AC6614 8004F474 00000000 */ nop -/* AC6618 8004F478 0C011495 */ jal func_80045254 +/* AC6618 8004F478 0C011495 */ jal Camera_CopyPREGToModeValues /* AC661C 8004F47C 02002025 */ move $a0, $s0 .L8004F480: /* AC6620 8004F480 0C0111DB */ jal func_8004476C diff --git a/asm/non_matchings/code/z_camera/func_8004CA6C.s b/asm/non_matchings/code/z_camera/Camera_KeepOn1.s similarity index 99% rename from asm/non_matchings/code/z_camera/func_8004CA6C.s rename to asm/non_matchings/code/z_camera/Camera_KeepOn1.s index ea8665eaa2..b4c62bdda6 100644 --- a/asm/non_matchings/code/z_camera/func_8004CA6C.s +++ b/asm/non_matchings/code/z_camera/Camera_KeepOn1.s @@ -64,7 +64,7 @@ glabel D_8013A0C8 .float 0.01 .text -glabel func_8004CA6C +glabel Camera_KeepOn1 /* AC3C0C 8004CA6C 27BDFEC8 */ addiu $sp, $sp, -0x138 /* AC3C10 8004CA70 AFB00028 */ sw $s0, 0x28($sp) /* AC3C14 8004CA74 00808025 */ move $s0, $a0 @@ -115,13 +115,13 @@ glabel func_8004CA6C /* AC3CB8 8004CB18 86180142 */ lh $t8, 0x142($s0) /* AC3CBC 8004CB1C 468021A0 */ cvt.s.w $f6, $f4 /* AC3CC0 8004CB20 44812000 */ mtc1 $at, $f4 -/* AC3CC4 8004CB24 3C0A8012 */ lui $t2, %hi(D_8011D068) +/* AC3CC4 8004CB24 3C0A8012 */ lui $t2, %hi(sCameraSettings) /* AC3CC8 8004CB28 0018C8C0 */ sll $t9, $t8, 3 /* AC3CCC 8004CB2C 860B0144 */ lh $t3, 0x144($s0) /* AC3CD0 8004CB30 01595021 */ addu $t2, $t2, $t9 /* AC3CD4 8004CB34 460E3082 */ mul.s $f2, $f6, $f14 /* AC3CD8 8004CB38 46002183 */ div.s $f6, $f4, $f0 -/* AC3CDC 8004CB3C 8D4AD068 */ lw $t2, %lo(D_8011D068)($t2) +/* AC3CDC 8004CB3C 8D4AD068 */ lw $t2, %lo(sCameraSettings+4)($t2) /* AC3CE0 8004CB40 000B60C0 */ sll $t4, $t3, 3 /* AC3CE4 8004CB44 014C6821 */ addu $t5, $t2, $t4 /* AC3CE8 8004CB48 8DA20004 */ lw $v0, 4($t5) @@ -208,7 +208,7 @@ glabel func_8004CA6C .L8004CC8C: /* AC3E2C 8004CC8C 50600004 */ beql $v1, $zero, .L8004CCA0 /* AC3E30 8004CC90 C7A60070 */ lwc1 $f6, 0x70($sp) -/* AC3E34 8004CC94 0C011495 */ jal func_80045254 +/* AC3E34 8004CC94 0C011495 */ jal Camera_CopyPREGToModeValues /* AC3E38 8004CC98 02002025 */ move $a0, $s0 /* AC3E3C 8004CC9C C7A60070 */ lwc1 $f6, 0x70($sp) .L8004CCA0: diff --git a/asm/non_matchings/code/z_camera/func_8004D9E4.s b/asm/non_matchings/code/z_camera/Camera_KeepOn3.s similarity index 99% rename from asm/non_matchings/code/z_camera/func_8004D9E4.s rename to asm/non_matchings/code/z_camera/Camera_KeepOn3.s index c6624915f3..e6687922cb 100644 --- a/asm/non_matchings/code/z_camera/func_8004D9E4.s +++ b/asm/non_matchings/code/z_camera/Camera_KeepOn3.s @@ -21,7 +21,7 @@ glabel D_8013A0D8 .float 0.001 .text -glabel func_8004D9E4 +glabel Camera_KeepOn3 /* AC4B84 8004D9E4 27BDFF18 */ addiu $sp, $sp, -0xe8 /* AC4B88 8004D9E8 AFB30028 */ sw $s3, 0x28($sp) /* AC4B8C 8004D9EC 00809825 */ move $s3, $a0 @@ -104,13 +104,13 @@ glabel func_8004D9E4 /* AC4CA0 8004DB00 86780142 */ lh $t8, 0x142($s3) /* AC4CA4 8004DB04 468021A0 */ cvt.s.w $f6, $f4 /* AC4CA8 8004DB08 44812000 */ mtc1 $at, $f4 -/* AC4CAC 8004DB0C 3C098012 */ lui $t1, %hi(D_8011D068) +/* AC4CAC 8004DB0C 3C098012 */ lui $t1, %hi(sCameraSettings) /* AC4CB0 8004DB10 0018C8C0 */ sll $t9, $t8, 3 /* AC4CB4 8004DB14 866A0144 */ lh $t2, 0x144($s3) /* AC4CB8 8004DB18 01394821 */ addu $t1, $t1, $t9 /* AC4CBC 8004DB1C 460E3082 */ mul.s $f2, $f6, $f14 /* AC4CC0 8004DB20 46002183 */ div.s $f6, $f4, $f0 -/* AC4CC4 8004DB24 8D29D068 */ lw $t1, %lo(D_8011D068)($t1) +/* AC4CC4 8004DB24 8D29D068 */ lw $t1, %lo(sCameraSettings+4)($t1) /* AC4CC8 8004DB28 000A58C0 */ sll $t3, $t2, 3 /* AC4CCC 8004DB2C 012B6021 */ addu $t4, $t1, $t3 /* AC4CD0 8004DB30 8D820004 */ lw $v0, 4($t4) @@ -183,7 +183,7 @@ glabel func_8004D9E4 .L8004DC3C: /* AC4DDC 8004DC3C 50400004 */ beql $v0, $zero, .L8004DC50 /* AC4DE0 8004DC40 C7A60058 */ lwc1 $f6, 0x58($sp) -/* AC4DE4 8004DC44 0C011495 */ jal func_80045254 +/* AC4DE4 8004DC44 0C011495 */ jal Camera_CopyPREGToModeValues /* AC4DE8 8004DC48 02602025 */ move $a0, $s3 /* AC4DEC 8004DC4C C7A60058 */ lwc1 $f6, 0x58($sp) .L8004DC50: diff --git a/asm/non_matchings/code/z_camera/func_8004E460.s b/asm/non_matchings/code/z_camera/Camera_KeepOn4.s similarity index 99% rename from asm/non_matchings/code/z_camera/func_8004E460.s rename to asm/non_matchings/code/z_camera/Camera_KeepOn4.s index 434cffcb94..517bbf39a0 100644 --- a/asm/non_matchings/code/z_camera/func_8004E460.s +++ b/asm/non_matchings/code/z_camera/Camera_KeepOn4.s @@ -90,7 +90,7 @@ glabel D_8013A15C .float 0.2 .text -glabel func_8004E460 +glabel Camera_KeepOn4 /* AC5600 8004E460 27BDFF20 */ addiu $sp, $sp, -0xe0 /* AC5604 8004E464 AFBF0024 */ sw $ra, 0x24($sp) /* AC5608 8004E468 AFB10020 */ sw $s1, 0x20($sp) @@ -180,12 +180,12 @@ glabel func_8004E460 /* AC5740 8004E5A0 3C014288 */ li $at, 0x42880000 # 0.000000 /* AC5744 8004E5A4 44814000 */ mtc1 $at, $f8 /* AC5748 8004E5A8 86380142 */ lh $t8, 0x142($s1) -/* AC574C 8004E5AC 3C088012 */ lui $t0, %hi(D_8011D068) +/* AC574C 8004E5AC 3C088012 */ lui $t0, %hi(sCameraSettings) /* AC5750 8004E5B0 46004283 */ div.s $f10, $f8, $f0 /* AC5754 8004E5B4 0018C8C0 */ sll $t9, $t8, 3 /* AC5758 8004E5B8 86290144 */ lh $t1, 0x144($s1) /* AC575C 8004E5BC 01194021 */ addu $t0, $t0, $t9 -/* AC5760 8004E5C0 8D08D068 */ lw $t0, %lo(D_8011D068)($t0) +/* AC5760 8004E5C0 8D08D068 */ lw $t0, %lo(sCameraSettings+4)($t0) /* AC5764 8004E5C4 000950C0 */ sll $t2, $t1, 3 /* AC5768 8004E5C8 46122180 */ add.s $f6, $f4, $f18 /* AC576C 8004E5CC 010A5821 */ addu $t3, $t0, $t2 @@ -563,7 +563,7 @@ glabel L8004EB20 .L8004EB2C: /* AC5CCC 8004EB2C 10400004 */ beqz $v0, .L8004EB40 /* AC5CD0 8004EB30 02202025 */ move $a0, $s1 -/* AC5CD4 8004EB34 0C011495 */ jal func_80045254 +/* AC5CD4 8004EB34 0C011495 */ jal Camera_CopyPREGToModeValues /* AC5CD8 8004EB38 E7AE0088 */ swc1 $f14, 0x88($sp) /* AC5CDC 8004EB3C C7AE0088 */ lwc1 $f14, 0x88($sp) .L8004EB40: @@ -1074,7 +1074,7 @@ glabel L8004EB20 /* AC6460 8004F2C0 3128FFF7 */ andi $t0, $t1, 0xfff7 /* AC6464 8004F2C4 04A10005 */ bgez $a1, .L8004F2DC /* AC6468 8004F2C8 A628014C */ sh $t0, 0x14c($s1) -/* AC646C 8004F2CC 0C016952 */ jal func_8005A548 +/* AC646C 8004F2CC 0C016952 */ jal Camera_ChangeSetting /* AC6470 8004F2D0 86250154 */ lh $a1, 0x154($s1) /* AC6474 8004F2D4 10000006 */ b .L8004F2F0 /* AC6478 8004F2D8 8FA30034 */ lw $v1, 0x34($sp) diff --git a/asm/non_matchings/code/z_camera/func_800473A0.s b/asm/non_matchings/code/z_camera/Camera_Normal1.s similarity index 99% rename from asm/non_matchings/code/z_camera/func_800473A0.s rename to asm/non_matchings/code/z_camera/Camera_Normal1.s index 953a63498e..ce4141b370 100644 --- a/asm/non_matchings/code/z_camera/func_800473A0.s +++ b/asm/non_matchings/code/z_camera/Camera_Normal1.s @@ -38,7 +38,7 @@ glabel D_80139EC0 .float 0.80 .text -glabel func_800473A0 +glabel Camera_Normal1 /* ABE540 800473A0 27BDFF50 */ addiu $sp, $sp, -0xb0 /* ABE544 800473A4 AFB0001C */ sw $s0, 0x1c($sp) /* ABE548 800473A8 00808025 */ move $s0, $a0 @@ -71,13 +71,13 @@ glabel func_800473A0 /* ABE5B0 80047410 860F0142 */ lh $t7, 0x142($s0) /* ABE5B4 80047414 468021A0 */ cvt.s.w $f6, $f4 /* ABE5B8 80047418 44812000 */ mtc1 $at, $f4 -/* ABE5BC 8004741C 3C198012 */ lui $t9, %hi(D_8011D068) +/* ABE5BC 8004741C 3C198012 */ lui $t9, %hi(sCameraSettings) /* ABE5C0 80047420 000FC0C0 */ sll $t8, $t7, 3 /* ABE5C4 80047424 86080144 */ lh $t0, 0x144($s0) /* ABE5C8 80047428 0338C821 */ addu $t9, $t9, $t8 /* ABE5CC 8004742C 46103302 */ mul.s $f12, $f6, $f16 /* ABE5D0 80047430 46002183 */ div.s $f6, $f4, $f0 -/* ABE5D4 80047434 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) +/* ABE5D4 80047434 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) /* ABE5D8 80047438 000848C0 */ sll $t1, $t0, 3 /* ABE5DC 8004743C 3C018014 */ lui $at, %hi(D_80139E90) /* ABE5E0 80047440 03295021 */ addu $t2, $t9, $t1 @@ -153,7 +153,7 @@ glabel func_800473A0 .L80047558: /* ABE6F8 80047558 50600004 */ beql $v1, $zero, .L8004756C /* ABE6FC 8004755C 86180022 */ lh $t8, 0x22($s0) -/* ABE700 80047560 0C011495 */ jal func_80045254 +/* ABE700 80047560 0C011495 */ jal Camera_CopyPREGToModeValues /* ABE704 80047564 02002025 */ move $a0, $s0 /* ABE708 80047568 86180022 */ lh $t8, 0x22($s0) .L8004756C: diff --git a/asm/non_matchings/code/z_camera/func_80047F64.s b/asm/non_matchings/code/z_camera/Camera_Normal2.s similarity index 99% rename from asm/non_matchings/code/z_camera/func_80047F64.s rename to asm/non_matchings/code/z_camera/Camera_Normal2.s index 1631aeb6e5..2f0eaba1db 100644 --- a/asm/non_matchings/code/z_camera/func_80047F64.s +++ b/asm/non_matchings/code/z_camera/Camera_Normal2.s @@ -30,7 +30,7 @@ glabel D_80139EEC .float 0.05 .text -glabel func_80047F64 +glabel Camera_Normal2 /* ABF104 80047F64 27BDFF20 */ addiu $sp, $sp, -0xe0 /* ABF108 80047F68 AFB0001C */ sw $s0, 0x1c($sp) /* ABF10C 80047F6C 00808025 */ move $s0, $a0 @@ -59,7 +59,7 @@ glabel func_80047F64 /* ABF168 80047FC8 46065381 */ sub.s $f14, $f10, $f6 /* ABF16C 80047FCC 02002025 */ move $a0, $s0 /* ABF170 80047FD0 E7AC0060 */ swc1 $f12, 0x60($sp) -/* ABF174 80047FD4 0C011495 */ jal func_80045254 +/* ABF174 80047FD4 0C011495 */ jal Camera_CopyPREGToModeValues /* ABF178 80047FD8 E7AE005C */ swc1 $f14, 0x5c($sp) /* ABF17C 80047FDC 3C018014 */ lui $at, %hi(D_80139EC8) /* ABF180 80047FE0 C4309EC8 */ lwc1 $f16, %lo(D_80139EC8)($at) @@ -79,11 +79,11 @@ glabel func_80047F64 /* ABF1B4 80048014 00000000 */ nop .L80048018: /* ABF1B8 80048018 86190142 */ lh $t9, 0x142($s0) -/* ABF1BC 8004801C 3C098012 */ lui $t1, %hi(D_8011D068) +/* ABF1BC 8004801C 3C098012 */ lui $t1, %hi(sCameraSettings) /* ABF1C0 80048020 860A0144 */ lh $t2, 0x144($s0) /* ABF1C4 80048024 001940C0 */ sll $t0, $t9, 3 /* ABF1C8 80048028 01284821 */ addu $t1, $t1, $t0 -/* ABF1CC 8004802C 8D29D068 */ lw $t1, %lo(D_8011D068)($t1) +/* ABF1CC 8004802C 8D29D068 */ lw $t1, %lo(sCameraSettings+4)($t1) /* ABF1D0 80048030 000A58C0 */ sll $t3, $t2, 3 /* ABF1D4 80048034 3C018014 */ lui $at, %hi(D_80139ECC) /* ABF1D8 80048038 012B6021 */ addu $t4, $t1, $t3 @@ -160,7 +160,7 @@ glabel func_80047F64 .L80048154: /* ABF2F4 80048154 50600004 */ beql $v1, $zero, .L80048168 /* ABF2F8 80048158 860F001E */ lh $t7, 0x1e($s0) -/* ABF2FC 8004815C 0C011495 */ jal func_80045254 +/* ABF2FC 8004815C 0C011495 */ jal Camera_CopyPREGToModeValues /* ABF300 80048160 02002025 */ move $a0, $s0 /* ABF304 80048164 860F001E */ lh $t7, 0x1e($s0) .L80048168: diff --git a/asm/non_matchings/code/z_camera/func_80048804.s b/asm/non_matchings/code/z_camera/Camera_Normal3.s similarity index 99% rename from asm/non_matchings/code/z_camera/func_80048804.s rename to asm/non_matchings/code/z_camera/Camera_Normal3.s index 932baa6564..8ab735c7a1 100644 --- a/asm/non_matchings/code/z_camera/func_80048804.s +++ b/asm/non_matchings/code/z_camera/Camera_Normal3.s @@ -27,7 +27,7 @@ glabel D_80139F10 .float 0.002 .text -glabel func_80048804 +glabel Camera_Normal3 /* ABF9A4 80048804 27BDFF58 */ addiu $sp, $sp, -0xa8 /* ABF9A8 80048808 AFB0001C */ sw $s0, 0x1c($sp) /* ABF9AC 8004880C 00808025 */ move $s0, $a0 @@ -48,11 +48,11 @@ glabel func_80048804 /* ABF9E8 80048848 00000000 */ nop .L8004884C: /* ABF9EC 8004884C 860F0142 */ lh $t7, 0x142($s0) -/* ABF9F0 80048850 3C198012 */ lui $t9, %hi(D_8011D068) +/* ABF9F0 80048850 3C198012 */ lui $t9, %hi(sCameraSettings) /* ABF9F4 80048854 86080144 */ lh $t0, 0x144($s0) /* ABF9F8 80048858 000FC0C0 */ sll $t8, $t7, 3 /* ABF9FC 8004885C 0338C821 */ addu $t9, $t9, $t8 -/* ABFA00 80048860 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) +/* ABFA00 80048860 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) /* ABFA04 80048864 000848C0 */ sll $t1, $t0, 3 /* ABFA08 80048868 3C018014 */ lui $at, %hi(D_80139EF0) /* ABFA0C 8004886C 03295021 */ addu $t2, $t9, $t1 @@ -121,7 +121,7 @@ glabel func_80048804 .L80048968: /* ABFB08 80048968 50600004 */ beql $v1, $zero, .L8004897C /* ABFB0C 8004896C 26050050 */ addiu $a1, $s0, 0x50 -/* ABFB10 80048970 0C011495 */ jal func_80045254 +/* ABFB10 80048970 0C011495 */ jal Camera_CopyPREGToModeValues /* ABFB14 80048974 02002025 */ move $a0, $s0 /* ABFB18 80048978 26050050 */ addiu $a1, $s0, 0x50 .L8004897C: diff --git a/asm/non_matchings/code/z_camera/func_8004900C.s b/asm/non_matchings/code/z_camera/Camera_Parallel1.s similarity index 99% rename from asm/non_matchings/code/z_camera/func_8004900C.s rename to asm/non_matchings/code/z_camera/Camera_Parallel1.s index d5e1c68c21..8170cd566a 100644 --- a/asm/non_matchings/code/z_camera/func_8004900C.s +++ b/asm/non_matchings/code/z_camera/Camera_Parallel1.s @@ -32,7 +32,7 @@ glabel D_80139F40 .float -0.1 .text -glabel func_8004900C +glabel Camera_Parallel1 /* AC01AC 8004900C 27BDFF38 */ addiu $sp, $sp, -0xc8 /* AC01B0 80049010 AFB00020 */ sw $s0, 0x20($sp) /* AC01B4 80049014 00808025 */ move $s0, $a0 @@ -68,11 +68,11 @@ glabel func_8004900C /* AC0228 80049088 860F0142 */ lh $t7, 0x142($s0) /* AC022C 8004908C 46123082 */ mul.s $f2, $f6, $f18 /* AC0230 80049090 46002183 */ div.s $f6, $f4, $f0 -/* AC0234 80049094 3C198012 */ lui $t9, %hi(D_8011D068) +/* AC0234 80049094 3C198012 */ lui $t9, %hi(sCameraSettings) /* AC0238 80049098 000FC0C0 */ sll $t8, $t7, 3 /* AC023C 8004909C 86090144 */ lh $t1, 0x144($s0) /* AC0240 800490A0 0338C821 */ addu $t9, $t9, $t8 -/* AC0244 800490A4 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) +/* AC0244 800490A4 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) /* AC0248 800490A8 000950C0 */ sll $t2, $t1, 3 /* AC024C 800490AC 46024280 */ add.s $f10, $f8, $f2 /* AC0250 800490B0 032A5821 */ addu $t3, $t9, $t2 @@ -164,7 +164,7 @@ glabel func_8004900C .L80049208: /* AC03A8 80049208 50400004 */ beql $v0, $zero, .L8004921C /* AC03AC 8004920C 26050050 */ addiu $a1, $s0, 0x50 -/* AC03B0 80049210 0C011495 */ jal func_80045254 +/* AC03B0 80049210 0C011495 */ jal Camera_CopyPREGToModeValues /* AC03B4 80049214 02002025 */ move $a0, $s0 /* AC03B8 80049218 26050050 */ addiu $a1, $s0, 0x50 .L8004921C: diff --git a/asm/non_matchings/code/z_camera/func_8005AA90.s b/asm/non_matchings/code/z_camera/Camera_SetParam.s similarity index 92% rename from asm/non_matchings/code/z_camera/func_8005AA90.s rename to asm/non_matchings/code/z_camera/Camera_SetParam.s index 2a04d75761..bac176628f 100644 --- a/asm/non_matchings/code/z_camera/func_8005AA90.s +++ b/asm/non_matchings/code/z_camera/Camera_SetParam.s @@ -37,7 +37,7 @@ glabel D_8013A56C .float 182.041672 # 32768 / PI .text -glabel func_8005AA90 +glabel Camera_SetParam /* AD1C30 8005AA90 10C00060 */ beqz $a2, .L8005AC14 /* AD1C34 8005AA94 27BDFFE0 */ addiu $sp, $sp, -0x20 /* AD1C38 8005AA98 28A10021 */ slti $at, $a1, 0x21 @@ -160,14 +160,3 @@ glabel L8005AC0C .L8005AC1C: /* AD1DBC 8005AC1C 03E00008 */ jr $ra /* AD1DC0 8005AC20 27BD0020 */ addiu $sp, $sp, 0x20 - -/* AD1DC4 8005AC24 AFA50004 */ sw $a1, 4($sp) -/* AD1DC8 8005AC28 848E015C */ lh $t6, 0x15c($a0) -/* AD1DCC 8005AC2C 00052C00 */ sll $a1, $a1, 0x10 -/* AD1DD0 8005AC30 00052C03 */ sra $a1, $a1, 0x10 -/* AD1DD4 8005AC34 00A07827 */ not $t7, $a1 -/* AD1DD8 8005AC38 01CFC024 */ and $t8, $t6, $t7 -/* AD1DDC 8005AC3C A498015C */ sh $t8, 0x15c($a0) -/* AD1DE0 8005AC40 03E00008 */ jr $ra -/* AD1DE4 8005AC44 24020001 */ li $v0, 1 - diff --git a/asm/non_matchings/code/z_camera/func_80056654.s b/asm/non_matchings/code/z_camera/Camera_Special4.s similarity index 98% rename from asm/non_matchings/code/z_camera/func_80056654.s rename to asm/non_matchings/code/z_camera/Camera_Special4.s index 4b7037a1c9..abdd009794 100644 --- a/asm/non_matchings/code/z_camera/func_80056654.s +++ b/asm/non_matchings/code/z_camera/Camera_Special4.s @@ -1,4 +1,4 @@ -glabel func_80056654 +glabel Camera_Special4 /* ACD7F4 80056654 27BDFFB0 */ addiu $sp, $sp, -0x50 /* ACD7F8 80056658 AFBF001C */ sw $ra, 0x1c($sp) /* ACD7FC 8005665C AFB10018 */ sw $s1, 0x18($sp) @@ -32,7 +32,7 @@ glabel func_80056654 /* ACD868 800566C8 460A3403 */ div.s $f16, $f6, $f10 /* ACD86C 800566CC 44068000 */ mfc1 $a2, $f16 /* ACD870 800566D0 0C010E27 */ jal func_8004389C -/* ACD874 800566D4 00000000 */ nop +/* ACD874 800566D4 00000000 */ nop /* ACD878 800566D8 E60000FC */ swc1 $f0, 0xfc($s0) /* ACD87C 800566DC 86230000 */ lh $v1, ($s1) /* ACD880 800566E0 860A0000 */ lh $t2, ($s0) diff --git a/asm/non_matchings/code/z_camera/func_800567F8.s b/asm/non_matchings/code/z_camera/Camera_Special5.s similarity index 95% rename from asm/non_matchings/code/z_camera/func_800567F8.s rename to asm/non_matchings/code/z_camera/Camera_Special5.s index ccfeb6f7cf..ebcebc1907 100644 --- a/asm/non_matchings/code/z_camera/func_800567F8.s +++ b/asm/non_matchings/code/z_camera/Camera_Special5.s @@ -21,7 +21,7 @@ glabel D_8013A3A8 .float 0.01 .text -glabel func_800567F8 +glabel Camera_Special5 /* ACD998 800567F8 27BDFF38 */ addiu $sp, $sp, -0xc8 /* ACD99C 800567FC AFB00018 */ sw $s0, 0x18($sp) /* ACD9A0 80056800 00808025 */ move $s0, $a0 @@ -51,12 +51,12 @@ glabel func_800567F8 /* ACD9FC 8005685C 44819000 */ mtc1 $at, $f18 /* ACDA00 80056860 468021A0 */ cvt.s.w $f6, $f4 /* ACDA04 80056864 860F0142 */ lh $t7, 0x142($s0) -/* ACDA08 80056868 3C198012 */ lui $t9, %hi(D_8011D068) +/* ACDA08 80056868 3C198012 */ lui $t9, %hi(sCameraSettings) /* ACDA0C 8005686C 86080144 */ lh $t0, 0x144($s0) /* ACDA10 80056870 000FC0C0 */ sll $t8, $t7, 3 /* ACDA14 80056874 46009103 */ div.s $f4, $f18, $f0 /* ACDA18 80056878 0338C821 */ addu $t9, $t9, $t8 -/* ACDA1C 8005687C 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) +/* ACDA1C 8005687C 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) /* ACDA20 80056880 000848C0 */ sll $t1, $t0, 3 /* ACDA24 80056884 46083082 */ mul.s $f2, $f6, $f8 /* ACDA28 80056888 03295021 */ addu $t2, $t9, $t1 @@ -73,19 +73,19 @@ glabel func_800567F8 /* ACDA54 800568B4 468042A0 */ cvt.s.w $f10, $f8 /* ACDA58 800568B8 46068301 */ sub.s $f12, $f16, $f6 /* ACDA5C 800568BC 46125102 */ mul.s $f4, $f10, $f18 -/* ACDA60 800568C0 00000000 */ nop +/* ACDA60 800568C0 00000000 */ nop /* ACDA64 800568C4 46002402 */ mul.s $f16, $f4, $f0 -/* ACDA68 800568C8 00000000 */ nop +/* ACDA68 800568C8 00000000 */ nop /* ACDA6C 800568CC 460C8182 */ mul.s $f6, $f16, $f12 /* ACDA70 800568D0 E6060000 */ swc1 $f6, ($s0) /* ACDA74 800568D4 844EFFE8 */ lh $t6, -0x18($v0) /* ACDA78 800568D8 448E4000 */ mtc1 $t6, $f8 -/* ACDA7C 800568DC 00000000 */ nop +/* ACDA7C 800568DC 00000000 */ nop /* ACDA80 800568E0 468042A0 */ cvt.s.w $f10, $f8 /* ACDA84 800568E4 E60A0004 */ swc1 $f10, 4($s0) /* ACDA88 800568E8 844FFFEC */ lh $t7, -0x14($v0) /* ACDA8C 800568EC 448F9000 */ mtc1 $t7, $f18 -/* ACDA90 800568F0 00000000 */ nop +/* ACDA90 800568F0 00000000 */ nop /* ACDA94 800568F4 46809120 */ cvt.s.w $f4, $f18 /* ACDA98 800568F8 E6040008 */ swc1 $f4, 8($s0) /* ACDA9C 800568FC 8458FFF0 */ lh $t8, -0x10($v0) @@ -101,17 +101,17 @@ glabel func_800567F8 /* ACDAC4 80056924 46125100 */ add.s $f4, $f10, $f18 /* ACDAC8 80056928 4600240D */ trunc.w.s $f16, $f4 /* ACDACC 8005692C 44098000 */ mfc1 $t1, $f16 -/* ACDAD0 80056930 00000000 */ nop +/* ACDAD0 80056930 00000000 */ nop /* ACDAD4 80056934 A6090016 */ sh $t1, 0x16($s0) /* ACDAD8 80056938 844AFFF8 */ lh $t2, -8($v0) /* ACDADC 8005693C 448A3000 */ mtc1 $t2, $f6 -/* ACDAE0 80056940 00000000 */ nop +/* ACDAE0 80056940 00000000 */ nop /* ACDAE4 80056944 46803220 */ cvt.s.w $f8, $f6 /* ACDAE8 80056948 E608000C */ swc1 $f8, 0xc($s0) /* ACDAEC 8005694C 844BFFFC */ lh $t3, -4($v0) /* ACDAF0 80056950 C424A39C */ lwc1 $f4, %lo(D_8013A39C)($at) /* ACDAF4 80056954 448B5000 */ mtc1 $t3, $f10 -/* ACDAF8 80056958 00000000 */ nop +/* ACDAF8 80056958 00000000 */ nop /* ACDAFC 8005695C 468054A0 */ cvt.s.w $f18, $f10 /* ACDB00 80056960 46049402 */ mul.s $f16, $f18, $f4 /* ACDB04 80056964 E6100010 */ swc1 $f16, 0x10($s0) @@ -122,7 +122,7 @@ glabel func_800567F8 .L80056978: /* ACDB18 80056978 50600004 */ beql $v1, $zero, .L8005698C /* ACDB1C 8005697C 26050050 */ addiu $a1, $s0, 0x50 -/* ACDB20 80056980 0C011495 */ jal func_80045254 +/* ACDB20 80056980 0C011495 */ jal Camera_CopyPREGToModeValues /* ACDB24 80056984 02002025 */ move $a0, $s0 /* ACDB28 80056988 26050050 */ addiu $a1, $s0, 0x50 .L8005698C: @@ -211,13 +211,13 @@ glabel func_800567F8 /* ACDC64 80056AC4 8FAC002C */ lw $t4, 0x2c($sp) /* ACDC68 80056AC8 3C018014 */ lui $at, %hi(D_8013A3A4) /* ACDC6C 80056ACC 0501000E */ bgez $t0, .L80056B08 -/* ACDC70 80056AD0 00000000 */ nop +/* ACDC70 80056AD0 00000000 */ nop /* ACDC74 80056AD4 3C018014 */ lui $at, %hi(D_8013A3A0) /* ACDC78 80056AD8 C432A3A0 */ lwc1 $f18, %lo(D_8013A3A0)($at) /* ACDC7C 80056ADC 46120102 */ mul.s $f4, $f0, $f18 /* ACDC80 80056AE0 4600240D */ trunc.w.s $f16, $f4 /* ACDC84 80056AE4 44028000 */ mfc1 $v0, $f16 -/* ACDC88 80056AE8 00000000 */ nop +/* ACDC88 80056AE8 00000000 */ nop /* ACDC8C 80056AEC 00021400 */ sll $v0, $v0, 0x10 /* ACDC90 80056AF0 00021403 */ sra $v0, $v0, 0x10 /* ACDC94 80056AF4 24421553 */ addiu $v0, $v0, 0x1553 @@ -230,7 +230,7 @@ glabel func_800567F8 /* ACDCAC 80056B0C 46060202 */ mul.s $f8, $f0, $f6 /* ACDCB0 80056B10 4600428D */ trunc.w.s $f10, $f8 /* ACDCB4 80056B14 44025000 */ mfc1 $v0, $f10 -/* ACDCB8 80056B18 00000000 */ nop +/* ACDCB8 80056B18 00000000 */ nop /* ACDCBC 80056B1C 00021400 */ sll $v0, $v0, 0x10 /* ACDCC0 80056B20 00021403 */ sra $v0, $v0, 0x10 /* ACDCC4 80056B24 24421553 */ addiu $v0, $v0, 0x1553 @@ -277,11 +277,11 @@ glabel func_800567F8 /* ACDD5C 80056BBC 3C073F80 */ lui $a3, 0x3f80 /* ACDD60 80056BC0 46809120 */ cvt.s.w $f4, $f18 /* ACDD64 80056BC4 46102182 */ mul.s $f6, $f4, $f16 -/* ACDD68 80056BC8 00000000 */ nop +/* ACDD68 80056BC8 00000000 */ nop /* ACDD6C 80056BCC 46083282 */ mul.s $f10, $f6, $f8 /* ACDD70 80056BD0 44065000 */ mfc1 $a2, $f10 /* ACDD74 80056BD4 0C010E27 */ jal func_8004389C -/* ACDD78 80056BD8 00000000 */ nop +/* ACDD78 80056BD8 00000000 */ nop /* ACDD7C 80056BDC E60000FC */ swc1 $f0, 0xfc($s0) /* ACDD80 80056BE0 00002025 */ move $a0, $zero /* ACDD84 80056BE4 8605015A */ lh $a1, 0x15a($s0) @@ -299,4 +299,4 @@ glabel func_800567F8 /* ACDDB0 80056C10 8FB00018 */ lw $s0, 0x18($sp) /* ACDDB4 80056C14 27BD00C8 */ addiu $sp, $sp, 0xc8 /* ACDDB8 80056C18 03E00008 */ jr $ra -/* ACDDBC 80056C1C 00000000 */ nop +/* ACDDBC 80056C1C 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/func_80056F6C.s b/asm/non_matchings/code/z_camera/Camera_Special6.s similarity index 97% rename from asm/non_matchings/code/z_camera/func_80056F6C.s rename to asm/non_matchings/code/z_camera/Camera_Special6.s index d74f1bb8f0..49ff5afbba 100644 --- a/asm/non_matchings/code/z_camera/func_80056F6C.s +++ b/asm/non_matchings/code/z_camera/Camera_Special6.s @@ -9,7 +9,7 @@ glabel D_8013A3CC .float 0.2 .text -glabel func_80056F6C +glabel Camera_Special6 /* ACE10C 80056F6C 27BDFF40 */ addiu $sp, $sp, -0xc0 /* ACE110 80056F70 AFBF0024 */ sw $ra, 0x24($sp) /* ACE114 80056F74 AFB20020 */ sw $s2, 0x20($sp) @@ -27,15 +27,15 @@ glabel func_80056F6C /* ACE144 80056FA4 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* ACE148 80056FA8 85C20314 */ lh $v0, 0x314($t6) /* ACE14C 80056FAC 1040000F */ beqz $v0, .L80056FEC -/* ACE150 80056FB0 00000000 */ nop +/* ACE150 80056FB0 00000000 */ nop .L80056FB4: /* ACE154 80056FB4 860F0142 */ lh $t7, 0x142($s0) .L80056FB8: -/* ACE158 80056FB8 3C198012 */ lui $t9, %hi(D_8011D068) +/* ACE158 80056FB8 3C198012 */ lui $t9, %hi(sCameraSettings) /* ACE15C 80056FBC 860B0144 */ lh $t3, 0x144($s0) /* ACE160 80056FC0 000FC0C0 */ sll $t8, $t7, 3 /* ACE164 80056FC4 0338C821 */ addu $t9, $t9, $t8 -/* ACE168 80056FC8 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) +/* ACE168 80056FC8 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) /* ACE16C 80056FCC 000B60C0 */ sll $t4, $t3, 3 /* ACE170 80056FD0 3C0F8016 */ lui $t7, %hi(gGameInfo) # $t7, 0x8016 /* ACE174 80056FD4 032C6821 */ addu $t5, $t9, $t4 @@ -47,7 +47,7 @@ glabel func_80056F6C .L80056FEC: /* ACE18C 80056FEC 50400004 */ beql $v0, $zero, .L80057000 /* ACE190 80056FF0 2611005C */ addiu $s1, $s0, 0x5c -/* ACE194 80056FF4 0C011495 */ jal func_80045254 +/* ACE194 80056FF4 0C011495 */ jal Camera_CopyPREGToModeValues /* ACE198 80056FF8 02002025 */ move $a0, $s0 /* ACE19C 80056FFC 2611005C */ addiu $s1, $s0, 0x5c .L80057000: @@ -95,18 +95,18 @@ glabel func_80056F6C /* ACE23C 8005709C C4860000 */ lwc1 $f6, ($a0) /* ACE240 800570A0 C7A800A4 */ lwc1 $f8, 0xa4($sp) /* ACE244 800570A4 46062032 */ c.eq.s $f4, $f6 -/* ACE248 800570A8 00000000 */ nop +/* ACE248 800570A8 00000000 */ nop /* ACE24C 800570AC 45020010 */ bc1fl .L800570F0 /* ACE250 800570B0 8E0F0090 */ lw $t7, 0x90($s0) /* ACE254 800570B4 C48A0004 */ lwc1 $f10, 4($a0) /* ACE258 800570B8 C7A400A8 */ lwc1 $f4, 0xa8($sp) /* ACE25C 800570BC 460A4032 */ c.eq.s $f8, $f10 -/* ACE260 800570C0 00000000 */ nop +/* ACE260 800570C0 00000000 */ nop /* ACE264 800570C4 4502000A */ bc1fl .L800570F0 /* ACE268 800570C8 8E0F0090 */ lw $t7, 0x90($s0) /* ACE26C 800570CC C4860008 */ lwc1 $f6, 8($a0) /* ACE270 800570D0 46062032 */ c.eq.s $f4, $f6 -/* ACE274 800570D4 00000000 */ nop +/* ACE274 800570D4 00000000 */ nop /* ACE278 800570D8 45020005 */ bc1fl .L800570F0 /* ACE27C 800570DC 8E0F0090 */ lw $t7, 0x90($s0) /* ACE280 800570E0 860D015E */ lh $t5, 0x15e($s0) @@ -244,7 +244,7 @@ glabel func_80056F6C /* ACE484 800572E4 46022181 */ sub.s $f6, $f4, $f2 /* ACE488 800572E8 46083282 */ mul.s $f10, $f6, $f8 /* ACE48C 800572EC 44883000 */ mtc1 $t0, $f6 -/* ACE490 800572F0 00000000 */ nop +/* ACE490 800572F0 00000000 */ nop /* ACE494 800572F4 46803220 */ cvt.s.w $f8, $f6 /* ACE498 800572F8 460A1100 */ add.s $f4, $f2, $f10 /* ACE49C 800572FC E6440008 */ swc1 $f4, 8($s2) @@ -253,7 +253,7 @@ glabel func_80056F6C /* ACE4A8 80057308 C60000FC */ lwc1 $f0, 0xfc($s0) /* ACE4AC 8005730C 460A4102 */ mul.s $f4, $f8, $f10 /* ACE4B0 80057310 44994000 */ mtc1 $t9, $f8 -/* ACE4B4 80057314 00000000 */ nop +/* ACE4B4 80057314 00000000 */ nop /* ACE4B8 80057318 468042A0 */ cvt.s.w $f10, $f8 /* ACE4BC 8005731C 46002181 */ sub.s $f6, $f4, $f0 /* ACE4C0 80057320 460A3103 */ div.s $f4, $f6, $f10 diff --git a/asm/non_matchings/code/z_camera/func_80056C20.s b/asm/non_matchings/code/z_camera/Camera_Special7.s similarity index 98% rename from asm/non_matchings/code/z_camera/func_80056C20.s rename to asm/non_matchings/code/z_camera/Camera_Special7.s index 90ada558b5..c2ebddb65f 100644 --- a/asm/non_matchings/code/z_camera/func_80056C20.s +++ b/asm/non_matchings/code/z_camera/Camera_Special7.s @@ -18,7 +18,7 @@ glabel D_8013A3C0 .float 0.1 .text -glabel func_80056C20 +glabel Camera_Special7 /* ACDDC0 80056C20 27BDFF90 */ addiu $sp, $sp, -0x70 /* ACDDC4 80056C24 AFB00020 */ sw $s0, 0x20($sp) /* ACDDC8 80056C28 00808025 */ move $s0, $a0 @@ -38,7 +38,7 @@ glabel func_80056C20 /* ACDE00 80056C60 85F800A4 */ lh $t8, 0xa4($t7) /* ACDE04 80056C64 26110094 */ addiu $s1, $s0, 0x94 /* ACDE08 80056C68 17010003 */ bne $t8, $at, .L80056C78 -/* ACDE0C 80056C6C 00000000 */ nop +/* ACDE0C 80056C6C 00000000 */ nop /* ACDE10 80056C70 10000016 */ b .L80056CCC /* ACDE14 80056C74 A6190000 */ sh $t9, ($s0) .L80056C78: @@ -48,7 +48,7 @@ glabel func_80056C20 /* ACDE24 80056C84 24080002 */ li $t0, 2 /* ACDE28 80056C88 3C018014 */ lui $at, %hi(D_8013A3B0) /* ACDE2C 80056C8C 4606203C */ c.lt.s $f4, $f6 -/* ACDE30 80056C90 00000000 */ nop +/* ACDE30 80056C90 00000000 */ nop /* ACDE34 80056C94 45020004 */ bc1fl .L80056CA8 /* ACDE38 80056C98 C6280004 */ lwc1 $f8, 4($s1) /* ACDE3C 80056C9C 1000000B */ b .L80056CCC @@ -58,7 +58,7 @@ glabel func_80056C20 /* ACDE48 80056CA8 C42AA3B0 */ lwc1 $f10, %lo(D_8013A3B0)($at) /* ACDE4C 80056CAC 24090001 */ li $t1, 1 /* ACDE50 80056CB0 460A403C */ c.lt.s $f8, $f10 -/* ACDE54 80056CB4 00000000 */ nop +/* ACDE54 80056CB4 00000000 */ nop /* ACDE58 80056CB8 45020004 */ bc1fl .L80056CCC /* ACDE5C 80056CBC A6090000 */ sh $t1, ($s0) /* ACDE60 80056CC0 10000002 */ b .L80056CCC @@ -78,7 +78,7 @@ glabel func_80056C20 /* ACDE90 80056CF0 C432DACC */ lwc1 $f18, %lo(D_8011DACC)($at) /* ACDE94 80056CF4 26110094 */ addiu $s1, $s0, 0x94 /* ACDE98 80056CF8 4612803C */ c.lt.s $f16, $f18 -/* ACDE9C 80056CFC 00000000 */ nop +/* ACDE9C 80056CFC 00000000 */ nop /* ACDEA0 80056D00 45020050 */ bc1fl .L80056E44 /* ACDEA4 80056D04 8E2B0000 */ lw $t3, ($s1) /* ACDEA8 80056D08 8E2F0000 */ lw $t7, ($s1) @@ -154,7 +154,7 @@ glabel func_80056C20 /* ACDFC0 80056E20 4600810D */ trunc.w.s $f4, $f16 /* ACDFC4 80056E24 46009182 */ mul.s $f6, $f18, $f0 /* ACDFC8 80056E28 44092000 */ mfc1 $t1, $f4 -/* ACDFCC 80056E2C 00000000 */ nop +/* ACDFCC 80056E2C 00000000 */ nop /* ACDFD0 80056E30 A609015A */ sh $t1, 0x15a($s0) /* ACDFD4 80056E34 46083280 */ add.s $f10, $f6, $f8 /* ACDFD8 80056E38 10000034 */ b .L80056F0C diff --git a/asm/non_matchings/code/z_camera/func_80057448.s b/asm/non_matchings/code/z_camera/Camera_Special9.s similarity index 97% rename from asm/non_matchings/code/z_camera/func_80057448.s rename to asm/non_matchings/code/z_camera/Camera_Special9.s index 80f138e64d..30f3f0201b 100644 --- a/asm/non_matchings/code/z_camera/func_80057448.s +++ b/asm/non_matchings/code/z_camera/Camera_Special9.s @@ -19,7 +19,7 @@ glabel D_8013A3F0 .float 0.001 .text -glabel func_80057448 +glabel Camera_Special9 /* ACE5E8 80057448 27BDFF38 */ addiu $sp, $sp, -0xc8 /* ACE5EC 8005744C AFB00020 */ sw $s0, 0x20($sp) /* ACE5F0 80057450 00808025 */ move $s0, $a0 @@ -42,17 +42,17 @@ glabel func_80057448 /* ACE634 80057494 2401000A */ li $at, 10 /* ACE638 80057498 845801F0 */ lh $t8, 0x1f0($v0) /* ACE63C 8005749C 44982000 */ mtc1 $t8, $f4 -/* ACE640 800574A0 00000000 */ nop +/* ACE640 800574A0 00000000 */ nop /* ACE644 800574A4 468021A0 */ cvt.s.w $f6, $f4 /* ACE648 800574A8 460C3082 */ mul.s $f2, $f6, $f12 -/* ACE64C 800574AC 00000000 */ nop +/* ACE64C 800574AC 00000000 */ nop /* ACE650 800574B0 46121102 */ mul.s $f4, $f2, $f18 /* ACE654 800574B4 46024280 */ add.s $f10, $f8, $f2 /* ACE658 800574B8 46045181 */ sub.s $f6, $f10, $f4 /* ACE65C 800574BC E7A60078 */ swc1 $f6, 0x78($sp) /* ACE660 800574C0 8603015E */ lh $v1, 0x15e($s0) /* ACE664 800574C4 10600008 */ beqz $v1, .L800574E8 -/* ACE668 800574C8 00000000 */ nop +/* ACE668 800574C8 00000000 */ nop /* ACE66C 800574CC 10610006 */ beq $v1, $at, .L800574E8 /* ACE670 800574D0 24010014 */ li $at, 20 /* ACE674 800574D4 50610005 */ beql $v1, $at, .L800574EC @@ -63,11 +63,11 @@ glabel func_80057448 .L800574E8: /* ACE688 800574E8 86190142 */ lh $t9, 0x142($s0) .L800574EC: -/* ACE68C 800574EC 3C0C8012 */ lui $t4, %hi(D_8011D068) +/* ACE68C 800574EC 3C0C8012 */ lui $t4, %hi(sCameraSettings) /* ACE690 800574F0 860D0144 */ lh $t5, 0x144($s0) /* ACE694 800574F4 001958C0 */ sll $t3, $t9, 3 /* ACE698 800574F8 018B6021 */ addu $t4, $t4, $t3 -/* ACE69C 800574FC 8D8CD068 */ lw $t4, %lo(D_8011D068)($t4) +/* ACE69C 800574FC 8D8CD068 */ lw $t4, %lo(sCameraSettings+4)($t4) /* ACE6A0 80057500 000D70C0 */ sll $t6, $t5, 3 /* ACE6A4 80057504 C7A40078 */ lwc1 $f4, 0x78($sp) /* ACE6A8 80057508 018E7821 */ addu $t7, $t4, $t6 @@ -77,17 +77,17 @@ glabel func_80057448 /* ACE6B8 80057518 84580000 */ lh $t8, ($v0) /* ACE6BC 8005751C 24420008 */ addiu $v0, $v0, 8 /* ACE6C0 80057520 44984000 */ mtc1 $t8, $f8 -/* ACE6C4 80057524 00000000 */ nop +/* ACE6C4 80057524 00000000 */ nop /* ACE6C8 80057528 46804420 */ cvt.s.w $f16, $f8 /* ACE6CC 8005752C 460C8482 */ mul.s $f18, $f16, $f12 -/* ACE6D0 80057530 00000000 */ nop +/* ACE6D0 80057530 00000000 */ nop /* ACE6D4 80057534 46009282 */ mul.s $f10, $f18, $f0 -/* ACE6D8 80057538 00000000 */ nop +/* ACE6D8 80057538 00000000 */ nop /* ACE6DC 8005753C 46045182 */ mul.s $f6, $f10, $f4 /* ACE6E0 80057540 E4860000 */ swc1 $f6, ($a0) /* ACE6E4 80057544 8459FFFC */ lh $t9, -4($v0) /* ACE6E8 80057548 44994000 */ mtc1 $t9, $f8 -/* ACE6EC 8005754C 00000000 */ nop +/* ACE6EC 8005754C 00000000 */ nop /* ACE6F0 80057550 46804420 */ cvt.s.w $f16, $f8 /* ACE6F4 80057554 E4900004 */ swc1 $f16, 4($a0) /* ACE6F8 80057558 844B0000 */ lh $t3, ($v0) @@ -98,7 +98,7 @@ glabel func_80057448 .L8005756C: /* ACE70C 8005756C 10600003 */ beqz $v1, .L8005757C /* ACE710 80057570 AFAC0038 */ sw $t4, 0x38($sp) -/* ACE714 80057574 0C011495 */ jal func_80045254 +/* ACE714 80057574 0C011495 */ jal Camera_CopyPREGToModeValues /* ACE718 80057578 02002025 */ move $a0, $s0 .L8005757C: /* ACE71C 8005757C 8E050000 */ lw $a1, ($s0) @@ -150,7 +150,7 @@ glabel func_80057448 /* ACE7CC 8005762C 002C0821 */ addu $at, $at, $t4 /* ACE7D0 80057630 8C2CA3D4 */ lw $t4, %lo(jtbl_8013A3D4)($at) /* ACE7D4 80057634 01800008 */ jr $t4 -/* ACE7D8 80057638 00000000 */ nop +/* ACE7D8 80057638 00000000 */ nop glabel L8005763C /* ACE7DC 8005763C 860E014C */ lh $t6, 0x14c($s0) /* ACE7E0 80057640 24780001 */ addiu $t8, $v1, 1 @@ -431,9 +431,9 @@ glabel L80057A38 /* ACEC04 80057A64 02002025 */ move $a0, $s0 /* ACEC08 80057A68 24060002 */ li $a2, 2 /* ACEC0C 80057A6C 4604303C */ c.lt.s $f6, $f4 -/* ACEC10 80057A70 00000000 */ nop +/* ACEC10 80057A70 00000000 */ nop /* ACEC14 80057A74 45010021 */ bc1t .L80057AFC -/* ACEC18 80057A78 00000000 */ nop +/* ACEC18 80057A78 00000000 */ nop /* ACEC1C 80057A7C 8D6BBD7C */ lw $t3, %lo(D_8015BD7C)($t3) /* ACEC20 80057A80 3C01FFFF */ lui $at, (0xFFFF7FFF >> 16) # lui $at, 0xffff /* ACEC24 80057A84 34217FFF */ ori $at, (0xFFFF7FFF & 0xFFFF) # ori $at, $at, 0x7fff @@ -461,13 +461,13 @@ glabel L80057A38 /* ACEC7C 80057ADC 2401DFFF */ li $at, -8193 /* ACEC80 80057AE0 00416827 */ nor $t5, $v0, $at /* ACEC84 80057AE4 11A00005 */ beqz $t5, .L80057AFC -/* ACEC88 80057AE8 00000000 */ nop +/* ACEC88 80057AE8 00000000 */ nop /* ACEC8C 80057AEC 854C0008 */ lh $t4, 8($t2) /* ACEC90 80057AF0 318E0008 */ andi $t6, $t4, 8 /* ACEC94 80057AF4 51C00007 */ beql $t6, $zero, .L80057B14 /* ACEC98 80057AF8 8FB9003C */ lw $t9, 0x3c($sp) .L80057AFC: -/* ACEC9C 80057AFC 0C016952 */ jal func_8005A548 +/* ACEC9C 80057AFC 0C016952 */ jal Camera_ChangeSetting /* ACECA0 80057B00 86050154 */ lh $a1, 0x154($s0) /* ACECA4 80057B04 860F014C */ lh $t7, 0x14c($s0) /* ACECA8 80057B08 35F80006 */ ori $t8, $t7, 6 @@ -506,4 +506,4 @@ glabel L80057A38 /* ACED28 80057B88 8FB00020 */ lw $s0, 0x20($sp) /* ACED2C 80057B8C 27BD00C8 */ addiu $sp, $sp, 0xc8 /* ACED30 80057B90 03E00008 */ jr $ra -/* ACED34 80057B94 00000000 */ nop +/* ACED34 80057B94 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/func_8005049C.s b/asm/non_matchings/code/z_camera/Camera_Subj3.s similarity index 98% rename from asm/non_matchings/code/z_camera/func_8005049C.s rename to asm/non_matchings/code/z_camera/Camera_Subj3.s index 48b64c671c..6edc5ea703 100644 --- a/asm/non_matchings/code/z_camera/func_8005049C.s +++ b/asm/non_matchings/code/z_camera/Camera_Subj3.s @@ -15,7 +15,7 @@ glabel D_8013A1AC .float 0.01 .text -glabel func_8005049C +glabel Camera_Subj3 /* AC763C 8005049C 27BDFF50 */ addiu $sp, $sp, -0xb0 /* AC7640 800504A0 AFB10018 */ sw $s1, 0x18($sp) /* AC7644 800504A4 AFB00014 */ sw $s0, 0x14($sp) @@ -40,14 +40,14 @@ glabel func_8005049C .L800504F0: /* AC7690 800504F0 0C010EAF */ jal func_80043ABC /* AC7694 800504F4 02002025 */ move $a0, $s0 -/* AC7698 800504F8 0C011495 */ jal func_80045254 +/* AC7698 800504F8 0C011495 */ jal Camera_CopyPREGToModeValues /* AC769C 800504FC 02002025 */ move $a0, $s0 /* AC76A0 80050500 86190142 */ lh $t9, 0x142($s0) -/* AC76A4 80050504 3C0B8012 */ lui $t3, %hi(D_8011D068) +/* AC76A4 80050504 3C0B8012 */ lui $t3, %hi(sCameraSettings) /* AC76A8 80050508 860C0144 */ lh $t4, 0x144($s0) /* AC76AC 8005050C 001950C0 */ sll $t2, $t9, 3 /* AC76B0 80050510 016A5821 */ addu $t3, $t3, $t2 -/* AC76B4 80050514 8D6BD068 */ lw $t3, %lo(D_8011D068)($t3) +/* AC76B4 80050514 8D6BD068 */ lw $t3, %lo(sCameraSettings+4)($t3) /* AC76B8 80050518 000C68C0 */ sll $t5, $t4, 3 /* AC76BC 8005051C 3C018014 */ lui $at, %hi(D_8013A19C) /* AC76C0 80050520 016D7021 */ addu $t6, $t3, $t5 diff --git a/asm/non_matchings/code/z_camera/func_80050B24.s b/asm/non_matchings/code/z_camera/Camera_Subj4.s similarity index 98% rename from asm/non_matchings/code/z_camera/func_80050B24.s rename to asm/non_matchings/code/z_camera/Camera_Subj4.s index a042d00149..fd37ed5cad 100644 --- a/asm/non_matchings/code/z_camera/func_80050B24.s +++ b/asm/non_matchings/code/z_camera/Camera_Subj4.s @@ -3,7 +3,7 @@ glabel D_8013A1B0 .float 0.416667 .text -glabel func_80050B24 +glabel Camera_Subj4 /* AC7CC4 80050B24 27BDFF48 */ addiu $sp, $sp, -0xb8 /* AC7CC8 80050B28 AFBF0024 */ sw $ra, 0x24($sp) /* AC7CCC 80050B2C AFB30020 */ sw $s3, 0x20($sp) @@ -26,11 +26,11 @@ glabel func_80050B24 .L80050B70: /* AC7D10 80050B70 862F0142 */ lh $t7, 0x142($s1) .L80050B74: -/* AC7D14 80050B74 3C198012 */ lui $t9, %hi(D_8011D068) +/* AC7D14 80050B74 3C198012 */ lui $t9, %hi(sCameraSettings) /* AC7D18 80050B78 86280144 */ lh $t0, 0x144($s1) /* AC7D1C 80050B7C 000FC0C0 */ sll $t8, $t7, 3 /* AC7D20 80050B80 0338C821 */ addu $t9, $t9, $t8 -/* AC7D24 80050B84 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) +/* AC7D24 80050B84 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) /* AC7D28 80050B88 000848C0 */ sll $t1, $t0, 3 /* AC7D2C 80050B8C 3C0C8016 */ lui $t4, %hi(gGameInfo) # $t4, 0x8016 /* AC7D30 80050B90 03295021 */ addu $t2, $t9, $t1 @@ -42,7 +42,7 @@ glabel func_80050B24 .L80050BA8: /* AC7D48 80050BA8 50400004 */ beql $v0, $zero, .L80050BBC /* AC7D4C 80050BAC 8E23008C */ lw $v1, 0x8c($s1) -/* AC7D50 80050BB0 0C011495 */ jal func_80045254 +/* AC7D50 80050BB0 0C011495 */ jal Camera_CopyPREGToModeValues /* AC7D54 80050BB4 02202025 */ move $a0, $s1 /* AC7D58 80050BB8 8E23008C */ lw $v1, 0x8c($s1) .L80050BBC: diff --git a/asm/non_matchings/code/z_camera/func_80052460.s b/asm/non_matchings/code/z_camera/Camera_Unique0.s similarity index 98% rename from asm/non_matchings/code/z_camera/func_80052460.s rename to asm/non_matchings/code/z_camera/Camera_Unique0.s index 194c944cf4..8e49b02900 100644 --- a/asm/non_matchings/code/z_camera/func_80052460.s +++ b/asm/non_matchings/code/z_camera/Camera_Unique0.s @@ -6,7 +6,7 @@ glabel D_8013A228 .float 0.001 .text -glabel func_80052460 +glabel Camera_Unique0 /* AC9600 80052460 27BDFF78 */ addiu $sp, $sp, -0x88 /* AC9604 80052464 AFB00018 */ sw $s0, 0x18($sp) /* AC9608 80052468 00808025 */ move $s0, $a0 @@ -32,11 +32,11 @@ glabel func_80052460 .L800524B8: /* AC9658 800524B8 86180142 */ lh $t8, 0x142($s0) .L800524BC: -/* AC965C 800524BC 3C098012 */ lui $t1, %hi(D_8011D068) +/* AC965C 800524BC 3C098012 */ lui $t1, %hi(sCameraSettings) /* AC9660 800524C0 860A0144 */ lh $t2, 0x144($s0) /* AC9664 800524C4 0018C8C0 */ sll $t9, $t8, 3 /* AC9668 800524C8 01394821 */ addu $t1, $t1, $t9 -/* AC966C 800524CC 8D29D068 */ lw $t1, %lo(D_8011D068)($t1) +/* AC966C 800524CC 8D29D068 */ lw $t1, %lo(sCameraSettings+4)($t1) /* AC9670 800524D0 000A58C0 */ sll $t3, $t2, 3 /* AC9674 800524D4 3C0E8016 */ lui $t6, %hi(gGameInfo) # $t6, 0x8016 /* AC9678 800524D8 012B6021 */ addu $t4, $t1, $t3 @@ -49,7 +49,7 @@ glabel func_80052460 .L800524F4: /* AC9694 800524F4 10400004 */ beqz $v0, .L80052508 /* AC9698 800524F8 AFAF0030 */ sw $t7, 0x30($sp) -/* AC969C 800524FC 0C011495 */ jal func_80045254 +/* AC969C 800524FC 0C011495 */ jal Camera_CopyPREGToModeValues /* AC96A0 80052500 E7A20084 */ swc1 $f2, 0x84($sp) /* AC96A4 80052504 C7A20084 */ lwc1 $f2, 0x84($sp) .L80052508: @@ -274,7 +274,7 @@ glabel func_80052460 /* AC99F4 80052854 A619014C */ sh $t9, 0x14c($s0) /* AC99F8 80052858 E6040100 */ swc1 $f4, 0x100($s0) /* AC99FC 8005285C 46105481 */ sub.s $f18, $f10, $f16 -/* AC9A00 80052860 0C016952 */ jal func_8005A548 +/* AC9A00 80052860 0C016952 */ jal Camera_ChangeSetting /* AC9A04 80052864 E61200EC */ swc1 $f18, 0xec($s0) /* AC9A08 80052868 10000057 */ b .L800529C8 /* AC9A0C 8005286C 8FBF001C */ lw $ra, 0x1c($sp) @@ -363,7 +363,7 @@ glabel func_80052460 /* AC9B44 800529A4 C5500008 */ lwc1 $f16, 8($t2) /* AC9B48 800529A8 E6040100 */ swc1 $f4, 0x100($s0) /* AC9B4C 800529AC 46105481 */ sub.s $f18, $f10, $f16 -/* AC9B50 800529B0 0C016952 */ jal func_8005A548 +/* AC9B50 800529B0 0C016952 */ jal Camera_ChangeSetting /* AC9B54 800529B4 E61200EC */ swc1 $f18, 0xec($s0) /* AC9B58 800529B8 8609014C */ lh $t1, 0x14c($s0) /* AC9B5C 800529BC 352B0004 */ ori $t3, $t1, 4 diff --git a/asm/non_matchings/code/z_camera/func_800515A4.s b/asm/non_matchings/code/z_camera/Camera_Unique1.s similarity index 98% rename from asm/non_matchings/code/z_camera/func_800515A4.s rename to asm/non_matchings/code/z_camera/Camera_Unique1.s index 0ff01a62af..0df7d872cc 100644 --- a/asm/non_matchings/code/z_camera/func_800515A4.s +++ b/asm/non_matchings/code/z_camera/Camera_Unique1.s @@ -24,7 +24,7 @@ glabel D_8013A1E8 .float 0.01 .text -glabel func_800515A4 +glabel Camera_Unique1 /* AC8744 800515A4 27BDFF50 */ addiu $sp, $sp, -0xb0 /* AC8748 800515A8 AFB00014 */ sw $s0, 0x14($sp) /* AC874C 800515AC 00808025 */ move $s0, $a0 @@ -54,13 +54,13 @@ glabel func_800515A4 /* AC87A8 80051608 860F0142 */ lh $t7, 0x142($s0) /* AC87AC 8005160C 856C01F0 */ lh $t4, 0x1f0($t3) /* AC87B0 80051610 46008483 */ div.s $f18, $f16, $f0 -/* AC87B4 80051614 3C198012 */ lui $t9, %hi(D_8011D068) +/* AC87B4 80051614 3C198012 */ lui $t9, %hi(sCameraSettings) /* AC87B8 80051618 448C2000 */ mtc1 $t4, $f4 /* AC87BC 8005161C 000FC0C0 */ sll $t8, $t7, 3 /* AC87C0 80051620 86080144 */ lh $t0, 0x144($s0) /* AC87C4 80051624 468021A0 */ cvt.s.w $f6, $f4 /* AC87C8 80051628 0338C821 */ addu $t9, $t9, $t8 -/* AC87CC 8005162C 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) +/* AC87CC 8005162C 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) /* AC87D0 80051630 000848C0 */ sll $t1, $t0, 3 /* AC87D4 80051634 3C018014 */ lui $at, %hi(D_8013A1C8) /* AC87D8 80051638 03295021 */ addu $t2, $t9, $t1 @@ -130,7 +130,7 @@ glabel func_800515A4 .L80051738: /* AC88D8 80051738 50600004 */ beql $v1, $zero, .L8005174C /* AC88DC 8005173C 240D0001 */ li $t5, 1 -/* AC88E0 80051740 0C011495 */ jal func_80045254 +/* AC88E0 80051740 0C011495 */ jal Camera_CopyPREGToModeValues /* AC88E4 80051744 02002025 */ move $a0, $s0 /* AC88E8 80051748 240D0001 */ li $t5, 1 .L8005174C: diff --git a/asm/non_matchings/code/z_camera/func_80051B3C.s b/asm/non_matchings/code/z_camera/Camera_Unique2.s similarity index 98% rename from asm/non_matchings/code/z_camera/func_80051B3C.s rename to asm/non_matchings/code/z_camera/Camera_Unique2.s index 4ac80f5e24..a28479ee1f 100644 --- a/asm/non_matchings/code/z_camera/func_80051B3C.s +++ b/asm/non_matchings/code/z_camera/Camera_Unique2.s @@ -18,7 +18,7 @@ glabel D_8013A200 .float 0.2 .text -glabel func_80051B3C +glabel Camera_Unique2 /* AC8CDC 80051B3C 27BDFF78 */ addiu $sp, $sp, -0x88 /* AC8CE0 80051B40 AFB0001C */ sw $s0, 0x1c($sp) /* AC8CE4 80051B44 00808025 */ move $s0, $a0 @@ -56,12 +56,12 @@ glabel func_80051B3C /* AC8D60 80051BC0 C7AA0048 */ lwc1 $f10, 0x48($sp) /* AC8D64 80051BC4 860F0142 */ lh $t7, 0x142($s0) /* AC8D68 80051BC8 468021A0 */ cvt.s.w $f6, $f4 -/* AC8D6C 80051BCC 3C198012 */ lui $t9, %hi(D_8011D068) +/* AC8D6C 80051BCC 3C198012 */ lui $t9, %hi(sCameraSettings) /* AC8D70 80051BD0 000FC0C0 */ sll $t8, $t7, 3 /* AC8D74 80051BD4 86080144 */ lh $t0, 0x144($s0) /* AC8D78 80051BD8 0338C821 */ addu $t9, $t9, $t8 /* AC8D7C 80051BDC 460A4103 */ div.s $f4, $f8, $f10 -/* AC8D80 80051BE0 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) +/* AC8D80 80051BE0 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) /* AC8D84 80051BE4 000848C0 */ sll $t1, $t0, 3 /* AC8D88 80051BE8 3C013F80 */ li $at, 0x3F800000 # 0.000000 /* AC8D8C 80051BEC 460C3002 */ mul.s $f0, $f6, $f12 @@ -99,7 +99,7 @@ glabel func_80051B3C .L80051C6C: /* AC8E0C 80051C6C 50600004 */ beql $v1, $zero, .L80051C80 /* AC8E10 80051C70 8619000C */ lh $t9, 0xc($s0) -/* AC8E14 80051C74 0C011495 */ jal func_80045254 +/* AC8E14 80051C74 0C011495 */ jal Camera_CopyPREGToModeValues /* AC8E18 80051C78 02002025 */ move $a0, $s0 /* AC8E1C 80051C7C 8619000C */ lh $t9, 0xc($s0) .L80051C80: diff --git a/asm/non_matchings/code/z_camera/func_80051F58.s b/asm/non_matchings/code/z_camera/Camera_Unique3.s similarity index 98% rename from asm/non_matchings/code/z_camera/func_80051F58.s rename to asm/non_matchings/code/z_camera/Camera_Unique3.s index 9267cf1631..7e8a3621d8 100644 --- a/asm/non_matchings/code/z_camera/func_80051F58.s +++ b/asm/non_matchings/code/z_camera/Camera_Unique3.s @@ -14,7 +14,7 @@ glabel D_8013A220 .float 0.001 .text -glabel func_80051F58 +glabel Camera_Unique3 /* AC90F8 80051F58 27BDFF98 */ addiu $sp, $sp, -0x68 /* AC90FC 80051F5C AFB00018 */ sw $s0, 0x18($sp) /* AC9100 80051F60 00808025 */ move $s0, $a0 @@ -47,13 +47,13 @@ glabel func_80051F58 /* AC9168 80051FC8 86190142 */ lh $t9, 0x142($s0) /* AC916C 80051FCC 85AE01F0 */ lh $t6, 0x1f0($t5) /* AC9170 80051FD0 46008483 */ div.s $f18, $f16, $f0 -/* AC9174 80051FD4 3C098012 */ lui $t1, %hi(D_8011D068) +/* AC9174 80051FD4 3C098012 */ lui $t1, %hi(sCameraSettings) /* AC9178 80051FD8 448E2000 */ mtc1 $t6, $f4 /* AC917C 80051FDC 001940C0 */ sll $t0, $t9, 3 /* AC9180 80051FE0 860A0144 */ lh $t2, 0x144($s0) /* AC9184 80051FE4 468021A0 */ cvt.s.w $f6, $f4 /* AC9188 80051FE8 01284821 */ addu $t1, $t1, $t0 -/* AC918C 80051FEC 8D29D068 */ lw $t1, %lo(D_8011D068)($t1) +/* AC918C 80051FEC 8D29D068 */ lw $t1, %lo(sCameraSettings+4)($t1) /* AC9190 80051FF0 000A58C0 */ sll $t3, $t2, 3 /* AC9194 80051FF4 2604000C */ addiu $a0, $s0, 0xc /* AC9198 80051FF8 012B6021 */ addu $t4, $t1, $t3 @@ -86,7 +86,7 @@ glabel func_80051F58 /* AC9200 80052060 260A000C */ addiu $t2, $s0, 0xc /* AC9204 80052064 10600003 */ beqz $v1, .L80052074 /* AC9208 80052068 AFAA0028 */ sw $t2, 0x28($sp) -/* AC920C 8005206C 0C011495 */ jal func_80045254 +/* AC920C 8005206C 0C011495 */ jal Camera_CopyPREGToModeValues /* AC9210 80052070 02002025 */ move $a0, $s0 .L80052074: /* AC9214 80052074 8FA90028 */ lw $t1, 0x28($sp) @@ -226,7 +226,7 @@ glabel L80052230 /* AC9400 80052260 860C014C */ lh $t4, 0x14c($s0) /* AC9404 80052264 24060002 */ li $a2, 2 /* AC9408 80052268 318DFFF7 */ andi $t5, $t4, 0xfff7 -/* AC940C 8005226C 0C016952 */ jal func_8005A548 +/* AC940C 8005226C 0C016952 */ jal Camera_ChangeSetting /* AC9410 80052270 A60D014C */ sh $t5, 0x14c($s0) /* AC9414 80052274 10000076 */ b .L80052450 /* AC9418 80052278 8FBF001C */ lw $ra, 0x1c($sp) @@ -335,7 +335,7 @@ glabel L80052318 /* AC959C 800523FC 8FA90028 */ lw $t1, 0x28($sp) /* AC95A0 80052400 C52A0004 */ lwc1 $f10, 4($t1) /* AC95A4 80052404 E60A00FC */ swc1 $f10, 0xfc($s0) -/* AC95A8 80052408 0C016952 */ jal func_8005A548 +/* AC95A8 80052408 0C016952 */ jal Camera_ChangeSetting /* AC95AC 8005240C AFA3002C */ sw $v1, 0x2c($sp) /* AC95B0 80052410 44803000 */ mtc1 $zero, $f6 /* AC95B4 80052414 8FA3002C */ lw $v1, 0x2c($sp) diff --git a/asm/non_matchings/code/z_camera/func_80052B90.s b/asm/non_matchings/code/z_camera/Camera_Unique7.s similarity index 97% rename from asm/non_matchings/code/z_camera/func_80052B90.s rename to asm/non_matchings/code/z_camera/Camera_Unique7.s index 3beb1342c8..20c63b9f0e 100644 --- a/asm/non_matchings/code/z_camera/func_80052B90.s +++ b/asm/non_matchings/code/z_camera/Camera_Unique7.s @@ -3,7 +3,7 @@ glabel D_8013A22C .float 0.01 .text -glabel func_80052B90 +glabel Camera_Unique7 /* AC9D30 80052B90 27BDFFA0 */ addiu $sp, $sp, -0x60 /* AC9D34 80052B94 AFBF001C */ sw $ra, 0x1c($sp) /* AC9D38 80052B98 AFB00018 */ sw $s0, 0x18($sp) @@ -21,11 +21,11 @@ glabel func_80052B90 /* AC9D68 80052BC8 00000000 */ nop .L80052BCC: /* AC9D6C 80052BCC 860F0142 */ lh $t7, 0x142($s0) -/* AC9D70 80052BD0 3C198012 */ lui $t9, %hi(D_8011D068) +/* AC9D70 80052BD0 3C198012 */ lui $t9, %hi(sCameraSettings) /* AC9D74 80052BD4 86080144 */ lh $t0, 0x144($s0) /* AC9D78 80052BD8 000FC0C0 */ sll $t8, $t7, 3 /* AC9D7C 80052BDC 0338C821 */ addu $t9, $t9, $t8 -/* AC9D80 80052BE0 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) +/* AC9D80 80052BE0 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) /* AC9D84 80052BE4 000848C0 */ sll $t1, $t0, 3 /* AC9D88 80052BE8 3C0D8016 */ lui $t5, %hi(gGameInfo) # $t5, 0x8016 /* AC9D8C 80052BEC 03295021 */ addu $t2, $t9, $t1 @@ -43,7 +43,7 @@ glabel func_80052B90 .L80052C1C: /* AC9DBC 80052C1C 10600003 */ beqz $v1, .L80052C2C /* AC9DC0 80052C20 00000000 */ nop -/* AC9DC4 80052C24 0C011495 */ jal func_80045254 +/* AC9DC4 80052C24 0C011495 */ jal Camera_CopyPREGToModeValues /* AC9DC8 80052C28 02002025 */ move $a0, $s0 .L80052C2C: /* AC9DCC 80052C2C 0C0111DB */ jal func_8004476C diff --git a/asm/non_matchings/code/z_camera/func_80052E0C.s b/asm/non_matchings/code/z_camera/Camera_Unique9.s similarity index 98% rename from asm/non_matchings/code/z_camera/func_80052E0C.s rename to asm/non_matchings/code/z_camera/Camera_Unique9.s index e1e60d55ba..a73155706a 100644 --- a/asm/non_matchings/code/z_camera/func_80052E0C.s +++ b/asm/non_matchings/code/z_camera/Camera_Unique9.s @@ -10,7 +10,7 @@ glabel D_8013942C glabel D_80139450 .asciz "\x1B[43;30mcamera: warning: demo C: actor is not valid\n\x1B[m" .balign 4 - + glabel D_80139488 .asciz "\x1B[43;30mcamera: warning: demo C: actor is not valid\n\x1B[m" .balign 4 @@ -18,7 +18,7 @@ glabel D_80139488 glabel D_801394C0 .asciz "\x1B[43;30mcamera: warning: demo C: actor is not valid\n\x1B[m" .balign 4 - + glabel D_801394F8 .asciz "\x1B[43;30mcamera: warning: demo C: actor is not valid\n\x1B[m" .balign 4 @@ -79,9 +79,9 @@ glabel jtbl_8013A254 glabel D_8013A2B4 .float 182.041672 # 32768 / PI - + .text -glabel func_80052E0C +glabel Camera_Unique9 /* AC9FAC 80052E0C 27BDFEE8 */ addiu $sp, $sp, -0x118 /* AC9FB0 80052E10 AFBF001C */ sw $ra, 0x1c($sp) /* AC9FB4 80052E14 AFB10018 */ sw $s1, 0x18($sp) @@ -100,15 +100,15 @@ glabel func_80052E0C /* AC9FE8 80052E48 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* AC9FEC 80052E4C 85E20314 */ lh $v0, 0x314($t7) /* AC9FF0 80052E50 1040000F */ beqz $v0, .L80052E90 -/* AC9FF4 80052E54 00000000 */ nop +/* AC9FF4 80052E54 00000000 */ nop .L80052E58: /* AC9FF8 80052E58 86380142 */ lh $t8, 0x142($s1) .L80052E5C: -/* AC9FFC 80052E5C 3C0A8012 */ lui $t2, %hi(D_8011D068) +/* AC9FFC 80052E5C 3C0A8012 */ lui $t2, %hi(sCameraSettings) /* ACA000 80052E60 862B0144 */ lh $t3, 0x144($s1) /* ACA004 80052E64 0018C8C0 */ sll $t9, $t8, 3 /* ACA008 80052E68 01595021 */ addu $t2, $t2, $t9 -/* ACA00C 80052E6C 8D4AD068 */ lw $t2, %lo(D_8011D068)($t2) +/* ACA00C 80052E6C 8D4AD068 */ lw $t2, %lo(sCameraSettings+4)($t2) /* ACA010 80052E70 000B60C0 */ sll $t4, $t3, 3 /* ACA014 80052E74 3C0F8016 */ lui $t7, %hi(gGameInfo) # $t7, 0x8016 /* ACA018 80052E78 014C6821 */ addu $t5, $t2, $t4 @@ -120,7 +120,7 @@ glabel func_80052E0C .L80052E90: /* ACA030 80052E90 10400003 */ beqz $v0, .L80052EA0 /* ACA034 80052E94 26300008 */ addiu $s0, $s1, 8 -/* ACA038 80052E98 0C011495 */ jal func_80045254 +/* ACA038 80052E98 0C011495 */ jal Camera_CopyPREGToModeValues /* ACA03C 80052E9C 02202025 */ move $a0, $s1 .L80052EA0: /* ACA040 80052EA0 86180000 */ lh $t8, ($s0) @@ -209,12 +209,12 @@ glabel func_80052E0C /* ACA178 80052FD8 8F19067C */ lw $t9, 0x67c($t8) /* ACA17C 80052FDC 00195900 */ sll $t3, $t9, 4 /* ACA180 80052FE0 0561000E */ bgez $t3, .L8005301C -/* ACA184 80052FE4 00000000 */ nop +/* ACA184 80052FE4 00000000 */ nop /* ACA188 80052FE8 814C014F */ lb $t4, 0x14f($t2) /* ACA18C 80052FEC 24010001 */ li $at, 1 /* ACA190 80052FF0 24060008 */ li $a2, 8 /* ACA194 80052FF4 11810009 */ beq $t4, $at, .L8005301C -/* ACA198 80052FF8 00000000 */ nop +/* ACA198 80052FF8 00000000 */ nop /* ACA19C 80052FFC 8E24008C */ lw $a0, 0x8c($s1) /* ACA1A0 80053000 0C00B7CE */ jal func_8002DF38 /* ACA1A4 80053004 8E2500A8 */ lw $a1, 0xa8($s1) @@ -236,7 +236,7 @@ glabel func_80052E0C .L80053040: /* ACA1E0 80053040 862E0164 */ lh $t6, 0x164($s1) /* ACA1E4 80053044 11C00002 */ beqz $t6, .L80053050 -/* ACA1E8 80053048 00000000 */ nop +/* ACA1E8 80053048 00000000 */ nop /* ACA1EC 8005304C A6200160 */ sh $zero, 0x160($s1) .L80053050: /* ACA1F0 80053050 100004AB */ b .L80054300 @@ -269,7 +269,7 @@ glabel func_80052E0C /* ACA250 800530B0 262E0050 */ addiu $t6, $s1, 0x50 /* ACA254 800530B4 860B003A */ lh $t3, 0x3a($s0) /* ACA258 800530B8 11600011 */ beqz $t3, .L80053100 -/* ACA25C 800530BC 00000000 */ nop +/* ACA25C 800530BC 00000000 */ nop /* ACA260 800530C0 8E2A008C */ lw $t2, 0x8c($s1) /* ACA264 800530C4 C4660010 */ lwc1 $f6, 0x10($v1) /* ACA268 800530C8 C54400EC */ lwc1 $f4, 0xec($t2) @@ -295,7 +295,7 @@ glabel func_80052E0C /* ACA2B0 80053110 26380050 */ addiu $t8, $s1, 0x50 /* ACA2B4 80053114 860F003A */ lh $t7, 0x3a($s0) /* ACA2B8 80053118 11E0000E */ beqz $t7, .L80053154 -/* ACA2BC 8005311C 00000000 */ nop +/* ACA2BC 8005311C 00000000 */ nop /* ACA2C0 80053120 C6260050 */ lwc1 $f6, 0x50($s1) /* ACA2C4 80053124 C4680010 */ lwc1 $f8, 0x10($v1) /* ACA2C8 80053128 46083280 */ add.s $f10, $f6, $f8 @@ -321,11 +321,11 @@ glabel func_80052E0C .L80053170: /* ACA310 80053170 8E2500A8 */ lw $a1, 0xa8($s1) /* ACA314 80053174 10A00045 */ beqz $a1, .L8005328C -/* ACA318 80053178 00000000 */ nop +/* ACA318 80053178 00000000 */ nop /* ACA31C 8005317C 8CB90130 */ lw $t9, 0x130($a1) /* ACA320 80053180 27A400C0 */ addiu $a0, $sp, 0xc0 /* ACA324 80053184 13200041 */ beqz $t9, .L8005328C -/* ACA328 80053188 00000000 */ nop +/* ACA328 80053188 00000000 */ nop /* ACA32C 8005318C 0C00BBB9 */ jal func_8002EEE4 /* ACA330 80053190 A7A700D8 */ sh $a3, 0xd8($sp) /* ACA334 80053194 27A400AC */ addiu $a0, $sp, 0xac @@ -365,7 +365,7 @@ glabel func_80052E0C /* ACA3BC 8005321C 46062200 */ add.s $f8, $f4, $f6 /* ACA3C0 80053220 4600428D */ trunc.w.s $f10, $f8 /* ACA3C4 80053224 44185000 */ mfc1 $t8, $f10 -/* ACA3C8 80053228 00000000 */ nop +/* ACA3C8 80053228 00000000 */ nop /* ACA3CC 8005322C A7B800EA */ sh $t8, 0xea($sp) /* ACA3D0 80053230 8E190000 */ lw $t9, ($s0) /* ACA3D4 80053234 C7240018 */ lwc1 $f4, 0x18($t9) @@ -487,7 +487,7 @@ glabel func_80052E0C /* ACA574 800533D4 46083280 */ add.s $f10, $f6, $f8 /* ACA578 800533D8 4600510D */ trunc.w.s $f4, $f10 /* ACA57C 800533DC 44182000 */ mfc1 $t8, $f4 -/* ACA580 800533E0 00000000 */ nop +/* ACA580 800533E0 00000000 */ nop /* ACA584 800533E4 A7B800EA */ sh $t8, 0xea($sp) /* ACA588 800533E8 8E190000 */ lw $t9, ($s0) /* ACA58C 800533EC C7260018 */ lwc1 $f6, 0x18($t9) @@ -569,7 +569,7 @@ glabel func_80052E0C /* ACA698 800534F8 860A003A */ lh $t2, 0x3a($s0) /* ACA69C 800534FC 262F0074 */ addiu $t7, $s1, 0x74 /* ACA6A0 80053500 11400011 */ beqz $t2, .L80053548 -/* ACA6A4 80053504 00000000 */ nop +/* ACA6A4 80053504 00000000 */ nop /* ACA6A8 80053508 8E2C008C */ lw $t4, 0x8c($s1) /* ACA6AC 8005350C C46A001C */ lwc1 $f10, 0x1c($v1) /* ACA6B0 80053510 C58800E0 */ lwc1 $f8, 0xe0($t4) @@ -594,7 +594,7 @@ glabel func_80052E0C /* ACA6F4 80053554 26390074 */ addiu $t9, $s1, 0x74 /* ACA6F8 80053558 8618003A */ lh $t8, 0x3a($s0) /* ACA6FC 8005355C 1300000E */ beqz $t8, .L80053598 -/* ACA700 80053560 00000000 */ nop +/* ACA700 80053560 00000000 */ nop /* ACA704 80053564 C62A0074 */ lwc1 $f10, 0x74($s1) /* ACA708 80053568 C464001C */ lwc1 $f4, 0x1c($v1) /* ACA70C 8005356C 46045180 */ add.s $f6, $f10, $f4 @@ -624,11 +624,11 @@ glabel func_80052E0C .L800535C4: /* ACA764 800535C4 8E2500A8 */ lw $a1, 0xa8($s1) /* ACA768 800535C8 10A0005A */ beqz $a1, .L80053734 -/* ACA76C 800535CC 00000000 */ nop +/* ACA76C 800535CC 00000000 */ nop /* ACA770 800535D0 8CAB0130 */ lw $t3, 0x130($a1) /* ACA774 800535D4 27A400C0 */ addiu $a0, $sp, 0xc0 /* ACA778 800535D8 11600056 */ beqz $t3, .L80053734 -/* ACA77C 800535DC 00000000 */ nop +/* ACA77C 800535DC 00000000 */ nop /* ACA780 800535E0 0C00BBB9 */ jal func_8002EEE4 /* ACA784 800535E4 A7A700D6 */ sh $a3, 0xd6($sp) /* ACA788 800535E8 27A400AC */ addiu $a0, $sp, 0xac @@ -692,7 +692,7 @@ glabel func_80052E0C /* ACA864 800536C4 460A4100 */ add.s $f4, $f8, $f10 /* ACA868 800536C8 4600218D */ trunc.w.s $f6, $f4 /* ACA86C 800536CC 44183000 */ mfc1 $t8, $f6 -/* ACA870 800536D0 00000000 */ nop +/* ACA870 800536D0 00000000 */ nop /* ACA874 800536D4 A7B800EA */ sh $t8, 0xea($sp) /* ACA878 800536D8 8E190000 */ lw $t9, ($s0) /* ACA87C 800536DC C7280024 */ lwc1 $f8, 0x24($t9) @@ -813,7 +813,7 @@ glabel func_80052E0C /* ACAA18 80053878 46045180 */ add.s $f6, $f10, $f4 /* ACAA1C 8005387C 4600320D */ trunc.w.s $f8, $f6 /* ACAA20 80053880 44184000 */ mfc1 $t8, $f8 -/* ACAA24 80053884 00000000 */ nop +/* ACAA24 80053884 00000000 */ nop /* ACAA28 80053888 A7B800EA */ sh $t8, 0xea($sp) /* ACAA2C 8005388C 8E190000 */ lw $t9, ($s0) /* ACAA30 80053890 C72A0024 */ lwc1 $f10, 0x24($t9) @@ -875,7 +875,7 @@ glabel func_80052E0C .L80053954: /* ACAAF4 80053954 24010002 */ li $at, 2 /* ACAAF8 80053958 14810007 */ bne $a0, $at, .L80053978 -/* ACAAFC 8005395C 00000000 */ nop +/* ACAAFC 8005395C 00000000 */ nop /* ACAB00 80053960 8E38008C */ lw $t8, 0x8c($s1) /* ACAB04 80053964 8E030000 */ lw $v1, ($s0) /* ACAB08 80053968 C70400D0 */ lwc1 $f4, 0xd0($t8) @@ -899,14 +899,14 @@ glabel func_80052E0C /* ACAB48 800539A8 C426A250 */ lwc1 $f6, %lo(D_8013A250)($at) /* ACAB4C 800539AC 3C013F00 */ li $at, 0x3F000000 # 0.000000 /* ACAB50 800539B0 448B5000 */ mtc1 $t3, $f10 -/* ACAB54 800539B4 00000000 */ nop +/* ACAB54 800539B4 00000000 */ nop /* ACAB58 800539B8 46805120 */ cvt.s.w $f4, $f10 /* ACAB5C 800539BC 44815000 */ mtc1 $at, $f10 /* ACAB60 800539C0 46062202 */ mul.s $f8, $f4, $f6 /* ACAB64 800539C4 460A4100 */ add.s $f4, $f8, $f10 /* ACAB68 800539C8 4600218D */ trunc.w.s $f6, $f4 /* ACAB6C 800539CC 440C3000 */ mfc1 $t4, $f6 -/* ACAB70 800539D0 00000000 */ nop +/* ACAB70 800539D0 00000000 */ nop /* ACAB74 800539D4 A60C0034 */ sh $t4, 0x34($s0) .L800539D8: /* ACAB78 800539D8 90620000 */ lbu $v0, ($v1) @@ -921,7 +921,7 @@ glabel func_80052E0C /* ACAB9C 800539FC 002D0821 */ addu $at, $at, $t5 /* ACABA0 80053A00 8C2DA254 */ lw $t5, %lo(jtbl_8013A254)($at) /* ACABA4 80053A04 01A00008 */ jr $t5 -/* ACABA8 80053A08 00000000 */ nop +/* ACABA8 80053A08 00000000 */ nop /* ACABAC 80053A0C 8FAE0030 */ lw $t6, 0x30($sp) /* ACABB0 80053A10 8E180004 */ lw $t8, 4($s0) /* ACABB4 80053A14 2626005C */ addiu $a2, $s1, 0x5c @@ -1066,7 +1066,7 @@ glabel func_80052E0C /* ACADC8 80053C28 000A6400 */ sll $t4, $t2, 0x10 /* ACADCC 80053C2C 000C6C03 */ sra $t5, $t4, 0x10 /* ACADD0 80053C30 448D3000 */ mtc1 $t5, $f6 -/* ACADD4 80053C34 00000000 */ nop +/* ACADD4 80053C34 00000000 */ nop /* ACADD8 80053C38 46803220 */ cvt.s.w $f8, $f6 /* ACADDC 80053C3C 468021A0 */ cvt.s.w $f6, $f4 /* ACADE0 80053C40 46024282 */ mul.s $f10, $f8, $f2 @@ -1138,7 +1138,7 @@ glabel func_80052E0C /* ACAEE4 80053D44 C60A0008 */ lwc1 $f10, 8($s0) /* ACAEE8 80053D48 46005181 */ sub.s $f6, $f10, $f0 /* ACAEEC 80053D4C 46024102 */ mul.s $f4, $f8, $f2 -/* ACAEF0 80053D50 00000000 */ nop +/* ACAEF0 80053D50 00000000 */ nop /* ACAEF4 80053D54 46023202 */ mul.s $f8, $f6, $f2 /* ACAEF8 80053D58 46047300 */ add.s $f12, $f14, $f4 /* ACAEFC 80053D5C 46080100 */ add.s $f4, $f0, $f8 @@ -1191,14 +1191,14 @@ glabel func_80052E0C /* ACAFB8 80053E18 00B92021 */ addu $a0, $a1, $t9 /* ACAFBC 80053E1C 00042400 */ sll $a0, $a0, 0x10 /* ACAFC0 80053E20 15A00002 */ bnez $t5, .L80053E2C -/* ACAFC4 80053E24 00000000 */ nop +/* ACAFC4 80053E24 00000000 */ nop /* ACAFC8 80053E28 0007000D */ break 7 .L80053E2C: /* ACAFCC 80053E2C 2401FFFF */ li $at, -1 /* ACAFD0 80053E30 15A10004 */ bne $t5, $at, .L80053E44 /* ACAFD4 80053E34 3C018000 */ lui $at, 0x8000 /* ACAFD8 80053E38 15810002 */ bne $t4, $at, .L80053E44 -/* ACAFDC 80053E3C 00000000 */ nop +/* ACAFDC 80053E3C 00000000 */ nop /* ACAFE0 80053E40 0006000D */ break 6 .L80053E44: /* ACAFE4 80053E44 00042403 */ sra $a0, $a0, 0x10 @@ -1346,7 +1346,7 @@ glabel func_80052E0C /* ACB218 80054078 46043280 */ add.s $f10, $f6, $f4 /* ACB21C 8005407C 4600520D */ trunc.w.s $f8, $f10 /* ACB220 80054080 440E4000 */ mfc1 $t6, $f8 -/* ACB224 80054084 00000000 */ nop +/* ACB224 80054084 00000000 */ nop /* ACB228 80054088 01EEC021 */ addu $t8, $t7, $t6 /* ACB22C 8005408C 14200002 */ bnez $at, .L80054098 /* ACB230 80054090 A7B800EA */ sh $t8, 0xea($sp) @@ -1363,7 +1363,7 @@ glabel func_80052E0C /* ACB254 800540B4 C7AE00E4 */ lwc1 $f14, 0xe4($sp) /* ACB258 800540B8 C46C0024 */ lwc1 $f12, 0x24($v1) /* ACB25C 800540BC 460C303C */ c.lt.s $f6, $f12 -/* ACB260 800540C0 00000000 */ nop +/* ACB260 800540C0 00000000 */ nop /* ACB264 800540C4 45030005 */ bc1tl .L800540DC /* ACB268 800540C8 8FA40034 */ lw $a0, 0x34($sp) /* ACB26C 800540CC 0C010E27 */ jal func_8004389C @@ -1411,7 +1411,7 @@ glabel func_80052E0C /* ACB30C 8005416C 00035080 */ sll $t2, $v1, 2 /* ACB310 80054170 24060001 */ li $a2, 1 /* ACB314 80054174 030A6021 */ addu $t4, $t8, $t2 -/* ACB318 80054178 0C016813 */ jal func_8005A04C +/* ACB318 80054178 0C016813 */ jal Camera_ChangeMode /* ACB31C 8005417C 8D840790 */ lw $a0, 0x790($t4) /* ACB320 80054180 86220162 */ lh $v0, 0x162($s1) /* ACB324 80054184 8FAF0034 */ lw $t7, 0x34($sp) @@ -1502,7 +1502,7 @@ glabel func_80052E0C /* ACB454 800542B4 8E2A0090 */ lw $t2, 0x90($s1) .L800542B8: /* ACB458 800542B8 1140000D */ beqz $t2, .L800542F0 -/* ACB45C 800542BC 00000000 */ nop +/* ACB45C 800542BC 00000000 */ nop /* ACB460 800542C0 C6260050 */ lwc1 $f6, 0x50($s1) /* ACB464 800542C4 C6240094 */ lwc1 $f4, 0x94($s1) /* ACB468 800542C8 C62A0054 */ lwc1 $f10, 0x54($s1) diff --git a/asm/non_matchings/code/z_camera/func_800443A0.s b/asm/non_matchings/code/z_camera/func_800443A0.s deleted file mode 100644 index 8017b61438..0000000000 --- a/asm/non_matchings/code/z_camera/func_800443A0.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_800443A0 -/* ABB540 800443A0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* ABB544 800443A4 AFBF002C */ sw $ra, 0x2c($sp) -/* ABB548 800443A8 AFA40050 */ sw $a0, 0x50($sp) -/* ABB54C 800443AC AFA50054 */ sw $a1, 0x54($sp) -/* ABB550 800443B0 8C84008C */ lw $a0, 0x8c($a0) -/* ABB554 800443B4 27AF0034 */ addiu $t7, $sp, 0x34 -/* ABB558 800443B8 27A90038 */ addiu $t1, $sp, 0x38 -/* ABB55C 800443BC 24180001 */ li $t8, 1 -/* ABB560 800443C0 24190001 */ li $t9, 1 -/* ABB564 800443C4 24080001 */ li $t0, 1 -/* ABB568 800443C8 AFA00034 */ sw $zero, 0x34($sp) -/* ABB56C 800443CC AFA8001C */ sw $t0, 0x1c($sp) -/* ABB570 800443D0 AFB90018 */ sw $t9, 0x18($sp) -/* ABB574 800443D4 AFB80014 */ sw $t8, 0x14($sp) -/* ABB578 800443D8 AFA90024 */ sw $t1, 0x24($sp) -/* ABB57C 800443DC AFAF0010 */ sw $t7, 0x10($sp) -/* ABB580 800443E0 AFA00020 */ sw $zero, 0x20($sp) -/* ABB584 800443E4 27A70040 */ addiu $a3, $sp, 0x40 -/* ABB588 800443E8 0C00F75B */ jal func_8003DD6C -/* ABB58C 800443EC 248407C0 */ addiu $a0, $a0, 0x7c0 -/* ABB590 800443F0 1040000B */ beqz $v0, .L80044420 -/* ABB594 800443F4 8FA40034 */ lw $a0, 0x34($sp) -/* ABB598 800443F8 0C00E2DF */ jal func_80038B7C -/* ABB59C 800443FC 8FA50054 */ lw $a1, 0x54($sp) -/* ABB5A0 80044400 44802000 */ mtc1 $zero, $f4 -/* ABB5A4 80044404 00000000 */ nop -/* ABB5A8 80044408 4604003C */ c.lt.s $f0, $f4 -/* ABB5AC 8004440C 00000000 */ nop -/* ABB5B0 80044410 45020004 */ bc1fl .L80044424 -/* ABB5B4 80044414 00001025 */ move $v0, $zero -/* ABB5B8 80044418 10000002 */ b .L80044424 -/* ABB5BC 8004441C 24020001 */ li $v0, 1 -.L80044420: -/* ABB5C0 80044420 00001025 */ move $v0, $zero -.L80044424: -/* ABB5C4 80044424 8FBF002C */ lw $ra, 0x2c($sp) -/* ABB5C8 80044428 27BD0050 */ addiu $sp, $sp, 0x50 -/* ABB5CC 8004442C 03E00008 */ jr $ra -/* ABB5D0 80044430 00000000 */ nop - diff --git a/asm/non_matchings/code/z_camera/func_800499A4.s b/asm/non_matchings/code/z_camera/func_800499A4.s deleted file mode 100644 index 3f3871beba..0000000000 --- a/asm/non_matchings/code/z_camera/func_800499A4.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_800499A4 -/* AC0B44 800499A4 848E0142 */ lh $t6, 0x142($a0) -/* AC0B48 800499A8 3C188012 */ lui $t8, %hi(D_8011D068) -/* AC0B4C 800499AC 84990144 */ lh $t9, 0x144($a0) -/* AC0B50 800499B0 000E78C0 */ sll $t7, $t6, 3 -/* AC0B54 800499B4 030FC021 */ addu $t8, $t8, $t7 -/* AC0B58 800499B8 8F18D068 */ lw $t8, %lo(D_8011D068)($t8) -/* AC0B5C 800499BC 001940C0 */ sll $t0, $t9, 3 -/* AC0B60 800499C0 3C018012 */ lui $at, %hi(D_8011D3A0) # $at, 0x8012 -/* AC0B64 800499C4 03084821 */ addu $t1, $t8, $t0 -/* AC0B68 800499C8 8D220004 */ lw $v0, 4($t1) -/* AC0B6C 800499CC 84430000 */ lh $v1, ($v0) -/* AC0B70 800499D0 306A0001 */ andi $t2, $v1, 1 -/* AC0B74 800499D4 11400004 */ beqz $t2, .L800499E8 -/* AC0B78 800499D8 AC23D3A0 */ sw $v1, %lo(D_8011D3A0)($at) -/* AC0B7C 800499DC 848B014C */ lh $t3, 0x14c($a0) -/* AC0B80 800499E0 356C0400 */ ori $t4, $t3, 0x400 -/* AC0B84 800499E4 A48C014C */ sh $t4, 0x14c($a0) -.L800499E8: -/* AC0B88 800499E8 306D0002 */ andi $t5, $v1, 2 -/* AC0B8C 800499EC 11A00004 */ beqz $t5, .L80049A00 -/* AC0B90 800499F0 00000000 */ nop -/* AC0B94 800499F4 848E014C */ lh $t6, 0x14c($a0) -/* AC0B98 800499F8 35CF0010 */ ori $t7, $t6, 0x10 -/* AC0B9C 800499FC A48F014C */ sh $t7, 0x14c($a0) -.L80049A00: -/* AC0BA0 80049A00 03E00008 */ jr $ra -/* AC0BA4 80049A04 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/func_80052A18.s b/asm/non_matchings/code/z_camera/func_80052A18.s deleted file mode 100644 index 7e79f019b4..0000000000 --- a/asm/non_matchings/code/z_camera/func_80052A18.s +++ /dev/null @@ -1,104 +0,0 @@ -glabel func_80052A18 -/* AC9BB8 80052A18 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* AC9BBC 80052A1C AFBF001C */ sw $ra, 0x1c($sp) -/* AC9BC0 80052A20 AFB00018 */ sw $s0, 0x18($sp) -/* AC9BC4 80052A24 8482015E */ lh $v0, 0x15e($a0) -/* AC9BC8 80052A28 00808025 */ move $s0, $a0 -/* AC9BCC 80052A2C 2401000A */ li $at, 10 -/* AC9BD0 80052A30 5040000A */ beql $v0, $zero, .L80052A5C -/* AC9BD4 80052A34 860F0142 */ lh $t7, 0x142($s0) -/* AC9BD8 80052A38 10410007 */ beq $v0, $at, .L80052A58 -/* AC9BDC 80052A3C 24010014 */ li $at, 20 -/* AC9BE0 80052A40 10410005 */ beq $v0, $at, .L80052A58 -/* AC9BE4 80052A44 3C0E8016 */ lui $t6, %hi(gGameInfo) # $t6, 0x8016 -/* AC9BE8 80052A48 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* AC9BEC 80052A4C 85C20314 */ lh $v0, 0x314($t6) -/* AC9BF0 80052A50 1040000F */ beqz $v0, .L80052A90 -/* AC9BF4 80052A54 00000000 */ nop -.L80052A58: -/* AC9BF8 80052A58 860F0142 */ lh $t7, 0x142($s0) -.L80052A5C: -/* AC9BFC 80052A5C 3C198012 */ lui $t9, %hi(D_8011D068) -/* AC9C00 80052A60 86080144 */ lh $t0, 0x144($s0) -/* AC9C04 80052A64 000FC0C0 */ sll $t8, $t7, 3 -/* AC9C08 80052A68 0338C821 */ addu $t9, $t9, $t8 -/* AC9C0C 80052A6C 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) -/* AC9C10 80052A70 000848C0 */ sll $t1, $t0, 3 -/* AC9C14 80052A74 3C0C8016 */ lui $t4, %hi(gGameInfo) # $t4, 0x8016 -/* AC9C18 80052A78 03295021 */ addu $t2, $t9, $t1 -/* AC9C1C 80052A7C 8D430004 */ lw $v1, 4($t2) -/* AC9C20 80052A80 846B0000 */ lh $t3, ($v1) -/* AC9C24 80052A84 A60B0000 */ sh $t3, ($s0) -/* AC9C28 80052A88 8D8CFA90 */ lw $t4, %lo(gGameInfo)($t4) -/* AC9C2C 80052A8C 85820314 */ lh $v0, 0x314($t4) -.L80052A90: -/* AC9C30 80052A90 50400004 */ beql $v0, $zero, .L80052AA4 -/* AC9C34 80052A94 860D0000 */ lh $t5, ($s0) -/* AC9C38 80052A98 0C011495 */ jal func_80045254 -/* AC9C3C 80052A9C 02002025 */ move $a0, $s0 -/* AC9C40 80052AA0 860D0000 */ lh $t5, ($s0) -.L80052AA4: -/* AC9C44 80052AA4 3C018012 */ lui $at, %hi(D_8011D3A0) # $at, 0x8012 -/* AC9C48 80052AA8 02002025 */ move $a0, $s0 -/* AC9C4C 80052AAC AC2DD3A0 */ sw $t5, %lo(D_8011D3A0)($at) -/* AC9C50 80052AB0 8602015E */ lh $v0, 0x15e($s0) -/* AC9C54 80052AB4 14400003 */ bnez $v0, .L80052AC4 -/* AC9C58 80052AB8 244E0001 */ addiu $t6, $v0, 1 -/* AC9C5C 80052ABC 0C010EAF */ jal func_80043ABC -/* AC9C60 80052AC0 A60E015E */ sh $t6, 0x15e($s0) -.L80052AC4: -/* AC9C64 80052AC4 8E040090 */ lw $a0, 0x90($s0) -/* AC9C68 80052AC8 2605005C */ addiu $a1, $s0, 0x5c -/* AC9C6C 80052ACC 10800020 */ beqz $a0, .L80052B50 -/* AC9C70 80052AD0 00000000 */ nop -/* AC9C74 80052AD4 0C00B721 */ jal Player_GetCameraYOffset -/* AC9C78 80052AD8 00000000 */ nop -/* AC9C7C 80052ADC 26020094 */ addiu $v0, $s0, 0x94 -/* AC9C80 80052AE0 8C580000 */ lw $t8, ($v0) -/* AC9C84 80052AE4 27A4002C */ addiu $a0, $sp, 0x2c -/* AC9C88 80052AE8 2605005C */ addiu $a1, $s0, 0x5c -/* AC9C8C 80052AEC AC980000 */ sw $t8, ($a0) -/* AC9C90 80052AF0 8C4F0004 */ lw $t7, 4($v0) -/* AC9C94 80052AF4 AC8F0004 */ sw $t7, 4($a0) -/* AC9C98 80052AF8 8C580008 */ lw $t8, 8($v0) -/* AC9C9C 80052AFC AC980008 */ sw $t8, 8($a0) -/* AC9CA0 80052B00 C7A40030 */ lwc1 $f4, 0x30($sp) -/* AC9CA4 80052B04 AFA20020 */ sw $v0, 0x20($sp) -/* AC9CA8 80052B08 46002180 */ add.s $f6, $f4, $f0 -/* AC9CAC 80052B0C 0C01EFE4 */ jal func_8007BF90 -/* AC9CB0 80052B10 E7A60030 */ swc1 $f6, 0x30($sp) -/* AC9CB4 80052B14 8FA20020 */ lw $v0, 0x20($sp) -/* AC9CB8 80052B18 E60000DC */ swc1 $f0, 0xdc($s0) -/* AC9CBC 80052B1C C6080050 */ lwc1 $f8, 0x50($s0) -/* AC9CC0 80052B20 C44A0000 */ lwc1 $f10, ($v0) -/* AC9CC4 80052B24 C6120054 */ lwc1 $f18, 0x54($s0) -/* AC9CC8 80052B28 460A4401 */ sub.s $f16, $f8, $f10 -/* AC9CCC 80052B2C C6080058 */ lwc1 $f8, 0x58($s0) -/* AC9CD0 80052B30 E61000E4 */ swc1 $f16, 0xe4($s0) -/* AC9CD4 80052B34 C4440004 */ lwc1 $f4, 4($v0) -/* AC9CD8 80052B38 46049181 */ sub.s $f6, $f18, $f4 -/* AC9CDC 80052B3C E60600E8 */ swc1 $f6, 0xe8($s0) -/* AC9CE0 80052B40 C44A0008 */ lwc1 $f10, 8($v0) -/* AC9CE4 80052B44 460A4401 */ sub.s $f16, $f8, $f10 -/* AC9CE8 80052B48 10000004 */ b .L80052B5C -/* AC9CEC 80052B4C E61000EC */ swc1 $f16, 0xec($s0) -.L80052B50: -/* AC9CF0 80052B50 0C01EFE4 */ jal func_8007BF90 -/* AC9CF4 80052B54 26040050 */ addiu $a0, $s0, 0x50 -/* AC9CF8 80052B58 E60000DC */ swc1 $f0, 0xdc($s0) -.L80052B5C: -/* AC9CFC 80052B5C 86080000 */ lh $t0, ($s0) -/* AC9D00 80052B60 31190001 */ andi $t9, $t0, 1 -/* AC9D04 80052B64 53200006 */ beql $t9, $zero, .L80052B80 -/* AC9D08 80052B68 8FBF001C */ lw $ra, 0x1c($sp) -/* AC9D0C 80052B6C 86020160 */ lh $v0, 0x160($s0) -/* AC9D10 80052B70 18400002 */ blez $v0, .L80052B7C -/* AC9D14 80052B74 2449FFFF */ addiu $t1, $v0, -1 -/* AC9D18 80052B78 A6090160 */ sh $t1, 0x160($s0) -.L80052B7C: -/* AC9D1C 80052B7C 8FBF001C */ lw $ra, 0x1c($sp) -.L80052B80: -/* AC9D20 80052B80 8FB00018 */ lw $s0, 0x18($sp) -/* AC9D24 80052B84 27BD0040 */ addiu $sp, $sp, 0x40 -/* AC9D28 80052B88 03E00008 */ jr $ra -/* AC9D2C 80052B8C 24020001 */ li $v0, 1 diff --git a/asm/non_matchings/code/z_camera/func_80054478.s b/asm/non_matchings/code/z_camera/func_80054478.s deleted file mode 100644 index f1a41905d2..0000000000 --- a/asm/non_matchings/code/z_camera/func_80054478.s +++ /dev/null @@ -1,24 +0,0 @@ - -glabel func_80054478 -/* ACB618 80054478 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* ACB61C 8005447C AFA40030 */ sw $a0, 0x30($sp) -/* ACB620 80054480 AFBF0014 */ sw $ra, 0x14($sp) -/* ACB624 80054484 00A02025 */ move $a0, $a1 -/* ACB628 80054488 AFA60038 */ sw $a2, 0x38($sp) -/* ACB62C 8005448C 0C015117 */ jal Camera_Vec3fCopy -/* ACB630 80054490 27A5001C */ addiu $a1, $sp, 0x1c -/* ACB634 80054494 27A40028 */ addiu $a0, $sp, 0x28 -/* ACB638 80054498 0C01F0FD */ jal func_8007C3F4 -/* ACB63C 8005449C 27A5001C */ addiu $a1, $sp, 0x1c -/* ACB640 800544A0 8FA50030 */ lw $a1, 0x30($sp) -/* ACB644 800544A4 87AE002E */ lh $t6, 0x2e($sp) -/* ACB648 800544A8 8FA40038 */ lw $a0, 0x38($sp) -/* ACB64C 800544AC 84AF000E */ lh $t7, 0xe($a1) -/* ACB650 800544B0 27A60028 */ addiu $a2, $sp, 0x28 -/* ACB654 800544B4 01CFC021 */ addu $t8, $t6, $t7 -/* ACB658 800544B8 0C010F0A */ jal func_80043C28 -/* ACB65C 800544BC A7B8002E */ sh $t8, 0x2e($sp) -/* ACB660 800544C0 8FBF0014 */ lw $ra, 0x14($sp) -/* ACB664 800544C4 27BD0030 */ addiu $sp, $sp, 0x30 -/* ACB668 800544C8 03E00008 */ jr $ra -/* ACB66C 800544CC 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/func_80055F64.s b/asm/non_matchings/code/z_camera/func_80055F64.s deleted file mode 100644 index 790ede1440..0000000000 --- a/asm/non_matchings/code/z_camera/func_80055F64.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80055F64 -/* ACD104 80055F64 8482015E */ lh $v0, 0x15e($a0) -/* ACD108 80055F68 14400009 */ bnez $v0, .L80055F90 -/* ACD10C 80055F6C 00000000 */ nop -/* ACD110 80055F70 848E014C */ lh $t6, 0x14c($a0) -/* ACD114 80055F74 24480001 */ addiu $t0, $v0, 1 -/* ACD118 80055F78 A488015E */ sh $t0, 0x15e($a0) -/* ACD11C 80055F7C 31CFFFFB */ andi $t7, $t6, 0xfffb -/* ACD120 80055F80 A48F014C */ sh $t7, 0x14c($a0) -/* ACD124 80055F84 8498014C */ lh $t8, 0x14c($a0) -/* ACD128 80055F88 37191000 */ ori $t9, $t8, 0x1000 -/* ACD12C 80055F8C A499014C */ sh $t9, 0x14c($a0) -.L80055F90: -/* ACD130 80055F90 03E00008 */ jr $ra -/* ACD134 80055F94 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/func_80056450.s b/asm/non_matchings/code/z_camera/func_80056450.s deleted file mode 100644 index e6b7b20e90..0000000000 --- a/asm/non_matchings/code/z_camera/func_80056450.s +++ /dev/null @@ -1,129 +0,0 @@ -.rdata -glabel D_80139714 - .asciz "\x1B[43;30mcamera: warning: circle: target is not valid, stop!\n\x1B[m" - .balign 4 - -.late_rodata -glabel D_8013A388 - .float 0.01 - -glabel D_8013A38C - .float 0.1 - -.text -glabel func_80056450 -/* ACD5F0 80056450 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* ACD5F4 80056454 AFBF0024 */ sw $ra, 0x24($sp) -/* ACD5F8 80056458 AFB00020 */ sw $s0, 0x20($sp) -/* ACD5FC 8005645C 8482015E */ lh $v0, 0x15e($a0) -/* ACD600 80056460 00808025 */ move $s0, $a0 -/* ACD604 80056464 2401000A */ li $at, 10 -/* ACD608 80056468 5040000A */ beql $v0, $zero, .L80056494 -/* ACD60C 8005646C 860F0142 */ lh $t7, 0x142($s0) -/* ACD610 80056470 10410007 */ beq $v0, $at, .L80056490 -/* ACD614 80056474 24010014 */ li $at, 20 -/* ACD618 80056478 10410005 */ beq $v0, $at, .L80056490 -/* ACD61C 8005647C 3C0E8016 */ lui $t6, %hi(gGameInfo) # $t6, 0x8016 -/* ACD620 80056480 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* ACD624 80056484 85C30314 */ lh $v1, 0x314($t6) -/* ACD628 80056488 10600018 */ beqz $v1, .L800564EC -/* ACD62C 8005648C 00000000 */ nop -.L80056490: -/* ACD630 80056490 860F0142 */ lh $t7, 0x142($s0) -.L80056494: -/* ACD634 80056494 3C198012 */ lui $t9, %hi(D_8011D068) -/* ACD638 80056498 86080144 */ lh $t0, 0x144($s0) -/* ACD63C 8005649C 000FC0C0 */ sll $t8, $t7, 3 -/* ACD640 800564A0 0338C821 */ addu $t9, $t9, $t8 -/* ACD644 800564A4 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) -/* ACD648 800564A8 000848C0 */ sll $t1, $t0, 3 -/* ACD64C 800564AC 3C018014 */ lui $at, %hi(D_8013A388) -/* ACD650 800564B0 03295021 */ addu $t2, $t9, $t1 -/* ACD654 800564B4 8D420004 */ lw $v0, 4($t2) -/* ACD658 800564B8 C428A388 */ lwc1 $f8, %lo(D_8013A388)($at) -/* ACD65C 800564BC 3C0D8016 */ lui $t5, %hi(gGameInfo) # $t5, 0x8016 -/* ACD660 800564C0 844B0000 */ lh $t3, ($v0) -/* ACD664 800564C4 24420004 */ addiu $v0, $v0, 4 -/* ACD668 800564C8 448B2000 */ mtc1 $t3, $f4 -/* ACD66C 800564CC 00000000 */ nop -/* ACD670 800564D0 468021A0 */ cvt.s.w $f6, $f4 -/* ACD674 800564D4 46083282 */ mul.s $f10, $f6, $f8 -/* ACD678 800564D8 E60A0000 */ swc1 $f10, ($s0) -/* ACD67C 800564DC 844C0000 */ lh $t4, ($v0) -/* ACD680 800564E0 A60C0004 */ sh $t4, 4($s0) -/* ACD684 800564E4 8DADFA90 */ lw $t5, %lo(gGameInfo)($t5) -/* ACD688 800564E8 85A30314 */ lh $v1, 0x314($t5) -.L800564EC: -/* ACD68C 800564EC 50600004 */ beql $v1, $zero, .L80056500 -/* ACD690 800564F0 860E0004 */ lh $t6, 4($s0) -/* ACD694 800564F4 0C011495 */ jal func_80045254 -/* ACD698 800564F8 02002025 */ move $a0, $s0 -/* ACD69C 800564FC 860E0004 */ lh $t6, 4($s0) -.L80056500: -/* ACD6A0 80056500 3C018012 */ lui $at, %hi(D_8011D3A0) # $at, 0x8012 -/* ACD6A4 80056504 AC2ED3A0 */ sw $t6, %lo(D_8011D3A0)($at) -/* ACD6A8 80056508 8602015E */ lh $v0, 0x15e($s0) -/* ACD6AC 8005650C 14400002 */ bnez $v0, .L80056518 -/* ACD6B0 80056510 244F0001 */ addiu $t7, $v0, 1 -/* ACD6B4 80056514 A60F015E */ sh $t7, 0x15e($s0) -.L80056518: -/* ACD6B8 80056518 8E0500A8 */ lw $a1, 0xa8($s0) -/* ACD6BC 8005651C 10A00005 */ beqz $a1, .L80056534 -/* ACD6C0 80056520 00000000 */ nop -/* ACD6C4 80056524 8CB80130 */ lw $t8, 0x130($a1) -/* ACD6C8 80056528 260400AC */ addiu $a0, $s0, 0xac -/* ACD6CC 8005652C 17000008 */ bnez $t8, .L80056550 -/* ACD6D0 80056530 00000000 */ nop -.L80056534: -/* ACD6D4 80056534 14A00003 */ bnez $a1, .L80056544 -/* ACD6D8 80056538 3C048014 */ lui $a0, %hi(D_80139714) # $a0, 0x8014 -/* ACD6DC 8005653C 0C00084C */ jal osSyncPrintf -/* ACD6E0 80056540 24849714 */ addiu $a0, %lo(D_80139714) # addiu $a0, $a0, -0x68ec -.L80056544: -/* ACD6E4 80056544 AE0000A8 */ sw $zero, 0xa8($s0) -/* ACD6E8 80056548 10000025 */ b .L800565E0 -/* ACD6EC 8005654C 24020001 */ li $v0, 1 -.L80056550: -/* ACD6F0 80056550 0C00BBB9 */ jal func_8002EEE4 -/* ACD6F4 80056554 AFA4002C */ sw $a0, 0x2c($sp) -/* ACD6F8 80056558 C6000000 */ lwc1 $f0, ($s0) -/* ACD6FC 8005655C 3C018014 */ lui $at, %hi(D_8013A38C) -/* ACD700 80056560 C430A38C */ lwc1 $f16, %lo(D_8013A38C)($at) -/* ACD704 80056564 26050050 */ addiu $a1, $s0, 0x50 -/* ACD708 80056568 44060000 */ mfc1 $a2, $f0 -/* ACD70C 8005656C 44070000 */ mfc1 $a3, $f0 -/* ACD710 80056570 8FA4002C */ lw $a0, 0x2c($sp) -/* ACD714 80056574 AFA50030 */ sw $a1, 0x30($sp) -/* ACD718 80056578 0C010E8F */ jal func_80043A3C -/* ACD71C 8005657C E7B00010 */ swc1 $f16, 0x10($sp) -/* ACD720 80056580 26020094 */ addiu $v0, $s0, 0x94 -/* ACD724 80056584 C4440000 */ lwc1 $f4, ($v0) -/* ACD728 80056588 C6120050 */ lwc1 $f18, 0x50($s0) -/* ACD72C 8005658C C6080054 */ lwc1 $f8, 0x54($s0) -/* ACD730 80056590 2605005C */ addiu $a1, $s0, 0x5c -/* ACD734 80056594 46049181 */ sub.s $f6, $f18, $f4 -/* ACD738 80056598 C6120058 */ lwc1 $f18, 0x58($s0) -/* ACD73C 8005659C E60600E4 */ swc1 $f6, 0xe4($s0) -/* ACD740 800565A0 C44A0004 */ lwc1 $f10, 4($v0) -/* ACD744 800565A4 460A4401 */ sub.s $f16, $f8, $f10 -/* ACD748 800565A8 E61000E8 */ swc1 $f16, 0xe8($s0) -/* ACD74C 800565AC C4440008 */ lwc1 $f4, 8($v0) -/* ACD750 800565B0 46049181 */ sub.s $f6, $f18, $f4 -/* ACD754 800565B4 E60600EC */ swc1 $f6, 0xec($s0) -/* ACD758 800565B8 0C01EFE4 */ jal func_8007BF90 -/* ACD75C 800565BC 8FA40030 */ lw $a0, 0x30($sp) -/* ACD760 800565C0 86020160 */ lh $v0, 0x160($s0) -/* ACD764 800565C4 44804000 */ mtc1 $zero, $f8 -/* ACD768 800565C8 E60000DC */ swc1 $f0, 0xdc($s0) -/* ACD76C 800565CC 18400003 */ blez $v0, .L800565DC -/* ACD770 800565D0 E60800D8 */ swc1 $f8, 0xd8($s0) -/* ACD774 800565D4 2448FFFF */ addiu $t0, $v0, -1 -/* ACD778 800565D8 A6080160 */ sh $t0, 0x160($s0) -.L800565DC: -/* ACD77C 800565DC 24020001 */ li $v0, 1 -.L800565E0: -/* ACD780 800565E0 8FBF0024 */ lw $ra, 0x24($sp) -/* ACD784 800565E4 8FB00020 */ lw $s0, 0x20($sp) -/* ACD788 800565E8 27BD0040 */ addiu $sp, $sp, 0x40 -/* ACD78C 800565EC 03E00008 */ jr $ra -/* ACD790 800565F0 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/func_80057C6C.s b/asm/non_matchings/code/z_camera/func_80057C6C.s index 87153958f2..26d6339659 100644 --- a/asm/non_matchings/code/z_camera/func_80057C6C.s +++ b/asm/non_matchings/code/z_camera/func_80057C6C.s @@ -6,7 +6,7 @@ glabel D_80139824 .late_rodata glabel D_8013A3F4 .float 0.01 - + .text glabel func_80057C6C /* ACEE0C 80057C6C 27BDFFE0 */ addiu $sp, $sp, -0x20 @@ -19,20 +19,20 @@ glabel func_80057C6C /* ACEE28 80057C88 2406016C */ li $a2, 364 /* ACEE2C 80057C8C 0C041A18 */ jal func_80106860 /* ACEE30 80057C90 00002825 */ move $a1, $zero -/* ACEE34 80057C94 3C0E8012 */ lui $t6, %hi(D_8011D390) # $t6, 0x8012 -/* ACEE38 80057C98 8DCED390 */ lw $t6, %lo(D_8011D390)($t6) -/* ACEE3C 80057C9C 3C058012 */ lui $a1, %hi(D_80119F4C) # $a1, 0x8012 -/* ACEE40 80057CA0 24A59F4C */ addiu $a1, %lo(D_80119F4C) # addiu $a1, $a1, -0x60b4 +/* ACEE34 80057C94 3C0E8012 */ lui $t6, %hi(sInitRegs) # $t6, 0x8012 +/* ACEE38 80057C98 8DCED390 */ lw $t6, %lo(sInitRegs)($t6) +/* ACEE3C 80057C9C 3C058012 */ lui $a1, %hi(sOREGInitCnt) # $a1, 0x8012 +/* ACEE40 80057CA0 24A59F4C */ addiu $a1, %lo(sOREGInitCnt) # addiu $a1, $a1, -0x60b4 /* ACEE44 80057CA4 51C00035 */ beql $t6, $zero, .L80057D7C /* ACEE48 80057CA8 8FAB002C */ lw $t3, 0x2c($sp) /* ACEE4C 80057CAC 84AF0000 */ lh $t7, ($a1) /* ACEE50 80057CB0 00001825 */ move $v1, $zero /* ACEE54 80057CB4 00001025 */ move $v0, $zero /* ACEE58 80057CB8 19E00010 */ blez $t7, .L80057CFC -/* ACEE5C 80057CBC 3C048012 */ lui $a0, %hi(D_80119EE0) # $a0, 0x8012 +/* ACEE5C 80057CBC 3C048012 */ lui $a0, %hi(sOREGInit) # $a0, 0x8012 /* ACEE60 80057CC0 3C078016 */ lui $a3, %hi(gGameInfo) # $a3, 0x8016 /* ACEE64 80057CC4 24E7FA90 */ addiu $a3, %lo(gGameInfo) # addiu $a3, $a3, -0x570 -/* ACEE68 80057CC8 24849EE0 */ addiu $a0, %lo(D_80119EE0) # addiu $a0, $a0, -0x6120 +/* ACEE68 80057CC8 24849EE0 */ addiu $a0, %lo(sOREGInit) # addiu $a0, $a0, -0x6120 /* ACEE6C 80057CCC 8CF90000 */ lw $t9, ($a3) .L80057CD0: /* ACEE70 80057CD0 84980000 */ lh $t8, ($a0) @@ -47,15 +47,15 @@ glabel func_80057C6C /* ACEE94 80057CF4 8CF90000 */ lw $t9, ($a3) /* ACEE98 80057CF8 00001825 */ move $v1, $zero .L80057CFC: -/* ACEE9C 80057CFC 3C058012 */ lui $a1, %hi(D_80119F88) # $a1, 0x8012 -/* ACEEA0 80057D00 24A59F88 */ addiu $a1, %lo(D_80119F88) # addiu $a1, $a1, -0x6078 +/* ACEE9C 80057CFC 3C058012 */ lui $a1, %hi(sPREGInitCnt) # $a1, 0x8012 +/* ACEEA0 80057D00 24A59F88 */ addiu $a1, %lo(sPREGInitCnt) # addiu $a1, $a1, -0x6078 /* ACEEA4 80057D04 84AC0000 */ lh $t4, ($a1) /* ACEEA8 80057D08 3C078016 */ lui $a3, %hi(gGameInfo) # $a3, 0x8016 /* ACEEAC 80057D0C 24E7FA90 */ addiu $a3, %lo(gGameInfo) # addiu $a3, $a3, -0x570 /* ACEEB0 80057D10 1980000E */ blez $t4, .L80057D4C /* ACEEB4 80057D14 00001025 */ move $v0, $zero -/* ACEEB8 80057D18 3C048012 */ lui $a0, %hi(D_80119F50) # $a0, 0x8012 -/* ACEEBC 80057D1C 24849F50 */ addiu $a0, %lo(D_80119F50) # addiu $a0, $a0, -0x60b0 +/* ACEEB8 80057D18 3C048012 */ lui $a0, %hi(sPREGInit) # $a0, 0x8012 +/* ACEEBC 80057D1C 24849F50 */ addiu $a0, %lo(sPREGInit) # addiu $a0, $a0, -0x60b0 /* ACEEC0 80057D20 8CEE0000 */ lw $t6, ($a3) .L80057D24: /* ACEEC4 80057D24 848D0000 */ lh $t5, ($a0) @@ -74,9 +74,9 @@ glabel func_80057C6C /* ACEEF4 80057D54 0C02E563 */ jal func_800B958C /* ACEEF8 80057D58 02002025 */ move $a0, $s0 /* ACEEFC 80057D5C 3C078016 */ lui $a3, %hi(gGameInfo) # $a3, 0x8016 -/* ACEF00 80057D60 3C018012 */ lui $at, %hi(D_8011D390) # $at, 0x8012 +/* ACEF00 80057D60 3C018012 */ lui $at, %hi(sInitRegs) # $at, 0x8012 /* ACEF04 80057D64 24E7FA90 */ addiu $a3, %lo(gGameInfo) # addiu $a3, $a3, -0x570 -/* ACEF08 80057D68 AC20D390 */ sw $zero, %lo(D_8011D390)($at) +/* ACEF08 80057D68 AC20D390 */ sw $zero, %lo(sInitRegs)($at) /* ACEF0C 80057D6C 8CEA0000 */ lw $t2, ($a3) /* ACEF10 80057D70 2418FFFF */ li $t8, -1 /* ACEF14 80057D74 A5580304 */ sh $t8, 0x304($t2) @@ -118,7 +118,7 @@ glabel func_80057C6C /* ACEF94 80057DF4 24630001 */ addiu $v1, $v1, 1 /* ACEF98 80057DF8 844A0130 */ lh $t2, 0x130($v0) /* ACEF9C 80057DFC 10AA0007 */ beq $a1, $t2, .L80057E1C -/* ACEFA0 80057E00 00000000 */ nop +/* ACEFA0 80057E00 00000000 */ nop /* ACEFA4 80057E04 24630001 */ addiu $v1, $v1, 1 .L80057E08: /* ACEFA8 80057E08 00031C00 */ sll $v1, $v1, 0x10 @@ -128,7 +128,7 @@ glabel func_80057C6C /* ACEFB8 80057E18 0003C880 */ sll $t9, $v1, 2 .L80057E1C: /* ACEFBC 80057E1C 10680007 */ beq $v1, $t0, .L80057E3C -/* ACEFC0 80057E20 00000000 */ nop +/* ACEFC0 80057E20 00000000 */ nop /* ACEFC4 80057E24 84C20000 */ lh $v0, ($a2) /* ACEFC8 80057E28 00022C00 */ sll $a1, $v0, 0x10 /* ACEFCC 80057E2C 00052C03 */ sra $a1, $a1, 0x10 @@ -173,7 +173,7 @@ glabel func_80057C6C /* ACF064 80057EC4 8CF80000 */ lw $t8, ($a3) /* ACF068 80057EC8 870A0198 */ lh $t2, 0x198($t8) /* ACF06C 80057ECC 448A5000 */ mtc1 $t2, $f10 -/* ACF070 80057ED0 00000000 */ nop +/* ACF070 80057ED0 00000000 */ nop /* ACF074 80057ED4 46805420 */ cvt.s.w $f16, $f10 /* ACF078 80057ED8 46008482 */ mul.s $f18, $f16, $f0 /* ACF07C 80057EDC E61200CC */ swc1 $f18, 0xcc($s0) @@ -188,7 +188,7 @@ glabel func_80057C6C /* ACF0A0 80057F00 8CEE0000 */ lw $t6, ($a3) /* ACF0A4 80057F04 85CD019C */ lh $t5, 0x19c($t6) /* ACF0A8 80057F08 448D5000 */ mtc1 $t5, $f10 -/* ACF0AC 80057F0C 00000000 */ nop +/* ACF0AC 80057F0C 00000000 */ nop /* ACF0B0 80057F10 46805420 */ cvt.s.w $f16, $f10 /* ACF0B4 80057F14 46008482 */ mul.s $f18, $f16, $f0 /* ACF0B8 80057F18 44800000 */ mtc1 $zero, $f0 @@ -233,5 +233,5 @@ glabel func_80057C6C /* ACF154 80057FB4 8FB00018 */ lw $s0, 0x18($sp) /* ACF158 80057FB8 27BD0020 */ addiu $sp, $sp, 0x20 /* ACF15C 80057FBC 03E00008 */ jr $ra -/* ACF160 80057FC0 00000000 */ nop +/* ACF160 80057FC0 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/func_80058148.s b/asm/non_matchings/code/z_camera/func_80058148.s index 3e51ea37fc..fcd6ba5d99 100644 --- a/asm/non_matchings/code/z_camera/func_80058148.s +++ b/asm/non_matchings/code/z_camera/func_80058148.s @@ -122,10 +122,10 @@ glabel func_80058148 /* ACF4A4 80058304 A6020156 */ sh $v0, 0x156($s0) /* ACF4A8 80058308 02002025 */ move $a0, $s0 /* ACF4AC 8005830C 86050144 */ lh $a1, 0x144($s0) -/* ACF4B0 80058310 0C01144A */ jal func_80045128 +/* ACF4B0 80058310 0C01144A */ jal Camera_CopyModeValuesToPREG /* ACF4B4 80058314 E6100100 */ swc1 $f16, 0x100($s0) /* ACF4B8 80058318 0C016C11 */ jal func_8005B044 -/* ACF4BC 8005831C 00000000 */ nop +/* ACF4BC 8005831C 00000000 */ nop /* ACF4C0 80058320 3C048014 */ lui $a0, %hi(D_801398C0) # $a0, 0x8014 /* ACF4C4 80058324 0C00084C */ jal osSyncPrintf /* ACF4C8 80058328 248498C0 */ addiu $a0, %lo(D_801398C0) # addiu $a0, $a0, -0x6740 @@ -139,5 +139,5 @@ glabel func_80058148 /* ACF4E4 80058344 8FB00018 */ lw $s0, 0x18($sp) /* ACF4E8 80058348 27BD0068 */ addiu $sp, $sp, 0x68 /* ACF4EC 8005834C 03E00008 */ jr $ra -/* ACF4F0 80058350 00000000 */ nop +/* ACF4F0 80058350 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/func_800584E8.s b/asm/non_matchings/code/z_camera/func_800584E8.s index 2054efbdbf..36ddc91684 100644 --- a/asm/non_matchings/code/z_camera/func_800584E8.s +++ b/asm/non_matchings/code/z_camera/func_800584E8.s @@ -2,7 +2,7 @@ glabel D_80139960 .asciz "S:" .balign 4 - + glabel D_80139964 .asciz "M:" .balign 4 @@ -10,7 +10,7 @@ glabel D_80139964 glabel D_80139968 .asciz "F:" .balign 4 - + glabel D_8013996C .asciz "I:" .balign 4 @@ -132,16 +132,16 @@ glabel func_800584E8 /* ACF828 80058688 24060005 */ li $a2, 5 /* ACF82C 8005868C 86180142 */ lh $t8, 0x142($s0) /* ACF830 80058690 2411000C */ li $s1, 12 -/* ACF834 80058694 3C198012 */ lui $t9, %hi(D_80119F8C) # $t9, 0x8012 +/* ACF834 80058694 3C198012 */ lui $t9, %hi(sCameraSettingNames) # $t9, 0x8012 /* ACF838 80058698 03110019 */ multu $t8, $s1 -/* ACF83C 8005869C 27399F8C */ addiu $t9, %lo(D_80119F8C) # addiu $t9, $t9, -0x6074 +/* ACF83C 8005869C 27399F8C */ addiu $t9, %lo(sCameraSettingNames) # addiu $t9, $t9, -0x6074 /* ACF840 800586A0 24040005 */ li $a0, 5 /* ACF844 800586A4 24050017 */ li $a1, 23 /* ACF848 800586A8 24060004 */ li $a2, 4 /* ACF84C 800586AC 00007012 */ mflo $t6 /* ACF850 800586B0 01D93821 */ addu $a3, $t6, $t9 /* ACF854 800586B4 0C018DDB */ jal func_8006376C -/* ACF858 800586B8 00000000 */ nop +/* ACF858 800586B8 00000000 */ nop /* ACF85C 800586BC 3C078014 */ lui $a3, %hi(D_80139964) # $a3, 0x8014 /* ACF860 800586C0 24E79964 */ addiu $a3, %lo(D_80139964) # addiu $a3, $a3, -0x669c /* ACF864 800586C4 24040003 */ li $a0, 3 @@ -149,8 +149,8 @@ glabel func_800584E8 /* ACF86C 800586CC 0C018DDB */ jal func_8006376C /* ACF870 800586D0 24060005 */ li $a2, 5 /* ACF874 800586D4 860F0144 */ lh $t7, 0x144($s0) -/* ACF878 800586D8 3C0E8012 */ lui $t6, %hi(D_8011A2A4) # $t6, 0x8012 -/* ACF87C 800586DC 25CEA2A4 */ addiu $t6, %lo(D_8011A2A4) # addiu $t6, $t6, -0x5d5c +/* ACF878 800586D8 3C0E8012 */ lui $t6, %hi(sCameraModeNames) # $t6, 0x8012 +/* ACF87C 800586DC 25CEA2A4 */ addiu $t6, %lo(sCameraModeNames) # addiu $t6, $t6, -0x5d5c /* ACF880 800586E0 01F10019 */ multu $t7, $s1 /* ACF884 800586E4 24040005 */ li $a0, 5 /* ACF888 800586E8 24050018 */ li $a1, 24 @@ -158,7 +158,7 @@ glabel func_800584E8 /* ACF890 800586F0 0000C012 */ mflo $t8 /* ACF894 800586F4 030E3821 */ addu $a3, $t8, $t6 /* ACF898 800586F8 0C018DDB */ jal func_8006376C -/* ACF89C 800586FC 00000000 */ nop +/* ACF89C 800586FC 00000000 */ nop /* ACF8A0 80058700 3C078014 */ lui $a3, %hi(D_80139968) # $a3, 0x8014 /* ACF8A4 80058704 24E79968 */ addiu $a3, %lo(D_80139968) # addiu $a3, $a3, -0x6698 /* ACF8A8 80058708 24040003 */ li $a0, 3 @@ -166,17 +166,17 @@ glabel func_800584E8 /* ACF8B0 80058710 0C018DDB */ jal func_8006376C /* ACF8B4 80058714 24060005 */ li $a2, 5 /* ACF8B8 80058718 86190142 */ lh $t9, 0x142($s0) -/* ACF8BC 8005871C 3C188012 */ lui $t8, %hi(D_8011D068) +/* ACF8BC 8005871C 3C188012 */ lui $t8, %hi(sCameraSettings) /* ACF8C0 80058720 860E0144 */ lh $t6, 0x144($s0) /* ACF8C4 80058724 001978C0 */ sll $t7, $t9, 3 /* ACF8C8 80058728 030FC021 */ addu $t8, $t8, $t7 -/* ACF8CC 8005872C 8F18D068 */ lw $t8, %lo(D_8011D068)($t8) +/* ACF8CC 8005872C 8F18D068 */ lw $t8, %lo(sCameraSettings+4)($t8) /* ACF8D0 80058730 000EC8C0 */ sll $t9, $t6, 3 /* ACF8D4 80058734 24040005 */ li $a0, 5 /* ACF8D8 80058738 03197821 */ addu $t7, $t8, $t9 /* ACF8DC 8005873C 85EE0000 */ lh $t6, ($t7) -/* ACF8E0 80058740 3C198012 */ lui $t9, %hi(D_8011D3F8) # $t9, 0x8012 -/* ACF8E4 80058744 2739D3F8 */ addiu $t9, %lo(D_8011D3F8) # addiu $t9, $t9, -0x2c08 +/* ACF8E0 80058740 3C198012 */ lui $t9, %hi(sCameraFunctionNames) # $t9, 0x8012 +/* ACF8E4 80058744 2739D3F8 */ addiu $t9, %lo(sCameraFunctionNames) # addiu $t9, $t9, -0x2c08 /* ACF8E8 80058748 000EC0C0 */ sll $t8, $t6, 3 /* ACF8EC 8005874C 03193821 */ addu $a3, $t8, $t9 /* ACF8F0 80058750 24050019 */ li $a1, 25 @@ -196,14 +196,14 @@ glabel func_800584E8 /* ACF924 80058784 00007012 */ mflo $t6 /* ACF928 80058788 2405001A */ li $a1, 26 /* ACF92C 8005878C 15000002 */ bnez $t0, .L80058798 -/* ACF930 80058790 00000000 */ nop +/* ACF930 80058790 00000000 */ nop /* ACF934 80058794 0007000D */ break 7 .L80058798: /* ACF938 80058798 2401FFFF */ li $at, -1 /* ACF93C 8005879C 15010004 */ bne $t0, $at, .L800587B0 /* ACF940 800587A0 3C018000 */ lui $at, 0x8000 /* ACF944 800587A4 14610002 */ bne $v1, $at, .L800587B0 -/* ACF948 800587A8 00000000 */ nop +/* ACF948 800587A8 00000000 */ nop /* ACF94C 800587AC 0006000D */ break 6 .L800587B0: /* ACF950 800587B0 24060005 */ li $a2, 5 @@ -215,14 +215,14 @@ glabel func_800584E8 /* ACF968 800587C8 0000C012 */ mflo $t8 /* ACF96C 800587CC 27190030 */ addiu $t9, $t8, 0x30 /* ACF970 800587D0 15000002 */ bnez $t0, .L800587DC -/* ACF974 800587D4 00000000 */ nop +/* ACF974 800587D4 00000000 */ nop /* ACF978 800587D8 0007000D */ break 7 .L800587DC: /* ACF97C 800587DC 2401FFFF */ li $at, -1 /* ACF980 800587E0 15010004 */ bne $t0, $at, .L800587F4 /* ACF984 800587E4 3C018000 */ lui $at, 0x8000 /* ACF988 800587E8 14410002 */ bne $v0, $at, .L800587F4 -/* ACF98C 800587EC 00000000 */ nop +/* ACF98C 800587EC 00000000 */ nop /* ACF990 800587F0 0006000D */ break 6 .L800587F4: /* ACF994 800587F4 24420001 */ addiu $v0, $v0, 1 @@ -232,14 +232,14 @@ glabel func_800584E8 /* ACF9A0 80058800 27A30050 */ addiu $v1, $sp, 0x50 /* ACF9A4 80058804 0062C821 */ addu $t9, $v1, $v0 /* ACF9A8 80058808 15000002 */ bnez $t0, .L80058814 -/* ACF9AC 8005880C 00000000 */ nop +/* ACF9AC 8005880C 00000000 */ nop /* ACF9B0 80058810 0007000D */ break 7 .L80058814: /* ACF9B4 80058814 2401FFFF */ li $at, -1 /* ACF9B8 80058818 15010004 */ bne $t0, $at, .L8005882C /* ACF9BC 8005881C 3C018000 */ lui $at, 0x8000 /* ACF9C0 80058820 14410002 */ bne $v0, $at, .L8005882C -/* ACF9C4 80058824 00000000 */ nop +/* ACF9C4 80058824 00000000 */ nop /* ACF9C8 80058828 0006000D */ break 6 .L8005882C: /* ACF9CC 8005882C 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/non_matchings/code/z_camera/func_800588B4.s b/asm/non_matchings/code/z_camera/func_800588B4.s index 02066ad4f7..edc099fd66 100644 --- a/asm/non_matchings/code/z_camera/func_800588B4.s +++ b/asm/non_matchings/code/z_camera/func_800588B4.s @@ -6,7 +6,7 @@ glabel D_80139970 glabel D_80139984 .asciz "kankyo changed water, sound on\n" .balign 4 - + glabel D_801399A4 .asciz "kankyo changed water off, sound off\n" .balign 4 @@ -21,16 +21,16 @@ glabel func_800588B4 /* ACFA68 800588C8 8C820090 */ lw $v0, 0x90($a0) /* ACFA6C 800588CC 306E0002 */ andi $t6, $v1, 2 /* ACFA70 800588D0 11C0000A */ beqz $t6, .L800588FC -/* ACFA74 800588D4 00000000 */ nop +/* ACFA74 800588D4 00000000 */ nop /* ACFA78 800588D8 848F0142 */ lh $t7, 0x142($a0) -/* ACFA7C 800588DC 3C198012 */ lui $t9, %hi(D_8011D064) +/* ACFA7C 800588DC 3C198012 */ lui $t9, %hi(sCameraSettings) /* ACFA80 800588E0 30690200 */ andi $t1, $v1, 0x200 /* ACFA84 800588E4 000FC0C0 */ sll $t8, $t7, 3 /* ACFA88 800588E8 0338C821 */ addu $t9, $t9, $t8 -/* ACFA8C 800588EC 8F39D064 */ lw $t9, %lo(D_8011D064)($t9) +/* ACFA8C 800588EC 8F39D064 */ lw $t9, %lo(sCameraSettings)($t9) /* ACFA90 800588F0 00194040 */ sll $t0, $t9, 1 /* ACFA94 800588F4 05010003 */ bgez $t0, .L80058904 -/* ACFA98 800588F8 00000000 */ nop +/* ACFA98 800588F8 00000000 */ nop .L800588FC: /* ACFA9C 800588FC 100000F9 */ b .L80058CE4 /* ACFAA0 80058900 00001025 */ move $v0, $zero @@ -43,7 +43,7 @@ glabel func_800588B4 /* ACFAB8 80058918 314B0800 */ andi $t3, $t2, 0x800 /* ACFABC 8005891C 11600009 */ beqz $t3, .L80058944 /* ACFAC0 80058920 000373C2 */ srl $t6, $v1, 0xf -/* ACFAC4 80058924 0C016952 */ jal func_8005A548 +/* ACFAC4 80058924 0C016952 */ jal Camera_ChangeSetting /* ACFAC8 80058928 24060006 */ li $a2, 6 /* ACFACC 8005892C 860C014C */ lh $t4, 0x14c($s0) /* ACFAD0 80058930 24018000 */ li $at, -32768 @@ -55,7 +55,7 @@ glabel func_800588B4 /* ACFAE4 80058944 11C00008 */ beqz $t6, .L80058968 /* ACFAE8 80058948 02002025 */ move $a0, $s0 /* ACFAEC 8005894C 8605011E */ lh $a1, 0x11e($s0) -/* ACFAF0 80058950 0C016952 */ jal func_8005A548 +/* ACFAF0 80058950 0C016952 */ jal Camera_ChangeSetting /* ACFAF4 80058954 24060006 */ li $a2, 6 /* ACFAF8 80058958 860F014C */ lh $t7, 0x14c($s0) /* ACFAFC 8005895C 31F87FFF */ andi $t8, $t7, 0x7fff @@ -92,7 +92,7 @@ glabel func_800588B4 /* ACFB6C 800589CC 02002025 */ move $a0, $s0 /* ACFB70 800589D0 24050005 */ li $a1, 5 /* ACFB74 800589D4 46083032 */ c.eq.s $f6, $f8 -/* ACFB78 800589D8 00000000 */ nop +/* ACFB78 800589D8 00000000 */ nop /* ACFB7C 800589DC 4503004D */ bc1tl .L80058B14 /* ACFB80 800589E0 02002025 */ move $a0, $s0 /* ACFB84 800589E4 860C0146 */ lh $t4, 0x146($s0) @@ -100,7 +100,7 @@ glabel func_800588B4 /* ACFB8C 800589EC 24060002 */ li $a2, 2 /* ACFB90 800589F0 A7AC0032 */ sh $t4, 0x32($sp) /* ACFB94 800589F4 A60D0146 */ sh $t5, 0x146($s0) -/* ACFB98 800589F8 0C016952 */ jal func_8005A548 +/* ACFB98 800589F8 0C016952 */ jal Camera_ChangeSetting /* ACFB9C 800589FC AFAE002C */ sw $t6, 0x2c($sp) /* ACFBA0 80058A00 860F0142 */ lh $t7, 0x142($s0) /* ACFBA4 80058A04 8FB8002C */ lw $t8, 0x2c($sp) @@ -130,7 +130,7 @@ glabel func_800588B4 /* ACFBFC 80058A5C C6100098 */ lwc1 $f16, 0x98($s0) /* ACFC00 80058A60 C6120104 */ lwc1 $f18, 0x104($s0) /* ACFC04 80058A64 46128032 */ c.eq.s $f16, $f18 -/* ACFC08 80058A68 00000000 */ nop +/* ACFC08 80058A68 00000000 */ nop /* ACFC0C 80058A6C 45030029 */ bc1tl .L80058B14 /* ACFC10 80058A70 02002025 */ move $a0, $s0 /* ACFC14 80058A74 860D0146 */ lh $t5, 0x146($s0) @@ -163,7 +163,7 @@ glabel func_800588B4 /* ACFC7C 80058ADC 8E050118 */ lw $a1, 0x118($s0) /* ACFC80 80058AE0 A60E0146 */ sh $t6, 0x146($s0) /* ACFC84 80058AE4 04A10006 */ bgez $a1, .L80058B00 -/* ACFC88 80058AE8 00000000 */ nop +/* ACFC88 80058AE8 00000000 */ nop /* ACFC8C 80058AEC 0C015FF1 */ jal func_80057FC4 /* ACFC90 80058AF0 02002025 */ move $a0, $s0 /* ACFC94 80058AF4 240FFFFF */ li $t7, -1 @@ -185,7 +185,7 @@ glabel func_800588B4 /* ACFCC4 80058B24 44812000 */ mtc1 $at, $f4 /* ACFCC8 80058B28 E7A0004C */ swc1 $f0, 0x4c($sp) /* ACFCCC 80058B2C 46040032 */ c.eq.s $f0, $f4 -/* ACFCD0 80058B30 00000000 */ nop +/* ACFCD0 80058B30 00000000 */ nop /* ACFCD4 80058B34 45030056 */ bc1tl .L80058C90 /* ACFCD8 80058B38 8603014C */ lh $v1, 0x14c($s0) /* ACFCDC 80058B3C 8603014C */ lh $v1, 0x14c($s0) @@ -228,7 +228,7 @@ glabel func_800588B4 /* ACFD68 80058BC8 50810006 */ beql $a0, $at, .L80058BE4 /* ACFD6C 80058BCC 02002025 */ move $a0, $s0 /* ACFD70 80058BD0 0C024B8F */ jal Quake_GetCountdown -/* ACFD74 80058BD4 00000000 */ nop +/* ACFD74 80058BD4 00000000 */ nop /* ACFD78 80058BD8 2401000A */ li $at, 10 /* ACFD7C 80058BDC 14410015 */ bne $v0, $at, .L80058C34 /* ACFD80 80058BE0 02002025 */ move $a0, $s0 @@ -296,7 +296,7 @@ glabel func_800588B4 /* ACFE64 80058CC4 50800004 */ beql $a0, $zero, .L80058CD8 /* ACFE68 80058CC8 A6000150 */ sh $zero, 0x150($s0) /* ACFE6C 80058CCC 0C024BEB */ jal Quake_RemoveFromIdx -/* ACFE70 80058CD0 00000000 */ nop +/* ACFE70 80058CD0 00000000 */ nop /* ACFE74 80058CD4 A6000150 */ sh $zero, 0x150($s0) .L80058CD8: /* ACFE78 80058CD8 A6000152 */ sh $zero, 0x152($s0) @@ -308,5 +308,5 @@ glabel func_800588B4 /* ACFE88 80058CE8 8FB00020 */ lw $s0, 0x20($sp) /* ACFE8C 80058CEC 27BD0050 */ addiu $sp, $sp, 0x50 /* ACFE90 80058CF0 03E00008 */ jr $ra -/* ACFE94 80058CF4 00000000 */ nop +/* ACFE94 80058CF4 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/func_800591EC.s b/asm/non_matchings/code/z_camera/func_800591EC.s index 51e9714246..11074b3adb 100644 --- a/asm/non_matchings/code/z_camera/func_800591EC.s +++ b/asm/non_matchings/code/z_camera/func_800591EC.s @@ -14,11 +14,11 @@ glabel D_80139A48 glabel D_80139A60 .asciz "camera: engine (%d %d %d) %04x \n" .balign 4 - + glabel D_80139A84 .asciz "camera: shrink_and_bitem %x(%d)\n" .balign 4 - + glabel D_80139AA8 .asciz "camera: engine (%s(%d) %s(%d) %s(%d)) ok!\n" .balign 4 @@ -26,7 +26,7 @@ glabel D_80139AA8 glabel D_80139AD4 .asciz "camera: debug out\n" .balign 4 - + glabel D_80139AE8 .asciz "dir (%d) %d(%f) %d(%f) 0(0) \n" .balign 4 @@ -34,11 +34,11 @@ glabel D_80139AE8 glabel D_80139B08 .asciz "real (%d) %d(%f) %d(%f) 0(0) \n" .balign 4 - + glabel D_80139B28 .asciz "camera: out (%f %f %f) (%f %f %f)\n" .balign 4 - + glabel D_80139B4C .asciz "camera: dir (%f %d(%f) %d(%f)) (%f)\n" .balign 4 @@ -68,7 +68,7 @@ glabel D_8013A448 glabel D_8013A44C .float 0.00549325 # (180 / 32767.5f) - + .text glabel func_800591EC /* AD038C 800591EC 27BDFF20 */ addiu $sp, $sp, -0xe0 @@ -93,7 +93,7 @@ glabel func_800591EC /* AD03D4 80059234 3C0B8016 */ lui $t3, %hi(gGameInfo) # $t3, 0x8016 /* AD03D8 80059238 3C018012 */ lui $at, %hi(D_8011D3E8) # $at, 0x8012 /* AD03DC 8005923C 15400012 */ bnez $t2, .L80059288 -/* AD03E0 80059240 00000000 */ nop +/* AD03E0 80059240 00000000 */ nop /* AD03E4 80059244 8D6BFA90 */ lw $t3, %lo(gGameInfo)($t3) /* AD03E8 80059248 3C048014 */ lui $a0, %hi(D_80139A34) # $a0, 0x8014 /* AD03EC 8005924C 24849A34 */ addiu $a0, %lo(D_80139A34) # addiu $a0, $a0, -0x65cc @@ -116,7 +116,7 @@ glabel func_800591EC /* AD0428 80059288 AC20D3E8 */ sw $zero, %lo(D_8011D3E8)($at) /* AD042C 8005928C 8E050090 */ lw $a1, 0x90($s0) /* AD0430 80059290 10A000CC */ beqz $a1, .L800595C4 -/* AD0434 80059294 00000000 */ nop +/* AD0434 80059294 00000000 */ nop /* AD0438 80059298 0C00BBD1 */ jal func_8002EF44 /* AD043C 8005929C 27A40080 */ addiu $a0, $sp, 0x80 /* AD0440 800592A0 26050094 */ addiu $a1, $s0, 0x94 @@ -138,7 +138,7 @@ glabel func_800591EC /* AD0480 800592E0 44817000 */ mtc1 $at, $f14 /* AD0484 800592E4 468021A0 */ cvt.s.w $f6, $f4 /* AD0488 800592E8 46083282 */ mul.s $f10, $f6, $f8 -/* AD048C 800592EC 00000000 */ nop +/* AD048C 800592EC 00000000 */ nop /* AD0490 800592F0 46005402 */ mul.s $f16, $f10, $f0 /* AD0494 800592F4 0C01F02A */ jal func_8007C0A8 /* AD0498 800592F8 46109303 */ div.s $f12, $f18, $f16 @@ -194,21 +194,21 @@ glabel func_800591EC /* AD0560 800593C0 85F80008 */ lh $t8, 8($t7) /* AD0564 800593C4 00001025 */ move $v0, $zero /* AD0568 800593C8 44982000 */ mtc1 $t8, $f4 -/* AD056C 800593CC 00000000 */ nop +/* AD056C 800593CC 00000000 */ nop /* AD0570 800593D0 468021A0 */ cvt.s.w $f6, $f4 /* AD0574 800593D4 46023202 */ mul.s $f8, $f6, $f2 /* AD0578 800593D8 E6080108 */ swc1 $f8, 0x108($s0) /* AD057C 800593DC 8C790000 */ lw $t9, ($v1) /* AD0580 800593E0 8729000A */ lh $t1, 0xa($t9) /* AD0584 800593E4 44895000 */ mtc1 $t1, $f10 -/* AD0588 800593E8 00000000 */ nop +/* AD0588 800593E8 00000000 */ nop /* AD058C 800593EC 468054A0 */ cvt.s.w $f18, $f10 /* AD0590 800593F0 46029402 */ mul.s $f16, $f18, $f2 /* AD0594 800593F4 E610010C */ swc1 $f16, 0x10c($s0) /* AD0598 800593F8 8C6A0000 */ lw $t2, ($v1) /* AD059C 800593FC 854B000C */ lh $t3, 0xc($t2) /* AD05A0 80059400 448B2000 */ mtc1 $t3, $f4 -/* AD05A4 80059404 00000000 */ nop +/* AD05A4 80059404 00000000 */ nop /* AD05A8 80059408 468021A0 */ cvt.s.w $f6, $f4 /* AD05AC 8005940C 46023202 */ mul.s $f8, $f6, $f2 /* AD05B0 80059410 E6080110 */ swc1 $f8, 0x110($s0) @@ -240,7 +240,7 @@ glabel func_800591EC /* AD0610 80059470 AC22DB10 */ sw $v0, %lo(D_8011DB10)($at) /* AD0614 80059474 284100C8 */ slti $at, $v0, 0xc8 /* AD0618 80059478 10200052 */ beqz $at, .L800595C4 -/* AD061C 8005947C 00000000 */ nop +/* AD061C 8005947C 00000000 */ nop /* AD0620 80059480 86190140 */ lh $t9, 0x140($s0) /* AD0624 80059484 24010007 */ li $at, 7 /* AD0628 80059488 57210008 */ bnel $t9, $at, .L800594AC @@ -281,7 +281,7 @@ glabel func_800591EC /* AD06A8 80059508 02002025 */ move $a0, $s0 /* AD06AC 8005950C 27A500A8 */ addiu $a1, $sp, 0xa8 /* AD06B0 80059510 46109032 */ c.eq.s $f18, $f16 -/* AD06B4 80059514 00000000 */ nop +/* AD06B4 80059514 00000000 */ nop /* AD06B8 80059518 4503000F */ bc1tl .L80059558 /* AD06BC 8005951C 86050156 */ lh $a1, 0x156($s0) /* AD06C0 80059520 0C0111E7 */ jal func_8004479C @@ -309,9 +309,9 @@ glabel func_800591EC /* AD0710 80059570 44814000 */ mtc1 $at, $f8 /* AD0714 80059574 46000005 */ abs.s $f0, $f0 /* AD0718 80059578 4608003C */ c.lt.s $f0, $f8 -/* AD071C 8005957C 00000000 */ nop +/* AD071C 8005957C 00000000 */ nop /* AD0720 80059580 45000010 */ bc1f .L800595C4 -/* AD0724 80059584 00000000 */ nop +/* AD0724 80059584 00000000 */ nop /* AD0728 80059588 860B014C */ lh $t3, 0x14c($s0) /* AD072C 8005958C 8FAD0058 */ lw $t5, 0x58($sp) /* AD0730 80059590 316C0200 */ andi $t4, $t3, 0x200 @@ -320,7 +320,7 @@ glabel func_800591EC /* AD073C 8005959C 81AE014F */ lb $t6, 0x14f($t5) /* AD0740 800595A0 24010001 */ li $at, 1 /* AD0744 800595A4 15C10007 */ bne $t6, $at, .L800595C4 -/* AD0748 800595A8 00000000 */ nop +/* AD0748 800595A8 00000000 */ nop /* AD074C 800595AC 860F0158 */ lh $t7, 0x158($s0) .L800595B0: /* AD0750 800595B0 02002025 */ move $a0, $s0 @@ -369,13 +369,13 @@ glabel func_800591EC /* AD07F0 80059650 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* AD07F4 80059654 872902F4 */ lh $t1, 0x2f4($t9) /* AD07F8 80059658 1120000D */ beqz $t1, .L80059690 -/* AD07FC 8005965C 00000000 */ nop +/* AD07FC 8005965C 00000000 */ nop /* AD0800 80059660 86050142 */ lh $a1, 0x142($s0) -/* AD0804 80059664 3C0B8012 */ lui $t3, %hi(D_8011D068) +/* AD0804 80059664 3C0B8012 */ lui $t3, %hi(sCameraSettings) /* AD0808 80059668 86060144 */ lh $a2, 0x144($s0) /* AD080C 8005966C 000550C0 */ sll $t2, $a1, 3 /* AD0810 80059670 016A5821 */ addu $t3, $t3, $t2 -/* AD0814 80059674 8D6BD068 */ lw $t3, %lo(D_8011D068)($t3) +/* AD0814 80059674 8D6BD068 */ lw $t3, %lo(sCameraSettings+4)($t3) /* AD0818 80059678 000660C0 */ sll $t4, $a2, 3 /* AD081C 8005967C 860E014C */ lh $t6, 0x14c($s0) /* AD0820 80059680 016C6821 */ addu $t5, $t3, $t4 @@ -389,21 +389,21 @@ glabel func_800591EC /* AD083C 8005969C 50200014 */ beql $at, $zero, .L800596F0 /* AD0840 800596A0 8E0E0090 */ lw $t6, 0x90($s0) /* AD0844 800596A4 860F0142 */ lh $t7, 0x142($s0) -/* AD0848 800596A8 3C198012 */ lui $t9, %hi(D_8011D068) +/* AD0848 800596A8 3C198012 */ lui $t9, %hi(sCameraSettings) /* AD084C 800596AC 86090144 */ lh $t1, 0x144($s0) /* AD0850 800596B0 000FC0C0 */ sll $t8, $t7, 3 /* AD0854 800596B4 0338C821 */ addu $t9, $t9, $t8 -/* AD0858 800596B8 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) +/* AD0858 800596B8 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) /* AD085C 800596BC 000950C0 */ sll $t2, $t1, 3 /* AD0860 800596C0 02002025 */ move $a0, $s0 /* AD0864 800596C4 032A5821 */ addu $t3, $t9, $t2 /* AD0868 800596C8 856C0000 */ lh $t4, ($t3) -/* AD086C 800596CC 3C198012 */ lui $t9, %hi(D_8011D274) +/* AD086C 800596CC 3C198012 */ lui $t9, %hi(sCameraFunctions) /* AD0870 800596D0 000C6880 */ sll $t5, $t4, 2 /* AD0874 800596D4 032DC821 */ addu $t9, $t9, $t5 -/* AD0878 800596D8 8F39D274 */ lw $t9, %lo(D_8011D274)($t9) +/* AD0878 800596D8 8F39D274 */ lw $t9, %lo(sCameraFunctions)($t9) /* AD087C 800596DC 0320F809 */ jalr $t9 -/* AD0880 800596E0 00000000 */ nop +/* AD0880 800596E0 00000000 */ nop /* AD0884 800596E4 1000000E */ b .L80059720 /* AD0888 800596E8 860F0140 */ lh $t7, 0x140($s0) /* AD088C 800596EC 8E0E0090 */ lw $t6, 0x90($s0) @@ -424,7 +424,7 @@ glabel func_800591EC /* AD08C0 80059720 24010007 */ li $at, 7 /* AD08C4 80059724 3C028016 */ lui $v0, %hi(gSaveContext+0x135c) # $v0, 0x8016 /* AD08C8 80059728 15E10038 */ bne $t7, $at, .L8005980C -/* AD08CC 8005972C 00000000 */ nop +/* AD08CC 8005972C 00000000 */ nop /* AD08D0 80059730 8C42F9BC */ lw $v0, %lo(gSaveContext+0x135c)($v0) /* AD08D4 80059734 3C038012 */ lui $v1, %hi(D_8011D3F0) # $v1, 0x8012 /* AD08D8 80059738 24010003 */ li $at, 3 @@ -437,7 +437,7 @@ glabel func_800591EC /* AD08F4 80059754 0C0114D4 */ jal func_80045350 /* AD08F8 80059758 84440002 */ lh $a0, 2($v0) /* AD08FC 8005975C 1000002B */ b .L8005980C -/* AD0900 80059760 00000000 */ nop +/* AD0900 80059760 00000000 */ nop .L80059764: /* AD0904 80059764 8C620000 */ lw $v0, ($v1) /* AD0908 80059768 5040000E */ beql $v0, $zero, .L800597A4 @@ -453,7 +453,7 @@ glabel func_800591EC /* AD0930 80059790 0C0114D4 */ jal func_80045350 /* AD0934 80059794 84A40002 */ lh $a0, 2($a1) /* AD0938 80059798 1000001C */ b .L8005980C -/* AD093C 8005979C 00000000 */ nop +/* AD093C 8005979C 00000000 */ nop .L800597A0: /* AD0940 800597A0 8E06008C */ lw $a2, 0x8c($s0) .L800597A4: @@ -462,29 +462,29 @@ glabel func_800591EC /* AD094C 800597AC 01665821 */ addu $t3, $t3, $a2 /* AD0950 800597B0 916B241B */ lbu $t3, 0x241b($t3) /* AD0954 800597B4 3C018012 */ lui $at, %hi(D_8011D3A0) # $at, 0x8012 -/* AD0958 800597B8 3C048012 */ lui $a0, %hi(D_8011D3A2) # $a0, 0x8012 +/* AD0958 800597B8 3C048012 */ lui $a0, %hi(D_8011D3A0) # $a0, 0x8012 /* AD095C 800597BC 51600007 */ beql $t3, $zero, .L800597DC /* AD0960 800597C0 90CD1D6C */ lbu $t5, 0x1d6c($a2) /* AD0964 800597C4 AC2CD3A0 */ sw $t4, %lo(D_8011D3A0)($at) /* AD0968 800597C8 0C0114D4 */ jal func_80045350 -/* AD096C 800597CC 8484D3A2 */ lh $a0, %lo(D_8011D3A2)($a0) +/* AD096C 800597CC 8484D3A2 */ lh $a0,%lo(D_8011D3A0+2)($a0) /* AD0970 800597D0 1000000E */ b .L8005980C -/* AD0974 800597D4 00000000 */ nop +/* AD0974 800597D4 00000000 */ nop /* AD0978 800597D8 90CD1D6C */ lbu $t5, 0x1d6c($a2) .L800597DC: /* AD097C 800597DC 24193200 */ li $t9, 12800 /* AD0980 800597E0 3C018012 */ lui $at, %hi(D_8011D3A0) # $at, 0x8012 /* AD0984 800597E4 11A00007 */ beqz $t5, .L80059804 -/* AD0988 800597E8 3C048012 */ lui $a0, %hi(D_8011D3A2) +/* AD0988 800597E8 3C048012 */ lui $a0, %hi(D_8011D3A0) /* AD098C 800597EC AC39D3A0 */ sw $t9, %lo(D_8011D3A0)($at) -/* AD0990 800597F0 3C048012 */ lui $a0, %hi(D_8011D3A2) # $a0, 0x8012 +/* AD0990 800597F0 3C048012 */ lui $a0, %hi(D_8011D3A0) # $a0, 0x8012 /* AD0994 800597F4 0C0114D4 */ jal func_80045350 -/* AD0998 800597F8 8484D3A2 */ lh $a0, %lo(D_8011D3A2)($a0) +/* AD0998 800597F8 8484D3A2 */ lh $a0,%lo(D_8011D3A0+2)($a0) /* AD099C 800597FC 10000003 */ b .L8005980C -/* AD09A0 80059800 00000000 */ nop +/* AD09A0 80059800 00000000 */ nop .L80059804: /* AD09A4 80059804 0C0114D4 */ jal func_80045350 -/* AD09A8 80059808 8484D3A2 */ lh $a0, %lo(D_8011D3A2)($a0) +/* AD09A8 80059808 8484D3A2 */ lh $a0,%lo(D_8011D3A0+2)($a0) .L8005980C: /* AD09AC 8005980C 3C0E8016 */ lui $t6, %hi(gGameInfo) # $t6, 0x8016 /* AD09B0 80059810 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) @@ -493,7 +493,7 @@ glabel func_800591EC /* AD09BC 8005981C 85C202F4 */ lh $v0, 0x2f4($t6) /* AD09C0 80059820 3C058012 */ lui $a1, %hi(D_8011D3A0) # $a1, 0x8012 /* AD09C4 80059824 1040000A */ beqz $v0, .L80059850 -/* AD09C8 80059828 00000000 */ nop +/* AD09C8 80059828 00000000 */ nop /* AD09CC 8005982C 8E0F008C */ lw $t7, 0x8c($s0) /* AD09D0 80059830 3C060001 */ lui $a2, 1 /* AD09D4 80059834 8CA5D3A0 */ lw $a1, %lo(D_8011D3A0)($a1) @@ -505,30 +505,30 @@ glabel func_800591EC /* AD09EC 8005984C 870202F4 */ lh $v0, 0x2f4($t8) .L80059850: /* AD09F0 80059850 1040001F */ beqz $v0, .L800598D0 -/* AD09F4 80059854 00000000 */ nop +/* AD09F4 80059854 00000000 */ nop /* AD09F8 80059858 86060142 */ lh $a2, 0x142($s0) /* AD09FC 8005985C 2408000C */ li $t0, 12 /* AD0A00 80059860 86020144 */ lh $v0, 0x144($s0) /* AD0A04 80059864 00C80019 */ multu $a2, $t0 -/* AD0A08 80059868 3C198012 */ lui $t9, %hi(D_8011D068) +/* AD0A08 80059868 3C198012 */ lui $t9, %hi(sCameraSettings) /* AD0A0C 8005986C 000668C0 */ sll $t5, $a2, 3 /* AD0A10 80059870 032DC821 */ addu $t9, $t9, $t5 -/* AD0A14 80059874 8F39D068 */ lw $t9, %lo(D_8011D068)($t9) +/* AD0A14 80059874 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) /* AD0A18 80059878 000270C0 */ sll $t6, $v0, 3 -/* AD0A1C 8005987C 3C0A8012 */ lui $t2, %hi(D_80119F8C) # $t2, 0x8012 +/* AD0A1C 8005987C 3C0A8012 */ lui $t2, %hi(sCameraSettingNames) # $t2, 0x8012 /* AD0A20 80059880 AFA20010 */ sw $v0, 0x10($sp) /* AD0A24 80059884 032E7821 */ addu $t7, $t9, $t6 /* AD0A28 80059888 85E30000 */ lh $v1, ($t7) /* AD0A2C 8005988C 00004812 */ mflo $t1 -/* AD0A30 80059890 254A9F8C */ addiu $t2, %lo(D_80119F8C) # addiu $t2, $t2, -0x6074 +/* AD0A30 80059890 254A9F8C */ addiu $t2, %lo(sCameraSettingNames) # addiu $t2, $t2, -0x6074 /* AD0A34 80059894 012A2821 */ addu $a1, $t1, $t2 /* AD0A38 80059898 00480019 */ multu $v0, $t0 -/* AD0A3C 8005989C 3C098012 */ lui $t1, %hi(D_8011D3F8) # $t1, 0x8012 -/* AD0A40 800598A0 2529D3F8 */ addiu $t1, %lo(D_8011D3F8) # addiu $t1, $t1, -0x2c08 -/* AD0A44 800598A4 3C0C8012 */ lui $t4, %hi(D_8011A2A4) # $t4, 0x8012 +/* AD0A3C 8005989C 3C098012 */ lui $t1, %hi(sCameraFunctionNames) # $t1, 0x8012 +/* AD0A40 800598A0 2529D3F8 */ addiu $t1, %lo(sCameraFunctionNames) # addiu $t1, $t1, -0x2c08 +/* AD0A44 800598A4 3C0C8012 */ lui $t4, %hi(sCameraModeNames) # $t4, 0x8012 /* AD0A48 800598A8 0003C0C0 */ sll $t8, $v1, 3 /* AD0A4C 800598AC 03095021 */ addu $t2, $t8, $t1 -/* AD0A50 800598B0 258CA2A4 */ addiu $t4, %lo(D_8011A2A4) # addiu $t4, $t4, -0x5d5c +/* AD0A50 800598B0 258CA2A4 */ addiu $t4, %lo(sCameraModeNames) # addiu $t4, $t4, -0x5d5c /* AD0A54 800598B4 3C048014 */ lui $a0, %hi(D_80139AA8) # $a0, 0x8014 /* AD0A58 800598B8 24849AA8 */ addiu $a0, %lo(D_80139AA8) # addiu $a0, $a0, -0x6558 /* AD0A5C 800598BC AFAA0014 */ sw $t2, 0x14($sp) @@ -545,7 +545,7 @@ glabel func_800591EC /* AD0A84 800598E4 2442D394 */ addiu $v0, %lo(D_8011D394) # addiu $v0, $v0, -0x2c6c /* AD0A88 800598E8 01816827 */ nor $t5, $t4, $at /* AD0A8C 800598EC 15A00012 */ bnez $t5, .L80059938 -/* AD0A90 800598F0 00000000 */ nop +/* AD0A90 800598F0 00000000 */ nop /* AD0A94 800598F4 8C590000 */ lw $t9, ($v0) /* AD0A98 800598F8 3C048016 */ lui $a0, %hi(D_8015BD80) # $a0, 0x8016 /* AD0A9C 800598FC 2484BD80 */ addiu $a0, %lo(D_8015BD80) # addiu $a0, $a0, -0x4280 @@ -555,13 +555,13 @@ glabel func_800591EC /* AD0AAC 8005990C 0C02D379 */ jal func_800B4DE4 /* AD0AB0 80059910 02002825 */ move $a1, $s0 /* AD0AB4 80059914 10000008 */ b .L80059938 -/* AD0AB8 80059918 00000000 */ nop +/* AD0AB8 80059918 00000000 */ nop .L8005991C: /* AD0ABC 8005991C 8E06008C */ lw $a2, 0x8c($s0) /* AD0AC0 80059920 90D81D6C */ lbu $t8, 0x1d6c($a2) /* AD0AC4 80059924 00C02025 */ move $a0, $a2 /* AD0AC8 80059928 13000003 */ beqz $t8, .L80059938 -/* AD0ACC 8005992C 00000000 */ nop +/* AD0ACC 8005992C 00000000 */ nop /* AD0AD0 80059930 0C01914D */ jal func_80064534 /* AD0AD4 80059934 24C51D64 */ addiu $a1, $a2, 0x1d64 .L80059938: @@ -592,7 +592,7 @@ glabel func_800591EC /* AD0B38 80059998 3C048014 */ lui $a0, %hi(D_80139AD4) # $a0, 0x8014 /* AD0B3C 8005999C 856C02F4 */ lh $t4, 0x2f4($t3) /* AD0B40 800599A0 11800003 */ beqz $t4, .L800599B0 -/* AD0B44 800599A4 00000000 */ nop +/* AD0B44 800599A4 00000000 */ nop /* AD0B48 800599A8 0C00084C */ jal osSyncPrintf /* AD0B4C 800599AC 24849AD4 */ addiu $a0, %lo(D_80139AD4) # addiu $a0, $a0, -0x652c .L800599B0: @@ -615,7 +615,7 @@ glabel func_800591EC /* AD0B8C 800599EC A4580194 */ sh $t8, 0x194($v0) /* AD0B90 800599F0 86090140 */ lh $t1, 0x140($s0) /* AD0B94 800599F4 1521000A */ bne $t1, $at, .L80059A20 -/* AD0B98 800599F8 00000000 */ nop +/* AD0B98 800599F8 00000000 */ nop /* AD0B9C 800599FC 8A0C0134 */ lwl $t4, 0x134($s0) /* AD0BA0 80059A00 8FAA00E0 */ lw $t2, 0xe0($sp) /* AD0BA4 80059A04 9A0C0137 */ lwr $t4, 0x137($s0) @@ -755,9 +755,9 @@ glabel func_800591EC /* AD0DA4 80059C04 3C053F4A */ lui $a1, (0x3F4A3D71 >> 16) # lui $a1, 0x3f4a /* AD0DA8 80059C08 34A53D71 */ ori $a1, (0x3F4A3D71 & 0xFFFF) # ori $a1, $a1, 0x3d71 /* AD0DAC 80059C0C 4604803C */ c.lt.s $f16, $f4 -/* AD0DB0 80059C10 00000000 */ nop +/* AD0DB0 80059C10 00000000 */ nop /* AD0DB4 80059C14 45000005 */ bc1f .L80059C2C -/* AD0DB8 80059C18 00000000 */ nop +/* AD0DB8 80059C18 00000000 */ nop /* AD0DBC 80059C1C 0C02A90F */ jal View_SetScale /* AD0DC0 80059C20 24C400B8 */ addiu $a0, $a2, 0xb8 /* AD0DC4 80059C24 10000004 */ b .L80059C38 @@ -786,7 +786,7 @@ glabel func_800591EC /* AD0E18 80059C78 8C6D0000 */ lw $t5, ($v1) /* AD0E1C 80059C7C 87B9009C */ lh $t9, 0x9c($sp) /* AD0E20 80059C80 15A00005 */ bnez $t5, .L80059C98 -/* AD0E24 80059C84 00000000 */ nop +/* AD0E24 80059C84 00000000 */ nop /* AD0E28 80059C88 A6190134 */ sh $t9, 0x134($s0) /* AD0E2C 80059C8C 87AE009E */ lh $t6, 0x9e($sp) /* AD0E30 80059C90 A6000138 */ sh $zero, 0x138($s0) @@ -846,7 +846,7 @@ glabel func_800591EC /* AD0F00 80059D60 954B0020 */ lhu $t3, 0x20($t2) /* AD0F04 80059D64 01616027 */ nor $t4, $t3, $at /* AD0F08 80059D68 15800002 */ bnez $t4, .L80059D74 -/* AD0F0C 80059D6C 00000000 */ nop +/* AD0F0C 80059D6C 00000000 */ nop /* AD0F10 80059D70 A6000160 */ sh $zero, 0x160($s0) .L80059D74: /* AD0F14 80059D74 8DADFA90 */ lw $t5, %lo(gGameInfo)($t5) @@ -936,5 +936,5 @@ glabel func_800591EC /* AD1058 80059EB8 8FB00040 */ lw $s0, 0x40($sp) /* AD105C 80059EBC 27BD00E0 */ addiu $sp, $sp, 0xe0 /* AD1060 80059EC0 03E00008 */ jr $ra -/* AD1064 80059EC4 00000000 */ nop +/* AD1064 80059EC4 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/func_8005A470.s b/asm/non_matchings/code/z_camera/func_8005A470.s deleted file mode 100644 index e8479ff2fb..0000000000 --- a/asm/non_matchings/code/z_camera/func_8005A470.s +++ /dev/null @@ -1,65 +0,0 @@ -.rdata -glabel D_80139C34 - .asciz "+=+=+=+ recive asking -> %s (%s)\n" - .balign 4 - -.text -glabel func_8005A470 -/* AD1610 8005A470 3C0E8016 */ lui $t6, %hi(gGameInfo) # $t6, 0x8016 -/* AD1614 8005A474 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* AD1618 8005A478 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD161C 8005A47C AFBF0014 */ sw $ra, 0x14($sp) -/* AD1620 8005A480 AFA5001C */ sw $a1, 0x1c($sp) -/* AD1624 8005A484 85CF03C6 */ lh $t7, 0x3c6($t6) -/* AD1628 8005A488 00803825 */ move $a3, $a0 -/* AD162C 8005A48C 87B8001E */ lh $t8, 0x1e($sp) -/* AD1630 8005A490 11E00013 */ beqz $t7, .L8005A4E0 -/* AD1634 8005A494 2402000C */ li $v0, 12 -/* AD1638 8005A498 03020019 */ multu $t8, $v0 -/* AD163C 8005A49C 84E90142 */ lh $t1, 0x142($a3) -/* AD1640 8005A4A0 3C088012 */ lui $t0, %hi(D_8011A2A4) # $t0, 0x8012 -/* AD1644 8005A4A4 3C0B8012 */ lui $t3, %hi(D_80119F8C) # $t3, 0x8012 -/* AD1648 8005A4A8 256B9F8C */ addiu $t3, %lo(D_80119F8C) # addiu $t3, $t3, -0x6074 -/* AD164C 8005A4AC 2508A2A4 */ addiu $t0, %lo(D_8011A2A4) # addiu $t0, $t0, -0x5d5c -/* AD1650 8005A4B0 3C048014 */ lui $a0, %hi(D_80139C34) # $a0, 0x8014 -/* AD1654 8005A4B4 24849C34 */ addiu $a0, %lo(D_80139C34) # addiu $a0, $a0, -0x63cc -/* AD1658 8005A4B8 AFA70018 */ sw $a3, 0x18($sp) -/* AD165C 8005A4BC 0000C812 */ mflo $t9 -/* AD1660 8005A4C0 03282821 */ addu $a1, $t9, $t0 -/* AD1664 8005A4C4 00000000 */ nop -/* AD1668 8005A4C8 01220019 */ multu $t1, $v0 -/* AD166C 8005A4CC 00005012 */ mflo $t2 -/* AD1670 8005A4D0 014B3021 */ addu $a2, $t2, $t3 -/* AD1674 8005A4D4 0C00084C */ jal osSyncPrintf -/* AD1678 8005A4D8 00000000 */ nop -/* AD167C 8005A4DC 8FA70018 */ lw $a3, 0x18($sp) -.L8005A4E0: -/* AD1680 8005A4E0 84EC0142 */ lh $t4, 0x142($a3) -/* AD1684 8005A4E4 3C0E8012 */ lui $t6, %hi(D_8011D064) -/* AD1688 8005A4E8 87B8001E */ lh $t8, 0x1e($sp) -/* AD168C 8005A4EC 000C68C0 */ sll $t5, $t4, 3 -/* AD1690 8005A4F0 01CD7021 */ addu $t6, $t6, $t5 -/* AD1694 8005A4F4 8DCED064 */ lw $t6, %lo(D_8011D064)($t6) -/* AD1698 8005A4F8 3C013FFF */ lui $at, (0x3FFFFFFF >> 16) # lui $at, 0x3fff -/* AD169C 8005A4FC 3421FFFF */ ori $at, (0x3FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* AD16A0 8005A500 24190001 */ li $t9, 1 -/* AD16A4 8005A504 03194004 */ sllv $t0, $t9, $t8 -/* AD16A8 8005A508 01C17824 */ and $t7, $t6, $at -/* AD16AC 8005A50C 01E84824 */ and $t1, $t7, $t0 -/* AD16B0 8005A510 15200003 */ bnez $t1, .L8005A520 -/* AD16B4 8005A514 8FBF0014 */ lw $ra, 0x14($sp) -/* AD16B8 8005A518 10000009 */ b .L8005A540 -/* AD16BC 8005A51C 00001025 */ move $v0, $zero -.L8005A520: -/* AD16C0 8005A520 87AA001E */ lh $t2, 0x1e($sp) -/* AD16C4 8005A524 84EB0144 */ lh $t3, 0x144($a3) -/* AD16C8 8005A528 87A2001E */ lh $v0, 0x1e($sp) -/* AD16CC 8005A52C 3C018000 */ lui $at, 0x8000 -/* AD16D0 8005A530 154B0003 */ bne $t2, $t3, .L8005A540 -/* AD16D4 8005A534 00411025 */ or $v0, $v0, $at -/* AD16D8 8005A538 10000001 */ b .L8005A540 -/* AD16DC 8005A53C 2402FFFF */ li $v0, -1 -.L8005A540: -/* AD16E0 8005A540 03E00008 */ jr $ra -/* AD16E4 8005A544 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/non_matchings/code/z_camera/func_8005A7A8.s b/asm/non_matchings/code/z_camera/func_8005A7A8.s index ff6d566e2e..480a529db6 100644 --- a/asm/non_matchings/code/z_camera/func_8005A7A8.s +++ b/asm/non_matchings/code/z_camera/func_8005A7A8.s @@ -37,7 +37,7 @@ glabel func_8005A7A8 /* AD19B4 8005A814 352A0040 */ ori $t2, $t1, 0x40 /* AD19B8 8005A818 A60A014A */ sh $t2, 0x14a($s0) /* AD19BC 8005A81C 02002025 */ move $a0, $s0 -/* AD19C0 8005A820 0C016952 */ jal func_8005A548 +/* AD19C0 8005A820 0C016952 */ jal Camera_ChangeSetting /* AD19C4 8005A824 24060005 */ li $a2, 5 /* AD19C8 8005A828 28430000 */ slti $v1, $v0, 0 /* AD19CC 8005A82C 38630001 */ xori $v1, $v1, 1 @@ -46,20 +46,20 @@ glabel func_8005A7A8 /* AD19D8 8005A838 1460000A */ bnez $v1, .L8005A864 /* AD19DC 8005A83C 02002025 */ move $a0, $s0 /* AD19E0 8005A840 860B0142 */ lh $t3, 0x142($s0) -/* AD19E4 8005A844 3C0D8012 */ lui $t5, %hi(D_8011D064) +/* AD19E4 8005A844 3C0D8012 */ lui $t5, %hi(sCameraSettings) /* AD19E8 8005A848 2861FFFF */ slti $at, $v1, -1 /* AD19EC 8005A84C 000B60C0 */ sll $t4, $t3, 3 /* AD19F0 8005A850 01AC6821 */ addu $t5, $t5, $t4 -/* AD19F4 8005A854 8DADD064 */ lw $t5, %lo(D_8011D064)($t5) +/* AD19F4 8005A854 8DADD064 */ lw $t5, %lo(sCameraSettings)($t5) /* AD19F8 8005A858 000D7000 */ sll $t6, $t5, 0 /* AD19FC 8005A85C 05C10009 */ bgez $t6, .L8005A884 -/* AD1A00 8005A860 00000000 */ nop +/* AD1A00 8005A860 00000000 */ nop .L8005A864: /* AD1A04 8005A864 860F014A */ lh $t7, 0x14a($s0) /* AD1A08 8005A868 A6110148 */ sh $s1, 0x148($s0) /* AD1A0C 8005A86C 86050144 */ lh $a1, 0x144($s0) /* AD1A10 8005A870 35F80004 */ ori $t8, $t7, 4 -/* AD1A14 8005A874 0C01144A */ jal func_80045128 +/* AD1A14 8005A874 0C01144A */ jal Camera_CopyModeValuesToPREG /* AD1A18 8005A878 A618014A */ sh $t8, 0x14a($s0) /* AD1A1C 8005A87C 1000000B */ b .L8005A8AC /* AD1A20 8005A880 3C018000 */ lui $at, 0x8000 diff --git a/asm/non_matchings/code/z_play/func_800C05E4.s b/asm/non_matchings/code/z_play/func_800C05E4.s index 308efca38d..97a8d2a269 100644 --- a/asm/non_matchings/code/z_play/func_800C05E4.s +++ b/asm/non_matchings/code/z_play/func_800C05E4.s @@ -29,18 +29,18 @@ glabel func_800C05E4 /* B377D4 800C0634 01F8C821 */ addu $t9, $t7, $t8 /* B377D8 800C0638 8F300790 */ lw $s0, 0x790($t9) /* B377DC 800C063C 02403025 */ move $a2, $s2 -/* B377E0 800C0640 0C016AA4 */ jal func_8005AA90 +/* B377E0 800C0640 0C016AA4 */ jal Camera_SetParam /* B377E4 800C0644 02002025 */ move $a0, $s0 /* B377E8 800C0648 00028840 */ sll $s1, $v0, 1 /* B377EC 800C064C 02002025 */ move $a0, $s0 /* B377F0 800C0650 24050002 */ li $a1, 2 -/* B377F4 800C0654 0C016AA4 */ jal func_8005AA90 +/* B377F4 800C0654 0C016AA4 */ jal Camera_SetParam /* B377F8 800C0658 8FA60034 */ lw $a2, 0x34($sp) /* B377FC 800C065C 02228825 */ or $s1, $s1, $v0 /* B37800 800C0660 00118840 */ sll $s1, $s1, 1 /* B37804 800C0664 02002025 */ move $a0, $s0 /* B37808 800C0668 24050004 */ li $a1, 4 -/* B3780C 800C066C 0C016AA4 */ jal func_8005AA90 +/* B3780C 800C066C 0C016AA4 */ jal Camera_SetParam /* B37810 800C0670 8FA60038 */ lw $a2, 0x38($sp) /* B37814 800C0674 02228825 */ or $s1, $s1, $v0 /* B37818 800C0678 02402025 */ move $a0, $s2 diff --git a/asm/non_matchings/code/z_play/func_800C0704.s b/asm/non_matchings/code/z_play/func_800C0704.s index 23299e5dfb..ae3eef4ff6 100644 --- a/asm/non_matchings/code/z_play/func_800C0704.s +++ b/asm/non_matchings/code/z_play/func_800C0704.s @@ -8,7 +8,7 @@ glabel func_800C0704 /* B378BC 800C071C 008FC021 */ addu $t8, $a0, $t7 /* B378C0 800C0720 8F040790 */ lw $a0, 0x790($t8) /* B378C4 800C0724 27A60020 */ addiu $a2, $sp, 0x20 -/* B378C8 800C0728 0C016AA4 */ jal func_8005AA90 +/* B378C8 800C0728 0C016AA4 */ jal Camera_SetParam /* B378CC 800C072C 24050020 */ li $a1, 32 /* B378D0 800C0730 8FBF0014 */ lw $ra, 0x14($sp) /* B378D4 800C0734 30430001 */ andi $v1, $v0, 1 diff --git a/asm/non_matchings/code/z_player_lib/func_8008EEAC.s b/asm/non_matchings/code/z_player_lib/func_8008EEAC.s index 916cadde69..b3f0f9ba3b 100644 --- a/asm/non_matchings/code/z_player_lib/func_8008EEAC.s +++ b/asm/non_matchings/code/z_player_lib/func_8008EEAC.s @@ -20,7 +20,7 @@ glabel func_8008EEAC /* B06094 8008EEF4 00002825 */ move $a1, $zero /* B06098 8008EEF8 00402025 */ move $a0, $v0 /* B0609C 8008EEFC 24050008 */ li $a1, 8 -/* B060A0 8008EF00 0C016AA4 */ jal func_8005AA90 +/* B060A0 8008EF00 0C016AA4 */ jal Camera_SetParam /* B060A4 8008EF04 8FA60024 */ lw $a2, 0x24($sp) /* B060A8 8008EF08 8FA40020 */ lw $a0, 0x20($sp) /* B060AC 8008EF0C 0C030129 */ jal Gameplay_GetCamera @@ -31,5 +31,5 @@ glabel func_8008EEAC /* B060C0 8008EF20 8FBF0014 */ lw $ra, 0x14($sp) /* B060C4 8008EF24 27BD0020 */ addiu $sp, $sp, 0x20 /* B060C8 8008EF28 03E00008 */ jr $ra -/* B060CC 8008EF2C 00000000 */ nop +/* B060CC 8008EF2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F08C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F08C.s index 05c091932f..f7e975a2e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F08C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F08C.s @@ -2,50 +2,50 @@ glabel func_80A5F08C /* 03D9C 80A5F08C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 03DA0 80A5F090 3C028016 */ lui $v0, %hi(gGameInfo) /* 03DA4 80A5F094 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 03DA8 80A5F098 AFBF002C */ sw $ra, 0x002C($sp) -/* 03DAC 80A5F09C AFB10028 */ sw $s1, 0x0028($sp) -/* 03DB0 80A5F0A0 AFB00024 */ sw $s0, 0x0024($sp) +/* 03DA8 80A5F098 AFBF002C */ sw $ra, 0x002C($sp) +/* 03DAC 80A5F09C AFB10028 */ sw $s1, 0x0028($sp) +/* 03DB0 80A5F0A0 AFB00024 */ sw $s0, 0x0024($sp) /* 03DB4 80A5F0A4 844E05BE */ lh $t6, 0x05BE($v0) ## 801605BE /* 03DB8 80A5F0A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 03DBC 80A5F0AC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 03DC0 80A5F0B0 51C00029 */ beql $t6, $zero, .L80A5F158 +/* 03DC0 80A5F0B0 51C00029 */ beql $t6, $zero, .L80A5F158 /* 03DC4 80A5F0B4 8E0B01F0 */ lw $t3, 0x01F0($s0) ## 000001F0 /* 03DC8 80A5F0B8 8C8F0158 */ lw $t7, 0x0158($a0) ## 00000158 -/* 03DCC 80A5F0BC 55E00026 */ bnel $t7, $zero, .L80A5F158 +/* 03DCC 80A5F0BC 55E00026 */ bnel $t7, $zero, .L80A5F158 /* 03DD0 80A5F0C0 8E0B01F0 */ lw $t3, 0x01F0($s0) ## 000001F0 -/* 03DD4 80A5F0C4 0C296F65 */ jal func_80A5BD94 +/* 03DD4 80A5F0C4 0C296F65 */ jal func_80A5BD94 /* 03DD8 80A5F0C8 A44005BE */ sh $zero, 0x05BE($v0) ## 801605BE -/* 03DDC 80A5F0CC 10400021 */ beq $v0, $zero, .L80A5F154 +/* 03DDC 80A5F0CC 10400021 */ beq $v0, $zero, .L80A5F154 /* 03DE0 80A5F0D0 3C078013 */ lui $a3, %hi(D_801333E0) /* 03DE4 80A5F0D4 3C188013 */ lui $t8, %hi(D_801333E8) /* 03DE8 80A5F0D8 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 03DEC 80A5F0DC 271833E8 */ addiu $t8, %lo(D_801333E8) -/* 03DF0 80A5F0E0 AFB80014 */ sw $t8, 0x0014($sp) -/* 03DF4 80A5F0E4 AFA70010 */ sw $a3, 0x0010($sp) +/* 03DF0 80A5F0E0 AFB80014 */ sw $t8, 0x0014($sp) +/* 03DF4 80A5F0E4 AFA70010 */ sw $a3, 0x0010($sp) /* 03DF8 80A5F0E8 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 /* 03DFC 80A5F0EC 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 03E00 80A5F0F0 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 03E04 80A5F0F4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 03E08 80A5F0F8 8E1901F0 */ lw $t9, 0x01F0($s0) ## 000001F0 /* 03E0C 80A5F0FC 2401DFFF */ addiu $at, $zero, 0xDFFF ## $at = FFFFDFFF /* 03E10 80A5F100 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 03E14 80A5F104 03214024 */ and $t0, $t9, $at +/* 03E14 80A5F104 03214024 */ and $t0, $t9, $at /* 03E18 80A5F108 AE0801F0 */ sw $t0, 0x01F0($s0) ## 000001F0 /* 03E1C 80A5F10C 862900A4 */ lh $t1, 0x00A4($s1) ## 000000A4 /* 03E20 80A5F110 3C018016 */ lui $at, %hi(gSaveContext+0x1348) /* 03E24 80A5F114 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 03E28 80A5F118 A429F9A8 */ sh $t1, %lo(gSaveContext+0x1348)($at) -/* 03E2C 80A5F11C 0C016AA4 */ jal func_8005AA90 +/* 03E2C 80A5F11C 0C016AA4 */ jal Camera_SetParam /* 03E30 80A5F120 8E240790 */ lw $a0, 0x0790($s1) ## 00000790 /* 03E34 80A5F124 8E240790 */ lw $a0, 0x0790($s1) ## 00000790 -/* 03E38 80A5F128 0C0169DF */ jal func_8005A77C +/* 03E38 80A5F128 0C0169DF */ jal func_8005A77C /* 03E3C 80A5F12C 24050038 */ addiu $a1, $zero, 0x0038 ## $a1 = 00000038 /* 03E40 80A5F130 8E240790 */ lw $a0, 0x0790($s1) ## 00000790 /* 03E44 80A5F134 240A0051 */ addiu $t2, $zero, 0x0051 ## $t2 = 00000051 -/* 03E48 80A5F138 AFAA0010 */ sw $t2, 0x0010($sp) -/* 03E4C 80A5F13C AFA00018 */ sw $zero, 0x0018($sp) -/* 03E50 80A5F140 AFA00014 */ sw $zero, 0x0014($sp) +/* 03E48 80A5F138 AFAA0010 */ sw $t2, 0x0010($sp) +/* 03E4C 80A5F13C AFA00018 */ sw $zero, 0x0018($sp) +/* 03E50 80A5F140 AFA00014 */ sw $zero, 0x0014($sp) /* 03E54 80A5F144 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 03E58 80A5F148 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 03E5C 80A5F14C 0C016BF5 */ jal Camera_SetCameraData @@ -57,9 +57,9 @@ glabel func_80A5F08C /* 03E68 80A5F158 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03E6C 80A5F15C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 03E70 80A5F160 316C2000 */ andi $t4, $t3, 0x2000 ## $t4 = 00000000 -/* 03E74 80A5F164 5580000E */ bnel $t4, $zero, .L80A5F1A0 -/* 03E78 80A5F168 8FBF002C */ lw $ra, 0x002C($sp) -/* 03E7C 80A5F16C 0C297DD8 */ jal func_80A5F760 +/* 03E74 80A5F164 5580000E */ bnel $t4, $zero, .L80A5F1A0 +/* 03E78 80A5F168 8FBF002C */ lw $ra, 0x002C($sp) +/* 03E7C 80A5F16C 0C297DD8 */ jal func_80A5F760 /* 03E80 80A5F170 A6000250 */ sh $zero, 0x0250($s0) ## 00000250 /* 03E84 80A5F174 920D028A */ lbu $t5, 0x028A($s0) ## 0000028A /* 03E88 80A5F178 920F02D6 */ lbu $t7, 0x02D6($s0) ## 000002D6 @@ -71,9 +71,9 @@ glabel func_80A5F08C /* 03EA0 80A5F190 A20E028A */ sb $t6, 0x028A($s0) ## 0000028A /* 03EA4 80A5F194 A21802D6 */ sb $t8, 0x02D6($s0) ## 000002D6 /* 03EA8 80A5F198 A2080322 */ sb $t0, 0x0322($s0) ## 00000322 -/* 03EAC 80A5F19C 8FBF002C */ lw $ra, 0x002C($sp) +/* 03EAC 80A5F19C 8FBF002C */ lw $ra, 0x002C($sp) .L80A5F1A0: -/* 03EB0 80A5F1A0 8FB00024 */ lw $s0, 0x0024($sp) -/* 03EB4 80A5F1A4 8FB10028 */ lw $s1, 0x0028($sp) -/* 03EB8 80A5F1A8 03E00008 */ jr $ra +/* 03EB0 80A5F1A0 8FB00024 */ lw $s0, 0x0024($sp) +/* 03EB4 80A5F1A4 8FB10028 */ lw $s1, 0x0028($sp) +/* 03EB8 80A5F1A8 03E00008 */ jr $ra /* 03EBC 80A5F1AC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s index 195ac91175..e2df6e2412 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s @@ -1,133 +1,133 @@ glabel func_80A5F414 /* 04124 80A5F414 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 04128 80A5F418 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0412C 80A5F41C AFBF002C */ sw $ra, 0x002C($sp) -/* 04130 80A5F420 AFB00028 */ sw $s0, 0x0028($sp) -/* 04134 80A5F424 AFA5003C */ sw $a1, 0x003C($sp) +/* 0412C 80A5F41C AFBF002C */ sw $ra, 0x002C($sp) +/* 04130 80A5F420 AFB00028 */ sw $s0, 0x0028($sp) +/* 04134 80A5F424 AFA5003C */ sw $a1, 0x003C($sp) /* 04138 80A5F428 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 0413C 80A5F42C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04140 80A5F430 0C296F1A */ jal func_80A5BC68 -/* 04144 80A5F434 8FA5003C */ lw $a1, 0x003C($sp) +/* 04140 80A5F430 0C296F1A */ jal func_80A5BC68 +/* 04144 80A5F434 8FA5003C */ lw $a1, 0x003C($sp) /* 04148 80A5F438 3C028016 */ lui $v0, %hi(gGameInfo) /* 0414C 80A5F43C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 04150 80A5F440 844E05BE */ lh $t6, 0x05BE($v0) ## 801605BE -/* 04154 80A5F444 11C00041 */ beq $t6, $zero, .L80A5F54C +/* 04154 80A5F444 11C00041 */ beq $t6, $zero, .L80A5F54C /* 04158 80A5F448 00000000 */ nop /* 0415C 80A5F44C 8E0F0158 */ lw $t7, 0x0158($s0) ## 00000158 /* 04160 80A5F450 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 04164 80A5F454 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 04168 80A5F458 15E0003C */ bne $t7, $zero, .L80A5F54C +/* 04168 80A5F458 15E0003C */ bne $t7, $zero, .L80A5F54C /* 0416C 80A5F45C 00000000 */ nop /* 04170 80A5F460 A44005BE */ sh $zero, 0x05BE($v0) ## 801605BE -/* 04174 80A5F464 0C296EEF */ jal func_80A5BBBC -/* 04178 80A5F468 8FA4003C */ lw $a0, 0x003C($sp) -/* 0417C 80A5F46C 14400028 */ bne $v0, $zero, .L80A5F510 +/* 04174 80A5F464 0C296EEF */ jal func_80A5BBBC +/* 04178 80A5F468 8FA4003C */ lw $a0, 0x003C($sp) +/* 0417C 80A5F46C 14400028 */ bne $v0, $zero, .L80A5F510 /* 04180 80A5F470 3C078013 */ lui $a3, %hi(D_801333E0) /* 04184 80A5F474 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04188 80A5F478 0C296F65 */ jal func_80A5BD94 -/* 0418C 80A5F47C 8FA5003C */ lw $a1, 0x003C($sp) -/* 04190 80A5F480 10400032 */ beq $v0, $zero, .L80A5F54C +/* 04188 80A5F478 0C296F65 */ jal func_80A5BD94 +/* 0418C 80A5F47C 8FA5003C */ lw $a1, 0x003C($sp) +/* 04190 80A5F480 10400032 */ beq $v0, $zero, .L80A5F54C /* 04194 80A5F484 3C078013 */ lui $a3, %hi(D_801333E0) /* 04198 80A5F488 3C188013 */ lui $t8, %hi(D_801333E8) /* 0419C 80A5F48C 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 041A0 80A5F490 271833E8 */ addiu $t8, %lo(D_801333E8) -/* 041A4 80A5F494 AFB80014 */ sw $t8, 0x0014($sp) -/* 041A8 80A5F498 AFA70010 */ sw $a3, 0x0010($sp) +/* 041A4 80A5F494 AFB80014 */ sw $t8, 0x0014($sp) +/* 041A8 80A5F498 AFA70010 */ sw $a3, 0x0010($sp) /* 041AC 80A5F49C 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 /* 041B0 80A5F4A0 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 041B4 80A5F4A4 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 041B8 80A5F4A8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 041BC 80A5F4AC A6000250 */ sh $zero, 0x0250($s0) ## 00000250 -/* 041C0 80A5F4B0 8FA5003C */ lw $a1, 0x003C($sp) -/* 041C4 80A5F4B4 0C297DD8 */ jal func_80A5F760 +/* 041C0 80A5F4B0 8FA5003C */ lw $a1, 0x003C($sp) +/* 041C4 80A5F4B4 0C297DD8 */ jal func_80A5F760 /* 041C8 80A5F4B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 041CC 80A5F4BC 8FB9003C */ lw $t9, 0x003C($sp) +/* 041CC 80A5F4BC 8FB9003C */ lw $t9, 0x003C($sp) /* 041D0 80A5F4C0 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 /* 041D4 80A5F4C4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 041D8 80A5F4C8 0C016AA4 */ jal func_8005AA90 +/* 041D8 80A5F4C8 0C016AA4 */ jal Camera_SetParam /* 041DC 80A5F4CC 8F240790 */ lw $a0, 0x0790($t9) ## 00000790 -/* 041E0 80A5F4D0 8FA8003C */ lw $t0, 0x003C($sp) +/* 041E0 80A5F4D0 8FA8003C */ lw $t0, 0x003C($sp) /* 041E4 80A5F4D4 24050038 */ addiu $a1, $zero, 0x0038 ## $a1 = 00000038 -/* 041E8 80A5F4D8 0C0169DF */ jal func_8005A77C +/* 041E8 80A5F4D8 0C0169DF */ jal func_8005A77C /* 041EC 80A5F4DC 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 041F0 80A5F4E0 8FA9003C */ lw $t1, 0x003C($sp) +/* 041F0 80A5F4E0 8FA9003C */ lw $t1, 0x003C($sp) /* 041F4 80A5F4E4 240A0051 */ addiu $t2, $zero, 0x0051 ## $t2 = 00000051 /* 041F8 80A5F4E8 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 041FC 80A5F4EC 8D240790 */ lw $a0, 0x0790($t1) ## 00000790 -/* 04200 80A5F4F0 AFA00018 */ sw $zero, 0x0018($sp) -/* 04204 80A5F4F4 AFA00014 */ sw $zero, 0x0014($sp) -/* 04208 80A5F4F8 AFAA0010 */ sw $t2, 0x0010($sp) +/* 04200 80A5F4F0 AFA00018 */ sw $zero, 0x0018($sp) +/* 04204 80A5F4F4 AFA00014 */ sw $zero, 0x0014($sp) +/* 04208 80A5F4F8 AFAA0010 */ sw $t2, 0x0010($sp) /* 0420C 80A5F4FC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 04210 80A5F500 0C016BF5 */ jal Camera_SetCameraData ## setCameraData /* 04214 80A5F504 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 04218 80A5F508 10000010 */ beq $zero, $zero, .L80A5F54C +/* 04218 80A5F508 10000010 */ beq $zero, $zero, .L80A5F54C /* 0421C 80A5F50C 00000000 */ nop .L80A5F510: /* 04220 80A5F510 3C0B8013 */ lui $t3, %hi(D_801333E8) /* 04224 80A5F514 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 04228 80A5F518 256B33E8 */ addiu $t3, %lo(D_801333E8) -/* 0422C 80A5F51C AFAB0014 */ sw $t3, 0x0014($sp) -/* 04230 80A5F520 AFA70010 */ sw $a3, 0x0010($sp) +/* 0422C 80A5F51C AFAB0014 */ sw $t3, 0x0014($sp) +/* 04230 80A5F520 AFA70010 */ sw $a3, 0x0010($sp) /* 04234 80A5F524 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 /* 04238 80A5F528 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 0423C 80A5F52C 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 04240 80A5F530 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 04244 80A5F534 A6000250 */ sh $zero, 0x0250($s0) ## 00000250 /* 04248 80A5F538 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0424C 80A5F53C 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 /* 04250 80A5F540 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 04254 80A5F544 0C297D7E */ jal func_80A5F5F8 +/* 04254 80A5F544 0C297D7E */ jal func_80A5F5F8 /* 04258 80A5F548 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 .L80A5F54C: /* 0425C 80A5F54C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 04260 80A5F550 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 04264 80A5F554 50400024 */ beql $v0, $zero, .L80A5F5E8 -/* 04268 80A5F558 8FBF002C */ lw $ra, 0x002C($sp) +/* 04264 80A5F554 50400024 */ beql $v0, $zero, .L80A5F5E8 +/* 04268 80A5F558 8FBF002C */ lw $ra, 0x002C($sp) /* 0426C 80A5F55C 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 /* 04270 80A5F560 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 04274 80A5F564 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 04278 80A5F568 10400009 */ beq $v0, $zero, .L80A5F590 +/* 04278 80A5F568 10400009 */ beq $v0, $zero, .L80A5F590 /* 0427C 80A5F56C 00000000 */ nop -/* 04280 80A5F570 54410004 */ bnel $v0, $at, .L80A5F584 +/* 04280 80A5F570 54410004 */ bnel $v0, $at, .L80A5F584 /* 04284 80A5F574 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 04288 80A5F578 10000005 */ beq $zero, $zero, .L80A5F590 +/* 04288 80A5F578 10000005 */ beq $zero, $zero, .L80A5F590 /* 0428C 80A5F57C 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 04290 80A5F580 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 .L80A5F584: -/* 04294 80A5F584 14410002 */ bne $v0, $at, .L80A5F590 +/* 04294 80A5F584 14410002 */ bne $v0, $at, .L80A5F590 /* 04298 80A5F588 00000000 */ nop /* 0429C 80A5F58C 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 .L80A5F590: /* 042A0 80A5F590 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 042A4 80A5F594 AFA30034 */ sw $v1, 0x0034($sp) +/* 042A4 80A5F594 AFA30034 */ sw $v1, 0x0034($sp) /* 042A8 80A5F598 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 042AC 80A5F59C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 042B0 80A5F5A0 8FA30034 */ lw $v1, 0x0034($sp) +/* 042B0 80A5F5A0 8FA30034 */ lw $v1, 0x0034($sp) /* 042B4 80A5F5A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 042B8 80A5F5A8 4600303C */ c.lt.s $f6, $f0 +/* 042B8 80A5F5A8 4600303C */ c.lt.s $f6, $f0 /* 042BC 80A5F5AC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 042C0 80A5F5B0 3C0580A6 */ lui $a1, %hi(D_80A66678) ## $a1 = 80A60000 /* 042C4 80A5F5B4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 042C8 80A5F5B8 45000003 */ bc1f .L80A5F5C8 -/* 042CC 80A5F5BC 000370C0 */ sll $t6, $v1, 3 -/* 042D0 80A5F5C0 10000001 */ beq $zero, $zero, .L80A5F5C8 +/* 042C8 80A5F5B8 45000003 */ bc1f .L80A5F5C8 +/* 042CC 80A5F5BC 000370C0 */ sll $t6, $v1, 3 +/* 042D0 80A5F5C0 10000001 */ beq $zero, $zero, .L80A5F5C8 /* 042D4 80A5F5C4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A5F5C8: -/* 042D8 80A5F5C8 00026080 */ sll $t4, $v0, 2 -/* 042DC 80A5F5CC 018E7821 */ addu $t7, $t4, $t6 -/* 042E0 80A5F5D0 00AF2821 */ addu $a1, $a1, $t7 -/* 042E4 80A5F5D4 44060000 */ mfc1 $a2, $f0 -/* 042E8 80A5F5D8 44070000 */ mfc1 $a3, $f0 -/* 042EC 80A5F5DC 0C297C6C */ jal func_80A5F1B0 -/* 042F0 80A5F5E0 8CA56678 */ lw $a1, %lo(D_80A66678)($a1) -/* 042F4 80A5F5E4 8FBF002C */ lw $ra, 0x002C($sp) +/* 042D8 80A5F5C8 00026080 */ sll $t4, $v0, 2 +/* 042DC 80A5F5CC 018E7821 */ addu $t7, $t4, $t6 +/* 042E0 80A5F5D0 00AF2821 */ addu $a1, $a1, $t7 +/* 042E4 80A5F5D4 44060000 */ mfc1 $a2, $f0 +/* 042E8 80A5F5D8 44070000 */ mfc1 $a3, $f0 +/* 042EC 80A5F5DC 0C297C6C */ jal func_80A5F1B0 +/* 042F0 80A5F5E0 8CA56678 */ lw $a1, %lo(D_80A66678)($a1) +/* 042F4 80A5F5E4 8FBF002C */ lw $ra, 0x002C($sp) .L80A5F5E8: -/* 042F8 80A5F5E8 8FB00028 */ lw $s0, 0x0028($sp) +/* 042F8 80A5F5E8 8FB00028 */ lw $s0, 0x0028($sp) /* 042FC 80A5F5EC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 04300 80A5F5F0 03E00008 */ jr $ra +/* 04300 80A5F5F0 03E00008 */ jr $ra /* 04304 80A5F5F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s index cf3d0657b2..cc839e77a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s @@ -1,135 +1,135 @@ glabel func_8083B040 /* 08E30 8083B040 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 08E34 8083B044 AFBF001C */ sw $ra, 0x001C($sp) -/* 08E38 8083B048 AFB00018 */ sw $s0, 0x0018($sp) -/* 08E3C 8083B04C AFA50034 */ sw $a1, 0x0034($sp) +/* 08E34 8083B044 AFBF001C */ sw $ra, 0x001C($sp) +/* 08E38 8083B048 AFB00018 */ sw $s0, 0x0018($sp) +/* 08E3C 8083B04C AFA50034 */ sw $a1, 0x0034($sp) /* 08E40 8083B050 908E06AD */ lbu $t6, 0x06AD($a0) ## 000006AD /* 08E44 8083B054 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 08E48 8083B058 51C00175 */ beql $t6, $zero, .L8083B630 +/* 08E48 8083B058 51C00175 */ beql $t6, $zero, .L8083B630 /* 08E4C 8083B05C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 08E50 8083B060 0C20CCAE */ jal func_808332B8 +/* 08E50 8083B060 0C20CCAE */ jal func_808332B8 /* 08E54 8083B064 00000000 */ nop -/* 08E58 8083B068 14400009 */ bne $v0, $zero, .L8083B090 -/* 08E5C 8083B06C 8FA40034 */ lw $a0, 0x0034($sp) +/* 08E58 8083B068 14400009 */ bne $v0, $zero, .L8083B090 +/* 08E5C 8083B06C 8FA40034 */ lw $a0, 0x0034($sp) /* 08E60 8083B070 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 /* 08E64 8083B074 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 08E68 8083B078 17000005 */ bne $t8, $zero, .L8083B090 +/* 08E68 8083B078 17000005 */ bne $t8, $zero, .L8083B090 /* 08E6C 8083B07C 00000000 */ nop /* 08E70 8083B080 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C -/* 08E74 8083B084 00194200 */ sll $t0, $t9, 8 -/* 08E78 8083B088 05030169 */ bgezl $t0, .L8083B630 +/* 08E74 8083B084 00194200 */ sll $t0, $t9, 8 +/* 08E78 8083B088 05030169 */ bgezl $t0, .L8083B630 /* 08E7C 8083B08C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L8083B090: -/* 08E80 8083B090 0C20EB75 */ jal func_8083ADD4 +/* 08E80 8083B090 0C20EB75 */ jal func_8083ADD4 /* 08E84 8083B094 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08E88 8083B098 14400160 */ bne $v0, $zero, .L8083B61C +/* 08E88 8083B098 14400160 */ bne $v0, $zero, .L8083B61C /* 08E8C 8083B09C 00000000 */ nop /* 08E90 8083B0A0 920906AD */ lbu $t1, 0x06AD($s0) ## 000006AD /* 08E94 8083B0A4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 08E98 8083B0A8 8FA40034 */ lw $a0, 0x0034($sp) -/* 08E9C 8083B0AC 15210138 */ bne $t1, $at, .L8083B590 +/* 08E98 8083B0A8 8FA40034 */ lw $a0, 0x0034($sp) +/* 08E9C 8083B0AC 15210138 */ bne $t1, $at, .L8083B590 /* 08EA0 8083B0B0 00000000 */ nop /* 08EA4 8083B0B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08EA8 8083B0B8 0C023C36 */ jal func_8008F0D8 +/* 08EA8 8083B0B8 0C023C36 */ jal func_8008F0D8 /* 08EAC 8083B0BC 82050154 */ lb $a1, 0x0154($s0) ## 00000154 -/* 08EB0 8083B0C0 04400023 */ bltz $v0, .L8083B150 -/* 08EB4 8083B0C4 AFA2002C */ sw $v0, 0x002C($sp) +/* 08EB0 8083B0C0 04400023 */ bltz $v0, .L8083B150 +/* 08EB4 8083B0C4 AFA2002C */ sw $v0, 0x002C($sp) /* 08EB8 8083B0C8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 08EBC 8083B0CC 14410006 */ bne $v0, $at, .L8083B0E8 +/* 08EBC 8083B0CC 14410006 */ bne $v0, $at, .L8083B0E8 /* 08EC0 8083B0D0 3C0A8016 */ lui $t2, %hi(gSaveContext+0x13b3) /* 08EC4 8083B0D4 814AFA13 */ lb $t2, %lo(gSaveContext+0x13b3)($t2) -/* 08EC8 8083B0D8 8FA40034 */ lw $a0, 0x0034($sp) +/* 08EC8 8083B0D8 8FA40034 */ lw $a0, 0x0034($sp) /* 08ECC 8083B0DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08ED0 8083B0E0 1D400007 */ bgtz $t2, .L8083B100 +/* 08ED0 8083B0E0 1D400007 */ bgtz $t2, .L8083B100 /* 08ED4 8083B0E4 3C068085 */ lui $a2, %hi(func_8085063C) ## $a2 = 80850000 .L8083B0E8: -/* 08ED8 8083B0E8 8FA40034 */ lw $a0, 0x0034($sp) +/* 08ED8 8083B0E8 8FA40034 */ lw $a0, 0x0034($sp) /* 08EDC 8083B0EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08EE0 8083B0F0 0C20EBD1 */ jal func_8083AF44 -/* 08EE4 8083B0F4 8FA6002C */ lw $a2, 0x002C($sp) -/* 08EE8 8083B0F8 10000011 */ beq $zero, $zero, .L8083B140 +/* 08EE0 8083B0F0 0C20EBD1 */ jal func_8083AF44 +/* 08EE4 8083B0F4 8FA6002C */ lw $a2, 0x002C($sp) +/* 08EE8 8083B0F8 10000011 */ beq $zero, $zero, .L8083B140 /* 08EEC 8083B0FC 00000000 */ nop .L8083B100: /* 08EF0 8083B100 24C6063C */ addiu $a2, $a2, %lo(func_8085063C) ## $a2 = 0000063C -/* 08EF4 8083B104 0C20D716 */ jal func_80835C58 +/* 08EF4 8083B104 0C20D716 */ jal func_80835C58 /* 08EF8 8083B108 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 08EFC 8083B10C 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C /* 08F00 8083B110 3C013000 */ lui $at, 0x3000 ## $at = 30000000 /* 08F04 8083B114 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 08F08 8083B118 01616025 */ or $t4, $t3, $at ## $t4 = 30000000 -/* 08F0C 8083B11C 0C20CCCE */ jal func_80833338 +/* 08F0C 8083B11C 0C20CCCE */ jal func_80833338 /* 08F10 8083B120 AE0C067C */ sw $t4, 0x067C($s0) ## 0000067C -/* 08F14 8083B124 8FA40034 */ lw $a0, 0x0034($sp) +/* 08F14 8083B124 8FA40034 */ lw $a0, 0x0034($sp) /* 08F18 8083B128 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08F1C 8083B12C 0C20C899 */ jal func_80832264 +/* 08F1C 8083B12C 0C20C899 */ jal func_80832264 /* 08F20 8083B130 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 08F24 8083B134 8FA40034 */ lw $a0, 0x0034($sp) -/* 08F28 8083B138 0C20D7A9 */ jal func_80835EA4 +/* 08F24 8083B134 8FA40034 */ lw $a0, 0x0034($sp) +/* 08F28 8083B138 0C20D7A9 */ jal func_80835EA4 /* 08F2C 8083B13C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 .L8083B140: -/* 08F30 8083B140 0C20C889 */ jal func_80832224 +/* 08F30 8083B140 0C20C889 */ jal func_80832224 /* 08F34 8083B144 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08F38 8083B148 10000139 */ beq $zero, $zero, .L8083B630 +/* 08F38 8083B148 10000139 */ beq $zero, $zero, .L8083B630 /* 08F3C 8083B14C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L8083B150: /* 08F40 8083B150 82050154 */ lb $a1, 0x0154($s0) ## 00000154 /* 08F44 8083B154 24ADFFD5 */ addiu $t5, $a1, 0xFFD5 ## $t5 = FFFFFFD5 -/* 08F48 8083B158 05A1001B */ bgez $t5, .L8083B1C8 -/* 08F4C 8083B15C AFAD002C */ sw $t5, 0x002C($sp) -/* 08F50 8083B160 0C023C89 */ jal func_8008F224 +/* 08F48 8083B158 05A1001B */ bgez $t5, .L8083B1C8 +/* 08F4C 8083B15C AFAD002C */ sw $t5, 0x002C($sp) +/* 08F50 8083B160 0C023C89 */ jal func_8008F224 /* 08F54 8083B164 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 08F58 8083B168 2443FFFF */ addiu $v1, $v0, 0xFFFF ## $v1 = FFFFFFFF -/* 08F5C 8083B16C 046000A2 */ bltz $v1, .L8083B3F8 -/* 08F60 8083B170 AFA30028 */ sw $v1, 0x0028($sp) -/* 08F64 8083B174 28610006 */ slti $at, $v1, 0x0006 -/* 08F68 8083B178 502000A0 */ beql $at, $zero, .L8083B3FC +/* 08F5C 8083B16C 046000A2 */ bltz $v1, .L8083B3F8 +/* 08F60 8083B170 AFA30028 */ sw $v1, 0x0028($sp) +/* 08F64 8083B174 28610006 */ slti $at, $v1, 0x0006 +/* 08F68 8083B178 502000A0 */ beql $at, $zero, .L8083B3FC /* 08F6C 8083B17C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 08F70 8083B180 82050154 */ lb $a1, 0x0154($s0) ## 00000154 -/* 08F74 8083B184 28A10023 */ slti $at, $a1, 0x0023 -/* 08F78 8083B188 50200010 */ beql $at, $zero, .L8083B1CC -/* 08F7C 8083B18C 8FA40034 */ lw $a0, 0x0034($sp) +/* 08F74 8083B184 28A10023 */ slti $at, $a1, 0x0023 +/* 08F78 8083B188 50200010 */ beql $at, $zero, .L8083B1CC +/* 08F7C 8083B18C 8FA40034 */ lw $a0, 0x0034($sp) /* 08F80 8083B190 8E0F0694 */ lw $t7, 0x0694($s0) ## 00000694 /* 08F84 8083B194 24010022 */ addiu $at, $zero, 0x0022 ## $at = 00000022 -/* 08F88 8083B198 51E00098 */ beql $t7, $zero, .L8083B3FC +/* 08F88 8083B198 51E00098 */ beql $t7, $zero, .L8083B3FC /* 08F8C 8083B19C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08F90 8083B1A0 54A10006 */ bnel $a1, $at, .L8083B1BC +/* 08F90 8083B1A0 54A10006 */ bnel $a1, $at, .L8083B1BC /* 08F94 8083B1A4 82190693 */ lb $t9, 0x0693($s0) ## 00000693 /* 08F98 8083B1A8 82180693 */ lb $t8, 0x0693($s0) ## 00000693 /* 08F9C 8083B1AC 2401001B */ addiu $at, $zero, 0x001B ## $at = 0000001B -/* 08FA0 8083B1B0 53010006 */ beql $t8, $at, .L8083B1CC -/* 08FA4 8083B1B4 8FA40034 */ lw $a0, 0x0034($sp) +/* 08FA0 8083B1B0 53010006 */ beql $t8, $at, .L8083B1CC +/* 08FA4 8083B1B4 8FA40034 */ lw $a0, 0x0034($sp) /* 08FA8 8083B1B8 82190693 */ lb $t9, 0x0693($s0) ## 00000693 .L8083B1BC: /* 08FAC 8083B1BC 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 08FB0 8083B1C0 5721008E */ bnel $t9, $at, .L8083B3FC +/* 08FB0 8083B1C0 5721008E */ bnel $t9, $at, .L8083B3FC /* 08FB4 8083B1C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L8083B1C8: -/* 08FB8 8083B1C8 8FA40034 */ lw $a0, 0x0034($sp) +/* 08FB8 8083B1C8 8FA40034 */ lw $a0, 0x0034($sp) .L8083B1CC: /* 08FBC 8083B1CC 90881D57 */ lbu $t0, 0x1D57($a0) ## 00001D57 -/* 08FC0 8083B1D0 15000087 */ bne $t0, $zero, .L8083B3F0 +/* 08FC0 8083B1D0 15000087 */ bne $t0, $zero, .L8083B3F0 /* 08FC4 8083B1D4 00000000 */ nop /* 08FC8 8083B1D8 84891D58 */ lh $t1, 0x1D58($a0) ## 00001D58 /* 08FCC 8083B1DC 3C068085 */ lui $a2, %hi(func_8084F104) ## $a2 = 80850000 /* 08FD0 8083B1E0 24C6F104 */ addiu $a2, $a2, %lo(func_8084F104) ## $a2 = 8084F104 -/* 08FD4 8083B1E4 15200082 */ bne $t1, $zero, .L8083B3F0 +/* 08FD4 8083B1E4 15200082 */ bne $t1, $zero, .L8083B3F0 /* 08FD8 8083B1E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08FDC 8083B1EC 0C20D779 */ jal func_80835DE4 +/* 08FDC 8083B1EC 0C20D779 */ jal func_80835DE4 /* 08FE0 8083B1F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08FE4 8083B1F4 8FAA002C */ lw $t2, 0x002C($sp) +/* 08FE4 8083B1F4 8FAA002C */ lw $t2, 0x002C($sp) /* 08FE8 8083B1F8 3C0B8085 */ lui $t3, %hi(D_80854528) ## $t3 = 80850000 /* 08FEC 8083B1FC 3C0E8085 */ lui $t6, %hi(D_80853624) ## $t6 = 80850000 -/* 08FF0 8083B200 0540000B */ bltz $t2, .L8083B230 -/* 08FF4 8083B204 016A5821 */ addu $t3, $t3, $t2 -/* 08FF8 8083B208 916B4528 */ lbu $t3, %lo(D_80854528)($t3) +/* 08FF0 8083B200 0540000B */ bltz $t2, .L8083B230 +/* 08FF4 8083B204 016A5821 */ addu $t3, $t3, $t2 +/* 08FF8 8083B208 916B4528 */ lbu $t3, %lo(D_80854528)($t3) /* 08FFC 8083B20C 25CE3624 */ addiu $t6, $t6, %lo(D_80853624) ## $t6 = 80853624 /* 09000 8083B210 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09004 8083B214 000B6080 */ sll $t4, $t3, 2 -/* 09008 8083B218 018B6023 */ subu $t4, $t4, $t3 -/* 0900C 8083B21C 000C6040 */ sll $t4, $t4, 1 +/* 09004 8083B214 000B6080 */ sll $t4, $t3, 2 +/* 09008 8083B218 018B6023 */ subu $t4, $t4, $t3 +/* 0900C 8083B21C 000C6040 */ sll $t4, $t4, 1 /* 09010 8083B220 258DFFFA */ addiu $t5, $t4, 0xFFFA ## $t5 = FFFFFFFA -/* 09014 8083B224 01AE1021 */ addu $v0, $t5, $t6 -/* 09018 8083B228 0C20EB90 */ jal func_8083AE40 +/* 09014 8083B224 01AE1021 */ addu $v0, $t5, $t6 +/* 09018 8083B228 0C20EB90 */ jal func_8083AE40 /* 0901C 8083B22C 84450004 */ lh $a1, 0x0004($v0) ## 00000004 .L8083B230: /* 09020 8083B230 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C @@ -137,61 +137,61 @@ glabel func_8083B040 /* 09028 8083B238 34210040 */ ori $at, $at, 0x0040 ## $at = 30000040 /* 0902C 8083B23C 01E1C025 */ or $t8, $t7, $at ## $t8 = 30000040 /* 09030 8083B240 AE18067C */ sw $t8, 0x067C($s0) ## 0000067C -/* 09034 8083B244 8FB9002C */ lw $t9, 0x002C($sp) -/* 09038 8083B248 8FA90028 */ lw $t1, 0x0028($sp) -/* 0903C 8083B24C 07200004 */ bltz $t9, .L8083B260 +/* 09034 8083B244 8FB9002C */ lw $t9, 0x002C($sp) +/* 09038 8083B248 8FA90028 */ lw $t1, 0x0028($sp) +/* 0903C 8083B24C 07200004 */ bltz $t9, .L8083B260 /* 09040 8083B250 252A0018 */ addiu $t2, $t1, 0x0018 ## $t2 = 00000018 /* 09044 8083B254 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 09048 8083B258 10000002 */ beq $zero, $zero, .L8083B264 -/* 0904C 8083B25C AFA8002C */ sw $t0, 0x002C($sp) +/* 09048 8083B258 10000002 */ beq $zero, $zero, .L8083B264 +/* 0904C 8083B25C AFA8002C */ sw $t0, 0x002C($sp) .L8083B260: -/* 09050 8083B260 AFAA002C */ sw $t2, 0x002C($sp) +/* 09050 8083B260 AFAA002C */ sw $t2, 0x002C($sp) .L8083B264: /* 09054 8083B264 8E030694 */ lw $v1, 0x0694($s0) ## 00000694 -/* 09058 8083B268 8FAB002C */ lw $t3, 0x002C($sp) -/* 0905C 8083B26C 50600034 */ beql $v1, $zero, .L8083B340 -/* 09060 8083B270 8FAC002C */ lw $t4, 0x002C($sp) +/* 09058 8083B268 8FAB002C */ lw $t3, 0x002C($sp) +/* 0905C 8083B26C 50600034 */ beql $v1, $zero, .L8083B340 +/* 09060 8083B270 8FAC002C */ lw $t4, 0x002C($sp) /* 09064 8083B274 82020693 */ lb $v0, 0x0693($s0) ## 00000693 /* 09068 8083B278 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 0906C 8083B27C 5162000F */ beql $t3, $v0, .L8083B2BC +/* 0906C 8083B27C 5162000F */ beql $t3, $v0, .L8083B2BC /* 09070 8083B280 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -/* 09074 8083B284 1041000C */ beq $v0, $at, .L8083B2B8 +/* 09074 8083B284 1041000C */ beq $v0, $at, .L8083B2B8 /* 09078 8083B288 2401001B */ addiu $at, $zero, 0x001B ## $at = 0000001B -/* 0907C 8083B28C 14410005 */ bne $v0, $at, .L8083B2A4 +/* 0907C 8083B28C 14410005 */ bne $v0, $at, .L8083B2A4 /* 09080 8083B290 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 /* 09084 8083B294 820C0154 */ lb $t4, 0x0154($s0) ## 00000154 /* 09088 8083B298 24010023 */ addiu $at, $zero, 0x0023 ## $at = 00000023 -/* 0908C 8083B29C 51810007 */ beql $t4, $at, .L8083B2BC +/* 0908C 8083B29C 51810007 */ beql $t4, $at, .L8083B2BC /* 09090 8083B2A0 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 .L8083B2A4: -/* 09094 8083B2A4 54820026 */ bnel $a0, $v0, .L8083B340 -/* 09098 8083B2A8 8FAC002C */ lw $t4, 0x002C($sp) +/* 09094 8083B2A4 54820026 */ bnel $a0, $v0, .L8083B340 +/* 09098 8083B2A8 8FAC002C */ lw $t4, 0x002C($sp) /* 0909C 8083B2AC 820D0154 */ lb $t5, 0x0154($s0) ## 00000154 /* 090A0 8083B2B0 24010021 */ addiu $at, $zero, 0x0021 ## $at = 00000021 -/* 090A4 8083B2B4 15A10021 */ bne $t5, $at, .L8083B33C +/* 090A4 8083B2B4 15A10021 */ bne $t5, $at, .L8083B33C .L8083B2B8: /* 090A8 8083B2B8 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 .L8083B2BC: -/* 090AC 8083B2BC 14820005 */ bne $a0, $v0, .L8083B2D4 +/* 090AC 8083B2BC 14820005 */ bne $a0, $v0, .L8083B2D4 /* 090B0 8083B2C0 00000000 */ nop /* 090B4 8083B2C4 820E0154 */ lb $t6, 0x0154($s0) ## 00000154 /* 090B8 8083B2C8 2401002E */ addiu $at, $zero, 0x002E ## $at = 0000002E -/* 090BC 8083B2CC 55C1001C */ bnel $t6, $at, .L8083B340 -/* 090C0 8083B2D0 8FAC002C */ lw $t4, 0x002C($sp) +/* 090BC 8083B2CC 55C1001C */ bnel $t6, $at, .L8083B340 +/* 090C0 8083B2D0 8FAC002C */ lw $t4, 0x002C($sp) .L8083B2D4: -/* 090C4 8083B2D4 14820013 */ bne $a0, $v0, .L8083B324 +/* 090C4 8083B2D4 14820013 */ bne $a0, $v0, .L8083B324 /* 090C8 8083B2D8 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF /* 090CC 8083B2DC 24040010 */ addiu $a0, $zero, 0x0010 ## $a0 = 00000010 -/* 090D0 8083B2E0 0C021CCC */ jal Inventory_ChangeAmmo -/* 090D4 8083B2E4 AFA30020 */ sw $v1, 0x0020($sp) +/* 090D0 8083B2E0 0C021CCC */ jal Inventory_ChangeAmmo +/* 090D4 8083B2E4 AFA30020 */ sw $v1, 0x0020($sp) /* 090D8 8083B2E8 3C068084 */ lui $a2, %hi(func_8084279C) ## $a2 = 80840000 /* 090DC 8083B2EC 24C6279C */ addiu $a2, $a2, %lo(func_8084279C) ## $a2 = 8084279C -/* 090E0 8083B2F0 8FA40034 */ lw $a0, 0x0034($sp) +/* 090E0 8083B2F0 8FA40034 */ lw $a0, 0x0034($sp) /* 090E4 8083B2F4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 090E8 8083B2F8 0C20D779 */ jal func_80835DE4 +/* 090E8 8083B2F8 0C20D779 */ jal func_80835DE4 /* 090EC 8083B2FC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 090F0 8083B300 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -/* 090F4 8083B304 8FA30020 */ lw $v1, 0x0020($sp) +/* 090F4 8083B304 8FA30020 */ lw $v1, 0x0020($sp) /* 090F8 8083B308 3C012000 */ lui $at, 0x2000 ## $at = 20000000 /* 090FC 8083B30C 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 /* 09100 8083B310 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF @@ -204,29 +204,29 @@ glabel func_8083B040 /* 09118 8083B328 352A0100 */ ori $t2, $t1, 0x0100 ## $t2 = 00000100 /* 0911C 8083B32C AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 /* 09120 8083B330 8E0B0694 */ lw $t3, 0x0694($s0) ## 00000694 -/* 09124 8083B334 10000014 */ beq $zero, $zero, .L8083B388 +/* 09124 8083B334 10000014 */ beq $zero, $zero, .L8083B388 /* 09128 8083B338 AE0B0664 */ sw $t3, 0x0664($s0) ## 00000664 .L8083B33C: -/* 0912C 8083B33C 8FAC002C */ lw $t4, 0x002C($sp) +/* 0912C 8083B33C 8FAC002C */ lw $t4, 0x002C($sp) .L8083B340: /* 09130 8083B340 2401001D */ addiu $at, $zero, 0x001D ## $at = 0000001D /* 09134 8083B344 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 09138 8083B348 1581000A */ bne $t4, $at, .L8083B374 +/* 09138 8083B348 1581000A */ bne $t4, $at, .L8083B374 /* 0913C 8083B34C 241800CF */ addiu $t8, $zero, 0x00CF ## $t8 = 000000CF /* 09140 8083B350 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 09144 8083B354 240E4005 */ addiu $t6, $zero, 0x4005 ## $t6 = 00004005 /* 09148 8083B358 A20D084F */ sb $t5, 0x084F($s0) ## 0000084F /* 0914C 8083B35C A60E010E */ sh $t6, 0x010E($s0) ## 0000010E -/* 09150 8083B360 8FA40034 */ lw $a0, 0x0034($sp) -/* 09154 8083B364 0C20D7A9 */ jal func_80835EA4 +/* 09150 8083B360 8FA40034 */ lw $a0, 0x0034($sp) +/* 09154 8083B364 0C20D7A9 */ jal func_80835EA4 /* 09158 8083B368 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0915C 8083B36C 10000007 */ beq $zero, $zero, .L8083B38C +/* 0915C 8083B36C 10000007 */ beq $zero, $zero, .L8083B38C /* 09160 8083B370 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 .L8083B374: /* 09164 8083B374 A20F084F */ sb $t7, 0x084F($s0) ## 0000084F /* 09168 8083B378 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 0916C 8083B37C 8FA40034 */ lw $a0, 0x0034($sp) -/* 09170 8083B380 0C20D7A9 */ jal func_80835EA4 +/* 0916C 8083B37C 8FA40034 */ lw $a0, 0x0034($sp) +/* 09170 8083B380 0C20D7A9 */ jal func_80835EA4 /* 09174 8083B384 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 .L8083B388: /* 09178 8083B388 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 @@ -235,175 +235,175 @@ glabel func_8083B040 /* 09180 8083B390 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 09184 8083B394 37280100 */ ori $t0, $t9, 0x0100 ## $t0 = 00000100 /* 09188 8083B398 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -/* 0918C 8083B39C 8FA9002C */ lw $t1, 0x002C($sp) -/* 09190 8083B3A0 00026080 */ sll $t4, $v0, 2 -/* 09194 8083B3A4 0441000B */ bgez $v0, .L8083B3D4 +/* 0918C 8083B39C 8FA9002C */ lw $t1, 0x002C($sp) +/* 09190 8083B3A0 00026080 */ sll $t4, $v0, 2 +/* 09194 8083B3A4 0441000B */ bgez $v0, .L8083B3D4 /* 09198 8083B3A8 A2090693 */ sb $t1, 0x0693($s0) ## 00000693 /* 0919C 8083B3AC 920A015B */ lbu $t2, 0x015B($s0) ## 0000015B /* 091A0 8083B3B0 3C068085 */ lui $a2, %hi(D_80853C14) ## $a2 = 80850000 -/* 091A4 8083B3B4 8FA40034 */ lw $a0, 0x0034($sp) -/* 091A8 8083B3B8 000A5880 */ sll $t3, $t2, 2 -/* 091AC 8083B3BC 00CB3021 */ addu $a2, $a2, $t3 -/* 091B0 8083B3C0 8CC63C14 */ lw $a2, %lo(D_80853C14)($a2) -/* 091B4 8083B3C4 0C20CAC3 */ jal func_80832B0C +/* 091A4 8083B3B4 8FA40034 */ lw $a0, 0x0034($sp) +/* 091A8 8083B3B8 000A5880 */ sll $t3, $t2, 2 +/* 091AC 8083B3BC 00CB3021 */ addu $a2, $a2, $t3 +/* 091B0 8083B3C0 8CC63C14 */ lw $a2, %lo(D_80853C14)($a2) +/* 091B4 8083B3C4 0C20CAC3 */ jal func_80832B0C /* 091B8 8083B3C8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 091BC 8083B3CC 10000006 */ beq $zero, $zero, .L8083B3E8 +/* 091BC 8083B3CC 10000006 */ beq $zero, $zero, .L8083B3E8 /* 091C0 8083B3D0 00000000 */ nop .L8083B3D4: /* 091C4 8083B3D4 3C068085 */ lui $a2, %hi(D_80854548) ## $a2 = 80850000 -/* 091C8 8083B3D8 00CC3021 */ addu $a2, $a2, $t4 -/* 091CC 8083B3DC 8CC64548 */ lw $a2, %lo(D_80854548)($a2) -/* 091D0 8083B3E0 0C20C899 */ jal func_80832264 -/* 091D4 8083B3E4 8FA40034 */ lw $a0, 0x0034($sp) +/* 091C8 8083B3D8 00CC3021 */ addu $a2, $a2, $t4 +/* 091CC 8083B3DC 8CC64548 */ lw $a2, %lo(D_80854548)($a2) +/* 091D0 8083B3E0 0C20C899 */ jal func_80832264 +/* 091D4 8083B3E4 8FA40034 */ lw $a0, 0x0034($sp) .L8083B3E8: -/* 091D8 8083B3E8 0C20C889 */ jal func_80832224 +/* 091D8 8083B3E8 0C20C889 */ jal func_80832224 /* 091DC 8083B3EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L8083B3F0: -/* 091E0 8083B3F0 1000008F */ beq $zero, $zero, .L8083B630 +/* 091E0 8083B3F0 1000008F */ beq $zero, $zero, .L8083B630 /* 091E4 8083B3F4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L8083B3F8: /* 091E8 8083B3F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L8083B3FC: -/* 091EC 8083B3FC 0C023C89 */ jal func_8008F224 +/* 091EC 8083B3FC 0C023C89 */ jal func_8008F224 /* 091F0 8083B400 82050154 */ lb $a1, 0x0154($s0) ## 00000154 -/* 091F4 8083B404 0440003C */ bltz $v0, .L8083B4F8 -/* 091F8 8083B408 AFA2002C */ sw $v0, 0x002C($sp) +/* 091F4 8083B404 0440003C */ bltz $v0, .L8083B4F8 +/* 091F8 8083B408 AFA2002C */ sw $v0, 0x002C($sp) /* 091FC 8083B40C 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 09200 8083B410 14410010 */ bne $v0, $at, .L8083B454 -/* 09204 8083B414 8FA40034 */ lw $a0, 0x0034($sp) +/* 09200 8083B410 14410010 */ bne $v0, $at, .L8083B454 +/* 09204 8083B414 8FA40034 */ lw $a0, 0x0034($sp) /* 09208 8083B418 3C068085 */ lui $a2, %hi(func_8084EED8) ## $a2 = 80850000 /* 0920C 8083B41C 24C6EED8 */ addiu $a2, $a2, %lo(func_8084EED8) ## $a2 = 8084EED8 /* 09210 8083B420 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 09214 8083B424 0C20D779 */ jal func_80835DE4 +/* 09214 8083B424 0C20D779 */ jal func_80835DE4 /* 09218 8083B428 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0921C 8083B42C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 09220 8083B430 24C62650 */ addiu $a2, $a2, 0x2650 ## $a2 = 04002650 -/* 09224 8083B434 8FA40034 */ lw $a0, 0x0034($sp) -/* 09228 8083B438 0C20C8B4 */ jal func_808322D0 +/* 09224 8083B434 8FA40034 */ lw $a0, 0x0034($sp) +/* 09228 8083B438 0C20C8B4 */ jal func_808322D0 /* 0922C 8083B43C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 09230 8083B440 8FA40034 */ lw $a0, 0x0034($sp) -/* 09234 8083B444 0C20D7A9 */ jal func_80835EA4 +/* 09230 8083B440 8FA40034 */ lw $a0, 0x0034($sp) +/* 09234 8083B444 0C20D7A9 */ jal func_80835EA4 /* 09238 8083B448 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 0923C 8083B44C 10000070 */ beq $zero, $zero, .L8083B610 +/* 0923C 8083B44C 10000070 */ beq $zero, $zero, .L8083B610 /* 09240 8083B450 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C .L8083B454: -/* 09244 8083B454 18400018 */ blez $v0, .L8083B4B8 -/* 09248 8083B458 28410004 */ slti $at, $v0, 0x0004 -/* 0924C 8083B45C 10200016 */ beq $at, $zero, .L8083B4B8 -/* 09250 8083B460 8FA40034 */ lw $a0, 0x0034($sp) +/* 09244 8083B454 18400018 */ blez $v0, .L8083B4B8 +/* 09248 8083B458 28410004 */ slti $at, $v0, 0x0004 +/* 0924C 8083B45C 10200016 */ beq $at, $zero, .L8083B4B8 +/* 09250 8083B460 8FA40034 */ lw $a0, 0x0034($sp) /* 09254 8083B464 3C068085 */ lui $a2, %hi(func_8084EFC0) ## $a2 = 80850000 /* 09258 8083B468 24C6EFC0 */ addiu $a2, $a2, %lo(func_8084EFC0) ## $a2 = 8084EFC0 /* 0925C 8083B46C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 09260 8083B470 0C20D779 */ jal func_80835DE4 +/* 09260 8083B470 0C20D779 */ jal func_80835DE4 /* 09264 8083B474 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 09268 8083B478 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 0926C 8083B47C 24C62688 */ addiu $a2, $a2, 0x2688 ## $a2 = 04002688 -/* 09270 8083B480 8FA40034 */ lw $a0, 0x0034($sp) -/* 09274 8083B484 0C20C8B4 */ jal func_808322D0 +/* 09270 8083B480 8FA40034 */ lw $a0, 0x0034($sp) +/* 09274 8083B484 0C20C8B4 */ jal func_808322D0 /* 09278 8083B488 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0927C 8083B48C 8FAD002C */ lw $t5, 0x002C($sp) +/* 0927C 8083B48C 8FAD002C */ lw $t5, 0x002C($sp) /* 09280 8083B490 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 09284 8083B494 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 09288 8083B498 15A10003 */ bne $t5, $at, .L8083B4A8 +/* 09288 8083B498 15A10003 */ bne $t5, $at, .L8083B4A8 /* 0928C 8083B49C 00000000 */ nop -/* 09290 8083B4A0 10000001 */ beq $zero, $zero, .L8083B4A8 +/* 09290 8083B4A0 10000001 */ beq $zero, $zero, .L8083B4A8 /* 09294 8083B4A4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 .L8083B4A8: -/* 09298 8083B4A8 0C20D7A9 */ jal func_80835EA4 -/* 0929C 8083B4AC 8FA40034 */ lw $a0, 0x0034($sp) -/* 092A0 8083B4B0 10000057 */ beq $zero, $zero, .L8083B610 +/* 09298 8083B4A8 0C20D7A9 */ jal func_80835EA4 +/* 0929C 8083B4AC 8FA40034 */ lw $a0, 0x0034($sp) +/* 092A0 8083B4B0 10000057 */ beq $zero, $zero, .L8083B610 /* 092A4 8083B4B4 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C .L8083B4B8: /* 092A8 8083B4B8 3C068085 */ lui $a2, %hi(func_8084EAC0) ## $a2 = 80850000 /* 092AC 8083B4BC 24C6EAC0 */ addiu $a2, $a2, %lo(func_8084EAC0) ## $a2 = 8084EAC0 -/* 092B0 8083B4C0 8FA40034 */ lw $a0, 0x0034($sp) +/* 092B0 8083B4C0 8FA40034 */ lw $a0, 0x0034($sp) /* 092B4 8083B4C4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 092B8 8083B4C8 0C20D779 */ jal func_80835DE4 +/* 092B8 8083B4C8 0C20D779 */ jal func_80835DE4 /* 092BC 8083B4CC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 092C0 8083B4D0 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 092C4 8083B4D4 24C62668 */ addiu $a2, $a2, 0x2668 ## $a2 = 04002668 -/* 092C8 8083B4D8 8FA40034 */ lw $a0, 0x0034($sp) -/* 092CC 8083B4DC 0C20CADE */ jal func_80832B78 +/* 092C8 8083B4D8 8FA40034 */ lw $a0, 0x0034($sp) +/* 092CC 8083B4DC 0C20CADE */ jal func_80832B78 /* 092D0 8083B4E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 092D4 8083B4E4 8FA40034 */ lw $a0, 0x0034($sp) -/* 092D8 8083B4E8 0C20D7A9 */ jal func_80835EA4 +/* 092D4 8083B4E4 8FA40034 */ lw $a0, 0x0034($sp) +/* 092D8 8083B4E8 0C20D7A9 */ jal func_80835EA4 /* 092DC 8083B4EC 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 092E0 8083B4F0 10000047 */ beq $zero, $zero, .L8083B610 +/* 092E0 8083B4F0 10000047 */ beq $zero, $zero, .L8083B610 /* 092E4 8083B4F4 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C .L8083B4F8: /* 092E8 8083B4F8 3C068085 */ lui $a2, %hi(func_8084E3C4) ## $a2 = 80850000 /* 092EC 8083B4FC 24C6E3C4 */ addiu $a2, $a2, %lo(func_8084E3C4) ## $a2 = 8084E3C4 -/* 092F0 8083B500 8FA40034 */ lw $a0, 0x0034($sp) +/* 092F0 8083B500 8FA40034 */ lw $a0, 0x0034($sp) /* 092F4 8083B504 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 092F8 8083B508 0C20D779 */ jal func_80835DE4 +/* 092F8 8083B508 0C20D779 */ jal func_80835DE4 /* 092FC 8083B50C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 09300 8083B510 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 09304 8083B514 24C630A0 */ addiu $a2, $a2, 0x30A0 ## $a2 = 040030A0 -/* 09308 8083B518 8FA40034 */ lw $a0, 0x0034($sp) -/* 0930C 8083B51C 0C20C8B4 */ jal func_808322D0 +/* 09308 8083B518 8FA40034 */ lw $a0, 0x0034($sp) +/* 0930C 8083B51C 0C20C8B4 */ jal func_808322D0 /* 09310 8083B520 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 09314 8083B524 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 /* 09318 8083B528 8E1806A8 */ lw $t8, 0x06A8($s0) ## 000006A8 /* 0931C 8083B52C 3C010800 */ lui $at, 0x0800 ## $at = 08000000 /* 09320 8083B530 01C17825 */ or $t7, $t6, $at ## $t7 = 08000000 -/* 09324 8083B534 13000003 */ beq $t8, $zero, .L8083B544 +/* 09324 8083B534 13000003 */ beq $t8, $zero, .L8083B544 /* 09328 8083B538 AE0F0680 */ sw $t7, 0x0680($s0) ## 00000680 -/* 0932C 8083B53C 10000002 */ beq $zero, $zero, .L8083B548 +/* 0932C 8083B53C 10000002 */ beq $zero, $zero, .L8083B548 /* 09330 8083B540 2405005B */ addiu $a1, $zero, 0x005B ## $a1 = 0000005B .L8083B544: /* 09334 8083B544 2405005A */ addiu $a1, $zero, 0x005A ## $a1 = 0000005A .L8083B548: -/* 09338 8083B548 0C20D7A9 */ jal func_80835EA4 -/* 0933C 8083B54C 8FA40034 */ lw $a0, 0x0034($sp) +/* 09338 8083B548 0C20D7A9 */ jal func_80835EA4 +/* 0933C 8083B54C 8FA40034 */ lw $a0, 0x0034($sp) /* 09340 8083B550 8E1906A8 */ lw $t9, 0x06A8($s0) ## 000006A8 -/* 09344 8083B554 5320002E */ beql $t9, $zero, .L8083B610 +/* 09344 8083B554 5320002E */ beql $t9, $zero, .L8083B610 /* 09348 8083B558 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C /* 0934C 8083B55C 8E080680 */ lw $t0, 0x0680($s0) ## 00000680 /* 09350 8083B560 3C010200 */ lui $at, 0x0200 ## $at = 02000000 /* 09354 8083B564 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09358 8083B568 01014825 */ or $t1, $t0, $at ## $t1 = 02000000 /* 0935C 8083B56C AE090680 */ sw $t1, 0x0680($s0) ## 00000680 -/* 09360 8083B570 0C030129 */ jal Gameplay_GetCamera -/* 09364 8083B574 8FA40034 */ lw $a0, 0x0034($sp) +/* 09360 8083B570 0C030129 */ jal Gameplay_GetCamera +/* 09364 8083B574 8FA40034 */ lw $a0, 0x0034($sp) /* 09368 8083B578 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 0936C 8083B57C 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 09370 8083B580 0C016AA4 */ jal func_8005AA90 +/* 09370 8083B580 0C016AA4 */ jal Camera_SetParam /* 09374 8083B584 8E0606A8 */ lw $a2, 0x06A8($s0) ## 000006A8 -/* 09378 8083B588 10000021 */ beq $zero, $zero, .L8083B610 +/* 09378 8083B588 10000021 */ beq $zero, $zero, .L8083B610 /* 0937C 8083B58C 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C .L8083B590: -/* 09380 8083B590 0C20EB53 */ jal func_8083AD4C +/* 09380 8083B590 0C20EB53 */ jal func_8083AD4C /* 09384 8083B594 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 09388 8083B598 10400018 */ beq $v0, $zero, .L8083B5FC +/* 09388 8083B598 10400018 */ beq $v0, $zero, .L8083B5FC /* 0938C 8083B59C 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 /* 09390 8083B5A0 8E02067C */ lw $v0, 0x067C($s0) ## 0000067C -/* 09394 8083B5A4 8FA40034 */ lw $a0, 0x0034($sp) +/* 09394 8083B5A4 8FA40034 */ lw $a0, 0x0034($sp) /* 09398 8083B5A8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0939C 8083B5AC 00025200 */ sll $t2, $v0, 8 -/* 093A0 8083B5B0 05400009 */ bltz $t2, .L8083B5D8 +/* 0939C 8083B5AC 00025200 */ sll $t2, $v0, 8 +/* 093A0 8083B5B0 05400009 */ bltz $t2, .L8083B5D8 /* 093A4 8083B5B4 3C068085 */ lui $a2, %hi(func_8084B1D8) ## $a2 = 80850000 /* 093A8 8083B5B8 24C6B1D8 */ addiu $a2, $a2, %lo(func_8084B1D8) ## $a2 = 8084B1D8 -/* 093AC 8083B5BC 0C20D716 */ jal func_80835C58 +/* 093AC 8083B5BC 0C20D716 */ jal func_80835C58 /* 093B0 8083B5C0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 093B4 8083B5C4 240B000D */ addiu $t3, $zero, 0x000D ## $t3 = 0000000D /* 093B8 8083B5C8 A60B0850 */ sh $t3, 0x0850($s0) ## 00000850 -/* 093BC 8083B5CC 0C20EC04 */ jal func_8083B010 +/* 093BC 8083B5CC 0C20EC04 */ jal func_8083B010 /* 093C0 8083B5D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 093C4 8083B5D4 8E02067C */ lw $v0, 0x067C($s0) ## 0000067C .L8083B5D8: /* 093C8 8083B5D8 3C010010 */ lui $at, 0x0010 ## $at = 00100000 /* 093CC 8083B5DC 00416025 */ or $t4, $v0, $at ## $t4 = 00100000 /* 093D0 8083B5E0 AE0C067C */ sw $t4, 0x067C($s0) ## 0000067C -/* 093D4 8083B5E4 0C01E221 */ jal func_80078884 +/* 093D4 8083B5E4 0C01E221 */ jal func_80078884 /* 093D8 8083B5E8 24044813 */ addiu $a0, $zero, 0x4813 ## $a0 = 00004813 -/* 093DC 8083B5EC 0C20C884 */ jal func_80832210 +/* 093DC 8083B5EC 0C20C884 */ jal func_80832210 /* 093E0 8083B5F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 093E4 8083B5F4 1000000E */ beq $zero, $zero, .L8083B630 +/* 093E4 8083B5F4 1000000E */ beq $zero, $zero, .L8083B630 /* 093E8 8083B5F8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L8083B5FC: -/* 093EC 8083B5FC 0C01E221 */ jal func_80078884 +/* 093EC 8083B5FC 0C01E221 */ jal func_80078884 /* 093F0 8083B600 A20006AD */ sb $zero, 0x06AD($s0) ## 000006AD -/* 093F4 8083B604 1000000A */ beq $zero, $zero, .L8083B630 +/* 093F4 8083B604 1000000A */ beq $zero, $zero, .L8083B630 /* 093F8 8083B608 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 093FC 8083B60C 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C .L8083B610: @@ -411,14 +411,14 @@ glabel func_8083B040 /* 09404 8083B614 01A17025 */ or $t6, $t5, $at ## $t6 = 30000000 /* 09408 8083B618 AE0E067C */ sw $t6, 0x067C($s0) ## 0000067C .L8083B61C: -/* 0940C 8083B61C 0C20C889 */ jal func_80832224 +/* 0940C 8083B61C 0C20C889 */ jal func_80832224 /* 09410 8083B620 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09414 8083B624 10000002 */ beq $zero, $zero, .L8083B630 +/* 09414 8083B624 10000002 */ beq $zero, $zero, .L8083B630 /* 09418 8083B628 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 0941C 8083B62C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L8083B630: -/* 09420 8083B630 8FBF001C */ lw $ra, 0x001C($sp) -/* 09424 8083B634 8FB00018 */ lw $s0, 0x0018($sp) +/* 09420 8083B630 8FBF001C */ lw $ra, 0x001C($sp) +/* 09424 8083B634 8FB00018 */ lw $s0, 0x0018($sp) /* 09428 8083B638 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0942C 8083B63C 03E00008 */ jr $ra +/* 0942C 8083B63C 03E00008 */ jr $ra /* 09430 8083B640 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808486A8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808486A8.s index c2a43314cd..f56187ef09 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808486A8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808486A8.s @@ -1,246 +1,246 @@ glabel func_808486A8 /* 16498 808486A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1649C 808486AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 164A0 808486B0 AFA40028 */ sw $a0, 0x0028($sp) +/* 1649C 808486AC AFBF0014 */ sw $ra, 0x0014($sp) +/* 164A0 808486B0 AFA40028 */ sw $a0, 0x0028($sp) /* 164A4 808486B4 90AE0002 */ lbu $t6, 0x0002($a1) ## 00000002 /* 164A8 808486B8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 164AC 808486BC 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 164B0 808486C0 55C100CD */ bnel $t6, $at, .L808489F8 -/* 164B4 808486C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 164B8 808486C8 A3A00027 */ sb $zero, 0x0027($sp) +/* 164B0 808486C0 55C100CD */ bnel $t6, $at, .L808489F8 +/* 164B4 808486C4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 164B8 808486C8 A3A00027 */ sb $zero, 0x0027($sp) /* 164BC 808486CC 90AF0444 */ lbu $t7, 0x0444($a1) ## 00000444 -/* 164C0 808486D0 51E00009 */ beql $t7, $zero, .L808486F8 +/* 164C0 808486D0 51E00009 */ beql $t7, $zero, .L808486F8 /* 164C4 808486D4 8CE2067C */ lw $v0, 0x067C($a3) ## 0000067C -/* 164C8 808486D8 0C030129 */ jal Gameplay_GetCamera +/* 164C8 808486D8 0C030129 */ jal Gameplay_GetCamera /* 164CC 808486DC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 164D0 808486E0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 164D4 808486E4 0C016911 */ jal func_8005A444 +/* 164D4 808486E4 0C016911 */ jal func_8005A444 /* 164D8 808486E8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 164DC 808486EC 100000B2 */ beq $zero, $zero, .L808489B8 -/* 164E0 808486F0 8FAC0028 */ lw $t4, 0x0028($sp) +/* 164DC 808486EC 100000B2 */ beq $zero, $zero, .L808489B8 +/* 164E0 808486F0 8FAC0028 */ lw $t4, 0x0028($sp) /* 164E4 808486F4 8CE2067C */ lw $v0, 0x067C($a3) ## 0000067C .L808486F8: /* 164E8 808486F8 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 164EC 808486FC 0002C2C0 */ sll $t8, $v0, 11 -/* 164F0 80848700 070200AC */ bltzl $t8, .L808489B4 -/* 164F4 80848704 A3AB0027 */ sb $t3, 0x0027($sp) +/* 164EC 808486FC 0002C2C0 */ sll $t8, $v0, 11 +/* 164F0 80848700 070200AC */ bltzl $t8, .L808489B4 +/* 164F4 80848704 A3AB0027 */ sb $t3, 0x0027($sp) /* 164F8 80848708 8CF90118 */ lw $t9, 0x0118($a3) ## 00000118 -/* 164FC 8084870C 53200012 */ beql $t9, $zero, .L80848758 +/* 164FC 8084870C 53200012 */ beql $t9, $zero, .L80848758 /* 16500 80848710 8CE30674 */ lw $v1, 0x0674($a3) ## 00000674 /* 16504 80848714 90E80692 */ lbu $t0, 0x0692($a3) ## 00000692 /* 16508 80848718 24030009 */ addiu $v1, $zero, 0x0009 ## $v1 = 00000009 -/* 1650C 8084871C 8FA40028 */ lw $a0, 0x0028($sp) +/* 1650C 8084871C 8FA40028 */ lw $a0, 0x0028($sp) /* 16510 80848720 31090080 */ andi $t1, $t0, 0x0080 ## $t1 = 00000000 -/* 16514 80848724 1120000B */ beq $t1, $zero, .L80848754 +/* 16514 80848724 1120000B */ beq $t1, $zero, .L80848754 /* 16518 80848728 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1651C 8084872C AFA30018 */ sw $v1, 0x0018($sp) -/* 16520 80848730 0C030129 */ jal Gameplay_GetCamera -/* 16524 80848734 AFA7002C */ sw $a3, 0x002C($sp) -/* 16528 80848738 8FA7002C */ lw $a3, 0x002C($sp) +/* 1651C 8084872C AFA30018 */ sw $v1, 0x0018($sp) +/* 16520 80848730 0C030129 */ jal Gameplay_GetCamera +/* 16524 80848734 AFA7002C */ sw $a3, 0x002C($sp) +/* 16528 80848738 8FA7002C */ lw $a3, 0x002C($sp) /* 1652C 8084873C 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 16530 80848740 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 16534 80848744 0C016AA4 */ jal func_8005AA90 +/* 16534 80848744 0C016AA4 */ jal Camera_SetParam /* 16538 80848748 8CE60118 */ lw $a2, 0x0118($a3) ## 00000118 -/* 1653C 8084874C 1000008D */ beq $zero, $zero, .L80848984 -/* 16540 80848750 8FA30018 */ lw $v1, 0x0018($sp) +/* 1653C 8084874C 1000008D */ beq $zero, $zero, .L80848984 +/* 16540 80848750 8FA30018 */ lw $v1, 0x0018($sp) .L80848754: /* 16544 80848754 8CE30674 */ lw $v1, 0x0674($a3) ## 00000674 .L80848758: /* 16548 80848758 3C0A8084 */ lui $t2, %hi(func_8084377C) ## $t2 = 80840000 /* 1654C 8084875C 254A377C */ addiu $t2, $t2, %lo(func_8084377C) ## $t2 = 8084377C -/* 16550 80848760 546A0004 */ bnel $v1, $t2, .L80848774 +/* 16550 80848760 546A0004 */ bnel $v1, $t2, .L80848774 /* 16554 80848764 8CEB0680 */ lw $t3, 0x0680($a3) ## 00000680 -/* 16558 80848768 10000086 */ beq $zero, $zero, .L80848984 +/* 16558 80848768 10000086 */ beq $zero, $zero, .L80848984 /* 1655C 8084876C 24030012 */ addiu $v1, $zero, 0x0012 ## $v1 = 00000012 /* 16560 80848770 8CEB0680 */ lw $t3, 0x0680($a3) ## 00000680 .L80848774: /* 16564 80848774 316C0100 */ andi $t4, $t3, 0x0100 ## $t4 = 00000000 -/* 16568 80848778 51800004 */ beql $t4, $zero, .L8084878C +/* 16568 80848778 51800004 */ beql $t4, $zero, .L8084878C /* 1656C 8084877C 8CE60664 */ lw $a2, 0x0664($a3) ## 00000664 -/* 16570 80848780 10000080 */ beq $zero, $zero, .L80848984 +/* 16570 80848780 10000080 */ beq $zero, $zero, .L80848984 /* 16574 80848784 24030013 */ addiu $v1, $zero, 0x0013 ## $v1 = 00000013 /* 16578 80848788 8CE60664 */ lw $a2, 0x0664($a3) ## 00000664 .L8084878C: -/* 1657C 8084878C 8FA40028 */ lw $a0, 0x0028($sp) +/* 1657C 8084878C 8FA40028 */ lw $a0, 0x0028($sp) /* 16580 80848790 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 16584 80848794 10C0001B */ beq $a2, $zero, .L80848804 +/* 16584 80848794 10C0001B */ beq $a2, $zero, .L80848804 /* 16588 80848798 30591000 */ andi $t9, $v0, 0x1000 ## $t9 = 00000000 /* 1658C 8084879C 8CED0004 */ lw $t5, 0x0004($a3) ## 00000004 /* 16590 808487A0 24010100 */ addiu $at, $zero, 0x0100 ## $at = 00000100 -/* 16594 808487A4 00027BC0 */ sll $t7, $v0, 15 +/* 16594 808487A4 00027BC0 */ sll $t7, $v0, 15 /* 16598 808487A8 31AE0100 */ andi $t6, $t5, 0x0100 ## $t6 = 00000000 -/* 1659C 808487AC 15C10003 */ bne $t6, $at, .L808487BC +/* 1659C 808487AC 15C10003 */ bne $t6, $at, .L808487BC /* 165A0 808487B0 00000000 */ nop -/* 165A4 808487B4 1000000A */ beq $zero, $zero, .L808487E0 +/* 165A4 808487B4 1000000A */ beq $zero, $zero, .L808487E0 /* 165A8 808487B8 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 .L808487BC: -/* 165AC 808487BC 05E10008 */ bgez $t7, .L808487E0 +/* 165AC 808487BC 05E10008 */ bgez $t7, .L808487E0 /* 165B0 808487C0 24030004 */ addiu $v1, $zero, 0x0004 ## $v1 = 00000004 -/* 165B4 808487C4 0002C180 */ sll $t8, $v0, 6 -/* 165B8 808487C8 07010003 */ bgez $t8, .L808487D8 +/* 165B4 808487C4 0002C180 */ sll $t8, $v0, 6 +/* 165B8 808487C8 07010003 */ bgez $t8, .L808487D8 /* 165BC 808487CC 00000000 */ nop -/* 165C0 808487D0 10000003 */ beq $zero, $zero, .L808487E0 +/* 165C0 808487D0 10000003 */ beq $zero, $zero, .L808487E0 /* 165C4 808487D4 24030014 */ addiu $v1, $zero, 0x0014 ## $v1 = 00000014 .L808487D8: -/* 165C8 808487D8 10000001 */ beq $zero, $zero, .L808487E0 +/* 165C8 808487D8 10000001 */ beq $zero, $zero, .L808487E0 /* 165CC 808487DC 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 .L808487E0: -/* 165D0 808487E0 AFA30018 */ sw $v1, 0x0018($sp) -/* 165D4 808487E4 0C030129 */ jal Gameplay_GetCamera -/* 165D8 808487E8 AFA6001C */ sw $a2, 0x001C($sp) -/* 165DC 808487EC 8FA6001C */ lw $a2, 0x001C($sp) +/* 165D0 808487E0 AFA30018 */ sw $v1, 0x0018($sp) +/* 165D4 808487E4 0C030129 */ jal Gameplay_GetCamera +/* 165D8 808487E8 AFA6001C */ sw $a2, 0x001C($sp) +/* 165DC 808487EC 8FA6001C */ lw $a2, 0x001C($sp) /* 165E0 808487F0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 165E4 808487F4 0C016AA4 */ jal func_8005AA90 +/* 165E4 808487F4 0C016AA4 */ jal Camera_SetParam /* 165E8 808487F8 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 165EC 808487FC 10000061 */ beq $zero, $zero, .L80848984 -/* 165F0 80848800 8FA30018 */ lw $v1, 0x0018($sp) +/* 165EC 808487FC 10000061 */ beq $zero, $zero, .L80848984 +/* 165F0 80848800 8FA30018 */ lw $v1, 0x0018($sp) .L80848804: -/* 165F4 80848804 13200003 */ beq $t9, $zero, .L80848814 -/* 165F8 80848808 00024180 */ sll $t0, $v0, 6 -/* 165FC 8084880C 1000005D */ beq $zero, $zero, .L80848984 +/* 165F4 80848804 13200003 */ beq $t9, $zero, .L80848814 +/* 165F8 80848808 00024180 */ sll $t0, $v0, 6 +/* 165FC 8084880C 1000005D */ beq $zero, $zero, .L80848984 /* 16600 80848810 24030011 */ addiu $v1, $zero, 0x0011 ## $v1 = 00000011 .L80848814: -/* 16604 80848814 0501000E */ bgez $t0, .L80848850 +/* 16604 80848814 0501000E */ bgez $t0, .L80848850 /* 16608 80848818 30496000 */ andi $t1, $v0, 0x6000 ## $t1 = 00000000 /* 1660C 8084881C 24030014 */ addiu $v1, $zero, 0x0014 ## $v1 = 00000014 -/* 16610 80848820 AFA30018 */ sw $v1, 0x0018($sp) -/* 16614 80848824 8FA40028 */ lw $a0, 0x0028($sp) +/* 16610 80848820 AFA30018 */ sw $v1, 0x0018($sp) +/* 16614 80848824 8FA40028 */ lw $a0, 0x0028($sp) /* 16618 80848828 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1661C 8084882C 0C030129 */ jal Gameplay_GetCamera -/* 16620 80848830 AFA7002C */ sw $a3, 0x002C($sp) -/* 16624 80848834 8FA7002C */ lw $a3, 0x002C($sp) +/* 1661C 8084882C 0C030129 */ jal Gameplay_GetCamera +/* 16620 80848830 AFA7002C */ sw $a3, 0x002C($sp) +/* 16624 80848834 8FA7002C */ lw $a3, 0x002C($sp) /* 16628 80848838 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 1662C 8084883C 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 16630 80848840 0C016AA4 */ jal func_8005AA90 +/* 16630 80848840 0C016AA4 */ jal Camera_SetParam /* 16634 80848844 8CE60688 */ lw $a2, 0x0688($a3) ## 00000688 -/* 16638 80848848 1000004E */ beq $zero, $zero, .L80848984 -/* 1663C 8084884C 8FA30018 */ lw $v1, 0x0018($sp) +/* 16638 80848848 1000004E */ beq $zero, $zero, .L80848984 +/* 1663C 8084884C 8FA30018 */ lw $v1, 0x0018($sp) .L80848850: -/* 16640 80848850 11200009 */ beq $t1, $zero, .L80848878 +/* 16640 80848850 11200009 */ beq $t1, $zero, .L80848878 /* 16644 80848854 3C014002 */ lui $at, 0x4002 ## $at = 40020000 -/* 16648 80848858 0C20CECB */ jal func_80833B2C +/* 16648 80848858 0C20CECB */ jal func_80833B2C /* 1664C 8084885C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 16650 80848860 10400003 */ beq $v0, $zero, .L80848870 +/* 16650 80848860 10400003 */ beq $v0, $zero, .L80848870 /* 16654 80848864 00000000 */ nop -/* 16658 80848868 10000046 */ beq $zero, $zero, .L80848984 +/* 16658 80848868 10000046 */ beq $zero, $zero, .L80848984 /* 1665C 8084886C 2403000F */ addiu $v1, $zero, 0x000F ## $v1 = 0000000F .L80848870: -/* 16660 80848870 10000044 */ beq $zero, $zero, .L80848984 +/* 16660 80848870 10000044 */ beq $zero, $zero, .L80848984 /* 16664 80848874 2403000E */ addiu $v1, $zero, 0x000E ## $v1 = 0000000E .L80848878: -/* 16668 80848878 00415024 */ and $t2, $v0, $at -/* 1666C 8084887C 11400015 */ beq $t2, $zero, .L808488D4 +/* 16668 80848878 00415024 */ and $t2, $v0, $at +/* 1666C 8084887C 11400015 */ beq $t2, $zero, .L808488D4 /* 16670 80848880 3C010024 */ lui $at, 0x0024 ## $at = 00240000 /* 16674 80848884 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 16678 80848888 0C00B75E */ jal func_8002DD78 -/* 1667C 8084888C AFA7002C */ sw $a3, 0x002C($sp) -/* 16680 80848890 14400006 */ bne $v0, $zero, .L808488AC -/* 16684 80848894 8FA7002C */ lw $a3, 0x002C($sp) +/* 16678 80848888 0C00B75E */ jal func_8002DD78 +/* 1667C 8084888C AFA7002C */ sw $a3, 0x002C($sp) +/* 16680 80848890 14400006 */ bne $v0, $zero, .L808488AC +/* 16684 80848894 8FA7002C */ lw $a3, 0x002C($sp) /* 16688 80848898 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 1668C 8084889C 0C20CD2D */ jal func_808334B4 -/* 16690 808488A0 AFA7002C */ sw $a3, 0x002C($sp) -/* 16694 808488A4 10400003 */ beq $v0, $zero, .L808488B4 -/* 16698 808488A8 8FA7002C */ lw $a3, 0x002C($sp) +/* 1668C 8084889C 0C20CD2D */ jal func_808334B4 +/* 16690 808488A0 AFA7002C */ sw $a3, 0x002C($sp) +/* 16694 808488A4 10400003 */ beq $v0, $zero, .L808488B4 +/* 16698 808488A8 8FA7002C */ lw $a3, 0x002C($sp) .L808488AC: -/* 1669C 808488AC 10000035 */ beq $zero, $zero, .L80848984 +/* 1669C 808488AC 10000035 */ beq $zero, $zero, .L80848984 /* 166A0 808488B0 24030008 */ addiu $v1, $zero, 0x0008 ## $v1 = 00000008 .L808488B4: /* 166A4 808488B4 8CEB067C */ lw $t3, 0x067C($a3) ## 0000067C -/* 166A8 808488B8 000B6280 */ sll $t4, $t3, 10 -/* 166AC 808488BC 05810003 */ bgez $t4, .L808488CC +/* 166A8 808488B8 000B6280 */ sll $t4, $t3, 10 +/* 166AC 808488BC 05810003 */ bgez $t4, .L808488CC /* 166B0 808488C0 00000000 */ nop -/* 166B4 808488C4 1000002F */ beq $zero, $zero, .L80848984 +/* 166B4 808488C4 1000002F */ beq $zero, $zero, .L80848984 /* 166B8 808488C8 2403000C */ addiu $v1, $zero, 0x000C ## $v1 = 0000000C .L808488CC: -/* 166BC 808488CC 1000002D */ beq $zero, $zero, .L80848984 +/* 166BC 808488CC 1000002D */ beq $zero, $zero, .L80848984 /* 166C0 808488D0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L808488D4: -/* 166C4 808488D4 00416824 */ and $t5, $v0, $at -/* 166C8 808488D8 11A0000B */ beq $t5, $zero, .L80848908 -/* 166CC 808488DC 0002C300 */ sll $t8, $v0, 12 +/* 166C4 808488D4 00416824 */ and $t5, $v0, $at +/* 166C8 808488D8 11A0000B */ beq $t5, $zero, .L80848908 +/* 166CC 808488DC 0002C300 */ sll $t8, $v0, 12 /* 166D0 808488E0 3C0E8084 */ lui $t6, %hi(func_80845668) ## $t6 = 80840000 /* 166D4 808488E4 25CE5668 */ addiu $t6, $t6, %lo(func_80845668) ## $t6 = 80845668 -/* 166D8 808488E8 106E0003 */ beq $v1, $t6, .L808488F8 -/* 166DC 808488EC 00027A80 */ sll $t7, $v0, 10 -/* 166E0 808488F0 05E10003 */ bgez $t7, .L80848900 +/* 166D8 808488E8 106E0003 */ beq $v1, $t6, .L808488F8 +/* 166DC 808488EC 00027A80 */ sll $t7, $v0, 10 +/* 166E0 808488F0 05E10003 */ bgez $t7, .L80848900 /* 166E4 808488F4 00000000 */ nop .L808488F8: -/* 166E8 808488F8 10000022 */ beq $zero, $zero, .L80848984 +/* 166E8 808488F8 10000022 */ beq $zero, $zero, .L80848984 /* 166EC 808488FC 24030005 */ addiu $v1, $zero, 0x0005 ## $v1 = 00000005 .L80848900: -/* 166F0 80848900 10000020 */ beq $zero, $zero, .L80848984 +/* 166F0 80848900 10000020 */ beq $zero, $zero, .L80848984 /* 166F4 80848904 2403000D */ addiu $v1, $zero, 0x000D ## $v1 = 0000000D .L80848908: -/* 166F8 80848908 07030004 */ bgezl $t8, .L8084891C +/* 166F8 80848908 07030004 */ bgezl $t8, .L8084891C /* 166FC 8084890C 80F90843 */ lb $t9, 0x0843($a3) ## 00000843 -/* 16700 80848910 1000001C */ beq $zero, $zero, .L80848984 +/* 16700 80848910 1000001C */ beq $zero, $zero, .L80848984 /* 16704 80848914 24030010 */ addiu $v1, $zero, 0x0010 ## $v1 = 00000010 /* 16708 80848918 80F90843 */ lb $t9, 0x0843($a3) ## 00000843 .L8084891C: -/* 1670C 8084891C 53200009 */ beql $t9, $zero, .L80848944 +/* 1670C 8084891C 53200009 */ beql $t9, $zero, .L80848944 /* 16710 80848920 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 16714 80848924 80E30842 */ lb $v1, 0x0842($a3) ## 00000842 -/* 16718 80848928 04600005 */ bltz $v1, .L80848940 -/* 1671C 8084892C 28610018 */ slti $at, $v1, 0x0018 -/* 16720 80848930 50200004 */ beql $at, $zero, .L80848944 +/* 16718 80848928 04600005 */ bltz $v1, .L80848940 +/* 1671C 8084892C 28610018 */ slti $at, $v1, 0x0018 +/* 16720 80848930 50200004 */ beql $at, $zero, .L80848944 /* 16724 80848934 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 16728 80848938 10000012 */ beq $zero, $zero, .L80848984 +/* 16728 80848938 10000012 */ beq $zero, $zero, .L80848984 /* 1672C 8084893C 24030012 */ addiu $v1, $zero, 0x0012 ## $v1 = 00000012 .L80848940: /* 16730 80848940 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80848944: /* 16734 80848944 C4E40838 */ lwc1 $f4, 0x0838($a3) ## 00000838 /* 16738 80848948 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 1673C 8084894C 00024200 */ sll $t0, $v0, 8 -/* 16740 80848950 46040032 */ c.eq.s $f0, $f4 +/* 1673C 8084894C 00024200 */ sll $t0, $v0, 8 +/* 16740 80848950 46040032 */ c.eq.s $f0, $f4 /* 16744 80848954 00000000 */ nop -/* 16748 80848958 4502000B */ bc1fl .L80848988 -/* 1674C 8084895C 8FA40028 */ lw $a0, 0x0028($sp) -/* 16750 80848960 05010007 */ bgez $t0, .L80848980 +/* 16748 80848958 4502000B */ bc1fl .L80848988 +/* 1674C 8084895C 8FA40028 */ lw $a0, 0x0028($sp) +/* 16750 80848960 05010007 */ bgez $t0, .L80848980 /* 16754 80848964 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 /* 16758 80848968 8CE90440 */ lw $t1, 0x0440($a3) ## 00000440 /* 1675C 8084896C C5260068 */ lwc1 $f6, 0x0068($t1) ## 00000068 -/* 16760 80848970 46060032 */ c.eq.s $f0, $f6 +/* 16760 80848970 46060032 */ c.eq.s $f0, $f6 /* 16764 80848974 00000000 */ nop -/* 16768 80848978 45020003 */ bc1fl .L80848988 -/* 1676C 8084897C 8FA40028 */ lw $a0, 0x0028($sp) +/* 16768 80848978 45020003 */ bc1fl .L80848988 +/* 1676C 8084897C 8FA40028 */ lw $a0, 0x0028($sp) .L80848980: -/* 16770 80848980 A3AA0027 */ sb $t2, 0x0027($sp) +/* 16770 80848980 A3AA0027 */ sb $t2, 0x0027($sp) .L80848984: -/* 16774 80848984 8FA40028 */ lw $a0, 0x0028($sp) +/* 16774 80848984 8FA40028 */ lw $a0, 0x0028($sp) .L80848988: /* 16778 80848988 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1677C 8084898C 0C030129 */ jal Gameplay_GetCamera -/* 16780 80848990 AFA30018 */ sw $v1, 0x0018($sp) -/* 16784 80848994 8FA30018 */ lw $v1, 0x0018($sp) +/* 1677C 8084898C 0C030129 */ jal Gameplay_GetCamera +/* 16780 80848990 AFA30018 */ sw $v1, 0x0018($sp) +/* 16784 80848994 8FA30018 */ lw $v1, 0x0018($sp) /* 16788 80848998 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 1678C 8084899C 00032C00 */ sll $a1, $v1, 16 -/* 16790 808489A0 0C016911 */ jal func_8005A444 -/* 16794 808489A4 00052C03 */ sra $a1, $a1, 16 -/* 16798 808489A8 10000003 */ beq $zero, $zero, .L808489B8 -/* 1679C 808489AC 8FAC0028 */ lw $t4, 0x0028($sp) -/* 167A0 808489B0 A3AB0027 */ sb $t3, 0x0027($sp) +/* 1678C 8084899C 00032C00 */ sll $a1, $v1, 16 +/* 16790 808489A0 0C016911 */ jal func_8005A444 +/* 16794 808489A4 00052C03 */ sra $a1, $a1, 16 +/* 16798 808489A8 10000003 */ beq $zero, $zero, .L808489B8 +/* 1679C 808489AC 8FAC0028 */ lw $t4, 0x0028($sp) +/* 167A0 808489B0 A3AB0027 */ sb $t3, 0x0027($sp) .L808489B4: -/* 167A4 808489B4 8FAC0028 */ lw $t4, 0x0028($sp) +/* 167A4 808489B4 8FAC0028 */ lw $t4, 0x0028($sp) .L808489B8: /* 167A8 808489B8 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 167AC 808489BC 8D821D20 */ lw $v0, 0x1D20($t4) ## 00001D20 -/* 167B0 808489C0 50400006 */ beql $v0, $zero, .L808489DC -/* 167B4 808489C4 8FAE0028 */ lw $t6, 0x0028($sp) -/* 167B8 808489C8 A3AD0027 */ sb $t5, 0x0027($sp) +/* 167B0 808489C0 50400006 */ beql $v0, $zero, .L808489DC +/* 167B4 808489C4 8FAE0028 */ lw $t6, 0x0028($sp) +/* 167B8 808489C8 A3AD0027 */ sb $t5, 0x0027($sp) /* 167BC 808489CC C440008C */ lwc1 $f0, 0x008C($v0) ## 0000008C -/* 167C0 808489D0 0C03D845 */ jal func_800F6114 -/* 167C4 808489D4 46000304 */ sqrt.s $f12, $f0 -/* 167C8 808489D8 8FAE0028 */ lw $t6, 0x0028($sp) +/* 167C0 808489D0 0C03D845 */ jal func_800F6114 +/* 167C4 808489D4 46000304 */ sqrt.s $f12, $f0 +/* 167C8 808489D8 8FAE0028 */ lw $t6, 0x0028($sp) .L808489DC: /* 167CC 808489DC 24010049 */ addiu $at, $zero, 0x0049 ## $at = 00000049 /* 167D0 808489E0 85CF00A4 */ lh $t7, 0x00A4($t6) ## 000000A4 -/* 167D4 808489E4 51E10004 */ beql $t7, $at, .L808489F8 -/* 167D8 808489E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 167DC 808489EC 0C03D7A4 */ jal func_800F5E90 -/* 167E0 808489F0 93A40027 */ lbu $a0, 0x0027($sp) -/* 167E4 808489F4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 167D4 808489E4 51E10004 */ beql $t7, $at, .L808489F8 +/* 167D8 808489E8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 167DC 808489EC 0C03D7A4 */ jal func_800F5E90 +/* 167E0 808489F0 93A40027 */ lbu $a0, 0x0027($sp) +/* 167E4 808489F4 8FBF0014 */ lw $ra, 0x0014($sp) .L808489F8: /* 167E8 808489F8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 167EC 808489FC 03E00008 */ jr $ra +/* 167EC 808489FC 03E00008 */ jr $ra /* 167F0 80848A00 00000000 */ nop diff --git a/data/z_camera.data.s b/data/z_camera.data.s deleted file mode 100644 index ab6f11db8f..0000000000 --- a/data/z_camera.data.s +++ /dev/null @@ -1,148 +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_80119EE0 - .incbin "baserom.z64", 0xB91080, 0x6C - -glabel D_80119F4C - .incbin "baserom.z64", 0xB910EC, 0x4 - -glabel D_80119F50 - .incbin "baserom.z64", 0xB910F0, 0x38 - -glabel D_80119F88 - .incbin "baserom.z64", 0xB91128, 0x4 - -glabel D_80119F8C - .incbin "baserom.z64", 0xB9112C, 0x318 - -glabel D_8011A2A4 - .incbin "baserom.z64", 0xB91444, 0x2DC0 - -glabel D_8011D064 - .incbin "baserom.z64", 0xB94204, 0x4 - -glabel D_8011D068 - .incbin "baserom.z64", 0xB94208, 0x20C - -glabel D_8011D274 - .incbin "baserom.z64", 0xB94414, 0x11C - -glabel D_8011D390 - .incbin "baserom.z64", 0xB94530, 0x4 - -glabel D_8011D394 - .incbin "baserom.z64", 0xB94534, 0x4 - -glabel D_8011D398 - .incbin "baserom.z64", 0xB94538, 0x4 - -glabel D_8011D39C - .incbin "baserom.z64", 0xB9453C, 0x4 - -glabel D_8011D3A0 - .incbin "baserom.z64", 0xB94540, 0x2 - -glabel D_8011D3A2 - .incbin "baserom.z64", 0xB94542, 0x2 - -glabel D_8011D3A4 - .incbin "baserom.z64", 0xB94544, 0x4 - -glabel D_8011D3A8 - .incbin "baserom.z64", 0xB94548, 0x4 - -glabel D_8011D3AC - .incbin "baserom.z64", 0xB9454C, 0x4 - -glabel D_8011D3B0 - .incbin "baserom.z64", 0xB94550, 0x1C - -glabel D_8011D3CC - .incbin "baserom.z64", 0xB9456C, 0x1C - -glabel D_8011D3E8 - .incbin "baserom.z64", 0xB94588, 0x8 - -glabel D_8011D3F0 - .incbin "baserom.z64", 0xB94590, 0x4 - -glabel D_8011D3F4 - .incbin "baserom.z64", 0xB94594, 0x4 - -glabel D_8011D3F8 - .incbin "baserom.z64", 0xB94598, 0x260 - -glabel D_8011D658 - .incbin "baserom.z64", 0xB947F8, 0x20 - -glabel D_8011D678 - .incbin "baserom.z64", 0xB94818, 0x30 - -glabel D_8011D6A8 - .incbin "baserom.z64", 0xB94848, 0x4 - -glabel D_8011D6AC - .incbin "baserom.z64", 0xB9484C, 0x2C - -glabel D_8011D6D8 - .incbin "baserom.z64", 0xB94878, 0x4C - -glabel D_8011D724 - .incbin "baserom.z64", 0xB948C4, 0x78 - -glabel D_8011D79C - .incbin "baserom.z64", 0xB9493C, 0xA0 - -glabel D_8011D83C - .incbin "baserom.z64", 0xB949DC, 0x50 - -glabel D_8011D88C - .incbin "baserom.z64", 0xB94A2C, 0x50 - -glabel D_8011D8DC - .incbin "baserom.z64", 0xB94A7C, 0x78 - -glabel D_8011D954 - .incbin "baserom.z64", 0xB94AF4, 0xA0 - -glabel D_8011D9F4 - .incbin "baserom.z64", 0xB94B94, 0x78 - -glabel D_8011DA6C - .incbin "baserom.z64", 0xB94C0C, 0x30 - -glabel D_8011DA9C - .incbin "baserom.z64", 0xB94C3C, 0x30 - -glabel D_8011DACC - .incbin "baserom.z64", 0xB94C6C, 0x10 - -glabel D_8011DADC - .incbin "baserom.z64", 0xB94C7C, 0x10 - -glabel D_8011DAEC - .incbin "baserom.z64", 0xB94C8C, 0x10 - -glabel D_8011DAFC - .incbin "baserom.z64", 0xB94C9C, 0xC - -glabel D_8011DB08 - .incbin "baserom.z64", 0xB94CA8, 0x4 - -glabel D_8011DB0C - .incbin "baserom.z64", 0xB94CAC, 0x4 - -glabel D_8011DB10 - .incbin "baserom.z64", 0xB94CB0, 0x4 - -glabel D_8011DB14 - .incbin "baserom.z64", 0xB94CB4, 0xC diff --git a/include/functions.h b/include/functions.h index 274e4fc560..31540f66b5 100644 --- a/include/functions.h +++ b/include/functions.h @@ -481,7 +481,7 @@ void ActorOverlayTable_Cleanup(void); // ? func_80038924(?); // ? func_800389D4(?); void func_80038A28(CollisionPoly*, f32, f32, f32, MtxF*); -// ? func_80038B7C(?); +f32 func_80038B7C(CollisionPoly*, Vec3f*); // ? func_80038BE0(?); // ? func_80038D48(?); // ? func_80038E78(?); @@ -585,7 +585,7 @@ void DynaPolyInfo_Alloc(UNK_PTR arg0, UNK_PTR arg1); // ? func_80041A4C(?); // ? func_80041B24(?); // ? func_80041B80(?); -// ? func_80041C10(?); +struct_80041C10_ret* func_80041C10(CollisionContext* colCtx, s32, s32); // ? func_80041C98(?); // ? func_80041D4C(?); // ? func_80041D94(?); @@ -646,8 +646,8 @@ f32 func_800437F0(f32, f32); // ? func_80044ADC(?); // ? func_80044E68(?); // ? func_800450A4(?); -// ? func_80045128(?); -// ? func_80045254(?); +// ? Camera_CopyModeValuesToPREG(?); +// ? Camera_CopyPREGToModeValues(?); // ? func_80045350(?); // ? func_8004545C(?); // ? func_80045508(?); @@ -664,9 +664,9 @@ f32 func_800437F0(f32, f32); // ? func_80046CB4(?); // ? func_80046E20(?); // ? func_80047394(?); -// ? func_800473A0(?); -// ? func_80051B3C(?); -// ? func_80052E0C(?); +// ? Camera_Normal1(?); +// ? Camera_Unique2(?); +// ? Camera_Unique9(?); // ? func_80054314(?); // ? func_8005445C(?); // ? func_80054478(?); @@ -682,16 +682,16 @@ void Camera_ChangeStatus(Camera* camera, s16 status); // ? func_800591EC(?); void func_80059EC8(Camera* camera); // ? func_8005A02C(?); -// ? func_8005A04C(?); +// ? Camera_ChangeMode(?); // ? func_8005A444(?); -// ? func_8005A548(?); +// ? Camera_ChangeSetting(?); s32 func_8005A77C(Camera* camera, s16 button); // ? func_8005A7A8(?); // ? func_8005A8C4(?); -s16 func_8005A970(Vec3s, Camera*); +Vec3s* func_8005A970(Vec3s*, Camera*); s16 func_8005A9F4(Camera* camera); -void func_8005AA1C(Camera* camera, s32, s16, s32); -s32 func_8005AA90(Camera*, s32, Vec3f*); +s32 func_8005AA1C(Camera* camera, s32, s16, s32); +s32 Camera_SetParam(Camera*, s32, void*); // ? func_8005AC48(?); // ? func_8005AC60(?); // ? func_8005AC6C(?); @@ -1024,8 +1024,8 @@ f32 func_8007BF90(Vec3f*, Vec3f*); // ? func_8007C0F8(?); // ? func_8007C25C(?); // ? func_8007C29C(?); -// ? func_8007C3F4(?); -// ? func_8007C490(?); +VecSph* func_8007C3F4(VecSph* arg0, Vec3f* arg1); +void func_8007C490(VecSph* arg0, Vec3f* a, Vec3f* b); // ? func_8007C4E0(?); // ? func_8007C680(?); // ? func_8007C704(?); @@ -2465,7 +2465,7 @@ u32 osDpGetStatus(void); void osDpSetStatus(u32 status); // ? func_801041E0(?); // ? func_801043B8(?); -void guOrthoF(f32[4][4], f32, f32, f32, f32, f32, f32, f32); +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); s16 coss(u16); diff --git a/include/variables.h b/include/variables.h index ce5da20f2e..818a513b20 100644 --- a/include/variables.h +++ b/include/variables.h @@ -186,14 +186,14 @@ extern s32 gMaxActorId; // original name: "MaxProfile" //extern ? D_80119E54; //extern ? D_80119E94; //extern ? D_80119EAC; -//extern ? D_80119EE0; -//extern ? D_80119F4C; -//extern ? D_80119F50; -//extern ? D_80119F88; -//extern ? D_80119F8C; -//extern ? D_8011A2A4; -//extern ? D_8011D064; -//extern ? D_8011D390; +//extern ? sOREGInit; +//extern ? sOREGInitCnt; +//extern ? sPREGInit; +//extern ? sPREGInitCnt; +//extern ? sCameraSettingNames; +//extern ? sCameraModeNames; +//extern ? sCameraSettings; +//extern ? sInitRegs; extern s32 D_8011D394; //extern ? D_8011D398; //extern ? D_8011D39C; @@ -205,7 +205,7 @@ extern s32 D_8011D3AC; //extern ? D_8011D3E8; //extern ? D_8011D3F0; //extern ? D_8011D3F4; -//extern ? D_8011D3F8; +//extern ? sCameraFunctionNames; //extern ? D_8011D658; //extern ? D_8011D678; //extern ? D_8011D6A8; diff --git a/include/z64.h b/include/z64.h index ad45324707..9adc769b33 100644 --- a/include/z64.h +++ b/include/z64.h @@ -391,48 +391,122 @@ typedef struct { } View; // size = 0x128 typedef struct { - /* 0x0000 */ s32 unk_00; + /* 0x0000 */ f32 unk_00; + /* 0x0004 */ f32 unk_04; + /* 0x0008 */ s16 unk_08; +} Special9; // size = 0xC + +typedef struct { + /* 0x0000 */ Actor* door; /* 0x0004 */ s16 unk_04; /* 0x0006 */ s16 unk_06; /* 0x0008 */ s16 unk_08; /* 0x000A */ s16 unk_0A; - /* 0x000C */ char unk_0C[0x16]; - /* 0x0022 */ s16 unk_22; - /* 0x0024 */ char unk_24[0x2C]; + /* 0x000C */ Special9 spec9; + /* 0x0018 */ s16 unk_18; +} DoorCamera; // size = 0x1C + +typedef struct { + f32 unk_00; + s16 unk_04; +} Special0; + +typedef struct { + /* 0x0000 */ f32 unk_00; + /* 0x0004 */ s16 unk_04; +} Demo1_unk_04; // size = 0x14 + +typedef struct { + /* 0x0000 */ s16 unk_00; + /* 0x0002 */ s16 unk_02; + /* 0x0004 */ Demo1_unk_04 unk_04; +} Demo1; // size = 0x18 + +typedef struct { + char unk_00[0xC]; + s32 unk_0C; + f32 unk_10; + s16 unk_14; + s16 unk_16; + s16 unk_18; + s16 unk_1A; + f32 unk_1C; + f32 unk_20; + s16 unk_24; + s16 unk_26; + s16 unk_28; + s16 unk_2A; +} Normal3_Unk20; + +typedef struct { + f32 unk_00; + f32 unk_04; // distance + f32 unk_08; + f32 unk_0C; + f32 unk_10; + f32 unk_14; // fov + f32 unk_18; + s16 unk_1C; // theta + s16 unk_1E; + Normal3_Unk20 unk_20; +} Normal3; + +typedef union { + char data[0x50]; + s16 sh[2]; + s32 w; + f32 f; + DoorCamera doorCam; + Special0 spec0; + Demo1 demo1; + Normal3 normal3; +} camera_unk_00; + +typedef struct { + Vec3s unk_00; + Vec3s unk_06; + s16 unk_0C; + s16 unk_0E; +} struct_80041C10_ret; + +typedef struct { + /* 0x0000 */ camera_unk_00 unk_00; /* 0x0050 */ Vec3f at; /* 0x005C */ Vec3f eye; /* 0x0068 */ Vec3f unk_68; - /* 0x0074 */ Vec3f unk_74; + /* 0x0074 */ Vec3f eyeNext; /* 0x0080 */ Vec3f unk_80; /* 0x008C */ struct GlobalContext* globalCtx; /* 0x0090 */ Player* player; - /* 0x0094 */ PosRot unk_94; - /* 0x00A8 */ Vec3f* unk_A8; - /* 0x00AC */ Vec3f unk_AC; - /* 0x00B8 */ char unk_B8[8]; - /* 0x00C0 */ Vec3f unk_C0; - /* 0x00CC */ Vec3f unk_CC; + /* 0x0094 */ PosRot playerPosRot; + /* 0x00A8 */ Actor* target; + /* 0x00AC */ PosRot targetPosRot; + /* 0x00C0 */ Vec3f unk_C0; // has to do with how quickly the camera rotates link. + /* 0x00CC */ Vec3f unk_CC; // has to do with how quickly the camera zooms /* 0x00D8 */ f32 unk_D8; - /* 0x00DC */ f32 unk_DC; // possibly a Vec3f + /* 0x00DC */ f32 dist; // possibly a Vec3f /* 0x00E0 */ f32 unk_E0; /* 0x00E4 */ Vec3f unk_E4; - /* 0x00F0 */ char unk_F0[0x0C]; - /* 0x00FC */ f32 unk_FC; - /* 0x0100 */ f32 unk_100; + /* 0x00F0 */ Vec3f unk_F0; + /* 0x00FC */ f32 fov; + /* 0x0100 */ f32 unk_100; // update rate of distance from link? /* 0x0104 */ f32 unk_104; /* 0x0108 */ Vec3f unk_108; - /* 0x0114 */ char unk_114[0x10]; - /* 0x0124 */ s32 unk_124; - /* 0x0128 */ s32 unk_128; - /* 0x012C */ s16 unk_12C; + /* 0x0114 */ char unk_114[0x4]; + /* 0x0118 */ s32 unk_118; + /* 0x011C */ s32 unk_11C; + /* 0x0120 */ char unk_120[0x4]; + /* 0x0124 */ CutsceneCameraPoint* atPoints; + /* 0x0128 */ CutsceneCameraPoint* eyePoints; + /* 0x012C */ s16 relativeToPlayer; // camera Cutscene points are relative to player's position /* 0x012E */ s16 unk_12E; /* 0x0130 */ s16 uid; // Unique identifier of the camera. /* 0x0132 */ char unk_132[0x02]; /* 0x0134 */ Vec3s unk_134; - /* 0x013A */ Vec3s unk_13A; + /* 0x013A */ Vec3s unk_13A; // seems to be a copy of unk_134, but unused for anything different? /* 0x0140 */ s16 status; - /* 0x0142 */ s16 unk_142; // related to door camera (see func_8005AD40) - /* 0x0144 */ s16 unk_144; + /* 0x0142 */ s16 setting; // referred to as set + /* 0x0144 */ s16 mode; /* 0x0146 */ s16 unk_146; // unknown if used /* 0x0148 */ s16 unk_148; // ID for door camera? (see func_8005AD40) /* 0x014A */ s16 unk_14A; // unknown if used @@ -440,12 +514,12 @@ typedef struct { /* 0x014E */ s16 unk_14E; /* 0x0150 */ s16 unk_150; // unknown if used /* 0x0152 */ s16 unk_152; - /* 0x0154 */ u16 unk_154; + /* 0x0154 */ u16 unk_154; // appears to be some clone of setting? /* 0x0156 */ s16 unk_156; /* 0x0158 */ s16 unk_158; // unknown if used - /* 0x015E */ s16 unk_15A; - /* 0x015E */ s16 unk_15C; // unknown if used - /* 0x015E */ u16 unk_15E; + /* 0x015A */ s16 roll; + /* 0x015C */ s16 unk_15C; // unknown if used + /* 0x015E */ s16 unk_15E; /* 0x0160 */ s16 unk_160; /* 0x0162 */ s16 unk_162; /* 0x0164 */ s16 unk_164; @@ -454,6 +528,38 @@ typedef struct { /* 0x016A */ s16 unk_16A; // unknown if used } Camera; // size = 0x16C +typedef struct { + s32 unk_00; + char unk_04[0x30]; + s32 unk_34; + s32 unk_38; + s32 unk_3C; + s32 unk_40; + s32 unk_44; + f32 unk_48; + s16 unk_4C; + f32 unk_50; + char unk_54[0x18]; + f32 unk_6C; + f32 unk_70; + f32 unk_74; + s16 unk_78; + s16 unk_7A; + s16 unk_7C; + s16 unk_7E; + s16 unk_80; + s16 unk_82; + s16 unk_84; + s16 unk_86; + char unk_88[0x1038]; + s16 unk_10C0; + s16 unk_10C2; + s16 unk_10C4; + s16 unk_10C6; + s16 unk_10C8; + s16 unk_10CA; +} DbgCamera; // size = 0x10CC; + typedef struct { /* 0x00 */ u8 musicSeq; /* 0x01 */ u8 nighttimeSFX; diff --git a/spec b/spec index 92ffc62333..afa4cdfcae 100644 --- a/spec +++ b/spec @@ -293,7 +293,6 @@ beginseg include "build/src/code/code_800430A0.o" include "build/src/code/code_80043480.o" include "build/src/code/z_camera.o" - include "build/data/z_camera.data.o" include "build/data/z_camera.bss.o" include "build/src/code/z_collision_btltbls.o" include "build/src/code/z_collision_check.o" @@ -380,8 +379,7 @@ beginseg include "build/data/db_camera.data.o" include "build/data/db_camera.rodata.o" include "build/data/db_camera.bss.o" - include "build/asm/code_800BB0A0.o" - include "build/data/code_800BB0A0.rodata.o" + include "build/src/code/code_800BB0A0.o" include "build/asm/code_800BB570.o" include "build/data/code_800BB570.data.o" include "build/data/code_800BB570.rodata.o" @@ -8519,7 +8517,7 @@ beginseg name "syotes2_scene" romalign 0x1000 include "build/scenes/test_levels/syotes2/syotes2_scene.o" - address SEGMENT_SCENE + address SEGMENT_SCENE endseg beginseg diff --git a/src/code/code_800BB0A0.c b/src/code/code_800BB0A0.c new file mode 100644 index 0000000000..f5e8a21708 --- /dev/null +++ b/src/code/code_800BB0A0.c @@ -0,0 +1,5 @@ +#include + +#pragma GLOBAL_ASM("asm/non_matchings/code/code_800BB0A0/func_800BB0A0.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/code_800BB0A0/func_800BB2B4.s") diff --git a/src/code/z_camera.c b/src/code/z_camera.c index fb5a9bd19d..dbcb35a051 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -2,13 +2,1734 @@ #include #include -/* -DATA -*/ +typedef struct { + s16 val; + s16 param; +} CameraModeValue; -// Non-matchings functions marked with CLOSE are either a matter of regalloc or stack size and can possibly be fixed -// with the permutator. +typedef struct { + s16 funcIdx; + s16 valueCnt; + CameraModeValue* values; +} CameraMode; +typedef struct { + union { + u32 unk_00; + struct { + u32 unk_bit0 : 1; + u32 unk_bit1 : 1; + u32 validModes : 30; + }; + }; + CameraMode* cameraModes; +} CameraSetting; + +typedef union { + s16 sh[2]; + s32 w; +} u_D_8011D3A0; + +typedef enum { + CAM_SET_NONE, + CAM_SET_NORMAL0, + CAM_SET_NORMAL1, + CAM_SET_DUNGEON0, + CAM_SET_DUNGEON1, + CAM_SET_NORMAL3, + CAM_SET_HORSE0, + CAM_SET_BOSS_GOMA, + CAM_SET_BOSS_DODO, + CAM_SET_BOSS_BARI, + CAM_SET_BOSS_FGANON, + CAM_SET_BOSS_BAL, + CAM_SET_BOSS_SHADES, + CAM_SET_BOSS_MOFA, + CAM_SET_TWIN0, + CAM_SET_TWIN1, + CAM_SET_BOSS_GANON1, + CAM_SET_BOSS_GANON2, + CAM_SET_TOWER0, + CAM_SET_TOWER1, + CAM_SET_FIXED0, + CAM_SET_FIXED1, + CAM_SET_CIRCLE0, + CAM_SET_CIRCLE2, + CAM_SET_CIRCLE3, + CAM_SET_PREREND0, + CAM_SET_PREREND1, + CAM_SET_PREREND3, + CAM_SET_DOOR0, + CAM_SET_DOORC, + CAM_SET_RAIL3, + CAM_SET_START0, + CAM_SET_START1, + CAM_SET_FREE0, + CAM_SET_FREE2, + CAM_SET_CIRCLE4, + CAM_SET_CIRCLE5, + CAM_SET_DEMO0, + CAM_SET_DEMO1, + CAM_SET_MORI1, + CAM_SET_ITEM0, + CAM_SET_ITEM1, + CAM_SET_DEMO3, + CAM_SET_DEMO4, + CAM_SET_UFOBEAN, + CAM_SET_LIFTBEAN, + CAM_SET_SCENE0, + CAM_SET_SCENE1, + CAM_SET_HIDAN1, + CAM_SET_HIDAN2, + CAM_SET_MORI2, + CAM_SET_MORI3, + CAM_SET_TAKO, + CAM_SET_SPOT05A, + CAM_SET_SPOT05B, + CAM_SET_HIDAN3, + CAM_SET_ITEM2, + CAM_SET_CIRCLE6, + CAM_SET_NORMAL2, + CAM_SET_FISHING, + CAM_SET_DEMOC, + CAM_SET_UO_FIBER, + CAM_SET_DUNGEON2, + CAM_SET_TEPPEN, + CAM_SET_CIRCLE7, + CAM_SET_NORMAL4, + CAM_SET_MAX +} CameraSettingType; + +typedef enum { + CAM_MODE_NORMAL, + CAM_MODE_PARALLEL, + CAM_MODE_KEEPON, + CAM_MODE_TALK, + CAM_MODE_BATTLE, + CAM_MODE_CLIMB, + CAM_MODE_SUBJECT, + CAM_MODE_BOWARROW, + CAM_MODE_BOWARROWZ, + CAM_MODE_FOOKSHOT, + CAM_MODE_BOOMERANG, + CAM_MODE_PACHINCO, + CAM_MODE_CLIMBZ, + CAM_MODE_JUMP, + CAM_MODE_HANG, + CAM_MODE_HANGZ, + CAM_MODE_FREEFALL, + CAM_MODE_CHARGE, + CAM_MODE_STILL, + CAM_MODE_PUSHPULL, + CAM_MODE_BOOKEEPON +} CameraModeType; + +/*==================================================================*/ +// Data +s16 sOREGInit[] = { + 0, 1, 5, 5, 5, 14500, 20, 16, 150, 25, 150, 6, 10, 10, 0, 0, 1, 100, + 250, 120, 80, 30, 120, 4, 1, 50, 20, 1800, 50, 50, 50, 20, 20, -10, -5460, -9100, + -6, 8, 15, 75, 60, 12, 110, 40, 50, 250, -10, 30, 30, 70, 20, 20, 20, +}; + +s16 sOREGInitCnt = 53; + +s16 sPREGInit[] = { + -20, 200, 300, 10, 12, 10, 35, 60, 60, 3, 0, -40, 20, 25, 45, -5, 15, 15, 20, 0, 0, 0, 6, 60, 30, 0, 5, +}; + +s16 sPREGInitCnt = 27; + +char sCameraSettingNames[][12] = { + "NONE ", "NORMAL0 ", "NORMAL1 ", "DUNGEON0 ", "DUNGEON1 ", "NORMAL3 ", "HORSE0 ", + "BOSS_GOMA ", "BOSS_DODO ", "BOSS_BARI ", "BOSS_FGANON", "BOSS_BAL ", "BOSS_SHADES", "BOSS_MOFA ", + "BOSS_TWIN0 ", "BOSS_TWIN1 ", "BOSS_GANON1", "BOSS_GANON2", "TOWER0 ", "TOWER1 ", "FIXED0 ", + "FIXED1 ", "CIRCLE0 ", "CIRCLE2 ", "CIRCLE3 ", "PREREND0 ", "PREREND1 ", "PREREND3 ", + "DOOR0 ", "DOORC ", "RAIL3 ", "START0 ", "START1 ", "FREE0 ", "FREE2 ", + "CIRCLE4 ", "CIRCLE5 ", "DEMO0 ", "DEMO1 ", "MORI1 ", "ITEM0 ", "ITEM1 ", + "DEMO3 ", "DEMO4 ", "UFOBEAN ", "LIFTBEAN ", "SCENE0 ", "SCENE1 ", "HIDAN1 ", + "HIDAN2 ", "MORI2 ", "MORI3 ", "TAKO ", "SPOT05A ", "SPOT05B ", "HIDAN3 ", + "ITEM2 ", "CIRCLE6 ", "NORMAL2 ", "FISHING ", "DEMOC ", "UO_FIBER ", "DUNGEON2 ", + "TEPPEN ", "CIRCLE7 ", "NORMAL4 ", +}; + +char sCameraModeNames[][12] = { + "NORMAL ", "PARALLEL ", "KEEPON ", "TALK ", "BATTLE ", "CLIMB ", "SUBJECT ", + "BOWARROW ", "BOWARROWZ ", "FOOKSHOT ", "BOOMERANG ", "PACHINCO ", "CLIMBZ ", "JUMP ", + "HANG ", "HANGZ ", "FREEFALL ", "CHARGE ", "STILL ", "PUSHPULL ", "BOOKEEPON ", +}; + +CameraModeValue D_8011A3A0[] = { + { -20, 0 }, { 200, 1 }, { 300, 2 }, { 10, 3 }, { 12, 4 }, { 10, 5 }, { 35, 6 }, { 60, 7 }, { 60, 8 }, { 3, 9 }, +}; + +CameraModeValue D_8011A3C8[] = { + { -20, 0 }, { 250, 1 }, { 0, 3 }, { 0, 10 }, { 5, 4 }, { 5, 5 }, + { 45, 7 }, { 50, 8 }, { 8202, 9 }, { -40, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011A3F4[] = { + { -20, 0 }, { 120, 1 }, { 140, 2 }, { 25, 13 }, { 45, 14 }, { -5, 15 }, { 15, 16 }, + { 15, 17 }, { 45, 7 }, { 50, 8 }, { 8193, 9 }, { -50, 11 }, { 30, 12 }, +}; + +CameraModeValue D_8011A428[] = { + { -30, 0 }, { 70, 1 }, { 200, 2 }, { 40, 13 }, { 10, 14 }, { 0, 15 }, + { 5, 16 }, { 70, 17 }, { 45, 7 }, { 50, 8 }, { 10, 4 }, { 13568, 9 }, +}; + +CameraModeValue D_8011A458[] = { + { -20, 0 }, { 180, 1 }, { 10, 13 }, { 80, 14 }, { 0, 15 }, { 10, 16 }, + { 25, 17 }, { 50, 7 }, { 80, 8 }, { 8194, 9 }, { -40, 11 }, { 25, 12 }, +}; + +CameraModeValue D_8011A488[] = { + { -20, 0 }, { 200, 1 }, { 300, 2 }, { 20, 18 }, { 5, 4 }, { 5, 5 }, { 60, 7 }, { 40, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011A4AC[] = { + { 0, 0 }, { 5, 1 }, { 50, 2 }, { 10, 4 }, { 0, 19 }, { 0, 20 }, { 0, 21 }, { 45, 7 }, { 0, 9 }, +}; + +CameraModeValue D_8011A4D0[] = { + { -7, 0 }, { 14, 1 }, { 50, 2 }, { 10, 4 }, { 0, 19 }, { -30, 20 }, { -5, 21 }, { 45, 7 }, { 8192, 9 }, +}; + +CameraModeValue D_8011A4F4[] = { + { 20, 0 }, { 70, 1 }, { 70, 2 }, { 10, 4 }, { -120, 19 }, { 20, 20 }, { 0, 21 }, { 45, 7 }, { 8192, 9 }, +}; + +CameraModeValue D_8011A518[] = { + { -20, 0 }, { 80, 1 }, { 250, 2 }, { 45, 3 }, { 60, 7 }, { 40, 8 }, { 6, 22 }, { 8192, 9 }, +}; + +CameraModeValue D_8011A538[] = { + { 5, 0 }, { 50, 1 }, { 50, 2 }, { 10, 4 }, { 0, 19 }, { 0, 20 }, { 0, 21 }, { 45, 7 }, { 8192, 9 }, +}; + +CameraModeValue D_8011A55C[] = { + { -7, 0 }, { 14, 1 }, { 50, 2 }, { 10, 4 }, { -9, 19 }, { -63, 20 }, { -30, 21 }, { 45, 7 }, { 8192, 9 }, +}; + +CameraModeValue D_8011A580[] = { + { -20, 0 }, { 200, 1 }, { 300, 2 }, { 20, 18 }, { 999, 4 }, { 5, 5 }, { 60, 7 }, { 40, 8 }, { 8198, 9 }, +}; + +CameraModeValue D_8011A5A4[] = { + { -20, 0 }, { 200, 1 }, { 300, 2 }, { 12, 4 }, { 35, 6 }, { 60, 7 }, { 40, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011A5C4[] = { + { -80, 0 }, { 200, 1 }, { 300, 2 }, { 40, 3 }, { 60, 7 }, { 10, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011A5E0[] = { + { -120, 0 }, { 300, 1 }, { 300, 2 }, { 70, 3 }, { 45, 7 }, { 10, 8 }, { 8192, 9 }, +}; + +CameraModeValue D_8011A5FC[] = { + { -20, 0 }, { 200, 1 }, { 300, 2 }, { 15, 4 }, { 80, 6 }, { 60, 7 }, { 20, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011A61C[] = { + { -20, 0 }, { 300, 1 }, { 50, 3 }, { 2, 4 }, { 80, 7 }, { 20, 8 }, { -4096, 9 }, +}; + +CameraModeValue D_8011A638[] = { + { -20, 0 }, { 200, 1 }, { 300, 2 }, { 10, 3 }, { 100, 4 }, { 10, 5 }, { 100, 6 }, { 60, 7 }, { 5, 8 }, { -4093, 9 }, +}; + +CameraModeValue D_8011A660[] = { + { 0, 0 }, { 250, 1 }, { 25, 3 }, { 0, 10 }, { 5, 4 }, { 5, 5 }, + { 70, 7 }, { 30, 8 }, { 8298, 9 }, { -20, 11 }, { 30, 12 }, +}; + +CameraModeValue D_8011A68C[] = { + { -5, 0 }, { 120, 1 }, { 140, 2 }, { 5, 13 }, { 85, 14 }, { 10, 15 }, { 5, 16 }, + { 25, 17 }, { 45, 7 }, { 50, 8 }, { 8193, 9 }, { -15, 11 }, { 30, 12 }, +}; + +CameraModeValue D_8011A6C0[] = { + { 0, 0 }, { 200, 1 }, { 400, 2 }, { 10, 3 }, { 12, 4 }, { 20, 5 }, { 40, 6 }, { 60, 7 }, { 60, 8 }, { 3, 9 }, +}; + +CameraModeValue D_8011A6E8[] = { + { 0, 0 }, { 250, 1 }, { 0, 3 }, { 0, 10 }, { 5, 4 }, { 5, 5 }, + { 45, 7 }, { 50, 8 }, { 8194, 9 }, { -40, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011A714[] = { + { -20, 0 }, { 120, 1 }, { 140, 2 }, { 25, 13 }, { 45, 14 }, { -5, 15 }, { 15, 16 }, + { 15, 17 }, { 45, 7 }, { 50, 8 }, { 8193, 9 }, { -50, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011A748[] = { + { -20, 0 }, { 250, 1 }, { 10, 13 }, { 80, 14 }, { 0, 15 }, { 10, 16 }, + { 25, 17 }, { 50, 7 }, { 65, 8 }, { 8194, 9 }, { -40, 11 }, { 25, 12 }, +}; + +CameraModeValue D_8011A778[] = { + { -20, 0 }, { 80, 1 }, { 250, 2 }, { 6, 22 }, { 45, 3 }, { 60, 7 }, { 40, 8 }, { 8192, 9 }, +}; + +CameraModeValue D_8011A798[] = { + { 0, 0 }, { 250, 1 }, { 400, 2 }, { 15, 4 }, { 50, 6 }, { 60, 7 }, { 30, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011A7B8[] = { + { 0, 0 }, { 200, 1 }, { 400, 2 }, { 30, 4 }, { 80, 6 }, { 60, 7 }, { 20, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011A7D8[] = { + { -20, 0 }, { 200, 1 }, { 400, 2 }, { 20, 18 }, { 5, 4 }, { 5, 5 }, { 60, 7 }, { 40, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011A7FC[] = { + { -20, 0 }, { 250, 1 }, { 400, 2 }, { 20, 18 }, { 999, 4 }, { 5, 5 }, { 60, 7 }, { 40, 8 }, { 8198, 9 }, +}; + +CameraModeValue D_8011A820[] = { + { 0, 0 }, { 300, 1 }, { 50, 3 }, { 2, 4 }, { 80, 7 }, { 20, 8 }, { -4096, 9 }, +}; + +CameraModeValue D_8011A83C[] = { + { -80, 0 }, { 200, 1 }, { 400, 2 }, { 40, 3 }, { 60, 7 }, { 10, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011A858[] = { + { -120, 0 }, { 400, 1 }, { 400, 2 }, { 70, 3 }, { 45, 7 }, { 10, 8 }, { 8192, 9 }, +}; + +CameraModeValue D_8011A874[] = { + { 0, 0 }, { 200, 1 }, { 400, 2 }, { 10, 3 }, { 100, 4 }, { 20, 5 }, { 100, 6 }, { 60, 7 }, { 5, 8 }, { -4093, 9 }, +}; + +CameraModeValue D_8011A89C[] = { + { -10, 0 }, { 150, 1 }, { 250, 2 }, { 5, 3 }, { 10, 4 }, { 5, 5 }, { 30, 6 }, { 60, 7 }, { 60, 8 }, { 3, 9 }, +}; + +CameraModeValue D_8011A8C4[] = { + { -20, 0 }, { 150, 1 }, { 0, 3 }, { 0, 10 }, { 5, 4 }, { 5, 5 }, + { 45, 7 }, { 50, 8 }, { 8202, 9 }, { -40, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011A8F0[] = { + { -20, 0 }, { 120, 1 }, { 140, 2 }, { 25, 13 }, { 45, 14 }, { -5, 15 }, { 15, 16 }, + { 15, 17 }, { 45, 7 }, { 50, 8 }, { 8193, 9 }, { -40, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011A924[] = { + { -20, 0 }, { 180, 1 }, { 10, 13 }, { 80, 14 }, { 0, 15 }, { 10, 16 }, + { 25, 17 }, { 45, 7 }, { 80, 8 }, { 8194, 9 }, { -40, 11 }, { 25, 12 }, +}; + +CameraModeValue D_8011A954[] = { + { -10, 0 }, { 150, 1 }, { 250, 2 }, { 10, 4 }, { 50, 6 }, { 60, 7 }, { 40, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011A974[] = { + { -10, 0 }, { 150, 1 }, { 250, 2 }, { 10, 4 }, { 80, 6 }, { 60, 7 }, { 20, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011A994[] = { + { -40, 0 }, { 150, 1 }, { 250, 2 }, { 20, 18 }, { 5, 4 }, { 5, 5 }, { 60, 7 }, { 40, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011A9B8[] = { + { -40, 0 }, { 250, 1 }, { 250, 2 }, { 20, 18 }, { 999, 4 }, { 5, 5 }, { 60, 7 }, { 40, 8 }, { 8198, 9 }, +}; + +CameraModeValue D_8011A9DC[] = { + { -10, 0 }, { 300, 1 }, { 50, 3 }, { 2, 4 }, { 80, 7 }, { 20, 8 }, { -4096, 9 }, +}; + +CameraModeValue D_8011A9F8[] = { + { -80, 0 }, { 150, 1 }, { 250, 2 }, { 40, 3 }, { 60, 7 }, { 10, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011AA14[] = { + { -120, 0 }, { 250, 1 }, { 250, 2 }, { 70, 3 }, { 45, 7 }, { 10, 8 }, { 8192, 9 }, +}; + +CameraModeValue D_8011AA30[] = { + { -10, 0 }, { 150, 1 }, { 250, 2 }, { 5, 3 }, { 100, 4 }, { 5, 5 }, { 100, 6 }, { 60, 7 }, { 5, 8 }, { -4093, 9 }, +}; + +CameraModeValue D_8011AA58[] = { + { -40, 0 }, { 150, 1 }, { 150, 2 }, { 0, 3 }, { 10, 4 }, { 5, 5 }, { 30, 6 }, { 60, 7 }, { 60, 8 }, { 3, 9 }, +}; + +CameraModeValue D_8011AA80[] = { + { -20, 0 }, { 70, 1 }, { 200, 2 }, { 40, 13 }, { 10, 14 }, { 0, 15 }, + { 5, 16 }, { 70, 17 }, { 45, 7 }, { 50, 8 }, { 10, 4 }, { 13568, 9 }, +}; + +CameraModeValue D_8011AAB0[] = { + { -40, 0 }, { 150, 1 }, { 150, 2 }, { 10, 4 }, { 50, 6 }, { 60, 7 }, { 40, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011AAD0[] = { + { -40, 0 }, { 150, 1 }, { 180, 2 }, { 12, 4 }, { 80, 6 }, { 60, 7 }, { 20, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011AAF0[] = { + { -40, 0 }, { 150, 1 }, { 150, 2 }, { 20, 18 }, { 5, 4 }, { 5, 5 }, { 60, 7 }, { 40, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011AB14[] = { + { -40, 0 }, { 150, 1 }, { 150, 2 }, { 20, 18 }, { 999, 4 }, { 5, 5 }, { 60, 7 }, { 40, 8 }, { 8198, 9 }, +}; + +CameraModeValue D_8011AB38[] = { + { -40, 0 }, { 200, 1 }, { 50, 3 }, { 2, 4 }, { 80, 7 }, { 20, 8 }, { -4096, 9 }, +}; + +CameraModeValue D_8011AB54[] = { + { -80, 0 }, { 150, 1 }, { 150, 2 }, { 40, 3 }, { 60, 7 }, { 10, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011AB70[] = { + { -120, 0 }, { 150, 1 }, { 150, 2 }, { 70, 3 }, { 45, 7 }, { 10, 8 }, { 8192, 9 }, +}; + +CameraModeValue D_8011AB8C[] = { + { -40, 0 }, { 150, 1 }, { 150, 2 }, { 0, 3 }, { 100, 4 }, { 5, 5 }, { 100, 6 }, { 60, 7 }, { 5, 8 }, { -4093, 9 }, +}; + +CameraModeValue D_8011ABB4[] = { + { -40, 0 }, { 180, 1 }, { 25, 3 }, { 0, 10 }, { 5, 4 }, { 5, 5 }, + { 60, 7 }, { 50, 8 }, { 8298, 9 }, { -20, 11 }, { 30, 12 }, +}; + +CameraModeValue D_8011ABE0[] = { + { -20, 0 }, { 280, 1 }, { 300, 2 }, { 20, 3 }, { 15, 4 }, { 5, 5 }, { 40, 6 }, { 60, 7 }, { 100, 8 }, { 4, 9 }, +}; + +CameraModeValue D_8011AC08[] = { + { -50, 0 }, { 250, 1 }, { 70, 3 }, { 0, 10 }, { 15, 4 }, { 5, 5 }, + { 60, 7 }, { 100, 8 }, { 8202, 9 }, { -50, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011AC34[] = { + { -30, 0 }, { 70, 1 }, { 200, 2 }, { 40, 13 }, { 10, 14 }, { 10, 15 }, + { 20, 16 }, { 70, 17 }, { 45, 7 }, { 10, 8 }, { 10, 4 }, { 13568, 9 }, +}; + +CameraModeValue D_8011AC64[] = { + { -40, 0 }, { 150, 1 }, { 250, 2 }, { -5, 3 }, { 18, 4 }, { 5, 5 }, { 60, 6 }, { 60, 7 }, { 40, 8 }, { 5, 9 }, +}; + +CameraModeValue D_8011AC8C[] = { + { -50, 0 }, { 220, 1 }, { 250, 2 }, { 10, 3 }, { 16, 4 }, { 20, 5 }, { 60, 7 }, { 100, 8 }, { 1536, 9 }, +}; + +CameraModeValue D_8011ACB0[] = { + { -40, 0 }, { 180, 1 }, { 220, 2 }, { -2, 3 }, { 12, 4 }, { 100, 5 }, { 45, 7 }, { 100, 8 }, { 9728, 9 }, +}; + +CameraModeValue D_8011ACD4[] = { + { -7, 0 }, { 14, 1 }, { 100, 2 }, { 10, 4 }, { 0, 19 }, { -30, 20 }, { -5, 21 }, { 40, 7 }, { 9728, 9 }, +}; + +CameraModeValue D_8011ACF8[] = { + { -60, 0 }, { 180, 1 }, { 220, 2 }, { 25, 13 }, { 45, 14 }, { -5, 15 }, { 15, 16 }, + { 15, 17 }, { 45, 7 }, { 50, 8 }, { 9729, 9 }, { -60, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011AD2C[] = { + { -60, 0 }, { 140, 1 }, { 200, 2 }, { 40, 13 }, { 10, 14 }, { 0, 15 }, + { 5, 16 }, { 70, 17 }, { 45, 7 }, { 50, 8 }, { 10, 4 }, { 13568, 9 }, +}; + +CameraModeValue D_8011AD5C[] = { + { -20, 0 }, { 150, 1 }, { 250, 2 }, { 0, 3 }, { 15, 4 }, { 5, 5 }, { 40, 6 }, { 60, 7 }, { 60, 8 }, { 1, 9 }, +}; + +CameraModeValue D_8011AD84[] = { + { -30, 0 }, { 150, 1 }, { 10, 13 }, { 40, 14 }, { -10, 15 }, { 0, 16 }, + { 25, 17 }, { 60, 7 }, { 40, 8 }, { 8194, 9 }, { -50, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011ADB4[] = { + { 0, 0 }, { 150, 1 }, { 300, 2 }, { 0, 3 }, { 12, 4 }, { 5, 5 }, { 70, 6 }, { 70, 7 }, { 40, 8 }, { 3, 9 }, +}; + +CameraModeValue D_8011ADDC[] = { + { -20, 0 }, { 160, 1 }, { 10, 13 }, { 60, 14 }, { -5, 15 }, { 0, 16 }, + { 25, 17 }, { 70, 7 }, { 50, 8 }, { 8194, 9 }, { -40, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011AE0C[] = { + { -20, 0 }, { 150, 1 }, { 300, 2 }, { -5, 3 }, { 15, 4 }, { 5, 5 }, { 40, 6 }, { 70, 7 }, { 70, 8 }, { 3, 9 }, +}; + +CameraModeValue D_8011AE34[] = { + { -30, 0 }, { 125, 1 }, { 10, 13 }, { 10, 14 }, { 0, 15 }, { 0, 16 }, + { 50, 17 }, { 60, 7 }, { 50, 8 }, { 8194, 9 }, { -50, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011AE64[] = { + { 10, 0 }, { 150, 1 }, { 250, 2 }, { 0, 3 }, { 15, 4 }, { 15, 5 }, { 40, 6 }, { 60, 7 }, { 100, 8 }, { 3, 9 }, +}; + +CameraModeValue D_8011AE8C[] = { + { -20, 0 }, { 200, 1 }, { 45, 13 }, { 40, 14 }, { 5, 15 }, { -5, 16 }, + { 35, 17 }, { 60, 7 }, { 100, 8 }, { 8194, 9 }, { -40, 11 }, { 60, 12 }, +}; + +CameraModeValue D_8011AEBC[] = { + { -20, 0 }, { 500, 1 }, { 500, 2 }, { 10, 3 }, { 16, 4 }, { 10, 5 }, { 40, 6 }, { 60, 7 }, { 80, 8 }, { 3, 9 }, +}; + +CameraModeValue D_8011AEE4[] = { + { -20, 0 }, { 200, 1 }, { 20, 13 }, { 60, 14 }, { 0, 15 }, { 10, 16 }, + { 15, 17 }, { 45, 7 }, { 50, 8 }, { 8194, 9 }, { -40, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011AF14[] = { + { -20, 0 }, { 500, 1 }, { 500, 2 }, { 10, 3 }, { 20, 4 }, { 10, 5 }, { 40, 6 }, { 60, 7 }, { 80, 8 }, { 131, 9 }, +}; + +CameraModeValue D_8011AF3C[] = { + { -20, 0 }, { 200, 1 }, { 20, 13 }, { 60, 14 }, { 0, 15 }, { 10, 16 }, + { 15, 17 }, { 45, 7 }, { 50, 8 }, { 8322, 9 }, { -40, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011AF6C[] = { + { -20, 0 }, { 500, 1 }, { 500, 2 }, { 10, 3 }, { 20, 4 }, { 10, 5 }, { 80, 6 }, { 60, 7 }, { 80, 8 }, { 131, 9 }, +}; + +CameraModeValue D_8011AF94[] = { + { -20, 0 }, { 100, 1 }, { 150, 2 }, { -10, 3 }, { 15, 4 }, { 10, 5 }, { 40, 6 }, { 80, 7 }, { 60, 8 }, { 3, 9 }, +}; + +CameraModeValue D_8011AFBC[] = { + { -20, 0 }, { 200, 1 }, { 10, 13 }, { 80, 14 }, { -10, 15 }, { 10, 16 }, + { 25, 17 }, { 70, 7 }, { 40, 8 }, { 8194, 9 }, { -40, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011AFEC[] = { + { -20, 0 }, { 150, 1 }, { 300, 2 }, { 0, 3 }, { 20, 4 }, { 10, 5 }, { 40, 6 }, { 60, 7 }, { 80, 8 }, { 3, 9 }, +}; + +CameraModeValue D_8011B014[] = { + { 0, 0 }, { 400, 1 }, { 0, 13 }, { 60, 14 }, { -10, 15 }, { 5, 16 }, + { 25, 17 }, { 45, 7 }, { 40, 8 }, { 8194, 9 }, { -20, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011B044[] = { + { -10, 0 }, { 150, 1 }, { 200, 2 }, { -10, 3 }, { 12, 4 }, { 10, 5 }, { 40, 6 }, { 60, 7 }, { 50, 8 }, { 3, 9 }, +}; + +CameraModeValue D_8011B06C[] = { + { 40, 0 }, { 330, 1 }, { 330, 2 }, { -5, 3 }, { 15, 4 }, { 15, 5 }, { 40, 6 }, { 60, 7 }, { 100, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011B094[] = { + { -40, 0 }, { 250, 1 }, { 0, 3 }, { 2, 4 }, { 80, 7 }, { 20, 8 }, { -4096, 9 }, +}; + +CameraModeValue D_8011B0B0[] = { + { -20, 0 }, { 500, 1 }, { 500, 2 }, { 10, 3 }, { 20, 4 }, { 10, 5 }, { 40, 6 }, { 60, 7 }, { 80, 8 }, { 3, 9 }, +}; + +CameraModeValue D_8011B0D8[] = { + { -20, 0 }, { 180, 1 }, { 20, 13 }, { 60, 14 }, { 0, 15 }, { 10, 16 }, + { 25, 17 }, { 45, 7 }, { 50, 8 }, { 8194, 9 }, { -40, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011B108[] = { + { 0, 0 }, { 120, 1 }, { 280, 2 }, { 60, 23 }, { 8, 4 }, { 40, 6 }, { 60, 7 }, { 50, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011B12C[] = { + { 0, 0 }, { 120, 1 }, { 280, 2 }, { 60, 23 }, { 8, 4 }, { 40, 6 }, { 60, 7 }, { 50, 8 }, { 128, 9 }, +}; + +CameraModeValue D_8011B150[] = { + { 0, 0 }, { 270, 1 }, { 300, 2 }, { 120, 23 }, { 8, 4 }, { 60, 6 }, { 60, 7 }, { 100, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011B174[] = { + { 0, 0 }, { 270, 1 }, { 300, 2 }, { 120, 23 }, { 6, 4 }, { 60, 6 }, { 60, 7 }, { 100, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011B198[] = { + { -40, 0 }, + { 100, 4 }, + { 60, 7 }, + { 0, 9 }, +}; + +CameraModeValue D_8011B1A8[] = { + { -40, 0 }, + { 100, 4 }, + { 60, 7 }, + { 8192, 9 }, +}; + +CameraModeValue D_8011B1B8[] = { + { -40, 0 }, + { 100, 4 }, + { 60, 7 }, + { 13568, 9 }, +}; + +CameraModeValue D_8011B1C8[] = { + { -40, 0 }, + { 25, 4 }, + { 60, 7 }, + { 0, 9 }, +}; + +CameraModeValue D_8011B1D8[] = { + { -40, 0 }, { 50, 4 }, { 80, 5 }, { 60, 7 }, { 1, 9 }, +}; + +CameraModeValue D_8011B1EC[] = { + { -40, 0 }, + { 60, 7 }, + { 16128, 9 }, +}; + +CameraModeValue D_8011B1F8[] = { + { -40, 0 }, { 50, 4 }, { 80, 5 }, { 60, 7 }, { 4, 9 }, +}; + +CameraModeValue D_8011B20C[] = { + { 0, 9 }, +}; + +CameraModeValue D_8011B210[] = { + { 8192, 9 }, +}; + +CameraModeValue D_8011B214[] = { + { 60, 7 }, + { 0, 9 }, +}; + +CameraModeValue D_8011B21C[] = { + { 60, 7 }, + { 8192, 9 }, +}; + +CameraModeValue D_8011B224[] = { + { 30, 24 }, + { 0, 25 }, + { 4, 4 }, + { 13568, 9 }, +}; + +CameraModeValue D_8011B234[] = { + { -40, 0 }, + { 60, 7 }, + { 12800, 9 }, +}; + +CameraModeValue D_8011B240[] = { + { -5, 0 }, + { 60, 7 }, + { 12802, 9 }, +}; + +CameraModeValue D_8011B24C[] = { + { -5, 0 }, + { 60, 7 }, + { 12810, 9 }, +}; + +CameraModeValue D_8011B258[] = { + { 0, 0 }, { 2, 1 }, { 30, 2 }, { 10, 4 }, { 45, 7 }, { 12800, 9 }, +}; + +CameraModeValue D_8011B270[] = { + { 1, 9 }, +}; + +CameraModeValue D_8011B274[] = { + { -256, 9 }, +}; + +CameraModeValue D_8011B278[] = { + { -255, 9 }, +}; + +CameraModeValue D_8011B27C[] = { + { -40, 0 }, { 100, 4 }, { 80, 5 }, { 60, 7 }, { 0, 9 }, +}; + +CameraModeValue D_8011B290[] = { + { -40, 0 }, + { 60, 1 }, + { 60, 7 }, + { 2, 9 }, +}; + +CameraModeValue D_8011B2A0[] = { + { -30, 0 }, + { 45, 1 }, + { 100, 7 }, + { 8193, 9 }, +}; + +CameraModeValue D_8011B2B0[] = { + { 12800, 9 }, +}; + +CameraModeValue D_8011B2B4[] = { + { -50, 0 }, { 450, 1 }, { 40, 3 }, { 180, 10 }, { 5, 4 }, { 5, 5 }, + { 70, 7 }, { 30, 8 }, { 12, 9 }, { -50, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011B2E0[] = { + { 13569, 9 }, +}; + +CameraModeValue D_8011B2E4[] = { + { 60, 7 }, + { 30, 8 }, + { 12800, 9 }, +}; + +CameraModeValue D_8011B2F0[] = { + { 12818, 9 }, +}; + +CameraModeValue D_8011B2F4[] = { + { -50, 0 }, { 300, 1 }, { 300, 2 }, { 50, 3 }, { 20, 4 }, { 10, 5 }, { 50, 6 }, { 70, 7 }, { 40, 8 }, { 2, 9 }, +}; + +CameraModeValue D_8011B31C[] = { + { -50, 0 }, { 300, 1 }, { 10, 3 }, { 0, 10 }, { 5, 4 }, { 5, 5 }, + { 45, 7 }, { 50, 8 }, { 8202, 9 }, { -40, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011B348[] = { + { -50, 0 }, { 300, 1 }, { 300, 2 }, { 12, 4 }, { 35, 6 }, { 60, 7 }, { 40, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011B368[] = { + { -80, 0 }, { 300, 1 }, { 300, 2 }, { 60, 3 }, { 70, 7 }, { 30, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011B384[] = { + { -120, 0 }, { 300, 1 }, { 300, 2 }, { 70, 3 }, { 50, 7 }, { 30, 8 }, { 8192, 9 }, +}; + +CameraModeValue D_8011B3A0[] = { + { -20, 0 }, { 300, 1 }, { 350, 2 }, { 50, 3 }, { 100, 4 }, + { 10, 5 }, { 100, 6 }, { 70, 7 }, { 30, 8 }, { -4094, 9 }, +}; + +CameraModeValue D_8011B3C8[] = { + { -50, 0 }, { 200, 1 }, { 200, 2 }, { 20, 3 }, { 16, 4 }, { 10, 5 }, { 50, 6 }, { 60, 7 }, { 50, 8 }, { 2, 9 }, +}; + +CameraModeValue D_8011B3F0[] = { + { -50, 0 }, { 200, 1 }, { 40, 3 }, { 0, 10 }, { 5, 4 }, { 5, 5 }, + { 45, 7 }, { 50, 8 }, { 8202, 9 }, { -40, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011B41C[] = { + { -50, 0 }, { 150, 1 }, { 250, 2 }, { 12, 4 }, { 35, 6 }, { 60, 7 }, { 40, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011B43C[] = { + { -80, 0 }, { 200, 1 }, { 200, 2 }, { 40, 3 }, { 60, 7 }, { 30, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011B458[] = { + { -120, 0 }, { 200, 1 }, { 200, 2 }, { 60, 3 }, { 50, 7 }, { 30, 8 }, { 8192, 9 }, +}; + +CameraModeValue D_8011B474[] = { + { -20, 0 }, { 200, 1 }, { 250, 2 }, { 20, 3 }, { 100, 4 }, + { 10, 5 }, { 100, 6 }, { 60, 7 }, { 30, 8 }, { -4094, 9 }, +}; + +CameraModeValue D_8011B49C[] = { + { -30, 0 }, + { 60, 7 }, + { 266, 9 }, +}; + +CameraModeValue D_8011B4A8[] = { + { -20, 0 }, + { 150, 1 }, + { 60, 7 }, + { 528, 9 }, +}; + +CameraModeValue D_8011B4B8[] = { + { 0, 0 }, { 400, 1 }, { 500, 2 }, { 35, 3 }, { 14, 4 }, { 5, 5 }, { 20, 6 }, { 60, 7 }, { 40, 8 }, { 18, 9 }, +}; + +CameraModeValue D_8011B4E0[] = { + { -20, 0 }, { 250, 1 }, { 5, 13 }, { 10, 14 }, { 30, 15 }, { 20, 16 }, + { 25, 17 }, { 45, 7 }, { 60, 8 }, { 8194, 9 }, { -40, 11 }, { 25, 12 }, +}; + +CameraModeValue D_8011B510[] = { + { 0, 0 }, { 300, 1 }, { 500, 2 }, { 60, 3 }, { 8, 4 }, { 5, 5 }, { 60, 6 }, { 60, 7 }, { 30, 8 }, { 18, 9 }, +}; + +CameraModeValue D_8011B538[] = { + { -20, 0 }, { 500, 1 }, { 500, 2 }, { 80, 3 }, { 20, 4 }, { 10, 5 }, { 70, 6 }, { 70, 7 }, { 80, 8 }, { 18, 9 }, +}; + +CameraModeValue D_8011B560[] = { + { -20, 0 }, { 500, 1 }, { 80, 3 }, { 0, 10 }, { 5, 4 }, { 5, 5 }, + { 70, 7 }, { 80, 8 }, { 8218, 9 }, { -40, 11 }, { 40, 12 }, +}; + +CameraModeValue D_8011B58C[] = { + { -20, 0 }, { 500, 1 }, { 80, 3 }, { 0, 10 }, { 5, 4 }, { 5, 5 }, + { 60, 7 }, { 80, 8 }, { 8218, 9 }, { -40, 11 }, { 40, 12 }, +}; + +CameraModeValue D_8011B5B8[] = { + { -20, 0 }, { 500, 1 }, { 500, 2 }, { 80, 3 }, { 20, 4 }, { 10, 5 }, { 80, 6 }, { 60, 7 }, { 20, 8 }, { 18, 9 }, +}; + +CameraModeValue D_8011B5E0[] = { + { -20, 0 }, { 750, 1 }, { 750, 2 }, { 80, 3 }, { 20, 4 }, { 10, 5 }, { 70, 6 }, { 70, 7 }, { 80, 8 }, { 18, 9 }, +}; + +CameraModeValue D_8011B608[] = { + { -20, 0 }, { 750, 1 }, { 80, 3 }, { 0, 10 }, { 5, 4 }, { 5, 5 }, + { 70, 7 }, { 80, 8 }, { 8218, 9 }, { -40, 11 }, { 40, 12 }, +}; + +CameraModeValue D_8011B634[] = { + { -20, 0 }, { 750, 1 }, { 80, 3 }, { 0, 10 }, { 5, 4 }, { 5, 5 }, + { 70, 7 }, { 80, 8 }, { 8202, 9 }, { -40, 11 }, { 40, 12 }, +}; + +CameraModeValue D_8011B660[] = { + { -20, 0 }, { 750, 1 }, { 750, 2 }, { 80, 3 }, { 20, 4 }, { 10, 5 }, { 80, 6 }, { 70, 7 }, { 20, 8 }, { 18, 9 }, +}; + +CameraModeValue D_8011B688[] = { + { -20, 0 }, { 500, 1 }, { 500, 2 }, { 80, 3 }, { 20, 4 }, { 10, 5 }, { 70, 6 }, { 70, 7 }, { 80, 8 }, { 2, 9 }, +}; + +CameraModeValue D_8011B6B0[] = { + { -20, 0 }, { 500, 1 }, { 80, 3 }, { 0, 10 }, { 5, 4 }, { 5, 5 }, + { 70, 7 }, { 80, 8 }, { 8202, 9 }, { -40, 11 }, { 40, 12 }, +}; + +CameraModeValue D_8011B6DC[] = { + { -20, 0 }, { 500, 1 }, { 80, 3 }, { 0, 10 }, { 5, 4 }, { 5, 5 }, + { 60, 7 }, { 80, 8 }, { 8202, 9 }, { -40, 11 }, { 40, 12 }, +}; + +CameraModeValue D_8011B708[] = { + { -20, 0 }, { 500, 1 }, { 500, 2 }, { 80, 3 }, { 20, 4 }, { 10, 5 }, { 80, 6 }, { 60, 7 }, { 20, 8 }, { 2, 9 }, +}; + +CameraModeValue D_8011B730[] = { + { -30, 0 }, { 120, 1 }, { -10, 3 }, { 170, 10 }, { 0, 21 }, { 60, 7 }, { 9474, 9 }, { 25, 4 }, { 6, 22 }, +}; + +CameraModeValue D_8011B754[] = { + { 20, 4 }, + { 12800, 9 }, +}; + +CameraModeValue D_8011B75C[] = { + { -20, 0 }, { 200, 1 }, { 300, 2 }, { 10, 3 }, { 12, 4 }, { 10, 5 }, { 35, 6 }, { 60, 7 }, { 60, 8 }, { 2, 9 }, +}; + +CameraModeValue D_8011B784[] = { + { 0, 0 }, { 200, 1 }, { 300, 2 }, { 20, 3 }, { 12, 4 }, { 10, 5 }, { 35, 6 }, { 55, 7 }, { 60, 8 }, { 3842, 9 }, +}; + +CameraModeValue D_8011B7AC[] = { + { -20, 0 }, { 250, 1 }, { 0, 3 }, { 0, 10 }, { 5, 4 }, { 5, 5 }, + { 45, 7 }, { 50, 8 }, { 12042, 9 }, { -40, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011B7D8[] = { + { -20, 0 }, { 250, 1 }, { 0, 13 }, { 80, 14 }, { 0, 15 }, { 0, 16 }, + { 25, 17 }, { 55, 7 }, { 80, 8 }, { 12034, 9 }, { -40, 11 }, { 25, 12 }, +}; + +CameraModeValue D_8011B808[] = { + { -30, 0 }, { 70, 1 }, { 200, 2 }, { 40, 13 }, { 10, 14 }, { 0, 15 }, + { 5, 16 }, { 70, 17 }, { 45, 7 }, { 50, 8 }, { 10, 4 }, { 16160, 9 }, +}; + +CameraModeValue D_8011B838[] = { + { 0, 0 }, { 5, 1 }, { 50, 2 }, { 10, 4 }, { 0, 19 }, { 0, 20 }, { 0, 21 }, { 45, 7 }, { 3840, 9 }, +}; + +CameraModeValue D_8011B85C[] = { + { -20, 0 }, { 200, 1 }, { 300, 2 }, { 12, 4 }, { 35, 6 }, { 60, 7 }, { 40, 8 }, { 3840, 9 }, +}; + +CameraModeValue D_8011B87C[] = { + { -20, 0 }, { 200, 1 }, { 300, 2 }, { 15, 4 }, { 80, 6 }, { 60, 7 }, { 20, 8 }, { 3840, 9 }, +}; + +CameraModeValue D_8011B89C[] = { + { -80, 0 }, { 200, 1 }, { 300, 2 }, { 40, 3 }, { 60, 7 }, { 10, 8 }, { 3840, 9 }, +}; + +CameraModeValue D_8011B8B8[] = { + { -120, 0 }, { 300, 1 }, { 300, 2 }, { 70, 3 }, { 45, 7 }, { 10, 8 }, { 12032, 9 }, +}; + +CameraModeValue D_8011B8D4[] = { + { 16128, 9 }, +}; + +CameraModeValue D_8011B8D8[] = { + { 30, 0 }, { 200, 1 }, { 300, 2 }, { -20, 3 }, { 15, 4 }, { 5, 26 }, { 50, 6 }, { 70, 7 }, { 70, 8 }, { 3, 9 }, +}; + +CameraModeValue D_8011B900[] = { + { -30, 0 }, { 160, 1 }, { 10, 13 }, { 10, 14 }, { 0, 15 }, { 0, 16 }, + { 70, 17 }, { 60, 7 }, { 40, 8 }, { 8194, 9 }, { -50, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011B930[] = { + { -20, 0 }, { 350, 1 }, { 350, 2 }, { 20, 3 }, { 15, 4 }, { 5, 5 }, { 30, 6 }, { 60, 7 }, { 60, 8 }, { 3, 9 }, +}; + +CameraModeValue D_8011B958[] = { + { -20, 0 }, { 200, 1 }, { 0, 3 }, { 0, 10 }, { 5, 4 }, { 5, 5 }, + { 45, 7 }, { 50, 8 }, { 8202, 9 }, { -40, 11 }, { 20, 12 }, +}; + +CameraModeValue D_8011B984[] = { + { -20, 0 }, { 180, 1 }, { 10, 13 }, { 80, 14 }, { -10, 15 }, { 10, 16 }, + { 25, 17 }, { 45, 7 }, { 80, 8 }, { 8194, 9 }, { -40, 11 }, { 25, 12 }, +}; + +CameraModeValue D_8011B9B4[] = { + { -20, 0 }, { 350, 1 }, { 350, 2 }, { 10, 4 }, { 50, 6 }, { 60, 7 }, { 40, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011B9D4[] = { + { -20, 0 }, { 350, 1 }, { 350, 2 }, { 15, 4 }, { 80, 6 }, { 60, 7 }, { 20, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011B9F4[] = { + { -40, 0 }, { 350, 1 }, { 350, 2 }, { 20, 18 }, { 5, 4 }, { 5, 5 }, { 60, 7 }, { 40, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011BA18[] = { + { -40, 0 }, { 350, 1 }, { 350, 2 }, { 20, 18 }, { 999, 4 }, { 5, 5 }, { 60, 7 }, { 40, 8 }, { 8198, 9 }, +}; + +CameraModeValue D_8011BA3C[] = { + { -50, 0 }, { 350, 1 }, { 350, 2 }, { 40, 3 }, { 60, 7 }, { 10, 8 }, { 0, 9 }, +}; + +CameraModeValue D_8011BA58[] = { + { -100, 0 }, { 350, 1 }, { 350, 2 }, { 70, 3 }, { 45, 7 }, { 10, 8 }, { 8192, 9 }, +}; + +CameraModeValue D_8011BA74[] = { + { -10, 0 }, { 350, 1 }, { 350, 2 }, { 20, 3 }, { 100, 4 }, { 5, 5 }, { 100, 6 }, { 60, 7 }, { 5, 8 }, { -4093, 9 }, +}; + +CameraModeValue D_8011BA9C[] = { + { 0, 0 }, { 280, 1 }, { 25, 3 }, { 0, 10 }, { 5, 4 }, { 5, 5 }, + { 70, 7 }, { 30, 8 }, { 8298, 9 }, { -20, 11 }, { 30, 12 }, +}; + +CameraModeValue D_8011BAC8[] = { + { -10, 0 }, { 280, 1 }, { 320, 2 }, { -8, 3 }, { 20, 4 }, { 10, 5 }, { 80, 6 }, { 60, 7 }, { 80, 8 }, { 2, 9 }, +}; + +CameraModeValue D_8011BAF0[] = { + { -20, 0 }, { 180, 1 }, { 200, 2 }, { 35, 13 }, { 45, 14 }, { 0, 15 }, { -5, 16 }, + { 20, 17 }, { 50, 7 }, { 50, 8 }, { 8193, 9 }, { -50, 11 }, { 30, 12 }, +}; + +CameraModeValue D_8011BB24[] = { + { -80, 0 }, { 200, 1 }, { 250, 2 }, { 30, 13 }, { 10, 14 }, { -8, 15 }, + { -8, 16 }, { 30, 17 }, { 50, 7 }, { 50, 8 }, { 10, 4 }, { 13600, 9 }, +}; + +CameraModeValue D_8011BB54[] = { + { -30, 0 }, { 70, 1 }, { 200, 2 }, { 40, 13 }, { 10, 14 }, { 0, 15 }, + { 5, 16 }, { 70, 17 }, { 45, 7 }, { 50, 8 }, { 10, 4 }, { 13728, 9 }, +}; + +CameraMode D_8011BB84[] = { + { 2, 10, D_8011A3A0 }, { 7, 11, D_8011A3C8 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011A458 }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 22, 8, D_8011A5A4 }, { 42, 7, D_8011A5C4 }, { 42, 7, D_8011A5E0 }, + { 22, 8, D_8011A5FC }, { 30, 7, D_8011A61C }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011BC2C[] = { + { 2, 10, D_8011A6C0 }, { 7, 11, D_8011A6E8 }, { 12, 13, D_8011A714 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011A748 }, { 23, 9, D_8011A7D8 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A778 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A7FC }, { 22, 8, D_8011A798 }, { 42, 7, D_8011A83C }, { 42, 7, D_8011A858 }, + { 22, 8, D_8011A7B8 }, { 30, 7, D_8011A820 }, { 2, 10, D_8011A874 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011BCD4[] = { + { 2, 10, D_8011A89C }, { 7, 11, D_8011A8C4 }, { 12, 13, D_8011A8F0 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011A924 }, { 23, 9, D_8011A994 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A778 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A9B8 }, { 22, 8, D_8011A954 }, { 42, 7, D_8011A9F8 }, { 42, 7, D_8011AA14 }, + { 22, 8, D_8011A974 }, { 30, 7, D_8011A9DC }, { 2, 10, D_8011AA30 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011BD7C[] = { + { 2, 10, D_8011AA58 }, { 7, 11, D_8011A8C4 }, { 12, 13, D_8011A714 }, { 14, 12, D_8011AA80 }, + { 27, 12, D_8011A924 }, { 23, 9, D_8011AAF0 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A778 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011AB14 }, { 22, 8, D_8011AAB0 }, { 42, 7, D_8011AB54 }, { 42, 7, D_8011AB70 }, + { 22, 8, D_8011AAD0 }, { 30, 7, D_8011AB38 }, { 2, 10, D_8011AB8C }, { 7, 11, D_8011ABB4 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011BE24[] = { + { 24, 10, D_8011ABE0 }, { 7, 11, D_8011AC08 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011AC34 }, + { 27, 12, D_8011A458 }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 24, 10, D_8011AC64 }, { 0, 0, NULL }, + { 23, 9, D_8011A580 }, { 22, 8, D_8011A5A4 }, { 42, 7, D_8011A5C4 }, { 42, 7, D_8011A5E0 }, + { 22, 8, D_8011A5A4 }, { 30, 7, D_8011A61C }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, +}; + +// HORSE0 0x8500018F (10000101000000000000000110001111) +CameraMode D_8011BEC4[] = { + { 4, 9, D_8011AC8C }, { 4, 9, D_8011ACB0 }, { 12, 13, D_8011ACF8 }, { 14, 12, D_8011AD2C }, { 0, 0, NULL }, + { 0, 0, NULL }, { 0, 0, NULL }, { 19, 9, D_8011ACD4 }, { 19, 9, D_8011A4F4 }, +}; + +CameraMode D_8011BF0C[] = { + { 2, 10, D_8011AD5C }, { 7, 11, D_8011A3C8 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011AD84 }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 22, 8, D_8011A5A4 }, { 42, 7, D_8011A5C4 }, { 42, 7, D_8011A5E0 }, + { 22, 8, D_8011A5A4 }, { 30, 7, D_8011A9DC }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011BFB4[] = { + { 2, 10, D_8011ADB4 }, { 7, 11, D_8011A3C8 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011ADDC }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 22, 8, D_8011A5A4 }, { 42, 7, D_8011A5C4 }, { 42, 7, D_8011A5E0 }, + { 22, 8, D_8011A5A4 }, { 30, 7, D_8011A61C }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011C05C[] = { + { 2, 10, D_8011AE0C }, { 7, 11, D_8011A3C8 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011AE34 }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 22, 8, D_8011A5A4 }, { 42, 7, D_8011A5C4 }, { 42, 7, D_8011A5E0 }, + { 22, 8, D_8011A5A4 }, { 30, 7, D_8011A61C }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011C104[] = { + { 2, 10, D_8011AE64 }, { 7, 11, D_8011A3C8 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011AE8C }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 22, 8, D_8011A5A4 }, { 42, 7, D_8011A5C4 }, { 42, 7, D_8011A5E0 }, + { 22, 8, D_8011A5A4 }, { 30, 7, D_8011A61C }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011C1AC[] = { + { 2, 10, D_8011AEBC }, { 7, 11, D_8011A3C8 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011AEE4 }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 22, 8, D_8011A5A4 }, { 42, 7, D_8011A5C4 }, { 42, 7, D_8011A5E0 }, + { 22, 8, D_8011A5A4 }, { 30, 7, D_8011A61C }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011C254[] = { + { 2, 10, D_8011AF14 }, { 7, 11, D_8011A3C8 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011AF3C }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 2, 10, D_8011AF6C }, { 42, 7, D_8011A5C4 }, { 42, 7, D_8011A5E0 }, + { 2, 10, D_8011AF6C }, { 30, 7, D_8011A61C }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011C2FC[] = { + { 2, 10, D_8011AF94 }, { 7, 11, D_8011A3C8 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011AFBC }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 22, 8, D_8011A5A4 }, { 42, 7, D_8011A5C4 }, { 42, 7, D_8011A5E0 }, + { 22, 8, D_8011A5A4 }, { 30, 7, D_8011A61C }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011C3A4[] = { + { 2, 10, D_8011AFEC }, { 7, 11, D_8011A3C8 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011B014 }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 22, 8, D_8011A5A4 }, { 42, 7, D_8011A5C4 }, { 42, 7, D_8011A5E0 }, + { 22, 8, D_8011A5A4 }, { 30, 7, D_8011A61C }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011C44C[] = { + { 2, 10, D_8011B044 }, { 7, 11, D_8011A3C8 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011B014 }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 22, 8, D_8011A5A4 }, { 42, 7, D_8011A5C4 }, { 42, 7, D_8011A5E0 }, + { 22, 8, D_8011A5A4 }, { 30, 7, D_8011A61C }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011C4F4[] = { + { 2, 10, D_8011B06C }, { 7, 11, D_8011A3C8 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011AE8C }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 22, 8, D_8011A5A4 }, { 42, 7, D_8011A5C4 }, { 42, 7, D_8011A5E0 }, + { 22, 8, D_8011A5A4 }, { 30, 7, D_8011B094 }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011C59C[] = { + { 2, 10, D_8011B0B0 }, { 7, 11, D_8011A3C8 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011B0D8 }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 22, 8, D_8011A5A4 }, { 42, 7, D_8011A5C4 }, { 42, 7, D_8011A5E0 }, + { 22, 8, D_8011A5A4 }, { 30, 7, D_8011A61C }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011C644[] = { + { 3, 9, D_8011B108 }, { 7, 11, D_8011A3C8 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011A458 }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 3, 9, D_8011B12C }, { 42, 7, D_8011A5C4 }, { 42, 7, D_8011A5E0 }, + { 22, 8, D_8011A5A4 }, { 30, 7, D_8011A61C }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011C6EC[] = { + { 3, 9, D_8011B150 }, { 7, 11, D_8011A3C8 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011A458 }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 3, 9, D_8011B174 }, { 42, 7, D_8011A5C4 }, { 42, 7, D_8011A5E0 }, + { 22, 8, D_8011A5A4 }, { 30, 7, D_8011A61C }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011C794[] = { + { 32, 4, D_8011B198 }, + { 0, 0, NULL }, + { 32, 4, D_8011B1A8 }, + { 32, 4, D_8011B1B8 }, +}; + +CameraMode D_8011C7B4[] = { + { 32, 4, D_8011B1C8 }, +}; + +CameraMode D_8011C7BC[] = { + { 33, 5, D_8011B1D8 }, +}; + +CameraMode D_8011C7C4[] = { + { 40, 3, D_8011B1EC }, +}; + +CameraMode D_8011C7CC[] = { + { 35, 5, D_8011B1F8 }, { 7, 11, D_8011A3C8 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011A748 }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 0, 0, NULL }, { 0, 0, NULL }, { 0, 0, NULL }, + { 0, 0, NULL }, { 30, 7, D_8011A61C }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011C874[] = { + { 34, 1, D_8011B20C }, + { 0, 0, NULL }, + { 34, 1, D_8011B210 }, + { 34, 1, D_8011B210 }, +}; + +CameraMode D_8011C894[] = { + { 48, 2, D_8011B214 }, + { 0, 0, NULL }, + { 48, 2, D_8011B21C }, + { 11, 4, D_8011B224 }, +}; + +CameraMode D_8011C8B4[] = { + { 67, 1, D_8011B20C }, +}; + +CameraMode D_8011C8BC[] = { + { 44, 3, D_8011B234 }, +}; + +CameraMode D_8011C8C4[] = { + { 70, 3, D_8011B240 }, + { 70, 3, D_8011B24C }, +}; + +CameraMode D_8011C8D4[] = { + { 20, 6, D_8011B258 }, +}; + +CameraMode D_8011C8DC[] = { + { 41, 1, D_8011B20C }, +}; + +CameraMode D_8011C8E4[] = { + { 41, 1, D_8011B270 }, +}; + +CameraMode D_8011C8EC[] = { + { 47, 1, D_8011B274 }, +}; + +CameraMode D_8011C8F4[] = { + { 47, 1, D_8011B278 }, +}; + +CameraMode D_8011C8FC[] = { + { 33, 5, D_8011B27C }, +}; + +CameraMode D_8011C904[] = { + { 43, 4, D_8011B290 }, + { 43, 4, D_8011B2A0 }, +}; + +CameraMode D_8011C914[] = { + { 52, 1, D_8011B2B0 }, +}; + +CameraMode D_8011C91C[] = { + { 53, 1, D_8011B2B0 }, +}; + +CameraMode D_8011C924[] = { + { 7, 11, D_8011B2B4 }, + { 0, 0, NULL }, + { 0, 0, NULL }, + { 9, 1, D_8011B2E0 }, +}; + +CameraMode D_8011C944[] = { + { 54, 3, D_8011B2E4 }, +}; + +CameraMode D_8011C94C[] = { + { 55, 3, D_8011B2E4 }, +}; + +CameraMode D_8011C954[] = { + { 60, 1, D_8011B2F0 }, +}; + +CameraMode D_8011C95C[] = { + { 56, 1, D_8011B2B0 }, +}; + +CameraMode D_8011C964[] = { + { 2, 10, D_8011B2F4 }, { 7, 11, D_8011B31C }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011A748 }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 22, 8, D_8011B348 }, { 42, 7, D_8011B368 }, { 42, 7, D_8011B384 }, + { 22, 8, D_8011A5A4 }, { 30, 7, D_8011A61C }, { 2, 10, D_8011B3A0 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011CA0C[] = { + { 2, 10, D_8011B3C8 }, { 7, 11, D_8011B3F0 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011A748 }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 22, 8, D_8011B41C }, { 42, 7, D_8011B43C }, { 42, 7, D_8011B458 }, + { 22, 8, D_8011A5A4 }, { 30, 7, D_8011A61C }, { 2, 10, D_8011B474 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011CAB4[] = { + { 70, 3, D_8011B49C }, +}; + +CameraMode D_8011CABC[] = { + { 43, 4, D_8011B4A8 }, +}; + +CameraMode D_8011CAC4[] = { + { 68, 1, D_8011B20C }, +}; + +CameraMode D_8011CACC[] = { + { 65, 1, D_8011B2B0 }, +}; + +CameraMode D_8011CAD4[] = { + { 46, 1, D_8011B2B0 }, +}; + +CameraMode D_8011CADC[] = { + { 57, 1, D_8011B2B0 }, +}; + +CameraMode D_8011CAE4[] = { + { 2, 10, D_8011B4B8 }, { 7, 11, D_8011A8C4 }, { 12, 13, D_8011A8F0 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011B4E0 }, { 23, 9, D_8011A994 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A778 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A9B8 }, { 22, 8, D_8011A954 }, { 42, 7, D_8011A9F8 }, { 42, 7, D_8011AA14 }, + { 22, 8, D_8011A974 }, { 30, 7, D_8011A9DC }, { 2, 10, D_8011B510 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011CB8C[] = { + { 2, 10, D_8011B538 }, { 7, 11, D_8011B560 }, { 0, 0, NULL }, + { 0, 0, NULL }, { 7, 11, D_8011B58C }, { 2, 10, D_8011B5B8 }, +}; + +CameraMode D_8011CBBC[] = { + { 2, 10, D_8011B5E0 }, { 7, 11, D_8011B608 }, { 0, 0, NULL }, + { 0, 0, NULL }, { 7, 11, D_8011B634 }, { 2, 10, D_8011B660 }, +}; + +CameraMode D_8011CBEC[] = { + { 2, 10, D_8011B688 }, { 7, 11, D_8011B6B0 }, { 0, 0, NULL }, + { 0, 0, NULL }, { 7, 11, D_8011B6DC }, { 2, 10, D_8011B708 }, +}; + +CameraMode D_8011CC1C[] = { + { 15, 9, D_8011B730 }, +}; + +CameraMode D_8011CC24[] = { + { 61, 2, D_8011B754 }, +}; + +CameraMode D_8011CC2C[] = { + { 2, 10, D_8011B75C }, { 7, 11, D_8011A3C8 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011A748 }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 22, 8, D_8011A5A4 }, { 42, 7, D_8011A5C4 }, { 42, 7, D_8011A5E0 }, + { 22, 8, D_8011A5A4 }, { 30, 7, D_8011A61C }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011CCD4[] = { + { 2, 10, D_8011B784 }, { 7, 11, D_8011B7AC }, { 27, 12, D_8011B7D8 }, { 14, 12, D_8011B808 }, + { 27, 12, D_8011B7D8 }, { 0, 0, NULL }, { 19, 9, D_8011B838 }, { 0, 0, NULL }, + { 0, 0, NULL }, { 0, 0, NULL }, { 0, 0, NULL }, { 0, 0, NULL }, + { 0, 0, NULL }, { 22, 8, D_8011B85C }, { 42, 7, D_8011B89C }, { 42, 7, D_8011B8B8 }, + { 22, 8, D_8011B87C }, +}; + +CameraMode D_8011CD5C[] = { + { 50, 1, D_8011B8D4 }, +}; + +CameraMode D_8011CD64[] = { + { 2, 10, D_8011B8D8 }, { 7, 11, D_8011A3C8 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011B900 }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 22, 8, D_8011A5A4 }, { 42, 7, D_8011A5C4 }, { 42, 7, D_8011A5E0 }, + { 22, 8, D_8011A5A4 }, { 30, 7, D_8011A61C }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011CE0C[] = { + { 2, 10, D_8011B930 }, { 7, 11, D_8011B958 }, { 12, 13, D_8011A8F0 }, { 14, 12, D_8011A428 }, + { 27, 12, D_8011B984 }, { 23, 9, D_8011B9F4 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A778 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011BA18 }, { 22, 8, D_8011B9B4 }, { 42, 7, D_8011BA3C }, { 42, 7, D_8011BA58 }, + { 22, 8, D_8011B9D4 }, { 30, 7, D_8011A61C }, { 2, 10, D_8011BA74 }, { 7, 11, D_8011BA9C }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011CEB4[] = { + { 2, 10, D_8011BAC8 }, { 7, 11, D_8011A3C8 }, { 12, 13, D_8011BAF0 }, { 14, 12, D_8011BB24 }, + { 27, 12, D_8011A458 }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 22, 8, D_8011A5A4 }, { 42, 7, D_8011A5C4 }, { 42, 7, D_8011A5E0 }, + { 22, 8, D_8011A5A4 }, { 30, 7, D_8011A61C }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraMode D_8011CF5C[] = { + { 35, 5, D_8011B1F8 }, { 0, 0, NULL }, { 35, 5, D_8011B1F8 }, { 14, 12, D_8011A428 }, + { 0, 0, NULL }, { 0, 0, NULL }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 0, 0, NULL }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, +}; + +CameraMode D_8011CFBC[] = { + { 2, 10, D_8011B75C }, { 7, 11, D_8011A3C8 }, { 12, 13, D_8011A3F4 }, { 14, 12, D_8011BB54 }, + { 27, 12, D_8011A748 }, { 23, 9, D_8011A488 }, { 19, 9, D_8011A4AC }, { 19, 9, D_8011A4D0 }, + { 19, 9, D_8011A4F4 }, { 66, 8, D_8011A518 }, { 19, 9, D_8011A538 }, { 19, 9, D_8011A55C }, + { 23, 9, D_8011A580 }, { 22, 8, D_8011A5A4 }, { 42, 7, D_8011A5C4 }, { 42, 7, D_8011A5E0 }, + { 22, 8, D_8011A5A4 }, { 30, 7, D_8011A61C }, { 2, 10, D_8011A638 }, { 7, 11, D_8011A660 }, + { 12, 13, D_8011A68C }, +}; + +CameraSetting sCameraSettings[] = { + { { 0x00000000 }, NULL }, { { 0x051FFFFF }, D_8011BB84 }, { { 0x051FFFFF }, D_8011BC2C }, + { { 0x051FFFFF }, D_8011BCD4 }, { { 0x051FFFFF }, D_8011BD7C }, { { 0x050FF7FF }, D_8011BE24 }, + { { 0x8500018F }, D_8011BEC4 }, { { 0x051FFFFF }, D_8011BF0C }, { { 0x051FFFFF }, D_8011BFB4 }, + { { 0x051FFFFF }, D_8011C05C }, { { 0x051FFFFF }, D_8011C104 }, { { 0x051FFFFF }, D_8011C1AC }, + { { 0x051FFFFF }, D_8011C254 }, { { 0x051FFFFF }, D_8011C2FC }, { { 0x051FFFFF }, D_8011C3A4 }, + { { 0x051FFFFF }, D_8011C44C }, { { 0x051FFFFF }, D_8011C4F4 }, { { 0x051FFFFF }, D_8011C59C }, + { { 0x851FFFFF }, D_8011C644 }, { { 0x851FFFFF }, D_8011C6EC }, { { 0x8500000D }, D_8011C794 }, + { { 0x85000001 }, D_8011C7B4 }, { { 0x85000001 }, D_8011C7BC }, { { 0x85000001 }, D_8011C7C4 }, + { { 0x851E1FFF }, D_8011C7CC }, { { 0x8C00000D }, D_8011C874 }, { { 0x8C00000D }, D_8011C894 }, + { { 0x8C000001 }, D_8011C8B4 }, { { 0xC5000001 }, D_8011C8BC }, { { 0xC5000003 }, D_8011C8C4 }, + { { 0xC5000001 }, D_8011C8D4 }, { { 0xC5000001 }, D_8011C8DC }, { { 0xC5000001 }, D_8011C8E4 }, + { { 0x05000001 }, D_8011C8EC }, { { 0x05000001 }, D_8011C8F4 }, { { 0x85000001 }, D_8011C8FC }, + { { 0x05000003 }, D_8011C904 }, { { 0xCE000001 }, D_8011C914 }, { { 0x4E000001 }, D_8011C91C }, + { { 0x05000009 }, D_8011C924 }, { { 0x45000001 }, D_8011C944 }, { { 0x45000001 }, D_8011C94C }, + { { 0x45000001 }, D_8011C954 }, { { 0x45000001 }, D_8011C95C }, { { 0x451FFFFF }, D_8011C964 }, + { { 0x451FFFFF }, D_8011CA0C }, { { 0xC5000001 }, D_8011CAB4 }, { { 0x45000001 }, D_8011CABC }, + { { 0x05000001 }, D_8011CAC4 }, { { 0x45000001 }, D_8011CACC }, { { 0x45000001 }, D_8011CAD4 }, + { { 0x45000001 }, D_8011CADC }, { { 0x451FFFFF }, D_8011CAE4 }, { { 0x05000033 }, D_8011CB8C }, + { { 0x05000033 }, D_8011CBBC }, { { 0x05000033 }, D_8011CBEC }, { { 0x4A000001 }, D_8011CC1C }, + { { 0x05000001 }, D_8011CC24 }, { { 0x051FFFFF }, D_8011CC2C }, { { 0x0501E05F }, D_8011CCD4 }, + { { 0x45000001 }, D_8011CD5C }, { { 0x051FFFFF }, D_8011CD64 }, { { 0x051FFFFF }, D_8011CE0C }, + { { 0x051FFFFF }, D_8011CEB4 }, { { 0xC5000ECD }, D_8011CF5C }, { { 0x051FFFFF }, D_8011CFBC }, +}; + +s32 Camera_Normal0(Camera* camera); +s32 Camera_Normal1(Camera* camera); +s32 Camera_Normal2(Camera* camera); +s32 Camera_Normal3(Camera* camera); +s32 Camera_Normal4(Camera* camera); +s32 Camera_Parallel0(Camera* camera); +s32 Camera_Parallel1(Camera* camera); +s32 Camera_Parallel2(Camera* camera); +void Camera_Parallel3(Camera* camera); +s32 Camera_Parallel4(Camera* camera); +s32 Camera_KeepOn0(Camera* camera); +s32 Camera_KeepOn1(Camera* camera); +s32 Camera_KeepOn2(Camera* camera); +s32 Camera_KeepOn3(Camera* camera); +s32 Camera_KeepOn4(Camera* camera); +s32 Camera_Subj0(Camera* camera); +s32 Camera_Subj1(Camera* camera); +s32 Camera_Subj2(Camera* camera); +s32 Camera_Subj3(Camera* camera); +s32 Camera_Subj4(Camera* camera); +s32 Camera_Jump0(Camera* camera); +s32 Camera_Jump1(Camera* camera); +s32 Camera_Jump2(Camera* camera); +s32 Camera_Jump3(Camera* camera); +s32 Camera_Jump4(Camera* camera); +s32 Camera_Battle0(Camera* camera); +s32 Camera_Battle1(Camera* camera); +s32 Camera_Battle2(Camera* camera); +s32 Camera_Battle3(Camera* camera); +s32 Camera_Battle4(Camera* camera); +s32 Camera_Fixed0(Camera* camera); +s32 Camera_Fixed1(Camera* camera); +s32 Camera_Fixed2(Camera* camera); +s32 Camera_Fixed3(Camera* camera); +s32 Camera_Fixed4(Camera* camera); +s32 Camera_Data0(Camera* camera); +s32 Camera_Data1(Camera* camera); +s32 Camera_Data2(Camera* camera); +s32 Camera_Data3(Camera* camera); +s32 Camera_Data4(Camera* camera); +s32 Camera_Unique0(Camera* camera); +s32 Camera_Unique1(Camera* camera); +s32 Camera_Unique2(Camera* camera); +s32 Camera_Unique3(Camera* camera); +s32 Camera_Unique4(Camera* camera); +s32 Camera_Unique5(Camera* camera); +s32 Camera_Unique6(Camera* camera); +s32 Camera_Unique7(Camera* camera); +s32 Camera_Unique8(Camera* camera); +s32 Camera_Unique9(Camera* camera); +s32 Camera_Demo0(Camera* camera); +s32 Camera_Demo1(Camera* camera); +s32 Camera_Demo2(Camera* camera); +s32 Camera_Demo3(Camera* camera); +s32 Camera_Demo4(Camera* camera); +s32 Camera_Demo5(Camera* camera); +s32 Camera_Demo6(Camera* camera); +void Camera_Demo7(Camera* camera); +s32 Camera_Demo8(Camera* camera); +s32 Camera_Demo9(Camera* camera); +s32 Camera_Special0(Camera* camera); +s32 Camera_Special1(Camera* camera); +s32 Camera_Special2(Camera* camera); +s32 Camera_Special3(Camera* camera); +s32 Camera_Special4(Camera* camera); +s32 Camera_Special5(Camera* camera); +s32 Camera_Special6(Camera* camera); +s32 Camera_Special7(Camera* camera); +s32 Camera_Special8(Camera* camera); +s32 Camera_Special9(Camera* camera); + +void* sCameraFunctions[] = { + NULL, + Camera_Normal0, + Camera_Normal1, + Camera_Normal2, + Camera_Normal3, + Camera_Normal4, + Camera_Parallel0, + Camera_Parallel1, + Camera_Parallel2, + Camera_Parallel3, + Camera_Parallel4, + Camera_KeepOn0, + Camera_KeepOn1, + Camera_KeepOn2, + Camera_KeepOn3, + Camera_KeepOn4, + Camera_Subj0, + Camera_Subj1, + Camera_Subj2, + Camera_Subj3, + Camera_Subj4, + Camera_Jump0, + Camera_Jump1, + Camera_Jump2, + Camera_Jump3, + Camera_Jump4, + Camera_Battle0, + Camera_Battle1, + Camera_Battle2, + Camera_Battle3, + Camera_Battle4, + Camera_Fixed0, + Camera_Fixed1, + Camera_Fixed2, + Camera_Fixed3, + Camera_Fixed4, + Camera_Data0, + Camera_Data1, + Camera_Data2, + Camera_Data3, + Camera_Data4, + Camera_Unique0, + Camera_Unique1, + Camera_Unique2, + Camera_Unique3, + Camera_Unique4, + Camera_Unique5, + Camera_Unique6, + Camera_Unique7, + Camera_Unique8, + Camera_Unique9, + Camera_Demo0, + Camera_Demo1, + Camera_Demo2, + Camera_Demo3, + Camera_Demo4, + Camera_Demo5, + Camera_Demo6, + Camera_Demo7, + Camera_Demo8, + Camera_Demo9, + Camera_Special0, + Camera_Special1, + Camera_Special2, + Camera_Special3, + Camera_Special4, + Camera_Special5, + Camera_Special6, + Camera_Special7, + Camera_Special8, + Camera_Special9, +}; + +s32 sInitRegs = 1; // 8011D390 + +UNK_TYPE D_8011D394 = 0; +s32 D_8011D398 = -1; +s16 D_8011D39C = 0; // size = 4 ? +u_D_8011D3A0 D_8011D3A0 = { { + 0x0000, + 0x0001, +} }; + +s32 D_8011D3A4 = 0x02; +s32 D_8011D3A8 = 0x20; +s32 D_8011D3AC = -1; + +s16 D_8011D3B0[] = { + 0x0AAA, 0xF556, 0x1555, 0xEAAB, 0x2AAA, 0xD556, 0x3FFF, 0xC001, 0x5555, 0xAAAB, 0x6AAA, 0x9556, 0x7FFF, 0x0000, +}; + +s16 D_8011D3CC[] = { + 0x0000, 0x02C6, 0x058C, 0x0000, 0x0000, 0xFD3A, 0x0000, 0x0852, 0x0000, 0x0000, 0x0B18, 0x02C6, 0xFA74, 0x0000, +}; + +s32 D_8011D3E8 = 0; // size = 8? +s32 D_8011D3EC = 0; +s32 D_8011D3F0 = 0; + +s32 D_8011D3F4 = -16; + +char sCameraFunctionNames[][8] = { + "NONE ", "NORM0()", "NORM1()", "NORM2()", "NORM3()", "NORM4()", "PARA0()", "PARA1()", "PARA2()", "PARA3()", + "PARA4()", "KEEP0()", "KEEP1()", "KEEP2()", "KEEP3()", "KEEP4()", "SUBJ0()", "SUBJ1()", "SUBJ2()", "SUBJ3()", + "SUBJ4()", "JUMP0()", "JUMP1()", "JUMP2()", "JUMP3()", "JUMP4()", "BATT0()", "BATT1()", "BATT2()", "BATT3()", + "BATT4()", "FIXD0()", "FIXD1()", "FIXD2()", "FIXD3()", "FIXD4()", "DATA0()", "DATA1()", "DATA2()", "DATA3()", + "DATA4()", "UNIQ0()", "UNIQ1()", "UNIQ2()", "UNIQ3()", "UNIQ4()", "UNIQ5()", "UNIQ6()", "UNIQ7()", "UNIQ8()", + "UNIQ9()", "DEMO0()", "DEMO1()", "DEMO2()", "DEMO3()", "DEMO4()", "DEMO5()", "DEMO6()", "DEMO7()", "DEMO8()", + "DEMO9()", "SPEC0()", "SPEC1()", "SPEC2()", "SPEC3()", "SPEC4()", "SPEC5()", "SPEC6()", "SPEC7()", "SPEC8()", + "SPEC9()", "", "", "", "", "", +}; + +u8 D_8011D658[] = { + 0x42, 0x48, 0x00, 0x00, 0xEE, 0x3A, 0xD5, 0x58, 0x42, 0x96, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, + 0x42, 0xA0, 0x00, 0x00, 0xEE, 0x3A, 0x80, 0x08, 0x41, 0x70, 0x00, 0x00, 0xEE, 0x3A, 0x80, 0x08, +}; + +u8 D_8011D678[] = { + 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x42, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, + 0xC0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, +}; + +s32 D_8011D6A8 = -200; + +u8 D_8011D6AC[] = { + 0x8F, 0xFF, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x3F, 0x80, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0xFF, 0x03, 0x03, +}; + +u8 D_8011D6D8[] = { + 0x00, 0x13, 0x00, 0x00, 0x42, 0x34, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xA0, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0xFF, + 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, + 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, +}; + +u8 D_8011D724[] = { + 0x8F, 0xFF, 0x24, 0x24, 0x00, 0x01, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, + 0xC1, 0xA0, 0x00, 0x00, 0x81, 0xFF, 0x21, 0x21, 0x00, 0x13, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x3F, 0x80, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x12, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x42, 0x70, + 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, + 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, +}; + +u8 D_8011D79C[] = { + 0xCF, 0xFF, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xC1, 0xFF, 0x03, 0x03, 0x00, 0x13, 0x00, 0x00, 0x42, 0x34, 0x00, 0x00, 0x3F, 0x80, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xC1, 0x20, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0xC1, 0xFF, 0x03, 0x03, 0x00, 0x09, 0x00, 0x00, 0x42, 0x70, + 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0xFF, 0x00, 0x00, 0x00, 0x01, + 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, + 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, +}; + +u8 D_8011D83C[] = { + 0x83, 0xFF, 0x21, 0x41, 0x00, 0x14, 0x00, 0x00, 0x42, 0x34, 0x00, 0x00, 0x3E, 0x4C, 0xCC, 0xCD, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x12, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, + 0x42, 0x70, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, + 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, +}; + +u8 D_8011D88C[] = { + 0x81, 0xFF, 0x03, 0x03, 0x00, 0x14, 0x00, 0x00, 0x42, 0x34, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, + 0x42, 0x70, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, + 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, +}; + +u8 D_8011D8DC[] = { + 0x8F, 0xFF, 0x04, 0x04, 0x00, 0x14, 0x00, 0x01, 0x42, 0x48, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, + 0xC2, 0xA0, 0x00, 0x00, 0x82, 0xFF, 0x21, 0x21, 0x00, 0x05, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x3F, 0x80, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, + 0x40, 0xA0, 0x00, 0x00, 0xC3, 0x48, 0x00, 0x00, 0x12, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x42, 0x70, + 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, + 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, +}; + +u8 D_8011D954[] = { + 0x0F, 0xFF, 0xC1, 0xC1, 0x00, 0x14, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x43, 0x7A, 0x00, 0x00, 0x83, 0xFF, 0x05, 0xB1, 0x00, 0x05, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x3D, 0xCC, + 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x41, 0x20, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x82, 0xFF, 0x21, 0x21, 0x00, 0x05, 0x00, 0x02, 0x42, 0x70, + 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0xC3, 0x16, 0x00, 0x00, 0x12, 0xFF, 0x00, 0x00, 0x00, 0x01, + 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, + 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, +}; + +u8 D_8011D9F4[] = { + 0x8F, 0xFF, 0x05, 0x04, 0x00, 0x14, 0x00, 0x02, 0x42, 0x70, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, + 0x43, 0x96, 0x00, 0x00, 0x82, 0xFF, 0x21, 0x21, 0x00, 0x05, 0x00, 0x02, 0x42, 0x70, 0x00, 0x00, 0x3F, 0x80, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x41, 0xA0, 0x00, 0x00, 0xC3, 0x16, 0x00, 0x00, 0x12, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x42, 0x70, + 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, + 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, +}; + +u8 D_8011DA6C[] = { + 0x45, 0x3E, 0xA0, 0x00, 0x44, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0xDB, 0x60, 0x00, + 0x45, 0x55, 0x70, 0x00, 0xC3, 0xBE, 0x00, 0x00, 0xC5, 0x43, 0x00, 0x00, 0x45, 0x45, 0x80, 0x00, + 0x43, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00, 0x43, 0x70, 0x00, 0x00, +}; + +u8 D_8011DA9C[] = { + 0x45, 0x45, 0x80, 0x00, 0x45, 0x06, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0xBD, 0x60, 0x00, + 0x45, 0x81, 0x10, 0x00, 0xC4, 0x50, 0xC0, 0x00, 0xC5, 0x3E, 0x00, 0x00, 0x45, 0x81, 0x38, 0x00, + 0x43, 0x66, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, 0xC2, 0x96, 0x00, 0x00, +}; + +u8 D_8011DACC[] = { + 0x44, 0xC4, 0x40, 0x00, 0x45, 0x66, 0x00, 0x00, 0x45, 0x67, 0x40, 0x00, 0x43, 0xC5, 0x80, 0x00, +}; + +u8 D_8011DADC[] = { + 0x43, 0xA0, 0x00, 0x00, 0x43, 0xA0, 0x00, 0x00, 0x43, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; + +u8 D_8011DAEC[] = { + 0xF8, 0x30, 0xFC, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; + +s16 D_8011DAFC[] = { + 1, 2, 58, 3, 4, 62, +}; + +s16 D_8011DB08 = 1008; + +s16 D_8011DB0C = 342; + +s32 D_8011DB10 = 0; + +s32 D_8011DB14 = 0; + +// BSS +extern GlobalContext* D_8015BD7C; +extern DbgCamera D_8015BD80; +extern Vec3f D_8015BD84; +extern Vec3f D_8015BD90; +extern Vec3f D_8015BD9C; +extern f32 D_8015BDC8; +extern Vec3s D_8015CE46; +extern CollisionPoly* D_8015CE4C; + +/*===============================================================*/ typedef struct { Vec3f unk_00; Vec3f unk_0C; @@ -17,15 +1738,6 @@ typedef struct { s32 unk_24; } struct_80043D18; -// names for this struct's values come from a debug function, may want to rename -typedef struct { - s8 code; - s8 z; - u16 T; - f32 zoom; - Vec3s pos; -} SplineData; // originally called SplinedatZ - f32 func_800437F0(f32 arg0, f32 arg1) { f32 percent = 0.4f; f32 ret = fabsf(arg1); @@ -41,70 +1753,70 @@ f32 func_800437F0(f32 arg0, f32 arg1) { return ret; } -f32 func_8004389C(f32 a, f32 b, f32 c, f32 d) { - f32 temp1 = a - b; +f32 func_8004389C(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { + f32 temp1 = arg0 - arg1; f32 temp2; f32 ret; - if (fabsf(temp1) >= d) { - temp2 = temp1 * c; - ret = b + temp2; + if (fabsf(temp1) >= arg3) { + temp2 = temp1 * arg2; + ret = arg1 + temp2; } else { - ret = a; + ret = arg0; } return ret; } -f32 func_800438DC(f32 a, f32 b, f32 c, f32 d) { - f32 temp1 = a - b; +f32 func_800438DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { + f32 temp1 = arg0 - arg1; f32 temp2; f32 ret; - if (fabsf(temp1) >= d) { - temp2 = temp1 * c; - ret = b + temp2; + if (fabsf(temp1) >= arg3) { + temp2 = temp1 * arg2; + ret = arg1 + temp2; } else { - ret = b; + ret = arg1; } return ret; } -s16 func_8004391C(s16 a, s16 b, f32 c, s16 d) { - s16 temp1 = a - b; +s16 func_8004391C(s16 arg0, s16 arg1, f32 arg2, s16 arg3) { + s16 temp1 = arg0 - arg1; s16 temp2; s32 ret; - if (ABS(temp1) >= d) { - temp2 = temp1 * c + 0.5f; - ret = b + temp2; + if (ABS(temp1) >= arg3) { + temp2 = temp1 * arg2 + 0.5f; + ret = arg1 + temp2; } else { - ret = a; + ret = arg0; } return ret; } - -s16 func_800439AC(s16 a, s16 b, f32 c, s16 d) { - s16 temp1 = a - b; +//*t = func_800439AC(sp4C.theta, *t, 0.4f, 0x7D0); +s16 func_800439AC(s16 arg0, s16 arg1, f32 arg2, s16 arg3) { + s16 temp1 = arg0 - arg1; s16 temp2; s32 ret; - if (ABS(temp1) >= d) { - temp2 = temp1 * c + 0.5f; - ret = b + temp2; + if (ABS(temp1) >= arg3) { + temp2 = temp1 * arg2 + 0.5f; + ret = arg1 + temp2; } else { - ret = b; + ret = arg1; } return ret; } -void func_80043A3C(Vec3f* a, Vec3f* b, f32 c, f32 d, f32 e) { - b->x = func_8004389C(a->x, b->x, d, e); - b->y = func_8004389C(a->y, b->y, c, e); - b->z = func_8004389C(a->z, b->z, d, e); +void func_80043A3C(Vec3f* arg0, Vec3f* arg1, f32 arg2, f32 arg3, f32 arg4) { + arg1->x = func_8004389C(arg0->x, arg1->x, arg3, arg4); + arg1->y = func_8004389C(arg0->y, arg1->y, arg2, arg4); + arg1->z = func_8004389C(arg0->z, arg1->z, arg3, arg4); } void func_80043ABC(Camera* camera) { @@ -125,41 +1837,41 @@ void func_80043B60(Camera* camera) { camera->unk_CC.z = 0.001f; } -Vec3f* func_80043BC4(Vec3f* a, Vec3s* b) { +Vec3f* func_80043BC4(Vec3f* arg0, Vec3s* arg1) { Vec3f sp4; - sp4.x = b->x; - sp4.y = b->y; - sp4.z = b->z; + sp4.x = arg1->x; + sp4.y = arg1->y; + sp4.z = arg1->z; - *a = sp4; - return a; + *arg0 = sp4; + return arg0; } -Vec3f* func_80043C28(Vec3f* a, Vec3f* b, VecSph* c) { +Vec3f* func_80043C28(Vec3f* arg0, Vec3f* arg1, VecSph* arg2) { Vec3f sp24, sp18; - func_8007C25C(&sp18, c); + func_8007C25C(&sp18, arg2); - sp24.x = b->x + sp18.x; - sp24.y = b->y + sp18.y; - sp24.z = b->z + sp18.z; + sp24.x = arg1->x + sp18.x; + sp24.y = arg1->y + sp18.y; + sp24.z = arg1->z + sp18.z; - *a = sp24; - return a; + *arg0 = sp24; + return arg0; } -Vec3f* func_80043CAC(Vec3f* a, Vec3f* b, Vec3f* c, f32 d) { +Vec3f* func_80043CAC(Vec3f* arg0, Vec3f* arg1, Vec3f* arg2, f32 arg3) { Vec3f sp4; - sp4.x = b->x + (c->x * d); - sp4.y = b->y + (c->y * d); - sp4.z = b->z + (c->z * d); + sp4.x = arg1->x + (arg2->x * arg3); + sp4.y = arg1->y + (arg2->y * arg3); + sp4.z = arg1->z + (arg2->z * arg3); - *a = sp4; - return a; + *arg0 = sp4; + return arg0; } -s32 func_80043D18(Camera* camera, Vec3f* b, struct_80043D18* c) { +s32 func_80043D18(Camera* camera, Vec3f* arg1, struct_80043D18* arg2) { CollisionContext* colCtx; Vec3f sp68, sp5C, sp50; f32 temp_ret; @@ -168,135 +1880,129 @@ s32 func_80043D18(Camera* camera, Vec3f* b, struct_80043D18* c) { VecSph sp3C; colCtx = &camera->globalCtx->colCtx; - func_8007C490(&sp3C, b, &c->unk_00); + func_8007C490(&sp3C, arg1, &arg2->unk_00); sp3C.r += 8.0f; - func_80043C28(&sp5C, b, &sp3C); + func_80043C28(&sp5C, arg1, &sp3C); - if (func_8003DD6C(colCtx, b, &sp5C, &sp68, &c->unk_18, 1, 1, 1, -1, &c->unk_24) == 0) { - func_8007C0F8(&sp50, b, &c->unk_00); + if (func_8003DD6C(colCtx, arg1, &sp5C, &sp68, &arg2->unk_18, 1, 1, 1, -1, &arg2->unk_24) == 0) { + func_8007C0F8(&sp50, arg1, &arg2->unk_00); - c->unk_0C.x = -sp50.x; - c->unk_0C.y = -sp50.y; - c->unk_0C.z = -sp50.z; + arg2->unk_0C.x = -sp50.x; + arg2->unk_0C.y = -sp50.y; + arg2->unk_0C.z = -sp50.z; - sp68 = c->unk_00; + sp68 = arg2->unk_00; sp68.y += 5.0f; temp_ret = func_8003CCA4(colCtx, &sp48, &sp44, &sp68); - if ((c->unk_00.y - temp_ret) > 5.0f) { - c->unk_00.x += c->unk_0C.x; - c->unk_00.y += c->unk_0C.y; - c->unk_00.z += c->unk_0C.z; + if ((arg2->unk_00.y - temp_ret) > 5.0f) { + arg2->unk_00.x += arg2->unk_0C.x; + arg2->unk_00.y += arg2->unk_0C.y; + arg2->unk_00.z += arg2->unk_0C.z; return 0; } - c->unk_18 = sp48; + arg2->unk_18 = sp48; sp68.y = temp_ret + 1.0f; - c->unk_24 = sp44; + arg2->unk_24 = sp44; } - c->unk_0C.x = c->unk_18->norm.x * (1.f / 32767); - c->unk_0C.y = c->unk_18->norm.y * (1.f / 32767); - c->unk_0C.z = c->unk_18->norm.z * (1.f / 32767); - c->unk_00.x = c->unk_0C.x + sp68.x; - c->unk_00.y = c->unk_0C.y + sp68.y; - c->unk_00.z = c->unk_0C.z + sp68.z; + arg2->unk_0C.x = arg2->unk_18->norm.x * (1.f / 32767); + arg2->unk_0C.y = arg2->unk_18->norm.y * (1.f / 32767); + arg2->unk_0C.z = arg2->unk_18->norm.z * (1.f / 32767); + arg2->unk_00.x = arg2->unk_0C.x + sp68.x; + arg2->unk_00.y = arg2->unk_0C.y + sp68.y; + arg2->unk_00.z = arg2->unk_0C.z + sp68.z; return sp44 + 1; } -void func_80043F34(Camera* camera, Vec3f* b, Vec3f* c) { +void func_80043F34(Camera* camera, Vec3f* arg1, Vec3f* arg2) { struct_80043D18 sp20; Vec3s unused; - sp20.unk_00 = *c; - func_80043D18(camera, b, &sp20); - *c = sp20.unk_00; + sp20.unk_00 = *arg2; + func_80043D18(camera, arg1, &sp20); + *arg2 = sp20.unk_00; } // 242 lines #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80043F94.s") -void func_80044340(Camera* camera, Vec3f* b, Vec3f* c) { +void func_80044340(Camera* camera, Vec3f* arg1, Vec3f* arg2) { struct_80043D18 sp20; Vec3s unused; - sp20.unk_00 = *c; - func_80043F94(camera, b, &sp20); - *c = sp20.unk_00; + sp20.unk_00 = *arg2; + func_80043F94(camera, arg1, &sp20); + *arg2 = sp20.unk_00; } -f32 func_80038B7C(); - -#ifdef NON_MATCHING -// ordering -s32 func_800443A0(Camera* camera, Vec3f* b, Vec3f* c) { - s32 sp4C; +s32 func_800443A0(Camera* camera, Vec3f* arg1, Vec3f* arg2) { + s32 pad; Vec3f sp40; - s32 sp3C; + s32 pad2; s32 sp38; CollisionPoly* sp34; + CollisionContext* colCtx; + colCtx = &camera->globalCtx->colCtx; - sp34 = NULL; // this is moved to the top when it should be done in the middle of the function args being loaded - if (func_8003DD6C(&camera->globalCtx->colCtx, b, c, &sp40, &sp34, 1, 1, 1, 0, &sp38) != 0) { - if (func_80038B7C(sp34, b) < 0.0f) { - return 1; - } + sp34 = NULL; + if (func_8003DD6C(colCtx, arg1, arg2, &sp40, &sp34, 1, 1, 1, 0, &sp38) && (func_80038B7C(sp34, arg1) < 0.0f)) { + return true; } - return 0; -} -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800443A0.s") -#endif -f32 func_80044434(Camera* camera, Vec3f* b, Vec3f* c, s32* d) { + return false; +} + +f32 func_80044434(Camera* camera, Vec3f* arg1, Vec3f* arg2, s32* arg3) { s32 sp2C; // unused CollisionPoly* sp28; - f32 temp_ret = func_8003C940(&camera->globalCtx->colCtx, &sp28, d, c); + f32 temp_ret = func_8003C940(&camera->globalCtx->colCtx, &sp28, arg3, arg2); if (temp_ret == -32000.0f) { - b->x = 0.0f; - b->z = 0.0f; - b->y = 1.0f; + arg1->x = 0.0f; + arg1->z = 0.0f; + arg1->y = 1.0f; } else { - b->x = sp28->norm.x * (1.f / 32767); - b->y = sp28->norm.y * (1.f / 32767); - b->z = sp28->norm.z * (1.f / 32767); + arg1->x = sp28->norm.x * (1.f / 32767); + arg1->y = sp28->norm.y * (1.f / 32767); + arg1->z = sp28->norm.z * (1.f / 32767); } return temp_ret; } -void func_80044510(Camera* camera, Vec3f* b) { +f32 func_80044510(Camera* camera, Vec3f* arg1) { Vec3f sp2C, sp20; s32 sp1C; - sp2C = *b; + sp2C = *arg1; sp2C.y += 80.0f; - func_80044434(camera, &sp20, &sp2C, &sp1C); + return func_80044434(camera, &sp20, &sp2C, &sp1C); } // 125 lines (loop) #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80044568.s") -s16 func_80044740(Camera* camera, s32 b) { - return func_80041A4C(&camera->globalCtx->colCtx, b, 50); +s16 func_80044740(Camera* camera, s32 arg1) { + return func_80041A4C(&camera->globalCtx->colCtx, arg1, 50); } -s32 func_8004476C(Camera* camera) { +struct_80041C10_ret* func_8004476C(Camera* camera) { return func_80041C10(&camera->globalCtx->colCtx, camera->unk_148, 50); } -s32 func_8004479C(Camera* camera, s32* b, Vec3f* c) { +s32 func_8004479C(Camera* camera, s32* arg1, Vec3f* arg2) { s32 temp_ret; PosRot sp20; s32 ret; func_8002EF44(&sp20, &camera->player->actor); - temp_ret = func_80041A28(&camera->globalCtx->colCtx, c, *b); + temp_ret = func_80041A28(&camera->globalCtx->colCtx, arg2, *arg1); - if (func_80041A4C(&camera->globalCtx->colCtx, temp_ret, *b) == 0) { + if (func_80041A4C(&camera->globalCtx->colCtx, temp_ret, *arg1) == 0) { ret = -1; } else { ret = temp_ret; @@ -319,20 +2025,20 @@ s32 func_8004481C(Camera* camera, s16* arg1) { return func_80041C98(&camera->globalCtx->colCtx, sp44, sp3C); } -s32 func_800448CC(Camera* camera, f32* b) { +s32 func_800448CC(Camera* camera, f32* arg1) { PosRot sp34; s32 sp30; s32 temp_ret; func_8002EF44(&sp34, &camera->player->actor); - *b = sp34.pos.y; + *arg1 = sp34.pos.y; - if (func_8004213C(camera->globalCtx, &camera->globalCtx->colCtx, sp34.pos.x, sp34.pos.z, b, &sp30) == 0) { - *b = -32000.0f; + if (func_8004213C(camera->globalCtx, &camera->globalCtx->colCtx, sp34.pos.x, sp34.pos.z, arg1, &sp30) == 0) { + *arg1 = -32000.0f; return -1; } if (!(camera->player->stateFlags1 & 0x8000000)) { - *b = -32000.0f; + *arg1 = -32000.0f; return -1; } @@ -344,7 +2050,7 @@ s32 func_800448CC(Camera* camera, f32* b) { return temp_ret; } -f32 func_800449AC(Camera* camera, Vec3f* b, s32* arg2) { +f32 func_800449AC(Camera* camera, Vec3f* arg1, s32* arg2) { PosRot sp2C; f32 sp28; s32 sp24; @@ -352,10 +2058,10 @@ f32 func_800449AC(Camera* camera, Vec3f* b, s32* arg2) { func_8002EF44(&sp2C, &camera->player->actor); sp28 = sp2C.pos.y; - if (func_8004213C(camera->globalCtx, &camera->globalCtx->colCtx, b->x, b->z, &sp28, &sp24) == 0) { + if (func_8004213C(camera->globalCtx, &camera->globalCtx->colCtx, arg1->x, arg1->z, &sp28, &sp24) == 0) { return -32000.f; } - if (sp28 < b->y) { + if (sp28 < arg1->y) { return -32000.f; } @@ -363,23 +2069,21 @@ f32 func_800449AC(Camera* camera, Vec3f* b, s32* arg2) { return sp28; } -s16 func_80044A74(Vec3f* a, Vec3f* b) { - return Math_atan2f(b->x - a->x, b->z - a->z) * (180 / M_PI) * (32767.5f / 180) + 0.5f; +s16 func_80044A74(Vec3f* arg0, Vec3f* arg1) { + return Math_atan2f(arg1->x - arg0->x, arg1->z - arg0->z) * (180.0f / M_PI) * (32767.5f / 180.0f) + 0.5f; } -// 234 lines #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80044ADC.s") -// 143 lines (extremely confusing) #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80044E68.s") -f32 func_800450A4(Camera* camera, f32 b) { +f32 func_800450A4(Camera* camera, f32 arg1) { f32 ret; if (camera->unk_100 < (OREG(41) * 0.01f)) { ret = OREG(41) * 0.01f; - } else if (b <= camera->unk_100) { - ret = b; + } else if (arg1 <= camera->unk_100) { + ret = arg1; } else { ret = OREG(42) * 0.01f * camera->unk_100; } @@ -387,41 +2091,71 @@ f32 func_800450A4(Camera* camera, f32 b) { return ret; } -// 79 lines (unknown arrays) -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80045128.s") +#ifdef NON_MATCHING +void Camera_CopyModeValuesToPREG(Camera* camera, s16 mode) { + s32 i; -// 66 lines (unknown arrays) -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80045254.s") + if (PREG(82)) { + osSyncPrintf("camera: res: stat (%d/%d/%d)\n", camera->unk_164, camera->setting, mode); + } + for (i = 0; i < sCameraSettings[camera->setting].cameraModes[mode].valueCnt; i++) { + CameraModeValue* phi_s0 = &sCameraSettings[camera->setting].cameraModes[mode].values[i]; + PREG(phi_s0->param) = phi_s0->val; + if (PREG(82)) { + osSyncPrintf("camera: res: PREG(%02d) = %d\n", phi_s0->param, phi_s0->val); + } + } + camera->unk_15E = 0; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_CopyModeValuesToPREG.s") +#endif + +#ifdef NON_MATCHING +s32 Camera_CopyPREGToModeValues(Camera* camera) { + CameraModeValue* phi_s0; + s32 i; + + for (i = 0; i < sCameraSettings[camera->setting].cameraModes[camera->mode].valueCnt; i++) { + phi_s0 = &sCameraSettings[camera->setting].cameraModes[camera->mode].values[i]; + phi_s0->val = PREG(phi_s0->param); + if (PREG(82)) { + osSyncPrintf("camera: res: %d = PREG(%02d)\n", phi_s0->val, phi_s0->param); + } + } + return true; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_CopyPREGToModeValues.s") +#endif -// 76 lines (unknown types) #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80045350.s") -void* func_8004545C(Vec3f* a, s32 b, s32 c, struct_80043D18* d, struct_80043D18* e) { +void* func_8004545C(Vec3f* arg0, s32 arg1, s32 arg2, struct_80043D18* arg3, struct_80043D18* arg4) { Vec3f sp24; - if (func_800427B4(d->unk_18, e->unk_18, b, c, &sp24) == 0) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: corner check no cross point %x %x\n" VT_RST, d, e); - *a = d->unk_00; - return a; + if (func_800427B4(arg3->unk_18, arg4->unk_18, arg1, arg2, &sp24) == 0) { + osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: corner check no cross point %x %x\n" VT_RST, arg3, arg4); + *arg0 = arg3->unk_00; + return arg0; } - *a = sp24; - return a; + *arg0 = sp24; + return arg0; } -// 141 lines #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80045508.s") #ifdef NON_MATCHING // CLOSE: stack is 4 bytes too big -f32 func_80045714(Vec3f* a, s16 b, s16 c, f32 arg3) { +f32 func_80045714(Vec3f* arg0, s16 arg1, s16 arg2, f32 arg3) { VecSph sp1C; f32 sp18; - func_8007C3F4(&sp1C, a); + func_8007C3F4(&sp1C, arg0); sp18 = Math_Coss(sp1C.phi); - sp18 = fabsf(Math_Coss(b - sp1C.theta) * sp18); - return Math_Coss(b - c) * (sp18 * arg3); + sp18 = fabsf(Math_Coss(arg1 - sp1C.theta) * sp18); + return Math_Coss(arg1 - arg2) * (sp18 * arg3); } #else f32 func_80045714(Vec3f* a, s16 b, s16 c, f32 arg3); @@ -430,7 +2164,7 @@ f32 func_80045714(Vec3f* a, s16 b, s16 c, f32 arg3); f32 func_8007C0A8(f32, f32); -s32 func_800457A8(Camera* camera, VecSph* b, f32 c, s16 d) { +s32 func_800457A8(Camera* camera, VecSph* arg1, f32 arg2, s16 arg3) { f32 unused; Vec3f sp50; Vec3f sp44; @@ -442,11 +2176,11 @@ s32 func_800457A8(Camera* camera, VecSph* b, f32 c, s16 d) { sp50.x = 0.f; sp50.z = 0.f; - sp50.y = temp_ret + c; + sp50.y = temp_ret + arg2; - sp2C = &camera->unk_94; - if (d != 0) { - sp50.y -= func_8007C0A8(func_80045714(&camera->unk_108, sp2C->rot.y, b->theta, OREG(9)), temp_ret); + sp2C = &camera->playerPosRot; + if (arg3 != 0) { + sp50.y -= func_8007C0A8(func_80045714(&camera->unk_108, sp2C->rot.y, arg1->theta, OREG(9)), temp_ret); } func_80043A3C(&sp50, &camera->unk_E4, camera->unk_CC.y, camera->unk_CC.x, 0.1f); @@ -458,11 +2192,9 @@ s32 func_800457A8(Camera* camera, VecSph* b, f32 c, s16 d) { return 1; } -f32 func_8007C028(Vec3f*, Vec3f*); - #ifdef NON_MATCHING // CLOSE: regalloc -s32 func_800458D4(Camera* camera, VecSph* b, f32 c, f32* d, s16 e) { +s32 func_800458D4(Camera* camera, VecSph* arg1, f32 arg2, f32* arg3, s16 arg4) { f32 phi_f2; Vec3f sp60; Vec3f sp54; @@ -471,16 +2203,16 @@ s32 func_800458D4(Camera* camera, VecSph* b, f32 c, f32* d, s16 e) { f32 sp48; s32 pad[2]; - sp60.y = Player_GetCameraYOffset(camera->player) + c; + sp60.y = Player_GetCameraYOffset(camera->player) + arg2; sp60.x = 0.0f; sp60.z = 0.0f; - temp_s1 = &camera->unk_94; - if (e != 0) { - sp60.y -= func_80045714(&camera->unk_108, temp_s1->rot.y, b->theta, OREG(9)); + temp_s1 = &camera->playerPosRot; + if (arg4 != 0) { + sp60.y -= func_80045714(&camera->unk_108, temp_s1->rot.y, arg1->theta, OREG(9)); } - sp48 = temp_s1->pos.y - *d; + sp48 = temp_s1->pos.y - *arg3; temp_ret = Math_atan2f(sp48, func_8007C028(&camera->at, &camera->eye)); // f2 and f14 are swapped if (OREG(32) * (M_PI / 180) < temp_ret) { @@ -505,7 +2237,7 @@ s32 func_800458D4(Camera* camera, VecSph* b, f32 c, f32* d, s16 e) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800458D4.s") #endif -s32 func_80045B08(Camera* camera, VecSph* b, f32 c, s16 d) { +s32 func_80045B08(Camera* camera, VecSph* arg1, f32 arg2, s16 arg3) { f32 phi_f2; Vec3f sp48; Vec3f sp3C; @@ -513,17 +2245,17 @@ s32 func_80045B08(Camera* camera, VecSph* b, f32 c, s16 d) { f32 temp_ret; PosRot* temp_s1; - sp48.y = Player_GetCameraYOffset(camera->player) + c; + sp48.y = Player_GetCameraYOffset(camera->player) + arg2; sp48.x = 0.0f; sp48.z = 0.0f; - temp_ret = Math_Sins((s32)d); - temp_s1 = &camera->unk_94; + temp_ret = Math_Sins(arg3); + temp_s1 = &camera->playerPosRot; if (temp_ret < 0.0f) { - phi_f2 = Math_Coss(temp_s1->rot.y - b->theta); + phi_f2 = Math_Coss(temp_s1->rot.y - arg1->theta); } else { - phi_f2 = -Math_Coss(temp_s1->rot.y - b->theta); + phi_f2 = -Math_Coss(temp_s1->rot.y - arg1->theta); } sp48.y -= temp_ret * phi_f2 * OREG(9); @@ -537,86 +2269,11 @@ s32 func_80045B08(Camera* camera, VecSph* b, f32 c, s16 d) { return 1; } -/* -// someone who's not me can have fun with this function -s32 func_80045C74(Camera* camera, VecSph* b, f32 c, f32* d, s16 arg4) { - Vec3f sp70; - Vec3f sp64; - f32 sp54; - PosRot* sp3C; - f32 temp; - f32 temp_f2; - f32 temp_ret_3; - f32 phi_f16; - f32 phi_f20; - - sp70.y = Player_GetCameraYOffset(camera->player) + c; - sp70.x = 0.0f; - sp70.z = 0.0f; - - if (PREG(76) != 0) { - if (arg4 != 0) { - sp70.y -= func_80045714(&camera->unk_108, sp3C->rot.y, b->unk_06, OREG(9)); - } - } - - sp3C = &camera->unk_94; - - if ((sp3C->pos.y == camera->unk_104) || (camera->player->actor.gravity > -0.1f) || - (camera->player->stateFlags1 & 0x200000)) { - *d = func_8004389C(sp3C->pos.y, *d, OREG(43) * 0.01f, 0.1f); - sp70.y -= sp3C->pos.y - *d; - func_80043A3C(&sp70, &camera->unk_E4, camera->unk_CC.y, camera->unk_CC.x, 0.1f); - } else { - temp = sp3C->pos.y - *d; - if (PREG(75) == 0) { - sp54 = func_8007C028(&camera->at, &camera->eye); - Math_atan2f(temp, sp54); - temp_f2 = Math_tanf(camera->unk_FC * 0.4f * (M_PI / 180)) * sp54; - - if (temp > temp_f2) { - *d += temp - temp_f2; - phi_f20 = temp_f2; - } else { - phi_f20 = temp; - if (temp < -temp_f2) { - *d += temp + temp_f2; - phi_f20 = -temp_f2; - } - } - sp70.y -= phi_f20; - } else { - temp_ret_3 = Math_atan2f(temp, func_8007C028(&camera->at, &camera->eye)); - - if (OREG(32) * (M_PI / 180) < temp_ret_3) - phi_f16 = 1.0f - sinf(temp_ret_3 - OREG(32) * (M_PI / 180)); - else if (temp_ret_3 < OREG(33) * (M_PI / 180)) - phi_f16 = 1.0f - sinf(OREG(33) * (M_PI / 180) - temp_ret_3); - else - phi_f16 = 1.0f; - - sp70.y -= temp * phi_f16; - } - - func_80043A3C(&sp70, &camera->unk_E4, OREG(29) * 0.01f, OREG(30) * 0.01f, 0.1f); - camera->unk_CC.y = OREG(29) * 0.01f; - camera->unk_CC.x = OREG(30) * 0.01f; - } - - sp64.x = sp3C->pos.x + camera->unk_E4.x; - sp64.y = sp3C->pos.y + camera->unk_E4.y; - sp64.z = sp3C->pos.z + camera->unk_E4.z; - func_80043A3C(&sp64, &camera->at, camera->unk_100, camera->unk_100, 0.2f); - - return 1; -} -*/ #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80045C74.s") -// 421 lines #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800460A8.s") -s32 func_800466F8(Camera* camera, VecSph* b, f32 c, f32* d, s16 e) { +s32 func_800466F8(Camera* camera, VecSph* arg1, f32 arg2, f32* arg3, s16 arg4) { s32 phi_v0; Vec3f sp60; Vec3f sp54; @@ -638,18 +2295,18 @@ s32 func_800466F8(Camera* camera, VecSph* b, f32 c, f32* d, s16 e) { if (phi_v0 != 0) { sp30.pos.y -= 49.f; - *d = func_8004389C(sp30.pos.y, *d, 0.1f, 0.2f); + *arg3 = func_8004389C(sp30.pos.y, *arg3, 0.1f, 0.2f); camera->unk_100 = func_8004389C(0.4f, camera->unk_100, 0.2f, 0.02f); } else { - *d = func_8004389C(sp30.pos.y, *d, 0.5f, 0.2f); + *arg3 = func_8004389C(sp30.pos.y, *arg3, 0.5f, 0.2f); } sp60.x = 0.0f; sp60.z = 0.0f; - sp60.y = sp48 + c; + sp60.y = sp48 + arg2; - if (e != 0) { - sp60.y -= func_80045714(&camera->unk_108, camera->unk_94.rot.y, b->theta, OREG(9)); + if (arg4 != 0) { + sp60.y -= func_80045714(&camera->unk_108, camera->playerPosRot.rot.y, arg1->theta, OREG(9)); } func_80043A3C(&sp60, &camera->unk_E4, camera->unk_CC.y, camera->unk_CC.x, 0.1f); @@ -662,49 +2319,49 @@ s32 func_800466F8(Camera* camera, VecSph* b, f32 c, f32* d, s16 e) { return 1; } -void func_800468CC(Camera* camera, f32 b, f32 c, f32 d) { +void func_800468CC(Camera* camera, f32 arg1, f32 arg2, f32 arg3) { f32 sp1C; f32 phi_f12; - if (b < c) { - sp1C = c; + if (arg1 < arg2) { + sp1C = arg2; phi_f12 = OREG(6); - } else if (d < b) { - sp1C = d; + } else if (arg3 < arg1) { + sp1C = arg3; phi_f12 = OREG(6); } else { - sp1C = b; + sp1C = arg1; phi_f12 = 1.0f; } camera->unk_C0.x = func_8004389C(phi_f12, camera->unk_C0.x, OREG(25) * 0.01f, 0.1f); - func_8004389C(sp1C, camera->unk_DC, 1.f / camera->unk_C0.x, 0.2f); + func_8004389C(sp1C, camera->dist, 1.f / camera->unk_C0.x, 0.2f); } -void func_800469C0(Camera* camera, f32 b, f32 c, f32 d, s16 e) { +f32 func_800469C0(Camera* camera, f32 arg1, f32 arg2, f32 arg3, s16 arg4) { f32 sp1C; f32 phi_f12; - if (b < c) { - sp1C = c; + if (arg1 < arg2) { + sp1C = arg2; - if (e != 0) { + if (arg4 != 0) { phi_f12 = OREG(6) * 0.5f; } else { phi_f12 = OREG(6); } - } else if (d < b) { - sp1C = d; + } else if (arg3 < arg1) { + sp1C = arg3; - if (e != 0) { + if (arg4 != 0) { phi_f12 = OREG(6) * 0.5f; } else { phi_f12 = OREG(6); } } else { - sp1C = b; + sp1C = arg1; - if (e != 0) { + if (arg4 != 0) { phi_f12 = OREG(6); } else { phi_f12 = 1.0f; @@ -712,30 +2369,27 @@ void func_800469C0(Camera* camera, f32 b, f32 c, f32 d, s16 e) { } camera->unk_C0.x = func_8004389C(phi_f12, camera->unk_C0.x, OREG(25) * 0.01f, 0.1f); - func_8004389C(sp1C, camera->unk_DC, 1.f / camera->unk_C0.x, 0.2f); + return func_8004389C(sp1C, camera->dist, 1.f / camera->unk_C0.x, 0.2f); } #ifdef NON_MATCHING // lots of regalloc and stack issues, but that's it -void func_80046B44(Camera* camera, s16 b, s16 c, s16 d) { +void func_80046B44(Camera* camera, s16 arg1, s16 arg2, s16 arg3) { + s32 pad[2]; s16 sp1C; s16 phi_v1; s16 phi_v0; f32 phi_a2; - phi_v1 = ABS(b); - if (d > 0) { - phi_v0 = Math_Coss(d) * d; - } else { - phi_v0 = d; - } - sp1C = c - phi_v0; + phi_v1 = ABS(arg1); + phi_v0 = arg3 > 0 ? (s16)(Math_Coss(arg3) * arg3) : arg3; + sp1C = arg2 - phi_v0; if (ABS(sp1C) < phi_v1) { phi_a2 = (1.0f / camera->unk_C0.y) * 3.0f; } else { phi_a2 = (1.0f / camera->unk_C0.y) * func_800437F0(0.8f, 1.0f - phi_v0 * (1.0f / OREG(5))); } - func_8004391C(sp1C, b, phi_a2, 0xa); + func_8004391C(sp1C, arg1, phi_a2, 0xa); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80046B44.s") @@ -743,7 +2397,7 @@ void func_80046B44(Camera* camera, s16 b, s16 c, s16 d) { #ifdef NON_MATCHING // stack, regalloc, tiny bit of ordering -s16 func_80046CB4(Camera* camera, s16 b, s16 c, f32 d, f32 e) { +s16 func_80046CB4(Camera* camera, s16 arg1, s16 arg2, f32 arg3, f32 arg4) { f32 sp34; s16 sp1C; f32 temp_ret; @@ -751,190 +2405,422 @@ s16 func_80046CB4(Camera* camera, s16 b, s16 c, f32 d, f32 e) { s16 temp; if (camera->unk_D8 > 0.001f) { - temp = b - 0x7fff; // this is probably some kind of cast that I'm too stupid to know - sp1C = c - temp; - phi_f14 = (s16)(sp1C - 0x7fff) * (1.0f / 32767.0f); + temp = arg1 - 0x7FFF; + sp1C = arg2 - temp; + phi_f14 = (s16)(sp1C - 0x7FFF) * (1.0f / 32767.0f); } else { - temp = b - 0x7fff; - sp1C = c - temp; + temp = arg1 - 0x7FFF; + sp1C = arg2 - temp; phi_f14 = OREG(48) * 0.01f; } - temp_ret = func_800437F0(d, phi_f14); - sp34 = ((1.0f - temp_ret) * e) + temp_ret; + temp_ret = func_800437F0(arg3, phi_f14); + sp34 = ((1.0f - temp_ret) * arg4) + temp_ret; if (sp34 < 0.0f) { sp34 = 0.0f; } // ordering stuff here - return (s16)((sp1C * sp34) * (1.0f / camera->unk_C0.z) * func_800437F0(0.5f, camera->unk_E0)) + b; + return arg1 + (s16)(sp1C * sp34 * (1.0f / camera->unk_C0.z) * func_800437F0(0.5f, camera->unk_E0)) + arg1; } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80046CB4.s") #endif -// 364 lines #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80046E20.s") s32 func_80047394(Camera* camera) { return 1; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800473A0.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Normal1.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80047F64.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Normal2.s") +#define NEXTSETTING ((values++)->val) +#ifdef NON_MATCHING +s32 Camera_Normal3(Camera* camera) { + f32 sp98; + f32 sp94; + f32 sp90; + f32 sp8C; + VecSph sp84; + VecSph sp7C; + VecSph sp74; + Vec3f* sp48; + Vec3f* sp44; + Vec3f* sp40; + f32 temp_f0; + f32 temp_f0_3; + f32 temp_f16; + f32 temp_f16_2; + f32 temp_f2; + f32 temp_f6; + s16 temp_t3; + s16 temp_v0_2; + s16 temp_v0_3; + s16 temp_v0_4; + s32 temp_a0; + s16 phi_v1; + s32 phi_v1_2; + s32 phi_a0; + CameraModeValue* values; + Normal3* normal3 = &camera->unk_00.normal3; + Normal3_Unk20* unk20; + PosRot* playerPostRot; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80048804.s") + temp_f2 = Player_GetCameraYOffset(camera->player); + if ((((camera->unk_15E == 0) || (camera->unk_15E == 0xA)) || (camera->unk_15E == 0x14)) || QREG(0)) { + temp_f2 *= 0.01f; + values = sCameraSettings[camera->setting].cameraModes[camera->mode].values; + // temp_t2 = sCameraSettings[camera->setting].unk_00 + (camera->mode * 8); + // temp_t3 = *temp_t2->unk4; + // temp_v0 = temp_t2->unk4 + 0x20; + normal3->unk_00 = temp_f2 * NEXTSETTING; + // normal3->unk_00 = (f32) ((f32) temp_t3 * temp_f2); -s32 func_80048FCC(Camera* camera) { + normal3->unk_04 = temp_f2 * NEXTSETTING; + // normal3->unk_04 = (f32) ((f32) temp_v0->unk-1C * temp_f2); + + normal3->unk_08 = temp_f2 * NEXTSETTING; + // normal3->unk_08 = (f32) ((f32) temp_v0->unk-18 * temp_f2); + + normal3->unk_1C = (65535.0f / 360.0f) * NEXTSETTING + 0.5f; + // normal3->unk_1C = (s16) (s32) (((f32) temp_v0->unk-14 * 182.0416717529297f) + 0.5f); + + normal3->unk_0C = NEXTSETTING; + // normal3->unk_0C = (f32) temp_v0->unk-10; + + normal3->unk_10 = NEXTSETTING; + // normal3->unk_10 = (f32) temp_v0->unk-C; + + normal3->unk_14 = NEXTSETTING; + // normal3->unk_14 = (f32) temp_v0->unk-8; + + normal3->unk_18 = NEXTSETTING * 0.01f; + // normal3->unk_18 = (f32) ((f32) temp_v0->unk-4 * 0.009999999776482582f); + + normal3->unk_1E = NEXTSETTING; + // normal3->unk_1E = (s16) temp_v0->unk0; + } + + if (QREG(0)) { + Camera_CopyPREGToModeValues(camera); + } + + sp48 = &camera->eye; + sp44 = &camera->at; + sp40 = &camera->eyeNext; + playerPostRot = &camera->playerPosRot; + func_8007C490(&sp7C, sp44, sp48); + func_8007C490(&sp74, sp44, sp40); + D_8011D3E8 = 1; + D_8011D3A0.w = normal3->unk_1E; + unk20 = &normal3->unk_20; + + // ordering here. + switch (camera->unk_15E) { + case 0: + case 0xA: + case 0x14: + case 0x19: + unk20->unk_0C = 0; + unk20->unk_24 = 0; + unk20->unk_1C = 0; + unk20->unk_14 = unk20->unk_16 = unk20->unk_18 = 0; + // unk20->unk_14 = (s16) unk20->unk_18; + // unk20->unk_16 = (s16) unk20->unk_18; + + unk20->unk_20 = camera->unk_104; + unk20->unk_10 = normal3->unk_0C; + unk20->unk_2A = 0xA; + unk20->unk_26 = (1.0f / OREG(23)) * (s16)(playerPostRot->rot.y - 0x7FFF - sp7C.theta); + unk20->unk_28 = OREG(23); + camera->unk_15E = 1; + unk20->unk_1A = 0; + break; + default: + break; + } + DECR(unk20->unk_2A); + /*temp_v0_2 = unk20->unk_2A; + if (temp_v0_2 != 0) { + unk20->unk_2A = (s16) (temp_v0_2 - 1); + } + */ + temp_f6 = OREG(25) * 0.01f; + temp_f16 = temp_f6 * camera->unk_E0; + sp94 = (OREG(26) * 0.01f) * camera->unk_E0; + temp_v0_3 = unk20->unk_1A; + if (temp_v0_3 != 0) { + camera->unk_C0.z = func_8004389C(normal3->unk_0C + (temp_v0_3 * 2), camera->unk_C0.z, temp_f16, 0.1f); + camera->unk_C0.y = func_8004389C((f32)OREG(7) + (unk20->unk_1A * 2), camera->unk_C0.y, sp94, 0.1f); + unk20->unk_1A--; + } else { + camera->unk_C0.z = func_8004389C(normal3->unk_0C, camera->unk_C0.z, temp_f16, 0.1f); + camera->unk_C0.y = func_8004389C(OREG(7), camera->unk_C0.y, sp94, 0.1f); + } + camera->unk_CC.x = func_8004389C(OREG(2) * 0.01f, camera->unk_CC.x, temp_f16, 0.1f); + camera->unk_CC.y = func_8004389C(OREG(3) * 0.01f, camera->unk_CC.y, sp94, 0.1f); + camera->unk_CC.z = func_8004389C(OREG(4) * 0.01f, camera->unk_CC.z, sp94, 0.1f); + temp_f0 = (1.0f / normal3->unk_10) * 0.5f; + unk20->unk_24 = func_8004391C(func_80044ADC(camera, sp7C.theta - 0x7FFF, 1), unk20->unk_24, + temp_f0 + (temp_f0 * (1.0f - camera->unk_E0)), 0xF); + func_800466F8(camera, &sp74, normal3->unk_00, &unk20->unk_20, 1); + sp90 = (normal3->unk_08 + normal3->unk_04) * 0.5f; + func_8007C490(&sp84, sp44, sp40); + sp84.r = func_800469C0(camera, sp84.r, normal3->unk_04, normal3->unk_08, unk20->unk_2A); + camera->dist = sp84.r; + if (0.001f < camera->unk_D8) { + sp84.r += (sp90 - sp84.r) * 0.002f; + } + sp84.phi = func_8004391C(normal3->unk_1C - unk20->unk_24, sp74.phi, 1.0f / camera->unk_C0.y, 0xA); + if (OREG(5) < sp84.phi) { + sp84.phi = OREG(5); + } + if (sp84.phi < OREG(34)) { + sp84.phi = OREG(34); + } + + // Probably some type of abs/clamp. + temp_a0 = playerPostRot->rot.y - (sp74.theta - 0x7FFF); + phi_v1_2 = -temp_a0; + if (temp_a0 >= 0) { + phi_v1_2 = temp_a0; + } + phi_a0 = temp_a0; + if (phi_v1_2 >= 0x2AF9) { + if (temp_a0 > 0) { + phi_a0 = 0x2AF8; + } else { + phi_a0 = -0x2AF8; + } + } + temp_f16_2 = (phi_a0 * ((camera->unk_E0 * (1.0f - 0.5f)) + 0.5f)) / camera->unk_C0.z; + if ((150.0f * (1.0f - camera->unk_E0)) < fabsf(temp_f16_2)) { + sp84.theta = sp74.theta + temp_f16_2; + // sp8A = sp74.theta + temp_f16_2; + } else { + sp84.theta = sp74.theta; + // sp8A = sp7A; + } + if (unk20->unk_28 > 0) { + sp84.theta += unk20->unk_26; + // sp8A = sp8A + unk20->unk_26; + + unk20->unk_28--; + } + func_80043C28(sp40, sp44, &sp84); + if (camera->status == 7) { + func_80046E20(camera, &sp84, normal3->unk_04, normal3->unk_0C, &sp8C, &normal3->unk_20); + } else { + *sp48 = *sp40; + } + camera->fov = func_8004389C(normal3->unk_14, camera->fov, camera->unk_CC.z, 1.0f); + camera->roll = func_8004391C(0, camera->roll, 0.5f, 0xA); + camera->unk_100 = func_800450A4(camera, normal3->unk_18); + return 1; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Normal3.s") +#endif + +s32 Camera_Normal4(Camera* camera) { return func_80047394(camera); } -s32 func_80048FEC(Camera* camera) { +s32 Camera_Normal0(Camera* camera) { return func_80047394(camera); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8004900C.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Parallel1.s") -s32 func_80049984(Camera* camera) { +s32 Camera_Parallel2(Camera* camera) { return func_80047394(camera); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800499A4.s") +void Camera_Parallel3(Camera* camera) { + CameraModeValue* reg = &sCameraSettings[camera->setting].cameraModes[camera->mode].values[0]; + s16 val = reg->val; -s32 func_80049A08(Camera* camera) { + D_8011D3A0.w = val; + if (val & 1) { + camera->unk_14C |= 0x400; + } + if (val & 2) { + camera->unk_14C |= 0x10; + } +} + +s32 Camera_Parallel4(Camera* camera) { return func_80047394(camera); } -s32 func_80049A28(Camera* camera) { +s32 Camera_Parallel0(Camera* camera) { return func_80047394(camera); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80049A48.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Jump1.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8004A250.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Jump2.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8004ACE0.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Jump3.s") -s32 func_8004B560(Camera* camera) { +s32 Camera_Jump4(Camera* camera) { return func_80047394(camera); } -s32 func_8004B580(Camera* camera) { +s32 Camera_Jump0(Camera* camera) { return func_80047394(camera); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8004B5A0.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Battle1.s") -s32 func_8004C5F4(Camera* camera) { +s32 Camera_Battle2(Camera* camera) { return func_80047394(camera); } -s32 func_8004C614(Camera* camera) { +s32 Camera_Battle3(Camera* camera) { func_80047394(camera); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8004C634.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Battle4.s") -s32 func_8004CA4C(Camera* camera) { +s32 Camera_Battle0(Camera* camera) { return func_80047394(camera); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8004CA6C.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_KeepOn1.s") -s32 func_8004D9C4(Camera* camera) { +s32 Camera_KeepOn2(Camera* camera) { return func_80047394(camera); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8004D9E4.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_KeepOn3.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8004E460.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_KeepOn4.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8004F3A4.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_KeepOn0.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8004F6A4.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Fixed1.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8004F9D8.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Fixed2.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8004FDE4.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Fixed3.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80050068.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Fixed4.s") -s32 func_8005043C(Camera* camera) { +s32 Camera_Fixed0(Camera* camera) { return func_80047394(camera); } -s32 func_8005045C(Camera* camera) { +s32 Camera_Subj1(Camera* camera) { return func_80047394(camera); } -s32 func_8005047C(Camera* camera) { +s32 Camera_Subj2(Camera* camera) { return func_80047394(camera); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8005049C.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Subj3.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80050B24.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Subj4.s") -s32 func_800511A0(Camera* camera) { +s32 Camera_Subj0(Camera* camera) { return func_80047394(camera); } -s32 func_800511C0(Camera* camera) { +s32 Camera_Data0(Camera* camera) { return func_80047394(camera); } -s32 func_800511E0(Camera* camera) { +s32 Camera_Data1(Camera* camera) { osSyncPrintf("chau!chau!\n"); - return func_800473A0(camera); + return Camera_Normal1(camera); } -s32 func_80051210(Camera* camera) { +s32 Camera_Data2(Camera* camera) { return func_80047394(camera); } -s32 func_80051230(Camera* camera) { +s32 Camera_Data3(Camera* camera) { return func_80047394(camera); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80051250.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Data4.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800515A4.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Unique1.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80051B3C.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Unique2.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80051F58.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Unique3.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80052460.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Unique0.s") -s32 func_800529D8(Camera* camera) { +s32 Camera_Unique4(Camera* camera) { return func_80047394(camera); } -s32 func_800529F8(Camera* camera) { +s32 Camera_Unique5(Camera* camera) { return func_80047394(camera); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80052A18.s") +s32 Camera_Unique6(Camera* camera) { + CameraModeValue* val; + s32 pad; + Vec3f sp2C; + Vec3f* playerPosRot; + f32 offset; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80052B90.s") + if (camera->unk_15E == 0 || camera->unk_15E == 0xA || camera->unk_15E == 0x14 || QREG(0)) { + val = sCameraSettings[camera->setting].cameraModes[camera->mode].values; + camera->unk_00.sh[0] = val[0].val; + } + if (QREG(0)) { + Camera_CopyPREGToModeValues(camera); + } + D_8011D3A0.w = camera->unk_00.sh[0]; + if (camera->unk_15E == 0) { + camera->unk_15E++; + func_80043ABC(camera); + } + if (camera->player != NULL) { + offset = Player_GetCameraYOffset(camera->player); + playerPosRot = &camera->playerPosRot.pos; + sp2C = *playerPosRot; + sp2C.y += offset; + camera->dist = func_8007BF90(&sp2C, &camera->eye); + camera->unk_E4.x = camera->at.x - playerPosRot->x; + camera->unk_E4.y = camera->at.y - playerPosRot->y; + camera->unk_E4.z = camera->at.z - playerPosRot->z; + } else { + camera->dist = func_8007BF90(&camera->at, &camera->eye); + } + if (camera->unk_00.sh[0] & 1) { + if (camera->unk_160 > 0) { + camera->unk_160--; + } + } + return 1; +} -s32 func_80052DEC(Camera* camera) { +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Unique7.s") + +s32 Camera_Unique8(Camera* camera) { return func_80047394(camera); } -// Very long function (1,444 lines), 1 jtbl -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80052E0C.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Unique9.s") -void Camera_DebugPrintSplineArray(char* name, s16 length, SplineData splines[]) { +void Camera_DebugPrintSplineArray(char* name, s16 length, CutsceneCameraPoint cameraPoints[]) { s32 i; osSyncPrintf("static SplinedatZ %s[] = {\n", name); for (i = 0; i < length; i++) { osSyncPrintf(" /* key frame %2d */ {\n", i); - osSyncPrintf(" /* code */ %d,\n", splines[i].code); - osSyncPrintf(" /* z */ %d,\n", splines[i].z); - osSyncPrintf(" /* T */ %d,\n", splines[i].T); - osSyncPrintf(" /* zoom */ %f,\n", splines[i].zoom); - osSyncPrintf(" /* pos */ { %d, %d, %d }\n", splines[i].pos.x, splines[i].pos.y, splines[i].pos.z); + osSyncPrintf(" /* code */ %d,\n", cameraPoints[i].continueFlag); + osSyncPrintf(" /* z */ %d,\n", cameraPoints[i].cameraRoll); + osSyncPrintf(" /* T */ %d,\n", cameraPoints[i].nextPointFrame); + osSyncPrintf(" /* zoom */ %f,\n", cameraPoints[i].viewAngle); + osSyncPrintf(" /* pos */ { %d, %d, %d }\n", cameraPoints[i].pos.x, cameraPoints[i].pos.y, + cameraPoints[i].pos.z); osSyncPrintf(" },\n"); } osSyncPrintf("};\n\n"); @@ -946,63 +2832,226 @@ void Camera_Vec3fCopy(Vec3f* src, Vec3f* dst) { dst->z = src->z; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80054478.s") +void func_80054478(PosRot* arg0, Vec3f* arg1, Vec3f* arg2) { + VecSph sp28; + Vec3f sp1C; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800544D0.s") + Camera_Vec3fCopy(arg1, &sp1C); + func_8007C3F4(&sp28, &sp1C); + sp28.theta += arg0->rot.y; + func_80043C28(arg2, &arg0->pos, &sp28); +} -s32 func_80054774(Camera* camera) { +s32 func_800BB2B4(Vec3f*, f32*, f32*, CutsceneCameraPoint*, s16*, Demo1_unk_04*); + +#ifdef NON_MATCHING +s32 Camera_Demo1(Camera* camera) { + Vec3f* at; + Vec3f* eyeNext; + Vec3f* eye; + char* t; + CutsceneCameraPoint* sp84; + CutsceneCameraPoint* sp80; + PosRot sp68; + Vec3f sp5C; + Vec3f sp50; + f32 sp4C; + s16* relativeToPlayer; + CameraModeValue* values; + Demo1_unk_04* unk_04; + s32 pad; + + sp84 = camera->atPoints; + sp80 = camera->eyePoints; + if (camera->unk_15E == 0 || camera->unk_15E == 0xA || camera->unk_15E == 0x14 || QREG(0)) { + values = sCameraSettings[camera->setting].cameraModes[camera->mode].values; + camera->unk_00.demo1.unk_00 = values->val; + } + D_8011D3A0.w = camera->unk_00.demo1.unk_00; + unk_04 = &camera->unk_00.demo1.unk_04; + + relativeToPlayer = &camera->relativeToPlayer; + eyeNext = &camera->eyeNext; + at = &camera->at; + eye = &camera->eye; + switch (camera->unk_15E) { + case 0: + unk_04->unk_04 = 0; + unk_04->unk_00 = 0.0f; + camera->unk_15E++; + // absolute / relative + t = *relativeToPlayer == 0 ? "絶対" : "相対"; + osSyncPrintf("\x1b[1m%06u:\x1b[m camera: spline demo: start %s \n", camera->globalCtx->state.frames, t); + if (PREG(93)) { + Camera_DebugPrintSplineArray("CENTER", 5, sp84); + Camera_DebugPrintSplineArray(" EYE", 5, sp80); + } + case 1: + // follow CutsceneCameraPoints. function returns 1 if at the end. + // unk_15E appears to be some kind of state of the cutscene? 0 is init, 1 is update, anything else is stop. + if (func_800BB2B4(&sp5C, &sp4C, &camera->fov, sp80, &unk_04->unk_04, unk_04) || + func_800BB2B4(&sp50, &sp4C, &camera->fov, sp84, &unk_04->unk_04, unk_04)) { + camera->unk_15E++; + } + if (*relativeToPlayer) { + if (camera->player != NULL && camera->player->actor.update != NULL) { + func_8002EF14(&sp68, &camera->player->actor); + func_80054478(&sp68, &sp5C, eyeNext); + func_80054478(&sp68, &sp50, at); + } else { + osSyncPrintf("\x1b[41;37mcamera: spline demo: owner dead\n\x1b[m"); + } + } else { + Camera_Vec3fCopy(&sp5C, eyeNext); + Camera_Vec3fCopy(&sp50, at); + } + *eye = *eyeNext; + camera->roll = sp4C * 256.0f; + camera->dist = func_8007BF90(at, eye); + break; + } + return 1; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Demo1.s") +#endif + +s32 Camera_Demo2(Camera* camera) { return func_80047394(camera); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80054794.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Demo3.s") -s32 func_8005527C(Camera* camera) { +s32 Camera_Demo4(Camera* camera) { return func_80047394(camera); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8005529C.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Demo5.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80055C78.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Demo6.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80055F64.s") +void Camera_Demo7(Camera* camera) { + if (camera->unk_15E == 0) { + camera->unk_14C &= ~4; + camera->unk_14C |= 0x1000; + camera->unk_15E++; + } +} -s32 func_80055F98(Camera* camera) { +s32 Camera_Demo8(Camera* camera) { return func_80047394(camera); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80055FB8.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Demo9.s") -s32 func_80056430(Camera* camera) { +s32 Camera_Demo0(Camera* camera) { return func_80047394(camera); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80056450.s") +s32 Camera_Special0(Camera* camera) { + s32 pad; + CameraModeValue* val; + Vec3f* playerPosRot; -s32 func_800565F4(Camera* camera) { + if (camera->unk_15E == 0 || camera->unk_15E == 0xA || camera->unk_15E == 0x14 || QREG(0)) { + val = sCameraSettings[camera->setting].cameraModes[camera->mode].values; + camera->unk_00.spec0.unk_00 = val->val * 0.01f; + val++; + camera->unk_00.spec0.unk_04 = val->val; + } + + if (QREG(0)) { + Camera_CopyPREGToModeValues(camera); + } + + D_8011D3A0.w = camera->unk_00.spec0.unk_04; + + if (camera->unk_15E == 0) { + camera->unk_15E++; + } + if ((camera->target == NULL) || (camera->target->update == NULL)) { + if (camera->target == NULL) { + osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: warning: circle: target is not valid, stop!\n" VT_RST); + } + camera->target = NULL; + return true; + } + + func_8002EEE4(&camera->targetPosRot, camera->target); + func_80043A3C(&camera->targetPosRot, &camera->at, camera->unk_00.f, camera->unk_00.f, 0.1f); + if (1) { + playerPosRot = &camera->playerPosRot.pos; + } + camera->unk_E4.x = camera->at.x - playerPosRot->x; + camera->unk_E4.y = camera->at.y - playerPosRot->y; + camera->unk_E4.z = camera->at.z - playerPosRot->z; + camera->dist = func_8007BF90(&camera->at, &camera->eye); + camera->unk_D8 = 0.0f; + if (camera->unk_160 > 0) { + camera->unk_160--; + } + return true; +} + +s32 Camera_Special1(Camera* camera) { return func_80047394(camera); } -s32 func_80056614(Camera* camera) { - return func_80051B3C(camera); +s32 Camera_Special2(Camera* camera) { + return Camera_Unique2(camera); } -s32 func_80056634(Camera* camera) { +s32 Camera_Special3(Camera* camera) { return func_80047394(camera); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80056654.s") +#ifdef NON_MATCHING +s32 Camera_Special4(Camera* camera) { + PosRot sp3C; + s32 temp_v0; + s16 sp3A; + s16* unk_160 = &camera->unk_160; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800567F8.s") + if (camera->unk_15E == 0) { + D_8011D3A0.w = 0x3200; + camera->unk_15E++; + camera->fov = 40.0f; + camera->unk_00.sh[0] = *unk_160; + } + camera->fov = func_8004389C(80.0f, camera->fov, 1.0f / *unk_160, 0.1f); + if ((camera->unk_00.sh[0] - *unk_160) < 0xF) { + *unk_160 = *unk_160 - 1; + return 0; + } + camera->roll = -0x1F4; + func_8002EF14(&sp3C, camera->target); + camera->at = sp3C.pos; + camera->at.y -= 150.0f; + temp_v0 = (s16)(sp3C.rot.y - 0x7FFF) + 0x3E8; + sp3A = temp_v0; + camera->eyeNext.y = (f32)camera->at.y; + camera->eye.x = camera->eyeNext.x = (Math_Sins(temp_v0) * 780.0f) + camera->at.x; + camera->eye.z = camera->eyeNext.z = (Math_Coss(sp3A) * 780.0f) + camera->at.z; + camera->eye.y = sp3C.pos.y; + camera->eye.y = func_80044510(camera, &camera->eye) + 20.0f; + camera->unk_160--; + return 1; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Special4.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80056C20.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Special5.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80056F6C.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Special7.s") -s32 func_80057428(Camera* camera) { +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Special6.s") + +s32 Camera_Special8(Camera* camera) { return func_80047394(camera); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80057448.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Special9.s") Camera* func_80057B98(View* view, CollisionContext* colCtx, GlobalContext* globalCtx) { Camera* newCamera = ZeldaArena_MallocDebug(sizeof(*newCamera), "../z_camera.c", 9370); @@ -1024,129 +3073,83 @@ void func_80057C14(Camera* camera) { } } -// 225 lines #ifdef NON_MATCHING - -s16 D_80119EE0[] = { - 0xC471, 0xC000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0005, 0x0005, 0x0005, 0x38A4, - 0x0014, 0x0010, 0x0096, 0x0019, 0x0096, 0x0006, 0x000A, 0x000A, 0x0000, 0x0000, 0x0001, 0x0064, 0x00FA, 0x0078, - 0x0050, 0x001E, 0x0078, 0x0004, 0x0001, 0x0032, 0x0014, 0x0708, 0x0032, 0x0032, 0x0032, 0x0014, 0x0014, 0xFFF6, - 0xEAAC, 0xDC74, 0xFFFA, 0x0008, 0x000F, 0x004B, 0x003C, 0x000C, 0x006E, 0x0028, 0x0032, 0x00FA, -}; - -s16 D_80119F4C = 53; - -s16 D_80119F50[] = { - 0xFFEC, 0x00C8, 0x012C, 0x000A, 0x000C, 0x000A, 0x0023, 0x003C, 0x003C, 0x0003, 0x0000, 0xFFD8, 0x0014, 0x0019, - 0x002D, 0xFFFB, 0x000F, 0x000F, 0x0014, 0x0000, 0x0000, 0x0000, 0x0006, 0x003C, 0x001E, 0x0000, 0x0005, -}; - -s16 D_80119F88 = 27; - -// gameInfoRegs init'd? -s32 D_8011D390 = 0; - -// Number of times func_80057C6C has been called? used for the camera ID -s16 D_8011D39C = 0; - -s32 D_8011D3A4 = 0x02; -s32 D_8011D3A8 = 0x20; - -s16 D_8011D3A0 = 0; -s32 D_8011D398 = -1; -s32 D_8011D3F0 = 0; - -GlobalContext* D_8015BD7C; -void* D_8015BD80; - -void func_800B958C(Camera* camera, void*); - void func_80057C6C(Camera* camera, View* view, CollisionContext* colCtx, GlobalContext* globalCtx) { - s32 temp_a1; + Camera* temp_v0; + s16 temp_a1; s32 temp_a1_2; s32 temp_v1; s32 temp_v1_2; - s16 temp_v1_3; - Camera* temp_t8; - void* phi_a0; + s32 temp_v1_3; + s16* phi_a0; s32 phi_v0; s32 phi_v1; - void* phi_a0_2; + s16* phi_a0_2; s32 phi_v0_2; s32 phi_v1_2; s32 phi_a1; s16 phi_v1_3; s32 phi_v1_4; s16 phi_a1_2; + s32 i; + s32 j; + Camera* cam; + s16 t; - func_80106860(camera, 0, sizeof(*camera)); - if (D_8011D390 != 0) { - for (phi_v1 = 0; phi_v1 < D_80119F4C; phi_v1++) { - QREG(phi_v1) = D_80119EE0[phi_v1]; + func_80106860((void*)camera, 0, 0x16CU); + if (sInitRegs) { + for (i = 0; i < sOREGInitCnt; i++) { + OREG(i) = sOREGInit[i]; } - for (phi_v1 = 0; phi_v1 < D_80119F88; phi_v1++) { - YREG(phi_v1) = D_80119F50[phi_v1]; + for (i = 0; i < sPREGInitCnt; i++) { + PREG(i) = sPREGInit[i]; } - func_800B958C(camera, &D_8015BD80); - D_8011D390 = 0; + func_800B958C(camera, &D_8015BD80, &gGameInfo); + sInitRegs = false; PREG(88) = -1; } camera->globalCtx = D_8015BD7C = globalCtx; func_800B4D58(&D_8015BD80, camera); - temp_a1 = (s32)(D_8011D39C << 0x10) >> 0x10; + temp_a1 = D_8011D39C; D_8011D39C++; - phi_a1_2 = temp_a1; - if (temp_a1 != 0) { - - phi_a1 = temp_a1; - loop_11: - if (phi_a1 == 0) { - D_8011D39C = (s16)(D_8011D39C + 1); - } - phi_v1_3 = 0; - loop_14: - temp_t8 = camera->globalCtx->cameraPtrs[phi_v1_3]; - if ((temp_t8 == 0) || (phi_v1_4 = phi_v1_3, (phi_a1 != temp_t8->uid))) { - temp_v1_3 = phi_v1_3 + 1; - phi_v1_3 = temp_v1_3; - phi_v1_4 = temp_v1_3; - if (temp_v1_3 < 4) { - goto loop_14; - } - } - - phi_a1_2 = (s16)phi_a1; - if (phi_v1_4 != 4) { - temp_a1_2 = D_8011D39C; + for (temp_a1 = D_8011D39C, D_8011D39C++; temp_a1 != 0; temp_a1 = D_8011D39C, D_8011D39C++) { + if (temp_a1 == 0) { D_8011D39C++; - phi_a1 = temp_a1_2; - phi_a1_2 = temp_a1_2; - if (temp_a1_2 != 0) { - goto loop_11; + } + for (phi_v1_3 = 0; phi_v1_3 < 4; phi_v1_3++) { + temp_v0 = camera->globalCtx->cameraPtrs[phi_v1_3]; + if (temp_v0 != NULL && temp_a1 == temp_v0->uid) { + break; } } + + if (phi_v1_3 == 4) { + break; + } } + camera->unk_134.y = 0x3FFF; camera->unk_13A = camera->unk_134; - camera->uid = phi_a1_2; + camera->uid = temp_a1; camera->unk_C0.x = 10.0f; camera->unk_C0.z = 10.0f; camera->unk_68.y = 1.0f; camera->unk_68.x = 0.0f; camera->unk_68.z = 0.0f; - camera->unk_FC = 60.0f; + camera->fov = 60.0f; + D_8011D3A8 = 0x20; + D_8011D3A4 = 0; camera->unk_C0.y = OREG(7); camera->unk_CC.x = OREG(2) * 0.01f; camera->unk_CC.y = OREG(3) * 0.01f; camera->unk_CC.z = OREG(4) * 0.01f; - D_8011D3A8 = 0x20; - D_8011D3A4 = 0; + camera->unk_14C = 0; - camera->unk_154 = 0x21; + camera->unk_154 = 0x21U; camera->unk_166 = -1; - camera->unk_144 = 0; + camera->mode = 0; camera->unk_146 = 0x32; camera->unk_168 = 0x7FFF; camera->unk_160 = -1; @@ -1157,45 +3160,45 @@ void func_80057C6C(Camera* camera, View* view, CollisionContext* colCtx, GlobalC camera->unk_80.x = 0.0f; camera->unk_80.y = 0.0f; camera->unk_80.z = 0.0f; - camera->unk_142 = camera->unk_154; + camera->setting = camera->unk_154; camera->unk_148 = camera->unk_166; camera->unk_100 = 1.0f; - D_8011D3A0 = 0xFF00; + D_8011D3A0.w = 0xFF00; D_8011D398 = -1; D_8011D3F0 = 3; - osSyncPrintf("\x1b[34mcamera: initialize --- \x1b[m UID %d\n", camera->uid); + osSyncPrintf(VT_FGCOL(BLUE) "camera: initialize --- " VT_RST " UID %d\n", camera->uid); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80057C6C.s") #endif -s32 func_8005AD40(Camera* camera, s32 a, s16 b, f32 c, s16 d, s16 e, s16 f); +s32 func_8005AD40(Camera* camera, Actor* doorActor, s16 arg2, f32 arg3, s16 arg4, s16 arg5, s16 arg6); void func_80057FC4(Camera* camera) { if (camera != &camera->globalCtx->cameras[0]) { - camera->unk_154 = camera->unk_142 = 33; + camera->unk_154 = camera->setting = CAM_SET_FREE0; camera->unk_14C &= ~0x4; } else if (camera->globalCtx->roomCtx.curRoom.mesh->polygon.type != 1) { switch (camera->globalCtx->roomCtx.curRoom.unk_03) { case 1: func_8005AD40(camera, 0, -99, 0, 0, 18, 10); - camera->unk_154 = camera->unk_142 = 3; + camera->unk_154 = camera->setting = CAM_SET_DUNGEON0; break; case 0: osSyncPrintf("camera: room type: default set field\n"); func_8005AD40(camera, 0, -99, 0, 0, 18, 10); - camera->unk_154 = camera->unk_142 = 1; + camera->unk_154 = camera->setting = CAM_SET_NORMAL0; break; default: osSyncPrintf("camera: room type: default set etc (%d)\n", camera->globalCtx->roomCtx.curRoom.unk_03); func_8005AD40(camera, 0, -99, 0, 0, 18, 10); - camera->unk_154 = camera->unk_142 = 1; + camera->unk_154 = camera->setting = CAM_SET_NORMAL0; camera->unk_14C |= 4; break; } } else { osSyncPrintf("camera: room type: prerender\n"); - camera->unk_154 = camera->unk_142 = 33; + camera->unk_154 = camera->setting = CAM_SET_FREE0; camera->unk_14C &= ~0x4; } } @@ -1203,33 +3206,75 @@ void func_80057FC4(Camera* camera) { void Camera_Stub80058140(Camera* camera) { } -// 135 lines (has lwl/lwr) +#ifdef NON_MATCHING +void func_80058148(Camera* camera, Player* player) { + s32 pad; + PosRot sp54; + VecSph sp4C; + s32 sp48; + Vec3f sp3C; + f32 temp_f0; + + func_8002EF44(&sp54, &player->actor); + temp_f0 = Player_GetCameraYOffset(player); + camera->player = player; + camera->playerPosRot = sp54; + sp4C.r = 180.0f; + camera->dist = 180.0f; + camera->unk_134.y = sp54.rot.y; + sp4C.phi = 0x71C; + sp4C.theta = camera->unk_134.y - 0x7FFF; + camera->unk_134.x = 0x71C; + camera->unk_134.z = 0; + camera->unk_13A = camera->unk_134; + camera->unk_D8 = 0.0f; + camera->unk_F0.y = 0.0f; + camera->at = sp54.pos; + camera->unk_E4.y = temp_f0; + camera->unk_E4.x = 0.0f; + camera->unk_E4.z = 0.0f; + camera->at.y += temp_f0; + func_80043C28(&camera->eyeNext, &camera->at, &sp4C); + camera->eye = camera->eyeNext; + camera->roll = 0; + camera->unk_68.z = 0.0f; + camera->unk_68.x = 0.0f; + camera->unk_68.y = 1.0f; + if (func_80044434(camera, &sp3C, &camera->at, &sp48) != -32000.0f) { + camera->unk_146 = sp48; + } + camera->unk_118 = -1; + camera->unk_11C = -1; + camera->unk_14C |= 4; + if (camera == &camera->globalCtx->cameras[0]) { + D_8011D3A0.w = 0xB200; + } else { + D_8011D3A0.w = 0; + } + func_80057FC4(camera); + camera->unk_14A = 0; + camera->unk_15C = 0; + camera->unk_156 = -1; + camera->unk_100 = 1.0f; + Camera_CopyModeValuesToPREG(camera, camera->mode); + func_8005B044(); + osSyncPrintf(VT_FGCOL(BLUE) "camera: personalize ---" VT_RST "\n"); + if (camera->unk_164 == 0) { + func_800588B4(camera); + } +} +#else #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80058148.s") +#endif -typedef struct { - s16 val; - s16 preg; -} PRegSet; -typedef struct { - s16 unk_00; - s16 unk_02; - PRegSet* unk_04; -} unk_D_8011D064_unk4; -typedef struct { - s32 unk_00; - unk_D_8011D064_unk4* unk_04; -} unk_D_8011D064; -extern unk_D_8011D064 D_8011D064[]; - -// 109 lines (unknown arrays) #ifdef NON_MATCHING void Camera_ChangeStatus(Camera* camera, s16 status) { s32 temp_s1; - unk_D_8011D064_unk4* temp_v0; + CameraMode* temp_v0; s32 phi_a1; s32 phi_a2; s16 phi_v0; - PRegSet* phi_s0; + CameraModeValue* phi_s0; s32 phi_s1; if (PREG(82)) { @@ -1238,22 +3283,22 @@ void Camera_ChangeStatus(Camera* camera, s16 status) { osSyncPrintf("camera: change camera status: cond %c%c\n", phi_a1, phi_a2); } if (PREG(82)) { - osSyncPrintf("camera: res: stat (%d/%d/%d)\n", camera->unk_164, camera->unk_142, camera->unk_144); + osSyncPrintf("camera: res: stat (%d/%d/%d)\n", camera->unk_164, camera->setting, camera->mode); } if (status == 7 && camera->status != 7) { - temp_v0 = &D_8011D064[camera->unk_142].unk_04[camera->unk_144]; - if (temp_v0->unk_02 > 0) { - phi_s0 = temp_v0->unk_04; + temp_v0 = &sCameraSettings[camera->setting].cameraModes[camera->mode]; + if (temp_v0->valueCnt > 0) { + phi_s0 = temp_v0->values; phi_s1 = 0; loop_12: - PREG(phi_s0->preg) = phi_s0->val; + PREG(phi_s0->param) = phi_s0->val; if (PREG(82) != 0) { - osSyncPrintf("camera: change camera status: PREG(%02d) = %d\n", phi_s0->preg, phi_s0->val); + osSyncPrintf("camera: change camera status: PREG(%02d) = %d\n", phi_s0->param, phi_s0->val); } temp_s1 = phi_s1 + 1; phi_s0 = phi_s0 + 4; phi_s1 = temp_s1; - if (temp_s1 < D_8011D064[camera->unk_142].unk_04[camera->unk_144].unk_02) { + if (temp_s1 < sCameraSettings[camera->setting].cameraModes[camera->mode].valueCnt) { goto loop_12; } } @@ -1264,10 +3309,8 @@ void Camera_ChangeStatus(Camera* camera, s16 status) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ChangeStatus.s") #endif -// 261 lines #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800584E8.s") -// 296 lines #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800588B4.s") s32 func_80058CF8(Camera* camera) { @@ -1280,81 +3323,6 @@ s32 func_80058CF8(Camera* camera) { return 1; } -// 92 lines (unknown arrays) -extern s16 D_8011DAFC[]; -extern char D_80119F8C[][12]; -#if 0 -char D_80119F8C[][12] = { - "NONE ", - "NORMAL0 ", - "NORMAL1 ", - "DUNGEON0 ", - "DUNGEON1 ", - "NORMAL3 ", - "HORSE0 ", - "BOSS_GOMA ", - "BOSS_DODO ", - "BOSS_BARI ", - "BOSS_FGANON", - "BOSS_BAL ", - "BOSS_SHADES", - "BOSS_MOFA ", - "BOSS_TWIN0 ", - "BOSS_TWIN1 ", - "BOSS_GANON1", - "BOSS_GANON2", - "TOWER0 ", - "TOWER1 ", - "FIXED0 ", - "FIXED1 ", - "CIRCLE0 ", - "CIRCLE2 ", - "CIRCLE3 ", - "PREREND0 ", - "PREREND1 ", - "PREREND3 ", - "DOOR0 ", - "DOORC ", - "RAIL3 ", - "START0 ", - "START1 ", - "FREE0 ", - "FREE2 ", - "CIRCLE4 ", - "CIRCLE5 ", - "DEMO0 ", - "DEMO1 ", - "MORI1 ", - "ITEM0 ", - "ITEM1 ", - "DEMO3 ", - "DEMO4 ", - "UFOBEAN ", - "LIFTBEAN ", - "SCENE0 ", - "SCENE1 ", - "HIDAN1 ", - "HIDAN2 ", - "MORI2 ", - "MORI3 ", - "TAKO ", - "SPOT05A ", - "SPOT05B ", - "HIDAN3 ", - "ITEM2 ", - "CIRCLE6 ", - "NORMAL2 ", - "FISHING ", - "DEMOC ", - "UO_FIBER ", - "DUNGEON2 ", - "TEPPEN ", - "CIRCLE7 ", - "NORMAL4 ", -}; -#endif -extern GlobalContext* D_8015BD7C; -extern s32 D_8011D398; s32 func_80058D34(Camera* camera) { s32 phi_a2 = 0; @@ -1378,7 +3346,7 @@ s32 func_80058D34(Camera* camera) { if (phi_a2 != 0) { D_8011D398 = (D_8011D398 + phi_a2) % 6; if (func_8005A77C(camera, D_8011DAFC[D_8011D398]) > 0) { - osSyncPrintf("camera: force change SET to %s!\n", D_80119F8C[D_8011DAFC[D_8011D398]]); + osSyncPrintf("camera: force change SET to %s!\n", sCameraSettingNames[D_8011DAFC[D_8011D398]]); } } } @@ -1386,10 +3354,8 @@ s32 func_80058D34(Camera* camera) { return 1; } -// 224 lines #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80058E8C.s") -// Long function, 866 lines (lots of debug symbols) #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800591EC.s") void func_80059EC8(Camera* camera) { @@ -1438,34 +3404,30 @@ s32 func_8005A02C(Camera* camera) { return 1; } -// 275 lines (has 2 jtbls) #ifdef NON_MATCHING -extern char D_8011A2A4[21][12]; -extern char D_80119F8C[66][12]; extern s32 D_8011DB14; -s32 func_8005A04C(Camera* camera, s16 type, u8 arg2) { +s32 Camera_ChangeMode(Camera* camera, s16 mode, u8 arg2) { s32 phi_v0; u32 temp_t8; s32 phi_at; if (QREG(89)) { - osSyncPrintf("+=+(%d)+=+ recive request -> %s\n", camera->globalCtx->state.frames, D_8011A2A4[type]); + osSyncPrintf("+=+(%d)+=+ recive request -> %s\n", camera->globalCtx->state.frames, sCameraModeNames[mode]); } if ((camera->unk_14C & 0x20) && (arg2 == 0)) { camera->unk_14A |= 0x20; return -1; - } else if (!((D_8011D064[camera->unk_142].unk_00 & 0x3FFFFFFF) & (1 << type))) { - if (type == 6) { - camera = camera; - osSyncPrintf("camera: error sound\n", camera); + } else if (!(sCameraSettings[camera->setting].validModes & (1 << mode))) { + if (mode == CAM_MODE_SUBJECT) { + osSyncPrintf("camera: error sound\n"); func_80078884(NA_SE_SY_ERROR); } - if (camera->unk_144 != 0) { - osSyncPrintf("\x1b[43;30mcamera: change camera mode: force NORMAL: %s %s refused\n\x1b[m", - D_80119F8C[camera->unk_142], D_8011A2A4[type]); - camera->unk_144 = 0; - func_80045128(camera, camera->unk_144); + if (camera->mode != CAM_MODE_NORMAL) { + osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: change camera mode: force NORMAL: %s %s refused\n" VT_RST, + sCameraSettingNames[camera->setting], sCameraModeNames[mode]); + camera->mode = CAM_MODE_NORMAL; + Camera_CopyModeValuesToPREG(camera, camera->mode); func_8005A02C(camera); phi_at = 0xC0000000; } else { @@ -1473,7 +3435,7 @@ s32 func_8005A04C(Camera* camera, s16 type, u8 arg2) { camera->unk_14A = (s16)(camera->unk_14A | 2); return 0; } - } else if ((type == camera->unk_144) && (arg2 == 0)) { + } else if ((mode == camera->mode) && (arg2 == 0)) { camera->unk_14A |= 0x20; camera->unk_14A |= 2; return -1; @@ -1481,10 +3443,10 @@ s32 func_8005A04C(Camera* camera, s16 type, u8 arg2) { camera->unk_14A |= 0x20; camera->unk_14A |= 2; camera = camera; - func_80045128(camera, type); - temp_t8 = type - 1; + Camera_CopyModeValuesToPREG(camera, mode); + temp_t8 = mode - 1; phi_v0 = 0; - switch (type) { + switch (mode) { default: break; case 5: // switch 1 @@ -1495,9 +3457,9 @@ s32 func_8005A04C(Camera* camera, s16 type, u8 arg2) { break; case 1: // switch 1 phi_v0 = 0; - if (camera->unk_A8 != NULL) { + if (camera->target != NULL) { phi_v0 = 0; - if (camera->unk_A8->x != 0x32) { + if (camera->target->id != ACTOR_EN_BOOM) { phi_v0 = 8; } } @@ -1511,7 +3473,7 @@ s32 func_8005A04C(Camera* camera, s16 type, u8 arg2) { break; } - switch (camera->unk_144) { + switch (camera->mode) { default: break; case 6: // switch 2 @@ -1574,93 +3536,282 @@ s32 func_8005A04C(Camera* camera, s16 type, u8 arg2) { } } func_8005A02C(camera); - camera->unk_144 = type; + camera->mode = mode; phi_at = 0x80000000; } - return type | phi_at; + return mode | phi_at; } #else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8005A04C.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ChangeMode.s") #endif -void func_8005A444(Camera* camera, s16 b) { - func_8005A04C(camera, b, 0); +void func_8005A444(Camera* camera, s16 arg1) { + Camera_ChangeMode(camera, arg1, 0); } -// 57 lines (unknown arrays) -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8005A470.s") +s32 func_8005A470(Camera* camera, s16 arg1) { + s32 phi_return; -// 154 lines (unknown arrays) -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8005A548.s") - -s32 func_8005A77C(Camera* camera, s16 b) { - return func_8005A548(camera, b, 0); + if (QREG(89) != 0) { + osSyncPrintf("+=+=+=+ recive asking -> %s (%s)\n", sCameraModeNames[arg1], + sCameraSettingNames[camera->setting]); + } + if (!(sCameraSettings[camera->setting].validModes & (1 << arg1))) { + return 0; + } else if (arg1 == camera->mode) { + return -1; + } else { + return arg1 | 0x80000000; + } } -// 79 lines (unknown arrays) -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8005A7A8.s") - -// 47 lines (has lwl/lwr) -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8005A8C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8005A948.s") - -// 80 lines (has lwl/lwr) -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8005A970.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8005A9CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8005AA1C.s") - #ifdef NON_MATCHING -// Ordering -s32 func_8005AA90(Camera* arg0, s32 arg1, Vec3f* arg2) { - Vec3f sp4; +s16 Camera_ChangeSetting(Camera* camera, s16 setting, s16 arg2) { + s16 temp_t1; + s32 t; - if (arg2 != NULL) { - switch (arg1) { - case 1: - arg0->unk_15C &= ~0x19; - arg0->at = *arg2; - break; - case 16: - arg0->unk_15C &= ~0x19; - arg0->unk_AC = *arg2; - break; - case 8: - if (arg0->unk_142 == 0x3C || arg0->unk_142 == 0x2B) { - break; - } - arg0->unk_A8 = arg2; - arg0->unk_15C &= ~0x19; - break; - case 2: - sp4 = *arg2; - arg0->eye = arg0->unk_74 = sp4; - break; - case 4: - arg0->unk_68 = *arg2; - break; - case 32: - arg0->unk_FC = arg2->x; - break; - case 0x40: - arg0->unk_15A = arg2->x * (M_PI / 180.0f) + 0.5f; - break; - default: - return 0; - } - arg0->unk_15C |= arg1; - return 1; + if ((camera->unk_14A & 1) && (((sCameraSettings[camera->setting].unk_00 & 0xF000000) >> 0x18) >= + (sCameraSettings[setting].unk_00 & 0xF000000) >> 0x18)) { + camera->unk_14A |= 0x10; + return -2; } - return 0; + + if ((setting == CAM_SET_SPOT05A || setting == CAM_SET_SPOT05B) && LINK_IS_ADULT && + (camera->globalCtx->sceneNum == 0x56)) { + camera->unk_14A |= 0x10; + return -5; + } + + if (setting == CAM_SET_NONE || setting >= CAM_SET_MAX) { + osSyncPrintf(VT_COL(RED, WHITE) "camera: error: illegal camera set (%d) !!!!\n" VT_RST, setting); + return -0x63; + } + + if (setting == camera->setting && !(arg2 & 1)) { + camera->unk_14A |= 0x10; + if (!(arg2 & 2)) { + camera->unk_14A |= 1; + } + return -1; + } + + camera->unk_14A |= 0x10; + + if (1 && !(arg2 & 2)) { + camera->unk_14A |= 1; + } + + camera->unk_14C |= (0x8 | 0x4); + camera->unk_14C &= ~(0x1000 | 0x8); + if (!(sCameraSettings[camera->setting].unk_bit1)) { + camera->unk_154 = camera->setting; + } + + t = sCameraSettings[camera->setting].unk_00 & 0x40000000; + if (arg2 & 8) { + camera->unk_148 = camera->unk_166; + camera->unk_166 = -1; + } else if (!(arg2 & 4)) { + if (!t) { + camera->unk_166 = camera->unk_148; + } + camera->unk_148 = -1; + } + + camera->setting = setting; + + if (Camera_ChangeMode(camera, camera->mode, 1) >= 0) { + Camera_CopyModeValuesToPREG(camera, camera->mode); + } + + osSyncPrintf(VT_SGR("1") "%06u:" VT_RST " camera: change camera[%d] set %s\n", camera->globalCtx->state.frames, + camera->unk_164, sCameraSettingNames[camera->setting]); + + return setting; } #else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8005AA90.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ChangeSetting.s") #endif -s32 func_8005AC48(Camera* camera, s16 b) { - camera->unk_14C = b; +s32 func_8005A77C(Camera* camera, s16 setting) { + return Camera_ChangeSetting(camera, setting, 0); +} + +#ifdef NON_MATCHING +s16 func_8005A7A8(Camera* arg0, s32 arg1) { + s16 temp_v0; + s16 temp_v1; + + if (arg1 == -1 || arg1 == arg0->unk_148) { + arg0->unk_14A |= 0x40; + return -1; + } else if (!(arg0->unk_14A & 0x40)) { + temp_v0 = func_80044740(arg0, arg1); + arg0->unk_14A |= 0x40; + temp_v1 = (Camera_ChangeSetting(arg0, temp_v0, 5) < 0) ^ 1; + if ((temp_v1 != 0) || sCameraSettings[arg0->setting].unk_00 & 0x80000000) { + arg0->unk_148 = arg1; + arg0->unk_14A |= 4; + Camera_CopyModeValuesToPREG(arg0, arg0->mode); + } else if (temp_v1 < -1) { + osSyncPrintf(VT_COL(RED, WHITE) "camera: error: illegal camera ID (%d) !! (%d|%d|%d)\n" VT_RST, arg1, + arg0->unk_164, 0x32, temp_v0); + } + return temp_v1; + } +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8005A7A8.s") +#endif + +#ifdef NON_MATCHING +// this code uses lw, then lhu. D_8015CD46 is probably part of a struct. +Vec3s* func_8005A8C4(Vec3s* arg0, Camera* camera) { + if (D_8011D394 != 0) { + *arg0 = D_8015CE46; + return arg0; + } else { + *arg0 = camera->unk_134; + return arg0; + } +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8005A8C4.s") +#endif + +s16 func_8005A948(Camera* camera) { + Vec3s sp18; + + func_8005A8C4(&sp18, camera); + return sp18.y; +} + +#ifdef NON_MATCHING +// Same issue as func_8005A8C4 +Vec3s* func_8005A970(Vec3s* arg0, Camera* arg1) { + if (D_8011D394 != 0) { + *arg0 = D_8015CE46; + return arg0; + } else { + *arg0 = arg1->unk_13A; + return arg0; + } +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8005A970.s") +#endif + +s16 func_8005A9CC(s32 arg0) { + Vec3s sp18; + + func_8005A970(&sp18, arg0); + return sp18.x; +} + +s16 func_8005A9F4(Camera* camera) { + Vec3s sp18; + + func_8005A970(&sp18, camera); + return sp18.y; +} + +s32 func_8005AA1C(Camera* camera, s32 arg1, s16 y, s32 countdown) { + s16 quakeIdx; + + quakeIdx = Quake_Add(camera, 3); + if (quakeIdx == 0) { + return 0; + } + Quake_SetSpeed(quakeIdx, 0x61A8); + Quake_SetQuakeValues(quakeIdx, y, 0, 0, 0); + Quake_SetCountdown(quakeIdx, countdown); + return 1; +} + +#ifdef NON_MATCHING +// additional move v0, zero added. +s32 Camera_SetParam(Camera* camera, s32 param, void* value) { + s32 pad; + Vec3f sp4; + + if (value != NULL) { + switch (param) { + case 1: + camera->unk_15C &= ~(0x10 | 0x8 | 0x1); + camera->at = *(Vec3f*)value; + break; + case 16: + camera->unk_15C &= ~(0x10 | 0x8 | 0x1); + camera->targetPosRot.pos = *(Vec3f*)value; + break; + case 8: + if (camera->setting == CAM_SET_DEMOC || camera->setting == CAM_SET_DEMO4) { + break; + } + camera->target = (Actor*)value; + camera->unk_15C &= ~(0x10 | 0x8 | 0x1); + break; + case 2: + sp4 = *(Vec3f*)value; + camera->eyeNext = sp4; + camera->eye = sp4; + break; + case 4: + camera->unk_68 = *(Vec3f*)value; + break; + case 0x40: + camera->roll = *(f32*)value * (M_PI / 180.0f) + 0.5f; + break; + case 32: + camera->fov = *(f32*)value; + break; + case 3: + case 5: + case 6: + case 7: + case 9: + case 10: + case 11: + case 12: + case 13: + case 14: + case 15: + case 17: + case 18: + case 19: + case 20: + case 21: + case 22: + case 23: + case 24: + case 25: + case 26: + case 27: + case 28: + case 29: + case 30: + case 31: + return false; + default: + return false; + } + camera->unk_15C |= param; + return true; + } else { + return false; + } +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_SetParam.s") +#endif + +s32 func_8005AC24(Camera* camera, s16 arg1) { + camera->unk_15C &= ~arg1; + return true; +} + +s32 func_8005AC48(Camera* camera, s16 arg1) { + camera->unk_14C = arg1; return 1; } @@ -1669,17 +3820,18 @@ s32 func_8005AC60(Camera* camera) { return 1; } -s32 func_8005AC6C(Camera* camera, s32 b, s32 c, Player* d, s16 e) { +s32 func_8005AC6C(Camera* camera, CutsceneCameraPoint* atPoints, CutsceneCameraPoint* eyePoints, Player* player, + s16 relativeToPlayer) { PosRot sp24; - camera->unk_124 = b; - camera->unk_128 = c; - camera->unk_12C = e; + camera->atPoints = atPoints; + camera->eyePoints = eyePoints; + camera->relativeToPlayer = relativeToPlayer; - if (camera->unk_12C != 0) { - camera->player = d; - func_8002EF44(&sp24, &d->actor); - camera->unk_94 = sp24; + if (camera->relativeToPlayer != 0) { + camera->player = player; + func_8002EF44(&sp24, &player->actor); + camera->playerPosRot = sp24; camera->unk_156 = -1; camera->unk_D8 = 0.0f; @@ -1689,49 +3841,48 @@ s32 func_8005AC6C(Camera* camera, s32 b, s32 c, Player* d, s16 e) { return 1; } -s16 func_8005ACFC(Camera* camera, s16 b) { - camera->unk_14C |= b; +s16 func_8005ACFC(Camera* camera, s16 arg1) { + camera->unk_14C |= arg1; return camera->unk_14C; } -s16 func_8005AD1C(Camera* camera, s16 b) { - camera->unk_14C &= ~b; +s16 func_8005AD1C(Camera* camera, s16 arg1) { + camera->unk_14C &= ~arg1; return camera->unk_14C; } -s32 func_8005AD40(Camera* camera, s32 a, s16 b, f32 c, s16 d, s16 e, s16 f) { - if ((camera->unk_142 == 43) || (camera->unk_142 == 29)) { +s32 func_8005AD40(Camera* camera, Actor* doorActor, s16 arg2, f32 arg3, s16 arg4, s16 arg5, s16 arg6) { + if ((camera->setting == CAM_SET_DEMO4) || (camera->setting == CAM_SET_DOORC)) { return 0; } - camera->unk_00 = a; - camera->unk_06 = d; - camera->unk_08 = e; - camera->unk_0A = f; - camera->unk_04 = b; + camera->unk_00.doorCam.door = doorActor; + camera->unk_00.doorCam.unk_06 = arg4; + camera->unk_00.doorCam.unk_08 = arg5; + camera->unk_00.doorCam.unk_0A = arg6; + camera->unk_00.doorCam.unk_04 = arg2; - if (b == -99) { - func_80045128(camera, camera->unk_144); + if (arg2 == -99) { + Camera_CopyModeValuesToPREG(camera, camera->mode); return -99; } - if (b == -1) { - func_8005A77C(camera, 29); - osSyncPrintf(".... change default door camera (set %d)\n", 29); + if (arg2 == -1) { + func_8005A77C(camera, CAM_SET_DOORC); + osSyncPrintf(".... change default door camera (set %d)\n", CAM_SET_DOORC); } else { - s32 ret = func_80044740(camera, b); + s32 ret = func_80044740(camera, arg2); camera->unk_14A |= 0x40; if (func_8005A77C(camera, ret) >= 0) { - camera->unk_148 = b; + camera->unk_148 = arg2; camera->unk_14A |= 4; } - // this is likely important for labelling unk_148 and unk_142 - osSyncPrintf("....change door camera ID %d (set %d)\n", camera->unk_148, camera->unk_142); + osSyncPrintf("....change door camera ID %d (set %d)\n", camera->unk_148, camera->setting); } - func_80045128(camera, camera->unk_144); + Camera_CopyModeValuesToPREG(camera, camera->mode); return -1; } @@ -1746,20 +3897,20 @@ s32 func_8005AE64(Camera* camera, Camera* otherCamera) { camera->at = otherCamera->at; sp30 = otherCamera->eye; - camera->unk_74 = sp30; + camera->eyeNext = sp30; camera->eye = sp30; - camera->unk_DC = func_8007BF90(&camera->at, &camera->eye); - camera->unk_FC = otherCamera->unk_FC; - camera->unk_15A = otherCamera->unk_15A; + camera->dist = func_8007BF90(&camera->at, &camera->eye); + camera->fov = otherCamera->fov; + camera->roll = otherCamera->roll; func_80043B60(camera); if (camera->player != NULL) { - func_8002EF14(&camera->unk_94, &camera->player->actor); - camera->unk_E4.x = camera->at.x - camera->unk_94.pos.x; - camera->unk_E4.y = camera->at.y - camera->unk_94.pos.y; - camera->unk_E4.z = camera->at.z - camera->unk_94.pos.z; - camera->unk_DC = func_8007BF90(&camera->unk_94.pos, &camera->eye); + func_8002EF14(&camera->playerPosRot, &camera->player->actor); + camera->unk_E4.x = camera->at.x - camera->playerPosRot.pos.x; + camera->unk_E4.y = camera->at.y - camera->playerPosRot.pos.y; + camera->unk_E4.z = camera->at.z - camera->playerPosRot.pos.z; + camera->dist = func_8007BF90(&camera->playerPosRot.pos, &camera->eye); camera->unk_CC.x = 1.0f; camera->unk_CC.y = 1.0f; } @@ -1775,26 +3926,26 @@ Vec3f* func_8005AFB4(Vec3f* dst, Camera* camera) { return dst; } -// Unused -void Camera_SetCameraData(Camera* camera, s16 b, s32 c, s32 d, s16 e, s16 f) { - if (b & 0x1) { - camera->unk_124 = c; +void Camera_SetCameraData(Camera* camera, s16 arg1, CutsceneCameraPoint* atPoints, CutsceneCameraPoint* eyePoints, + s16 relativeToPlayer, s16 arg5) { + if (arg1 & 0x1) { + camera->atPoints = atPoints; } - if (b & 0x2) { - camera->unk_128 = d; + if (arg1 & 0x2) { + camera->eyePoints = eyePoints; } - if (b & 0x4) { - camera->unk_12C = e; + if (arg1 & 0x4) { + camera->relativeToPlayer = relativeToPlayer; } - if (b & 0x8) { - camera->unk_12E = f; + if (arg1 & 0x8) { + camera->unk_12E = arg5; } - if (b & 0x10) { - osSyncPrintf(VT_COL(RED, WHITE) "camera: setCameraData: last argument not alive!\n" VT_RST, b); + if (arg1 & 0x10) { + osSyncPrintf(VT_COL(RED, WHITE) "camera: setCameraData: last argument not alive!\n" VT_RST); } } diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 36b47ee591..f30789f695 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -1372,7 +1372,7 @@ s32 Cutscene_Command_07(GlobalContext* globalCtx, CutsceneContext* csCtx, u8* cm Gameplay_ChangeCameraStatus(globalCtx, csCtx->unk_14, 7); func_800C0874(globalCtx, csCtx->unk_14, 0x21); sp28 = csCtx->cameraFocus->cameraRoll * 1.40625f; - func_8005AA90(sp2C, 64, &sp28); + Camera_SetParam(sp2C, 64, &sp28); sp3C.x = csCtx->cameraFocus->pos.x; sp3C.y = csCtx->cameraFocus->pos.y; sp3C.z = csCtx->cameraFocus->pos.z; diff --git a/src/code/z_play.c b/src/code/z_play.c index 41726cb110..7e47deb9c1 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -1235,7 +1235,7 @@ void Gameplay_Draw(GlobalContext* globalCtx) { if ((HREG(80) != 10) || (HREG(83) != 0)) { if (globalCtx->skyboxCtx.unk_140 != 0) { - if (ACTIVE_CAM->unk_142 != 0x19) { + if (ACTIVE_CAM->setting != 0x19) { Vec3f sp74; func_8005AFB4(&sp74, ACTIVE_CAM); SkyboxDraw_Draw(&globalCtx->skyboxCtx, gfxCtx, globalCtx->skyboxId, 0, @@ -1605,13 +1605,13 @@ s32 func_800C04D8(GlobalContext* globalCtx, s16 camId, Vec3f* arg2, Vec3f* arg3) camera = globalCtx->cameraPtrs[camIdx]; - ret = func_8005AA90(camera, 1, arg2); + ret = Camera_SetParam(camera, 1, arg2); ret *= 2; - ret |= func_8005AA90(camera, 2, arg3); + ret |= Camera_SetParam(camera, 2, arg3); if (1) {} // Necessary to match - camera->unk_DC = Math3D_Vec3f_DistXYZ(arg2, arg3); + camera->dist = Math3D_Vec3f_DistXYZ(arg2, arg3); player = camera->player; if (player != NULL) { @@ -1639,13 +1639,13 @@ s32 func_800C05E4(GlobalContext* globalCtx, s16 camId, Vec3f* arg2, Vec3f* arg3, if (1) {} // Probably necessary to match - ret = func_8005AA90(camera, 1, arg2); + ret = Camera_SetParam(camera, 1, arg2); ret *= 2; - ret |= func_8005AA90(camera, 2, arg3); + ret |= Camera_SetParam(camera, 2, arg3); ret *= 2; - ret |= func_8005AA90(camera, 4, arg4); + ret |= Camera_SetParam(camera, 4, arg4); - camera->unk_DC = func_800CB678(arg2, arg3); + camera->dist = func_800CB678(arg2, arg3); player = camera->player; if (player != NULL) { @@ -1667,7 +1667,7 @@ s32 func_800C05E4(GlobalContext* globalCtx, s16 camId, Vec3f* arg2, Vec3f* arg3, #ifdef NON_MATCHING // missing an extra move instruction s32 func_800C0704(GlobalContext* globalCtx, s16 camId, f32 arg2) { - return (func_8005AA90(globalCtx->cameraPtrs[camId], 32, &arg2) & 1); + return (Camera_SetParam(globalCtx->cameraPtrs[camId], 32, &arg2) & 1); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0704.s") @@ -1678,7 +1678,7 @@ s32 func_800C0744(GlobalContext* globalCtx, s16 camId, s16 arg2) { Camera* camera; camera = globalCtx->cameraPtrs[camIdx]; - camera->unk_15A = arg2; + camera->roll = arg2; return 1; } diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 677ae8a686..c1630564da 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -248,7 +248,7 @@ void func_8008EEAC(GlobalContext* globalCtx, UNK_PTR arg1) { player->unk_664 = arg1; player->unk_684 = arg1; player->stateFlags1 |= 0x10000; - func_8005AA90(Gameplay_GetCamera(globalCtx, 0), 8, arg1); + Camera_SetParam(Gameplay_GetCamera(globalCtx, 0), 8, arg1); func_8005A444(Gameplay_GetCamera(globalCtx, 0), 2); } #else diff --git a/src/code/z_room.c b/src/code/z_room.c index bf3ab98e3c..dbde895fbe 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -345,7 +345,7 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) { camera = ACTIVE_CAM; polygon1 = &room->mesh->polygon1; - sp9C = (camera->unk_142 ^ 25) == 0; + sp9C = (camera->setting ^ 25) == 0; polygonDlist = SEGMENTED_TO_VIRTUAL(polygon1->dlist); sp98 = (flags & 1) && sp9C && polygon1->single.source && !(SREG(25) & 1); sp94 = (flags & 1) && polygonDlist->opa && !(SREG(25) & 2); @@ -390,13 +390,6 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 691); } -typedef struct { - char unk_00[0x0E]; - s16 unk_0E; -} struct_80041C10_ret; - -extern struct_80041C10_ret* func_80041C10(CollisionContext*, s32, s32); - BgImage* func_80096A74(PolygonType1* polygon1, GlobalContext* globalCtx) { Camera* camera; s32 camId; @@ -450,7 +443,7 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) { Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 752); camera = ACTIVE_CAM; - sp98 = (camera->unk_142 ^ 25) == 0; + sp98 = (camera->setting ^ 25) == 0; polygon1 = &room->mesh->polygon1; polygonDlist = SEGMENTED_TO_VIRTUAL(polygon1->dlist); bgImage = func_80096A74(polygon1, globalCtx); 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 79a75b8cc2..2fbf15fab3 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 @@ -348,7 +348,7 @@ void func_8086C874(BgBdanObjects* this, GlobalContext* globalCtx) { } if (this->unk_168 == 0) { if (func_8004356C(&this->dyna.actor)) { - this->unk_1B8 = globalCtx->cameraPtrs[0]->unk_142; + this->unk_1B8 = globalCtx->cameraPtrs[0]->setting; func_8005A77C(globalCtx->cameraPtrs[0], 0x3A); func_8005AD1C(globalCtx->cameraPtrs[0], 4); this->unk_168 = 0xAU;