diff --git a/asm/nonmatchings/code_838b0_len_5900/enable_partner_flying.s b/asm/nonmatchings/code_838b0_len_5900/enable_partner_flying.s index 25198e1280..a1f7bf8af5 100644 --- a/asm/nonmatchings/code_838b0_len_5900/enable_partner_flying.s +++ b/asm/nonmatchings/code_838b0_len_5900/enable_partner_flying.s @@ -94,9 +94,9 @@ glabel enable_partner_flying /* 86908 800ED458 000310C0 */ sll $v0, $v1, 3 /* 8690C 800ED45C 00431021 */ addu $v0, $v0, $v1 /* 86910 800ED460 00021080 */ sll $v0, $v0, 2 -/* 86914 800ED464 3C038010 */ lui $v1, 0x8010 +/* 86914 800ED464 3C038010 */ lui $v1, %hi(gPartnerAnimations+0x14) /* 86918 800ED468 00621821 */ addu $v1, $v1, $v0 -/* 8691C 800ED46C 8C63835C */ lw $v1, -0x7ca4($v1) +/* 8691C 800ED46C 8C63835C */ lw $v1, %lo(gPartnerAnimations+0x14)($v1) /* 86920 800ED470 24020010 */ addiu $v0, $zero, 0x10 /* 86924 800ED474 3C018010 */ lui $at, 0x8010 /* 86928 800ED478 AC22802C */ sw $v0, -0x7fd4($at) diff --git a/asm/nonmatchings/code_838b0_len_5900/enable_partner_walking.s b/asm/nonmatchings/code_838b0_len_5900/enable_partner_walking.s index bf808bad50..95a32f0923 100644 --- a/asm/nonmatchings/code_838b0_len_5900/enable_partner_walking.s +++ b/asm/nonmatchings/code_838b0_len_5900/enable_partner_walking.s @@ -83,9 +83,9 @@ glabel enable_partner_walking /* 84E78 800EB9C8 000310C0 */ sll $v0, $v1, 3 /* 84E7C 800EB9CC 00431021 */ addu $v0, $v0, $v1 /* 84E80 800EB9D0 00021080 */ sll $v0, $v0, 2 -/* 84E84 800EB9D4 3C038010 */ lui $v1, 0x8010 +/* 84E84 800EB9D4 3C038010 */ lui $v1, %hi(gPartnerAnimations+0x14) /* 84E88 800EB9D8 00621821 */ addu $v1, $v1, $v0 -/* 84E8C 800EB9DC 8C63835C */ lw $v1, -0x7ca4($v1) +/* 84E8C 800EB9DC 8C63835C */ lw $v1, %lo(gPartnerAnimations+0x14)($v1) /* 84E90 800EB9E0 24020010 */ addiu $v0, $zero, 0x10 /* 84E94 800EB9E4 3C018010 */ lui $at, 0x8010 /* 84E98 800EB9E8 AC22802C */ sw $v0, -0x7fd4($at) diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EA6CC.s b/asm/nonmatchings/code_838b0_len_5900/func_800EA6CC.s index 749afb5ebb..7360f53ed7 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EA6CC.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EA6CC.s @@ -537,9 +537,9 @@ glabel func_800EA6CC /* 84374 800EAEC4 00431021 */ addu $v0, $v0, $v1 /* 84378 800EAEC8 00021080 */ sll $v0, $v0, 2 /* 8437C 800EAECC 8CA30000 */ lw $v1, ($a1) -/* 84380 800EAED0 3C018010 */ lui $at, 0x8010 +/* 84380 800EAED0 3C018010 */ lui $at, %hi(gPartnerAnimations+0x10) /* 84384 800EAED4 00220821 */ addu $at, $at, $v0 -/* 84388 800EAED8 8C228358 */ lw $v0, -0x7ca8($at) +/* 84388 800EAED8 8C228358 */ lw $v0, %lo(gPartnerAnimations+0x10)($at) /* 8438C 800EAEDC 3C018011 */ lui $at, 0x8011 /* 84390 800EAEE0 AC30CD30 */ sw $s0, -0x32d0($at) /* 84394 800EAEE4 0C038069 */ jal enable_player_input diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EBC74.s b/asm/nonmatchings/code_838b0_len_5900/func_800EBC74.s index 74a3fe073e..ae470cf992 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EBC74.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EBC74.s @@ -36,9 +36,9 @@ glabel func_800EBC74 /* 8519C 800EBCEC 000310C0 */ sll $v0, $v1, 3 /* 851A0 800EBCF0 00431021 */ addu $v0, $v0, $v1 /* 851A4 800EBCF4 00021080 */ sll $v0, $v0, 2 -/* 851A8 800EBCF8 3C038010 */ lui $v1, 0x8010 +/* 851A8 800EBCF8 3C038010 */ lui $v1, %hi(gPartnerAnimations+0x14) /* 851AC 800EBCFC 00621821 */ addu $v1, $v1, $v0 -/* 851B0 800EBD00 8C63835C */ lw $v1, -0x7ca4($v1) +/* 851B0 800EBD00 8C63835C */ lw $v1, %lo(gPartnerAnimations+0x14)($v1) /* 851B4 800EBD04 24020005 */ addiu $v0, $zero, 5 /* 851B8 800EBD08 3C018011 */ lui $at, 0x8011 /* 851BC 800EBD0C A422CFC8 */ sh $v0, -0x3038($at) @@ -105,8 +105,8 @@ glabel func_800EBC74 .L800EBDFC: /* 852AC 800EBDFC 3C038011 */ lui $v1, 0x8011 /* 852B0 800EBE00 8C63CFD8 */ lw $v1, -0x3028($v1) -/* 852B4 800EBE04 3C048010 */ lui $a0, 0x8010 -/* 852B8 800EBE08 24848348 */ addiu $a0, $a0, -0x7cb8 +/* 852B4 800EBE04 3C048010 */ lui $a0, %hi(gPartnerAnimations) +/* 852B8 800EBE08 24848348 */ addiu $a0, $a0, %lo(gPartnerAnimations) /* 852BC 800EBE0C 000310C0 */ sll $v0, $v1, 3 /* 852C0 800EBE10 00431021 */ addu $v0, $v0, $v1 /* 852C4 800EBE14 00021080 */ sll $v0, $v0, 2 @@ -506,9 +506,9 @@ glabel func_800EBC74 /* 85898 800EC3E8 000218C0 */ sll $v1, $v0, 3 /* 8589C 800EC3EC 00621821 */ addu $v1, $v1, $v0 /* 858A0 800EC3F0 00031880 */ sll $v1, $v1, 2 -/* 858A4 800EC3F4 3C028010 */ lui $v0, 0x8010 +/* 858A4 800EC3F4 3C028010 */ lui $v0, %hi(gPartnerAnimations+0x8) /* 858A8 800EC3F8 00431021 */ addu $v0, $v0, $v1 -/* 858AC 800EC3FC 8C428350 */ lw $v0, -0x7cb0($v0) +/* 858AC 800EC3FC 8C428350 */ lw $v0, %lo(gPartnerAnimations+0x8)($v0) /* 858B0 800EC400 0803B10B */ j .L800EC42C /* 858B4 800EC404 AE220028 */ sw $v0, 0x28($s1) .L800EC408: @@ -517,9 +517,9 @@ glabel func_800EBC74 /* 858C0 800EC410 000218C0 */ sll $v1, $v0, 3 /* 858C4 800EC414 00621821 */ addu $v1, $v1, $v0 /* 858C8 800EC418 00031880 */ sll $v1, $v1, 2 -/* 858CC 800EC41C 3C028010 */ lui $v0, 0x8010 +/* 858CC 800EC41C 3C028010 */ lui $v0, %hi(gPartnerAnimations+0x20) /* 858D0 800EC420 00431021 */ addu $v0, $v0, $v1 -/* 858D4 800EC424 8C428368 */ lw $v0, -0x7c98($v0) +/* 858D4 800EC424 8C428368 */ lw $v0, %lo(gPartnerAnimations+0x20)($v0) /* 858D8 800EC428 AE220028 */ sw $v0, 0x28($s1) .L800EC42C: /* 858DC 800EC42C C6200038 */ lwc1 $f0, 0x38($s1) @@ -550,9 +550,9 @@ glabel func_800EBC74 /* 85940 800EC490 000218C0 */ sll $v1, $v0, 3 /* 85944 800EC494 00621821 */ addu $v1, $v1, $v0 /* 85948 800EC498 00031880 */ sll $v1, $v1, 2 -/* 8594C 800EC49C 3C028010 */ lui $v0, 0x8010 +/* 8594C 800EC49C 3C028010 */ lui $v0, %hi(gPartnerAnimations+0xC) /* 85950 800EC4A0 00431021 */ addu $v0, $v0, $v1 -/* 85954 800EC4A4 8C428354 */ lw $v0, -0x7cac($v0) +/* 85954 800EC4A4 8C428354 */ lw $v0, %lo(gPartnerAnimations+0xC)($v0) /* 85958 800EC4A8 AE220028 */ sw $v0, 0x28($s1) .L800EC4AC: /* 8595C 800EC4AC C622003C */ lwc1 $f2, 0x3c($s1) @@ -571,9 +571,9 @@ glabel func_800EBC74 /* 85990 800EC4E0 00621821 */ addu $v1, $v1, $v0 /* 85994 800EC4E4 00031880 */ sll $v1, $v1, 2 /* 85998 800EC4E8 8E220000 */ lw $v0, ($s1) -/* 8599C 800EC4EC 3C018010 */ lui $at, 0x8010 +/* 8599C 800EC4EC 3C018010 */ lui $at, %hi(gPartnerAnimations+0x10) /* 859A0 800EC4F0 00230821 */ addu $at, $at, $v1 -/* 859A4 800EC4F4 8C238358 */ lw $v1, -0x7ca8($at) +/* 859A4 800EC4F4 8C238358 */ lw $v1, %lo(gPartnerAnimations+0x10)($at) /* 859A8 800EC4F8 E634001C */ swc1 $f20, 0x1c($s1) /* 859AC 800EC4FC 00441024 */ and $v0, $v0, $a0 /* 859B0 800EC500 AE220000 */ sw $v0, ($s1) @@ -642,9 +642,9 @@ glabel func_800EBC74 /* 85AA8 800EC5F8 000310C0 */ sll $v0, $v1, 3 /* 85AAC 800EC5FC 00431021 */ addu $v0, $v0, $v1 /* 85AB0 800EC600 00021080 */ sll $v0, $v0, 2 -/* 85AB4 800EC604 3C048010 */ lui $a0, 0x8010 +/* 85AB4 800EC604 3C048010 */ lui $a0, %hi(gPartnerAnimations+0x10) /* 85AB8 800EC608 00822021 */ addu $a0, $a0, $v0 -/* 85ABC 800EC60C 8C848358 */ lw $a0, -0x7ca8($a0) +/* 85ABC 800EC60C 8C848358 */ lw $a0, %lo(gPartnerAnimations+0x10)($a0) /* 85AC0 800EC610 8E220000 */ lw $v0, ($s1) /* 85AC4 800EC614 2403F7FF */ addiu $v1, $zero, -0x801 /* 85AC8 800EC618 E634001C */ swc1 $f20, 0x1c($s1) @@ -744,9 +744,9 @@ glabel func_800EBC74 /* 85C3C 800EC78C 000310C0 */ sll $v0, $v1, 3 /* 85C40 800EC790 00431021 */ addu $v0, $v0, $v1 /* 85C44 800EC794 00021080 */ sll $v0, $v0, 2 -/* 85C48 800EC798 3C018010 */ lui $at, 0x8010 +/* 85C48 800EC798 3C018010 */ lui $at, %hi(gPartnerAnimations+0x14) /* 85C4C 800EC79C 00220821 */ addu $at, $at, $v0 -/* 85C50 800EC7A0 8C22835C */ lw $v0, -0x7ca4($at) +/* 85C50 800EC7A0 8C22835C */ lw $v0, %lo(gPartnerAnimations+0x14)($at) /* 85C54 800EC7A4 AE220028 */ sw $v0, 0x28($s1) /* 85C58 800EC7A8 826300B4 */ lb $v1, 0xb4($s3) /* 85C5C 800EC7AC 2402000C */ addiu $v0, $zero, 0xc @@ -813,8 +813,8 @@ glabel func_800EBC74 /* 85D44 800EC894 E6220018 */ swc1 $f2, 0x18($s1) /* 85D48 800EC898 3C038011 */ lui $v1, 0x8011 /* 85D4C 800EC89C 8C63CFD8 */ lw $v1, -0x3028($v1) -/* 85D50 800EC8A0 3C048010 */ lui $a0, 0x8010 -/* 85D54 800EC8A4 24848348 */ addiu $a0, $a0, -0x7cb8 +/* 85D50 800EC8A0 3C048010 */ lui $a0, %hi(gPartnerAnimations) +/* 85D54 800EC8A4 24848348 */ addiu $a0, $a0, %lo(gPartnerAnimations) /* 85D58 800EC8A8 E634000C */ swc1 $f20, 0xc($s1) /* 85D5C 800EC8AC 000310C0 */ sll $v0, $v1, 3 /* 85D60 800EC8B0 00431021 */ addu $v0, $v0, $v1 @@ -860,9 +860,9 @@ glabel func_800EBC74 /* 85DF8 800EC948 000310C0 */ sll $v0, $v1, 3 /* 85DFC 800EC94C 00431021 */ addu $v0, $v0, $v1 /* 85E00 800EC950 00021080 */ sll $v0, $v0, 2 -/* 85E04 800EC954 3C018010 */ lui $at, 0x8010 +/* 85E04 800EC954 3C018010 */ lui $at, %hi(gPartnerAnimations+0x14) /* 85E08 800EC958 00220821 */ addu $at, $at, $v0 -/* 85E0C 800EC95C 8C22835C */ lw $v0, -0x7ca4($at) +/* 85E0C 800EC95C 8C22835C */ lw $v0, %lo(gPartnerAnimations+0x14)($at) .L800EC960: /* 85E10 800EC960 3C048011 */ lui $a0, 0x8011 /* 85E14 800EC964 2484CFCA */ addiu $a0, $a0, -0x3036 @@ -949,9 +949,9 @@ glabel func_800EBC74 /* 85F4C 800ECA9C 000310C0 */ sll $v0, $v1, 3 /* 85F50 800ECAA0 00431021 */ addu $v0, $v0, $v1 /* 85F54 800ECAA4 00021080 */ sll $v0, $v0, 2 -/* 85F58 800ECAA8 3C018010 */ lui $at, 0x8010 +/* 85F58 800ECAA8 3C018010 */ lui $at, %hi(gPartnerAnimations+0x14) /* 85F5C 800ECAAC 00220821 */ addu $at, $at, $v0 -/* 85F60 800ECAB0 8C22835C */ lw $v0, -0x7ca4($at) +/* 85F60 800ECAB0 8C22835C */ lw $v0, %lo(gPartnerAnimations+0x14)($at) /* 85F64 800ECAB4 3C048011 */ lui $a0, 0x8011 /* 85F68 800ECAB8 2484CFCA */ addiu $a0, $a0, -0x3036 /* 85F6C 800ECABC AE220028 */ sw $v0, 0x28($s1) @@ -1164,8 +1164,8 @@ glabel func_800EBC74 .L800ECDC4: /* 86274 800ECDC4 24430004 */ addiu $v1, $v0, 4 .L800ECDC8: -/* 86278 800ECDC8 3C028010 */ lui $v0, 0x8010 -/* 8627C 800ECDCC 24428348 */ addiu $v0, $v0, -0x7cb8 +/* 86278 800ECDC8 3C028010 */ lui $v0, %hi(gPartnerAnimations) +/* 8627C 800ECDCC 24428348 */ addiu $v0, $v0, %lo(gPartnerAnimations) /* 86280 800ECDD0 00431021 */ addu $v0, $v0, $v1 /* 86284 800ECDD4 8C420000 */ lw $v0, ($v0) /* 86288 800ECDD8 AC820000 */ sw $v0, ($a0) @@ -1210,9 +1210,9 @@ glabel func_800EBC74 /* 86320 800ECE70 000218C0 */ sll $v1, $v0, 3 /* 86324 800ECE74 00621821 */ addu $v1, $v1, $v0 /* 86328 800ECE78 00031880 */ sll $v1, $v1, 2 -/* 8632C 800ECE7C 3C028010 */ lui $v0, 0x8010 +/* 8632C 800ECE7C 3C028010 */ lui $v0, %hi(gPartnerAnimations+0xC) /* 86330 800ECE80 00431021 */ addu $v0, $v0, $v1 -/* 86334 800ECE84 8C428354 */ lw $v0, -0x7cac($v0) +/* 86334 800ECE84 8C428354 */ lw $v0, %lo(gPartnerAnimations+0xC)($v0) /* 86338 800ECE88 AE220028 */ sw $v0, 0x28($s1) .L800ECE8C: /* 8633C 800ECE8C C624001C */ lwc1 $f4, 0x1c($s1) @@ -1275,8 +1275,8 @@ glabel func_800EBC74 .L800ECF70: /* 86420 800ECF70 24430004 */ addiu $v1, $v0, 4 .L800ECF74: -/* 86424 800ECF74 3C028010 */ lui $v0, 0x8010 -/* 86428 800ECF78 24428348 */ addiu $v0, $v0, -0x7cb8 +/* 86424 800ECF74 3C028010 */ lui $v0, %hi(gPartnerAnimations) +/* 86428 800ECF78 24428348 */ addiu $v0, $v0, %lo(gPartnerAnimations) /* 8642C 800ECF7C 00431021 */ addu $v0, $v0, $v1 /* 86430 800ECF80 8C420000 */ lw $v0, ($v0) /* 86434 800ECF84 C7A0002C */ lwc1 $f0, 0x2c($sp) @@ -1326,9 +1326,9 @@ glabel func_800EBC74 /* 864D8 800ED028 000310C0 */ sll $v0, $v1, 3 /* 864DC 800ED02C 00431021 */ addu $v0, $v0, $v1 /* 864E0 800ED030 00021080 */ sll $v0, $v0, 2 -/* 864E4 800ED034 3C018010 */ lui $at, 0x8010 +/* 864E4 800ED034 3C018010 */ lui $at, %hi(gPartnerAnimations+0x14) /* 864E8 800ED038 00220821 */ addu $at, $at, $v0 -/* 864EC 800ED03C 8C22835C */ lw $v0, -0x7ca4($at) +/* 864EC 800ED03C 8C22835C */ lw $v0, %lo(gPartnerAnimations+0x14)($at) /* 864F0 800ED040 AE220028 */ sw $v0, 0x28($s1) /* 864F4 800ED044 C6AC006C */ lwc1 $f12, 0x6c($s5) /* 864F8 800ED048 46006300 */ add.s $f12, $f12, $f0 @@ -1378,9 +1378,9 @@ glabel func_800EBC74 /* 8659C 800ED0EC 000310C0 */ sll $v0, $v1, 3 /* 865A0 800ED0F0 00431021 */ addu $v0, $v0, $v1 /* 865A4 800ED0F4 00021080 */ sll $v0, $v0, 2 -/* 865A8 800ED0F8 3C038010 */ lui $v1, 0x8010 +/* 865A8 800ED0F8 3C038010 */ lui $v1, %hi(gPartnerAnimations+0x14) /* 865AC 800ED0FC 00621821 */ addu $v1, $v1, $v0 -/* 865B0 800ED100 8C63835C */ lw $v1, -0x7ca4($v1) +/* 865B0 800ED100 8C63835C */ lw $v1, %lo(gPartnerAnimations+0x14)($v1) /* 865B4 800ED104 24020032 */ addiu $v0, $zero, 0x32 /* 865B8 800ED108 3C018011 */ lui $at, 0x8011 /* 865BC 800ED10C A422CFC8 */ sh $v0, -0x3038($at) @@ -1404,9 +1404,9 @@ glabel func_800EBC74 /* 86600 800ED150 000218C0 */ sll $v1, $v0, 3 /* 86604 800ED154 00621821 */ addu $v1, $v1, $v0 /* 86608 800ED158 00031880 */ sll $v1, $v1, 2 -/* 8660C 800ED15C 3C028010 */ lui $v0, 0x8010 +/* 8660C 800ED15C 3C028010 */ lui $v0, %hi(gPartnerAnimations+0xC) /* 86610 800ED160 00431021 */ addu $v0, $v0, $v1 -/* 86614 800ED164 8C428354 */ lw $v0, -0x7cac($v0) +/* 86614 800ED164 8C428354 */ lw $v0, %lo(gPartnerAnimations+0xC)($v0) /* 86618 800ED168 AE220028 */ sw $v0, 0x28($s1) .L800ED16C: /* 8661C 800ED16C C622003C */ lwc1 $f2, 0x3c($s1) @@ -1425,9 +1425,9 @@ glabel func_800EBC74 /* 86650 800ED1A0 00621821 */ addu $v1, $v1, $v0 /* 86654 800ED1A4 00031880 */ sll $v1, $v1, 2 /* 86658 800ED1A8 8E220000 */ lw $v0, ($s1) -/* 8665C 800ED1AC 3C018010 */ lui $at, 0x8010 +/* 8665C 800ED1AC 3C018010 */ lui $at, %hi(gPartnerAnimations+0x14) /* 86660 800ED1B0 00230821 */ addu $at, $at, $v1 -/* 86664 800ED1B4 8C23835C */ lw $v1, -0x7ca4($at) +/* 86664 800ED1B4 8C23835C */ lw $v1, %lo(gPartnerAnimations+0x14)($at) /* 86668 800ED1B8 E634001C */ swc1 $f20, 0x1c($s1) /* 8666C 800ED1BC 00441024 */ and $v0, $v0, $a0 /* 86670 800ED1C0 AE220000 */ sw $v0, ($s1) @@ -1485,9 +1485,9 @@ glabel func_800EBC74 /* 86738 800ED288 000310C0 */ sll $v0, $v1, 3 /* 8673C 800ED28C 00431021 */ addu $v0, $v0, $v1 /* 86740 800ED290 00021080 */ sll $v0, $v0, 2 -/* 86744 800ED294 3C048010 */ lui $a0, 0x8010 +/* 86744 800ED294 3C048010 */ lui $a0, %hi(gPartnerAnimations+0x14) /* 86748 800ED298 00822021 */ addu $a0, $a0, $v0 -/* 8674C 800ED29C 8C84835C */ lw $a0, -0x7ca4($a0) +/* 8674C 800ED29C 8C84835C */ lw $a0, %lo(gPartnerAnimations+0x14)($a0) /* 86750 800ED2A0 8E220000 */ lw $v0, ($s1) /* 86754 800ED2A4 2403F7FF */ addiu $v1, $zero, -0x801 /* 86758 800ED2A8 E634001C */ swc1 $f20, 0x1c($s1) diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800ED9F8.s b/asm/nonmatchings/code_838b0_len_5900/func_800ED9F8.s index cae6784bcb..45a8472a69 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800ED9F8.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800ED9F8.s @@ -120,9 +120,9 @@ glabel func_800ED9F8 /* 87064 800EDBB4 000218C0 */ sll $v1, $v0, 3 /* 87068 800EDBB8 00621821 */ addu $v1, $v1, $v0 /* 8706C 800EDBBC 00031880 */ sll $v1, $v1, 2 -/* 87070 800EDBC0 3C028010 */ lui $v0, 0x8010 +/* 87070 800EDBC0 3C028010 */ lui $v0, %hi(gPartnerAnimations+0x14) /* 87074 800EDBC4 00431021 */ addu $v0, $v0, $v1 -/* 87078 800EDBC8 8C42835C */ lw $v0, -0x7ca4($v0) +/* 87078 800EDBC8 8C42835C */ lw $v0, %lo(gPartnerAnimations+0x14)($v0) /* 8707C 800EDBCC 0803B76E */ j .L800EDDB8 /* 87080 800EDBD0 AE220028 */ sw $v0, 0x28($s1) .L800EDBD4: @@ -134,9 +134,9 @@ glabel func_800ED9F8 /* 87098 800EDBE8 000310C0 */ sll $v0, $v1, 3 /* 8709C 800EDBEC 00431021 */ addu $v0, $v0, $v1 /* 870A0 800EDBF0 00021080 */ sll $v0, $v0, 2 -/* 870A4 800EDBF4 3C038010 */ lui $v1, 0x8010 +/* 870A4 800EDBF4 3C038010 */ lui $v1, %hi(gPartnerAnimations+0x14) /* 870A8 800EDBF8 00621821 */ addu $v1, $v1, $v0 -/* 870AC 800EDBFC 8C63835C */ lw $v1, -0x7ca4($v1) +/* 870AC 800EDBFC 8C63835C */ lw $v1, %lo(gPartnerAnimations+0x14)($v1) /* 870B0 800EDC00 24020005 */ addiu $v0, $zero, 5 /* 870B4 800EDC04 3C018011 */ lui $at, 0x8011 /* 870B8 800EDC08 A422CFC8 */ sh $v0, -0x3038($at) @@ -429,9 +429,9 @@ glabel func_800ED9F8 /* 874F0 800EE040 000310C0 */ sll $v0, $v1, 3 /* 874F4 800EE044 00431021 */ addu $v0, $v0, $v1 /* 874F8 800EE048 00021080 */ sll $v0, $v0, 2 -/* 874FC 800EE04C 3C038010 */ lui $v1, 0x8010 +/* 874FC 800EE04C 3C038010 */ lui $v1, %hi(gPartnerAnimations+0x8) /* 87500 800EE050 00621821 */ addu $v1, $v1, $v0 -/* 87504 800EE054 8C638350 */ lw $v1, -0x7cb0($v1) +/* 87504 800EE054 8C638350 */ lw $v1, %lo(gPartnerAnimations+0x8)($v1) /* 87508 800EE058 24020002 */ addiu $v0, $zero, 2 /* 8750C 800EE05C 3C018011 */ lui $at, 0x8011 /* 87510 800EE060 A422CFC8 */ sh $v0, -0x3038($at) @@ -456,9 +456,9 @@ glabel func_800ED9F8 /* 8755C 800EE0AC 000218C0 */ sll $v1, $v0, 3 /* 87560 800EE0B0 00621821 */ addu $v1, $v1, $v0 /* 87564 800EE0B4 00031880 */ sll $v1, $v1, 2 -/* 87568 800EE0B8 3C028010 */ lui $v0, 0x8010 +/* 87568 800EE0B8 3C028010 */ lui $v0, %hi(gPartnerAnimations+0xC) /* 8756C 800EE0BC 00431021 */ addu $v0, $v0, $v1 -/* 87570 800EE0C0 8C428354 */ lw $v0, -0x7cac($v0) +/* 87570 800EE0C0 8C428354 */ lw $v0, %lo(gPartnerAnimations+0xC)($v0) /* 87574 800EE0C4 AE220028 */ sw $v0, 0x28($s1) .L800EE0C8: /* 87578 800EE0C8 8E250018 */ lw $a1, 0x18($s1) @@ -483,9 +483,9 @@ glabel func_800ED9F8 /* 875C4 800EE114 000310C0 */ sll $v0, $v1, 3 /* 875C8 800EE118 00431021 */ addu $v0, $v0, $v1 /* 875CC 800EE11C 00021080 */ sll $v0, $v0, 2 -/* 875D0 800EE120 3C018010 */ lui $at, 0x8010 +/* 875D0 800EE120 3C018010 */ lui $at, %hi(gPartnerAnimations+0x10) /* 875D4 800EE124 00220821 */ addu $at, $at, $v0 -/* 875D8 800EE128 8C228358 */ lw $v0, -0x7ca8($at) +/* 875D8 800EE128 8C228358 */ lw $v0, %lo(gPartnerAnimations+0x10)($at) /* 875DC 800EE12C E634001C */ swc1 $f20, 0x1c($s1) /* 875E0 800EE130 E620003C */ swc1 $f0, 0x3c($s1) /* 875E4 800EE134 AE220028 */ sw $v0, 0x28($s1) @@ -573,9 +573,9 @@ glabel func_800ED9F8 /* 8772C 800EE27C AE200014 */ sw $zero, 0x14($s1) /* 87730 800EE280 462010A0 */ cvt.s.d $f2, $f2 /* 87734 800EE284 E622003C */ swc1 $f2, 0x3c($s1) -/* 87738 800EE288 3C018010 */ lui $at, 0x8010 +/* 87738 800EE288 3C018010 */ lui $at, %hi(gPartnerAnimations+0x14) /* 8773C 800EE28C 00220821 */ addu $at, $at, $v0 -/* 87740 800EE290 8C22835C */ lw $v0, -0x7ca4($at) +/* 87740 800EE290 8C22835C */ lw $v0, %lo(gPartnerAnimations+0x14)($at) /* 87744 800EE294 E7A20024 */ swc1 $f2, 0x24($sp) /* 87748 800EE298 AE220028 */ sw $v0, 0x28($s1) /* 8774C 800EE29C 826300B4 */ lb $v1, 0xb4($s3) @@ -635,8 +635,8 @@ glabel func_800ED9F8 /* 8781C 800EE36C E6220018 */ swc1 $f2, 0x18($s1) /* 87820 800EE370 3C038011 */ lui $v1, 0x8011 /* 87824 800EE374 8C63CFD8 */ lw $v1, -0x3028($v1) -/* 87828 800EE378 3C048010 */ lui $a0, 0x8010 -/* 8782C 800EE37C 24848348 */ addiu $a0, $a0, -0x7cb8 +/* 87828 800EE378 3C048010 */ lui $a0, %hi(gPartnerAnimations) +/* 8782C 800EE37C 24848348 */ addiu $a0, $a0, %lo(gPartnerAnimations) /* 87830 800EE380 E634000C */ swc1 $f20, 0xc($s1) /* 87834 800EE384 000310C0 */ sll $v0, $v1, 3 /* 87838 800EE388 00431021 */ addu $v0, $v0, $v1 @@ -682,9 +682,9 @@ glabel func_800ED9F8 /* 878D0 800EE420 000310C0 */ sll $v0, $v1, 3 /* 878D4 800EE424 00431021 */ addu $v0, $v0, $v1 /* 878D8 800EE428 00021080 */ sll $v0, $v0, 2 -/* 878DC 800EE42C 3C018010 */ lui $at, 0x8010 +/* 878DC 800EE42C 3C018010 */ lui $at, %hi(gPartnerAnimations+0x14) /* 878E0 800EE430 00220821 */ addu $at, $at, $v0 -/* 878E4 800EE434 8C22835C */ lw $v0, -0x7ca4($at) +/* 878E4 800EE434 8C22835C */ lw $v0, %lo(gPartnerAnimations+0x14)($at) .L800EE438: /* 878E8 800EE438 3C048011 */ lui $a0, 0x8011 /* 878EC 800EE43C 2484CFCA */ addiu $a0, $a0, -0x3036 @@ -836,8 +836,8 @@ glabel func_800ED9F8 .L800EE668: /* 87B18 800EE668 24430018 */ addiu $v1, $v0, 0x18 .L800EE66C: -/* 87B1C 800EE66C 3C028010 */ lui $v0, 0x8010 -/* 87B20 800EE670 24428348 */ addiu $v0, $v0, -0x7cb8 +/* 87B1C 800EE66C 3C028010 */ lui $v0, %hi(gPartnerAnimations) +/* 87B20 800EE670 24428348 */ addiu $v0, $v0, %lo(gPartnerAnimations) /* 87B24 800EE674 00431021 */ addu $v0, $v0, $v1 /* 87B28 800EE678 8C420000 */ lw $v0, ($v0) /* 87B2C 800EE67C AC820000 */ sw $v0, ($a0) @@ -1001,9 +1001,9 @@ glabel func_800ED9F8 /* 87D90 800EE8E0 000310C0 */ sll $v0, $v1, 3 /* 87D94 800EE8E4 00431021 */ addu $v0, $v0, $v1 /* 87D98 800EE8E8 00021080 */ sll $v0, $v0, 2 -/* 87D9C 800EE8EC 3C018010 */ lui $at, 0x8010 +/* 87D9C 800EE8EC 3C018010 */ lui $at, %hi(gPartnerAnimations+0x14) /* 87DA0 800EE8F0 00220821 */ addu $at, $at, $v0 -/* 87DA4 800EE8F4 8C22835C */ lw $v0, -0x7ca4($at) +/* 87DA4 800EE8F4 8C22835C */ lw $v0, %lo(gPartnerAnimations+0x14)($at) /* 87DA8 800EE8F8 AE220028 */ sw $v0, 0x28($s1) /* 87DAC 800EE8FC C64C006C */ lwc1 $f12, 0x6c($s2) /* 87DB0 800EE900 46006300 */ add.s $f12, $f12, $f0 @@ -1028,9 +1028,9 @@ glabel func_800ED9F8 /* 87DFC 800EE94C 000218C0 */ sll $v1, $v0, 3 /* 87E00 800EE950 00621821 */ addu $v1, $v1, $v0 /* 87E04 800EE954 00031880 */ sll $v1, $v1, 2 -/* 87E08 800EE958 3C028010 */ lui $v0, 0x8010 +/* 87E08 800EE958 3C028010 */ lui $v0, %hi(gPartnerAnimations+0x14) /* 87E0C 800EE95C 00431021 */ addu $v0, $v0, $v1 -/* 87E10 800EE960 8C42835C */ lw $v0, -0x7ca4($v0) +/* 87E10 800EE960 8C42835C */ lw $v0, %lo(gPartnerAnimations+0x14)($v0) /* 87E14 800EE964 AE220028 */ sw $v0, 0x28($s1) .L800EE968: /* 87E18 800EE968 8FBF0044 */ lw $ra, 0x44($sp) diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EE9B8.s b/asm/nonmatchings/code_838b0_len_5900/func_800EE9B8.s index 800bfad17c..1814b5fa3d 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EE9B8.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EE9B8.s @@ -113,9 +113,9 @@ glabel func_800EE9B8 /* 88010 800EEB60 E6040018 */ swc1 $f4, 0x18($s0) /* 88014 800EEB64 4606A503 */ div.s $f20, $f20, $f6 /* 88018 800EEB68 E614001C */ swc1 $f20, 0x1c($s0) -/* 8801C 800EEB6C 3C018010 */ lui $at, 0x8010 +/* 8801C 800EEB6C 3C018010 */ lui $at, %hi(gPartnerAnimations+0x8) /* 88020 800EEB70 00220821 */ addu $at, $at, $v0 -/* 88024 800EEB74 8C228350 */ lw $v0, -0x7cb0($at) +/* 88024 800EEB74 8C228350 */ lw $v0, %lo(gPartnerAnimations+0x8)($at) /* 88028 800EEB78 0200202D */ daddu $a0, $s0, $zero /* 8802C 800EEB7C 0C00EB49 */ jal enable_npc_blur /* 88030 800EEB80 AC820028 */ sw $v0, 0x28($a0) @@ -140,9 +140,9 @@ glabel func_800EE9B8 /* 88078 800EEBC8 000218C0 */ sll $v1, $v0, 3 /* 8807C 800EEBCC 00621821 */ addu $v1, $v1, $v0 /* 88080 800EEBD0 00031880 */ sll $v1, $v1, 2 -/* 88084 800EEBD4 3C028010 */ lui $v0, 0x8010 +/* 88084 800EEBD4 3C028010 */ lui $v0, %hi(gPartnerAnimations+0xC) /* 88088 800EEBD8 00431021 */ addu $v0, $v0, $v1 -/* 8808C 800EEBDC 8C428354 */ lw $v0, -0x7cac($v0) +/* 8808C 800EEBDC 8C428354 */ lw $v0, %lo(gPartnerAnimations+0xC)($v0) /* 88090 800EEBE0 AE020028 */ sw $v0, 0x28($s0) .L800EEBE4: /* 88094 800EEBE4 8E06000C */ lw $a2, 0xc($s0) @@ -181,9 +181,9 @@ glabel func_800EE9B8 /* 88110 800EEC60 000310C0 */ sll $v0, $v1, 3 /* 88114 800EEC64 00431021 */ addu $v0, $v0, $v1 /* 88118 800EEC68 00021080 */ sll $v0, $v0, 2 -/* 8811C 800EEC6C 3C018010 */ lui $at, 0x8010 +/* 8811C 800EEC6C 3C018010 */ lui $at, %hi(gPartnerAnimations+0x10) /* 88120 800EEC70 00220821 */ addu $at, $at, $v0 -/* 88124 800EEC74 8C228358 */ lw $v0, -0x7ca8($at) +/* 88124 800EEC74 8C228358 */ lw $v0, %lo(gPartnerAnimations+0x10)($at) /* 88128 800EEC78 AC80001C */ sw $zero, 0x1c($a0) /* 8812C 800EEC7C E480003C */ swc1 $f0, 0x3c($a0) /* 88130 800EEC80 0C00EB6B */ jal disable_npc_blur diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EECE8.s b/asm/nonmatchings/code_838b0_len_5900/func_800EECE8.s index b6909360a0..0f669fe2f2 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EECE8.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EECE8.s @@ -263,9 +263,9 @@ glabel func_800EECE8 /* 88580 800EF0D0 00021080 */ sll $v0, $v0, 2 /* 88584 800EF0D4 46040003 */ div.s $f0, $f0, $f4 /* 88588 800EF0D8 E600001C */ swc1 $f0, 0x1c($s0) -/* 8858C 800EF0DC 3C038010 */ lui $v1, 0x8010 +/* 8858C 800EF0DC 3C038010 */ lui $v1, %hi(gPartnerAnimations+0x8) /* 88590 800EF0E0 00621821 */ addu $v1, $v1, $v0 -/* 88594 800EF0E4 8C638350 */ lw $v1, -0x7cb0($v1) +/* 88594 800EF0E4 8C638350 */ lw $v1, %lo(gPartnerAnimations+0x8)($v1) /* 88598 800EF0E8 24020001 */ addiu $v0, $zero, 1 /* 8859C 800EF0EC 3C018011 */ lui $at, 0x8011 /* 885A0 800EF0F0 A422CFC8 */ sh $v0, -0x3038($at) @@ -307,9 +307,9 @@ glabel func_800EECE8 /* 88628 800EF178 000218C0 */ sll $v1, $v0, 3 /* 8862C 800EF17C 00621821 */ addu $v1, $v1, $v0 /* 88630 800EF180 00031880 */ sll $v1, $v1, 2 -/* 88634 800EF184 3C028010 */ lui $v0, 0x8010 +/* 88634 800EF184 3C028010 */ lui $v0, %hi(gPartnerAnimations+0xC) /* 88638 800EF188 00431021 */ addu $v0, $v0, $v1 -/* 8863C 800EF18C 8C428354 */ lw $v0, -0x7cac($v0) +/* 8863C 800EF18C 8C428354 */ lw $v0, %lo(gPartnerAnimations+0xC)($v0) /* 88640 800EF190 AE020028 */ sw $v0, 0x28($s0) .L800EF194: /* 88644 800EF194 8E050018 */ lw $a1, 0x18($s0) diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF82C.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF82C.s index 3a518c1b93..025c33a92e 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF82C.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF82C.s @@ -84,8 +84,8 @@ glabel func_800EF82C .L800EF968: /* 88E18 800EF968 24430004 */ addiu $v1, $v0, 4 .L800EF96C: -/* 88E1C 800EF96C 3C028010 */ lui $v0, 0x8010 -/* 88E20 800EF970 24428348 */ addiu $v0, $v0, -0x7cb8 +/* 88E1C 800EF96C 3C028010 */ lui $v0, %hi(gPartnerAnimations) +/* 88E20 800EF970 24428348 */ addiu $v0, $v0, %lo(gPartnerAnimations) /* 88E24 800EF974 00431021 */ addu $v0, $v0, $v1 /* 88E28 800EF978 8C420000 */ lw $v0, ($v0) /* 88E2C 800EF97C AC820000 */ sw $v0, ($a0) @@ -125,9 +125,9 @@ glabel func_800EF82C /* 88EAC 800EF9FC 000218C0 */ sll $v1, $v0, 3 /* 88EB0 800EFA00 00621821 */ addu $v1, $v1, $v0 /* 88EB4 800EFA04 00031880 */ sll $v1, $v1, 2 -/* 88EB8 800EFA08 3C028010 */ lui $v0, 0x8010 +/* 88EB8 800EFA08 3C028010 */ lui $v0, %hi(gPartnerAnimations+0xC) /* 88EBC 800EFA0C 00431021 */ addu $v0, $v0, $v1 -/* 88EC0 800EFA10 8C428354 */ lw $v0, -0x7cac($v0) +/* 88EC0 800EFA10 8C428354 */ lw $v0, %lo(gPartnerAnimations+0xC)($v0) /* 88EC4 800EFA14 AE420028 */ sw $v0, 0x28($s2) .L800EFA18: /* 88EC8 800EFA18 C642001C */ lwc1 $f2, 0x1c($s2) @@ -196,8 +196,8 @@ glabel func_800EF82C .L800EFB14: /* 88FC4 800EFB14 24430004 */ addiu $v1, $v0, 4 .L800EFB18: -/* 88FC8 800EFB18 3C028010 */ lui $v0, 0x8010 -/* 88FCC 800EFB1C 24428348 */ addiu $v0, $v0, -0x7cb8 +/* 88FC8 800EFB18 3C028010 */ lui $v0, %hi(gPartnerAnimations) +/* 88FCC 800EFB1C 24428348 */ addiu $v0, $v0, %lo(gPartnerAnimations) /* 88FD0 800EFB20 00431021 */ addu $v0, $v0, $v1 /* 88FD4 800EFB24 8C420000 */ lw $v0, ($v0) /* 88FD8 800EFB28 C7A00024 */ lwc1 $f0, 0x24($sp) @@ -240,8 +240,8 @@ glabel func_800EF82C .L800EFBB8: /* 89068 800EFBB8 24630004 */ addiu $v1, $v1, 4 .L800EFBBC: -/* 8906C 800EFBBC 3C028010 */ lui $v0, 0x8010 -/* 89070 800EFBC0 24428348 */ addiu $v0, $v0, -0x7cb8 +/* 8906C 800EFBBC 3C028010 */ lui $v0, %hi(gPartnerAnimations) +/* 89070 800EFBC0 24428348 */ addiu $v0, $v0, %lo(gPartnerAnimations) /* 89074 800EFBC4 00431021 */ addu $v0, $v0, $v1 /* 89078 800EFBC8 8C420000 */ lw $v0, ($v0) /* 8907C 800EFBCC 0240202D */ daddu $a0, $s2, $zero @@ -310,9 +310,9 @@ glabel func_800EF82C /* 89164 800EFCB4 2484CFCE */ addiu $a0, $a0, -0x3032 /* 89168 800EFCB8 AE420000 */ sw $v0, ($s2) /* 8916C 800EFCBC 94820000 */ lhu $v0, ($a0) -/* 89170 800EFCC0 3C018010 */ lui $at, 0x8010 +/* 89170 800EFCC0 3C018010 */ lui $at, %hi(gPartnerAnimations+0x14) /* 89174 800EFCC4 00230821 */ addu $at, $at, $v1 -/* 89178 800EFCC8 8C23835C */ lw $v1, -0x7ca4($at) +/* 89178 800EFCC8 8C23835C */ lw $v1, %lo(gPartnerAnimations+0x14)($at) /* 8917C 800EFCCC 24420001 */ addiu $v0, $v0, 1 /* 89180 800EFCD0 A4820000 */ sh $v0, ($a0) /* 89184 800EFCD4 AE430028 */ sw $v1, 0x28($s2) diff --git a/asm/nonmatchings/code_f2470_len_27f0/BringPartnerOut.s b/asm/nonmatchings/code_f2470_len_27f0/BringPartnerOut.s index 59c7f53ec5..60ca81e8dd 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/BringPartnerOut.s +++ b/asm/nonmatchings/code_f2470_len_27f0/BringPartnerOut.s @@ -45,9 +45,9 @@ glabel BringPartnerOut /* F4004 802CF654 000310C0 */ sll $v0, $v1, 3 /* F4008 802CF658 00431021 */ addu $v0, $v0, $v1 /* F400C 802CF65C 00021080 */ sll $v0, $v0, 2 -/* F4010 802CF660 3C018010 */ lui $at, 0x8010 +/* F4010 802CF660 3C018010 */ lui $at, %hi(gPartnerAnimations+0x10) /* F4014 802CF664 00220821 */ addu $at, $at, $v0 -/* F4018 802CF668 8C228358 */ lw $v0, -0x7ca8($at) +/* F4018 802CF668 8C228358 */ lw $v0, %lo(gPartnerAnimations+0x10)($at) /* F401C 802CF66C 0220202D */ daddu $a0, $s1, $zero /* F4020 802CF670 AFA00018 */ sw $zero, 0x18($sp) /* F4024 802CF674 AFA0001C */ sw $zero, 0x1c($sp) @@ -111,8 +111,8 @@ glabel BringPartnerOut /* F410C 802CF75C E6200010 */ swc1 $f0, 0x10($s1) /* F4110 802CF760 C6220010 */ lwc1 $f2, 0x10($s1) /* F4114 802CF764 C6240018 */ lwc1 $f4, 0x18($s1) -/* F4118 802CF768 3C108010 */ lui $s0, 0x8010 -/* F411C 802CF76C 26108348 */ addiu $s0, $s0, -0x7cb8 +/* F4118 802CF768 3C108010 */ lui $s0, %hi(gPartnerAnimations) +/* F411C 802CF76C 26108348 */ addiu $s0, $s0, %lo(gPartnerAnimations) /* F4120 802CF770 E620000C */ swc1 $f0, 0xc($s1) /* F4124 802CF774 46041083 */ div.s $f2, $f2, $f4 /* F4128 802CF778 4600118D */ trunc.w.s $f6, $f2 @@ -180,9 +180,9 @@ glabel BringPartnerOut /* F4218 802CF868 000218C0 */ sll $v1, $v0, 3 /* F421C 802CF86C 00621821 */ addu $v1, $v1, $v0 /* F4220 802CF870 00031880 */ sll $v1, $v1, 2 -/* F4224 802CF874 3C028010 */ lui $v0, 0x8010 +/* F4224 802CF874 3C028010 */ lui $v0, %hi(gPartnerAnimations+0x8) /* F4228 802CF878 00431021 */ addu $v0, $v0, $v1 -/* F422C 802CF87C 8C428350 */ lw $v0, -0x7cb0($v0) +/* F422C 802CF87C 8C428350 */ lw $v0, %lo(gPartnerAnimations+0x8)($v0) /* F4230 802CF880 AE220028 */ sw $v0, 0x28($s1) .L802CF884: /* F4234 802CF884 8E250018 */ lw $a1, 0x18($s1) @@ -225,9 +225,9 @@ glabel BringPartnerOut /* F42C0 802CF910 000310C0 */ sll $v0, $v1, 3 /* F42C4 802CF914 00431021 */ addu $v0, $v0, $v1 /* F42C8 802CF918 00021080 */ sll $v0, $v0, 2 -/* F42CC 802CF91C 3C018010 */ lui $at, 0x8010 +/* F42CC 802CF91C 3C018010 */ lui $at, %hi(gPartnerAnimations+0x14) /* F42D0 802CF920 00220821 */ addu $at, $at, $v0 -/* F42D4 802CF924 8C22835C */ lw $v0, -0x7ca4($at) +/* F42D4 802CF924 8C22835C */ lw $v0, %lo(gPartnerAnimations+0x14)($at) /* F42D8 802CF928 460C1300 */ add.s $f12, $f2, $f12 /* F42DC 802CF92C E634001C */ swc1 $f20, 0x1c($s1) /* F42E0 802CF930 E624003C */ swc1 $f4, 0x3c($s1) diff --git a/asm/nonmatchings/code_f2470_len_27f0/PutPartnerAway.s b/asm/nonmatchings/code_f2470_len_27f0/PutPartnerAway.s index 30eddb4f3a..48b6a12c49 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/PutPartnerAway.s +++ b/asm/nonmatchings/code_f2470_len_27f0/PutPartnerAway.s @@ -108,9 +108,9 @@ glabel PutPartnerAway /* F44D0 802CFB20 00021080 */ sll $v0, $v0, 2 /* F44D4 802CFB24 46040003 */ div.s $f0, $f0, $f4 /* F44D8 802CFB28 E620001C */ swc1 $f0, 0x1c($s1) -/* F44DC 802CFB2C 3C038010 */ lui $v1, 0x8010 +/* F44DC 802CFB2C 3C038010 */ lui $v1, %hi(gPartnerAnimations+0x4) /* F44E0 802CFB30 00621821 */ addu $v1, $v1, $v0 -/* F44E4 802CFB34 8C63834C */ lw $v1, -0x7cb4($v1) +/* F44E4 802CFB34 8C63834C */ lw $v1, %lo(gPartnerAnimations+0x4)($v1) /* F44E8 802CFB38 0000102D */ daddu $v0, $zero, $zero /* F44EC 802CFB3C 080B3F12 */ j .L802CFC48 /* F44F0 802CFB40 AE230028 */ sw $v1, 0x28($s1) @@ -131,9 +131,9 @@ glabel PutPartnerAway /* F4528 802CFB78 000218C0 */ sll $v1, $v0, 3 /* F452C 802CFB7C 00621821 */ addu $v1, $v1, $v0 /* F4530 802CFB80 00031880 */ sll $v1, $v1, 2 -/* F4534 802CFB84 3C028010 */ lui $v0, 0x8010 +/* F4534 802CFB84 3C028010 */ lui $v0, %hi(gPartnerAnimations+0x8) /* F4538 802CFB88 00431021 */ addu $v0, $v0, $v1 -/* F453C 802CFB8C 8C428350 */ lw $v0, -0x7cb0($v0) +/* F453C 802CFB8C 8C428350 */ lw $v0, %lo(gPartnerAnimations+0x8)($v0) /* F4540 802CFB90 AE220028 */ sw $v0, 0x28($s1) .L802CFB94: /* F4544 802CFB94 8E26000C */ lw $a2, 0xc($s1) @@ -170,9 +170,9 @@ glabel PutPartnerAway /* F45BC 802CFC0C 000310C0 */ sll $v0, $v1, 3 /* F45C0 802CFC10 00431021 */ addu $v0, $v0, $v1 /* F45C4 802CFC14 00021080 */ sll $v0, $v0, 2 -/* F45C8 802CFC18 3C018010 */ lui $at, 0x8010 +/* F45C8 802CFC18 3C018010 */ lui $at, %hi(gPartnerAnimations+0xC) /* F45CC 802CFC1C 00220821 */ addu $at, $at, $v0 -/* F45D0 802CFC20 8C228354 */ lw $v0, -0x7cac($at) +/* F45D0 802CFC20 8C228354 */ lw $v0, %lo(gPartnerAnimations+0xC)($at) /* F45D4 802CFC24 E634001C */ swc1 $f20, 0x1c($s1) /* F45D8 802CFC28 E620003C */ swc1 $f0, 0x3c($s1) /* F45DC 802CFC2C 0C00E228 */ jal free_npc_by_index diff --git a/asm/nonmatchings/code_f2470_len_27f0/set_npc_animation.s b/asm/nonmatchings/code_f2470_len_27f0/set_npc_animation.s index c10fd87c14..41013a8ad2 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/set_npc_animation.s +++ b/asm/nonmatchings/code_f2470_len_27f0/set_npc_animation.s @@ -18,9 +18,9 @@ glabel set_npc_animation /* F24F0 802CDB40 00431021 */ addu $v0, $v0, $v1 /* F24F4 802CDB44 00441021 */ addu $v0, $v0, $a0 /* F24F8 802CDB48 00021080 */ sll $v0, $v0, 2 -/* F24FC 802CDB4C 3C018010 */ lui $at, 0x8010 +/* F24FC 802CDB4C 3C018010 */ lui $at, %hi(gPartnerAnimations) /* F2500 802CDB50 00220821 */ addu $at, $at, $v0 -/* F2504 802CDB54 8C228348 */ lw $v0, -0x7cb8($at) +/* F2504 802CDB54 8C228348 */ lw $v0, %lo(gPartnerAnimations)($at) /* F2508 802CDB58 080B36E4 */ j .L802CDB90 /* F250C 802CDB5C AE220028 */ sw $v0, 0x28($s1) .L802CDB60: