diff --git a/asm/nonmatchings/code_317E50/func_802BD758.s b/asm/nonmatchings/code_317E50/func_802BD758.s index 66429a51fa..96df531688 100644 --- a/asm/nonmatchings/code_317E50/func_802BD758.s +++ b/asm/nonmatchings/code_317E50/func_802BD758.s @@ -11,8 +11,8 @@ glabel func_802BD758 /* 3184C0 802BD770 3C138011 */ lui $s3, %hi(gPlayerStatus) /* 3184C4 802BD774 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) /* 3184C8 802BD778 AFB40040 */ sw $s4, 0x40($sp) -/* 3184CC 802BD77C 3C148016 */ lui $s4, 0x8016 -/* 3184D0 802BD780 2694A550 */ addiu $s4, $s4, -0x5ab0 +/* 3184CC 802BD77C 3C148016 */ lui $s4, %hi(gCollisionStatus) +/* 3184D0 802BD780 2694A550 */ addiu $s4, $s4, %lo(gCollisionStatus) /* 3184D4 802BD784 AFB50044 */ sw $s5, 0x44($sp) /* 3184D8 802BD788 3C158011 */ lui $s5, %hi(D_8010EBB0) /* 3184DC 802BD78C 26B5EBB0 */ addiu $s5, $s5, %lo(D_8010EBB0) diff --git a/asm/nonmatchings/code_319670/func_802BD660.s b/asm/nonmatchings/code_319670/func_802BD660.s index a6809fd67e..60464d1e94 100644 --- a/asm/nonmatchings/code_319670/func_802BD660.s +++ b/asm/nonmatchings/code_319670/func_802BD660.s @@ -298,8 +298,8 @@ glabel func_802BD660 /* 31A030 802BDAC0 0000282D */ daddu $a1, $zero, $zero /* 31A034 802BDAC4 0C052742 */ jal play_sound_at_npc /* 31A038 802BDAC8 2406FFFC */ addiu $a2, $zero, -4 -/* 31A03C 802BDACC 3C038016 */ lui $v1, 0x8016 -/* 31A040 802BDAD0 2463A550 */ addiu $v1, $v1, -0x5ab0 +/* 31A03C 802BDACC 3C038016 */ lui $v1, %hi(gCollisionStatus) +/* 31A040 802BDAD0 2463A550 */ addiu $v1, $v1, %lo(gCollisionStatus) /* 31A044 802BDAD4 2402FFFF */ addiu $v0, $zero, -1 /* 31A048 802BDAD8 A4620004 */ sh $v0, 4($v1) /* 31A04C 802BDADC A4620002 */ sh $v0, 2($v1) diff --git a/asm/nonmatchings/code_31B120/func_802BD638.s b/asm/nonmatchings/code_31B120/func_802BD638.s index f1ee71ce5c..5790f6fb82 100644 --- a/asm/nonmatchings/code_31B120/func_802BD638.s +++ b/asm/nonmatchings/code_31B120/func_802BD638.s @@ -379,8 +379,8 @@ glabel func_802BD638 /* 31BBFC 802BDBDC 00000000 */ nop /* 31BC00 802BDBE0 46800020 */ cvt.s.w $f0, $f0 /* 31BC04 802BDBE4 46001081 */ sub.s $f2, $f2, $f0 -/* 31BC08 802BDBE8 3C028016 */ lui $v0, 0x8016 -/* 31BC0C 802BDBEC 2442A550 */ addiu $v0, $v0, -0x5ab0 +/* 31BC08 802BDBE8 3C028016 */ lui $v0, %hi(gCollisionStatus) +/* 31BC0C 802BDBEC 2442A550 */ addiu $v0, $v0, %lo(gCollisionStatus) /* 31BC10 802BDBF0 A4430008 */ sh $v1, 8($v0) /* 31BC14 802BDBF4 0C0AF451 */ jal func_802BD144 /* 31BC18 802BDBF8 E682002C */ swc1 $f2, 0x2c($s4) diff --git a/asm/nonmatchings/code_31DE70/func_802BD368.s b/asm/nonmatchings/code_31DE70/func_802BD368.s index 62dd04e912..a689be4320 100644 --- a/asm/nonmatchings/code_31DE70/func_802BD368.s +++ b/asm/nonmatchings/code_31DE70/func_802BD368.s @@ -10,8 +10,8 @@ glabel func_802BD368 /* 31E0EC 802BD37C C7A6004C */ lwc1 $f6, 0x4c($sp) /* 31E0F0 802BD380 27A20020 */ addiu $v0, $sp, 0x20 /* 31E0F4 802BD384 AFB00028 */ sw $s0, 0x28($sp) -/* 31E0F8 802BD388 3C108016 */ lui $s0, 0x8016 -/* 31E0FC 802BD38C 2610A550 */ addiu $s0, $s0, -0x5ab0 +/* 31E0F8 802BD388 3C108016 */ lui $s0, %hi(gCollisionStatus) +/* 31E0FC 802BD38C 2610A550 */ addiu $s0, $s0, %lo(gCollisionStatus) /* 31E100 802BD390 AFB1002C */ sw $s1, 0x2c($sp) /* 31E104 802BD394 0200882D */ daddu $s1, $s0, $zero /* 31E108 802BD398 AFA5003C */ sw $a1, 0x3c($sp) diff --git a/asm/nonmatchings/code_31DE70/func_802BD414.s b/asm/nonmatchings/code_31DE70/func_802BD414.s index e02d2dda93..c15198b87d 100644 --- a/asm/nonmatchings/code_31DE70/func_802BD414.s +++ b/asm/nonmatchings/code_31DE70/func_802BD414.s @@ -22,8 +22,8 @@ glabel func_802BD414 /* 31E1C8 802BD458 2694EFC8 */ addiu $s4, $s4, %lo(gPlayerStatus) /* 31E1CC 802BD45C 3C158011 */ lui $s5, %hi(D_8010EBB0) /* 31E1D0 802BD460 26B5EBB0 */ addiu $s5, $s5, %lo(D_8010EBB0) -/* 31E1D4 802BD464 3C118016 */ lui $s1, 0x8016 -/* 31E1D8 802BD468 2631A550 */ addiu $s1, $s1, -0x5ab0 +/* 31E1D4 802BD464 3C118016 */ lui $s1, %hi(gCollisionStatus) +/* 31E1D8 802BD468 2631A550 */ addiu $s1, $s1, %lo(gCollisionStatus) /* 31E1DC 802BD46C 3C02802C */ lui $v0, 0x802c /* 31E1E0 802BD470 8C42FEE4 */ lw $v0, -0x11c($v0) /* 31E1E4 802BD474 3C014200 */ lui $at, 0x4200 diff --git a/asm/nonmatchings/code_31DE70/func_802BE3A4.s b/asm/nonmatchings/code_31DE70/func_802BE3A4.s index 29495b12e1..763a1cf6e9 100644 --- a/asm/nonmatchings/code_31DE70/func_802BE3A4.s +++ b/asm/nonmatchings/code_31DE70/func_802BE3A4.s @@ -12,8 +12,8 @@ glabel func_802BE3A4 /* 31F130 802BE3C0 3C108011 */ lui $s0, %hi(gPlayerData) /* 31F134 802BE3C4 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) /* 31F138 802BE3C8 AFB60060 */ sw $s6, 0x60($sp) -/* 31F13C 802BE3CC 3C168016 */ lui $s6, 0x8016 -/* 31F140 802BE3D0 26D6A550 */ addiu $s6, $s6, -0x5ab0 +/* 31F13C 802BE3CC 3C168016 */ lui $s6, %hi(gCollisionStatus) +/* 31F140 802BE3D0 26D6A550 */ addiu $s6, $s6, %lo(gCollisionStatus) /* 31F144 802BE3D4 AFB40058 */ sw $s4, 0x58($sp) /* 31F148 802BE3D8 3C148011 */ lui $s4, %hi(D_8010EBB0) /* 31F14C 802BE3DC 2694EBB0 */ addiu $s4, $s4, %lo(D_8010EBB0) diff --git a/asm/nonmatchings/code_320C50/func_802BDDD8.s b/asm/nonmatchings/code_320C50/func_802BDDD8.s index 30e252d063..8b1ceab8f5 100644 --- a/asm/nonmatchings/code_320C50/func_802BDDD8.s +++ b/asm/nonmatchings/code_320C50/func_802BDDD8.s @@ -23,8 +23,8 @@ glabel func_802BDDD8 /* 321970 802BDE20 00000000 */ nop /* 321974 802BDE24 3C148011 */ lui $s4, %hi(gPlayerStatus) /* 321978 802BDE28 2694EFC8 */ addiu $s4, $s4, %lo(gPlayerStatus) -/* 32197C 802BDE2C 3C158016 */ lui $s5, 0x8016 -/* 321980 802BDE30 26B5A550 */ addiu $s5, $s5, -0x5ab0 +/* 32197C 802BDE2C 3C158016 */ lui $s5, %hi(gCollisionStatus) +/* 321980 802BDE30 26B5A550 */ addiu $s5, $s5, %lo(gCollisionStatus) /* 321984 802BDE34 304200FF */ andi $v0, $v0, 0xff /* 321988 802BDE38 24030003 */ addiu $v1, $zero, 3 /* 32198C 802BDE3C 14430008 */ bne $v0, $v1, .L802BDE60 diff --git a/asm/nonmatchings/code_323A50/func_802BD694.s b/asm/nonmatchings/code_323A50/func_802BD694.s index abb68ebb57..d4e9227bfd 100644 --- a/asm/nonmatchings/code_323A50/func_802BD694.s +++ b/asm/nonmatchings/code_323A50/func_802BD694.s @@ -12,8 +12,8 @@ glabel func_802BD694 /* 324000 802BD6B0 3C158011 */ lui $s5, %hi(D_8010EBB0) /* 324004 802BD6B4 26B5EBB0 */ addiu $s5, $s5, %lo(D_8010EBB0) /* 324008 802BD6B8 AFB10024 */ sw $s1, 0x24($sp) -/* 32400C 802BD6BC 3C118016 */ lui $s1, 0x8016 -/* 324010 802BD6C0 2631A550 */ addiu $s1, $s1, -0x5ab0 +/* 32400C 802BD6BC 3C118016 */ lui $s1, %hi(gCollisionStatus) +/* 324010 802BD6C0 2631A550 */ addiu $s1, $s1, %lo(gCollisionStatus) /* 324014 802BD6C4 AFBF0038 */ sw $ra, 0x38($sp) /* 324018 802BD6C8 AFB20028 */ sw $s2, 0x28($sp) /* 32401C 802BD6CC AFB00020 */ sw $s0, 0x20($sp) diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0818.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0818.s index 2f766f2b06..9daa6867db 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0818.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0818.s @@ -27,8 +27,8 @@ glabel func_800E0818 /* 79D20 800E0870 8C42C958 */ lw $v0, -0x36a8($v0) /* 79D24 800E0874 14400073 */ bnez $v0, .L800E0A44 /* 79D28 800E0878 00000000 */ nop -/* 79D2C 800E087C 3C038016 */ lui $v1, 0x8016 -/* 79D30 800E0880 2463A550 */ addiu $v1, $v1, -0x5ab0 +/* 79D2C 800E087C 3C038016 */ lui $v1, %hi(gCollisionStatus) +/* 79D30 800E0880 2463A550 */ addiu $v1, $v1, %lo(gCollisionStatus) /* 79D34 800E0884 82220015 */ lb $v0, 0x15($s1) /* 79D38 800E0888 10400006 */ beqz $v0, .L800E08A4 /* 79D3C 800E088C 84700012 */ lh $s0, 0x12($v1) diff --git a/asm/nonmatchings/code_759b0_len_61b0/update_player.s b/asm/nonmatchings/code_759b0_len_61b0/update_player.s index 444f6f327d..1d834849ba 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/update_player.s +++ b/asm/nonmatchings/code_759b0_len_61b0/update_player.s @@ -10,8 +10,8 @@ glabel update_player /* 78C04 800DF754 3C108011 */ lui $s0, %hi(gPlayerStatus) /* 78C08 800DF758 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* 78C0C 800DF75C 860200C0 */ lh $v0, 0xc0($s0) -/* 78C10 800DF760 3C118016 */ lui $s1, 0x8016 -/* 78C14 800DF764 2631A550 */ addiu $s1, $s1, -0x5ab0 +/* 78C10 800DF760 3C118016 */ lui $s1, %hi(gCollisionStatus) +/* 78C14 800DF764 2631A550 */ addiu $s1, $s1, %lo(gCollisionStatus) /* 78C18 800DF768 28420065 */ slti $v0, $v0, 0x65 /* 78C1C 800DF76C 10400009 */ beqz $v0, .L800DF794 /* 78C20 800DF770 00000000 */ nop diff --git a/asm/nonmatchings/code_7E3700/func_80282E30.s b/asm/nonmatchings/code_7E3700/func_80282E30.s index 72066f8e25..c76b40eceb 100644 --- a/asm/nonmatchings/code_7E3700/func_80282E30.s +++ b/asm/nonmatchings/code_7E3700/func_80282E30.s @@ -141,8 +141,8 @@ glabel func_80282E30 /* 7E3EBC 8028303C 90420000 */ lbu $v0, ($v0) /* 7E3EC0 80283040 14400008 */ bnez $v0, .L80283064 /* 7E3EC4 80283044 24020001 */ addiu $v0, $zero, 1 -/* 7E3EC8 80283048 3C038016 */ lui $v1, 0x8016 -/* 7E3ECC 8028304C 8463A550 */ lh $v1, -0x5ab0($v1) +/* 7E3EC8 80283048 3C038016 */ lui $v1, %hi(gCollisionStatus) +/* 7E3ECC 8028304C 8463A550 */ lh $v1, %lo(gCollisionStatus)($v1) /* 7E3ED0 80283050 2402FFFF */ addiu $v0, $zero, -1 /* 7E3ED4 80283054 10620003 */ beq $v1, $v0, .L80283064 /* 7E3ED8 80283058 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/code_7E3700/func_80283174.s b/asm/nonmatchings/code_7E3700/func_80283174.s index 8f27dab64f..9ba84c5043 100644 --- a/asm/nonmatchings/code_7E3700/func_80283174.s +++ b/asm/nonmatchings/code_7E3700/func_80283174.s @@ -5,8 +5,8 @@ glabel func_80283174 /* 7E3FF4 80283174 3C058011 */ lui $a1, %hi(gPlayerStatus) /* 7E3FF8 80283178 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) /* 7E3FFC 8028317C 8C8200B0 */ lw $v0, 0xb0($a0) -/* 7E4000 80283180 3C038016 */ lui $v1, 0x8016 -/* 7E4004 80283184 8463A550 */ lh $v1, -0x5ab0($v1) +/* 7E4000 80283180 3C038016 */ lui $v1, %hi(gCollisionStatus) +/* 7E4004 80283184 8463A550 */ lh $v1, %lo(gCollisionStatus)($v1) /* 7E4008 80283188 24424000 */ addiu $v0, $v0, 0x4000 /* 7E400C 8028318C 5462000F */ bnel $v1, $v0, .L802831CC /* 7E4010 80283190 AC8000B8 */ sw $zero, 0xb8($a0) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/check_input_jump.s b/asm/nonmatchings/code_7bb60_len_41b0/check_input_jump.s index 29d8d1bc59..e1924850a0 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/check_input_jump.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/check_input_jump.s @@ -9,8 +9,8 @@ glabel check_input_jump /* 7F620 800E6170 AFBF0018 */ sw $ra, 0x18($sp) /* 7F624 800E6174 AFB00010 */ sw $s0, 0x10($sp) /* 7F628 800E6178 8E2200E0 */ lw $v0, 0xe0($s1) -/* 7F62C 800E617C 3C108016 */ lui $s0, 0x8016 -/* 7F630 800E6180 2610A550 */ addiu $s0, $s0, -0x5ab0 +/* 7F62C 800E617C 3C108016 */ lui $s0, %hi(gCollisionStatus) +/* 7F630 800E6180 2610A550 */ addiu $s0, $s0, %lo(gCollisionStatus) /* 7F634 800E6184 30428000 */ andi $v0, $v0, 0x8000 /* 7F638 800E6188 10400032 */ beqz $v0, .L800E6254 /* 7F63C 800E618C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_7bb60_len_41b0/collision_main_above.s b/asm/nonmatchings/code_7bb60_len_41b0/collision_main_above.s index 7c68455b71..7425538c46 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/collision_main_above.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/collision_main_above.s @@ -32,8 +32,8 @@ glabel collision_main_above /* 7BCFC 800E284C E7A00024 */ swc1 $f0, 0x24($sp) /* 7BD00 800E2850 C7A2001C */ lwc1 $f2, 0x1c($sp) /* 7BD04 800E2854 44800000 */ mtc1 $zero, $f0 -/* 7BD08 800E2858 3C128016 */ lui $s2, 0x8016 -/* 7BD0C 800E285C 2652A550 */ addiu $s2, $s2, -0x5ab0 +/* 7BD08 800E2858 3C128016 */ lui $s2, %hi(gCollisionStatus) +/* 7BD0C 800E285C 2652A550 */ addiu $s2, $s2, %lo(gCollisionStatus) /* 7BD10 800E2860 46001032 */ c.eq.s $f2, $f0 /* 7BD14 800E2864 00000000 */ nop /* 7BD18 800E2868 45010004 */ bc1t .L800E287C diff --git a/asm/nonmatchings/code_7bb60_len_41b0/collision_main_lateral.s b/asm/nonmatchings/code_7bb60_len_41b0/collision_main_lateral.s index 2b3397af58..9f7db66963 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/collision_main_lateral.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/collision_main_lateral.s @@ -7,8 +7,8 @@ glabel collision_main_lateral /* 7CAF4 800E3644 3C118011 */ lui $s1, %hi(gPlayerStatus) /* 7CAF8 800E3648 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) /* 7CAFC 800E364C AFB40068 */ sw $s4, 0x68($sp) -/* 7CB00 800E3650 3C148016 */ lui $s4, 0x8016 -/* 7CB04 800E3654 2694A550 */ addiu $s4, $s4, -0x5ab0 +/* 7CB00 800E3650 3C148016 */ lui $s4, %hi(gCollisionStatus) +/* 7CB04 800E3654 2694A550 */ addiu $s4, $s4, %lo(gCollisionStatus) /* 7CB08 800E3658 AFBF006C */ sw $ra, 0x6c($sp) /* 7CB0C 800E365C AFB30064 */ sw $s3, 0x64($sp) /* 7CB10 800E3660 AFB20060 */ sw $s2, 0x60($sp) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E3514.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E3514.s index 7ae758016b..5961d95f45 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E3514.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E3514.s @@ -45,8 +45,8 @@ glabel func_800E3514 /* 7CA64 800E35B4 27A20044 */ addiu $v0, $sp, 0x44 /* 7CA68 800E35B8 0C03791B */ jal func_800DE46C /* 7CA6C 800E35BC AFA20020 */ sw $v0, 0x20($sp) -/* 7CA70 800E35C0 3C128016 */ lui $s2, 0x8016 -/* 7CA74 800E35C4 2652A550 */ addiu $s2, $s2, -0x5ab0 +/* 7CA70 800E35C0 3C128016 */ lui $s2, %hi(gCollisionStatus) +/* 7CA74 800E35C4 2652A550 */ addiu $s2, $s2, %lo(gCollisionStatus) /* 7CA78 800E35C8 AE020000 */ sw $v0, ($s0) /* 7CA7C 800E35CC 04410010 */ bgez $v0, .L800E3610 /* 7CA80 800E35D0 0240802D */ daddu $s0, $s2, $zero diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4744.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4744.s index aa2d0cd990..bbadc4fa92 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4744.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4744.s @@ -57,8 +57,8 @@ glabel func_800E4744 /* 7DCC4 800E4814 2673EBB0 */ addiu $s3, $s3, %lo(D_8010EBB0) /* 7DCC8 800E4818 C7A20034 */ lwc1 $f2, 0x34($sp) /* 7DCCC 800E481C 4614B500 */ add.s $f20, $f22, $f20 -/* 7DCD0 800E4820 3C148016 */ lui $s4, 0x8016 -/* 7DCD4 800E4824 2694A550 */ addiu $s4, $s4, -0x5ab0 +/* 7DCD0 800E4820 3C148016 */ lui $s4, %hi(gCollisionStatus) +/* 7DCD4 800E4824 2694A550 */ addiu $s4, $s4, %lo(gCollisionStatus) /* 7DCD8 800E4828 4602A03C */ c.lt.s $f20, $f2 /* 7DCDC 800E482C 00000000 */ nop /* 7DCE0 800E4830 45000002 */ bc1f .L800E483C diff --git a/asm/nonmatchings/code_7bb60_len_41b0/phys_player_land.s b/asm/nonmatchings/code_7bb60_len_41b0/phys_player_land.s index b9cac8954e..48dff095ef 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/phys_player_land.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/phys_player_land.s @@ -25,8 +25,8 @@ glabel phys_player_land /* 7C778 800E32C8 E6020048 */ swc1 $f2, 0x48($s0) /* 7C77C 800E32CC 0C052736 */ jal play_sound_at_player /* 7C780 800E32D0 AE030000 */ sw $v1, ($s0) -/* 7C784 800E32D4 3C038016 */ lui $v1, 0x8016 -/* 7C788 800E32D8 2463A550 */ addiu $v1, $v1, -0x5ab0 +/* 7C784 800E32D4 3C038016 */ lui $v1, %hi(gCollisionStatus) +/* 7C788 800E32D8 2463A550 */ addiu $v1, $v1, %lo(gCollisionStatus) /* 7C78C 800E32DC 94620002 */ lhu $v0, 2($v1) /* 7C790 800E32E0 30424000 */ andi $v0, $v0, 0x4000 /* 7C794 800E32E4 14400003 */ bnez $v0, .L800E32F4 diff --git a/asm/nonmatchings/code_ED510/ResetFromLava.s b/asm/nonmatchings/code_ED510/ResetFromLava.s index dea3bba74b..36aad51e0f 100644 --- a/asm/nonmatchings/code_ED510/ResetFromLava.s +++ b/asm/nonmatchings/code_ED510/ResetFromLava.s @@ -42,8 +42,8 @@ glabel ResetFromLava /* EE910 802C9F60 3C01802E */ lui $at, 0x802e /* EE914 802C9F64 AC22ADA4 */ sw $v0, -0x525c($at) .L802C9F68: -/* EE918 802C9F68 3C028016 */ lui $v0, 0x8016 -/* EE91C 802C9F6C 2442A550 */ addiu $v0, $v0, -0x5ab0 +/* EE918 802C9F68 3C028016 */ lui $v0, %hi(gCollisionStatus) +/* EE91C 802C9F6C 2442A550 */ addiu $v0, $v0, %lo(gCollisionStatus) /* EE920 802C9F70 94430002 */ lhu $v1, 2($v0) /* EE924 802C9F74 30624000 */ andi $v0, $v1, 0x4000 /* EE928 802C9F78 1440000F */ bnez $v0, .L802C9FB8 diff --git a/asm/nonmatchings/code_FBE10/func_802D7460.s b/asm/nonmatchings/code_FBE10/func_802D7460.s new file mode 100644 index 0000000000..a7d880f6d7 --- /dev/null +++ b/asm/nonmatchings/code_FBE10/func_802D7460.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802D7460 +/* FBE10 802D7460 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* FBE14 802D7464 24E2001E */ addiu $v0, $a3, 0x1e +/* FBE18 802D7468 44820000 */ mtc1 $v0, $f0 +/* FBE1C 802D746C 00000000 */ nop +/* FBE20 802D7470 46800020 */ cvt.s.w $f0, $f0 +/* FBE24 802D7474 000717C2 */ srl $v0, $a3, 0x1f +/* FBE28 802D7478 00E23821 */ addu $a3, $a3, $v0 +/* FBE2C 802D747C 00073843 */ sra $a3, $a3, 1 +/* FBE30 802D7480 24E7000A */ addiu $a3, $a3, 0xa +/* FBE34 802D7484 44861000 */ mtc1 $a2, $f2 +/* FBE38 802D7488 44056000 */ mfc1 $a1, $f12 +/* FBE3C 802D748C 44067000 */ mfc1 $a2, $f14 +/* FBE40 802D7490 2402001E */ addiu $v0, $zero, 0x1e +/* FBE44 802D7494 AFA70018 */ sw $a3, 0x18($sp) +/* FBE48 802D7498 44071000 */ mfc1 $a3, $f2 +/* FBE4C 802D749C 24040001 */ addiu $a0, $zero, 1 +/* FBE50 802D74A0 AFBF0020 */ sw $ra, 0x20($sp) +/* FBE54 802D74A4 E7A00010 */ swc1 $f0, 0x10($sp) +/* FBE58 802D74A8 E7A00014 */ swc1 $f0, 0x14($sp) +/* FBE5C 802D74AC 0C01C154 */ jal func_80070550 +/* FBE60 802D74B0 AFA2001C */ sw $v0, 0x1c($sp) +/* FBE64 802D74B4 8FBF0020 */ lw $ra, 0x20($sp) +/* FBE68 802D74B8 03E00008 */ jr $ra +/* FBE6C 802D74BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_FBE10/func_802D74C0.s b/asm/nonmatchings/code_FBE10/func_802D74C0.s new file mode 100644 index 0000000000..3a7037aa26 --- /dev/null +++ b/asm/nonmatchings/code_FBE10/func_802D74C0.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802D74C0 +/* FBE70 802D74C0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* FBE74 802D74C4 24E2001E */ addiu $v0, $a3, 0x1e +/* FBE78 802D74C8 44820000 */ mtc1 $v0, $f0 +/* FBE7C 802D74CC 00000000 */ nop +/* FBE80 802D74D0 46800020 */ cvt.s.w $f0, $f0 +/* FBE84 802D74D4 000717C2 */ srl $v0, $a3, 0x1f +/* FBE88 802D74D8 00E23821 */ addu $a3, $a3, $v0 +/* FBE8C 802D74DC 00073843 */ sra $a3, $a3, 1 +/* FBE90 802D74E0 24E7000A */ addiu $a3, $a3, 0xa +/* FBE94 802D74E4 44861000 */ mtc1 $a2, $f2 +/* FBE98 802D74E8 44056000 */ mfc1 $a1, $f12 +/* FBE9C 802D74EC 44067000 */ mfc1 $a2, $f14 +/* FBEA0 802D74F0 2402001E */ addiu $v0, $zero, 0x1e +/* FBEA4 802D74F4 AFA70018 */ sw $a3, 0x18($sp) +/* FBEA8 802D74F8 44071000 */ mfc1 $a3, $f2 +/* FBEAC 802D74FC 24040002 */ addiu $a0, $zero, 2 +/* FBEB0 802D7500 AFBF0020 */ sw $ra, 0x20($sp) +/* FBEB4 802D7504 E7A00010 */ swc1 $f0, 0x10($sp) +/* FBEB8 802D7508 E7A00014 */ swc1 $f0, 0x14($sp) +/* FBEBC 802D750C 0C01C154 */ jal func_80070550 +/* FBEC0 802D7510 AFA2001C */ sw $v0, 0x1c($sp) +/* FBEC4 802D7514 8FBF0020 */ lw $ra, 0x20($sp) +/* FBEC8 802D7518 03E00008 */ jr $ra +/* FBECC 802D751C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/entity_get_collision_flags.s b/asm/nonmatchings/code_a5dd0_len_114e0/entity_get_collision_flags.s index e610153ced..76d64f0484 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/entity_get_collision_flags.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/entity_get_collision_flags.s @@ -44,8 +44,8 @@ glabel entity_get_collision_flags /* A7048 80110948 50C20001 */ beql $a2, $v0, .L80110950 /* A704C 8011094C 34A50004 */ ori $a1, $a1, 4 .L80110950: -/* A7050 80110950 3C038016 */ lui $v1, 0x8016 -/* A7054 80110954 8463A550 */ lh $v1, -0x5ab0($v1) +/* A7050 80110950 3C038016 */ lui $v1, %hi(gCollisionStatus) +/* A7054 80110954 8463A550 */ lh $v1, %lo(gCollisionStatus)($v1) /* A7058 80110958 2402FFFF */ addiu $v0, $zero, -1 /* A705C 8011095C 10620005 */ beq $v1, $v0, .L80110974 /* A7060 80110960 30624000 */ andi $v0, $v1, 0x4000 diff --git a/asm/nonmatchings/code_dbd70_len_700/clear_trigger_data.s b/asm/nonmatchings/code_dbd70_len_700/clear_trigger_data.s index a8451cc203..bf3cecc2dc 100644 --- a/asm/nonmatchings/code_dbd70_len_700/clear_trigger_data.s +++ b/asm/nonmatchings/code_dbd70_len_700/clear_trigger_data.s @@ -5,8 +5,8 @@ glabel clear_trigger_data /* DBD80 80145680 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* DBD84 80145684 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* DBD88 80145688 80420070 */ lb $v0, 0x70($v0) -/* DBD8C 8014568C 3C048016 */ lui $a0, 0x8016 -/* DBD90 80145690 2484A550 */ addiu $a0, $a0, -0x5ab0 +/* DBD8C 8014568C 3C048016 */ lui $a0, %hi(gCollisionStatus) +/* DBD90 80145690 2484A550 */ addiu $a0, $a0, %lo(gCollisionStatus) /* DBD94 80145694 14400005 */ bnez $v0, .L801456AC /* DBD98 80145698 00000000 */ nop /* DBD9C 8014569C 3C028016 */ lui $v0, %hi(gTriggerList1) diff --git a/asm/nonmatchings/code_dbd70_len_700/update_triggers.s b/asm/nonmatchings/code_dbd70_len_700/update_triggers.s index 728a45e557..471505641d 100644 --- a/asm/nonmatchings/code_dbd70_len_700/update_triggers.s +++ b/asm/nonmatchings/code_dbd70_len_700/update_triggers.s @@ -4,8 +4,8 @@ glabel update_triggers /* DBF60 80145860 27BDFFD0 */ addiu $sp, $sp, -0x30 /* DBF64 80145864 AFB20020 */ sw $s2, 0x20($sp) -/* DBF68 80145868 3C128016 */ lui $s2, 0x8016 -/* DBF6C 8014586C 2652A550 */ addiu $s2, $s2, -0x5ab0 +/* DBF68 80145868 3C128016 */ lui $s2, %hi(gCollisionStatus) +/* DBF6C 8014586C 2652A550 */ addiu $s2, $s2, %lo(gCollisionStatus) /* DBF70 80145870 AFB30024 */ sw $s3, 0x24($sp) /* DBF74 80145874 0000982D */ daddu $s3, $zero, $zero /* DBF78 80145878 AFBF0028 */ sw $ra, 0x28($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_80240000_C314E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_80240000_C314E0.s index 1612e45740..e229730845 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_80240000_C314E0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_80240000_C314E0.s @@ -10,8 +10,8 @@ glabel func_80240000_C314E0 /* C314F4 80240014 0C0B1EAF */ jal get_variable /* C314F8 80240018 8C450000 */ lw $a1, ($v0) /* C314FC 8024001C 0040302D */ daddu $a2, $v0, $zero -/* C31500 80240020 3C058016 */ lui $a1, 0x8016 -/* C31504 80240024 84A5A550 */ lh $a1, -0x5ab0($a1) +/* C31500 80240020 3C058016 */ lui $a1, %hi(gCollisionStatus) +/* C31504 80240024 84A5A550 */ lh $a1, %lo(gCollisionStatus)($a1) /* C31508 80240028 3C048011 */ lui $a0, %hi(gPlayerStatus) /* C3150C 8024002C 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) /* C31510 80240030 10A60004 */ beq $a1, $a2, .L80240044 diff --git a/asm/nonmatchings/world/area_kpa/kpa_04/A4BF60/func_80240000_A4BF60.s b/asm/nonmatchings/world/area_kpa/kpa_04/A4BF60/func_80240000_A4BF60.s index 409a22f6cf..109fa32fcb 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_04/A4BF60/func_80240000_A4BF60.s +++ b/asm/nonmatchings/world/area_kpa/kpa_04/A4BF60/func_80240000_A4BF60.s @@ -10,8 +10,8 @@ glabel func_80240000_A4BF60 /* A4BF74 80240014 0C0B1EAF */ jal get_variable /* A4BF78 80240018 8C450000 */ lw $a1, ($v0) /* A4BF7C 8024001C 0040302D */ daddu $a2, $v0, $zero -/* A4BF80 80240020 3C058016 */ lui $a1, 0x8016 -/* A4BF84 80240024 84A5A550 */ lh $a1, -0x5ab0($a1) +/* A4BF80 80240020 3C058016 */ lui $a1, %hi(gCollisionStatus) +/* A4BF84 80240024 84A5A550 */ lh $a1, %lo(gCollisionStatus)($a1) /* A4BF88 80240028 3C048011 */ lui $a0, %hi(gPlayerStatus) /* A4BF8C 8024002C 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) /* A4BF90 80240030 10A60004 */ beq $a1, $a2, .L80240044 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240000_A99590.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240000_A99590.s index 4dbc72d3df..75aa9096e3 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240000_A99590.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240000_A99590.s @@ -10,8 +10,8 @@ glabel func_80240000_A99590 /* A995A4 80240014 0C0B1EAF */ jal get_variable /* A995A8 80240018 8C450000 */ lw $a1, ($v0) /* A995AC 8024001C 0040302D */ daddu $a2, $v0, $zero -/* A995B0 80240020 3C058016 */ lui $a1, 0x8016 -/* A995B4 80240024 84A5A550 */ lh $a1, -0x5ab0($a1) +/* A995B0 80240020 3C058016 */ lui $a1, %hi(gCollisionStatus) +/* A995B4 80240024 84A5A550 */ lh $a1, %lo(gCollisionStatus)($a1) /* A995B8 80240028 3C048011 */ lui $a0, %hi(gPlayerStatus) /* A995BC 8024002C 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) /* A995C0 80240030 10A60004 */ beq $a1, $a2, .L80240044 diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240040_A9CC70.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240040_A9CC70.s index da511dff13..3b5f5c478f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240040_A9CC70.s +++ b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240040_A9CC70.s @@ -10,8 +10,8 @@ glabel func_80240040_A9CC70 /* A9CC84 80240054 0C0B1EAF */ jal get_variable /* A9CC88 80240058 8C450000 */ lw $a1, ($v0) /* A9CC8C 8024005C 0040302D */ daddu $a2, $v0, $zero -/* A9CC90 80240060 3C058016 */ lui $a1, 0x8016 -/* A9CC94 80240064 84A5A550 */ lh $a1, -0x5ab0($a1) +/* A9CC90 80240060 3C058016 */ lui $a1, %hi(gCollisionStatus) +/* A9CC94 80240064 84A5A550 */ lh $a1, %lo(gCollisionStatus)($a1) /* A9CC98 80240068 3C048011 */ lui $a0, %hi(gPlayerStatus) /* A9CC9C 8024006C 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) /* A9CCA0 80240070 10A60004 */ beq $a1, $a2, .L80240084 diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240000_A9ED40.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240000_A9ED40.s index f9602a02c8..9e2a118cbe 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240000_A9ED40.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240000_A9ED40.s @@ -10,8 +10,8 @@ glabel func_80240000_A9ED40 /* A9ED54 80240014 0C0B1EAF */ jal get_variable /* A9ED58 80240018 8C450000 */ lw $a1, ($v0) /* A9ED5C 8024001C 0040302D */ daddu $a2, $v0, $zero -/* A9ED60 80240020 3C058016 */ lui $a1, 0x8016 -/* A9ED64 80240024 84A5A550 */ lh $a1, -0x5ab0($a1) +/* A9ED60 80240020 3C058016 */ lui $a1, %hi(gCollisionStatus) +/* A9ED64 80240024 84A5A550 */ lh $a1, %lo(gCollisionStatus)($a1) /* A9ED68 80240028 3C048011 */ lui $a0, %hi(gPlayerStatus) /* A9ED6C 8024002C 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) /* A9ED70 80240030 10A60004 */ beq $a1, $a2, .L80240044 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 21ac85499f..e3900f6019 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 @@ -16,8 +16,8 @@ glabel func_8024037C_A54CCC /* A54CF8 802403A8 0C0B1EAF */ jal get_variable /* A54CFC 802403AC 0040882D */ daddu $s1, $v0, $zero /* A54D00 802403B0 0040802D */ daddu $s0, $v0, $zero -/* A54D04 802403B4 3C038016 */ lui $v1, 0x8016 -/* A54D08 802403B8 2463A550 */ addiu $v1, $v1, -0x5ab0 +/* A54D04 802403B4 3C038016 */ lui $v1, %hi(gCollisionStatus) +/* A54D08 802403B8 2463A550 */ addiu $v1, $v1, %lo(gCollisionStatus) /* A54D0C 802403BC 84620002 */ lh $v0, 2($v1) /* A54D10 802403C0 10500004 */ beq $v0, $s0, .L802403D4 /* A54D14 802403C4 00000000 */ nop 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 50ec5cea98..986383060d 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 @@ -16,8 +16,8 @@ glabel func_8024037C_A5629C /* A562C8 802403A8 0C0B1EAF */ jal get_variable /* A562CC 802403AC 0040882D */ daddu $s1, $v0, $zero /* A562D0 802403B0 0040802D */ daddu $s0, $v0, $zero -/* A562D4 802403B4 3C038016 */ lui $v1, 0x8016 -/* A562D8 802403B8 2463A550 */ addiu $v1, $v1, -0x5ab0 +/* A562D4 802403B4 3C038016 */ lui $v1, %hi(gCollisionStatus) +/* A562D8 802403B8 2463A550 */ addiu $v1, $v1, %lo(gCollisionStatus) /* A562DC 802403BC 84620002 */ lh $v0, 2($v1) /* A562E0 802403C0 10500004 */ beq $v0, $s0, .L802403D4 /* A562E4 802403C4 00000000 */ nop 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 146abb0384..58774ad020 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 @@ -22,8 +22,8 @@ glabel func_8024073C_A57BEC /* A57C30 80240780 0C0B1EAF */ jal get_variable /* A57C34 80240784 0040802D */ daddu $s0, $v0, $zero /* A57C38 80240788 0040202D */ daddu $a0, $v0, $zero -/* A57C3C 8024078C 3C038016 */ lui $v1, 0x8016 -/* A57C40 80240790 2463A550 */ addiu $v1, $v1, -0x5ab0 +/* A57C3C 8024078C 3C038016 */ lui $v1, %hi(gCollisionStatus) +/* A57C40 80240790 2463A550 */ addiu $v1, $v1, %lo(gCollisionStatus) /* A57C44 80240794 84620002 */ lh $v0, 2($v1) /* A57C48 80240798 3C058011 */ lui $a1, %hi(gPlayerStatus) /* A57C4C 8024079C 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) 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 a79f734ef2..80c68ebcfc 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 @@ -22,8 +22,8 @@ glabel func_802403DC_C5AB1C /* C5AB60 80240420 0C0B1EAF */ jal get_variable /* C5AB64 80240424 0040882D */ daddu $s1, $v0, $zero /* C5AB68 80240428 0040802D */ daddu $s0, $v0, $zero -/* C5AB6C 8024042C 3C028016 */ lui $v0, 0x8016 -/* C5AB70 80240430 2442A550 */ addiu $v0, $v0, -0x5ab0 +/* C5AB6C 8024042C 3C028016 */ lui $v0, %hi(gCollisionStatus) +/* C5AB70 80240430 2442A550 */ addiu $v0, $v0, %lo(gCollisionStatus) /* C5AB74 80240434 84430002 */ lh $v1, 2($v0) /* C5AB78 80240438 10710008 */ beq $v1, $s1, .L8024045C /* C5AB7C 8024043C 00000000 */ nop 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 d86f659df5..5fc4cae48e 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 @@ -22,8 +22,8 @@ glabel func_80240310_C804B0 /* C804F4 80240354 0C0B1EAF */ jal get_variable /* C804F8 80240358 0040882D */ daddu $s1, $v0, $zero /* C804FC 8024035C 0040802D */ daddu $s0, $v0, $zero -/* C80500 80240360 3C028016 */ lui $v0, 0x8016 -/* C80504 80240364 2442A550 */ addiu $v0, $v0, -0x5ab0 +/* C80500 80240360 3C028016 */ lui $v0, %hi(gCollisionStatus) +/* C80504 80240364 2442A550 */ addiu $v0, $v0, %lo(gCollisionStatus) /* C80508 80240368 84430002 */ lh $v1, 2($v0) /* C8050C 8024036C 10710008 */ beq $v1, $s1, .L80240390 /* C80510 80240370 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC4B50/func_802408D0_BC4B50.s b/asm/nonmatchings/world/area_obk/obk_03/BC4B50/func_802408D0_BC4B50.s index 0ed6a6321d..42b80e873c 100644 --- a/asm/nonmatchings/world/area_obk/obk_03/BC4B50/func_802408D0_BC4B50.s +++ b/asm/nonmatchings/world/area_obk/obk_03/BC4B50/func_802408D0_BC4B50.s @@ -8,8 +8,8 @@ glabel func_802408D0_BC4B50 /* BC4B5C 802408DC 3C138011 */ lui $s3, %hi(gPlayerStatus) /* BC4B60 802408E0 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) /* BC4B64 802408E4 AFB00068 */ sw $s0, 0x68($sp) -/* BC4B68 802408E8 3C108016 */ lui $s0, 0x8016 -/* BC4B6C 802408EC 2610A550 */ addiu $s0, $s0, -0x5ab0 +/* BC4B68 802408E8 3C108016 */ lui $s0, %hi(gCollisionStatus) +/* BC4B6C 802408EC 2610A550 */ addiu $s0, $s0, %lo(gCollisionStatus) /* BC4B70 802408F0 AFBF0078 */ sw $ra, 0x78($sp) /* BC4B74 802408F4 AFB1006C */ sw $s1, 0x6c($sp) /* BC4B78 802408F8 F7B60088 */ sdc1 $f22, 0x88($sp) diff --git a/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240050_BCD0B0.s b/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240050_BCD0B0.s index 8b6a94c0f2..5c06e557f2 100644 --- a/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240050_BCD0B0.s +++ b/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240050_BCD0B0.s @@ -8,8 +8,8 @@ glabel func_80240050_BCD0B0 /* BCD0BC 8024005C 3C138011 */ lui $s3, %hi(gPlayerStatus) /* BCD0C0 80240060 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) /* BCD0C4 80240064 AFB00068 */ sw $s0, 0x68($sp) -/* BCD0C8 80240068 3C108016 */ lui $s0, 0x8016 -/* BCD0CC 8024006C 2610A550 */ addiu $s0, $s0, -0x5ab0 +/* BCD0C8 80240068 3C108016 */ lui $s0, %hi(gCollisionStatus) +/* BCD0CC 8024006C 2610A550 */ addiu $s0, $s0, %lo(gCollisionStatus) /* BCD0D0 80240070 AFBF0078 */ sw $ra, 0x78($sp) /* BCD0D4 80240074 AFB1006C */ sw $s1, 0x6c($sp) /* BCD0D8 80240078 F7B60088 */ sdc1 $f22, 0x88($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078_DCCD48.s b/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078_DCCD48.s index e438d4072e..74d6e38726 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078_DCCD48.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078_DCCD48.s @@ -96,8 +96,8 @@ glabel func_80240078_DCCD48 /* DCCEA0 802401D0 14400032 */ bnez $v0, .L8024029C /* DCCEA4 802401D4 24020002 */ addiu $v0, $zero, 2 .L802401D8: -/* DCCEA8 802401D8 3C178016 */ lui $s7, 0x8016 -/* DCCEAC 802401DC 26F7A550 */ addiu $s7, $s7, -0x5ab0 +/* DCCEA8 802401D8 3C178016 */ lui $s7, %hi(gCollisionStatus) +/* DCCEAC 802401DC 26F7A550 */ addiu $s7, $s7, %lo(gCollisionStatus) /* DCCEB0 802401E0 24120004 */ addiu $s2, $zero, 4 /* DCCEB4 802401E4 3C168024 */ lui $s6, 0x8024 /* DCCEB8 802401E8 26D63A90 */ addiu $s6, $s6, 0x3a90 diff --git a/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_80240020_D788A0.s b/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_80240020_D788A0.s index 1d50ec83ec..de7b707978 100644 --- a/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_80240020_D788A0.s +++ b/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_80240020_D788A0.s @@ -10,8 +10,8 @@ glabel func_80240020_D788A0 /* D788B4 80240034 0C0B1EAF */ jal get_variable /* D788B8 80240038 8C450000 */ lw $a1, ($v0) /* D788BC 8024003C 0040302D */ daddu $a2, $v0, $zero -/* D788C0 80240040 3C058016 */ lui $a1, 0x8016 -/* D788C4 80240044 84A5A550 */ lh $a1, -0x5ab0($a1) +/* D788C0 80240040 3C058016 */ lui $a1, %hi(gCollisionStatus) +/* D788C4 80240044 84A5A550 */ lh $a1, %lo(gCollisionStatus)($a1) /* D788C8 80240048 3C048011 */ lui $a0, %hi(gPlayerStatus) /* D788CC 8024004C 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) /* D788D0 80240050 10A60004 */ beq $a1, $a2, .L80240064 diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240FF0_D7FD50.s b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240FF0_D7FD50.s index 84c73a3764..4098c34351 100644 --- a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240FF0_D7FD50.s +++ b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240FF0_D7FD50.s @@ -10,8 +10,8 @@ glabel func_80240FF0_D7FD50 /* D7FD64 80241004 0C0B1EAF */ jal get_variable /* D7FD68 80241008 8C450000 */ lw $a1, ($v0) /* D7FD6C 8024100C 0040302D */ daddu $a2, $v0, $zero -/* D7FD70 80241010 3C058016 */ lui $a1, 0x8016 -/* D7FD74 80241014 84A5A550 */ lh $a1, -0x5ab0($a1) +/* D7FD70 80241010 3C058016 */ lui $a1, %hi(gCollisionStatus) +/* D7FD74 80241014 84A5A550 */ lh $a1, %lo(gCollisionStatus)($a1) /* D7FD78 80241018 3C048011 */ lui $a0, %hi(gPlayerStatus) /* D7FD7C 8024101C 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) /* D7FD80 80241020 10A60004 */ beq $a1, $a2, .L80241034 diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240F20_D8A600.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240F20_D8A600.s index 056ae74214..0b74983b59 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240F20_D8A600.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240F20_D8A600.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240F20_D8A600 -/* D8A600 80240F20 3C058016 */ lui $a1, 0x8016 -/* D8A604 80240F24 24A5A550 */ addiu $a1, $a1, -0x5ab0 +/* D8A600 80240F20 3C058016 */ lui $a1, %hi(gCollisionStatus) +/* D8A604 80240F24 24A5A550 */ addiu $a1, $a1, %lo(gCollisionStatus) /* D8A608 80240F28 AC8000AC */ sw $zero, 0xac($a0) /* D8A60C 80240F2C 84A20002 */ lh $v0, 2($a1) /* D8A610 80240F30 2403001C */ addiu $v1, $zero, 0x1c diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FB0_D3C580.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FB0_D3C580.s index dce4d0c19a..9a8b632b15 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FB0_D3C580.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FB0_D3C580.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80241FB0_D3C580 -/* D3C580 80241FB0 3C058016 */ lui $a1, 0x8016 -/* D3C584 80241FB4 24A5A550 */ addiu $a1, $a1, -0x5ab0 +/* D3C580 80241FB0 3C058016 */ lui $a1, %hi(gCollisionStatus) +/* D3C584 80241FB4 24A5A550 */ addiu $a1, $a1, %lo(gCollisionStatus) /* D3C588 80241FB8 AC8000AC */ sw $zero, 0xac($a0) /* D3C58C 80241FBC 84A20002 */ lh $v0, 2($a1) /* D3C590 80241FC0 24030040 */ addiu $v1, $zero, 0x40