diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s b/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s index e87865cbe0..ba61951dcc 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802E3E9C -/* 10571C 802E3E9C 3C028011 */ lui $v0, 0x8011 -/* 105720 802E3EA0 8C42EFCC */ lw $v0, -0x1034($v0) +/* 10571C 802E3E9C 3C028011 */ lui $v0, %hi(gPlayerStatus+0x4) +/* 105720 802E3EA0 8C42EFCC */ lw $v0, %lo(gPlayerStatus+0x4)($v0) /* 105724 802E3EA4 9083000B */ lbu $v1, 0xb($a0) /* 105728 802E3EA8 30420001 */ andi $v0, $v0, 1 /* 10572C 802E3EAC 50400007 */ beql $v0, $zero, .L802E3ECC diff --git a/asm/nonmatchings/code_FBE10/ShowEmote.s b/asm/nonmatchings/code_FBE10/ShowEmote.s index 1d1d874dae..d78e090254 100644 --- a/asm/nonmatchings/code_FBE10/ShowEmote.s +++ b/asm/nonmatchings/code_FBE10/ShowEmote.s @@ -66,8 +66,8 @@ glabel ShowEmote /* FC344 802D7994 080B5E9E */ j .L802D7A78 /* FC348 802D7998 4600B106 */ mov.s $f4, $f22 .L802D799C: -/* FC34C 802D799C 3C028011 */ lui $v0, 0x8011 -/* FC350 802D79A0 9442F078 */ lhu $v0, -0xf88($v0) +/* FC34C 802D799C 3C028011 */ lui $v0, %hi(gPlayerStatus+0xB0) +/* FC350 802D79A0 9442F078 */ lhu $v0, %lo(gPlayerStatus+0xB0)($v0) /* FC354 802D79A4 34A55556 */ ori $a1, $a1, 0x5556 /* FC358 802D79A8 00021400 */ sll $v0, $v0, 0x10 /* FC35C 802D79AC 00022403 */ sra $a0, $v0, 0x10 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s index 8021cc8534..02b81e54e7 100644 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s @@ -3,8 +3,8 @@ glabel func_80240D38_989898 /* 989898 80240D38 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 98989C 80240D3C 3C028011 */ lui $v0, 0x8011 -/* 9898A0 80240D40 8442EFE0 */ lh $v0, -0x1020($v0) +/* 98989C 80240D3C 3C028011 */ lui $v0, %hi(gPlayerStatus+0x18) +/* 9898A0 80240D40 8442EFE0 */ lh $v0, %lo(gPlayerStatus+0x18)($v0) /* 9898A4 80240D44 3C018024 */ lui $at, 0x8024 /* 9898A8 80240D48 D4201EA0 */ ldc1 $f0, 0x1ea0($at) /* 9898AC 80240D4C 2406FFFF */ addiu $a2, $zero, -1 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s index 0cc6c4b83c..3e46faef59 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s @@ -3,8 +3,8 @@ glabel func_802402BC_918E6C /* 918E6C 802402BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 918E70 802402C0 3C028011 */ lui $v0, 0x8011 -/* 918E74 802402C4 8442EFE0 */ lh $v0, -0x1020($v0) +/* 918E70 802402C0 3C028011 */ lui $v0, %hi(gPlayerStatus+0x18) +/* 918E74 802402C4 8442EFE0 */ lh $v0, %lo(gPlayerStatus+0x18)($v0) /* 918E78 802402C8 3C014069 */ lui $at, 0x4069 /* 918E7C 802402CC 44810800 */ mtc1 $at, $f1 /* 918E80 802402D0 44800000 */ mtc1 $zero, $f0 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s index 330f487e77..81b2d5b654 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s @@ -3,8 +3,8 @@ glabel func_80240000_91B8E0 /* 91B8E0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 91B8E4 80240004 3C028011 */ lui $v0, 0x8011 -/* 91B8E8 80240008 8442EFE0 */ lh $v0, -0x1020($v0) +/* 91B8E4 80240004 3C028011 */ lui $v0, %hi(gPlayerStatus+0x18) +/* 91B8E8 80240008 8442EFE0 */ lh $v0, %lo(gPlayerStatus+0x18)($v0) /* 91B8EC 8024000C 3C01C059 */ lui $at, 0xc059 /* 91B8F0 80240010 44810800 */ mtc1 $at, $f1 /* 91B8F4 80240014 44800000 */ mtc1 $zero, $f0 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s index 3a055bd399..a3d711160f 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s @@ -11,8 +11,8 @@ glabel func_80240034_ACAB54 /* ACAB6C 8024004C 4600008D */ trunc.w.s $f2, $f0 /* ACAB70 80240050 44021000 */ mfc1 $v0, $f2 /* ACAB74 80240054 00000000 */ nop -/* ACAB78 80240058 3C018011 */ lui $at, 0x8011 -/* ACAB7C 8024005C A022EFD5 */ sb $v0, -0x102b($at) +/* ACAB78 80240058 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) +/* ACAB7C 8024005C A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* ACAB80 80240060 24020002 */ addiu $v0, $zero, 2 /* ACAB84 80240064 03E00008 */ jr $ra /* ACAB88 80240068 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s index 9d39c1729e..a1a360bf0d 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s @@ -5,8 +5,8 @@ glabel func_80240F18_ACBA38 /* ACBA38 80240F18 27BDFFE8 */ addiu $sp, $sp, -0x18 /* ACBA3C 80240F1C AFBF0010 */ sw $ra, 0x10($sp) /* ACBA40 80240F20 8C82000C */ lw $v0, 0xc($a0) -/* ACBA44 80240F24 3C068011 */ lui $a2, 0x8011 -/* ACBA48 80240F28 80C6EFD4 */ lb $a2, -0x102c($a2) +/* ACBA44 80240F24 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* ACBA48 80240F28 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* ACBA4C 80240F2C 0C0B2026 */ jal set_variable /* ACBA50 80240F30 8C450000 */ lw $a1, ($v0) /* ACBA54 80240F34 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s index e47bcd0f46..e1c1fc0aec 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s +++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s @@ -11,8 +11,8 @@ glabel func_80240034_ACE174 /* ACE18C 8024004C 4600008D */ trunc.w.s $f2, $f0 /* ACE190 80240050 44021000 */ mfc1 $v0, $f2 /* ACE194 80240054 00000000 */ nop -/* ACE198 80240058 3C018011 */ lui $at, 0x8011 -/* ACE19C 8024005C A022EFD5 */ sb $v0, -0x102b($at) +/* ACE198 80240058 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) +/* ACE19C 8024005C A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* ACE1A0 80240060 24020002 */ addiu $v0, $zero, 2 /* ACE1A4 80240064 03E00008 */ jr $ra /* ACE1A8 80240068 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s index 175d6c8e95..2efc6d90e5 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s +++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s @@ -5,8 +5,8 @@ glabel func_80240F18_ACF058 /* ACF058 80240F18 27BDFFE8 */ addiu $sp, $sp, -0x18 /* ACF05C 80240F1C AFBF0010 */ sw $ra, 0x10($sp) /* ACF060 80240F20 8C82000C */ lw $v0, 0xc($a0) -/* ACF064 80240F24 3C068011 */ lui $a2, 0x8011 -/* ACF068 80240F28 80C6EFD4 */ lb $a2, -0x102c($a2) +/* ACF064 80240F24 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* ACF068 80240F28 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* ACF06C 80240F2C 0C0B2026 */ jal set_variable /* ACF070 80240F30 8C450000 */ lw $a1, ($v0) /* ACF074 80240F34 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s b/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s index 11f07f8482..bef78bbf6a 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s +++ b/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s @@ -11,8 +11,8 @@ glabel func_80240034_AD40C4 /* AD40DC 8024004C 4600008D */ trunc.w.s $f2, $f0 /* AD40E0 80240050 44021000 */ mfc1 $v0, $f2 /* AD40E4 80240054 00000000 */ nop -/* AD40E8 80240058 3C018011 */ lui $at, 0x8011 -/* AD40EC 8024005C A022EFD5 */ sb $v0, -0x102b($at) +/* AD40E8 80240058 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) +/* AD40EC 8024005C A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* AD40F0 80240060 24020002 */ addiu $v0, $zero, 2 /* AD40F4 80240064 03E00008 */ jr $ra /* AD40F8 80240068 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s index cb509ba3dc..bd512fcc47 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s +++ b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s @@ -5,8 +5,8 @@ glabel func_802406E8_AD4778 /* AD4778 802406E8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AD477C 802406EC AFBF0010 */ sw $ra, 0x10($sp) /* AD4780 802406F0 8C82000C */ lw $v0, 0xc($a0) -/* AD4784 802406F4 3C068011 */ lui $a2, 0x8011 -/* AD4788 802406F8 80C6EFD4 */ lb $a2, -0x102c($a2) +/* AD4784 802406F4 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* AD4788 802406F8 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* AD478C 802406FC 0C0B2026 */ jal set_variable /* AD4790 80240700 8C450000 */ lw $a1, ($v0) /* AD4794 80240704 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s index 864f81aff4..808e385b3b 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s +++ b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s @@ -5,8 +5,8 @@ glabel func_802403A0_ADB240 /* ADB240 802403A0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* ADB244 802403A4 AFBF0010 */ sw $ra, 0x10($sp) /* ADB248 802403A8 8C82000C */ lw $v0, 0xc($a0) -/* ADB24C 802403AC 3C068011 */ lui $a2, 0x8011 -/* ADB250 802403B0 80C6EFD4 */ lb $a2, -0x102c($a2) +/* ADB24C 802403AC 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* ADB250 802403B0 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* ADB254 802403B4 0C0B2026 */ jal set_variable /* ADB258 802403B8 8C450000 */ lw $a1, ($v0) /* ADB25C 802403BC 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s index 7b606c7ce4..95c3f3ba12 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s @@ -11,8 +11,8 @@ glabel func_80240028_AED438 /* AED450 80240040 4600008D */ trunc.w.s $f2, $f0 /* AED454 80240044 44021000 */ mfc1 $v0, $f2 /* AED458 80240048 00000000 */ nop -/* AED45C 8024004C 3C018011 */ lui $at, 0x8011 -/* AED460 80240050 A022EFD5 */ sb $v0, -0x102b($at) +/* AED45C 8024004C 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) +/* AED460 80240050 A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* AED464 80240054 24020002 */ addiu $v0, $zero, 2 /* AED468 80240058 03E00008 */ jr $ra /* AED46C 8024005C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s index 2a22d7bf22..dcb61015b5 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s @@ -5,8 +5,8 @@ glabel func_80240EC8_AEE2D8 /* AEE2D8 80240EC8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AEE2DC 80240ECC AFBF0010 */ sw $ra, 0x10($sp) /* AEE2E0 80240ED0 8C82000C */ lw $v0, 0xc($a0) -/* AEE2E4 80240ED4 3C068011 */ lui $a2, 0x8011 -/* AEE2E8 80240ED8 80C6EFD4 */ lb $a2, -0x102c($a2) +/* AEE2E4 80240ED4 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* AEE2E8 80240ED8 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* AEE2EC 80240EDC 0C0B2026 */ jal set_variable /* AEE2F0 80240EE0 8C450000 */ lw $a1, ($v0) /* AEE2F4 80240EE4 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s index 52f74b189e..12097d8f4f 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s @@ -12,8 +12,8 @@ glabel func_80240730_AF33D0 /* AF33EC 8024074C 4600008D */ trunc.w.s $f2, $f0 /* AF33F0 80240750 44021000 */ mfc1 $v0, $f2 /* AF33F4 80240754 00000000 */ nop -/* AF33F8 80240758 3C018011 */ lui $at, 0x8011 -/* AF33FC 8024075C A022F08C */ sb $v0, -0xf74($at) +/* AF33F8 80240758 3C018011 */ lui $at, %hi(gPlayerStatus+0xC4) +/* AF33FC 8024075C A022F08C */ sb $v0, %lo(gPlayerStatus+0xC4)($at) /* AF3400 80240760 A0620080 */ sb $v0, 0x80($v1) /* AF3404 80240764 8FBF0010 */ lw $ra, 0x10($sp) /* AF3408 80240768 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s index 0256e6abbd..43ea5d1890 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s @@ -10,8 +10,8 @@ glabel func_80240C10_AF8560 /* AF8574 80240C24 3C048007 */ lui $a0, %hi(gGameStatusPtr) /* AF8578 80240C28 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) /* AF857C 80240C2C 0040182D */ daddu $v1, $v0, $zero -/* AF8580 80240C30 3C018011 */ lui $at, 0x8011 -/* AF8584 80240C34 A023F08C */ sb $v1, -0xf74($at) +/* AF8580 80240C30 3C018011 */ lui $at, %hi(gPlayerStatus+0xC4) +/* AF8584 80240C34 A023F08C */ sb $v1, %lo(gPlayerStatus+0xC4)($at) /* AF8588 80240C38 A0830080 */ sb $v1, 0x80($a0) /* AF858C 80240C3C 8FBF0010 */ lw $ra, 0x10($sp) /* AF8590 80240C40 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s index 139246b4ac..e2880bba27 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s @@ -5,8 +5,8 @@ glabel func_802405BC_AFE0FC /* AFE0FC 802405BC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AFE100 802405C0 AFBF0010 */ sw $ra, 0x10($sp) /* AFE104 802405C4 8C82000C */ lw $v0, 0xc($a0) -/* AFE108 802405C8 3C068011 */ lui $a2, 0x8011 -/* AFE10C 802405CC 80C6EFD4 */ lb $a2, -0x102c($a2) +/* AFE108 802405C8 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* AFE10C 802405CC 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* AFE110 802405D0 0C0B2026 */ jal set_variable /* AFE114 802405D4 8C450000 */ lw $a1, ($v0) /* AFE118 802405D8 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s index d6223aa13a..888e49bad5 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s @@ -11,8 +11,8 @@ glabel func_80240048_B028C8 /* B028E0 80240060 4600008D */ trunc.w.s $f2, $f0 /* B028E4 80240064 44021000 */ mfc1 $v0, $f2 /* B028E8 80240068 00000000 */ nop -/* B028EC 8024006C 3C018011 */ lui $at, 0x8011 -/* B028F0 80240070 A022EFD5 */ sb $v0, -0x102b($at) +/* B028EC 8024006C 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) +/* B028F0 80240070 A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* B028F4 80240074 24020002 */ addiu $v0, $zero, 2 /* B028F8 80240078 03E00008 */ jr $ra /* B028FC 8024007C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s index 3669829815..d829944e67 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s @@ -5,8 +5,8 @@ glabel func_80240758_B02FD8 /* B02FD8 80240758 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B02FDC 8024075C AFBF0010 */ sw $ra, 0x10($sp) /* B02FE0 80240760 8C82000C */ lw $v0, 0xc($a0) -/* B02FE4 80240764 3C068011 */ lui $a2, 0x8011 -/* B02FE8 80240768 80C6EFD4 */ lb $a2, -0x102c($a2) +/* B02FE4 80240764 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* B02FE8 80240768 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* B02FEC 8024076C 0C0B2026 */ jal set_variable /* B02FF0 80240770 8C450000 */ lw $a1, ($v0) /* B02FF4 80240774 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s index a16bbd1a0c..4107d94080 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s @@ -3,8 +3,8 @@ glabel func_80242D38_C63A48 /* C63A48 80242D38 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C63A4C 80242D3C 3C028011 */ lui $v0, 0x8011 -/* C63A50 80242D40 8442EFE0 */ lh $v0, -0x1020($v0) +/* C63A4C 80242D3C 3C028011 */ lui $v0, %hi(gPlayerStatus+0x18) +/* C63A50 80242D40 8442EFE0 */ lh $v0, %lo(gPlayerStatus+0x18)($v0) /* C63A54 80242D44 3C014089 */ lui $at, 0x4089 /* C63A58 80242D48 44810800 */ mtc1 $at, $f1 /* C63A5C 80242D4C 44800000 */ mtc1 $zero, $f0 diff --git a/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s b/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s index c5260c8342..661b45cb0c 100644 --- a/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s +++ b/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s @@ -11,8 +11,8 @@ glabel func_80240020_AB2190 /* AB21A8 80240038 4600008D */ trunc.w.s $f2, $f0 /* AB21AC 8024003C 44021000 */ mfc1 $v0, $f2 /* AB21B0 80240040 00000000 */ nop -/* AB21B4 80240044 3C018011 */ lui $at, 0x8011 -/* AB21B8 80240048 A022EFD5 */ sb $v0, -0x102b($at) +/* AB21B4 80240044 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) +/* AB21B8 80240048 A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* AB21BC 8024004C 24020002 */ addiu $v0, $zero, 2 /* AB21C0 80240050 03E00008 */ jr $ra /* AB21C4 80240054 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s b/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s index ffdeabcd3f..e2a05b2af3 100644 --- a/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s +++ b/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s @@ -5,8 +5,8 @@ glabel func_80240120_AB2290 /* AB2290 80240120 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AB2294 80240124 AFBF0010 */ sw $ra, 0x10($sp) /* AB2298 80240128 8C82000C */ lw $v0, 0xc($a0) -/* AB229C 8024012C 3C068011 */ lui $a2, 0x8011 -/* AB22A0 80240130 80C6EFD4 */ lb $a2, -0x102c($a2) +/* AB229C 8024012C 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* AB22A0 80240130 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* AB22A4 80240134 0C0B2026 */ jal set_variable /* AB22A8 80240138 8C450000 */ lw $a1, ($v0) /* AB22AC 8024013C 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s index fe2a36ff96..9107c8a9ef 100644 --- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s +++ b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s @@ -23,8 +23,8 @@ glabel func_80240508_9AEC08 /* 9AEC50 80240550 44103000 */ mfc1 $s0, $f6 /* 9AEC54 80240554 0C0B210B */ jal get_float_variable /* 9AEC58 80240558 0220202D */ daddu $a0, $s1, $zero -/* 9AEC5C 8024055C 3C028011 */ lui $v0, 0x8011 -/* 9AEC60 80240560 8442F078 */ lh $v0, -0xf88($v0) +/* 9AEC5C 8024055C 3C028011 */ lui $v0, %hi(gPlayerStatus+0xB0) +/* 9AEC60 80240560 8442F078 */ lh $v0, %lo(gPlayerStatus+0xB0)($v0) /* 9AEC64 80240564 3C018024 */ lui $at, 0x8024 /* 9AEC68 80240568 D4223078 */ ldc1 $f2, 0x3078($at) /* 9AEC6C 8024056C 44822000 */ mtc1 $v0, $f4 diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt index 7026becfac..30190c2498 100644 --- a/tools/symbol_addrs.txt +++ b/tools/symbol_addrs.txt @@ -692,6 +692,7 @@ enable_partner_ai = 0x800EF328; clear_partner_move_history = 0x800EF45C; draw_submenu_title = 0x800F4648; draw_box = 0x800F52E0; +gPlayerStatus = 0x8010EFC8; // size:0x288 gPlayerData = 0x8010F290; // size:0x340 update_entities = 0x8010F6D0; update_shadows = 0x8010FA98;