mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 22:44:30 +00:00
Code Issues Projects Releases Wiki Activity

Decompile z_camera data, and some camera WIP (#173)

Browse source 
* cleanup

* name camera action functions

* decompile a few small functions, name a few Camera struct members

* decompile camera data, decompile a few camera functions

* Split ASM for code_800BB0A0

* removing code_800BB0A0.s

* PR Requests, Camera WIP

* remove #define NON_MATCHING from db_camera
This commit is contained in:
krimtonz 2020-06-01 16:54:47 -05:00 • committed by GitHub
parent 08aaba0d2c
commit 77137f5a04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
76 changed files with 3967 additions and 2282 deletions
Download patch file Download diff file Expand all files Collapse all files

144
asm/non_matchings/code/code_800BB0A0/func_800BB0A0.s Normal file
View file

@ -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)

147
asm/code_800BB0A0.s → asm/non_matchings/code/code_800BB0A0/func_800BB2B4.s
View file

@ -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)

8
asm/non_matchings/code/z_camera/func_8004B5A0.s → asm/non_matchings/code/z_camera/Camera_Battle1.s
View file

@ -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

8
asm/non_matchings/code/z_camera/func_8004C634.s → asm/non_matchings/code/z_camera/Camera_Battle4.s
View file

@ -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:

22
asm/non_matchings/code/z_camera/func_8005A04C.s → asm/non_matchings/code/z_camera/Camera_ChangeMode.s
View file

@ -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)

18
asm/non_matchings/code/z_camera/func_8005A548.s → asm/non_matchings/code/z_camera/Camera_ChangeSetting.s
View file

@ -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,10 +43,10 @@ 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:
@ -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

4
asm/non_matchings/code/z_camera/Camera_ChangeStatus.s
View file

@ -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

6
asm/non_matchings/code/z_camera/func_80045128.s → asm/non_matchings/code/z_camera/Camera_CopyModeValuesToPREG.s
View file

@ -8,7 +8,7 @@ glabel D_801390B4
.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)

6
asm/non_matchings/code/z_camera/func_80045254.s → asm/non_matchings/code/z_camera/Camera_CopyPREGToModeValues.s
View file

@ -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

8
asm/non_matchings/code/z_camera/func_80051250.s → asm/non_matchings/code/z_camera/Camera_Data4.s
View file

@ -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)

6
asm/non_matchings/code/z_camera/func_800544D0.s → asm/non_matchings/code/z_camera/Camera_Demo1.s
View file

@ -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)

10
asm/non_matchings/code/z_camera/func_80054794.s → asm/non_matchings/code/z_camera/Camera_Demo3.s
View file

@ -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

6
asm/non_matchings/code/z_camera/func_8005529C.s → asm/non_matchings/code/z_camera/Camera_Demo5.s
View file

@ -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
@ -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:

8
asm/non_matchings/code/z_camera/func_80055C78.s → asm/non_matchings/code/z_camera/Camera_Demo6.s
View file

@ -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
@ -35,11 +35,11 @@ glabel func_80055C78
.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:

8
asm/non_matchings/code/z_camera/func_80055FB8.s → asm/non_matchings/code/z_camera/Camera_Demo9.s
View file

@ -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)

8
asm/non_matchings/code/z_camera/func_8004F6A4.s → asm/non_matchings/code/z_camera/Camera_Fixed1.s
View file

@ -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)

8
asm/non_matchings/code/z_camera/func_8004F9D8.s → asm/non_matchings/code/z_camera/Camera_Fixed2.s
View file

@ -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:

8
asm/non_matchings/code/z_camera/func_8004FDE4.s → asm/non_matchings/code/z_camera/Camera_Fixed3.s
View file

@ -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)

8
asm/non_matchings/code/z_camera/func_80050068.s → asm/non_matchings/code/z_camera/Camera_Fixed4.s
View file

@ -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)

8
asm/non_matchings/code/z_camera/func_80049A48.s → asm/non_matchings/code/z_camera/Camera_Jump1.s
View file

@ -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:

