diff --git a/asm/non_matchings/code/code_80110450/func_801104C8.s b/asm/non_matchings/code/code_80110450/func_801104C8.s index 85f0530234..665b57b042 100644 --- a/asm/non_matchings/code/code_80110450/func_801104C8.s +++ b/asm/non_matchings/code/code_80110450/func_801104C8.s @@ -233,7 +233,7 @@ glabel L8011079C /* B8795C 801107BC A4600000 */ sh $zero, ($v1) /* B87960 801107C0 0C01D7C5 */ jal func_80075F14 /* B87964 801107C4 02A02025 */ move $a0, $s5 -/* B87968 801107C8 0C02CE10 */ jal func_800B3840 +/* B87968 801107C8 0C02CE10 */ jal ShrinkWindow_SetVal /* B8796C 801107CC 24040020 */ li $a0, 32 /* B87970 801107D0 10000064 */ b .L80110964 /* B87974 801107D4 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/non_matchings/code/db_camera/func_800B3840.s b/asm/non_matchings/code/db_camera/func_800B3840.s deleted file mode 100644 index 9c051bd8e7..0000000000 --- a/asm/non_matchings/code/db_camera/func_800B3840.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800B3840 -/* B2A9E0 800B3840 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B2A9E4 800B3844 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B2A9E8 800B3848 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2A9EC 800B384C AFBF0014 */ sw $ra, 0x14($sp) -/* B2A9F0 800B3850 AFA40018 */ sw $a0, 0x18($sp) -/* B2A9F4 800B3854 844E1074 */ lh $t6, 0x1074($v0) -/* B2A9F8 800B3858 24010013 */ li $at, 19 -/* B2A9FC 800B385C 55C10009 */ bnel $t6, $at, .L800B3884 -/* B2AA00 800B3860 8FBF0014 */ lw $ra, 0x14($sp) -/* B2AA04 800B3864 844F1076 */ lh $t7, 0x1076($v0) -/* B2AA08 800B3868 24010001 */ li $at, 1 -/* B2AA0C 800B386C 3C048014 */ lui $a0, %hi(D_80143100) # $a0, 0x8014 -/* B2AA10 800B3870 15E10003 */ bne $t7, $at, .L800B3880 -/* B2AA14 800B3874 24843100 */ addiu $a0, %lo(D_80143100) # addiu $a0, $a0, 0x3100 -/* B2AA18 800B3878 0C00084C */ jal osSyncPrintf -/* B2AA1C 800B387C 8FA50018 */ lw $a1, 0x18($sp) -.L800B3880: -/* B2AA20 800B3880 8FBF0014 */ lw $ra, 0x14($sp) -.L800B3884: -/* B2AA24 800B3884 8FB80018 */ lw $t8, 0x18($sp) -/* B2AA28 800B3888 3C018013 */ lui $at, %hi(D_8012CED4) -/* B2AA2C 800B388C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B2AA30 800B3890 03E00008 */ jr $ra -/* B2AA34 800B3894 AC38CED4 */ sw $t8, %lo(D_8012CED4)($at) - diff --git a/asm/non_matchings/code/db_camera/func_800B3898.s b/asm/non_matchings/code/db_camera/func_800B3898.s deleted file mode 100644 index bd6de8566b..0000000000 --- a/asm/non_matchings/code/db_camera/func_800B3898.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_800B3898 -/* B2AA38 800B3898 3C028013 */ lui $v0, %hi(D_8012CED4) -/* B2AA3C 800B389C 03E00008 */ jr $ra -/* B2AA40 800B38A0 8C42CED4 */ lw $v0, %lo(D_8012CED4)($v0) - diff --git a/asm/non_matchings/code/db_camera/func_800B38A4.s b/asm/non_matchings/code/db_camera/func_800B38A4.s deleted file mode 100644 index 37db99631b..0000000000 --- a/asm/non_matchings/code/db_camera/func_800B38A4.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800B38A4 -/* B2AA44 800B38A4 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B2AA48 800B38A8 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B2AA4C 800B38AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2AA50 800B38B0 AFBF0014 */ sw $ra, 0x14($sp) -/* B2AA54 800B38B4 AFA40018 */ sw $a0, 0x18($sp) -/* B2AA58 800B38B8 844E1074 */ lh $t6, 0x1074($v0) -/* B2AA5C 800B38BC 24010013 */ li $at, 19 -/* B2AA60 800B38C0 55C10009 */ bnel $t6, $at, .L800B38E8 -/* B2AA64 800B38C4 8FBF0014 */ lw $ra, 0x14($sp) -/* B2AA68 800B38C8 844F1076 */ lh $t7, 0x1076($v0) -/* B2AA6C 800B38CC 24010001 */ li $at, 1 -/* B2AA70 800B38D0 3C048014 */ lui $a0, %hi(D_8014311C) # $a0, 0x8014 -/* B2AA74 800B38D4 15E10003 */ bne $t7, $at, .L800B38E4 -/* B2AA78 800B38D8 2484311C */ addiu $a0, %lo(D_8014311C) # addiu $a0, $a0, 0x311c -/* B2AA7C 800B38DC 0C00084C */ jal osSyncPrintf -/* B2AA80 800B38E0 8FA50018 */ lw $a1, 0x18($sp) -.L800B38E4: -/* B2AA84 800B38E4 8FBF0014 */ lw $ra, 0x14($sp) -.L800B38E8: -/* B2AA88 800B38E8 8FB80018 */ lw $t8, 0x18($sp) -/* B2AA8C 800B38EC 3C018013 */ lui $at, %hi(D_8012CED8) -/* B2AA90 800B38F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B2AA94 800B38F4 03E00008 */ jr $ra -/* B2AA98 800B38F8 AC38CED8 */ sw $t8, %lo(D_8012CED8)($at) - diff --git a/asm/non_matchings/code/db_camera/func_800B38FC.s b/asm/non_matchings/code/db_camera/func_800B38FC.s deleted file mode 100644 index 8a0b006588..0000000000 --- a/asm/non_matchings/code/db_camera/func_800B38FC.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_800B38FC -/* B2AA9C 800B38FC 3C028013 */ lui $v0, %hi(D_8012CED8) -/* B2AAA0 800B3900 03E00008 */ jr $ra -/* B2AAA4 800B3904 8C42CED8 */ lw $v0, %lo(D_8012CED8)($v0) - diff --git a/asm/non_matchings/code/db_camera/func_800B3908.s b/asm/non_matchings/code/db_camera/func_800B3908.s deleted file mode 100644 index fe24436ebc..0000000000 --- a/asm/non_matchings/code/db_camera/func_800B3908.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_800B3908 -/* B2AAA8 800B3908 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B2AAAC 800B390C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B2AAB0 800B3910 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2AAB4 800B3914 AFBF0014 */ sw $ra, 0x14($sp) -/* B2AAB8 800B3918 844E1074 */ lh $t6, 0x1074($v0) -/* B2AABC 800B391C 24010013 */ li $at, 19 -/* B2AAC0 800B3920 15C10008 */ bne $t6, $at, .L800B3944 -/* B2AAC4 800B3924 00000000 */ nop -/* B2AAC8 800B3928 844F1076 */ lh $t7, 0x1076($v0) -/* B2AACC 800B392C 24010001 */ li $at, 1 -/* B2AAD0 800B3930 3C048014 */ lui $a0, %hi(D_8014313C) # $a0, 0x8014 -/* B2AAD4 800B3934 15E10003 */ bne $t7, $at, .L800B3944 -/* B2AAD8 800B3938 00000000 */ nop -/* B2AADC 800B393C 0C00084C */ jal osSyncPrintf -/* B2AAE0 800B3940 2484313C */ addiu $a0, %lo(D_8014313C) # addiu $a0, $a0, 0x313c -.L800B3944: -/* B2AAE4 800B3944 3C018013 */ lui $at, %hi(D_8012CED0) # $at, 0x8013 -/* B2AAE8 800B3948 AC20CED0 */ sw $zero, %lo(D_8012CED0)($at) -/* B2AAEC 800B394C 8FBF0014 */ lw $ra, 0x14($sp) -/* B2AAF0 800B3950 3C018013 */ lui $at, %hi(D_8012CED4) # $at, 0x8013 -/* B2AAF4 800B3954 AC20CED4 */ sw $zero, %lo(D_8012CED4)($at) -/* B2AAF8 800B3958 3C018013 */ lui $at, %hi(D_8012CED8) # $at, 0x8013 -/* B2AAFC 800B395C AC20CED8 */ sw $zero, %lo(D_8012CED8)($at) -/* B2AB00 800B3960 03E00008 */ jr $ra -/* B2AB04 800B3964 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/non_matchings/code/db_camera/func_800B3968.s b/asm/non_matchings/code/db_camera/func_800B3968.s deleted file mode 100644 index 67ad5e72e3..0000000000 --- a/asm/non_matchings/code/db_camera/func_800B3968.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_800B3968 -/* B2AB08 800B3968 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B2AB0C 800B396C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B2AB10 800B3970 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2AB14 800B3974 AFBF0014 */ sw $ra, 0x14($sp) -/* B2AB18 800B3978 844E1074 */ lh $t6, 0x1074($v0) -/* B2AB1C 800B397C 24010013 */ li $at, 19 -/* B2AB20 800B3980 55C10009 */ bnel $t6, $at, .L800B39A8 -/* B2AB24 800B3984 8FBF0014 */ lw $ra, 0x14($sp) -/* B2AB28 800B3988 844F1076 */ lh $t7, 0x1076($v0) -/* B2AB2C 800B398C 24010001 */ li $at, 1 -/* B2AB30 800B3990 3C048014 */ lui $a0, %hi(D_80143154) # $a0, 0x8014 -/* B2AB34 800B3994 55E10004 */ bnel $t7, $at, .L800B39A8 -/* B2AB38 800B3998 8FBF0014 */ lw $ra, 0x14($sp) -/* B2AB3C 800B399C 0C00084C */ jal osSyncPrintf -/* B2AB40 800B39A0 24843154 */ addiu $a0, %lo(D_80143154) # addiu $a0, $a0, 0x3154 -/* B2AB44 800B39A4 8FBF0014 */ lw $ra, 0x14($sp) -.L800B39A8: -/* B2AB48 800B39A8 3C018013 */ lui $at, %hi(D_8012CED8) # $at, 0x8013 -/* B2AB4C 800B39AC AC20CED8 */ sw $zero, %lo(D_8012CED8)($at) -/* B2AB50 800B39B0 03E00008 */ jr $ra -/* B2AB54 800B39B4 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/non_matchings/code/db_camera/func_800B39B8.s b/asm/non_matchings/code/db_camera/func_800B39B8.s deleted file mode 100644 index cc8f849b75..0000000000 --- a/asm/non_matchings/code/db_camera/func_800B39B8.s +++ /dev/null @@ -1,116 +0,0 @@ -glabel func_800B39B8 -/* B2AB58 800B39B8 24010003 */ li $at, 3 -/* B2AB5C 800B39BC 14810003 */ bne $a0, $at, .L800B39CC -/* B2AB60 800B39C0 3C068013 */ lui $a2, %hi(D_8012CED8) # $a2, 0x8013 -/* B2AB64 800B39C4 1000000D */ b .L800B39FC -/* B2AB68 800B39C8 2402000A */ li $v0, 10 -.L800B39CC: -/* B2AB6C 800B39CC 240E001E */ li $t6, 30 -/* B2AB70 800B39D0 01C4001A */ div $zero, $t6, $a0 -/* B2AB74 800B39D4 00001012 */ mflo $v0 -/* B2AB78 800B39D8 14800002 */ bnez $a0, .L800B39E4 -/* B2AB7C 800B39DC 00000000 */ nop -/* B2AB80 800B39E0 0007000D */ break 7 -.L800B39E4: -/* B2AB84 800B39E4 2401FFFF */ li $at, -1 -/* B2AB88 800B39E8 14810004 */ bne $a0, $at, .L800B39FC -/* B2AB8C 800B39EC 3C018000 */ lui $at, 0x8000 -/* B2AB90 800B39F0 15C10002 */ bne $t6, $at, .L800B39FC -/* B2AB94 800B39F4 00000000 */ nop -/* B2AB98 800B39F8 0006000D */ break 6 -.L800B39FC: -/* B2AB9C 800B39FC 3C078013 */ lui $a3, %hi(D_8012CED4) # $a3, 0x8013 -/* B2ABA0 800B3A00 24E7CED4 */ addiu $a3, %lo(D_8012CED4) # addiu $a3, $a3, -0x312c -/* B2ABA4 800B3A04 24C6CED8 */ addiu $a2, %lo(D_8012CED8) # addiu $a2, $a2, -0x3128 -/* B2ABA8 800B3A08 8CC30000 */ lw $v1, ($a2) -/* B2ABAC 800B3A0C 8CE40000 */ lw $a0, ($a3) -/* B2ABB0 800B3A10 3C088013 */ lui $t0, %hi(D_8012CED0) # $t0, 0x8013 -/* B2ABB4 800B3A14 2508CED0 */ addiu $t0, %lo(D_8012CED0) # addiu $t0, $t0, -0x3130 -/* B2ABB8 800B3A18 0064082A */ slt $at, $v1, $a0 -/* B2ABBC 800B3A1C 5020000F */ beql $at, $zero, .L800B3A5C -/* B2ABC0 800B3A20 0083082A */ slt $at, $a0, $v1 -/* B2ABC4 800B3A24 8D0F0000 */ lw $t7, ($t0) -/* B2ABC8 800B3A28 24050001 */ li $a1, 1 -/* B2ABCC 800B3A2C 50AF0003 */ beql $a1, $t7, .L800B3A3C -/* B2ABD0 800B3A30 00622821 */ addu $a1, $v1, $v0 -/* B2ABD4 800B3A34 AD050000 */ sw $a1, ($t0) -/* B2ABD8 800B3A38 00622821 */ addu $a1, $v1, $v0 -.L800B3A3C: -/* B2ABDC 800B3A3C 00A4082A */ slt $at, $a1, $a0 -/* B2ABE0 800B3A40 10200003 */ beqz $at, .L800B3A50 -/* B2ABE4 800B3A44 00000000 */ nop -/* B2ABE8 800B3A48 10000017 */ b .L800B3AA8 -/* B2ABEC 800B3A4C ACC50000 */ sw $a1, ($a2) -.L800B3A50: -/* B2ABF0 800B3A50 10000015 */ b .L800B3AA8 -/* B2ABF4 800B3A54 ACC40000 */ sw $a0, ($a2) -/* B2ABF8 800B3A58 0083082A */ slt $at, $a0, $v1 -.L800B3A5C: -/* B2ABFC 800B3A5C 1020000F */ beqz $at, .L800B3A9C -/* B2AC00 800B3A60 3C088013 */ lui $t0, %hi(D_8012CED0) # $t0, 0x8013 -/* B2AC04 800B3A64 2508CED0 */ addiu $t0, %lo(D_8012CED0) # addiu $t0, $t0, -0x3130 -/* B2AC08 800B3A68 8D180000 */ lw $t8, ($t0) -/* B2AC0C 800B3A6C 24050002 */ li $a1, 2 -/* B2AC10 800B3A70 50B80003 */ beql $a1, $t8, .L800B3A80 -/* B2AC14 800B3A74 00622823 */ subu $a1, $v1, $v0 -/* B2AC18 800B3A78 AD050000 */ sw $a1, ($t0) -/* B2AC1C 800B3A7C 00622823 */ subu $a1, $v1, $v0 -.L800B3A80: -/* B2AC20 800B3A80 0085082A */ slt $at, $a0, $a1 -/* B2AC24 800B3A84 10200003 */ beqz $at, .L800B3A94 -/* B2AC28 800B3A88 00000000 */ nop -/* B2AC2C 800B3A8C 10000006 */ b .L800B3AA8 -/* B2AC30 800B3A90 ACC50000 */ sw $a1, ($a2) -.L800B3A94: -/* B2AC34 800B3A94 10000004 */ b .L800B3AA8 -/* B2AC38 800B3A98 ACC40000 */ sw $a0, ($a2) -.L800B3A9C: -/* B2AC3C 800B3A9C 3C088013 */ lui $t0, %hi(D_8012CED0) # $t0, 0x8013 -/* B2AC40 800B3AA0 2508CED0 */ addiu $t0, %lo(D_8012CED0) # addiu $t0, $t0, -0x3130 -/* B2AC44 800B3AA4 AD000000 */ sw $zero, ($t0) -.L800B3AA8: -/* B2AC48 800B3AA8 3C058016 */ lui $a1, %hi(gGameInfo) # $a1, 0x8016 -/* B2AC4C 800B3AAC 24A5FA90 */ addiu $a1, %lo(gGameInfo) # addiu $a1, $a1, -0x570 -/* B2AC50 800B3AB0 8CA30000 */ lw $v1, ($a1) -/* B2AC54 800B3AB4 24040013 */ li $a0, 19 -/* B2AC58 800B3AB8 84791074 */ lh $t9, 0x1074($v1) -/* B2AC5C 800B3ABC 14990022 */ bne $a0, $t9, .L800B3B48 -/* B2AC60 800B3AC0 00000000 */ nop -/* B2AC64 800B3AC4 84691090 */ lh $t1, 0x1090($v1) -/* B2AC68 800B3AC8 50890016 */ beql $a0, $t1, .L800B3B24 -/* B2AC6C 800B3ACC 8D0A0000 */ lw $t2, ($t0) -/* B2AC70 800B3AD0 A4641090 */ sh $a0, 0x1090($v1) -/* B2AC74 800B3AD4 8CAA0000 */ lw $t2, ($a1) -/* B2AC78 800B3AD8 A5401076 */ sh $zero, 0x1076($t2) -/* B2AC7C 800B3ADC 8CAB0000 */ lw $t3, ($a1) -/* B2AC80 800B3AE0 A5601078 */ sh $zero, 0x1078($t3) -/* B2AC84 800B3AE4 8CAC0000 */ lw $t4, ($a1) -/* B2AC88 800B3AE8 A580107A */ sh $zero, 0x107a($t4) -/* B2AC8C 800B3AEC 8CAD0000 */ lw $t5, ($a1) -/* B2AC90 800B3AF0 A5A0107C */ sh $zero, 0x107c($t5) -/* B2AC94 800B3AF4 8CAE0000 */ lw $t6, ($a1) -/* B2AC98 800B3AF8 A5C0107E */ sh $zero, 0x107e($t6) -/* B2AC9C 800B3AFC 8CAF0000 */ lw $t7, ($a1) -/* B2ACA0 800B3B00 A5E01080 */ sh $zero, 0x1080($t7) -/* B2ACA4 800B3B04 8CB80000 */ lw $t8, ($a1) -/* B2ACA8 800B3B08 A7001082 */ sh $zero, 0x1082($t8) -/* B2ACAC 800B3B0C 8CB90000 */ lw $t9, ($a1) -/* B2ACB0 800B3B10 A7201084 */ sh $zero, 0x1084($t9) -/* B2ACB4 800B3B14 8CA90000 */ lw $t1, ($a1) -/* B2ACB8 800B3B18 A5201086 */ sh $zero, 0x1086($t1) -/* B2ACBC 800B3B1C 8CA30000 */ lw $v1, ($a1) -/* B2ACC0 800B3B20 8D0A0000 */ lw $t2, ($t0) -.L800B3B24: -/* B2ACC4 800B3B24 A46A107A */ sh $t2, 0x107a($v1) -/* B2ACC8 800B3B28 8CAC0000 */ lw $t4, ($a1) -/* B2ACCC 800B3B2C 8CCB0000 */ lw $t3, ($a2) -/* B2ACD0 800B3B30 A58B107C */ sh $t3, 0x107c($t4) -/* B2ACD4 800B3B34 8CAE0000 */ lw $t6, ($a1) -/* B2ACD8 800B3B38 8CED0000 */ lw $t5, ($a3) -/* B2ACDC 800B3B3C A5CD107E */ sh $t5, 0x107e($t6) -/* B2ACE0 800B3B40 8CAF0000 */ lw $t7, ($a1) -/* B2ACE4 800B3B44 A5E21080 */ sh $v0, 0x1080($t7) -.L800B3B48: -/* B2ACE8 800B3B48 03E00008 */ jr $ra -/* B2ACEC 800B3B4C 00000000 */ nop - diff --git a/asm/non_matchings/code/db_camera/func_800B9638.s b/asm/non_matchings/code/db_camera/func_800B9638.s index 2ca0a8e5bf..e3e9d36ff0 100644 --- a/asm/non_matchings/code/db_camera/func_800B9638.s +++ b/asm/non_matchings/code/db_camera/func_800B9638.s @@ -1031,7 +1031,7 @@ glabel func_800B9638 /* B31708 800BA568 A420111A */ sh $zero, %lo(D_8016111A)($at) /* B3170C 800BA56C 0C020978 */ jal Interface_ChangeAlpha /* B31710 800BA570 24040002 */ li $a0, 2 -/* B31714 800BA574 0C02CE10 */ jal func_800B3840 +/* B31714 800BA574 0C02CE10 */ jal ShrinkWindow_SetVal /* B31718 800BA578 00002025 */ move $a0, $zero /* B3171C 800BA57C 3C018016 */ lui $at, %hi(D_8016110C) # $at, 0x8016 /* B31720 800BA580 A420110C */ sh $zero, %lo(D_8016110C)($at) @@ -1045,7 +1045,7 @@ glabel func_800B9638 /* B3173C 800BA59C 27A4005C */ addiu $a0, $sp, 0x5c /* B31740 800BA5A0 0C020978 */ jal Interface_ChangeAlpha /* B31744 800BA5A4 24040002 */ li $a0, 2 -/* B31748 800BA5A8 0C02CE10 */ jal func_800B3840 +/* B31748 800BA5A8 0C02CE10 */ jal ShrinkWindow_SetVal /* B3174C 800BA5AC 00002025 */ move $a0, $zero /* B31750 800BA5B0 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 /* B31754 800BA5B4 3C0C8013 */ lui $t4, %hi(D_801333E8) # $t4, 0x8013 @@ -1706,7 +1706,7 @@ glabel func_800B9638 /* B320F8 800BAF58 A420111C */ sh $zero, %lo(D_8016111C)($at) /* B320FC 800BAF5C 0C020978 */ jal Interface_ChangeAlpha /* B32100 800BAF60 24040032 */ li $a0, 50 -/* B32104 800BAF64 0C02CE10 */ jal func_800B3840 +/* B32104 800BAF64 0C02CE10 */ jal ShrinkWindow_SetVal /* B32108 800BAF68 24040020 */ li $a0, 32 /* B3210C 800BAF6C 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 /* B32110 800BAF70 3C0B8013 */ lui $t3, %hi(D_801333E8) # $t3, 0x8013 diff --git a/asm/non_matchings/code/z_camera/func_80045350.s b/asm/non_matchings/code/z_camera/func_80045350.s index 7723eb59de..7b89c781c5 100644 --- a/asm/non_matchings/code/z_camera/func_80045350.s +++ b/asm/non_matchings/code/z_camera/func_80045350.s @@ -40,13 +40,13 @@ glabel func_80045350 /* ABC578 800453D8 51000007 */ beql $t0, $zero, .L800453F8 /* ABC57C 800453DC 8C440000 */ lw $a0, ($v0) /* ABC580 800453E0 8C440000 */ lw $a0, ($v0) -/* ABC584 800453E4 0C02CE29 */ jal func_800B38A4 +/* ABC584 800453E4 0C02CE29 */ jal ShrinkWindow_SetCurrentVal /* ABC588 800453E8 A7A5001A */ sh $a1, 0x1a($sp) /* ABC58C 800453EC 10000005 */ b .L80045404 /* ABC590 800453F0 87A5001A */ lh $a1, 0x1a($sp) /* ABC594 800453F4 8C440000 */ lw $a0, ($v0) .L800453F8: -/* ABC598 800453F8 0C02CE10 */ jal func_800B3840 +/* ABC598 800453F8 0C02CE10 */ jal ShrinkWindow_SetVal /* ABC59C 800453FC A7A5001A */ sh $a1, 0x1a($sp) /* ABC5A0 80045400 87A5001A */ lh $a1, 0x1a($sp) .L80045404: diff --git a/asm/non_matchings/code/z_kaleido_scope_call/KaleidoScopeCall_Update.s b/asm/non_matchings/code/z_kaleido_scope_call/KaleidoScopeCall_Update.s index 69ae720608..1ca4caece8 100644 --- a/asm/non_matchings/code/z_kaleido_scope_call/KaleidoScopeCall_Update.s +++ b/asm/non_matchings/code/z_kaleido_scope_call/KaleidoScopeCall_Update.s @@ -68,7 +68,7 @@ glabel KaleidoScopeCall_Update /* B33358 800BC1B8 24010008 */ li $at, 8 /* B3335C 800BC1BC 14820016 */ bne $a0, $v0, .L800BC218 /* B33360 800BC1C0 00000000 */ nop -/* B33364 800BC1C4 0C02CE3F */ jal func_800B38FC +/* B33364 800BC1C4 0C02CE3F */ jal ShrinkWindow_GetCurrentVal /* B33368 800BC1C8 AFA3001C */ sw $v1, 0x1c($sp) /* B3336C 800BC1CC 8FA3001C */ lw $v1, 0x1c($sp) /* B33370 800BC1D0 1440007B */ bnez $v0, .L800BC3C0 diff --git a/asm/non_matchings/code/z_play/Gameplay_Init.s b/asm/non_matchings/code/z_play/Gameplay_Init.s index d894c54634..a5e73b6db3 100644 --- a/asm/non_matchings/code/z_play/Gameplay_Init.s +++ b/asm/non_matchings/code/z_play/Gameplay_Init.s @@ -458,7 +458,7 @@ glabel Gameplay_Init /* B34224 800BD084 240F0006 */ li $t7, 6 /* B34228 800BD088 A02F1E5E */ sb $t7, 0x1e5e($at) .L800BD08C: -/* B3422C 800BD08C 0C02CE42 */ jal func_800B3908 +/* B3422C 800BD08C 0C02CE42 */ jal ShrinkWindow_Init /* B34230 800BD090 00000000 */ nop /* B34234 800BD094 3C010001 */ lui $at, (0x0001241C >> 16) # lui $at, 1 /* B34238 800BD098 3421241C */ ori $at, (0x0001241C & 0xFFFF) # ori $at, $at, 0x241c diff --git a/asm/non_matchings/code/z_play/Gameplay_Update.s b/asm/non_matchings/code/z_play/Gameplay_Update.s index 6ca4c77de5..89457fb481 100644 --- a/asm/non_matchings/code/z_play/Gameplay_Update.s +++ b/asm/non_matchings/code/z_play/Gameplay_Update.s @@ -2024,7 +2024,7 @@ glabel L800BE148 /* B35C70 800BEAD0 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 /* B35C74 800BEAD4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) .L800BEAD8: -/* B35C78 800BEAD8 0C02CE6E */ jal func_800B39B8 +/* B35C78 800BEAD8 0C02CE6E */ jal ShrinkWindow_Update /* B35C7C 800BEADC 84440110 */ lh $a0, 0x110($v0) /* B35C80 800BEAE0 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 /* B35C84 800BEAE4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s index a106f26a06..2bf5c5bee8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s @@ -1624,7 +1624,7 @@ glabel L8091D918 /* 01E30 8091D930 AFAA0088 */ sw $t2, 0x0088($sp) /* 01E34 8091D934 14410006 */ bne $v0, $at, .L8091D950 /* 01E38 8091D938 265001C8 */ addiu $s0, $s2, 0x01C8 ## $s0 = 000001C8 -/* 01E3C 8091D93C 0C02CE10 */ jal func_800B3840 ## letterbox_target_addr +/* 01E3C 8091D93C 0C02CE10 */ jal ShrinkWindow_SetVal ## letterbox_target_addr /* 01E40 8091D940 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 01E44 8091D944 0C020978 */ jal Interface_ChangeAlpha /* 01E48 8091D948 2404000B */ addiu $a0, $zero, 0x000B ## $a0 = 0000000B diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s index 14c7e4ee63..d552452569 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s @@ -118,7 +118,7 @@ glabel func_80A79C78 /* 00E88 80A79E38 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00E8C 80A79E3C 24040020 */ addiu $a0, $zero, 0x0020 ## $a0 = 00000020 /* 00E90 80A79E40 01616024 */ and $t4, $t3, $at -/* 00E94 80A79E44 0C02CE10 */ jal func_800B3840 ## letterbox_target_addr +/* 00E94 80A79E44 0C02CE10 */ jal ShrinkWindow_SetVal ## letterbox_target_addr /* 00E98 80A79E48 AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 /* 00E9C 80A79E4C 0C020978 */ jal Interface_ChangeAlpha /* 00EA0 80A79E50 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AA40.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AA40.s index d72ad343a7..e5e4f3d469 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AA40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AA40.s @@ -88,7 +88,7 @@ glabel func_80A7AA40 /* 01BE8 80A7AB98 A60E0308 */ sh $t6, 0x0308($s0) ## 00000308 /* 01BEC 80A7AB9C A60001FC */ sh $zero, 0x01FC($s0) ## 000001FC /* 01BF0 80A7ABA0 A6201D74 */ sh $zero, 0x1D74($s1) ## 00001D74 -/* 01BF4 80A7ABA4 0C02CE10 */ jal func_800B3840 ## letterbox_target_addr +/* 01BF4 80A7ABA4 0C02CE10 */ jal ShrinkWindow_SetVal ## letterbox_target_addr /* 01BF8 80A7ABA8 24040020 */ addiu $a0, $zero, 0x0020 ## $a0 = 00000020 /* 01BFC 80A7ABAC 0C020978 */ jal Interface_ChangeAlpha /* 01C00 80A7ABB0 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BC00.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BC00.s index 4b40b8e1bd..937d5d232d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BC00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BC00.s @@ -44,7 +44,7 @@ glabel func_80B5BC00 /* 004F0 80B5BCA0 E7020838 */ swc1 $f2, 0x0838($t8) ## 00000838 /* 004F4 80B5BCA4 0C2D6E22 */ jal func_80B5B888 /* 004F8 80B5BCA8 8FA40034 */ lw $a0, 0x0034($sp) -/* 004FC 80B5BCAC 0C02CE10 */ jal func_800B3840 ## letterbox_target_addr +/* 004FC 80B5BCAC 0C02CE10 */ jal ShrinkWindow_SetVal ## letterbox_target_addr /* 00500 80B5BCB0 24040020 */ addiu $a0, $zero, 0x0020 ## $a0 = 00000020 /* 00504 80B5BCB4 0C020978 */ jal Interface_ChangeAlpha /* 00508 80B5BCB8 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DE1C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DE1C.s index 04df754743..d087434b6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DE1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DE1C.s @@ -56,7 +56,7 @@ glabel L80B5DE84 /* 02708 80B5DEB8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0270C 80B5DEBC 0C020978 */ jal Interface_ChangeAlpha /* 02710 80B5DEC0 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 -/* 02714 80B5DEC4 0C02CE10 */ jal func_800B3840 ## letterbox_target_addr +/* 02714 80B5DEC4 0C02CE10 */ jal ShrinkWindow_SetVal ## letterbox_target_addr /* 02718 80B5DEC8 24040020 */ addiu $a0, $zero, 0x0020 ## $a0 = 00000020 /* 0271C 80B5DECC 920A0209 */ lbu $t2, 0x0209($s0) ## 00000209 /* 02720 80B5DED0 A2000208 */ sb $zero, 0x0208($s0) ## 00000208 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s index d0235d45f7..92b48dcb3a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s @@ -606,7 +606,7 @@ glabel L80B78890 /* 0EF88 80B78928 3C0180B8 */ lui $at, %hi(D_80B7FECC) ## $at = 80B80000 /* 0EF8C 80B7892C E428FECC */ swc1 $f8, %lo(D_80B7FECC)($at) glabel L80B78930 -/* 0EF90 80B78930 0C02CE10 */ jal func_800B3840 ## letterbox_target_addr +/* 0EF90 80B78930 0C02CE10 */ jal ShrinkWindow_SetVal ## letterbox_target_addr /* 0EF94 80B78934 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B /* 0EF98 80B78938 8FAC00E4 */ lw $t4, 0x00E4($sp) /* 0EF9C 80B7893C 3C0280B8 */ lui $v0, %hi(D_80B7E0B8) ## $v0 = 80B80000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s index 2966b35d72..9f4508d987 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s @@ -95,7 +95,7 @@ glabel func_80836448 /* 04390 808365A0 00063403 */ sra $a2, $a2, 16 /* 04394 808365A4 0C02003E */ jal func_800800F8 /* 04398 808365A8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0439C 808365AC 0C02CE10 */ jal func_800B3840 ## letterbox_target_addr +/* 0439C 808365AC 0C02CE10 */ jal ShrinkWindow_SetVal ## letterbox_target_addr /* 043A0 808365B0 24040020 */ addiu $a0, $zero, 0x0020 ## $a0 = 00000020 /* 043A4 808365B4 8FBF0024 */ lw $ra, 0x0024($sp) .L808365B8: diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s index 61237ef056..1a8cc5b763 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s @@ -336,7 +336,7 @@ glabel func_808113A8 /* 0DBA0 808118E0 A4674ADC */ sh $a3, 0x4ADC($v1) ## 00004ADC /* 0DBA4 808118E4 A4684ADE */ sh $t0, 0x4ADE($v1) ## 00004ADE /* 0DBA8 808118E8 AFA30030 */ sw $v1, 0x0030($sp) -/* 0DBAC 808118EC 0C02CE10 */ jal func_800B3840 ## letterbox_target_addr +/* 0DBAC 808118EC 0C02CE10 */ jal ShrinkWindow_SetVal ## letterbox_target_addr /* 0DBB0 808118F0 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 0DBB4 808118F4 3C118016 */ lui $s1, %hi(gSaveContext) /* 0DBB8 808118F8 2631E660 */ addiu $s1, %lo(gSaveContext) diff --git a/data/db_camera.data.s b/data/db_camera.data.s index 29d94c4898..b73a4a0e85 100644 --- a/data/db_camera.data.s +++ b/data/db_camera.data.s @@ -9,15 +9,6 @@ .balign 16 -glabel D_8012CED0 - .incbin "baserom.z64", 0xBA4070, 0x4 - -glabel D_8012CED4 - .incbin "baserom.z64", 0xBA4074, 0x4 - -glabel D_8012CED8 - .incbin "baserom.z64", 0xBA4078, 0x8 - glabel D_8012CEE0 .word D_80143170 diff --git a/data/db_camera.rodata.s b/data/db_camera.rodata.s index 865076091c..99f87e7584 100644 --- a/data/db_camera.rodata.s +++ b/data/db_camera.rodata.s @@ -9,22 +9,6 @@ .balign 16 -glabel D_80143100 - .asciz "shrink_window_setval(%d)\n" - .balign 4 - -glabel D_8014311C - .asciz "shrink_window_setnowval(%d)\n" - .balign 4 - -glabel D_8014313C - .asciz "shrink_window_init()\n" - .balign 4 - -glabel D_80143154 - .asciz "shrink_window_cleanup()\n" - .balign 4 - glabel D_80143170 .asciz "\x8Cキ-フレ-ム\x8Dガ" .balign 4 diff --git a/include/functions.h b/include/functions.h index 1ad7feccd9..48be7c4036 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1427,13 +1427,13 @@ void TransitionFade_Draw(TransitionFade* this, Gfx** gfxP); s32 TransitionFade_IsDone(TransitionFade* this); void TransitionFade_SetColor(TransitionFade* this, u32 color); void TransitionFade_SetType(TransitionFade* this, s32 type); -// ? func_800B3840(?); -// ? func_800B3898(?); -// ? func_800B38A4(?); -// ? func_800B38FC(?); -// ? func_800B3908(?); -// ? func_800B3968(?); -// ? func_800B39B8(?); +void ShrinkWindow_SetVal(s32 value); +u32 ShrinkWindow_GetVal(void); +void ShrinkWindow_SetCurrentVal(s32 nowVal); +u32 ShrinkWindow_GetCurrentVal(void); +void ShrinkWindow_Init(void); +void ShrinkWindow_Destroy(void); +void ShrinkWindow_Update(s32 updateRate); // ? func_800B3B50(?); // ? func_800B3BD4(?); // ? func_800B3DF8(?); diff --git a/include/variables.h b/include/variables.h index 1bf3472459..da69973878 100644 --- a/include/variables.h +++ b/include/variables.h @@ -511,9 +511,6 @@ extern u8 gFontFF[]; // original name: "font_ff" //extern ? D_8012C7A8; //extern ? D_8012CDC8; //extern ? D_8012CEA0; -//extern ? D_8012CED0; -//extern ? D_8012CED4; -//extern ? D_8012CED8; //extern ? D_8012CEE0; //extern ? D_8012CEE4; //extern ? D_8012CEE8; diff --git a/include/z64.h b/include/z64.h index 6d7b1c4cc6..869da9fee2 100644 --- a/include/z64.h +++ b/include/z64.h @@ -1146,13 +1146,15 @@ typedef struct { /* 0x01E2 */ char unk_1E2[0x06]; } TitleContext; // size = 0x1E8 +struct SelectContext; + typedef struct { /* 0x00 */ char* name; /* 0x04 */ void (*loadFunc)(struct SelectContext*, s32); /* 0x08 */ s32 entranceIndex; } SceneSelectEntry; // size = 0xC -typedef struct { +typedef struct SelectContext { /* 0x0000 */ GameState state; /* 0x00A4 */ s32 unk_A4; /* 0x00A8 */ View view; diff --git a/spec b/spec index 19ed81d9f7..0f521fdbfa 100644 --- a/spec +++ b/spec @@ -372,6 +372,7 @@ beginseg include "build/src/code/z_fbdemo_wipe1.o" include "build/src/code/z_fbdemo_circle.o" include "build/src/code/z_fbdemo_fade.o" + include "build/src/code/shrink_window.o" include "build/src/code/db_camera.o" include "build/data/db_camera.data.o" include "build/data/db_camera.rodata.o" diff --git a/src/code/db_camera.c b/src/code/db_camera.c index b1e858e638..b693051d9a 100644 --- a/src/code/db_camera.c +++ b/src/code/db_camera.c @@ -1,20 +1,6 @@ #include #include -#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B3840.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B3898.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B38A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B38FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B3908.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B3968.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B39B8.s") - #pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B3B50.s") #pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B3BD4.s") diff --git a/src/code/shrink_window.c b/src/code/shrink_window.c new file mode 100644 index 0000000000..212195ce6e --- /dev/null +++ b/src/code/shrink_window.c @@ -0,0 +1,99 @@ +#include + +s32 D_8012CED0 = 0; + +s32 sShrinkWindowVal = 0; + +s32 sShrinkWindowCurrentVal = 0; + +void ShrinkWindow_SetVal(s32 value) { + + if (HREG(80) == 0x13 && HREG(81) == 1) { + osSyncPrintf("shrink_window_setval(%d)\n", value); + } + sShrinkWindowVal = value; +} + +u32 ShrinkWindow_GetVal(void) { + return sShrinkWindowVal; +} + +void ShrinkWindow_SetCurrentVal(s32 currentVal) { + if (HREG(80) == 0x13 && HREG(81) == 1) { + osSyncPrintf("shrink_window_setnowval(%d)\n", currentVal); + } + sShrinkWindowCurrentVal = currentVal; +} + +u32 ShrinkWindow_GetCurrentVal(void) { + return sShrinkWindowCurrentVal; +} + +void ShrinkWindow_Init(void) { + if (HREG(80) == 0x13 && HREG(81) == 1) { + osSyncPrintf("shrink_window_init()\n"); + } + D_8012CED0 = 0; + sShrinkWindowVal = 0; + sShrinkWindowCurrentVal = 0; +} + +void ShrinkWindow_Destroy(void) { + if (HREG(80) == 0x13 && HREG(81) == 1) { + osSyncPrintf("shrink_window_cleanup()\n"); + } + sShrinkWindowCurrentVal = 0; +} + +void ShrinkWindow_Update(s32 updateRate) { + s32 off; + + if (updateRate == 3) { + off = 10; + } else { + off = 30 / updateRate; + } + + if (sShrinkWindowCurrentVal < sShrinkWindowVal) { + if (D_8012CED0 != 1) { + D_8012CED0 = 1; + } + + if (sShrinkWindowCurrentVal + off < sShrinkWindowVal) { + sShrinkWindowCurrentVal += off; + } else { + sShrinkWindowCurrentVal = sShrinkWindowVal; + } + } else if (sShrinkWindowVal < sShrinkWindowCurrentVal) { + if (D_8012CED0 != 2) { + D_8012CED0 = 2; + } + + if (sShrinkWindowVal < sShrinkWindowCurrentVal - off) { + sShrinkWindowCurrentVal -= off; + } else { + sShrinkWindowCurrentVal = sShrinkWindowVal; + } + } else { + D_8012CED0 = 0; + } + + if (HREG(80) == 0x13) { + if (HREG(94) != 0x13) { + HREG(94) = 0x13; + HREG(81) = 0; + HREG(82) = 0; + HREG(83) = 0; + HREG(84) = 0; + HREG(85) = 0; + HREG(86) = 0; + HREG(87) = 0; + HREG(88) = 0; + HREG(89) = 0; + } + HREG(83) = D_8012CED0; + HREG(84) = sShrinkWindowCurrentVal; + HREG(85) = sShrinkWindowVal; + HREG(86) = off; + } +} diff --git a/src/code/z_demo.c b/src/code/z_demo.c index f0bc2a333c..4591876114 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -137,7 +137,7 @@ u32 func_8006472C(GlobalContext* globalCtx, CutsceneContext* csCtx, f32 target) void func_80064760(GlobalContext* globalCtx, CutsceneContext* csCtx) { Interface_ChangeAlpha(1); - func_800B3840(0x20); + ShrinkWindow_SetVal(0x20); if (func_8006472C(globalCtx, csCtx, 1.0f)) { func_800F68BC(1); @@ -148,7 +148,7 @@ void func_80064760(GlobalContext* globalCtx, CutsceneContext* csCtx) { void func_800647C0(GlobalContext* globalCtx, CutsceneContext* csCtx) { func_80068C3C(globalCtx, csCtx); Interface_ChangeAlpha(1); - func_800B3840(0x20); + ShrinkWindow_SetVal(0x20); if (func_8006472C(globalCtx, csCtx, 1.0f)) { func_800F68BC(1); @@ -1964,8 +1964,8 @@ void func_80068ECC(GlobalContext* globalCtx, CutsceneContext* csCtx) { if (gSaveContext.cutsceneTrigger == 0) { Interface_ChangeAlpha(1); - func_800B3840(0x20); - func_800B38A4(0x20); + ShrinkWindow_SetVal(0x20); + ShrinkWindow_SetCurrentVal(0x20); csCtx->state++; } diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index 8ceeb6334b..0baf2654b3 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -54,7 +54,7 @@ void KaleidoScopeCall_Update(GlobalContext* globalCtx) { if (pauseCtx->state != 0 || pauseCtx->flag != 0) { if (pauseCtx->state == 1) { - if (func_800B38FC() == 0) { + if (ShrinkWindow_GetCurrentVal() == 0) { HREG(80) = 7; HREG(82) = 3; R_PAUSE_MENU_MODE = 1; diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index 3d6e5739ef..4e8fcacc92 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -77,8 +77,8 @@ void KaleidoSetup_Update(GlobalContext* globalCtx) { if (pauseCtx->state == 1) { WREG(2) = -0x1860; R_UPDATE_RATE = 2; - if (func_800B3898()) { - func_800B3840(0); + if (ShrinkWindow_GetVal()) { + ShrinkWindow_SetVal(0); } func_800F64E0(1); } diff --git a/src/code/z_play.c b/src/code/z_play.c index 26b44c3946..b475b0ae05 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -172,7 +172,7 @@ void Gameplay_Destroy(GlobalContext* globalCtx) { globalCtx->transitionMode = 0; } - func_800B3968(); + ShrinkWindow_Destroy(); TransitionFade_Destroy(&globalCtx->transitionFade); VisMono_Destroy(&D_80161498); @@ -360,7 +360,7 @@ void Gameplay_Init(GlobalContext* globalCtx) { globalCtx->fadeTransition = 6; } - func_800B3908(); + ShrinkWindow_Init(); TransitionFade_Init(&globalCtx->transitionFade); TransitionFade_SetType(&globalCtx->transitionFade, 3); TransitionFade_SetColor(&globalCtx->transitionFade, RGBA8(0xA0, 0xA0, 0xA0, 0xFF)); @@ -998,7 +998,7 @@ void Gameplay_Update(GlobalContext* globalCtx) { LOG_NUM("1", 1, "../z_play.c", 3777); } - func_800B39B8(R_UPDATE_RATE); + ShrinkWindow_Update(R_UPDATE_RATE); if (1 && HREG(63)) { LOG_NUM("1", 1, "../z_play.c", 3783); diff --git a/src/code/z_rcp.c b/src/code/z_rcp.c index 511cf84479..750d353c04 100644 --- a/src/code/z_rcp.c +++ b/src/code/z_rcp.c @@ -1471,7 +1471,7 @@ void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) { gDPSetDepthImage(gfxCtx->overlay.p++, gZBuffer); if ((R_PAUSE_MENU_MODE < 2) && (gTrnsnUnkState < 2)) { - ret = func_800B38FC(); + ret = ShrinkWindow_GetCurrentVal(); if (HREG(80) == 16) { if (HREG(95) != 16) { diff --git a/src/code/z_view.c b/src/code/z_view.c index 63de9688d4..b0566e7a41 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -138,7 +138,7 @@ void func_800AA550(View* view) { gfxCtx = view->gfxCtx; - varY = func_800B38FC(); + varY = ShrinkWindow_GetCurrentVal(); varX = -1; // The following is optimized to varX = 0 but affects codegen diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index d46566f260..4d98268147 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -183,7 +183,7 @@ void func_80B4B010(EnZl1* this, GlobalContext* globalCtx) { globalCtx->envCtx.unk_E1 = 1; func_800C04D8(globalCtx, this->unk_1E8, &vec1, &vec2); func_800C0704(globalCtx, this->unk_1E8, 30.0f); - func_800B3840(0x20); + ShrinkWindow_SetVal(0x20); Interface_ChangeAlpha(2); player->actor.posRot.pos = playerPos; player->actor.speedXZ = 0.0f;