diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1660.s b/asm/nonmatchings/code_102610_len_2330/func_802E1660.s index 194061e592..080da0f3c1 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E1660.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E1660.s @@ -22,8 +22,8 @@ glabel func_802E1660 /* 102F24 802E16A4 822300B4 */ lb $v1, 0xb4($s1) /* 102F28 802E16A8 14620009 */ bne $v1, $v0, .L802E16D0 /* 102F2C 802E16AC 2402000D */ addiu $v0, $zero, 0xd -/* 102F30 802E16B0 3C028011 */ lui $v0, 0x8011 -/* 102F34 802E16B4 8042F291 */ lb $v0, -0xd6f($v0) +/* 102F30 802E16B0 3C028011 */ lui $v0, %hi(gPlayerData+0x1) +/* 102F34 802E16B4 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) /* 102F38 802E16B8 0440001A */ bltz $v0, .L802E1724 /* 102F3C 802E16BC 00000000 */ nop /* 102F40 802E16C0 080B85C2 */ j .L802E1708 diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s b/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s index a58bef3f9d..ac142e5bf1 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s @@ -97,8 +97,8 @@ glabel func_802E3BA4 /* 105570 802E3CF0 080B8F42 */ j .L802E3D08 /* 105574 802E3CF4 00000000 */ nop .L802E3CF8: -/* 105578 802E3CF8 3C028011 */ lui $v0, 0x8011 -/* 10557C 802E3CFC 8042F291 */ lb $v0, -0xd6f($v0) +/* 105578 802E3CF8 3C028011 */ lui $v0, %hi(gPlayerData+0x1) +/* 10557C 802E3CFC 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) /* 105580 802E3D00 04430001 */ bgezl $v0, .L802E3D08 /* 105584 802E3D04 24100001 */ addiu $s0, $zero, 1 .L802E3D08: @@ -121,8 +121,8 @@ glabel func_802E3BA4 /* 1055C8 802E3D48 080B8F58 */ j .L802E3D60 /* 1055CC 802E3D4C 00000000 */ nop .L802E3D50: -/* 1055D0 802E3D50 3C028011 */ lui $v0, 0x8011 -/* 1055D4 802E3D54 8042F291 */ lb $v0, -0xd6f($v0) +/* 1055D0 802E3D50 3C028011 */ lui $v0, %hi(gPlayerData+0x1) +/* 1055D4 802E3D54 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) /* 1055D8 802E3D58 5C400001 */ bgtzl $v0, .L802E3D60 /* 1055DC 802E3D5C 24100001 */ addiu $s0, $zero, 1 .L802E3D60: @@ -135,8 +135,8 @@ glabel func_802E3BA4 /* 1055F8 802E3D78 C6200050 */ lwc1 $f0, 0x50($s1) /* 1055FC 802E3D7C 080B8F6C */ j .L802E3DB0 /* 105600 802E3D80 24040150 */ addiu $a0, $zero, 0x150 -/* 105604 802E3D84 3C028011 */ lui $v0, 0x8011 -/* 105608 802E3D88 8042F291 */ lb $v0, -0xd6f($v0) +/* 105604 802E3D84 3C028011 */ lui $v0, %hi(gPlayerData+0x1) +/* 105608 802E3D88 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) /* 10560C 802E3D8C 28420002 */ slti $v0, $v0, 2 /* 105610 802E3D90 14400015 */ bnez $v0, .L802E3DE8 /* 105614 802E3D94 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s b/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s index 77c53f1b52..cc83ebeea2 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802E54CC -/* 106D4C 802E54CC 3C028011 */ lui $v0, 0x8011 -/* 106D50 802E54D0 9042F2AC */ lbu $v0, -0xd54($v0) +/* 106D4C 802E54CC 3C028011 */ lui $v0, %hi(gPlayerData+0x1C) +/* 106D50 802E54D0 9042F2AC */ lbu $v0, %lo(gPlayerData+0x1C)($v0) /* 106D54 802E54D4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 106D58 802E54D8 AFB00010 */ sw $s0, 0x10($sp) /* 106D5C 802E54DC 0080802D */ daddu $s0, $a0, $zero diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s index a3dc79dc42..b84b2c3964 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s @@ -34,16 +34,16 @@ glabel func_802E7AE4 /* 1093D8 802E7B58 A022F290 */ sb $v0, %lo(gPlayerData)($at) /* 1093DC 802E7B5C 080B9EE2 */ j .L802E7B88 /* 1093E0 802E7B60 00000000 */ nop -/* 1093E4 802E7B64 3C018011 */ lui $at, 0x8011 -/* 1093E8 802E7B68 A020F291 */ sb $zero, -0xd6f($at) +/* 1093E4 802E7B64 3C018011 */ lui $at, %hi(gPlayerData+0x1) +/* 1093E8 802E7B68 A020F291 */ sb $zero, %lo(gPlayerData+0x1)($at) /* 1093EC 802E7B6C 080B9EE2 */ j .L802E7B88 /* 1093F0 802E7B70 00000000 */ nop /* 1093F4 802E7B74 080B9EE0 */ j .L802E7B80 /* 1093F8 802E7B78 24020001 */ addiu $v0, $zero, 1 /* 1093FC 802E7B7C 24020002 */ addiu $v0, $zero, 2 .L802E7B80: -/* 109400 802E7B80 3C018011 */ lui $at, 0x8011 -/* 109404 802E7B84 A022F291 */ sb $v0, -0xd6f($at) +/* 109400 802E7B80 3C018011 */ lui $at, %hi(gPlayerData+0x1) +/* 109404 802E7B84 A022F291 */ sb $v0, %lo(gPlayerData+0x1)($at) .L802E7B88: /* 109408 802E7B88 8E020010 */ lw $v0, 0x10($s0) /* 10940C 802E7B8C 10400027 */ beqz $v0, .L802E7C2C diff --git a/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s b/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s index 5f0ccdd553..16a96ab4e8 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s @@ -60,8 +60,8 @@ glabel pause_badges_draw_contents /* 13A91C 802475DC 00005810 */ mfhi $t3 /* 13A920 802475E0 24040004 */ addiu $a0, $zero, 4 /* 13A924 802475E4 8FA700C8 */ lw $a3, 0xc8($sp) -/* 13A928 802475E8 3C088011 */ lui $t0, 0x8011 -/* 13A92C 802475EC 8108F298 */ lb $t0, -0xd68($t0) +/* 13A928 802475E8 3C088011 */ lui $t0, %hi(gPlayerData+0x8) +/* 13A92C 802475EC 8108F298 */ lb $t0, %lo(gPlayerData+0x8)($t0) /* 13A930 802475F0 3C058027 */ lui $a1, 0x8027 /* 13A934 802475F4 24A5FC48 */ addiu $a1, $a1, -0x3b8 /* 13A938 802475F8 AFA00010 */ sw $zero, 0x10($sp) @@ -211,8 +211,8 @@ glabel pause_badges_draw_contents /* 13AB60 80247820 AFAA0094 */ sw $t2, 0x94($sp) .L80247824: /* 13AB64 80247824 8FAB0078 */ lw $t3, 0x78($sp) -/* 13AB68 80247828 3C128011 */ lui $s2, 0x8011 -/* 13AB6C 8024782C 2652F498 */ addiu $s2, $s2, -0xb68 +/* 13AB68 80247828 3C128011 */ lui $s2, %hi(gPlayerData+0x208) +/* 13AB6C 8024782C 2652F498 */ addiu $s2, $s2, %lo(gPlayerData+0x208) /* 13AB70 80247830 AFA00084 */ sw $zero, 0x84($sp) /* 13AB74 80247834 8D620004 */ lw $v0, 4($t3) /* 13AB78 80247838 24037FFF */ addiu $v1, $zero, 0x7fff @@ -1012,8 +1012,8 @@ glabel pause_badges_draw_contents /* 13B734 802483F4 24070001 */ addiu $a3, $zero, 1 /* 13B738 802483F8 241500FF */ addiu $s5, $zero, 0xff /* 13B73C 802483FC 8FAB00C4 */ lw $t3, 0xc4($sp) -/* 13B740 80248400 3C048011 */ lui $a0, 0x8011 -/* 13B744 80248404 8084F298 */ lb $a0, -0xd68($a0) +/* 13B740 80248400 3C048011 */ lui $a0, %hi(gPlayerData+0x8) +/* 13B744 80248404 8084F298 */ lb $a0, %lo(gPlayerData+0x8)($a0) /* 13B748 80248408 24140003 */ addiu $s4, $zero, 3 /* 13B74C 8024840C AFB30010 */ sw $s3, 0x10($sp) /* 13B750 80248410 AFB50014 */ sw $s5, 0x14($sp) @@ -1023,8 +1023,8 @@ glabel pause_badges_draw_contents /* 13B760 80248420 0C0911FD */ jal pause_get_total_equipped_bp_cost /* 13B764 80248424 0000902D */ daddu $s2, $zero, $zero /* 13B768 80248428 3C056666 */ lui $a1, 0x6666 -/* 13B76C 8024842C 3C048011 */ lui $a0, 0x8011 -/* 13B770 80248430 8084F298 */ lb $a0, -0xd68($a0) +/* 13B76C 8024842C 3C048011 */ lui $a0, %hi(gPlayerData+0x8) +/* 13B770 80248430 8084F298 */ lb $a0, %lo(gPlayerData+0x8)($a0) /* 13B774 80248434 34A56667 */ ori $a1, $a1, 0x6667 /* 13B778 80248438 2483FFFF */ addiu $v1, $a0, -1 /* 13B77C 8024843C 00650018 */ mult $v1, $a1 @@ -1068,8 +1068,8 @@ glabel pause_badges_draw_contents /* 13B810 802484D0 0060202D */ daddu $a0, $v1, $zero /* 13B814 802484D4 24630008 */ addiu $v1, $v1, 8 /* 13B818 802484D8 ACC30000 */ sw $v1, ($a2) -/* 13B81C 802484DC 3C108011 */ lui $s0, 0x8011 -/* 13B820 802484E0 8210F298 */ lb $s0, -0xd68($s0) +/* 13B81C 802484DC 3C108011 */ lui $s0, %hi(gPlayerData+0x8) +/* 13B820 802484E0 8210F298 */ lb $s0, %lo(gPlayerData+0x8)($s0) /* 13B824 802484E4 241E0064 */ addiu $fp, $zero, 0x64 /* 13B828 802484E8 AC820000 */ sw $v0, ($a0) /* 13B82C 802484EC 3C028027 */ lui $v0, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/pause_badges_try_remove.s b/asm/nonmatchings/code_135EE0/pause_badges_try_remove.s index e4973f8e35..d1916c5b06 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_try_remove.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_try_remove.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel pause_badges_try_remove -/* 13A5F0 802472B0 3C068011 */ lui $a2, 0x8011 -/* 13A5F4 802472B4 24C6F498 */ addiu $a2, $a2, -0xb68 +/* 13A5F0 802472B0 3C068011 */ lui $a2, %hi(gPlayerData+0x208) +/* 13A5F4 802472B4 24C6F498 */ addiu $a2, $a2, %lo(gPlayerData+0x208) /* 13A5F8 802472B8 00C0182D */ daddu $v1, $a2, $zero /* 13A5FC 802472BC 00042400 */ sll $a0, $a0, 0x10 /* 13A600 802472C0 00042403 */ sra $a0, $a0, 0x10 diff --git a/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s b/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s index e7d909e93b..27f6124019 100644 --- a/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s +++ b/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s @@ -44,8 +44,8 @@ glabel pause_stats_draw_contents /* 138D5C 80245A1C 0200302D */ daddu $a2, $s0, $zero /* 138D60 80245A20 24070001 */ addiu $a3, $zero, 1 /* 138D64 80245A24 8FA80084 */ lw $t0, 0x84($sp) -/* 138D68 80245A28 3C048011 */ lui $a0, 0x8011 -/* 138D6C 80245A2C 8484F29C */ lh $a0, -0xd64($a0) +/* 138D68 80245A28 3C048011 */ lui $a0, %hi(gPlayerData+0xC) +/* 138D6C 80245A2C 8484F29C */ lh $a0, %lo(gPlayerData+0xC)($a0) /* 138D70 80245A30 24120003 */ addiu $s2, $zero, 3 /* 138D74 80245A34 AFB20018 */ sw $s2, 0x18($sp) /* 138D78 80245A38 25140119 */ addiu $s4, $t0, 0x119 @@ -85,8 +85,8 @@ glabel pause_stats_draw_contents /* 138E00 80245AC0 0280282D */ daddu $a1, $s4, $zero /* 138E04 80245AC4 0200302D */ daddu $a2, $s0, $zero /* 138E08 80245AC8 24070001 */ addiu $a3, $zero, 1 -/* 138E0C 80245ACC 3C048011 */ lui $a0, 0x8011 -/* 138E10 80245AD0 8084F2A0 */ lb $a0, -0xd60($a0) +/* 138E0C 80245ACC 3C048011 */ lui $a0, %hi(gPlayerData+0x10) +/* 138E10 80245AD0 8084F2A0 */ lb $a0, %lo(gPlayerData+0x10)($a0) /* 138E14 80245AD4 2408000A */ addiu $t0, $zero, 0xa /* 138E18 80245AD8 AFA80010 */ sw $t0, 0x10($sp) /* 138E1C 80245ADC 240800FF */ addiu $t0, $zero, 0xff @@ -121,8 +121,8 @@ glabel pause_stats_draw_contents /* 138E90 80245B50 0280282D */ daddu $a1, $s4, $zero /* 138E94 80245B54 0200302D */ daddu $a2, $s0, $zero /* 138E98 80245B58 24070001 */ addiu $a3, $zero, 1 -/* 138E9C 80245B5C 3C048011 */ lui $a0, 0x8011 -/* 138EA0 80245B60 9084F29F */ lbu $a0, -0xd61($a0) +/* 138E9C 80245B5C 3C048011 */ lui $a0, %hi(gPlayerData+0xF) +/* 138EA0 80245B60 9084F29F */ lbu $a0, %lo(gPlayerData+0xF)($a0) /* 138EA4 80245B64 2408000A */ addiu $t0, $zero, 0xa /* 138EA8 80245B68 AFA80010 */ sw $t0, 0x10($sp) /* 138EAC 80245B6C 240800FF */ addiu $t0, $zero, 0xff @@ -165,8 +165,8 @@ glabel pause_stats_draw_contents /* 138F40 80245C00 AFA80014 */ sw $t0, 0x14($sp) /* 138F44 80245C04 0200302D */ daddu $a2, $s0, $zero /* 138F48 80245C08 8FA80084 */ lw $t0, 0x84($sp) -/* 138F4C 80245C0C 3C048011 */ lui $a0, 0x8011 -/* 138F50 80245C10 8084F292 */ lb $a0, -0xd6e($a0) +/* 138F4C 80245C0C 3C048011 */ lui $a0, %hi(gPlayerData+0x2) +/* 138F50 80245C10 8084F292 */ lb $a0, %lo(gPlayerData+0x2)($a0) /* 138F54 80245C14 24070001 */ addiu $a3, $zero, 1 /* 138F58 80245C18 AFA00010 */ sw $zero, 0x10($sp) /* 138F5C 80245C1C AFB20018 */ sw $s2, 0x18($sp) @@ -187,8 +187,8 @@ glabel pause_stats_draw_contents /* 138F98 80245C58 AFA80014 */ sw $t0, 0x14($sp) /* 138F9C 80245C5C 0200302D */ daddu $a2, $s0, $zero /* 138FA0 80245C60 8FA80084 */ lw $t0, 0x84($sp) -/* 138FA4 80245C64 3C048011 */ lui $a0, 0x8011 -/* 138FA8 80245C68 8084F293 */ lb $a0, -0xd6d($a0) +/* 138FA4 80245C64 3C048011 */ lui $a0, %hi(gPlayerData+0x3) +/* 138FA8 80245C68 8084F293 */ lb $a0, %lo(gPlayerData+0x3)($a0) /* 138FAC 80245C6C 24070001 */ addiu $a3, $zero, 1 /* 138FB0 80245C70 AFA00010 */ sw $zero, 0x10($sp) /* 138FB4 80245C74 AFB20018 */ sw $s2, 0x18($sp) @@ -221,8 +221,8 @@ glabel pause_stats_draw_contents /* 139020 80245CE0 0260282D */ daddu $a1, $s3, $zero /* 139024 80245CE4 0200302D */ daddu $a2, $s0, $zero /* 139028 80245CE8 24070001 */ addiu $a3, $zero, 1 -/* 13902C 80245CEC 3C048011 */ lui $a0, 0x8011 -/* 139030 80245CF0 8084F295 */ lb $a0, -0xd6b($a0) +/* 13902C 80245CEC 3C048011 */ lui $a0, %hi(gPlayerData+0x5) +/* 139030 80245CF0 8084F295 */ lb $a0, %lo(gPlayerData+0x5)($a0) /* 139034 80245CF4 240800FF */ addiu $t0, $zero, 0xff /* 139038 80245CF8 AFA00010 */ sw $zero, 0x10($sp) /* 13903C 80245CFC AFA80014 */ sw $t0, 0x14($sp) @@ -241,8 +241,8 @@ glabel pause_stats_draw_contents /* 139070 80245D30 02E0282D */ daddu $a1, $s7, $zero /* 139074 80245D34 0200302D */ daddu $a2, $s0, $zero /* 139078 80245D38 24070001 */ addiu $a3, $zero, 1 -/* 13907C 80245D3C 3C048011 */ lui $a0, 0x8011 -/* 139080 80245D40 8084F296 */ lb $a0, -0xd6a($a0) +/* 13907C 80245D3C 3C048011 */ lui $a0, %hi(gPlayerData+0x6) +/* 139080 80245D40 8084F296 */ lb $a0, %lo(gPlayerData+0x6)($a0) /* 139084 80245D44 240800FF */ addiu $t0, $zero, 0xff /* 139088 80245D48 AFA00010 */ sw $zero, 0x10($sp) /* 13908C 80245D4C AFA80014 */ sw $t0, 0x14($sp) @@ -272,8 +272,8 @@ glabel pause_stats_draw_contents /* 1390EC 80245DAC 0260282D */ daddu $a1, $s3, $zero /* 1390F0 80245DB0 0200302D */ daddu $a2, $s0, $zero /* 1390F4 80245DB4 24070001 */ addiu $a3, $zero, 1 -/* 1390F8 80245DB8 3C048011 */ lui $a0, 0x8011 -/* 1390FC 80245DBC 8084F298 */ lb $a0, -0xd68($a0) +/* 1390F8 80245DB8 3C048011 */ lui $a0, %hi(gPlayerData+0x8) +/* 1390FC 80245DBC 8084F298 */ lb $a0, %lo(gPlayerData+0x8)($a0) /* 139100 80245DC0 240800FF */ addiu $t0, $zero, 0xff /* 139104 80245DC4 AFA00010 */ sw $zero, 0x10($sp) /* 139108 80245DC8 AFA80014 */ sw $t0, 0x14($sp) @@ -298,8 +298,8 @@ glabel pause_stats_draw_contents /* 139154 80245E14 0C04993B */ jal draw_string /* 139158 80245E18 AFA80014 */ sw $t0, 0x14($sp) /* 13915C 80245E1C 3C020149 */ lui $v0, 0x149 -/* 139160 80245E20 3C148011 */ lui $s4, 0x8011 -/* 139164 80245E24 8E94F54C */ lw $s4, -0xab4($s4) +/* 139160 80245E20 3C148011 */ lui $s4, %hi(gPlayerData+0x2BC) +/* 139164 80245E24 8E94F54C */ lw $s4, %lo(gPlayerData+0x2BC)($s4) /* 139168 80245E28 344296FF */ ori $v0, $v0, 0x96ff /* 13916C 80245E2C 0054102A */ slt $v0, $v0, $s4 /* 139170 80245E30 10400003 */ beqz $v0, .L80245E40 @@ -423,8 +423,8 @@ glabel pause_stats_draw_contents /* 139344 80246004 00442023 */ subu $a0, $v0, $a0 /* 139348 80246008 3C028011 */ lui $v0, %hi(gPlayerData) /* 13934C 8024600C 9042F290 */ lbu $v0, %lo(gPlayerData)($v0) -/* 139350 80246010 3C038011 */ lui $v1, 0x8011 -/* 139354 80246014 9063F291 */ lbu $v1, -0xd6f($v1) +/* 139350 80246010 3C038011 */ lui $v1, %hi(gPlayerData+0x1) +/* 139354 80246014 9063F291 */ lbu $v1, %lo(gPlayerData+0x1)($v1) /* 139358 80246018 8FA80084 */ lw $t0, 0x84($sp) /* 13935C 8024601C 27C7000C */ addiu $a3, $fp, 0xc /* 139360 80246020 AFA00010 */ sw $zero, 0x10($sp) @@ -432,8 +432,8 @@ glabel pause_stats_draw_contents /* 139368 80246028 00029603 */ sra $s2, $v0, 0x18 /* 13936C 8024602C 00031E00 */ sll $v1, $v1, 0x18 /* 139370 80246030 00039E03 */ sra $s3, $v1, 0x18 -/* 139374 80246034 3C028011 */ lui $v0, 0x8011 -/* 139378 80246038 9042F299 */ lbu $v0, -0xd67($v0) +/* 139374 80246034 3C028011 */ lui $v0, %hi(gPlayerData+0x9) +/* 139378 80246038 9042F299 */ lbu $v0, %lo(gPlayerData+0x9)($v0) /* 13937C 8024603C 00021600 */ sll $v0, $v0, 0x18 /* 139380 80246040 0002A603 */ sra $s4, $v0, 0x18 /* 139384 80246044 0280102D */ daddu $v0, $s4, $zero diff --git a/asm/nonmatchings/code_182B30/func_80255FE0.s b/asm/nonmatchings/code_182B30/func_80255FE0.s index 8a6421b9ed..58297a1373 100644 --- a/asm/nonmatchings/code_182B30/func_80255FE0.s +++ b/asm/nonmatchings/code_182B30/func_80255FE0.s @@ -658,8 +658,8 @@ glabel func_80255FE0 .L802569B0: /* 185290 802569B0 1100000B */ beqz $t0, .L802569E0 /* 185294 802569B4 24020006 */ addiu $v0, $zero, 6 -/* 185298 802569B8 3C038011 */ lui $v1, 0x8011 -/* 18529C 802569BC 8063F2A2 */ lb $v1, -0xd5e($v1) +/* 185298 802569B8 3C038011 */ lui $v1, %hi(gPlayerData+0x12) +/* 18529C 802569BC 8063F2A2 */ lb $v1, %lo(gPlayerData+0x12)($v1) /* 1852A0 802569C0 14620007 */ bne $v1, $v0, .L802569E0 /* 1852A4 802569C4 00000000 */ nop /* 1852A8 802569C8 16000005 */ bnez $s0, .L802569E0 diff --git a/asm/nonmatchings/code_190B20/func_80263464.s b/asm/nonmatchings/code_190B20/func_80263464.s index 574798d6fd..521e4d14c4 100644 --- a/asm/nonmatchings/code_190B20/func_80263464.s +++ b/asm/nonmatchings/code_190B20/func_80263464.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80263464 -/* 191D44 80263464 3C028011 */ lui $v0, 0x8011 -/* 191D48 80263468 8042F292 */ lb $v0, -0xd6e($v0) +/* 191D44 80263464 3C028011 */ lui $v0, %hi(gPlayerData+0x2) +/* 191D48 80263468 8042F292 */ lb $v0, %lo(gPlayerData+0x2)($v0) /* 191D4C 8026346C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 191D50 80263470 1C40000D */ bgtz $v0, .L802634A8 /* 191D54 80263474 AFBF0010 */ sw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s b/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s index f6181bec33..48e88bc850 100644 --- a/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s +++ b/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s @@ -56,8 +56,8 @@ glabel calc_enemy_damage_target /* 1A5DCC 802774EC 00000000 */ nop /* 1A5DD0 802774F0 16C00007 */ bnez $s6, .L80277510 /* 1A5DD4 802774F4 00000000 */ nop -/* 1A5DD8 802774F8 3C028011 */ lui $v0, 0x8011 -/* 1A5DDC 802774FC 9042F292 */ lbu $v0, -0xd6e($v0) +/* 1A5DD8 802774F8 3C028011 */ lui $v0, %hi(gPlayerData+0x2) +/* 1A5DDC 802774FC 9042F292 */ lbu $v0, %lo(gPlayerData+0x2)($v0) /* 1A5DE0 80277500 0809DD44 */ j .L80277510 /* 1A5DE4 80277504 A26201B8 */ sb $v0, 0x1b8($s3) .L80277508: @@ -513,8 +513,8 @@ glabel calc_enemy_damage_target /* 1A6458 80277B78 00501021 */ addu $v0, $v0, $s0 /* 1A645C 80277B7C A282007B */ sb $v0, 0x7b($s4) /* 1A6460 80277B80 926201B8 */ lbu $v0, 0x1b8($s3) -/* 1A6464 80277B84 3C018011 */ lui $at, 0x8011 -/* 1A6468 80277B88 A022F292 */ sb $v0, -0xd6e($at) +/* 1A6464 80277B84 3C018011 */ lui $at, %hi(gPlayerData+0x2) +/* 1A6468 80277B88 A022F292 */ sb $v0, %lo(gPlayerData+0x2)($at) .L80277B8C: /* 1A646C 80277B8C 3C02800E */ lui $v0, %hi(gBattleStatus) /* 1A6470 80277B90 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s b/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s index 7a5a543e63..b1957f3e01 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s @@ -759,8 +759,8 @@ glabel func_8003F7CC /* 1B6FC 800402FC 0000282D */ daddu $a1, $zero, $zero /* 1B700 80040300 0C052757 */ jal play_sound_at_position /* 1B704 80040304 E7A00010 */ swc1 $f0, 0x10($sp) -/* 1B708 80040308 3C038011 */ lui $v1, 0x8011 -/* 1B70C 8004030C 9063F291 */ lbu $v1, -0xd6f($v1) +/* 1B708 80040308 3C038011 */ lui $v1, %hi(gPlayerData+0x1) +/* 1B70C 8004030C 9063F291 */ lbu $v1, %lo(gPlayerData+0x1)($v1) /* 1B710 80040310 24020004 */ addiu $v0, $zero, 4 /* 1B714 80040314 A2620005 */ sb $v0, 5($s3) /* 1B718 80040318 0801015F */ j .L8004057C @@ -1030,8 +1030,8 @@ glabel func_8003F7CC /* 1BB14 80040714 1040000A */ beqz $v0, .L80040740 /* 1BB18 80040718 00000000 */ nop /* 1BB1C 8004071C 8E220018 */ lw $v0, 0x18($s1) -/* 1BB20 80040720 3C038011 */ lui $v1, 0x8011 -/* 1BB24 80040724 8063F299 */ lb $v1, -0xd67($v1) +/* 1BB20 80040720 3C038011 */ lui $v1, %hi(gPlayerData+0x9) +/* 1BB24 80040724 8063F299 */ lb $v1, %lo(gPlayerData+0x9)($v1) /* 1BB28 80040728 84420028 */ lh $v0, 0x28($v0) /* 1BB2C 8004072C 0062182A */ slt $v1, $v1, $v0 /* 1BB30 80040730 14600003 */ bnez $v1, .L80040740 @@ -1126,8 +1126,8 @@ glabel func_8003F7CC /* 1BC80 80040880 5040001C */ beql $v0, $zero, .L800408F4 /* 1BC84 80040884 A2700004 */ sb $s0, 4($s3) /* 1BC88 80040888 8E220018 */ lw $v0, 0x18($s1) -/* 1BC8C 8004088C 3C038011 */ lui $v1, 0x8011 -/* 1BC90 80040890 8063F299 */ lb $v1, -0xd67($v1) +/* 1BC8C 8004088C 3C038011 */ lui $v1, %hi(gPlayerData+0x9) +/* 1BC90 80040890 8063F299 */ lb $v1, %lo(gPlayerData+0x9)($v1) /* 1BC94 80040894 84420028 */ lh $v0, 0x28($v0) /* 1BC98 80040898 0062182A */ slt $v1, $v1, $v0 /* 1BC9C 8004089C 54600015 */ bnel $v1, $zero, .L800408F4 diff --git a/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s b/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s index 7b4c785996..ae5a24ac34 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s +++ b/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s @@ -245,10 +245,10 @@ glabel spawn_drops /* 23A10 80048610 4481D000 */ mtc1 $at, $f26 /* 23A14 80048614 3C0142C8 */ lui $at, 0x42c8 /* 23A18 80048618 4481E000 */ mtc1 $at, $f28 -/* 23A1C 8004861C 3C028011 */ lui $v0, 0x8011 -/* 23A20 80048620 8042F292 */ lb $v0, -0xd6e($v0) -/* 23A24 80048624 3C038011 */ lui $v1, 0x8011 -/* 23A28 80048628 8063F293 */ lb $v1, -0xd6d($v1) +/* 23A1C 8004861C 3C028011 */ lui $v0, %hi(gPlayerData+0x2) +/* 23A20 80048620 8042F292 */ lb $v0, %lo(gPlayerData+0x2)($v0) +/* 23A24 80048624 3C038011 */ lui $v1, %hi(gPlayerData+0x3) +/* 23A28 80048628 8063F293 */ lb $v1, %lo(gPlayerData+0x3)($v1) /* 23A2C 8004862C 24130002 */ addiu $s3, $zero, 2 /* 23A30 80048630 AFA00030 */ sw $zero, 0x30($sp) /* 23A34 80048634 44821000 */ mtc1 $v0, $f2 @@ -431,10 +431,10 @@ glabel spawn_drops /* 23CC0 800488C0 4481D000 */ mtc1 $at, $f26 /* 23CC4 800488C4 3C0142C8 */ lui $at, 0x42c8 /* 23CC8 800488C8 4481E000 */ mtc1 $at, $f28 -/* 23CCC 800488CC 3C028011 */ lui $v0, 0x8011 -/* 23CD0 800488D0 8042F295 */ lb $v0, -0xd6b($v0) -/* 23CD4 800488D4 3C038011 */ lui $v1, 0x8011 -/* 23CD8 800488D8 8063F296 */ lb $v1, -0xd6a($v1) +/* 23CCC 800488CC 3C028011 */ lui $v0, %hi(gPlayerData+0x5) +/* 23CD0 800488D0 8042F295 */ lb $v0, %lo(gPlayerData+0x5)($v0) +/* 23CD4 800488D4 3C038011 */ lui $v1, %hi(gPlayerData+0x6) +/* 23CD8 800488D8 8063F296 */ lb $v1, %lo(gPlayerData+0x6)($v1) /* 23CDC 800488DC 24130002 */ addiu $s3, $zero, 2 /* 23CE0 800488E0 AFA00030 */ sw $zero, 0x30($sp) /* 23CE4 800488E4 44821000 */ mtc1 $v0, $f2 diff --git a/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s b/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s index 140cbadd07..3af1e3c00a 100644 --- a/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s +++ b/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel TeleportPartnerToPlayer -/* 7E46FC 8028387C 3C028011 */ lui $v0, 0x8011 -/* 7E4700 80283880 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 7E46FC 8028387C 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 7E4700 80283880 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 7E4704 80283884 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 7E4708 80283888 AFB10014 */ sw $s1, 0x14($sp) /* 7E470C 8028388C 3C118011 */ lui $s1, %hi(gPlayerStatus) diff --git a/asm/nonmatchings/code_7E3700/func_80283908.s b/asm/nonmatchings/code_7E3700/func_80283908.s index 6e6e927ccb..e00af2cf6e 100644 --- a/asm/nonmatchings/code_7E3700/func_80283908.s +++ b/asm/nonmatchings/code_7E3700/func_80283908.s @@ -38,8 +38,8 @@ glabel func_80283908 /* 7E480C 8028398C 00431021 */ addu $v0, $v0, $v1 /* 7E4810 80283990 000210C0 */ sll $v0, $v0, 3 /* 7E4814 80283994 E6000030 */ swc1 $f0, 0x30($s0) -/* 7E4818 80283998 3C038011 */ lui $v1, 0x8011 -/* 7E481C 8028399C 8063F2A2 */ lb $v1, -0xd5e($v1) +/* 7E4818 80283998 3C038011 */ lui $v1, %hi(gPlayerData+0x12) +/* 7E481C 8028399C 8063F2A2 */ lb $v1, %lo(gPlayerData+0x12)($v1) /* 7E4820 802839A0 10600022 */ beqz $v1, .L80283A2C /* 7E4824 802839A4 00449021 */ addu $s2, $v0, $a0 /* 7E4828 802839A8 0C00EABB */ jal get_npc_unsafe diff --git a/asm/nonmatchings/code_80850_len_3060/update_status_menu.s b/asm/nonmatchings/code_80850_len_3060/update_status_menu.s index 1db095db11..1316ee7478 100644 --- a/asm/nonmatchings/code_80850_len_3060/update_status_menu.s +++ b/asm/nonmatchings/code_80850_len_3060/update_status_menu.s @@ -40,16 +40,16 @@ glabel update_status_menu /* 815F0 800E8140 80420070 */ lb $v0, 0x70($v0) /* 815F4 800E8144 14400008 */ bnez $v0, .L800E8168 /* 815F8 800E8148 00000000 */ nop -/* 815FC 800E814C 3C038011 */ lui $v1, 0x8011 -/* 81600 800E8150 8463F29C */ lh $v1, -0xd64($v1) +/* 815FC 800E814C 3C038011 */ lui $v1, %hi(gPlayerData+0xC) +/* 81600 800E8150 8463F29C */ lh $v1, %lo(gPlayerData+0xC)($v1) /* 81604 800E8154 86620040 */ lh $v0, 0x40($s3) /* 81608 800E8158 10620007 */ beq $v1, $v0, .L800E8178 /* 8160C 800E815C 00628023 */ subu $s0, $v1, $v0 /* 81610 800E8160 0C03A67D */ jal status_menu_start_blinking_coins /* 81614 800E8164 00000000 */ nop .L800E8168: -/* 81618 800E8168 3C038011 */ lui $v1, 0x8011 -/* 8161C 800E816C 8463F29C */ lh $v1, -0xd64($v1) +/* 81618 800E8168 3C038011 */ lui $v1, %hi(gPlayerData+0xC) +/* 8161C 800E816C 8463F29C */ lh $v1, %lo(gPlayerData+0xC)($v1) /* 81620 800E8170 86620040 */ lh $v0, 0x40($s3) /* 81624 800E8174 00628023 */ subu $s0, $v1, $v0 .L800E8178: @@ -69,8 +69,8 @@ glabel update_status_menu /* 81654 800E81A4 00628023 */ subu $s0, $v1, $v0 /* 81658 800E81A8 96620040 */ lhu $v0, 0x40($s3) /* 8165C 800E81AC 8264003D */ lb $a0, 0x3d($s3) -/* 81660 800E81B0 3C038011 */ lui $v1, 0x8011 -/* 81664 800E81B4 8063F292 */ lb $v1, -0xd6e($v1) +/* 81660 800E81B0 3C038011 */ lui $v1, %hi(gPlayerData+0x2) +/* 81664 800E81B4 8063F292 */ lb $v1, %lo(gPlayerData+0x2)($v1) /* 81668 800E81B8 00501021 */ addu $v0, $v0, $s0 /* 8166C 800E81BC 1083000C */ beq $a0, $v1, .L800E81F0 /* 81670 800E81C0 A6620040 */ sh $v0, 0x40($s3) @@ -88,8 +88,8 @@ glabel update_status_menu /* 8169C 800E81EC A6620038 */ sh $v0, 0x38($s3) .L800E81F0: /* 816A0 800E81F0 8263003E */ lb $v1, 0x3e($s3) -/* 816A4 800E81F4 3C028011 */ lui $v0, 0x8011 -/* 816A8 800E81F8 8042F295 */ lb $v0, -0xd6b($v0) +/* 816A4 800E81F4 3C028011 */ lui $v0, %hi(gPlayerData+0x5) +/* 816A8 800E81F8 8042F295 */ lb $v0, %lo(gPlayerData+0x5)($v0) /* 816AC 800E81FC 1062000C */ beq $v1, $v0, .L800E8230 /* 816B0 800E8200 00000000 */ nop /* 816B4 800E8204 82620044 */ lb $v0, 0x44($s3) @@ -106,8 +106,8 @@ glabel update_status_menu /* 816DC 800E822C A6620038 */ sh $v0, 0x38($s3) .L800E8230: /* 816E0 800E8230 86630048 */ lh $v1, 0x48($s3) -/* 816E4 800E8234 3C028011 */ lui $v0, 0x8011 -/* 816E8 800E8238 8442F520 */ lh $v0, -0xae0($v0) +/* 816E4 800E8234 3C028011 */ lui $v0, %hi(gPlayerData+0x290) +/* 816E8 800E8238 8442F520 */ lh $v0, %lo(gPlayerData+0x290)($v0) /* 816EC 800E823C 1062000C */ beq $v1, $v0, .L800E8270 /* 816F0 800E8240 00000000 */ nop /* 816F4 800E8244 82620044 */ lb $v0, 0x44($s3) @@ -124,8 +124,8 @@ glabel update_status_menu /* 8171C 800E826C A6620038 */ sh $v0, 0x38($s3) .L800E8270: /* 81720 800E8270 8264003D */ lb $a0, 0x3d($s3) -/* 81724 800E8274 3C038011 */ lui $v1, 0x8011 -/* 81728 800E8278 8063F292 */ lb $v1, -0xd6e($v1) +/* 81724 800E8274 3C038011 */ lui $v1, %hi(gPlayerData+0x2) +/* 81728 800E8278 8063F292 */ lb $v1, %lo(gPlayerData+0x2)($v1) /* 8172C 800E827C 1083002E */ beq $a0, $v1, .L800E8338 /* 81730 800E8280 00000000 */ nop /* 81734 800E8284 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -139,8 +139,8 @@ glabel update_status_menu /* 81754 800E82A4 00000000 */ nop .L800E82A8: /* 81758 800E82A8 8262003D */ lb $v0, 0x3d($s3) -/* 8175C 800E82AC 3C038011 */ lui $v1, 0x8011 -/* 81760 800E82B0 8063F292 */ lb $v1, -0xd6e($v1) +/* 8175C 800E82AC 3C038011 */ lui $v1, %hi(gPlayerData+0x2) +/* 81760 800E82B0 8063F292 */ lb $v1, %lo(gPlayerData+0x2)($v1) /* 81764 800E82B4 0043102A */ slt $v0, $v0, $v1 /* 81768 800E82B8 10400018 */ beqz $v0, .L800E831C /* 8176C 800E82BC 9263003D */ lbu $v1, 0x3d($s3) @@ -178,8 +178,8 @@ glabel update_status_menu /* 817E4 800E8334 A262003D */ sb $v0, 0x3d($s3) .L800E8338: /* 817E8 800E8338 8264003E */ lb $a0, 0x3e($s3) -/* 817EC 800E833C 3C038011 */ lui $v1, 0x8011 -/* 817F0 800E8340 8063F295 */ lb $v1, -0xd6b($v1) +/* 817EC 800E833C 3C038011 */ lui $v1, %hi(gPlayerData+0x5) +/* 817F0 800E8340 8063F295 */ lb $v1, %lo(gPlayerData+0x5)($v1) /* 817F4 800E8344 1083002E */ beq $a0, $v1, .L800E8400 /* 817F8 800E8348 00000000 */ nop /* 817FC 800E834C 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -193,8 +193,8 @@ glabel update_status_menu /* 8181C 800E836C 00000000 */ nop .L800E8370: /* 81820 800E8370 8262003E */ lb $v0, 0x3e($s3) -/* 81824 800E8374 3C038011 */ lui $v1, 0x8011 -/* 81828 800E8378 8063F295 */ lb $v1, -0xd6b($v1) +/* 81824 800E8374 3C038011 */ lui $v1, %hi(gPlayerData+0x5) +/* 81828 800E8378 8063F295 */ lb $v1, %lo(gPlayerData+0x5)($v1) /* 8182C 800E837C 0043102A */ slt $v0, $v0, $v1 /* 81830 800E8380 10400018 */ beqz $v0, .L800E83E4 /* 81834 800E8384 9263003E */ lbu $v1, 0x3e($s3) @@ -232,8 +232,8 @@ glabel update_status_menu /* 818AC 800E83FC A262003E */ sb $v0, 0x3e($s3) .L800E8400: /* 818B0 800E8400 86620048 */ lh $v0, 0x48($s3) -/* 818B4 800E8404 3C048011 */ lui $a0, 0x8011 -/* 818B8 800E8408 8484F520 */ lh $a0, -0xae0($a0) +/* 818B4 800E8404 3C048011 */ lui $a0, %hi(gPlayerData+0x290) +/* 818B8 800E8408 8484F520 */ lh $a0, %lo(gPlayerData+0x290)($a0) /* 818BC 800E840C 96630048 */ lhu $v1, 0x48($s3) /* 818C0 800E8410 1044001A */ beq $v0, $a0, .L800E847C /* 818C4 800E8414 0044102A */ slt $v0, $v0, $a0 @@ -241,12 +241,12 @@ glabel update_status_menu /* 818CC 800E841C 2462000A */ addiu $v0, $v1, 0xa /* 818D0 800E8420 A6620048 */ sh $v0, 0x48($s3) /* 818D4 800E8424 00021400 */ sll $v0, $v0, 0x10 -/* 818D8 800E8428 3C038011 */ lui $v1, 0x8011 -/* 818DC 800E842C 8463F520 */ lh $v1, -0xae0($v1) +/* 818D8 800E8428 3C038011 */ lui $v1, %hi(gPlayerData+0x290) +/* 818DC 800E842C 8463F520 */ lh $v1, %lo(gPlayerData+0x290)($v1) /* 818E0 800E8430 00021403 */ sra $v0, $v0, 0x10 /* 818E4 800E8434 0062182A */ slt $v1, $v1, $v0 -/* 818E8 800E8438 3C028011 */ lui $v0, 0x8011 -/* 818EC 800E843C 9442F520 */ lhu $v0, -0xae0($v0) +/* 818E8 800E8438 3C028011 */ lui $v0, %hi(gPlayerData+0x290) +/* 818EC 800E843C 9442F520 */ lhu $v0, %lo(gPlayerData+0x290)($v0) /* 818F0 800E8440 5460000E */ bnel $v1, $zero, .L800E847C /* 818F4 800E8444 A6620048 */ sh $v0, 0x48($s3) /* 818F8 800E8448 0803A11F */ j .L800E847C @@ -255,12 +255,12 @@ glabel update_status_menu /* 81900 800E8450 2462FFF6 */ addiu $v0, $v1, -0xa /* 81904 800E8454 A6620048 */ sh $v0, 0x48($s3) /* 81908 800E8458 00021400 */ sll $v0, $v0, 0x10 -/* 8190C 800E845C 3C038011 */ lui $v1, 0x8011 -/* 81910 800E8460 8463F520 */ lh $v1, -0xae0($v1) +/* 8190C 800E845C 3C038011 */ lui $v1, %hi(gPlayerData+0x290) +/* 81910 800E8460 8463F520 */ lh $v1, %lo(gPlayerData+0x290)($v1) /* 81914 800E8464 00021403 */ sra $v0, $v0, 0x10 /* 81918 800E8468 0043102A */ slt $v0, $v0, $v1 -/* 8191C 800E846C 3C038011 */ lui $v1, 0x8011 -/* 81920 800E8470 9463F520 */ lhu $v1, -0xae0($v1) +/* 8191C 800E846C 3C038011 */ lui $v1, %hi(gPlayerData+0x290) +/* 81920 800E8470 9463F520 */ lhu $v1, %lo(gPlayerData+0x290)($v1) /* 81924 800E8474 54400001 */ bnel $v0, $zero, .L800E847C /* 81928 800E8478 A6630048 */ sh $v1, 0x48($s3) .L800E847C: @@ -492,8 +492,8 @@ glabel update_status_menu /* 81C78 800E87C8 86650034 */ lh $a1, 0x34($s3) /* 81C7C 800E87CC 86660036 */ lh $a2, 0x36($s3) /* 81C80 800E87D0 8267003D */ lb $a3, 0x3d($s3) -/* 81C84 800E87D4 3C028011 */ lui $v0, 0x8011 -/* 81C88 800E87D8 8042F293 */ lb $v0, -0xd6d($v0) +/* 81C84 800E87D4 3C028011 */ lui $v0, %hi(gPlayerData+0x3) +/* 81C88 800E87D8 8042F293 */ lb $v0, %lo(gPlayerData+0x3)($v0) /* 81C8C 800E87DC 24A50030 */ addiu $a1, $a1, 0x30 /* 81C90 800E87E0 24C60008 */ addiu $a2, $a2, 8 /* 81C94 800E87E4 0C039F8D */ jal status_menu_draw_stat @@ -550,20 +550,20 @@ glabel update_status_menu /* 81D50 800E88A0 86650034 */ lh $a1, 0x34($s3) /* 81D54 800E88A4 86660036 */ lh $a2, 0x36($s3) /* 81D58 800E88A8 8267003E */ lb $a3, 0x3e($s3) -/* 81D5C 800E88AC 3C028011 */ lui $v0, 0x8011 -/* 81D60 800E88B0 8042F296 */ lb $v0, -0xd6a($v0) +/* 81D5C 800E88AC 3C028011 */ lui $v0, %hi(gPlayerData+0x6) +/* 81D60 800E88B0 8042F296 */ lb $v0, %lo(gPlayerData+0x6)($v0) /* 81D64 800E88B4 24A50088 */ addiu $a1, $a1, 0x88 /* 81D68 800E88B8 24C60008 */ addiu $a2, $a2, 8 /* 81D6C 800E88BC 0C039F8D */ jal status_menu_draw_stat /* 81D70 800E88C0 AFA20010 */ sw $v0, 0x10($sp) .L800E88C4: -/* 81D74 800E88C4 3C028011 */ lui $v0, 0x8011 -/* 81D78 800E88C8 8042F299 */ lb $v0, -0xd67($v0) +/* 81D74 800E88C4 3C028011 */ lui $v0, %hi(gPlayerData+0x9) +/* 81D78 800E88C8 8042F299 */ lb $v0, %lo(gPlayerData+0x9)($v0) /* 81D7C 800E88CC 2842001B */ slti $v0, $v0, 0x1b /* 81D80 800E88D0 14400003 */ bnez $v0, .L800E88E0 /* 81D84 800E88D4 00000000 */ nop -/* 81D88 800E88D8 3C018011 */ lui $at, 0x8011 -/* 81D8C 800E88DC A020F2A0 */ sb $zero, -0xd60($at) +/* 81D88 800E88D8 3C018011 */ lui $at, %hi(gPlayerData+0x10) +/* 81D8C 800E88DC A020F2A0 */ sb $zero, %lo(gPlayerData+0x10)($at) .L800E88E0: /* 81D90 800E88E0 82620052 */ lb $v0, 0x52($s3) /* 81D94 800E88E4 1040000B */ beqz $v0, .L800E8914 @@ -605,8 +605,8 @@ glabel update_status_menu /* 81E1C 800E896C 24020002 */ addiu $v0, $zero, 2 /* 81E20 800E8970 AFA20010 */ sw $v0, 0x10($sp) /* 81E24 800E8974 86660036 */ lh $a2, 0x36($s3) -/* 81E28 800E8978 3C078011 */ lui $a3, 0x8011 -/* 81E2C 800E897C 80E7F2A0 */ lb $a3, -0xd60($a3) +/* 81E28 800E8978 3C078011 */ lui $a3, %hi(gPlayerData+0x10) +/* 81E2C 800E897C 80E7F2A0 */ lb $a3, %lo(gPlayerData+0x10)($a3) /* 81E30 800E8980 24A500C8 */ addiu $a1, $a1, 0xc8 /* 81E34 800E8984 0C039F29 */ jal status_menu_draw_number /* 81E38 800E8988 24C60008 */ addiu $a2, $a2, 8 @@ -711,8 +711,8 @@ glabel update_status_menu /* 81FA0 800E8AF0 24020001 */ addiu $v0, $zero, 1 /* 81FA4 800E8AF4 1462002B */ bne $v1, $v0, .L800E8BA4 /* 81FA8 800E8AF8 00000000 */ nop -/* 81FAC 800E8AFC 3C038011 */ lui $v1, 0x8011 -/* 81FB0 800E8B00 8463F520 */ lh $v1, -0xae0($v1) +/* 81FAC 800E8AFC 3C038011 */ lui $v1, %hi(gPlayerData+0x290) +/* 81FB0 800E8B00 8463F520 */ lh $v1, %lo(gPlayerData+0x290)($v1) /* 81FB4 800E8B04 04610002 */ bgez $v1, .L800E8B10 /* 81FB8 800E8B08 0060102D */ daddu $v0, $v1, $zero /* 81FBC 800E8B0C 246200FF */ addiu $v0, $v1, 0xff @@ -1064,8 +1064,8 @@ glabel update_status_menu /* 824C8 800E9018 3C16800F */ lui $s6, 0x800f /* 824CC 800E901C 26D67FE8 */ addiu $s6, $s6, 0x7fe8 /* 824D0 800E9020 8FA90050 */ lw $t1, 0x50($sp) -/* 824D4 800E9024 3C048011 */ lui $a0, 0x8011 -/* 824D8 800E9028 8084F51E */ lb $a0, -0xae2($a0) +/* 824D4 800E9024 3C048011 */ lui $a0, %hi(gPlayerData+0x28E) +/* 824D8 800E9028 8084F51E */ lb $a0, %lo(gPlayerData+0x28E)($a0) /* 824DC 800E902C 00091080 */ sll $v0, $t1, 2 /* 824E0 800E9030 00491021 */ addu $v0, $v0, $t1 /* 824E4 800E9034 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s b/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s index 6441e053df..ffe2fa71ae 100644 --- a/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s +++ b/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s @@ -8,8 +8,8 @@ glabel partner_reset_data /* 84930 800EB480 2631EBB0 */ addiu $s1, $s1, %lo(D_8010EBB0) /* 84934 800EB484 0220202D */ daddu $a0, $s1, $zero /* 84938 800EB488 AFB00010 */ sw $s0, 0x10($sp) -/* 8493C 800EB48C 3C108011 */ lui $s0, 0x8011 -/* 84940 800EB490 8210F2A2 */ lb $s0, -0xd5e($s0) +/* 8493C 800EB48C 3C108011 */ lui $s0, %hi(gPlayerData+0x12) +/* 84940 800EB490 8210F2A2 */ lb $s0, %lo(gPlayerData+0x12)($s0) /* 84944 800EB494 AFBF0018 */ sw $ra, 0x18($sp) /* 84948 800EB498 0C00A580 */ jal mem_clear /* 8494C 800EB49C 24050360 */ addiu $a1, $zero, 0x360 diff --git a/asm/nonmatchings/code_838b0_len_5900/use_consumable.s b/asm/nonmatchings/code_838b0_len_5900/use_consumable.s index c341840e85..4ce96bddbf 100644 --- a/asm/nonmatchings/code_838b0_len_5900/use_consumable.s +++ b/asm/nonmatchings/code_838b0_len_5900/use_consumable.s @@ -16,9 +16,9 @@ glabel use_consumable /* 838DC 800EA42C 00111040 */ sll $v0, $s1, 1 /* 838E0 800EA430 3C018011 */ lui $at, %hi(D_8010CD20) /* 838E4 800EA434 AC31CD20 */ sw $s1, %lo(D_8010CD20)($at) -/* 838E8 800EA438 3C118011 */ lui $s1, 0x8011 +/* 838E8 800EA438 3C118011 */ lui $s1, %hi(gPlayerData+0x1B4) /* 838EC 800EA43C 02228821 */ addu $s1, $s1, $v0 -/* 838F0 800EA440 8631F444 */ lh $s1, -0xbbc($s1) +/* 838F0 800EA440 8631F444 */ lh $s1, %lo(gPlayerData+0x1B4)($s1) /* 838F4 800EA444 0C00A5CF */ jal dma_copy /* 838F8 800EA448 00000000 */ nop /* 838FC 800EA44C 24050001 */ addiu $a1, $zero, 1 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s index 9c04bc7950..6a5639e28f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s @@ -12,8 +12,8 @@ glabel func_802424F0_C38A20 /* C38A3C 8024250C AFB50024 */ sw $s5, 0x24($sp) /* C38A40 80242510 0200A82D */ daddu $s5, $s0, $zero /* C38A44 80242514 AFB10014 */ sw $s1, 0x14($sp) -/* C38A48 80242518 3C118011 */ lui $s1, 0x8011 -/* C38A4C 8024251C 2631F298 */ addiu $s1, $s1, -0xd68 +/* C38A48 80242518 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* C38A4C 8024251C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* C38A50 80242520 AFBF0028 */ sw $ra, 0x28($sp) /* C38A54 80242524 AFB20018 */ sw $s2, 0x18($sp) /* C38A58 80242528 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s index 431c983a4e..474b20ce22 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80242818_C38D48 -/* C38D48 80242818 3C028011 */ lui $v0, 0x8011 -/* C38D4C 8024281C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* C38D48 80242818 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* C38D4C 8024281C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* C38D50 80242820 27BDFFE8 */ addiu $sp, $sp, -0x18 /* C38D54 80242824 AFBF0010 */ sw $ra, 0x10($sp) /* C38D58 80242828 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s index d258a5b4c0..fda576323c 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s @@ -12,8 +12,8 @@ glabel func_80240120_CAEE60 /* CAEE7C 8024013C AFB50024 */ sw $s5, 0x24($sp) /* CAEE80 80240140 0200A82D */ daddu $s5, $s0, $zero /* CAEE84 80240144 AFB10014 */ sw $s1, 0x14($sp) -/* CAEE88 80240148 3C118011 */ lui $s1, 0x8011 -/* CAEE8C 8024014C 2631F298 */ addiu $s1, $s1, -0xd68 +/* CAEE88 80240148 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* CAEE8C 8024014C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* CAEE90 80240150 AFBF0028 */ sw $ra, 0x28($sp) /* CAEE94 80240154 AFB20018 */ sw $s2, 0x18($sp) /* CAEE98 80240158 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s index 78f957404c..a19c129a53 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240448_CAF188 -/* CAF188 80240448 3C028011 */ lui $v0, 0x8011 -/* CAF18C 8024044C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* CAF188 80240448 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* CAF18C 8024044C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* CAF190 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 /* CAF194 80240454 AFBF0010 */ sw $ra, 0x10($sp) /* CAF198 80240458 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802403D4_CCB6E4.s b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802403D4_CCB6E4.s index 316b599ad3..6f5aee6437 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802403D4_CCB6E4.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802403D4_CCB6E4.s @@ -3,8 +3,8 @@ glabel func_802403D4_CCB6E4 /* CCB6E4 802403D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CCB6E8 802403D8 3C028011 */ lui $v0, 0x8011 -/* CCB6EC 802403DC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* CCB6E8 802403D8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* CCB6EC 802403DC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* CCB6F0 802403E0 0080182D */ daddu $v1, $a0, $zero /* CCB6F4 802403E4 1040000C */ beqz $v0, .L80240418 /* CCB6F8 802403E8 AFBF0010 */ sw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s index 49186a69c3..6543d3568a 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s @@ -12,8 +12,8 @@ glabel func_80240200_CD2030 /* CD204C 8024021C AFB50024 */ sw $s5, 0x24($sp) /* CD2050 80240220 0200A82D */ daddu $s5, $s0, $zero /* CD2054 80240224 AFB10014 */ sw $s1, 0x14($sp) -/* CD2058 80240228 3C118011 */ lui $s1, 0x8011 -/* CD205C 8024022C 2631F298 */ addiu $s1, $s1, -0xd68 +/* CD2058 80240228 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* CD205C 8024022C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* CD2060 80240230 AFBF0028 */ sw $ra, 0x28($sp) /* CD2064 80240234 AFB20018 */ sw $s2, 0x18($sp) /* CD2068 80240238 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s index aca75a6bbd..8c9e36a0d3 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240528_CD2358 -/* CD2358 80240528 3C028011 */ lui $v0, 0x8011 -/* CD235C 8024052C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* CD2358 80240528 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* CD235C 8024052C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* CD2360 80240530 27BDFFE8 */ addiu $sp, $sp, -0x18 /* CD2364 80240534 AFBF0010 */ sw $ra, 0x10($sp) /* CD2368 80240538 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s b/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s index 8a35eb943d..231a5b2a96 100644 --- a/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s +++ b/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s @@ -8,8 +8,8 @@ glabel func_802407C0_A0C4B0 /* A0C4BC 802407CC 0C0B1EAF */ jal get_variable /* A0C4C0 802407D0 8C450000 */ lw $a1, ($v0) /* A0C4C4 802407D4 8FBF0010 */ lw $ra, 0x10($sp) -/* A0C4C8 802407D8 3C018011 */ lui $at, 0x8011 -/* A0C4CC 802407DC A022F2A2 */ sb $v0, -0xd5e($at) +/* A0C4C8 802407D8 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* A0C4CC 802407DC A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* A0C4D0 802407E0 24020002 */ addiu $v0, $zero, 2 /* A0C4D4 802407E4 03E00008 */ jr $ra /* A0C4D8 802407E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240908_A0C5F8.s b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240908_A0C5F8.s index 33ee37042b..a48de861df 100644 --- a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240908_A0C5F8.s +++ b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240908_A0C5F8.s @@ -3,7 +3,7 @@ glabel func_80240908_A0C5F8 /* A0C5F8 80240908 24020001 */ addiu $v0, $zero, 1 -/* A0C5FC 8024090C 3C018011 */ lui $at, 0x8011 -/* A0C600 80240910 A022F29A */ sb $v0, -0xd66($at) +/* A0C5FC 8024090C 3C018011 */ lui $at, %hi(gPlayerData+0xA) +/* A0C600 80240910 A022F29A */ sb $v0, %lo(gPlayerData+0xA)($at) /* A0C604 80240914 03E00008 */ jr $ra /* A0C608 80240918 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s index 08a17c7972..20cbc0e829 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s @@ -5,8 +5,8 @@ glabel func_80240A68_A39F48 /* A39F48 80240A68 27BDFFE8 */ addiu $sp, $sp, -0x18 /* A39F4C 80240A6C AFBF0010 */ sw $ra, 0x10($sp) /* A39F50 80240A70 8C82000C */ lw $v0, 0xc($a0) -/* A39F54 80240A74 3C068011 */ lui $a2, 0x8011 -/* A39F58 80240A78 90C6F29F */ lbu $a2, -0xd61($a2) +/* A39F54 80240A74 3C068011 */ lui $a2, %hi(gPlayerData+0xF) +/* A39F58 80240A78 90C6F29F */ lbu $a2, %lo(gPlayerData+0xF)($a2) /* A39F5C 80240A7C 0C0B2026 */ jal set_variable /* A39F60 80240A80 8C450000 */ lw $a1, ($v0) /* A39F64 80240A84 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s index deb496c038..0a3e0f9ec6 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s @@ -11,8 +11,8 @@ glabel func_802417EC_A3ACCC /* A3ACE4 80241804 8E050000 */ lw $a1, ($s0) /* A3ACE8 80241808 0C0B1EAF */ jal get_variable /* A3ACEC 8024180C 26100004 */ addiu $s0, $s0, 4 -/* A3ACF0 80241810 3C038011 */ lui $v1, 0x8011 -/* A3ACF4 80241814 8463F29C */ lh $v1, -0xd64($v1) +/* A3ACF0 80241810 3C038011 */ lui $v1, %hi(gPlayerData+0xC) +/* A3ACF4 80241814 8463F29C */ lh $v1, %lo(gPlayerData+0xC)($v1) /* A3ACF8 80241818 3C018024 */ lui $at, 0x8024 /* A3ACFC 8024181C 00220821 */ addu $at, $at, $v0 /* A3AD00 80241820 902247D0 */ lbu $v0, 0x47d0($at) diff --git a/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s b/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s index 71cf0b78e9..3405093595 100644 --- a/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s +++ b/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s @@ -2,7 +2,7 @@ .set noreorder # don't insert nops after branches glabel func_80240BEC_A4032C -/* A4032C 80240BEC 3C018011 */ lui $at, 0x8011 -/* A40330 80240BF0 A020F2A2 */ sb $zero, -0xd5e($at) +/* A4032C 80240BEC 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* A40330 80240BF0 A020F2A2 */ sb $zero, %lo(gPlayerData+0x12)($at) /* A40334 80240BF4 03E00008 */ jr $ra /* A40338 80240BF8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s index 0918131edf..d25a33d76e 100644 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s @@ -12,8 +12,8 @@ glabel func_80240120_988C80 /* 988C9C 8024013C AFB50024 */ sw $s5, 0x24($sp) /* 988CA0 80240140 0200A82D */ daddu $s5, $s0, $zero /* 988CA4 80240144 AFB10014 */ sw $s1, 0x14($sp) -/* 988CA8 80240148 3C118011 */ lui $s1, 0x8011 -/* 988CAC 8024014C 2631F298 */ addiu $s1, $s1, -0xd68 +/* 988CA8 80240148 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 988CAC 8024014C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 988CB0 80240150 AFBF0028 */ sw $ra, 0x28($sp) /* 988CB4 80240154 AFB20018 */ sw $s2, 0x18($sp) /* 988CB8 80240158 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s index 62065d9373..09a3bfe846 100644 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240448_988FA8 -/* 988FA8 80240448 3C028011 */ lui $v0, 0x8011 -/* 988FAC 8024044C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 988FA8 80240448 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 988FAC 8024044C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 988FB0 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 988FB4 80240454 AFBF0010 */ sw $ra, 0x10($sp) /* 988FB8 80240458 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s index 8bd8afd955..f2b96dfb38 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s @@ -12,8 +12,8 @@ glabel func_80240410_91E980 /* 91E99C 8024042C AFB50024 */ sw $s5, 0x24($sp) /* 91E9A0 80240430 0200A82D */ daddu $s5, $s0, $zero /* 91E9A4 80240434 AFB10014 */ sw $s1, 0x14($sp) -/* 91E9A8 80240438 3C118011 */ lui $s1, 0x8011 -/* 91E9AC 8024043C 2631F298 */ addiu $s1, $s1, -0xd68 +/* 91E9A8 80240438 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 91E9AC 8024043C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 91E9B0 80240440 AFBF0028 */ sw $ra, 0x28($sp) /* 91E9B4 80240444 AFB20018 */ sw $s2, 0x18($sp) /* 91E9B8 80240448 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s index 4077c47e03..51476c406b 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240738_91ECA8 -/* 91ECA8 80240738 3C028011 */ lui $v0, 0x8011 -/* 91ECAC 8024073C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 91ECA8 80240738 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 91ECAC 8024073C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 91ECB0 80240740 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 91ECB4 80240744 AFBF0010 */ sw $ra, 0x10($sp) /* 91ECB8 80240748 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s index d1c7f51216..e4c639c610 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s @@ -12,8 +12,8 @@ glabel func_80240780_B5EA30 /* B5EA4C 8024079C AFB50024 */ sw $s5, 0x24($sp) /* B5EA50 802407A0 0200A82D */ daddu $s5, $s0, $zero /* B5EA54 802407A4 AFB10014 */ sw $s1, 0x14($sp) -/* B5EA58 802407A8 3C118011 */ lui $s1, 0x8011 -/* B5EA5C 802407AC 2631F298 */ addiu $s1, $s1, -0xd68 +/* B5EA58 802407A8 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* B5EA5C 802407AC 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* B5EA60 802407B0 AFBF0028 */ sw $ra, 0x28($sp) /* B5EA64 802407B4 AFB20018 */ sw $s2, 0x18($sp) /* B5EA68 802407B8 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s index 5ad0aa5525..a92c7dc2dd 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240AA8_B5ED58 -/* B5ED58 80240AA8 3C028011 */ lui $v0, 0x8011 -/* B5ED5C 80240AAC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* B5ED58 80240AA8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* B5ED5C 80240AAC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* B5ED60 80240AB0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B5ED64 80240AB4 AFBF0010 */ sw $ra, 0x10($sp) /* B5ED68 80240AB8 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024035C_ADB1FC.s b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024035C_ADB1FC.s index bb07a690db..92d6421284 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024035C_ADB1FC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024035C_ADB1FC.s @@ -8,7 +8,7 @@ glabel func_8024035C_ADB1FC /* ADB208 80240368 306300FE */ andi $v1, $v1, 0xfe /* ADB20C 8024036C A043007E */ sb $v1, 0x7e($v0) /* ADB210 80240370 90820087 */ lbu $v0, 0x87($a0) -/* ADB214 80240374 3C018011 */ lui $at, 0x8011 -/* ADB218 80240378 A022F2A2 */ sb $v0, -0xd5e($at) +/* ADB214 80240374 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* ADB218 80240378 A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* ADB21C 8024037C 03E00008 */ jr $ra /* ADB220 80240380 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s b/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s index 83eeebf918..a10ef85d26 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s @@ -8,8 +8,8 @@ glabel func_8024030C_AE589C /* AE58A8 80240318 306300FE */ andi $v1, $v1, 0xfe /* AE58AC 8024031C A043007E */ sb $v1, 0x7e($v0) /* AE58B0 80240320 90820087 */ lbu $v0, 0x87($a0) -/* AE58B4 80240324 3C018011 */ lui $at, 0x8011 -/* AE58B8 80240328 A022F2A2 */ sb $v0, -0xd5e($at) +/* AE58B4 80240324 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* AE58B8 80240328 A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* AE58BC 8024032C 03E00008 */ jr $ra /* AE58C0 80240330 24020002 */ addiu $v0, $zero, 2 /* AE58C4 80240334 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240000_AED410.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240000_AED410.s index 026a624c18..820eae1f4a 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240000_AED410.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240000_AED410.s @@ -8,7 +8,7 @@ glabel func_80240000_AED410 /* AED41C 8024000C 306300FE */ andi $v1, $v1, 0xfe /* AED420 80240010 A043007E */ sb $v1, 0x7e($v0) /* AED424 80240014 90820087 */ lbu $v0, 0x87($a0) -/* AED428 80240018 3C018011 */ lui $at, 0x8011 -/* AED42C 8024001C A022F2A2 */ sb $v0, -0xd5e($at) +/* AED428 80240018 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* AED42C 8024001C A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* AED430 80240020 03E00008 */ jr $ra /* AED434 80240024 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s index a5f8b01d5f..440e2f628a 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s @@ -8,8 +8,8 @@ glabel func_8024030C_AF2FAC /* AF2FB8 80240318 306300FE */ andi $v1, $v1, 0xfe /* AF2FBC 8024031C A043007E */ sb $v1, 0x7e($v0) /* AF2FC0 80240320 90820087 */ lbu $v0, 0x87($a0) -/* AF2FC4 80240324 3C018011 */ lui $at, 0x8011 -/* AF2FC8 80240328 A022F2A2 */ sb $v0, -0xd5e($at) +/* AF2FC4 80240324 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* AF2FC8 80240328 A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* AF2FCC 8024032C 03E00008 */ jr $ra /* AF2FD0 80240330 24020002 */ addiu $v0, $zero, 2 /* AF2FD4 80240334 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240020_B028A0.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240020_B028A0.s index 37e564b43e..556262f71c 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240020_B028A0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240020_B028A0.s @@ -8,7 +8,7 @@ glabel func_80240020_B028A0 /* B028AC 8024002C 306300FE */ andi $v1, $v1, 0xfe /* B028B0 80240030 A043007E */ sb $v1, 0x7e($v0) /* B028B4 80240034 90820087 */ lbu $v0, 0x87($a0) -/* B028B8 80240038 3C018011 */ lui $at, 0x8011 -/* B028BC 8024003C A022F2A2 */ sb $v0, -0xd5e($at) +/* B028B8 80240038 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* B028BC 8024003C A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* B028C0 80240040 03E00008 */ jr $ra /* B028C4 80240044 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s b/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s index 8245428187..76b334fb4d 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s +++ b/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s @@ -8,8 +8,8 @@ glabel func_80240000_B13120 /* B1312C 8024000C 306300FE */ andi $v1, $v1, 0xfe /* B13130 80240010 A043007E */ sb $v1, 0x7e($v0) /* B13134 80240014 90820087 */ lbu $v0, 0x87($a0) -/* B13138 80240018 3C018011 */ lui $at, 0x8011 -/* B1313C 8024001C A022F2A2 */ sb $v0, -0xd5e($at) +/* B13138 80240018 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* B1313C 8024001C A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* B13140 80240020 03E00008 */ jr $ra /* B13144 80240024 24020002 */ addiu $v0, $zero, 2 /* B13148 80240028 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s b/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s index eb90b313f0..a398faff3c 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s @@ -8,8 +8,8 @@ glabel func_80240000_B150B0 /* B150BC 8024000C 306300FE */ andi $v1, $v1, 0xfe /* B150C0 80240010 A043007E */ sb $v1, 0x7e($v0) /* B150C4 80240014 90820087 */ lbu $v0, 0x87($a0) -/* B150C8 80240018 3C018011 */ lui $at, 0x8011 -/* B150CC 8024001C A022F2A2 */ sb $v0, -0xd5e($at) +/* B150C8 80240018 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* B150CC 8024001C A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* B150D0 80240020 03E00008 */ jr $ra /* B150D4 80240024 24020002 */ addiu $v0, $zero, 2 /* B150D8 80240028 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s index 28e2cc6a96..421fff4889 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s @@ -4,8 +4,8 @@ glabel func_80242788_8B27F8 /* 8B27F8 80242788 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 8B27FC 8024278C AFBF0010 */ sw $ra, 0x10($sp) -/* 8B2800 80242790 3C018011 */ lui $at, 0x8011 -/* 8B2804 80242794 A020F2CC */ sb $zero, -0xd34($at) +/* 8B2800 80242790 3C018011 */ lui $at, %hi(gPlayerData+0x3C) +/* 8B2804 80242794 A020F2CC */ sb $zero, %lo(gPlayerData+0x3C)($at) /* 8B2808 80242798 0C03ACA9 */ jal func_800EB2A4 /* 8B280C 8024279C 0000202D */ daddu $a0, $zero, $zero /* 8B2810 802427A0 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s index 8096c27b8f..03e5caf0ac 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s +++ b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s @@ -2,7 +2,7 @@ .set noreorder # don't insert nops after branches glabel func_80240434_8CAD34 -/* 8CAD34 80240434 3C018011 */ lui $at, 0x8011 -/* 8CAD38 80240438 A020F291 */ sb $zero, -0xd6f($at) +/* 8CAD34 80240434 3C018011 */ lui $at, %hi(gPlayerData+0x1) +/* 8CAD38 80240438 A020F291 */ sb $zero, %lo(gPlayerData+0x1)($at) /* 8CAD3C 8024043C 03E00008 */ jr $ra /* 8CAD40 80240440 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s index 49b7180b4b..c3b167fe1c 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s @@ -51,8 +51,8 @@ glabel func_802406C8_8EC4E8 /* 8EC590 80240770 2402FFFF */ addiu $v0, $zero, -1 /* 8EC594 80240774 1602001F */ bne $s0, $v0, .L802407F4 /* 8EC598 80240778 0000202D */ daddu $a0, $zero, $zero -/* 8EC59C 8024077C 3C028011 */ lui $v0, 0x8011 -/* 8EC5A0 80240780 9442F552 */ lhu $v0, -0xaae($v0) +/* 8EC59C 8024077C 3C028011 */ lui $v0, %hi(gPlayerData+0x2C2) +/* 8EC5A0 80240780 9442F552 */ lhu $v0, %lo(gPlayerData+0x2C2)($v0) /* 8EC5A4 80240784 10400021 */ beqz $v0, .L8024080C /* 8EC5A8 80240788 00000000 */ nop /* 8EC5AC 8024078C 08090203 */ j .L8024080C diff --git a/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s b/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s index e3900f6019..6a65e7a67c 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s @@ -32,8 +32,8 @@ glabel func_8024037C_A54CCC /* A54D34 802403E4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* A54D38 802403E8 E440001C */ swc1 $f0, 0x1c($v0) .L802403EC: -/* A54D3C 802403EC 3C028011 */ lui $v0, 0x8011 -/* A54D40 802403F0 8042F2A2 */ lb $v0, -0xd5e($v0) +/* A54D3C 802403EC 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* A54D40 802403F0 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* A54D44 802403F4 1040000D */ beqz $v0, .L8024042C /* A54D48 802403F8 00000000 */ nop /* A54D4C 802403FC 0C00EABB */ jal get_npc_unsafe diff --git a/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s b/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s index 986383060d..286ddccde5 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s @@ -32,8 +32,8 @@ glabel func_8024037C_A5629C /* A56304 802403E4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* A56308 802403E8 E440001C */ swc1 $f0, 0x1c($v0) .L802403EC: -/* A5630C 802403EC 3C028011 */ lui $v0, 0x8011 -/* A56310 802403F0 8042F2A2 */ lb $v0, -0xd5e($v0) +/* A5630C 802403EC 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* A56310 802403F0 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* A56314 802403F4 1040000D */ beqz $v0, .L8024042C /* A56318 802403F8 00000000 */ nop /* A5631C 802403FC 0C00EABB */ jal get_npc_unsafe diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s index 58774ad020..4060728c1e 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s @@ -46,8 +46,8 @@ glabel func_8024073C_A57BEC /* A57C8C 802407DC 46800020 */ cvt.s.w $f0, $f0 /* A57C90 802407E0 E4A0001C */ swc1 $f0, 0x1c($a1) .L802407E4: -/* A57C94 802407E4 3C028011 */ lui $v0, 0x8011 -/* A57C98 802407E8 8042F2A2 */ lb $v0, -0xd5e($v0) +/* A57C94 802407E4 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* A57C98 802407E8 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* A57C9C 802407EC 1040000D */ beqz $v0, .L80240824 /* A57CA0 802407F0 00000000 */ nop /* A57CA4 802407F4 0C00EABB */ jal get_npc_unsafe diff --git a/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s b/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s index fe9c426885..5648433c0f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240000_A927C0 -/* A927C0 80240000 3C028011 */ lui $v0, 0x8011 -/* A927C4 80240004 8442F29C */ lh $v0, -0xd64($v0) +/* A927C0 80240000 3C028011 */ lui $v0, %hi(gPlayerData+0xC) +/* A927C4 80240004 8442F29C */ lh $v0, %lo(gPlayerData+0xC)($v0) /* A927C8 80240008 18400003 */ blez $v0, .L80240018 /* A927CC 8024000C 24020001 */ addiu $v0, $zero, 1 /* A927D0 80240010 08090007 */ j .L8024001C diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s index 80c68ebcfc..22b6850ea0 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s @@ -42,8 +42,8 @@ glabel func_802403DC_C5AB1C /* C5ABAC 8024046C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* C5ABB0 80240470 E440001C */ swc1 $f0, 0x1c($v0) .L80240474: -/* C5ABB4 80240474 3C028011 */ lui $v0, 0x8011 -/* C5ABB8 80240478 8042F2A2 */ lb $v0, -0xd5e($v0) +/* C5ABB4 80240474 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* C5ABB8 80240478 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* C5ABBC 8024047C 1040000E */ beqz $v0, .L802404B8 /* C5ABC0 80240480 00000000 */ nop /* C5ABC4 80240484 0C00EABB */ jal get_npc_unsafe diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s index ae3cc022c2..91f5ce6c99 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s @@ -12,8 +12,8 @@ glabel func_80240430_C68560 /* C6857C 8024044C AFB50024 */ sw $s5, 0x24($sp) /* C68580 80240450 0200A82D */ daddu $s5, $s0, $zero /* C68584 80240454 AFB10014 */ sw $s1, 0x14($sp) -/* C68588 80240458 3C118011 */ lui $s1, 0x8011 -/* C6858C 8024045C 2631F298 */ addiu $s1, $s1, -0xd68 +/* C68588 80240458 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* C6858C 8024045C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* C68590 80240460 AFBF0028 */ sw $ra, 0x28($sp) /* C68594 80240464 AFB20018 */ sw $s2, 0x18($sp) /* C68598 80240468 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s index 72cceee892..bfe0eaa7e8 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240758_C68888 -/* C68888 80240758 3C028011 */ lui $v0, 0x8011 -/* C6888C 8024075C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* C68888 80240758 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* C6888C 8024075C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* C68890 80240760 27BDFFE8 */ addiu $sp, $sp, -0x18 /* C68894 80240764 AFBF0010 */ sw $ra, 0x10($sp) /* C68898 80240768 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s index 4dc454419d..595e9bc7eb 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s @@ -12,8 +12,8 @@ glabel func_80240120_C76E00 /* C76E1C 8024013C AFB50024 */ sw $s5, 0x24($sp) /* C76E20 80240140 0200A82D */ daddu $s5, $s0, $zero /* C76E24 80240144 AFB10014 */ sw $s1, 0x14($sp) -/* C76E28 80240148 3C118011 */ lui $s1, 0x8011 -/* C76E2C 8024014C 2631F298 */ addiu $s1, $s1, -0xd68 +/* C76E28 80240148 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* C76E2C 8024014C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* C76E30 80240150 AFBF0028 */ sw $ra, 0x28($sp) /* C76E34 80240154 AFB20018 */ sw $s2, 0x18($sp) /* C76E38 80240158 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s index 0508dc7eed..82da4bb2f8 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240448_C77128 -/* C77128 80240448 3C028011 */ lui $v0, 0x8011 -/* C7712C 8024044C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* C77128 80240448 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* C7712C 8024044C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* C77130 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 /* C77134 80240454 AFBF0010 */ sw $ra, 0x10($sp) /* C77138 80240458 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s b/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s index 5fc4cae48e..83315e428b 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s @@ -42,8 +42,8 @@ glabel func_80240310_C804B0 /* C80540 802403A0 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* C80544 802403A4 E440001C */ swc1 $f0, 0x1c($v0) .L802403A8: -/* C80548 802403A8 3C028011 */ lui $v0, 0x8011 -/* C8054C 802403AC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* C80548 802403A8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* C8054C 802403AC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* C80550 802403B0 1040000E */ beqz $v0, .L802403EC /* C80554 802403B4 00000000 */ nop /* C80558 802403B8 0C00EABB */ jal get_npc_unsafe diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s index 34b66ddccc..f5db5f7529 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s @@ -5,8 +5,8 @@ glabel func_80242224_7ECF34 /* 7ECF34 80242224 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 7ECF38 80242228 24020001 */ addiu $v0, $zero, 1 /* 7ECF3C 8024222C AFBF0010 */ sw $ra, 0x10($sp) -/* 7ECF40 80242230 3C018011 */ lui $at, 0x8011 -/* 7ECF44 80242234 A022F292 */ sb $v0, -0xd6e($at) +/* 7ECF40 80242230 3C018011 */ lui $at, %hi(gPlayerData+0x2) +/* 7ECF44 80242234 A022F292 */ sb $v0, %lo(gPlayerData+0x2)($at) /* 7ECF48 80242238 0C03A6DB */ jal sync_status_menu /* 7ECF4C 8024223C 00000000 */ nop /* 7ECF50 80242240 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s index 9fe30cc31d..9ab507f9fd 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s @@ -4,8 +4,8 @@ glabel func_802416CC_E13E2C /* E13E2C 802416CC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* E13E30 802416D0 3C05FE36 */ lui $a1, 0xfe36 -/* E13E34 802416D4 3C068011 */ lui $a2, 0x8011 -/* E13E38 802416D8 84C6F29C */ lh $a2, -0xd64($a2) +/* E13E34 802416D4 3C068011 */ lui $a2, %hi(gPlayerData+0xC) +/* E13E38 802416D8 84C6F29C */ lh $a2, %lo(gPlayerData+0xC)($a2) /* E13E3C 802416DC AFBF0010 */ sw $ra, 0x10($sp) /* E13E40 802416E0 0C0B2026 */ jal set_variable /* E13E44 802416E4 34A53C8A */ ori $a1, $a1, 0x3c8a diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s index 11f9e63790..9ec8c4b87f 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s @@ -4,8 +4,8 @@ glabel func_80242314_E18094 /* E18094 80242314 27BDFFE8 */ addiu $sp, $sp, -0x18 /* E18098 80242318 3C05FE36 */ lui $a1, 0xfe36 -/* E1809C 8024231C 3C068011 */ lui $a2, 0x8011 -/* E180A0 80242320 84C6F29C */ lh $a2, -0xd64($a2) +/* E1809C 8024231C 3C068011 */ lui $a2, %hi(gPlayerData+0xC) +/* E180A0 80242320 84C6F29C */ lh $a2, %lo(gPlayerData+0xC)($a2) /* E180A4 80242324 AFBF0010 */ sw $ra, 0x10($sp) /* E180A8 80242328 0C0B2026 */ jal set_variable /* E180AC 8024232C 34A53C8A */ ori $a1, $a1, 0x3c8a diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s index f53c31221c..edc2d8a84b 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80241F08_9F6948 -/* 9F6948 80241F08 3C028011 */ lui $v0, 0x8011 -/* 9F694C 80241F0C 8442F29C */ lh $v0, -0xd64($v0) +/* 9F6948 80241F08 3C028011 */ lui $v0, %hi(gPlayerData+0xC) +/* 9F694C 80241F0C 8442F29C */ lh $v0, %lo(gPlayerData+0xC)($v0) /* 9F6950 80241F10 28420064 */ slti $v0, $v0, 0x64 /* 9F6954 80241F14 14400003 */ bnez $v0, .L80241F24 /* 9F6958 80241F18 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s index bdd6db4f0b..8395e83a4f 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s @@ -12,8 +12,8 @@ glabel func_802408B0_DDD0E0 /* DDD0FC 802408CC AFB50024 */ sw $s5, 0x24($sp) /* DDD100 802408D0 0200A82D */ daddu $s5, $s0, $zero /* DDD104 802408D4 AFB10014 */ sw $s1, 0x14($sp) -/* DDD108 802408D8 3C118011 */ lui $s1, 0x8011 -/* DDD10C 802408DC 2631F298 */ addiu $s1, $s1, -0xd68 +/* DDD108 802408D8 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* DDD10C 802408DC 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* DDD110 802408E0 AFBF0028 */ sw $ra, 0x28($sp) /* DDD114 802408E4 AFB20018 */ sw $s2, 0x18($sp) /* DDD118 802408E8 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s index 9f71ad3c2a..fcf58055c1 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240BD8_DDD408 -/* DDD408 80240BD8 3C028011 */ lui $v0, 0x8011 -/* DDD40C 80240BDC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* DDD408 80240BD8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* DDD40C 80240BDC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* DDD410 80240BE0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* DDD414 80240BE4 AFBF0010 */ sw $ra, 0x10($sp) /* DDD418 80240BE8 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s index 992bb5f768..1ca8e08a15 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s @@ -12,8 +12,8 @@ glabel func_80240120_D2FDA0 /* D2FDBC 8024013C AFB50024 */ sw $s5, 0x24($sp) /* D2FDC0 80240140 0200A82D */ daddu $s5, $s0, $zero /* D2FDC4 80240144 AFB10014 */ sw $s1, 0x14($sp) -/* D2FDC8 80240148 3C118011 */ lui $s1, 0x8011 -/* D2FDCC 8024014C 2631F298 */ addiu $s1, $s1, -0xd68 +/* D2FDC8 80240148 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* D2FDCC 8024014C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* D2FDD0 80240150 AFBF0028 */ sw $ra, 0x28($sp) /* D2FDD4 80240154 AFB20018 */ sw $s2, 0x18($sp) /* D2FDD8 80240158 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s index 0847937065..4b92b691f8 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240448_D300C8 -/* D300C8 80240448 3C028011 */ lui $v0, 0x8011 -/* D300CC 8024044C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* D300C8 80240448 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* D300CC 8024044C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* D300D0 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D300D4 80240454 AFBF0010 */ sw $ra, 0x10($sp) /* D300D8 80240458 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s index dfcc790296..f8c1b51d98 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s @@ -12,8 +12,8 @@ glabel func_802401A0_954160 /* 95417C 802401BC AFB50024 */ sw $s5, 0x24($sp) /* 954180 802401C0 0200A82D */ daddu $s5, $s0, $zero /* 954184 802401C4 AFB10014 */ sw $s1, 0x14($sp) -/* 954188 802401C8 3C118011 */ lui $s1, 0x8011 -/* 95418C 802401CC 2631F298 */ addiu $s1, $s1, -0xd68 +/* 954188 802401C8 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 95418C 802401CC 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 954190 802401D0 AFBF0028 */ sw $ra, 0x28($sp) /* 954194 802401D4 AFB20018 */ sw $s2, 0x18($sp) /* 954198 802401D8 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s index 8bf79961fa..44ffb326cc 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802404C8_954488 -/* 954488 802404C8 3C028011 */ lui $v0, 0x8011 -/* 95448C 802404CC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 954488 802404C8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 95448C 802404CC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 954490 802404D0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 954494 802404D4 AFBF0010 */ sw $ra, 0x10($sp) /* 954498 802404D8 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s index f012d08dc5..0456b51d0e 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s @@ -12,8 +12,8 @@ glabel func_80240400_879FE0 /* 879FFC 8024041C AFB50024 */ sw $s5, 0x24($sp) /* 87A000 80240420 0200A82D */ daddu $s5, $s0, $zero /* 87A004 80240424 AFB10014 */ sw $s1, 0x14($sp) -/* 87A008 80240428 3C118011 */ lui $s1, 0x8011 -/* 87A00C 8024042C 2631F298 */ addiu $s1, $s1, -0xd68 +/* 87A008 80240428 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 87A00C 8024042C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 87A010 80240430 AFBF0028 */ sw $ra, 0x28($sp) /* 87A014 80240434 AFB20018 */ sw $s2, 0x18($sp) /* 87A018 80240438 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s index 882caca4b4..31dd9f6013 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240728_87A308 -/* 87A308 80240728 3C028011 */ lui $v0, 0x8011 -/* 87A30C 8024072C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 87A308 80240728 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 87A30C 8024072C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 87A310 80240730 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 87A314 80240734 AFBF0010 */ sw $ra, 0x10($sp) /* 87A318 80240738 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s index baf65714b0..4316a071b1 100644 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s @@ -12,8 +12,8 @@ glabel func_802407A0_886B60 /* 886B7C 802407BC AFB50024 */ sw $s5, 0x24($sp) /* 886B80 802407C0 0200A82D */ daddu $s5, $s0, $zero /* 886B84 802407C4 AFB10014 */ sw $s1, 0x14($sp) -/* 886B88 802407C8 3C118011 */ lui $s1, 0x8011 -/* 886B8C 802407CC 2631F298 */ addiu $s1, $s1, -0xd68 +/* 886B88 802407C8 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 886B8C 802407CC 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 886B90 802407D0 AFBF0028 */ sw $ra, 0x28($sp) /* 886B94 802407D4 AFB20018 */ sw $s2, 0x18($sp) /* 886B98 802407D8 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s index ccdcc41a3c..848ec6f9a2 100644 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240AC8_886E88 -/* 886E88 80240AC8 3C028011 */ lui $v0, 0x8011 -/* 886E8C 80240ACC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 886E88 80240AC8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 886E8C 80240ACC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 886E90 80240AD0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 886E94 80240AD4 AFBF0010 */ sw $ra, 0x10($sp) /* 886E98 80240AD8 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s index f175cb7772..3b5c3812b5 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s @@ -12,8 +12,8 @@ glabel func_80240D3C_88990C /* 889928 80240D58 AFB50024 */ sw $s5, 0x24($sp) /* 88992C 80240D5C 0200A82D */ daddu $s5, $s0, $zero /* 889930 80240D60 AFB10014 */ sw $s1, 0x14($sp) -/* 889934 80240D64 3C118011 */ lui $s1, 0x8011 -/* 889938 80240D68 2631F298 */ addiu $s1, $s1, -0xd68 +/* 889934 80240D64 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 889938 80240D68 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 88993C 80240D6C AFBF0028 */ sw $ra, 0x28($sp) /* 889940 80240D70 AFB20018 */ sw $s2, 0x18($sp) /* 889944 80240D74 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s index 0a9d47f416..1d3b0c3706 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80241064_889C34 -/* 889C34 80241064 3C028011 */ lui $v0, 0x8011 -/* 889C38 80241068 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 889C34 80241064 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 889C38 80241068 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 889C3C 8024106C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 889C40 80241070 AFBF0010 */ sw $ra, 0x10($sp) /* 889C44 80241074 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s index 6af3cd00aa..71b84ffbed 100644 --- a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s +++ b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240AD0_890670 -/* 890670 80240AD0 3C068011 */ lui $a2, 0x8011 -/* 890674 80240AD4 84C6F29C */ lh $a2, -0xd64($a2) +/* 890670 80240AD0 3C068011 */ lui $a2, %hi(gPlayerData+0xC) +/* 890674 80240AD4 84C6F29C */ lh $a2, %lo(gPlayerData+0xC)($a2) /* 890678 80240AD8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 89067C 80240ADC AFBF0010 */ sw $ra, 0x10($sp) /* 890680 80240AE0 8C82000C */ lw $v0, 0xc($a0) diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s index 809235df88..c35cdb854f 100644 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s @@ -12,8 +12,8 @@ glabel func_80240150_892B70 /* 892B8C 8024016C AFB50024 */ sw $s5, 0x24($sp) /* 892B90 80240170 0200A82D */ daddu $s5, $s0, $zero /* 892B94 80240174 AFB10014 */ sw $s1, 0x14($sp) -/* 892B98 80240178 3C118011 */ lui $s1, 0x8011 -/* 892B9C 8024017C 2631F298 */ addiu $s1, $s1, -0xd68 +/* 892B98 80240178 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 892B9C 8024017C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 892BA0 80240180 AFBF0028 */ sw $ra, 0x28($sp) /* 892BA4 80240184 AFB20018 */ sw $s2, 0x18($sp) /* 892BA8 80240188 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s index fc1c5daadf..fa7adf807c 100644 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240478_892E98 -/* 892E98 80240478 3C028011 */ lui $v0, 0x8011 -/* 892E9C 8024047C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 892E98 80240478 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 892E9C 8024047C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 892EA0 80240480 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 892EA4 80240484 AFBF0010 */ sw $ra, 0x10($sp) /* 892EA8 80240488 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s index b4830cf40d..9d6fab67d9 100644 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s @@ -12,8 +12,8 @@ glabel func_80240710_897CF0 /* 897D0C 8024072C AFB50024 */ sw $s5, 0x24($sp) /* 897D10 80240730 0200A82D */ daddu $s5, $s0, $zero /* 897D14 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* 897D18 80240738 3C118011 */ lui $s1, 0x8011 -/* 897D1C 8024073C 2631F298 */ addiu $s1, $s1, -0xd68 +/* 897D18 80240738 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 897D1C 8024073C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 897D20 80240740 AFBF0028 */ sw $ra, 0x28($sp) /* 897D24 80240744 AFB20018 */ sw $s2, 0x18($sp) /* 897D28 80240748 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s index b70f6286fe..5e8d297207 100644 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240A38_898018 -/* 898018 80240A38 3C028011 */ lui $v0, 0x8011 -/* 89801C 80240A3C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 898018 80240A38 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 89801C 80240A3C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 898020 80240A40 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 898024 80240A44 AFBF0010 */ sw $ra, 0x10($sp) /* 898028 80240A48 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s b/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s index 2ec406ce53..b9206ebf5f 100644 --- a/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s +++ b/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240820_9C3130 -/* 9C3130 80240820 3C038011 */ lui $v1, 0x8011 -/* 9C3134 80240824 8063F2A2 */ lb $v1, -0xd5e($v1) +/* 9C3130 80240820 3C038011 */ lui $v1, %hi(gPlayerData+0x12) +/* 9C3134 80240824 8063F2A2 */ lb $v1, %lo(gPlayerData+0x12)($v1) /* 9C3138 80240828 24020003 */ addiu $v0, $zero, 3 /* 9C313C 8024082C 54620003 */ bnel $v1, $v0, .L8024083C /* 9C3140 80240830 AC800084 */ sw $zero, 0x84($a0) diff --git a/requirements.txt b/requirements.txt index 361a2122c4..679782c268 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ capstone PyYAML lark-parser +python-ranges diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt index dddb3344c8..7026becfac 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; +gPlayerData = 0x8010F290; // size:0x340 update_entities = 0x8010F6D0; update_shadows = 0x8010FA98; render_entities = 0x8010FEB4;