8
asm/non_matchings/code/z_camera/func_8004A250.s → asm/non_matchings/code/z_camera/Camera_Jump2.s
View file

@ -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:

8
asm/non_matchings/code/z_camera/func_8004ACE0.s → asm/non_matchings/code/z_camera/Camera_Jump3.s
View file

@ -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)

8
asm/non_matchings/code/z_camera/func_8004F3A4.s → asm/non_matchings/code/z_camera/Camera_KeepOn0.s
View file

@ -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

8
asm/non_matchings/code/z_camera/func_8004CA6C.s → asm/non_matchings/code/z_camera/Camera_KeepOn1.s
View file

@ -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:

8
asm/non_matchings/code/z_camera/func_8004D9E4.s → asm/non_matchings/code/z_camera/Camera_KeepOn3.s
View file

@ -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:

10
asm/non_matchings/code/z_camera/func_8004E460.s → asm/non_matchings/code/z_camera/Camera_KeepOn4.s
View file

@ -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)

8
asm/non_matchings/code/z_camera/func_800473A0.s → asm/non_matchings/code/z_camera/Camera_Normal1.s
View file

@ -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:

10
asm/non_matchings/code/z_camera/func_80047F64.s → asm/non_matchings/code/z_camera/Camera_Normal2.s
View file

@ -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:

8
asm/non_matchings/code/z_camera/func_80048804.s → asm/non_matchings/code/z_camera/Camera_Normal3.s
View file

@ -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:

8
asm/non_matchings/code/z_camera/func_8004900C.s → asm/non_matchings/code/z_camera/Camera_Parallel1.s
View file

@ -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:

13
asm/non_matchings/code/z_camera/func_8005AA90.s → asm/non_matchings/code/z_camera/Camera_SetParam.s
View file

@ -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

2
asm/non_matchings/code/z_camera/func_80056654.s → asm/non_matchings/code/z_camera/Camera_Special4.s
View file

@ -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)

8
asm/non_matchings/code/z_camera/func_800567F8.s → asm/non_matchings/code/z_camera/Camera_Special5.s
View file

@ -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
@ -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:

8
asm/non_matchings/code/z_camera/func_80056F6C.s → asm/non_matchings/code/z_camera/Camera_Special6.s
View file

@ -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)
@ -31,11 +31,11 @@ glabel func_80056F6C
.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:

2
asm/non_matchings/code/z_camera/func_80056C20.s → asm/non_matchings/code/z_camera/Camera_Special7.s
View file

@ -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

10
asm/non_matchings/code/z_camera/func_80057448.s → asm/non_matchings/code/z_camera/Camera_Special9.s
View file

