diff --git a/asm/non_matchings/code/code_800DACC0/func_800DD9F4.s b/asm/non_matchings/code/code_800DACC0/func_800DD9F4.s index 8fd792b2ab..0d38ced10d 100644 --- a/asm/non_matchings/code/code_800DACC0/func_800DD9F4.s +++ b/asm/non_matchings/code/code_800DACC0/func_800DD9F4.s @@ -12,7 +12,7 @@ glabel func_800DD9F4 /* B54BBC 800DDA1C 8CC30008 */ lw $v1, 8($a2) /* B54BC0 800DDA20 00073040 */ sll $a2, $a3, 1 /* B54BC4 800DDA24 24C6000F */ addiu $a2, $a2, 0xf -/* B54BC8 800DDA28 3C078013 */ lui $a3, %hi(gWaveSamples+0x18) # $a3, 0x8013 +/* B54BC8 800DDA28 3C078013 */ lui $a3, %hi(gWaveSamples+0x20) # $a3, 0x8013 /* B54BCC 800DDA2C 02002025 */ move $a0, $s0 /* B54BD0 800DDA30 2401FFF0 */ li $at, -16 /* B54BD4 800DDA34 00C13024 */ and $a2, $a2, $at diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5000.s b/asm/non_matchings/code/code_800E11F0/func_800E5000.s index 4103be1a9a..7fd3a05da5 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E5000.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E5000.s @@ -308,7 +308,7 @@ glabel func_800E5000 /* B5C5F4 800E5454 000FC040 */ sll $t8, $t7, 1 /* B5C5F8 800E5458 3C0F800E */ lui $t7, %hi(func_800E4FE0) # $t7, 0x800e /* B5C5FC 800E545C 25EF4FE0 */ addiu $t7, %lo(func_800E4FE0) # addiu $t7, $t7, 0x4fe0 -/* B5C600 800E5460 3C018013 */ lui $at, %hi(gWaveSamples) # $at, 0x8013 +/* B5C600 800E5460 3C018013 */ lui $at, %hi(gWaveSamples+0x20) # $at, 0x8013 /* B5C604 800E5464 3C068015 */ lui $a2, %hi(D_80155C70) # $a2, 0x8015 /* B5C608 800E5468 3C0A8015 */ lui $t2, %hi(D_80155F50) # $t2, 0x8015 /* B5C60C 800E546C 24C65C70 */ addiu $a2, %lo(D_80155C70) # addiu $a2, $a2, 0x5c70 diff --git a/asm/non_matchings/code/code_800F7260/func_800F74E0.s b/asm/non_matchings/code/code_800F7260/func_800F74E0.s index c166ca264e..8f470ea5be 100644 --- a/asm/non_matchings/code/code_800F7260/func_800F74E0.s +++ b/asm/non_matchings/code/code_800F7260/func_800F74E0.s @@ -9,7 +9,7 @@ glabel jtbl_8014A620 .text glabel func_800F74E0 -/* B6E680 800F74E0 3C028013 */ lui $v0, %hi(D_801333A0) # $v0, 0x8013 +/* B6E680 800F74E0 3C028013 */ lui $v0, %hi(D_801333A4) # $v0, 0x8013 /* B6E684 800F74E4 3C038013 */ lui $v1, %hi(D_801333A0) # $v1, 0x8013 /* B6E688 800F74E8 904233A4 */ lbu $v0, %lo(D_801333A4)($v0) /* B6E68C 800F74EC 906333A0 */ lbu $v1, %lo(D_801333A0)($v1) diff --git a/asm/non_matchings/code/db_camera/func_800B9638.s b/asm/non_matchings/code/db_camera/func_800B9638.s index e3e9d36ff0..17e3b618d0 100644 --- a/asm/non_matchings/code/db_camera/func_800B9638.s +++ b/asm/non_matchings/code/db_camera/func_800B9638.s @@ -1141,7 +1141,7 @@ glabel func_800B9638 /* B318B0 800BA710 240EFFFF */ li $t6, -1 /* B318B4 800BA714 3C018016 */ lui $at, %hi(D_8016114A) # $at, 0x8016 /* B318B8 800BA718 A42E114A */ sh $t6, %lo(D_8016114A)($at) -/* B318BC 800BA71C 3C018016 */ lui $at, %hi(D_8016114A) # $at, 0x8016 +/* B318BC 800BA71C 3C018016 */ lui $at, %hi(D_801612EA) # $at, 0x8016 /* B318C0 800BA720 240F002A */ li $t7, 42 /* B318C4 800BA724 10000006 */ b .L800BA740 /* B318C8 800BA728 A02F12EA */ sb $t7, %lo(D_801612EA)($at) diff --git a/asm/non_matchings/code/z_camera/Camera_Battle1.s b/asm/non_matchings/code/z_camera/Camera_Battle1.s index 6bcdd2d601..3e1136b869 100644 --- a/asm/non_matchings/code/z_camera/Camera_Battle1.s +++ b/asm/non_matchings/code/z_camera/Camera_Battle1.s @@ -148,7 +148,7 @@ glabel Camera_Battle1 /* 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(sCameraSettings) +/* AC27D0 8004B630 3C198012 */ lui $t9, %hi(sCameraSettings+4) /* AC27D4 8004B634 000FC0C0 */ sll $t8, $t7, 3 /* AC27D8 8004B638 86090144 */ lh $t1, 0x144($s0) /* AC27DC 8004B63C 0338C821 */ addu $t9, $t9, $t8 diff --git a/asm/non_matchings/code/z_camera/Camera_Battle4.s b/asm/non_matchings/code/z_camera/Camera_Battle4.s index a99d4136b6..60717b4ca6 100644 --- a/asm/non_matchings/code/z_camera/Camera_Battle4.s +++ b/asm/non_matchings/code/z_camera/Camera_Battle4.s @@ -55,7 +55,7 @@ glabel Camera_Battle4 /* 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(sCameraSettings) +/* AC3840 8004C6A0 3C198012 */ lui $t9, %hi(sCameraSettings+4) /* AC3844 8004C6A4 448C2000 */ mtc1 $t4, $f4 /* AC3848 8004C6A8 000FC0C0 */ sll $t8, $t7, 3 /* AC384C 8004C6AC 86080144 */ lh $t0, 0x144($s0) diff --git a/asm/non_matchings/code/z_camera/Camera_Data4.s b/asm/non_matchings/code/z_camera/Camera_Data4.s index 9e8366e358..7465b7750d 100644 --- a/asm/non_matchings/code/z_camera/Camera_Data4.s +++ b/asm/non_matchings/code/z_camera/Camera_Data4.s @@ -43,7 +43,7 @@ glabel Camera_Data4 /* 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(sCameraSettings) +/* AC8464 800512C4 3C198012 */ lui $t9, %hi(sCameraSettings+4) /* AC8468 800512C8 000FC0C0 */ sll $t8, $t7, 3 /* AC846C 800512CC 448C2000 */ mtc1 $t4, $f4 /* AC8470 800512D0 86080144 */ lh $t0, 0x144($s0) diff --git a/asm/non_matchings/code/z_camera/Camera_Demo1.s b/asm/non_matchings/code/z_camera/Camera_Demo1.s index 0fc9ad5780..7da437cb57 100644 --- a/asm/non_matchings/code/z_camera/Camera_Demo1.s +++ b/asm/non_matchings/code/z_camera/Camera_Demo1.s @@ -49,7 +49,7 @@ glabel Camera_Demo1 .L80054524: /* ACB6C4 80054524 86090142 */ lh $t1, 0x142($s0) .L80054528: -/* ACB6C8 80054528 3C0B8012 */ lui $t3, %hi(sCameraSettings) +/* ACB6C8 80054528 3C0B8012 */ lui $t3, %hi(sCameraSettings+4) /* ACB6CC 8005452C 860C0144 */ lh $t4, 0x144($s0) /* ACB6D0 80054530 000950C0 */ sll $t2, $t1, 3 /* ACB6D4 80054534 016A5821 */ addu $t3, $t3, $t2 diff --git a/asm/non_matchings/code/z_camera/Camera_Demo3.s b/asm/non_matchings/code/z_camera/Camera_Demo3.s index beb5b7021f..322b8276b8 100644 --- a/asm/non_matchings/code/z_camera/Camera_Demo3.s +++ b/asm/non_matchings/code/z_camera/Camera_Demo3.s @@ -86,7 +86,7 @@ glabel Camera_Demo3 /* ACB98C 800547EC 00000000 */ nop .L800547F0: /* ACB990 800547F0 86390142 */ lh $t9, 0x142($s1) -/* ACB994 800547F4 3C098012 */ lui $t1, %hi(sCameraSettings) +/* ACB994 800547F4 3C098012 */ lui $t1, %hi(sCameraSettings+4) /* ACB998 800547F8 862A0144 */ lh $t2, 0x144($s1) /* ACB99C 800547FC 001940C0 */ sll $t0, $t9, 3 /* ACB9A0 80054800 01284821 */ addu $t1, $t1, $t0 diff --git a/asm/non_matchings/code/z_camera/Camera_Demo6.s b/asm/non_matchings/code/z_camera/Camera_Demo6.s index d154ed92df..9c45ec2560 100644 --- a/asm/non_matchings/code/z_camera/Camera_Demo6.s +++ b/asm/non_matchings/code/z_camera/Camera_Demo6.s @@ -35,7 +35,7 @@ glabel Camera_Demo6 .L80055CE8: /* ACCE88 80055CE8 860A0142 */ lh $t2, 0x142($s0) .L80055CEC: -/* ACCE8C 80055CEC 3C0C8012 */ lui $t4, %hi(sCameraSettings) +/* ACCE8C 80055CEC 3C0C8012 */ lui $t4, %hi(sCameraSettings+4) /* ACCE90 80055CF0 860D0144 */ lh $t5, 0x144($s0) /* ACCE94 80055CF4 000A58C0 */ sll $t3, $t2, 3 /* ACCE98 80055CF8 018B6021 */ addu $t4, $t4, $t3 diff --git a/asm/non_matchings/code/z_camera/Camera_Demo9.s b/asm/non_matchings/code/z_camera/Camera_Demo9.s index fd6ab76742..59d3710231 100644 --- a/asm/non_matchings/code/z_camera/Camera_Demo9.s +++ b/asm/non_matchings/code/z_camera/Camera_Demo9.s @@ -36,7 +36,7 @@ glabel Camera_Demo9 .L80056010: /* ACD1B0 80056010 86180142 */ lh $t8, 0x142($s0) .L80056014: -/* ACD1B4 80056014 3C098012 */ lui $t1, %hi(sCameraSettings) +/* ACD1B4 80056014 3C098012 */ lui $t1, %hi(sCameraSettings+4) /* ACD1B8 80056018 860A0144 */ lh $t2, 0x144($s0) /* ACD1BC 8005601C 0018C8C0 */ sll $t9, $t8, 3 /* ACD1C0 80056020 01394821 */ addu $t1, $t1, $t9 diff --git a/asm/non_matchings/code/z_camera/Camera_Fixed1.s b/asm/non_matchings/code/z_camera/Camera_Fixed1.s index 8f48dda441..80f14b0ff1 100644 --- a/asm/non_matchings/code/z_camera/Camera_Fixed1.s +++ b/asm/non_matchings/code/z_camera/Camera_Fixed1.s @@ -37,7 +37,7 @@ glabel Camera_Fixed1 /* AC688C 8004F6EC 00000000 */ nop .L8004F6F0: /* AC6890 8004F6F0 860F0142 */ lh $t7, 0x142($s0) -/* AC6894 8004F6F4 3C198012 */ lui $t9, %hi(sCameraSettings) +/* AC6894 8004F6F4 3C198012 */ lui $t9, %hi(sCameraSettings+4) /* AC6898 8004F6F8 86080144 */ lh $t0, 0x144($s0) /* AC689C 8004F6FC 000FC0C0 */ sll $t8, $t7, 3 /* AC68A0 8004F700 0338C821 */ addu $t9, $t9, $t8 diff --git a/asm/non_matchings/code/z_camera/Camera_Fixed2.s b/asm/non_matchings/code/z_camera/Camera_Fixed2.s index abd899673f..ac867be46a 100644 --- a/asm/non_matchings/code/z_camera/Camera_Fixed2.s +++ b/asm/non_matchings/code/z_camera/Camera_Fixed2.s @@ -44,7 +44,7 @@ glabel Camera_Fixed2 /* 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(sCameraSettings) +/* AC6BF0 8004FA50 3C088012 */ lui $t0, %hi(sCameraSettings+4) /* AC6BF4 8004FA54 0018C8C0 */ sll $t9, $t8, 3 /* AC6BF8 8004FA58 448D2000 */ mtc1 $t5, $f4 /* AC6BFC 8004FA5C 86090144 */ lh $t1, 0x144($s0) diff --git a/asm/non_matchings/code/z_camera/Camera_Fixed3.s b/asm/non_matchings/code/z_camera/Camera_Fixed3.s index 0b97e2920e..3affbf1701 100644 --- a/asm/non_matchings/code/z_camera/Camera_Fixed3.s +++ b/asm/non_matchings/code/z_camera/Camera_Fixed3.s @@ -37,7 +37,7 @@ glabel Camera_Fixed3 .L8004FE48: /* AC6FE8 8004FE48 86180142 */ lh $t8, 0x142($s0) .L8004FE4C: -/* AC6FEC 8004FE4C 3C088012 */ lui $t0, %hi(sCameraSettings) +/* AC6FEC 8004FE4C 3C088012 */ lui $t0, %hi(sCameraSettings+4) /* AC6FF0 8004FE50 86090144 */ lh $t1, 0x144($s0) /* AC6FF4 8004FE54 0018C8C0 */ sll $t9, $t8, 3 /* AC6FF8 8004FE58 01194021 */ addu $t0, $t0, $t9 diff --git a/asm/non_matchings/code/z_camera/Camera_Fixed4.s b/asm/non_matchings/code/z_camera/Camera_Fixed4.s index 1380ae5488..fc1a528e7e 100644 --- a/asm/non_matchings/code/z_camera/Camera_Fixed4.s +++ b/asm/non_matchings/code/z_camera/Camera_Fixed4.s @@ -39,7 +39,7 @@ glabel Camera_Fixed4 /* 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(sCameraSettings) +/* AC7284 800500E4 3C198012 */ lui $t9, %hi(sCameraSettings+4) /* AC7288 800500E8 000FC0C0 */ sll $t8, $t7, 3 /* AC728C 800500EC 86080144 */ lh $t0, 0x144($s0) /* AC7290 800500F0 0338C821 */ addu $t9, $t9, $t8 diff --git a/asm/non_matchings/code/z_camera/Camera_Jump1.s b/asm/non_matchings/code/z_camera/Camera_Jump1.s index 6206e8b80b..4f4aab9bd6 100644 --- a/asm/non_matchings/code/z_camera/Camera_Jump1.s +++ b/asm/non_matchings/code/z_camera/Camera_Jump1.s @@ -71,7 +71,7 @@ glabel Camera_Jump1 /* 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(sCameraSettings) +/* AC0C58 80049AB8 3C198012 */ lui $t9, %hi(sCameraSettings+4) /* AC0C5C 80049ABC 448C2000 */ mtc1 $t4, $f4 /* AC0C60 80049AC0 000FC0C0 */ sll $t8, $t7, 3 /* AC0C64 80049AC4 86080144 */ lh $t0, 0x144($s0) diff --git a/asm/non_matchings/code/z_camera/Camera_Jump2.s b/asm/non_matchings/code/z_camera/Camera_Jump2.s index 0dae43dc40..360e3b06ab 100644 --- a/asm/non_matchings/code/z_camera/Camera_Jump2.s +++ b/asm/non_matchings/code/z_camera/Camera_Jump2.s @@ -70,7 +70,7 @@ glabel Camera_Jump2 /* 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(sCameraSettings) +/* AC146C 8004A2CC 3C198012 */ lui $t9, %hi(sCameraSettings+4) /* AC1470 8004A2D0 860B0144 */ lh $t3, 0x144($s0) /* AC1474 8004A2D4 0338C821 */ addu $t9, $t9, $t8 /* AC1478 8004A2D8 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) diff --git a/asm/non_matchings/code/z_camera/Camera_Jump3.s b/asm/non_matchings/code/z_camera/Camera_Jump3.s index bb7a27aca0..f6c71dcf75 100644 --- a/asm/non_matchings/code/z_camera/Camera_Jump3.s +++ b/asm/non_matchings/code/z_camera/Camera_Jump3.s @@ -121,7 +121,7 @@ glabel Camera_Jump3 /* 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(sCameraSettings) +/* AC1FE0 8004AE40 3C0D8012 */ lui $t5, %hi(sCameraSettings+4) /* AC1FE4 8004AE44 862E0022 */ lh $t6, 0x22($s1) /* AC1FE8 8004AE48 000B60C0 */ sll $t4, $t3, 3 /* AC1FEC 8004AE4C 46105082 */ mul.s $f2, $f10, $f16 diff --git a/asm/non_matchings/code/z_camera/Camera_KeepOn0.s b/asm/non_matchings/code/z_camera/Camera_KeepOn0.s index 1f362ec9e7..51ad3cfa3e 100644 --- a/asm/non_matchings/code/z_camera/Camera_KeepOn0.s +++ b/asm/non_matchings/code/z_camera/Camera_KeepOn0.s @@ -35,7 +35,7 @@ glabel Camera_KeepOn0 /* AC6588 8004F3E8 00000000 */ nop .L8004F3EC: /* AC658C 8004F3EC 86190142 */ lh $t9, 0x142($s0) -/* AC6590 8004F3F0 3C0A8012 */ lui $t2, %hi(sCameraSettings) +/* AC6590 8004F3F0 3C0A8012 */ lui $t2, %hi(sCameraSettings+4) /* AC6594 8004F3F4 860B0144 */ lh $t3, 0x144($s0) /* AC6598 8004F3F8 001948C0 */ sll $t1, $t9, 3 /* AC659C 8004F3FC 01495021 */ addu $t2, $t2, $t1 diff --git a/asm/non_matchings/code/z_camera/Camera_KeepOn1.s b/asm/non_matchings/code/z_camera/Camera_KeepOn1.s index 4b5feb28d1..3f2aac4689 100644 --- a/asm/non_matchings/code/z_camera/Camera_KeepOn1.s +++ b/asm/non_matchings/code/z_camera/Camera_KeepOn1.s @@ -115,7 +115,7 @@ glabel Camera_KeepOn1 /* 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(sCameraSettings) +/* AC3CC4 8004CB24 3C0A8012 */ lui $t2, %hi(sCameraSettings+4) /* AC3CC8 8004CB28 0018C8C0 */ sll $t9, $t8, 3 /* AC3CCC 8004CB2C 860B0144 */ lh $t3, 0x144($s0) /* AC3CD0 8004CB30 01595021 */ addu $t2, $t2, $t9 diff --git a/asm/non_matchings/code/z_camera/Camera_KeepOn3.s b/asm/non_matchings/code/z_camera/Camera_KeepOn3.s index 8b5c2b2eb9..c4d58490da 100644 --- a/asm/non_matchings/code/z_camera/Camera_KeepOn3.s +++ b/asm/non_matchings/code/z_camera/Camera_KeepOn3.s @@ -104,7 +104,7 @@ glabel Camera_KeepOn3 /* 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(sCameraSettings) +/* AC4CAC 8004DB0C 3C098012 */ lui $t1, %hi(sCameraSettings+4) /* AC4CB0 8004DB10 0018C8C0 */ sll $t9, $t8, 3 /* AC4CB4 8004DB14 866A0144 */ lh $t2, 0x144($s3) /* AC4CB8 8004DB18 01394821 */ addu $t1, $t1, $t9 diff --git a/asm/non_matchings/code/z_camera/Camera_KeepOn4.s b/asm/non_matchings/code/z_camera/Camera_KeepOn4.s index d5125cd14c..5975201a11 100644 --- a/asm/non_matchings/code/z_camera/Camera_KeepOn4.s +++ b/asm/non_matchings/code/z_camera/Camera_KeepOn4.s @@ -180,7 +180,7 @@ glabel Camera_KeepOn4 /* 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(sCameraSettings) +/* AC574C 8004E5AC 3C088012 */ lui $t0, %hi(sCameraSettings+4) /* AC5750 8004E5B0 46004283 */ div.s $f10, $f8, $f0 /* AC5754 8004E5B4 0018C8C0 */ sll $t9, $t8, 3 /* AC5758 8004E5B8 86290144 */ lh $t1, 0x144($s1) diff --git a/asm/non_matchings/code/z_camera/Camera_Normal1.s b/asm/non_matchings/code/z_camera/Camera_Normal1.s index 9ebd4afa5d..1e646e404d 100644 --- a/asm/non_matchings/code/z_camera/Camera_Normal1.s +++ b/asm/non_matchings/code/z_camera/Camera_Normal1.s @@ -71,7 +71,7 @@ glabel Camera_Normal1 /* 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(sCameraSettings) +/* ABE5BC 8004741C 3C198012 */ lui $t9, %hi(sCameraSettings+4) /* ABE5C0 80047420 000FC0C0 */ sll $t8, $t7, 3 /* ABE5C4 80047424 86080144 */ lh $t0, 0x144($s0) /* ABE5C8 80047428 0338C821 */ addu $t9, $t9, $t8 diff --git a/asm/non_matchings/code/z_camera/Camera_Normal2.s b/asm/non_matchings/code/z_camera/Camera_Normal2.s index 6fe810b626..e22bede3ae 100644 --- a/asm/non_matchings/code/z_camera/Camera_Normal2.s +++ b/asm/non_matchings/code/z_camera/Camera_Normal2.s @@ -79,7 +79,7 @@ glabel Camera_Normal2 /* ABF1B4 80048014 00000000 */ nop .L80048018: /* ABF1B8 80048018 86190142 */ lh $t9, 0x142($s0) -/* ABF1BC 8004801C 3C098012 */ lui $t1, %hi(sCameraSettings) +/* ABF1BC 8004801C 3C098012 */ lui $t1, %hi(sCameraSettings+4) /* ABF1C0 80048020 860A0144 */ lh $t2, 0x144($s0) /* ABF1C4 80048024 001940C0 */ sll $t0, $t9, 3 /* ABF1C8 80048028 01284821 */ addu $t1, $t1, $t0 diff --git a/asm/non_matchings/code/z_camera/Camera_Normal3.s b/asm/non_matchings/code/z_camera/Camera_Normal3.s index b1007c5566..8e2e7ec842 100644 --- a/asm/non_matchings/code/z_camera/Camera_Normal3.s +++ b/asm/non_matchings/code/z_camera/Camera_Normal3.s @@ -48,7 +48,7 @@ glabel Camera_Normal3 /* ABF9E8 80048848 00000000 */ nop .L8004884C: /* ABF9EC 8004884C 860F0142 */ lh $t7, 0x142($s0) -/* ABF9F0 80048850 3C198012 */ lui $t9, %hi(sCameraSettings) +/* ABF9F0 80048850 3C198012 */ lui $t9, %hi(sCameraSettings+4) /* ABF9F4 80048854 86080144 */ lh $t0, 0x144($s0) /* ABF9F8 80048858 000FC0C0 */ sll $t8, $t7, 3 /* ABF9FC 8004885C 0338C821 */ addu $t9, $t9, $t8 diff --git a/asm/non_matchings/code/z_camera/Camera_Parallel1.s b/asm/non_matchings/code/z_camera/Camera_Parallel1.s index 35b08000df..053830b2e2 100644 --- a/asm/non_matchings/code/z_camera/Camera_Parallel1.s +++ b/asm/non_matchings/code/z_camera/Camera_Parallel1.s @@ -68,7 +68,7 @@ glabel Camera_Parallel1 /* 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(sCameraSettings) +/* AC0234 80049094 3C198012 */ lui $t9, %hi(sCameraSettings+4) /* AC0238 80049098 000FC0C0 */ sll $t8, $t7, 3 /* AC023C 8004909C 86090144 */ lh $t1, 0x144($s0) /* AC0240 800490A0 0338C821 */ addu $t9, $t9, $t8 diff --git a/asm/non_matchings/code/z_camera/Camera_Special5.s b/asm/non_matchings/code/z_camera/Camera_Special5.s index 687d3c294b..a4fa23beae 100644 --- a/asm/non_matchings/code/z_camera/Camera_Special5.s +++ b/asm/non_matchings/code/z_camera/Camera_Special5.s @@ -51,7 +51,7 @@ glabel Camera_Special5 /* 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(sCameraSettings) +/* ACDA08 80056868 3C198012 */ lui $t9, %hi(sCameraSettings+4) /* ACDA0C 8005686C 86080144 */ lh $t0, 0x144($s0) /* ACDA10 80056870 000FC0C0 */ sll $t8, $t7, 3 /* ACDA14 80056874 46009103 */ div.s $f4, $f18, $f0 diff --git a/asm/non_matchings/code/z_camera/Camera_Special6.s b/asm/non_matchings/code/z_camera/Camera_Special6.s index 190d5dafb7..d0d26c8f53 100644 --- a/asm/non_matchings/code/z_camera/Camera_Special6.s +++ b/asm/non_matchings/code/z_camera/Camera_Special6.s @@ -31,7 +31,7 @@ glabel Camera_Special6 .L80056FB4: /* ACE154 80056FB4 860F0142 */ lh $t7, 0x142($s0) .L80056FB8: -/* ACE158 80056FB8 3C198012 */ lui $t9, %hi(sCameraSettings) +/* ACE158 80056FB8 3C198012 */ lui $t9, %hi(sCameraSettings+4) /* ACE15C 80056FBC 860B0144 */ lh $t3, 0x144($s0) /* ACE160 80056FC0 000FC0C0 */ sll $t8, $t7, 3 /* ACE164 80056FC4 0338C821 */ addu $t9, $t9, $t8 diff --git a/asm/non_matchings/code/z_camera/Camera_Special9.s b/asm/non_matchings/code/z_camera/Camera_Special9.s index 0c70b2f600..d85b60d22d 100644 --- a/asm/non_matchings/code/z_camera/Camera_Special9.s +++ b/asm/non_matchings/code/z_camera/Camera_Special9.s @@ -63,7 +63,7 @@ glabel Camera_Special9 .L800574E8: /* ACE688 800574E8 86190142 */ lh $t9, 0x142($s0) .L800574EC: -/* ACE68C 800574EC 3C0C8012 */ lui $t4, %hi(sCameraSettings) +/* ACE68C 800574EC 3C0C8012 */ lui $t4, %hi(sCameraSettings+4) /* ACE690 800574F0 860D0144 */ lh $t5, 0x144($s0) /* ACE694 800574F4 001958C0 */ sll $t3, $t9, 3 /* ACE698 800574F8 018B6021 */ addu $t4, $t4, $t3 diff --git a/asm/non_matchings/code/z_camera/Camera_Subj3.s b/asm/non_matchings/code/z_camera/Camera_Subj3.s index 1f47a59b1f..fd6786b543 100644 --- a/asm/non_matchings/code/z_camera/Camera_Subj3.s +++ b/asm/non_matchings/code/z_camera/Camera_Subj3.s @@ -43,7 +43,7 @@ glabel Camera_Subj3 /* 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(sCameraSettings) +/* AC76A4 80050504 3C0B8012 */ lui $t3, %hi(sCameraSettings+4) /* AC76A8 80050508 860C0144 */ lh $t4, 0x144($s0) /* AC76AC 8005050C 001950C0 */ sll $t2, $t9, 3 /* AC76B0 80050510 016A5821 */ addu $t3, $t3, $t2 diff --git a/asm/non_matchings/code/z_camera/Camera_Subj4.s b/asm/non_matchings/code/z_camera/Camera_Subj4.s index 6f2cb22e3a..22ece9258c 100644 --- a/asm/non_matchings/code/z_camera/Camera_Subj4.s +++ b/asm/non_matchings/code/z_camera/Camera_Subj4.s @@ -26,7 +26,7 @@ glabel Camera_Subj4 .L80050B70: /* AC7D10 80050B70 862F0142 */ lh $t7, 0x142($s1) .L80050B74: -/* AC7D14 80050B74 3C198012 */ lui $t9, %hi(sCameraSettings) +/* AC7D14 80050B74 3C198012 */ lui $t9, %hi(sCameraSettings+4) /* AC7D18 80050B78 86280144 */ lh $t0, 0x144($s1) /* AC7D1C 80050B7C 000FC0C0 */ sll $t8, $t7, 3 /* AC7D20 80050B80 0338C821 */ addu $t9, $t9, $t8 diff --git a/asm/non_matchings/code/z_camera/Camera_Unique0.s b/asm/non_matchings/code/z_camera/Camera_Unique0.s index df002da27d..1d9d458db7 100644 --- a/asm/non_matchings/code/z_camera/Camera_Unique0.s +++ b/asm/non_matchings/code/z_camera/Camera_Unique0.s @@ -32,7 +32,7 @@ glabel Camera_Unique0 .L800524B8: /* AC9658 800524B8 86180142 */ lh $t8, 0x142($s0) .L800524BC: -/* AC965C 800524BC 3C098012 */ lui $t1, %hi(sCameraSettings) +/* AC965C 800524BC 3C098012 */ lui $t1, %hi(sCameraSettings+4) /* AC9660 800524C0 860A0144 */ lh $t2, 0x144($s0) /* AC9664 800524C4 0018C8C0 */ sll $t9, $t8, 3 /* AC9668 800524C8 01394821 */ addu $t1, $t1, $t9 diff --git a/asm/non_matchings/code/z_camera/Camera_Unique1.s b/asm/non_matchings/code/z_camera/Camera_Unique1.s index 5ca741f51c..49b0519608 100644 --- a/asm/non_matchings/code/z_camera/Camera_Unique1.s +++ b/asm/non_matchings/code/z_camera/Camera_Unique1.s @@ -54,7 +54,7 @@ glabel Camera_Unique1 /* 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(sCameraSettings) +/* AC87B4 80051614 3C198012 */ lui $t9, %hi(sCameraSettings+4) /* AC87B8 80051618 448C2000 */ mtc1 $t4, $f4 /* AC87BC 8005161C 000FC0C0 */ sll $t8, $t7, 3 /* AC87C0 80051620 86080144 */ lh $t0, 0x144($s0) diff --git a/asm/non_matchings/code/z_camera/Camera_Unique2.s b/asm/non_matchings/code/z_camera/Camera_Unique2.s index 8750967bd9..ea68266925 100644 --- a/asm/non_matchings/code/z_camera/Camera_Unique2.s +++ b/asm/non_matchings/code/z_camera/Camera_Unique2.s @@ -56,7 +56,7 @@ glabel Camera_Unique2 /* 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(sCameraSettings) +/* AC8D6C 80051BCC 3C198012 */ lui $t9, %hi(sCameraSettings+4) /* AC8D70 80051BD0 000FC0C0 */ sll $t8, $t7, 3 /* AC8D74 80051BD4 86080144 */ lh $t0, 0x144($s0) /* AC8D78 80051BD8 0338C821 */ addu $t9, $t9, $t8 diff --git a/asm/non_matchings/code/z_camera/Camera_Unique3.s b/asm/non_matchings/code/z_camera/Camera_Unique3.s index 8613246208..3c75690087 100644 --- a/asm/non_matchings/code/z_camera/Camera_Unique3.s +++ b/asm/non_matchings/code/z_camera/Camera_Unique3.s @@ -47,7 +47,7 @@ glabel Camera_Unique3 /* 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(sCameraSettings) +/* AC9174 80051FD4 3C098012 */ lui $t1, %hi(sCameraSettings+4) /* AC9178 80051FD8 448E2000 */ mtc1 $t6, $f4 /* AC917C 80051FDC 001940C0 */ sll $t0, $t9, 3 /* AC9180 80051FE0 860A0144 */ lh $t2, 0x144($s0) diff --git a/asm/non_matchings/code/z_camera/Camera_Unique7.s b/asm/non_matchings/code/z_camera/Camera_Unique7.s index df623ffddc..4a52529ecd 100644 --- a/asm/non_matchings/code/z_camera/Camera_Unique7.s +++ b/asm/non_matchings/code/z_camera/Camera_Unique7.s @@ -21,7 +21,7 @@ glabel Camera_Unique7 /* AC9D68 80052BC8 00000000 */ nop .L80052BCC: /* AC9D6C 80052BCC 860F0142 */ lh $t7, 0x142($s0) -/* AC9D70 80052BD0 3C198012 */ lui $t9, %hi(sCameraSettings) +/* AC9D70 80052BD0 3C198012 */ lui $t9, %hi(sCameraSettings+4) /* AC9D74 80052BD4 86080144 */ lh $t0, 0x144($s0) /* AC9D78 80052BD8 000FC0C0 */ sll $t8, $t7, 3 /* AC9D7C 80052BDC 0338C821 */ addu $t9, $t9, $t8 diff --git a/asm/non_matchings/code/z_camera/Camera_Unique9.s b/asm/non_matchings/code/z_camera/Camera_Unique9.s index 839fbc5883..8b4a58aecf 100644 --- a/asm/non_matchings/code/z_camera/Camera_Unique9.s +++ b/asm/non_matchings/code/z_camera/Camera_Unique9.s @@ -104,7 +104,7 @@ glabel Camera_Unique9 .L80052E58: /* AC9FF8 80052E58 86380142 */ lh $t8, 0x142($s1) .L80052E5C: -/* AC9FFC 80052E5C 3C0A8012 */ lui $t2, %hi(sCameraSettings) +/* AC9FFC 80052E5C 3C0A8012 */ lui $t2, %hi(sCameraSettings+4) /* ACA000 80052E60 862B0144 */ lh $t3, 0x144($s1) /* ACA004 80052E64 0018C8C0 */ sll $t9, $t8, 3 /* ACA008 80052E68 01595021 */ addu $t2, $t2, $t9 diff --git a/asm/non_matchings/code/z_camera/func_800584E8.s b/asm/non_matchings/code/z_camera/func_800584E8.s index 36ddc91684..64c6d31215 100644 --- a/asm/non_matchings/code/z_camera/func_800584E8.s +++ b/asm/non_matchings/code/z_camera/func_800584E8.s @@ -166,7 +166,7 @@ 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(sCameraSettings) +/* ACF8BC 8005871C 3C188012 */ lui $t8, %hi(sCameraSettings+4) /* ACF8C0 80058720 860E0144 */ lh $t6, 0x144($s0) /* ACF8C4 80058724 001978C0 */ sll $t7, $t9, 3 /* ACF8C8 80058728 030FC021 */ addu $t8, $t8, $t7 diff --git a/asm/non_matchings/code/z_camera/func_800591EC.s b/asm/non_matchings/code/z_camera/func_800591EC.s index 3bc7d097c1..f1899e1631 100644 --- a/asm/non_matchings/code/z_camera/func_800591EC.s +++ b/asm/non_matchings/code/z_camera/func_800591EC.s @@ -371,7 +371,7 @@ 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(sCameraSettings) +/* AD0804 80059664 3C0B8012 */ lui $t3, %hi(sCameraSettings+4) /* AD0808 80059668 86060144 */ lh $a2, 0x144($s0) /* AD080C 8005966C 000550C0 */ sll $t2, $a1, 3 /* AD0810 80059670 016A5821 */ addu $t3, $t3, $t2 @@ -389,7 +389,7 @@ 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(sCameraSettings) +/* AD0848 800596A8 3C198012 */ lui $t9, %hi(sCameraSettings+4) /* AD084C 800596AC 86090144 */ lh $t1, 0x144($s0) /* AD0850 800596B0 000FC0C0 */ sll $t8, $t7, 3 /* AD0854 800596B4 0338C821 */ addu $t9, $t9, $t8 @@ -462,7 +462,7 @@ 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_8011D3A0) # $a0, 0x8012 +/* AD0958 800597B8 3C048012 */ lui $a0, %hi(D_8011D3A0+2) # $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) @@ -475,9 +475,9 @@ 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_8011D3A0) +/* AD0988 800597E8 3C048012 */ lui $a0, %hi(D_8011D3A0+2) /* AD098C 800597EC AC39D3A0 */ sw $t9, %lo(D_8011D3A0)($at) -/* AD0990 800597F0 3C048012 */ lui $a0, %hi(D_8011D3A0) # $a0, 0x8012 +/* AD0990 800597F0 3C048012 */ lui $a0, %hi(D_8011D3A0+2) # $a0, 0x8012 /* AD0994 800597F4 0C0114D4 */ jal func_80045350 /* AD0998 800597F8 8484D3A2 */ lh $a0,%lo(D_8011D3A0+2)($a0) /* AD099C 800597FC 10000003 */ b .L8005980C @@ -510,7 +510,7 @@ 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(sCameraSettings) +/* AD0A08 80059868 3C198012 */ lui $t9, %hi(sCameraSettings+4) /* AD0A0C 8005986C 000668C0 */ sll $t5, $a2, 3 /* AD0A10 80059870 032DC821 */ addu $t9, $t9, $t5 /* AD0A14 80059874 8F39D068 */ lw $t9, %lo(sCameraSettings+4)($t9) diff --git a/asm/non_matchings/code/z_lifemeter/Health_UpdateData.s b/asm/non_matchings/code/z_lifemeter/Health_UpdateData.s index 01fa3527cf..d9f97dabe8 100644 --- a/asm/non_matchings/code/z_lifemeter/Health_UpdateData.s +++ b/asm/non_matchings/code/z_lifemeter/Health_UpdateData.s @@ -195,7 +195,7 @@ glabel Health_UpdateData /* AEFEBC 80078D1C 46809120 */ cvt.s.w $f4, $f18 /* AEFEC0 80078D20 46004282 */ mul.s $f10, $f8, $f0 /* AEFEC4 80078D24 00031C00 */ sll $v1, $v1, 0x10 -/* AEFEC8 80078D28 3C018016 */ lui $at, %hi(D_8015FDE0+6) # $at, 0x8016 +/* AEFEC8 80078D28 3C018016 */ lui $at, %hi(D_8015FDE0+8) # $at, 0x8016 /* AEFECC 80078D2C 00031C03 */ sra $v1, $v1, 0x10 /* AEFED0 80078D30 246E00FF */ addiu $t6, $v1, 0xff /* AEFED4 80078D34 46002182 */ mul.s $f6, $f4, $f0 diff --git a/asm/non_matchings/code/z_message_PAL/func_80107980.s b/asm/non_matchings/code/z_message_PAL/func_80107980.s index 3502962ded..5f93b338b9 100644 --- a/asm/non_matchings/code/z_message_PAL/func_80107980.s +++ b/asm/non_matchings/code/z_message_PAL/func_80107980.s @@ -164,7 +164,7 @@ glabel func_80107980 /* B7ED5C 80107BBC 03207025 */ move $t6, $t9 /* B7ED60 80107BC0 3C018015 */ lui $at, %hi(D_801539E4) # $at, 0x8015 /* B7ED64 80107BC4 A42939E4 */ sh $t1, %lo(D_801539E4)($at) -/* B7ED68 80107BC8 3C018015 */ lui $at, %hi(D_801539E4) # $at, 0x8015 +/* B7ED68 80107BC8 3C018015 */ lui $at, %hi(D_801539E0) # $at, 0x8015 /* B7ED6C 80107BCC A42A39E0 */ sh $t2, %lo(D_801539E0)($at) /* B7ED70 80107BD0 00801825 */ move $v1, $a0 /* B7ED74 80107BD4 10000006 */ b .L80107BF0