@ -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
@ -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
@ -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)
@ -467,7 +467,7 @@ glabel L80057A38
/* 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

8
asm/non_matchings/code/z_camera/func_8005049C.s → asm/non_matchings/code/z_camera/Camera_Subj3.s
View file

@ -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

8
asm/non_matchings/code/z_camera/func_80050B24.s → asm/non_matchings/code/z_camera/Camera_Subj4.s
View file

@ -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:

12
asm/non_matchings/code/z_camera/func_80052460.s → asm/non_matchings/code/z_camera/Camera_Unique0.s
View file

@ -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

8
asm/non_matchings/code/z_camera/func_800515A4.s → asm/non_matchings/code/z_camera/Camera_Unique1.s
View file

@ -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:

8
asm/non_matchings/code/z_camera/func_80051B3C.s → asm/non_matchings/code/z_camera/Camera_Unique2.s
View file

@ -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:

12
asm/non_matchings/code/z_camera/func_80051F58.s → asm/non_matchings/code/z_camera/Camera_Unique3.s
View file

@ -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)

8
asm/non_matchings/code/z_camera/func_80052B90.s → asm/non_matchings/code/z_camera/Camera_Unique7.s
View file

@ -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

10
asm/non_matchings/code/z_camera/func_80052E0C.s → asm/non_matchings/code/z_camera/Camera_Unique9.s
View file

@ -81,7 +81,7 @@ 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)
@ -104,11 +104,11 @@ glabel func_80052E0C
.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)
@ -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)

41
asm/non_matchings/code/z_camera/func_800443A0.s
View file

@ -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

28
asm/non_matchings/code/z_camera/func_800499A4.s
View file

@ -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

104
asm/non_matchings/code/z_camera/func_80052A18.s
View file

@ -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

24
asm/non_matchings/code/z_camera/func_80054478.s
View file

@ -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

15
asm/non_matchings/code/z_camera/func_80055F64.s
View file

@ -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

129
asm/non_matchings/code/z_camera/func_80056450.s
View file

@ -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

24
asm/non_matchings/code/z_camera/func_80057C6C.s
View file

@ -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)

2
asm/non_matchings/code/z_camera/func_80058148.s
View file

@ -122,7 +122,7 @@ 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

16
asm/non_matchings/code/z_camera/func_800584E8.s
View file

@ -132,9 +132,9 @@ 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
@ -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
@ -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

10
asm/non_matchings/code/z_camera/func_800588B4.s
View file

@ -23,11 +23,11 @@ glabel func_800588B4
/* ACFA70 800588D0 11C0000A */ beqz $t6, .L800588FC
/* 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
@ -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
@ -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)

40
asm/non_matchings/code/z_camera/func_800591EC.s
View file

@ -371,11 +371,11 @@ glabel func_800591EC
/* AD07F8 80059658 1120000D */ beqz $t1, .L80059690
/* 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,19 +389,19 @@ 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
/* AD0884 800596E4 1000000E */ b .L80059720
@ -462,12 +462,12 @@ 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
/* AD0978 800597D8 90CD1D6C */ lbu $t5, 0x1d6c($a2)
@ -475,16 +475,16 @@ glabel func_800591EC
/* 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
.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)
@ -510,25 +510,25 @@ glabel func_800591EC
/* 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)

65
asm/non_matchings/code/z_camera/func_8005A470.s
View file

@ -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

8
asm/non_matchings/code/z_camera/func_8005A7A8.s
View file

@ -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,11 +46,11 @@ 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
@ -59,7 +59,7 @@ glabel func_8005A7A8
/* 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

6
asm/non_matchings/code/z_play/func_800C05E4.s
View file

@ -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

2
asm/non_matchings/code/z_play/func_800C0704.s
View file

@ -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

2
asm/non_matchings/code/z_player_lib/func_8008EEAC.s
View file

@ -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

2
asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F08C.s
View file

@ -36,7 +36,7 @@ glabel func_80A5F08C
/* 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

2
asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s
View file

@ -45,7 +45,7 @@ glabel func_80A5F414
/* 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)
/* 041E4 80A5F4D4 24050038 */ addiu $a1, $zero, 0x0038 ## $a1 = 00000038

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s
View file

@ -367,7 +367,7 @@ glabel func_8083B040
/* 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
/* 0937C 8083B58C 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C

6
asm/non_matchings/overlays/actors/ovl_player_actor/func_808486A8.s
View file

@ -39,7 +39,7 @@ glabel func_808486A8
/* 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)
@ -90,7 +90,7 @@ glabel func_808486A8
/* 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)
@ -111,7 +111,7 @@ glabel func_808486A8
/* 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)

148
data/z_camera.data.s
View file

@ -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

28
include/functions.h
View file

@ -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(?);

18
include/variables.h
View file

@ -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;

158
include/z64.h
View file

@ -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;

4
spec
View file

@ -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"

5
src/code/code_800BB0A0.c Normal file
View file

@ -0,0 +1,5 @@
#include <global.h>
#pragma GLOBAL_ASM("asm/non_matchings/code/code_800BB0A0/func_800BB0A0.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_800BB0A0/func_800BB2B4.s")

3565
src/code/z_camera.c
View file

File diff suppressed because it is too large Load diff

2
src/code/z_demo.c
View file

@ -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;

20
src/code/z_play.c
View file

@ -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;
}

2
src/code/z_player_lib.c
View file

@ -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

11
src/code/z_room.c
View file

@ -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);

2
src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c
View file

@ -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;