diff --git a/asm/non_matchings/code/z_player_lib/func_8008FCC8.s b/asm/non_matchings/code/z_player_lib/func_8008FCC8.s index 923d4091fb..2c51ccd7c6 100644 --- a/asm/non_matchings/code/z_player_lib/func_8008FCC8.s +++ b/asm/non_matchings/code/z_player_lib/func_8008FCC8.s @@ -253,202 +253,3 @@ glabel func_8008FCC8 /* B071AC 8009000C 03E00008 */ jr $ra /* B071B0 80090010 27BD0030 */ addiu $sp, $sp, 0x30 -/* B071B4 80090014 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B071B8 80090018 AFB00020 */ sw $s0, 0x20($sp) -/* B071BC 8009001C 8FB0003C */ lw $s0, 0x3c($sp) -/* B071C0 80090020 8FAE0038 */ lw $t6, 0x38($sp) -/* B071C4 80090024 AFBF0024 */ sw $ra, 0x24($sp) -/* B071C8 80090028 AFA5002C */ sw $a1, 0x2c($sp) -/* B071CC 8009002C AFA60030 */ sw $a2, 0x30($sp) -/* B071D0 80090030 AFB00014 */ sw $s0, 0x14($sp) -/* B071D4 80090034 0C023F32 */ jal func_8008FCC8 -/* B071D8 80090038 AFAE0010 */ sw $t6, 0x10($sp) -/* B071DC 8009003C 8FA5002C */ lw $a1, 0x2c($sp) -/* B071E0 80090040 144000A6 */ bnez $v0, .L800902DC -/* B071E4 80090044 8FA60030 */ lw $a2, 0x30($sp) -/* B071E8 80090048 24070010 */ li $a3, 16 -/* B071EC 8009004C 14A70043 */ bne $a1, $a3, .L8009015C -/* B071F0 80090050 24040013 */ li $a0, 19 -/* B071F4 80090054 3C048016 */ lui $a0, %hi(D_80160014) -/* B071F8 80090058 24840014 */ addiu $a0, %lo(D_80160014) # addiu $a0, $a0, 0x14 -/* B071FC 8009005C 8C830000 */ lw $v1, ($a0) -/* B07200 80090060 24010004 */ li $at, 4 -/* B07204 80090064 8E020164 */ lw $v0, 0x164($s0) -/* B07208 80090068 14610011 */ bne $v1, $at, .L800900B0 -/* B0720C 8009006C 3C058016 */ lui $a1, %hi(gSaveContext) -/* B07210 80090070 24A5E660 */ addiu $a1, %lo(gSaveContext) -/* B07214 80090074 94AF0036 */ lhu $t7, 0x36($a1) -/* B07218 80090078 44802000 */ mtc1 $zero, $f4 -/* B0721C 8009007C 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* B07220 80090080 448F3000 */ mtc1 $t7, $f6 -/* B07224 80090084 05E10004 */ bgez $t7, .L80090098 -/* B07228 80090088 46803220 */ cvt.s.w $f8, $f6 -/* B0722C 8009008C 44815000 */ mtc1 $at, $f10 -/* B07230 80090090 00000000 */ nop -/* B07234 80090094 460A4200 */ add.s $f8, $f8, $f10 -.L80090098: -/* B07238 80090098 4604403E */ c.le.s $f8, $f4 -/* B0723C 8009009C 00000000 */ nop -/* B07240 800900A0 45000003 */ bc1f .L800900B0 -/* B07244 800900A4 00000000 */ nop -/* B07248 800900A8 10000025 */ b .L80090140 -/* B0724C 800900AC 24420010 */ addiu $v0, $v0, 0x10 -.L800900B0: -/* B07250 800900B0 3C058016 */ lui $a1, %hi(gSaveContext) # $a1, 0x8016 -/* B07254 800900B4 24010006 */ li $at, 6 -/* B07258 800900B8 1461000C */ bne $v1, $at, .L800900EC -/* B0725C 800900BC 24A5E660 */ addiu $a1, %lo(gSaveContext) # addiu $a1, $a1, -0x19a0 -/* B07260 800900C0 8E18067C */ lw $t8, 0x67c($s0) -/* B07264 800900C4 3C0A8012 */ lui $t2, %hi(D_80125E08) # $t2, 0x8012 -/* B07268 800900C8 0018C980 */ sll $t9, $t8, 6 -/* B0726C 800900CC 07230008 */ bgezl $t9, .L800900F0 -/* B07270 800900D0 920B015C */ lbu $t3, 0x15c($s0) -/* B07274 800900D4 8CA80004 */ lw $t0, 4($a1) -/* B07278 800900D8 254A5E08 */ addiu $t2, %lo(D_80125E08) # addiu $t2, $t2, 0x5e08 -/* B0727C 800900DC AC800000 */ sw $zero, ($a0) -/* B07280 800900E0 00084880 */ sll $t1, $t0, 2 -/* B07284 800900E4 10000016 */ b .L80090140 -/* B07288 800900E8 012A1021 */ addu $v0, $t1, $t2 -.L800900EC: -/* B0728C 800900EC 920B015C */ lbu $t3, 0x15c($s0) -.L800900F0: -/* B07290 800900F0 3C014000 */ li $at, 0x40000000 # 0.000000 -/* B07294 800900F4 15600012 */ bnez $t3, .L80090140 -/* B07298 800900F8 00000000 */ nop -/* B0729C 800900FC 44818000 */ mtc1 $at, $f16 -/* B072A0 80090100 C6120068 */ lwc1 $f18, 0x68($s0) -/* B072A4 80090104 4612803C */ c.lt.s $f16, $f18 -/* B072A8 80090108 00000000 */ nop -/* B072AC 8009010C 4500000C */ bc1f .L80090140 -/* B072B0 80090110 00000000 */ nop -/* B072B4 80090114 8E0C067C */ lw $t4, 0x67c($s0) -/* B072B8 80090118 3C188012 */ lui $t8, %hi(D_80125E18) # $t8, 0x8012 -/* B072BC 8009011C 27185E18 */ addiu $t8, %lo(D_80125E18) # addiu $t8, $t8, 0x5e18 -/* B072C0 80090120 000C6900 */ sll $t5, $t4, 4 -/* B072C4 80090124 05A00006 */ bltz $t5, .L80090140 -/* B072C8 80090128 00000000 */ nop -/* B072CC 8009012C 8CAE0004 */ lw $t6, 4($a1) -/* B072D0 80090130 24190001 */ li $t9, 1 -/* B072D4 80090134 AC990000 */ sw $t9, ($a0) -/* B072D8 80090138 000E7880 */ sll $t7, $t6, 2 -/* B072DC 8009013C 01F81021 */ addu $v0, $t7, $t8 -.L80090140: -/* B072E0 80090140 3C088016 */ lui $t0, %hi(D_80160004) # $t0, 0x8016 -/* B072E4 80090144 8D080004 */ lw $t0, %lo(D_80160004)($t0) -/* B072E8 80090148 00084880 */ sll $t1, $t0, 2 -/* B072EC 8009014C 00495021 */ addu $t2, $v0, $t1 -/* B072F0 80090150 8D4B0000 */ lw $t3, ($t2) -/* B072F4 80090154 10000061 */ b .L800902DC -/* B072F8 80090158 ACCB0000 */ sw $t3, ($a2) -.L8009015C: -/* B072FC 8009015C 14A40029 */ bne $a1, $a0, .L80090204 -/* B07300 80090160 24010014 */ li $at, 20 -/* B07304 80090164 3C038016 */ lui $v1, %hi(D_80160018) # $v1, 0x8016 -/* B07308 80090168 24630018 */ addiu $v1, %lo(D_80160018) # addiu $v1, $v1, 0x18 -/* B0730C 8009016C 8C6C0000 */ lw $t4, ($v1) -/* B07310 80090170 2401000A */ li $at, 10 -/* B07314 80090174 8E020160 */ lw $v0, 0x160($s0) -/* B07318 80090178 55810006 */ bnel $t4, $at, .L80090194 -/* B0731C 8009017C 920F015D */ lbu $t7, 0x15d($s0) -/* B07320 80090180 820D014E */ lb $t5, 0x14e($s0) -/* B07324 80090184 000D7100 */ sll $t6, $t5, 4 -/* B07328 80090188 10000017 */ b .L800901E8 -/* B0732C 8009018C 004E1021 */ addu $v0, $v0, $t6 -/* B07330 80090190 920F015D */ lbu $t7, 0x15d($s0) -.L80090194: -/* B07334 80090194 24010008 */ li $at, 8 -/* B07338 80090198 15E10013 */ bne $t7, $at, .L800901E8 -/* B0733C 8009019C 3C014000 */ li $at, 0x40000000 # 0.000000 -/* B07340 800901A0 44813000 */ mtc1 $at, $f6 -/* B07344 800901A4 C60A0068 */ lwc1 $f10, 0x68($s0) -/* B07348 800901A8 460A303C */ c.lt.s $f6, $f10 -/* B0734C 800901AC 00000000 */ nop -/* B07350 800901B0 4500000D */ bc1f .L800901E8 -/* B07354 800901B4 00000000 */ nop -/* B07358 800901B8 8E18067C */ lw $t8, 0x67c($s0) -/* B0735C 800901BC 3C058016 */ lui $a1, %hi(gSaveContext) # $a1, 0x8016 -/* B07360 800901C0 24A5E660 */ addiu $a1, %lo(gSaveContext) # addiu $a1, $a1, -0x19a0 -/* B07364 800901C4 0018C900 */ sll $t9, $t8, 4 -/* B07368 800901C8 07200007 */ bltz $t9, .L800901E8 -/* B0736C 800901CC 3C0A8012 */ lui $t2, %hi(D_80125E58) # $t2, 0x8012 -/* B07370 800901D0 8CA80004 */ lw $t0, 4($a1) -/* B07374 800901D4 254A5E58 */ addiu $t2, %lo(D_80125E58) # addiu $t2, $t2, 0x5e58 -/* B07378 800901D8 240B0009 */ li $t3, 9 -/* B0737C 800901DC 00084880 */ sll $t1, $t0, 2 -/* B07380 800901E0 012A1021 */ addu $v0, $t1, $t2 -/* B07384 800901E4 AC6B0000 */ sw $t3, ($v1) -.L800901E8: -/* B07388 800901E8 3C0C8016 */ lui $t4, %hi(D_80160004) # $t4, 0x8016 -/* B0738C 800901EC 8D8C0004 */ lw $t4, %lo(D_80160004)($t4) -/* B07390 800901F0 000C6880 */ sll $t5, $t4, 2 -/* B07394 800901F4 004D7021 */ addu $t6, $v0, $t5 -/* B07398 800901F8 8DCF0000 */ lw $t7, ($t6) -/* B0739C 800901FC 10000037 */ b .L800902DC -/* B073A0 80090200 ACCF0000 */ sw $t7, ($a2) -.L80090204: -/* B073A4 80090204 14A1002C */ bne $a1, $at, .L800902B8 -/* B073A8 80090208 3C0B8016 */ lui $t3, %hi(D_80160004) # $t3, 0x8016 -/* B073AC 8009020C 9202015E */ lbu $v0, 0x15e($s0) -/* B073B0 80090210 24010012 */ li $at, 18 -/* B073B4 80090214 8E030168 */ lw $v1, 0x168($s0) -/* B073B8 80090218 10410003 */ beq $v0, $at, .L80090228 -/* B073BC 8009021C 3C058016 */ lui $a1, %hi(gSaveContext) # $a1, 0x8016 -/* B073C0 80090220 14820010 */ bne $a0, $v0, .L80090264 -/* B073C4 80090224 00000000 */ nop -.L80090228: -/* B073C8 80090228 8202014E */ lb $v0, 0x14e($s0) -/* B073CC 8009022C 24A5E660 */ addiu $a1, %lo(gSaveContext) # addiu $a1, $a1, -0x19a0 -/* B073D0 80090230 8CB90004 */ lw $t9, 4($a1) -/* B073D4 80090234 0002C100 */ sll $t8, $v0, 4 -/* B073D8 80090238 00781821 */ addu $v1, $v1, $t8 -/* B073DC 8009023C 13200018 */ beqz $t9, .L800902A0 -/* B073E0 80090240 28410002 */ slti $at, $v0, 2 -/* B073E4 80090244 10200016 */ beqz $at, .L800902A0 -/* B073E8 80090248 00000000 */ nop -/* B073EC 8009024C 90A80068 */ lbu $t0, 0x68($a1) -/* B073F0 80090250 2401003B */ li $at, 59 -/* B073F4 80090254 11010012 */ beq $t0, $at, .L800902A0 -/* B073F8 80090258 00000000 */ nop -/* B073FC 8009025C 10000010 */ b .L800902A0 -/* B07400 80090260 24630040 */ addiu $v1, $v1, 0x40 -.L80090264: -/* B07404 80090264 3C058016 */ lui $a1, %hi(gSaveContext) # $a1, 0x8016 -/* B07408 80090268 24A5E660 */ addiu $a1, %lo(gSaveContext) # addiu $a1, $a1, -0x19a0 -/* B0740C 8009026C 8CA90004 */ lw $t1, 4($a1) -/* B07410 80090270 1120000B */ beqz $t1, .L800902A0 -/* B07414 80090274 00000000 */ nop -/* B07418 80090278 10E20003 */ beq $a3, $v0, .L80090288 -/* B0741C 8009027C 24010011 */ li $at, 17 -/* B07420 80090280 14410007 */ bne $v0, $at, .L800902A0 -/* B07424 80090284 00000000 */ nop -.L80090288: -/* B07428 80090288 90AA0068 */ lbu $t2, 0x68($a1) -/* B0742C 8009028C 2401003B */ li $at, 59 -/* B07430 80090290 11410003 */ beq $t2, $at, .L800902A0 -/* B07434 80090294 00000000 */ nop -/* B07438 80090298 3C038012 */ lui $v1, %hi(D_80125D68) # $v1, 0x8012 -/* B0743C 8009029C 24635D68 */ addiu $v1, %lo(D_80125D68) # addiu $v1, $v1, 0x5d68 -.L800902A0: -/* B07440 800902A0 8D6B0004 */ lw $t3, %lo(D_80160004)($t3) -/* B07444 800902A4 000B6080 */ sll $t4, $t3, 2 -/* B07448 800902A8 006C6821 */ addu $t5, $v1, $t4 -/* B0744C 800902AC 8DAE0000 */ lw $t6, ($t5) -/* B07450 800902B0 1000000A */ b .L800902DC -/* B07454 800902B4 ACCE0000 */ sw $t6, ($a2) -.L800902B8: -/* B07458 800902B8 24010002 */ li $at, 2 -/* B0745C 800902BC 14A10007 */ bne $a1, $at, .L800902DC -/* B07460 800902C0 3C188016 */ lui $t8, %hi(D_80160004) # $t8, 0x8016 -/* B07464 800902C4 8F180004 */ lw $t8, %lo(D_80160004)($t8) -/* B07468 800902C8 8E0F016C */ lw $t7, 0x16c($s0) -/* B0746C 800902CC 0018C880 */ sll $t9, $t8, 2 -/* B07470 800902D0 01F94021 */ addu $t0, $t7, $t9 -/* B07474 800902D4 8D090000 */ lw $t1, ($t0) -/* B07478 800902D8 ACC90000 */ sw $t1, ($a2) -.L800902DC: -/* B0747C 800902DC 8FBF0024 */ lw $ra, 0x24($sp) -/* B07480 800902E0 8FB00020 */ lw $s0, 0x20($sp) -/* B07484 800902E4 27BD0028 */ addiu $sp, $sp, 0x28 -/* B07488 800902E8 03E00008 */ jr $ra -/* B0748C 800902EC 00001025 */ move $v0, $zero - diff --git a/asm/non_matchings/code/z_player_lib/func_80090014.s b/asm/non_matchings/code/z_player_lib/func_80090014.s new file mode 100644 index 0000000000..5a8a008d9d --- /dev/null +++ b/asm/non_matchings/code/z_player_lib/func_80090014.s @@ -0,0 +1,200 @@ +glabel func_80090014 +/* B071B4 80090014 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* B071B8 80090018 AFB00020 */ sw $s0, 0x20($sp) +/* B071BC 8009001C 8FB0003C */ lw $s0, 0x3c($sp) +/* B071C0 80090020 8FAE0038 */ lw $t6, 0x38($sp) +/* B071C4 80090024 AFBF0024 */ sw $ra, 0x24($sp) +/* B071C8 80090028 AFA5002C */ sw $a1, 0x2c($sp) +/* B071CC 8009002C AFA60030 */ sw $a2, 0x30($sp) +/* B071D0 80090030 AFB00014 */ sw $s0, 0x14($sp) +/* B071D4 80090034 0C023F32 */ jal func_8008FCC8 +/* B071D8 80090038 AFAE0010 */ sw $t6, 0x10($sp) +/* B071DC 8009003C 8FA5002C */ lw $a1, 0x2c($sp) +/* B071E0 80090040 144000A6 */ bnez $v0, .L800902DC +/* B071E4 80090044 8FA60030 */ lw $a2, 0x30($sp) +/* B071E8 80090048 24070010 */ li $a3, 16 +/* B071EC 8009004C 14A70043 */ bne $a1, $a3, .L8009015C +/* B071F0 80090050 24040013 */ li $a0, 19 +/* B071F4 80090054 3C048016 */ lui $a0, %hi(D_80160014) +/* B071F8 80090058 24840014 */ addiu $a0, %lo(D_80160014) # addiu $a0, $a0, 0x14 +/* B071FC 8009005C 8C830000 */ lw $v1, ($a0) +/* B07200 80090060 24010004 */ li $at, 4 +/* B07204 80090064 8E020164 */ lw $v0, 0x164($s0) +/* B07208 80090068 14610011 */ bne $v1, $at, .L800900B0 +/* B0720C 8009006C 3C058016 */ lui $a1, %hi(gSaveContext) +/* B07210 80090070 24A5E660 */ addiu $a1, %lo(gSaveContext) +/* B07214 80090074 94AF0036 */ lhu $t7, 0x36($a1) +/* B07218 80090078 44802000 */ mtc1 $zero, $f4 +/* B0721C 8009007C 3C014F80 */ li $at, 0x4F800000 # 0.000000 +/* B07220 80090080 448F3000 */ mtc1 $t7, $f6 +/* B07224 80090084 05E10004 */ bgez $t7, .L80090098 +/* B07228 80090088 46803220 */ cvt.s.w $f8, $f6 +/* B0722C 8009008C 44815000 */ mtc1 $at, $f10 +/* B07230 80090090 00000000 */ nop +/* B07234 80090094 460A4200 */ add.s $f8, $f8, $f10 +.L80090098: +/* B07238 80090098 4604403E */ c.le.s $f8, $f4 +/* B0723C 8009009C 00000000 */ nop +/* B07240 800900A0 45000003 */ bc1f .L800900B0 +/* B07244 800900A4 00000000 */ nop +/* B07248 800900A8 10000025 */ b .L80090140 +/* B0724C 800900AC 24420010 */ addiu $v0, $v0, 0x10 +.L800900B0: +/* B07250 800900B0 3C058016 */ lui $a1, %hi(gSaveContext) # $a1, 0x8016 +/* B07254 800900B4 24010006 */ li $at, 6 +/* B07258 800900B8 1461000C */ bne $v1, $at, .L800900EC +/* B0725C 800900BC 24A5E660 */ addiu $a1, %lo(gSaveContext) # addiu $a1, $a1, -0x19a0 +/* B07260 800900C0 8E18067C */ lw $t8, 0x67c($s0) +/* B07264 800900C4 3C0A8012 */ lui $t2, %hi(D_80125E08) # $t2, 0x8012 +/* B07268 800900C8 0018C980 */ sll $t9, $t8, 6 +/* B0726C 800900CC 07230008 */ bgezl $t9, .L800900F0 +/* B07270 800900D0 920B015C */ lbu $t3, 0x15c($s0) +/* B07274 800900D4 8CA80004 */ lw $t0, 4($a1) +/* B07278 800900D8 254A5E08 */ addiu $t2, %lo(D_80125E08) # addiu $t2, $t2, 0x5e08 +/* B0727C 800900DC AC800000 */ sw $zero, ($a0) +/* B07280 800900E0 00084880 */ sll $t1, $t0, 2 +/* B07284 800900E4 10000016 */ b .L80090140 +/* B07288 800900E8 012A1021 */ addu $v0, $t1, $t2 +.L800900EC: +/* B0728C 800900EC 920B015C */ lbu $t3, 0x15c($s0) +.L800900F0: +/* B07290 800900F0 3C014000 */ li $at, 0x40000000 # 0.000000 +/* B07294 800900F4 15600012 */ bnez $t3, .L80090140 +/* B07298 800900F8 00000000 */ nop +/* B0729C 800900FC 44818000 */ mtc1 $at, $f16 +/* B072A0 80090100 C6120068 */ lwc1 $f18, 0x68($s0) +/* B072A4 80090104 4612803C */ c.lt.s $f16, $f18 +/* B072A8 80090108 00000000 */ nop +/* B072AC 8009010C 4500000C */ bc1f .L80090140 +/* B072B0 80090110 00000000 */ nop +/* B072B4 80090114 8E0C067C */ lw $t4, 0x67c($s0) +/* B072B8 80090118 3C188012 */ lui $t8, %hi(D_80125E18) # $t8, 0x8012 +/* B072BC 8009011C 27185E18 */ addiu $t8, %lo(D_80125E18) # addiu $t8, $t8, 0x5e18 +/* B072C0 80090120 000C6900 */ sll $t5, $t4, 4 +/* B072C4 80090124 05A00006 */ bltz $t5, .L80090140 +/* B072C8 80090128 00000000 */ nop +/* B072CC 8009012C 8CAE0004 */ lw $t6, 4($a1) +/* B072D0 80090130 24190001 */ li $t9, 1 +/* B072D4 80090134 AC990000 */ sw $t9, ($a0) +/* B072D8 80090138 000E7880 */ sll $t7, $t6, 2 +/* B072DC 8009013C 01F81021 */ addu $v0, $t7, $t8 +.L80090140: +/* B072E0 80090140 3C088016 */ lui $t0, %hi(D_80160004) # $t0, 0x8016 +/* B072E4 80090144 8D080004 */ lw $t0, %lo(D_80160004)($t0) +/* B072E8 80090148 00084880 */ sll $t1, $t0, 2 +/* B072EC 8009014C 00495021 */ addu $t2, $v0, $t1 +/* B072F0 80090150 8D4B0000 */ lw $t3, ($t2) +/* B072F4 80090154 10000061 */ b .L800902DC +/* B072F8 80090158 ACCB0000 */ sw $t3, ($a2) +.L8009015C: +/* B072FC 8009015C 14A40029 */ bne $a1, $a0, .L80090204 +/* B07300 80090160 24010014 */ li $at, 20 +/* B07304 80090164 3C038016 */ lui $v1, %hi(D_80160018) # $v1, 0x8016 +/* B07308 80090168 24630018 */ addiu $v1, %lo(D_80160018) # addiu $v1, $v1, 0x18 +/* B0730C 8009016C 8C6C0000 */ lw $t4, ($v1) +/* B07310 80090170 2401000A */ li $at, 10 +/* B07314 80090174 8E020160 */ lw $v0, 0x160($s0) +/* B07318 80090178 55810006 */ bnel $t4, $at, .L80090194 +/* B0731C 8009017C 920F015D */ lbu $t7, 0x15d($s0) +/* B07320 80090180 820D014E */ lb $t5, 0x14e($s0) +/* B07324 80090184 000D7100 */ sll $t6, $t5, 4 +/* B07328 80090188 10000017 */ b .L800901E8 +/* B0732C 8009018C 004E1021 */ addu $v0, $v0, $t6 +/* B07330 80090190 920F015D */ lbu $t7, 0x15d($s0) +.L80090194: +/* B07334 80090194 24010008 */ li $at, 8 +/* B07338 80090198 15E10013 */ bne $t7, $at, .L800901E8 +/* B0733C 8009019C 3C014000 */ li $at, 0x40000000 # 0.000000 +/* B07340 800901A0 44813000 */ mtc1 $at, $f6 +/* B07344 800901A4 C60A0068 */ lwc1 $f10, 0x68($s0) +/* B07348 800901A8 460A303C */ c.lt.s $f6, $f10 +/* B0734C 800901AC 00000000 */ nop +/* B07350 800901B0 4500000D */ bc1f .L800901E8 +/* B07354 800901B4 00000000 */ nop +/* B07358 800901B8 8E18067C */ lw $t8, 0x67c($s0) +/* B0735C 800901BC 3C058016 */ lui $a1, %hi(gSaveContext) # $a1, 0x8016 +/* B07360 800901C0 24A5E660 */ addiu $a1, %lo(gSaveContext) # addiu $a1, $a1, -0x19a0 +/* B07364 800901C4 0018C900 */ sll $t9, $t8, 4 +/* B07368 800901C8 07200007 */ bltz $t9, .L800901E8 +/* B0736C 800901CC 3C0A8012 */ lui $t2, %hi(D_80125E58) # $t2, 0x8012 +/* B07370 800901D0 8CA80004 */ lw $t0, 4($a1) +/* B07374 800901D4 254A5E58 */ addiu $t2, %lo(D_80125E58) # addiu $t2, $t2, 0x5e58 +/* B07378 800901D8 240B0009 */ li $t3, 9 +/* B0737C 800901DC 00084880 */ sll $t1, $t0, 2 +/* B07380 800901E0 012A1021 */ addu $v0, $t1, $t2 +/* B07384 800901E4 AC6B0000 */ sw $t3, ($v1) +.L800901E8: +/* B07388 800901E8 3C0C8016 */ lui $t4, %hi(D_80160004) # $t4, 0x8016 +/* B0738C 800901EC 8D8C0004 */ lw $t4, %lo(D_80160004)($t4) +/* B07390 800901F0 000C6880 */ sll $t5, $t4, 2 +/* B07394 800901F4 004D7021 */ addu $t6, $v0, $t5 +/* B07398 800901F8 8DCF0000 */ lw $t7, ($t6) +/* B0739C 800901FC 10000037 */ b .L800902DC +/* B073A0 80090200 ACCF0000 */ sw $t7, ($a2) +.L80090204: +/* B073A4 80090204 14A1002C */ bne $a1, $at, .L800902B8 +/* B073A8 80090208 3C0B8016 */ lui $t3, %hi(D_80160004) # $t3, 0x8016 +/* B073AC 8009020C 9202015E */ lbu $v0, 0x15e($s0) +/* B073B0 80090210 24010012 */ li $at, 18 +/* B073B4 80090214 8E030168 */ lw $v1, 0x168($s0) +/* B073B8 80090218 10410003 */ beq $v0, $at, .L80090228 +/* B073BC 8009021C 3C058016 */ lui $a1, %hi(gSaveContext) # $a1, 0x8016 +/* B073C0 80090220 14820010 */ bne $a0, $v0, .L80090264 +/* B073C4 80090224 00000000 */ nop +.L80090228: +/* B073C8 80090228 8202014E */ lb $v0, 0x14e($s0) +/* B073CC 8009022C 24A5E660 */ addiu $a1, %lo(gSaveContext) # addiu $a1, $a1, -0x19a0 +/* B073D0 80090230 8CB90004 */ lw $t9, 4($a1) +/* B073D4 80090234 0002C100 */ sll $t8, $v0, 4 +/* B073D8 80090238 00781821 */ addu $v1, $v1, $t8 +/* B073DC 8009023C 13200018 */ beqz $t9, .L800902A0 +/* B073E0 80090240 28410002 */ slti $at, $v0, 2 +/* B073E4 80090244 10200016 */ beqz $at, .L800902A0 +/* B073E8 80090248 00000000 */ nop +/* B073EC 8009024C 90A80068 */ lbu $t0, 0x68($a1) +/* B073F0 80090250 2401003B */ li $at, 59 +/* B073F4 80090254 11010012 */ beq $t0, $at, .L800902A0 +/* B073F8 80090258 00000000 */ nop +/* B073FC 8009025C 10000010 */ b .L800902A0 +/* B07400 80090260 24630040 */ addiu $v1, $v1, 0x40 +.L80090264: +/* B07404 80090264 3C058016 */ lui $a1, %hi(gSaveContext) # $a1, 0x8016 +/* B07408 80090268 24A5E660 */ addiu $a1, %lo(gSaveContext) # addiu $a1, $a1, -0x19a0 +/* B0740C 8009026C 8CA90004 */ lw $t1, 4($a1) +/* B07410 80090270 1120000B */ beqz $t1, .L800902A0 +/* B07414 80090274 00000000 */ nop +/* B07418 80090278 10E20003 */ beq $a3, $v0, .L80090288 +/* B0741C 8009027C 24010011 */ li $at, 17 +/* B07420 80090280 14410007 */ bne $v0, $at, .L800902A0 +/* B07424 80090284 00000000 */ nop +.L80090288: +/* B07428 80090288 90AA0068 */ lbu $t2, 0x68($a1) +/* B0742C 8009028C 2401003B */ li $at, 59 +/* B07430 80090290 11410003 */ beq $t2, $at, .L800902A0 +/* B07434 80090294 00000000 */ nop +/* B07438 80090298 3C038012 */ lui $v1, %hi(D_80125D68) # $v1, 0x8012 +/* B0743C 8009029C 24635D68 */ addiu $v1, %lo(D_80125D68) # addiu $v1, $v1, 0x5d68 +.L800902A0: +/* B07440 800902A0 8D6B0004 */ lw $t3, %lo(D_80160004)($t3) +/* B07444 800902A4 000B6080 */ sll $t4, $t3, 2 +/* B07448 800902A8 006C6821 */ addu $t5, $v1, $t4 +/* B0744C 800902AC 8DAE0000 */ lw $t6, ($t5) +/* B07450 800902B0 1000000A */ b .L800902DC +/* B07454 800902B4 ACCE0000 */ sw $t6, ($a2) +.L800902B8: +/* B07458 800902B8 24010002 */ li $at, 2 +/* B0745C 800902BC 14A10007 */ bne $a1, $at, .L800902DC +/* B07460 800902C0 3C188016 */ lui $t8, %hi(D_80160004) # $t8, 0x8016 +/* B07464 800902C4 8F180004 */ lw $t8, %lo(D_80160004)($t8) +/* B07468 800902C8 8E0F016C */ lw $t7, 0x16c($s0) +/* B0746C 800902CC 0018C880 */ sll $t9, $t8, 2 +/* B07470 800902D0 01F94021 */ addu $t0, $t7, $t9 +/* B07474 800902D4 8D090000 */ lw $t1, ($t0) +/* B07478 800902D8 ACC90000 */ sw $t1, ($a2) +.L800902DC: +/* B0747C 800902DC 8FBF0024 */ lw $ra, 0x24($sp) +/* B07480 800902E0 8FB00020 */ lw $s0, 0x20($sp) +/* B07484 800902E4 27BD0028 */ addiu $sp, $sp, 0x28 +/* B07488 800902E8 03E00008 */ jr $ra +/* B0748C 800902EC 00001025 */ move $v0, $zero + diff --git a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_8086518C.s b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_8086518C.s index 3d905b55f6..4894fa5286 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_8086518C.s +++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_8086518C.s @@ -66,11 +66,11 @@ glabel func_8086518C /* 0036C 8086526C 0C219411 */ jal func_80865044 /* 00370 80865270 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80865274: -/* 00374 80865274 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00378 80865278 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 0037C 8086527C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00374 80865274 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00378 80865278 3C188013 */ lui $t8, %hi(D_801333E8) +/* 0037C 8086527C 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00380 80865280 A6000210 */ sh $zero, 0x0210($s0) ## 00000210 -/* 00384 80865284 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 00384 80865284 271833E8 */ addiu $t8, %lo(D_801333E8) /* 00388 80865288 AFB80014 */ sw $t8, 0x0014($sp) /* 0038C 8086528C AFA70010 */ sw $a3, 0x0010($sp) /* 00390 80865290 24041814 */ addiu $a0, $zero, 0x1814 ## $a0 = 00001814 @@ -414,10 +414,10 @@ glabel func_8086518C .L80865750: /* 00850 80865750 0C219411 */ jal func_80865044 /* 00854 80865754 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00858 80865758 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0085C 8086575C 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 00860 80865760 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00864 80865764 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 00858 80865758 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0085C 8086575C 3C198013 */ lui $t9, %hi(D_801333E8) +/* 00860 80865760 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00864 80865764 273933E8 */ addiu $t9, %lo(D_801333E8) /* 00868 80865768 AFB90014 */ sw $t9, 0x0014($sp) /* 0086C 8086576C AFA70010 */ sw $a3, 0x0010($sp) /* 00870 80865770 24041829 */ addiu $a0, $zero, 0x1829 ## $a0 = 00001829 @@ -430,10 +430,10 @@ glabel func_8086518C .L80865788: /* 00888 80865788 0C018B58 */ jal func_80062D60 /* 0088C 8086578C 8FA50044 */ lw $a1, 0x0044($sp) -/* 00890 80865790 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00894 80865794 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 00898 80865798 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0089C 8086579C 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 +/* 00890 80865790 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00894 80865794 3C088013 */ lui $t0, %hi(D_801333E8) +/* 00898 80865798 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0089C 8086579C 250833E8 */ addiu $t0, %lo(D_801333E8) /* 008A0 808657A0 AFA80014 */ sw $t0, 0x0014($sp) /* 008A4 808657A4 AFA70010 */ sw $a3, 0x0010($sp) /* 008A8 808657A8 24041813 */ addiu $a0, $zero, 0x1813 ## $a0 = 00001813 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870394.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870394.s index 87c39fed67..f2a78a1567 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870394.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870394.s @@ -93,15 +93,15 @@ glabel func_80870394 /* 008E4 808704C4 0C01A4F6 */ jal Cutscene_SetSegment /* 008E8 808704C8 8FA40044 */ lw $a0, 0x0044($sp) -/* 008EC 808704CC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 008F0 808704D0 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 008F4 808704D4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 008EC 808704CC 3C078013 */ lui $a3, %hi(D_801333E0) +/* 008F0 808704D0 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 008F4 808704D4 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 008F8 808704D8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 008FC 808704DC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00900 808704E0 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 00904 808704E4 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00908 808704E8 A02EFA74 */ sb $t6, -0x058C($at) ## 8015FA74 -/* 0090C 808704EC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 008FC 808704DC 3C018016 */ lui $at, %hi(gSaveContext+0x1414) +/* 00900 808704E0 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 00904 808704E4 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00908 808704E8 A02EFA74 */ sb $t6, %lo(gSaveContext+0x1414)($at) +/* 0090C 808704EC 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00910 808704F0 AFAF0014 */ sw $t7, 0x0014($sp) /* 00914 808704F4 AFA70010 */ sw $a3, 0x0010($sp) /* 00918 808704F8 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 @@ -114,14 +114,14 @@ glabel func_80870394 /* 00930 80870510 24060031 */ addiu $a2, $zero, 0x0031 ## $a2 = 00000031 /* 00934 80870514 8618001C */ lh $t8, 0x001C($s0) ## 0000001C .L80870518: -/* 00938 80870518 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0093C 8087051C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00938 80870518 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0093C 8087051C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00940 80870520 07010009 */ bgez $t8, .L80870548 /* 00944 80870524 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 00948 80870528 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 0094C 8087052C 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 00950 80870530 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 -/* 00954 80870534 272733E0 */ addiu $a3, $t9, 0x33E0 ## $a3 = 801333E0 +/* 00948 80870528 3C198013 */ lui $t9, %hi(D_801333E0) +/* 0094C 8087052C 3C088013 */ lui $t0, %hi(D_801333E8) +/* 00950 80870530 250833E8 */ addiu $t0, %lo(D_801333E8) +/* 00954 80870534 272733E0 */ addiu $a3, $t9, %lo(D_801333E0) /* 00958 80870538 AFA70010 */ sw $a3, 0x0010($sp) /* 0095C 8087053C AFA80014 */ sw $t0, 0x0014($sp) /* 00960 80870540 0C03DCE3 */ jal Audio_PlaySoundGeneral diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870564.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870564.s index 9b46cbe2e0..116cc30526 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870564.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870564.s @@ -1,6 +1,6 @@ glabel func_80870564 -/* 00984 80870564 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00988 80870568 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 00984 80870564 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 00988 80870568 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 0098C 8087056C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00990 80870570 AFBF0014 */ sw $ra, 0x0014($sp) /* 00994 80870574 AFA5001C */ sw $a1, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871364.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871364.s index fedf8c7109..96898dfc7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871364.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871364.s @@ -321,10 +321,10 @@ glabel func_80871364 /* 00700 808717F0 00063400 */ sll $a2, $a2, 16 /* 00704 808717F4 0C016A87 */ jal func_8005AA1C /* 00708 808717F8 00063403 */ sra $a2, $a2, 16 -/* 0070C 808717FC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00710 80871800 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 00714 80871804 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00718 80871808 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 +/* 0070C 808717FC 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00710 80871800 3C0C8013 */ lui $t4, %hi(D_801333E8) +/* 00714 80871804 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00718 80871808 258C33E8 */ addiu $t4, %lo(D_801333E8) /* 0071C 8087180C AFAC0014 */ sw $t4, 0x0014($sp) /* 00720 80871810 AFA70010 */ sw $a3, 0x0010($sp) /* 00724 80871814 24042027 */ addiu $a0, $zero, 0x2027 ## $a0 = 00002027 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871CF4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871CF4.s index c2b78cde02..f5ec5b88b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871CF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871CF4.s @@ -47,13 +47,13 @@ glabel func_80871CF4 /* 00394 80871D94 0C00B2DD */ jal Flags_SetSwitch /* 00398 80871D98 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 0039C 80871D9C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 003A0 80871DA0 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 003A4 80871DA4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 0039C 80871D9C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 003A0 80871DA0 3C098013 */ lui $t1, %hi(D_801333E8) +/* 003A4 80871DA4 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 003A8 80871DA8 A6000164 */ sh $zero, 0x0164($s0) ## 00000164 -/* 003AC 80871DAC 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 -/* 003B0 80871DB0 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 003B4 80871DB4 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 003AC 80871DAC 252933E8 */ addiu $t1, %lo(D_801333E8) +/* 003B0 80871DB0 3C058013 */ lui $a1, %hi(D_801333D4) +/* 003B4 80871DB4 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 003B8 80871DB8 AFA90014 */ sw $t1, 0x0014($sp) /* 003BC 80871DBC AFA70010 */ sw $a3, 0x0010($sp) /* 003C0 80871DC0 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 @@ -103,12 +103,12 @@ glabel func_80871CF4 /* 00460 80871E60 24A52288 */ addiu $a1, $a1, %lo(func_80872288) ## $a1 = 80872288 /* 00464 80871E64 0C21C680 */ jal BgDodoago_SetupAction /* 00468 80871E68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0046C 80871E6C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00470 80871E70 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 00474 80871E74 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00478 80871E78 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 -/* 0047C 80871E7C 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00480 80871E80 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0046C 80871E6C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00470 80871E70 3C088013 */ lui $t0, %hi(D_801333E8) +/* 00474 80871E74 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00478 80871E78 250833E8 */ addiu $t0, %lo(D_801333E8) +/* 0047C 80871E7C 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00480 80871E80 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00484 80871E84 AFA80014 */ sw $t0, 0x0014($sp) /* 00488 80871E88 AFA70010 */ sw $a3, 0x0010($sp) /* 0048C 80871E8C 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 @@ -121,12 +121,12 @@ glabel func_80871CF4 /* 004A0 80871EA0 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 /* 004A4 80871EA4 0C02003E */ jal func_800800F8 /* 004A8 80871EA8 AFA00010 */ sw $zero, 0x0010($sp) -/* 004AC 80871EAC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 004B0 80871EB0 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 004B4 80871EB4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 004B8 80871EB8 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 -/* 004BC 80871EBC 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 004C0 80871EC0 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 004AC 80871EAC 3C078013 */ lui $a3, %hi(D_801333E0) +/* 004B0 80871EB0 3C098013 */ lui $t1, %hi(D_801333E8) +/* 004B4 80871EB4 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 004B8 80871EB8 252933E8 */ addiu $t1, %lo(D_801333E8) +/* 004BC 80871EBC 3C058013 */ lui $a1, %hi(D_801333D4) +/* 004C0 80871EC0 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 004C4 80871EC4 AFA90014 */ sw $t1, 0x0014($sp) /* 004C8 80871EC8 AFA70010 */ sw $a3, 0x0010($sp) /* 004CC 80871ECC 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871FB8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871FB8.s index 3df900725f..1868e4f25f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871FB8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871FB8.s @@ -150,15 +150,15 @@ glabel func_80871FB8 /* 007E8 808721E8 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 007EC 808721EC 14400011 */ bne $v0, $zero, .L80872234 -/* 007F0 808721F0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 007F0 808721F0 3C078013 */ lui $a3, %hi(D_801333E0) /* 007F4 808721F4 3C058087 */ lui $a1, %hi(func_8087227C) ## $a1 = 80870000 /* 007F8 808721F8 24A5227C */ addiu $a1, $a1, %lo(func_8087227C) ## $a1 = 8087227C /* 007FC 808721FC 0C21C680 */ jal BgDodoago_SetupAction /* 00800 80872200 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00804 80872204 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00808 80872208 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 0080C 8087220C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00810 80872210 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 +/* 00804 80872204 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00808 80872208 3C0C8013 */ lui $t4, %hi(D_801333E8) +/* 0080C 8087220C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00810 80872210 258C33E8 */ addiu $t4, %lo(D_801333E8) /* 00814 80872214 AFAC0014 */ sw $t4, 0x0014($sp) /* 00818 80872218 AFA70010 */ sw $a3, 0x0010($sp) /* 0081C 8087221C 2404281D */ addiu $a0, $zero, 0x281D ## $a0 = 0000281D @@ -169,9 +169,9 @@ glabel func_80871FB8 /* 0082C 8087222C 1000000B */ beq $zero, $zero, .L8087225C /* 00830 80872230 8FBF0044 */ lw $ra, 0x0044($sp) .L80872234: -/* 00834 80872234 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 -/* 00838 80872238 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 000033E0 -/* 0083C 8087223C 25AD33E8 */ addiu $t5, $t5, 0x33E8 ## $t5 = 801333E8 +/* 00834 80872234 3C0D8013 */ lui $t5, %hi(D_801333E8) +/* 00838 80872238 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0083C 8087223C 25AD33E8 */ addiu $t5, %lo(D_801333E8) /* 00840 80872240 AFAD0014 */ sw $t5, 0x0014($sp) /* 00844 80872244 AFA70010 */ sw $a3, 0x0010($sp) /* 00848 80872248 2404201E */ addiu $a0, $zero, 0x201E ## $a0 = 0000201E diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872960.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872960.s index f505647dda..9c78a0eba6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872960.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872960.s @@ -157,8 +157,8 @@ glabel func_80872960 /* 00330 80872B60 46083400 */ add.s $f16, $f6, $f8 /* 00334 80872B64 E7B000B4 */ swc1 $f16, 0x00B4($sp) .L80872B68: -/* 00338 80872B68 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 0033C 80872B6C 8D6BE664 */ lw $t3, -0x199C($t3) ## 8015E664 +/* 00338 80872B68 3C0B8016 */ lui $t3, %hi(gSaveContext+4) +/* 0033C 80872B6C 8D6BE664 */ lw $t3, %lo(gSaveContext+4)($t3) /* 00340 80872B70 C7AA00B0 */ lwc1 $f10, 0x00B0($sp) /* 00344 80872B74 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00348 80872B78 15600005 */ bne $t3, $zero, .L80872B90 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872D20.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872D20.s index d63fdcd4e6..b9b9d06b7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872D20.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872D20.s @@ -17,10 +17,10 @@ glabel func_80872D20 /* 00528 80872D58 A42E04C6 */ sh $t6, 0x04C6($at) ## 000104C6 /* 0052C 80872D5C 84EF00A4 */ lh $t7, 0x00A4($a3) ## 000000A4 /* 00530 80872D60 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 00534 80872D64 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 00534 80872D64 3C188016 */ lui $t8, %hi(gSaveContext+0x3a) /* 00538 80872D68 15E1000B */ bne $t7, $at, .L80872D98 -/* 0053C 80872D6C 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 00540 80872D70 9318E69A */ lbu $t8, -0x1966($t8) ## 8015E69A +/* 0053C 80872D6C 3C088016 */ lui $t0, %hi(gSaveContext+0x3a) +/* 00540 80872D70 9318E69A */ lbu $t8, %lo(gSaveContext+0x3a)($t8) /* 00544 80872D74 57000010 */ bnel $t8, $zero, .L80872DB8 /* 00548 80872D78 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 0054C 80872D7C 861902EC */ lh $t9, 0x02EC($s0) ## 000002EC @@ -32,7 +32,7 @@ glabel func_80872D20 /* 00560 80872D90 10000010 */ beq $zero, $zero, .L80872DD4 /* 00564 80872D94 8FBF001C */ lw $ra, 0x001C($sp) .L80872D98: -/* 00568 80872D98 9108E69A */ lbu $t0, -0x1966($t0) ## FFFFE69A +/* 00568 80872D98 9108E69A */ lbu $t0, %lo(gSaveContext+0x3a)($t0) /* 0056C 80872D9C 55000006 */ bnel $t0, $zero, .L80872DB8 /* 00570 80872DA0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00574 80872DA4 0C00B55C */ jal Actor_Kill diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872DE4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872DE4.s index 45a5aad217..7e355fb264 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872DE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872DE4.s @@ -42,18 +42,18 @@ glabel func_80872DE4 /* 00604 80872E34 53010023 */ beql $t8, $at, .L80872EC4 /* 00608 80872E38 8FAE0020 */ lw $t6, 0x0020($sp) /* 0060C 80872E3C 850202EC */ lh $v0, 0x02EC($t0) ## 000002EC -/* 00610 80872E40 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00614 80872E44 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 +/* 00610 80872E40 3C058016 */ lui $a1, %hi(gSaveContext) +/* 00614 80872E44 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 00618 80872E48 10400009 */ beq $v0, $zero, .L80872E70 /* 0061C 80872E4C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00620 80872E50 1041000D */ beq $v0, $at, .L80872E88 -/* 00624 80872E54 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 00624 80872E54 3C058016 */ lui $a1, %hi(gSaveContext) /* 00628 80872E58 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 0062C 80872E5C 10410011 */ beq $v0, $at, .L80872EA4 -/* 00630 80872E60 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00634 80872E64 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 00630 80872E60 3C058016 */ lui $a1, %hi(gSaveContext) +/* 00634 80872E64 3C058016 */ lui $a1, %hi(gSaveContext) /* 00638 80872E68 10000054 */ beq $zero, $zero, .L80872FBC -/* 0063C 80872E6C 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 +/* 0063C 80872E6C 24A5E660 */ addiu $a1, %lo(gSaveContext) .L80872E70: /* 00640 80872E70 94B90EF2 */ lhu $t9, 0x0EF2($a1) ## 8015F552 /* 00644 80872E74 33290100 */ andi $t1, $t9, 0x0100 ## $t1 = 00000000 @@ -62,7 +62,7 @@ glabel func_80872DE4 /* 00650 80872E80 1000004E */ beq $zero, $zero, .L80872FBC /* 00654 80872E84 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L80872E88: -/* 00658 80872E88 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015CCC0 +/* 00658 80872E88 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 0065C 80872E8C 94AA0EF2 */ lhu $t2, 0x0EF2($a1) ## 8015DBB2 /* 00660 80872E90 314B0200 */ andi $t3, $t2, 0x0200 ## $t3 = 00000000 /* 00664 80872E94 15600049 */ bne $t3, $zero, .L80872FBC @@ -70,7 +70,7 @@ glabel func_80872DE4 /* 0066C 80872E9C 10000047 */ beq $zero, $zero, .L80872FBC /* 00670 80872EA0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L80872EA4: -/* 00674 80872EA4 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015B320 +/* 00674 80872EA4 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 00678 80872EA8 94AC0EF2 */ lhu $t4, 0x0EF2($a1) ## 8015C212 /* 0067C 80872EAC 318D0400 */ andi $t5, $t4, 0x0400 ## $t5 = 00000000 /* 00680 80872EB0 15A00042 */ bne $t5, $zero, .L80872FBC @@ -83,23 +83,23 @@ glabel func_80872DE4 /* 00698 80872EC8 1040000A */ beq $v0, $zero, .L80872EF4 /* 0069C 80872ECC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 006A0 80872ED0 1041001D */ beq $v0, $at, .L80872F48 -/* 006A4 80872ED4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 006A4 80872ED4 3C058016 */ lui $a1, %hi(gSaveContext) /* 006A8 80872ED8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 006AC 80872EDC 10410029 */ beq $v0, $at, .L80872F84 -/* 006B0 80872EE0 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 006B4 80872EE4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 006B8 80872EE8 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 +/* 006B0 80872EE0 3C058016 */ lui $a1, %hi(gSaveContext) +/* 006B4 80872EE4 3C058016 */ lui $a1, %hi(gSaveContext) +/* 006B8 80872EE8 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 006BC 80872EEC 10000033 */ beq $zero, $zero, .L80872FBC /* 006C0 80872EF0 01C04025 */ or $t0, $t6, $zero ## $t0 = 00000000 .L80872EF4: -/* 006C4 80872EF4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 006C8 80872EF8 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 +/* 006C4 80872EF4 3C058016 */ lui $a1, %hi(gSaveContext) +/* 006C8 80872EF8 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 006CC 80872EFC 90AF003A */ lbu $t7, 0x003A($a1) ## 8015E69A -/* 006D0 80872F00 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 006D0 80872F00 3C188016 */ lui $t8, %hi(gGameInfo) /* 006D4 80872F04 3C048087 */ lui $a0, %hi(D_8087556C) ## $a0 = 80870000 /* 006D8 80872F08 11E00005 */ beq $t7, $zero, .L80872F20 /* 006DC 80872F0C 00000000 */ nop -/* 006E0 80872F10 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 006E0 80872F10 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 006E4 80872F14 871912D8 */ lh $t9, 0x12D8($t8) ## 801612D8 /* 006E8 80872F18 13200009 */ beq $t9, $zero, .L80872F40 /* 006EC 80872F1C 00000000 */ nop @@ -108,16 +108,16 @@ glabel func_80872DE4 /* 006F4 80872F24 2484556C */ addiu $a0, $a0, %lo(D_8087556C) ## $a0 = 8087556C /* 006F8 80872F28 8FAA0020 */ lw $t2, 0x0020($sp) -/* 006FC 80872F2C 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 006FC 80872F2C 3C058016 */ lui $a1, %hi(gSaveContext) /* 00700 80872F30 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 00704 80872F34 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 +/* 00704 80872F34 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 00708 80872F38 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 0070C 80872F3C A54902EA */ sh $t1, 0x02EA($t2) ## 000002EA .L80872F40: /* 00710 80872F40 1000001E */ beq $zero, $zero, .L80872FBC /* 00714 80872F44 8FA80020 */ lw $t0, 0x0020($sp) .L80872F48: -/* 00718 80872F48 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015CCC0 +/* 00718 80872F48 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 0071C 80872F4C 90AB003C */ lbu $t3, 0x003C($a1) ## 8015CCFC /* 00720 80872F50 3C048087 */ lui $a0, %hi(D_808755A0) ## $a0 = 80870000 /* 00724 80872F54 15600009 */ bne $t3, $zero, .L80872F7C @@ -126,16 +126,16 @@ glabel func_80872DE4 /* 00730 80872F60 248455A0 */ addiu $a0, $a0, %lo(D_808755A0) ## $a0 = 808755A0 /* 00734 80872F64 8FAD0020 */ lw $t5, 0x0020($sp) -/* 00738 80872F68 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 00738 80872F68 3C058016 */ lui $a1, %hi(gSaveContext) /* 0073C 80872F6C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 00740 80872F70 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 +/* 00740 80872F70 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 00744 80872F74 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 00748 80872F78 A5AC02EA */ sh $t4, 0x02EA($t5) ## 000002EA .L80872F7C: /* 0074C 80872F7C 1000000F */ beq $zero, $zero, .L80872FBC /* 00750 80872F80 8FA80020 */ lw $t0, 0x0020($sp) .L80872F84: -/* 00754 80872F84 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015CCC0 +/* 00754 80872F84 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 00758 80872F88 90AE003D */ lbu $t6, 0x003D($a1) ## 8015CCFD /* 0075C 80872F8C 3C048087 */ lui $a0, %hi(D_808755D8) ## $a0 = 80870000 /* 00760 80872F90 55C0000A */ bnel $t6, $zero, .L80872FBC @@ -144,9 +144,9 @@ glabel func_80872DE4 /* 0076C 80872F9C 248455D8 */ addiu $a0, $a0, %lo(D_808755D8) ## $a0 = 808755D8 /* 00770 80872FA0 8FB80020 */ lw $t8, 0x0020($sp) -/* 00774 80872FA4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 00774 80872FA4 3C058016 */ lui $a1, %hi(gSaveContext) /* 00778 80872FA8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0077C 80872FAC 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 +/* 0077C 80872FAC 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 00780 80872FB0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 00784 80872FB4 A70F02EA */ sh $t7, 0x02EA($t8) ## 000002EA /* 00788 80872FB8 8FA80020 */ lw $t0, 0x0020($sp) @@ -164,13 +164,13 @@ glabel func_80872DE4 /* 007B4 80872FE4 11410041 */ beq $t2, $at, .L808730EC /* 007B8 80872FE8 00000000 */ nop /* 007BC 80872FEC 10400009 */ beq $v0, $zero, .L80873014 -/* 007C0 80872FF0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 007C0 80872FF0 3C0E8016 */ lui $t6, %hi(gSegments) /* 007C4 80872FF4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 007C8 80872FF8 10410018 */ beq $v0, $at, .L8087305C -/* 007CC 80872FFC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 007CC 80872FFC 3C0E8016 */ lui $t6, %hi(gSegments) /* 007D0 80873000 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 007D4 80873004 10410027 */ beq $v0, $at, .L808730A4 -/* 007D8 80873008 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 007D8 80873008 3C0E8016 */ lui $t6, %hi(gSegments) /* 007DC 8087300C 10000076 */ beq $zero, $zero, .L808731E8 /* 007E0 80873010 00000000 */ nop .L80873014: @@ -181,7 +181,7 @@ glabel func_80872DE4 /* 007F4 80873024 000C6880 */ sll $t5, $t4, 2 /* 007F8 80873028 01CD7021 */ addu $t6, $t6, $t5 /* 007FC 8087302C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00800 80873030 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 00800 80873030 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 00804 80873034 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00808 80873038 00417824 */ and $t7, $v0, $at /* 0080C 8087303C 8FA90024 */ lw $t1, 0x0024($sp) @@ -200,7 +200,7 @@ glabel func_80872DE4 /* 0083C 8087306C 000C6880 */ sll $t5, $t4, 2 /* 00840 80873070 01CD7021 */ addu $t6, $t6, $t5 /* 00844 80873074 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00848 80873078 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 00848 80873078 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 0084C 8087307C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00850 80873080 00417824 */ and $t7, $v0, $at /* 00854 80873084 8FA90024 */ lw $t1, 0x0024($sp) @@ -219,7 +219,7 @@ glabel func_80872DE4 /* 00884 808730B4 000C6880 */ sll $t5, $t4, 2 /* 00888 808730B8 01CD7021 */ addu $t6, $t6, $t5 /* 0088C 808730BC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00890 808730C0 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 00890 808730C0 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 00894 808730C4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00898 808730C8 00417824 */ and $t7, $v0, $at /* 0089C 808730CC 8FA90024 */ lw $t1, 0x0024($sp) @@ -232,13 +232,13 @@ glabel func_80872DE4 /* 008B8 808730E8 A0AA1414 */ sb $t2, 0x1414($a1) ## 8015FA74 .L808730EC: /* 008BC 808730EC 10400009 */ beq $v0, $zero, .L80873114 -/* 008C0 808730F0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 008C0 808730F0 3C0E8016 */ lui $t6, %hi(gSegments) /* 008C4 808730F4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 008C8 808730F8 10410018 */ beq $v0, $at, .L8087315C -/* 008CC 808730FC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 008CC 808730FC 3C0E8016 */ lui $t6, %hi(gSegments) /* 008D0 80873100 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 008D4 80873104 10410027 */ beq $v0, $at, .L808731A4 -/* 008D8 80873108 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 008D8 80873108 3C0E8016 */ lui $t6, %hi(gSegments) /* 008DC 8087310C 10000036 */ beq $zero, $zero, .L808731E8 /* 008E0 80873110 00000000 */ nop .L80873114: @@ -249,7 +249,7 @@ glabel func_80872DE4 /* 008F4 80873124 000C6880 */ sll $t5, $t4, 2 /* 008F8 80873128 01CD7021 */ addu $t6, $t6, $t5 /* 008FC 8087312C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00900 80873130 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 00900 80873130 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 00904 80873134 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00908 80873138 00417824 */ and $t7, $v0, $at /* 0090C 8087313C 8FA90024 */ lw $t1, 0x0024($sp) @@ -268,7 +268,7 @@ glabel func_80872DE4 /* 0093C 8087316C 000C6880 */ sll $t5, $t4, 2 /* 00940 80873170 01CD7021 */ addu $t6, $t6, $t5 /* 00944 80873174 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00948 80873178 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 00948 80873178 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 0094C 8087317C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00950 80873180 00417824 */ and $t7, $v0, $at /* 00954 80873184 8FA90024 */ lw $t1, 0x0024($sp) @@ -287,7 +287,7 @@ glabel func_80872DE4 /* 00984 808731B4 000C6880 */ sll $t5, $t4, 2 /* 00988 808731B8 01CD7021 */ addu $t6, $t6, $t5 /* 0098C 808731BC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00990 808731C0 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 00990 808731C0 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 00994 808731C4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00998 808731C8 00417824 */ and $t7, $v0, $at /* 0099C 808731CC 8FA90024 */ lw $t1, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s index 9bc178af74..8a973a45ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s @@ -131,14 +131,14 @@ glabel func_80873868 /* 011F8 80873A28 86020306 */ lh $v0, 0x0306($s0) ## 00000306 .L80873A2C: /* 011FC 80873A2C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01200 80873A30 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 01200 80873A30 3C038016 */ lui $v1, %hi(gSaveContext) /* 01204 80873A34 28410002 */ slti $at, $v0, 0x0002 /* 01208 80873A38 14200002 */ bne $at, $zero, .L80873A44 /* 0120C 80873A3C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 01210 80873A40 A60E0306 */ sh $t6, 0x0306($s0) ## 00000306 .L80873A44: /* 01214 80873A44 86020302 */ lh $v0, 0x0302($s0) ## 00000302 -/* 01218 80873A48 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 01218 80873A48 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0121C 80873A4C 24180140 */ addiu $t8, $zero, 0x0140 ## $t8 = 00000140 /* 01220 80873A50 2841006E */ slti $at, $v0, 0x006E /* 01224 80873A54 14200003 */ bne $at, $zero, .L80873A64 @@ -157,8 +157,8 @@ glabel func_80873868 /* 01254 80873A84 86020302 */ lh $v0, 0x0302($s0) ## 00000302 /* 01258 80873A88 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 .L80873A8C: -/* 0125C 80873A8C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 01260 80873A90 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0125C 80873A8C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 01260 80873A90 2463E660 */ addiu $v1, %lo(gSaveContext) /* 01264 80873A94 84690030 */ lh $t1, 0x0030($v1) ## 8015E690 /* 01268 80873A98 846A002E */ lh $t2, 0x002E($v1) ## 8015E68E /* 0126C 80873A9C 241900DA */ addiu $t9, $zero, 0x00DA ## $t9 = 000000DA diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s index fe84e82977..a90e0bb565 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s @@ -178,46 +178,46 @@ glabel func_80874304 /* 01D48 80874578 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 01D4C 8087457C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 01D50 80874580 10610010 */ beq $v1, $at, .L808745C4 -/* 01D54 80874584 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 01D54 80874584 3C0F8016 */ lui $t7, %hi(gSaveContext+0x3a) /* 01D58 80874588 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 01D5C 8087458C 1061001F */ beq $v1, $at, .L8087460C /* 01D60 80874590 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 01D64 80874594 10000024 */ beq $zero, $zero, .L80874628 /* 01D68 80874598 920C02E6 */ lbu $t4, 0x02E6($s0) ## 000002E6 .L8087459C: -/* 01D6C 8087459C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 01D70 808745A0 A02DE69A */ sb $t5, -0x1966($at) ## 8015E69A -/* 01D74 808745A4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 01D6C 8087459C 3C018016 */ lui $at, %hi(gSaveContext+0x3a) +/* 01D70 808745A0 A02DE69A */ sb $t5, %lo(gSaveContext+0x3a)($at) +/* 01D74 808745A4 3C018016 */ lui $at, %hi(gSaveContext+0x13f6) /* 01D78 808745A8 240E0030 */ addiu $t6, $zero, 0x0030 ## $t6 = 00000030 -/* 01D7C 808745AC A42EFA56 */ sh $t6, -0x05AA($at) ## 8015FA56 +/* 01D7C 808745AC A42EFA56 */ sh $t6, %lo(gSaveContext+0x13f6)($at) /* 01D80 808745B0 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 /* 01D84 808745B4 0C020978 */ jal Interface_ChangeAlpha /* 01D88 808745B8 A7A30056 */ sh $v1, 0x0056($sp) /* 01D8C 808745BC 10000019 */ beq $zero, $zero, .L80874624 /* 01D90 808745C0 87A30056 */ lh $v1, 0x0056($sp) .L808745C4: -/* 01D94 808745C4 91EFE69A */ lbu $t7, -0x1966($t7) ## FFFFE69A +/* 01D94 808745C4 91EFE69A */ lbu $t7, %lo(gSaveContext+0x3a)($t7) /* 01D98 808745C8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 01D9C 808745CC 240A0060 */ addiu $t2, $zero, 0x0060 ## $t2 = 00000060 /* 01DA0 808745D0 15E00004 */ bne $t7, $zero, .L808745E4 /* 01DA4 808745D4 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 /* 01DA8 808745D8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01DAC 808745DC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 01DB0 808745E0 A038E69A */ sb $t8, -0x1966($at) ## 8015E69A +/* 01DAC 808745DC 3C018016 */ lui $at, %hi(gSaveContext+0x3a) +/* 01DB0 808745E0 A038E69A */ sb $t8, %lo(gSaveContext+0x3a)($at) .L808745E4: -/* 01DB4 808745E4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 01DB8 808745E8 A039E69C */ sb $t9, -0x1964($at) ## 8015E69C -/* 01DBC 808745EC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 01DC0 808745F0 A42AFA56 */ sh $t2, -0x05AA($at) ## 8015FA56 -/* 01DC4 808745F4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 01DC8 808745F8 A020E692 */ sb $zero, -0x196E($at) ## 8015E692 +/* 01DB4 808745E4 3C018016 */ lui $at, %hi(gSaveContext+0x3c) +/* 01DB8 808745E8 A039E69C */ sb $t9, %lo(gSaveContext+0x3c)($at) +/* 01DBC 808745EC 3C018016 */ lui $at, %hi(gSaveContext+0x13f6) +/* 01DC0 808745F0 A42AFA56 */ sh $t2, %lo(gSaveContext+0x13f6)($at) +/* 01DC4 808745F4 3C018016 */ lui $at, %hi(gSaveContext+0x32) +/* 01DC8 808745F8 A020E692 */ sb $zero, %lo(gSaveContext+0x32)($at) /* 01DCC 808745FC 0C020978 */ jal Interface_ChangeAlpha /* 01DD0 80874600 A7A30056 */ sh $v1, 0x0056($sp) /* 01DD4 80874604 10000007 */ beq $zero, $zero, .L80874624 /* 01DD8 80874608 87A30056 */ lh $v1, 0x0056($sp) .L8087460C: -/* 01DDC 8087460C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 01DE0 80874610 A02BE69D */ sb $t3, -0x1963($at) ## 8015E69D +/* 01DDC 8087460C 3C018016 */ lui $at, %hi(gSaveContext+0x3d) +/* 01DE0 80874610 A02BE69D */ sb $t3, %lo(gSaveContext+0x3d)($at) /* 01DE4 80874614 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 /* 01DE8 80874618 0C020978 */ jal Interface_ChangeAlpha /* 01DEC 8087461C A7A30056 */ sh $v1, 0x0056($sp) @@ -225,8 +225,8 @@ glabel func_80874304 .L80874624: /* 01DF4 80874624 920C02E6 */ lbu $t4, 0x02E6($s0) ## 000002E6 .L80874628: -/* 01DF8 80874628 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 01DFC 8087462C 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 01DF8 80874628 3C098016 */ lui $t1, %hi(gSaveContext) +/* 01DFC 8087462C 2529E660 */ addiu $t1, %lo(gSaveContext) /* 01E00 80874630 15800008 */ bne $t4, $zero, .L80874654 /* 01E04 80874634 240D0140 */ addiu $t5, $zero, 0x0140 ## $t5 = 00000140 /* 01E08 80874638 A52D1424 */ sh $t5, 0x1424($t1) ## 8015FA84 @@ -239,10 +239,10 @@ glabel func_80874304 .L80874654: /* 01E24 80874654 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 .L80874658: -/* 01E28 80874658 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 01E28 80874658 3C098016 */ lui $t1, %hi(gSaveContext) /* 01E2C 8087465C 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B /* 01E30 80874660 10610074 */ beq $v1, $at, .L80874834 -/* 01E34 80874664 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 01E34 80874664 2529E660 */ addiu $t1, %lo(gSaveContext) /* 01E38 80874668 8E2F1D8C */ lw $t7, 0x1D8C($s1) ## 00001D8C /* 01E3C 8087466C 95E20000 */ lhu $v0, 0x0000($t7) ## 00000000 /* 01E40 80874670 2841000E */ slti $at, $v0, 0x000E @@ -293,8 +293,8 @@ glabel func_80874304 /* 01EE8 80874718 87A30056 */ lh $v1, 0x0056($sp) /* 01EEC 8087471C 10400025 */ beq $v0, $zero, .L808747B4 /* 01EF0 80874720 AE020344 */ sw $v0, 0x0344($s0) ## 00000344 -/* 01EF4 80874724 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01EF8 80874728 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01EF4 80874724 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01EF8 80874728 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01EFC 8087472C 904B003A */ lbu $t3, 0x003A($v0) ## 8015E69A /* 01F00 80874730 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 01F04 80874734 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 @@ -305,8 +305,8 @@ glabel func_80874304 .L80874748: /* 01F18 80874748 0C021DA0 */ jal func_80087680 /* 01F1C 8087474C A7A30056 */ sh $v1, 0x0056($sp) -/* 01F20 80874750 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01F24 80874754 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01F20 80874750 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01F24 80874754 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01F28 80874758 87A30056 */ lh $v1, 0x0056($sp) .L8087475C: /* 01F2C 8087475C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 @@ -317,9 +317,9 @@ glabel func_80874304 /* 01F40 80874770 0C020978 */ jal Interface_ChangeAlpha /* 01F44 80874774 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 /* 01F48 80874778 8FB80040 */ lw $t8, 0x0040($sp) -/* 01F4C 8087477C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 01F4C 8087477C 3C028016 */ lui $v0, %hi(gSaveContext) /* 01F50 80874780 3C198087 */ lui $t9, %hi(D_808754C0) ## $t9 = 80870000 -/* 01F54 80874784 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01F54 80874784 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01F58 80874788 0338C821 */ addu $t9, $t9, $t8 /* 01F5C 8087478C 873954C0 */ lh $t9, %lo(D_808754C0)($t9) /* 01F60 80874790 944F0EF2 */ lhu $t7, 0x0EF2($v0) ## 8015F552 @@ -332,8 +332,8 @@ glabel func_80874304 /* 01F7C 808747AC 0C021344 */ jal Item_Give /* 01F80 808747B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L808747B4: -/* 01F84 808747B4 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 01F88 808747B8 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 01F84 808747B4 3C098016 */ lui $t1, %hi(gSaveContext) +/* 01F88 808747B8 2529E660 */ addiu $t1, %lo(gSaveContext) /* 01F8C 808747BC 1000001D */ beq $zero, $zero, .L80874834 /* 01F90 808747C0 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 .L808747C4: @@ -384,8 +384,8 @@ glabel func_80874304 /* 02034 80874864 00000000 */ nop /* 02038 80874868 AE000344 */ sw $zero, 0x0344($s0) ## 00000344 -/* 0203C 8087486C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 02040 80874870 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 0203C 8087486C 3C098016 */ lui $t1, %hi(gSaveContext) +/* 02040 80874870 2529E660 */ addiu $t1, %lo(gSaveContext) /* 02044 80874874 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 /* 02048 80874878 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B .L8087487C: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s index c1ef522b10..2d4c12cc62 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s @@ -40,8 +40,8 @@ glabel func_80874BE0 /* 02420 80874C50 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 /* 02424 80874C54 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 02428 80874C58 860A02F2 */ lh $t2, 0x02F2($s0) ## 000002F2 -/* 0242C 80874C5C 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 02430 80874C60 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 0242C 80874C5C 3C068016 */ lui $a2, %hi(gSegments) +/* 02430 80874C60 24C66FA8 */ addiu $a2, %lo(gSegments) /* 02434 80874C64 000A5880 */ sll $t3, $t2, 2 /* 02438 80874C68 012B6021 */ addu $t4, $t1, $t3 /* 0243C 80874C6C 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s index 1f3a256181..5f36030476 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s @@ -56,8 +56,8 @@ glabel func_808751A0 /* 02A0C 8087523C 02419021 */ addu $s2, $s2, $at /* 02A10 80875240 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 02A14 80875244 00194702 */ srl $t0, $t9, 28 -/* 02A18 80875248 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 02A1C 8087524C 254A6FA8 */ addiu $t2, $t2, 0x6FA8 ## $t2 = 80166FA8 +/* 02A18 80875248 3C0A8016 */ lui $t2, %hi(gSegments) +/* 02A1C 8087524C 254A6FA8 */ addiu $t2, %lo(gSegments) /* 02A20 80875250 00084880 */ sll $t1, $t0, 2 /* 02A24 80875254 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 02A28 80875258 0041B024 */ and $s6, $v0, $at diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/func_80875C88.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/func_80875C88.s index bb17578418..4240d6af96 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/func_80875C88.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/func_80875C88.s @@ -280,11 +280,11 @@ glabel func_80875C88 /* 00708 80876028 00000000 */ nop .L8087602C: /* 0070C 8087602C 1441000D */ bne $v0, $at, .L80876064 -/* 00710 80876030 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00714 80876034 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00718 80876038 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 0071C 8087603C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00720 80876040 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 +/* 00710 80876030 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00714 80876034 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00718 80876038 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 0071C 8087603C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00720 80876040 25CE33E8 */ addiu $t6, %lo(D_801333E8) /* 00724 80876044 AFAE0014 */ sw $t6, 0x0014($sp) /* 00728 80876048 AFA70010 */ sw $a3, 0x0010($sp) /* 0072C 8087604C 24042893 */ addiu $a0, $zero, 0x2893 ## $a0 = 00002893 @@ -295,9 +295,9 @@ glabel func_80875C88 /* 0073C 8087605C 1000000B */ beq $zero, $zero, .L8087608C /* 00740 80876060 4406B000 */ mfc1 $a2, $f22 .L80876064: -/* 00744 80876064 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 00748 80876068 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 000033E0 -/* 0074C 8087606C 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 +/* 00744 80876064 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 00748 80876068 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0074C 8087606C 254A33E8 */ addiu $t2, %lo(D_801333E8) /* 00750 80876070 AFAA0014 */ sw $t2, 0x0014($sp) /* 00754 80876074 AFA70010 */ sw $a3, 0x0010($sp) /* 00758 80876078 2404205C */ addiu $a0, $zero, 0x205C ## $a0 = 0000205C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80878F34.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80878F34.s index 706f7fb04d..12c64a6f1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80878F34.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80878F34.s @@ -37,14 +37,14 @@ glabel func_80878F34 /* 00384 80878FB4 1000000D */ beq $zero, $zero, .L80878FEC /* 00388 80878FB8 A6190164 */ sh $t9, 0x0164($s0) ## 00000164 .L80878FBC: -/* 0038C 80878FBC 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 00390 80878FC0 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 +/* 0038C 80878FBC 3C0A8013 */ lui $t2, %hi(D_801333E0) +/* 00390 80878FC0 3C0B8013 */ lui $t3, %hi(D_801333E8) /* 00394 80878FC4 A6080164 */ sh $t0, 0x0164($s0) ## 00000164 /* 00398 80878FC8 A6090166 */ sh $t1, 0x0166($s0) ## 00000166 -/* 0039C 80878FCC 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 -/* 003A0 80878FD0 254733E0 */ addiu $a3, $t2, 0x33E0 ## $a3 = 801333E0 -/* 003A4 80878FD4 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 003A8 80878FD8 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0039C 80878FCC 256B33E8 */ addiu $t3, %lo(D_801333E8) +/* 003A0 80878FD0 254733E0 */ addiu $a3, $t2, %lo(D_801333E0) +/* 003A4 80878FD4 3C058013 */ lui $a1, %hi(D_801333D4) +/* 003A8 80878FD8 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 003AC 80878FDC AFA70010 */ sw $a3, 0x0010($sp) /* 003B0 80878FE0 AFAB0014 */ sw $t3, 0x0014($sp) /* 003B4 80878FE4 0C03DCE3 */ jal Audio_PlaySoundGeneral @@ -62,8 +62,8 @@ glabel func_80878F34 /* 003D4 80879004 50400023 */ beql $v0, $zero, .L80879094 /* 003D8 80879008 86030166 */ lh $v1, 0x0166($s0) ## 00000166 /* 003DC 8087900C 96020164 */ lhu $v0, 0x0164($s0) ## 00000164 -/* 003E0 80879010 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 003E4 80879014 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 003E0 80879010 3C078013 */ lui $a3, %hi(D_801333E0) +/* 003E4 80879014 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 003E8 80879018 304C0008 */ andi $t4, $v0, 0x0008 ## $t4 = 00000000 /* 003EC 8087901C 11800010 */ beq $t4, $zero, .L80879060 /* 003F0 80879020 34580008 */ ori $t8, $v0, 0x0008 ## $t8 = 00000008 @@ -86,12 +86,12 @@ glabel func_80878F34 /* 0042C 8087905C A60F0164 */ sh $t7, 0x0164($s0) ## 00000164 .L80879060: /* 00430 80879060 24190130 */ addiu $t9, $zero, 0x0130 ## $t9 = 00000130 -/* 00434 80879064 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 +/* 00434 80879064 3C088013 */ lui $t0, %hi(D_801333E8) /* 00438 80879068 A6180164 */ sh $t8, 0x0164($s0) ## 00000164 /* 0043C 8087906C A6190168 */ sh $t9, 0x0168($s0) ## 00000168 -/* 00440 80879070 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 -/* 00444 80879074 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00448 80879078 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00440 80879070 250833E8 */ addiu $t0, %lo(D_801333E8) +/* 00444 80879074 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00448 80879078 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 0044C 8087907C AFA80014 */ sw $t0, 0x0014($sp) /* 00450 80879080 AFA70010 */ sw $a3, 0x0010($sp) /* 00454 80879084 24042881 */ addiu $a0, $zero, 0x2881 ## $a0 = 00002881 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087B284.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087B284.s index 48ccdb547e..4f3c7ca465 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087B284.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087B284.s @@ -18,12 +18,12 @@ glabel func_8087B284 /* 00500 8087B2C0 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 /* 00504 8087B2C4 13000012 */ beq $t8, $zero, .L8087B310 /* 00508 8087B2C8 AE0E0134 */ sw $t6, 0x0134($s0) ## 00000134 -/* 0050C 8087B2CC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00510 8087B2D0 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 00514 8087B2D4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00518 8087B2D8 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 0051C 8087B2DC 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00520 8087B2E0 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0050C 8087B2CC 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00510 8087B2D0 3C198013 */ lui $t9, %hi(D_801333E8) +/* 00514 8087B2D4 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00518 8087B2D8 273933E8 */ addiu $t9, %lo(D_801333E8) +/* 0051C 8087B2DC 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00520 8087B2E0 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00524 8087B2E4 AFB90014 */ sw $t9, 0x0014($sp) /* 00528 8087B2E8 AFA70010 */ sw $a3, 0x0010($sp) /* 0052C 8087B2EC 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B7E8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B7E8.s index 89d266fd35..b65a61415d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B7E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B7E8.s @@ -12,9 +12,9 @@ glabel func_8087B7E8 /* 00160 8087B810 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00164 8087B814 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 /* 00168 8087B818 24010053 */ addiu $at, $zero, 0x0053 ## $at = 00000053 -/* 0016C 8087B81C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 0016C 8087B81C 3C038016 */ lui $v1, %hi(gSaveContext) /* 00170 8087B820 1441001E */ bne $v0, $at, .L8087B89C -/* 00174 8087B824 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00174 8087B824 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00178 8087B828 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 /* 0017C 8087B82C 51C0001C */ beql $t6, $zero, .L8087B8A0 /* 00180 8087B830 4600103C */ c.lt.s $f2, $f0 @@ -47,8 +47,8 @@ glabel func_8087B7E8 .L8087B89C: /* 001EC 8087B89C 4600103C */ c.lt.s $f2, $f0 .L8087B8A0: -/* 001F0 8087B8A0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 001F4 8087B8A4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 001F0 8087B8A0 3C038016 */ lui $v1, %hi(gSaveContext) +/* 001F4 8087B8A4 2463E660 */ addiu $v1, %lo(gSaveContext) /* 001F8 8087B8A8 24010057 */ addiu $at, $zero, 0x0057 ## $at = 00000057 /* 001FC 8087B8AC 4503000E */ bc1tl .L8087B8E8 /* 00200 8087B8B0 E4E20150 */ swc1 $f2, 0x0150($a3) ## 00000150 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B938.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B938.s index 901615d168..ca1905b6ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B938.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B938.s @@ -52,7 +52,7 @@ glabel func_8087B938 /* 00340 8087B9F0 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF /* 00344 8087B9F4 E6120150 */ swc1 $f18, 0x0150($s0) ## 00000150 /* 00348 8087B9F8 8C590680 */ lw $t9, 0x0680($v0) ## 00000680 -/* 0034C 8087B9FC 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 0034C 8087B9FC 3C0A8016 */ lui $t2, %hi(gSaveContext+0x10) /* 00350 8087BA00 03214024 */ and $t0, $t9, $at /* 00354 8087BA04 AC480680 */ sw $t0, 0x0680($v0) ## 00000680 /* 00358 8087BA08 8609001C */ lh $t1, 0x001C($s0) ## 0000001C @@ -64,7 +64,7 @@ glabel func_8087B938 /* 00370 8087BA20 10000017 */ beq $zero, $zero, .L8087BA80 /* 00374 8087BA24 00000000 */ nop .L8087BA28: -/* 00378 8087BA28 8D4AE670 */ lw $t2, -0x1990($t2) ## FFFFE670 +/* 00378 8087BA28 8D4AE670 */ lw $t2, %lo(gSaveContext+0x10)($t2) /* 0037C 8087BA2C 8FA50044 */ lw $a1, 0x0044($sp) /* 00380 8087BA30 11400013 */ beq $t2, $zero, .L8087BA80 /* 00384 8087BA34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Update.s index 1f8d0ae54a..0e7d547313 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Update.s @@ -147,8 +147,8 @@ glabel BgHidanCurtain_Update /* 007D0 80885970 0C017713 */ jal Actor_CollisionCheck_SetOT ## CollisionCheck_setOT /* 007D4 80885974 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 007D8 80885978 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 007DC 8088597C 8D29F9C0 */ lw $t1, -0x0640($t1) ## 8015F9C0 +/* 007D8 80885978 3C098016 */ lui $t1, %hi(gSaveContext+0x1360) +/* 007DC 8088597C 8D29F9C0 */ lw $t1, %lo(gSaveContext+0x1360)($t1) /* 007E0 80885980 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 007E4 80885984 29210004 */ slti $at, $t1, 0x0004 /* 007E8 80885988 50200011 */ beql $at, $zero, .L808859D0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s index 66d84a2875..c82887d2ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s @@ -33,12 +33,12 @@ glabel BgHidanFwbig_Draw /* 00924 80887C14 248473D0 */ addiu $a0, $a0, 0x73D0 ## $a0 = 040173D0 /* 00928 80887C18 0004C100 */ sll $t8, $a0, 4 /* 0092C 80887C1C 0018CF02 */ srl $t9, $t8, 28 -/* 00930 80887C20 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 00930 80887C20 3C058016 */ lui $a1, %hi(gSegments) /* 00934 80887C24 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 00938 80887C28 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 0093C 80887C2C AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 00940 80887C30 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 -/* 00944 80887C34 24A56FA8 */ addiu $a1, $a1, 0x6FA8 ## $a1 = 80166FA8 +/* 00944 80887C34 24A56FA8 */ addiu $a1, %lo(gSegments) /* 00948 80887C38 00194880 */ sll $t1, $t9, 2 /* 0094C 80887C3C 00A95021 */ addu $t2, $a1, $t1 /* 00950 80887C40 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Update.s index b4a48d4c91..8749259ff1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Update.s @@ -50,13 +50,13 @@ glabel BgHidanFwbig_Update /* 00818 80887B08 44814000 */ mtc1 $at, $f8 ## $f8 = 200.00 /* 0081C 80887B0C C606000C */ lwc1 $f6, 0x000C($s0) ## 0000000C /* 00820 80887B10 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00824 80887B14 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 00824 80887B14 3C0D8016 */ lui $t5, %hi(gSaveContext+0x1360) /* 00828 80887B18 46083281 */ sub.s $f10, $f6, $f8 /* 0082C 80887B1C 4610503C */ c.lt.s $f10, $f16 /* 00830 80887B20 00000000 */ nop /* 00834 80887B24 45020026 */ bc1fl .L80887BC0 /* 00838 80887B28 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0083C 80887B2C 8DADF9C0 */ lw $t5, -0x0640($t5) ## 8015F9C0 +/* 0083C 80887B2C 8DADF9C0 */ lw $t5, %lo(gSaveContext+0x1360)($t5) /* 00840 80887B30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00844 80887B34 29A10004 */ slti $at, $t5, 0x0004 /* 00848 80887B38 50200006 */ beql $at, $zero, .L80887B54 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888734.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888734.s index fe92ea2fbc..badf581988 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888734.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888734.s @@ -1,6 +1,6 @@ glabel func_80888734 -/* 006F4 80888734 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 006F8 80888738 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 006F4 80888734 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 006F8 80888738 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 006FC 8088873C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00700 80888740 AFBF0014 */ sw $ra, 0x0014($sp) /* 00704 80888744 85CF0110 */ lh $t7, 0x0110($t6) ## 80160110 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s index 918f10b8c8..592f666213 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s @@ -109,7 +109,7 @@ glabel func_8088BC40 /* 00D2C 8088BDAC 01074021 */ addu $t0, $t0, $a3 /* 00D30 8088BDB0 8D081DE4 */ lw $t0, 0x1DE4($t0) ## 00011DE4 /* 00D34 8088BDB4 3C048089 */ lui $a0, %hi(D_8088BFC4) ## $a0 = 80890000 -/* 00D38 8088BDB8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00D38 8088BDB8 3C0F8016 */ lui $t7, %hi(gSegments) /* 00D3C 8088BDBC 31090007 */ andi $t1, $t0, 0x0007 ## $t1 = 00000000 /* 00D40 8088BDC0 00095080 */ sll $t2, $t1, 2 /* 00D44 8088BDC4 008A2021 */ addu $a0, $a0, $t2 @@ -120,7 +120,7 @@ glabel func_8088BC40 /* 00D58 8088BDD8 000C6F02 */ srl $t5, $t4, 28 /* 00D5C 8088BDDC 000D7080 */ sll $t6, $t5, 2 /* 00D60 8088BDE0 01EE7821 */ addu $t7, $t7, $t6 -/* 00D64 8088BDE4 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 00D64 8088BDE4 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 00D68 8088BDE8 00815824 */ and $t3, $a0, $at /* 00D6C 8088BDEC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00D70 8088BDF0 016FC021 */ addu $t8, $t3, $t7 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s index b61fb40d01..5a35c4f592 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s @@ -52,8 +52,8 @@ glabel BgHidanRsekizou_Draw /* 008CC 8088CACC AE3802C0 */ sw $t8, 0x02C0($s1) ## 000002C0 /* 008D0 8088CAD0 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 /* 008D4 8088CAD4 27B3005C */ addiu $s3, $sp, 0x005C ## $s3 = FFFFFFB4 -/* 008D8 8088CAD8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 008DC 8088CADC 24A5DB60 */ addiu $a1, $a1, 0xDB60 ## $a1 = 8012DB60 +/* 008D8 8088CAD8 3C058013 */ lui $a1, %hi(gMtxFClear) +/* 008DC 8088CADC 24A5DB60 */ addiu $a1, %lo(gMtxFClear) /* 008E0 8088CAE0 02602025 */ or $a0, $s3, $zero ## $a0 = FFFFFFB4 /* 008E4 8088CAE4 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 008E8 8088CAE8 0C0346EA */ jal Matrix_MtxFCopy diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/func_8088C70C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/func_8088C70C.s index e7e3cc5cd6..d95e550e52 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/func_8088C70C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/func_8088C70C.s @@ -49,7 +49,7 @@ glabel func_8088C70C /* 00580 8088C780 0018C8C0 */ sll $t9, $t8, 3 /* 00584 8088C784 0338C823 */ subu $t9, $t9, $t8 /* 00588 8088C788 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 0058C 8088C78C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0058C 8088C78C 3C188016 */ lui $t8, %hi(gSegments) /* 00590 8088C790 26100008 */ addiu $s0, $s0, 0x0008 ## $s0 = 00000008 /* 00594 8088C794 468021A0 */ cvt.s.w $f6, $f4 /* 00598 8088C798 46083282 */ mul.s $f10, $f6, $f8 @@ -63,7 +63,7 @@ glabel func_8088C70C /* 005B8 8088C7B8 000D7702 */ srl $t6, $t5, 28 /* 005BC 8088C7BC 000E7880 */ sll $t7, $t6, 2 /* 005C0 8088C7C0 030FC021 */ addu $t8, $t8, $t7 -/* 005C4 8088C7C4 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 005C4 8088C7C4 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 005C8 8088C7C8 00616024 */ and $t4, $v1, $at /* 005CC 8088C7CC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 005D0 8088C7D0 0198C821 */ addu $t9, $t4, $t8 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D9F4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D9F4.s index 150e8e0bde..31f03295a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D9F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088D9F4.s @@ -39,7 +39,7 @@ glabel func_8088D9F4 /* 00B88 8088DA48 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 /* 00B8C 8088DA4C 468021A0 */ cvt.s.w $f6, $f4 /* 00B90 8088DA50 3C048089 */ lui $a0, %hi(D_8088E27C) ## $a0 = 80890000 -/* 00B94 8088DA54 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 00B94 8088DA54 3C198016 */ lui $t9, %hi(gSegments) /* 00B98 8088DA58 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00B9C 8088DA5C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00BA0 8088DA60 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000001 @@ -62,7 +62,7 @@ glabel func_8088D9F4 /* 00BE4 8088DAA4 000E7F02 */ srl $t7, $t6, 28 /* 00BE8 8088DAA8 000FC080 */ sll $t8, $t7, 2 /* 00BEC 8088DAAC 0338C821 */ addu $t9, $t9, $t8 -/* 00BF0 8088DAB0 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 00BF0 8088DAB0 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 00BF4 8088DAB4 00816824 */ and $t5, $a0, $at /* 00BF8 8088DAB8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00BFC 8088DABC 01B94021 */ addu $t0, $t5, $t9 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088DC50.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088DC50.s index 23cb500621..b1d724eb76 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088DC50.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088DC50.s @@ -42,9 +42,9 @@ glabel func_8088DC50 ## coss? /* 00E24 8088DCE4 00042403 */ sra $a0, $a0, 16 /* 00E28 8088DCE8 27B30068 */ addiu $s3, $sp, 0x0068 ## $s3 = FFFFFFA8 -/* 00E2C 8088DCEC 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 +/* 00E2C 8088DCEC 3C058013 */ lui $a1, %hi(gMtxFClear) /* 00E30 8088DCF0 46000586 */ mov.s $f22, $f0 -/* 00E34 8088DCF4 24A5DB60 */ addiu $a1, $a1, 0xDB60 ## $a1 = 8012DB60 +/* 00E34 8088DCF4 24A5DB60 */ addiu $a1, %lo(gMtxFClear) /* 00E38 8088DCF8 0C0346EA */ jal Matrix_MtxFCopy /* 00E3C 8088DCFC 02602025 */ or $a0, $s3, $zero ## $a0 = FFFFFFA8 /* 00E40 8088DD00 86B807A0 */ lh $t8, 0x07A0($s5) ## 000007A0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088EB54.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088EB54.s index cc92e07e77..7653cdb77f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088EB54.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088EB54.s @@ -19,7 +19,7 @@ glabel func_8088EB54 /* 00790 8088EB60 AFBF0054 */ sw $ra, 0x0054($sp) /* 00794 8088EB64 AFB10034 */ sw $s1, 0x0034($sp) /* 00798 8088EB68 AFA400E8 */ sw $a0, 0x00E8($sp) -/* 0079C 8088EB6C 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 +/* 0079C 8088EB6C 3C058013 */ lui $a1, %hi(gMtxFClear) /* 007A0 8088EB70 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 /* 007A4 8088EB74 AFBE0050 */ sw $s8, 0x0050($sp) /* 007A8 8088EB78 AFB7004C */ sw $s7, 0x004C($sp) @@ -31,7 +31,7 @@ glabel func_8088EB54 /* 007C0 8088EB90 F7B80028 */ sdc1 $f24, 0x0028($sp) /* 007C4 8088EB94 F7B60020 */ sdc1 $f22, 0x0020($sp) /* 007C8 8088EB98 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 007CC 8088EB9C 24A5DB60 */ addiu $a1, $a1, 0xDB60 ## $a1 = 8012DB60 +/* 007CC 8088EB9C 24A5DB60 */ addiu $a1, %lo(gMtxFClear) /* 007D0 8088EBA0 0C0346EA */ jal Matrix_MtxFCopy /* 007D4 8088EBA4 27A400A8 */ addiu $a0, $sp, 0x00A8 ## $a0 = FFFFFFC0 /* 007D8 8088EBA8 868E0032 */ lh $t6, 0x0032($s4) ## 00000032 @@ -164,7 +164,7 @@ glabel func_8088EB54 /* 009B0 8088ED80 02201025 */ or $v0, $s1, $zero ## $v0 = 00000000 /* 009B4 8088ED84 46142280 */ add.s $f10, $f4, $f20 /* 009B8 8088ED88 E7B200A8 */ swc1 $f18, 0x00A8($sp) -/* 009BC 8088ED8C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 009BC 8088ED8C 3C198016 */ lui $t9, %hi(gSegments) /* 009C0 8088ED90 46148180 */ add.s $f6, $f16, $f20 /* 009C4 8088ED94 E7AA00BC */ swc1 $f10, 0x00BC($sp) /* 009C8 8088ED98 26310008 */ addiu $s1, $s1, 0x0008 ## $s1 = 00000008 @@ -196,7 +196,7 @@ glabel func_8088EB54 /* 00A28 8088EDF8 00184080 */ sll $t0, $t8, 2 /* 00A2C 8088EDFC 0328C821 */ addu $t9, $t9, $t0 /* 00A30 8088EE00 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00A34 8088EE04 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 00A34 8088EE04 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 00A38 8088EE08 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00A3C 8088EE0C 00617024 */ and $t6, $v1, $at /* 00A40 8088EE10 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -259,7 +259,7 @@ glabel func_8088EB54 /* 00B1C 8088EEEC E7B000D8 */ swc1 $f16, 0x00D8($sp) /* 00B20 8088EEF0 C686002C */ lwc1 $f6, 0x002C($s4) ## 0000002C /* 00B24 8088EEF4 AFAE0060 */ sw $t6, 0x0060($sp) -/* 00B28 8088EEF8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 00B28 8088EEF8 3C0E8016 */ lui $t6, %hi(gSegments) /* 00B2C 8088EEFC 46083100 */ add.s $f4, $f6, $f8 /* 00B30 8088EF00 24060270 */ addiu $a2, $zero, 0x0270 ## $a2 = 00000270 /* 00B34 8088EF04 E7A400E0 */ swc1 $f4, 0x00E0($sp) @@ -287,7 +287,7 @@ glabel func_8088EB54 /* 00B84 8088EF54 00184080 */ sll $t0, $t8, 2 /* 00B88 8088EF58 01C87021 */ addu $t6, $t6, $t0 /* 00B8C 8088EF5C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00B90 8088EF60 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 00B90 8088EF60 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 00B94 8088EF64 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00B98 8088EF68 00616824 */ and $t5, $v1, $at /* 00B9C 8088EF6C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Init.s index bd8d6cd8ae..6c47ce52a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Init.s @@ -21,10 +21,10 @@ glabel BgIngate_Init /* 00048 80892788 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 /* 0004C 8089278C AE02014C */ sw $v0, 0x014C($s0) ## 0000014C /* 00050 80892790 8FAE0034 */ lw $t6, 0x0034($sp) -/* 00054 80892794 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00054 80892794 3C028016 */ lui $v0, %hi(gSaveContext) /* 00058 80892798 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 /* 0005C 8089279C 85CF00A4 */ lh $t7, 0x00A4($t6) ## 000000A4 -/* 00060 808927A0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00060 808927A0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00064 808927A4 15E1000E */ bne $t7, $at, .L808927E0 /* 00068 808927A8 00000000 */ nop /* 0006C 808927AC 8C580004 */ lw $t8, 0x0004($v0) ## 8015E664 @@ -51,8 +51,8 @@ glabel BgIngate_Init /* 000B4 808927F4 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 0000CCCD /* 000B8 808927F8 860A001C */ lh $t2, 0x001C($s0) ## 0000001C -/* 000BC 808927FC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 000C0 80892800 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 000BC 808927FC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 000C0 80892800 2442E660 */ addiu $v0, %lo(gSaveContext) /* 000C4 80892804 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 /* 000C8 80892808 1160000D */ beq $t3, $zero, .L80892840 /* 000CC 8089280C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Init.s index f14193f238..96effe8ce3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Init.s @@ -50,8 +50,8 @@ glabel BgJya1flift_Init /* 00178 80892CD8 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 /* 0017C 80892CDC 10400012 */ beq $v0, $zero, .L80892D28 -/* 00180 80892CE0 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 00184 80892CE4 8F18E664 */ lw $t8, -0x199C($t8) ## 8015E664 +/* 00180 80892CE0 3C188016 */ lui $t8, %hi(gSaveContext+4) +/* 00184 80892CE4 8F18E664 */ lw $t8, %lo(gSaveContext+4)($t8) /* 00188 80892CE8 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 /* 0018C 80892CEC 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 /* 00190 80892CF0 13000003 */ beq $t8, $zero, .L80892D00 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Draw.s index a1c6ce4688..2d692d2df1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Draw.s @@ -38,11 +38,11 @@ glabel BgJyaBlock_Draw /* 0015C 808942FC AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 00160 80894300 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00164 80894304 00095080 */ sll $t2, $t1, 2 -/* 00168 80894308 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 00168 80894308 3C0B8016 */ lui $t3, %hi(gSegments) /* 0016C 8089430C 016A5821 */ addu $t3, $t3, $t2 /* 00170 80894310 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00174 80894314 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00178 80894318 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 +/* 00178 80894318 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) /* 0017C 8089431C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00180 80894320 00816024 */ and $t4, $a0, $at /* 00184 80894324 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Init.s index 340cff0243..bb563fa5ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Init.s @@ -25,8 +25,8 @@ glabel BgJyaBlock_Init /* 00050 808941F0 0C01E037 */ jal Actor_ProcessInitChain /* 00054 808941F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00058 808941F8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0005C 808941FC 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 +/* 00058 808941F8 3C0E8016 */ lui $t6, %hi(gSaveContext+4) +/* 0005C 808941FC 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) /* 00060 80894200 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00064 80894204 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 /* 00068 80894208 11C00003 */ beq $t6, $zero, .L80894218 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Init.s index a5c2806af3..25153c9ac9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Init.s @@ -21,8 +21,8 @@ glabel BgJyaGoroiwa_Init /* 0013C 80897AAC 0C0187B5 */ jal func_80061ED4 /* 00140 80897AB0 A60200B4 */ sh $v0, 0x00B4($s0) ## 000000B4 /* 00144 80897AB4 3C054414 */ lui $a1, 0x4414 ## $a1 = 44140000 -/* 00148 80897AB8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0014C 80897ABC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00148 80897AB8 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 0014C 80897ABC 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00150 80897AC0 34A5C000 */ ori $a1, $a1, 0xC000 ## $a1 = 4414C000 /* 00154 80897AC4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00158 80897AC8 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089ABC8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089ABC8.s index 24b2b092f9..86f7ae94bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089ABC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089ABC8.s @@ -37,11 +37,11 @@ glabel func_8089ABC8 /* 00AEC 8089AC1C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 00AF0 8089AC20 850901CC */ lh $t1, 0x01CC($t0) ## 000001CC /* 00AF4 8089AC24 3C04808A */ lui $a0, %hi(D_8089B1AC) ## $a0 = 808A0000 -/* 00AF8 8089AC28 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 00AF8 8089AC28 3C068016 */ lui $a2, %hi(gSegments) /* 00AFC 8089AC2C 00095080 */ sll $t2, $t1, 2 /* 00B00 8089AC30 008A2021 */ addu $a0, $a0, $t2 /* 00B04 8089AC34 8C84B1AC */ lw $a0, %lo(D_8089B1AC)($a0) -/* 00B08 8089AC38 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 00B08 8089AC38 24C66FA8 */ addiu $a2, %lo(gSegments) /* 00B0C 8089AC3C 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 /* 00B10 8089AC40 00046100 */ sll $t4, $a0, 4 /* 00B14 8089AC44 000C6F02 */ srl $t5, $t4, 28 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D258.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D258.s index d805e9cf7a..6111b7ca4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D258.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D258.s @@ -32,12 +32,12 @@ glabel func_8089D258 /* 00E4C 8089D2CC 0C00BE0A */ jal Audio_PlayActorSound2 /* 00E50 8089D2D0 24052810 */ addiu $a1, $zero, 0x2810 ## $a1 = 00002810 -/* 00E54 8089D2D4 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00E58 8089D2D8 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 00E5C 8089D2DC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00E60 8089D2E0 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 00E64 8089D2E4 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00E68 8089D2E8 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00E54 8089D2D4 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00E58 8089D2D8 3C198013 */ lui $t9, %hi(D_801333E8) +/* 00E5C 8089D2DC 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00E60 8089D2E0 273933E8 */ addiu $t9, %lo(D_801333E8) +/* 00E64 8089D2E4 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00E68 8089D2E8 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00E6C 8089D2EC AFB90014 */ sw $t9, 0x0014($sp) /* 00E70 8089D2F0 AFA70010 */ sw $a3, 0x0010($sp) /* 00E74 8089D2F4 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E108.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E108.s index 06c003a51a..104e57a581 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E108.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E108.s @@ -2,13 +2,13 @@ glabel func_8089E108 /* 004D8 8089E108 000670C0 */ sll $t6, $a2, 3 /* 004DC 8089E10C 008E7821 */ addu $t7, $a0, $t6 /* 004E0 8089E110 8DE80004 */ lw $t0, 0x0004($t7) ## 00000004 -/* 004E4 8089E114 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 004E4 8089E114 3C0A8016 */ lui $t2, %hi(gSegments) /* 004E8 8089E118 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 004EC 8089E11C 0008C100 */ sll $t8, $t0, 4 /* 004F0 8089E120 0018CF02 */ srl $t9, $t8, 28 /* 004F4 8089E124 00194880 */ sll $t1, $t9, 2 /* 004F8 8089E128 01495021 */ addu $t2, $t2, $t1 -/* 004FC 8089E12C 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 004FC 8089E12C 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 00500 8089E130 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00504 8089E134 00076880 */ sll $t5, $a3, 2 /* 00508 8089E138 01A76823 */ subu $t5, $t5, $a3 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Init.s index 8de24a6b19..81d8b96ca0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Init.s @@ -45,8 +45,8 @@ glabel BgMizuWater_Init /* 001FC 8089FAAC 01200008 */ jr $t1 /* 00200 8089FAB0 00000000 */ nop glabel L8089FAB4 -/* 00204 8089FAB4 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 00208 8089FAB8 8D4AFA90 */ lw $t2, -0x0570($t2) ## 8015FA90 +/* 00204 8089FAB4 3C0A8016 */ lui $t2, %hi(gGameInfo) +/* 00208 8089FAB8 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) /* 0020C 8089FABC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00210 8089FAC0 854B1532 */ lh $t3, 0x1532($t2) ## 80161532 /* 00214 8089FAC4 55600012 */ bnel $t3, $zero, .L8089FB10 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Update.s index 1c6eef996e..f2e5c1bd31 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Update.s @@ -13,8 +13,8 @@ glabel D_808A0634 .text glabel BgMizuWater_Update -/* 00924 808A01D4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00928 808A01D8 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 00924 808A01D4 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 00928 808A01D8 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 0092C 808A01DC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00930 808A01E0 AFBF001C */ sw $ra, 0x001C($sp) /* 00934 808A01E4 AFB00018 */ sw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F8B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F8B0.s index 0f59a6bd7a..10b55f796d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F8B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F8B0.s @@ -1,7 +1,7 @@ glabel func_8089F8B0 /* 00000 8089F8B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 8089F8B4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00008 8089F8B8 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00004 8089F8B4 3C028016 */ lui $v0, %hi(gGameInfo) +/* 00008 8089F8B8 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0000C 8089F8BC AFBF0014 */ sw $ra, 0x0014($sp) /* 00010 8089F8C0 AFA40018 */ sw $a0, 0x0018($sp) /* 00014 8089F8C4 AFA5001C */ sw $a1, 0x001C($sp) @@ -24,22 +24,22 @@ glabel func_8089F8B0 /* 00054 8089F904 0C00B2DD */ jal Flags_SetSwitch /* 00058 8089F908 2405001C */ addiu $a1, $zero, 0x001C ## $a1 = 0000001C -/* 0005C 8089F90C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 0005C 8089F90C 3C028016 */ lui $v0, %hi(gGameInfo) /* 00060 8089F910 1000000A */ beq $zero, $zero, .L8089F93C -/* 00064 8089F914 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00064 8089F914 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) .L8089F918: /* 00068 8089F918 0C00B2DD */ jal Flags_SetSwitch /* 0006C 8089F91C 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D -/* 00070 8089F920 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00070 8089F920 3C028016 */ lui $v0, %hi(gGameInfo) /* 00074 8089F924 10000005 */ beq $zero, $zero, .L8089F93C -/* 00078 8089F928 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00078 8089F928 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) .L8089F92C: /* 0007C 8089F92C 0C00B2DD */ jal Flags_SetSwitch /* 00080 8089F930 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 00084 8089F934 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00088 8089F938 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00084 8089F934 3C028016 */ lui $v0, %hi(gGameInfo) +/* 00088 8089F938 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) .L8089F93C: /* 0008C 8089F93C A4401514 */ sh $zero, 0x1514($v0) ## 80161514 .L8089F940: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s index 18289be08e..029d63d3a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s @@ -214,7 +214,7 @@ glabel func_808A3F58 /* 00A08 808A41D8 8FAB00B4 */ lw $t3, 0x00B4($sp) /* 00A0C 808A41DC 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 /* 00A10 808A41E0 818D016A */ lb $t5, 0x016A($t4) ## 0000016A -/* 00A14 808A41E4 3C098011 */ lui $t1, 0x8011 ## $t1 = 80110000 +/* 00A14 808A41E4 3C098011 */ lui $t1, %hi(D_80116280+0x10) /* 00A18 808A41E8 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 /* 00A1C 808A41EC 000D7100 */ sll $t6, $t5, 4 /* 00A20 808A41F0 01CD7021 */ addu $t6, $t6, $t5 @@ -223,7 +223,7 @@ glabel func_808A3F58 /* 00A2C 808A41FC 030FC021 */ addu $t8, $t8, $t7 /* 00A30 808A4200 8F1817B4 */ lw $t8, 0x17B4($t8) ## 000117B4 /* 00A34 808A4204 35080020 */ ori $t0, $t0, 0x0020 ## $t0 = DB060020 -/* 00A38 808A4208 25296290 */ addiu $t1, $t1, 0x6290 ## $t1 = 80116290 +/* 00A38 808A4208 25296290 */ addiu $t1, %lo(D_80116280+0x10) /* 00A3C 808A420C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 00A40 808A4210 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00A44 808A4214 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFB8 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Destroy.s index 20f6c9ebdf..50a4f7a07f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Destroy.s @@ -21,9 +21,9 @@ glabel BgPoEvent_Destroy /* 0067C 808A688C 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 /* 00680 808A6890 8FA70018 */ lw $a3, 0x0018($sp) /* 00684 808A6894 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00688 808A6898 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00688 808A6898 3C028016 */ lui $v0, %hi(gSaveContext) /* 0068C 808A689C 90F80168 */ lbu $t8, 0x0168($a3) ## 00000168 -/* 00690 808A68A0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00690 808A68A0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00694 808A68A4 57010007 */ bnel $t8, $at, .L808A68C4 /* 00698 808A68A8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0069C 808A68AC 845913D0 */ lh $t9, 0x13D0($v0) ## 8015FA30 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6CCC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6CCC.s index ffa120acca..b8903bfcec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6CCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6CCC.s @@ -53,12 +53,12 @@ glabel func_808A6CCC /* 00B80 808A6D90 0C01E221 */ jal func_80078884 /* 00B84 808A6D94 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 /* 00B88 808A6D98 240D000A */ addiu $t5, $zero, 0x000A ## $t5 = 0000000A -/* 00B8C 808A6D9C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00B8C 808A6D9C 3C018016 */ lui $at, %hi(gSaveContext+0x13ce) /* 00B90 808A6DA0 10000071 */ beq $zero, $zero, .L808A6F68 -/* 00B94 808A6DA4 A42DFA2E */ sh $t5, -0x05D2($at) ## 8015FA2E +/* 00B94 808A6DA4 A42DFA2E */ sh $t5, %lo(gSaveContext+0x13ce)($at) .L808A6DA8: -/* 00B98 808A6DA8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00B9C 808A6DAC 85CEFA30 */ lh $t6, -0x05D0($t6) ## 8015FA30 +/* 00B98 808A6DA8 3C0E8016 */ lui $t6, %hi(gSaveContext+0x13d0) +/* 00B9C 808A6DAC 85CEFA30 */ lh $t6, %lo(gSaveContext+0x13d0)($t6) /* 00BA0 808A6DB0 3C0F808A */ lui $t7, %hi(D_808A7D58) ## $t7 = 808A0000 /* 00BA4 808A6DB4 55C00010 */ bnel $t6, $zero, .L808A6DF8 /* 00BA8 808A6DB8 24010040 */ addiu $at, $zero, 0x0040 ## $at = 00000040 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Destroy.s index 5c0e6873d9..776d9be071 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Destroy.s @@ -9,8 +9,8 @@ glabel BgRelayObjects_Destroy ## DynaPolyInfo_delReserve /* 00258 808A90A8 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C /* 0025C 808A90AC 8FAF0018 */ lw $t7, 0x0018($sp) -/* 00260 808A90B0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00264 808A90B4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00260 808A90B0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00264 808A90B4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00268 808A90B8 85F8001C */ lh $t8, 0x001C($t7) ## 0000001C /* 0026C 808A90BC 5700000A */ bnel $t8, $zero, .L808A90E8 /* 00270 808A90C0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Init.s index 5330c874a9..e8444f843a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Init.s @@ -29,8 +29,8 @@ glabel BgRelayObjects_Init /* 00064 808A8EB4 0C010620 */ jal DynaPolyInfo_Alloc /* 00068 808A8EB8 248425FC */ addiu $a0, $a0, 0x25FC ## $a0 = 060025FC -/* 0006C 808A8EBC 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 00070 808A8EC0 954AF540 */ lhu $t2, -0x0AC0($t2) ## 8015F540 +/* 0006C 808A8EBC 3C0A8016 */ lui $t2, %hi(gSaveContext+0xee0) +/* 00070 808A8EC0 954AF540 */ lhu $t2, %lo(gSaveContext+0xee0)($t2) /* 00074 808A8EC4 240C0400 */ addiu $t4, $zero, 0x0400 ## $t4 = 00000400 /* 00078 808A8EC8 240D0080 */ addiu $t5, $zero, 0x0080 ## $t5 = 00000080 /* 0007C 808A8ECC 314B0020 */ andi $t3, $t2, 0x0020 ## $t3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A90F4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A90F4.s index c6acc1ebba..a263a9f64f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A90F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A90F4.s @@ -16,12 +16,12 @@ glabel func_808A90F4 /* 002D8 808A9128 0C00BE0A */ jal Audio_PlayActorSound2 /* 002DC 808A912C 24052814 */ addiu $a1, $zero, 0x2814 ## $a1 = 00002814 -/* 002E0 808A9130 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 002E4 808A9134 91EF746E */ lbu $t7, 0x746E($t7) ## 8012746E -/* 002E8 808A9138 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 002E0 808A9130 3C0F8012 */ lui $t7, %hi(gItemSlots+0xa) +/* 002E4 808A9134 91EF746E */ lbu $t7, %lo(gItemSlots+0xa)($t7) +/* 002E8 808A9138 3C188016 */ lui $t8, %hi(gSaveContext+0x74) /* 002EC 808A913C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 002F0 808A9140 030FC021 */ addu $t8, $t8, $t7 -/* 002F4 808A9144 9318E6D4 */ lbu $t8, -0x192C($t8) ## 8015E6D4 +/* 002F4 808A9144 9318E6D4 */ lbu $t8, %lo(gSaveContext+0x74)($t8) /* 002F8 808A9148 24190078 */ addiu $t9, $zero, 0x0078 ## $t9 = 00000078 /* 002FC 808A914C 240800A0 */ addiu $t0, $zero, 0x00A0 ## $t0 = 000000A0 /* 00300 808A9150 53010004 */ beql $t8, $at, .L808A9164 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A9234.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A9234.s index 2704c9b7ed..94f292fd07 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A9234.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A9234.s @@ -54,8 +54,8 @@ glabel func_808A9234 /* 004A4 808A92F4 15410004 */ bne $t2, $at, .L808A9308 /* 004A8 808A92F8 258C9320 */ addiu $t4, $t4, %lo(func_808A9320) ## $t4 = 808A9320 /* 004AC 808A92FC 240B000F */ addiu $t3, $zero, 0x000F ## $t3 = 0000000F -/* 004B0 808A9300 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 004B4 808A9304 A42BFA2E */ sh $t3, -0x05D2($at) ## 8015FA2E +/* 004B0 808A9300 3C018016 */ lui $at, %hi(gSaveContext+0x13ce) +/* 004B4 808A9304 A42BFA2E */ sh $t3, %lo(gSaveContext+0x13ce)($at) .L808A9308: /* 004B8 808A9308 AE0C0164 */ sw $t4, 0x0164($s0) ## 00000164 .L808A930C: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A939C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A939C.s index 6d4b83a42c..4606a907ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A939C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A939C.s @@ -13,14 +13,14 @@ glabel func_808A939C /* 00564 808A93B4 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 00568 808A93B8 10400006 */ beq $v0, $zero, .L808A93D4 /* 0056C 808A93BC 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00570 808A93C0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00574 808A93C4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00570 808A93C0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00574 808A93C4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00578 808A93C8 944E0EE0 */ lhu $t6, 0x0EE0($v0) ## 8015F540 /* 0057C 808A93CC 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 /* 00580 808A93D0 A44F0EE0 */ sh $t7, 0x0EE0($v0) ## 8015F540 .L808A93D4: -/* 00584 808A93D4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00588 808A93D8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00584 808A93D4 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00588 808A93D8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0058C 808A93DC 94580EE0 */ lhu $t8, 0x0EE0($v0) ## 8015F540 /* 00590 808A93E0 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 /* 00594 808A93E4 24050080 */ addiu $a1, $zero, 0x0080 ## $a1 = 00000080 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s index 5e9dea88ef..d7d8a573f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s @@ -90,9 +90,9 @@ glabel BgSpot00Hanebasi_Draw /* 00F30 808AA6B0 E7B20054 */ swc1 $f18, 0x0054($sp) /* 00F34 808AA6B4 8E0C011C */ lw $t4, 0x011C($s0) ## 0000011C /* 00F38 808AA6B8 C7A40048 */ lwc1 $f4, 0x0048($sp) -/* 00F3C 808AA6BC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00F3C 808AA6BC 3C038016 */ lui $v1, %hi(gSaveContext) /* 00F40 808AA6C0 8D8D011C */ lw $t5, 0x011C($t4) ## 0000011C -/* 00F44 808AA6C4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00F44 808AA6C4 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00F48 808AA6C8 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 00F4C 808AA6CC E5A40024 */ swc1 $f4, 0x0024($t5) ## 00000024 /* 00F50 808AA6D0 8E0E011C */ lw $t6, 0x011C($s0) ## 0000011C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s index d7f1f85d1e..94e60fd6d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s @@ -41,8 +41,8 @@ glabel BgSpot00Hanebasi_Init /* 00080 808A9800 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C /* 00084 808A9804 14610091 */ bne $v1, $at, .L808A9A4C /* 00088 808A9808 00000000 */ nop -/* 0008C 808A980C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00090 808A9810 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0008C 808A980C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00090 808A9810 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00094 808A9814 8C640004 */ lw $a0, 0x0004($v1) ## 8015E664 /* 00098 808A9818 5480000A */ bnel $a0, $zero, .L808A9844 /* 0009C 808A981C 8C621360 */ lw $v0, 0x1360($v1) ## 8015F9C0 @@ -78,8 +78,8 @@ glabel BgSpot00Hanebasi_Init .L808A9884: /* 00104 808A9884 8C681360 */ lw $t0, 0x1360($v1) ## 00001360 /* 00108 808A9888 10A80015 */ beq $a1, $t0, .L808A98E0 -/* 0010C 808A988C 3C048012 */ lui $a0, 0x8012 ## $a0 = 80120000 -/* 00110 808A9890 24847120 */ addiu $a0, $a0, 0x7120 ## $a0 = 80127120 +/* 0010C 808A988C 3C048012 */ lui $a0, %hi(gBitFlags) +/* 00110 808A9890 24847120 */ addiu $a0, %lo(gBitFlags) /* 00114 808A9894 8C890048 */ lw $t1, 0x0048($a0) ## 80127168 /* 00118 808A9898 8C6200A4 */ lw $v0, 0x00A4($v1) ## 000000A4 /* 0011C 808A989C 01225024 */ and $t2, $t1, $v0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Update.s index b645c3d6ee..556a4ff7f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Update.s @@ -21,11 +21,11 @@ glabel BgSpot00Hanebasi_Update /* 0085C 808A9FDC 8FBF001C */ lw $ra, 0x001C($sp) /* 00860 808A9FE0 860F00A4 */ lh $t7, 0x00A4($s0) ## 000000A4 /* 00864 808A9FE4 24010051 */ addiu $at, $zero, 0x0051 ## $at = 00000051 -/* 00868 808A9FE8 3C038012 */ lui $v1, 0x8012 ## $v1 = 80120000 +/* 00868 808A9FE8 3C038012 */ lui $v1, %hi(gBitFlags) /* 0086C 808A9FEC 15E10066 */ bne $t7, $at, .L808AA188 -/* 00870 808A9FF0 24637120 */ addiu $v1, $v1, 0x7120 ## $v1 = 80127120 -/* 00874 808A9FF4 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 00878 808A9FF8 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 00870 808A9FF0 24637120 */ addiu $v1, %lo(gBitFlags) +/* 00874 808A9FF4 3C088016 */ lui $t0, %hi(gSaveContext) +/* 00878 808A9FF8 2508E660 */ addiu $t0, %lo(gSaveContext) /* 0087C 808A9FFC 8D0200A4 */ lw $v0, 0x00A4($t0) ## 8015E704 /* 00880 808AA000 8C780048 */ lw $t8, 0x0048($v1) ## 80127168 /* 00884 808AA004 03024824 */ and $t1, $t8, $v0 @@ -78,8 +78,8 @@ glabel BgSpot00Hanebasi_Update /* 00940 808AA0C0 AFA50024 */ sw $a1, 0x0024($sp) /* 00944 808AA0C4 0C02FF21 */ jal Gameplay_InCsMode /* 00948 808AA0C8 AFA70030 */ sw $a3, 0x0030($sp) -/* 0094C 808AA0CC 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 00950 808AA0D0 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 0094C 808AA0CC 3C088016 */ lui $t0, %hi(gSaveContext) +/* 00950 808AA0D0 2508E660 */ addiu $t0, %lo(gSaveContext) /* 00954 808AA0D4 8FA50024 */ lw $a1, 0x0024($sp) /* 00958 808AA0D8 14400021 */ bne $v0, $zero, .L808AA160 /* 0095C 808AA0DC 8FA70030 */ lw $a3, 0x0030($sp) @@ -102,9 +102,9 @@ glabel BgSpot00Hanebasi_Update /* 0099C 808AA11C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 009A0 808AA120 00300821 */ addu $at, $at, $s0 /* 009A4 808AA124 240B00CD */ addiu $t3, $zero, 0x00CD ## $t3 = 000000CD -/* 009A8 808AA128 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 009A8 808AA128 3C088016 */ lui $t0, %hi(gSaveContext) /* 009AC 808AA12C A42B1E1A */ sh $t3, 0x1E1A($at) ## 00011E1A -/* 009B0 808AA130 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 009B0 808AA130 2508E660 */ addiu $t0, %lo(gSaveContext) /* 009B4 808AA134 340CFFF1 */ ori $t4, $zero, 0xFFF1 ## $t4 = 0000FFF1 /* 009B8 808AA138 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 009BC 808AA13C A50C1412 */ sh $t4, 0x1412($t0) ## 8015FA72 @@ -129,13 +129,13 @@ glabel BgSpot00Hanebasi_Update /* 00A00 808AA180 00300821 */ addu $at, $at, $s0 /* 00A04 808AA184 A02E0B01 */ sb $t6, 0x0B01($at) ## 00010B01 .L808AA188: -/* 00A08 808AA188 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 00A0C 808AA18C 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 00A08 808AA188 3C088016 */ lui $t0, %hi(gSaveContext) +/* 00A0C 808AA18C 2508E660 */ addiu $t0, %lo(gSaveContext) /* 00A10 808AA190 8D041360 */ lw $a0, 0x1360($t0) ## 8015F9C0 /* 00A14 808AA194 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 00A18 808AA198 3C058012 */ lui $a1, 0x8012 ## $a1 = 80120000 +/* 00A18 808AA198 3C058012 */ lui $a1, %hi(D_8011FB40) /* 00A1C 808AA19C 14C4003F */ bne $a2, $a0, .L808AA29C -/* 00A20 808AA1A0 24A5FB40 */ addiu $a1, $a1, 0xFB40 ## $a1 = 8011FB40 +/* 00A20 808AA1A0 24A5FB40 */ addiu $a1, %lo(D_8011FB40) /* 00A24 808AA1A4 94AF0000 */ lhu $t7, 0x0000($a1) ## 8011FB40 /* 00A28 808AA1A8 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 /* 00A2C 808AA1AC 55E10033 */ bnel $t7, $at, .L808AA27C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9BE8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9BE8.s index c9734b915b..5dd7b2cbe1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9BE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9BE8.s @@ -1,6 +1,6 @@ glabel func_808A9BE8 -/* 00468 808A9BE8 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 0046C 808A9BEC 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 00468 808A9BE8 3C078016 */ lui $a3, %hi(gSaveContext) +/* 0046C 808A9BEC 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 00470 808A9BF0 8CE31360 */ lw $v1, 0x1360($a3) ## 8015F9C0 /* 00474 808A9BF4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00478 808A9BF8 AFBF0014 */ sw $ra, 0x0014($sp) @@ -9,8 +9,8 @@ glabel func_808A9BE8 /* 00484 808A9C04 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00488 808A9C08 10200014 */ beq $at, $zero, .L808A9C5C /* 0048C 808A9C0C 8C88011C */ lw $t0, 0x011C($a0) ## 0000011C -/* 00490 808A9C10 3C048012 */ lui $a0, 0x8012 ## $a0 = 80120000 -/* 00494 808A9C14 24847120 */ addiu $a0, $a0, 0x7120 ## $a0 = 80127120 +/* 00490 808A9C10 3C048012 */ lui $a0, %hi(gBitFlags) +/* 00494 808A9C14 24847120 */ addiu $a0, %lo(gBitFlags) /* 00498 808A9C18 8C8E0048 */ lw $t6, 0x0048($a0) ## 80127168 /* 0049C 808A9C1C 8CE200A4 */ lw $v0, 0x00A4($a3) ## 8015E704 /* 004A0 808A9C20 01C27824 */ and $t7, $t6, $v0 @@ -38,8 +38,8 @@ glabel func_808A9BE8 /* 004F0 808A9C70 AFA60020 */ sw $a2, 0x0020($sp) /* 004F4 808A9C74 0C01B129 */ jal func_8006C4A4 /* 004F8 808A9C78 AFA8001C */ sw $t0, 0x001C($sp) -/* 004FC 808A9C7C 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 00500 808A9C80 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 004FC 808A9C7C 3C078016 */ lui $a3, %hi(gSaveContext) +/* 00500 808A9C80 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 00504 808A9C84 8FA60020 */ lw $a2, 0x0020($sp) /* 00508 808A9C88 14400007 */ bne $v0, $zero, .L808A9CA8 /* 0050C 808A9C8C 8FA8001C */ lw $t0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s index 89a2f1c6c4..2f6a872a15 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s @@ -52,8 +52,8 @@ glabel func_808AA2B0 /* 00B90 808AA310 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 00B94 808AA314 0C024F61 */ jal func_80093D84 /* 00B98 808AA318 8E640000 */ lw $a0, 0x0000($s3) ## 00000000 -/* 00B9C 808AA31C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00BA0 808AA320 8DCEF9C0 */ lw $t6, -0x0640($t6) ## 8015F9C0 +/* 00B9C 808AA31C 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) +/* 00BA0 808AA320 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) /* 00BA4 808AA324 29C10004 */ slti $at, $t6, 0x0004 /* 00BA8 808AA328 14200005 */ bne $at, $zero, .L808AA340 /* 00BAC 808AA32C 3C01808B */ lui $at, %hi(D_808AA88C) ## $at = 808B0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Init.s index 13c5590311..ffe13882f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/BgSpot01Idohashira_Init.s @@ -29,8 +29,8 @@ glabel BgSpot01Idohashira_Init /* 00958 808AB638 0C00FA9D */ jal DynaPolyInfo_RegisterActor ## DynaPolyInfo_setActor /* 0095C 808AB63C 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00960 808AB640 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 00964 808AB644 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 00960 808AB640 3C048016 */ lui $a0, %hi(gSaveContext) +/* 00964 808AB644 2484E660 */ addiu $a0, %lo(gSaveContext) /* 00968 808AB648 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C /* 0096C 808AB64C 8C831360 */ lw $v1, 0x1360($a0) ## 8015F9C0 /* 00970 808AB650 28610004 */ slti $at, $v1, 0x0004 @@ -56,8 +56,8 @@ glabel BgSpot01Idohashira_Init /* 009B4 808AB694 1461000E */ bne $v1, $at, .L808AB6D0 /* 009B8 808AB698 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 009BC 808AB69C AE190164 */ sw $t9, 0x0164($s0) ## 00000164 -/* 009C0 808AB6A0 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 009C4 808AB6A4 8D08FA90 */ lw $t0, -0x0570($t0) ## 8015FA90 +/* 009C0 808AB6A0 3C088016 */ lui $t0, %hi(gGameInfo) +/* 009C4 808AB6A4 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) /* 009C8 808AB6A8 3C01808B */ lui $at, %hi(D_808AB9D0) ## $at = 808B0000 /* 009CC 808AB6AC C428B9D0 */ lwc1 $f8, %lo(D_808AB9D0)($at) /* 009D0 808AB6B0 85091468 */ lh $t1, 0x1468($t0) ## 80161468 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAE6C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAE6C.s index 8c5374ee66..00deaf6e18 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAE6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAE6C.s @@ -5,14 +5,14 @@ glabel func_808AAE6C /* 00198 808AAE78 AFA50044 */ sw $a1, 0x0044($sp) /* 0019C 808AAE7C 8C980024 */ lw $t8, 0x0024($a0) ## 00000024 /* 001A0 808AAE80 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF0 -/* 001A4 808AAE84 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 001A4 808AAE84 3C028016 */ lui $v0, %hi(gGameInfo) /* 001A8 808AAE88 ACB80000 */ sw $t8, 0x0000($a1) ## FFFFFFF0 /* 001AC 808AAE8C 8C8F0028 */ lw $t7, 0x0028($a0) ## 00000028 /* 001B0 808AAE90 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 /* 001B4 808AAE94 ACAF0004 */ sw $t7, 0x0004($a1) ## FFFFFFF4 /* 001B8 808AAE98 8C98002C */ lw $t8, 0x002C($a0) ## 0000002C /* 001BC 808AAE9C ACB80008 */ sw $t8, 0x0008($a1) ## FFFFFFF8 -/* 001C0 808AAEA0 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 001C0 808AAEA0 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 001C4 808AAEA4 C7A40034 */ lwc1 $f4, 0x0034($sp) /* 001C8 808AAEA8 8FA40044 */ lw $a0, 0x0044($sp) /* 001CC 808AAEAC 84591472 */ lh $t9, 0x1472($v0) ## 80161472 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAF34.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAF34.s index 1e99a38588..34162dddb2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAF34.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AAF34.s @@ -13,10 +13,10 @@ glabel func_808AAF34 /* 00260 808AAF40 AFA40058 */ sw $a0, 0x0058($sp) /* 00264 808AAF44 AFA5005C */ sw $a1, 0x005C($sp) /* 00268 808AAF48 8C8F0170 */ lw $t7, 0x0170($a0) ## 00000170 -/* 0026C 808AAF4C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 0026C 808AAF4C 3C028016 */ lui $v0, %hi(gGameInfo) /* 00270 808AAF50 51E00064 */ beql $t7, $zero, .L808AB0E4 /* 00274 808AAF54 8FBF002C */ lw $ra, 0x002C($sp) -/* 00278 808AAF58 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00278 808AAF58 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0027C 808AAF5C 3C01808B */ lui $at, %hi(D_808AB9C4) ## $at = 808B0000 /* 00280 808AAF60 C428B9C4 */ lwc1 $f8, %lo(D_808AB9C4)($at) /* 00284 808AAF64 8458147C */ lh $t8, 0x147C($v0) ## 8016147C @@ -38,8 +38,8 @@ glabel func_808AAF34 /* 002C4 808AAFA4 46049180 */ add.s $f6, $f18, $f4 /* 002C8 808AAFA8 0C0346BD */ jal Matrix_MultVec3f /* 002CC 808AAFAC E7A6003C */ swc1 $f6, 0x003C($sp) -/* 002D0 808AAFB0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 002D4 808AAFB4 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 002D0 808AAFB0 3C028016 */ lui $v0, %hi(gGameInfo) +/* 002D4 808AAFB4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 002D8 808AAFB8 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 002DC 808AAFBC 44819000 */ mtc1 $at, $f18 ## $f18 = 80.00 /* 002E0 808AAFC0 84481474 */ lh $t0, 0x1474($v0) ## 80161474 @@ -63,8 +63,8 @@ glabel func_808AAF34 /* 00328 808AB008 02002825 */ or $a1, $s0, $zero ## $a1 = FFFFFFEC /* 0032C 808AB00C 0C22AB4F */ jal func_808AAD3C /* 00330 808AB010 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00334 808AB014 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00338 808AB018 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00334 808AB014 3C028016 */ lui $v0, %hi(gGameInfo) +/* 00338 808AB018 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0033C 808AB01C 3C01808B */ lui $at, %hi(D_808AB9C8) ## $at = 808B0000 /* 00340 808AB020 C42AB9C8 */ lwc1 $f10, %lo(D_808AB9C8)($at) /* 00344 808AB024 844C147C */ lh $t4, 0x147C($v0) ## 8016147C @@ -86,8 +86,8 @@ glabel func_808AAF34 /* 00384 808AB064 46083280 */ add.s $f10, $f6, $f8 /* 00388 808AB068 0C0346BD */ jal Matrix_MultVec3f /* 0038C 808AB06C E7AA003C */ swc1 $f10, 0x003C($sp) -/* 00390 808AB070 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00394 808AB074 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00390 808AB070 3C028016 */ lui $v0, %hi(gGameInfo) +/* 00394 808AB074 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 00398 808AB078 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 0039C 808AB07C 44813000 */ mtc1 $at, $f6 ## $f6 = 80.00 /* 003A0 808AB080 844E1474 */ lh $t6, 0x1474($v0) ## 80161474 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB18C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB18C.s index c94d8313a5..b728e295e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB18C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB18C.s @@ -1,6 +1,6 @@ glabel func_808AB18C -/* 004AC 808AB18C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 004B0 808AB190 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 004AC 808AB18C 3C028016 */ lui $v0, %hi(gGameInfo) +/* 004B0 808AB190 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 004B4 808AB194 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90 /* 004B8 808AB198 848E00B4 */ lh $t6, 0x00B4($a0) ## 000000B4 /* 004BC 808AB19C 848800B6 */ lh $t0, 0x00B6($a0) ## 000000B6 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB1DC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB1DC.s index be3ba982d4..91c6508b65 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB1DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB1DC.s @@ -18,13 +18,13 @@ glabel func_808AB1DC /* 00524 808AB204 AFBF0014 */ sw $ra, 0x0014($sp) /* 00528 808AB208 E7AC0018 */ swc1 $f12, 0x0018($sp) /* 0052C 808AB20C E7AE001C */ swc1 $f14, 0x001C($sp) -/* 00530 808AB210 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00530 808AB210 3C0F8016 */ lui $t7, %hi(gGameInfo) /* 00534 808AB214 3C04808B */ lui $a0, %hi(D_808AB870) ## $a0 = 808B0000 /* 00538 808AB218 46103032 */ c.eq.s $f6, $f16 /* 0053C 808AB21C 03274023 */ subu $t0, $t9, $a3 /* 00540 808AB220 45010016 */ bc1t .L808AB27C /* 00544 808AB224 00000000 */ nop -/* 00548 808AB228 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 00548 808AB228 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 0054C 808AB22C 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 /* 00550 808AB230 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 00554 808AB234 85F81466 */ lh $t8, 0x1466($t7) ## 80161466 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB29C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB29C.s index bb28d5b485..94162fc30f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB29C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB29C.s @@ -22,14 +22,14 @@ glabel func_808AB29C /* 005F8 808AB2D8 8FA3004C */ lw $v1, 0x004C($sp) /* 005FC 808AB2DC 27AF0030 */ addiu $t7, $sp, 0x0030 ## $t7 = FFFFFFE0 /* 00600 808AB2E0 8C590008 */ lw $t9, 0x0008($v0) ## 00000008 -/* 00604 808AB2E4 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 00604 808AB2E4 3C098016 */ lui $t1, %hi(gGameInfo) /* 00608 808AB2E8 3C01808B */ lui $at, %hi(D_808AB9CC) ## $at = 808B0000 /* 0060C 808AB2EC ADF90000 */ sw $t9, 0x0000($t7) ## FFFFFFE0 /* 00610 808AB2F0 8C58000C */ lw $t8, 0x000C($v0) ## 0000000C /* 00614 808AB2F4 ADF80004 */ sw $t8, 0x0004($t7) ## FFFFFFE4 /* 00618 808AB2F8 8C590010 */ lw $t9, 0x0010($v0) ## 00000010 /* 0061C 808AB2FC ADF90008 */ sw $t9, 0x0008($t7) ## FFFFFFE8 -/* 00620 808AB300 8D29FA90 */ lw $t1, -0x0570($t1) ## 8015FA90 +/* 00620 808AB300 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) /* 00624 808AB304 8C680018 */ lw $t0, 0x0018($v1) ## 00000018 /* 00628 808AB308 C42AB9CC */ lwc1 $f10, %lo(D_808AB9CC)($at) /* 0062C 808AB30C 852A1468 */ lh $t2, 0x1468($t1) ## 80161468 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Init.s index 14c4144e5a..5f18827d70 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Init.s @@ -12,8 +12,8 @@ glabel BgSpot01Idomizu_Init /* 00014 808ABAF4 0C01E037 */ jal Actor_ProcessInitChain /* 00018 808ABAF8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0001C 808ABAFC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00020 808ABB00 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0001C 808ABAFC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00020 808ABB00 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00024 808ABB04 944E0EE0 */ lhu $t6, 0x0EE0($v0) ## 8015F540 /* 00028 808ABB08 8FA40018 */ lw $a0, 0x0018($sp) /* 0002C 808ABB0C 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/func_808ABB84.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/func_808ABB84.s index 452ae330f9..3ca0eb8077 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/func_808ABB84.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/func_808ABB84.s @@ -4,8 +4,8 @@ glabel D_808ABE18 .text glabel func_808ABB84 -/* 000A4 808ABB84 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 000A8 808ABB88 95CEF540 */ lhu $t6, -0x0AC0($t6) ## 8015F540 +/* 000A4 808ABB84 3C0E8016 */ lui $t6, %hi(gSaveContext+0xee0) +/* 000A8 808ABB88 95CEF540 */ lhu $t6, %lo(gSaveContext+0xee0)($t6) /* 000AC 808ABB8C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 000B0 808ABB90 AFB00020 */ sw $s0, 0x0020($sp) /* 000B4 808ABB94 31CF0080 */ andi $t7, $t6, 0x0080 ## $t7 = 00000000 @@ -18,18 +18,18 @@ glabel func_808ABB84 .L808ABBB0: /* 000D0 808ABBB0 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 000D4 808ABBB4 8CA807C0 */ lw $t0, 0x07C0($a1) ## 000007C0 -/* 000D8 808ABBB8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 000D8 808ABBB8 3C078013 */ lui $a3, %hi(D_801333E0) /* 000DC 808ABBBC 4600320D */ trunc.w.s $f8, $f6 /* 000E0 808ABBC0 8D090028 */ lw $t1, 0x0028($t0) ## 00000028 -/* 000E4 808ABBC4 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 000E8 808ABBC8 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 +/* 000E4 808ABBC4 3C058013 */ lui $a1, %hi(D_801333D4) +/* 000E8 808ABBC8 3C0A8013 */ lui $t2, %hi(D_801333E8) /* 000EC 808ABBCC 44194000 */ mfc1 $t9, $f8 -/* 000F0 808ABBD0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 000F4 808ABBD4 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 +/* 000F0 808ABBD0 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 000F4 808ABBD4 254A33E8 */ addiu $t2, %lo(D_801333E8) /* 000F8 808ABBD8 A5390002 */ sh $t9, 0x0002($t1) ## 00000002 /* 000FC 808ABBDC C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 00100 808ABBE0 C6000150 */ lwc1 $f0, 0x0150($s0) ## 00000150 -/* 00104 808ABBE4 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00104 808ABBE4 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00108 808ABBE8 2404205E */ addiu $a0, $zero, 0x205E ## $a0 = 0000205E /* 0010C 808ABBEC 460A003C */ c.lt.s $f0, $f10 /* 00110 808ABBF0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC22C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC22C.s index 2ff5e7098c..59d41af124 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC22C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC22C.s @@ -2,13 +2,13 @@ glabel func_808AC22C /* 000EC 808AC22C 000670C0 */ sll $t6, $a2, 3 /* 000F0 808AC230 008E7821 */ addu $t7, $a0, $t6 /* 000F4 808AC234 8DE80004 */ lw $t0, 0x0004($t7) ## 00000004 -/* 000F8 808AC238 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 000F8 808AC238 3C0A8016 */ lui $t2, %hi(gSegments) /* 000FC 808AC23C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00100 808AC240 0008C100 */ sll $t8, $t0, 4 /* 00104 808AC244 0018CF02 */ srl $t9, $t8, 28 /* 00108 808AC248 00194880 */ sll $t1, $t9, 2 /* 0010C 808AC24C 01495021 */ addu $t2, $t2, $t1 -/* 00110 808AC250 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 00110 808AC250 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 00114 808AC254 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00118 808AC258 00076880 */ sll $t5, $a3, 2 /* 0011C 808AC25C 01A76823 */ subu $t5, $t5, $a3 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC2BC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC2BC.s index fa3fd8d971..cbff853bb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC2BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC2BC.s @@ -35,8 +35,8 @@ glabel func_808AC2BC /* 001E0 808AC320 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001E4 808AC324 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 001E8 808AC328 03214021 */ addu $t0, $t9, $at -/* 001EC 808AC32C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 001F0 808AC330 AC286FC0 */ sw $t0, 0x6FC0($at) ## 80166FC0 +/* 001EC 808AC32C 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 001F0 808AC330 AC286FC0 */ sw $t0, %lo(gSegments+0x18)($at) /* 001F4 808AC334 8209017C */ lb $t1, 0x017C($s0) ## 0000017C /* 001F8 808AC338 0C010D20 */ jal DynaPolyInfo_SetActorMove @@ -78,8 +78,8 @@ glabel L808AC394 ## DynaPolyInfo_setActor /* 00274 808AC3B4 8FA70054 */ lw $a3, 0x0054($sp) /* 00278 808AC3B8 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 0027C 808AC3BC 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 00280 808AC3C0 8D8CE670 */ lw $t4, -0x1990($t4) ## 8015E670 +/* 0027C 808AC3BC 3C0C8016 */ lui $t4, %hi(gSaveContext+0x10) +/* 00280 808AC3C0 8D8CE670 */ lw $t4, %lo(gSaveContext+0x10)($t4) /* 00284 808AC3C4 3C040001 */ lui $a0, 0x0001 ## $a0 = 00010000 /* 00288 808AC3C8 00912021 */ addu $a0, $a0, $s1 /* 0028C 808AC3CC 1580001E */ bne $t4, $zero, .L808AC448 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Init.s index 78b5834723..e6157f93ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Init.s @@ -110,8 +110,8 @@ glabel L808AC6BC /* 00150 808AC7B0 0C00FA9D */ jal DynaPolyInfo_RegisterActor ## DynaPolyInfo_setActor /* 00154 808AC7B4 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00158 808AC7B8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0015C 808AC7BC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00158 808AC7B8 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0015C 808AC7BC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00160 808AC7C0 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C /* 00164 808AC7C4 94690ED6 */ lhu $t1, 0x0ED6($v1) ## 8015F536 /* 00168 808AC7C8 8FAB0034 */ lw $t3, 0x0034($sp) @@ -150,10 +150,10 @@ glabel L808AC824 /* 001D8 808AC838 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 /* 001DC 808AC83C 3C19808B */ lui $t9, %hi(func_808ACC34) ## $t9 = 808B0000 /* 001E0 808AC840 3C08808B */ lui $t0, %hi(func_808ACCB8) ## $t0 = 808B0000 -/* 001E4 808AC844 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 001E4 808AC844 3C038016 */ lui $v1, %hi(gSaveContext) /* 001E8 808AC848 2739CC34 */ addiu $t9, $t9, %lo(func_808ACC34) ## $t9 = 808ACC34 /* 001EC 808AC84C 2508CCB8 */ addiu $t0, $t0, %lo(func_808ACCB8) ## $t0 = 808ACCB8 -/* 001F0 808AC850 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 001F0 808AC850 2463E660 */ addiu $v1, %lo(gSaveContext) /* 001F4 808AC854 AE190164 */ sw $t9, 0x0164($s0) ## 00000164 /* 001F8 808AC858 AE080134 */ sw $t0, 0x0134($s0) ## 00000134 /* 001FC 808AC85C 94690ED6 */ lhu $t1, 0x0ED6($v1) ## 8015F536 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AC908.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AC908.s index c95d1082ec..b012f0eeb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AC908.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AC908.s @@ -18,8 +18,8 @@ glabel func_808AC908 /* 002E8 808AC948 0C00BE0A */ jal Audio_PlayActorSound2 /* 002EC 808AC94C AFA6003C */ sw $a2, 0x003C($sp) -/* 002F0 808AC950 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 002F4 808AC954 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 002F0 808AC950 3C028016 */ lui $v0, %hi(gSaveContext) +/* 002F4 808AC954 2442E660 */ addiu $v0, %lo(gSaveContext) /* 002F8 808AC958 94580ED6 */ lhu $t8, 0x0ED6($v0) ## 8015F536 /* 002FC 808AC95C 24080019 */ addiu $t0, $zero, 0x0019 ## $t0 = 00000019 /* 00300 808AC960 37192000 */ ori $t9, $t8, 0x2000 ## $t9 = 00002000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACA08.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACA08.s index 43c2fc9527..dcdc58d169 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACA08.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACA08.s @@ -44,11 +44,11 @@ glabel func_808ACA08 /* 00444 808ACAA4 8FAD0044 */ lw $t5, 0x0044($sp) .L808ACAA8: /* 00448 808ACAA8 24010192 */ addiu $at, $zero, 0x0192 ## $at = 00000192 -/* 0044C 808ACAAC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0044C 808ACAAC 3C0F8016 */ lui $t7, %hi(gSaveContext+4) /* 00450 808ACAB0 95AE1D74 */ lhu $t6, 0x1D74($t5) ## 00001D74 /* 00454 808ACAB4 55C1000D */ bnel $t6, $at, .L808ACAEC /* 00458 808ACAB8 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0045C 808ACABC 8DEFE664 */ lw $t7, -0x199C($t7) ## 8015E664 +/* 0045C 808ACABC 8DEFE664 */ lw $t7, %lo(gSaveContext+4)($t7) /* 00460 808ACAC0 2405683E */ addiu $a1, $zero, 0x683E ## $a1 = 0000683E /* 00464 808ACAC4 8FA4003C */ lw $a0, 0x003C($sp) /* 00468 808ACAC8 11E00005 */ beq $t7, $zero, .L808ACAE0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACCB8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACCB8.s index 514ba48ffc..89639fe4eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACCB8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACCB8.s @@ -451,7 +451,7 @@ glabel func_808ACCB8 /* 00C9C 808AD2FC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00CA0 808AD300 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00CA4 808AD304 3C04808B */ lui $a0, %hi(D_808AD850) ## $a0 = 808B0000 -/* 00CA8 808AD308 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 00CA8 808AD308 3C0A8016 */ lui $t2, %hi(gSegments) /* 00CAC 808AD30C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 00CB0 808AD310 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 00CB4 808AD314 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 @@ -468,7 +468,7 @@ glabel func_808ACCB8 /* 00CE0 808AD340 00184F02 */ srl $t1, $t8, 28 /* 00CE4 808AD344 00096080 */ sll $t4, $t1, 2 /* 00CE8 808AD348 014C5021 */ addu $t2, $t2, $t4 -/* 00CEC 808AD34C 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 00CEC 808AD34C 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 00CF0 808AD350 00814024 */ and $t0, $a0, $at /* 00CF4 808AD354 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00CF8 808AD358 010A5821 */ addu $t3, $t0, $t2 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADAE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADAE0.s index 4ff03b9668..a3686397d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADAE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADAE0.s @@ -6,10 +6,10 @@ glabel func_808ADAE0 /* 00010 808ADAF0 00037100 */ sll $t6, $v1, 4 /* 00014 808ADAF4 000E7F02 */ srl $t7, $t6, 28 /* 00018 808ADAF8 000FC080 */ sll $t8, $t7, 2 -/* 0001C 808ADAFC 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 0001C 808ADAFC 3C198016 */ lui $t9, %hi(gSegments) /* 00020 808ADB00 0338C821 */ addu $t9, $t9, $t8 /* 00024 808ADB04 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00028 808ADB08 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 00028 808ADB08 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 0002C 808ADB0C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00030 808ADB10 00614024 */ and $t0, $v1, $at /* 00034 808ADB14 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -22,10 +22,10 @@ glabel func_808ADAE0 /* 0004C 808ADB2C 00034900 */ sll $t1, $v1, 4 /* 00050 808ADB30 00095702 */ srl $t2, $t1, 28 /* 00054 808ADB34 000A5880 */ sll $t3, $t2, 2 -/* 00058 808ADB38 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 00058 808ADB38 3C0C8016 */ lui $t4, %hi(gSegments) /* 0005C 808ADB3C 018B6021 */ addu $t4, $t4, $t3 /* 00060 808ADB40 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00064 808ADB44 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 00064 808ADB44 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 00068 808ADB48 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0006C 808ADB4C 00616824 */ and $t5, $v1, $at /* 00070 808ADB50 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Init.s index 4190cf2669..d8c16122a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Init.s @@ -68,8 +68,8 @@ glabel BgSpot06Objects_Init /* 000AC 808AE82C 0C00FA9D */ jal DynaPolyInfo_RegisterActor ## DynaPolyInfo_setActor /* 000B0 808AE830 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 000B4 808AE834 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 000B8 808AE838 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 000B4 808AE834 3C038016 */ lui $v1, %hi(gSaveContext) +/* 000B8 808AE838 2463E660 */ addiu $v1, %lo(gSaveContext) /* 000BC 808AE83C AE02014C */ sw $v0, 0x014C($s0) ## 0000014C /* 000C0 808AE840 8C790004 */ lw $t9, 0x0004($v1) ## 8015E664 /* 000C4 808AE844 8FA40044 */ lw $a0, 0x0044($sp) @@ -110,8 +110,8 @@ glabel BgSpot06Objects_Init /* 00140 808AE8C0 8FA40044 */ lw $a0, 0x0044($sp) /* 00144 808AE8C4 0C017014 */ jal func_8005C050 /* 00148 808AE8C8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0014C 808AE8CC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00150 808AE8D0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0014C 808AE8CC 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00150 808AE8D0 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00154 808AE8D4 8C6B0004 */ lw $t3, 0x0004($v1) ## 8015E664 /* 00158 808AE8D8 8FA40044 */ lw $a0, 0x0044($sp) /* 0015C 808AE8DC 5560002C */ bnel $t3, $zero, .L808AE990 @@ -119,9 +119,9 @@ glabel BgSpot06Objects_Init /* 00164 808AE8E4 0C00B2D0 */ jal Flags_GetSwitch /* 00168 808AE8E8 86050168 */ lh $a1, 0x0168($s0) ## 00000168 -/* 0016C 808AE8EC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 0016C 808AE8EC 3C038016 */ lui $v1, %hi(gSaveContext) /* 00170 808AE8F0 10400026 */ beq $v0, $zero, .L808AE98C -/* 00174 808AE8F4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00174 808AE8F4 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00178 808AE8F8 946C0EE0 */ lhu $t4, 0x0EE0($v1) ## 8015F540 /* 0017C 808AE8FC 3C01808B */ lui $at, %hi(D_808AF9EC) ## $at = 808B0000 /* 00180 808AE900 318D0200 */ andi $t5, $t4, 0x0200 ## $t5 = 00000000 @@ -196,9 +196,9 @@ glabel BgSpot06Objects_Init /* 0027C 808AE9FC 0C01E037 */ jal Actor_ProcessInitChain /* 00280 808AEA00 24A5F968 */ addiu $a1, $a1, %lo(D_808AF968) ## $a1 = 808AF968 -/* 00284 808AEA04 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00284 808AEA04 3C038016 */ lui $v1, %hi(gSaveContext) /* 00288 808AEA08 240C0030 */ addiu $t4, $zero, 0x0030 ## $t4 = 00000030 -/* 0028C 808AEA0C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0028C 808AEA0C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00290 808AEA10 AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 /* 00294 808AEA14 8C6D0004 */ lw $t5, 0x0004($v1) ## 8015E664 /* 00298 808AEA18 3C09808B */ lui $t1, %hi(func_808AEE00) ## $t1 = 808B0000 @@ -274,9 +274,9 @@ glabel BgSpot06Objects_Init ## DynaPolyInfo_setActor /* 00398 808AEB18 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 /* 0039C 808AEB1C 3C0A808B */ lui $t2, %hi(func_808AEE00) ## $t2 = 808B0000 -/* 003A0 808AEB20 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 003A0 808AEB20 3C038016 */ lui $v1, %hi(gSaveContext) /* 003A4 808AEB24 254AEE00 */ addiu $t2, $t2, %lo(func_808AEE00) ## $t2 = 808AEE00 -/* 003A8 808AEB28 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 003A8 808AEB28 2463E660 */ addiu $v1, %lo(gSaveContext) /* 003AC 808AEB2C AE02014C */ sw $v0, 0x014C($s0) ## 0000014C /* 003B0 808AEB30 AE0A0164 */ sw $t2, 0x0164($s0) ## 00000164 /* 003B4 808AEB34 8C6B0004 */ lw $t3, 0x0004($v1) ## 8015E664 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s index dbde568fb2..2ef46733a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s @@ -107,15 +107,15 @@ glabel func_808AEEFC /* 008EC 808AF06C 8E2C018C */ lw $t4, 0x018C($s1) ## 0000018C /* 008F0 808AF070 240B002D */ addiu $t3, $zero, 0x002D ## $t3 = 0000002D /* 008F4 808AF074 3C0D808B */ lui $t5, %hi(func_808AF120) ## $t5 = 808B0000 -/* 008F8 808AF078 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 008F8 808AF078 3C078013 */ lui $a3, %hi(D_801333E0) /* 008FC 808AF07C 25ADF120 */ addiu $t5, $t5, %lo(func_808AF120) ## $t5 = 808AF120 -/* 00900 808AF080 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 +/* 00900 808AF080 3C0E8013 */ lui $t6, %hi(D_801333E8) /* 00904 808AF084 A58B0036 */ sh $t3, 0x0036($t4) ## 00000036 -/* 00908 808AF088 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00908 808AF088 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 0090C 808AF08C AE2D0164 */ sw $t5, 0x0164($s1) ## 00000164 -/* 00910 808AF090 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 00914 808AF094 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00918 808AF098 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00910 808AF090 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 00914 808AF094 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00918 808AF098 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 0091C 808AF09C AFAE0014 */ sw $t6, 0x0014($sp) /* 00920 808AF0A0 AFA70010 */ sw $a3, 0x0010($sp) /* 00924 808AF0A4 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s index f1788ee20a..d6a73db4f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s @@ -109,7 +109,7 @@ glabel func_808AF524 /* 00F18 808AF698 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 00F1C 808AF69C 8FAD0088 */ lw $t5, 0x0088($sp) /* 00F20 808AF6A0 3C06808B */ lui $a2, %hi(D_808AF9CC) ## $a2 = 808B0000 -/* 00F24 808AF6A4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 00F24 808AF6A4 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) /* 00F28 808AF6A8 C5A4016C */ lwc1 $f4, 0x016C($t5) ## 0000016C /* 00F2C 808AF6AC 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 /* 00F30 808AF6B0 24C6F9CC */ addiu $a2, $a2, %lo(D_808AF9CC) ## $a2 = 808AF9CC @@ -118,7 +118,7 @@ glabel func_808AF524 /* 00F3C 808AF6BC 2407036F */ addiu $a3, $zero, 0x036F ## $a3 = 0000036F /* 00F40 808AF6C0 4502000F */ bc1fl .L808AF700 /* 00F44 808AF6C4 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00F48 808AF6C8 8DCEF9C0 */ lw $t6, -0x0640($t6) ## 8015F9C0 +/* 00F48 808AF6C8 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) /* 00F4C 808AF6CC 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 /* 00F50 808AF6D0 29C10004 */ slti $at, $t6, 0x0004 /* 00F54 808AF6D4 5020000A */ beql $at, $zero, .L808AF700 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF7FC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF7FC.s index 928f2a30d9..9ec3390a04 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF7FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF7FC.s @@ -1,6 +1,6 @@ glabel func_808AF7FC -/* 0107C 808AF7FC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 01080 808AF800 95CEF540 */ lhu $t6, -0x0AC0($t6) ## 8015F540 +/* 0107C 808AF7FC 3C0E8016 */ lui $t6, %hi(gSaveContext+0xee0) +/* 01080 808AF800 95CEF540 */ lhu $t6, %lo(gSaveContext+0xee0)($t6) /* 01084 808AF804 3C18808B */ lui $t8, %hi(func_808AF824) ## $t8 = 808B0000 /* 01088 808AF808 AFA50004 */ sw $a1, 0x0004($sp) /* 0108C 808AF80C 31CF0200 */ andi $t7, $t6, 0x0200 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s index e04a0540d5..82575de83d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s @@ -31,8 +31,8 @@ glabel BgSpot07Taki_Draw /* 00134 808AFD64 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00138 808AFD68 8FA200A4 */ lw $v0, 0x00A4($sp) /* 0013C 808AFD6C 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 00140 808AFD70 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 00144 808AFD74 8F18E664 */ lw $t8, -0x199C($t8) ## 8015E664 +/* 00140 808AFD70 3C188016 */ lui $t8, %hi(gSaveContext+4) +/* 00144 808AFD74 8F18E664 */ lw $t8, %lo(gSaveContext+4)($t8) /* 00148 808AFD78 01E27821 */ addu $t7, $t7, $v0 /* 0014C 808AFD7C 8DEF1DE4 */ lw $t7, 0x1DE4($t7) ## 00011DE4 /* 00150 808AFD80 17000029 */ bne $t8, $zero, .L808AFE28 @@ -127,9 +127,9 @@ glabel BgSpot07Taki_Draw /* 002AC 808AFEDC AFA20070 */ sw $v0, 0x0070($sp) /* 002B0 808AFEE0 8FA30070 */ lw $v1, 0x0070($sp) /* 002B4 808AFEE4 8FA70048 */ lw $a3, 0x0048($sp) -/* 002B8 808AFEE8 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 002B8 808AFEE8 3C0C8016 */ lui $t4, %hi(gSaveContext+4) /* 002BC 808AFEEC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 002C0 808AFEF0 8D8CE664 */ lw $t4, -0x199C($t4) ## 8015E664 +/* 002C0 808AFEF0 8D8CE664 */ lw $t4, %lo(gSaveContext+4)($t4) /* 002C4 808AFEF4 51800097 */ beql $t4, $zero, .L808B0154 /* 002C8 808AFEF8 8FAC00A0 */ lw $t4, 0x00A0($sp) /* 002CC 808AFEFC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Init.s index 041638a3a0..969d3672f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Init.s @@ -13,8 +13,8 @@ glabel BgSpot07Taki_Init /* 00028 808AFC58 0C01E037 */ jal Actor_ProcessInitChain /* 0002C 808AFC5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00030 808AFC60 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00034 808AFC64 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 +/* 00030 808AFC60 3C0E8016 */ lui $t6, %hi(gSaveContext+4) +/* 00034 808AFC64 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) /* 00038 808AFC68 15C00013 */ bne $t6, $zero, .L808AFCB8 /* 0003C 808AFC6C 00000000 */ nop /* 00040 808AFC70 860F001C */ lh $t7, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Init.s index fccdbea5bb..85d675285b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Init.s @@ -44,8 +44,8 @@ glabel BgSpot08Iceblock_Init /* 00884 808B11E4 0C22C25A */ jal func_808B0968 /* 00888 808B11E8 8FA5002C */ lw $a1, 0x002C($sp) .L808B11EC: -/* 0088C 808B11EC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00890 808B11F0 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 +/* 0088C 808B11EC 3C0E8016 */ lui $t6, %hi(gSaveContext+4) +/* 00890 808B11F0 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) /* 00894 808B11F4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00898 808B11F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0089C 808B11FC 11C00003 */ beq $t6, $zero, .L808B120C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3AAC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3AAC.s index cad42a5d89..57bda84abd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3AAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3AAC.s @@ -56,8 +56,8 @@ glabel func_808B3AAC /* 00200 808B3B60 10200006 */ beq $at, $zero, .L808B3B7C /* 00204 808B3B64 2841A001 */ slti $at, $v0, 0xA001 /* 00208 808B3B68 14200004 */ bne $at, $zero, .L808B3B7C -/* 0020C 808B3B6C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00210 808B3B70 9442F536 */ lhu $v0, -0x0ACA($v0) ## 8015F536 +/* 0020C 808B3B6C 3C028016 */ lui $v0, %hi(gSaveContext+0xed6) +/* 00210 808B3B70 9442F536 */ lhu $v0, %lo(gSaveContext+0xed6)($v0) /* 00214 808B3B74 10000003 */ beq $zero, $zero, .L808B3B84 /* 00218 808B3B78 30420010 */ andi $v0, $v0, 0x0010 ## $v0 = 00000000 .L808B3B7C: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5950.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5950.s index b55cb760c6..b324abe249 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5950.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5950.s @@ -30,8 +30,8 @@ glabel func_808B5950 /* 00D90 808B59C0 0C00B2DD */ jal Flags_SetSwitch /* 00D94 808B59C4 86250156 */ lh $a1, 0x0156($s1) ## 00000156 -/* 00D98 808B59C8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00D9C 808B59CC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00D98 808B59C8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00D9C 808B59CC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00DA0 808B59D0 94580ED8 */ lhu $t8, 0x0ED8($v0) ## 8015F538 /* 00DA4 808B59D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00DA8 808B59D8 37190008 */ ori $t9, $t8, 0x0008 ## $t9 = 00000008 @@ -57,8 +57,8 @@ glabel func_808B5950 ## CollisionCheck_setAC /* 00DEC 808B5A1C 8FA50030 */ lw $a1, 0x0030($sp) .L808B5A20: -/* 00DF0 808B5A20 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00DF4 808B5A24 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 00DF0 808B5A20 3C038016 */ lui $v1, %hi(gGameInfo) +/* 00DF4 808B5A24 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) /* 00DF8 808B5A28 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00DFC 808B5A2C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E00 808B5A30 846211D4 */ lh $v0, 0x11D4($v1) ## 801611D4 @@ -66,8 +66,8 @@ glabel func_808B5950 /* 00E08 808B5A38 00000000 */ nop /* 00E0C 808B5A3C 0C22D587 */ jal func_808B561C /* 00E10 808B5A40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00E14 808B5A44 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 00E18 808B5A48 8D29FA90 */ lw $t1, -0x0570($t1) ## 8015FA90 +/* 00E14 808B5A44 3C098016 */ lui $t1, %hi(gGameInfo) +/* 00E18 808B5A48 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) /* 00E1C 808B5A4C 2408FFF6 */ addiu $t0, $zero, 0xFFF6 ## $t0 = FFFFFFF6 /* 00E20 808B5A50 10000004 */ beq $zero, $zero, .L808B5A64 /* 00E24 808B5A54 A52811D4 */ sh $t0, 0x11D4($t1) ## 801611D4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Init.s index 5afddd1e5d..a32972cbb8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Init.s @@ -104,8 +104,8 @@ glabel BgSpot16Doughnut_Init /* 00134 808B6574 0C00084C */ jal osSyncPrintf /* 00138 808B6578 00000000 */ nop -/* 0013C 808B657C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00140 808B6580 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0013C 808B657C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00140 808B6580 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00144 808B6584 8C4A0004 */ lw $t2, 0x0004($v0) ## 8015E664 /* 00148 808B6588 3C04808B */ lui $a0, %hi(D_808B6A3C) ## $a0 = 808B0000 /* 0014C 808B658C 24846A3C */ addiu $a0, $a0, %lo(D_808B6A3C) ## $a0 = 808B6A3C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Init.s index b8f8875225..1576a7d901 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Init.s @@ -51,8 +51,8 @@ glabel BgSpot18Basket_Init /* 0027C 808B798C 0C01E037 */ jal Actor_ProcessInitChain /* 00280 808B7990 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00284 808B7994 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00288 808B7998 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00284 808B7994 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00288 808B7998 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0028C 808B799C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00290 808B79A0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00294 808B79A4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8910.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8910.s index 72d3f264f6..a0a82faf58 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8910.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8910.s @@ -29,8 +29,8 @@ glabel D_808B9244 .text glabel func_808B8910 -/* 00000 808B8910 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00004 808B8914 8C63E664 */ lw $v1, -0x199C($v1) ## 8015E664 +/* 00000 808B8910 3C038016 */ lui $v1, %hi(gSaveContext+4) +/* 00004 808B8914 8C63E664 */ lw $v1, %lo(gSaveContext+4)($v1) /* 00008 808B8918 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0000C 808B891C AFBF0014 */ sw $ra, 0x0014($sp) /* 00010 808B8920 AFA40020 */ sw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8BB4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8BB4.s index dafb499b42..32f1f221ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8BB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/func_808B8BB4.s @@ -8,8 +8,8 @@ glabel func_808B8BB4 /* 002BC 808B8BCC 0C01E037 */ jal Actor_ProcessInitChain /* 002C0 808B8BD0 24A5911C */ addiu $a1, $a1, %lo(D_808B911C) ## $a1 = 808B911C -/* 002C4 808B8BD4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 002C8 808B8BD8 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 +/* 002C4 808B8BD4 3C0E8016 */ lui $t6, %hi(gSaveContext+4) +/* 002C8 808B8BD8 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) /* 002CC 808B8BDC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 002D0 808B8BE0 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 /* 002D4 808B8BE4 11C00003 */ beq $t6, $zero, .L808B8BF4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Init.s index 355d641d6c..e26ad944c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Init.s @@ -18,12 +18,12 @@ glabel BgSpot18Shutter_Init /* 0003C 808B940C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00040 808B9410 8FB9002C */ lw $t9, 0x002C($sp) -/* 00044 808B9414 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00044 808B9414 3C038016 */ lui $v1, %hi(gSaveContext) /* 00048 808B9418 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 /* 0004C 808B941C 1720002D */ bne $t9, $zero, .L808B94D4 -/* 00050 808B9420 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00054 808B9424 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00058 808B9428 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00050 808B9420 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 00054 808B9424 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00058 808B9428 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0005C 808B942C 8C680004 */ lw $t0, 0x0004($v1) ## 8015E664 /* 00060 808B9430 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 /* 00064 808B9434 11000003 */ beq $t0, $zero, .L808B9444 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B9618.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B9618.s index 1a694f314f..e6ac094f75 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B9618.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/func_808B9618.s @@ -1,6 +1,6 @@ glabel func_808B9618 -/* 00248 808B9618 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0024C 808B961C 95CEF578 */ lhu $t6, -0x0A88($t6) ## 8015F578 +/* 00248 808B9618 3C0E8016 */ lui $t6, %hi(gSaveContext+0xf18) +/* 0024C 808B961C 95CEF578 */ lhu $t6, %lo(gSaveContext+0xf18)($t6) /* 00250 808B9620 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00254 808B9624 AFBF001C */ sw $ra, 0x001C($sp) /* 00258 808B9628 31CF0200 */ andi $t7, $t6, 0x0200 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Update.s index 66ed618501..2aa50550ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Update.s @@ -12,9 +12,9 @@ glabel BgSstFloor_Update /* 0009C 808B99AC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 000A0 808B99B0 244294F8 */ addiu $v0, $v0, 0x94F8 ## $v0 = 060194F8 /* 000A4 808B99B4 0002C100 */ sll $t8, $v0, 4 -/* 000A8 808B99B8 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 000A8 808B99B8 3C068016 */ lui $a2, %hi(gSegments) /* 000AC 808B99BC 0018CF02 */ srl $t9, $t8, 28 -/* 000B0 808B99C0 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 000B0 808B99C0 24C66FA8 */ addiu $a2, %lo(gSegments) /* 000B4 808B99C4 00194880 */ sll $t1, $t9, 2 /* 000B8 808B99C8 00C95021 */ addu $t2, $a2, $t1 /* 000BC 808B99CC 8D4B0000 */ lw $t3, 0x0000($t2) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Init.s index ed778cde63..95e54238a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Init.s @@ -8,7 +8,7 @@ glabel BgTokiHikari_Init /* 00018 808B9F18 10400005 */ beq $v0, $zero, .L808B9F30 /* 0001C 808B9F1C 24A5AC70 */ addiu $a1, $a1, %lo(D_808BAC70) ## $a1 = 808BAC70 /* 00020 808B9F20 1041000A */ beq $v0, $at, .L808B9F4C -/* 00024 808B9F24 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00024 808B9F24 3C0F8016 */ lui $t7, %hi(gSaveContext+0xedc) /* 00028 808B9F28 10000015 */ beq $zero, $zero, .L808B9F80 /* 0002C 808B9F2C 8FBF0014 */ lw $ra, 0x0014($sp) .L808B9F30: @@ -21,7 +21,7 @@ glabel BgTokiHikari_Init /* 00044 808B9F44 1000000D */ beq $zero, $zero, .L808B9F7C /* 00048 808B9F48 AC8E0150 */ sw $t6, 0x0150($a0) ## 00000150 .L808B9F4C: -/* 0004C 808B9F4C 95EFF53C */ lhu $t7, -0x0AC4($t7) ## FFFFF53C +/* 0004C 808B9F4C 95EFF53C */ lhu $t7, %lo(gSaveContext+0xedc)($t7) /* 00050 808B9F50 3C19808C */ lui $t9, %hi(func_808BA204) ## $t9 = 808C0000 /* 00054 808B9F54 2739A204 */ addiu $t9, $t9, %lo(func_808BA204) ## $t9 = 808BA204 /* 00058 808B9F58 31F80800 */ andi $t8, $t7, 0x0800 ## $t8 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s index a074cf517b..00e0e3b176 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s @@ -45,10 +45,10 @@ glabel func_808BA018 /* 0017C 808BA07C 0C0346A2 */ jal Matrix_NewMtx /* 00180 808BA080 AFA2004C */ sw $v0, 0x004C($sp) /* 00184 808BA084 8FA3004C */ lw $v1, 0x004C($sp) -/* 00188 808BA088 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 00188 808BA088 3C188016 */ lui $t8, %hi(gSaveContext+4) /* 0018C 808BA08C 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 /* 00190 808BA090 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00194 808BA094 8F18E664 */ lw $t8, -0x199C($t8) ## 8015E664 +/* 00194 808BA094 8F18E664 */ lw $t8, %lo(gSaveContext+4)($t8) /* 00198 808BA098 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 /* 0019C 808BA09C 5700000A */ bnel $t8, $zero, .L808BA0C8 /* 001A0 808BA0A0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Draw.s index 9933edda53..2425db2d57 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Draw.s @@ -33,8 +33,8 @@ glabel BgTreemouth_Draw /* 00750 808BCC50 8FAF004C */ lw $t7, 0x004C($sp) /* 00754 808BCC54 0C024F46 */ jal func_80093D18 /* 00758 808BCC58 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 0075C 808BCC5C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00760 808BCC60 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0075C 808BCC5C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00760 808BCC60 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00764 808BCC64 8C621360 */ lw $v0, 0x1360($v1) ## 8015F9C0 /* 00768 808BCC68 8FA8003C */ lw $t0, 0x003C($sp) /* 0076C 808BCC6C 97A90042 */ lhu $t1, 0x0042($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Init.s index ae28ff4db2..39e6cd256a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Init.s @@ -36,8 +36,8 @@ glabel BgTreemouth_Init /* 0007C 808BC57C 0C00B56E */ jal Actor_SetHeight /* 00080 808BC580 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 00084 808BC584 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00088 808BC588 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00084 808BC584 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00088 808BC588 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0008C 808BC58C 8C621360 */ lw $v0, 0x1360($v1) ## 8015F9C0 /* 00090 808BC590 28410004 */ slti $at, $v0, 0x0004 /* 00094 808BC594 5020000B */ beql $at, $zero, .L808BC5C4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC65C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC65C.s index 7f61e42289..ea85414acd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC65C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC65C.s @@ -20,12 +20,12 @@ glabel func_808BC65C /* 001A4 808BC6A4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 .L808BC6A8: /* 001A8 808BC6A8 1461000F */ bne $v1, $at, .L808BC6E8 -/* 001AC 808BC6AC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 001B0 808BC6B0 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 001B4 808BC6B4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 001B8 808BC6B8 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 001BC 808BC6BC 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 001C0 808BC6C0 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 001AC 808BC6AC 3C078013 */ lui $a3, %hi(D_801333E0) +/* 001B0 808BC6B0 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 001B4 808BC6B4 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 001B8 808BC6B8 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 001BC 808BC6BC 3C058013 */ lui $a1, %hi(D_801333D4) +/* 001C0 808BC6C0 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 001C4 808BC6C4 AFAF0014 */ sw $t7, 0x0014($sp) /* 001C8 808BC6C8 AFA70010 */ sw $a3, 0x0010($sp) /* 001CC 808BC6CC 24042866 */ addiu $a0, $zero, 0x2866 ## $a0 = 00002866 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC6F8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC6F8.s index c13f4796a5..c76603a1a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC6F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC6F8.s @@ -21,7 +21,7 @@ glabel func_808BC6F8 /* 00204 808BC704 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 00208 808BC708 C4800168 */ lwc1 $f0, 0x0168($a0) ## 00000168 /* 0020C 808BC70C 3C01808C */ lui $at, %hi(D_808BDA1C) ## $at = 808C0000 -/* 00210 808BC710 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 00210 808BC710 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) /* 00214 808BC714 4602003C */ c.lt.s $f0, $f2 /* 00218 808BC718 00000000 */ nop /* 0021C 808BC71C 45020006 */ bc1fl .L808BC738 @@ -32,7 +32,7 @@ glabel func_808BC6F8 /* 00230 808BC730 E4860168 */ swc1 $f6, 0x0168($a0) ## 00000168 /* 00234 808BC734 E4820168 */ swc1 $f2, 0x0168($a0) ## 00000168 .L808BC738: -/* 00238 808BC738 8DCEF9C0 */ lw $t6, -0x0640($t6) ## 8015F9C0 +/* 00238 808BC738 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) /* 0023C 808BC73C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 00240 808BC740 55C1002F */ bnel $t6, $at, .L808BC800 /* 00244 808BC744 8FBF002C */ lw $ra, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC8B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC8B8.s index 1dcb8fd5de..ac6217f96f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC8B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC8B8.s @@ -8,13 +8,13 @@ glabel func_808BC8B8 /* 003D0 808BC8D0 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 /* 003D4 808BC8D4 10400004 */ beq $v0, $zero, .L808BC8E8 -/* 003D8 808BC8D8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 003DC 808BC8DC 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 +/* 003D8 808BC8D8 3C0E8016 */ lui $t6, %hi(gSaveContext+4) +/* 003DC 808BC8DC 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) /* 003E0 808BC8E0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 003E4 808BC8E4 15C00039 */ bne $t6, $zero, .L808BC9CC .L808BC8E8: -/* 003E8 808BC8E8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 003EC 808BC8EC 8DEFE664 */ lw $t7, -0x199C($t7) ## 8015E664 +/* 003E8 808BC8E8 3C0F8016 */ lui $t7, %hi(gSaveContext+4) +/* 003EC 808BC8EC 8DEFE664 */ lw $t7, %lo(gSaveContext+4)($t7) /* 003F0 808BC8F0 51E0003A */ beql $t7, $zero, .L808BC9DC /* 003F4 808BC8F4 8FBF001C */ lw $ra, 0x001C($sp) /* 003F8 808BC8F8 0C00D6D3 */ jal Flags_GetEventChkInf @@ -40,11 +40,11 @@ glabel func_808BC8B8 /* 00444 808BC944 8FAC0024 */ lw $t4, 0x0024($sp) /* 00448 808BC948 3C0B808C */ lui $t3, %hi(D_808BD2A0) ## $t3 = 808C0000 /* 0044C 808BC94C 256BD2A0 */ addiu $t3, $t3, %lo(D_808BD2A0) ## $t3 = 808BD2A0 -/* 00450 808BC950 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00450 808BC950 3C018016 */ lui $at, %hi(gSaveContext+0x1414) /* 00454 808BC954 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 00458 808BC958 3C05808C */ lui $a1, %hi(func_808BC9EC) ## $a1 = 808C0000 /* 0045C 808BC95C AD8B1D68 */ sw $t3, 0x1D68($t4) ## 00001D68 -/* 00460 808BC960 A02DFA74 */ sb $t5, -0x058C($at) ## 8015FA74 +/* 00460 808BC960 A02DFA74 */ sb $t5, %lo(gSaveContext+0x1414)($at) /* 00464 808BC964 24A5C9EC */ addiu $a1, $a1, %lo(func_808BC9EC) ## $a1 = 808BC9EC /* 00468 808BC968 0C22F140 */ jal func_808BC500 /* 0046C 808BC96C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -64,10 +64,10 @@ glabel func_808BC8B8 /* 0049C 808BC99C 3C0E808C */ lui $t6, %hi(D_808BCE20) ## $t6 = 808C0000 /* 004A0 808BC9A0 25CECE20 */ addiu $t6, $t6, %lo(D_808BCE20) ## $t6 = 808BCE20 /* 004A4 808BC9A4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 004A8 808BC9A8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 004A8 808BC9A8 3C018016 */ lui $at, %hi(gSaveContext+0x1414) /* 004AC 808BC9AC 3C05808C */ lui $a1, %hi(func_808BC9EC) ## $a1 = 808C0000 /* 004B0 808BC9B0 ADEE1D68 */ sw $t6, 0x1D68($t7) ## 00001D68 -/* 004B4 808BC9B4 A038FA74 */ sb $t8, -0x058C($at) ## 8015FA74 +/* 004B4 808BC9B4 A038FA74 */ sb $t8, %lo(gSaveContext+0x1414)($at) /* 004B8 808BC9B8 24A5C9EC */ addiu $a1, $a1, %lo(func_808BC9EC) ## $a1 = 808BC9EC /* 004BC 808BC9BC 0C22F140 */ jal func_808BC500 /* 004C0 808BC9C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC9EC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC9EC.s index 27f6f27f20..0fadd893dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC9EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BC9EC.s @@ -35,12 +35,12 @@ glabel func_808BC9EC /* 00550 808BCA50 3402FFFF */ ori $v0, $zero, 0xFFFF ## $v0 = 0000FFFF /* 00554 808BCA54 A4E01D74 */ sh $zero, 0x1D74($a3) ## 00001D74 /* 00558 808BCA58 A4E21D7C */ sh $v0, 0x1D7C($a3) ## 00001D7C -/* 0055C 808BCA5C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00560 808BCA60 A422FCC0 */ sh $v0, -0x0340($at) ## 8015FCC0 -/* 00564 808BCA64 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00568 808BCA68 A422FCC2 */ sh $v0, -0x033E($at) ## 8015FCC2 -/* 0056C 808BCA6C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00570 808BCA70 A422FCC4 */ sh $v0, -0x033C($at) ## 8015FCC4 +/* 0055C 808BCA5C 3C018016 */ lui $at, %hi(D_8015FCC0) +/* 00560 808BCA60 A422FCC0 */ sh $v0, %lo(D_8015FCC0)($at) +/* 00564 808BCA64 3C018016 */ lui $at, %hi(D_8015FCC2) +/* 00568 808BCA68 A422FCC2 */ sh $v0, %lo(D_8015FCC2)($at) +/* 0056C 808BCA6C 3C018016 */ lui $at, %hi(D_8015FCC4) +/* 00570 808BCA70 A422FCC4 */ sh $v0, %lo(D_8015FCC4)($at) /* 00574 808BCA74 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 00578 808BCA78 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 /* 0057C 808BCA7C A0E01D7E */ sb $zero, 0x1D7E($a3) ## 00001D7E diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BCAF0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BCAF0.s index d9896828c8..b99532fbcf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BCAF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/func_808BCAF0.s @@ -20,12 +20,12 @@ glabel func_808BCAF0 /* 00638 808BCB38 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 .L808BCB3C: /* 0063C 808BCB3C 1461000F */ bne $v1, $at, .L808BCB7C -/* 00640 808BCB40 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00644 808BCB44 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 00648 808BCB48 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0064C 808BCB4C 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 00650 808BCB50 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00654 808BCB54 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00640 808BCB40 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00644 808BCB44 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 00648 808BCB48 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0064C 808BCB4C 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 00650 808BCB50 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00654 808BCB54 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00658 808BCB58 AFAF0014 */ sw $t7, 0x0014($sp) /* 0065C 808BCB5C AFA70010 */ sw $a3, 0x0010($sp) /* 00660 808BCB60 24042866 */ addiu $a0, $zero, 0x2866 ## $a0 = 00002866 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Update.s index ab09eaf0fe..37e38ae2f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Update.s @@ -95,11 +95,11 @@ glabel BgVbSima_Update ## sins? /* 00288 808BDFE8 00000000 */ nop /* 0028C 808BDFEC 4600048D */ trunc.w.s $f18, $f0 -/* 00290 808BDFF0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00294 808BDFF4 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 00298 808BDFF8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00290 808BDFF0 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00294 808BDFF4 3C188013 */ lui $t8, %hi(D_801333E8) +/* 00298 808BDFF8 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 0029C 808BDFFC 440C9000 */ mfc1 $t4, $f18 -/* 002A0 808BE000 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 002A0 808BE000 271833E8 */ addiu $t8, %lo(D_801333E8) /* 002A4 808BE004 2404205C */ addiu $a0, $zero, 0x205C ## $a0 = 0000205C /* 002A8 808BE008 000C6C00 */ sll $t5, $t4, 16 /* 002AC 808BE00C 000D7403 */ sra $t6, $t5, 16 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF83C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF83C.s index 710b2c92aa..88e479dccf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF83C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF83C.s @@ -2,9 +2,9 @@ glabel func_808BF83C /* 0042C 808BF83C 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 /* 00430 808BF840 24636460 */ addiu $v1, $v1, 0x6460 ## $v1 = 06006460 /* 00434 808BF844 00037100 */ sll $t6, $v1, 4 -/* 00438 808BF848 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 +/* 00438 808BF848 3C078016 */ lui $a3, %hi(gSegments) /* 0043C 808BF84C 000E7F02 */ srl $t7, $t6, 28 -/* 00440 808BF850 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 +/* 00440 808BF850 24E76FA8 */ addiu $a3, %lo(gSegments) /* 00444 808BF854 000FC080 */ sll $t8, $t7, 2 /* 00448 808BF858 00F8C821 */ addu $t9, $a3, $t8 /* 0044C 808BF85C 8F2A0000 */ lw $t2, 0x0000($t9) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s index 0b1f49f92a..45289b2b9d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s @@ -37,8 +37,8 @@ glabel BossDodongo_Init /* 00818 808C19A8 24A5A3C8 */ addiu $a1, $a1, %lo(D_808CA3C8) ## $a1 = 808CA3C8 /* 0081C 808C19AC 3C05460F */ lui $a1, 0x460F ## $a1 = 460F0000 -/* 00820 808C19B0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00824 808C19B4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00820 808C19B0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00824 808C19B4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00828 808C19B8 34A5C000 */ ori $a1, $a1, 0xC000 ## $a1 = 460FC000 /* 0082C 808C19BC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00830 808C19C0 0C00AC78 */ jal ActorShape_Init @@ -106,14 +106,14 @@ glabel BossDodongo_Init /* 0091C 808C1AAC 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00920 808C1AB0 1040005A */ beq $v0, $zero, .L808C1C1C -/* 00924 808C1AB4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 00924 808C1AB4 3C058016 */ lui $a1, %hi(gSegments) /* 00928 808C1AB8 3C020300 */ lui $v0, 0x0300 ## $v0 = 03000000 /* 0092C 808C1ABC 3C03808D */ lui $v1, %hi(D_808C93C8) ## $v1 = 808D0000 /* 00930 808C1AC0 244221D8 */ addiu $v0, $v0, 0x21D8 ## $v0 = 030021D8 /* 00934 808C1AC4 246393C8 */ addiu $v1, $v1, %lo(D_808C93C8) ## $v1 = 808C93C8 /* 00938 808C1AC8 00024100 */ sll $t0, $v0, 4 /* 0093C 808C1ACC 00037900 */ sll $t7, $v1, 4 -/* 00940 808C1AD0 24A56FA8 */ addiu $a1, $a1, 0x6FA8 ## $a1 = 80166FA8 +/* 00940 808C1AD0 24A56FA8 */ addiu $a1, %lo(gSegments) /* 00944 808C1AD4 00084F02 */ srl $t1, $t0, 28 /* 00948 808C1AD8 000FC702 */ srl $t8, $t7, 28 /* 0094C 808C1ADC 00095080 */ sll $t2, $t1, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s index f6c958ad7b..1d67b15e61 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s @@ -856,8 +856,8 @@ glabel BossDodongo_Update /* 034AC 808C463C 8E270224 */ lw $a3, 0x0224($s1) ## 00000224 /* 034B0 808C4640 862E01C6 */ lh $t6, 0x01C6($s1) ## 000001C6 .L808C4644: -/* 034B4 808C4644 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 034B8 808C4648 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 +/* 034B4 808C4644 3C078016 */ lui $a3, %hi(gSegments) +/* 034B8 808C4648 24E76FA8 */ addiu $a3, %lo(gSegments) /* 034BC 808C464C 11C00031 */ beq $t6, $zero, .L808C4714 /* 034C0 808C4650 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 /* 034C4 808C4654 3C02808C */ lui $v0, %hi(D_808C73C8) ## $v0 = 808C0000 @@ -993,16 +993,16 @@ glabel BossDodongo_Update /* 03690 808C4820 00000000 */ nop /* 03694 808C4824 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 03698 808C4828 C6320244 */ lwc1 $f18, 0x0244($s1) ## 00000244 -/* 0369C 808C482C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 036A0 808C4830 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 0369C 808C482C 3C028016 */ lui $v0, %hi(gGameInfo) +/* 036A0 808C4830 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 036A4 808C4834 46128032 */ c.eq.s $f16, $f18 /* 036A8 808C4838 26240244 */ addiu $a0, $s1, 0x0244 ## $a0 = 00000244 /* 036AC 808C483C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 036B0 808C4840 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 036B4 808C4844 45030033 */ bc1tl .L808C4914 /* 036B8 808C4848 8C4E0000 */ lw $t6, 0x0000($v0) ## 8015FA90 -/* 036BC 808C484C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 036C0 808C4850 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 036BC 808C484C 3C028016 */ lui $v0, %hi(gGameInfo) +/* 036C0 808C4850 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 036C4 808C4854 8C4C0000 */ lw $t4, 0x0000($v0) ## 8015FA90 /* 036C8 808C4858 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 036CC 808C485C 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C12C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C12C4.s index 51172c2bd5..5825be700a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C12C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C12C4.s @@ -4,9 +4,9 @@ glabel func_808C12C4 /* 0013C 808C12CC 24425890 */ addiu $v0, $v0, 0x5890 ## $v0 = 06015890 /* 00140 808C12D0 AFB20020 */ sw $s2, 0x0020($sp) /* 00144 808C12D4 00027100 */ sll $t6, $v0, 4 -/* 00148 808C12D8 3C128016 */ lui $s2, 0x8016 ## $s2 = 80160000 +/* 00148 808C12D8 3C128016 */ lui $s2, %hi(gSegments) /* 0014C 808C12DC 000E7F02 */ srl $t7, $t6, 28 -/* 00150 808C12E0 26526FA8 */ addiu $s2, $s2, 0x6FA8 ## $s2 = 80166FA8 +/* 00150 808C12E0 26526FA8 */ addiu $s2, %lo(gSegments) /* 00154 808C12E4 000FC080 */ sll $t8, $t7, 2 /* 00158 808C12E8 AFB30024 */ sw $s3, 0x0024($sp) /* 0015C 808C12EC 0258C821 */ addu $t9, $s2, $t8 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1554.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1554.s index 87f8554d6c..7459b3ffcc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1554.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1554.s @@ -11,11 +11,11 @@ glabel func_808C1554 /* 003D4 808C1564 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 003D8 808C1568 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 /* 003DC 808C156C 27BDEFA0 */ addiu $sp, $sp, 0xEFA0 ## $sp = FFFFEFA0 -/* 003E0 808C1570 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 003E0 808C1570 3C028016 */ lui $v0, %hi(gSegments) /* 003E4 808C1574 00047100 */ sll $t6, $a0, 4 /* 003E8 808C1578 46060202 */ mul.s $f8, $f0, $f6 /* 003EC 808C157C 00055900 */ sll $t3, $a1, 4 -/* 003F0 808C1580 24426FA8 */ addiu $v0, $v0, 0x6FA8 ## $v0 = 80166FA8 +/* 003F0 808C1580 24426FA8 */ addiu $v0, %lo(gSegments) /* 003F4 808C1584 000E7F02 */ srl $t7, $t6, 28 /* 003F8 808C1588 000B6702 */ srl $t4, $t3, 28 /* 003FC 808C158C 000FC080 */ sll $t8, $t7, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s index fa21599ebf..ec9aa2649f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s @@ -293,8 +293,8 @@ glabel L808C1E60 /* 00F10 808C20A0 C5D2002C */ lwc1 $f18, 0x002C($t6) ## 0000002C /* 00F14 808C20A4 E612043C */ swc1 $f18, 0x043C($s0) ## 0000043C .L808C20A8: -/* 00F18 808C20A8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00F1C 808C20AC 95EFF542 */ lhu $t7, -0x0ABE($t7) ## 8015F542 +/* 00F18 808C20A8 3C0F8016 */ lui $t7, %hi(gSaveContext+0xee2) +/* 00F1C 808C20AC 95EFF542 */ lhu $t7, %lo(gSaveContext+0xee2)($t7) /* 00F20 808C20B0 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 /* 00F24 808C20B4 5300002D */ beql $t8, $zero, .L808C216C /* 00F28 808C20B8 860E0198 */ lh $t6, 0x0198($s0) ## 00000198 @@ -509,8 +509,8 @@ glabel L808C23A8 /* 01230 808C23C0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF /* 01234 808C23C4 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01238 808C23C8 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 0123C 808C23CC 95ADF542 */ lhu $t5, -0x0ABE($t5) ## 8015F542 +/* 01238 808C23C8 3C0D8016 */ lui $t5, %hi(gSaveContext+0xee2) +/* 0123C 808C23CC 95ADF542 */ lhu $t5, %lo(gSaveContext+0xee2)($t5) /* 01240 808C23D0 8FAF006C */ lw $t7, 0x006C($sp) /* 01244 808C23D4 31AE0002 */ andi $t6, $t5, 0x0002 ## $t6 = 00000000 /* 01248 808C23D8 11C00004 */ beq $t6, $zero, .L808C23EC @@ -660,8 +660,8 @@ glabel L808C23A8 /* 01454 808C25E4 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A .L808C25E8: /* 01458 808C25E8 1461001F */ bne $v1, $at, .L808C2668 -/* 0145C 808C25EC 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 01460 808C25F0 9529F542 */ lhu $t1, -0x0ABE($t1) ## 8015F542 +/* 0145C 808C25EC 3C098016 */ lui $t1, %hi(gSaveContext+0xee2) +/* 01460 808C25F0 9529F542 */ lhu $t1, %lo(gSaveContext+0xee2)($t1) /* 01464 808C25F4 8FA4007C */ lw $a0, 0x007C($sp) /* 01468 808C25F8 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 /* 0146C 808C25FC 312A0002 */ andi $t2, $t1, 0x0002 ## $t2 = 00000000 @@ -671,10 +671,10 @@ glabel L808C23A8 /* 0147C 808C260C 00025900 */ sll $t3, $v0, 4 /* 01480 808C2610 000B6702 */ srl $t4, $t3, 28 /* 01484 808C2614 000C6880 */ sll $t5, $t4, 2 -/* 01488 808C2618 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 01488 808C2618 3C0E8016 */ lui $t6, %hi(gSegments) /* 0148C 808C261C 01CD7021 */ addu $t6, $t6, $t5 /* 01490 808C2620 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01494 808C2624 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 01494 808C2624 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 01498 808C2628 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0149C 808C262C 00417824 */ and $t7, $v0, $at /* 014A0 808C2630 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -737,12 +737,12 @@ glabel L808C23A8 /* 01574 808C2704 A60001BC */ sh $zero, 0x01BC($s0) ## 000001BC /* 01578 808C2708 8FA8006C */ lw $t0, 0x006C($sp) /* 0157C 808C270C 2419BFFE */ addiu $t9, $zero, 0xBFFE ## $t9 = FFFFBFFE -/* 01580 808C2710 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 01580 808C2710 3C098016 */ lui $t1, %hi(gSaveContext+0xee2) /* 01584 808C2714 A51900B6 */ sh $t9, 0x00B6($t0) ## 000000B6 -/* 01588 808C2718 9529F542 */ lhu $t1, -0x0ABE($t1) ## 8015F542 -/* 0158C 808C271C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 01588 808C2718 9529F542 */ lhu $t1, %lo(gSaveContext+0xee2)($t1) +/* 0158C 808C271C 3C018016 */ lui $at, %hi(gSaveContext+0xee2) /* 01590 808C2720 352A0002 */ ori $t2, $t1, 0x0002 ## $t2 = 80160002 -/* 01594 808C2724 A42AF542 */ sh $t2, -0x0ABE($at) ## 8015F542 +/* 01594 808C2724 A42AF542 */ sh $t2, %lo(gSaveContext+0xee2)($at) .L808C2728: /* 01598 808C2728 860B01B4 */ lh $t3, 0x01B4($s0) ## 000001B4 .L808C272C: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s index cb4840da9b..f468fec994 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s @@ -454,8 +454,8 @@ glabel L808CB988 /* 00D98 808CBB58 3C01808D */ lui $at, %hi(D_808D1E6C) ## $at = 808D0000 /* 00D9C 808CBB5C C4221E6C */ lwc1 $f2, %lo(D_808D1E6C)($at) /* 00DA0 808CBB60 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00DA4 808CBB64 3C148016 */ lui $s4, 0x8016 ## $s4 = 80160000 -/* 00DA8 808CBB68 2694E660 */ addiu $s4, $s4, 0xE660 ## $s4 = 8015E660 +/* 00DA4 808CBB64 3C148016 */ lui $s4, %hi(gSaveContext) +/* 00DA8 808CBB68 2694E660 */ addiu $s4, %lo(gSaveContext) /* 00DAC 808CBB6C A6C00248 */ sh $zero, 0x0248($s6) ## 00000248 /* 00DB0 808CBB70 E6C2147C */ swc1 $f2, 0x147C($s6) ## 0000147C /* 00DB4 808CBB74 E6C21478 */ swc1 $f2, 0x1478($s6) ## 00001478 @@ -577,15 +577,15 @@ glabel L808CBCF8 /* 00F74 808CBD34 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 /* 00F78 808CBD38 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00F7C 808CBD3C 14610003 */ bne $v1, $at, .L808CBD4C -/* 00F80 808CBD40 3C128013 */ lui $s2, 0x8013 ## $s2 = 80130000 +/* 00F80 808CBD40 3C128013 */ lui $s2, %hi(D_801333E0) /* 00F84 808CBD44 A2CE0220 */ sb $t6, 0x0220($s6) ## 00000220 /* 00F88 808CBD48 86C30248 */ lh $v1, 0x0248($s6) ## 00000248 .L808CBD4C: /* 00F8C 808CBD4C 28610032 */ slti $at, $v1, 0x0032 /* 00F90 808CBD50 10200018 */ beq $at, $zero, .L808CBDB4 -/* 00F94 808CBD54 264733E0 */ addiu $a3, $s2, 0x33E0 ## $a3 = 801333E0 -/* 00F98 808CBD58 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 00F9C 808CBD5C 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 00F94 808CBD54 264733E0 */ addiu $a3, $s2, %lo(D_801333E0) +/* 00F98 808CBD58 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 00F9C 808CBD5C 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 00FA0 808CBD60 AFAF0014 */ sw $t7, 0x0014($sp) /* 00FA4 808CBD64 2404304E */ addiu $a0, $zero, 0x304E ## $a0 = 0000304E /* 00FA8 808CBD68 26C500E4 */ addiu $a1, $s6, 0x00E4 ## $a1 = 000000E4 @@ -656,10 +656,10 @@ glabel L808CBE20 /* 01090 808CBE50 0C01E107 */ jal Math_SmoothScaleMaxF /* 01094 808CBE54 E6C61488 */ swc1 $f6, 0x1488($s6) ## 00001488 -/* 01098 808CBE58 3C128013 */ lui $s2, 0x8013 ## $s2 = 80130000 -/* 0109C 808CBE5C 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 010A0 808CBE60 264733E0 */ addiu $a3, $s2, 0x33E0 ## $a3 = 801333E0 -/* 010A4 808CBE64 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 +/* 01098 808CBE58 3C128013 */ lui $s2, %hi(D_801333E0) +/* 0109C 808CBE5C 3C088013 */ lui $t0, %hi(D_801333E8) +/* 010A0 808CBE60 264733E0 */ addiu $a3, $s2, %lo(D_801333E0) +/* 010A4 808CBE64 250833E8 */ addiu $t0, %lo(D_801333E8) /* 010A8 808CBE68 AFA80014 */ sw $t0, 0x0014($sp) /* 010AC 808CBE6C AFA70010 */ sw $a3, 0x0010($sp) /* 010B0 808CBE70 2404304E */ addiu $a0, $zero, 0x304E ## $a0 = 0000304E @@ -737,10 +737,10 @@ glabel L808CBF44 /* 011C0 808CBF80 0C01E107 */ jal Math_SmoothScaleMaxF /* 011C4 808CBF84 E6C81488 */ swc1 $f8, 0x1488($s6) ## 00001488 -/* 011C8 808CBF88 3C128013 */ lui $s2, 0x8013 ## $s2 = 80130000 -/* 011CC 808CBF8C 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 011D0 808CBF90 264733E0 */ addiu $a3, $s2, 0x33E0 ## $a3 = 801333E0 -/* 011D4 808CBF94 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 +/* 011C8 808CBF88 3C128013 */ lui $s2, %hi(D_801333E0) +/* 011CC 808CBF8C 3C0C8013 */ lui $t4, %hi(D_801333E8) +/* 011D0 808CBF90 264733E0 */ addiu $a3, $s2, %lo(D_801333E0) +/* 011D4 808CBF94 258C33E8 */ addiu $t4, %lo(D_801333E8) /* 011D8 808CBF98 AFAC0014 */ sw $t4, 0x0014($sp) /* 011DC 808CBF9C AFA70010 */ sw $a3, 0x0010($sp) /* 011E0 808CBFA0 2404304E */ addiu $a0, $zero, 0x304E ## $a0 = 0000304E @@ -879,19 +879,19 @@ glabel L808CC140 /* 013DC 808CC19C 00000000 */ nop /* 013E0 808CC1A0 86C2024E */ lh $v0, 0x024E($s6) ## 0000024E -/* 013E4 808CC1A4 3C148016 */ lui $s4, 0x8016 ## $s4 = 80160000 -/* 013E8 808CC1A8 2694E660 */ addiu $s4, $s4, 0xE660 ## $s4 = 8015E660 +/* 013E4 808CC1A4 3C148016 */ lui $s4, %hi(gSaveContext) +/* 013E8 808CC1A8 2694E660 */ addiu $s4, %lo(gSaveContext) /* 013EC 808CC1AC 284100BF */ slti $at, $v0, 0x00BF /* 013F0 808CC1B0 1420000F */ bne $at, $zero, .L808CC1F0 /* 013F4 808CC1B4 00000000 */ nop /* 013F8 808CC1B8 968E0EE2 */ lhu $t6, 0x0EE2($s4) ## 8015F542 -/* 013FC 808CC1BC 3C128013 */ lui $s2, 0x8013 ## $s2 = 80130000 -/* 01400 808CC1C0 264733E0 */ addiu $a3, $s2, 0x33E0 ## $a3 = 801333E0 +/* 013FC 808CC1BC 3C128013 */ lui $s2, %hi(D_801333E0) +/* 01400 808CC1C0 264733E0 */ addiu $a3, $s2, %lo(D_801333E0) /* 01404 808CC1C4 31CF0008 */ andi $t7, $t6, 0x0008 ## $t7 = 00000000 /* 01408 808CC1C8 15E00009 */ bne $t7, $zero, .L808CC1F0 /* 0140C 808CC1CC 2404304E */ addiu $a0, $zero, 0x304E ## $a0 = 0000304E -/* 01410 808CC1D0 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 01414 808CC1D4 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 01410 808CC1D0 3C188013 */ lui $t8, %hi(D_801333E8) +/* 01414 808CC1D4 271833E8 */ addiu $t8, %lo(D_801333E8) /* 01418 808CC1D8 AFB80014 */ sw $t8, 0x0014($sp) /* 0141C 808CC1DC 26C500E4 */ addiu $a1, $s6, 0x00E4 ## $a1 = 000000E4 /* 01420 808CC1E0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 @@ -900,10 +900,10 @@ glabel L808CC140 /* 01428 808CC1E8 AFA70010 */ sw $a3, 0x0010($sp) /* 0142C 808CC1EC 86C2024E */ lh $v0, 0x024E($s6) ## 0000024E .L808CC1F0: -/* 01430 808CC1F0 3C148016 */ lui $s4, 0x8016 ## $s4 = 80160000 +/* 01430 808CC1F0 3C148016 */ lui $s4, %hi(gSaveContext) /* 01434 808CC1F4 240100BE */ addiu $at, $zero, 0x00BE ## $at = 000000BE /* 01438 808CC1F8 14410010 */ bne $v0, $at, .L808CC23C -/* 0143C 808CC1FC 2694E660 */ addiu $s4, $s4, 0xE660 ## $s4 = 8015E660 +/* 0143C 808CC1FC 2694E660 */ addiu $s4, %lo(gSaveContext) /* 01440 808CC200 3C01808D */ lui $at, %hi(D_808D1EA4) ## $at = 808D0000 /* 01444 808CC204 C42A1EA4 */ lwc1 $f10, %lo(D_808D1EA4)($at) /* 01448 808CC208 3C01808D */ lui $at, %hi(D_808D1EA8) ## $at = 808D0000 @@ -974,7 +974,7 @@ glabel L808CC140 /* 01530 808CC2F0 28410065 */ slti $at, $v0, 0x0065 /* 01534 808CC2F4 968A0EE2 */ lhu $t2, 0x0EE2($s4) ## 8015F542 /* 01538 808CC2F8 8FA401D4 */ lw $a0, 0x01D4($sp) -/* 0153C 808CC2FC 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0153C 808CC2FC 3C188016 */ lui $t8, %hi(gSegments) /* 01540 808CC300 314B0008 */ andi $t3, $t2, 0x0008 ## $t3 = 00000000 /* 01544 808CC304 15600017 */ bne $t3, $zero, .L808CC364 /* 01548 808CC308 24851D4C */ addiu $a1, $a0, 0x1D4C ## $a1 = 00001D4C @@ -985,7 +985,7 @@ glabel L808CC140 /* 0155C 808CC31C 000E7880 */ sll $t7, $t6, 2 /* 01560 808CC320 030FC021 */ addu $t8, $t8, $t7 /* 01564 808CC324 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01568 808CC328 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 01568 808CC328 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 0156C 808CC32C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 01570 808CC330 0041C824 */ and $t9, $v0, $at /* 01574 808CC334 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -1159,8 +1159,8 @@ glabel L808CC140 /* 017E0 808CC5A0 4481D000 */ mtc1 $at, $f26 ## $f26 = 0.50 /* 017E4 808CC5A4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 017E8 808CC5A8 4481E000 */ mtc1 $at, $f28 ## $f28 = 100.00 -/* 017EC 808CC5AC 3C128013 */ lui $s2, 0x8013 ## $s2 = 80130000 -/* 017F0 808CC5B0 265233E0 */ addiu $s2, $s2, 0x33E0 ## $s2 = 801333E0 +/* 017EC 808CC5AC 3C128013 */ lui $s2, %hi(D_801333E0) +/* 017F0 808CC5B0 265233E0 */ addiu $s2, %lo(D_801333E0) /* 017F4 808CC5B4 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 017F8 808CC5B8 0C232C66 */ jal func_808CB198 /* 017FC 808CC5BC 8FA501D4 */ lw $a1, 0x01D4($sp) @@ -1176,9 +1176,9 @@ glabel L808CC140 /* 01820 808CC5E0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 01824 808CC5E4 4481C000 */ mtc1 $at, $f24 ## $f24 = 50.00 /* 01828 808CC5E8 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 0182C 808CC5EC 3C128013 */ lui $s2, 0x8013 ## $s2 = 80130000 +/* 0182C 808CC5EC 3C128013 */ lui $s2, %hi(D_801333E0) /* 01830 808CC5F0 4481B000 */ mtc1 $at, $f22 ## $f22 = 200.00 -/* 01834 808CC5F4 265233E0 */ addiu $s2, $s2, 0x33E0 ## $s2 = 801333E0 +/* 01834 808CC5F4 265233E0 */ addiu $s2, %lo(D_801333E0) /* 01838 808CC5F8 E6CA02A4 */ swc1 $f10, 0x02A4($s6) ## 000002A4 /* 0183C 808CC5FC 86C20222 */ lh $v0, 0x0222($s6) ## 00000222 .L808CC600: @@ -1555,9 +1555,9 @@ glabel L808CC944 /* 01DA4 808CCB64 13200018 */ beq $t9, $zero, .L808CCBC8 /* 01DA8 808CCB68 24042802 */ addiu $a0, $zero, 0x2802 ## $a0 = 00002802 /* 01DAC 808CCB6C C42A1EF4 */ lwc1 $f10, %lo(D_808D1EF4)($at) -/* 01DB0 808CCB70 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 +/* 01DB0 808CCB70 3C098013 */ lui $t1, %hi(D_801333E8) /* 01DB4 808CCB74 A6C8024A */ sh $t0, 0x024A($s6) ## 0000024A -/* 01DB8 808CCB78 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 +/* 01DB8 808CCB78 252933E8 */ addiu $t1, %lo(D_801333E8) /* 01DBC 808CCB7C E6CA027C */ swc1 $f10, 0x027C($s6) ## 0000027C /* 01DC0 808CCB80 AFA90014 */ sw $t1, 0x0014($sp) /* 01DC4 808CCB84 AFB20010 */ sw $s2, 0x0010($sp) @@ -1827,8 +1827,8 @@ glabel L808CCDF0 /* 02180 808CCF40 31AE001C */ andi $t6, $t5, 0x001C ## $t6 = 00000000 /* 02184 808CCF44 11C00006 */ beq $t6, $zero, .L808CCF60 /* 02188 808CCF48 02403825 */ or $a3, $s2, $zero ## $a3 = 801333E0 -/* 0218C 808CCF4C 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 02190 808CCF50 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 0218C 808CCF4C 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 02190 808CCF50 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 02194 808CCF54 AFAF0014 */ sw $t7, 0x0014($sp) /* 02198 808CCF58 0C03DCE3 */ jal Audio_PlaySoundGeneral @@ -2024,11 +2024,11 @@ glabel L808CD178 /* 0244C 808CD20C 246D0001 */ addiu $t5, $v1, 0x0001 ## $t5 = 00000001 /* 02450 808CD210 240E003C */ addiu $t6, $zero, 0x003C ## $t6 = 0000003C /* 02454 808CD214 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 02458 808CD218 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 +/* 02458 808CD218 3C188013 */ lui $t8, %hi(D_801333E8) /* 0245C 808CD21C A6CD023C */ sh $t5, 0x023C($s6) ## 0000023C /* 02460 808CD220 A6CE024A */ sh $t6, 0x024A($s6) ## 0000024A /* 02464 808CD224 A6CF0242 */ sh $t7, 0x0242($s6) ## 00000242 -/* 02468 808CD228 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 02468 808CD228 271833E8 */ addiu $t8, %lo(D_801333E8) /* 0246C 808CD22C AFB80014 */ sw $t8, 0x0014($sp) /* 02470 808CD230 AFB20010 */ sw $s2, 0x0010($sp) /* 02474 808CD234 24043889 */ addiu $a0, $zero, 0x3889 ## $a0 = 00003889 @@ -2166,8 +2166,8 @@ glabel L808CD3A8 /* 0264C 808CD40C 27B10108 */ addiu $s1, $sp, 0x0108 ## $s1 = FFFFFF38 /* 02650 808CD410 AE0F0004 */ sw $t7, 0x0004($s0) ## FFFFFF48 /* 02654 808CD414 8DD80008 */ lw $t8, 0x0008($t6) ## 808D1A18 -/* 02658 808CD418 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 0265C 808CD41C 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 +/* 02658 808CD418 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 0265C 808CD41C 254A33E8 */ addiu $t2, %lo(D_801333E8) /* 02660 808CD420 AE180008 */ sw $t8, 0x0008($s0) ## FFFFFF4C /* 02664 808CD424 8F290000 */ lw $t1, 0x0000($t9) ## 808D1A1C /* 02668 808CD428 2404301C */ addiu $a0, $zero, 0x301C ## $a0 = 0000301C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CE01C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CE01C.s index 6ccc43bb2b..229260be01 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CE01C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CE01C.s @@ -313,10 +313,10 @@ glabel func_808CE01C /* 03640 808CE400 50400012 */ beql $v0, $zero, .L808CE44C /* 03644 808CE404 86380226 */ lh $t8, 0x0226($s1) ## 00000226 /* 03648 808CE408 1441000A */ bne $v0, $at, .L808CE434 -/* 0364C 808CE40C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 03650 808CE410 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 03654 808CE414 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 03658 808CE418 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 0364C 808CE40C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 03650 808CE410 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 03654 808CE414 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 03658 808CE418 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 0365C 808CE41C AFAF0014 */ sw $t7, 0x0014($sp) /* 03660 808CE420 AFA70010 */ sw $a3, 0x0010($sp) /* 03664 808CE424 240438D1 */ addiu $a0, $zero, 0x38D1 ## $a0 = 000038D1 @@ -354,8 +354,8 @@ glabel func_808CE01C /* 036CC 808CE48C 262413CC */ addiu $a0, $s1, 0x13CC ## $a0 = 000013CC /* 036D0 808CE490 8622022E */ lh $v0, 0x022E($s1) ## 0000022E -/* 036D4 808CE494 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 036D8 808CE498 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 036D4 808CE494 3C078013 */ lui $a3, %hi(D_801333E0) +/* 036D8 808CE498 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 036DC 808CE49C 10400002 */ beq $v0, $zero, .L808CE4A8 /* 036E0 808CE4A0 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF /* 036E4 808CE4A4 A628022E */ sh $t0, 0x022E($s1) ## 0000022E @@ -365,8 +365,8 @@ glabel func_808CE01C /* 036F0 808CE4B0 262500E4 */ addiu $a1, $s1, 0x00E4 ## $a1 = 000000E4 /* 036F4 808CE4B4 112000E6 */ beq $t1, $zero, .L808CE850 /* 036F8 808CE4B8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 036FC 808CE4BC 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 03700 808CE4C0 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 +/* 036FC 808CE4BC 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 03700 808CE4C0 254A33E8 */ addiu $t2, %lo(D_801333E8) /* 03704 808CE4C4 AFAA0014 */ sw $t2, 0x0014($sp) /* 03708 808CE4C8 0C03DCE3 */ jal Audio_PlaySoundGeneral @@ -654,16 +654,16 @@ glabel func_808CE01C /* 03B00 808CE8C0 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 /* 03B04 808CE8C4 AE4F0004 */ sw $t7, 0x0004($s2) ## FFFFFF9C /* 03B08 808CE8C8 8DD80008 */ lw $t8, 0x0008($t6) ## 808D1A48 -/* 03B0C 808CE8CC 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 03B10 808CE8D0 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 +/* 03B0C 808CE8CC 3C0C8013 */ lui $t4, %hi(D_801333E0) +/* 03B10 808CE8D0 3C0D8013 */ lui $t5, %hi(D_801333E8) /* 03B14 808CE8D4 AE580008 */ sw $t8, 0x0008($s2) ## FFFFFFA0 /* 03B18 808CE8D8 8D0A0000 */ lw $t2, 0x0000($t0) ## 808D1A4C /* 03B1C 808CE8DC 8D090004 */ lw $t1, 0x0004($t0) ## 808D1A50 -/* 03B20 808CE8E0 25AD33E8 */ addiu $t5, $t5, 0x33E8 ## $t5 = 801333E8 +/* 03B20 808CE8E0 25AD33E8 */ addiu $t5, %lo(D_801333E8) /* 03B24 808CE8E4 AF2A0000 */ sw $t2, 0x0000($t9) ## FFFFFF80 /* 03B28 808CE8E8 8D0A0008 */ lw $t2, 0x0008($t0) ## 808D1A54 /* 03B2C 808CE8EC AF290004 */ sw $t1, 0x0004($t9) ## FFFFFF84 -/* 03B30 808CE8F0 258733E0 */ addiu $a3, $t4, 0x33E0 ## $a3 = 801333E0 +/* 03B30 808CE8F0 258733E0 */ addiu $a3, $t4, %lo(D_801333E0) /* 03B34 808CE8F4 AF2A0008 */ sw $t2, 0x0008($t9) ## FFFFFF88 /* 03B38 808CE8F8 A22B0220 */ sb $t3, 0x0220($s1) ## 00000220 /* 03B3C 808CE8FC 262E1970 */ addiu $t6, $s1, 0x1970 ## $t6 = 00001970 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CEC34.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CEC34.s index 92ad67e87c..8c2c711bd8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CEC34.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CEC34.s @@ -4,10 +4,10 @@ glabel func_808CEC34 /* 03E7C 808CEC3C AFB00020 */ sw $s0, 0x0020($sp) /* 03E80 808CEC40 AFA5002C */ sw $a1, 0x002C($sp) /* 03E84 808CEC44 8C8214AC */ lw $v0, 0x14AC($a0) ## 000014AC -/* 03E88 808CEC48 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 03E88 808CEC48 3C078013 */ lui $a3, %hi(D_801333E0) /* 03E8C 808CEC4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 03E90 808CEC50 90450016 */ lbu $a1, 0x0016($v0) ## 00000016 -/* 03E94 808CEC54 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 03E94 808CEC54 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 03E98 808CEC58 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 03E9C 808CEC5C 30AE0002 */ andi $t6, $a1, 0x0002 ## $t6 = 00000000 /* 03EA0 808CEC60 11C0001B */ beq $t6, $zero, .L808CECD0 @@ -20,7 +20,7 @@ glabel func_808CEC34 /* 03EBC 808CEC7C A09900AF */ sb $t9, 0x00AF($a0) ## 000000AF /* 03EC0 808CEC80 8C680000 */ lw $t0, 0x0000($v1) ## 00000000 /* 03EC4 808CEC84 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 03EC8 808CEC88 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 +/* 03EC8 808CEC88 3C188013 */ lui $t8, %hi(D_801333E8) /* 03ECC 808CEC8C 31091000 */ andi $t1, $t0, 0x1000 ## $t1 = 00000000 /* 03ED0 808CEC90 11200003 */ beq $t1, $zero, .L808CECA0 /* 03ED4 808CEC94 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 @@ -32,7 +32,7 @@ glabel func_808CEC34 /* 03EE8 808CECA8 240438D5 */ addiu $a0, $zero, 0x38D5 ## $a0 = 000038D5 /* 03EEC 808CECAC 29810003 */ slti $at, $t4, 0x0003 /* 03EF0 808CECB0 10200002 */ beq $at, $zero, .L808CECBC -/* 03EF4 808CECB4 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 03EF4 808CECB4 271833E8 */ addiu $t8, %lo(D_801333E8) /* 03EF8 808CECB8 A20D00AF */ sb $t5, 0x00AF($s0) ## 000000AF .L808CECBC: /* 03EFC 808CECBC A60E0230 */ sh $t6, 0x0230($s0) ## 00000230 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s index 383b784ba0..4751a132c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s @@ -271,7 +271,7 @@ glabel func_808CF898 /* 04E74 808CFC34 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 04E78 808CFC38 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 04E7C 808CFC3C 3C04808D */ lui $a0, %hi(D_808D1A9C) ## $a0 = 808D0000 -/* 04E80 808CFC40 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 04E80 808CFC40 3C098016 */ lui $t1, %hi(gSegments) /* 04E84 808CFC44 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 04E88 808CFC48 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 04E8C 808CFC4C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 @@ -285,7 +285,7 @@ glabel func_808CF898 /* 04EAC 808CFC6C 000F4702 */ srl $t0, $t7, 28 /* 04EB0 808CFC70 00085080 */ sll $t2, $t0, 2 /* 04EB4 808CFC74 012A4821 */ addu $t1, $t1, $t2 -/* 04EB8 808CFC78 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 +/* 04EB8 808CFC78 8D296FA8 */ lw $t1, %lo(gSegments)($t1) /* 04EBC 808CFC7C 0081C824 */ and $t9, $a0, $at /* 04EC0 808CFC80 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 04EC4 808CFC84 03296021 */ addu $t4, $t9, $t1 @@ -377,7 +377,7 @@ glabel func_808CF898 /* 05010 808CFDD0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 05014 808CFDD4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 05018 808CFDD8 3C04808D */ lui $a0, %hi(D_808D1A9C) ## $a0 = 808D0000 -/* 0501C 808CFDDC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0501C 808CFDDC 3C0E8016 */ lui $t6, %hi(gSegments) /* 05020 808CFDE0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 05024 808CFDE4 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 05028 808CFDE8 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 @@ -391,7 +391,7 @@ glabel func_808CF898 /* 05048 808CFE08 000C6F02 */ srl $t5, $t4, 28 /* 0504C 808CFE0C 000D5880 */ sll $t3, $t5, 2 /* 05050 808CFE10 01CB7021 */ addu $t6, $t6, $t3 -/* 05054 808CFE14 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 05054 808CFE14 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 05058 808CFE18 00814824 */ and $t1, $a0, $at /* 0505C 808CFE1C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 05060 808CFE20 012EC021 */ addu $t8, $t1, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s index 56cf3f23cc..2d06b55e66 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s @@ -111,7 +111,7 @@ glabel func_808D08F8 /* 05BC0 808D0980 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 05BC4 808D0984 927902D5 */ lbu $t9, 0x02D5($s3) ## 000002D5 /* 05BC8 808D0988 3C04808D */ lui $a0, %hi(D_808D1BB8) ## $a0 = 808D0000 -/* 05BCC 808D098C 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 05BCC 808D098C 3C0D8016 */ lui $t5, %hi(gSegments) /* 05BD0 808D0990 00194080 */ sll $t0, $t9, 2 /* 05BD4 808D0994 00882021 */ addu $a0, $a0, $t0 /* 05BD8 808D0998 8C841BB8 */ lw $a0, %lo(D_808D1BB8)($a0) @@ -121,7 +121,7 @@ glabel func_808D08F8 /* 05BE8 808D09A8 000A5F02 */ srl $t3, $t2, 28 /* 05BEC 808D09AC 000B6080 */ sll $t4, $t3, 2 /* 05BF0 808D09B0 01AC6821 */ addu $t5, $t5, $t4 -/* 05BF4 808D09B4 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 +/* 05BF4 808D09B4 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) /* 05BF8 808D09B8 00814824 */ and $t1, $a0, $at /* 05BFC 808D09BC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 05C00 808D09C0 012D7021 */ addu $t6, $t1, $t5 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s index 70c0a01621..e6a92dfac3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s @@ -61,7 +61,7 @@ glabel BossFd2_Draw /* 0378C 808D5DFC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 03790 808D5E00 922C0223 */ lbu $t4, 0x0223($s1) ## 00000223 /* 03794 808D5E04 3C04808D */ lui $a0, %hi(D_808D62C0) ## $a0 = 808D0000 -/* 03798 808D5E08 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 03798 808D5E08 3C088016 */ lui $t0, %hi(gSegments) /* 0379C 808D5E0C 000C6880 */ sll $t5, $t4, 2 /* 037A0 808D5E10 008D2021 */ addu $a0, $a0, $t5 /* 037A4 808D5E14 8C8462C0 */ lw $a0, %lo(D_808D62C0)($a0) @@ -71,7 +71,7 @@ glabel BossFd2_Draw /* 037B4 808D5E24 000FC702 */ srl $t8, $t7, 28 /* 037B8 808D5E28 0018C880 */ sll $t9, $t8, 2 /* 037BC 808D5E2C 01194021 */ addu $t0, $t0, $t9 -/* 037C0 808D5E30 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 +/* 037C0 808D5E30 8D086FA8 */ lw $t0, %lo(gSegments)($t0) /* 037C4 808D5E34 00817024 */ and $t6, $a0, $at /* 037C8 808D5E38 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 037CC 808D5E3C 01C84821 */ addu $t1, $t6, $t0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s index 93a40931ff..e1e3ffc1da 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s @@ -48,11 +48,11 @@ glabel BossGanon_Draw /* 0A518 808E0D88 AE4802D0 */ sw $t0, 0x02D0($s2) ## 000002D0 /* 0A51C 808E0D8C 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 /* 0A520 808E0D90 000B6080 */ sll $t4, $t3, 2 -/* 0A524 808E0D94 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 0A524 808E0D94 3C0D8016 */ lui $t5, %hi(gSegments) /* 0A528 808E0D98 01AC6821 */ addu $t5, $t5, $t4 /* 0A52C 808E0D9C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0A530 808E0DA0 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 -/* 0A534 808E0DA4 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 +/* 0A534 808E0DA4 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) /* 0A538 808E0DA8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0A53C 808E0DAC 00817024 */ and $t6, $a0, $at /* 0A540 808E0DB0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s index 3d68863621..14cc616d2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s @@ -39,8 +39,8 @@ glabel BossGanon_Update /* 06DEC 808DD65C 01284821 */ addu $t1, $t1, $t0 /* 06DF0 808DD660 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 /* 06DF4 808DD664 01215021 */ addu $t2, $t1, $at -/* 06DF8 808DD668 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 06DFC 808DD66C AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 +/* 06DF8 808DD668 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 06DFC 808DD66C AC2A6FC0 */ sw $t2, %lo(gSegments+0x18)($at) /* 06E00 808DD670 92A4071B */ lbu $a0, 0x071B($s5) ## 0000071B .L808DD674: /* 06E04 808DD674 50800049 */ beql $a0, $zero, .L808DD79C @@ -1130,18 +1130,18 @@ glabel L808DE3B0 /* 07D14 808DE584 92AE066C */ lbu $t6, 0x066C($s5) ## 0000066C .L808DE588: /* 07D18 808DE588 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 07D1C 808DE58C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 07D1C 808DE58C 3C018016 */ lui $at, %hi(D_8015FCF0) /* 07D20 808DE590 11C0001C */ beq $t6, $zero, .L808DE604 /* 07D24 808DE594 00000000 */ nop -/* 07D28 808DE598 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 07D2C 808DE59C A02FFCF0 */ sb $t7, -0x0310($at) ## 8015FCF0 +/* 07D28 808DE598 3C018016 */ lui $at, %hi(D_8015FCF0) +/* 07D2C 808DE59C A02FFCF0 */ sb $t7, %lo(D_8015FCF0)($at) /* 07D30 808DE5A0 92B8066C */ lbu $t8, 0x066C($s5) ## 0000066C /* 07D34 808DE5A4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 07D38 808DE5A8 5701000A */ bnel $t8, $at, .L808DE5D4 /* 07D3C 808DE5AC C6A60670 */ lwc1 $f6, 0x0670($s5) ## 00000670 /* 07D40 808DE5B0 8EA90024 */ lw $t1, 0x0024($s5) ## 00000024 -/* 07D44 808DE5B4 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 07D48 808DE5B8 2739FCF8 */ addiu $t9, $t9, 0xFCF8 ## $t9 = 8015FCF8 +/* 07D44 808DE5B4 3C198016 */ lui $t9, %hi(D_8015FCF8) +/* 07D48 808DE5B8 2739FCF8 */ addiu $t9, %lo(D_8015FCF8) /* 07D4C 808DE5BC AF290000 */ sw $t1, 0x0000($t9) ## 8015FCF8 /* 07D50 808DE5C0 8EA80028 */ lw $t0, 0x0028($s5) ## 00000028 /* 07D54 808DE5C4 AF280004 */ sw $t0, 0x0004($t9) ## 8015FCFC @@ -1149,20 +1149,20 @@ glabel L808DE3B0 /* 07D5C 808DE5CC AF290008 */ sw $t1, 0x0008($t9) ## 8015FD00 /* 07D60 808DE5D0 C6A60670 */ lwc1 $f6, 0x0670($s5) ## 00000670 .L808DE5D4: -/* 07D64 808DE5D4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 07D64 808DE5D4 3C018016 */ lui $at, %hi(D_8015FD06) /* 07D68 808DE5D8 4600320D */ trunc.w.s $f8, $f6 /* 07D6C 808DE5DC 440B4000 */ mfc1 $t3, $f8 /* 07D70 808DE5E0 00000000 */ nop -/* 07D74 808DE5E4 A42BFD06 */ sh $t3, -0x02FA($at) ## 8015FD06 +/* 07D74 808DE5E4 A42BFD06 */ sh $t3, %lo(D_8015FD06)($at) /* 07D78 808DE5E8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 07D7C 808DE5EC 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 07D80 808DE5F0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 07D84 808DE5F4 E430FD08 */ swc1 $f16, -0x02F8($at) ## 8015FD08 -/* 07D88 808DE5F8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 07D80 808DE5F0 3C018016 */ lui $at, %hi(D_8015FD08) +/* 07D84 808DE5F4 E430FD08 */ swc1 $f16, %lo(D_8015FD08)($at) +/* 07D88 808DE5F8 3C018016 */ lui $at, %hi(D_8015FD0C) /* 07D8C 808DE5FC 10000002 */ beq $zero, $zero, .L808DE608 -/* 07D90 808DE600 A420FD0C */ sh $zero, -0x02F4($at) ## 8015FD0C +/* 07D90 808DE600 A420FD0C */ sh $zero, %lo(D_8015FD0C)($at) .L808DE604: -/* 07D94 808DE604 A020FCF0 */ sb $zero, -0x0310($at) ## 8015FCF0 +/* 07D94 808DE604 A020FCF0 */ sb $zero, %lo(D_8015FCF0)($at) .L808DE608: /* 07D98 808DE608 92A20274 */ lbu $v0, 0x0274($s5) ## 00000274 /* 07D9C 808DE60C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D712C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D712C.s index 8c03ab6994..5d073727b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D712C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D712C.s @@ -23,7 +23,7 @@ glabel func_808D712C /* 0090C 808D717C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00910 808D7180 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00914 808D7184 01014821 */ addu $t1, $t0, $at -/* 00918 808D7188 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 0091C 808D718C AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 +/* 00918 808D7188 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 0091C 808D718C AC296FC0 */ sw $t1, %lo(gSegments+0x18)($at) /* 00920 808D7190 03E00008 */ jr $ra /* 00924 808D7194 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s index 9df9ca0b20..ca07399398 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s @@ -43,8 +43,8 @@ glabel func_808D779C /* 00FC0 808D7830 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00FC4 808D7834 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00FC8 808D7838 01215021 */ addu $t2, $t1, $at -/* 00FCC 808D783C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00FD0 808D7840 AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 +/* 00FCC 808D783C 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 00FD0 808D7840 AC2A6FC0 */ sw $t2, %lo(gSegments+0x18)($at) /* 00FD4 808D7844 24A55FFC */ addiu $a1, $a1, 0x5FFC ## $a1 = 06005FFC /* 00FD8 808D7848 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00FDC 808D784C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s index 059ed968e9..80593625ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s @@ -19,8 +19,8 @@ glabel func_808D7918 /* 010EC 808D795C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 010F0 808D7960 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 010F4 808D7964 01014821 */ addu $t1, $t0, $at -/* 010F8 808D7968 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 010FC 808D796C AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 +/* 010F8 808D7968 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 010FC 808D796C AC296FC0 */ sw $t1, %lo(gSegments+0x18)($at) /* 01100 808D7970 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 01104 808D7974 44812000 */ mtc1 $at, $f4 ## $f4 = -2.00 /* 01108 808D7978 8C4A0000 */ lw $t2, 0x0000($v0) ## 808F93C0 @@ -91,10 +91,10 @@ glabel L808D79E8 /* 01204 808D7A74 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 01208 808D7A78 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 0120C 808D7A7C 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 -/* 01210 808D7A80 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 01210 808D7A80 3C198016 */ lui $t9, %hi(gSaveContext+0xee2) /* 01214 808D7A84 24090011 */ addiu $t1, $zero, 0x0011 ## $t1 = 00000011 /* 01218 808D7A88 E60806F4 */ swc1 $f8, 0x06F4($s0) ## 000006F4 -/* 0121C 808D7A8C 9739F542 */ lhu $t9, -0x0ABE($t9) ## 8015F542 +/* 0121C 808D7A8C 9739F542 */ lhu $t9, %lo(gSaveContext+0xee2)($t9) /* 01220 808D7A90 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 01224 808D7A94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01228 808D7A98 33280100 */ andi $t0, $t9, 0x0100 ## $t0 = 00000000 @@ -123,9 +123,9 @@ glabel L808D79E8 /* 01284 808D7AF4 A2020198 */ sb $v0, 0x0198($s0) ## 00000198 /* 01288 808D7AF8 A60B01BA */ sh $t3, 0x01BA($s0) ## 000001BA /* 0128C 808D7AFC 240C0140 */ addiu $t4, $zero, 0x0140 ## $t4 = 00000140 -/* 01290 808D7B00 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 01290 808D7B00 3C018016 */ lui $at, %hi(gSaveContext+0x1424) /* 01294 808D7B04 3C041000 */ lui $a0, 0x1000 ## $a0 = 10000000 -/* 01298 808D7B08 A42CFA84 */ sh $t4, -0x057C($at) ## 8015FA84 +/* 01298 808D7B08 A42CFA84 */ sh $t4, %lo(gSaveContext+0x1424)($at) /* 0129C 808D7B0C 0C03E803 */ jal Audio_SetBGM /* 012A0 808D7B10 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100000FF @@ -606,8 +606,8 @@ glabel L808D8188 .L808D81DC: /* 0196C 808D81DC 14610004 */ bne $v1, $at, .L808D81F0 /* 01970 808D81E0 240B0140 */ addiu $t3, $zero, 0x0140 ## $t3 = 00000140 -/* 01974 808D81E4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 01978 808D81E8 A42BFA84 */ sh $t3, -0x057C($at) ## 8015FA84 +/* 01974 808D81E4 3C018016 */ lui $at, %hi(gSaveContext+0x1424) +/* 01978 808D81E8 A42BFA84 */ sh $t3, %lo(gSaveContext+0x1424)($at) /* 0197C 808D81EC 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D81F0: /* 01980 808D81F0 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 @@ -1308,13 +1308,13 @@ glabel L808D8A98 /* 02374 808D8BE4 03194021 */ addu $t0, $t8, $t9 /* 02378 808D8BE8 01284821 */ addu $t1, $t1, $t0 /* 0237C 808D8BEC 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 -/* 02380 808D8BF0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 02380 808D8BF0 3C038016 */ lui $v1, %hi(gSegments) /* 02384 808D8BF4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02388 808D8BF8 24636FA8 */ addiu $v1, $v1, 0x6FA8 ## $v1 = 80166FA8 +/* 02388 808D8BF8 24636FA8 */ addiu $v1, %lo(gSegments) /* 0238C 808D8BFC 01215021 */ addu $t2, $t1, $at /* 02390 808D8C00 AC6A0018 */ sw $t2, 0x0018($v1) ## 80166FC0 -/* 02394 808D8C04 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 02398 808D8C08 9484F542 */ lhu $a0, -0x0ABE($a0) ## 8015F542 +/* 02394 808D8C04 3C048016 */ lui $a0, %hi(gSaveContext+0xee2) +/* 02398 808D8C08 9484F542 */ lhu $a0, %lo(gSaveContext+0xee2)($a0) /* 0239C 808D8C0C 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 /* 023A0 808D8C10 2442CF00 */ addiu $v0, $v0, 0xCF00 ## $v0 = 0600CF00 /* 023A4 808D8C14 308B0100 */ andi $t3, $a0, 0x0100 ## $t3 = 00000000 @@ -1341,12 +1341,12 @@ glabel L808D8A98 /* 023F8 808D8C68 0C00B380 */ jal TitleCard_InitBossName /* 023FC 808D8C6C 24851D4C */ addiu $a1, $a0, 0x1D4C ## $a1 = 80161D4C -/* 02400 808D8C70 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 02404 808D8C74 9484F542 */ lhu $a0, -0x0ABE($a0) ## 8015F542 +/* 02400 808D8C70 3C048016 */ lui $a0, %hi(gSaveContext+0xee2) +/* 02404 808D8C74 9484F542 */ lhu $a0, %lo(gSaveContext+0xee2)($a0) .L808D8C78: /* 02408 808D8C78 348C0100 */ ori $t4, $a0, 0x0100 ## $t4 = 80160100 -/* 0240C 808D8C7C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 02410 808D8C80 A42CF542 */ sh $t4, -0x0ABE($at) ## 8015F542 +/* 0240C 808D8C7C 3C018016 */ lui $at, %hi(gSaveContext+0xee2) +/* 02410 808D8C80 A42CF542 */ sh $t4, %lo(gSaveContext+0xee2)($at) /* 02414 808D8C84 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D8C88: /* 02418 808D8C88 2C610014 */ sltiu $at, $v1, 0x0014 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D9018.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D9018.s index 5e4235a728..b1706606f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D9018.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D9018.s @@ -38,8 +38,8 @@ glabel func_808D9018 /* 02830 808D90A0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 02834 808D90A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02838 808D90A8 01415821 */ addu $t3, $t2, $at -/* 0283C 808D90AC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 02840 808D90B0 AC2B6FC0 */ sw $t3, 0x6FC0($at) ## 80166FC0 +/* 0283C 808D90AC 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 02840 808D90B0 AC2B6FC0 */ sw $t3, %lo(gSegments+0x18)($at) /* 02844 808D90B4 24A5EA00 */ addiu $a1, $a1, 0xEA00 ## $a1 = 0600EA00 /* 02848 808D90B8 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 0284C 808D90BC 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D90F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D90F8.s index 15ebdce209..43c9f1ac40 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D90F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D90F8.s @@ -30,8 +30,8 @@ glabel func_808D90F8 /* 028F0 808D9160 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 028F4 808D9164 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 028F8 808D9168 03214021 */ addu $t0, $t9, $at -/* 028FC 808D916C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 02900 808D9170 AC286FC0 */ sw $t0, 0x6FC0($at) ## 80166FC0 +/* 028FC 808D916C 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 02900 808D9170 AC286FC0 */ sw $t0, %lo(gSegments+0x18)($at) /* 02904 808D9174 24A5EA00 */ addiu $a1, $a1, 0xEA00 ## $a1 = 0600EA00 /* 02908 808D9178 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 0290C 808D917C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop @@ -42,12 +42,12 @@ glabel func_808D90F8 /* 0291C 808D918C 2484EA00 */ addiu $a0, $a0, 0xEA00 ## $a0 = 0600EA00 /* 02920 808D9190 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02924 808D9194 3C09808E */ lui $t1, %hi(func_808D933C) ## $t1 = 808E0000 -/* 02928 808D9198 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 02928 808D9198 3C038016 */ lui $v1, %hi(gSaveContext) /* 0292C 808D919C 468021A0 */ cvt.s.w $f6, $f4 /* 02930 808D91A0 2529933C */ addiu $t1, $t1, %lo(func_808D933C) ## $t1 = 808D933C /* 02934 808D91A4 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064 /* 02938 808D91A8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 0293C 808D91AC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0293C 808D91AC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 02940 808D91B0 AE090194 */ sw $t1, 0x0194($s0) ## 00000194 /* 02944 808D91B4 E60601CC */ swc1 $f6, 0x01CC($s0) ## 000001CC /* 02948 808D91B8 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D91F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D91F8.s index 7ce1d41054..53fa5a9ec5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D91F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D91F8.s @@ -4,10 +4,10 @@ glabel func_808D91F8 /* 02990 808D9200 3C030200 */ lui $v1, 0x0200 ## $v1 = 02000000 /* 02994 808D9204 24426C18 */ addiu $v0, $v0, 0x6C18 ## $v0 = 02006C18 /* 02998 808D9208 24637418 */ addiu $v1, $v1, 0x7418 ## $v1 = 02007418 -/* 0299C 808D920C 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 0299C 808D920C 3C058016 */ lui $a1, %hi(gSegments) /* 029A0 808D9210 00027100 */ sll $t6, $v0, 4 /* 029A4 808D9214 00035900 */ sll $t3, $v1, 4 -/* 029A8 808D9218 24A56FA8 */ addiu $a1, $a1, 0x6FA8 ## $a1 = 80166FA8 +/* 029A8 808D9218 24A56FA8 */ addiu $a1, %lo(gSegments) /* 029AC 808D921C 000E7F02 */ srl $t7, $t6, 28 /* 029B0 808D9220 000B6702 */ srl $t4, $t3, 28 /* 029B4 808D9224 000FC080 */ sll $t8, $t7, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s index 35cb2613c8..8e3f1945ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s @@ -17,8 +17,8 @@ glabel func_808D933C /* 02B08 808D9378 01394821 */ addu $t1, $t1, $t9 /* 02B0C 808D937C 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 /* 02B10 808D9380 01215021 */ addu $t2, $t1, $at -/* 02B14 808D9384 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 02B18 808D9388 AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 +/* 02B14 808D9384 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 02B18 808D9388 AC2A6FC0 */ sw $t2, %lo(gSegments+0x18)($at) /* 02B1C 808D938C 8C8B0524 */ lw $t3, 0x0524($a0) ## 00000674 /* 02B20 808D9390 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 /* 02B24 808D9394 AC8C0524 */ sw $t4, 0x0524($a0) ## 00000674 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s index f2e0541d08..dc6dab59ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s @@ -292,10 +292,10 @@ glabel L808DB498 /* 04E78 808DB6E8 8E2B0278 */ lw $t3, 0x0278($s1) ## 00000278 /* 04E7C 808DB6EC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 04E80 808DB6F0 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 04E84 808DB6F4 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 04E84 808DB6F4 3C098016 */ lui $t1, %hi(D_8015FCF8) /* 04E88 808DB6F8 A639066E */ sh $t9, 0x066E($s1) ## 0000066E /* 04E8C 808DB6FC A228066C */ sb $t0, 0x066C($s1) ## 0000066C -/* 04E90 808DB700 2529FCF8 */ addiu $t1, $t1, 0xFCF8 ## $t1 = 8015FCF8 +/* 04E90 808DB700 2529FCF8 */ addiu $t1, %lo(D_8015FCF8) /* 04E94 808DB704 AD2B0000 */ sw $t3, 0x0000($t1) ## 8015FCF8 /* 04E98 808DB708 8E2A027C */ lw $t2, 0x027C($s1) ## 0000027C /* 04E9C 808DB70C AD2A0004 */ sw $t2, 0x0004($t1) ## 8015FCFC diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s index 6fea4d9a6a..3d194a3a0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s @@ -39,12 +39,12 @@ glabel func_808DC14C /* 05960 808DC1D0 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 05964 808DC1D4 44810000 */ mtc1 $at, $f0 ## $f0 = 12.00 /* 05968 808DC1D8 C6040168 */ lwc1 $f4, 0x0168($s0) ## 00000168 -/* 0596C 808DC1DC 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 0596C 808DC1DC 3C088016 */ lui $t0, %hi(D_8015FCF8) /* 05970 808DC1E0 44050000 */ mfc1 $a1, $f0 /* 05974 808DC1E4 4600203E */ c.le.s $f4, $f0 /* 05978 808DC1E8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 0597C 808DC1EC 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 05980 808DC1F0 2508FCF8 */ addiu $t0, $t0, 0xFCF8 ## $t0 = 8015FCF8 +/* 05980 808DC1F0 2508FCF8 */ addiu $t0, %lo(D_8015FCF8) /* 05984 808DC1F4 45000009 */ bc1f .L808DC21C /* 05988 808DC1F8 00000000 */ nop /* 0598C 808DC1FC 8E0A0260 */ lw $t2, 0x0260($s0) ## 00000260 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE988.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE988.s index 7d62531601..897313bc81 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE988.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE988.s @@ -84,12 +84,12 @@ glabel func_808DE988 /* 08254 808DEAC4 00194080 */ sll $t0, $t9, 2 /* 08258 808DEAC8 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 /* 0825C 808DEACC 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 08260 808DEAD0 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 08260 808DEAD0 3C098016 */ lui $t1, %hi(gSegments) /* 08264 808DEAD4 ADAE02D0 */ sw $t6, 0x02D0($t5) ## 000002D0 /* 08268 808DEAD8 01284821 */ addu $t1, $t1, $t0 /* 0826C 808DEADC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 08270 808DEAE0 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 08274 808DEAE4 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 +/* 08274 808DEAE4 8D296FA8 */ lw $t1, %lo(gSegments)($t1) /* 08278 808DEAE8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0827C 808DEAEC 00815024 */ and $t2, $a0, $at /* 08280 808DEAF0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFBD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFBD0.s index 03008b8f2a..67f3991cf6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFBD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFBD0.s @@ -240,11 +240,11 @@ glabel func_808DFBD0 /* 096EC 808DFF5C AE2902D0 */ sw $t1, 0x02D0($s1) ## 000002D0 /* 096F0 808DFF60 000C6880 */ sll $t5, $t4, 2 /* 096F4 808DFF64 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 096F8 808DFF68 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 096F8 808DFF68 3C0F8016 */ lui $t7, %hi(gSegments) /* 096FC 808DFF6C 01ED7821 */ addu $t7, $t7, $t5 /* 09700 808DFF70 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 09704 808DFF74 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 09708 808DFF78 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 09708 808DFF78 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 0970C 808DFF7C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 09710 808DFF80 0081C024 */ and $t8, $a0, $at /* 09714 808DFF84 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s index 7e95ecf651..a1e91ea0b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s @@ -140,11 +140,11 @@ glabel func_808DFFC8 /* 09978 808E01E8 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 0997C 808E01EC 000B6080 */ sll $t4, $t3, 2 /* 09980 808E01F0 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 09984 808E01F4 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 09984 808E01F4 3C0D8016 */ lui $t5, %hi(gSegments) /* 09988 808E01F8 01AC6821 */ addu $t5, $t5, $t4 /* 0998C 808E01FC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 09990 808E0200 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 09994 808E0204 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 +/* 09994 808E0204 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) /* 09998 808E0208 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0999C 808E020C 00817024 */ and $t6, $a0, $at /* 099A0 808E0210 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1034.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1034.s index 02b91bb2b5..fbde775e39 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1034.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1034.s @@ -35,8 +35,8 @@ glabel func_808E1034 /* 0A840 808E10B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L808E10B4: /* 0A844 808E10B4 862900B6 */ lh $t1, 0x00B6($s1) ## 000000B6 -/* 0A848 808E10B8 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 0A84C 808E10BC 256BFCF8 */ addiu $t3, $t3, 0xFCF8 ## $t3 = 8015FCF8 +/* 0A848 808E10B8 3C0B8016 */ lui $t3, %hi(D_8015FCF8) +/* 0A84C 808E10BC 256BFCF8 */ addiu $t3, %lo(D_8015FCF8) /* 0A850 808E10C0 252A1000 */ addiu $t2, $t1, 0x1000 ## $t2 = 00001000 /* 0A854 808E10C4 A62A00B6 */ sh $t2, 0x00B6($s1) ## 000000B6 /* 0A858 808E10C8 A467066E */ sh $a3, 0x066E($v1) ## 0000066E @@ -228,13 +228,13 @@ glabel L808E12A0 /* 0AAEC 808E135C 14600017 */ bne $v1, $zero, .L808E13BC /* 0AAF0 808E1360 A2290621 */ sb $t1, 0x0621($s1) ## 00000621 /* 0AAF4 808E1364 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 -/* 0AAF8 808E1368 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0AAFC 808E136C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 0AAF8 808E1368 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0AAFC 808E136C 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 0AB00 808E1370 000A5AC0 */ sll $t3, $t2, 11 /* 0AB04 808E1374 05610011 */ bgez $t3, .L808E13BC /* 0AB08 808E1378 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 0AB0C 808E137C 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 -/* 0AB10 808E1380 25AD33E8 */ addiu $t5, $t5, 0x33E8 ## $t5 = 801333E8 +/* 0AB0C 808E137C 3C0D8013 */ lui $t5, %hi(D_801333E8) +/* 0AB10 808E1380 25AD33E8 */ addiu $t5, %lo(D_801333E8) /* 0AB14 808E1384 A7AC00BA */ sh $t4, 0x00BA($sp) /* 0AB18 808E1388 AFAD0014 */ sw $t5, 0x0014($sp) /* 0AB1C 808E138C 2404180C */ addiu $a0, $zero, 0x180C ## $a0 = 0000180C @@ -274,10 +274,10 @@ glabel L808E12A0 /* 0AB94 808E1404 A62F01A4 */ sh $t7, 0x01A4($s1) ## 000001A4 /* 0AB98 808E1408 A63901B8 */ sh $t9, 0x01B8($s1) ## 000001B8 /* 0AB9C 808E140C 8FA5006C */ lw $a1, 0x006C($sp) -/* 0ABA0 808E1410 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0ABA4 808E1414 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 0ABA8 808E1418 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0ABAC 808E141C 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 +/* 0ABA0 808E1410 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0ABA4 808E1414 3C098013 */ lui $t1, %hi(D_801333E8) +/* 0ABA8 808E1418 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0ABAC 808E141C 252933E8 */ addiu $t1, %lo(D_801333E8) /* 0ABB0 808E1420 AFA90014 */ sw $t1, 0x0014($sp) /* 0ABB4 808E1424 AFA70010 */ sw $a3, 0x0010($sp) /* 0ABB8 808E1428 2404182A */ addiu $a0, $zero, 0x182A ## $a0 = 0000182A diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s index 9e7eee40c2..909ca67de4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s @@ -489,7 +489,7 @@ glabel func_808E3D84 /* 0DC70 808E44E0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0DC74 808E44E4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0DC78 808E44E8 3C04808E */ lui $a0, %hi(D_808E4E98) ## $a0 = 808E0000 -/* 0DC7C 808E44EC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0DC7C 808E44EC 3C0F8016 */ lui $t7, %hi(gSegments) /* 0DC80 808E44F0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 0DC84 808E44F4 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 0DC88 808E44F8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 @@ -503,7 +503,7 @@ glabel func_808E3D84 /* 0DCA8 808E4518 0009C702 */ srl $t8, $t1, 28 /* 0DCAC 808E451C 00186880 */ sll $t5, $t8, 2 /* 0DCB0 808E4520 01ED7821 */ addu $t7, $t7, $t5 -/* 0DCB4 808E4524 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 0DCB4 808E4524 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 0DCB8 808E4528 00817024 */ and $t6, $a0, $at /* 0DCBC 808E452C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 0DCC0 808E4530 01CF5821 */ addu $t3, $t6, $t7 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s index 14e973c4d9..9a4e275fe5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s @@ -58,9 +58,9 @@ glabel BossGanon2_Draw /* 08A50 80905990 0004C900 */ sll $t9, $a0, 4 /* 08A54 80905994 00194F02 */ srl $t1, $t9, 28 /* 08A58 80905998 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 08A5C 8090599C 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 08A5C 8090599C 3C0B8016 */ lui $t3, %hi(gSegments) /* 08A60 809059A0 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 08A64 809059A4 256B6FA8 */ addiu $t3, $t3, 0x6FA8 ## $t3 = 80166FA8 +/* 08A64 809059A4 256B6FA8 */ addiu $t3, %lo(gSegments) /* 08A68 809059A8 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 08A6C 809059AC 00095080 */ sll $t2, $t1, 2 /* 08A70 809059B0 ADCF02D0 */ sw $t7, 0x02D0($t6) ## 000002D0 @@ -108,7 +108,7 @@ glabel BossGanon2_Draw /* 08B10 80905A50 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 08B14 80905A54 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 08B18 80905A58 3C048090 */ lui $a0, %hi(D_80907170) ## $a0 = 80900000 -/* 08B1C 80905A5C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 08B1C 80905A5C 3C0C8016 */ lui $t4, %hi(gSegments) /* 08B20 80905A60 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 /* 08B24 80905A64 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 /* 08B28 80905A68 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 @@ -124,7 +124,7 @@ glabel BossGanon2_Draw /* 08B50 80905A90 00095702 */ srl $t2, $t1, 28 /* 08B54 80905A94 000A5880 */ sll $t3, $t2, 2 /* 08B58 80905A98 018B6021 */ addu $t4, $t4, $t3 -/* 08B5C 80905A9C 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 08B5C 80905A9C 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 08B60 80905AA0 0081C824 */ and $t9, $a0, $at /* 08B64 80905AA4 3C068090 */ lui $a2, %hi(D_8090717C) ## $a2 = 80900000 /* 08B68 80905AA8 032C6821 */ addu $t5, $t9, $t4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD108.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD108.s index 5b4fb04767..426069e2b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD108.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD108.s @@ -32,9 +32,9 @@ glabel func_808FD108 /* 00214 808FD154 93AA005F */ lbu $t2, 0x005F($sp) /* 00218 808FD158 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 0021C 808FD15C 0301C821 */ addu $t9, $t8, $at -/* 00220 808FD160 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00220 808FD160 3C018016 */ lui $at, %hi(gSegments+0x18) /* 00224 808FD164 11400025 */ beq $t2, $zero, .L808FD1FC -/* 00228 808FD168 AC396FC0 */ sw $t9, 0x6FC0($at) ## 80166FC0 +/* 00228 808FD168 AC396FC0 */ sw $t9, %lo(gSegments+0x18)($at) /* 0022C 808FD16C 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 /* 00230 808FD170 3C068091 */ lui $a2, %hi(D_8090D6C0) ## $a2 = 80910000 /* 00234 808FD174 24C6D6C0 */ addiu $a2, $a2, %lo(D_8090D6C0) ## $a2 = 8090D6C0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s index c9d392ecf8..46c7743b33 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s @@ -1741,10 +1741,10 @@ glabel L808FED50 /* 01EC0 808FEE00 00027900 */ sll $t7, $v0, 4 /* 01EC4 808FEE04 000FC702 */ srl $t8, $t7, 28 /* 01EC8 808FEE08 0018C880 */ sll $t9, $t8, 2 -/* 01ECC 808FEE0C 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 01ECC 808FEE0C 3C0B8016 */ lui $t3, %hi(gSegments) /* 01ED0 808FEE10 01795821 */ addu $t3, $t3, $t9 /* 01ED4 808FEE14 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01ED8 808FEE18 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 +/* 01ED8 808FEE18 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) /* 01EDC 808FEE1C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 01EE0 808FEE20 00416024 */ and $t4, $v0, $at /* 01EE4 808FEE24 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s index 9546d17ffa..4aa6efd0d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s @@ -30,8 +30,8 @@ glabel func_808FFDB0 /* 02ED8 808FFE18 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 02EDC 808FFE1C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02EE0 808FFE20 01014821 */ addu $t1, $t0, $at -/* 02EE4 808FFE24 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 02EE8 808FFE28 AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 +/* 02EE4 808FFE24 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 02EE8 808FFE28 AC296FC0 */ sw $t1, %lo(gSegments+0x18)($at) /* 02EEC 808FFE2C 24A5FFE4 */ addiu $a1, $a1, 0xFFE4 ## $a1 = 0600FFE4 /* 02EF0 808FFE30 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02EF4 808FFE34 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s index 158b957449..bd41e25b30 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s @@ -1172,9 +1172,9 @@ glabel L80902240 /* 05308 80902248 2418006B */ addiu $t8, $zero, 0x006B ## $t8 = 0000006B /* 0530C 8090224C 00220821 */ addu $at, $at, $v0 /* 05310 80902250 A4381E1A */ sh $t8, 0x1E1A($at) ## 00011E1A -/* 05314 80902254 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 05314 80902254 3C018016 */ lui $at, %hi(gSaveContext+0x1412) /* 05318 80902258 3408FFF2 */ ori $t0, $zero, 0xFFF2 ## $t0 = 0000FFF2 -/* 0531C 8090225C A428FA72 */ sh $t0, -0x058E($at) ## 8015FA72 +/* 0531C 8090225C A428FA72 */ sh $t0, %lo(gSaveContext+0x1412)($at) /* 05320 80902260 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 05324 80902264 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 /* 05328 80902268 00220821 */ addu $at, $at, $v0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809034E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809034E4.s index d517ace35b..9782f46939 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809034E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809034E4.s @@ -592,10 +592,10 @@ glabel func_809034E4 /* 06E34 80903D74 0003C100 */ sll $t8, $v1, 4 /* 06E38 80903D78 0018CF02 */ srl $t9, $t8, 28 /* 06E3C 80903D7C 00194880 */ sll $t1, $t9, 2 -/* 06E40 80903D80 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 06E40 80903D80 3C0A8016 */ lui $t2, %hi(gSegments) /* 06E44 80903D84 01495021 */ addu $t2, $t2, $t1 /* 06E48 80903D88 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 06E4C 80903D8C 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 06E4C 80903D8C 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 06E50 80903D90 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 06E54 80903D94 00615824 */ and $t3, $v1, $at /* 06E58 80903D98 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s index 32600978b2..707d34e049 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s @@ -139,11 +139,11 @@ glabel func_80904108 /* 07394 809042D4 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 07398 809042D8 00195880 */ sll $t3, $t9, 2 /* 0739C 809042DC 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 -/* 073A0 809042E0 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 073A0 809042E0 3C0C8016 */ lui $t4, %hi(gSegments) /* 073A4 809042E4 018B6021 */ addu $t4, $t4, $t3 /* 073A8 809042E8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 073AC 809042EC AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 073B0 809042F0 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 073B0 809042F0 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 073B4 809042F4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 073B8 809042F8 00816824 */ and $t5, $a0, $at /* 073BC 809042FC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s index 6703f25a40..f7fd04948b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s @@ -121,8 +121,8 @@ glabel func_80904340 /* 0754C 8090448C 0002C900 */ sll $t9, $v0, 4 /* 07550 80904490 00194702 */ srl $t0, $t9, 28 /* 07554 80904494 4481D000 */ mtc1 $at, $f26 ## $f26 = -200.00 -/* 07558 80904498 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 0755C 8090449C 254A6FA8 */ addiu $t2, $t2, 0x6FA8 ## $t2 = 80166FA8 +/* 07558 80904498 3C0A8016 */ lui $t2, %hi(gSegments) +/* 0755C 8090449C 254A6FA8 */ addiu $t2, %lo(gSegments) /* 07560 809044A0 3C018091 */ lui $at, %hi(D_8090DD20) ## $at = 80910000 /* 07564 809044A4 00084880 */ sll $t1, $t0, 2 /* 07568 809044A8 46040782 */ mul.s $f30, $f0, $f4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090464C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090464C.s index 5b8f02f965..12a7c0e02e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090464C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090464C.s @@ -110,11 +110,11 @@ glabel func_8090464C /* 0786C 809047AC AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 07870 809047B0 000FC080 */ sll $t8, $t7, 2 /* 07874 809047B4 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 07878 809047B8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 07878 809047B8 3C198016 */ lui $t9, %hi(gSegments) /* 0787C 809047BC 0338C821 */ addu $t9, $t9, $t8 /* 07880 809047C0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 07884 809047C4 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 07888 809047C8 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 07888 809047C8 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 0788C 809047CC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 07890 809047D0 00814024 */ and $t0, $a0, $at /* 07894 809047D4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904FC8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904FC8.s index 0a1919aacb..fe05bb59a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904FC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904FC8.s @@ -106,10 +106,10 @@ glabel func_80904FC8 /* 081E0 80905120 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 081E4 80905124 00047900 */ sll $t7, $a0, 4 /* 081E8 80905128 000FC702 */ srl $t8, $t7, 28 -/* 081EC 8090512C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 081EC 8090512C 3C098016 */ lui $t1, %hi(gSegments) /* 081F0 80905130 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 081F4 80905134 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 081F8 80905138 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 +/* 081F8 80905138 25296FA8 */ addiu $t1, %lo(gSegments) /* 081FC 8090513C 0018C880 */ sll $t9, $t8, 2 /* 08200 80905140 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 /* 08204 80905144 03293821 */ addu $a3, $t9, $t1 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s index 6af45e21b5..b745b4b9bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s @@ -82,8 +82,8 @@ glabel func_8090523C /* 083EC 8090532C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 083F0 80905330 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 083F4 80905334 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 083F8 80905338 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 083FC 8090533C 256B6FA8 */ addiu $t3, $t3, 0x6FA8 ## $t3 = 80166FA8 +/* 083F8 80905338 3C0B8016 */ lui $t3, %hi(gSegments) +/* 083FC 8090533C 256B6FA8 */ addiu $t3, %lo(gSegments) /* 08400 80905340 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 08404 80905344 AE5802D0 */ sw $t8, 0x02D0($s2) ## 000002D0 /* 08408 80905348 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905508.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905508.s index 25fa7ae905..f4f7c7f4a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905508.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905508.s @@ -73,12 +73,12 @@ glabel func_80905508 /* 086A8 809055E8 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 086AC 809055EC 0018C880 */ sll $t9, $t8, 2 /* 086B0 809055F0 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 086B4 809055F4 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 086B4 809055F4 3C098016 */ lui $t1, %hi(gSegments) /* 086B8 809055F8 AD0D02D0 */ sw $t5, 0x02D0($t0) ## 000002D0 /* 086BC 809055FC 01394821 */ addu $t1, $t1, $t9 /* 086C0 80905600 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 086C4 80905604 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 086C8 80905608 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 +/* 086C8 80905608 8D296FA8 */ lw $t1, %lo(gSegments)($t1) /* 086CC 8090560C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 086D0 80905610 00815024 */ and $t2, $a0, $at /* 086D4 80905614 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s index d0c44eaee7..5c18e2d528 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s @@ -156,11 +156,11 @@ glabel func_80905674 /* 08944 80905884 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 08948 80905888 000B6080 */ sll $t4, $t3, 2 /* 0894C 8090588C 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 08950 80905890 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 08950 80905890 3C0D8016 */ lui $t5, %hi(gSegments) /* 08954 80905894 01AC6821 */ addu $t5, $t5, $t4 /* 08958 80905898 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0895C 8090589C AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 08960 809058A0 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 +/* 08960 809058A0 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) /* 08964 809058A4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 08968 809058A8 00817024 */ and $t6, $a0, $at /* 0896C 809058AC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910784.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910784.s index 5efa1d829d..12eacc7120 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910784.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910784.s @@ -10,7 +10,7 @@ glabel func_80910784 /* 00164 809107A4 AFB40028 */ sw $s4, 0x0028($sp) /* 00168 809107A8 AFB00018 */ sw $s0, 0x0018($sp) /* 0016C 809107AC 3C1200FF */ lui $s2, 0x00FF ## $s2 = 00FF0000 -/* 00170 809107B0 3C138016 */ lui $s3, 0x8016 ## $s3 = 80160000 +/* 00170 809107B0 3C138016 */ lui $s3, %hi(gSegments) /* 00174 809107B4 3C178091 */ lui $s7, %hi(D_80915028) ## $s7 = 80910000 /* 00178 809107B8 3C1E8091 */ lui $s8, %hi(D_8091503C) ## $s8 = 80910000 /* 0017C 809107BC 0080A825 */ or $s5, $a0, $zero ## $s5 = 00000000 @@ -20,7 +20,7 @@ glabel func_80910784 /* 0018C 809107CC AFA50044 */ sw $a1, 0x0044($sp) /* 00190 809107D0 27DE503C */ addiu $s8, $s8, %lo(D_8091503C) ## $s8 = 8091503C /* 00194 809107D4 26F75028 */ addiu $s7, $s7, %lo(D_80915028) ## $s7 = 80915028 -/* 00198 809107D8 26736FA8 */ addiu $s3, $s3, 0x6FA8 ## $s3 = 80166FA8 +/* 00198 809107D8 26736FA8 */ addiu $s3, %lo(gSegments) /* 0019C 809107DC 3652FFFF */ ori $s2, $s2, 0xFFFF ## $s2 = 00FFFFFF /* 001A0 809107E0 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 001A4 809107E4 3C148000 */ lui $s4, 0x8000 ## $s4 = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s index 7b71bef04a..935ef20c9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s @@ -9,8 +9,8 @@ glabel BossGoma_Init /* 00250 80915C60 0C01E037 */ jal Actor_ProcessInitChain /* 00254 80915C64 24A5B2A8 */ addiu $a1, $a1, %lo(D_8091B2A8) ## $a1 = 8091B2A8 -/* 00258 80915C68 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0025C 80915C6C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00258 80915C68 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 0025C 80915C6C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00260 80915C70 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00264 80915C74 3C05457A */ lui $a1, 0x457A ## $a1 = 457A0000 /* 00268 80915C78 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915A94.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915A94.s index bf35d7326f..10cf0873df 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915A94.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915A94.s @@ -4,9 +4,9 @@ glabel func_80915A94 /* 0008C 80915A9C 244283A8 */ addiu $v0, $v0, 0x83A8 ## $v0 = 060183A8 /* 00090 80915AA0 AFB20020 */ sw $s2, 0x0020($sp) /* 00094 80915AA4 00027100 */ sll $t6, $v0, 4 -/* 00098 80915AA8 3C128016 */ lui $s2, 0x8016 ## $s2 = 80160000 +/* 00098 80915AA8 3C128016 */ lui $s2, %hi(gSegments) /* 0009C 80915AAC 000E7F02 */ srl $t7, $t6, 28 -/* 000A0 80915AB0 26526FA8 */ addiu $s2, $s2, 0x6FA8 ## $s2 = 80166FA8 +/* 000A0 80915AB0 26526FA8 */ addiu $s2, %lo(gSegments) /* 000A4 80915AB4 000FC080 */ sll $t8, $t7, 2 /* 000A8 80915AB8 AFB30024 */ sw $s3, 0x0024($sp) /* 000AC 80915ABC 0258C821 */ addu $t9, $s2, $t8 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s index 4ab1e2c5e8..1e46925b52 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s @@ -97,14 +97,14 @@ glabel L80916D30 /* 01350 80916D60 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC /* 01354 80916D64 C448002C */ lwc1 $f8, 0x002C($v0) ## 0000002C /* 01358 80916D68 44815000 */ mtc1 $at, $f10 ## $f10 = 350.00 -/* 0135C 80916D6C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 0135C 80916D6C 3C198016 */ lui $t9, %hi(gSaveContext+0xee2) /* 01360 80916D70 460A4001 */ sub.s $f0, $f8, $f10 /* 01364 80916D74 46000005 */ abs.s $f0, $f0 /* 01368 80916D78 4602003C */ c.lt.s $f0, $f2 /* 0136C 80916D7C 00000000 */ nop /* 01370 80916D80 450203FA */ bc1fl .L80917D6C /* 01374 80916D84 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC -/* 01378 80916D88 9739F542 */ lhu $t9, -0x0ABE($t9) ## 8015F542 +/* 01378 80916D88 9739F542 */ lhu $t9, %lo(gSaveContext+0xee2)($t9) /* 0137C 80916D8C 8FA4006C */ lw $a0, 0x006C($sp) /* 01380 80916D90 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01384 80916D94 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 @@ -1029,8 +1029,8 @@ glabel L80917738 /* 020C0 80917AD0 0C00BE0A */ jal Audio_PlayActorSound2 /* 020C4 80917AD4 2405380E */ addiu $a1, $zero, 0x380E ## $a1 = 0000380E -/* 020C8 80917AD8 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 020CC 80917ADC 954AF542 */ lhu $t2, -0x0ABE($t2) ## 8015F542 +/* 020C8 80917AD8 3C0A8016 */ lui $t2, %hi(gSaveContext+0xee2) +/* 020CC 80917ADC 954AF542 */ lhu $t2, %lo(gSaveContext+0xee2)($t2) /* 020D0 80917AE0 8FA4006C */ lw $a0, 0x006C($sp) /* 020D4 80917AE4 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 /* 020D8 80917AE8 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 @@ -1040,10 +1040,10 @@ glabel L80917738 /* 020E8 80917AF8 00026100 */ sll $t4, $v0, 4 /* 020EC 80917AFC 000C6F02 */ srl $t5, $t4, 28 /* 020F0 80917B00 000D7080 */ sll $t6, $t5, 2 -/* 020F4 80917B04 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 020F4 80917B04 3C0F8016 */ lui $t7, %hi(gSegments) /* 020F8 80917B08 01EE7821 */ addu $t7, $t7, $t6 /* 020FC 80917B0C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 02100 80917B10 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 02100 80917B10 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 02104 80917B14 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 02108 80917B18 0041C024 */ and $t8, $v0, $at /* 0210C 80917B1C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -1062,11 +1062,11 @@ glabel L80917738 /* 02138 80917B48 0C03E803 */ jal Audio_SetBGM /* 0213C 80917B4C 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B -/* 02140 80917B50 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 02144 80917B54 954AF542 */ lhu $t2, -0x0ABE($t2) ## 8015F542 -/* 02148 80917B58 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 02140 80917B50 3C0A8016 */ lui $t2, %hi(gSaveContext+0xee2) +/* 02144 80917B54 954AF542 */ lhu $t2, %lo(gSaveContext+0xee2)($t2) +/* 02148 80917B58 3C018016 */ lui $at, %hi(gSaveContext+0xee2) /* 0214C 80917B5C 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 80160001 -/* 02150 80917B60 A42BF542 */ sh $t3, -0x0ABE($at) ## 8015F542 +/* 02150 80917B60 A42BF542 */ sh $t3, %lo(gSaveContext+0xee2)($at) .L80917B64: /* 02154 80917B64 8FA40044 */ lw $a0, 0x0044($sp) /* 02158 80917B68 0C0295B2 */ jal func_800A56C8 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s index d782c181a5..da35d6be7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s @@ -101,7 +101,7 @@ glabel BossMo_Init /* 00720 8091C220 81251CBC */ lb $a1, 0x1CBC($t1) ## 00001CBC /* 00724 8091C224 1040002A */ beq $v0, $zero, .L8091C2D0 -/* 00728 8091C228 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 00728 8091C228 3C198016 */ lui $t9, %hi(gSaveContext+0xee2) /* 0072C 8091C22C 0C00B55C */ jal Actor_Kill /* 00730 8091C230 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -147,7 +147,7 @@ glabel BossMo_Init /* 007C8 8091C2C8 1000006D */ beq $zero, $zero, .L8091C480 /* 007CC 8091C2CC A70E0002 */ sh $t6, 0x0002($t8) ## 00000002 .L8091C2D0: -/* 007D0 8091C2D0 9739F542 */ lhu $t9, -0x0ABE($t9) ## FFFFF542 +/* 007D0 8091C2D0 9739F542 */ lhu $t9, %lo(gSaveContext+0xee2)($t9) /* 007D4 8091C2D4 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 007D8 8091C2D8 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 /* 007DC 8091C2DC 33280010 */ andi $t0, $t9, 0x0010 ## $t0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s index c6db1e2696..a106f26a06 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s @@ -350,9 +350,9 @@ glabel func_8091C538 /* 00C04 8091C704 240538F2 */ addiu $a1, $zero, 0x38F2 ## $a1 = 000038F2 /* 00C08 8091C708 29A1001E */ slti $at, $t5, 0x001E /* 00C0C 8091C70C 10200003 */ beq $at, $zero, .L8091C71C -/* 00C10 8091C710 3C068013 */ lui $a2, 0x8013 ## $a2 = 80130000 +/* 00C10 8091C710 3C068013 */ lui $a2, %hi(D_801305D0) /* 00C14 8091C714 0C03D2D6 */ jal func_800F4B58 -/* 00C18 8091C718 24C605D0 */ addiu $a2, $a2, 0x05D0 ## $a2 = 801305D0 +/* 00C18 8091C718 24C605D0 */ addiu $a2, %lo(D_801305D0) .L8091C71C: /* 00C1C 8091C71C E7B40180 */ swc1 $f20, 0x0180($sp) .L8091C720: @@ -391,8 +391,8 @@ glabel func_8091C538 /* 00C9C 8091C79C 31D8001F */ andi $t8, $t6, 0x001F ## $t8 = 00000000 /* 00CA0 8091C7A0 17000010 */ bne $t8, $zero, .L8091C7E4 /* 00CA4 8091C7A4 26441010 */ addiu $a0, $s2, 0x1010 ## $a0 = 00001010 -/* 00CA8 8091C7A8 3C068013 */ lui $a2, 0x8013 ## $a2 = 80130000 -/* 00CAC 8091C7AC 24C605D0 */ addiu $a2, $a2, 0x05D0 ## $a2 = 801305D0 +/* 00CA8 8091C7A8 3C068013 */ lui $a2, %hi(D_801305D0) +/* 00CAC 8091C7AC 24C605D0 */ addiu $a2, %lo(D_801305D0) /* 00CB0 8091C7B0 0C03D2D6 */ jal func_800F4B58 /* 00CB4 8091C7B4 240538F2 */ addiu $a1, $zero, 0x38F2 ## $a1 = 000038F2 /* 00CB8 8091C7B8 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 @@ -434,9 +434,9 @@ glabel func_8091C538 /* 00D40 8091C840 3109000F */ andi $t1, $t0, 0x000F ## $t1 = 00000000 /* 00D44 8091C844 1520000F */ bne $t1, $zero, .L8091C884 /* 00D48 8091C848 4600B506 */ mov.s $f20, $f22 -/* 00D4C 8091C84C 3C068013 */ lui $a2, 0x8013 ## $a2 = 80130000 +/* 00D4C 8091C84C 3C068013 */ lui $a2, %hi(D_801305D0) /* 00D50 8091C850 0C03D2D6 */ jal func_800F4B58 -/* 00D54 8091C854 24C605D0 */ addiu $a2, $a2, 0x05D0 ## $a2 = 801305D0 +/* 00D54 8091C854 24C605D0 */ addiu $a2, %lo(D_801305D0) /* 00D58 8091C858 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00D5C 8091C85C 240500A0 */ addiu $a1, $zero, 0x00A0 ## $a1 = 000000A0 /* 00D60 8091C860 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 @@ -1472,10 +1472,10 @@ glabel L8091D430 /* 01C0C 8091D70C 26441010 */ addiu $a0, $s2, 0x1010 ## $a0 = 00001010 /* 01C10 8091D710 0C01E245 */ jal func_80078914 /* 01C14 8091D714 240538F3 */ addiu $a1, $zero, 0x38F3 ## $a1 = 000038F3 -/* 01C18 8091D718 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01C1C 8091D71C 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 01C20 8091D720 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 01C24 8091D724 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 +/* 01C18 8091D718 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01C1C 8091D71C 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 01C20 8091D720 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 01C24 8091D724 25CE33E8 */ addiu $t6, %lo(D_801333E8) /* 01C28 8091D728 AFAE0014 */ sw $t6, 0x0014($sp) /* 01C2C 8091D72C AFA70010 */ sw $a3, 0x0010($sp) /* 01C30 8091D730 24046805 */ addiu $a0, $zero, 0x6805 ## $a0 = 00006805 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s index dbd7c0c2a4..b1efe0a24c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s @@ -914,10 +914,10 @@ glabel L8091FF00 /* 04714 80920214 00024100 */ sll $t0, $v0, 4 /* 04718 80920218 00084F02 */ srl $t1, $t0, 28 /* 0471C 8092021C 00095080 */ sll $t2, $t1, 2 -/* 04720 80920220 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 04720 80920220 3C0C8016 */ lui $t4, %hi(gSegments) /* 04724 80920224 018A6021 */ addu $t4, $t4, $t2 /* 04728 80920228 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0472C 8092022C 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 0472C 8092022C 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 04730 80920230 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 04734 80920234 00415824 */ and $t3, $v0, $at /* 04738 80920238 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -933,8 +933,8 @@ glabel L8091FF00 /* 04760 80920260 0C00B380 */ jal TitleCard_InitBossName /* 04764 80920264 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 -/* 04768 80920268 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0476C 8092026C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 04768 80920268 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0476C 8092026C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 04770 80920270 94580EE2 */ lhu $t8, 0x0EE2($v0) ## 8015F542 /* 04774 80920274 37190010 */ ori $t9, $t8, 0x0010 ## $t9 = 00000010 /* 04778 80920278 10000047 */ beq $zero, $zero, .L80920398 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s index ffd5e26563..c9d2a68344 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s @@ -207,10 +207,10 @@ glabel func_80924228 /* 0899C 8092449C 24846700 */ addiu $a0, $a0, 0x6700 ## $a0 = 06006700 /* 089A0 809244A0 00047100 */ sll $t6, $a0, 4 /* 089A4 809244A4 000EC702 */ srl $t8, $t6, 28 -/* 089A8 809244A8 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 089A8 809244A8 3C068016 */ lui $a2, %hi(gSegments) /* 089AC 809244AC 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 089B0 809244B0 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 089B4 809244B4 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 089B4 809244B4 24C66FA8 */ addiu $a2, %lo(gSegments) /* 089B8 809244B8 0018C880 */ sll $t9, $t8, 2 /* 089BC 809244BC 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 /* 089C0 809244C0 00D95021 */ addu $t2, $a2, $t9 @@ -366,11 +366,11 @@ glabel func_80924228 /* 08C00 80924700 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 08C04 80924704 000EC080 */ sll $t8, $t6, 2 /* 08C08 80924708 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 08C0C 8092470C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 08C0C 8092470C 3C198016 */ lui $t9, %hi(gSegments) /* 08C10 80924710 0338C821 */ addu $t9, $t9, $t8 /* 08C14 80924714 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 08C18 80924718 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 08C1C 8092471C 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 08C1C 8092471C 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 08C20 80924720 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 08C24 80924724 00815024 */ and $t2, $a0, $at /* 08C28 80924728 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s index 319533ddce..8fecf32812 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s @@ -223,10 +223,10 @@ glabel func_80925480 /* 09C5C 8092575C 24421DB0 */ addiu $v0, $v0, 0x1DB0 ## $v0 = 04051DB0 /* 09C60 80925760 00024900 */ sll $t1, $v0, 4 /* 09C64 80925764 00095702 */ srl $t2, $t1, 28 -/* 09C68 80925768 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 09C68 80925768 3C0C8016 */ lui $t4, %hi(gSegments) /* 09C6C 8092576C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 09C70 80925770 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 09C74 80925774 258C6FA8 */ addiu $t4, $t4, 0x6FA8 ## $t4 = 80166FA8 +/* 09C74 80925774 258C6FA8 */ addiu $t4, %lo(gSegments) /* 09C78 80925778 000A5880 */ sll $t3, $t2, 2 /* 09C7C 8092577C 3C140600 */ lui $s4, 0x0600 ## $s4 = 06000000 /* 09C80 80925780 26940F20 */ addiu $s4, $s4, 0x0F20 ## $s4 = 06000F20 @@ -338,10 +338,10 @@ glabel func_80925480 /* 09E1C 8092591C 24421DB0 */ addiu $v0, $v0, 0x1DB0 ## $v0 = 04051DB0 /* 09E20 80925920 0002C900 */ sll $t9, $v0, 4 /* 09E24 80925924 00194F02 */ srl $t1, $t9, 28 -/* 09E28 80925928 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 09E28 80925928 3C0A8016 */ lui $t2, %hi(gSegments) /* 09E2C 8092592C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 09E30 80925930 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 09E34 80925934 254A6FA8 */ addiu $t2, $t2, 0x6FA8 ## $t2 = 80166FA8 +/* 09E34 80925934 254A6FA8 */ addiu $t2, %lo(gSegments) /* 09E38 80925938 00094080 */ sll $t0, $t1, 2 /* 09E3C 8092593C 3C140600 */ lui $s4, 0x0600 ## $s4 = 06000000 /* 09E40 80925940 26940F20 */ addiu $s4, $s4, 0x0F20 ## $s4 = 06000F20 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925C18.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925C18.s index 1f7cc7c620..6d559cabea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925C18.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925C18.s @@ -1,6 +1,6 @@ glabel func_80925C18 -/* 0A118 80925C18 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0A11C 80925C1C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0A118 80925C18 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0A11C 80925C1C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0A120 80925C20 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0A124 80925C24 AFBF0014 */ sw $ra, 0x0014($sp) /* 0A128 80925C28 84431314 */ lh $v1, 0x1314($v0) ## 80161314 @@ -11,8 +11,8 @@ glabel func_80925C18 /* 0A13C 80925C3C 0C03E803 */ jal Audio_SetBGM /* 0A140 80925C40 A44E1314 */ sh $t6, 0x1314($v0) ## 80161314 -/* 0A144 80925C44 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 0A148 80925C48 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 0A144 80925C44 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 0A148 80925C48 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 0A14C 80925C4C 3C058092 */ lui $a1, %hi(D_80926518) ## $a1 = 80920000 /* 0A150 80925C50 3C048092 */ lui $a0, %hi(D_8092650C) ## $a0 = 80920000 /* 0A154 80925C54 85F81316 */ lh $t8, 0x1316($t7) ## 80161316 @@ -21,15 +21,15 @@ glabel func_80925C18 /* 0A160 80925C60 00B92821 */ addu $a1, $a1, $t9 /* 0A164 80925C64 0C01E245 */ jal func_80078914 /* 0A168 80925C68 94A56518 */ lhu $a1, %lo(D_80926518)($a1) -/* 0A16C 80925C6C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0A170 80925C70 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0A16C 80925C6C 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0A170 80925C70 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) .L80925C74: /* 0A174 80925C74 84481318 */ lh $t0, 0x1318($v0) ## 80161318 -/* 0A178 80925C78 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 0A178 80925C78 3C098016 */ lui $t1, %hi(gGameInfo) /* 0A17C 80925C7C 51000006 */ beql $t0, $zero, .L80925C98 /* 0A180 80925C80 8FBF0014 */ lw $ra, 0x0014($sp) /* 0A184 80925C84 A4401318 */ sh $zero, 0x1318($v0) ## 80161318 -/* 0A188 80925C88 8D29FA90 */ lw $t1, -0x0570($t1) ## 8015FA90 +/* 0A188 80925C88 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) /* 0A18C 80925C8C 0C03E803 */ jal Audio_SetBGM /* 0A190 80925C90 9524131A */ lhu $a0, 0x131A($t1) ## 8016131A diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s index 5eb93ed67b..2e19617825 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s @@ -64,10 +64,10 @@ glabel BossSst_Draw /* 08158 80934728 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 /* 0815C 8093472C 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 /* 08160 80934730 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 08164 80934734 3C0D8011 */ lui $t5, 0x8011 ## $t5 = 80110000 +/* 08164 80934734 3C0D8011 */ lui $t5, %hi(D_80116280+0x10) /* 08168 80934738 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 0816C 8093473C AE8C02C0 */ sw $t4, 0x02C0($s4) ## 000002C0 -/* 08170 80934740 25AD6290 */ addiu $t5, $t5, 0x6290 ## $t5 = 80116290 +/* 08170 80934740 25AD6290 */ addiu $t5, %lo(D_80116280+0x10) /* 08174 80934744 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 /* 08178 80934748 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 0817C 8093474C 10000017 */ beq $zero, $zero, .L809347AC diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s index 772f2a6eb0..275e32444f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s @@ -75,8 +75,8 @@ glabel BossSst_Init /* 000F0 8092C6C0 0C0291BE */ jal SkelAnime_InitSV /* 000F4 8092C6C4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 000F8 8092C6C8 3C054788 */ lui $a1, 0x4788 ## $a1 = 47880000 -/* 000FC 8092C6CC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00100 8092C6D0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 000FC 8092C6CC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00100 8092C6D0 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00104 8092C6D4 34A5B800 */ ori $a1, $a1, 0xB800 ## $a1 = 4788B800 /* 00108 8092C6D8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0010C 8092C6DC 0C00AC78 */ jal ActorShape_Init @@ -293,8 +293,8 @@ glabel BossSst_Init /* 00424 8092C9F4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 00428 8092C9F8 A20D0194 */ sb $t5, 0x0194($s0) ## 00000194 .L8092C9FC: -/* 0042C 8092C9FC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00430 8092CA00 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0042C 8092C9FC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00430 8092CA00 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00434 8092CA04 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00438 8092CA08 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0043C 8092CA0C 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CB0C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CB0C.s index f2a63605ac..efc8a4c891 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CB0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CB0C.s @@ -55,8 +55,8 @@ glabel func_8092CB0C /* 00610 8092CBE0 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy /* 00614 8092CBE4 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00618 8092CBE8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 0061C 8092CBEC 9739F542 */ lhu $t9, -0x0ABE($t9) ## 8015F542 +/* 00618 8092CBE8 3C198016 */ lui $t9, %hi(gSaveContext+0xee2) +/* 0061C 8092CBEC 9739F542 */ lhu $t9, %lo(gSaveContext+0xee2)($t9) /* 00620 8092CBF0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00624 8092CBF4 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 /* 00628 8092CBF8 33280080 */ andi $t0, $t9, 0x0080 ## $t0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s index 69dc9a0a93..fc9a6e07e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s @@ -98,8 +98,8 @@ glabel func_8092CC58 /* 007D8 8092CDA8 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) /* 007DC 8092CDAC 0C0300E1 */ jal Gameplay_ClearCamera /* 007E0 8092CDB0 8FA40054 */ lw $a0, 0x0054($sp) -/* 007E4 8092CDB4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 007E8 8092CDB8 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 +/* 007E4 8092CDB4 3C058016 */ lui $a1, %hi(gSaveContext) +/* 007E8 8092CDB8 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 007EC 8092CDBC 94AE0EE2 */ lhu $t6, 0x0EE2($a1) ## 8015F542 /* 007F0 8092CDC0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 007F4 8092CDC4 35CF0080 */ ori $t7, $t6, 0x0080 ## $t7 = 00000080 @@ -157,10 +157,10 @@ glabel func_8092CC58 /* 008B8 8092CE88 13000030 */ beq $t8, $zero, .L8092CF4C /* 008BC 8092CE8C 00000000 */ nop /* 008C0 8092CE90 82590195 */ lb $t9, 0x0195($s2) ## 00000195 -/* 008C4 8092CE94 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 008C4 8092CE94 3C058016 */ lui $a1, %hi(gSaveContext) /* 008C8 8092CE98 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 008CC 8092CE9C 17200011 */ bne $t9, $zero, .L8092CEE4 -/* 008D0 8092CEA0 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 +/* 008D0 8092CEA0 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 008D4 8092CEA4 3C108094 */ lui $s0, %hi(D_80938CA0) ## $s0 = 80940000 /* 008D8 8092CEA8 26108CA0 */ addiu $s0, $s0, %lo(D_80938CA0) ## $s0 = 80938CA0 /* 008DC 8092CEAC 8E0A0000 */ lw $t2, 0x0000($s0) ## 80938CA0 @@ -718,8 +718,8 @@ glabel func_8092CC58 /* 01114 8092D6E4 28C100C7 */ slti $at, $a2, 0x00C7 /* 01118 8092D6E8 502000B3 */ beql $at, $zero, .L8092D9B8 /* 0111C 8092D6EC 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 01120 8092D6F0 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 01124 8092D6F4 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 +/* 01120 8092D6F0 3C058016 */ lui $a1, %hi(gSaveContext) +/* 01124 8092D6F4 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 01128 8092D6F8 94A30EE2 */ lhu $v1, 0x0EE2($a1) ## 8015F542 /* 0112C 8092D6FC 240F00C6 */ addiu $t7, $zero, 0x00C6 ## $t7 = 000000C6 /* 01130 8092D700 01E61023 */ subu $v0, $t7, $a2 @@ -863,10 +863,10 @@ glabel func_8092CC58 /* 01348 8092D918 00025900 */ sll $t3, $v0, 4 /* 0134C 8092D91C 000B6702 */ srl $t4, $t3, 28 /* 01350 8092D920 000C6880 */ sll $t5, $t4, 2 -/* 01354 8092D924 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 01354 8092D924 3C0E8016 */ lui $t6, %hi(gSegments) /* 01358 8092D928 01CD7021 */ addu $t6, $t6, $t5 /* 0135C 8092D92C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01360 8092D930 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 01360 8092D930 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 01364 8092D934 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 01368 8092D938 00417824 */ and $t7, $v0, $at /* 0136C 8092D93C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D5C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D5C.s index 3ea15d638f..411661c17f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D5C.s @@ -31,7 +31,7 @@ glabel func_80931D5C /* 057F8 80931DC8 8E090024 */ lw $t1, 0x0024($s0) ## 00000024 .L80931DCC: /* 057FC 80931DCC 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 05800 80931DD0 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 05800 80931DD0 3C0C8016 */ lui $t4, %hi(gSaveContext+4) /* 05804 80931DD4 ACC90024 */ sw $t1, 0x0024($a2) ## 00000024 /* 05808 80931DD8 8E080028 */ lw $t0, 0x0028($s0) ## 00000028 /* 0580C 80931DDC ACC80028 */ sw $t0, 0x0028($a2) ## 00000028 @@ -41,7 +41,7 @@ glabel func_80931D5C /* 0581C 80931DEC 55400015 */ bnel $t2, $zero, .L80931E44 /* 05820 80931DF0 8FA40020 */ lw $a0, 0x0020($sp) /* 05824 80931DF4 A60B0198 */ sh $t3, 0x0198($s0) ## 00000198 -/* 05828 80931DF8 8D8CE664 */ lw $t4, -0x199C($t4) ## 8015E664 +/* 05828 80931DF8 8D8CE664 */ lw $t4, %lo(gSaveContext+4)($t4) /* 0582C 80931DFC 24056825 */ addiu $a1, $zero, 0x6825 ## $a1 = 00006825 /* 05830 80931E00 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 05834 80931E04 11800005 */ beq $t4, $zero, .L80931E1C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s index 8e03cc9fd9..6a5e2ce1c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s @@ -72,10 +72,10 @@ glabel func_809352DC /* 08DBC 8093538C 3C08FB00 */ lui $t0, 0xFB00 ## $t0 = FB000000 /* 08DC0 80935390 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 08DC4 80935394 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 08DC8 80935398 3C0F8011 */ lui $t7, 0x8011 ## $t7 = 80110000 +/* 08DC8 80935398 3C0F8011 */ lui $t7, %hi(D_80116280+0x10) /* 08DCC 8093539C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 08DD0 809353A0 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 08DD4 809353A4 25EF6290 */ addiu $t7, $t7, 0x6290 ## $t7 = 80116290 +/* 08DD4 809353A4 25EF6290 */ addiu $t7, %lo(D_80116280+0x10) /* 08DD8 809353A8 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 /* 08DDC 809353AC AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 08DE0 809353B0 1000002B */ beq $zero, $zero, .L80935460 @@ -117,10 +117,10 @@ glabel func_809352DC /* 08E68 80935438 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 08E6C 8093543C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 08E70 80935440 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 -/* 08E74 80935444 3C188011 */ lui $t8, 0x8011 ## $t8 = 80110000 +/* 08E74 80935444 3C188011 */ lui $t8, %hi(D_80116280+0x10) /* 08E78 80935448 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 08E7C 8093544C AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 08E80 80935450 27186290 */ addiu $t8, $t8, 0x6290 ## $t8 = 80116290 +/* 08E80 80935450 27186290 */ addiu $t8, %lo(D_80116280+0x10) /* 08E84 80935454 35080020 */ ori $t0, $t0, 0x0020 ## $t0 = DB060020 /* 08E88 80935458 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 08E8C 8093545C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s index 9b2c8899ca..7f57b0f221 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s @@ -41,8 +41,8 @@ glabel BossTw_Draw /* 0A608 809432D8 AE3802C0 */ sw $t8, 0x02C0($s1) ## 000002C0 /* 0A60C 809432DC AC650000 */ sw $a1, 0x0000($v1) ## 00000000 /* 0A610 809432E0 861904CC */ lh $t9, 0x04CC($s0) ## 000004CC -/* 0A614 809432E4 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 0A618 809432E8 25086FA8 */ addiu $t0, $t0, 0x6FA8 ## $t0 = 80166FA8 +/* 0A614 809432E4 3C088016 */ lui $t0, %hi(gSegments) +/* 0A618 809432E8 25086FA8 */ addiu $t0, %lo(gSegments) /* 0A61C 809432EC 00195080 */ sll $t2, $t9, 2 /* 0A620 809432F0 00CA5821 */ addu $t3, $a2, $t2 /* 0A624 809432F4 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s index b970717631..5eaa80dd32 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s @@ -283,8 +283,8 @@ glabel BossTw_Init /* 00DEC 80939ABC AFA00010 */ sw $zero, 0x0010($sp) /* 00DF0 80939AC0 0C0291BE */ jal SkelAnime_InitSV /* 00DF4 80939AC4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00DF8 80939AC8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00DFC 80939ACC 95EFF542 */ lhu $t7, -0x0ABE($t7) ## 8015F542 +/* 00DF8 80939AC8 3C0F8016 */ lui $t7, %hi(gSaveContext+0xee2) +/* 00DFC 80939ACC 95EFF542 */ lhu $t7, %lo(gSaveContext+0xee2)($t7) /* 00E00 80939AD0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00E04 80939AD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E08 80939AD8 31F80020 */ andi $t8, $t7, 0x0020 ## $t8 = 00000000 @@ -339,8 +339,8 @@ glabel BossTw_Init /* 00EB8 80939B88 AFA00010 */ sw $zero, 0x0010($sp) /* 00EBC 80939B8C 0C0291BE */ jal SkelAnime_InitSV /* 00EC0 80939B90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00EC4 80939B94 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00EC8 80939B98 95EFF542 */ lhu $t7, -0x0ABE($t7) ## 8015F542 +/* 00EC4 80939B94 3C0F8016 */ lui $t7, %hi(gSaveContext+0xee2) +/* 00EC8 80939B98 95EFF542 */ lhu $t7, %lo(gSaveContext+0xee2)($t7) /* 00ECC 80939B9C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00ED0 80939BA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00ED4 80939BA4 31F80020 */ andi $t8, $t7, 0x0020 ## $t8 = 00000000 @@ -401,8 +401,8 @@ glabel BossTw_Init /* 00FA0 80939C70 8FA40048 */ lw $a0, 0x0048($sp) /* 00FA4 80939C74 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00FA8 80939C78 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00FAC 80939C7C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00FB0 80939C80 95CEF542 */ lhu $t6, -0x0ABE($t6) ## 8015F542 +/* 00FAC 80939C7C 3C0E8016 */ lui $t6, %hi(gSaveContext+0xee2) +/* 00FB0 80939C80 95CEF542 */ lhu $t6, %lo(gSaveContext+0xee2)($t6) /* 00FB4 80939C84 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00FB8 80939C88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00FBC 80939C8C 31CF0020 */ andi $t7, $t6, 0x0020 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s index e20d91efe2..8319f183c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s @@ -588,13 +588,13 @@ glabel func_8093B1AC /* 02CDC 8093B9AC 26A700F0 */ addiu $a3, $s5, 0x00F0 ## $a3 = 000000F0 /* 02CE0 8093B9B0 86AC001C */ lh $t4, 0x001C($s5) ## 0000001C /* 02CE4 8093B9B4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02CE8 8093B9B8 3C108013 */ lui $s0, 0x8013 ## $s0 = 80130000 +/* 02CE8 8093B9B8 3C108013 */ lui $s0, %hi(D_801333E0) /* 02CEC 8093B9BC 1581000D */ bne $t4, $at, .L8093B9F4 -/* 02CF0 8093B9C0 260733E0 */ addiu $a3, $s0, 0x33E0 ## $a3 = 801333E0 -/* 02CF4 8093B9C4 3C108013 */ lui $s0, 0x8013 ## $s0 = 80130000 -/* 02CF8 8093B9C8 3C128013 */ lui $s2, 0x8013 ## $s2 = 80130000 -/* 02CFC 8093B9CC 265233E8 */ addiu $s2, $s2, 0x33E8 ## $s2 = 801333E8 -/* 02D00 8093B9D0 260733E0 */ addiu $a3, $s0, 0x33E0 ## $a3 = 801333E0 +/* 02CF0 8093B9C0 260733E0 */ addiu $a3, $s0, %lo(D_801333E0) +/* 02CF4 8093B9C4 3C108013 */ lui $s0, %hi(D_801333E0) +/* 02CF8 8093B9C8 3C128013 */ lui $s2, %hi(D_801333E8) +/* 02CFC 8093B9CC 265233E8 */ addiu $s2, %lo(D_801333E8) +/* 02D00 8093B9D0 260733E0 */ addiu $a3, $s0, %lo(D_801333E0) /* 02D04 8093B9D4 AFA70010 */ sw $a3, 0x0010($sp) /* 02D08 8093B9D8 AFB20014 */ sw $s2, 0x0014($sp) /* 02D0C 8093B9DC 24043122 */ addiu $a0, $zero, 0x3122 ## $a0 = 00003122 @@ -605,8 +605,8 @@ glabel func_8093B1AC /* 02D1C 8093B9EC 10000071 */ beq $zero, $zero, .L8093BBB4 /* 02D20 8093B9F0 86A20178 */ lh $v0, 0x0178($s5) ## 00000178 .L8093B9F4: -/* 02D24 8093B9F4 3C128013 */ lui $s2, 0x8013 ## $s2 = 80130000 -/* 02D28 8093B9F8 265233E8 */ addiu $s2, $s2, 0x33E8 ## $s2 = 801333E8 +/* 02D24 8093B9F4 3C128013 */ lui $s2, %hi(D_801333E8) +/* 02D28 8093B9F8 265233E8 */ addiu $s2, %lo(D_801333E8) /* 02D2C 8093B9FC AFB20014 */ sw $s2, 0x0014($sp) /* 02D30 8093BA00 24043111 */ addiu $a0, $zero, 0x3111 ## $a0 = 00003111 /* 02D34 8093BA04 02202825 */ or $a1, $s1, $zero ## $a1 = 0000054C @@ -685,13 +685,13 @@ glabel func_8093B1AC /* 02E34 8093BB04 26A700F0 */ addiu $a3, $s5, 0x00F0 ## $a3 = 000000F0 /* 02E38 8093BB08 86AB001C */ lh $t3, 0x001C($s5) ## 0000001C /* 02E3C 8093BB0C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02E40 8093BB10 3C108013 */ lui $s0, 0x8013 ## $s0 = 80130000 +/* 02E40 8093BB10 3C108013 */ lui $s0, %hi(D_801333E0) /* 02E44 8093BB14 15610015 */ bne $t3, $at, .L8093BB6C -/* 02E48 8093BB18 261033E0 */ addiu $s0, $s0, 0x33E0 ## $s0 = 801333E0 -/* 02E4C 8093BB1C 3C108013 */ lui $s0, 0x8013 ## $s0 = 80130000 -/* 02E50 8093BB20 3C128013 */ lui $s2, 0x8013 ## $s2 = 80130000 -/* 02E54 8093BB24 265233E8 */ addiu $s2, $s2, 0x33E8 ## $s2 = 801333E8 -/* 02E58 8093BB28 261033E0 */ addiu $s0, $s0, 0x33E0 ## $s0 = 801333E0 +/* 02E48 8093BB18 261033E0 */ addiu $s0, %lo(D_801333E0) +/* 02E4C 8093BB1C 3C108013 */ lui $s0, %hi(D_801333E0) +/* 02E50 8093BB20 3C128013 */ lui $s2, %hi(D_801333E8) +/* 02E54 8093BB24 265233E8 */ addiu $s2, %lo(D_801333E8) +/* 02E58 8093BB28 261033E0 */ addiu $s0, %lo(D_801333E0) /* 02E5C 8093BB2C 02003825 */ or $a3, $s0, $zero ## $a3 = 801333E0 /* 02E60 8093BB30 AFB00010 */ sw $s0, 0x0010($sp) /* 02E64 8093BB34 AFB20014 */ sw $s2, 0x0014($sp) @@ -711,8 +711,8 @@ glabel func_8093B1AC /* 02E94 8093BB64 10000012 */ beq $zero, $zero, .L8093BBB0 /* 02E98 8093BB68 26B3050C */ addiu $s3, $s5, 0x050C ## $s3 = 0000050C .L8093BB6C: -/* 02E9C 8093BB6C 3C128013 */ lui $s2, 0x8013 ## $s2 = 80130000 -/* 02EA0 8093BB70 265233E8 */ addiu $s2, $s2, 0x33E8 ## $s2 = 801333E8 +/* 02E9C 8093BB6C 3C128013 */ lui $s2, %hi(D_801333E8) +/* 02EA0 8093BB70 265233E8 */ addiu $s2, %lo(D_801333E8) /* 02EA4 8093BB74 AFB20014 */ sw $s2, 0x0014($sp) /* 02EA8 8093BB78 24043111 */ addiu $a0, $zero, 0x3111 ## $a0 = 00003111 /* 02EAC 8093BB7C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000558 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s index 3b2854791f..a9972a989c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s @@ -1419,11 +1419,11 @@ glabel L8093E854 /* 05C40 8093E910 000D7702 */ srl $t6, $t5, 28 /* 05C44 8093E914 002B0821 */ addu $at, $at, $t3 /* 05C48 8093E918 000EC880 */ sll $t9, $t6, 2 -/* 05C4C 8093E91C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 05C4C 8093E91C 3C0F8016 */ lui $t7, %hi(gSegments) /* 05C50 8093E920 E4260AFC */ swc1 $f6, 0x0AFC($at) ## 00010AFC /* 05C54 8093E924 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 05C58 8093E928 01F97821 */ addu $t7, $t7, $t9 -/* 05C5C 8093E92C 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 05C5C 8093E92C 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 05C60 8093E930 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 05C64 8093E934 0041C024 */ and $t8, $v0, $at /* 05C68 8093E938 8FA400A4 */ lw $a0, 0x00A4($sp) @@ -1440,8 +1440,8 @@ glabel L8093E854 /* 05C94 8093E964 0C00B380 */ jal TitleCard_InitBossName /* 05C98 8093E968 24851D4C */ addiu $a1, $a0, 0x1D4C ## $a1 = 00001D4C -/* 05C9C 8093E96C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 05CA0 8093E970 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 05C9C 8093E96C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 05CA0 8093E970 2442E660 */ addiu $v0, %lo(gSaveContext) /* 05CA4 8093E974 944B0EE2 */ lhu $t3, 0x0EE2($v0) ## 8015F542 /* 05CA8 8093E978 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B /* 05CAC 8093E97C 356C0020 */ ori $t4, $t3, 0x0020 ## $t4 = 00000020 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941788.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941788.s index a564f01a99..4829b55693 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941788.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941788.s @@ -63,12 +63,12 @@ glabel func_80941788 /* 08B64 80941834 0C0346A2 */ jal Matrix_NewMtx /* 08B68 80941838 AFA20054 */ sw $v0, 0x0054($sp) /* 08B6C 8094183C 8FA30054 */ lw $v1, 0x0054($sp) -/* 08B70 80941840 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 08B70 80941840 3C068016 */ lui $a2, %hi(gSegments) /* 08B74 80941844 3C0700FF */ lui $a3, 0x00FF ## $a3 = 00FF0000 /* 08B78 80941848 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 08B7C 8094184C 862B001C */ lh $t3, 0x001C($s1) ## 0000001C /* 08B80 80941850 34E7FFFF */ ori $a3, $a3, 0xFFFF ## $a3 = 00FFFFFF -/* 08B84 80941854 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 08B84 80941854 24C66FA8 */ addiu $a2, %lo(gSegments) /* 08B88 80941858 15600017 */ bne $t3, $zero, .L809418B8 /* 08B8C 8094185C 3C05DE00 */ lui $a1, 0xDE00 ## $a1 = DE000000 /* 08B90 80941860 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -76,10 +76,10 @@ glabel func_80941788 /* 08B98 80941868 24843AE8 */ addiu $a0, $a0, 0x3AE8 ## $a0 = 06013AE8 /* 08B9C 8094186C 00046900 */ sll $t5, $a0, 4 /* 08BA0 80941870 000D7702 */ srl $t6, $t5, 28 -/* 08BA4 80941874 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 08BA4 80941874 3C068016 */ lui $a2, %hi(gSegments) /* 08BA8 80941878 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 08BAC 8094187C AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 08BB0 80941880 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 08BB0 80941880 24C66FA8 */ addiu $a2, %lo(gSegments) /* 08BB4 80941884 000E7880 */ sll $t7, $t6, 2 /* 08BB8 80941888 3C05DE00 */ lui $a1, 0xDE00 ## $a1 = DE000000 /* 08BBC 8094188C 00CFC021 */ addu $t8, $a2, $t7 @@ -152,8 +152,8 @@ glabel func_80941788 /* 08CC0 80941990 0C0346A2 */ jal Matrix_NewMtx /* 08CC4 80941994 AFA20048 */ sw $v0, 0x0048($sp) /* 08CC8 80941998 8FA30048 */ lw $v1, 0x0048($sp) -/* 08CCC 8094199C 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 08CD0 809419A0 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 08CCC 8094199C 3C068016 */ lui $a2, %hi(gSegments) +/* 08CD0 809419A0 24C66FA8 */ addiu $a2, %lo(gSegments) /* 08CD4 809419A4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 08CD8 809419A8 8639001C */ lh $t9, 0x001C($s1) ## 0000001C /* 08CDC 809419AC 3C05DE00 */ lui $a1, 0xDE00 ## $a1 = DE000000 @@ -230,8 +230,8 @@ glabel func_80941788 /* 08DF4 80941AC4 00045100 */ sll $t2, $a0, 4 /* 08DF8 80941AC8 000A5F02 */ srl $t3, $t2, 28 /* 08DFC 80941ACC 4600218D */ trunc.w.s $f6, $f4 -/* 08E00 80941AD0 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 08E04 80941AD4 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 08E00 80941AD0 3C068016 */ lui $a2, %hi(gSegments) +/* 08E04 80941AD4 24C66FA8 */ addiu $a2, %lo(gSegments) /* 08E08 80941AD8 000B6080 */ sll $t4, $t3, 2 /* 08E0C 80941ADC 440E3000 */ mfc1 $t6, $f6 /* 08E10 80941AE0 3C05DE00 */ lui $a1, 0xDE00 ## $a1 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s index 38a5d7e14a..eeba95bcce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s @@ -93,14 +93,14 @@ glabel func_80941BC0 /* 09004 80941CD4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 09008 80941CD8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 0900C 80941CDC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 09010 80941CE0 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 09010 80941CE0 3C0D8016 */ lui $t5, %hi(gSegments) /* 09014 80941CE4 000B6080 */ sll $t4, $t3, 2 /* 09018 80941CE8 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0901C 80941CEC AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 09020 80941CF0 01AC6821 */ addu $t5, $t5, $t4 /* 09024 80941CF4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 09028 80941CF8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0902C 80941CFC 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 +/* 0902C 80941CFC 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) /* 09030 80941D00 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 09034 80941D04 00817024 */ and $t6, $a0, $at /* 09038 80941D08 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -262,11 +262,11 @@ glabel func_80941BC0 /* 09290 80941F60 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 09294 80941F64 000E7880 */ sll $t7, $t6, 2 /* 09298 80941F68 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 0929C 80941F6C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0929C 80941F6C 3C188016 */ lui $t8, %hi(gSegments) /* 092A0 80941F70 030FC021 */ addu $t8, $t8, $t7 /* 092A4 80941F74 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 092A8 80941F78 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 092AC 80941F7C 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 092AC 80941F7C 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 092B0 80941F80 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 092B4 80941F84 0081C824 */ and $t9, $a0, $at /* 092B8 80941F88 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -370,12 +370,12 @@ glabel func_80941BC0 /* 09440 80942110 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 09444 80942114 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 09448 80942118 000E7880 */ sll $t7, $t6, 2 -/* 0944C 8094211C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0944C 8094211C 3C188016 */ lui $t8, %hi(gSegments) /* 09450 80942120 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 /* 09454 80942124 030FC021 */ addu $t8, $t8, $t7 /* 09458 80942128 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0945C 8094212C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 09460 80942130 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 09460 80942130 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 09464 80942134 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 09468 80942138 0081C824 */ and $t9, $a0, $at /* 0946C 8094213C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s index 064a81b527..a27a4f4f18 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s @@ -129,7 +129,7 @@ glabel func_80942180 /* 09644 80942314 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 09648 80942318 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 0964C 8094231C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 09650 80942320 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 09650 80942320 3C0E8016 */ lui $t6, %hi(gSegments) /* 09654 80942324 000C6880 */ sll $t5, $t4, 2 /* 09658 80942328 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0965C 8094232C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 @@ -142,7 +142,7 @@ glabel func_80942180 /* 09678 80942348 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 /* 0967C 8094234C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 09680 80942350 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 09684 80942354 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 09684 80942354 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 09688 80942358 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0968C 8094235C 00817824 */ and $t7, $a0, $at /* 09690 80942360 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -234,7 +234,7 @@ glabel func_80942180 /* 097E8 809424B8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 097EC 809424BC AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 097F0 809424C0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 097F4 809424C4 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 097F4 809424C4 3C0F8016 */ lui $t7, %hi(gSegments) /* 097F8 809424C8 000D7080 */ sll $t6, $t5, 2 /* 097FC 809424CC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 09800 809424D0 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 @@ -247,7 +247,7 @@ glabel func_80942180 /* 0981C 809424EC AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 09820 809424F0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 09824 809424F4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 09828 809424F8 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 09828 809424F8 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 0982C 809424FC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 09830 80942500 0081C024 */ and $t8, $a0, $at /* 09834 80942504 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -349,11 +349,11 @@ glabel func_80942180 /* 099B4 80942684 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 099B8 80942688 000FC080 */ sll $t8, $t7, 2 /* 099BC 8094268C 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 099C0 80942690 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 099C0 80942690 3C198016 */ lui $t9, %hi(gSegments) /* 099C4 80942694 0338C821 */ addu $t9, $t9, $t8 /* 099C8 80942698 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 099CC 8094269C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 099D0 809426A0 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 099D0 809426A0 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 099D4 809426A4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 099D8 809426A8 00814824 */ and $t1, $a0, $at /* 099DC 809426AC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s index 572b5e5f32..a1dacc54de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s @@ -119,8 +119,8 @@ glabel func_809426F0 /* 09B90 80942860 00046900 */ sll $t5, $a0, 4 /* 09B94 80942864 000D7702 */ srl $t6, $t5, 28 /* 09B98 80942868 4600428D */ trunc.w.s $f10, $f8 -/* 09B9C 8094286C 3C118016 */ lui $s1, 0x8016 ## $s1 = 80160000 -/* 09BA0 80942870 26316FA8 */ addiu $s1, $s1, 0x6FA8 ## $s1 = 80166FA8 +/* 09B9C 8094286C 3C118016 */ lui $s1, %hi(gSegments) +/* 09BA0 80942870 26316FA8 */ addiu $s1, %lo(gSegments) /* 09BA4 80942874 000E7880 */ sll $t7, $t6, 2 /* 09BA8 80942878 44085000 */ mfc1 $t0, $f10 /* 09BAC 8094287C 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 @@ -154,9 +154,9 @@ glabel func_809426F0 /* 09C18 809428E8 4600848D */ trunc.w.s $f18, $f16 /* 09C1C 809428EC 00045100 */ sll $t2, $a0, 4 /* 09C20 809428F0 000A5F02 */ srl $t3, $t2, 28 -/* 09C24 809428F4 3C118016 */ lui $s1, 0x8016 ## $s1 = 80160000 +/* 09C24 809428F4 3C118016 */ lui $s1, %hi(gSegments) /* 09C28 809428F8 440F9000 */ mfc1 $t7, $f18 -/* 09C2C 809428FC 26316FA8 */ addiu $s1, $s1, 0x6FA8 ## $s1 = 80166FA8 +/* 09C2C 809428FC 26316FA8 */ addiu $s1, %lo(gSegments) /* 09C30 80942900 000B6080 */ sll $t4, $t3, 2 /* 09C34 80942904 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 /* 09C38 80942908 0301C825 */ or $t9, $t8, $at ## $t9 = FFFF0000 @@ -244,8 +244,8 @@ glabel func_809426F0 /* 09D74 80942A44 0002C900 */ sll $t9, $v0, 4 /* 09D78 80942A48 00194702 */ srl $t0, $t9, 28 /* 09D7C 80942A4C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 09D80 80942A50 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 09D84 80942A54 254A6FA8 */ addiu $t2, $t2, 0x6FA8 ## $t2 = 80166FA8 +/* 09D80 80942A50 3C0A8016 */ lui $t2, %hi(gSegments) +/* 09D84 80942A54 254A6FA8 */ addiu $t2, %lo(gSegments) /* 09D88 80942A58 00416024 */ and $t4, $v0, $at /* 09D8C 80942A5C 00084880 */ sll $t1, $t0, 2 /* 09D90 80942A60 012A5821 */ addu $t3, $t1, $t2 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s index ac6a8d3f1c..a7a7c8af8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s @@ -174,10 +174,10 @@ glabel func_80942C70 /* 0A1D0 80942EA0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0A1D4 80942EA4 00046900 */ sll $t5, $a0, 4 /* 0A1D8 80942EA8 000D7702 */ srl $t6, $t5, 28 -/* 0A1DC 80942EAC 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0A1DC 80942EAC 3C188016 */ lui $t8, %hi(gSegments) /* 0A1E0 80942EB0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 0A1E4 80942EB4 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 -/* 0A1E8 80942EB8 27186FA8 */ addiu $t8, $t8, 0x6FA8 ## $t8 = 80166FA8 +/* 0A1E8 80942EB8 27186FA8 */ addiu $t8, %lo(gSegments) /* 0A1EC 80942EBC 000E7880 */ sll $t7, $t6, 2 /* 0A1F0 80942EC0 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 /* 0A1F4 80942EC4 01F82821 */ addu $a1, $t7, $t8 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943028.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943028.s index e1b78ca381..d335ec10d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943028.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943028.s @@ -76,11 +76,11 @@ glabel func_80943028 /* 0A438 80943108 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 0A43C 8094310C 000E7880 */ sll $t7, $t6, 2 /* 0A440 80943110 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 0A444 80943114 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0A444 80943114 3C188016 */ lui $t8, %hi(gSegments) /* 0A448 80943118 030FC021 */ addu $t8, $t8, $t7 /* 0A44C 8094311C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0A450 80943120 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 0A454 80943124 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 0A454 80943124 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 0A458 80943128 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0A45C 8094312C 0081C824 */ and $t9, $a0, $at /* 0A460 80943130 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -140,11 +140,11 @@ glabel func_80943028 /* 0A538 80943208 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 0A53C 8094320C 000A5880 */ sll $t3, $t2, 2 /* 0A540 80943210 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 -/* 0A544 80943214 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 0A544 80943214 3C0C8016 */ lui $t4, %hi(gSegments) /* 0A548 80943218 018B6021 */ addu $t4, $t4, $t3 /* 0A54C 8094321C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0A550 80943220 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 0A554 80943224 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 0A554 80943224 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 0A558 80943228 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0A55C 8094322C 00816824 */ and $t5, $a0, $at /* 0A560 80943230 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s index b31436c386..d46811b1cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s @@ -108,8 +108,8 @@ glabel L809439B8 /* 0AD80 80943A50 000E7880 */ sll $t7, $t6, 2 /* 0AD84 80943A54 00AFC021 */ addu $t8, $a1, $t7 /* 0AD88 80943A58 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 0AD8C 80943A5C 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 0AD90 80943A60 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 +/* 0AD8C 80943A5C 3C078016 */ lui $a3, %hi(gSegments) +/* 0AD90 80943A60 24E76FA8 */ addiu $a3, %lo(gSegments) /* 0AD94 80943A64 00046100 */ sll $t4, $a0, 4 /* 0AD98 80943A68 000C6F02 */ srl $t5, $t4, 28 /* 0AD9C 80943A6C 000D7080 */ sll $t6, $t5, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s index 3d71bda68d..79f1d448e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s @@ -209,11 +209,11 @@ glabel func_80943F08 /* 0B4DC 809441AC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0B4E0 809441B0 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 0B4E4 809441B4 00195080 */ sll $t2, $t9, 2 -/* 0B4E8 809441B8 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 0B4E8 809441B8 3C0B8016 */ lui $t3, %hi(gSegments) /* 0B4EC 809441BC 016A5821 */ addu $t3, $t3, $t2 /* 0B4F0 809441C0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0B4F4 809441C4 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 0B4F8 809441C8 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 +/* 0B4F8 809441C8 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) /* 0B4FC 809441CC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0B500 809441D0 00816024 */ and $t4, $a0, $at /* 0B504 809441D4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -277,13 +277,13 @@ glabel func_80943F08 /* 0B5EC 809442BC 01415825 */ or $t3, $t2, $at ## $t3 = 64140000 /* 0B5F0 809442C0 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 0B5F4 809442C4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0B5F8 809442C8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 0B5F8 809442C8 3C198016 */ lui $t9, %hi(gSegments) /* 0B5FC 809442CC 0338C821 */ addu $t9, $t9, $t8 /* 0B600 809442D0 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 0B604 809442D4 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 0B608 809442D8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0B60C 809442DC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 0B610 809442E0 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 0B610 809442E0 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 0B614 809442E4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0B618 809442E8 00815024 */ and $t2, $a0, $at /* 0B61C 809442EC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -307,11 +307,11 @@ glabel func_80943F08 /* 0B660 80944330 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 0B664 80944334 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 0B668 80944338 000C6880 */ sll $t5, $t4, 2 -/* 0B66C 8094433C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0B66C 8094433C 3C0F8016 */ lui $t7, %hi(gSegments) /* 0B670 80944340 01ED7821 */ addu $t7, $t7, $t5 /* 0B674 80944344 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0B678 80944348 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0B67C 8094434C 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 0B67C 8094434C 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 0B680 80944350 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0B684 80944354 00817024 */ and $t6, $a0, $at /* 0B688 80944358 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -376,13 +376,13 @@ glabel func_80943F08 /* 0B774 80944444 01A17825 */ or $t7, $t5, $at ## $t7 = AFCDC300 /* 0B778 80944448 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 0B77C 8094444C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0B780 80944450 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 0B780 80944450 3C0C8016 */ lui $t4, %hi(gSegments) /* 0B784 80944454 018B6021 */ addu $t4, $t4, $t3 /* 0B788 80944458 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 0B78C 8094445C AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 0B790 80944460 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0B794 80944464 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0B798 80944468 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 0B798 80944468 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 0B79C 8094446C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0B7A0 80944470 00816824 */ and $t5, $a0, $at /* 0B7A4 80944474 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -583,11 +583,11 @@ glabel func_80943F08 /* 0BA7C 8094474C AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 0BA80 80944750 000C6880 */ sll $t5, $t4, 2 /* 0BA84 80944754 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 0BA88 80944758 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0BA88 80944758 3C0F8016 */ lui $t7, %hi(gSegments) /* 0BA8C 8094475C 01ED7821 */ addu $t7, $t7, $t5 /* 0BA90 80944760 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0BA94 80944764 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0BA98 80944768 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 0BA98 80944768 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 0BA9C 8094476C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0BAA0 80944770 00817024 */ and $t6, $a0, $at /* 0BAA4 80944774 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s index 8ce6ba0eb8..92f919ded1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s @@ -124,10 +124,10 @@ glabel func_809447BC /* 0BC50 80944920 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0BC54 80944924 00046100 */ sll $t4, $a0, 4 /* 0BC58 80944928 000C6F02 */ srl $t5, $t4, 28 -/* 0BC5C 8094492C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0BC5C 8094492C 3C0F8016 */ lui $t7, %hi(gSegments) /* 0BC60 80944930 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 0BC64 80944934 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 0BC68 80944938 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 +/* 0BC68 80944938 25EF6FA8 */ addiu $t7, %lo(gSegments) /* 0BC6C 8094493C 000D7080 */ sll $t6, $t5, 2 /* 0BC70 80944940 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 /* 0BC74 80944944 01CF2821 */ addu $a1, $t6, $t7 @@ -191,11 +191,11 @@ glabel func_809447BC /* 0BD5C 80944A2C AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 0BD60 80944A30 0018C880 */ sll $t9, $t8, 2 /* 0BD64 80944A34 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 0BD68 80944A38 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 0BD68 80944A38 3C098016 */ lui $t1, %hi(gSegments) /* 0BD6C 80944A3C 01394821 */ addu $t1, $t1, $t9 /* 0BD70 80944A40 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0BD74 80944A44 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 0BD78 80944A48 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 +/* 0BD78 80944A48 8D296FA8 */ lw $t1, %lo(gSegments)($t1) /* 0BD7C 80944A4C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0BD80 80944A50 00815024 */ and $t2, $a0, $at /* 0BD84 80944A54 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -301,11 +301,11 @@ glabel func_809447BC /* 0BF14 80944BE4 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 0BF18 80944BE8 000B6080 */ sll $t4, $t3, 2 /* 0BF1C 80944BEC 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 0BF20 80944BF0 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 0BF20 80944BF0 3C0D8016 */ lui $t5, %hi(gSegments) /* 0BF24 80944BF4 01AC6821 */ addu $t5, $t5, $t4 /* 0BF28 80944BF8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0BF2C 80944BFC AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0BF30 80944C00 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 +/* 0BF30 80944C00 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) /* 0BF34 80944C04 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0BF38 80944C08 00817024 */ and $t6, $a0, $at /* 0BF3C 80944C0C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s index b5b11aeaf4..cb36a7dd7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s @@ -87,11 +87,11 @@ glabel func_80944C50 /* 0C05C 80944D2C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 0C060 80944D30 000D7080 */ sll $t6, $t5, 2 /* 0C064 80944D34 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 -/* 0C068 80944D38 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0C068 80944D38 3C0F8016 */ lui $t7, %hi(gSegments) /* 0C06C 80944D3C 01EE7821 */ addu $t7, $t7, $t6 /* 0C070 80944D40 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0C074 80944D44 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 0C078 80944D48 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 0C078 80944D48 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 0C07C 80944D4C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0C080 80944D50 0081C024 */ and $t8, $a0, $at /* 0C084 80944D54 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -176,11 +176,11 @@ glabel func_80944C50 /* 0C1BC 80944E8C AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 0C1C0 80944E90 00194880 */ sll $t1, $t9, 2 /* 0C1C4 80944E94 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 -/* 0C1C8 80944E98 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 0C1C8 80944E98 3C0A8016 */ lui $t2, %hi(gSegments) /* 0C1CC 80944E9C 01495021 */ addu $t2, $t2, $t1 /* 0C1D0 80944EA0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0C1D4 80944EA4 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0C1D8 80944EA8 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 0C1D8 80944EA8 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 0C1DC 80944EAC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0C1E0 80944EB0 00815824 */ and $t3, $a0, $at /* 0C1E4 80944EB4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -276,11 +276,11 @@ glabel func_80944C50 /* 0C348 80945018 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 /* 0C34C 8094501C 000C6880 */ sll $t5, $t4, 2 /* 0C350 80945020 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 0C354 80945024 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0C354 80945024 3C0E8016 */ lui $t6, %hi(gSegments) /* 0C358 80945028 01CD7021 */ addu $t6, $t6, $t5 /* 0C35C 8094502C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0C360 80945030 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0C364 80945034 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 0C364 80945034 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 0C368 80945038 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0C36C 8094503C 00817824 */ and $t7, $a0, $at /* 0C370 80945040 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s index d6ef1cde6a..eb12aaf40e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s @@ -65,7 +65,7 @@ glabel func_80946C7C .L80946D18: /* 0E048 80946D18 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 /* 0E04C 80946D1C 3C01C814 */ lui $at, 0xC814 ## $at = C8140000 -/* 0E050 80946D20 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 0E050 80946D20 3C088016 */ lui $t0, %hi(gSegments) /* 0E054 80946D24 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 0E058 80946D28 AE4E02D0 */ sw $t6, 0x02D0($s2) ## 000002D0 /* 0E05C 80946D2C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 @@ -73,7 +73,7 @@ glabel func_80946C7C /* 0E064 80946D34 3C0EFFD7 */ lui $t6, 0xFFD7 ## $t6 = FFD70000 /* 0E068 80946D38 35CEFF80 */ ori $t6, $t6, 0xFF80 ## $t6 = FFD7FF80 /* 0E06C 80946D3C 4600218D */ trunc.w.s $f6, $f4 -/* 0E070 80946D40 25086FA8 */ addiu $t0, $t0, 0x6FA8 ## $t0 = 80166FA8 +/* 0E070 80946D40 25086FA8 */ addiu $t0, %lo(gSegments) /* 0E074 80946D44 3C15DB06 */ lui $s5, 0xDB06 ## $s5 = DB060000 /* 0E078 80946D48 36B50020 */ ori $s5, $s5, 0x0020 ## $s5 = DB060020 /* 0E07C 80946D4C 44093000 */ mfc1 $t1, $f6 @@ -229,7 +229,7 @@ glabel func_80946C7C /* 0E2CC 80946F9C 000FC080 */ sll $t8, $t7, 2 /* 0E2D0 80946FA0 44098000 */ mfc1 $t1, $f16 /* 0E2D4 80946FA4 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 0E2D8 80946FA8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 0E2D8 80946FA8 3C198016 */ lui $t9, %hi(gSegments) /* 0E2DC 80946FAC 312A00FF */ andi $t2, $t1, 0x00FF ## $t2 = 00000000 /* 0E2E0 80946FB0 01415825 */ or $t3, $t2, $at ## $t3 = C3E1EB00 /* 0E2E4 80946FB4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 @@ -239,7 +239,7 @@ glabel func_80946C7C /* 0E2F4 80946FC4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 0E2F8 80946FC8 AE4C02D0 */ sw $t4, 0x02D0($s2) ## 000002D0 /* 0E2FC 80946FCC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 0E300 80946FD0 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 0E300 80946FD0 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 0E304 80946FD4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0E308 80946FD8 00814024 */ and $t0, $a0, $at /* 0E30C 80946FDC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -258,8 +258,8 @@ glabel func_80946C7C /* 0E340 80947010 00025900 */ sll $t3, $v0, 4 /* 0E344 80947014 000B6702 */ srl $t4, $t3, 28 /* 0E348 80947018 C436B1C8 */ lwc1 $f22, %lo(D_8094B1C8)($at) -/* 0E34C 8094701C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0E350 80947020 25CE6FA8 */ addiu $t6, $t6, 0x6FA8 ## $t6 = 80166FA8 +/* 0E34C 8094701C 3C0E8016 */ lui $t6, %hi(gSegments) +/* 0E350 80947020 25CE6FA8 */ addiu $t6, %lo(gSegments) /* 0E354 80947024 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0E358 80947028 000C6880 */ sll $t5, $t4, 2 /* 0E35C 8094702C 01AE7821 */ addu $t7, $t5, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s index 621561b493..43b7dad784 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s @@ -63,8 +63,8 @@ glabel func_80947240 /* 0E604 809472D4 35EFFF80 */ ori $t7, $t7, 0xFF80 ## $t7 = FFD7FF80 /* 0E608 809472D8 4600218D */ trunc.w.s $f6, $f4 /* 0E60C 809472DC 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 0E610 809472E0 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 0E614 809472E4 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 +/* 0E610 809472E0 3C098016 */ lui $t1, %hi(gSegments) +/* 0E614 809472E4 25296FA8 */ addiu $t1, %lo(gSegments) /* 0E618 809472E8 440A3000 */ mfc1 $t2, $f6 /* 0E61C 809472EC 3C15DB06 */ lui $s5, 0xDB06 ## $s5 = DB060000 /* 0E620 809472F0 36B50020 */ ori $s5, $s5, 0x0020 ## $s5 = DB060020 @@ -219,7 +219,7 @@ glabel func_80947240 /* 0E86C 8094753C 0018C880 */ sll $t9, $t8, 2 /* 0E870 80947540 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 /* 0E874 80947544 440A8000 */ mfc1 $t2, $f16 -/* 0E878 80947548 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 0E878 80947548 3C088016 */ lui $t0, %hi(gSegments) /* 0E87C 8094754C 01194021 */ addu $t0, $t0, $t9 /* 0E880 80947550 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000000 /* 0E884 80947554 01616025 */ or $t4, $t3, $at ## $t4 = C3E1EB00 @@ -230,7 +230,7 @@ glabel func_80947240 /* 0E898 80947568 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 0E89C 8094756C AE4D02D0 */ sw $t5, 0x02D0($s2) ## 000002D0 /* 0E8A0 80947570 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 0E8A4 80947574 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 +/* 0E8A4 80947574 8D086FA8 */ lw $t0, %lo(gSegments)($t0) /* 0E8A8 80947578 00814824 */ and $t1, $a0, $at /* 0E8AC 8094757C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 0E8B0 80947580 01095021 */ addu $t2, $t0, $t1 @@ -248,8 +248,8 @@ glabel func_80947240 /* 0E8E0 809475B0 00026100 */ sll $t4, $v0, 4 /* 0E8E4 809475B4 000C6F02 */ srl $t5, $t4, 28 /* 0E8E8 809475B8 C436B1D0 */ lwc1 $f22, %lo(D_8094B1D0)($at) -/* 0E8EC 809475BC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 0E8F0 809475C0 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 +/* 0E8EC 809475BC 3C0F8016 */ lui $t7, %hi(gSegments) +/* 0E8F0 809475C0 25EF6FA8 */ addiu $t7, %lo(gSegments) /* 0E8F4 809475C4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0E8F8 809475C8 000D7080 */ sll $t6, $t5, 2 /* 0E8FC 809475CC 01CFC021 */ addu $t8, $t6, $t7 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s index c6b58c29e8..4ff70d6630 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s @@ -178,8 +178,8 @@ glabel func_80948668 /* 0FBA4 80948874 0281A021 */ addu $s4, $s4, $at /* 0FBA8 80948878 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0FBAC 8094887C 000F6F02 */ srl $t5, $t7, 28 -/* 0FBB0 80948880 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0FBB4 80948884 25CE6FA8 */ addiu $t6, $t6, 0x6FA8 ## $t6 = 80166FA8 +/* 0FBB0 80948880 3C0E8016 */ lui $t6, %hi(gSegments) +/* 0FBB4 80948884 25CE6FA8 */ addiu $t6, %lo(gSegments) /* 0FBB8 80948888 000DC080 */ sll $t8, $t5, 2 /* 0FBBC 8094888C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0FBC0 80948890 0041B824 */ and $s7, $v0, $at @@ -311,8 +311,8 @@ glabel func_80948668 /* 0FDAC 80948A7C 0281A021 */ addu $s4, $s4, $at /* 0FDB0 80948A80 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0FDB4 80948A84 000E4F02 */ srl $t1, $t6, 28 -/* 0FDB8 80948A88 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 0FDBC 80948A8C 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 +/* 0FDB8 80948A88 3C0F8016 */ lui $t7, %hi(gSegments) +/* 0FDBC 80948A8C 25EF6FA8 */ addiu $t7, %lo(gSegments) /* 0FDC0 80948A90 00096080 */ sll $t4, $t1, 2 /* 0FDC4 80948A94 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0FDC8 80948A98 00419024 */ and $s2, $v0, $at @@ -442,8 +442,8 @@ glabel func_80948668 /* 0FFAC 80948C7C 0281A021 */ addu $s4, $s4, $at /* 0FFB0 80948C80 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0FFB4 80948C84 00195702 */ srl $t2, $t9, 28 -/* 0FFB8 80948C88 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0FFBC 80948C8C 25CE6FA8 */ addiu $t6, $t6, 0x6FA8 ## $t6 = 80166FA8 +/* 0FFB8 80948C88 3C0E8016 */ lui $t6, %hi(gSegments) +/* 0FFBC 80948C8C 25CE6FA8 */ addiu $t6, %lo(gSegments) /* 0FFC0 80948C90 000A5880 */ sll $t3, $t2, 2 /* 0FFC4 80948C94 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0FFC8 80948C98 00419024 */ and $s2, $v0, $at @@ -638,10 +638,10 @@ glabel func_80948668 /* 102A0 80948F70 2442AA50 */ addiu $v0, $v0, 0xAA50 ## $v0 = 0601AA50 /* 102A4 80948F74 00025900 */ sll $t3, $v0, 4 /* 102A8 80948F78 000B7702 */ srl $t6, $t3, 28 -/* 102AC 80948F7C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 102AC 80948F7C 3C0C8016 */ lui $t4, %hi(gSegments) /* 102B0 80948F80 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 /* 102B4 80948F84 AE6F02D0 */ sw $t7, 0x02D0($s3) ## 000002D0 -/* 102B8 80948F88 258C6FA8 */ addiu $t4, $t4, 0x6FA8 ## $t4 = 80166FA8 +/* 102B8 80948F88 258C6FA8 */ addiu $t4, %lo(gSegments) /* 102BC 80948F8C 000E4880 */ sll $t1, $t6, 2 /* 102C0 80948F90 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 /* 102C4 80948F94 012C2021 */ addu $a0, $t1, $t4 @@ -706,10 +706,10 @@ glabel func_80948668 /* 103A8 80949078 1A80005A */ blez $s4, .L809491E4 /* 103AC 8094907C 00027900 */ sll $t7, $v0, 4 /* 103B0 80949080 000F6F02 */ srl $t5, $t7, 28 -/* 103B4 80949084 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 103B4 80949084 3C198016 */ lui $t9, %hi(gSegments) /* 103B8 80949088 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 103BC 8094908C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 103C0 80949090 27396FA8 */ addiu $t9, $t9, 0x6FA8 ## $t9 = 80166FA8 +/* 103C0 80949090 27396FA8 */ addiu $t9, %lo(gSegments) /* 103C4 80949094 000DC080 */ sll $t8, $t5, 2 /* 103C8 80949098 0319B021 */ addu $s6, $t8, $t9 /* 103CC 8094909C 0041B824 */ and $s7, $v0, $at @@ -842,9 +842,9 @@ glabel func_80948668 /* 105B0 80949280 00026100 */ sll $t4, $v0, 4 /* 105B4 80949284 000C7F02 */ srl $t7, $t4, 28 /* 105B8 80949288 000F6880 */ sll $t5, $t7, 2 -/* 105BC 8094928C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 105BC 8094928C 3C188016 */ lui $t8, %hi(gSegments) /* 105C0 80949290 246C0008 */ addiu $t4, $v1, 0x0008 ## $t4 = 00000008 -/* 105C4 80949294 27186FA8 */ addiu $t8, $t8, 0x6FA8 ## $t8 = 80166FA8 +/* 105C4 80949294 27186FA8 */ addiu $t8, %lo(gSegments) /* 105C8 80949298 AE6C02D0 */ sw $t4, 0x02D0($s3) ## 000002D0 /* 105CC 8094929C 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 /* 105D0 809492A0 01B82021 */ addu $a0, $t5, $t8 @@ -946,10 +946,10 @@ glabel func_80948668 /* 10748 80949418 2442AB00 */ addiu $v0, $v0, 0xAB00 ## $v0 = 0601AB00 /* 1074C 8094941C 00024900 */ sll $t1, $v0, 4 /* 10750 80949420 00096702 */ srl $t4, $t1, 28 -/* 10754 80949424 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 10754 80949424 3C0D8016 */ lui $t5, %hi(gSegments) /* 10758 80949428 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 /* 1075C 8094942C AE7802D0 */ sw $t8, 0x02D0($s3) ## 000002D0 -/* 10760 80949430 25AD6FA8 */ addiu $t5, $t5, 0x6FA8 ## $t5 = 80166FA8 +/* 10760 80949430 25AD6FA8 */ addiu $t5, %lo(gSegments) /* 10764 80949434 000C7880 */ sll $t7, $t4, 2 /* 10768 80949438 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 /* 1076C 8094943C 01EDB021 */ addu $s6, $t7, $t5 @@ -966,10 +966,10 @@ glabel func_80948668 .L80949468: /* 10798 80949468 8E6302D0 */ lw $v1, 0x02D0($s3) ## 000002D0 /* 1079C 8094946C 00096702 */ srl $t4, $t1, 28 -/* 107A0 80949470 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 107A0 80949470 3C0D8016 */ lui $t5, %hi(gSegments) /* 107A4 80949474 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 /* 107A8 80949478 AE7802D0 */ sw $t8, 0x02D0($s3) ## 000002D0 -/* 107AC 8094947C 25AD6FA8 */ addiu $t5, $t5, 0x6FA8 ## $t5 = 80166FA8 +/* 107AC 8094947C 25AD6FA8 */ addiu $t5, %lo(gSegments) /* 107B0 80949480 000C7880 */ sll $t7, $t4, 2 /* 107B4 80949484 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 /* 107B8 80949488 01ED8821 */ addu $s1, $t7, $t5 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s index 35a978a9ec..207ed4f98e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s @@ -201,8 +201,8 @@ glabel L80950024 /* 00DC0 80950080 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00DC4 80950084 1040002C */ beq $v0, $zero, .L80950138 /* 00DC8 80950088 3C0D8096 */ lui $t5, %hi(D_8095C200) ## $t5 = 80960000 -/* 00DCC 8095008C 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 00DD0 80950090 954AF53A */ lhu $t2, -0x0AC6($t2) ## 8015F53A +/* 00DCC 8095008C 3C0A8016 */ lui $t2, %hi(gSaveContext+0xeda) +/* 00DD0 80950090 954AF53A */ lhu $t2, %lo(gSaveContext+0xeda)($t2) /* 00DD4 80950094 240600A1 */ addiu $a2, $zero, 0x00A1 ## $a2 = 000000A1 /* 00DD8 80950098 8FA40050 */ lw $a0, 0x0050($sp) /* 00DDC 8095009C 314B0080 */ andi $t3, $t2, 0x0080 ## $t3 = 00000000 @@ -251,8 +251,8 @@ glabel L80950024 .L80950138: /* 00E78 80950138 25ADC200 */ addiu $t5, $t5, %lo(D_8095C200) ## $t5 = FFFFC200 /* 00E7C 8095013C AE6D0098 */ sw $t5, 0x0098($s3) ## 00000098 -/* 00E80 80950140 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00E84 80950144 95EFF542 */ lhu $t7, -0x0ABE($t7) ## 8015F542 +/* 00E80 80950140 3C0F8016 */ lui $t7, %hi(gSaveContext+0xee2) +/* 00E84 80950144 95EFF542 */ lhu $t7, %lo(gSaveContext+0xee2)($t7) /* 00E88 80950148 340EFFFF */ ori $t6, $zero, 0xFFFF ## $t6 = 0000FFFF /* 00E8C 8095014C 3C018096 */ lui $at, %hi(D_8096693E) ## $at = 80960000 /* 00E90 80950150 31F80040 */ andi $t8, $t7, 0x0040 ## $t8 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s index 1b1f9c3657..72a9e486af 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s @@ -801,7 +801,7 @@ glabel L809510AC /* 01F9C 8095125C 862E01F2 */ lh $t6, 0x01F2($s1) ## 000001F2 .L80951260: /* 01FA0 80951260 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01FA4 80951264 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 01FA4 80951264 3C058016 */ lui $a1, %hi(gSaveContext) /* 01FA8 80951268 006E7821 */ addu $t7, $v1, $t6 /* 01FAC 8095126C 01E1082A */ slt $at, $t7, $at /* 01FB0 80951270 14200045 */ bne $at, $zero, .L80951388 @@ -823,7 +823,7 @@ glabel L809510AC /* 01FF0 809512B0 E4266900 */ swc1 $f6, %lo(D_80966900)($at) /* 01FF4 809512B4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01FF8 809512B8 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 01FFC 809512BC 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 +/* 01FFC 809512BC 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 02000 809512C0 3C01430C */ lui $at, 0x430C ## $at = 430C0000 /* 02004 809512C4 44815000 */ mtc1 $at, $f10 ## $f10 = 140.00 /* 02008 809512C8 94AC0EE2 */ lhu $t4, 0x0EE2($a1) ## 8015F542 @@ -841,10 +841,10 @@ glabel L809510AC /* 02038 809512F8 00027100 */ sll $t6, $v0, 4 /* 0203C 809512FC 000E7F02 */ srl $t7, $t6, 28 /* 02040 80951300 000FC080 */ sll $t8, $t7, 2 -/* 02044 80951304 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 02044 80951304 3C198016 */ lui $t9, %hi(gSegments) /* 02048 80951308 0338C821 */ addu $t9, $t9, $t8 /* 0204C 8095130C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 02050 80951310 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 02050 80951310 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 02054 80951314 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 02058 80951318 00415824 */ and $t3, $v0, $at /* 0205C 8095131C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -991,8 +991,8 @@ glabel L809514D0 /* 02258 80951518 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0225C 8095151C 0C00B7D5 */ jal func_8002DF54 /* 02260 80951520 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 02264 80951524 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 02268 80951528 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 +/* 02264 80951524 3C058016 */ lui $a1, %hi(gSaveContext) +/* 02268 80951528 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 0226C 8095152C 826C0000 */ lb $t4, 0x0000($s3) ## 809668D2 /* 02270 80951530 94AE0EE2 */ lhu $t6, 0x0EE2($a1) ## 8015F542 /* 02274 80951534 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954C20.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954C20.s index 5737284998..53f7d2665a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954C20.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954C20.s @@ -28,7 +28,7 @@ glabel func_80954C20 /* 0599C 80954C5C 50600004 */ beql $v1, $zero, .L80954C70 /* 059A0 80954C60 8D2B0024 */ lw $t3, 0x0024($t1) ## 00000024 /* 059A4 80954C64 17030010 */ bne $t8, $v1, .L80954CA8 -/* 059A8 80954C68 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 059A8 80954C68 3C0D8016 */ lui $t5, %hi(gGameInfo) .L80954C6C: /* 059AC 80954C6C 8D2B0024 */ lw $t3, 0x0024($t1) ## 00000024 .L80954C70: @@ -47,7 +47,7 @@ glabel func_80954C20 /* 059E0 80954CA0 10000091 */ beq $zero, $zero, .L80954EE8 /* 059E4 80954CA4 E7A80080 */ swc1 $f8, 0x0080($sp) .L80954CA8: -/* 059E8 80954CA8 8DADFA90 */ lw $t5, -0x0570($t5) ## 8015FA90 +/* 059E8 80954CA8 8DADFA90 */ lw $t5, %lo(gGameInfo)($t5) /* 059EC 80954CAC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 059F0 80954CB0 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 /* 059F4 80954CB4 85AE0110 */ lh $t6, 0x0110($t5) ## 80160110 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s index f0a1fe71f8..3769d7b053 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s @@ -277,7 +277,7 @@ glabel func_8095A188 /* 0B1D0 8095A490 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0B1D4 8095A494 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B1D8 8095A498 3C048096 */ lui $a0, %hi(D_8095C300) ## $a0 = 80960000 -/* 0B1DC 8095A49C 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 0B1DC 8095A49C 3C088016 */ lui $t0, %hi(gSegments) /* 0B1E0 8095A4A0 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 0B1E4 8095A4A4 AE2902D0 */ sw $t1, 0x02D0($s1) ## 000002D0 /* 0B1E8 8095A4A8 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 @@ -297,7 +297,7 @@ glabel func_8095A188 /* 0B220 8095A4E0 000FC702 */ srl $t8, $t7, 28 /* 0B224 8095A4E4 0018C880 */ sll $t9, $t8, 2 /* 0B228 8095A4E8 01194021 */ addu $t0, $t0, $t9 -/* 0B22C 8095A4EC 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 +/* 0B22C 8095A4EC 8D086FA8 */ lw $t0, %lo(gSegments)($t0) /* 0B230 8095A4F0 00817024 */ and $t6, $a0, $at /* 0B234 8095A4F4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 0B238 8095A4F8 01C84821 */ addu $t1, $t6, $t0 @@ -372,10 +372,10 @@ glabel func_8095A188 /* 0B344 8095A604 24425DB0 */ addiu $v0, $v0, 0x5DB0 ## $v0 = 04055DB0 /* 0B348 8095A608 00027100 */ sll $t6, $v0, 4 /* 0B34C 8095A60C 000E5702 */ srl $t2, $t6, 28 -/* 0B350 8095A610 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 0B350 8095A610 3C098016 */ lui $t1, %hi(gSegments) /* 0B354 8095A614 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0B358 8095A618 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0B35C 8095A61C 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 +/* 0B35C 8095A61C 25296FA8 */ addiu $t1, %lo(gSegments) /* 0B360 8095A620 000A5880 */ sll $t3, $t2, 2 /* 0B364 8095A624 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 /* 0B368 8095A628 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B80C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B80C.s index e8bb829d67..d1fa6cabfb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B80C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B80C.s @@ -74,14 +74,14 @@ glabel func_8095B80C /* 0C650 8095B910 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 /* 0C654 8095B914 A4AF003E */ sh $t7, 0x003E($a1) ## 0000003E /* 0C658 8095B918 3C018096 */ lui $at, %hi(D_8095C92C) ## $at = 80960000 -/* 0C65C 8095B91C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0C660 8095B920 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 +/* 0C65C 8095B91C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0C660 8095B920 3C098013 */ lui $t1, %hi(D_801333E8) /* 0C664 8095B924 4600848D */ trunc.w.s $f18, $f16 /* 0C668 8095B928 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 0C66C 8095B92C 30590003 */ andi $t9, $v0, 0x0003 ## $t9 = 00000000 -/* 0C670 8095B930 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 0C670 8095B930 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 0C674 8095B934 440D9000 */ mfc1 $t5, $f18 -/* 0C678 8095B938 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 +/* 0C678 8095B938 252933E8 */ addiu $t1, %lo(D_801333E8) /* 0C67C 8095B93C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 0C680 8095B940 25AE000A */ addiu $t6, $t5, 0x000A ## $t6 = 0000000A /* 0C684 8095B944 A4AE0026 */ sh $t6, 0x0026($a1) ## 00000026 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s index fbcf43256c..9071ffdfd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s @@ -36,10 +36,10 @@ glabel func_80968298 /* 01978 809682C8 0018CF02 */ srl $t9, $t8, 28 /* 0197C 809682CC 46062202 */ mul.s $f8, $f4, $f6 /* 01980 809682D0 00194880 */ sll $t1, $t9, 2 -/* 01984 809682D4 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 01984 809682D4 3C0A8016 */ lui $t2, %hi(gSegments) /* 01988 809682D8 01495021 */ addu $t2, $t2, $t1 /* 0198C 809682DC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01990 809682E0 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 01990 809682E0 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 01994 809682E4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 01998 809682E8 00415824 */ and $t3, $v0, $at /* 0199C 809682EC E7A800A0 */ swc1 $f8, 0x00A0($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Init.s index 3cd48793da..73c8c73945 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Init.s @@ -4,8 +4,8 @@ glabel DemoDu_Init /* 023E8 8096BEB8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 023EC 8096BEBC AFBF001C */ sw $ra, 0x001C($sp) /* 023F0 8096BEC0 AFA50024 */ sw $a1, 0x0024($sp) -/* 023F4 8096BEC4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 023F8 8096BEC8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 023F4 8096BEC4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 023F8 8096BEC8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 023FC 8096BECC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02400 8096BED0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 02404 8096BED4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FD0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FD0.s index de880c6958..11f3988d18 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FD0.s @@ -1,6 +1,6 @@ glabel func_80969FD0 -/* 00500 80969FD0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00504 80969FD4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00500 80969FD0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00504 80969FD4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00508 80969FD8 904E1415 */ lbu $t6, 0x1415($v0) ## 8015FA75 /* 0050C 80969FDC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00510 80969FE0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A408.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A408.s index e106d6005a..0539b3079d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A408.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A408.s @@ -6,10 +6,10 @@ glabel func_8096A408 /* 00948 8096A418 244400E4 */ addiu $a0, $v0, 0x00E4 ## $a0 = 000000E4 /* 0094C 8096A41C 0C01E245 */ jal func_80078914 /* 00950 8096A420 AFA40024 */ sw $a0, 0x0024($sp) -/* 00954 8096A424 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00958 8096A428 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 0095C 8096A42C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00960 8096A430 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 +/* 00954 8096A424 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00958 8096A428 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 0095C 8096A42C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00960 8096A430 25CE33E8 */ addiu $t6, %lo(D_801333E8) /* 00964 8096A434 AFAE0014 */ sw $t6, 0x0014($sp) /* 00968 8096A438 AFA70010 */ sw $a3, 0x0010($sp) /* 0096C 8096A43C 24046825 */ addiu $a0, $zero, 0x6825 ## $a0 = 00006825 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A480.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A480.s index 6a3117f9dd..e3feab7a02 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A480.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A480.s @@ -4,12 +4,12 @@ glabel func_8096A480 /* 009B8 8096A488 AFA40020 */ sw $a0, 0x0020($sp) /* 009BC 8096A48C 948F1D74 */ lhu $t7, 0x1D74($a0) ## 00001D74 /* 009C0 8096A490 24010578 */ addiu $at, $zero, 0x0578 ## $at = 00000578 -/* 009C4 8096A494 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 009C4 8096A494 3C078013 */ lui $a3, %hi(D_801333E0) /* 009C8 8096A498 15E1000A */ bne $t7, $at, .L8096A4C4 -/* 009CC 8096A49C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 009CC 8096A49C 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 009D0 8096A4A0 8C821C44 */ lw $v0, 0x1C44($a0) ## 00001C44 -/* 009D4 8096A4A4 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 009D8 8096A4A8 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 009D4 8096A4A4 3C188013 */ lui $t8, %hi(D_801333E8) +/* 009D8 8096A4A8 271833E8 */ addiu $t8, %lo(D_801333E8) /* 009DC 8096A4AC AFB80014 */ sw $t8, 0x0014($sp) /* 009E0 8096A4B0 AFA70010 */ sw $a3, 0x0010($sp) /* 009E4 8096A4B4 24046828 */ addiu $a0, $zero, 0x6828 ## $a0 = 00006828 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A4D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A4D4.s index 7befe2762b..b4207a5f24 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A4D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A4D4.s @@ -4,12 +4,12 @@ glabel func_8096A4D4 /* 00A0C 8096A4DC AFA40020 */ sw $a0, 0x0020($sp) /* 00A10 8096A4E0 948F1D74 */ lhu $t7, 0x1D74($a0) ## 00001D74 /* 00A14 8096A4E4 240100AE */ addiu $at, $zero, 0x00AE ## $at = 000000AE -/* 00A18 8096A4E8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 00A18 8096A4E8 3C078013 */ lui $a3, %hi(D_801333E0) /* 00A1C 8096A4EC 15E1000A */ bne $t7, $at, .L8096A518 -/* 00A20 8096A4F0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00A20 8096A4F0 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00A24 8096A4F4 8C821C44 */ lw $v0, 0x1C44($a0) ## 00001C44 -/* 00A28 8096A4F8 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 00A2C 8096A4FC 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 00A28 8096A4F8 3C188013 */ lui $t8, %hi(D_801333E8) +/* 00A2C 8096A4FC 271833E8 */ addiu $t8, %lo(D_801333E8) /* 00A30 8096A500 AFB80014 */ sw $t8, 0x0014($sp) /* 00A34 8096A504 AFA70010 */ sw $a3, 0x0010($sp) /* 00A38 8096A508 24046836 */ addiu $a0, $zero, 0x6836 ## $a0 = 00006836 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A630.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A630.s index 391b5b494d..76808fed47 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A630.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A630.s @@ -5,14 +5,14 @@ glabel func_8096A630 /* 00B6C 8096A63C AFA5003C */ sw $a1, 0x003C($sp) /* 00B70 8096A640 8C980024 */ lw $t8, 0x0024($a0) ## 00000024 /* 00B74 8096A644 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFF0 -/* 00B78 8096A648 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00B78 8096A648 3C028016 */ lui $v0, %hi(gGameInfo) /* 00B7C 8096A64C ACB80000 */ sw $t8, 0x0000($a1) ## FFFFFFF0 /* 00B80 8096A650 8C8F0028 */ lw $t7, 0x0028($a0) ## 00000028 /* 00B84 8096A654 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00B88 8096A658 ACAF0004 */ sw $t7, 0x0004($a1) ## FFFFFFF4 /* 00B8C 8096A65C 8C98002C */ lw $t8, 0x002C($a0) ## 0000002C /* 00B90 8096A660 ACB80008 */ sw $t8, 0x0008($a1) ## FFFFFFF8 -/* 00B94 8096A664 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00B94 8096A664 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 00B98 8096A668 C7A4002C */ lwc1 $f4, 0x002C($sp) /* 00B9C 8096A66C 8FA4003C */ lw $a0, 0x003C($sp) /* 00BA0 8096A670 8459145E */ lh $t9, 0x145E($v0) ## 8016145E diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B4A8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B4A8.s index dfae1c3197..a39cd46fbd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B4A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B4A8.s @@ -5,8 +5,8 @@ glabel func_8096B4A8 /* 019E4 8096B4B4 AFBF0034 */ sw $ra, 0x0034($sp) /* 019E8 8096B4B8 AFA40038 */ sw $a0, 0x0038($sp) /* 019EC 8096B4BC C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 019F0 8096B4C0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 019F4 8096B4C4 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 019F0 8096B4C0 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 019F4 8096B4C4 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 019F8 8096B4C8 E7A40010 */ swc1 $f4, 0x0010($sp) /* 019FC 8096B4CC 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 /* 01A00 8096B4D0 85CF1474 */ lh $t7, 0x1474($t6) ## 80161474 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B57C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B57C.s index 6b73691abc..f3ccf2e34e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B57C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B57C.s @@ -13,8 +13,8 @@ glabel func_8096B57C /* 01AD8 8096B5A8 248201A4 */ addiu $v0, $a0, 0x01A4 ## $v0 = 000001A4 /* 01ADC 8096B5AC C4440000 */ lwc1 $f4, 0x0000($v0) ## 000001A4 /* 01AE0 8096B5B0 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 01AE4 8096B5B4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 01AE8 8096B5B8 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 +/* 01AE4 8096B5B4 3C058016 */ lui $a1, %hi(gGameInfo) +/* 01AE8 8096B5B8 24A5FA90 */ addiu $a1, %lo(gGameInfo) /* 01AEC 8096B5BC 46062200 */ add.s $f8, $f4, $f6 /* 01AF0 8096B5C0 24180017 */ addiu $t8, $zero, 0x0017 ## $t8 = 00000017 /* 01AF4 8096B5C4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 @@ -63,8 +63,8 @@ glabel func_8096B57C /* 01B9C 8096B66C 10000014 */ beq $zero, $zero, .L8096B6C0 /* 01BA0 8096B670 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 .L8096B674: -/* 01BA4 8096B674 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 01BA8 8096B678 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 +/* 01BA4 8096B674 3C058016 */ lui $a1, %hi(gGameInfo) +/* 01BA8 8096B678 24A5FA90 */ addiu $a1, %lo(gGameInfo) /* 01BAC 8096B67C 8CAB0000 */ lw $t3, 0x0000($a1) ## 8015FA90 /* 01BB0 8096B680 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01BB4 8096B684 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B6D0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B6D0.s index 946bae1bb0..11a4f48f88 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B6D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B6D0.s @@ -12,8 +12,8 @@ glabel func_8096B6D0 /* 01C28 8096B6F8 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 01C2C 8096B6FC AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 /* 01C30 8096B700 AC8F019C */ sw $t7, 0x019C($a0) ## 0000019C -/* 01C34 8096B704 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 01C38 8096B708 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 01C34 8096B704 3C188016 */ lui $t8, %hi(gGameInfo) +/* 01C38 8096B708 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 01C3C 8096B70C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01C40 8096B710 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 /* 01C44 8096B714 8719145E */ lh $t9, 0x145E($t8) ## 8016145E diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s index be283d0d7d..fed06d5578 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s @@ -38,7 +38,7 @@ glabel func_8096B840 /* 01DD8 8096B8A8 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 /* 01DDC 8096B8AC 8FA40070 */ lw $a0, 0x0070($sp) /* 01DE0 8096B8B0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01DE4 8096B8B4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 01DE4 8096B8B4 3C058016 */ lui $a1, %hi(gSegments) /* 01DE8 8096B8B8 00047900 */ sll $t7, $a0, 4 /* 01DEC 8096B8BC 000FC702 */ srl $t8, $t7, 28 /* 01DF0 8096B8C0 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -46,7 +46,7 @@ glabel func_8096B840 /* 01DF8 8096B8C8 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 01DFC 8096B8CC 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 /* 01E00 8096B8D0 00187080 */ sll $t6, $t8, 2 -/* 01E04 8096B8D4 24A56FA8 */ addiu $a1, $a1, 0x6FA8 ## $a1 = 80166FA8 +/* 01E04 8096B8D4 24A56FA8 */ addiu $a1, %lo(gSegments) /* 01E08 8096B8D8 00AEC821 */ addu $t9, $a1, $t6 /* 01E0C 8096B8DC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01E10 8096B8E0 8F290000 */ lw $t1, 0x0000($t9) ## 00000000 @@ -93,7 +93,7 @@ glabel func_8096B840 /* 01EB4 8096B984 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 01EB8 8096B988 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01EBC 8096B98C 8FA80080 */ lw $t0, 0x0080($sp) -/* 01EC0 8096B990 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 +/* 01EC0 8096B990 3C0C8011 */ lui $t4, %hi(D_80116280) /* 01EC4 8096B994 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 01EC8 8096B998 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 /* 01ECC 8096B99C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 @@ -103,7 +103,7 @@ glabel func_8096B840 /* 01EDC 8096B9AC 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000000 /* 01EE0 8096B9B0 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 01EE4 8096B9B4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01EE8 8096B9B8 258C6280 */ addiu $t4, $t4, 0x6280 ## $t4 = 80116280 +/* 01EE8 8096B9B8 258C6280 */ addiu $t4, %lo(D_80116280) /* 01EEC 8096B9BC 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 01EF0 8096B9C0 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 01EF4 8096B9C4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA98.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA98.s index 04ce8c8108..7b0e57c1bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA98.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA98.s @@ -2,13 +2,13 @@ glabel func_8096BA98 /* 01FC8 8096BA98 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01FCC 8096BA9C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 /* 01FD0 8096BAA0 C48401A4 */ lwc1 $f4, 0x01A4($a0) ## 000001A4 -/* 01FD4 8096BAA4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 01FD4 8096BAA4 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 01FD8 8096BAA8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01FDC 8096BAAC 46062200 */ add.s $f8, $f4, $f6 /* 01FE0 8096BAB0 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 01FE4 8096BAB4 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF /* 01FE8 8096BAB8 E48801A4 */ swc1 $f8, 0x01A4($a0) ## 000001A4 -/* 01FEC 8096BABC 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 01FEC 8096BABC 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 01FF0 8096BAC0 C48401A4 */ lwc1 $f4, 0x01A4($a0) ## 000001A4 /* 01FF4 8096BAC4 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 /* 01FF8 8096BAC8 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB5C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB5C.s index 24c4d6ab07..af3c2ad999 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB5C.s @@ -1,6 +1,6 @@ glabel func_8096BB5C -/* 0208C 8096BB5C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 02090 8096BB60 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 0208C 8096BB5C 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 02090 8096BB60 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 02094 8096BB64 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 02098 8096BB68 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 0209C 8096BB6C 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s index 6b51754c17..5cc6ed377f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s @@ -37,7 +37,7 @@ glabel func_8096BF60 /* 024F4 8096BFC4 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 /* 024F8 8096BFC8 8FA80054 */ lw $t0, 0x0054($sp) /* 024FC 8096BFCC 8FA40068 */ lw $a0, 0x0068($sp) -/* 02500 8096BFD0 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 02500 8096BFD0 3C058016 */ lui $a1, %hi(gSegments) /* 02504 8096BFD4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02508 8096BFD8 00047900 */ sll $t7, $a0, 4 /* 0250C 8096BFDC 000FC702 */ srl $t8, $t7, 28 @@ -45,7 +45,7 @@ glabel func_8096BF60 /* 02514 8096BFE4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 02518 8096BFE8 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 /* 0251C 8096BFEC 00187080 */ sll $t6, $t8, 2 -/* 02520 8096BFF0 24A56FA8 */ addiu $a1, $a1, 0x6FA8 ## $a1 = 80166FA8 +/* 02520 8096BFF0 24A56FA8 */ addiu $a1, %lo(gSegments) /* 02524 8096BFF4 AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 /* 02528 8096BFF8 00AEC821 */ addu $t9, $a1, $t6 /* 0252C 8096BFFC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 @@ -93,7 +93,7 @@ glabel func_8096BF60 /* 025D4 8096C0A4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 025D8 8096C0A8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 025DC 8096C0AC 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 025E0 8096C0B0 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 +/* 025E0 8096C0B0 3C0B8011 */ lui $t3, %hi(D_80116280+0x10) /* 025E4 8096C0B4 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 025E8 8096C0B8 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 /* 025EC 8096C0BC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 @@ -103,7 +103,7 @@ glabel func_8096BF60 /* 025FC 8096C0CC 354A0030 */ ori $t2, $t2, 0x0030 ## $t2 = DB060030 /* 02600 8096C0D0 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 02604 8096C0D4 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 -/* 02608 8096C0D8 256B6290 */ addiu $t3, $t3, 0x6290 ## $t3 = 80116290 +/* 02608 8096C0D8 256B6290 */ addiu $t3, %lo(D_80116280+0x10) /* 0260C 8096C0DC AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 02610 8096C0E0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 02614 8096C0E4 8FA30078 */ lw $v1, 0x0078($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s index 76f25345be..b4fdc201a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s @@ -3,10 +3,10 @@ glabel func_8096D728 /* 0027C 8096D72C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00280 8096D730 000FC702 */ srl $t8, $t7, 28 /* 00284 8096D734 0018C880 */ sll $t9, $t8, 2 -/* 00288 8096D738 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 00288 8096D738 3C088016 */ lui $t0, %hi(gSegments) /* 0028C 8096D73C 01194021 */ addu $t0, $t0, $t9 /* 00290 8096D740 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00294 8096D744 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 +/* 00294 8096D744 8D086FA8 */ lw $t0, %lo(gSegments)($t0) /* 00298 8096D748 AFA40028 */ sw $a0, 0x0028($sp) /* 0029C 8096D74C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 002A0 8096D750 AFA5002C */ sw $a1, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D79C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D79C.s index b99c97baea..bb7553b560 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D79C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D79C.s @@ -2,10 +2,10 @@ glabel func_8096D79C /* 002EC 8096D79C 00057100 */ sll $t6, $a1, 4 /* 002F0 8096D7A0 000E7F02 */ srl $t7, $t6, 28 /* 002F4 8096D7A4 000FC080 */ sll $t8, $t7, 2 -/* 002F8 8096D7A8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 002F8 8096D7A8 3C198016 */ lui $t9, %hi(gSegments) /* 002FC 8096D7AC 0338C821 */ addu $t9, $t9, $t8 /* 00300 8096D7B0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00304 8096D7B4 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 00304 8096D7B4 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 00308 8096D7B8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0030C 8096D7BC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00310 8096D7C0 00A14024 */ and $t0, $a1, $at diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s index b549d0e664..ab137319e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s @@ -33,10 +33,10 @@ glabel func_8096D8C4 /* 00468 8096D918 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0046C 8096D91C 0006C900 */ sll $t9, $a2, 4 /* 00470 8096D920 00194702 */ srl $t0, $t9, 28 -/* 00474 8096D924 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 00474 8096D924 3C0A8016 */ lui $t2, %hi(gSegments) /* 00478 8096D928 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0047C 8096D92C AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 00480 8096D930 254A6FA8 */ addiu $t2, $t2, 0x6FA8 ## $t2 = 80166FA8 +/* 00480 8096D930 254A6FA8 */ addiu $t2, %lo(gSegments) /* 00484 8096D934 00084880 */ sll $t1, $t0, 2 /* 00488 8096D938 012A2021 */ addu $a0, $t1, $t2 /* 0048C 8096D93C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 @@ -69,10 +69,10 @@ glabel func_8096D8C4 /* 004F4 8096D9A4 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 004F8 8096D9A8 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 004FC 8096D9AC 000C6880 */ sll $t5, $t4, 2 -/* 00500 8096D9B0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 00500 8096D9B0 3C0E8016 */ lui $t6, %hi(gSegments) /* 00504 8096D9B4 01CD7021 */ addu $t6, $t6, $t5 /* 00508 8096D9B8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0050C 8096D9BC 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 0050C 8096D9BC 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 00510 8096D9C0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00514 8096D9C4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00518 8096D9C8 00817824 */ and $t7, $a0, $at @@ -89,10 +89,10 @@ glabel func_8096D8C4 /* 00540 8096D9F0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 00544 8096D9F4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00548 8096D9F8 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 0054C 8096D9FC 3C0D8011 */ lui $t5, 0x8011 ## $t5 = 80110000 +/* 0054C 8096D9FC 3C0D8011 */ lui $t5, %hi(D_80116280+0x10) /* 00550 8096DA00 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 00554 8096DA04 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 00558 8096DA08 25AD6290 */ addiu $t5, $t5, 0x6290 ## $t5 = 80116290 +/* 00558 8096DA08 25AD6290 */ addiu $t5, %lo(D_80116280+0x10) /* 0055C 8096DA0C 358C0030 */ ori $t4, $t4, 0x0030 ## $t4 = DB060030 /* 00560 8096DA10 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 00564 8096DA14 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s index 1274e08f97..7099dad9dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s @@ -35,11 +35,11 @@ glabel func_8096DA80 /* 0062C 8096DADC 00084880 */ sll $t1, $t0, 2 /* 00630 8096DAE0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 00634 8096DAE4 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 00638 8096DAE8 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 00638 8096DAE8 3C0A8016 */ lui $t2, %hi(gSegments) /* 0063C 8096DAEC 01495021 */ addu $t2, $t2, $t1 /* 00640 8096DAF0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00644 8096DAF4 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00648 8096DAF8 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 00648 8096DAF8 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 0064C 8096DAFC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00650 8096DB00 00815824 */ and $t3, $a0, $at /* 00654 8096DB04 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -57,11 +57,11 @@ glabel func_8096DA80 /* 00680 8096DB30 00194080 */ sll $t0, $t9, 2 /* 00684 8096DB34 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 00688 8096DB38 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 0068C 8096DB3C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 0068C 8096DB3C 3C098016 */ lui $t1, %hi(gSegments) /* 00690 8096DB40 01284821 */ addu $t1, $t1, $t0 /* 00694 8096DB44 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00698 8096DB48 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0069C 8096DB4C 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 +/* 0069C 8096DB4C 8D296FA8 */ lw $t1, %lo(gSegments)($t1) /* 006A0 8096DB50 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 006A4 8096DB54 00815024 */ and $t2, $a0, $at /* 006A8 8096DB58 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -86,13 +86,13 @@ glabel func_8096DA80 /* 006F0 8096DBA0 0C25B616 */ jal func_8096D858 /* 006F4 8096DBA4 8FA50080 */ lw $a1, 0x0080($sp) /* 006F8 8096DBA8 8FB80034 */ lw $t8, 0x0034($sp) -/* 006FC 8096DBAC 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 006FC 8096DBAC 3C0A8016 */ lui $t2, %hi(gSegments) /* 00700 8096DBB0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00704 8096DBB4 0018C900 */ sll $t9, $t8, 4 /* 00708 8096DBB8 00194702 */ srl $t0, $t9, 28 /* 0070C 8096DBBC 00084880 */ sll $t1, $t0, 2 /* 00710 8096DBC0 01495021 */ addu $t2, $t2, $t1 -/* 00714 8096DBC4 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 00714 8096DBC4 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 00718 8096DBC8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0071C 8096DBCC 00417824 */ and $t7, $v0, $at /* 00720 8096DBD0 8FAD0044 */ lw $t5, 0x0044($sp) @@ -119,13 +119,13 @@ glabel func_8096DA80 /* 00770 8096DC20 0C25B616 */ jal func_8096D858 /* 00774 8096DC24 8FA50080 */ lw $a1, 0x0080($sp) /* 00778 8096DC28 8FA90034 */ lw $t1, 0x0034($sp) -/* 0077C 8096DC2C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 0077C 8096DC2C 3C0C8016 */ lui $t4, %hi(gSegments) /* 00780 8096DC30 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00784 8096DC34 00097900 */ sll $t7, $t1, 4 /* 00788 8096DC38 000F5702 */ srl $t2, $t7, 28 /* 0078C 8096DC3C 000A5880 */ sll $t3, $t2, 2 /* 00790 8096DC40 018B6021 */ addu $t4, $t4, $t3 -/* 00794 8096DC44 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 00794 8096DC44 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 00798 8096DC48 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0079C 8096DC4C 00414024 */ and $t0, $v0, $at /* 007A0 8096DC50 8FB80040 */ lw $t8, 0x0040($sp) @@ -143,10 +143,10 @@ glabel func_8096DA80 /* 007CC 8096DC7C AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 007D0 8096DC80 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 007D4 8096DC84 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 007D8 8096DC88 3C088011 */ lui $t0, 0x8011 ## $t0 = 80110000 +/* 007D8 8096DC88 3C088011 */ lui $t0, %hi(D_80116280+0x10) /* 007DC 8096DC8C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 007E0 8096DC90 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 007E4 8096DC94 25086290 */ addiu $t0, $t0, 0x6290 ## $t0 = 80116290 +/* 007E4 8096DC94 25086290 */ addiu $t0, %lo(D_80116280+0x10) /* 007E8 8096DC98 356B0030 */ ori $t3, $t3, 0x0030 ## $t3 = DB060030 /* 007EC 8096DC9C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 007F0 8096DCA0 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s index dbf029445a..e9a2c4ce3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s @@ -46,9 +46,9 @@ glabel func_8096DD0C /* 008E4 8096DD94 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC /* 008E8 8096DD98 24C606BC */ addiu $a2, $a2, %lo(D_809706BC) ## $a2 = 809706BC /* 008EC 8096DD9C 01816821 */ addu $t5, $t4, $at -/* 008F0 8096DDA0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 008F0 8096DDA0 3C018016 */ lui $at, %hi(gSegments+0x18) /* 008F4 8096DDA4 0C031AD5 */ jal Graph_CloseDisps -/* 008F8 8096DDA8 AC2D6FC0 */ sw $t5, 0x6FC0($at) ## 80166FC0 +/* 008F8 8096DDA8 AC2D6FC0 */ sw $t5, %lo(gSegments+0x18)($at) /* 008FC 8096DDAC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00900 8096DDB0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 /* 00904 8096DDB4 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDBC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDBC.s index 245121d968..fad8e78b9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDBC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDBC.s @@ -9,6 +9,6 @@ glabel func_8096DDBC /* 00928 8096DDD8 030FC021 */ addu $t8, $t8, $t7 /* 0092C 8096DDDC 8F1817B4 */ lw $t8, 0x17B4($t8) ## 000117B4 /* 00930 8096DDE0 0301C821 */ addu $t9, $t8, $at -/* 00934 8096DDE4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00934 8096DDE4 3C018016 */ lui $at, %hi(gSegments+0x18) /* 00938 8096DDE8 03E00008 */ jr $ra -/* 0093C 8096DDEC AC396FC0 */ sw $t9, 0x6FC0($at) ## 80166FC0 +/* 0093C 8096DDEC AC396FC0 */ sw $t9, %lo(gSegments+0x18)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE94.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE94.s index 8c66c17ba7..02c939a772 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE94.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE94.s @@ -23,8 +23,8 @@ glabel func_8096DE94 /* 00A38 8096DEE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A3C 8096DEEC 0C25B593 */ jal func_8096D64C /* 00A40 8096DEF0 8FA5002C */ lw $a1, 0x002C($sp) -/* 00A44 8096DEF4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00A48 8096DEF8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00A44 8096DEF4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00A48 8096DEF8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00A4C 8096DEFC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00A50 8096DF00 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00A54 8096DF04 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF9C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF9C.s index 992e0a4467..95ccb92ee9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF9C.s @@ -23,8 +23,8 @@ glabel func_8096DF9C /* 00B40 8096DFF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00B44 8096DFF4 0C25B593 */ jal func_8096D64C /* 00B48 8096DFF8 8FA5002C */ lw $a1, 0x002C($sp) -/* 00B4C 8096DFFC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00B50 8096E000 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00B4C 8096DFFC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00B50 8096E000 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00B54 8096E004 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00B58 8096E008 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00B5C 8096E00C 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E0A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E0A4.s index 56f43f43f9..b7c1ff293b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E0A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E0A4.s @@ -23,8 +23,8 @@ glabel func_8096E0A4 /* 00C48 8096E0F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00C4C 8096E0FC 0C25B575 */ jal func_8096D5D4 /* 00C50 8096E100 8FA5002C */ lw $a1, 0x002C($sp) -/* 00C54 8096E104 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00C58 8096E108 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00C54 8096E104 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00C58 8096E108 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00C5C 8096E10C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00C60 8096E110 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00C64 8096E114 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E1AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E1AC.s index 31c6f6da51..c589f8cade 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E1AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E1AC.s @@ -23,8 +23,8 @@ glabel func_8096E1AC /* 00D50 8096E200 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00D54 8096E204 0C25B575 */ jal func_8096D5D4 /* 00D58 8096E208 8FA5002C */ lw $a1, 0x002C($sp) -/* 00D5C 8096E20C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00D60 8096E210 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00D5C 8096E20C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00D60 8096E210 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00D64 8096E214 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00D68 8096E218 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00D6C 8096E21C 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E244.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E244.s index 4b184070a0..9f874ac556 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E244.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E244.s @@ -23,8 +23,8 @@ glabel func_8096E244 /* 00DE8 8096E298 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00DEC 8096E29C 0C25B575 */ jal func_8096D5D4 /* 00DF0 8096E2A0 8FA5002C */ lw $a1, 0x002C($sp) -/* 00DF4 8096E2A4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00DF8 8096E2A8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00DF4 8096E2A4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00DF8 8096E2A8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00DFC 8096E2AC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00E00 8096E2B0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00E04 8096E2B4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E380.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E380.s index 6ab3ea4c3a..72c308f08b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E380.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E380.s @@ -23,8 +23,8 @@ glabel func_8096E380 /* 00F24 8096E3D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00F28 8096E3D8 0C25B575 */ jal func_8096D5D4 /* 00F2C 8096E3DC 8FA5002C */ lw $a1, 0x002C($sp) -/* 00F30 8096E3E0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00F34 8096E3E4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00F30 8096E3E0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00F34 8096E3E4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00F38 8096E3E8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00F3C 8096E3EC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00F40 8096E3F0 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E418.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E418.s index 8fd06e1293..a4edda366f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E418.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E418.s @@ -23,8 +23,8 @@ glabel func_8096E418 /* 00FBC 8096E46C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00FC0 8096E470 0C25B575 */ jal func_8096D5D4 /* 00FC4 8096E474 8FA5002C */ lw $a1, 0x002C($sp) -/* 00FC8 8096E478 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00FCC 8096E47C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00FC8 8096E478 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00FCC 8096E47C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00FD0 8096E480 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00FD4 8096E484 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00FD8 8096E488 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E56C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E56C.s index 369d215ce2..0b322e4b5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E56C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E56C.s @@ -23,8 +23,8 @@ glabel func_8096E56C /* 01110 8096E5C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01114 8096E5C4 0C25B575 */ jal func_8096D5D4 /* 01118 8096E5C8 8FA5002C */ lw $a1, 0x002C($sp) -/* 0111C 8096E5CC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 01120 8096E5D0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0111C 8096E5CC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 01120 8096E5D0 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 01124 8096E5D4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01128 8096E5D8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0112C 8096E5DC 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E69C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E69C.s index a7d5b16955..ecef8dc88f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E69C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E69C.s @@ -23,8 +23,8 @@ glabel func_8096E69C /* 01240 8096E6F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01244 8096E6F4 0C25B575 */ jal func_8096D5D4 /* 01248 8096E6F8 8FA5002C */ lw $a1, 0x002C($sp) -/* 0124C 8096E6FC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 01250 8096E700 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0124C 8096E6FC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 01250 8096E700 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 01254 8096E704 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01258 8096E708 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0125C 8096E70C 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E7CC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E7CC.s index 08b326abf7..b240e57314 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E7CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E7CC.s @@ -23,8 +23,8 @@ glabel func_8096E7CC /* 01370 8096E820 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01374 8096E824 0C25B575 */ jal func_8096D5D4 /* 01378 8096E828 8FA5002C */ lw $a1, 0x002C($sp) -/* 0137C 8096E82C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 01380 8096E830 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0137C 8096E82C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 01380 8096E830 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 01384 8096E834 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01388 8096E838 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0138C 8096E83C 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8E4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8E4.s index fb16b1df65..4f1c084e18 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8E4.s @@ -23,8 +23,8 @@ glabel func_8096E8E4 /* 01488 8096E938 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0148C 8096E93C 0C25B575 */ jal func_8096D5D4 /* 01490 8096E940 8FA5002C */ lw $a1, 0x002C($sp) -/* 01494 8096E944 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 01498 8096E948 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 01494 8096E944 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 01498 8096E948 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0149C 8096E94C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 014A0 8096E950 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 014A4 8096E954 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9E8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9E8.s index 8adb7e1328..1e81ea49f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9E8.s @@ -23,8 +23,8 @@ glabel func_8096E9E8 /* 0158C 8096EA3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01590 8096EA40 0C25B575 */ jal func_8096D5D4 /* 01594 8096EA44 8FA5002C */ lw $a1, 0x002C($sp) -/* 01598 8096EA48 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0159C 8096EA4C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 01598 8096EA48 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 0159C 8096EA4C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 015A0 8096EA50 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 015A4 8096EA54 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 015A8 8096EA58 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EAE8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EAE8.s index 4979e24de0..d28a37cd44 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EAE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EAE8.s @@ -23,8 +23,8 @@ glabel func_8096EAE8 /* 0168C 8096EB3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01690 8096EB40 0C25B575 */ jal func_8096D5D4 /* 01694 8096EB44 8FA5002C */ lw $a1, 0x002C($sp) -/* 01698 8096EB48 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0169C 8096EB4C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 01698 8096EB48 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 0169C 8096EB4C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 016A0 8096EB50 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 016A4 8096EB54 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 016A8 8096EB58 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ED40.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ED40.s index ee6b78d606..ebc72202e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ED40.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ED40.s @@ -15,12 +15,12 @@ glabel func_8096ED40 /* 018C4 8096ED74 00194080 */ sll $t0, $t9, 2 /* 018C8 8096ED78 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 /* 018CC 8096ED7C 248E0008 */ addiu $t6, $a0, 0x0008 ## $t6 = 00000008 -/* 018D0 8096ED80 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 018D0 8096ED80 3C098016 */ lui $t1, %hi(gSegments) /* 018D4 8096ED84 ACAE0000 */ sw $t6, 0x0000($a1) ## 00000000 /* 018D8 8096ED88 01284821 */ addu $t1, $t1, $t0 /* 018DC 8096ED8C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 018E0 8096ED90 AC8F0000 */ sw $t7, 0x0000($a0) ## 00000000 -/* 018E4 8096ED94 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 +/* 018E4 8096ED94 8D296FA8 */ lw $t1, %lo(gSegments)($t1) /* 018E8 8096ED98 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 018EC 8096ED9C 00415024 */ and $t2, $v0, $at /* 018F0 8096EDA0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDFC.s index 97267c14dc..560c1b94a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDFC.s @@ -23,8 +23,8 @@ glabel func_8096EDFC /* 019A0 8096EE50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 019A4 8096EE54 0C25B575 */ jal func_8096D5D4 /* 019A8 8096EE58 8FA5002C */ lw $a1, 0x002C($sp) -/* 019AC 8096EE5C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 019B0 8096EE60 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 019AC 8096EE5C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 019B0 8096EE60 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 019B4 8096EE64 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 019B8 8096EE68 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 019BC 8096EE6C 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EF4C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EF4C.s index caed632127..00569847aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EF4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EF4C.s @@ -15,12 +15,12 @@ glabel func_8096EF4C /* 01AD0 8096EF80 00194080 */ sll $t0, $t9, 2 /* 01AD4 8096EF84 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 /* 01AD8 8096EF88 248E0008 */ addiu $t6, $a0, 0x0008 ## $t6 = 00000008 -/* 01ADC 8096EF8C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 01ADC 8096EF8C 3C098016 */ lui $t1, %hi(gSegments) /* 01AE0 8096EF90 ACAE0000 */ sw $t6, 0x0000($a1) ## 00000000 /* 01AE4 8096EF94 01284821 */ addu $t1, $t1, $t0 /* 01AE8 8096EF98 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01AEC 8096EF9C AC8F0000 */ sw $t7, 0x0000($a0) ## 00000000 -/* 01AF0 8096EFA0 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 +/* 01AF0 8096EFA0 8D296FA8 */ lw $t1, %lo(gSegments)($t1) /* 01AF4 8096EFA4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 01AF8 8096EFA8 00415024 */ and $t2, $v0, $at /* 01AFC 8096EFAC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F010.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F010.s index 8b150d57a9..87862a7692 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F010.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F010.s @@ -23,8 +23,8 @@ glabel func_8096F010 /* 01BB4 8096F064 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01BB8 8096F068 0C25B575 */ jal func_8096D5D4 /* 01BBC 8096F06C 8FA5002C */ lw $a1, 0x002C($sp) -/* 01BC0 8096F070 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 01BC4 8096F074 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 01BC0 8096F070 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 01BC4 8096F074 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 01BC8 8096F078 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01BCC 8096F07C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 01BD0 8096F080 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F12C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F12C.s index c176f877bb..44b49a8b76 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F12C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F12C.s @@ -23,8 +23,8 @@ glabel func_8096F12C /* 01CD0 8096F180 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01CD4 8096F184 0C25B575 */ jal func_8096D5D4 /* 01CD8 8096F188 8FA5002C */ lw $a1, 0x002C($sp) -/* 01CDC 8096F18C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 01CE0 8096F190 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 01CDC 8096F18C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 01CE0 8096F190 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 01CE4 8096F194 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01CE8 8096F198 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 01CEC 8096F19C 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F454.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F454.s index e822e28199..78bc9e9b18 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F454.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F454.s @@ -23,8 +23,8 @@ glabel func_8096F454 /* 01FF8 8096F4A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01FFC 8096F4AC 0C25B575 */ jal func_8096D5D4 /* 02000 8096F4B0 8FA5002C */ lw $a1, 0x002C($sp) -/* 02004 8096F4B4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 02008 8096F4B8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 02004 8096F4B4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 02008 8096F4B8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0200C 8096F4BC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 02010 8096F4C0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02014 8096F4C4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F6D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F6D8.s index b55820c3ef..2479454f1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F6D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F6D8.s @@ -37,8 +37,8 @@ glabel func_8096F6D8 /* 022A8 8096F758 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 022AC 8096F75C 0C25B593 */ jal func_8096D64C /* 022B0 8096F760 8FA5002C */ lw $a1, 0x002C($sp) -/* 022B4 8096F764 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 022B8 8096F768 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 022B4 8096F764 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 022B8 8096F768 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 022BC 8096F76C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 022C0 8096F770 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 022C4 8096F774 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F808.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F808.s index 478cca8e70..8d512a210d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F808.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F808.s @@ -23,8 +23,8 @@ glabel func_8096F808 /* 023AC 8096F85C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 023B0 8096F860 0C25B575 */ jal func_8096D5D4 /* 023B4 8096F864 8FA5002C */ lw $a1, 0x002C($sp) -/* 023B8 8096F868 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 023BC 8096F86C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 023B8 8096F868 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 023BC 8096F86C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 023C0 8096F870 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 023C4 8096F874 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 023C8 8096F878 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F924.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F924.s index 758f612610..fc1de01a9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F924.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F924.s @@ -23,8 +23,8 @@ glabel func_8096F924 /* 024C8 8096F978 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 024CC 8096F97C 0C25B575 */ jal func_8096D5D4 /* 024D0 8096F980 8FA5002C */ lw $a1, 0x002C($sp) -/* 024D4 8096F984 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 024D8 8096F988 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 024D4 8096F984 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 024D8 8096F988 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 024DC 8096F98C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 024E0 8096F990 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 024E4 8096F994 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA40.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA40.s index dd7dae8bf5..32f21e7fe3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA40.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA40.s @@ -23,8 +23,8 @@ glabel func_8096FA40 /* 025E4 8096FA94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 025E8 8096FA98 0C25B575 */ jal func_8096D5D4 /* 025EC 8096FA9C 8FA5002C */ lw $a1, 0x002C($sp) -/* 025F0 8096FAA0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 025F4 8096FAA4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 025F0 8096FAA0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 025F4 8096FAA4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 025F8 8096FAA8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 025FC 8096FAAC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02600 8096FAB0 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB48.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB48.s index d69d9acd7f..9a4a8afdf6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB48.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB48.s @@ -23,8 +23,8 @@ glabel func_8096FB48 /* 026EC 8096FB9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 026F0 8096FBA0 0C25B575 */ jal func_8096D5D4 /* 026F4 8096FBA4 8FA5002C */ lw $a1, 0x002C($sp) -/* 026F8 8096FBA8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 026FC 8096FBAC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 026F8 8096FBA8 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 026FC 8096FBAC 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 02700 8096FBB0 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 02704 8096FBB4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02708 8096FBB8 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FC28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FC28.s index 51ace0cfba..284ebcffea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FC28.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FC28.s @@ -4,8 +4,8 @@ glabel func_8096FC28 /* 02780 8096FC30 AFA60008 */ sw $a2, 0x0008($sp) /* 02784 8096FC34 14A1001A */ bne $a1, $at, .L8096FCA0 /* 02788 8096FC38 AFA7000C */ sw $a3, 0x000C($sp) -/* 0278C 8096FC3C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 02790 8096FC40 8DCEF520 */ lw $t6, -0x0AE0($t6) ## 8015F520 +/* 0278C 8096FC3C 3C0E8016 */ lui $t6, %hi(gSaveContext+0xec0) +/* 02790 8096FC40 8DCEF520 */ lw $t6, %lo(gSaveContext+0xec0)($t6) /* 02794 8096FC44 8FA30014 */ lw $v1, 0x0014($sp) /* 02798 8096FC48 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 /* 0279C 8096FC4C 31CF1000 */ andi $t7, $t6, 0x1000 ## $t7 = 00000000 @@ -18,11 +18,11 @@ glabel func_8096FC28 /* 027B8 8096FC68 24980008 */ addiu $t8, $a0, 0x0008 ## $t8 = 00000008 /* 027BC 8096FC6C AC780000 */ sw $t8, 0x0000($v1) ## 00000000 /* 027C0 8096FC70 00095080 */ sll $t2, $t1, 2 -/* 027C4 8096FC74 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 027C4 8096FC74 3C0B8016 */ lui $t3, %hi(gSegments) /* 027C8 8096FC78 016A5821 */ addu $t3, $t3, $t2 /* 027CC 8096FC7C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 027D0 8096FC80 AC990000 */ sw $t9, 0x0000($a0) ## 00000000 -/* 027D4 8096FC84 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 +/* 027D4 8096FC84 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) /* 027D8 8096FC88 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 027DC 8096FC8C 00A16024 */ and $t4, $a1, $at /* 027E0 8096FC90 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCEC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCEC.s index fd5420df14..319de3e959 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCEC.s @@ -23,8 +23,8 @@ glabel func_8096FCEC /* 02890 8096FD40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02894 8096FD44 0C25B575 */ jal func_8096D5D4 /* 02898 8096FD48 8FA5002C */ lw $a1, 0x002C($sp) -/* 0289C 8096FD4C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 028A0 8096FD50 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0289C 8096FD4C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 028A0 8096FD50 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 028A4 8096FD54 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 028A8 8096FD58 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 028AC 8096FD5C 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FE08.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FE08.s index 1db3a9ab78..4aa92872ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FE08.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FE08.s @@ -64,8 +64,8 @@ glabel func_8096FE08 /* 02A40 8096FEF0 E4520008 */ swc1 $f18, 0x0008($v0) ## 00000058 /* 02A44 8096FEF4 0C25B593 */ jal func_8096D64C /* 02A48 8096FEF8 8FA5003C */ lw $a1, 0x003C($sp) -/* 02A4C 8096FEFC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 02A50 8096FF00 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 02A4C 8096FEFC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 02A50 8096FF00 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 02A54 8096FF04 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 02A58 8096FF08 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02A5C 8096FF0C 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FFBC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FFBC.s index cce38dc630..d0099797a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FFBC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FFBC.s @@ -23,8 +23,8 @@ glabel func_8096FFBC /* 02B60 80970010 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02B64 80970014 0C25B575 */ jal func_8096D5D4 /* 02B68 80970018 8FA5002C */ lw $a1, 0x002C($sp) -/* 02B6C 8097001C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 02B70 80970020 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 02B6C 8097001C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 02B70 80970020 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 02B74 80970024 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 02B78 80970028 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02B7C 8097002C 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Init.s index 7ce46d8e91..2ed2d06996 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Init.s @@ -307,8 +307,8 @@ glabel L809713CC /* 004CC 8097141C 1000012D */ beq $zero, $zero, .L809718D4 /* 004D0 80971420 A600018C */ sh $zero, 0x018C($s0) ## 0000018C glabel L80971424 -/* 004D4 80971424 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 004D8 80971428 8DCEE660 */ lw $t6, -0x19A0($t6) ## 8015E660 +/* 004D4 80971424 3C0E8016 */ lui $t6, %hi(gSaveContext) +/* 004D8 80971428 8DCEE660 */ lw $t6, %lo(gSaveContext)($t6) /* 004DC 8097142C 2401013D */ addiu $at, $zero, 0x013D ## $at = 0000013D /* 004E0 80971430 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004E4 80971434 15C10006 */ bne $t6, $at, .L80971450 @@ -349,8 +349,8 @@ glabel L80971424 /* 00560 809714B0 10000108 */ beq $zero, $zero, .L809718D4 /* 00564 809714B4 A60A018C */ sh $t2, 0x018C($s0) ## 0000018C glabel L809714B8 -/* 00568 809714B8 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 0056C 809714BC 8D6BE660 */ lw $t3, -0x19A0($t3) ## 8015E660 +/* 00568 809714B8 3C0B8016 */ lui $t3, %hi(gSaveContext) +/* 0056C 809714BC 8D6BE660 */ lw $t3, %lo(gSaveContext)($t3) /* 00570 809714C0 240100EE */ addiu $at, $zero, 0x00EE ## $at = 000000EE /* 00574 809714C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00578 809714C8 15610007 */ bne $t3, $at, .L809714E8 @@ -613,11 +613,11 @@ glabel L80971820 /* 00910 80971860 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 /* 00914 80971864 8FAF0064 */ lw $t7, 0x0064($sp) /* 00918 80971868 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0091C 8097186C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 0091C 8097186C 3C198016 */ lui $t9, %hi(gSaveContext+0xf20) /* 00920 80971870 85F800A4 */ lh $t8, 0x00A4($t7) ## 000000A4 /* 00924 80971874 57010018 */ bnel $t8, $at, .L809718D8 /* 00928 80971878 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0092C 8097187C 9739F580 */ lhu $t9, -0x0A80($t9) ## 8015F580 +/* 0092C 8097187C 9739F580 */ lhu $t9, %lo(gSaveContext+0xf20)($t9) /* 00930 80971880 33280020 */ andi $t0, $t9, 0x0020 ## $t0 = 00000000 /* 00934 80971884 51000014 */ beql $t0, $zero, .L809718D8 /* 00938 80971888 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970FB4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970FB4.s index 837d161f4e..89cb629c0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970FB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970FB4.s @@ -5,8 +5,8 @@ glabel func_80970FB4 /* 00070 80970FC0 AFB00018 */ sw $s0, 0x0018($sp) /* 00074 80970FC4 25CE46F8 */ addiu $t6, $t6, %lo(func_809746F8) ## $t6 = 809746F8 /* 00078 80970FC8 ACAE0198 */ sw $t6, 0x0198($a1) ## 00000198 -/* 0007C 80970FCC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00080 80970FD0 8DEFE664 */ lw $t7, -0x199C($t7) ## 8015E664 +/* 0007C 80970FCC 3C0F8016 */ lui $t7, %hi(gSaveContext+4) +/* 00080 80970FD0 8DEFE664 */ lw $t7, %lo(gSaveContext+4)($t7) /* 00084 80970FD4 3C198097 */ lui $t9, %hi(func_80974314) ## $t9 = 80970000 /* 00088 80970FD8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0008C 80970FDC 11E00005 */ beq $t7, $zero, .L80970FF4 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971BBC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971BBC.s index 8ac8a2851a..20baf8b9b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971BBC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971BBC.s @@ -49,8 +49,8 @@ glabel func_80971BBC /* 00D04 80971C54 0C00B58B */ jal Actor_SetScale /* 00D08 80971C58 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD -/* 00D0C 80971C5C 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 00D10 80971C60 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 00D0C 80971C5C 3C078016 */ lui $a3, %hi(gSaveContext) +/* 00D10 80971C60 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 00D14 80971C64 8CEE0000 */ lw $t6, 0x0000($a3) ## 8015E660 /* 00D18 80971C68 24030053 */ addiu $v1, $zero, 0x0053 ## $v1 = 00000053 /* 00D1C 80971C6C 546E001B */ bnel $v1, $t6, .L80971CDC @@ -72,15 +72,15 @@ glabel func_80971BBC .L80971CAC: /* 00D5C 80971CAC 0C25C68A */ jal func_80971A28 /* 00D60 80971CB0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00D64 80971CB4 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 00D68 80971CB8 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 00D64 80971CB4 3C078016 */ lui $a3, %hi(gSaveContext) +/* 00D68 80971CB8 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 00D6C 80971CBC 10000006 */ beq $zero, $zero, .L80971CD8 /* 00D70 80971CC0 24030053 */ addiu $v1, $zero, 0x0053 ## $v1 = 00000053 .L80971CC4: /* 00D74 80971CC4 0C25C68A */ jal func_80971A28 /* 00D78 80971CC8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00D7C 80971CCC 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 00D80 80971CD0 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 00D7C 80971CCC 3C078016 */ lui $a3, %hi(gSaveContext) +/* 00D80 80971CD0 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 00D84 80971CD4 24030053 */ addiu $v1, $zero, 0x0053 ## $v1 = 00000053 .L80971CD8: /* 00D88 80971CD8 8609018C */ lh $t1, 0x018C($s0) ## 0000018C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971DFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971DFC.s index 68f4c4e24d..7baf014674 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971DFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971DFC.s @@ -54,7 +54,7 @@ glabel func_80971DFC /* 00F1C 80971E6C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F20 80971E70 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 /* 00F24 80971E74 14410022 */ bne $v0, $at, .L80971F00 -/* 00F28 80971E78 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00F28 80971E78 3C038016 */ lui $v1, %hi(gSaveContext) .L80971E7C: /* 00F2C 80971E7C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00F30 80971E80 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 @@ -93,7 +93,7 @@ glabel func_80971DFC /* 00FA8 80971EF8 1000003F */ beq $zero, $zero, .L80971FF8 /* 00FAC 80971EFC 8FBF0024 */ lw $ra, 0x0024($sp) .L80971F00: -/* 00FB0 80971F00 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = FFFFE660 +/* 00FB0 80971F00 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00FB4 80971F04 8C621360 */ lw $v0, 0x1360($v1) ## FFFFF9C0 /* 00FB8 80971F08 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00FBC 80971F0C 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809720AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809720AC.s index c3c45b97a5..1e1e92c6fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809720AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809720AC.s @@ -4,10 +4,10 @@ glabel func_809720AC /* 01164 809720B4 00037100 */ sll $t6, $v1, 4 /* 01168 809720B8 000E7F02 */ srl $t7, $t6, 28 /* 0116C 809720BC 000FC080 */ sll $t8, $t7, 2 -/* 01170 809720C0 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 01170 809720C0 3C198016 */ lui $t9, %hi(gSegments) /* 01174 809720C4 0338C821 */ addu $t9, $t9, $t8 /* 01178 809720C8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0117C 809720CC 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 0117C 809720CC 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 01180 809720D0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 01184 809720D4 00614024 */ and $t0, $v1, $at /* 01188 809720D8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809721D0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809721D0.s index 4ed5295dd8..ff287412c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809721D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809721D0.s @@ -14,8 +14,8 @@ glabel func_809721D0 /* 0129C 809721EC 284100FB */ slti $at, $v0, 0x00FB /* 012A0 809721F0 5420000F */ bnel $at, $zero, .L80972230 /* 012A4 809721F4 28410065 */ slti $at, $v0, 0x0065 -/* 012A8 809721F8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 012AC 809721FC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 012A8 809721F8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 012AC 809721FC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 012B0 80972200 8C580000 */ lw $t8, 0x0000($v0) ## 8015E660 /* 012B4 80972204 24010324 */ addiu $at, $zero, 0x0324 ## $at = 00000324 /* 012B8 80972208 17010004 */ bne $t8, $at, .L8097221C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809723C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809723C4.s index c39a590f83..5876956990 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809723C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809723C4.s @@ -178,8 +178,8 @@ glabel func_809723C4 /* 01704 80972654 A08D0186 */ sb $t5, 0x0186($a0) ## 00000186 /* 01708 80972658 00000000 */ nop .L8097265C: -/* 0170C 8097265C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01710 80972660 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0170C 8097265C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01710 80972660 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01714 80972664 8C4E0000 */ lw $t6, 0x0000($v0) ## 8015E660 /* 01718 80972668 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 /* 0171C 8097266C 55C1000C */ bnel $t6, $at, .L809726A0 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972B4C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972B4C.s index 6f451d11ba..f920784310 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972B4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972B4C.s @@ -119,10 +119,10 @@ glabel func_80972B4C /* 01D58 80972CA8 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 .L80972CAC: /* 01D5C 80972CAC 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 01D60 80972CB0 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 01D60 80972CB0 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1360) /* 01D64 80972CB4 5441000E */ bnel $v0, $at, .L80972CF0 /* 01D68 80972CB8 24010060 */ addiu $at, $zero, 0x0060 ## $at = 00000060 -/* 01D6C 80972CBC 8DEFF9C0 */ lw $t7, -0x0640($t7) ## 8015F9C0 +/* 01D6C 80972CBC 8DEFF9C0 */ lw $t7, %lo(gSaveContext+0x1360)($t7) /* 01D70 80972CC0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 01D74 80972CC4 55E1000A */ bnel $t7, $at, .L80972CF0 /* 01D78 80972CC8 24010060 */ addiu $at, $zero, 0x0060 ## $at = 00000060 @@ -138,8 +138,8 @@ glabel func_80972B4C /* 01D9C 80972CEC 24010060 */ addiu $at, $zero, 0x0060 ## $at = 00000060 .L80972CF0: /* 01DA0 80972CF0 14410014 */ bne $v0, $at, .L80972D44 -/* 01DA4 80972CF4 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 01DA8 80972CF8 8F39F9C0 */ lw $t9, -0x0640($t9) ## 8015F9C0 +/* 01DA4 80972CF4 3C198016 */ lui $t9, %hi(gSaveContext+0x1360) +/* 01DA8 80972CF8 8F39F9C0 */ lw $t9, %lo(gSaveContext+0x1360)($t9) /* 01DAC 80972CFC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 01DB0 80972D00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01DB4 80972D04 1721000F */ bne $t9, $at, .L80972D44 @@ -164,8 +164,8 @@ glabel func_80972B4C .L80972D44: /* 01DF4 80972D44 24010059 */ addiu $at, $zero, 0x0059 ## $at = 00000059 /* 01DF8 80972D48 14410014 */ bne $v0, $at, .L80972D9C -/* 01DFC 80972D4C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 01E00 80972D50 8D29F9C0 */ lw $t1, -0x0640($t1) ## 8015F9C0 +/* 01DFC 80972D4C 3C098016 */ lui $t1, %hi(gSaveContext+0x1360) +/* 01E00 80972D50 8D29F9C0 */ lw $t1, %lo(gSaveContext+0x1360)($t1) /* 01E04 80972D54 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 01E08 80972D58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01E0C 80972D5C 1521000F */ bne $t1, $at, .L80972D9C @@ -190,8 +190,8 @@ glabel func_80972B4C .L80972D9C: /* 01E4C 80972D9C 24010043 */ addiu $at, $zero, 0x0043 ## $at = 00000043 /* 01E50 80972DA0 14410011 */ bne $v0, $at, .L80972DE8 -/* 01E54 80972DA4 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 01E58 80972DA8 8D6BF9C0 */ lw $t3, -0x0640($t3) ## 8015F9C0 +/* 01E54 80972DA4 3C0B8016 */ lui $t3, %hi(gSaveContext+0x1360) +/* 01E58 80972DA8 8D6BF9C0 */ lw $t3, %lo(gSaveContext+0x1360)($t3) /* 01E5C 80972DAC 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E /* 01E60 80972DB0 5561000E */ bnel $t3, $at, .L80972DEC /* 01E64 80972DB4 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972EA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972EA8.s index 0306e2cdde..84bf3f4b9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972EA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972EA8.s @@ -51,8 +51,8 @@ glabel func_80972EA8 /* 02018 80972F68 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3CA3D70A .L80972F6C: -/* 0201C 80972F6C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 02020 80972F70 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0201C 80972F6C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 02020 80972F70 2463E660 */ addiu $v1, %lo(gSaveContext) /* 02024 80972F74 8C6F0000 */ lw $t7, 0x0000($v1) ## 8015E660 /* 02028 80972F78 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 /* 0202C 80972F7C 55E1002B */ bnel $t7, $at, .L8097302C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097303C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097303C.s index 2b61f6bdde..1442f1ba6b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097303C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097303C.s @@ -57,13 +57,13 @@ glabel func_8097303C /* 021C0 80973110 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 .L80973114: -/* 021C4 80973114 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 021C8 80973118 8C63E660 */ lw $v1, -0x19A0($v1) ## 8015E660 +/* 021C4 80973114 3C038016 */ lui $v1, %hi(gSaveContext) +/* 021C8 80973118 8C63E660 */ lw $v1, %lo(gSaveContext)($v1) /* 021CC 8097311C 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 021D0 80973120 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 021D0 80973120 3C028016 */ lui $v0, %hi(gSaveContext+0x1360) /* 021D4 80973124 54610029 */ bnel $v1, $at, .L809731CC /* 021D8 80973128 2401013D */ addiu $at, $zero, 0x013D ## $at = 0000013D -/* 021DC 8097312C 8C42F9C0 */ lw $v0, -0x0640($v0) ## 8015F9C0 +/* 021DC 8097312C 8C42F9C0 */ lw $v0, %lo(gSaveContext+0x1360)($v0) /* 021E0 80973130 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 021E4 80973134 10410007 */ beq $v0, $at, .L80973154 /* 021E8 80973138 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 @@ -82,9 +82,9 @@ glabel func_8097303C /* 02218 80973168 0C00BE0A */ jal Audio_PlayActorSound2 /* 0221C 8097316C 24051840 */ addiu $a1, $zero, 0x1840 ## $a1 = 00001840 -/* 02220 80973170 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 02220 80973170 3C038016 */ lui $v1, %hi(gSaveContext) /* 02224 80973174 10000014 */ beq $zero, $zero, .L809731C8 -/* 02228 80973178 8C63E660 */ lw $v1, -0x19A0($v1) ## 8015E660 +/* 02228 80973178 8C63E660 */ lw $v1, %lo(gSaveContext)($v1) .L8097317C: /* 0222C 8097317C 962B1D74 */ lhu $t3, 0x1D74($s1) ## 00001D74 /* 02230 80973180 24010069 */ addiu $at, $zero, 0x0069 ## $at = 00000069 @@ -94,9 +94,9 @@ glabel func_8097303C /* 02240 80973190 0C00BE0A */ jal Audio_PlayActorSound2 /* 02244 80973194 24051841 */ addiu $a1, $zero, 0x1841 ## $a1 = 00001841 -/* 02248 80973198 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 02248 80973198 3C038016 */ lui $v1, %hi(gSaveContext) /* 0224C 8097319C 1000000A */ beq $zero, $zero, .L809731C8 -/* 02250 809731A0 8C63E660 */ lw $v1, -0x19A0($v1) ## 8015E660 +/* 02250 809731A0 8C63E660 */ lw $v1, %lo(gSaveContext)($v1) /* 02254 809731A4 962C1D74 */ lhu $t4, 0x1D74($s1) ## 00001D74 .L809731A8: /* 02258 809731A8 24010168 */ addiu $at, $zero, 0x0168 ## $at = 00000168 @@ -106,14 +106,14 @@ glabel func_8097303C /* 02268 809731B8 0C00BE0A */ jal Audio_PlayActorSound2 /* 0226C 809731BC 24051841 */ addiu $a1, $zero, 0x1841 ## $a1 = 00001841 -/* 02270 809731C0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 02274 809731C4 8C63E660 */ lw $v1, -0x19A0($v1) ## 8015E660 +/* 02270 809731C0 3C038016 */ lui $v1, %hi(gSaveContext) +/* 02274 809731C4 8C63E660 */ lw $v1, %lo(gSaveContext)($v1) .L809731C8: /* 02278 809731C8 2401013D */ addiu $at, $zero, 0x013D ## $at = 0000013D .L809731CC: /* 0227C 809731CC 14610012 */ bne $v1, $at, .L80973218 -/* 02280 809731D0 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 02284 809731D4 8DADF9C0 */ lw $t5, -0x0640($t5) ## 8015F9C0 +/* 02280 809731D0 3C0D8016 */ lui $t5, %hi(gSaveContext+0x1360) +/* 02284 809731D4 8DADF9C0 */ lw $t5, %lo(gSaveContext+0x1360)($t5) /* 02288 809731D8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 0228C 809731DC 55A1000F */ bnel $t5, $at, .L8097321C /* 02290 809731E0 8FBF0034 */ lw $ra, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097322C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097322C.s index c90266b370..c90d196369 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097322C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097322C.s @@ -68,8 +68,8 @@ glabel func_8097322C /* 023B8 80973308 0C03CFCF */ jal func_800F3F3C /* 023BC 8097330C 24040003 */ addiu $a0, $zero, 0x0003 ## $a0 = 00000003 .L80973310: -/* 023C0 80973310 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 023C4 80973314 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 023C0 80973310 3C038016 */ lui $v1, %hi(gSaveContext) +/* 023C4 80973314 2463E660 */ addiu $v1, %lo(gSaveContext) /* 023C8 80973318 8C6E0000 */ lw $t6, 0x0000($v1) ## 8015E660 /* 023CC 8097331C 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 /* 023D0 80973320 55C10025 */ bnel $t6, $at, .L809733B8 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974358.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974358.s index 655320cbff..8d46ce9de4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974358.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974358.s @@ -29,13 +29,13 @@ glabel func_80974358 /* 03474 809743C4 10000038 */ beq $zero, $zero, .L809744A8 /* 03478 809743C8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L809743CC: -/* 0347C 809743CC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 03480 809743D0 9442F53C */ lhu $v0, -0x0AC4($v0) ## 8015F53C -/* 03484 809743D4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 0347C 809743CC 3C028016 */ lui $v0, %hi(gSaveContext+0xedc) +/* 03480 809743D0 9442F53C */ lhu $v0, %lo(gSaveContext+0xedc)($v0) +/* 03484 809743D4 3C018016 */ lui $at, %hi(gSaveContext+0xedc) /* 03488 809743D8 30490800 */ andi $t1, $v0, 0x0800 ## $t1 = 00000000 /* 0348C 809743DC 11200002 */ beq $t1, $zero, .L809743E8 /* 03490 809743E0 344A0800 */ ori $t2, $v0, 0x0800 ## $t2 = 80160800 -/* 03494 809743E4 A42AF53C */ sh $t2, -0x0AC4($at) ## 8015F53C +/* 03494 809743E4 A42AF53C */ sh $t2, %lo(gSaveContext+0xedc)($at) .L809743E8: /* 03498 809743E8 0C25CFB8 */ jal func_80973EE0 /* 0349C 809743EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 @@ -92,8 +92,8 @@ glabel func_80974358 .L809744A8: /* 03558 809744A8 0C25D96B */ jal func_809765AC /* 0355C 809744AC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03560 809744B0 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 03564 809744B4 8F39E660 */ lw $t9, -0x19A0($t9) ## 8015E660 +/* 03560 809744B0 3C198016 */ lui $t9, %hi(gSaveContext) +/* 03564 809744B4 8F39E660 */ lw $t9, %lo(gSaveContext)($t9) /* 03568 809744B8 24010053 */ addiu $at, $zero, 0x0053 ## $at = 00000053 /* 0356C 809744BC 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 03570 809744C0 17210003 */ bne $t9, $at, .L809744D0 @@ -101,13 +101,13 @@ glabel func_80974358 /* 03578 809744C8 0C25CF28 */ jal func_80973CA0 /* 0357C 809744CC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 .L809744D0: -/* 03580 809744D0 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 03584 809744D4 8D08E660 */ lw $t0, -0x19A0($t0) ## 8015E660 +/* 03580 809744D0 3C088016 */ lui $t0, %hi(gSaveContext) +/* 03584 809744D4 8D08E660 */ lw $t0, %lo(gSaveContext)($t0) /* 03588 809744D8 24010053 */ addiu $at, $zero, 0x0053 ## $at = 00000053 -/* 0358C 809744DC 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 0358C 809744DC 3C098016 */ lui $t1, %hi(gSaveContext+0xedc) /* 03590 809744E0 55010015 */ bnel $t0, $at, .L80974538 /* 03594 809744E4 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 03598 809744E8 9529F53C */ lhu $t1, -0x0AC4($t1) ## 8015F53C +/* 03598 809744E8 9529F53C */ lhu $t1, %lo(gSaveContext+0xedc)($t1) /* 0359C 809744EC 312A0800 */ andi $t2, $t1, 0x0800 ## $t2 = 00000000 /* 035A0 809744F0 55400011 */ bnel $t2, $zero, .L80974538 /* 035A4 809744F4 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s index 7101bd25fc..8260046a81 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s @@ -49,8 +49,8 @@ glabel func_80975074 /* 04170 809750C0 0C25D1AD */ jal func_809746B4 /* 04174 809750C4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 04178 809750C8 144000E6 */ bne $v0, $zero, .L80975464 -/* 0417C 809750CC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 04180 809750D0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0417C 809750CC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 04180 809750D0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 04184 809750D4 8C580000 */ lw $t8, 0x0000($v0) ## 8015E660 /* 04188 809750D8 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 /* 0418C 809750DC 57010014 */ bnel $t8, $at, .L80975130 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s index d8b7d3e170..3eccb88027 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s @@ -46,12 +46,12 @@ glabel func_80975BD4 /* 04CA4 80975BF4 AFA400B8 */ sw $a0, 0x00B8($sp) /* 04CA8 80975BF8 AFA500BC */ sw $a1, 0x00BC($sp) /* 04CAC 80975BFC 000FC080 */ sll $t8, $t7, 2 -/* 04CB0 80975C00 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 04CB0 80975C00 3C198016 */ lui $t9, %hi(gSegments) /* 04CB4 80975C04 01A56821 */ addu $t5, $t5, $a1 /* 04CB8 80975C08 8DAD1DE4 */ lw $t5, 0x1DE4($t5) ## 00011DE4 /* 04CBC 80975C0C 0338C821 */ addu $t9, $t9, $t8 /* 04CC0 80975C10 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 04CC4 80975C14 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 04CC4 80975C14 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 04CC8 80975C18 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 04CCC 80975C1C 00415824 */ and $t3, $v0, $at /* 04CD0 80975C20 AFAD00A8 */ sw $t5, 0x00A8($sp) @@ -66,8 +66,8 @@ glabel func_80975BD4 /* 04CF4 80975C44 24070BB2 */ addiu $a3, $zero, 0x0BB2 ## $a3 = 00000BB2 /* 04CF8 80975C48 0C031AB1 */ jal Graph_OpenDisps /* 04CFC 80975C4C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 04D00 80975C50 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 04D04 80975C54 8DCEE660 */ lw $t6, -0x19A0($t6) ## 8015E660 +/* 04D00 80975C50 3C0E8016 */ lui $t6, %hi(gSaveContext) +/* 04D04 80975C54 8DCEE660 */ lw $t6, %lo(gSaveContext)($t6) /* 04D08 80975C58 24010400 */ addiu $at, $zero, 0x0400 ## $at = 00000400 /* 04D0C 80975C5C 8FA300AC */ lw $v1, 0x00AC($sp) /* 04D10 80975C60 15C10005 */ bne $t6, $at, .L80975C78 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s index f4217b5114..f8c29ed57d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s @@ -25,8 +25,8 @@ glabel func_80976404 /* 054E8 80976438 0C01B129 */ jal func_8006C4A4 /* 054EC 8097643C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 054F0 80976440 14400009 */ bne $v0, $zero, .L80976468 -/* 054F4 80976444 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 054F8 80976448 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 054F4 80976444 3C028016 */ lui $v0, %hi(gSaveContext) +/* 054F8 80976448 2442E660 */ addiu $v0, %lo(gSaveContext) /* 054FC 8097644C 8C581360 */ lw $t8, 0x1360($v0) ## 8015F9C0 /* 05500 80976450 2B010004 */ slti $at, $t8, 0x0004 /* 05504 80976454 10200004 */ beq $at, $zero, .L80976468 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Init.s index 42dfa57fd7..f97fb7e355 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/DemoExt_Init.s @@ -1,11 +1,11 @@ glabel DemoExt_Init /* 0000C 8097739C AFA50004 */ sw $a1, 0x0004($sp) -/* 00010 809773A0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00010 809773A0 3C028016 */ lui $v0, %hi(gGameInfo) /* 00014 809773A4 240E0019 */ addiu $t6, $zero, 0x0019 ## $t6 = 00000019 /* 00018 809773A8 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 /* 0001C 809773AC 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 /* 00020 809773B0 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E -/* 00024 809773B4 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 00024 809773B4 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 00028 809773B8 A48E0158 */ sh $t6, 0x0158($a0) ## 00000158 /* 0002C 809773BC A48F015A */ sh $t7, 0x015A($a0) ## 0000015A /* 00030 809773C0 A498015C */ sh $t8, 0x015C($a0) ## 0000015C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977450.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977450.s index ce42572273..2379ebc9a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977450.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977450.s @@ -1,6 +1,6 @@ glabel func_80977450 -/* 000C0 80977450 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 000C4 80977454 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 000C0 80977450 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 000C4 80977454 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 000C8 80977458 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 000CC 8097745C AFBF001C */ sw $ra, 0x001C($sp) /* 000D0 80977460 AFA40020 */ sw $a0, 0x0020($sp) @@ -13,11 +13,11 @@ glabel func_80977450 /* 000EC 8097747C 468021A0 */ cvt.s.w $f6, $f4 /* 000F0 80977480 C484016C */ lwc1 $f4, 0x016C($a0) ## 0000016C /* 000F4 80977484 0080C025 */ or $t8, $a0, $zero ## $t8 = 00000000 -/* 000F8 80977488 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 000FC 8097748C 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 00100 80977490 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 000F8 80977488 3C078013 */ lui $a3, %hi(D_801333E0) +/* 000FC 8097748C 3C198013 */ lui $t9, %hi(D_801333E8) +/* 00100 80977490 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00104 80977494 46083280 */ add.s $f10, $f6, $f8 -/* 00108 80977498 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 00108 80977498 273933E8 */ addiu $t9, %lo(D_801333E8) /* 0010C 8097749C 270500E4 */ addiu $a1, $t8, 0x00E4 ## $a1 = 000000E4 /* 00110 809774A0 24042040 */ addiu $a0, $zero, 0x2040 ## $a0 = 00002040 /* 00114 809774A4 46105481 */ sub.s $f18, $f10, $f16 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809775A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809775A4.s index 0158e08087..6323d854ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809775A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809775A4.s @@ -4,12 +4,12 @@ glabel func_809775A4 /* 0021C 809775AC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00220 809775B0 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 /* 00224 809775B4 C484016C */ lwc1 $f4, 0x016C($a0) ## 0000016C -/* 00228 809775B8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 00228 809775B8 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 0022C 809775BC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00230 809775C0 46062200 */ add.s $f8, $f4, $f6 /* 00234 809775C4 44812000 */ mtc1 $at, $f4 ## $f4 = 40.00 /* 00238 809775C8 E488016C */ swc1 $f8, 0x016C($a0) ## 0000016C -/* 0023C 809775CC 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 0023C 809775CC 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 00240 809775D0 C48A016C */ lwc1 $f10, 0x016C($a0) ## 0000016C /* 00244 809775D4 85CF149A */ lh $t7, 0x149A($t6) ## 8016149A /* 00248 809775D8 448F8000 */ mtc1 $t7, $f16 ## $f16 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809776D0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809776D0.s index ec75948eba..446212a208 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809776D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_809776D0.s @@ -11,8 +11,8 @@ glabel func_809776D0 /* 00360 809776F0 24A5FFFE */ addiu $a1, $a1, 0xFFFE ## $a1 = 0000015C /* 00364 809776F4 1440FFF9 */ bne $v0, $zero, .L809776DC /* 00368 809776F8 A4780002 */ sh $t8, 0x0002($v1) ## 00000166 -/* 0036C 809776FC 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 00370 80977700 8D08FA90 */ lw $t0, -0x0570($t0) ## 8015FA90 +/* 0036C 809776FC 3C088016 */ lui $t0, %hi(gGameInfo) +/* 00370 80977700 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) /* 00374 80977704 84990168 */ lh $t9, 0x0168($a0) ## 00000168 /* 00378 80977708 85091498 */ lh $t1, 0x1498($t0) ## 80161498 /* 0037C 8097770C 252C03E8 */ addiu $t4, $t1, 0x03E8 ## $t4 = 000003E8 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_8097771C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_8097771C.s index 2bd7cf91c6..b67ad74f2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_8097771C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_8097771C.s @@ -1,6 +1,6 @@ glabel func_8097771C -/* 0038C 8097771C 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00390 80977720 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 +/* 0038C 8097771C 3C058016 */ lui $a1, %hi(gGameInfo) +/* 00390 80977720 24A5FA90 */ addiu $a1, %lo(gGameInfo) /* 00394 80977724 8CA30000 */ lw $v1, 0x0000($a1) ## 8015FA90 /* 00398 80977728 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0039C 8097772C 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s index 02ef062ed6..45ab9c6d3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s @@ -38,8 +38,8 @@ glabel func_80977950 /* 00614 809779A4 C44E0004 */ lwc1 $f14, 0x0004($v0) ## 0000017C /* 00618 809779A8 0C0342A3 */ jal Matrix_Scale /* 0061C 809779AC C44C0000 */ lwc1 $f12, 0x0000($v0) ## 00000178 -/* 00620 809779B0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00624 809779B4 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00620 809779B0 3C028016 */ lui $v0, %hi(gGameInfo) +/* 00624 809779B4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 00628 809779B8 8FAE0088 */ lw $t6, 0x0088($sp) /* 0062C 809779BC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00630 809779C0 84441474 */ lh $a0, 0x1474($v0) ## 80161474 @@ -49,8 +49,8 @@ glabel func_80977950 /* 00640 809779D0 00042400 */ sll $a0, $a0, 16 /* 00644 809779D4 0C034421 */ jal Matrix_RotateZYX /* 00648 809779D8 00042403 */ sra $a0, $a0, 16 -/* 0064C 809779DC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00650 809779E0 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0064C 809779DC 3C028016 */ lui $v0, %hi(gGameInfo) +/* 00650 809779E0 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 00654 809779E4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00658 809779E8 84591484 */ lh $t9, 0x1484($v0) ## 80161484 /* 0065C 809779EC 844F1480 */ lh $t7, 0x1480($v0) ## 80161480 @@ -74,10 +74,10 @@ glabel func_80977950 /* 006A4 80977A34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006A8 80977A38 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 /* 006AC 80977A3C 8FA90088 */ lw $t1, 0x0088($sp) -/* 006B0 80977A40 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 006B0 80977A40 3C058016 */ lui $a1, %hi(gGameInfo) /* 006B4 80977A44 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 /* 006B8 80977A48 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 006BC 80977A4C 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 +/* 006BC 80977A4C 24A5FA90 */ addiu $a1, %lo(gGameInfo) /* 006C0 80977A50 8CAB0000 */ lw $t3, 0x0000($a1) ## 8015FA90 /* 006C4 80977A54 3C01FA00 */ lui $at, 0xFA00 ## $at = FA000000 /* 006C8 80977A58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978EBC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978EBC.s index 7bba47f455..a01aa928db 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978EBC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978EBC.s @@ -1,6 +1,6 @@ glabel func_80978EBC -/* 0058C 80978EBC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00590 80978EC0 8DCEF9C0 */ lw $t6, -0x0640($t6) ## 8015F9C0 +/* 0058C 80978EBC 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) +/* 00590 80978EC0 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) /* 00594 80978EC4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 00598 80978EC8 29C10004 */ slti $at, $t6, 0x0004 /* 0059C 80978ECC 10200003 */ beq $at, $zero, .L80978EDC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s index aa61a56805..eb54b0aaa0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s @@ -14,8 +14,8 @@ glabel D_8097C010 .text glabel func_80979030 /* 00700 80979030 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00704 80979034 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00708 80979038 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 00704 80979034 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 00708 80979038 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 0070C 8097903C AFBF001C */ sw $ra, 0x001C($sp) /* 00710 80979040 AFB00018 */ sw $s0, 0x0018($sp) /* 00714 80979044 AFA40048 */ sw $a0, 0x0048($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097923C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097923C.s index 7c02625bf5..a76228cd42 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097923C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097923C.s @@ -58,8 +58,8 @@ glabel func_8097923C /* 00950 80979280 01C00008 */ jr $t6 /* 00954 80979284 00000000 */ nop glabel L80979288 -/* 00958 80979288 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0095C 8097928C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00958 80979288 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0095C 8097928C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 00960 80979290 3C018098 */ lui $at, %hi(D_8097C1C8) ## $at = 80980000 /* 00964 80979294 C420C1C8 */ lwc1 $f0, %lo(D_8097C1C8)($at) /* 00968 80979298 844F1482 */ lh $t7, 0x1482($v0) ## 80161482 @@ -97,8 +97,8 @@ glabel L80979288 /* 009E8 80979318 100000EE */ beq $zero, $zero, .L809796D4 /* 009EC 8097931C 46023580 */ add.s $f22, $f6, $f2 glabel L80979320 -/* 009F0 80979320 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 009F4 80979324 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 009F0 80979320 3C028016 */ lui $v0, %hi(gGameInfo) +/* 009F4 80979324 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 009F8 80979328 3C018098 */ lui $at, %hi(D_8097C1CC) ## $at = 80980000 /* 009FC 8097932C C420C1CC */ lwc1 $f0, %lo(D_8097C1CC)($at) /* 00A00 80979330 844B149C */ lh $t3, 0x149C($v0) ## 8016149C @@ -136,8 +136,8 @@ glabel L80979320 /* 00A80 809793B0 100000C8 */ beq $zero, $zero, .L809796D4 /* 00A84 809793B4 46024580 */ add.s $f22, $f8, $f2 glabel L809793B8 -/* 00A88 809793B8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00A8C 809793BC 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00A88 809793B8 3C028016 */ lui $v0, %hi(gGameInfo) +/* 00A8C 809793BC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 00A90 809793C0 3C018098 */ lui $at, %hi(D_8097C1D0) ## $at = 80980000 /* 00A94 809793C4 C420C1D0 */ lwc1 $f0, %lo(D_8097C1D0)($at) /* 00A98 809793C8 845914B6 */ lh $t9, 0x14B6($v0) ## 801614B6 @@ -175,8 +175,8 @@ glabel L809793B8 /* 00B18 80979448 100000A2 */ beq $zero, $zero, .L809796D4 /* 00B1C 8097944C 46025580 */ add.s $f22, $f10, $f2 glabel L80979450 -/* 00B20 80979450 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00B24 80979454 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00B20 80979450 3C028016 */ lui $v0, %hi(gGameInfo) +/* 00B24 80979454 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 00B28 80979458 3C018098 */ lui $at, %hi(D_8097C1D4) ## $at = 80980000 /* 00B2C 8097945C C420C1D4 */ lwc1 $f0, %lo(D_8097C1D4)($at) /* 00B30 80979460 844D14D0 */ lh $t5, 0x14D0($v0) ## 801614D0 @@ -214,8 +214,8 @@ glabel L80979450 /* 00BB0 809794E0 1000007C */ beq $zero, $zero, .L809796D4 /* 00BB4 809794E4 46022580 */ add.s $f22, $f4, $f2 glabel L809794E8 -/* 00BB8 809794E8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00BBC 809794EC 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00BB8 809794E8 3C028016 */ lui $v0, %hi(gGameInfo) +/* 00BBC 809794EC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 00BC0 809794F0 3C018098 */ lui $at, %hi(D_8097C1D8) ## $at = 80980000 /* 00BC4 809794F4 C420C1D8 */ lwc1 $f0, %lo(D_8097C1D8)($at) /* 00BC8 809794F8 844914EA */ lh $t1, 0x14EA($v0) ## 801614EA @@ -253,8 +253,8 @@ glabel L809794E8 /* 00C48 80979578 10000056 */ beq $zero, $zero, .L809796D4 /* 00C4C 8097957C 46023580 */ add.s $f22, $f6, $f2 glabel L80979580 -/* 00C50 80979580 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00C54 80979584 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00C50 80979580 3C028016 */ lui $v0, %hi(gGameInfo) +/* 00C54 80979584 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 00C58 80979588 3C018098 */ lui $at, %hi(D_8097C1DC) ## $at = 80980000 /* 00C5C 8097958C C420C1DC */ lwc1 $f0, %lo(D_8097C1DC)($at) /* 00C60 80979590 844F1504 */ lh $t7, 0x1504($v0) ## 80161504 @@ -292,8 +292,8 @@ glabel L80979580 /* 00CE0 80979610 10000030 */ beq $zero, $zero, .L809796D4 /* 00CE4 80979614 46024580 */ add.s $f22, $f8, $f2 glabel L80979618 -/* 00CE8 80979618 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00CEC 8097961C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00CE8 80979618 3C028016 */ lui $v0, %hi(gGameInfo) +/* 00CEC 8097961C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 00CF0 80979620 3C018098 */ lui $at, %hi(D_8097C1E0) ## $at = 80980000 /* 00CF4 80979624 C420C1E0 */ lwc1 $f0, %lo(D_8097C1E0)($at) /* 00CF8 80979628 844B1468 */ lh $t3, 0x1468($v0) ## 80161468 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979860.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979860.s index d883df9e10..d6009ee178 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979860.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979860.s @@ -69,8 +69,8 @@ glabel func_80979860 /* 00F98 809798C8 01C00008 */ jr $t6 /* 00F9C 809798CC 00000000 */ nop glabel L809798D0 -/* 00FA0 809798D0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00FA4 809798D4 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 00FA0 809798D0 3C028016 */ lui $v0, %hi(gGameInfo) +/* 00FA4 809798D4 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 00FA8 809798D8 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90 /* 00FAC 809798DC 3C018098 */ lui $at, %hi(D_8097C204) ## $at = 80980000 /* 00FB0 809798E0 C420C204 */ lwc1 $f0, %lo(D_8097C204)($at) @@ -124,8 +124,8 @@ glabel L809798D0 /* 01070 809799A0 1000014D */ beq $zero, $zero, .L80979ED8 /* 01074 809799A4 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C glabel L809799A8 -/* 01078 809799A8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0107C 809799AC 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 01078 809799A8 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0107C 809799AC 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 01080 809799B0 8C4B0000 */ lw $t3, 0x0000($v0) ## 8015FA90 /* 01084 809799B4 3C018098 */ lui $at, %hi(D_8097C208) ## $at = 80980000 /* 01088 809799B8 C420C208 */ lwc1 $f0, %lo(D_8097C208)($at) @@ -179,8 +179,8 @@ glabel L809799A8 /* 01148 80979A78 10000117 */ beq $zero, $zero, .L80979ED8 /* 0114C 80979A7C E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C glabel L80979A80 -/* 01150 80979A80 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01154 80979A84 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 01150 80979A80 3C028016 */ lui $v0, %hi(gGameInfo) +/* 01154 80979A84 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 01158 80979A88 8C590000 */ lw $t9, 0x0000($v0) ## 8015FA90 /* 0115C 80979A8C 3C018098 */ lui $at, %hi(D_8097C20C) ## $at = 80980000 /* 01160 80979A90 C420C20C */ lwc1 $f0, %lo(D_8097C20C)($at) @@ -234,8 +234,8 @@ glabel L80979A80 /* 01220 80979B50 100000E1 */ beq $zero, $zero, .L80979ED8 /* 01224 80979B54 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C glabel L80979B58 -/* 01228 80979B58 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0122C 80979B5C 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 01228 80979B58 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0122C 80979B5C 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 01230 80979B60 8C4D0000 */ lw $t5, 0x0000($v0) ## 8015FA90 /* 01234 80979B64 3C018098 */ lui $at, %hi(D_8097C210) ## $at = 80980000 /* 01238 80979B68 C420C210 */ lwc1 $f0, %lo(D_8097C210)($at) @@ -289,8 +289,8 @@ glabel L80979B58 /* 012F8 80979C28 100000AB */ beq $zero, $zero, .L80979ED8 /* 012FC 80979C2C E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C glabel L80979C30 -/* 01300 80979C30 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01304 80979C34 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 01300 80979C30 3C028016 */ lui $v0, %hi(gGameInfo) +/* 01304 80979C34 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 01308 80979C38 8C490000 */ lw $t1, 0x0000($v0) ## 8015FA90 /* 0130C 80979C3C 3C018098 */ lui $at, %hi(D_8097C214) ## $at = 80980000 /* 01310 80979C40 C420C214 */ lwc1 $f0, %lo(D_8097C214)($at) @@ -344,8 +344,8 @@ glabel L80979C30 /* 013D0 80979D00 10000075 */ beq $zero, $zero, .L80979ED8 /* 013D4 80979D04 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C glabel L80979D08 -/* 013D8 80979D08 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 013DC 80979D0C 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 013D8 80979D08 3C028016 */ lui $v0, %hi(gGameInfo) +/* 013DC 80979D0C 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 013E0 80979D10 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90 /* 013E4 80979D14 3C018098 */ lui $at, %hi(D_8097C218) ## $at = 80980000 /* 013E8 80979D18 C420C218 */ lwc1 $f0, %lo(D_8097C218)($at) @@ -399,8 +399,8 @@ glabel L80979D08 /* 014A8 80979DD8 1000003F */ beq $zero, $zero, .L80979ED8 /* 014AC 80979DDC E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C glabel L80979DE0 -/* 014B0 80979DE0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 014B4 80979DE4 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 014B0 80979DE0 3C028016 */ lui $v0, %hi(gGameInfo) +/* 014B4 80979DE4 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 014B8 80979DE8 8C4B0000 */ lw $t3, 0x0000($v0) ## 8015FA90 /* 014BC 80979DEC 3C018098 */ lui $at, %hi(D_8097C21C) ## $at = 80980000 /* 014C0 80979DF0 C420C21C */ lwc1 $f0, %lo(D_8097C21C)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A000.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A000.s index 4a6b15f11e..9b944d673c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A000.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A000.s @@ -5,8 +5,8 @@ glabel func_8097A000 /* 016DC 8097A00C 0C00B638 */ jal Actor_MoveForward /* 016E0 8097A010 AFA40018 */ sw $a0, 0x0018($sp) -/* 016E4 8097A014 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 016E8 8097A018 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 016E4 8097A014 3C028016 */ lui $v0, %hi(gGameInfo) +/* 016E8 8097A018 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 016EC 8097A01C 8FA40018 */ lw $a0, 0x0018($sp) /* 016F0 8097A020 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90 /* 016F4 8097A024 848E016C */ lh $t6, 0x016C($a0) ## 0000016C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A238.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A238.s index 65aee0a507..46f50c33aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A238.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A238.s @@ -5,8 +5,8 @@ glabel func_8097A238 /* 01914 8097A244 0C00B638 */ jal Actor_MoveForward /* 01918 8097A248 AFA40018 */ sw $a0, 0x0018($sp) -/* 0191C 8097A24C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01920 8097A250 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 0191C 8097A24C 3C028016 */ lui $v0, %hi(gGameInfo) +/* 01920 8097A250 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 01924 8097A254 8FA40018 */ lw $a0, 0x0018($sp) /* 01928 8097A258 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90 /* 0192C 8097A25C 848E016C */ lh $t6, 0x016C($a0) ## 0000016C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A474.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A474.s index 3cda424389..5b14225bd6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A474.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A474.s @@ -5,8 +5,8 @@ glabel func_8097A474 /* 01B50 8097A480 0C00B638 */ jal Actor_MoveForward /* 01B54 8097A484 AFA40018 */ sw $a0, 0x0018($sp) -/* 01B58 8097A488 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01B5C 8097A48C 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 01B58 8097A488 3C028016 */ lui $v0, %hi(gGameInfo) +/* 01B5C 8097A48C 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 01B60 8097A490 8FA40018 */ lw $a0, 0x0018($sp) /* 01B64 8097A494 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90 /* 01B68 8097A498 848E016C */ lh $t6, 0x016C($a0) ## 0000016C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A644.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A644.s index 2aa1883b52..ca223e6bb2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A644.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A644.s @@ -5,8 +5,8 @@ glabel func_8097A644 /* 01D20 8097A650 0C00B638 */ jal Actor_MoveForward /* 01D24 8097A654 AFA40018 */ sw $a0, 0x0018($sp) -/* 01D28 8097A658 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01D2C 8097A65C 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 01D28 8097A658 3C028016 */ lui $v0, %hi(gGameInfo) +/* 01D2C 8097A65C 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 01D30 8097A660 8FA40018 */ lw $a0, 0x0018($sp) /* 01D34 8097A664 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90 /* 01D38 8097A668 848E016C */ lh $t6, 0x016C($a0) ## 0000016C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A814.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A814.s index 23debe9110..28bf2f1320 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A814.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A814.s @@ -5,8 +5,8 @@ glabel func_8097A814 /* 01EF0 8097A820 0C00B638 */ jal Actor_MoveForward /* 01EF4 8097A824 AFA40018 */ sw $a0, 0x0018($sp) -/* 01EF8 8097A828 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01EFC 8097A82C 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 01EF8 8097A828 3C028016 */ lui $v0, %hi(gGameInfo) +/* 01EFC 8097A82C 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 01F00 8097A830 8FA40018 */ lw $a0, 0x0018($sp) /* 01F04 8097A834 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90 /* 01F08 8097A838 848E016C */ lh $t6, 0x016C($a0) ## 0000016C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9E4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9E4.s index ba56d744be..1c84a311fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9E4.s @@ -5,8 +5,8 @@ glabel func_8097A9E4 /* 020C0 8097A9F0 0C00B638 */ jal Actor_MoveForward /* 020C4 8097A9F4 AFA40018 */ sw $a0, 0x0018($sp) -/* 020C8 8097A9F8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 020CC 8097A9FC 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 020C8 8097A9F8 3C028016 */ lui $v0, %hi(gGameInfo) +/* 020CC 8097A9FC 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 020D0 8097AA00 8FA40018 */ lw $a0, 0x0018($sp) /* 020D4 8097AA04 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90 /* 020D8 8097AA08 848E016C */ lh $t6, 0x016C($a0) ## 0000016C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ABB4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ABB4.s index f420b14bc5..aa5a7c9f11 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ABB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ABB4.s @@ -5,8 +5,8 @@ glabel func_8097ABB4 /* 02290 8097ABC0 0C00B638 */ jal Actor_MoveForward /* 02294 8097ABC4 AFA40018 */ sw $a0, 0x0018($sp) -/* 02298 8097ABC8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0229C 8097ABCC 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 02298 8097ABC8 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0229C 8097ABCC 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 022A0 8097ABD0 8FA40018 */ lw $a0, 0x0018($sp) /* 022A4 8097ABD4 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90 /* 022A8 8097ABD8 848E016C */ lh $t6, 0x016C($a0) ## 0000016C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E824.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E824.s index 99163ebe74..bda5eaab28 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E824.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E824.s @@ -30,8 +30,8 @@ glabel func_8097E824 /* 011BC 8097E82C AFBF0014 */ sw $ra, 0x0014($sp) /* 011C0 8097E830 14A10023 */ bne $a1, $at, .L8097E8C0 /* 011C4 8097E834 AFA40048 */ sw $a0, 0x0048($sp) -/* 011C8 8097E838 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 011CC 8097E83C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 011C8 8097E838 3C028016 */ lui $v0, %hi(gGameInfo) +/* 011CC 8097E83C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 011D0 8097E840 3C018098 */ lui $at, %hi(D_80982AA0) ## $at = 80980000 /* 011D4 8097E844 C4202AA0 */ lwc1 $f0, %lo(D_80982AA0)($at) /* 011D8 8097E848 84591474 */ lh $t9, 0x1474($v0) ## 80161474 @@ -67,8 +67,8 @@ glabel func_8097E824 .L8097E8C0: /* 01250 8097E8C0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 01254 8097E8C4 14A10022 */ bne $a1, $at, .L8097E950 -/* 01258 8097E8C8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0125C 8097E8CC 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 01258 8097E8C8 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0125C 8097E8CC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 01260 8097E8D0 3C018098 */ lui $at, %hi(D_80982AA4) ## $at = 80980000 /* 01264 8097E8D4 C4202AA4 */ lwc1 $f0, %lo(D_80982AA4)($at) /* 01268 8097E8D8 844D1480 */ lh $t5, 0x1480($v0) ## 80161480 @@ -104,8 +104,8 @@ glabel func_8097E824 .L8097E950: /* 012E0 8097E950 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 012E4 8097E954 14A10022 */ bne $a1, $at, .L8097E9E0 -/* 012E8 8097E958 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 012EC 8097E95C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 012E8 8097E958 3C028016 */ lui $v0, %hi(gGameInfo) +/* 012EC 8097E95C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 012F0 8097E960 3C018098 */ lui $at, %hi(D_80982AA8) ## $at = 80980000 /* 012F4 8097E964 C4202AA8 */ lwc1 $f0, %lo(D_80982AA8)($at) /* 012F8 8097E968 8449148C */ lh $t1, 0x148C($v0) ## 8016148C @@ -141,8 +141,8 @@ glabel func_8097E824 .L8097E9E0: /* 01370 8097E9E0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 01374 8097E9E4 14A10022 */ bne $a1, $at, .L8097EA70 -/* 01378 8097E9E8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0137C 8097E9EC 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 01378 8097E9E8 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0137C 8097E9EC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 01380 8097E9F0 3C018098 */ lui $at, %hi(D_80982AAC) ## $at = 80980000 /* 01384 8097E9F4 C4202AAC */ lwc1 $f0, %lo(D_80982AAC)($at) /* 01388 8097E9F8 844F1498 */ lh $t7, 0x1498($v0) ## 80161498 @@ -178,8 +178,8 @@ glabel func_8097E824 .L8097EA70: /* 01400 8097EA70 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 01404 8097EA74 14A10022 */ bne $a1, $at, .L8097EB00 -/* 01408 8097EA78 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0140C 8097EA7C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 01408 8097EA78 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0140C 8097EA7C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 01410 8097EA80 3C018098 */ lui $at, %hi(D_80982AB0) ## $at = 80980000 /* 01414 8097EA84 C4202AB0 */ lwc1 $f0, %lo(D_80982AB0)($at) /* 01418 8097EA88 844B14A4 */ lh $t3, 0x14A4($v0) ## 801614A4 @@ -215,8 +215,8 @@ glabel func_8097E824 .L8097EB00: /* 01490 8097EB00 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 01494 8097EB04 14A10022 */ bne $a1, $at, .L8097EB90 -/* 01498 8097EB08 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0149C 8097EB0C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 01498 8097EB08 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0149C 8097EB0C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 014A0 8097EB10 3C018098 */ lui $at, %hi(D_80982AB4) ## $at = 80980000 /* 014A4 8097EB14 C4202AB4 */ lwc1 $f0, %lo(D_80982AB4)($at) /* 014A8 8097EB18 845914B0 */ lh $t9, 0x14B0($v0) ## 801614B0 @@ -252,9 +252,9 @@ glabel func_8097E824 .L8097EB90: /* 01520 8097EB90 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 /* 01524 8097EB94 14A10023 */ bne $a1, $at, .L8097EC24 -/* 01528 8097EB98 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0152C 8097EB9C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01530 8097EBA0 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 01528 8097EB98 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0152C 8097EB9C 3C028016 */ lui $v0, %hi(gGameInfo) +/* 01530 8097EBA0 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 01534 8097EBA4 3C018098 */ lui $at, %hi(D_80982AB8) ## $at = 80980000 /* 01538 8097EBA8 C4202AB8 */ lwc1 $f0, %lo(D_80982AB8)($at) /* 0153C 8097EBAC 844D14F8 */ lh $t5, 0x14F8($v0) ## 801614F8 @@ -288,7 +288,7 @@ glabel func_8097E824 /* 015AC 8097EC1C 10000022 */ beq $zero, $zero, .L8097ECA8 /* 015B0 8097EC20 8FA20048 */ lw $v0, 0x0048($sp) .L8097EC24: -/* 015B4 8097EC24 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 015B4 8097EC24 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 015B8 8097EC28 3C018098 */ lui $at, %hi(D_80982ABC) ## $at = 80980000 /* 015BC 8097EC2C C4202ABC */ lwc1 $f0, %lo(D_80982ABC)($at) /* 015C0 8097EC30 84491504 */ lh $t1, 0x1504($v0) ## 80161504 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED94.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED94.s index c765809e8d..baa275e30c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED94.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED94.s @@ -1,14 +1,14 @@ glabel func_8097ED94 -/* 01724 8097ED94 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 01728 8097ED98 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 0172C 8097ED9C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 01724 8097ED94 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 01728 8097ED98 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) +/* 0172C 8097ED9C 3C188016 */ lui $t8, %hi(gSaveContext+0x1360) /* 01730 8097EDA0 85CF1458 */ lh $t7, 0x1458($t6) ## 80161458 /* 01734 8097EDA4 11E00003 */ beq $t7, $zero, .L8097EDB4 /* 01738 8097EDA8 00000000 */ nop /* 0173C 8097EDAC 03E00008 */ jr $ra /* 01740 8097EDB0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L8097EDB4: -/* 01744 8097EDB4 8F18F9C0 */ lw $t8, -0x0640($t8) ## 8015F9C0 +/* 01744 8097EDB4 8F18F9C0 */ lw $t8, %lo(gSaveContext+0x1360)($t8) /* 01748 8097EDB8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 0174C 8097EDBC 2B010004 */ slti $at, $t8, 0x0004 /* 01750 8097EDC0 10200003 */ beq $at, $zero, .L8097EDD0 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF40.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF40.s index a2111a8d22..5073840f76 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF40.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF40.s @@ -29,7 +29,7 @@ glabel func_8097EF40 /* 01904 8097EF74 ACD80004 */ sw $t8, 0x0004($a2) ## FFFFFFDC /* 01908 8097EF78 8DF90008 */ lw $t9, 0x0008($t7) ## 80982604 /* 0190C 8097EF7C 27A70034 */ addiu $a3, $sp, 0x0034 ## $a3 = FFFFFFCC -/* 01910 8097EF80 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 01910 8097EF80 3C0B8016 */ lui $t3, %hi(gGameInfo) /* 01914 8097EF84 ACD90008 */ sw $t9, 0x0008($a2) ## FFFFFFE0 /* 01918 8097EF88 8D0A0000 */ lw $t2, 0x0000($t0) ## 80982608 /* 0191C 8097EF8C 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 @@ -39,7 +39,7 @@ glabel func_8097EF40 /* 0192C 8097EF9C ACE90004 */ sw $t1, 0x0004($a3) ## FFFFFFD0 /* 01930 8097EFA0 8D0A0008 */ lw $t2, 0x0008($t0) ## 80982610 /* 01934 8097EFA4 ACEA0008 */ sw $t2, 0x0008($a3) ## FFFFFFD4 -/* 01938 8097EFA8 8D6BFA90 */ lw $t3, -0x0570($t3) ## 8015FA90 +/* 01938 8097EFA8 8D6BFA90 */ lw $t3, %lo(gGameInfo)($t3) /* 0193C 8097EFAC 856C1456 */ lh $t4, 0x1456($t3) ## 80161456 /* 01940 8097EFB0 11810003 */ beq $t4, $at, .L8097EFC0 /* 01944 8097EFB4 240100DC */ addiu $at, $zero, 0x00DC ## $at = 000000DC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F0AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F0AC.s index ab7d05ba1e..615c0076a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F0AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F0AC.s @@ -6,8 +6,8 @@ glabel func_8097F0AC /* 01A4C 8097F0BC 2401008C */ addiu $at, $zero, 0x008C ## $at = 0000008C /* 01A50 8097F0C0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 01A54 8097F0C4 10610005 */ beq $v1, $at, .L8097F0DC -/* 01A58 8097F0C8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 01A5C 8097F0CC 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 01A58 8097F0C8 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 01A5C 8097F0CC 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 01A60 8097F0D0 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 /* 01A64 8097F0D4 85F81456 */ lh $t8, 0x1456($t7) ## 80161456 /* 01A68 8097F0D8 17010017 */ bne $t8, $at, .L8097F138 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F1D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F1D8.s index 59e2400175..dd55ee8274 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F1D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F1D8.s @@ -7,8 +7,8 @@ glabel D_80982AD4 .text glabel func_8097F1D8 -/* 01B68 8097F1D8 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 01B6C 8097F1DC 24C6FA90 */ addiu $a2, $a2, 0xFA90 ## $a2 = 8015FA90 +/* 01B68 8097F1D8 3C068016 */ lui $a2, %hi(gGameInfo) +/* 01B6C 8097F1DC 24C6FA90 */ addiu $a2, %lo(gGameInfo) /* 01B70 8097F1E0 8CC30000 */ lw $v1, 0x0000($a2) ## 8015FA90 /* 01B74 8097F1E4 84820172 */ lh $v0, 0x0172($a0) ## 00000172 /* 01B78 8097F1E8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s index 202bfc9e1f..5cfb7900a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s @@ -29,9 +29,9 @@ glabel func_8097F508 /* 01EBC 8097F52C AFAE00CC */ sw $t6, 0x00CC($sp) /* 01EC0 8097F530 84870172 */ lh $a3, 0x0172($a0) ## 00000172 /* 01EC4 8097F534 C4282AD8 */ lwc1 $f8, %lo(D_80982AD8)($at) -/* 01EC8 8097F538 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 01EC8 8097F538 3C028016 */ lui $v0, %hi(gGameInfo) /* 01ECC 8097F53C 44872000 */ mtc1 $a3, $f4 ## $f4 = 0.00 -/* 01ED0 8097F540 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 01ED0 8097F540 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 01ED4 8097F544 24050040 */ addiu $a1, $zero, 0x0040 ## $a1 = 00000040 /* 01ED8 8097F548 468021A0 */ cvt.s.w $f6, $f4 /* 01EDC 8097F54C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F96C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F96C.s index 1996658262..d10093550f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F96C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F96C.s @@ -3,14 +3,14 @@ glabel func_8097F96C /* 02300 8097F970 AFBF0014 */ sw $ra, 0x0014($sp) /* 02304 8097F974 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 /* 02308 8097F978 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 0230C 8097F97C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0230C 8097F97C 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 02310 8097F980 28410424 */ slti $at, $v0, 0x0424 /* 02314 8097F984 14200003 */ bne $at, $zero, .L8097F994 /* 02318 8097F988 28410426 */ slti $at, $v0, 0x0426 /* 0231C 8097F98C 54200007 */ bnel $at, $zero, .L8097F9AC /* 02320 8097F990 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 .L8097F994: -/* 02324 8097F994 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 02324 8097F994 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 02328 8097F998 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 /* 0232C 8097F99C 85CF1456 */ lh $t7, 0x1456($t6) ## 80161456 /* 02330 8097F9A0 55E1001B */ bnel $t7, $at, .L8097FA10 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FA1C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FA1C.s index c0f016e5fa..3d659c9001 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FA1C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FA1C.s @@ -16,7 +16,7 @@ glabel func_8097FA1C /* 023D0 8097FA40 ACD90000 */ sw $t9, 0x0000($a2) ## FFFFFFD4 /* 023D4 8097FA44 8DF80004 */ lw $t8, 0x0004($t7) ## 8098261C /* 023D8 8097FA48 284101F7 */ slti $at, $v0, 0x01F7 -/* 023DC 8097FA4C 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 023DC 8097FA4C 3C088016 */ lui $t0, %hi(gGameInfo) /* 023E0 8097FA50 ACD80004 */ sw $t8, 0x0004($a2) ## FFFFFFD8 /* 023E4 8097FA54 8DF90008 */ lw $t9, 0x0008($t7) ## 80982620 /* 023E8 8097FA58 14200004 */ bne $at, $zero, .L8097FA6C @@ -25,7 +25,7 @@ glabel func_8097FA1C /* 023F4 8097FA64 54200007 */ bnel $at, $zero, .L8097FA84 /* 023F8 8097FA68 8FA20068 */ lw $v0, 0x0068($sp) .L8097FA6C: -/* 023FC 8097FA6C 8D08FA90 */ lw $t0, -0x0570($t0) ## 8015FA90 +/* 023FC 8097FA6C 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) /* 02400 8097FA70 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 02404 8097FA74 85091456 */ lh $t1, 0x1456($t0) ## 80161456 /* 02408 8097FA78 5521001D */ bnel $t1, $at, .L8097FAF0 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FAFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FAFC.s index 240745723b..03ac70b6fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FAFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FAFC.s @@ -3,7 +3,7 @@ glabel func_8097FAFC /* 02490 8097FB00 AFBF002C */ sw $ra, 0x002C($sp) /* 02494 8097FB04 AFA50054 */ sw $a1, 0x0054($sp) /* 02498 8097FB08 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 0249C 8097FB0C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0249C 8097FB0C 3C0F8016 */ lui $t7, %hi(gGameInfo) /* 024A0 8097FB10 28410247 */ slti $at, $v0, 0x0247 /* 024A4 8097FB14 14200004 */ bne $at, $zero, .L8097FB28 /* 024A8 8097FB18 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 @@ -11,7 +11,7 @@ glabel func_8097FAFC /* 024B0 8097FB20 54200007 */ bnel $at, $zero, .L8097FB40 /* 024B4 8097FB24 8C880024 */ lw $t0, 0x0024($a0) ## 00000024 .L8097FB28: -/* 024B8 8097FB28 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 024B8 8097FB28 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 024BC 8097FB2C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 024C0 8097FB30 85F81456 */ lh $t8, 0x1456($t7) ## 80161456 /* 024C4 8097FB34 57010036 */ bnel $t8, $at, .L8097FC10 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FC1C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FC1C.s index 00ff5f9042..b40a9b1486 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FC1C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FC1C.s @@ -11,12 +11,12 @@ glabel func_8097FC1C /* 025D0 8097FC40 ACD90000 */ sw $t9, 0x0000($a2) ## FFFFFFD4 /* 025D4 8097FC44 8DF80004 */ lw $t8, 0x0004($t7) ## 80982654 /* 025D8 8097FC48 284102AB */ slti $at, $v0, 0x02AB -/* 025DC 8097FC4C 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 025DC 8097FC4C 3C088016 */ lui $t0, %hi(gGameInfo) /* 025E0 8097FC50 ACD80004 */ sw $t8, 0x0004($a2) ## FFFFFFD8 /* 025E4 8097FC54 8DF90008 */ lw $t9, 0x0008($t7) ## 80982658 /* 025E8 8097FC58 10200006 */ beq $at, $zero, .L8097FC74 /* 025EC 8097FC5C ACD90008 */ sw $t9, 0x0008($a2) ## FFFFFFDC -/* 025F0 8097FC60 8D08FA90 */ lw $t0, -0x0570($t0) ## 8015FA90 +/* 025F0 8097FC60 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) /* 025F4 8097FC64 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 /* 025F8 8097FC68 85091456 */ lh $t1, 0x1456($t0) ## 80161456 /* 025FC 8097FC6C 5521001A */ bnel $t1, $at, .L8097FCD8 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FCE4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FCE4.s index 0acb447593..b0c68a40a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FCE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FCE4.s @@ -11,8 +11,8 @@ glabel func_8097FCE4 /* 02684 8097FCF4 240101F7 */ addiu $at, $zero, 0x01F7 ## $at = 000001F7 /* 02688 8097FCF8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0268C 8097FCFC 10410005 */ beq $v0, $at, .L8097FD14 -/* 02690 8097FD00 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 02694 8097FD04 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 02690 8097FD00 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 02694 8097FD04 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 02698 8097FD08 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 0269C 8097FD0C 85F81456 */ lh $t8, 0x1456($t7) ## 80161456 /* 026A0 8097FD10 17010013 */ bne $t8, $at, .L8097FD60 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980430.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980430.s index 2b7559d2bb..ddd0aa7d49 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980430.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980430.s @@ -11,12 +11,12 @@ glabel func_80980430 /* 02DE4 80980454 ACD90000 */ sw $t9, 0x0000($a2) ## FFFFFFD4 /* 02DE8 80980458 8DF80004 */ lw $t8, 0x0004($t7) ## 80982680 /* 02DEC 8098045C 284102C6 */ slti $at, $v0, 0x02C6 -/* 02DF0 80980460 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 02DF0 80980460 3C088016 */ lui $t0, %hi(gGameInfo) /* 02DF4 80980464 ACD80004 */ sw $t8, 0x0004($a2) ## FFFFFFD8 /* 02DF8 80980468 8DF90008 */ lw $t9, 0x0008($t7) ## 80982684 /* 02DFC 8098046C 10200006 */ beq $at, $zero, .L80980488 /* 02E00 80980470 ACD90008 */ sw $t9, 0x0008($a2) ## FFFFFFDC -/* 02E04 80980474 8D08FA90 */ lw $t0, -0x0570($t0) ## 8015FA90 +/* 02E04 80980474 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) /* 02E08 80980478 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 /* 02E0C 8098047C 85091456 */ lh $t1, 0x1456($t0) ## 80161456 /* 02E10 80980480 5521001D */ bnel $t1, $at, .L809804F8 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980504.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980504.s index 1ec5d490ad..bd764eeeff 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980504.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980504.s @@ -16,12 +16,12 @@ glabel func_80980504 /* 02EB8 80980528 ACD90000 */ sw $t9, 0x0000($a2) ## FFFFFFD4 /* 02EBC 8098052C 8DF80004 */ lw $t8, 0x0004($t7) ## 8098268C /* 02EC0 80980530 284102C1 */ slti $at, $v0, 0x02C1 -/* 02EC4 80980534 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 02EC4 80980534 3C088016 */ lui $t0, %hi(gGameInfo) /* 02EC8 80980538 ACD80004 */ sw $t8, 0x0004($a2) ## FFFFFFD8 /* 02ECC 8098053C 8DF90008 */ lw $t9, 0x0008($t7) ## 80982690 /* 02ED0 80980540 10200006 */ beq $at, $zero, .L8098055C /* 02ED4 80980544 ACD90008 */ sw $t9, 0x0008($a2) ## FFFFFFDC -/* 02ED8 80980548 8D08FA90 */ lw $t0, -0x0570($t0) ## 8015FA90 +/* 02ED8 80980548 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) /* 02EDC 8098054C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 /* 02EE0 80980550 85091456 */ lh $t1, 0x1456($t0) ## 80161456 /* 02EE4 80980554 5521001D */ bnel $t1, $at, .L809805CC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809805D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809805D8.s index 4d2d8be73e..bbad581d95 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809805D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809805D8.s @@ -16,7 +16,7 @@ glabel func_809805D8 /* 02F8C 809805FC ACD90000 */ sw $t9, 0x0000($a2) ## FFFFFFD4 /* 02F90 80980600 8DF80004 */ lw $t8, 0x0004($t7) ## 80982698 /* 02F94 80980604 284102E4 */ slti $at, $v0, 0x02E4 -/* 02F98 80980608 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 02F98 80980608 3C088016 */ lui $t0, %hi(gGameInfo) /* 02F9C 8098060C ACD80004 */ sw $t8, 0x0004($a2) ## FFFFFFD8 /* 02FA0 80980610 8DF90008 */ lw $t9, 0x0008($t7) ## 8098269C /* 02FA4 80980614 14200004 */ bne $at, $zero, .L80980628 @@ -25,7 +25,7 @@ glabel func_809805D8 /* 02FB0 80980620 54200007 */ bnel $at, $zero, .L80980640 /* 02FB4 80980624 8FA20068 */ lw $v0, 0x0068($sp) .L80980628: -/* 02FB8 80980628 8D08FA90 */ lw $t0, -0x0570($t0) ## 8015FA90 +/* 02FB8 80980628 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) /* 02FBC 8098062C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B /* 02FC0 80980630 85091456 */ lh $t1, 0x1456($t0) ## 80161456 /* 02FC4 80980634 5521001D */ bnel $t1, $at, .L809806AC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809806B8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809806B8.s index a218485ef9..bd3597718b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809806B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809806B8.s @@ -11,12 +11,12 @@ glabel func_809806B8 /* 0306C 809806DC ACD90000 */ sw $t9, 0x0000($a2) ## FFFFFFD4 /* 03070 809806E0 8DF80004 */ lw $t8, 0x0004($t7) ## 809826A4 /* 03074 809806E4 284103C5 */ slti $at, $v0, 0x03C5 -/* 03078 809806E8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 03078 809806E8 3C088016 */ lui $t0, %hi(gGameInfo) /* 0307C 809806EC ACD80004 */ sw $t8, 0x0004($a2) ## FFFFFFD8 /* 03080 809806F0 8DF90008 */ lw $t9, 0x0008($t7) ## 809826A8 /* 03084 809806F4 10200006 */ beq $at, $zero, .L80980710 /* 03088 809806F8 ACD90008 */ sw $t9, 0x0008($a2) ## FFFFFFDC -/* 0308C 809806FC 8D08FA90 */ lw $t0, -0x0570($t0) ## 8015FA90 +/* 0308C 809806FC 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) /* 03090 80980700 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 03094 80980704 85091456 */ lh $t1, 0x1456($t0) ## 80161456 /* 03098 80980708 5521001D */ bnel $t1, $at, .L80980780 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098078C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098078C.s index bcda87ba89..2a49a05bbe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098078C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098078C.s @@ -11,12 +11,12 @@ glabel func_8098078C /* 03140 809807B0 ACD90000 */ sw $t9, 0x0000($a2) ## FFFFFFD4 /* 03144 809807B4 8DF80004 */ lw $t8, 0x0004($t7) ## 809826B0 /* 03148 809807B8 284103AC */ slti $at, $v0, 0x03AC -/* 0314C 809807BC 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 0314C 809807BC 3C088016 */ lui $t0, %hi(gGameInfo) /* 03150 809807C0 ACD80004 */ sw $t8, 0x0004($a2) ## FFFFFFD8 /* 03154 809807C4 8DF90008 */ lw $t9, 0x0008($t7) ## 809826B4 /* 03158 809807C8 10200006 */ beq $at, $zero, .L809807E4 /* 0315C 809807CC ACD90008 */ sw $t9, 0x0008($a2) ## FFFFFFDC -/* 03160 809807D0 8D08FA90 */ lw $t0, -0x0570($t0) ## 8015FA90 +/* 03160 809807D0 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) /* 03164 809807D4 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E /* 03168 809807D8 85091456 */ lh $t1, 0x1456($t0) ## 80161456 /* 0316C 809807DC 5521001C */ bnel $t1, $at, .L80980850 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098085C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098085C.s index 8e7b6f26a5..df3728edb9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098085C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098085C.s @@ -17,8 +17,8 @@ glabel func_8098085C /* 031FC 8098086C 2401003A */ addiu $at, $zero, 0x003A ## $at = 0000003A /* 03200 80980870 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 /* 03204 80980874 10610006 */ beq $v1, $at, .L80980890 -/* 03208 80980878 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0320C 8098087C 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 03208 80980878 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 0320C 8098087C 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 03210 80980880 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 03214 80980884 85CF1456 */ lh $t7, 0x1456($t6) ## 80161456 /* 03218 80980888 55E10019 */ bnel $t7, $at, .L809808F0 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809809C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809809C0.s index a7242c4030..f7235be708 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809809C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809809C0.s @@ -16,8 +16,8 @@ glabel func_809809C0 /* 03374 809809E4 284101E1 */ slti $at, $v0, 0x01E1 /* 03378 809809E8 14200005 */ bne $at, $zero, .L80980A00 .L809809EC: -/* 0337C 809809EC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 03380 809809F0 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 0337C 809809EC 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 03380 809809F0 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 03384 809809F4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 03388 809809F8 85F81456 */ lh $t8, 0x1456($t7) ## 80161456 /* 0338C 809809FC 17010031 */ bne $t8, $at, .L80980AC4 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980AD4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980AD4.s index b5b1db6791..5a2beb3726 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980AD4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980AD4.s @@ -10,8 +10,8 @@ glabel func_80980AD4 /* 03470 80980AE0 240101DD */ addiu $at, $zero, 0x01DD ## $at = 000001DD /* 03474 80980AE4 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 /* 03478 80980AE8 10410005 */ beq $v0, $at, .L80980B00 -/* 0347C 80980AEC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 03480 80980AF0 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 0347C 80980AEC 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 03480 80980AF0 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 03484 80980AF4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 03488 80980AF8 85CF1458 */ lh $t7, 0x1458($t6) ## 80161458 /* 0348C 80980AFC 15E10016 */ bne $t7, $at, .L80980B58 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980B68.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980B68.s index 1f5d9f09df..58b8c9f35e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980B68.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980B68.s @@ -5,8 +5,8 @@ glabel func_80980B68 /* 03504 80980B74 2401013D */ addiu $at, $zero, 0x013D ## $at = 0000013D /* 03508 80980B78 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 /* 0350C 80980B7C 10410005 */ beq $v0, $at, .L80980B94 -/* 03510 80980B80 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 03514 80980B84 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 03510 80980B80 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 03514 80980B84 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 03518 80980B88 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0351C 80980B8C 85CF145A */ lh $t7, 0x145A($t6) ## 8016145A /* 03520 80980B90 15E10016 */ bne $t7, $at, .L80980BEC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980BFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980BFC.s index f92c25555a..c7045a5de1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980BFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980BFC.s @@ -10,8 +10,8 @@ glabel func_80980BFC /* 03598 80980C08 240102E4 */ addiu $at, $zero, 0x02E4 ## $at = 000002E4 /* 0359C 80980C0C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 /* 035A0 80980C10 10410005 */ beq $v0, $at, .L80980C28 -/* 035A4 80980C14 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 035A8 80980C18 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 035A4 80980C14 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 035A8 80980C18 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 035AC 80980C1C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 035B0 80980C20 85CF145C */ lh $t7, 0x145C($t6) ## 8016145C /* 035B4 80980C24 15E10016 */ bne $t7, $at, .L80980C80 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981114.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981114.s index 67918ab59b..4bb6e04d0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981114.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981114.s @@ -7,8 +7,8 @@ glabel D_80982B14 .text glabel func_80981114 -/* 03AA4 80981114 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 03AA8 80981118 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 03AA4 80981114 3C038016 */ lui $v1, %hi(gGameInfo) +/* 03AA8 80981118 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) /* 03AAC 8098111C AFA50004 */ sw $a1, 0x0004($sp) /* 03AB0 80981120 84820172 */ lh $v0, 0x0172($a0) ## 00000172 /* 03AB4 80981124 846E14D6 */ lh $t6, 0x14D6($v1) ## 801614D6 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s index 6708df03cd..5ae8db213f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s @@ -30,8 +30,8 @@ glabel func_809811AC /* 03B64 809811D4 3C018098 */ lui $at, %hi(D_80982B18) ## $at = 80980000 /* 03B68 809811D8 C4282B18 */ lwc1 $f8, %lo(D_80982B18)($at) /* 03B6C 809811DC 44862000 */ mtc1 $a2, $f4 ## $f4 = 0.00 -/* 03B70 809811E0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 03B74 809811E4 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 03B70 809811E0 3C028016 */ lui $v0, %hi(gGameInfo) +/* 03B74 809811E4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 03B78 809811E8 468021A0 */ cvt.s.w $f6, $f4 /* 03B7C 809811EC 46083002 */ mul.s $f0, $f6, $f8 /* 03B80 809811F0 46000005 */ abs.s $f0, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981458.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981458.s index 238a8ed9b2..3b11f6e893 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981458.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981458.s @@ -12,14 +12,14 @@ glabel func_80981458 /* 03DF0 80981460 AFA40070 */ sw $a0, 0x0070($sp) /* 03DF4 80981464 AFA50074 */ sw $a1, 0x0074($sp) /* 03DF8 80981468 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 03DFC 8098146C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 03DFC 8098146C 3C0F8016 */ lui $t7, %hi(gGameInfo) /* 03E00 80981470 28410358 */ slti $at, $v0, 0x0358 /* 03E04 80981474 14200003 */ bne $at, $zero, .L80981484 /* 03E08 80981478 2841037B */ slti $at, $v0, 0x037B /* 03E0C 8098147C 14200005 */ bne $at, $zero, .L80981494 /* 03E10 80981480 00000000 */ nop .L80981484: -/* 03E14 80981484 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 03E14 80981484 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 03E18 80981488 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D /* 03E1C 8098148C 85F81456 */ lh $t8, 0x1456($t7) ## 80161456 /* 03E20 80981490 17010020 */ bne $t8, $at, .L80981514 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815FC.s index 801aeb9c67..e690662e0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815FC.s @@ -7,8 +7,8 @@ glabel D_80982B28 .text glabel func_809815FC -/* 03F8C 809815FC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 03F90 80981600 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 03F8C 809815FC 3C038016 */ lui $v1, %hi(gGameInfo) +/* 03F90 80981600 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) /* 03F94 80981604 AFA50004 */ sw $a1, 0x0004($sp) /* 03F98 80981608 84820172 */ lh $v0, 0x0172($a0) ## 00000172 /* 03F9C 8098160C 846E14DA */ lh $t6, 0x14DA($v1) ## 801614DA diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s index f96103224d..b5b3d6afb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s @@ -26,8 +26,8 @@ glabel func_80981694 /* 0403C 809816AC 3C018098 */ lui $at, %hi(D_80982B2C) ## $at = 80980000 /* 04040 809816B0 C4282B2C */ lwc1 $f8, %lo(D_80982B2C)($at) /* 04044 809816B4 44862000 */ mtc1 $a2, $f4 ## $f4 = 0.00 -/* 04048 809816B8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0404C 809816BC 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 04048 809816B8 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0404C 809816BC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 04050 809816C0 468021A0 */ cvt.s.w $f6, $f4 /* 04054 809816C4 46083002 */ mul.s $f0, $f6, $f8 /* 04058 809816C8 46000005 */ abs.s $f0, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981A08.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981A08.s index a976e4f118..a88b01667b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981A08.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981A08.s @@ -7,8 +7,8 @@ glabel D_80982B34 .text glabel func_80981A08 -/* 04398 80981A08 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0439C 80981A0C 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 04398 80981A08 3C038016 */ lui $v1, %hi(gGameInfo) +/* 0439C 80981A0C 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) /* 043A0 80981A10 AFA50004 */ sw $a1, 0x0004($sp) /* 043A4 80981A14 84820172 */ lh $v0, 0x0172($a0) ## 00000172 /* 043A8 80981A18 846E14DE */ lh $t6, 0x14DE($v1) ## 801614DE diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s index 4f2b647fd1..21b32a7f25 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s @@ -25,8 +25,8 @@ glabel func_80981AA0 /* 04444 80981AB4 3C018098 */ lui $at, %hi(D_80982B38) ## $at = 80980000 /* 04448 80981AB8 C4282B38 */ lwc1 $f8, %lo(D_80982B38)($at) /* 0444C 80981ABC 44872000 */ mtc1 $a3, $f4 ## $f4 = 0.00 -/* 04450 80981AC0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 04454 80981AC4 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 04450 80981AC0 3C028016 */ lui $v0, %hi(gGameInfo) +/* 04454 80981AC4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 04458 80981AC8 468021A0 */ cvt.s.w $f6, $f4 /* 0445C 80981ACC 46083002 */ mul.s $f0, $f6, $f8 /* 04460 80981AD0 46000005 */ abs.s $f0, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981D20.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981D20.s index c9e9d30b8e..1d2c5076e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981D20.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981D20.s @@ -7,8 +7,8 @@ glabel D_80982B40 .text glabel func_80981D20 -/* 046B0 80981D20 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 046B4 80981D24 24C6FA90 */ addiu $a2, $a2, 0xFA90 ## $a2 = 8015FA90 +/* 046B0 80981D20 3C068016 */ lui $a2, %hi(gGameInfo) +/* 046B4 80981D24 24C6FA90 */ addiu $a2, %lo(gGameInfo) /* 046B8 80981D28 8CC30000 */ lw $v1, 0x0000($a2) ## 8015FA90 /* 046BC 80981D2C 84820172 */ lh $v0, 0x0172($a0) ## 00000172 /* 046C0 80981D30 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s index aea26f7f76..2cc2df7247 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s @@ -24,8 +24,8 @@ glabel func_80981E84 /* 04824 80981E94 3C018098 */ lui $at, %hi(D_80982B44) ## $at = 80980000 /* 04828 80981E98 C4282B44 */ lwc1 $f8, %lo(D_80982B44)($at) /* 0482C 80981E9C 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 04830 80981EA0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 04834 80981EA4 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 04830 80981EA0 3C028016 */ lui $v0, %hi(gGameInfo) +/* 04834 80981EA4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 04838 80981EA8 468021A0 */ cvt.s.w $f6, $f4 /* 0483C 80981EAC 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 04840 80981EB0 24050040 */ addiu $a1, $zero, 0x0040 ## $a1 = 00000040 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820E0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820E0.s index 9fd76a0eee..21018de01c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820E0.s @@ -7,8 +7,8 @@ glabel D_80982B4C .text glabel func_809820E0 -/* 04A70 809820E0 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 04A74 809820E4 24C6FA90 */ addiu $a2, $a2, 0xFA90 ## $a2 = 8015FA90 +/* 04A70 809820E0 3C068016 */ lui $a2, %hi(gGameInfo) +/* 04A74 809820E4 24C6FA90 */ addiu $a2, %lo(gGameInfo) /* 04A78 809820E8 8CC30000 */ lw $v1, 0x0000($a2) ## 8015FA90 /* 04A7C 809820EC 84820172 */ lh $v0, 0x0172($a0) ## 00000172 /* 04A80 809820F0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s index 333aa75b8c..cef3b5e5b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s @@ -24,8 +24,8 @@ glabel func_80982244 /* 04BE4 80982254 3C018098 */ lui $at, %hi(D_80982B50) ## $at = 80980000 /* 04BE8 80982258 C4282B50 */ lwc1 $f8, %lo(D_80982B50)($at) /* 04BEC 8098225C 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 04BF0 80982260 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 04BF4 80982264 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 04BF0 80982260 3C028016 */ lui $v0, %hi(gGameInfo) +/* 04BF4 80982264 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 04BF8 80982268 468021A0 */ cvt.s.w $f6, $f4 /* 04BFC 8098226C 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 04C00 80982270 3401BE80 */ ori $at, $zero, 0xBE80 ## $at = 0000BE80 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983500.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983500.s index d4bb5d26f3..51c63a537b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983500.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983500.s @@ -18,10 +18,10 @@ glabel func_80983500 /* 0023C 8098353C 0C0295B2 */ jal func_800A56C8 /* 00240 80983540 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 00244 80983544 10400028 */ beq $v0, $zero, .L809835E8 -/* 00248 80983548 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0024C 8098354C 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 00250 80983550 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00254 80983554 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 +/* 00248 80983548 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0024C 8098354C 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 00250 80983550 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00254 80983554 25CE33E8 */ addiu $t6, %lo(D_801333E8) /* 00258 80983558 AFAE0014 */ sw $t6, 0x0014($sp) /* 0025C 8098355C AFA70010 */ sw $a3, 0x0010($sp) /* 00260 80983560 2404392D */ addiu $a0, $zero, 0x392D ## $a0 = 0000392D @@ -35,10 +35,10 @@ glabel func_80983500 /* 00278 80983578 0C0295B2 */ jal func_800A56C8 /* 0027C 8098357C 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 00280 80983580 10400019 */ beq $v0, $zero, .L809835E8 -/* 00284 80983584 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00288 80983588 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 0028C 8098358C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00290 80983590 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 00284 80983584 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00288 80983588 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 0028C 8098358C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00290 80983590 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 00294 80983594 AFAF0014 */ sw $t7, 0x0014($sp) /* 00298 80983598 AFA70010 */ sw $a3, 0x0010($sp) /* 0029C 8098359C 2404392F */ addiu $a0, $zero, 0x392F ## $a0 = 0000392F @@ -52,10 +52,10 @@ glabel func_80983500 /* 002B4 809835B4 0C0295B2 */ jal func_800A56C8 /* 002B8 809835B8 3C054110 */ lui $a1, 0x4110 ## $a1 = 41100000 /* 002BC 809835BC 1040000A */ beq $v0, $zero, .L809835E8 -/* 002C0 809835C0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 002C4 809835C4 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 002C8 809835C8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 002CC 809835CC 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 002C0 809835C0 3C078013 */ lui $a3, %hi(D_801333E0) +/* 002C4 809835C4 3C188013 */ lui $t8, %hi(D_801333E8) +/* 002C8 809835C8 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 002CC 809835CC 271833E8 */ addiu $t8, %lo(D_801333E8) /* 002D0 809835D0 AFB80014 */ sw $t8, 0x0014($sp) /* 002D4 809835D4 AFA70010 */ sw $a3, 0x0010($sp) /* 002D8 809835D8 2404392E */ addiu $a0, $zero, 0x392E ## $a0 = 0000392E diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983820.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983820.s index e49f5be008..1fdf633ccd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983820.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983820.s @@ -39,11 +39,11 @@ glabel func_80983820 /* 005A8 809838A8 AFB80048 */ sw $t8, 0x0048($sp) /* 005AC 809838AC 2631035C */ addiu $s1, $s1, 0x035C ## $s1 = 0600035C .L809838B0: -/* 005B0 809838B0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 005B0 809838B0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 005B4 809838B4 44070000 */ mfc1 $a3, $f0 /* 005B8 809838B8 0C00AC78 */ jal ActorShape_Init -/* 005BC 809838BC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 005BC 809838BC 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 005C0 809838C0 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 005C4 809838C4 26190190 */ addiu $t9, $s0, 0x0190 ## $t9 = 00000190 /* 005C8 809838C8 2608019C */ addiu $t0, $s0, 0x019C ## $t0 = 0000019C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F30.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F30.s index 99281f1f8a..8ac85e76ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F30.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F30.s @@ -7,11 +7,11 @@ glabel func_80983F30 /* 00C44 80983F44 0C0295B2 */ jal func_800A56C8 /* 00C48 80983F48 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00C4C 80983F4C 1040000B */ beq $v0, $zero, .L80983F7C -/* 00C50 80983F50 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 00C50 80983F50 3C078013 */ lui $a3, %hi(D_801333E0) /* 00C54 80983F54 8FA50020 */ lw $a1, 0x0020($sp) -/* 00C58 80983F58 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 00C5C 80983F5C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00C60 80983F60 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 +/* 00C58 80983F58 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 00C5C 80983F5C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00C60 80983F60 25CE33E8 */ addiu $t6, %lo(D_801333E8) /* 00C64 80983F64 AFAE0014 */ sw $t6, 0x0014($sp) /* 00C68 80983F68 AFA70010 */ sw $a3, 0x0010($sp) /* 00C6C 80983F6C 2404392C */ addiu $a0, $zero, 0x392C ## $a0 = 0000392C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s index 5014887186..57299ac928 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s @@ -15,8 +15,8 @@ glabel DemoIm_Init /* 027F8 809873D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 027FC 809873DC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 02800 809873E0 AFBF002C */ sw $ra, 0x002C($sp) -/* 02804 809873E4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 02808 809873E8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 02804 809873E4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 02808 809873E8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0280C 809873EC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02810 809873F0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 02814 809873F4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984E58.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984E58.s index 08cd86d9a2..cc2b010f9d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984E58.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984E58.s @@ -2,8 +2,8 @@ glabel func_80984E58 /* 00278 80984E58 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0027C 80984E5C AFBF0014 */ sw $ra, 0x0014($sp) /* 00280 80984E60 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00284 80984E64 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 00288 80984E68 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 00284 80984E64 3C088016 */ lui $t0, %hi(gGameInfo) +/* 00288 80984E68 2508FA90 */ addiu $t0, %lo(gGameInfo) /* 0028C 80984E6C 8C4F0024 */ lw $t7, 0x0024($v0) ## 00000024 /* 00290 80984E70 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 00294 80984E74 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F10.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F10.s index f9af979c53..7a975d759b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F10.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F10.s @@ -3,8 +3,8 @@ glabel func_80984F10 /* 00334 80984F14 AFBF0014 */ sw $ra, 0x0014($sp) /* 00338 80984F18 AFA5001C */ sw $a1, 0x001C($sp) /* 0033C 80984F1C 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00340 80984F20 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00344 80984F24 2463FA90 */ addiu $v1, $v1, 0xFA90 ## $v1 = 8015FA90 +/* 00340 80984F20 3C038016 */ lui $v1, %hi(gGameInfo) +/* 00344 80984F24 2463FA90 */ addiu $v1, %lo(gGameInfo) /* 00348 80984F28 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 /* 0034C 80984F2C 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 00350 80984F30 44814000 */ mtc1 $at, $f8 ## $f8 = 12.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F94.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F94.s index c1f584ed08..17df566daa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F94.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F94.s @@ -3,8 +3,8 @@ glabel func_80984F94 /* 003B8 80984F98 AFBF0014 */ sw $ra, 0x0014($sp) /* 003BC 80984F9C AFA5001C */ sw $a1, 0x001C($sp) /* 003C0 80984FA0 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 003C4 80984FA4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 003C8 80984FA8 2463FA90 */ addiu $v1, $v1, 0xFA90 ## $v1 = 8015FA90 +/* 003C4 80984FA4 3C038016 */ lui $v1, %hi(gGameInfo) +/* 003C8 80984FA8 2463FA90 */ addiu $v1, %lo(gGameInfo) /* 003CC 80984FAC 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 /* 003D0 80984FB0 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 003D4 80984FB4 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098544C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098544C.s index e3b794b8ca..663f33614b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098544C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098544C.s @@ -1,6 +1,6 @@ glabel func_8098544C -/* 0086C 8098544C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00870 80985450 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0086C 8098544C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00870 80985450 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00874 80985454 904E1415 */ lbu $t6, 0x1415($v0) ## 8015FA75 /* 00878 80985458 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0087C 8098545C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858C8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858C8.s index dee201aac6..689cc194ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858C8.s @@ -5,8 +5,8 @@ glabel func_809858C8 /* 00CF4 809858D4 AFBF0034 */ sw $ra, 0x0034($sp) /* 00CF8 809858D8 AFA40038 */ sw $a0, 0x0038($sp) /* 00CFC 809858DC C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 00D00 809858E0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00D04 809858E4 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 00D00 809858E0 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 00D04 809858E4 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 00D08 809858E8 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00D0C 809858EC 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 /* 00D10 809858F0 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809859E0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809859E0.s index a147466f0c..dc75b70ec2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809859E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809859E0.s @@ -13,8 +13,8 @@ glabel func_809859E0 /* 00E2C 80985A0C 24820268 */ addiu $v0, $a0, 0x0268 ## $v0 = 00000268 /* 00E30 80985A10 C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000268 /* 00E34 80985A14 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00E38 80985A18 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00E3C 80985A1C 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 +/* 00E38 80985A18 3C058016 */ lui $a1, %hi(gGameInfo) +/* 00E3C 80985A1C 24A5FA90 */ addiu $a1, %lo(gGameInfo) /* 00E40 80985A20 46062200 */ add.s $f8, $f4, $f6 /* 00E44 80985A24 24180009 */ addiu $t8, $zero, 0x0009 ## $t8 = 00000009 /* 00E48 80985A28 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 @@ -63,8 +63,8 @@ glabel func_809859E0 /* 00EF0 80985AD0 10000014 */ beq $zero, $zero, .L80985B24 /* 00EF4 80985AD4 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 .L80985AD8: -/* 00EF8 80985AD8 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00EFC 80985ADC 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 +/* 00EF8 80985AD8 3C058016 */ lui $a1, %hi(gGameInfo) +/* 00EFC 80985ADC 24A5FA90 */ addiu $a1, %lo(gGameInfo) /* 00F00 80985AE0 8CAB0000 */ lw $t3, 0x0000($a1) ## 8015FA90 /* 00F04 80985AE4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00F08 80985AE8 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985B34.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985B34.s index 8cfd61fa21..8cf24361e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985B34.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985B34.s @@ -31,8 +31,8 @@ glabel func_80985B34 /* 00FC0 80985BA0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 00FC4 80985BA4 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 /* 00FC8 80985BA8 AE180264 */ sw $t8, 0x0264($s0) ## 00000264 -/* 00FCC 80985BAC 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 00FD0 80985BB0 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 00FCC 80985BAC 3C198016 */ lui $t9, %hi(gGameInfo) +/* 00FD0 80985BB0 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 00FD4 80985BB4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00FD8 80985BB8 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 00FDC 80985BBC 8728145E */ lh $t0, 0x145E($t9) ## 8016145E diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s index 2f2440f9be..c6fbd2e93f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s @@ -35,10 +35,10 @@ glabel func_80985CE8 /* 01164 80985D44 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 01168 80985D48 00076100 */ sll $t4, $a3, 4 /* 0116C 80985D4C 000C6F02 */ srl $t5, $t4, 28 -/* 01170 80985D50 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 01170 80985D50 3C0F8016 */ lui $t7, %hi(gSegments) /* 01174 80985D54 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 01178 80985D58 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 0117C 80985D5C 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 +/* 0117C 80985D5C 25EF6FA8 */ addiu $t7, %lo(gSegments) /* 01180 80985D60 000D7080 */ sll $t6, $t5, 2 /* 01184 80985D64 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 01188 80985D68 01CF2021 */ addu $a0, $t6, $t7 @@ -65,12 +65,12 @@ glabel func_80985CE8 /* 011DC 80985DBC AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 011E0 80985DC0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 011E4 80985DC4 8FA80078 */ lw $t0, 0x0078($sp) -/* 011E8 80985DC8 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 +/* 011E8 80985DC8 3C0C8011 */ lui $t4, %hi(D_80116280) /* 011EC 80985DCC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 011F0 80985DD0 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 011F4 80985DD4 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 011F8 80985DD8 8D19026C */ lw $t9, 0x026C($t0) ## 0000026C -/* 011FC 80985DDC 258C6280 */ addiu $t4, $t4, 0x6280 ## $t4 = 80116280 +/* 011FC 80985DDC 258C6280 */ addiu $t4, %lo(D_80116280) /* 01200 80985DE0 356B0030 */ ori $t3, $t3, 0x0030 ## $t3 = DB060030 /* 01204 80985DE4 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000000 /* 01208 80985DE8 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986570.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986570.s index f059af22cd..c61d91bb07 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986570.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986570.s @@ -17,11 +17,11 @@ glabel func_80986570 /* 019CC 809865AC 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 /* 019D0 809865B0 0C0107CD */ jal func_80041F34 /* 019D4 809865B4 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 019D8 809865B8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 019DC 809865BC 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 019E0 809865C0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 019D8 809865B8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 019DC 809865BC 3C188013 */ lui $t8, %hi(D_801333E8) +/* 019E0 809865C0 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 019E4 809865C4 24430800 */ addiu $v1, $v0, 0x0800 ## $v1 = 00000800 -/* 019E8 809865C8 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 019E8 809865C8 271833E8 */ addiu $t8, %lo(D_801333E8) /* 019EC 809865CC AFB80014 */ sw $t8, 0x0014($sp) /* 019F0 809865D0 3064FFFF */ andi $a0, $v1, 0xFFFF ## $a0 = 00000800 /* 019F4 809865D4 AFA70010 */ sw $a3, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869F8.s index e226e56441..4614fa8845 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869F8.s @@ -1,6 +1,6 @@ glabel func_809869F8 -/* 01E18 809869F8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 01E1C 809869FC 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 01E18 809869F8 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 01E1C 809869FC 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 01E20 80986A00 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 01E24 80986A04 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 /* 01E28 80986A08 85CF1474 */ lh $t7, 0x1474($t6) ## 80161474 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986A5C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986A5C.s index 17f987754b..b2f1663fc1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986A5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986A5C.s @@ -1,6 +1,6 @@ glabel func_80986A5C -/* 01E7C 80986A5C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 01E80 80986A60 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 01E7C 80986A5C 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 01E80 80986A60 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 01E84 80986A64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01E88 80986A68 AFBF0014 */ sw $ra, 0x0014($sp) /* 01E8C 80986A6C 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BF8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BF8.s index c91a2746bc..8abefc54c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BF8.s @@ -1,6 +1,6 @@ glabel func_80986BF8 -/* 02018 80986BF8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0201C 80986BFC 95CEF53C */ lhu $t6, -0x0AC4($t6) ## 8015F53C +/* 02018 80986BF8 3C0E8016 */ lui $t6, %hi(gSaveContext+0xedc) +/* 0201C 80986BFC 95CEF53C */ lhu $t6, %lo(gSaveContext+0xedc)($t6) /* 02020 80986C00 AFA50004 */ sw $a1, 0x0004($sp) /* 02024 80986C04 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 02028 80986C08 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986C30.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986C30.s index 97de7300df..ce3589a813 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986C30.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986C30.s @@ -11,17 +11,17 @@ glabel func_80986C30 /* 02074 80986C54 00027100 */ sll $t6, $v0, 4 /* 02078 80986C58 000E7F02 */ srl $t7, $t6, 28 /* 0207C 80986C5C 000FC080 */ sll $t8, $t7, 2 -/* 02080 80986C60 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 02080 80986C60 3C198016 */ lui $t9, %hi(gSegments) /* 02084 80986C64 0338C821 */ addu $t9, $t9, $t8 /* 02088 80986C68 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0208C 80986C6C 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 0208C 80986C6C 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 02090 80986C70 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 02094 80986C74 00414024 */ and $t0, $v0, $at /* 02098 80986C78 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 0209C 80986C7C 03284821 */ addu $t1, $t9, $t0 -/* 020A0 80986C80 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 020A0 80986C80 3C038016 */ lui $v1, %hi(gSaveContext) /* 020A4 80986C84 01215021 */ addu $t2, $t1, $at -/* 020A8 80986C88 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 020A8 80986C88 2463E660 */ addiu $v1, %lo(gSaveContext) /* 020AC 80986C8C ACCA1D68 */ sw $t2, 0x1D68($a2) ## 00001D68 /* 020B0 80986C90 946C0EDE */ lhu $t4, 0x0EDE($v1) ## 8015F53E /* 020B4 80986C94 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CC8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CC8.s index c50f5296df..a075ff5754 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CC8.s @@ -1,6 +1,6 @@ glabel func_80986CC8 -/* 020E8 80986CC8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 020EC 80986CCC 95CEF53C */ lhu $t6, -0x0AC4($t6) ## 8015F53C +/* 020E8 80986CC8 3C0E8016 */ lui $t6, %hi(gSaveContext+0xedc) +/* 020EC 80986CCC 95CEF53C */ lhu $t6, %lo(gSaveContext+0xedc)($t6) /* 020F0 80986CD0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 020F4 80986CD4 2418001A */ addiu $t8, $zero, 0x001A ## $t8 = 0000001A /* 020F8 80986CD8 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CFC.s index 4f9f77a0ad..f68b8942cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CFC.s @@ -4,8 +4,8 @@ glabel func_80986CFC /* 02124 80986D04 0C261A97 */ jal func_80986A5C /* 02128 80986D08 AFA40018 */ sw $a0, 0x0018($sp) /* 0212C 80986D0C 10400008 */ beq $v0, $zero, .L80986D30 -/* 02130 80986D10 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 02134 80986D14 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 02130 80986D10 3C028016 */ lui $v0, %hi(gSaveContext) +/* 02134 80986D14 2442E660 */ addiu $v0, %lo(gSaveContext) /* 02138 80986D18 944E0EDC */ lhu $t6, 0x0EDC($v0) ## 8015F53C /* 0213C 80986D1C 8FB90018 */ lw $t9, 0x0018($sp) /* 02140 80986D20 24180013 */ addiu $t8, $zero, 0x0013 ## $t8 = 00000013 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986D40.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986D40.s index 186f1962e2..5e26b11648 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986D40.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986D40.s @@ -1,6 +1,6 @@ glabel func_80986D40 -/* 02160 80986D40 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 02164 80986D44 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 02160 80986D40 3C028016 */ lui $v0, %hi(gSaveContext) +/* 02164 80986D44 2442E660 */ addiu $v0, %lo(gSaveContext) /* 02168 80986D48 8C4E1360 */ lw $t6, 0x1360($v0) ## 8015F9C0 /* 0216C 80986D4C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02170 80986D50 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987064.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987064.s index 58c092e657..834a9bb14c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987064.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987064.s @@ -2,13 +2,13 @@ glabel func_80987064 /* 02484 80987064 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 02488 80987068 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 /* 0248C 8098706C C4840268 */ lwc1 $f4, 0x0268($a0) ## 00000268 -/* 02490 80987070 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 02490 80987070 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 02494 80987074 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 02498 80987078 46062200 */ add.s $f8, $f4, $f6 /* 0249C 8098707C 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 024A0 80987080 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF /* 024A4 80987084 E4880268 */ swc1 $f8, 0x0268($a0) ## 00000268 -/* 024A8 80987088 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 024A8 80987088 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 024AC 8098708C C4840268 */ lwc1 $f4, 0x0268($a0) ## 00000268 /* 024B0 80987090 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 /* 024B4 80987094 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987128.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987128.s index 7b2cfaee54..a1cdf6a36c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987128.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987128.s @@ -1,6 +1,6 @@ glabel func_80987128 -/* 02548 80987128 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0254C 8098712C 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 02548 80987128 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 0254C 8098712C 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 02550 80987130 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 02554 80987134 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 02558 80987138 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s index a6d33af9bd..b9e7872287 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s @@ -35,9 +35,9 @@ glabel func_80987658 /* 02AD4 809876B4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02AD8 809876B8 00076100 */ sll $t4, $a3, 4 /* 02ADC 809876BC 000C6F02 */ srl $t5, $t4, 28 -/* 02AE0 809876C0 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 02AE0 809876C0 3C0F8016 */ lui $t7, %hi(gSegments) /* 02AE4 809876C4 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 02AE8 809876C8 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 +/* 02AE8 809876C8 25EF6FA8 */ addiu $t7, %lo(gSegments) /* 02AEC 809876CC 000D7080 */ sll $t6, $t5, 2 /* 02AF0 809876D0 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 02AF4 809876D4 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 @@ -64,7 +64,7 @@ glabel func_80987658 /* 02B48 80987728 01A67021 */ addu $t6, $t5, $a2 /* 02B4C 8098772C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 02B50 80987730 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02B54 80987734 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 +/* 02B54 80987734 3C0B8011 */ lui $t3, %hi(D_80116280+0x10) /* 02B58 80987738 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 02B5C 8098773C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 02B60 80987740 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 @@ -72,7 +72,7 @@ glabel func_80987658 /* 02B68 80987748 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 02B6C 8098774C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02B70 80987750 354A0030 */ ori $t2, $t2, 0x0030 ## $t2 = DB060030 -/* 02B74 80987754 256B6290 */ addiu $t3, $t3, 0x6290 ## $t3 = 80116290 +/* 02B74 80987754 256B6290 */ addiu $t3, %lo(D_80116280+0x10) /* 02B78 80987758 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 02B7C 8098775C AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 /* 02B80 80987760 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Draw.s index e147e3f2c2..98990fccfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Draw.s @@ -57,11 +57,11 @@ glabel L809899F8 /* 00BA8 80989A28 0C00B84B */ jal func_8002E12C /* 00BAC 80989A2C 24067530 */ addiu $a2, $zero, 0x7530 ## $a2 = 00007530 /* 00BB0 80989A30 14400003 */ bne $v0, $zero, .L80989A40 -/* 00BB4 80989A34 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 00BB4 80989A34 3C198016 */ lui $t9, %hi(gSaveContext+4) /* 00BB8 80989A38 10000038 */ beq $zero, $zero, .L80989B1C /* 00BBC 80989A3C 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C .L80989A40: -/* 00BC0 80989A40 8F39E664 */ lw $t9, -0x199C($t9) ## 8015E664 +/* 00BC0 80989A40 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) /* 00BC4 80989A44 5320000B */ beql $t9, $zero, .L80989A74 /* 00BC8 80989A48 962A1D74 */ lhu $t2, 0x1D74($s1) ## 00001D74 /* 00BCC 80989A4C 96281D74 */ lhu $t0, 0x1D74($s1) ## 00001D74 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s index 29ca3b873b..e5a70147cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s @@ -209,12 +209,12 @@ glabel L809890DC /* 0025C 809890DC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00260 809890E0 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 00264 809890E4 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00268 809890E8 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 00268 809890E8 3C188016 */ lui $t8, %hi(gSaveContext+0xedc) /* 0026C 809890EC E6620058 */ swc1 $f2, 0x0058($s3) ## 00000058 /* 00270 809890F0 E6620054 */ swc1 $f2, 0x0054($s3) ## 00000054 /* 00274 809890F4 E6620050 */ swc1 $f2, 0x0050($s3) ## 00000050 /* 00278 809890F8 E6720168 */ swc1 $f18, 0x0168($s3) ## 00000168 -/* 0027C 809890FC 9718F53C */ lhu $t8, -0x0AC4($t8) ## 8015F53C +/* 0027C 809890FC 9718F53C */ lhu $t8, %lo(gSaveContext+0xedc)($t8) /* 00280 80989100 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00284 80989104 00300821 */ addu $at, $at, $s0 /* 00288 80989108 33190800 */ andi $t9, $t8, 0x0800 ## $t9 = 00000000 @@ -279,12 +279,12 @@ glabel L80989190 /* 0035C 809891DC E6620054 */ swc1 $f2, 0x0054($s3) ## 00000054 /* 00360 809891E0 15A1000C */ bne $t5, $at, .L80989214 /* 00364 809891E4 E6620050 */ swc1 $f2, 0x0050($s3) ## 00000050 -/* 00368 809891E8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0036C 809891EC 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 00370 809891F0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00374 809891F4 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 00378 809891F8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0037C 809891FC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00368 809891E8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0036C 809891EC 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 00370 809891F0 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00374 809891F4 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 00378 809891F8 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0037C 809891FC 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00380 80989200 AFAE0014 */ sw $t6, 0x0014($sp) /* 00384 80989204 AFA70010 */ sw $a3, 0x0010($sp) /* 00388 80989208 240428A6 */ addiu $a0, $zero, 0x28A6 ## $a0 = 000028A6 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809892A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809892A4.s index 2ca6763498..88de3fc419 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809892A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809892A4.s @@ -229,13 +229,13 @@ glabel L80989348 /* 00710 80989590 8FBF0014 */ lw $ra, 0x0014($sp) /* 00714 80989594 84CF00A4 */ lh $t7, 0x00A4($a2) ## 000000A4 /* 00718 80989598 24010043 */ addiu $at, $zero, 0x0043 ## $at = 00000043 -/* 0071C 8098959C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 0071C 8098959C 3C038016 */ lui $v1, %hi(gSaveContext) /* 00720 809895A0 15E10010 */ bne $t7, $at, .L809895E4 -/* 00724 809895A4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00728 809895A8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00724 809895A4 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 00728 809895A8 3C038016 */ lui $v1, %hi(gSaveContext) /* 0072C 809895AC 24180019 */ addiu $t8, $zero, 0x0019 ## $t8 = 00000019 /* 00730 809895B0 3C018099 */ lui $at, %hi(D_8098CF84) ## $at = 80990000 -/* 00734 809895B4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00734 809895B4 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00738 809895B8 A438CF84 */ sh $t8, %lo(D_8098CF84)($at) /* 0073C 809895BC 8C790004 */ lw $t9, 0x0004($v1) ## 8015E664 /* 00740 809895C0 3C0A8099 */ lui $t2, %hi(D_8098BBA0) ## $t2 = 80990000 @@ -265,8 +265,8 @@ glabel L80989348 .L80989614: /* 00794 80989614 0C03032E */ jal func_800C0CB8 /* 00798 80989618 AFA70018 */ sw $a3, 0x0018($sp) -/* 0079C 8098961C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 007A0 80989620 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0079C 8098961C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 007A0 80989620 2463E660 */ addiu $v1, %lo(gSaveContext) /* 007A4 80989624 10400003 */ beq $v0, $zero, .L80989634 /* 007A8 80989628 8FA70018 */ lw $a3, 0x0018($sp) /* 007AC 8098962C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 @@ -284,8 +284,8 @@ glabel L8098964C /* 007D4 80989654 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 007D8 80989658 1701000D */ bne $t8, $at, .L80989690 /* 007DC 8098965C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 007E0 80989660 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 007E4 80989664 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 007E0 80989660 3C038016 */ lui $v1, %hi(gSaveContext) +/* 007E4 80989664 2463E660 */ addiu $v1, %lo(gSaveContext) /* 007E8 80989668 8C790004 */ lw $t9, 0x0004($v1) ## 8015E664 /* 007EC 8098966C 3C0A8099 */ lui $t2, %hi(D_8098BCB0) ## $t2 = 80990000 /* 007F0 80989670 3C098099 */ lui $t1, %hi(D_8098C1B0) ## $t1 = 80990000 @@ -298,8 +298,8 @@ glabel L8098964C /* 00808 80989688 1000000C */ beq $zero, $zero, .L809896BC /* 0080C 8098968C ACCA1D68 */ sw $t2, 0x1D68($a2) ## 00001D68 .L80989690: -/* 00810 80989690 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00814 80989694 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00810 80989690 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00814 80989694 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00818 80989698 8C6B0004 */ lw $t3, 0x0004($v1) ## 8015E664 /* 0081C 8098969C 3C0D8099 */ lui $t5, %hi(D_8098BA20) ## $t5 = 80990000 /* 00820 809896A0 3C0C8099 */ lui $t4, %hi(D_8098BF00) ## $t4 = 80990000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809898C8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809898C8.s index 463c4a4d56..656dfcc5fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809898C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809898C8.s @@ -23,8 +23,8 @@ glabel func_809898C8 /* 00A98 80989918 0C00BE0A */ jal Audio_PlayActorSound2 /* 00A9C 8098991C 24052893 */ addiu $a1, $zero, 0x2893 ## $a1 = 00002893 -/* 00AA0 80989920 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00AA4 80989924 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00AA0 80989920 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00AA4 80989924 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00AA8 80989928 944E0EDC */ lhu $t6, 0x0EDC($v0) ## 8015F53C /* 00AAC 8098992C 35CF0800 */ ori $t7, $t6, 0x0800 ## $t7 = 00000800 /* 00AB0 80989930 A44F0EDC */ sh $t7, 0x0EDC($v0) ## 8015F53C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s index f430f05c85..575f78d9e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s @@ -131,8 +131,8 @@ glabel func_80989D24 .L80989EC0: /* 01040 80989EC0 0C2626D5 */ jal func_80989B54 /* 01044 80989EC4 87A600DE */ lh $a2, 0x00DE($sp) -/* 01048 80989EC8 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 0104C 80989ECC 8D4AE660 */ lw $t2, -0x19A0($t2) ## 8015E660 +/* 01048 80989EC8 3C0A8016 */ lui $t2, %hi(gSaveContext) +/* 0104C 80989ECC 8D4AE660 */ lw $t2, %lo(gSaveContext)($t2) /* 01050 80989ED0 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 /* 01054 80989ED4 15410009 */ bne $t2, $at, .L80989EFC /* 01058 80989ED8 00000000 */ nop @@ -166,11 +166,11 @@ glabel func_80989D24 /* 010B4 80989F34 46001103 */ div.s $f4, $f2, $f0 /* 010B8 80989F38 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 010BC 80989F3C 44819000 */ mtc1 $at, $f18 ## $f18 = 150.00 -/* 010C0 80989F40 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 010C4 80989F44 8DADE660 */ lw $t5, -0x19A0($t5) ## 8015E660 +/* 010C0 80989F40 3C0D8016 */ lui $t5, %hi(gSaveContext) +/* 010C4 80989F44 8DADE660 */ lw $t5, %lo(gSaveContext)($t5) /* 010C8 80989F48 C6AA00E4 */ lwc1 $f10, 0x00E4($s5) ## 000000E4 /* 010CC 80989F4C 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 010D0 80989F50 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 010D0 80989F50 3C028016 */ lui $v0, %hi(gSaveContext) /* 010D4 80989F54 46122182 */ mul.s $f6, $f4, $f18 /* 010D8 80989F58 15A10006 */ bne $t5, $at, .L80989F74 /* 010DC 80989F5C 46065300 */ add.s $f12, $f10, $f6 @@ -185,7 +185,7 @@ glabel func_80989D24 /* 010FC 80989F7C 46065200 */ add.s $f8, $f10, $f6 /* 01100 80989F80 E6680154 */ swc1 $f8, 0x0154($s3) ## 00000154 .L80989F84: -/* 01104 80989F84 8C42E660 */ lw $v0, -0x19A0($v0) ## 8015E660 +/* 01104 80989F84 8C42E660 */ lw $v0, %lo(gSaveContext)($v0) /* 01108 80989F88 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 /* 0110C 80989F8C 54410011 */ bnel $v0, $at, .L80989FD4 /* 01110 80989F90 240100CD */ addiu $at, $zero, 0x00CD ## $at = 000000CD @@ -262,8 +262,8 @@ glabel func_80989D24 /* 01218 8098A098 44069000 */ mfc1 $a2, $f18 /* 0121C 8098A09C 0C034261 */ jal Matrix_Translate /* 01220 8098A0A0 00000000 */ nop -/* 01224 8098A0A4 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 01228 8098A0A8 8D8CE660 */ lw $t4, -0x19A0($t4) ## 8015E660 +/* 01224 8098A0A4 3C0C8016 */ lui $t4, %hi(gSaveContext) +/* 01228 8098A0A8 8D8CE660 */ lw $t4, %lo(gSaveContext)($t4) /* 0122C 8098A0AC 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 /* 01230 8098A0B0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 01234 8098A0B4 11810003 */ beq $t4, $at, .L8098A0C4 @@ -273,12 +273,12 @@ glabel func_80989D24 .L8098A0C4: /* 01244 8098A0C4 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 /* 01248 8098A0C8 3C0EE700 */ lui $t6, 0xE700 ## $t6 = E7000000 -/* 0124C 8098A0CC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0124C 8098A0CC 3C0F8016 */ lui $t7, %hi(gSaveContext) /* 01250 8098A0D0 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 /* 01254 8098A0D4 AE4D02D0 */ sw $t5, 0x02D0($s2) ## 000002D0 /* 01258 8098A0D8 AC600004 */ sw $zero, 0x0004($v1) ## 00000004 /* 0125C 8098A0DC AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 -/* 01260 8098A0E0 8DEFE660 */ lw $t7, -0x19A0($t7) ## 8015E660 +/* 01260 8098A0E0 8DEFE660 */ lw $t7, %lo(gSaveContext)($t7) /* 01264 8098A0E4 240100CD */ addiu $at, $zero, 0x00CD ## $at = 000000CD /* 01268 8098A0E8 3C0EC8FF */ lui $t6, 0xC8FF ## $t6 = C8FF0000 /* 0126C 8098A0EC 15E10011 */ bne $t7, $at, .L8098A134 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s index 5f851e3a2f..07d49b8efc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s @@ -49,10 +49,10 @@ glabel func_8098A4F0 /* 016F4 8098A574 00027100 */ sll $t6, $v0, 4 /* 016F8 8098A578 000E7F02 */ srl $t7, $t6, 28 /* 016FC 8098A57C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 01700 8098A580 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 01700 8098A580 3C198016 */ lui $t9, %hi(gSegments) /* 01704 8098A584 3C080401 */ lui $t0, 0x0401 ## $t0 = 04010000 /* 01708 8098A588 25080050 */ addiu $t0, $t0, 0x0050 ## $t0 = 04010050 -/* 0170C 8098A58C 27396FA8 */ addiu $t9, $t9, 0x6FA8 ## $t9 = 80166FA8 +/* 0170C 8098A58C 27396FA8 */ addiu $t9, %lo(gSegments) /* 01710 8098A590 000FC080 */ sll $t8, $t7, 2 /* 01714 8098A594 3C1E0100 */ lui $s8, 0x0100 ## $s8 = 01000000 /* 01718 8098A598 3C15E300 */ lui $s5, 0xE300 ## $s5 = E3000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s index b0d0d36151..0e4c14694b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s @@ -27,10 +27,10 @@ glabel func_8098A9A4 /* 01B50 8098A9D0 0C031AB1 */ jal Graph_OpenDisps /* 01B54 8098A9D4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01B58 8098A9D8 922E1D6C */ lbu $t6, 0x1D6C($s1) ## 00001D6C -/* 01B5C 8098A9DC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 01B5C 8098A9DC 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1360) /* 01B60 8098A9E0 11C00005 */ beq $t6, $zero, .L8098A9F8 /* 01B64 8098A9E4 00000000 */ nop -/* 01B68 8098A9E8 8DEFF9C0 */ lw $t7, -0x0640($t7) ## 8015F9C0 +/* 01B68 8098A9E8 8DEFF9C0 */ lw $t7, %lo(gSaveContext+0x1360)($t7) /* 01B6C 8098A9EC 29E10004 */ slti $at, $t7, 0x0004 /* 01B70 8098A9F0 1420002A */ bne $at, $zero, .L8098AA9C /* 01B74 8098A9F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s index ceee0f97d2..1b2ad0f661 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s @@ -40,9 +40,9 @@ glabel func_8098ABC0 /* 01D70 8098ABF0 F7B80030 */ sdc1 $f24, 0x0030($sp) /* 01D74 8098ABF4 F7B60028 */ sdc1 $f22, 0x0028($sp) /* 01D78 8098ABF8 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 01D7C 8098ABFC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 01D7C 8098ABFC 3C0F8016 */ lui $t7, %hi(gSaveContext+4) /* 01D80 8098AC00 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 01D84 8098AC04 8DEFE664 */ lw $t7, -0x199C($t7) ## 8015E664 +/* 01D84 8098AC04 8DEFE664 */ lw $t7, %lo(gSaveContext+4)($t7) /* 01D88 8098AC08 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 01D8C 8098AC0C AFAE00E4 */ sw $t6, 0x00E4($sp) /* 01D90 8098AC10 A3AF00B7 */ sb $t7, 0x00B7($sp) @@ -155,8 +155,8 @@ glabel func_8098ABC0 /* 01F20 8098ADA0 E6040158 */ swc1 $f4, 0x0158($s0) ## 00000158 .L8098ADA4: /* 01F24 8098ADA4 862C001C */ lh $t4, 0x001C($s1) ## 0000001C -/* 01F28 8098ADA8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01F2C 8098ADAC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01F28 8098ADA8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01F2C 8098ADAC 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01F30 8098ADB0 16AC001E */ bne $s5, $t4, .L8098AE2C /* 01F34 8098ADB4 240420A7 */ addiu $a0, $zero, 0x20A7 ## $a0 = 000020A7 /* 01F38 8098ADB8 3C058099 */ lui $a1, %hi(D_8098CF88) ## $a1 = 80990000 @@ -190,10 +190,10 @@ glabel func_8098ABC0 /* 01FA4 8098AE24 10000025 */ beq $zero, $zero, .L8098AEBC /* 01FA8 8098AE28 A20A0172 */ sb $t2, 0x0172($s0) ## 00000172 .L8098AE2C: -/* 01FAC 8098AE2C 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 -/* 01FB0 8098AE30 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 -/* 01FB4 8098AE34 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 01FB8 8098AE38 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 01FAC 8098AE2C 3C0B8013 */ lui $t3, %hi(D_801333E8) +/* 01FB0 8098AE30 256B33E8 */ addiu $t3, %lo(D_801333E8) +/* 01FB4 8098AE34 3C058013 */ lui $a1, %hi(D_801333D4) +/* 01FB8 8098AE38 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 01FBC 8098AE3C AFAB0014 */ sw $t3, 0x0014($sp) /* 01FC0 8098AE40 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 01FC4 8098AE44 0C03DCE3 */ jal Audio_PlaySoundGeneral @@ -430,7 +430,7 @@ glabel func_8098ABC0 /* 0230C 8098B18C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 02310 8098B190 8629001C */ lh $t1, 0x001C($s1) ## 0000001C /* 02314 8098B194 3C0A8099 */ lui $t2, %hi(D_8098C31C) ## $t2 = 80990000 -/* 02318 8098B198 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 02318 8098B198 3C058016 */ lui $a1, %hi(D_801604C4) /* 0231C 8098B19C 16A90019 */ bne $s5, $t1, .L8098B204 /* 02320 8098B1A0 254AC31C */ addiu $t2, $t2, %lo(D_8098C31C) ## $t2 = 8098C31C /* 02324 8098B1A4 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 @@ -440,7 +440,7 @@ glabel func_8098ABC0 /* 02334 8098B1B4 AE6A02D0 */ sw $t2, 0x02D0($s3) ## 000002D0 /* 02338 8098B1B8 02412821 */ addu $a1, $s2, $at /* 0233C 8098B1BC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 02340 8098B1C0 94AC04C4 */ lhu $t4, 0x04C4($a1) ## 801604C4 +/* 02340 8098B1C0 94AC04C4 */ lhu $t4, %lo(D_801604C4)($a1) /* 02344 8098B1C4 3C0E8099 */ lui $t6, %hi(D_8098C31C) ## $t6 = 80990000 /* 02348 8098B1C8 25CEC31C */ addiu $t6, $t6, %lo(D_8098C31C) ## $t6 = 8098C31C /* 0234C 8098B1CC 000C6880 */ sll $t5, $t4, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D87C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D87C.s index e643663793..bce49b413e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D87C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D87C.s @@ -71,22 +71,22 @@ glabel func_8098D87C /* 00974 8098D944 A60001F4 */ sh $zero, 0x01F4($s0) ## 000001F4 /* 00978 8098D948 004A1021 */ addu $v0, $v0, $t2 /* 0097C 8098D94C 8C42E14C */ lw $v0, %lo(D_8098E14C)($v0) -/* 00980 8098D950 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00980 8098D950 3C0F8016 */ lui $t7, %hi(gSegments) /* 00984 8098D954 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00988 8098D958 00026100 */ sll $t4, $v0, 4 /* 0098C 8098D95C 000C6F02 */ srl $t5, $t4, 28 /* 00990 8098D960 000D7080 */ sll $t6, $t5, 2 /* 00994 8098D964 01EE7821 */ addu $t7, $t7, $t6 -/* 00998 8098D968 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 00998 8098D968 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 0099C 8098D96C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 009A0 8098D970 00415824 */ and $t3, $v0, $at /* 009A4 8098D974 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 009A8 8098D978 016FC021 */ addu $t8, $t3, $t7 /* 009AC 8098D97C 0301C821 */ addu $t9, $t8, $at /* 009B0 8098D980 AE391D68 */ sw $t9, 0x1D68($s1) ## 00001D68 -/* 009B4 8098D984 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 009B4 8098D984 3C018016 */ lui $at, %hi(gSaveContext+0x1414) /* 009B8 8098D988 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 009BC 8098D98C A028FA74 */ sb $t0, -0x058C($at) ## 8015FA74 +/* 009BC 8098D98C A028FA74 */ sb $t0, %lo(gSaveContext+0x1414)($at) /* 009C0 8098D990 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L8098D994: /* 009C4 8098D994 8FA5002C */ lw $a1, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s index ae0d1e6145..0979aaf0e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s @@ -53,11 +53,11 @@ glabel func_8098D9C0 /* 00A70 8098DA40 000D7702 */ srl $t6, $t5, 28 /* 00A74 8098DA44 000E7880 */ sll $t7, $t6, 2 /* 00A78 8098DA48 C52601E8 */ lwc1 $f6, 0x01E8($t1) ## 8098E35C -/* 00A7C 8098DA4C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 00A7C 8098DA4C 3C188016 */ lui $t8, %hi(gSegments) /* 00A80 8098DA50 030FC021 */ addu $t8, $t8, $t7 /* 00A84 8098DA54 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00A88 8098DA58 46062032 */ c.eq.s $f4, $f6 -/* 00A8C 8098DA5C 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 00A8C 8098DA5C 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 00A90 8098DA60 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00A94 8098DA64 00416024 */ and $t4, $v0, $at /* 00A98 8098DA68 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Init.s index 0650b6ea67..30719fb9bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Init.s @@ -5,8 +5,8 @@ glabel DemoSa_Init /* 01958 8098FDB8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0195C 8098FDBC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 01960 8098FDC0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01964 8098FDC4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 01968 8098FDC8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 01964 8098FDC4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 01968 8098FDC8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0196C 8098FDCC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 01970 8098FDD0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 01974 8098FDD4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E960.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E960.s index 79154836b5..f73793e8da 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E960.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E960.s @@ -1,6 +1,6 @@ glabel func_8098E960 -/* 00500 8098E960 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00504 8098E964 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00500 8098E960 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00504 8098E964 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00508 8098E968 904E1415 */ lbu $t6, 0x1415($v0) ## 8015FA75 /* 0050C 8098E96C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00510 8098E970 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE28.s index 8b652d1414..d5a502493b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE28.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE28.s @@ -5,8 +5,8 @@ glabel func_8098EE28 /* 009D4 8098EE34 AFBF0034 */ sw $ra, 0x0034($sp) /* 009D8 8098EE38 AFA40038 */ sw $a0, 0x0038($sp) /* 009DC 8098EE3C C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 009E0 8098EE40 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 009E4 8098EE44 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 009E0 8098EE40 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 009E4 8098EE44 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 009E8 8098EE48 E7A40010 */ swc1 $f4, 0x0010($sp) /* 009EC 8098EE4C 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 009F0 8098EE50 85CF1482 */ lh $t7, 0x1482($t6) ## 80161482 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEFC.s index 5862891523..69b68a9876 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEFC.s @@ -13,8 +13,8 @@ glabel func_8098EEFC /* 00AC8 8098EF28 248201A0 */ addiu $v0, $a0, 0x01A0 ## $v0 = 000001A0 /* 00ACC 8098EF2C C4440000 */ lwc1 $f4, 0x0000($v0) ## 000001A0 /* 00AD0 8098EF30 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00AD4 8098EF34 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00AD8 8098EF38 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 +/* 00AD4 8098EF34 3C058016 */ lui $a1, %hi(gGameInfo) +/* 00AD8 8098EF38 24A5FA90 */ addiu $a1, %lo(gGameInfo) /* 00ADC 8098EF3C 46062200 */ add.s $f8, $f4, $f6 /* 00AE0 8098EF40 24180009 */ addiu $t8, $zero, 0x0009 ## $t8 = 00000009 /* 00AE4 8098EF44 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 @@ -63,8 +63,8 @@ glabel func_8098EEFC /* 00B8C 8098EFEC 10000014 */ beq $zero, $zero, .L8098F040 /* 00B90 8098EFF0 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 .L8098EFF4: -/* 00B94 8098EFF4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00B98 8098EFF8 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 +/* 00B94 8098EFF4 3C058016 */ lui $a1, %hi(gGameInfo) +/* 00B98 8098EFF8 24A5FA90 */ addiu $a1, %lo(gGameInfo) /* 00B9C 8098EFFC 8CAB0000 */ lw $t3, 0x0000($a1) ## 8015FA90 /* 00BA0 8098F000 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00BA4 8098F004 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F050.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F050.s index f0bc65c363..cd5b81e055 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F050.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F050.s @@ -12,8 +12,8 @@ glabel func_8098F050 /* 00C18 8098F078 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 00C1C 8098F07C AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 /* 00C20 8098F080 AC8F019C */ sw $t7, 0x019C($a0) ## 0000019C -/* 00C24 8098F084 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 00C28 8098F088 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 00C24 8098F084 3C188016 */ lui $t8, %hi(gGameInfo) +/* 00C28 8098F088 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 00C2C 8098F08C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00C30 8098F090 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 /* 00C34 8098F094 8719145E */ lh $t9, 0x145E($t8) ## 8016145E diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s index b614784c48..f6b3fa3537 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s @@ -38,7 +38,7 @@ glabel func_8098F1C0 /* 00DC8 8098F228 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 /* 00DCC 8098F22C 8FA90078 */ lw $t1, 0x0078($sp) /* 00DD0 8098F230 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00DD4 8098F234 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 +/* 00DD4 8098F234 3C078016 */ lui $a3, %hi(gSegments) /* 00DD8 8098F238 0009C100 */ sll $t8, $t1, 4 /* 00DDC 8098F23C 00187702 */ srl $t6, $t8, 28 /* 00DE0 8098F240 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -46,7 +46,7 @@ glabel func_8098F1C0 /* 00DE8 8098F248 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 00DEC 8098F24C 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 00DF0 8098F250 000EC880 */ sll $t9, $t6, 2 -/* 00DF4 8098F254 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 +/* 00DF4 8098F254 24E76FA8 */ addiu $a3, %lo(gSegments) /* 00DF8 8098F258 00F92021 */ addu $a0, $a3, $t9 /* 00DFC 8098F25C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 00E00 8098F260 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 @@ -86,7 +86,7 @@ glabel func_8098F1C0 /* 00E88 8098F2E8 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 00E8C 8098F2EC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00E90 8098F2F0 8FA80088 */ lw $t0, 0x0088($sp) -/* 00E94 8098F2F4 3C0A8011 */ lui $t2, 0x8011 ## $t2 = 80110000 +/* 00E94 8098F2F4 3C0A8011 */ lui $t2, %hi(D_80116280) /* 00E98 8098F2F8 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 00E9C 8098F2FC AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 00EA0 8098F300 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 @@ -96,7 +96,7 @@ glabel func_8098F1C0 /* 00EB0 8098F310 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000024 /* 00EB4 8098F314 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 00EB8 8098F318 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00EBC 8098F31C 254A6280 */ addiu $t2, $t2, 0x6280 ## $t2 = 80116280 +/* 00EBC 8098F31C 254A6280 */ addiu $t2, %lo(D_80116280) /* 00EC0 8098F320 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 00EC4 8098F324 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 00EC8 8098F328 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F480.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F480.s index f55abad674..33a07c4d8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F480.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F480.s @@ -2,13 +2,13 @@ glabel func_8098F480 /* 01020 8098F480 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01024 8098F484 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 /* 01028 8098F488 C48401A0 */ lwc1 $f4, 0x01A0($a0) ## 000001A0 -/* 0102C 8098F48C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0102C 8098F48C 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 01030 8098F490 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01034 8098F494 46062200 */ add.s $f8, $f4, $f6 /* 01038 8098F498 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 0103C 8098F49C 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF /* 01040 8098F4A0 E48801A0 */ swc1 $f8, 0x01A0($a0) ## 000001A0 -/* 01044 8098F4A4 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 01044 8098F4A4 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 01048 8098F4A8 C48401A0 */ lwc1 $f4, 0x01A0($a0) ## 000001A0 /* 0104C 8098F4AC 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 /* 01050 8098F4B0 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F544.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F544.s index bf1f3912d3..628044ce90 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F544.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F544.s @@ -1,6 +1,6 @@ glabel func_8098F544 -/* 010E4 8098F544 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 010E8 8098F548 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 010E4 8098F544 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 010E8 8098F548 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 010EC 8098F54C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 010F0 8098F550 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 010F4 8098F554 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F8F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F8F8.s index c68eddb722..2863b949ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F8F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F8F8.s @@ -2,13 +2,13 @@ glabel func_8098F8F8 /* 01498 8098F8F8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0149C 8098F8FC 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 /* 014A0 8098F900 C48401A0 */ lwc1 $f4, 0x01A0($a0) ## 000001A0 -/* 014A4 8098F904 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 014A4 8098F904 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 014A8 8098F908 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 014AC 8098F90C 46062200 */ add.s $f8, $f4, $f6 /* 014B0 8098F910 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 014B4 8098F914 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF /* 014B8 8098F918 E48801A0 */ swc1 $f8, 0x01A0($a0) ## 000001A0 -/* 014BC 8098F91C 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 014BC 8098F91C 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 014C0 8098F920 C48401A0 */ lwc1 $f4, 0x01A0($a0) ## 000001A0 /* 014C4 8098F924 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 /* 014C8 8098F928 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA2C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA2C.s index 6f348777c6..da7737f5fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA2C.s @@ -1,6 +1,6 @@ glabel func_8098FA2C -/* 015CC 8098FA2C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 015D0 8098FA30 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 015CC 8098FA2C 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 015D0 8098FA30 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 015D4 8098FA34 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 015D8 8098FA38 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 015DC 8098FA3C 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s index 72662112ed..d6e0b014dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s @@ -37,7 +37,7 @@ glabel func_8098FEB4 /* 01AB8 8098FF18 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 01ABC 8098FF1C 8FA8005C */ lw $t0, 0x005C($sp) /* 01AC0 8098FF20 8FAA0070 */ lw $t2, 0x0070($sp) -/* 01AC4 8098FF24 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 +/* 01AC4 8098FF24 3C078016 */ lui $a3, %hi(gSegments) /* 01AC8 8098FF28 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01ACC 8098FF2C 000A7100 */ sll $t6, $t2, 4 /* 01AD0 8098FF30 000ECF02 */ srl $t9, $t6, 28 @@ -45,7 +45,7 @@ glabel func_8098FEB4 /* 01AD8 8098FF38 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01ADC 8098FF3C 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 01AE0 8098FF40 00195880 */ sll $t3, $t9, 2 -/* 01AE4 8098FF44 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 +/* 01AE4 8098FF44 24E76FA8 */ addiu $a3, %lo(gSegments) /* 01AE8 8098FF48 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 01AEC 8098FF4C 00EB2021 */ addu $a0, $a3, $t3 /* 01AF0 8098FF50 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 @@ -86,7 +86,7 @@ glabel func_8098FEB4 /* 01B7C 8098FFDC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 01B80 8098FFE0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01B84 8098FFE4 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 01B88 8098FFE8 3C0F8011 */ lui $t7, 0x8011 ## $t7 = 80110000 +/* 01B88 8098FFE8 3C0F8011 */ lui $t7, %hi(D_80116280+0x10) /* 01B8C 8098FFEC 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 01B90 8098FFF0 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 01B94 8098FFF4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 @@ -96,7 +96,7 @@ glabel func_8098FEB4 /* 01BA4 80990004 35AD0030 */ ori $t5, $t5, 0x0030 ## $t5 = DB060030 /* 01BA8 80990008 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 01BAC 8099000C AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 -/* 01BB0 80990010 25EF6290 */ addiu $t7, $t7, 0x6290 ## $t7 = 80116290 +/* 01BB0 80990010 25EF6290 */ addiu $t7, %lo(D_80116280+0x10) /* 01BB4 80990014 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 01BB8 80990018 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01BBC 8099001C 8FA30080 */ lw $v1, 0x0080($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_809937B4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_809937B4.s index d86426f5dc..d89f71e90c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_809937B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_809937B4.s @@ -5,8 +5,8 @@ glabel func_809937B4 /* 00100 809937C0 AFA50034 */ sw $a1, 0x0034($sp) /* 00104 809937C4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00108 809937C8 AC8E016C */ sw $t6, 0x016C($a0) ## 0000016C -/* 0010C 809937CC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00110 809937D0 8C42E664 */ lw $v0, -0x199C($v0) ## 8015E664 +/* 0010C 809937CC 3C028016 */ lui $v0, %hi(gSaveContext+4) +/* 00110 809937D0 8C42E664 */ lw $v0, %lo(gSaveContext+4)($v0) /* 00114 809937D4 3C088099 */ lui $t0, %hi(D_80993D70) ## $t0 = 80990000 /* 00118 809937D8 25083D70 */ addiu $t0, $t0, %lo(D_80993D70) ## $t0 = 80993D70 /* 0011C 809937DC 0002C900 */ sll $t9, $v0, 4 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993848.s b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993848.s index 239fdbaabb..5583b5f75d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993848.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993848.s @@ -1,6 +1,6 @@ glabel func_80993848 -/* 00188 80993848 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 0018C 8099384C 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 00188 80993848 3C078016 */ lui $a3, %hi(gSaveContext) +/* 0018C 8099384C 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 00190 80993850 8CE30004 */ lw $v1, 0x0004($a3) ## 8015E664 /* 00194 80993854 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00198 80993858 3C068099 */ lui $a2, %hi(D_80993D70) ## $a2 = 80990000 @@ -156,14 +156,14 @@ glabel func_80993848 /* 003C4 80993A84 45020011 */ bc1fl .L80993ACC /* 003C8 80993A88 8FA4002C */ lw $a0, 0x002C($sp) /* 003CC 80993A8C 92020178 */ lbu $v0, 0x0178($s0) ## 00000178 -/* 003D0 80993A90 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 003D4 80993A94 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 003D0 80993A90 3C078013 */ lui $a3, %hi(D_801333E0) +/* 003D4 80993A94 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 003D8 80993A98 30490001 */ andi $t1, $v0, 0x0001 ## $t1 = 00000000 /* 003DC 80993A9C 1520000A */ bne $t1, $zero, .L80993AC8 /* 003E0 80993AA0 344A0001 */ ori $t2, $v0, 0x0001 ## $t2 = 00000001 -/* 003E4 80993AA4 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 +/* 003E4 80993AA4 3C0B8013 */ lui $t3, %hi(D_801333E8) /* 003E8 80993AA8 A20A0178 */ sb $t2, 0x0178($s0) ## 00000178 -/* 003EC 80993AAC 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 +/* 003EC 80993AAC 256B33E8 */ addiu $t3, %lo(D_801333E8) /* 003F0 80993AB0 AFAB0014 */ sw $t3, 0x0014($sp) /* 003F4 80993AB4 AFA70010 */ sw $a3, 0x0010($sp) /* 003F8 80993AB8 24042884 */ addiu $a0, $zero, 0x2884 ## $a0 = 00002884 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_8099485C.s b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_8099485C.s index 06d52e7d76..bc5391c239 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_8099485C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/func_8099485C.s @@ -6,10 +6,10 @@ glabel func_8099485C /* 0028C 8099486C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00290 80994870 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 /* 00294 80994874 11C00013 */ beq $t6, $zero, .L809948C4 -/* 00298 80994878 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 00298 80994878 3C088016 */ lui $t0, %hi(gSaveContext) /* 0029C 8099487C 3C0F8099 */ lui $t7, %hi(func_8099496C) ## $t7 = 80990000 /* 002A0 80994880 25EF496C */ addiu $t7, $t7, %lo(func_8099496C) ## $t7 = 8099496C -/* 002A4 80994884 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 002A4 80994884 2508E660 */ addiu $t0, %lo(gSaveContext) /* 002A8 80994888 AC8F0168 */ sw $t7, 0x0168($a0) ## 00000168 /* 002AC 8099488C 95181402 */ lhu $t8, 0x1402($t0) ## 8015FA62 /* 002B0 80994890 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 @@ -35,8 +35,8 @@ glabel func_8099485C /* 002F4 809948D4 8FA6002C */ lw $a2, 0x002C($sp) /* 002F8 809948D8 1040001F */ beq $v0, $zero, .L80994958 /* 002FC 809948DC 00403825 */ or $a3, $v0, $zero ## $a3 = 00000000 -/* 00300 809948E0 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 00304 809948E4 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 00300 809948E0 3C088016 */ lui $t0, %hi(gSaveContext) +/* 00304 809948E4 2508E660 */ addiu $t0, %lo(gSaveContext) /* 00308 809948E8 950A1402 */ lhu $t2, 0x1402($t0) ## 8015FA62 /* 0030C 809948EC 8CC31C44 */ lw $v1, 0x1C44($a2) ## 00001C44 /* 00310 809948F0 240DFDFD */ addiu $t5, $zero, 0xFDFD ## $t5 = FFFFFDFD diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995CDC.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995CDC.s index 5f57ab69ec..32217c267d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995CDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995CDC.s @@ -1,7 +1,7 @@ glabel func_80995CDC /* 0108C 80995CDC 908E021C */ lbu $t6, 0x021C($a0) ## 0000021C /* 01090 80995CE0 3C060001 */ lui $a2, 0x0001 ## $a2 = 00010000 -/* 01094 80995CE4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 01094 80995CE4 3C038016 */ lui $v1, %hi(gSegments) /* 01098 80995CE8 000E7900 */ sll $t7, $t6, 4 /* 0109C 80995CEC 01EE7821 */ addu $t7, $t7, $t6 /* 010A0 80995CF0 000F7880 */ sll $t7, $t7, 2 @@ -9,7 +9,7 @@ glabel func_80995CDC /* 010A8 80995CF8 0306C821 */ addu $t9, $t8, $a2 /* 010AC 80995CFC 8F2817B4 */ lw $t0, 0x17B4($t9) ## 000017B4 /* 010B0 80995D00 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 010B4 80995D04 24636FA8 */ addiu $v1, $v1, 0x6FA8 ## $v1 = 80166FA8 +/* 010B4 80995D04 24636FA8 */ addiu $v1, %lo(gSegments) /* 010B8 80995D08 01074821 */ addu $t1, $t0, $a3 /* 010BC 80995D0C AC690018 */ sw $t1, 0x0018($v1) ## 80166FC0 /* 010C0 80995D10 8C820214 */ lw $v0, 0x0214($a0) ## 00000214 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Draw.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Draw.s index 5fc9ba8779..95fa41649a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Draw.s @@ -256,7 +256,7 @@ glabel DoorShutter_Draw /* 01B74 80997E14 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01B78 80997E18 862E0168 */ lh $t6, 0x0168($s1) ## 00000168 /* 01B7C 80997E1C 3C04809A */ lui $a0, %hi(D_809982D4) ## $a0 = 809A0000 -/* 01B80 80997E20 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 01B80 80997E20 3C098016 */ lui $t1, %hi(gSegments) /* 01B84 80997E24 000E6080 */ sll $t4, $t6, 2 /* 01B88 80997E28 008C2021 */ addu $a0, $a0, $t4 /* 01B8C 80997E2C 8C8482D4 */ lw $a0, %lo(D_809982D4)($a0) @@ -266,7 +266,7 @@ glabel DoorShutter_Draw /* 01B9C 80997E3C 0018CF02 */ srl $t9, $t8, 28 /* 01BA0 80997E40 00194080 */ sll $t0, $t9, 2 /* 01BA4 80997E44 01284821 */ addu $t1, $t1, $t0 -/* 01BA8 80997E48 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 +/* 01BA8 80997E48 8D296FA8 */ lw $t1, %lo(gSegments)($t1) /* 01BAC 80997E4C 00817824 */ and $t7, $a0, $at /* 01BB0 80997E50 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01BB4 80997E54 01E95021 */ addu $t2, $t7, $t1 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996B0C.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996B0C.s index a4b0404457..d7c1b5c8cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996B0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80996B0C.s @@ -22,10 +22,10 @@ glabel func_80996B0C /* 008B8 80996B58 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 /* 008BC 80996B5C 9218016A */ lbu $t8, 0x016A($s0) ## 0000016A /* 008C0 80996B60 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 008C4 80996B64 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 008C4 80996B64 3C068016 */ lui $a2, %hi(gSaveContext) /* 008C8 80996B68 1301000C */ beq $t8, $at, .L80996B9C /* 008CC 80996B6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008D0 80996B70 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 +/* 008D0 80996B70 24C6E660 */ addiu $a2, %lo(gSaveContext) /* 008D4 80996B74 94D91402 */ lhu $t9, 0x1402($a2) ## 8015FA62 /* 008D8 80996B78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 008DC 80996B7C 2405287C */ addiu $a1, $zero, 0x287C ## $a1 = 0000287C @@ -54,14 +54,14 @@ glabel func_80996B0C /* 00928 80996BC8 8D431C44 */ lw $v1, 0x1C44($t2) ## 00001C44 /* 0092C 80996BCC 920C016A */ lbu $t4, 0x016A($s0) ## 0000016A /* 00930 80996BD0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00934 80996BD4 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 00934 80996BD4 3C068016 */ lui $a2, %hi(gSaveContext) /* 00938 80996BD8 1581000E */ bne $t4, $at, .L80996C14 -/* 0093C 80996BDC 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 -/* 00940 80996BE0 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 00944 80996BE4 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 +/* 0093C 80996BDC 24C6E660 */ addiu $a2, %lo(gSaveContext) +/* 00940 80996BE0 3C068016 */ lui $a2, %hi(gSaveContext) +/* 00944 80996BE4 24C6E660 */ addiu $a2, %lo(gSaveContext) /* 00948 80996BE8 94CE1402 */ lhu $t6, 0x1402($a2) ## 8015FA62 -/* 0094C 80996BEC 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 -/* 00950 80996BF0 8DAD7120 */ lw $t5, 0x7120($t5) ## 80127120 +/* 0094C 80996BEC 3C0D8012 */ lui $t5, %hi(gBitFlags) +/* 00950 80996BF0 8DAD7120 */ lw $t5, %lo(gBitFlags)($t5) /* 00954 80996BF4 00CE7821 */ addu $t7, $a2, $t6 /* 00958 80996BF8 91F800A8 */ lbu $t8, 0x00A8($t7) ## 000000A8 /* 0095C 80996BFC 2408FDFC */ addiu $t0, $zero, 0xFDFC ## $t0 = FFFFFDFC diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809975C0.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809975C0.s index 853474bddc..14ae189e40 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809975C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809975C0.s @@ -23,8 +23,8 @@ glabel func_809975C0 /* 01370 80997610 8FBF0034 */ lw $ra, 0x0034($sp) /* 01374 80997614 0C2658A8 */ jal func_809962A0 /* 01378 80997618 24A576B8 */ addiu $a1, $a1, %lo(func_809976B8) ## $a1 = 809976B8 -/* 0137C 8099761C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 01380 80997620 9739F542 */ lhu $t9, -0x0ABE($t9) ## 8015F542 +/* 0137C 8099761C 3C198016 */ lui $t9, %hi(gSaveContext+0xee2) +/* 01380 80997620 9739F542 */ lhu $t9, %lo(gSaveContext+0xee2)($t9) /* 01384 80997624 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A /* 01388 80997628 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 /* 0138C 8099762C 5500001E */ bnel $t0, $zero, .L809976A8 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099898C.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099898C.s index a4ddf23d4c..2936c84685 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099898C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099898C.s @@ -147,8 +147,8 @@ glabel L80998B6C /* 00420 80998BA0 10000037 */ beq $zero, $zero, .L80998C80 /* 00424 80998BA4 8FBF002C */ lw $ra, 0x002C($sp) .L80998BA8: -/* 00428 80998BA8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0042C 80998BAC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00428 80998BA8 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0042C 80998BAC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00430 80998BB0 8C620000 */ lw $v0, 0x0000($v1) ## 8015E660 /* 00434 80998BB4 24010608 */ addiu $at, $zero, 0x0608 ## $at = 00000608 /* 00438 80998BB8 8FA8003C */ lw $t0, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998FF4.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998FF4.s index 6765ef8e48..8d5304be5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998FF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998FF4.s @@ -67,7 +67,7 @@ glabel func_80998FF4 /* 00968 809990E8 A60801B0 */ sh $t0, 0x01B0($s0) ## 000001B0 /* 0096C 809990EC A6090192 */ sh $t1, 0x0192($s0) ## 00000192 /* 00970 809990F0 A60A01B8 */ sh $t2, 0x01B8($s0) ## 000001B8 -/* 00974 809990F4 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 00974 809990F4 3C0B8016 */ lui $t3, %hi(gSaveContext) /* 00978 809990F8 E6020050 */ swc1 $f2, 0x0050($s0) ## 00000050 /* 0097C 809990FC E6020054 */ swc1 $f2, 0x0054($s0) ## 00000054 /* 00980 80999100 E6020058 */ swc1 $f2, 0x0058($s0) ## 00000058 @@ -79,7 +79,7 @@ glabel func_80998FF4 /* 00998 80999118 E600019C */ swc1 $f0, 0x019C($s0) ## 0000019C /* 0099C 8099911C E61201BC */ swc1 $f18, 0x01BC($s0) ## 000001BC /* 009A0 80999120 E60400BC */ swc1 $f4, 0x00BC($s0) ## 000000BC -/* 009A4 80999124 8D6BE660 */ lw $t3, -0x19A0($t3) ## 8015E660 +/* 009A4 80999124 8D6BE660 */ lw $t3, %lo(gSaveContext)($t3) /* 009A8 80999128 24010053 */ addiu $at, $zero, 0x0053 ## $at = 00000053 /* 009AC 8099912C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 009B0 80999130 1161000D */ beq $t3, $at, .L80999168 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809999A0.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809999A0.s index 428acf1a45..bc8c4f6cbf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809999A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809999A0.s @@ -11,12 +11,12 @@ glabel func_809999A0 /* 01240 809999C0 0C26664E */ jal func_80999938 /* 01244 809999C4 8FA50034 */ lw $a1, 0x0034($sp) /* 01248 809999C8 10400022 */ beq $v0, $zero, .L80999A54 -/* 0124C 809999CC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 0124C 809999CC 3C078013 */ lui $a3, %hi(D_801333E0) /* 01250 809999D0 8FAE0034 */ lw $t6, 0x0034($sp) -/* 01254 809999D4 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 01258 809999D8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01254 809999D4 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 01258 809999D8 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 0125C 809999DC 8DC21C44 */ lw $v0, 0x1C44($t6) ## 00001C44 -/* 01260 809999E0 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 01260 809999E0 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 01264 809999E4 AFAF0014 */ sw $t7, 0x0014($sp) /* 01268 809999E8 AFA70010 */ sw $a3, 0x0010($sp) /* 0126C 809999EC 24042826 */ addiu $a0, $zero, 0x2826 ## $a0 = 00002826 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999A68.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999A68.s index 1bdc783470..ade573f6a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999A68.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999A68.s @@ -41,7 +41,7 @@ glabel func_80999A68 /* 01374 80999AF4 E7B00010 */ swc1 $f16, 0x0010($sp) /* 01378 80999AF8 962F0192 */ lhu $t7, 0x0192($s1) ## 00000192 /* 0137C 80999AFC 3C19809A */ lui $t9, %hi(D_8099CCA0) ## $t9 = 809A0000 -/* 01380 80999B00 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 01380 80999B00 3C098016 */ lui $t1, %hi(gSaveContext+0x1412) /* 01384 80999B04 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 /* 01388 80999B08 A6380192 */ sh $t8, 0x0192($s1) ## 00000192 /* 0138C 80999B0C 8739CCA0 */ lh $t9, %lo(D_8099CCA0)($t9) @@ -49,7 +49,7 @@ glabel func_80999A68 /* 01394 80999B14 0328082A */ slt $at, $t9, $t0 /* 01398 80999B18 50200059 */ beql $at, $zero, .L80999C80 /* 0139C 80999B1C 3C063C23 */ lui $a2, 0x3C23 ## $a2 = 3C230000 -/* 013A0 80999B20 9529FA72 */ lhu $t1, -0x058E($t1) ## 8015FA72 +/* 013A0 80999B20 9529FA72 */ lhu $t1, %lo(gSaveContext+0x1412)($t1) /* 013A4 80999B24 3401FFEF */ ori $at, $zero, 0xFFEF ## $at = 0000FFEF /* 013A8 80999B28 3C04809A */ lui $a0, %hi(D_8099C5C8) ## $a0 = 809A0000 /* 013AC 80999B2C 15210053 */ bne $t1, $at, .L80999C7C @@ -79,17 +79,17 @@ glabel func_80999A68 /* 01400 80999B80 00300821 */ addu $at, $at, $s0 /* 01404 80999B84 240A013D */ addiu $t2, $zero, 0x013D ## $t2 = 0000013D /* 01408 80999B88 A42A1E1A */ sh $t2, 0x1E1A($at) ## 00011E1A -/* 0140C 80999B8C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 0140C 80999B8C 3C018016 */ lui $at, %hi(gSaveContext+0x1412) /* 01410 80999B90 340BFFF1 */ ori $t3, $zero, 0xFFF1 ## $t3 = 0000FFF1 /* 01414 80999B94 1000002B */ beq $zero, $zero, .L80999C44 -/* 01418 80999B98 A42BFA72 */ sh $t3, -0x058E($at) ## 8015FA72 +/* 01418 80999B98 A42BFA72 */ sh $t3, %lo(gSaveContext+0x1412)($at) .L80999B9C: /* 0141C 80999B9C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01420 80999BA0 00300821 */ addu $at, $at, $s0 /* 01424 80999BA4 A42C1E1A */ sh $t4, 0x1E1A($at) ## 00011E1A -/* 01428 80999BA8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 01428 80999BA8 3C018016 */ lui $at, %hi(gSaveContext+0x1412) /* 0142C 80999BAC 10000025 */ beq $zero, $zero, .L80999C44 -/* 01430 80999BB0 A420FA72 */ sh $zero, -0x058E($at) ## 8015FA72 +/* 01430 80999BB0 A420FA72 */ sh $zero, %lo(gSaveContext+0x1412)($at) /* 01434 80999BB4 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 .L80999BB8: /* 01438 80999BB8 5441001B */ bnel $v0, $at, .L80999C28 @@ -112,17 +112,17 @@ glabel func_80999A68 /* 01470 80999BF0 00300821 */ addu $at, $at, $s0 /* 01474 80999BF4 240D00EE */ addiu $t5, $zero, 0x00EE ## $t5 = 000000EE /* 01478 80999BF8 A42D1E1A */ sh $t5, 0x1E1A($at) ## 00011E1A -/* 0147C 80999BFC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 0147C 80999BFC 3C018016 */ lui $at, %hi(gSaveContext+0x1412) /* 01480 80999C00 340EFFF1 */ ori $t6, $zero, 0xFFF1 ## $t6 = 0000FFF1 /* 01484 80999C04 1000000F */ beq $zero, $zero, .L80999C44 -/* 01488 80999C08 A42EFA72 */ sh $t6, -0x058E($at) ## 8015FA72 +/* 01488 80999C08 A42EFA72 */ sh $t6, %lo(gSaveContext+0x1412)($at) .L80999C0C: /* 0148C 80999C0C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01490 80999C10 00300821 */ addu $at, $at, $s0 /* 01494 80999C14 A42F1E1A */ sh $t7, 0x1E1A($at) ## 00011E1A -/* 01498 80999C18 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 01498 80999C18 3C018016 */ lui $at, %hi(gSaveContext+0x1412) /* 0149C 80999C1C 10000009 */ beq $zero, $zero, .L80999C44 -/* 014A0 80999C20 A420FA72 */ sh $zero, -0x058E($at) ## 8015FA72 +/* 014A0 80999C20 A420FA72 */ sh $zero, %lo(gSaveContext+0x1412)($at) /* 014A4 80999C24 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 .L80999C28: /* 014A8 80999C28 14410006 */ bne $v0, $at, .L80999C44 @@ -130,8 +130,8 @@ glabel func_80999A68 /* 014B0 80999C30 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 014B4 80999C34 00300821 */ addu $at, $at, $s0 /* 014B8 80999C38 A4381E1A */ sh $t8, 0x1E1A($at) ## 00011E1A -/* 014BC 80999C3C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 014C0 80999C40 A420FA72 */ sh $zero, -0x058E($at) ## 8015FA72 +/* 014BC 80999C3C 3C018016 */ lui $at, %hi(gSaveContext+0x1412) +/* 014C0 80999C40 A420FA72 */ sh $zero, %lo(gSaveContext+0x1412)($at) .L80999C44: /* 014C4 80999C44 3C04809A */ lui $a0, %hi(D_8099C5FC) ## $a0 = 809A0000 /* 014C8 80999C48 0C00084C */ jal osSyncPrintf @@ -145,9 +145,9 @@ glabel func_80999A68 /* 014E4 80999C64 00300821 */ addu $at, $at, $s0 /* 014E8 80999C68 24080007 */ addiu $t0, $zero, 0x0007 ## $t0 = 00000007 /* 014EC 80999C6C A0281E5E */ sb $t0, 0x1E5E($at) ## 00011E5E -/* 014F0 80999C70 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 014F0 80999C70 3C018016 */ lui $at, %hi(gSaveContext+0x141d) /* 014F4 80999C74 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 014F8 80999C78 A029FA7D */ sb $t1, -0x0583($at) ## 8015FA7D +/* 014F8 80999C78 A029FA7D */ sb $t1, %lo(gSaveContext+0x141d)($at) .L80999C7C: /* 014FC 80999C7C 3C063C23 */ lui $a2, 0x3C23 ## $a2 = 3C230000 .L80999C80: diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999FE4.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999FE4.s index fbaf1c499f..0900c52280 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999FE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999FE4.s @@ -6,11 +6,11 @@ glabel func_80999FE4 /* 01874 80999FF4 0C042F6F */ jal func_8010BDBC /* 01878 80999FF8 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 /* 0187C 80999FFC 14400022 */ bne $v0, $zero, .L8099A088 -/* 01880 8099A000 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 01880 8099A000 3C078013 */ lui $a3, %hi(D_801333E0) /* 01884 8099A004 8FA50020 */ lw $a1, 0x0020($sp) -/* 01888 8099A008 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 0188C 8099A00C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 01890 8099A010 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 +/* 01888 8099A008 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 0188C 8099A00C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 01890 8099A010 25CE33E8 */ addiu $t6, %lo(D_801333E8) /* 01894 8099A014 AFAE0014 */ sw $t6, 0x0014($sp) /* 01898 8099A018 AFA70010 */ sw $a3, 0x0010($sp) /* 0189C 8099A01C 24042826 */ addiu $a0, $zero, 0x2826 ## $a0 = 00002826 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A098.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A098.s index 947513da97..eb295da9de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A098.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A098.s @@ -41,12 +41,12 @@ glabel func_8099A098 /* 019A4 8099A124 E7B00010 */ swc1 $f16, 0x0010($sp) /* 019A8 8099A128 960F0192 */ lhu $t7, 0x0192($s0) ## 00000192 /* 019AC 8099A12C 3C19809A */ lui $t9, %hi(D_8099CCA0) ## $t9 = 809A0000 -/* 019B0 8099A130 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 019B0 8099A130 3C028016 */ lui $v0, %hi(gSaveContext) /* 019B4 8099A134 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 /* 019B8 8099A138 A6180192 */ sh $t8, 0x0192($s0) ## 00000192 /* 019BC 8099A13C 8739CCA0 */ lh $t9, %lo(D_8099CCA0)($t9) /* 019C0 8099A140 3308FFFF */ andi $t0, $t8, 0xFFFF ## $t0 = 00000001 -/* 019C4 8099A144 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 019C4 8099A144 2442E660 */ addiu $v0, %lo(gSaveContext) /* 019C8 8099A148 0328082A */ slt $at, $t9, $t0 /* 019CC 8099A14C 5020001C */ beql $at, $zero, .L8099A1C0 /* 019D0 8099A150 3C063C23 */ lui $a2, 0x3C23 ## $a2 = 3C230000 @@ -63,9 +63,9 @@ glabel func_8099A098 /* 019FC 8099A17C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01A00 8099A180 00320821 */ addu $at, $at, $s2 /* 01A04 8099A184 240C010E */ addiu $t4, $zero, 0x010E ## $t4 = 0000010E -/* 01A08 8099A188 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 01A08 8099A188 3C028016 */ lui $v0, %hi(gSaveContext) /* 01A0C 8099A18C A42C1E1A */ sh $t4, 0x1E1A($at) ## 00011E1A -/* 01A10 8099A190 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01A10 8099A190 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01A14 8099A194 340DFFF0 */ ori $t5, $zero, 0xFFF0 ## $t5 = 0000FFF0 /* 01A18 8099A198 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01A1C 8099A19C A44D1412 */ sh $t5, 0x1412($v0) ## 8015FA72 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A508.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A508.s index 6b2fabf584..f4bb283108 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A508.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A508.s @@ -6,14 +6,14 @@ glabel func_8099A508 /* 01D98 8099A518 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01D9C 8099A51C 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 /* 01DA0 8099A520 10400004 */ beq $v0, $zero, .L8099A534 -/* 01DA4 8099A524 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 01DA4 8099A524 3C078013 */ lui $a3, %hi(D_801333E0) /* 01DA8 8099A528 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 01DAC 8099A52C 1000002A */ beq $zero, $zero, .L8099A5D8 /* 01DB0 8099A530 A48E01B2 */ sh $t6, 0x01B2($a0) ## 000001B2 .L8099A534: -/* 01DB4 8099A534 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 01DB8 8099A538 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 01DBC 8099A53C 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 01DB4 8099A534 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 01DB8 8099A538 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 01DBC 8099A53C 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 01DC0 8099A540 AFAF0014 */ sw $t7, 0x0014($sp) /* 01DC4 8099A544 AFA70010 */ sw $a3, 0x0010($sp) /* 01DC8 8099A548 24042826 */ addiu $a0, $zero, 0x2826 ## $a0 = 00002826 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A5EC.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A5EC.s index 35bb91db85..3990fc8c4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A5EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A5EC.s @@ -14,8 +14,8 @@ glabel func_8099A5EC .L8099A61C: /* 01E9C 8099A61C 2841001F */ slti $at, $v0, 0x001F /* 01EA0 8099A620 10200042 */ beq $at, $zero, .L8099A72C -/* 01EA4 8099A624 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 01EA8 8099A628 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 01EA4 8099A624 3C038016 */ lui $v1, %hi(gSaveContext) +/* 01EA8 8099A628 2463E660 */ addiu $v1, %lo(gSaveContext) /* 01EAC 8099A62C 8C6F0004 */ lw $t7, 0x0004($v1) ## 8015E664 /* 01EB0 8099A630 25040024 */ addiu $a0, $t0, 0x0024 ## $a0 = 00000024 /* 01EB4 8099A634 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 @@ -92,12 +92,12 @@ glabel func_8099A5EC .L8099A72C: /* 01FAC 8099A72C 962E0192 */ lhu $t6, 0x0192($s1) ## 00000192 /* 01FB0 8099A730 3C18809A */ lui $t8, %hi(D_8099CCA0) ## $t8 = 809A0000 -/* 01FB4 8099A734 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 01FB4 8099A734 3C038016 */ lui $v1, %hi(gSaveContext) /* 01FB8 8099A738 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 /* 01FBC 8099A73C A62F0192 */ sh $t7, 0x0192($s1) ## 00000192 /* 01FC0 8099A740 8718CCA0 */ lh $t8, %lo(D_8099CCA0)($t8) /* 01FC4 8099A744 31E2FFFF */ andi $v0, $t7, 0xFFFF ## $v0 = 00000001 -/* 01FC8 8099A748 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 01FC8 8099A748 2463E660 */ addiu $v1, %lo(gSaveContext) /* 01FCC 8099A74C 0302082A */ slt $at, $t8, $v0 /* 01FD0 8099A750 502000C3 */ beql $at, $zero, .L8099AA60 /* 01FD4 8099A754 2841008D */ slti $at, $v0, 0x008D @@ -119,11 +119,11 @@ glabel func_8099A5EC /* 02014 8099A794 0C021344 */ jal Item_Give /* 02018 8099A798 AFA80034 */ sw $t0, 0x0034($sp) /* 0201C 8099A79C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02020 8099A7A0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 02020 8099A7A0 3C038016 */ lui $v1, %hi(gSaveContext) /* 02024 8099A7A4 8FA80034 */ lw $t0, 0x0034($sp) /* 02028 8099A7A8 00300821 */ addu $at, $at, $s0 /* 0202C 8099A7AC 240B006B */ addiu $t3, $zero, 0x006B ## $t3 = 0000006B -/* 02030 8099A7B0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 02030 8099A7B0 2463E660 */ addiu $v1, %lo(gSaveContext) /* 02034 8099A7B4 A42B1E1A */ sh $t3, 0x1E1A($at) ## 00011E1A /* 02038 8099A7B8 A4601412 */ sh $zero, 0x1412($v1) ## 8015FA72 /* 0203C 8099A7BC 1000009C */ beq $zero, $zero, .L8099AA30 @@ -158,11 +158,11 @@ glabel func_8099A5EC /* 020A0 8099A820 0C021344 */ jal Item_Give /* 020A4 8099A824 AFA80034 */ sw $t0, 0x0034($sp) /* 020A8 8099A828 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 020AC 8099A82C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 020AC 8099A82C 3C038016 */ lui $v1, %hi(gSaveContext) /* 020B0 8099A830 8FA80034 */ lw $t0, 0x0034($sp) /* 020B4 8099A834 00300821 */ addu $at, $at, $s0 /* 020B8 8099A838 241900DB */ addiu $t9, $zero, 0x00DB ## $t9 = 000000DB -/* 020BC 8099A83C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 020BC 8099A83C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 020C0 8099A840 A4391E1A */ sh $t9, 0x1E1A($at) ## 00011E1A /* 020C4 8099A844 3409FFF3 */ ori $t1, $zero, 0xFFF3 ## $t1 = 0000FFF3 /* 020C8 8099A848 10000079 */ beq $zero, $zero, .L8099AA30 @@ -197,11 +197,11 @@ glabel func_8099A5EC /* 0212C 8099A8AC 0C021344 */ jal Item_Give /* 02130 8099A8B0 AFA80034 */ sw $t0, 0x0034($sp) /* 02134 8099A8B4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02138 8099A8B8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 02138 8099A8B8 3C038016 */ lui $v1, %hi(gSaveContext) /* 0213C 8099A8BC 8FA80034 */ lw $t0, 0x0034($sp) /* 02140 8099A8C0 00300821 */ addu $at, $at, $s0 /* 02144 8099A8C4 240F006B */ addiu $t7, $zero, 0x006B ## $t7 = 0000006B -/* 02148 8099A8C8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 02148 8099A8C8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0214C 8099A8CC A42F1E1A */ sh $t7, 0x1E1A($at) ## 00011E1A /* 02150 8099A8D0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 02154 8099A8D4 A4601412 */ sh $zero, 0x1412($v1) ## 8015FA72 @@ -226,8 +226,8 @@ glabel func_8099A5EC /* 02194 8099A914 24010017 */ addiu $at, $zero, 0x0017 ## $at = 00000017 .L8099A918: /* 02198 8099A918 14410022 */ bne $v0, $at, .L8099A9A4 -/* 0219C 8099A91C 3C0B8012 */ lui $t3, 0x8012 ## $t3 = 80120000 -/* 021A0 8099A920 8D6B712C */ lw $t3, 0x712C($t3) ## 8012712C +/* 0219C 8099A91C 3C0B8012 */ lui $t3, %hi(gBitFlags+0xc) +/* 021A0 8099A920 8D6B712C */ lw $t3, %lo(gBitFlags+0xc)($t3) /* 021A4 8099A924 8C6C00A4 */ lw $t4, 0x00A4($v1) ## 8015E704 /* 021A8 8099A928 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 021AC 8099A92C 24050069 */ addiu $a1, $zero, 0x0069 ## $a1 = 00000069 @@ -237,11 +237,11 @@ glabel func_8099A5EC /* 021BC 8099A93C 0C021344 */ jal Item_Give /* 021C0 8099A940 AFA80034 */ sw $t0, 0x0034($sp) /* 021C4 8099A944 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 021C8 8099A948 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 021C8 8099A948 3C038016 */ lui $v1, %hi(gSaveContext) /* 021CC 8099A94C 8FA80034 */ lw $t0, 0x0034($sp) /* 021D0 8099A950 00300821 */ addu $at, $at, $s0 /* 021D4 8099A954 240E006B */ addiu $t6, $zero, 0x006B ## $t6 = 0000006B -/* 021D8 8099A958 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 021D8 8099A958 2463E660 */ addiu $v1, %lo(gSaveContext) /* 021DC 8099A95C A42E1E1A */ sh $t6, 0x1E1A($at) ## 00011E1A /* 021E0 8099A960 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 021E4 8099A964 A4601412 */ sh $zero, 0x1412($v1) ## 8015FA72 @@ -266,8 +266,8 @@ glabel func_8099A5EC .L8099A9A4: /* 02224 8099A9A4 24010018 */ addiu $at, $zero, 0x0018 ## $at = 00000018 /* 02228 8099A9A8 14410021 */ bne $v0, $at, .L8099AA30 -/* 0222C 8099A9AC 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 02230 8099A9B0 8D4A7130 */ lw $t2, 0x7130($t2) ## 80127130 +/* 0222C 8099A9AC 3C0A8012 */ lui $t2, %hi(gBitFlags+0x10) +/* 02230 8099A9B0 8D4A7130 */ lw $t2, %lo(gBitFlags+0x10)($t2) /* 02234 8099A9B4 8C6B00A4 */ lw $t3, 0x00A4($v1) ## 8015E704 /* 02238 8099A9B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0223C 8099A9BC 2405006A */ addiu $a1, $zero, 0x006A ## $a1 = 0000006A @@ -277,11 +277,11 @@ glabel func_8099A5EC /* 0224C 8099A9CC 0C021344 */ jal Item_Give /* 02250 8099A9D0 AFA80034 */ sw $t0, 0x0034($sp) /* 02254 8099A9D4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02258 8099A9D8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 02258 8099A9D8 3C038016 */ lui $v1, %hi(gSaveContext) /* 0225C 8099A9DC 8FA80034 */ lw $t0, 0x0034($sp) /* 02260 8099A9E0 00300821 */ addu $at, $at, $s0 /* 02264 8099A9E4 240D006B */ addiu $t5, $zero, 0x006B ## $t5 = 0000006B -/* 02268 8099A9E8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 02268 8099A9E8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0226C 8099A9EC A42D1E1A */ sh $t5, 0x1E1A($at) ## 00011E1A /* 02270 8099A9F0 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 /* 02274 8099A9F4 A4601412 */ sh $zero, 0x1412($v1) ## 8015FA72 diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099CD2C.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099CD2C.s index cfd8650aa4..d1a6b747a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099CD2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099CD2C.s @@ -81,8 +81,8 @@ glabel func_8099CD2C /* 0018C 8099CE3C 244B0001 */ addiu $t3, $v0, 0x0001 ## $t3 = 00000001 /* 00190 8099CE40 0C03CFCF */ jal func_800F3F3C /* 00194 8099CE44 24040006 */ addiu $a0, $zero, 0x0006 ## $a0 = 00000006 -/* 00198 8099CE48 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0019C 8099CE4C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00198 8099CE48 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0019C 8099CE4C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 001A0 8099CE50 94690ED8 */ lhu $t1, 0x0ED8($v1) ## 8015F538 /* 001A4 8099CE54 352A8000 */ ori $t2, $t1, 0x8000 ## $t2 = 00008000 /* 001A8 8099CE58 A46A0ED8 */ sh $t2, 0x0ED8($v1) ## 8015F538 diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s index ae4eaf107e..2cc1705a0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s @@ -95,8 +95,8 @@ glabel func_8099E4F4 /* 00D5C 8099E62C 00027900 */ sll $t7, $v0, 4 /* 00D60 8099E630 000FC702 */ srl $t8, $t7, 28 /* 00D64 8099E634 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00D68 8099E638 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 00D6C 8099E63C 25086FA8 */ addiu $t0, $t0, 0x6FA8 ## $t0 = 80166FA8 +/* 00D68 8099E638 3C088016 */ lui $t0, %hi(gSegments) +/* 00D6C 8099E63C 25086FA8 */ addiu $t0, %lo(gSegments) /* 00D70 8099E640 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 /* 00D74 8099E644 46083280 */ add.s $f10, $f6, $f8 /* 00D78 8099E648 C6280024 */ lwc1 $f8, 0x0024($s1) ## 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E784.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E784.s index 080680d4b6..52b0c969fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E784.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E784.s @@ -127,9 +127,9 @@ glabel func_8099E784 /* 01054 8099E924 4458F800 */ cfc1 $t8, $31 /* 01058 8099E928 44D9F800 */ ctc1 $t9, $31 /* 0105C 8099E92C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01060 8099E930 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 01060 8099E930 3C0D8016 */ lui $t5, %hi(gSegments) /* 01064 8099E934 460084A4 */ cvt.w.s $f18, $f16 -/* 01068 8099E938 25AD6FA8 */ addiu $t5, $t5, 0x6FA8 ## $t5 = 80166FA8 +/* 01068 8099E938 25AD6FA8 */ addiu $t5, %lo(gSegments) /* 0106C 8099E93C 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 /* 01070 8099E940 000B6080 */ sll $t4, $t3, 2 /* 01074 8099E944 4459F800 */ cfc1 $t9, $31 diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Draw.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Draw.s index e0541f41eb..a728f87341 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Draw.s @@ -24,8 +24,8 @@ glabel ElfMsg_Draw /* 00590 809AD0B0 240701B4 */ addiu $a3, $zero, 0x01B4 ## $a3 = 000001B4 /* 00594 809AD0B4 0C031AB1 */ jal Graph_OpenDisps /* 00598 809AD0B8 AFA50044 */ sw $a1, 0x0044($sp) -/* 0059C 809AD0BC 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 005A0 809AD0C0 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 +/* 0059C 809AD0BC 3C058016 */ lui $a1, %hi(gGameInfo) +/* 005A0 809AD0C0 24A5FA90 */ addiu $a1, %lo(gGameInfo) /* 005A4 809AD0C4 8CAF0000 */ lw $t7, 0x0000($a1) ## 8015FA90 /* 005A8 809AD0C8 8FA80044 */ lw $t0, 0x0044($sp) /* 005AC 809AD0CC 8FB9004C */ lw $t9, 0x004C($sp) @@ -36,8 +36,8 @@ glabel ElfMsg_Draw /* 005C0 809AD0E0 0C024F46 */ jal func_80093D18 /* 005C4 809AD0E4 AFA80044 */ sw $t0, 0x0044($sp) /* 005C8 809AD0E8 8FA90048 */ lw $t1, 0x0048($sp) -/* 005CC 809AD0EC 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 005D0 809AD0F0 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 +/* 005CC 809AD0EC 3C058016 */ lui $a1, %hi(gGameInfo) +/* 005D0 809AD0F0 24A5FA90 */ addiu $a1, %lo(gGameInfo) /* 005D4 809AD0F4 852A001C */ lh $t2, 0x001C($t1) ## 0000001C /* 005D8 809AD0F8 8FA80044 */ lw $t0, 0x0044($sp) /* 005DC 809AD0FC 240601C0 */ addiu $a2, $zero, 0x01C0 ## $a2 = 000001C0 diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Draw.s index e5ba1c215f..c614d0924c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Draw.s @@ -25,8 +25,8 @@ glabel ElfMsg2_Draw /* 00400 809ADB00 24070163 */ addiu $a3, $zero, 0x0163 ## $a3 = 00000163 /* 00404 809ADB04 0C031AB1 */ jal Graph_OpenDisps /* 00408 809ADB08 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0040C 809ADB0C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00410 809ADB10 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 0040C 809ADB0C 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 00410 809ADB10 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 00414 809ADB14 8FB9004C */ lw $t9, 0x004C($sp) /* 00418 809ADB18 85F812C2 */ lh $t8, 0x12C2($t7) ## 801612C2 /* 0041C 809ADB1C 53000036 */ beql $t8, $zero, .L809ADBF8 @@ -35,11 +35,11 @@ glabel ElfMsg2_Draw /* 00428 809ADB28 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 0042C 809ADB2C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00430 809ADB30 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 -/* 00434 809ADB34 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 00434 809ADB34 3C0A8016 */ lui $t2, %hi(gGameInfo) /* 00438 809ADB38 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 0043C 809ADB3C AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 /* 00440 809ADB40 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00444 809ADB44 8D4AFA90 */ lw $t2, -0x0570($t2) ## 8015FA90 +/* 00444 809ADB44 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) /* 00448 809ADB48 3C016464 */ lui $at, 0x6464 ## $at = 64640000 /* 0044C 809ADB4C 3421FF00 */ ori $at, $at, 0xFF00 ## $at = 6464FF00 /* 00450 809ADB50 854B12C2 */ lh $t3, 0x12C2($t2) ## 801612C2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Init.s index c305fdef74..243e05fd24 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Init.s @@ -10,8 +10,8 @@ glabel EnAm_Init /* 00150 809AE070 0C01E037 */ jal Actor_ProcessInitChain /* 00154 809AE074 24A50048 */ addiu $a1, $a1, %lo(D_809B0048) ## $a1 = 809B0048 -/* 00158 809AE078 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0015C 809AE07C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00158 809AE078 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 0015C 809AE07C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00160 809AE080 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00164 809AE084 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00168 809AE088 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Init.s index 79c4f8a420..1e898b6cfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Init.s @@ -18,8 +18,8 @@ glabel EnAnubice_Init /* 0018C 809B12AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00190 809B12B0 AFBF002C */ sw $ra, 0x002C($sp) /* 00194 809B12B4 AFA5003C */ sw $a1, 0x003C($sp) -/* 00198 809B12B8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0019C 809B12BC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00198 809B12B8 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 0019C 809B12BC 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 001A0 809B12C0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 001A4 809B12C4 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 001A8 809B12C8 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Draw.s index 462ea21ae5..31a777ef73 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Draw.s @@ -76,13 +76,13 @@ glabel EnAnubiceFire_Draw /* 00A24 809B2FC4 AE6C02D0 */ sw $t4, 0x02D0($s3) ## 000002D0 /* 00A28 809B2FC8 AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 /* 00A2C 809B2FCC 8C843270 */ lw $a0, %lo(D_809B3270)($a0) -/* 00A30 809B2FD0 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 00A30 809B2FD0 3C088016 */ lui $t0, %hi(gSegments) /* 00A34 809B2FD4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00A38 809B2FD8 00047900 */ sll $t7, $a0, 4 /* 00A3C 809B2FDC 000FC702 */ srl $t8, $t7, 28 /* 00A40 809B2FE0 0018C880 */ sll $t9, $t8, 2 /* 00A44 809B2FE4 01194021 */ addu $t0, $t0, $t9 -/* 00A48 809B2FE8 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 +/* 00A48 809B2FE8 8D086FA8 */ lw $t0, %lo(gSegments)($t0) /* 00A4C 809B2FEC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00A50 809B2FF0 00817024 */ and $t6, $a0, $at /* 00A54 809B2FF4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s index 68a0606129..70d27e9f08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s @@ -30,8 +30,8 @@ glabel EnArrow_Draw /* 01068 809B4988 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0106C 809B498C 0C024F46 */ jal func_80093D18 /* 01070 809B4990 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 01074 809B4994 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 01078 809B4998 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 01074 809B4994 3C188016 */ lui $t8, %hi(gGameInfo) +/* 01078 809B4998 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 0107C 809B499C C60400EC */ lwc1 $f4, 0x00EC($s0) ## 000000EC /* 01080 809B49A0 8FA4007C */ lw $a0, 0x007C($sp) /* 01084 809B49A4 87190492 */ lh $t9, 0x0492($t8) ## 80160492 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s index 76837370cd..dc3e4c025a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s @@ -91,8 +91,8 @@ glabel func_809B3FDC .L809B4104: /* 007E4 809B4104 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 007E8 809B4108 14410013 */ bne $v0, $at, .L809B4158 -/* 007EC 809B410C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 007F0 809B4110 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 007EC 809B410C 3C198016 */ lui $t9, %hi(gGameInfo) +/* 007F0 809B4110 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 007F4 809B4114 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF /* 007F8 809B4118 24060056 */ addiu $a2, $zero, 0x0056 ## $a2 = 00000056 /* 007FC 809B411C A7380D38 */ sh $t8, 0x0D38($t9) ## 80160D38 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Init.s index 4ab29499e8..4cf60e7489 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Init.s @@ -13,8 +13,8 @@ glabel EnAttackNiw_Init /* 00018 809B5118 0C01E037 */ jal Actor_ProcessInitChain /* 0001C 809B511C 24A56170 */ addiu $a1, $a1, %lo(D_809B6170) ## $a1 = 809B6170 -/* 00020 809B5120 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00024 809B5124 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00020 809B5120 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00024 809B5124 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00028 809B5128 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0002C 809B512C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00030 809B5130 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s index aa60856dfc..68830f957e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s @@ -81,7 +81,7 @@ glabel EnBa_Draw /* 019B8 809B7D08 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 019BC 809B7D0C 8659001C */ lh $t9, 0x001C($s2) ## 0000001C /* 019C0 809B7D10 3C04809C */ lui $a0, %hi(D_809B8118) ## $a0 = 809C0000 -/* 019C4 809B7D14 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 019C4 809B7D14 3C0E8016 */ lui $t6, %hi(gSegments) /* 019C8 809B7D18 00194880 */ sll $t1, $t9, 2 /* 019CC 809B7D1C 00892021 */ addu $a0, $a0, $t1 /* 019D0 809B7D20 8C848118 */ lw $a0, %lo(D_809B8118)($a0) @@ -91,7 +91,7 @@ glabel EnBa_Draw /* 019E0 809B7D30 000B6702 */ srl $t4, $t3, 28 /* 019E4 809B7D34 000C6880 */ sll $t5, $t4, 2 /* 019E8 809B7D38 01CD7021 */ addu $t6, $t6, $t5 -/* 019EC 809B7D3C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 019EC 809B7D3C 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 019F0 809B7D40 00815024 */ and $t2, $a0, $at /* 019F4 809B7D44 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 019F8 809B7D48 014E7821 */ addu $t7, $t2, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Init.s index 2ee52bb1f6..a4e16aa9e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Init.s @@ -86,8 +86,8 @@ glabel EnBa_Init /* 00148 809B6498 10000025 */ beq $zero, $zero, .L809B6530 /* 0014C 809B649C 8FBF0024 */ lw $ra, 0x0024($sp) .L809B64A0: -/* 00150 809B64A0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00154 809B64A4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00150 809B64A0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00154 809B64A4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00158 809B64A8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0015C 809B64AC 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Init.s index a4d3dc16cf..2b1437bf4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Init.s @@ -59,8 +59,8 @@ glabel EnBb_Init .L809B8618: /* 00338 809B8618 04410006 */ bgez $v0, .L809B8634 /* 0033C 809B861C 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 -/* 00340 809B8620 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00344 809B8624 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00340 809B8620 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00344 809B8624 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00348 809B8628 0C00AC78 */ jal ActorShape_Init /* 0034C 809B862C 3C07420C */ lui $a3, 0x420C ## $a3 = 420C0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9F60.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9F60.s index ddc711f64e..b0fbe78225 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9F60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9F60.s @@ -7,7 +7,7 @@ glabel func_809B9F60 /* 01C94 809B9F74 9083029D */ lbu $v1, 0x029D($a0) ## 0000029D /* 01C98 809B9F78 01D81021 */ addu $v0, $t6, $t8 /* 01C9C 809B9F7C 90590000 */ lbu $t9, 0x0000($v0) ## 00000000 -/* 01CA0 809B9F80 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 01CA0 809B9F80 3C0E8016 */ lui $t6, %hi(gSegments) /* 01CA4 809B9F84 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01CA8 809B9F88 2728FFFF */ addiu $t0, $t9, 0xFFFF ## $t0 = FFFFFFFF /* 01CAC 809B9F8C 00084C00 */ sll $t1, $t0, 16 @@ -26,7 +26,7 @@ glabel func_809B9F60 /* 01CD8 809B9FB8 000C6F02 */ srl $t5, $t4, 28 /* 01CDC 809B9FBC 000D7880 */ sll $t7, $t5, 2 /* 01CE0 809B9FC0 01CF7021 */ addu $t6, $t6, $t7 -/* 01CE4 809B9FC4 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 01CE4 809B9FC4 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 01CE8 809B9FC8 00084880 */ sll $t1, $t0, 2 /* 01CEC 809B9FCC 00A1C024 */ and $t8, $a1, $at /* 01CF0 809B9FD0 01284823 */ subu $t1, $t1, $t0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Init.s index 3bed19086b..f2345a77a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Init.s @@ -77,8 +77,8 @@ glabel EnBdfire_Init /* 000F8 809BC128 0C26F00C */ jal func_809BC030 /* 000FC 809BC12C 24A5C598 */ addiu $a1, $a1, %lo(func_809BC598) ## $a1 = FFFFC598 /* 00100 809BC130 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00104 809BC134 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00108 809BC138 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00104 809BC134 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00108 809BC138 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0010C 809BC13C 44050000 */ mfc1 $a1, $f0 /* 00110 809BC140 44070000 */ mfc1 $a3, $f0 /* 00114 809BC144 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC598.s b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC598.s index cea9f18f94..10215375bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC598.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC598.s @@ -28,10 +28,10 @@ glabel func_809BC598 /* 00590 809BC5C0 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 00594 809BC5C4 1700000D */ bne $t8, $zero, .L809BC5FC /* 00598 809BC5C8 A48F0158 */ sh $t7, 0x0158($a0) ## 00000158 -/* 0059C 809BC5CC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 005A0 809BC5D0 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 005A4 809BC5D4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 005A8 809BC5D8 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 0059C 809BC5CC 3C078013 */ lui $a3, %hi(D_801333E0) +/* 005A0 809BC5D0 3C198013 */ lui $t9, %hi(D_801333E8) +/* 005A4 809BC5D4 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 005A8 809BC5D8 273933E8 */ addiu $t9, %lo(D_801333E8) /* 005AC 809BC5DC AFB90014 */ sw $t9, 0x0014($sp) /* 005B0 809BC5E0 AFA70010 */ sw $a3, 0x0010($sp) /* 005B4 809BC5E4 24043009 */ addiu $a0, $zero, 0x3009 ## $a0 = 00003009 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC8C8.s b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC8C8.s index db2b642d12..3a86a0de59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC8C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC8C8.s @@ -84,7 +84,7 @@ glabel func_809BC8C8 /* 009A8 809BC9D8 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 009AC 809BC9DC AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 009B0 809BC9E0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 009B4 809BC9E4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 009B4 809BC9E4 3C0E8016 */ lui $t6, %hi(gSegments) /* 009B8 809BC9E8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 009BC 809BC9EC AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 /* 009C0 809BC9F0 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 @@ -96,7 +96,7 @@ glabel func_809BC8C8 /* 009D8 809BCA08 000B6702 */ srl $t4, $t3, 28 /* 009DC 809BCA0C 000C6880 */ sll $t5, $t4, 2 /* 009E0 809BCA10 01CD7021 */ addu $t6, $t6, $t5 -/* 009E4 809BCA14 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 009E4 809BCA14 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 009E8 809BCA18 00815024 */ and $t2, $a0, $at /* 009EC 809BCA1C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 009F0 809BCA20 014E7821 */ addu $t7, $t2, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s index cee1bb2767..5fe19a0a3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s @@ -59,8 +59,8 @@ glabel EnBigokuta_Draw /* 024C4 809BF124 8FA5003C */ lw $a1, 0x003C($sp) /* 024C8 809BF128 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 024CC 809BF12C 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 024D0 809BF130 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 -/* 024D4 809BF134 258C6290 */ addiu $t4, $t4, 0x6290 ## $t4 = 80116290 +/* 024D0 809BF130 3C0C8011 */ lui $t4, %hi(D_80116280+0x10) +/* 024D4 809BF134 258C6290 */ addiu $t4, %lo(D_80116280+0x10) /* 024D8 809BF138 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 /* 024DC 809BF13C AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 /* 024E0 809BF140 356B0030 */ ori $t3, $t3, 0x0030 ## $t3 = DB060030 @@ -143,9 +143,9 @@ glabel EnBigokuta_Draw /* 025F8 809BF258 AFA80068 */ sw $t0, 0x0068($sp) /* 025FC 809BF25C 8FA80068 */ lw $t0, 0x0068($sp) /* 02600 809BF260 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 02604 809BF264 3C0D8011 */ lui $t5, 0x8011 ## $t5 = 80110000 +/* 02604 809BF264 3C0D8011 */ lui $t5, %hi(D_80116280) /* 02608 809BF268 8D0302D0 */ lw $v1, 0x02D0($t0) ## 000002D0 -/* 0260C 809BF26C 25AD6280 */ addiu $t5, $t5, 0x6280 ## $t5 = 80116280 +/* 0260C 809BF26C 25AD6280 */ addiu $t5, %lo(D_80116280) /* 02610 809BF270 358C0030 */ ori $t4, $t4, 0x0030 ## $t4 = DB060030 /* 02614 809BF274 246B0008 */ addiu $t3, $v1, 0x0008 ## $t3 = 00000008 /* 02618 809BF278 AD0B02D0 */ sw $t3, 0x02D0($t0) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s index 215593ed3b..b8ee0eb692 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s @@ -44,7 +44,7 @@ glabel EnBili_Draw /* 01C70 809C1510 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 01C74 809C1514 92090194 */ lbu $t1, 0x0194($s0) ## 00000194 /* 01C78 809C1518 3C04809C */ lui $a0, %hi(D_809C16CC) ## $a0 = 809C0000 -/* 01C7C 809C151C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 01C7C 809C151C 3C0F8016 */ lui $t7, %hi(gSegments) /* 01C80 809C1520 00095080 */ sll $t2, $t1, 2 /* 01C84 809C1524 008A2021 */ addu $a0, $a0, $t2 /* 01C88 809C1528 8C8416CC */ lw $a0, %lo(D_809C16CC)($a0) @@ -54,7 +54,7 @@ glabel EnBili_Draw /* 01C98 809C1538 000C6F02 */ srl $t5, $t4, 28 /* 01C9C 809C153C 000D7080 */ sll $t6, $t5, 2 /* 01CA0 809C1540 01EE7821 */ addu $t7, $t7, $t6 -/* 01CA4 809C1544 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 01CA4 809C1544 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 01CA8 809C1548 00815824 */ and $t3, $a0, $at /* 01CAC 809C154C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01CB0 809C1550 016FC021 */ addu $t8, $t3, $t7 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Init.s index c1fe5f7e6b..0725b8dd63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Init.s @@ -8,8 +8,8 @@ glabel EnBili_Init /* 00018 809BF8B8 0C01E037 */ jal Actor_ProcessInitChain /* 0001C 809BF8BC 24A51698 */ addiu $a1, $a1, %lo(D_809C1698) ## $a1 = 809C1698 -/* 00020 809BF8C0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00024 809BF8C4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00020 809BF8C0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00024 809BF8C4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00028 809BF8C8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0002C 809BF8CC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00030 809BF8D0 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Init.s index d7f131b826..a887fd0cee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Init.s @@ -8,8 +8,8 @@ glabel EnBom_Init /* 00020 809C26F0 0C01E037 */ jal Actor_ProcessInitChain /* 00024 809C26F4 24A53490 */ addiu $a1, $a1, %lo(D_809C3490) ## $a1 = 809C3490 -/* 00028 809C26F8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0002C 809C26FC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00028 809C26F8 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 0002C 809C26FC 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00030 809C2700 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00034 809C2704 3C05442F */ lui $a1, 0x442F ## $a1 = 442F0000 /* 00038 809C2708 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s index 250435f91c..70e54f7337 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s @@ -29,7 +29,7 @@ glabel EnBomBowlMan_Draw /* 01300 809C4930 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 01304 809C4934 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 01308 809C4938 3C04809C */ lui $a0, %hi(D_809C4AA8) ## $a0 = 809C0000 -/* 0130C 809C493C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0130C 809C493C 3C0E8016 */ lui $t6, %hi(gSegments) /* 01310 809C4940 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 /* 01314 809C4944 ACB802C0 */ sw $t8, 0x02C0($a1) ## 000002C0 /* 01318 809C4948 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 @@ -45,7 +45,7 @@ glabel EnBomBowlMan_Draw /* 01340 809C4970 000B6702 */ srl $t4, $t3, 28 /* 01344 809C4974 000C6880 */ sll $t5, $t4, 2 /* 01348 809C4978 01CD7021 */ addu $t6, $t6, $t5 -/* 0134C 809C497C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 0134C 809C497C 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 01350 809C4980 00815024 */ and $t2, $a0, $at /* 01354 809C4984 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01358 809C4988 014E7821 */ addu $t7, $t2, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Init.s index e9f16250e0..c8394f1675 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Init.s @@ -19,7 +19,7 @@ glabel EnBomBowlMan_Init /* 0000C 809C363C 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 00010 809C3640 0080F025 */ or $s8, $a0, $zero ## $s8 = 00000000 /* 00014 809C3644 AFBF0054 */ sw $ra, 0x0054($sp) -/* 00018 809C3648 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 00018 809C3648 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 0001C 809C364C AFB7004C */ sw $s7, 0x004C($sp) /* 00020 809C3650 AFB60048 */ sw $s6, 0x0048($sp) /* 00024 809C3654 AFB50044 */ sw $s5, 0x0044($sp) @@ -27,7 +27,7 @@ glabel EnBomBowlMan_Init /* 0002C 809C365C AFB20038 */ sw $s2, 0x0038($sp) /* 00030 809C3660 AFB10034 */ sw $s1, 0x0034($sp) /* 00034 809C3664 AFB00030 */ sw $s0, 0x0030($sp) -/* 00038 809C3668 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00038 809C3668 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0003C 809C366C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00040 809C3670 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00044 809C3674 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3A54.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3A54.s index 130767d71c..0073458b9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3A54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3A54.s @@ -15,17 +15,17 @@ glabel func_809C3A54 /* 00454 809C3A84 8FA60020 */ lw $a2, 0x0020($sp) /* 00458 809C3A88 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 0045C 809C3A8C 46083032 */ c.eq.s $f6, $f8 -/* 00460 809C3A90 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00460 809C3A90 3C0F8016 */ lui $t7, %hi(gSaveContext+0xed8) /* 00464 809C3A94 45020011 */ bc1fl .L809C3ADC /* 00468 809C3A98 94C5010E */ lhu $a1, 0x010E($a2) ## 0000010E /* 0046C 809C3A9C A4CE022E */ sh $t6, 0x022E($a2) ## 0000022E -/* 00470 809C3AA0 95EFF538 */ lhu $t7, -0x0AC8($t7) ## 8015F538 -/* 00474 809C3AA4 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 00470 809C3AA0 95EFF538 */ lhu $t7, %lo(gSaveContext+0xed8)($t7) +/* 00474 809C3AA4 3C198016 */ lui $t9, %hi(gGameInfo) /* 00478 809C3AA8 240900BF */ addiu $t1, $zero, 0x00BF ## $t1 = 000000BF /* 0047C 809C3AAC 31F80020 */ andi $t8, $t7, 0x0020 ## $t8 = 00000000 /* 00480 809C3AB0 17000006 */ bne $t8, $zero, .L809C3ACC /* 00484 809C3AB4 00000000 */ nop -/* 00488 809C3AB8 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 00488 809C3AB8 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 0048C 809C3ABC 240A7058 */ addiu $t2, $zero, 0x7058 ## $t2 = 00007058 /* 00490 809C3AC0 872812D8 */ lh $t0, 0x12D8($t9) ## 801612D8 /* 00494 809C3AC4 51000004 */ beql $t0, $zero, .L809C3AD8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3B50.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3B50.s index a440d78380..279f94eea8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3B50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3B50.s @@ -46,19 +46,19 @@ glabel func_809C3B50 /* 005C4 809C3BF4 A60F0238 */ sh $t7, 0x0238($s0) ## 00000238 /* 005C8 809C3BF8 4600020D */ trunc.w.s $f8, $f0 -/* 005CC 809C3BFC 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 005CC 809C3BFC 3C0B8016 */ lui $t3, %hi(gSaveContext+0xed8) /* 005D0 809C3C00 24180018 */ addiu $t8, $zero, 0x0018 ## $t8 = 00000018 -/* 005D4 809C3C04 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 005D4 809C3C04 3C0D8016 */ lui $t5, %hi(gGameInfo) /* 005D8 809C3C08 44094000 */ mfc1 $t1, $f8 /* 005DC 809C3C0C 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 /* 005E0 809C3C10 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 00000018 /* 005E4 809C3C14 252A0014 */ addiu $t2, $t1, 0x0014 ## $t2 = 00000014 /* 005E8 809C3C18 A60A0236 */ sh $t2, 0x0236($s0) ## 00000236 -/* 005EC 809C3C1C 956BF538 */ lhu $t3, -0x0AC8($t3) ## 8015F538 +/* 005EC 809C3C1C 956BF538 */ lhu $t3, %lo(gSaveContext+0xed8)($t3) /* 005F0 809C3C20 316C0020 */ andi $t4, $t3, 0x0020 ## $t4 = 00000000 /* 005F4 809C3C24 5580000A */ bnel $t4, $zero, .L809C3C50 /* 005F8 809C3C28 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 005FC 809C3C2C 8DADFA90 */ lw $t5, -0x0570($t5) ## 8015FA90 +/* 005FC 809C3C2C 8DADFA90 */ lw $t5, %lo(gGameInfo)($t5) /* 00600 809C3C30 3C0F809C */ lui $t7, %hi(func_809C3C7C) ## $t7 = 809C0000 /* 00604 809C3C34 25EF3C7C */ addiu $t7, $t7, %lo(func_809C3C7C) ## $t7 = 809C3C7C /* 00608 809C3C38 85AE12D8 */ lh $t6, 0x12D8($t5) ## 801612D8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3DC4.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3DC4.s index 7f3394a4eb..898eb4bd44 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3DC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3DC4.s @@ -37,8 +37,8 @@ glabel func_809C3DC4 /* 007A8 809C3DD8 0C02927F */ jal SkelAnime_FrameUpdateMatrix /* 007AC 809C3DDC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 007B0 809C3DE0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 007B4 809C3DE4 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 007B0 809C3DE0 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 007B4 809C3DE4 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 007B8 809C3DE8 8FB8002C */ lw $t8, 0x002C($sp) /* 007BC 809C3DEC 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 /* 007C0 809C3DF0 85CF12DA */ lh $t7, 0x12DA($t6) ## 801612DA diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4040.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4040.s index 96eb6e11c8..681b371844 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4040.s @@ -23,7 +23,7 @@ glabel func_809C4040 /* 00A60 809C4090 00511021 */ addu $v0, $v0, $s1 /* 00A64 809C4094 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD /* 00A68 809C4098 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00A6C 809C409C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00A6C 809C409C 3C0F8016 */ lui $t7, %hi(gSaveContext+0x34) /* 00A70 809C40A0 10400005 */ beq $v0, $zero, .L809C40B8 /* 00A74 809C40A4 00000000 */ nop /* 00A78 809C40A8 10410045 */ beq $v0, $at, .L809C41C0 @@ -31,7 +31,7 @@ glabel func_809C4040 /* 00A80 809C40B0 1000004E */ beq $zero, $zero, .L809C41EC /* 00A84 809C40B4 8FBF0024 */ lw $ra, 0x0024($sp) .L809C40B8: -/* 00A88 809C40B8 85EFE694 */ lh $t7, -0x196C($t7) ## 8015E694 +/* 00A88 809C40B8 85EFE694 */ lh $t7, %lo(gSaveContext+0x34)($t7) /* 00A8C 809C40BC 24190085 */ addiu $t9, $zero, 0x0085 ## $t9 = 00000085 /* 00A90 809C40C0 3325FFFF */ andi $a1, $t9, 0xFFFF ## $a1 = 00000085 /* 00A94 809C40C4 29E1001E */ slti $at, $t7, 0x001E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C441C.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C441C.s index f6caf9969a..a4d38f52aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C441C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C441C.s @@ -30,8 +30,8 @@ glabel func_809C441C /* 00E30 809C4460 01E00008 */ jr $t7 /* 00E34 809C4464 00000000 */ nop glabel L809C4468 -/* 00E38 809C4468 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 00E3C 809C446C 9718F552 */ lhu $t8, -0x0AAE($t8) ## 8015F552 +/* 00E38 809C4468 3C188016 */ lui $t8, %hi(gSaveContext+0xef2) +/* 00E3C 809C446C 9718F552 */ lhu $t8, %lo(gSaveContext+0xef2)($t8) /* 00E40 809C4470 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 00E44 809C4474 33190002 */ andi $t9, $t8, 0x0002 ## $t9 = 00000000 /* 00E48 809C4478 13200002 */ beq $t9, $zero, .L809C4484 @@ -49,8 +49,8 @@ glabel L809C4498 /* 00E6C 809C449C 1000000C */ beq $zero, $zero, .L809C44D0 /* 00E70 809C44A0 A7A3004E */ sh $v1, 0x004E($sp) glabel L809C44A4 -/* 00E74 809C44A4 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 00E78 809C44A8 9508F552 */ lhu $t0, -0x0AAE($t0) ## 8015F552 +/* 00E74 809C44A4 3C088016 */ lui $t0, %hi(gSaveContext+0xef2) +/* 00E78 809C44A8 9508F552 */ lhu $t0, %lo(gSaveContext+0xef2)($t0) /* 00E7C 809C44AC 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 00E80 809C44B0 31090004 */ andi $t1, $t0, 0x0004 ## $t1 = 00000000 /* 00E84 809C44B4 11200002 */ beq $t1, $zero, .L809C44C0 @@ -64,10 +64,10 @@ glabel L809C44C8 /* 00E9C 809C44CC A7A3004E */ sh $v1, 0x004E($sp) .L809C44D0: /* 00EA0 809C44D0 87A3004E */ lh $v1, 0x004E($sp) -/* 00EA4 809C44D4 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 00EA4 809C44D4 3C0A8016 */ lui $t2, %hi(gGameInfo) /* 00EA8 809C44D8 3C014314 */ lui $at, 0x4314 ## $at = 43140000 /* 00EAC 809C44DC A6030230 */ sh $v1, 0x0230($s0) ## 00000230 -/* 00EB0 809C44E0 8D4AFA90 */ lw $t2, -0x0570($t2) ## 8015FA90 +/* 00EB0 809C44E0 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) /* 00EB4 809C44E4 44813000 */ mtc1 $at, $f6 ## $f6 = 148.00 /* 00EB8 809C44E8 3C0D809C */ lui $t5, %hi(D_809C4A60) ## $t5 = 809C0000 /* 00EBC 809C44EC 854212E2 */ lh $v0, 0x12E2($t2) ## 801612E2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4664.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4664.s index 6636afdc90..9a99051dc5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4664.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C4664.s @@ -32,9 +32,9 @@ glabel func_809C4664 /* 01090 809C46C0 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 /* 01094 809C46C4 8FAA0020 */ lw $t2, 0x0020($sp) /* 01098 809C46C8 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 0109C 809C46CC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 0109C 809C46CC 3C038016 */ lui $v1, %hi(gGameInfo) /* 010A0 809C46D0 A5490232 */ sh $t1, 0x0232($t2) ## 00000232 -/* 010A4 809C46D4 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 010A4 809C46D4 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) /* 010A8 809C46D8 3C04809C */ lui $a0, %hi(D_809C4C2C) ## $a0 = 809C0000 /* 010AC 809C46DC 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 /* 010B0 809C46E0 846B12D8 */ lh $t3, 0x12D8($v1) ## 801612D8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C4E8C.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C4E8C.s index dfbaba0126..a456554c21 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C4E8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C4E8C.s @@ -25,9 +25,9 @@ glabel func_809C4E8C /* 0007C 809C4EBC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00080 809C4EC0 240400DA */ addiu $a0, $zero, 0x00DA ## $a0 = 000000DA /* 00084 809C4EC4 106000AA */ beq $v1, $zero, .L809C5170 -/* 00088 809C4EC8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00088 809C4EC8 3C028016 */ lui $v0, %hi(gGameInfo) /* 0008C 809C4ECC 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00 -/* 00090 809C4ED0 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 00090 809C4ED0 2442FA90 */ addiu $v0, %lo(gGameInfo) .L809C4ED4: /* 00094 809C4ED4 10700004 */ beq $v1, $s0, .L809C4EE8 /* 00098 809C4ED8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C53F0.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C53F0.s index cdf1c41d46..96d827a0e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C53F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C53F0.s @@ -15,15 +15,15 @@ glabel func_809C53F0 /* 005E4 809C5424 1000000D */ beq $zero, $zero, .L809C545C /* 005E8 809C5428 84C50152 */ lh $a1, 0x0152($a2) ## 00000152 .L809C542C: -/* 005EC 809C542C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 005F0 809C5430 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 005EC 809C542C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 005F0 809C5430 2442E660 */ addiu $v0, %lo(gSaveContext) /* 005F4 809C5434 944F0EF2 */ lhu $t7, 0x0EF2($v0) ## 8015F552 /* 005F8 809C5438 35F80002 */ ori $t8, $t7, 0x0002 ## $t8 = 00000002 /* 005FC 809C543C 10000006 */ beq $zero, $zero, .L809C5458 /* 00600 809C5440 A4580EF2 */ sh $t8, 0x0EF2($v0) ## 8015F552 .L809C5444: -/* 00604 809C5444 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00608 809C5448 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00604 809C5444 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00608 809C5448 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0060C 809C544C 94590EF2 */ lhu $t9, 0x0EF2($v0) ## 8015F552 /* 00610 809C5450 37280004 */ ori $t0, $t9, 0x0004 ## $t0 = 00000004 /* 00614 809C5454 A4480EF2 */ sh $t0, 0x0EF2($v0) ## 8015F552 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C54A8.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C54A8.s index 5b8cc5d1b0..04d31e8d61 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C54A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C54A8.s @@ -21,18 +21,18 @@ glabel func_809C54A8 /* 006B4 809C54F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006B8 809C54F8 17010012 */ bne $t8, $at, .L809C5544 /* 006BC 809C54FC AE180160 */ sw $t8, 0x0160($s0) ## 00000160 -/* 006C0 809C5500 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 006C4 809C5504 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 -/* 006C8 809C5508 8D2971B4 */ lw $t1, 0x71B4($t1) ## 801271B4 -/* 006CC 809C550C 8D08E700 */ lw $t0, -0x1900($t0) ## 8015E700 -/* 006D0 809C5510 3C0B8012 */ lui $t3, 0x8012 ## $t3 = 80120000 -/* 006D4 809C5514 916B71F5 */ lbu $t3, 0x71F5($t3) ## 801271F5 +/* 006C0 809C5500 3C088016 */ lui $t0, %hi(gSaveContext+0xa0) +/* 006C4 809C5504 3C098012 */ lui $t1, %hi(gUpgradeMasks+4) +/* 006C8 809C5508 8D2971B4 */ lw $t1, %lo(gUpgradeMasks+4)($t1) +/* 006CC 809C550C 8D08E700 */ lw $t0, %lo(gSaveContext+0xa0)($t0) +/* 006D0 809C5510 3C0B8012 */ lui $t3, %hi(gUpgradeShifts+1) +/* 006D4 809C5514 916B71F5 */ lbu $t3, %lo(gUpgradeShifts+1)($t3) /* 006D8 809C5518 01095024 */ and $t2, $t0, $t1 -/* 006DC 809C551C 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 +/* 006DC 809C551C 3C0E8012 */ lui $t6, %hi(gUpgradeCapacities+8) /* 006E0 809C5520 016A6007 */ srav $t4, $t2, $t3 /* 006E4 809C5524 000C6840 */ sll $t5, $t4, 1 /* 006E8 809C5528 01CD7021 */ addu $t6, $t6, $t5 -/* 006EC 809C552C 95CE7204 */ lhu $t6, 0x7204($t6) ## 80127204 +/* 006EC 809C552C 95CE7204 */ lhu $t6, %lo(gUpgradeCapacities+8)($t6) /* 006F0 809C5530 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 006F4 809C5534 240F0034 */ addiu $t7, $zero, 0x0034 ## $t7 = 00000034 /* 006F8 809C5538 55C10003 */ bnel $t6, $at, .L809C5548 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5608.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5608.s index 63945f8c49..51debd6890 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5608.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5608.s @@ -32,10 +32,10 @@ glabel func_809C5608 /* 00814 809C5654 240F0140 */ addiu $t7, $zero, 0x0140 ## $t7 = 00000140 /* 00818 809C5658 2484574C */ addiu $a0, $a0, %lo(D_809C574C) ## $a0 = 809C574C /* 0081C 809C565C 15C10004 */ bne $t6, $at, .L809C5670 -/* 00820 809C5660 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00820 809C5660 3C018016 */ lui $at, %hi(gSaveContext+0x1424) /* 00824 809C5664 0C00084C */ jal osSyncPrintf -/* 00828 809C5668 A42FFA84 */ sh $t7, -0x057C($at) ## 8015FA84 +/* 00828 809C5668 A42FFA84 */ sh $t7, %lo(gSaveContext+0x1424)($at) /* 0082C 809C566C 8FA20018 */ lw $v0, 0x0018($sp) .L809C5670: /* 00830 809C5670 3C19809C */ lui $t9, %hi(func_809C4E60) ## $t9 = 809C0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Draw.s index d4a32f22e3..fb952c9c4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Draw.s @@ -143,13 +143,13 @@ glabel EnBombf_Draw /* 0123C 809C819C 0C271FC9 */ jal func_809C7F24 /* 01240 809C81A0 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 01244 809C81A4 8FAA0024 */ lw $t2, 0x0024($sp) -/* 01248 809C81A8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 01248 809C81A8 3C0E8016 */ lui $t6, %hi(gSegments) /* 0124C 809C81AC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01250 809C81B0 000A5900 */ sll $t3, $t2, 4 /* 01254 809C81B4 000B6702 */ srl $t4, $t3, 28 /* 01258 809C81B8 000C6880 */ sll $t5, $t4, 2 /* 0125C 809C81BC 01CD7021 */ addu $t6, $t6, $t5 -/* 01260 809C81C0 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 01260 809C81C0 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 01264 809C81C4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 01268 809C81C8 00414824 */ and $t1, $v0, $at /* 0126C 809C81CC 8FB9002C */ lw $t9, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Init.s index df30b7771c..80e34c074c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Init.s @@ -46,8 +46,8 @@ glabel EnBombf_Init /* 0008C 809C6FEC 0C017014 */ jal func_8005C050 /* 00090 809C6FF0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00094 809C6FF4 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 00098 809C6FF8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0009C 809C6FFC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00098 809C6FF8 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 0009C 809C6FFC 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 000A0 809C7000 17000005 */ bne $t8, $zero, .L809C7018 /* 000A4 809C7004 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 000A8 809C7008 3C01447A */ lui $at, 0x447A ## $at = 447A0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Update.s index 79e6d8a5f0..d73ded5eb2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Update.s @@ -115,13 +115,13 @@ glabel EnBombf_Update .L809C78EC: /* 0098C 809C78EC C610006C */ lwc1 $f16, 0x006C($s0) ## 0000006C /* 00990 809C78F0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00994 809C78F4 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 00994 809C78F4 3C0B8016 */ lui $t3, %hi(gGameInfo) /* 00998 809C78F8 46101032 */ c.eq.s $f2, $f16 /* 0099C 809C78FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 009A0 809C7900 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 009A4 809C7904 4503000E */ bc1tl .L809C7940 /* 009A8 809C7908 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 009AC 809C790C 8D6BFA90 */ lw $t3, -0x0570($t3) ## 8015FA90 +/* 009AC 809C790C 8D6BFA90 */ lw $t3, %lo(gGameInfo)($t3) /* 009B0 809C7910 240C001F */ addiu $t4, $zero, 0x001F ## $t4 = 0000001F /* 009B4 809C7914 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 009B8 809C7918 A56A0560 */ sh $t2, 0x0560($t3) ## 80160560 @@ -129,8 +129,8 @@ glabel EnBombf_Update /* 009C0 809C7920 E7A20010 */ swc1 $f2, 0x0010($sp) /* 009C4 809C7924 0C00B92D */ jal func_8002E4B4 /* 009C8 809C7928 8FA4009C */ lw $a0, 0x009C($sp) -/* 009CC 809C792C 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 009D0 809C7930 8DADFA90 */ lw $t5, -0x0570($t5) ## 8015FA90 +/* 009CC 809C792C 3C0D8016 */ lui $t5, %hi(gGameInfo) +/* 009D0 809C7930 8DADFA90 */ lw $t5, %lo(gGameInfo)($t5) /* 009D4 809C7934 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 009D8 809C7938 A5A00560 */ sh $zero, 0x0560($t5) ## 80160560 /* 009DC 809C793C 860E001C */ lh $t6, 0x001C($s0) ## 0000001C @@ -182,8 +182,8 @@ glabel EnBombf_Update /* 00A80 809C79E0 0C00B638 */ jal Actor_MoveForward /* 00A84 809C79E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A88 809C79E8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00A8C 809C79EC 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 00A88 809C79E8 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 00A8C 809C79EC 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 00A90 809C79F0 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 00A94 809C79F4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 00A98 809C79F8 A5CD0560 */ sh $t5, 0x0560($t6) ## 80160560 @@ -195,8 +195,8 @@ glabel EnBombf_Update /* 00AB0 809C7A10 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 00AB4 809C7A14 0C00B92D */ jal func_8002E4B4 /* 00AB8 809C7A18 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00ABC 809C7A1C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 00AC0 809C7A20 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 00ABC 809C7A1C 3C188016 */ lui $t8, %hi(gGameInfo) +/* 00AC0 809C7A20 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 00AC4 809C7A24 3C01809D */ lui $at, %hi(D_809C835C) ## $at = 809D0000 /* 00AC8 809C7A28 A7000560 */ sh $zero, 0x0560($t8) ## 80160560 /* 00ACC 809C7A2C C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Init.s index 04ce99ac5f..11df0c3715 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Init.s @@ -1,6 +1,6 @@ glabel EnBox_Init -/* 00094 809C8E54 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00098 809C8E58 8C42E664 */ lw $v0, -0x199C($v0) ## 8015E664 +/* 00094 809C8E54 3C028016 */ lui $v0, %hi(gSaveContext+4) +/* 00098 809C8E58 8C42E664 */ lw $v0, %lo(gSaveContext+4)($v0) /* 0009C 809C8E5C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 000A0 809C8E60 AFB00024 */ sw $s0, 0x0024($sp) /* 000A4 809C8E64 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C94AC.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C94AC.s index 44511dbd5e..942be22beb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C94AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C94AC.s @@ -68,10 +68,10 @@ glabel func_809C94AC /* 007C8 809C9588 0C0200FC */ jal func_800803F0 /* 007CC 809C958C 860501AE */ lh $a1, 0x01AE($s0) ## 000001AE .L809C9590: -/* 007D0 809C9590 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 007D4 809C9594 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 007D8 809C9598 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 007DC 809C959C 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 007D0 809C9590 3C078013 */ lui $a3, %hi(D_801333E0) +/* 007D4 809C9594 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 007D8 809C9598 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 007DC 809C959C 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 007E0 809C95A0 AFAF0014 */ sw $t7, 0x0014($sp) /* 007E4 809C95A4 AFA70010 */ sw $a3, 0x0010($sp) /* 007E8 809C95A8 24042856 */ addiu $a0, $zero, 0x2856 ## $a0 = 00002856 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C99C4.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C99C4.s index 1afb9e0ba9..f4f73e847e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C99C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C99C4.s @@ -32,10 +32,10 @@ glabel func_809C99C4 /* 00C78 809C9A38 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn /* 00C7C 809C9A3C E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00C80 809C9A40 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00C84 809C9A44 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 00C88 809C9A48 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00C8C 809C9A4C 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 00C80 809C9A40 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00C84 809C9A44 3C198013 */ lui $t9, %hi(D_801333E8) +/* 00C88 809C9A48 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00C8C 809C9A4C 273933E8 */ addiu $t9, %lo(D_801333E8) /* 00C90 809C9A50 AFB90014 */ sw $t9, 0x0014($sp) /* 00C94 809C9A54 AFA70010 */ sw $a3, 0x0010($sp) /* 00C98 809C9A58 2404287B */ addiu $a0, $zero, 0x287B ## $a0 = 0000287B diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s index d74db5685f..cd51422336 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s @@ -17,9 +17,9 @@ glabel func_809C9B28 /* 00D8C 809C9B4C A08E01F7 */ sb $t6, 0x01F7($a0) ## 000001F7 /* 00D90 809C9B50 1040004C */ beq $v0, $zero, .L809C9C84 /* 00D94 809C9B54 A09801F6 */ sb $t8, 0x01F6($a0) ## 000001F6 -/* 00D98 809C9B58 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00D98 809C9B58 3C038016 */ lui $v1, %hi(gSaveContext+4) /* 00D9C 809C9B5C 04410003 */ bgez $v0, .L809C9B6C -/* 00DA0 809C9B60 8C63E664 */ lw $v1, -0x199C($v1) ## 8015E664 +/* 00DA0 809C9B60 8C63E664 */ lw $v1, %lo(gSaveContext+4)($v1) /* 00DA4 809C9B64 10000002 */ beq $zero, $zero, .L809C9B70 /* 00DA8 809C9B68 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 .L809C9B6C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9D70.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9D70.s index a261148432..7961a6f568 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9D70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9D70.s @@ -69,12 +69,12 @@ glabel func_809C9D70 /* 01088 809C9E48 A7A8002E */ sh $t0, 0x002E($sp) .L809C9E4C: /* 0108C 809C9E4C 97A4002E */ lhu $a0, 0x002E($sp) -/* 01090 809C9E50 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01094 809C9E54 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01090 809C9E50 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01094 809C9E54 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01098 809C9E58 10800007 */ beq $a0, $zero, .L809C9E78 /* 0109C 809C9E5C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 010A0 809C9E60 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 010A4 809C9E64 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 +/* 010A0 809C9E60 3C098013 */ lui $t1, %hi(D_801333E8) +/* 010A4 809C9E64 252933E8 */ addiu $t1, %lo(D_801333E8) /* 010A8 809C9E68 AFA90014 */ sw $t1, 0x0014($sp) /* 010AC 809C9E6C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 010B0 809C9E70 0C03DCE3 */ jal Audio_PlaySoundGeneral diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Init.s index 6ede302bae..537f5cd0d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Init.s @@ -4,10 +4,10 @@ glabel EnBubble_Init /* 00C94 809CC894 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00C98 809CC898 AFBF0024 */ sw $ra, 0x0024($sp) /* 00C9C 809CC89C AFA5003C */ sw $a1, 0x003C($sp) -/* 00CA0 809CC8A0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 00CA0 809CC8A0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 00CA4 809CC8A4 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 /* 00CA8 809CC8A8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD -/* 00CAC 809CC8AC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00CAC 809CC8AC 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00CB0 809CC8B0 3C054180 */ lui $a1, 0x4180 ## $a1 = 41800000 /* 00CB4 809CC8B4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCAA8.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCAA8.s index 6bcd7f75c1..143ac6dcdb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCAA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCAA8.s @@ -6,9 +6,9 @@ glabel func_809CCAA8 /* 00EB8 809CCAB8 AFA40018 */ sw $a0, 0x0018($sp) /* 00EBC 809CCABC 04400008 */ bltz $v0, .L809CCAE0 /* 00EC0 809CCAC0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00EC4 809CCAC4 3C0E8003 */ lui $t6, 0x8003 ## $t6 = 80030000 +/* 00EC4 809CCAC4 3C0E8003 */ lui $t6, %hi(ActorShadow_DrawFunc_Circle) /* 00EC8 809CCAC8 3C0F809D */ lui $t7, %hi(func_809CCAF0) ## $t7 = 809D0000 -/* 00ECC 809CCACC 25CEB5EC */ addiu $t6, $t6, 0xB5EC ## $t6 = 8002B5EC +/* 00ECC 809CCACC 25CEB5EC */ addiu $t6, %lo(ActorShadow_DrawFunc_Circle) /* 00ED0 809CCAD0 25EFCAF0 */ addiu $t7, $t7, %lo(func_809CCAF0) ## $t7 = 809CCAF0 /* 00ED4 809CCAD4 AC8E00C0 */ sw $t6, 0x00C0($a0) ## 000000C0 /* 00ED8 809CCAD8 A482020A */ sh $v0, 0x020A($a0) ## 0000020A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD144.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD144.s index 7b4f65250b..eabc2195e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD144.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD144.s @@ -161,12 +161,12 @@ glabel func_809CD144 /* 002E0 809CD350 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 002E4 809CD354 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 002E8 809CD358 00194080 */ sll $t0, $t9, 2 -/* 002EC 809CD35C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 002EC 809CD35C 3C098016 */ lui $t1, %hi(gSegments) /* 002F0 809CD360 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 /* 002F4 809CD364 01284821 */ addu $t1, $t1, $t0 /* 002F8 809CD368 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 002FC 809CD36C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00300 809CD370 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 +/* 00300 809CD370 8D296FA8 */ lw $t1, %lo(gSegments)($t1) /* 00304 809CD374 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00308 809CD378 00815024 */ and $t2, $a0, $at /* 0030C 809CD37C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s index 024a66382a..e4d5c31439 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s @@ -75,12 +75,12 @@ glabel EnBw_Draw /* 02908 809D0FE8 01B87025 */ or $t6, $t5, $t8 ## $t6 = 00000000 /* 0290C 809D0FEC AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 02910 809D0FF0 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 -/* 02914 809D0FF4 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 +/* 02914 809D0FF4 3C0B8011 */ lui $t3, %hi(D_80116280+0x10) /* 02918 809D0FF8 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 0291C 809D0FFC 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 /* 02920 809D1000 AE3902C0 */ sw $t9, 0x02C0($s1) ## 000002C0 /* 02924 809D1004 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 02928 809D1008 256B6290 */ addiu $t3, $t3, 0x6290 ## $t3 = 80116290 +/* 02928 809D1008 256B6290 */ addiu $t3, %lo(D_80116280+0x10) /* 0292C 809D100C AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 /* 02930 809D1010 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 02934 809D1014 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C @@ -131,12 +131,12 @@ glabel EnBw_Draw /* 029E4 809D10C4 01987825 */ or $t7, $t4, $t8 ## $t7 = FF008080 /* 029E8 809D10C8 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 029EC 809D10CC 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 029F0 809D10D0 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 +/* 029F0 809D10D0 3C0B8011 */ lui $t3, %hi(D_80116280) /* 029F4 809D10D4 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 029F8 809D10D8 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 029FC 809D10DC AE2E02D0 */ sw $t6, 0x02D0($s1) ## 000002D0 /* 02A00 809D10E0 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 02A04 809D10E4 256B6280 */ addiu $t3, $t3, 0x6280 ## $t3 = 80116280 +/* 02A04 809D10E4 256B6280 */ addiu $t3, %lo(D_80116280) /* 02A08 809D10E8 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 02A0C 809D10EC AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 02A10 809D10F0 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Init.s index c0b6274e2f..6636dbad6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Init.s @@ -32,8 +32,8 @@ glabel EnBw_Init /* 00068 809CE748 0C02915F */ jal SkelAnime_Init /* 0006C 809CE74C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00070 809CE750 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00074 809CE754 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00070 809CE750 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00074 809CE754 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00078 809CE758 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0007C 809CE75C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00080 809CE760 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CEA24.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CEA24.s index 839b6bcf3b..b46c41b163 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CEA24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CEA24.s @@ -251,26 +251,26 @@ glabel func_809CEA24 .L809CED34: /* 00654 809CED34 8FAA0074 */ lw $t2, 0x0074($sp) /* 00658 809CED38 8FAC0074 */ lw $t4, 0x0074($sp) -/* 0065C 809CED3C 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 0065C 809CED3C 3C0B8016 */ lui $t3, %hi(gSegments) /* 00660 809CED40 11400020 */ beq $t2, $zero, .L809CEDC4 /* 00664 809CED44 000C7100 */ sll $t6, $t4, 4 /* 00668 809CED48 000E6F02 */ srl $t5, $t6, 28 /* 0066C 809CED4C 000D7880 */ sll $t7, $t5, 2 /* 00670 809CED50 016F5821 */ addu $t3, $t3, $t7 /* 00674 809CED54 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00678 809CED58 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 +/* 00678 809CED58 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) /* 0067C 809CED5C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00680 809CED60 0181C024 */ and $t8, $t4, $at /* 00684 809CED64 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00688 809CED68 0178C821 */ addu $t9, $t3, $t8 /* 0068C 809CED6C 03214021 */ addu $t0, $t9, $at /* 00690 809CED70 AFA80074 */ sw $t0, 0x0074($sp) -/* 00694 809CED74 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 -/* 00698 809CED78 3C0A8000 */ lui $t2, 0x8000 ## $t2 = 80000000 +/* 00694 809CED74 3C098000 */ lui $t1, %hi(D_80000008) +/* 00698 809CED78 3C0A8000 */ lui $t2, %hi(D_8000000C) /* 0069C 809CED7C 01595021 */ addu $t2, $t2, $t9 /* 006A0 809CED80 01394821 */ addu $t1, $t1, $t9 -/* 006A4 809CED84 85290008 */ lh $t1, 0x0008($t1) ## 80000008 -/* 006A8 809CED88 854A000C */ lh $t2, 0x000C($t2) ## 8000000C +/* 006A4 809CED84 85290008 */ lh $t1, %lo(D_80000008)($t1) +/* 006A8 809CED88 854A000C */ lh $t2, %lo(D_8000000C)($t2) /* 006AC 809CED8C 44894000 */ mtc1 $t1, $f8 ## $f8 = -0.00 /* 006B0 809CED90 448A8000 */ mtc1 $t2, $f16 ## $f16 = -0.00 /* 006B4 809CED94 46804320 */ cvt.s.w $f12, $f8 @@ -527,25 +527,25 @@ glabel L809CEF9C /* 00A38 809CF118 10400031 */ beq $v0, $zero, .L809CF1E0 /* 00A3C 809CF11C AFA20064 */ sw $v0, 0x0064($sp) /* 00A40 809CF120 8FAE0074 */ lw $t6, 0x0074($sp) -/* 00A44 809CF124 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 00A44 809CF124 3C0B8016 */ lui $t3, %hi(gSegments) /* 00A48 809CF128 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00A4C 809CF12C 000E6900 */ sll $t5, $t6, 4 /* 00A50 809CF130 000D7F02 */ srl $t7, $t5, 28 /* 00A54 809CF134 000F6080 */ sll $t4, $t7, 2 /* 00A58 809CF138 016C5821 */ addu $t3, $t3, $t4 -/* 00A5C 809CF13C 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 +/* 00A5C 809CF13C 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) /* 00A60 809CF140 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00A64 809CF144 01C1C024 */ and $t8, $t6, $at /* 00A68 809CF148 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00A6C 809CF14C 01784021 */ addu $t0, $t3, $t8 /* 00A70 809CF150 01014821 */ addu $t1, $t0, $at /* 00A74 809CF154 AFA90074 */ sw $t1, 0x0074($sp) -/* 00A78 809CF158 3C198000 */ lui $t9, 0x8000 ## $t9 = 80000000 -/* 00A7C 809CF15C 3C0A8000 */ lui $t2, 0x8000 ## $t2 = 80000000 +/* 00A78 809CF158 3C198000 */ lui $t9, %hi(D_80000008) +/* 00A7C 809CF15C 3C0A8000 */ lui $t2, %hi(D_8000000C) /* 00A80 809CF160 01485021 */ addu $t2, $t2, $t0 /* 00A84 809CF164 0328C821 */ addu $t9, $t9, $t0 -/* 00A88 809CF168 87390008 */ lh $t9, 0x0008($t9) ## 80000008 -/* 00A8C 809CF16C 854A000C */ lh $t2, 0x000C($t2) ## 8000000C +/* 00A88 809CF168 87390008 */ lh $t9, %lo(D_80000008)($t9) +/* 00A8C 809CF16C 854A000C */ lh $t2, %lo(D_8000000C)($t2) /* 00A90 809CF170 44995000 */ mtc1 $t9, $f10 ## $f10 = -0.00 /* 00A94 809CF174 448A9000 */ mtc1 $t2, $f18 ## $f18 = -0.00 /* 00A98 809CF178 46805320 */ cvt.s.w $f12, $f10 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s index d115d57e2a..105cb9114d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s @@ -68,7 +68,7 @@ glabel EnBx_Draw /* 006C0 809D21A0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 006C4 809D21A4 864B001C */ lh $t3, 0x001C($s2) ## 0000001C /* 006C8 809D21A8 3C04809D */ lui $a0, %hi(D_809D2560) ## $a0 = 809D0000 -/* 006CC 809D21AC 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 006CC 809D21AC 3C088016 */ lui $t0, %hi(gSegments) /* 006D0 809D21B0 316C007F */ andi $t4, $t3, 0x007F ## $t4 = 00000000 /* 006D4 809D21B4 000C6880 */ sll $t5, $t4, 2 /* 006D8 809D21B8 008D2021 */ addu $a0, $a0, $t5 @@ -79,7 +79,7 @@ glabel EnBx_Draw /* 006EC 809D21CC 000FC702 */ srl $t8, $t7, 28 /* 006F0 809D21D0 0018C880 */ sll $t9, $t8, 2 /* 006F4 809D21D4 01194021 */ addu $t0, $t0, $t9 -/* 006F8 809D21D8 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 +/* 006F8 809D21D8 8D086FA8 */ lw $t0, %lo(gSegments)($t0) /* 006FC 809D21DC 00817024 */ and $t6, $a0, $at /* 00700 809D21E0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00704 809D21E4 01C84821 */ addu $t1, $t6, $t0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Init.s index 6ccc264748..102276b71c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Init.s @@ -90,8 +90,8 @@ glabel EnBx_Init /* 00134 809D1C14 46068200 */ add.s $f8, $f16, $f6 /* 00138 809D1C18 144AFFE2 */ bne $v0, $t2, .L809D1BA4 /* 0013C 809D1C1C E488014C */ swc1 $f8, 0x014C($a0) ## 00000158 -/* 00140 809D1C20 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00144 809D1C24 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00140 809D1C20 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00144 809D1C24 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00148 809D1C28 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0014C 809D1C2C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00150 809D1C30 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Init.s index 9fc27b36c8..3e8819c924 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Init.s @@ -140,13 +140,13 @@ glabel EnChanger_Init /* 000D8 809D2768 24843230 */ addiu $a0, $a0, %lo(D_809D3230) ## $a0 = 809D3230 /* 000DC 809D276C 87A30068 */ lh $v1, 0x0068($sp) /* 000E0 809D2770 82491CBC */ lb $t1, 0x1CBC($s2) ## 00001CBC -/* 000E4 809D2774 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 000E4 809D2774 3C0A8016 */ lui $t2, %hi(gSaveContext+0xef2) /* 000E8 809D2778 00031840 */ sll $v1, $v1, 1 /* 000EC 809D277C 00031C00 */ sll $v1, $v1, 16 /* 000F0 809D2780 29210006 */ slti $at, $t1, 0x0006 /* 000F4 809D2784 14200053 */ bne $at, $zero, .L809D28D4 /* 000F8 809D2788 00031C03 */ sra $v1, $v1, 16 -/* 000FC 809D278C 954AF552 */ lhu $t2, -0x0AAE($t2) ## 8015F552 +/* 000FC 809D278C 954AF552 */ lhu $t2, %lo(gSaveContext+0xef2)($t2) /* 00100 809D2790 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00104 809D2794 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 /* 00108 809D2798 314B0800 */ andi $t3, $t2, 0x0800 ## $t3 = 00000000 @@ -188,7 +188,7 @@ glabel EnChanger_Init /* 0018C 809D281C 1040002D */ beq $v0, $zero, .L809D28D4 /* 00190 809D2820 AE220158 */ sw $v0, 0x0158($s1) ## 00000158 /* 00194 809D2824 862F0168 */ lh $t7, 0x0168($s1) ## 00000168 -/* 00198 809D2828 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 00198 809D2828 3C188016 */ lui $t8, %hi(gSaveContext+0xef2) /* 0019C 809D282C 8FA4004C */ lw $a0, 0x004C($sp) /* 001A0 809D2830 11E00009 */ beq $t7, $zero, .L809D2858 /* 001A4 809D2834 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 @@ -203,7 +203,7 @@ glabel EnChanger_Init /* 001C0 809D2850 10000119 */ beq $zero, $zero, .L809D2CB8 /* 001C4 809D2854 8FBF0044 */ lw $ra, 0x0044($sp) .L809D2858: -/* 001C8 809D2858 9718F552 */ lhu $t8, -0x0AAE($t8) ## FFFFF552 +/* 001C8 809D2858 9718F552 */ lhu $t8, %lo(gSaveContext+0xef2)($t8) /* 001CC 809D285C 44070000 */ mfc1 $a3, $f0 /* 001D0 809D2860 2406010F */ addiu $a2, $zero, 0x010F ## $a2 = 0000010F /* 001D4 809D2864 33190800 */ andi $t9, $t8, 0x0800 ## $t9 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Update.s index 01208be3a8..a56757fc86 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Update.s @@ -7,7 +7,7 @@ glabel EnChanger_Update /* 00948 809D2FD8 0320F809 */ jalr $ra, $t9 /* 0094C 809D2FDC 00000000 */ nop /* 00950 809D2FE0 8FA40048 */ lw $a0, 0x0048($sp) -/* 00954 809D2FE4 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00954 809D2FE4 3C0F8016 */ lui $t7, %hi(gGameInfo) /* 00958 809D2FE8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0095C 809D2FEC 84820166 */ lh $v0, 0x0166($a0) ## 00000166 /* 00960 809D2FF0 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF @@ -16,7 +16,7 @@ glabel EnChanger_Update /* 0096C 809D2FFC 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 00970 809D3000 A48E0166 */ sh $t6, 0x0166($a0) ## 00000166 .L809D3004: -/* 00974 809D3004 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 00974 809D3004 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 00978 809D3008 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF /* 0097C 809D300C 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 /* 00980 809D3010 85F812D4 */ lh $t8, 0x12D4($t7) ## 801612D4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Changer/func_809D2F74.s b/asm/non_matchings/overlays/actors/ovl_En_Changer/func_809D2F74.s index 54c66a078f..1eef4d8c6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Changer/func_809D2F74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Changer/func_809D2F74.s @@ -3,8 +3,8 @@ glabel func_809D2F74 /* 008E8 809D2F78 AFBF0014 */ sw $ra, 0x0014($sp) /* 008EC 809D2F7C AFA5001C */ sw $a1, 0x001C($sp) /* 008F0 809D2F80 8C8E0158 */ lw $t6, 0x0158($a0) ## 00000158 -/* 008F4 809D2F84 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 008F8 809D2F88 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 008F4 809D2F84 3C038016 */ lui $v1, %hi(gSaveContext) +/* 008F8 809D2F88 2463E660 */ addiu $v1, %lo(gSaveContext) /* 008FC 809D2F8C 85CF01F4 */ lh $t7, 0x01F4($t6) ## 000001F4 /* 00900 809D2F90 51E00009 */ beql $t7, $zero, .L809D2FB8 /* 00904 809D2F94 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s index 61f156ad05..ffdc993e8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s @@ -5,8 +5,8 @@ glabel EnCow_Init /* 00220 809DF020 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00224 809DF024 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00228 809DF028 AFBF003C */ sw $ra, 0x003C($sp) -/* 0022C 809DF02C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00230 809DF030 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0022C 809DF02C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00230 809DF030 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00234 809DF034 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00238 809DF038 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 0023C 809DF03C 0C00AC78 */ jal ActorShape_Init @@ -68,9 +68,9 @@ glabel EnCow_Init /* 00304 809DF104 AE19027C */ sw $t9, 0x027C($s0) ## 0000027C /* 00308 809DF108 862800A4 */ lh $t0, 0x00A4($s1) ## 000000A4 /* 0030C 809DF10C 24010034 */ addiu $at, $zero, 0x0034 ## $at = 00000034 -/* 00310 809DF110 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00310 809DF110 3C028016 */ lui $v0, %hi(gSaveContext) /* 00314 809DF114 15010010 */ bne $t0, $at, .L809DF158 -/* 00318 809DF118 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00318 809DF118 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0031C 809DF11C 8C490004 */ lw $t1, 0x0004($v0) ## 8015E664 /* 00320 809DF120 51200006 */ beql $t1, $zero, .L809DF13C /* 00324 809DF124 944A0ED6 */ lhu $t2, 0x0ED6($v0) ## 8015F536 @@ -120,7 +120,7 @@ glabel EnCow_Init /* 003B8 809DF1B8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 003BC 809DF1BC 460A0400 */ add.s $f16, $f0, $f10 /* 003C0 809DF1C0 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 003C4 809DF1C4 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 003C4 809DF1C4 3C198016 */ lui $t9, %hi(gGameInfo) /* 003C8 809DF1C8 444EF800 */ cfc1 $t6, $31 /* 003CC 809DF1CC 44CFF800 */ ctc1 $t7, $31 /* 003D0 809DF1D0 00000000 */ nop @@ -157,7 +157,7 @@ glabel EnCow_Init /* 00440 809DF240 A60F0278 */ sh $t7, 0x0278($s0) ## 00000278 /* 00444 809DF244 A600027A */ sh $zero, 0x027A($s0) ## 0000027A /* 00448 809DF248 A218001F */ sb $t8, 0x001F($s0) ## 0000001F -/* 0044C 809DF24C 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 0044C 809DF24C 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 00450 809DF250 44CEF800 */ ctc1 $t6, $31 /* 00454 809DF254 10000071 */ beq $zero, $zero, .L809DF41C /* 00458 809DF258 A72005BE */ sh $zero, 0x05BE($t9) ## 801605BE diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF96C.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF96C.s index ecc7872bde..062c9e5f36 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF96C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF96C.s @@ -10,8 +10,8 @@ glabel func_809DF96C /* 00B8C 809DF98C 00000000 */ nop /* 00B90 809DF990 14410036 */ bne $v0, $at, .L809DFA6C .L809DF994: -/* 00B94 809DF994 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00B98 809DF998 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 00B94 809DF994 3C028016 */ lui $v0, %hi(gGameInfo) +/* 00B98 809DF998 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 00B9C 809DF99C 8C470000 */ lw $a3, 0x0000($v0) ## 8015FA90 /* 00BA0 809DF9A0 84EF05BE */ lh $t7, 0x05BE($a3) ## 000005BE /* 00BA4 809DF9A4 51E0002F */ beql $t7, $zero, .L809DFA64 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s index c27a7903af..6a6ce714f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s @@ -44,8 +44,8 @@ glabel EnCrow_Init /* 000A4 809E02E4 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 000A8 809E02E8 0C0187B5 */ jal func_80061ED4 /* 000AC 809E02EC A5490036 */ sh $t1, 0x0036($t2) ## 00000036 -/* 000B0 809E02F0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 000B4 809E02F4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 000B0 809E02F0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 000B4 809E02F4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 000B8 809E02F8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 000BC 809E02FC 3C0544FA */ lui $a1, 0x44FA ## $a1 = 44FA0000 /* 000C0 809E0300 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s index a4b2d95913..fc20a65d54 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s @@ -37,7 +37,7 @@ glabel EnCs_Draw /* 00D38 809E25E8 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 /* 00D3C 809E25EC 8E5801E4 */ lw $t8, 0x01E4($s2) ## 000001E4 /* 00D40 809E25F0 3C04809E */ lui $a0, %hi(D_809E2964) ## $a0 = 809E0000 -/* 00D44 809E25F4 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 00D44 809E25F4 3C0C8016 */ lui $t4, %hi(gSegments) /* 00D48 809E25F8 0018C880 */ sll $t9, $t8, 2 /* 00D4C 809E25FC 00992021 */ addu $a0, $a0, $t9 /* 00D50 809E2600 8C842964 */ lw $a0, %lo(D_809E2964)($a0) @@ -47,7 +47,7 @@ glabel EnCs_Draw /* 00D60 809E2610 00095702 */ srl $t2, $t1, 28 /* 00D64 809E2614 000A5880 */ sll $t3, $t2, 2 /* 00D68 809E2618 018B6021 */ addu $t4, $t4, $t3 -/* 00D6C 809E261C 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 00D6C 809E261C 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 00D70 809E2620 00814024 */ and $t0, $a0, $at /* 00D74 809E2624 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00D78 809E2628 010C6821 */ addu $t5, $t0, $t4 @@ -65,8 +65,8 @@ glabel EnCs_Draw /* 00DA8 809E2658 AFB20018 */ sw $s2, 0x0018($sp) /* 00DAC 809E265C 0C0286B2 */ jal SkelAnime_DrawSV /* 00DB0 809E2660 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00DB4 809E2664 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 00DB8 809E2668 9739F556 */ lhu $t9, -0x0AAA($t9) ## 8015F556 +/* 00DB4 809E2664 3C198016 */ lui $t9, %hi(gSaveContext+0xef6) +/* 00DB8 809E2668 9739F556 */ lhu $t9, %lo(gSaveContext+0xef6)($t9) /* 00DBC 809E266C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00DC0 809E2670 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 /* 00DC4 809E2674 33290400 */ andi $t1, $t9, 0x0400 ## $t1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s index 09c86bce16..f0c629935b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s @@ -1,6 +1,6 @@ glabel EnCs_Init -/* 00120 809E19D0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00124 809E19D4 8DCEE670 */ lw $t6, -0x1990($t6) ## 8015E670 +/* 00120 809E19D0 3C0E8016 */ lui $t6, %hi(gSaveContext+0x10) +/* 00124 809E19D4 8DCEE670 */ lw $t6, %lo(gSaveContext+0x10)($t6) /* 00128 809E19D8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 0012C 809E19DC AFB00028 */ sw $s0, 0x0028($sp) /* 00130 809E19E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 @@ -13,8 +13,8 @@ glabel EnCs_Init /* 00148 809E19F8 10000056 */ beq $zero, $zero, .L809E1B54 /* 0014C 809E19FC 8FBF002C */ lw $ra, 0x002C($sp) .L809E1A00: -/* 00150 809E1A00 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00154 809E1A04 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00150 809E1A00 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00154 809E1A04 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00158 809E1A08 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0015C 809E1A0C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00160 809E1A10 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1B8C.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1B8C.s index 49bddfec87..00bf5efc95 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1B8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1B8C.s @@ -72,8 +72,8 @@ glabel L809E1C3C /* 003BC 809E1C6C 8FA40034 */ lw $a0, 0x0034($sp) /* 003C0 809E1C70 0C021344 */ jal Item_Give /* 003C4 809E1C74 2405002C */ addiu $a1, $zero, 0x002C ## $a1 = 0000002C -/* 003C8 809E1C78 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 003CC 809E1C7C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 003C8 809E1C78 3C038016 */ lui $v1, %hi(gSaveContext) +/* 003CC 809E1C7C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 003D0 809E1C80 946A0EF6 */ lhu $t2, 0x0EF6($v1) ## 8015F556 /* 003D4 809E1C84 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E /* 003D8 809E1C88 354B0400 */ ori $t3, $t2, 0x0400 ## $t3 = 00000400 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s index aaafbcc7a9..7ae855e101 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s @@ -7,8 +7,8 @@ glabel func_809E1CB8 /* 0041C 809E1CCC 2405000F */ addiu $a1, $zero, 0x000F ## $a1 = 0000000F /* 00420 809E1CD0 0C01B0D8 */ jal Text_GetFaceReaction /* 00424 809E1CD4 AFAE001C */ sw $t6, 0x001C($sp) -/* 00428 809E1CD8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 0042C 809E1CDC 95EFF556 */ lhu $t7, -0x0AAA($t7) ## 8015F556 +/* 00428 809E1CD8 3C0F8016 */ lui $t7, %hi(gSaveContext+0xef6) +/* 0042C 809E1CDC 95EFF556 */ lhu $t7, %lo(gSaveContext+0xef6)($t7) /* 00430 809E1CE0 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 /* 00434 809E1CE4 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 00438 809E1CE8 31F80400 */ andi $t8, $t7, 0x0400 ## $t8 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E90.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E90.s index b0529b1508..d235c0f2f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E90.s @@ -2,13 +2,13 @@ glabel func_809E1E90 /* 005E0 809E1E90 000670C0 */ sll $t6, $a2, 3 /* 005E4 809E1E94 008E7821 */ addu $t7, $a0, $t6 /* 005E8 809E1E98 8DE80004 */ lw $t0, 0x0004($t7) ## 00000004 -/* 005EC 809E1E9C 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 005EC 809E1E9C 3C0A8016 */ lui $t2, %hi(gSegments) /* 005F0 809E1EA0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 005F4 809E1EA4 0008C100 */ sll $t8, $t0, 4 /* 005F8 809E1EA8 0018CF02 */ srl $t9, $t8, 28 /* 005FC 809E1EAC 00194880 */ sll $t1, $t9, 2 /* 00600 809E1EB0 01495021 */ addu $t2, $t2, $t1 -/* 00604 809E1EB4 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 00604 809E1EB4 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 00608 809E1EB8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0060C 809E1EBC 00076880 */ sll $t5, $a3, 2 /* 00610 809E1EC0 01A76823 */ subu $t5, $t5, $a3 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2134.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2134.s index 786670faca..aacbc7ef31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2134.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2134.s @@ -18,10 +18,10 @@ glabel func_809E2134 /* 008BC 809E216C 8FA70018 */ lw $a3, 0x0018($sp) /* 008C0 809E2170 8CF801E0 */ lw $t8, 0x01E0($a3) ## 000001E0 /* 008C4 809E2174 8CE50210 */ lw $a1, 0x0210($a3) ## 00000210 -/* 008C8 809E2178 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 008C8 809E2178 3C198016 */ lui $t9, %hi(gSaveContext+0xef6) /* 008CC 809E217C 57000032 */ bnel $t8, $zero, .L809E2248 /* 008D0 809E2180 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 008D4 809E2184 9739F556 */ lhu $t9, -0x0AAA($t9) ## 8015F556 +/* 008D4 809E2184 9739F556 */ lhu $t9, %lo(gSaveContext+0xef6)($t9) /* 008D8 809E2188 33280400 */ andi $t0, $t9, 0x0400 ## $t0 = 00000000 /* 008DC 809E218C 1100000B */ beq $t0, $zero, .L809E21BC /* 008E0 809E2190 00000000 */ nop @@ -50,8 +50,8 @@ glabel func_809E2134 .L809E21E0: /* 00930 809E21E0 14400018 */ bne $v0, $zero, .L809E2244 /* 00934 809E21E4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00938 809E21E8 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 0093C 809E21EC 956BF556 */ lhu $t3, -0x0AAA($t3) ## 8015F556 +/* 00938 809E21E8 3C0B8016 */ lui $t3, %hi(gSaveContext+0xef6) +/* 0093C 809E21EC 956BF556 */ lhu $t3, %lo(gSaveContext+0xef6)($t3) /* 00940 809E21F0 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 00944 809E21F4 316C0400 */ andi $t4, $t3, 0x0400 ## $t4 = 00000000 /* 00948 809E21F8 1180000E */ beq $t4, $zero, .L809E2234 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s index 40d0642abf..b442eb2f3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s @@ -9,8 +9,8 @@ glabel EnDaiku_Init /* 000CC 809E2BFC 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 /* 000D0 809E2C00 14400009 */ bne $v0, $zero, .L809E2C28 /* 000D4 809E2C04 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 000D8 809E2C08 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 000DC 809E2C0C 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 000D8 809E2C08 3C048016 */ lui $a0, %hi(gSaveContext) +/* 000DC 809E2C0C 2484E660 */ addiu $a0, %lo(gSaveContext) /* 000E0 809E2C10 948E0EE6 */ lhu $t6, 0x0EE6($a0) ## 8015F546 /* 000E4 809E2C14 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 /* 000E8 809E2C18 11E00003 */ beq $t7, $zero, .L809E2C28 @@ -18,10 +18,10 @@ glabel EnDaiku_Init /* 000F0 809E2C20 1000001C */ beq $zero, $zero, .L809E2C94 /* 000F4 809E2C24 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L809E2C28: -/* 000F8 809E2C28 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 000F8 809E2C28 3C048016 */ lui $a0, %hi(gSaveContext) /* 000FC 809E2C2C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00100 809E2C30 14410007 */ bne $v0, $at, .L809E2C50 -/* 00104 809E2C34 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 00104 809E2C34 2484E660 */ addiu $a0, %lo(gSaveContext) /* 00108 809E2C38 94980EE6 */ lhu $t8, 0x0EE6($a0) ## 8015F546 /* 0010C 809E2C3C 33190002 */ andi $t9, $t8, 0x0002 ## $t9 = 00000000 /* 00110 809E2C40 53200004 */ beql $t9, $zero, .L809E2C54 @@ -72,11 +72,11 @@ glabel EnDaiku_Init /* 001A8 809E2CD8 861900B8 */ lh $t9, 0x00B8($s0) ## 000000B8 .L809E2CDC: /* 001AC 809E2CDC A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 -/* 001B0 809E2CE0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 001B0 809E2CE0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 001B4 809E2CE4 3329003F */ andi $t1, $t9, 0x003F ## $t1 = 00000000 /* 001B8 809E2CE8 AE090240 */ sw $t1, 0x0240($s0) ## 00000240 /* 001BC 809E2CEC AFA80044 */ sw $t0, 0x0044($sp) -/* 001C0 809E2CF0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 001C0 809E2CF0 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 001C4 809E2CF4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 001C8 809E2CF8 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E2F50.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E2F50.s index fbc53bb83e..acc5e2a2cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E2F50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E2F50.s @@ -57,15 +57,15 @@ glabel func_809E2F50 /* 004F0 809E3020 1000000C */ beq $zero, $zero, .L809E3054 /* 004F4 809E3024 00000000 */ nop .L809E3028: -/* 004F8 809E3028 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 004FC 809E302C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 004F8 809E3028 3C028016 */ lui $v0, %hi(gSaveContext) +/* 004FC 809E302C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00500 809E3030 94580F26 */ lhu $t8, 0x0F26($v0) ## 8015F586 /* 00504 809E3034 37190040 */ ori $t9, $t8, 0x0040 ## $t9 = 00000040 /* 00508 809E3038 10000006 */ beq $zero, $zero, .L809E3054 /* 0050C 809E303C A4590F26 */ sh $t9, 0x0F26($v0) ## 8015F586 .L809E3040: -/* 00510 809E3040 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00514 809E3044 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00510 809E3040 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00514 809E3044 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00518 809E3048 94480F26 */ lhu $t0, 0x0F26($v0) ## 8015F586 /* 0051C 809E304C 35090100 */ ori $t1, $t0, 0x0100 ## $t1 = 00000100 /* 00520 809E3050 A4490F26 */ sh $t1, 0x0F26($v0) ## 8015F586 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3068.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3068.s index ce818a4413..8f7f33023a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3068.s @@ -49,8 +49,8 @@ glabel func_809E3068 /* 005EC 809E311C 54410030 */ bnel $v0, $at, .L809E31E0 /* 005F0 809E3120 24010039 */ addiu $at, $zero, 0x0039 ## $at = 00000039 /* 005F4 809E3124 8E02023C */ lw $v0, 0x023C($s0) ## 0000023C -/* 005F8 809E3128 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 005FC 809E312C 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 005F8 809E3128 3C048016 */ lui $a0, %hi(gSaveContext) +/* 005FC 809E312C 2484E660 */ addiu $a0, %lo(gSaveContext) /* 00600 809E3130 30480010 */ andi $t0, $v0, 0x0010 ## $t0 = 00000000 /* 00604 809E3134 11000025 */ beq $t0, $zero, .L809E31CC /* 00608 809E3138 30590018 */ andi $t9, $v0, 0x0018 ## $t9 = 00000000 @@ -108,23 +108,23 @@ glabel func_809E3068 /* 006B0 809E31E0 54410051 */ bnel $v0, $at, .L809E3328 /* 006B4 809E31E4 8FBF001C */ lw $ra, 0x001C($sp) /* 006B8 809E31E8 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 006BC 809E31EC 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 006C0 809E31F0 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 006BC 809E31EC 3C048016 */ lui $a0, %hi(gSaveContext) +/* 006C0 809E31F0 2484E660 */ addiu $a0, %lo(gSaveContext) /* 006C4 809E31F4 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 /* 006C8 809E31F8 1040000B */ beq $v0, $zero, .L809E3228 -/* 006CC 809E31FC 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 +/* 006CC 809E31FC 3C098012 */ lui $t1, %hi(gBitFlags+0xc) /* 006D0 809E3200 10450014 */ beq $v0, $a1, .L809E3254 -/* 006D4 809E3204 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 006D4 809E3204 3C048016 */ lui $a0, %hi(gSaveContext) /* 006D8 809E3208 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 006DC 809E320C 10410025 */ beq $v0, $at, .L809E32A4 -/* 006E0 809E3210 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 006E0 809E3210 3C048016 */ lui $a0, %hi(gSaveContext) /* 006E4 809E3214 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 006E8 809E3218 10410036 */ beq $v0, $at, .L809E32F4 -/* 006EC 809E321C 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 006EC 809E321C 3C048016 */ lui $a0, %hi(gSaveContext) /* 006F0 809E3220 10000041 */ beq $zero, $zero, .L809E3328 /* 006F4 809E3224 8FBF001C */ lw $ra, 0x001C($sp) .L809E3228: -/* 006F8 809E3228 8D29712C */ lw $t1, 0x712C($t1) ## 8012712C +/* 006F8 809E3228 8D29712C */ lw $t1, %lo(gBitFlags+0xc)($t1) /* 006FC 809E322C 8C8A00A4 */ lw $t2, 0x00A4($a0) ## 801600A4 /* 00700 809E3230 240C6060 */ addiu $t4, $zero, 0x6060 ## $t4 = 00006060 /* 00704 809E3234 240D605F */ addiu $t5, $zero, 0x605F ## $t5 = 0000605F @@ -137,9 +137,9 @@ glabel func_809E3068 /* 0071C 809E324C 10000035 */ beq $zero, $zero, .L809E3324 /* 00720 809E3250 A60D010E */ sh $t5, 0x010E($s0) ## 0000010E .L809E3254: -/* 00724 809E3254 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 -/* 00728 809E3258 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 0072C 809E325C 8DCE712C */ lw $t6, 0x712C($t6) ## 8012712C +/* 00724 809E3254 2484E660 */ addiu $a0, %lo(gSaveContext) +/* 00728 809E3258 3C0E8012 */ lui $t6, %hi(gBitFlags+0xc) +/* 0072C 809E325C 8DCE712C */ lw $t6, %lo(gBitFlags+0xc)($t6) /* 00730 809E3260 8C8F00A4 */ lw $t7, 0x00A4($a0) ## 8015E704 /* 00734 809E3264 24196063 */ addiu $t9, $zero, 0x6063 ## $t9 = 00006063 /* 00738 809E3268 01CFC024 */ and $t8, $t6, $t7 @@ -160,9 +160,9 @@ glabel func_809E3068 /* 0076C 809E329C 10000021 */ beq $zero, $zero, .L809E3324 /* 00770 809E32A0 A60B010E */ sh $t3, 0x010E($s0) ## 0000010E .L809E32A4: -/* 00774 809E32A4 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015CCC0 -/* 00778 809E32A8 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 -/* 0077C 809E32AC 8D8C712C */ lw $t4, 0x712C($t4) ## 8012712C +/* 00774 809E32A4 2484E660 */ addiu $a0, %lo(gSaveContext) +/* 00778 809E32A8 3C0C8012 */ lui $t4, %hi(gBitFlags+0xc) +/* 0077C 809E32AC 8D8C712C */ lw $t4, %lo(gBitFlags+0xc)($t4) /* 00780 809E32B0 8C8D00A4 */ lw $t5, 0x00A4($a0) ## 8015CD64 /* 00784 809E32B4 240F6066 */ addiu $t7, $zero, 0x6066 ## $t7 = 00006066 /* 00788 809E32B8 018D7024 */ and $t6, $t4, $t5 @@ -183,9 +183,9 @@ glabel func_809E3068 /* 007BC 809E32EC 1000000D */ beq $zero, $zero, .L809E3324 /* 007C0 809E32F0 A609010E */ sh $t1, 0x010E($s0) ## 0000010E .L809E32F4: -/* 007C4 809E32F4 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015B320 -/* 007C8 809E32F8 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 007CC 809E32FC 8D4A712C */ lw $t2, 0x712C($t2) ## 8012712C +/* 007C4 809E32F4 2484E660 */ addiu $a0, %lo(gSaveContext) +/* 007C8 809E32F8 3C0A8012 */ lui $t2, %hi(gBitFlags+0xc) +/* 007CC 809E32FC 8D4A712C */ lw $t2, %lo(gBitFlags+0xc)($t2) /* 007D0 809E3300 8C8B00A4 */ lw $t3, 0x00A4($a0) ## 8015B3C4 /* 007D4 809E3304 240D6068 */ addiu $t5, $zero, 0x6068 ## $t5 = 00006068 /* 007D8 809E3308 240E6067 */ addiu $t6, $zero, 0x6067 ## $t6 = 00006067 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E349C.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E349C.s index e13bc6e845..06bde7e585 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E349C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E349C.s @@ -28,9 +28,9 @@ glabel func_809E349C /* 009C0 809E34F0 8E0E023C */ lw $t6, 0x023C($s0) ## 0000023C /* 009C4 809E34F4 2401FFF9 */ addiu $at, $zero, 0xFFF9 ## $at = FFFFFFF9 /* 009C8 809E34F8 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 009CC 809E34FC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 009CC 809E34FC 3C028016 */ lui $v0, %hi(gSaveContext) /* 009D0 809E3500 01C17824 */ and $t7, $t6, $at -/* 009D4 809E3504 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 009D4 809E3504 2442E660 */ addiu $v0, %lo(gSaveContext) /* 009D8 809E3508 AE0F023C */ sw $t7, 0x023C($s0) ## 0000023C /* 009DC 809E350C 94580EE6 */ lhu $t8, 0x0EE6($v0) ## 8015F546 /* 009E0 809E3510 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 @@ -61,11 +61,11 @@ glabel func_809E349C /* 00A44 809E3574 4481D000 */ mtc1 $at, $f26 ## $f26 = 10.00 /* 00A48 809E3578 001850C0 */ sll $t2, $t8, 3 /* 00A4C 809E357C 3C01809E */ lui $at, %hi(D_809E41B0) ## $at = 809E0000 -/* 00A50 809E3580 3C128016 */ lui $s2, 0x8016 ## $s2 = 80160000 +/* 00A50 809E3580 3C128016 */ lui $s2, %hi(gSegments) /* 00A54 809E3584 3C1300FF */ lui $s3, 0x00FF ## $s3 = 00FF0000 /* 00A58 809E3588 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 /* 00A5C 809E358C 3673FFFF */ ori $s3, $s3, 0xFFFF ## $s3 = 00FFFFFF -/* 00A60 809E3590 26526FA8 */ addiu $s2, $s2, 0x6FA8 ## $s2 = 80166FA8 +/* 00A60 809E3590 26526FA8 */ addiu $s2, %lo(gSegments) /* 00A64 809E3594 C43841B0 */ lwc1 $f24, %lo(D_809E41B0)($at) /* 00A68 809E3598 24150006 */ addiu $s5, $zero, 0x0006 ## $s5 = 00000006 /* 00A6C 809E359C 3C148000 */ lui $s4, 0x8000 ## $s4 = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3954.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3954.s index 0b6fc77546..a60c29cf5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3954.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3954.s @@ -21,8 +21,8 @@ glabel func_809E3954 /* 00E50 809E3980 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00E54 809E3984 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00E58 809E3988 AE0001FC */ sw $zero, 0x01FC($s0) ## 000001FC -/* 00E5C 809E398C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00E60 809E3990 95CEF546 */ lhu $t6, -0x0ABA($t6) ## 8015F546 +/* 00E5C 809E398C 3C0E8016 */ lui $t6, %hi(gSaveContext+0xee6) +/* 00E60 809E3990 95CEF546 */ lhu $t6, %lo(gSaveContext+0xee6)($t6) /* 00E64 809E3994 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 00E68 809E3998 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E6C 809E399C 31CF000F */ andi $t7, $t6, 0x000F ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3A8C.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3A8C.s index b4a8f4ad3d..4c9075db9d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3A8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3A8C.s @@ -20,12 +20,12 @@ glabel func_809E3A8C /* 00F88 809E3AB8 01E93021 */ addu $a2, $t7, $t1 /* 00F8C 809E3ABC 8CC30004 */ lw $v1, 0x0004($a2) ## 00000004 /* 00F90 809E3AC0 8C9901EC */ lw $t9, 0x01EC($a0) ## 000001EC -/* 00F94 809E3AC4 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 00F94 809E3AC4 3C0D8016 */ lui $t5, %hi(gSegments) /* 00F98 809E3AC8 00035100 */ sll $t2, $v1, 4 /* 00F9C 809E3ACC 000A5F02 */ srl $t3, $t2, 28 /* 00FA0 809E3AD0 000B6080 */ sll $t4, $t3, 2 /* 00FA4 809E3AD4 01AC6821 */ addu $t5, $t5, $t4 -/* 00FA8 809E3AD8 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 +/* 00FA8 809E3AD8 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) /* 00FAC 809E3ADC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00FB0 809E3AE0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00FB4 809E3AE4 00194080 */ sll $t0, $t9, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s index 9bd1e66d59..b3112a8a2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s @@ -1,6 +1,6 @@ glabel EnDaikuKakariko_Init -/* 000B0 809E43D0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 000B4 809E43D4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 000B0 809E43D0 3C038016 */ lui $v1, %hi(gSaveContext) +/* 000B4 809E43D4 2463E660 */ addiu $v1, %lo(gSaveContext) /* 000B8 809E43D8 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 /* 000BC 809E43DC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 000C0 809E43E0 AFB00028 */ sw $s0, 0x0028($sp) @@ -62,8 +62,8 @@ glabel EnDaikuKakariko_Init /* 00188 809E44A8 0C00B55C */ jal Actor_Kill /* 0018C 809E44AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00190 809E44B0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00194 809E44B4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00190 809E44B0 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00194 809E44B4 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00198 809E44B8 8C690010 */ lw $t1, 0x0010($v1) ## 8015E670 .L809E44BC: /* 0019C 809E44BC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -74,8 +74,8 @@ glabel EnDaikuKakariko_Init /* 001B0 809E44D0 35AE0008 */ ori $t6, $t5, 0x0008 ## $t6 = 00000008 /* 001B4 809E44D4 A60E0200 */ sh $t6, 0x0200($s0) ## 00000200 .L809E44D8: -/* 001B8 809E44D8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 001BC 809E44DC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 001B8 809E44D8 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 001BC 809E44DC 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 001C0 809E44E0 0C00AC78 */ jal ActorShape_Init /* 001C4 809E44E4 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E474C.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E474C.s index 8642376424..43ce12f33d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E474C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E474C.s @@ -23,15 +23,15 @@ glabel func_809E474C /* 00480 809E47A0 1000000D */ beq $zero, $zero, .L809E47D8 /* 00484 809E47A4 AFA0001C */ sw $zero, 0x001C($sp) .L809E47A8: -/* 00488 809E47A8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0048C 809E47AC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00488 809E47A8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0048C 809E47AC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00490 809E47B0 94580F26 */ lhu $t8, 0x0F26($v0) ## 8015F586 /* 00494 809E47B4 37190040 */ ori $t9, $t8, 0x0040 ## $t9 = 00000040 /* 00498 809E47B8 10000006 */ beq $zero, $zero, .L809E47D4 /* 0049C 809E47BC A4590F26 */ sh $t9, 0x0F26($v0) ## 8015F586 .L809E47C0: -/* 004A0 809E47C0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 004A4 809E47C4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 004A0 809E47C0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 004A4 809E47C4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 004A8 809E47C8 94480F26 */ lhu $t0, 0x0F26($v0) ## 8015F586 /* 004AC 809E47CC 35090100 */ ori $t1, $t0, 0x0100 ## $t1 = 00000100 /* 004B0 809E47D0 A4490F26 */ sh $t1, 0x0F26($v0) ## 8015F586 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s index eb9233a394..7caa23b96d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s @@ -21,7 +21,7 @@ glabel func_809E4BC4 /* 008DC 809E4BFC 8FA60040 */ lw $a2, 0x0040($sp) .L809E4C00: /* 008E0 809E4C00 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 008E4 809E4C04 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 008E4 809E4C04 3C0C8016 */ lui $t4, %hi(gSegments) /* 008E8 809E4C08 8CCE1E08 */ lw $t6, 0x1E08($a2) ## 00001E08 /* 008EC 809E4C0C 000FC203 */ sra $t8, $t7, 8 /* 008F0 809E4C10 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 @@ -34,7 +34,7 @@ glabel func_809E4BC4 /* 0090C 809E4C2C 00095702 */ srl $t2, $t1, 28 /* 00910 809E4C30 000A5880 */ sll $t3, $t2, 2 /* 00914 809E4C34 018B6021 */ addu $t4, $t4, $t3 -/* 00918 809E4C38 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 00918 809E4C38 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 0091C 809E4C3C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00920 809E4C40 0018C880 */ sll $t9, $t8, 2 /* 00924 809E4C44 00616824 */ and $t5, $v1, $at diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Init.s index 8b74d4dd55..da268d5654 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Init.s @@ -8,8 +8,8 @@ glabel EnDekubaba_Init /* 00018 809E57E8 0C01E037 */ jal Actor_ProcessInitChain /* 0001C 809E57EC 24A59020 */ addiu $a1, $a1, %lo(D_809E9020) ## $a1 = 809E9020 -/* 00020 809E57F0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00024 809E57F4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00020 809E57F0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00024 809E57F4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00028 809E57F8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0002C 809E57FC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00030 809E5800 0C00AC78 */ jal ActorShape_Init @@ -53,7 +53,7 @@ glabel EnDekubaba_Init /* 000C0 809E5890 E6040230 */ swc1 $f4, 0x0230($s0) ## 00000230 /* 000C4 809E5894 8CE90008 */ lw $t1, 0x0008($a3) ## 809E8FD0 /* 000C8 809E5898 3C05809F */ lui $a1, %hi(D_809E8ECC) ## $a1 = 809F0000 -/* 000CC 809E589C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 000CC 809E589C 3C198016 */ lui $t9, %hi(gSaveContext+4) /* 000D0 809E58A0 1920001B */ blez $t1, .L809E5910 /* 000D4 809E58A4 24C68FD8 */ addiu $a2, $a2, %lo(D_809E8FD8) ## $a2 = 809E8FD8 /* 000D8 809E58A8 3C014020 */ lui $at, 0x4020 ## $at = 40200000 @@ -84,7 +84,7 @@ glabel EnDekubaba_Init /* 00138 809E5908 5420FFEC */ bnel $at, $zero, .L809E58BC /* 0013C 809E590C 84AA0020 */ lh $t2, 0x0020($a1) ## 809E8F10 .L809E5910: -/* 00140 809E5910 8F39E664 */ lw $t9, -0x199C($t9) ## 8015E664 +/* 00140 809E5910 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) /* 00144 809E5914 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 /* 00148 809E5918 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 0014C 809E591C 13200003 */ beq $t9, $zero, .L809E592C @@ -108,7 +108,7 @@ glabel EnDekubaba_Init /* 0018C 809E595C 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 00190 809E5960 E6120230 */ swc1 $f18, 0x0230($s0) ## 00000230 /* 00194 809E5964 8CEC0008 */ lw $t4, 0x0008($a3) ## 00000008 -/* 00198 809E5968 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 00198 809E5968 3C188016 */ lui $t8, %hi(gSaveContext+4) /* 0019C 809E596C 24A58FE0 */ addiu $a1, $a1, %lo(D_809E8FE0) ## $a1 = 809E8FE0 /* 001A0 809E5970 1980000C */ blez $t4, .L809E59A4 /* 001A4 809E5974 3C06809F */ lui $a2, %hi(D_809E8FD8) ## $a2 = 809F0000 @@ -125,7 +125,7 @@ glabel EnDekubaba_Init /* 001CC 809E599C 5420FFF8 */ bnel $at, $zero, .L809E5980 /* 001D0 809E59A0 8E0D0254 */ lw $t5, 0x0254($s0) ## 00000254 .L809E59A4: -/* 001D4 809E59A4 8F18E664 */ lw $t8, -0x199C($t8) ## 8015E664 +/* 001D4 809E59A4 8F18E664 */ lw $t8, %lo(gSaveContext+4)($t8) /* 001D8 809E59A8 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 /* 001DC 809E59AC 3C01809F */ lui $at, %hi(D_809E8FFB) ## $at = 809F0000 /* 001E0 809E59B0 13000002 */ beq $t8, $zero, .L809E59BC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Init.s index fbf6d672bc..3c2b3583a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Init.s @@ -20,8 +20,8 @@ glabel EnDekunuts_Init /* 00044 809E95A4 10000043 */ beq $zero, $zero, .L809E96B4 /* 00048 809E95A8 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 .L809E95AC: -/* 0004C 809E95AC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00050 809E95B0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0004C 809E95AC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00050 809E95B0 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00054 809E95B4 0C00AC78 */ jal ActorShape_Init /* 00058 809E95B8 3C07420C */ lui $a3, 0x420C ## $a3 = 420C0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s index 3435752220..2bd890091e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s @@ -44,8 +44,8 @@ glabel EnDh_Draw /* 01550 809EC290 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 /* 01554 809EC294 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 /* 01558 809EC298 9229025A */ lbu $t1, 0x025A($s1) ## 0000025A -/* 0155C 809EC29C 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 -/* 01560 809EC2A0 258C6290 */ addiu $t4, $t4, 0x6290 ## $t4 = 80116290 +/* 0155C 809EC29C 3C0C8011 */ lui $t4, %hi(D_80116280+0x10) +/* 01560 809EC2A0 258C6290 */ addiu $t4, %lo(D_80116280+0x10) /* 01564 809EC2A4 AC690004 */ sw $t1, 0x0004($v1) ## 00000004 /* 01568 809EC2A8 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 0156C 809EC2AC 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 @@ -77,8 +77,8 @@ glabel EnDh_Draw /* 015D0 809EC310 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 015D4 809EC314 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 015D8 809EC318 9229025A */ lbu $t1, 0x025A($s1) ## 0000025A -/* 015DC 809EC31C 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 -/* 015E0 809EC320 258C6280 */ addiu $t4, $t4, 0x6280 ## $t4 = 80116280 +/* 015DC 809EC31C 3C0C8011 */ lui $t4, %hi(D_80116280) +/* 015E0 809EC320 258C6280 */ addiu $t4, %lo(D_80116280) /* 015E4 809EC324 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 015E8 809EC328 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 015EC 809EC32C 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s index 7a6970701d..fdfa41dd58 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s @@ -25,8 +25,8 @@ glabel EnDh_Init /* 00060 809EADA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00064 809EADA4 0C0291BE */ jal SkelAnime_InitSV /* 00068 809EADA8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0006C 809EADAC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00070 809EADB0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0006C 809EADAC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00070 809EADB0 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00074 809EADB4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00078 809EADB8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0007C 809EADBC 0C00AC78 */ jal ActorShape_Init @@ -35,8 +35,8 @@ glabel EnDh_Init /* 00084 809EADC4 240800FE */ addiu $t0, $zero, 0x00FE ## $t0 = 000000FE /* 00088 809EADC8 A600001C */ sh $zero, 0x001C($s0) ## 0000001C /* 0008C 809EADCC A20800AE */ sb $t0, 0x00AE($s0) ## 000000AE -/* 00090 809EADD0 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 00094 809EADD4 8D29E664 */ lw $t1, -0x199C($t1) ## 8015E664 +/* 00090 809EADD0 3C098016 */ lui $t1, %hi(gSaveContext+4) +/* 00094 809EADD4 8D29E664 */ lw $t1, %lo(gSaveContext+4)($t1) /* 00098 809EADD8 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF /* 0009C 809EADDC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 000A0 809EADE0 15200004 */ bne $t1, $zero, .L809EADF4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s index 7198eb7415..6fdec72ba1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s @@ -24,8 +24,8 @@ glabel EnDha_Init /* 0005C 809EC8DC 8FA4003C */ lw $a0, 0x003C($sp) /* 00060 809EC8E0 0C0291BE */ jal SkelAnime_InitSV /* 00064 809EC8E4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00068 809EC8E8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0006C 809EC8EC 24C6B8C4 */ addiu $a2, $a2, 0xB8C4 ## $a2 = 8002B8C4 +/* 00068 809EC8E8 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Teardrop) +/* 0006C 809EC8EC 24C6B8C4 */ addiu $a2, %lo(ActorShadow_DrawFunc_Teardrop) /* 00070 809EC8F0 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00074 809EC8F4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00078 809EC8F8 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s index b793b4d813..0ce3effd2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s @@ -62,9 +62,9 @@ glabel func_809ECA50 /* 002A4 809ECB24 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 002A8 809ECB28 44819000 */ mtc1 $at, $f18 ## $f18 = -5.00 /* 002AC 809ECB2C C7B00054 */ lwc1 $f16, 0x0054($sp) -/* 002B0 809ECB30 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 002B0 809ECB30 3C0A8016 */ lui $t2, %hi(gSaveContext+4) /* 002B4 809ECB34 46120182 */ mul.s $f6, $f0, $f18 -/* 002B8 809ECB38 8D4AE664 */ lw $t2, -0x199C($t2) ## 8015E664 +/* 002B8 809ECB38 8D4AE664 */ lw $t2, %lo(gSaveContext+4)($t2) /* 002BC 809ECB3C 8FA60060 */ lw $a2, 0x0060($sp) /* 002C0 809ECB40 C7A80050 */ lwc1 $f8, 0x0050($sp) /* 002C4 809ECB44 3C014260 */ lui $at, 0x4260 ## $at = 42600000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Destroy.s index 60c77a2260..07d66c371f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Destroy.s @@ -6,8 +6,8 @@ glabel EnDivingGame_Destroy /* 00144 809ED9B4 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 /* 00148 809ED9B8 15C00003 */ bne $t6, $zero, .L809ED9C8 /* 0014C 809ED9BC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00150 809ED9C0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00154 809ED9C4 A420FA2E */ sh $zero, -0x05D2($at) ## 8015FA2E +/* 00150 809ED9C0 3C018016 */ lui $at, %hi(gSaveContext+0x13ce) +/* 00154 809ED9C4 A420FA2E */ sh $zero, %lo(gSaveContext+0x13ce)($at) .L809ED9C8: /* 00158 809ED9C8 0C0170EB */ jal ActorCollider_FreeCylinder diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s index fe04587804..484c80d0ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s @@ -47,7 +47,7 @@ glabel EnDivingGame_Draw /* 01760 809EEFD0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01764 809EEFD4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 01768 809EEFD8 3C04809F */ lui $a0, %hi(D_809EF0E0) ## $a0 = 809F0000 -/* 0176C 809EEFDC 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 0176C 809EEFDC 3C198016 */ lui $t9, %hi(gSegments) /* 01770 809EEFE0 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 01774 809EEFE4 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 01778 809EEFE8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 @@ -63,7 +63,7 @@ glabel EnDivingGame_Draw /* 017A0 809EF010 000E7F02 */ srl $t7, $t6, 28 /* 017A4 809EF014 000FC080 */ sll $t8, $t7, 2 /* 017A8 809EF018 0338C821 */ addu $t9, $t9, $t8 -/* 017AC 809EF01C 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 017AC 809EF01C 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 017B0 809EF020 00816824 */ and $t5, $a0, $at /* 017B4 809EF024 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 017B8 809EF028 01B94021 */ addu $t0, $t5, $t9 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s index 7e90f039c7..0389f3f910 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s @@ -29,8 +29,8 @@ glabel EnDivingGame_Init /* 00010 809ED880 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00014 809ED884 AFBF002C */ sw $ra, 0x002C($sp) /* 00018 809ED888 AFA5003C */ sw $a1, 0x003C($sp) -/* 0001C 809ED88C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00020 809ED890 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0001C 809ED88C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00020 809ED890 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00024 809ED894 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00028 809ED898 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 0002C 809ED89C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s index dc26be4166..7ace7d3c3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s @@ -5,7 +5,7 @@ glabel EnDivingGame_Update /* 0132C 809EEB9C AFA5004C */ sw $a1, 0x004C($sp) /* 01330 809EEBA0 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 /* 01334 809EEBA4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01338 809EEBA8 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 01338 809EEBA8 3C0A8016 */ lui $t2, %hi(gSaveContext+0x13d0) /* 0133C 809EEBAC AFAF003C */ sw $t7, 0x003C($sp) /* 01340 809EEBB0 84820294 */ lh $v0, 0x0294($a0) ## 00000294 /* 01344 809EEBB4 10400002 */ beq $v0, $zero, .L809EEBC0 @@ -27,7 +27,7 @@ glabel EnDivingGame_Update /* 01378 809EEBE8 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF /* 0137C 809EEBEC A609029A */ sh $t1, 0x029A($s0) ## 0000029A .L809EEBF0: -/* 01380 809EEBF0 854AFA30 */ lh $t2, -0x05D0($t2) ## 8015FA30 +/* 01380 809EEBF0 854AFA30 */ lh $t2, %lo(gSaveContext+0x13d0)($t2) /* 01384 809EEBF4 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 01388 809EEBF8 55410004 */ bnel $t2, $at, .L809EEC0C /* 0138C 809EEBFC 860B0298 */ lh $t3, 0x0298($s0) ## 00000298 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDB08.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDB08.s index 53589606c8..14c0d9510f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDB08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDB08.s @@ -1,6 +1,6 @@ glabel func_809EDB08 -/* 00298 809EDB08 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0029C 809EDB0C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00298 809EDB08 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0029C 809EDB0C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 002A0 809EDB10 846E13CE */ lh $t6, 0x13CE($v1) ## 8015FA2E /* 002A4 809EDB14 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 002A8 809EDB18 AFB00018 */ sw $s0, 0x0018($sp) @@ -12,9 +12,9 @@ glabel func_809EDB08 /* 002C0 809EDB30 0C02FF21 */ jal Gameplay_InCsMode /* 002C4 809EDB34 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 002C8 809EDB38 1440001C */ bne $v0, $zero, .L809EDBAC -/* 002CC 809EDB3C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 002CC 809EDB3C 3C018016 */ lui $at, %hi(gSaveContext+0x13ce) /* 002D0 809EDB40 0C03D6D6 */ jal func_800F5B58 -/* 002D4 809EDB44 A420FA2E */ sh $zero, -0x05D2($at) ## 8015FA2E +/* 002D4 809EDB44 A420FA2E */ sh $zero, %lo(gSaveContext+0x13ce)($at) /* 002D8 809EDB48 0C01E221 */ jal func_80078884 /* 002DC 809EDB4C 2404482C */ addiu $a0, $zero, 0x482C ## $a0 = 0000482C /* 002E0 809EDB50 240F71AD */ addiu $t7, $zero, 0x71AD ## $t7 = 000071AD @@ -41,8 +41,8 @@ glabel func_809EDB08 /* 00334 809EDBA4 1000003D */ beq $zero, $zero, .L809EDC9C /* 00338 809EDBA8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L809EDBAC: -/* 0033C 809EDBAC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00340 809EDBB0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0033C 809EDBAC 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00340 809EDBB0 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00344 809EDBB4 94680EDA */ lhu $t0, 0x0EDA($v1) ## 8015F53A /* 00348 809EDBB8 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 /* 0034C 809EDBBC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 @@ -90,8 +90,8 @@ glabel func_809EDB08 /* 003E8 809EDC58 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 003EC 809EDC5C 0C00B7D5 */ jal func_8002DF54 /* 003F0 809EDC60 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 003F4 809EDC64 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 003F8 809EDC68 9739F53A */ lhu $t9, -0x0AC6($t9) ## 8015F53A +/* 003F4 809EDC64 3C198016 */ lui $t9, %hi(gSaveContext+0xeda) +/* 003F8 809EDC68 9739F53A */ lhu $t9, %lo(gSaveContext+0xeda)($t9) /* 003FC 809EDC6C 3C0A809F */ lui $t2, %hi(func_809EE048) ## $t2 = 809F0000 /* 00400 809EDC70 3C09809F */ lui $t1, %hi(func_809EE96C) ## $t1 = 809F0000 /* 00404 809EDC74 33280100 */ andi $t0, $t9, 0x0100 ## $t0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s index 56fc7344c4..5aa74026e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s @@ -68,7 +68,7 @@ glabel func_809EDD4C /* 005C8 809EDE38 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 005CC 809EDE3C 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 /* 005D0 809EDE40 10400008 */ beq $v0, $zero, .L809EDE64 -/* 005D4 809EDE44 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 005D4 809EDE44 3C0B8016 */ lui $t3, %hi(gSaveContext+0xeda) /* 005D8 809EDE48 10410014 */ beq $v0, $at, .L809EDE9C /* 005DC 809EDE4C 24194056 */ addiu $t9, $zero, 0x4056 ## $t9 = 00004056 /* 005E0 809EDE50 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 @@ -78,7 +78,7 @@ glabel func_809EDD4C /* 005F0 809EDE60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L809EDE64: /* 005F4 809EDE64 A60A0292 */ sh $t2, 0x0292($s0) ## 00000292 -/* 005F8 809EDE68 956BF53A */ lhu $t3, -0x0AC6($t3) ## 8015F53A +/* 005F8 809EDE68 956BF53A */ lhu $t3, %lo(gSaveContext+0xeda)($t3) /* 005FC 809EDE6C 240D4053 */ addiu $t5, $zero, 0x4053 ## $t5 = 00004053 /* 00600 809EDE70 240F405C */ addiu $t7, $zero, 0x405C ## $t7 = 0000405C /* 00604 809EDE74 316C0100 */ andi $t4, $t3, 0x0100 ## $t4 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDEDC.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDEDC.s index 2b822b771a..1c4e7af17d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDEDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDEDC.s @@ -22,7 +22,7 @@ glabel func_809EDEDC /* 006B8 809EDF28 00471021 */ addu $v0, $v0, $a3 /* 006BC 809EDF2C 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD /* 006C0 809EDF30 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 006C4 809EDF34 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 006C4 809EDF34 3C0F8016 */ lui $t7, %hi(gSaveContext+0x34) /* 006C8 809EDF38 10400005 */ beq $v0, $zero, .L809EDF50 /* 006CC 809EDF3C 00000000 */ nop /* 006D0 809EDF40 50410017 */ beql $v0, $at, .L809EDFA0 @@ -30,7 +30,7 @@ glabel func_809EDEDC /* 006D8 809EDF48 1000001C */ beq $zero, $zero, .L809EDFBC /* 006DC 809EDF4C 00000000 */ nop .L809EDF50: -/* 006E0 809EDF50 85EFE694 */ lh $t7, -0x196C($t7) ## 8015E694 +/* 006E0 809EDF50 85EFE694 */ lh $t7, %lo(gSaveContext+0x34)($t7) /* 006E4 809EDF54 29E10014 */ slti $at, $t7, 0x0014 /* 006E8 809EDF58 54200008 */ bnel $at, $zero, .L809EDF7C /* 006EC 809EDF5C A60002A4 */ sh $zero, 0x02A4($s0) ## 000002A4 @@ -60,8 +60,8 @@ glabel func_809EDEDC /* 00744 809EDFB4 A60202A8 */ sh $v0, 0x02A8($s0) ## 000002A8 /* 00748 809EDFB8 A202031E */ sb $v0, 0x031E($s0) ## 0000031E .L809EDFBC: -/* 0074C 809EDFBC 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 00750 809EDFC0 9529F53A */ lhu $t1, -0x0AC6($t1) ## 8015F53A +/* 0074C 809EDFBC 3C098016 */ lui $t1, %hi(gSaveContext+0xeda) +/* 00750 809EDFC0 9529F53A */ lhu $t1, %lo(gSaveContext+0xeda)($t1) /* 00754 809EDFC4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00758 809EDFC8 312A0100 */ andi $t2, $t1, 0x0100 ## $t2 = 00000000 /* 0075C 809EDFCC 11400007 */ beq $t2, $zero, .L809EDFEC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE1F4.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE1F4.s index 6adeac0d98..68f80668c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE1F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE1F4.s @@ -41,14 +41,14 @@ glabel func_809EE1F4 /* 009FC 809EE26C 44819000 */ mtc1 $at, $f18 ## $f18 = -240.00 /* 00A00 809EE270 2403000A */ addiu $v1, $zero, 0x000A ## $v1 = 0000000A /* 00A04 809EE274 A603029A */ sh $v1, 0x029A($s0) ## 0000029A -/* 00A08 809EE278 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 00A08 809EE278 3C0E8016 */ lui $t6, %hi(gSaveContext+0xeda) /* 00A0C 809EE27C E60402F4 */ swc1 $f4, 0x02F4($s0) ## 000002F4 /* 00A10 809EE280 E60602F8 */ swc1 $f6, 0x02F8($s0) ## 000002F8 /* 00A14 809EE284 E60802FC */ swc1 $f8, 0x02FC($s0) ## 000002FC /* 00A18 809EE288 E60A02D0 */ swc1 $f10, 0x02D0($s0) ## 000002D0 /* 00A1C 809EE28C E61002D4 */ swc1 $f16, 0x02D4($s0) ## 000002D4 /* 00A20 809EE290 E61202D8 */ swc1 $f18, 0x02D8($s0) ## 000002D8 -/* 00A24 809EE294 95CEF53A */ lhu $t6, -0x0AC6($t6) ## 8015F53A +/* 00A24 809EE294 95CEF53A */ lhu $t6, %lo(gSaveContext+0xeda)($t6) /* 00A28 809EE298 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 /* 00A2C 809EE29C 3C01809F */ lui $at, %hi(D_809EF1BC) ## $at = 809F0000 /* 00A30 809EE2A0 31CF0100 */ andi $t7, $t6, 0x0100 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE408.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE408.s index 89d9a354cb..bacd6ac4f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE408.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE408.s @@ -95,11 +95,11 @@ glabel func_809EE408 /* 00CE8 809EE558 0C27B678 */ jal func_809ED9E0 /* 00CEC 809EE55C 8FA50024 */ lw $a1, 0x0024($sp) /* 00CF0 809EE560 861902A6 */ lh $t9, 0x02A6($s0) ## 000002A6 -/* 00CF4 809EE564 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 00CF4 809EE564 3C098016 */ lui $t1, %hi(gSaveContext+0xeda) /* 00CF8 809EE568 240B001E */ addiu $t3, $zero, 0x001E ## $t3 = 0000001E /* 00CFC 809EE56C 2728FFFF */ addiu $t0, $t9, 0xFFFF ## $t0 = FFFFFFFF /* 00D00 809EE570 A60802A6 */ sh $t0, 0x02A6($s0) ## 000002A6 -/* 00D04 809EE574 9529F53A */ lhu $t1, -0x0AC6($t1) ## 8015F53A +/* 00D04 809EE574 9529F53A */ lhu $t1, %lo(gSaveContext+0xeda)($t1) /* 00D08 809EE578 240C0005 */ addiu $t4, $zero, 0x0005 ## $t4 = 00000005 /* 00D0C 809EE57C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00D10 809EE580 312A0100 */ andi $t2, $t1, 0x0100 ## $t2 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE800.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE800.s index 1f1e0ce3cf..8b1ec96cef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE800.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE800.s @@ -19,14 +19,14 @@ glabel func_809EE800 /* 00FD0 809EE840 8FBF001C */ lw $ra, 0x001C($sp) /* 00FD4 809EE844 0C041B33 */ jal func_80106CCC /* 00FD8 809EE848 8FA40024 */ lw $a0, 0x0024($sp) -/* 00FDC 809EE84C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00FE0 809EE850 95EFF53A */ lhu $t7, -0x0AC6($t7) ## 8015F53A -/* 00FE4 809EE854 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 00FE8 809EE858 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 00FDC 809EE84C 3C0F8016 */ lui $t7, %hi(gSaveContext+0xeda) +/* 00FE0 809EE850 95EFF53A */ lhu $t7, %lo(gSaveContext+0xeda)($t7) +/* 00FE4 809EE854 3C198016 */ lui $t9, %hi(gGameInfo) +/* 00FE8 809EE858 3C088016 */ lui $t0, %hi(gGameInfo) /* 00FEC 809EE85C 31F80100 */ andi $t8, $t7, 0x0100 ## $t8 = 00000000 /* 00FF0 809EE860 17000009 */ bne $t8, $zero, .L809EE888 /* 00FF4 809EE864 00000000 */ nop -/* 00FF8 809EE868 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 00FF8 809EE868 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 00FFC 809EE86C 872412D8 */ lh $a0, 0x12D8($t9) ## 801612D8 /* 01000 809EE870 24840032 */ addiu $a0, $a0, 0x0032 ## $a0 = 00000032 /* 01004 809EE874 00042400 */ sll $a0, $a0, 16 @@ -35,7 +35,7 @@ glabel func_809EE800 /* 01010 809EE880 10000007 */ beq $zero, $zero, .L809EE8A0 /* 01014 809EE884 00000000 */ nop .L809EE888: -/* 01018 809EE888 8D08FA90 */ lw $t0, -0x0570($t0) ## FFFFFA90 +/* 01018 809EE888 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) /* 0101C 809EE88C 850412D8 */ lh $a0, 0x12D8($t0) ## 000012D8 /* 01020 809EE890 24840032 */ addiu $a0, $a0, 0x0032 ## $a0 = 00000032 /* 01024 809EE894 00042400 */ sll $a0, $a0, 16 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEAF8.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEAF8.s index 41ef3ca905..365e1d5825 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEAF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEAF8.s @@ -30,8 +30,8 @@ glabel func_809EEAF8 /* 012D0 809EEB40 2484F150 */ addiu $a0, $a0, %lo(D_809EF150) ## $a0 = 809EF150 /* 012D4 809EEB44 A60002A4 */ sh $zero, 0x02A4($s0) ## 000002A4 /* 012D8 809EEB48 860202A4 */ lh $v0, 0x02A4($s0) ## 000002A4 -/* 012DC 809EEB4C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 012E0 809EEB50 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 012DC 809EEB4C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 012E0 809EEB50 2463E660 */ addiu $v1, %lo(gSaveContext) /* 012E4 809EEB54 A60202A2 */ sh $v0, 0x02A2($s0) ## 000002A2 /* 012E8 809EEB58 A602029C */ sh $v0, 0x029C($s0) ## 0000029C /* 012EC 809EEB5C A60202A8 */ sh $v0, 0x02A8($s0) ## 000002A8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s index b9c2ee8d2d..d53e08bf03 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s @@ -75,8 +75,8 @@ glabel EnDns_Init .L809EF394: /* 00044 809EF394 14C1000D */ bne $a2, $at, .L809EF3CC /* 00048 809EF398 248406C8 */ addiu $a0, $a0, %lo(D_809F06C8) ## $a0 = 000006C8 -/* 0004C 809EF39C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00050 809EF3A0 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 +/* 0004C 809EF39C 3C0E8016 */ lui $t6, %hi(gSaveContext+4) +/* 00050 809EF3A0 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) /* 00054 809EF3A4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00058 809EF3A8 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 /* 0005C 809EF3AC 11C00003 */ beq $t6, $zero, .L809EF3BC @@ -125,8 +125,8 @@ glabel EnDns_Init /* 000F0 809EF440 8FA40044 */ lw $a0, 0x0044($sp) /* 000F4 809EF444 0C017114 */ jal func_8005C450 /* 000F8 809EF448 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 000FC 809EF44C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00100 809EF450 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 000FC 809EF44C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00100 809EF450 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00104 809EF454 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00108 809EF458 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0010C 809EF45C 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF5A4.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF5A4.s index aadb082b63..d6a7fd37f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF5A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF5A4.s @@ -1,22 +1,22 @@ glabel func_809EF5A4 -/* 00254 809EF5A4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00258 809EF5A8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 0025C 809EF5AC 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 00260 809EF5B0 8DEF71CC */ lw $t7, 0x71CC($t7) ## 801271CC +/* 00254 809EF5A4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00258 809EF5A8 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 0025C 809EF5AC 3C0F8012 */ lui $t7, %hi(gUpgradeMasks+0x1c) +/* 00260 809EF5B0 8DEF71CC */ lw $t7, %lo(gUpgradeMasks+0x1c)($t7) /* 00264 809EF5B4 8C6E00A0 */ lw $t6, 0x00A0($v1) ## 8015E700 -/* 00268 809EF5B8 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 -/* 0026C 809EF5BC 933971FB */ lbu $t9, 0x71FB($t9) ## 801271FB +/* 00268 809EF5B8 3C198012 */ lui $t9, %hi(gUpgradeShifts+7) +/* 0026C 809EF5BC 933971FB */ lbu $t9, %lo(gUpgradeShifts+7)($t9) /* 00270 809EF5C0 01CFC024 */ and $t8, $t6, $t7 -/* 00274 809EF5C4 3C028012 */ lui $v0, 0x8012 ## $v0 = 80120000 +/* 00274 809EF5C4 3C028012 */ lui $v0, %hi(gUpgradeCapacities+0x38) /* 00278 809EF5C8 03384007 */ srav $t0, $t8, $t9 /* 0027C 809EF5CC 00084840 */ sll $t1, $t0, 1 /* 00280 809EF5D0 00491021 */ addu $v0, $v0, $t1 -/* 00284 809EF5D4 94427234 */ lhu $v0, 0x7234($v0) ## 80127234 +/* 00284 809EF5D4 94427234 */ lhu $v0, %lo(gUpgradeCapacities+0x38)($v0) /* 00288 809EF5D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0028C 809EF5DC AFBF0014 */ sw $ra, 0x0014($sp) /* 00290 809EF5E0 10400009 */ beq $v0, $zero, .L809EF608 -/* 00294 809EF5E4 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 00298 809EF5E8 914A7465 */ lbu $t2, 0x7465($t2) ## 80127465 +/* 00294 809EF5E4 3C0A8012 */ lui $t2, %hi(gItemSlots+1) +/* 00298 809EF5E8 914A7465 */ lbu $t2, %lo(gItemSlots+1)($t2) /* 0029C 809EF5EC 006A5821 */ addu $t3, $v1, $t2 /* 002A0 809EF5F0 816C008C */ lb $t4, 0x008C($t3) ## 0000008C /* 002A4 809EF5F4 0182082A */ slt $at, $t4, $v0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF658.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF658.s index d8b34ca7dd..6b3f36eeaa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF658.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF658.s @@ -1,22 +1,22 @@ glabel func_809EF658 -/* 00308 809EF658 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0030C 809EF65C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00310 809EF660 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 00314 809EF664 8DEF71C8 */ lw $t7, 0x71C8($t7) ## 801271C8 +/* 00308 809EF658 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0030C 809EF65C 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 00310 809EF660 3C0F8012 */ lui $t7, %hi(gUpgradeMasks+0x18) +/* 00314 809EF664 8DEF71C8 */ lw $t7, %lo(gUpgradeMasks+0x18)($t7) /* 00318 809EF668 8C6E00A0 */ lw $t6, 0x00A0($v1) ## 8015E700 -/* 0031C 809EF66C 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 -/* 00320 809EF670 933971FA */ lbu $t9, 0x71FA($t9) ## 801271FA +/* 0031C 809EF66C 3C198012 */ lui $t9, %hi(gUpgradeShifts+6) +/* 00320 809EF670 933971FA */ lbu $t9, %lo(gUpgradeShifts+6)($t9) /* 00324 809EF674 01CFC024 */ and $t8, $t6, $t7 -/* 00328 809EF678 3C028012 */ lui $v0, 0x8012 ## $v0 = 80120000 +/* 00328 809EF678 3C028012 */ lui $v0, %hi(gUpgradeCapacities+0x30) /* 0032C 809EF67C 03384007 */ srav $t0, $t8, $t9 /* 00330 809EF680 00084840 */ sll $t1, $t0, 1 /* 00334 809EF684 00491021 */ addu $v0, $v0, $t1 -/* 00338 809EF688 9442722C */ lhu $v0, 0x722C($v0) ## 8012722C +/* 00338 809EF688 9442722C */ lhu $v0, %lo(gUpgradeCapacities+0x30)($v0) /* 0033C 809EF68C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00340 809EF690 AFBF0014 */ sw $ra, 0x0014($sp) /* 00344 809EF694 10400009 */ beq $v0, $zero, .L809EF6BC -/* 00348 809EF698 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 0034C 809EF69C 914A7464 */ lbu $t2, 0x7464($t2) ## 80127464 +/* 00348 809EF698 3C0A8012 */ lui $t2, %hi(gItemSlots) +/* 0034C 809EF69C 914A7464 */ lbu $t2, %lo(gItemSlots)($t2) /* 00350 809EF6A0 006A5821 */ addu $t3, $v1, $t2 /* 00354 809EF6A4 816C008C */ lb $t4, 0x008C($t3) ## 0000008C /* 00358 809EF6A8 0182082A */ slt $at, $t4, $v0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF70C.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF70C.s index 34339e9c42..ed754a5776 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF70C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF70C.s @@ -1,7 +1,7 @@ glabel func_809EF70C /* 003BC 809EF70C 8C8F02C0 */ lw $t7, 0x02C0($a0) ## 000002C0 -/* 003C0 809EF710 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 003C4 809EF714 85CEE694 */ lh $t6, -0x196C($t6) ## 8015E694 +/* 003C0 809EF710 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) +/* 003C4 809EF714 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) /* 003C8 809EF718 85F80000 */ lh $t8, 0x0000($t7) ## 00000000 /* 003CC 809EF71C 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 /* 003D0 809EF720 01D8082A */ slt $at, $t6, $t8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF73C.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF73C.s index b7d05dbe23..b518c8727d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF73C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF73C.s @@ -1,8 +1,8 @@ glabel func_809EF73C -/* 003EC 809EF73C 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 003F0 809EF740 91CE746A */ lbu $t6, 0x746A($t6) ## 8012746A -/* 003F4 809EF744 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 003F8 809EF748 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 003EC 809EF73C 3C0E8012 */ lui $t6, %hi(gItemSlots+6) +/* 003F0 809EF740 91CE746A */ lbu $t6, %lo(gItemSlots+6)($t6) +/* 003F4 809EF744 3C038016 */ lui $v1, %hi(gSaveContext) +/* 003F8 809EF748 2463E660 */ addiu $v1, %lo(gSaveContext) /* 003FC 809EF74C 006E1021 */ addu $v0, $v1, $t6 /* 00400 809EF750 904F0074 */ lbu $t7, 0x0074($v0) ## 00000074 /* 00404 809EF754 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 @@ -12,17 +12,17 @@ glabel func_809EF73C /* 00414 809EF764 10000022 */ beq $zero, $zero, .L809EF7F0 /* 00418 809EF768 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 .L809EF76C: -/* 0041C 809EF76C 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 00420 809EF770 8D0871C4 */ lw $t0, 0x71C4($t0) ## 801271C4 +/* 0041C 809EF76C 3C088012 */ lui $t0, %hi(gUpgradeMasks+0x14) +/* 00420 809EF770 8D0871C4 */ lw $t0, %lo(gUpgradeMasks+0x14)($t0) /* 00424 809EF774 8C7900A0 */ lw $t9, 0x00A0($v1) ## 8015E700 -/* 00428 809EF778 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 0042C 809EF77C 914A71F9 */ lbu $t2, 0x71F9($t2) ## 801271F9 +/* 00428 809EF778 3C0A8012 */ lui $t2, %hi(gUpgradeShifts+5) +/* 0042C 809EF77C 914A71F9 */ lbu $t2, %lo(gUpgradeShifts+5)($t2) /* 00430 809EF780 03284824 */ and $t1, $t9, $t0 -/* 00434 809EF784 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 +/* 00434 809EF784 3C0D8012 */ lui $t5, %hi(gUpgradeCapacities+0x28) /* 00438 809EF788 01495807 */ srav $t3, $t1, $t2 /* 0043C 809EF78C 000B6040 */ sll $t4, $t3, 1 /* 00440 809EF790 01AC6821 */ addu $t5, $t5, $t4 -/* 00444 809EF794 95AD7224 */ lhu $t5, 0x7224($t5) ## 80127224 +/* 00444 809EF794 95AD7224 */ lhu $t5, %lo(gUpgradeCapacities+0x28)($t5) /* 00448 809EF798 8058008C */ lb $t8, 0x008C($v0) ## 0000008F /* 0044C 809EF79C 030D082A */ slt $at, $t8, $t5 /* 00450 809EF7A0 54200004 */ bnel $at, $zero, .L809EF7B4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF800.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF800.s index 166b2a19e2..0cf2d452a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF800.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF800.s @@ -1,8 +1,8 @@ glabel func_809EF800 -/* 004B0 809EF800 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 004B4 809EF804 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 004B8 809EF808 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 004BC 809EF80C 8DCE7130 */ lw $t6, 0x7130($t6) ## 80127130 +/* 004B0 809EF800 3C028016 */ lui $v0, %hi(gSaveContext) +/* 004B4 809EF804 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 004B8 809EF808 3C0E8012 */ lui $t6, %hi(gBitFlags+0x10) +/* 004BC 809EF80C 8DCE7130 */ lw $t6, %lo(gBitFlags+0x10)($t6) /* 004C0 809EF810 944F009C */ lhu $t7, 0x009C($v0) ## 8015E6FC /* 004C4 809EF814 01CFC024 */ and $t8, $t6, $t7 /* 004C8 809EF818 53000004 */ beql $t8, $zero, .L809EF82C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF854.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF854.s index 06193a284b..f0d8e2da66 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF854.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF854.s @@ -1,29 +1,29 @@ glabel func_809EF854 -/* 00504 809EF854 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00508 809EF858 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 0050C 809EF85C 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 00510 809EF860 8DCE716C */ lw $t6, 0x716C($t6) ## 8012716C +/* 00504 809EF854 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00508 809EF858 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 0050C 809EF85C 3C0E8012 */ lui $t6, %hi(gBitFlags+0x4c) +/* 00510 809EF860 8DCE716C */ lw $t6, %lo(gBitFlags+0x4c)($t6) /* 00514 809EF864 8C4F00A4 */ lw $t7, 0x00A4($v0) ## 8015E704 -/* 00518 809EF868 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 -/* 0051C 809EF86C 3C0B8012 */ lui $t3, 0x8012 ## $t3 = 80120000 +/* 00518 809EF868 3C198012 */ lui $t9, %hi(gItemSlots+2) +/* 0051C 809EF86C 3C0B8012 */ lui $t3, %hi(gUpgradeMasks+4) /* 00520 809EF870 01CFC024 */ and $t8, $t6, $t7 /* 00524 809EF874 17000003 */ bne $t8, $zero, .L809EF884 -/* 00528 809EF878 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 +/* 00528 809EF878 3C0D8012 */ lui $t5, %hi(gUpgradeShifts+1) /* 0052C 809EF87C 03E00008 */ jr $ra /* 00530 809EF880 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 .L809EF884: /* 00534 809EF884 8C4A00A0 */ lw $t2, 0x00A0($v0) ## 000000A3 -/* 00538 809EF888 8D6B71B4 */ lw $t3, 0x71B4($t3) ## 801271B4 -/* 0053C 809EF88C 91AD71F5 */ lbu $t5, 0x71F5($t5) ## 801271F5 -/* 00540 809EF890 93397466 */ lbu $t9, 0x7466($t9) ## 80127466 +/* 00538 809EF888 8D6B71B4 */ lw $t3, %lo(gUpgradeMasks+4)($t3) +/* 0053C 809EF88C 91AD71F5 */ lbu $t5, %lo(gUpgradeShifts+1)($t5) +/* 00540 809EF890 93397466 */ lbu $t9, %lo(gItemSlots+2)($t9) /* 00544 809EF894 014B6024 */ and $t4, $t2, $t3 /* 00548 809EF898 01AC7007 */ srav $t6, $t4, $t5 /* 0054C 809EF89C 000E7840 */ sll $t7, $t6, 1 -/* 00550 809EF8A0 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 +/* 00550 809EF8A0 3C188012 */ lui $t8, %hi(gUpgradeCapacities+8) /* 00554 809EF8A4 030FC021 */ addu $t8, $t8, $t7 /* 00558 809EF8A8 00594021 */ addu $t0, $v0, $t9 /* 0055C 809EF8AC 8109008C */ lb $t1, 0x008C($t0) ## 0000008C -/* 00560 809EF8B0 97187204 */ lhu $t8, 0x7204($t8) ## 80127204 +/* 00560 809EF8B0 97187204 */ lhu $t8, %lo(gUpgradeCapacities+8)($t8) /* 00564 809EF8B4 0138082A */ slt $at, $t1, $t8 /* 00568 809EF8B8 54200004 */ bnel $at, $zero, .L809EF8CC /* 0056C 809EF8BC 8C8802C0 */ lw $t0, 0x02C0($a0) ## 000002C0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF8F4.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF8F4.s index eaac37162d..3440a4ec8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF8F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF8F4.s @@ -10,23 +10,23 @@ glabel func_809EF8F4 /* 005C4 809EF914 10000021 */ beq $zero, $zero, .L809EF99C /* 005C8 809EF918 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 .L809EF91C: -/* 005CC 809EF91C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 005D0 809EF920 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 005D4 809EF924 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 005D8 809EF928 8D0871B0 */ lw $t0, 0x71B0($t0) ## 801271B0 +/* 005CC 809EF91C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 005D0 809EF920 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 005D4 809EF924 3C088012 */ lui $t0, %hi(gUpgradeMasks) +/* 005D8 809EF928 8D0871B0 */ lw $t0, %lo(gUpgradeMasks)($t0) /* 005DC 809EF92C 8C5900A0 */ lw $t9, 0x00A0($v0) ## 8015E700 -/* 005E0 809EF930 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 005E4 809EF934 914A71F4 */ lbu $t2, 0x71F4($t2) ## 801271F4 -/* 005E8 809EF938 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 005EC 809EF93C 91CE7467 */ lbu $t6, 0x7467($t6) ## 80127467 +/* 005E0 809EF930 3C0A8012 */ lui $t2, %hi(gUpgradeShifts) +/* 005E4 809EF934 914A71F4 */ lbu $t2, %lo(gUpgradeShifts)($t2) +/* 005E8 809EF938 3C0E8012 */ lui $t6, %hi(gItemSlots+3) +/* 005EC 809EF93C 91CE7467 */ lbu $t6, %lo(gItemSlots+3)($t6) /* 005F0 809EF940 03284824 */ and $t1, $t9, $t0 /* 005F4 809EF944 01495807 */ srav $t3, $t1, $t2 /* 005F8 809EF948 000B6040 */ sll $t4, $t3, 1 -/* 005FC 809EF94C 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 +/* 005FC 809EF94C 3C0D8012 */ lui $t5, %hi(gUpgradeCapacities) /* 00600 809EF950 01AC6821 */ addu $t5, $t5, $t4 /* 00604 809EF954 004E7821 */ addu $t7, $v0, $t6 /* 00608 809EF958 81F8008C */ lb $t8, 0x008C($t7) ## 0000008C -/* 0060C 809EF95C 95AD71FC */ lhu $t5, 0x71FC($t5) ## 801271FC +/* 0060C 809EF95C 95AD71FC */ lhu $t5, %lo(gUpgradeCapacities)($t5) /* 00610 809EF960 8FAF0018 */ lw $t7, 0x0018($sp) /* 00614 809EF964 030D082A */ slt $at, $t8, $t5 /* 00618 809EF968 54200004 */ bnel $at, $zero, .L809EF97C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF9A4.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF9A4.s index 85e3c05b0e..367854e682 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF9A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF9A4.s @@ -9,8 +9,8 @@ glabel func_809EF9A4 /* 00670 809EF9C0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L809EF9C4: /* 00674 809EF9C4 8FAF0018 */ lw $t7, 0x0018($sp) -/* 00678 809EF9C8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0067C 809EF9CC 85CEE694 */ lh $t6, -0x196C($t6) ## 8015E694 +/* 00678 809EF9C8 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) +/* 0067C 809EF9CC 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) /* 00680 809EF9D0 8DF802C0 */ lw $t8, 0x02C0($t7) ## 000002C0 /* 00684 809EF9D4 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 /* 00688 809EF9D8 87190000 */ lh $t9, 0x0000($t8) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFA58.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFA58.s index 2023619476..4fe02a925f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFA58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFA58.s @@ -1,6 +1,6 @@ glabel func_809EFA58 -/* 00708 809EFA58 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0070C 809EFA5C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00708 809EFA58 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0070C 809EFA5C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00710 809EFA60 944E0EF0 */ lhu $t6, 0x0EF0($v0) ## 8015F550 /* 00714 809EFA64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00718 809EFA68 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFAFC.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFAFC.s index bbd0b5f84b..6de1bc8022 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFAFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFAFC.s @@ -1,6 +1,6 @@ glabel func_809EFAFC -/* 007AC 809EFAFC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 007B0 809EFB00 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 007AC 809EFAFC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 007B0 809EFB00 2442E660 */ addiu $v0, %lo(gSaveContext) /* 007B4 809EFB04 944E0F2A */ lhu $t6, 0x0F2A($v0) ## 8015F58A /* 007B8 809EFB08 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 007BC 809EFB0C AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFB40.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFB40.s index 507bfc1172..01e3cd715c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFB40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFB40.s @@ -1,6 +1,6 @@ glabel func_809EFB40 -/* 007F0 809EFB40 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 007F4 809EFB44 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 007F0 809EFB40 3C028016 */ lui $v0, %hi(gSaveContext) +/* 007F4 809EFB44 2442E660 */ addiu $v0, %lo(gSaveContext) /* 007F8 809EFB48 944E0F2A */ lhu $t6, 0x0F2A($v0) ## 8015F58A /* 007FC 809EFB4C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00800 809EFB50 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFDD0.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFDD0.s index 3d4dfb1bde..d1c0d95aca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFDD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFDD0.s @@ -3,13 +3,13 @@ glabel func_809EFDD0 /* 00A84 809EFDD4 AFBF001C */ sw $ra, 0x001C($sp) /* 00A88 809EFDD8 8482001C */ lh $v0, 0x001C($a0) ## 0000001C /* 00A8C 809EFDDC 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 00A90 809EFDE0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 00A90 809EFDE0 3C0E8016 */ lui $t6, %hi(gSaveContext+0xa0) /* 00A94 809EFDE4 14410019 */ bne $v0, $at, .L809EFE4C -/* 00A98 809EFDE8 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 00A9C 809EFDEC 8DCEE700 */ lw $t6, -0x1900($t6) ## 8015E700 -/* 00AA0 809EFDF0 8DEF71C8 */ lw $t7, 0x71C8($t7) ## 801271C8 -/* 00AA4 809EFDF4 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 -/* 00AA8 809EFDF8 933971FA */ lbu $t9, 0x71FA($t9) ## 801271FA +/* 00A98 809EFDE8 3C0F8012 */ lui $t7, %hi(gUpgradeMasks+0x18) +/* 00A9C 809EFDEC 8DCEE700 */ lw $t6, %lo(gSaveContext+0xa0)($t6) +/* 00AA0 809EFDF0 8DEF71C8 */ lw $t7, %lo(gUpgradeMasks+0x18)($t7) +/* 00AA4 809EFDF4 3C198012 */ lui $t9, %hi(gUpgradeShifts+6) +/* 00AA8 809EFDF8 933971FA */ lbu $t9, %lo(gUpgradeShifts+6)($t9) /* 00AAC 809EFDFC 01CFC024 */ and $t8, $t6, $t7 /* 00AB0 809EFE00 3C074302 */ lui $a3, 0x4302 ## $a3 = 43020000 /* 00AB4 809EFE04 03384007 */ srav $t0, $t8, $t9 @@ -35,12 +35,12 @@ glabel func_809EFDD0 /* 00AFC 809EFE4C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 00B00 809EFE50 1441001B */ bne $v0, $at, .L809EFEC0 /* 00B04 809EFE54 3C074302 */ lui $a3, 0x4302 ## $a3 = 43020000 -/* 00B08 809EFE58 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 00B0C 809EFE5C 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 00B10 809EFE60 8D4A71CC */ lw $t2, 0x71CC($t2) ## 801271CC -/* 00B14 809EFE64 8D29E700 */ lw $t1, -0x1900($t1) ## 8015E700 -/* 00B18 809EFE68 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 -/* 00B1C 809EFE6C 918C71FB */ lbu $t4, 0x71FB($t4) ## 801271FB +/* 00B08 809EFE58 3C098016 */ lui $t1, %hi(gSaveContext+0xa0) +/* 00B0C 809EFE5C 3C0A8012 */ lui $t2, %hi(gUpgradeMasks+0x1c) +/* 00B10 809EFE60 8D4A71CC */ lw $t2, %lo(gUpgradeMasks+0x1c)($t2) +/* 00B14 809EFE64 8D29E700 */ lw $t1, %lo(gSaveContext+0xa0)($t1) +/* 00B18 809EFE68 3C0C8012 */ lui $t4, %hi(gUpgradeShifts+7) +/* 00B1C 809EFE6C 918C71FB */ lbu $t4, %lo(gUpgradeShifts+7)($t4) /* 00B20 809EFE70 012A5824 */ and $t3, $t1, $t2 /* 00B24 809EFE74 3C074302 */ lui $a3, 0x4302 ## $a3 = 43020000 /* 00B28 809EFE78 018B6807 */ srav $t5, $t3, $t4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Update.s index 5b435da812..872d6ccfdc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Update.s @@ -16,8 +16,8 @@ glabel EnDntDemo_Update /* 00BA0 809F1480 8C99014C */ lw $t9, 0x014C($a0) ## 0000014C /* 00BA4 809F1484 0320F809 */ jalr $ra, $t9 /* 00BA8 809F1488 00000000 */ nop -/* 00BAC 809F148C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 00BB0 809F1490 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 00BAC 809F148C 3C188016 */ lui $t8, %hi(gGameInfo) +/* 00BB0 809F1490 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 00BB4 809F1494 8FA40048 */ lw $a0, 0x0048($sp) /* 00BB8 809F1498 8FA5004C */ lw $a1, 0x004C($sp) /* 00BBC 809F149C 870812D4 */ lh $t0, 0x12D4($t8) ## 801612D4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s index 22f6142d2a..61d7553455 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s @@ -258,8 +258,8 @@ glabel func_809F0AA4 /* 00468 809F0D48 03200008 */ jr $t9 /* 0046C 809F0D4C 00000000 */ nop glabel L809F0D50 -/* 00470 809F0D50 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 00474 809F0D54 954AF552 */ lhu $t2, -0x0AAE($t2) ## 8015F552 +/* 00470 809F0D50 3C0A8016 */ lui $t2, %hi(gSaveContext+0xef2) +/* 00474 809F0D54 954AF552 */ lhu $t2, %lo(gSaveContext+0xef2)($t2) /* 00478 809F0D58 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 /* 0047C 809F0D5C 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 /* 00480 809F0D60 314B4000 */ andi $t3, $t2, 0x4000 ## $t3 = 00000000 @@ -273,8 +273,8 @@ glabel L809F0D50 /* 0049C 809F0D7C 87A8003C */ lh $t0, 0x003C($sp) glabel L809F0D80 .L809F0D80: -/* 004A0 809F0D80 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 004A4 809F0D84 95CEF552 */ lhu $t6, -0x0AAE($t6) ## 8015F552 +/* 004A0 809F0D80 3C0E8016 */ lui $t6, %hi(gSaveContext+0xef2) +/* 004A4 809F0D84 95CEF552 */ lhu $t6, %lo(gSaveContext+0xef2)($t6) /* 004A8 809F0D88 31CF8000 */ andi $t7, $t6, 0x8000 ## $t7 = 00000000 /* 004AC 809F0D8C 15E00023 */ bne $t7, $zero, .L809F0E1C /* 004B0 809F0D90 00000000 */ nop @@ -282,12 +282,12 @@ glabel L809F0D80 /* 004B8 809F0D98 8FA40044 */ lw $a0, 0x0044($sp) /* 004BC 809F0D9C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 004C0 809F0DA0 1041001E */ beq $v0, $at, .L809F0E1C -/* 004C4 809F0DA4 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 004C8 809F0DA8 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 004CC 809F0DAC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 004D0 809F0DB0 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 004D4 809F0DB4 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 004D8 809F0DB8 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 004C4 809F0DA4 3C078013 */ lui $a3, %hi(D_801333E0) +/* 004C8 809F0DA8 3C188013 */ lui $t8, %hi(D_801333E8) +/* 004CC 809F0DAC 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 004D0 809F0DB0 271833E8 */ addiu $t8, %lo(D_801333E8) +/* 004D4 809F0DB4 3C058013 */ lui $a1, %hi(D_801333D4) +/* 004D8 809F0DB8 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 004DC 809F0DBC AFB80014 */ sw $t8, 0x0014($sp) /* 004E0 809F0DC0 AFA70010 */ sw $a3, 0x0010($sp) /* 004E4 809F0DC4 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s index 0d5087e4da..ee375a6658 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s @@ -42,7 +42,7 @@ glabel EnDntJiji_Draw /* 0137C 809F2E5C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 01380 809F2E60 8618024C */ lh $t8, 0x024C($s0) ## 0000024C /* 01384 809F2E64 3C04809F */ lui $a0, %hi(D_809F2FCC) ## $a0 = 809F0000 -/* 01388 809F2E68 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 01388 809F2E68 3C0C8016 */ lui $t4, %hi(gSegments) /* 0138C 809F2E6C 0018C880 */ sll $t9, $t8, 2 /* 01390 809F2E70 00992021 */ addu $a0, $a0, $t9 /* 01394 809F2E74 8C842FCC */ lw $a0, %lo(D_809F2FCC)($a0) @@ -52,7 +52,7 @@ glabel EnDntJiji_Draw /* 013A4 809F2E84 00095702 */ srl $t2, $t1, 28 /* 013A8 809F2E88 000A5880 */ sll $t3, $t2, 2 /* 013AC 809F2E8C 018B6021 */ addu $t4, $t4, $t3 -/* 013B0 809F2E90 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 013B0 809F2E90 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 013B4 809F2E94 00814024 */ and $t0, $a0, $at /* 013B8 809F2E98 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 013BC 809F2E9C 010C6821 */ addu $t5, $t0, $t4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Init.s index 6a1e29462f..1bb6f0a978 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Init.s @@ -15,10 +15,10 @@ glabel EnDntJiji_Init /* 0000C 809F1AEC AFA5003C */ sw $a1, 0x003C($sp) /* 00010 809F1AF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00014 809F1AF4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 809F1AF8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 00018 809F1AF8 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 0001C 809F1AFC 44050000 */ mfc1 $a1, $f0 /* 00020 809F1B00 44070000 */ mfc1 $a3, $f0 -/* 00024 809F1B04 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00024 809F1B04 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00028 809F1B08 0C00AC78 */ jal ActorShape_Init /* 0002C 809F1B0C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s index d94e034dfd..7998332078 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s @@ -15,10 +15,10 @@ glabel EnDntJiji_Update /* 01144 809F2C24 34A5C28F */ ori $a1, $a1, 0xC28F ## $a1 = 3C75C28F /* 01148 809F2C28 860E0246 */ lh $t6, 0x0246($s0) ## 00000246 -/* 0114C 809F2C2C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0114C 809F2C2C 3C188016 */ lui $t8, %hi(gGameInfo) /* 01150 809F2C30 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 /* 01154 809F2C34 A60F0246 */ sh $t7, 0x0246($s0) ## 00000246 -/* 01158 809F2C38 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 01158 809F2C38 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 0115C 809F2C3C 871912D4 */ lh $t9, 0x12D4($t8) ## 801612D4 /* 01160 809F2C40 13200004 */ beq $t9, $zero, .L809F2C54 /* 01164 809F2C44 3C04809F */ lui $a0, %hi(D_809F3090) ## $a0 = 809F0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2118.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2118.s index e48cbad645..9bd3f84672 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2118.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2118.s @@ -34,8 +34,8 @@ glabel func_809F2118 /* 006A8 809F2188 A6180242 */ sh $t8, 0x0242($s0) ## 00000242 .L809F218C: /* 006AC 809F218C 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 006B0 809F2190 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 006B4 809F2194 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 +/* 006B0 809F2190 3C098016 */ lui $t1, %hi(gSaveContext+0xa0) +/* 006B4 809F2194 3C0A8012 */ lui $t2, %hi(gUpgradeMasks+0x18) /* 006B8 809F2198 30590008 */ andi $t9, $v0, 0x0008 ## $t9 = 00000000 /* 006BC 809F219C 13200008 */ beq $t9, $zero, .L809F21C0 /* 006C0 809F21A0 30480001 */ andi $t0, $v0, 0x0001 ## $t0 = 00000000 @@ -51,15 +51,15 @@ glabel func_809F2118 /* 006E4 809F21C4 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 /* 006E8 809F21C8 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 /* 006EC 809F21CC 2418104D */ addiu $t8, $zero, 0x104D ## $t8 = 0000104D -/* 006F0 809F21D0 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 +/* 006F0 809F21D0 3C0C8012 */ lui $t4, %hi(gUpgradeShifts+6) /* 006F4 809F21D4 460A403C */ c.lt.s $f8, $f10 /* 006F8 809F21D8 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 0000104D /* 006FC 809F21DC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00700 809F21E0 45020018 */ bc1fl .L809F2244 /* 00704 809F21E4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00708 809F21E8 8D29E700 */ lw $t1, -0x1900($t1) ## 8015E700 -/* 0070C 809F21EC 8D4A71C8 */ lw $t2, 0x71C8($t2) ## 801271C8 -/* 00710 809F21F0 918C71FA */ lbu $t4, 0x71FA($t4) ## 801271FA +/* 00708 809F21E8 8D29E700 */ lw $t1, %lo(gSaveContext+0xa0)($t1) +/* 0070C 809F21EC 8D4A71C8 */ lw $t2, %lo(gUpgradeMasks+0x18)($t2) +/* 00710 809F21F0 918C71FA */ lbu $t4, %lo(gUpgradeShifts+6)($t4) /* 00714 809F21F4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00718 809F21F8 012A5824 */ and $t3, $t1, $t2 /* 0071C 809F21FC 018B6807 */ srav $t5, $t3, $t4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s index b4927b8f25..eaa90b8f8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s @@ -51,12 +51,12 @@ glabel func_809F236C /* 00948 809F2428 0C00BE0A */ jal Audio_PlayActorSound2 /* 0094C 809F242C 2405387C */ addiu $a1, $zero, 0x387C ## $a1 = 0000387C -/* 00950 809F2430 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 00954 809F2434 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 00958 809F2438 8DCE71CC */ lw $t6, 0x71CC($t6) ## 801271CC -/* 0095C 809F243C 8DADE700 */ lw $t5, -0x1900($t5) ## 8015E700 -/* 00960 809F2440 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 -/* 00964 809F2444 931871FB */ lbu $t8, 0x71FB($t8) ## 801271FB +/* 00950 809F2430 3C0D8016 */ lui $t5, %hi(gSaveContext+0xa0) +/* 00954 809F2434 3C0E8012 */ lui $t6, %hi(gUpgradeMasks+0x1c) +/* 00958 809F2438 8DCE71CC */ lw $t6, %lo(gUpgradeMasks+0x1c)($t6) +/* 0095C 809F243C 8DADE700 */ lw $t5, %lo(gSaveContext+0xa0)($t5) +/* 00960 809F2440 3C188012 */ lui $t8, %hi(gUpgradeShifts+7) +/* 00964 809F2444 931871FB */ lbu $t8, %lo(gUpgradeShifts+7)($t8) /* 00968 809F2448 01AE7824 */ and $t7, $t5, $t6 /* 0096C 809F244C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00970 809F2450 030F1007 */ srav $v0, $t7, $t8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2720.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2720.s index 7f6b01fe52..b15d4d039b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2720.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2720.s @@ -101,8 +101,8 @@ glabel func_809F2720 /* 00CF4 809F27D4 0C00084C */ jal osSyncPrintf /* 00CF8 809F27D8 24843058 */ addiu $a0, $a0, %lo(D_809F3058) ## $a0 = 809F3058 -/* 00CFC 809F27DC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00D00 809F27E0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00CFC 809F27DC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00D00 809F27E0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00D04 809F27E4 944E0EF2 */ lhu $t6, 0x0EF2($v0) ## 8015F552 /* 00D08 809F27E8 35CF8000 */ ori $t7, $t6, 0x8000 ## $t7 = 00008000 /* 00D0C 809F27EC 10000018 */ beq $zero, $zero, .L809F2850 @@ -132,8 +132,8 @@ glabel func_809F2720 /* 00D54 809F2834 0C00084C */ jal osSyncPrintf /* 00D58 809F2838 24843088 */ addiu $a0, $a0, %lo(D_809F3088) ## $a0 = 809F3088 -/* 00D5C 809F283C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00D60 809F2840 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00D5C 809F283C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00D60 809F2840 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00D64 809F2844 94580EF2 */ lhu $t8, 0x0EF2($v0) ## 8015F552 /* 00D68 809F2848 37194000 */ ori $t9, $t8, 0x4000 ## $t9 = 00004000 /* 00D6C 809F284C A4590EF2 */ sh $t9, 0x0EF2($v0) ## 8015F552 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3480.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3480.s index aa8706afab..3ba341b6e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3480.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3480.s @@ -22,14 +22,14 @@ glabel func_809F3480 /* 0020C 809F34CC 01194021 */ addu $t0, $t0, $t9 /* 00210 809F34D0 8D0817B4 */ lw $t0, 0x17B4($t0) ## 000117B4 /* 00214 809F34D4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00218 809F34D8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 00218 809F34D8 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 0021C 809F34DC 01014821 */ addu $t1, $t0, $at -/* 00220 809F34E0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00224 809F34E4 AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 +/* 00220 809F34E0 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 00224 809F34E4 AC296FC0 */ sw $t1, %lo(gSegments+0x18)($at) /* 00228 809F34E8 820A0279 */ lb $t2, 0x0279($s0) ## 00000279 /* 0022C 809F34EC 44050000 */ mfc1 $a1, $f0 /* 00230 809F34F0 44070000 */ mfc1 $a3, $f0 -/* 00234 809F34F4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00234 809F34F4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00238 809F34F8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0023C 809F34FC 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F36CC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F36CC.s index c3e48ea4da..c16b86f373 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F36CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F36CC.s @@ -71,8 +71,8 @@ glabel func_809F36CC /* 004EC 809F37AC 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFC4 /* 004F0 809F37B0 15800006 */ bne $t4, $zero, .L809F37CC /* 004F4 809F37B4 27A70048 */ addiu $a3, $sp, 0x0048 ## $a3 = FFFFFFD0 -/* 004F8 809F37B8 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 004FC 809F37BC 8DADFA90 */ lw $t5, -0x0570($t5) ## 8015FA90 +/* 004F8 809F37B8 3C0D8016 */ lui $t5, %hi(gGameInfo) +/* 004FC 809F37BC 8DADFA90 */ lw $t5, %lo(gGameInfo)($t5) /* 00500 809F37C0 85AE12D4 */ lh $t6, 0x12D4($t5) ## 801612D4 /* 00504 809F37C4 51C00078 */ beql $t6, $zero, .L809F39A8 /* 00508 809F37C8 8FBF0024 */ lw $ra, 0x0024($sp) @@ -139,8 +139,8 @@ glabel func_809F36CC /* 005F8 809F38B8 0C00084C */ jal osSyncPrintf /* 005FC 809F38BC 8605026C */ lh $a1, 0x026C($s0) ## 0000026C -/* 00600 809F38C0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00604 809F38C4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00600 809F38C0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00604 809F38C4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00608 809F38C8 8C4B0004 */ lw $t3, 0x0004($v0) ## 8015E664 /* 0060C 809F38CC 51600036 */ beql $t3, $zero, .L809F39A8 /* 00610 809F38D0 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s index 71ba0fbdeb..bd7e905490 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s @@ -50,7 +50,7 @@ glabel func_809F5A6C /* 02824 809F5AE4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 02828 809F5AE8 862A0268 */ lh $t2, 0x0268($s1) ## 00000268 /* 0282C 809F5AEC 3C04809F */ lui $a0, %hi(D_809F5EA0) ## $a0 = 809F0000 -/* 02830 809F5AF0 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 02830 809F5AF0 3C188016 */ lui $t8, %hi(gSegments) /* 02834 809F5AF4 000A5880 */ sll $t3, $t2, 2 /* 02838 809F5AF8 008B2021 */ addu $a0, $a0, $t3 /* 0283C 809F5AFC 8C845EA0 */ lw $a0, %lo(D_809F5EA0)($a0) @@ -60,7 +60,7 @@ glabel func_809F5A6C /* 0284C 809F5B0C 000D7702 */ srl $t6, $t5, 28 /* 02850 809F5B10 000E7880 */ sll $t7, $t6, 2 /* 02854 809F5B14 030FC021 */ addu $t8, $t8, $t7 -/* 02858 809F5B18 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 02858 809F5B18 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 0285C 809F5B1C 00816024 */ and $t4, $a0, $at /* 02860 809F5B20 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 02864 809F5B24 0198C821 */ addu $t9, $t4, $t8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F70E8.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F70E8.s index cce2a99a81..44affbf7b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F70E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F70E8.s @@ -40,8 +40,8 @@ glabel func_809F70E8 /* 00DB8 809F7178 3C0D809F */ lui $t5, %hi(func_809F74C4) ## $t5 = 809F0000 /* 00DBC 809F717C 25AD74C4 */ addiu $t5, $t5, %lo(func_809F74C4) ## $t5 = 809F74C4 /* 00DC0 809F7180 15A20003 */ bne $t5, $v0, .L809F7190 -/* 00DC4 809F7184 3C0E8003 */ lui $t6, 0x8003 ## $t6 = 80030000 -/* 00DC8 809F7188 25CEB5EC */ addiu $t6, $t6, 0xB5EC ## $t6 = 8002B5EC +/* 00DC4 809F7184 3C0E8003 */ lui $t6, %hi(ActorShadow_DrawFunc_Circle) +/* 00DC8 809F7188 25CEB5EC */ addiu $t6, %lo(ActorShadow_DrawFunc_Circle) /* 00DCC 809F718C AE0E00C0 */ sw $t6, 0x00C0($s0) ## 000000C0 .L809F7190: /* 00DD0 809F7190 0C27DC27 */ jal func_809F709C @@ -65,8 +65,8 @@ glabel func_809F70E8 /* 00E0C 809F71CC 250874C4 */ addiu $t0, $t0, %lo(func_809F74C4) ## $t0 = 809F74C4 /* 00E10 809F71D0 15020003 */ bne $t0, $v0, .L809F71E0 .L809F71D4: -/* 00E14 809F71D4 3C098003 */ lui $t1, 0x8003 ## $t1 = 80030000 -/* 00E18 809F71D8 2529B5EC */ addiu $t1, $t1, 0xB5EC ## $t1 = 8002B5EC +/* 00E14 809F71D4 3C098003 */ lui $t1, %hi(ActorShadow_DrawFunc_Circle) +/* 00E18 809F71D8 2529B5EC */ addiu $t1, %lo(ActorShadow_DrawFunc_Circle) /* 00E1C 809F71DC AE0900C0 */ sw $t1, 0x00C0($s0) ## 000000C0 .L809F71E0: /* 00E20 809F71E0 920200B1 */ lbu $v0, 0x00B1($s0) ## 000000B1 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s index a5175e02d7..b7fe877a56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s @@ -36,8 +36,8 @@ glabel func_809F74C4 /* 01174 809F7534 8FA50034 */ lw $a1, 0x0034($sp) /* 01178 809F7538 C7A0002C */ lwc1 $f0, 0x002C($sp) /* 0117C 809F753C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01180 809F7540 3C188003 */ lui $t8, 0x8003 ## $t8 = 80030000 -/* 01184 809F7544 2718B5EC */ addiu $t8, $t8, 0xB5EC ## $t8 = 8002B5EC +/* 01180 809F7540 3C188003 */ lui $t8, %hi(ActorShadow_DrawFunc_Circle) +/* 01184 809F7544 2718B5EC */ addiu $t8, %lo(ActorShadow_DrawFunc_Circle) /* 01188 809F7548 46040032 */ c.eq.s $f0, $f4 /* 0118C 809F754C 3C01809F */ lui $at, %hi(D_809F7F8C) ## $at = 809F0000 /* 01190 809F7550 4502000A */ bc1fl .L809F757C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Init.s index 4b2a59a503..76e5391d74 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Init.s @@ -16,14 +16,14 @@ glabel EnDodongo_Init /* 0052C 809F877C 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF /* 00530 809F8780 241900C8 */ addiu $t9, $zero, 0x00C8 ## $t9 = 000000C8 /* 00534 809F8784 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 00538 809F8788 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 00538 809F8788 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 0053C 809F878C A20203C8 */ sb $v0, 0x03C8($s0) ## 000003C8 /* 00540 809F8790 A20203C5 */ sb $v0, 0x03C5($s0) ## 000003C5 /* 00544 809F8794 A20203C4 */ sb $v0, 0x03C4($s0) ## 000003C4 /* 00548 809F8798 A21903CB */ sb $t9, 0x03CB($s0) ## 000003CB /* 0054C 809F879C A21903C7 */ sb $t9, 0x03C7($s0) ## 000003C7 /* 00550 809F87A0 A20903C9 */ sb $t1, 0x03C9($s0) ## 000003C9 -/* 00554 809F87A4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00554 809F87A4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00558 809F87A8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0055C 809F87AC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00560 809F87B0 3C074240 */ lui $a3, 0x4240 ## $a3 = 42400000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC41C.s b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC41C.s index e4bc5631fc..ce6db0e16b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC41C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC41C.s @@ -28,8 +28,8 @@ glabel func_809FC41C /* 002B0 809FC480 ACD901D4 */ sw $t9, 0x01D4($a2) ## 000001D4 /* 002B4 809FC484 1461000D */ bne $v1, $at, .L809FC4BC /* 002B8 809FC488 A0D8001E */ sb $t8, 0x001E($a2) ## 0000001E -/* 002BC 809FC48C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 002C0 809FC490 9442E66C */ lhu $v0, -0x1994($v0) ## 8015E66C +/* 002BC 809FC48C 3C028016 */ lui $v0, %hi(gSaveContext+0xc) +/* 002C0 809FC490 9442E66C */ lhu $v0, %lo(gSaveContext+0xc)($v0) /* 002C4 809FC494 3401C001 */ ori $at, $zero, 0xC001 ## $at = 0000C001 /* 002C8 809FC498 24030005 */ addiu $v1, $zero, 0x0005 ## $v1 = 00000005 /* 002CC 809FC49C 0041082A */ slt $at, $v0, $at @@ -84,13 +84,13 @@ glabel func_809FC41C /* 00380 809FC550 84CA001C */ lh $t2, 0x001C($a2) ## 0000001C /* 00384 809FC554 84CB001C */ lh $t3, 0x001C($a2) ## 0000001C /* 00388 809FC558 24010229 */ addiu $at, $zero, 0x0229 ## $at = 00000229 -/* 0038C 809FC55C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0038C 809FC55C 3C0F8016 */ lui $t7, %hi(gSaveContext+0xed6) /* 00390 809FC560 316C003F */ andi $t4, $t3, 0x003F ## $t4 = 00000000 /* 00394 809FC564 258D0200 */ addiu $t5, $t4, 0x0200 ## $t5 = 00000200 /* 00398 809FC568 31AEFFFF */ andi $t6, $t5, 0xFFFF ## $t6 = 00000200 /* 0039C 809FC56C 15C10007 */ bne $t6, $at, .L809FC58C /* 003A0 809FC570 A4CD010E */ sh $t5, 0x010E($a2) ## 0000010E -/* 003A4 809FC574 95EFF536 */ lhu $t7, -0x0ACA($t7) ## 8015F536 +/* 003A4 809FC574 95EFF536 */ lhu $t7, %lo(gSaveContext+0xed6)($t7) /* 003A8 809FC578 31F80010 */ andi $t8, $t7, 0x0010 ## $t8 = 00000000 /* 003AC 809FC57C 57000004 */ bnel $t8, $zero, .L809FC590 /* 003B0 809FC580 8CC80004 */ lw $t0, 0x0004($a2) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s index 6ae0fa2a1c..78928e9db5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s @@ -43,8 +43,8 @@ glabel func_809FC5D0 /* 0049C 809FC66C 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 004A0 809FC670 8CA5CECC */ lw $a1, %lo(D_809FCECC)($a1) /* 004A4 809FC674 8FA70040 */ lw $a3, 0x0040($sp) -/* 004A8 809FC678 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 004AC 809FC67C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 004A8 809FC678 3C038016 */ lui $v1, %hi(gSaveContext) +/* 004AC 809FC67C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 004B0 809FC680 84EF0196 */ lh $t7, 0x0196($a3) ## 00000196 /* 004B4 809FC684 51E00079 */ beql $t7, $zero, .L809FC86C /* 004B8 809FC688 8FBF0014 */ lw $ra, 0x0014($sp) @@ -115,8 +115,8 @@ glabel func_809FC5D0 /* 005A8 809FC778 5020003C */ beql $at, $zero, .L809FC86C /* 005AC 809FC77C 8FBF0014 */ lw $ra, 0x0014($sp) /* 005B0 809FC780 84ED0196 */ lh $t5, 0x0196($a3) ## 00000196 -/* 005B4 809FC784 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 005B8 809FC788 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 005B4 809FC784 3C038016 */ lui $v1, %hi(gSaveContext) +/* 005B8 809FC788 2463E660 */ addiu $v1, %lo(gSaveContext) /* 005BC 809FC78C 51A0000E */ beql $t5, $zero, .L809FC7C8 /* 005C0 809FC790 8FAB0038 */ lw $t3, 0x0038($sp) /* 005C4 809FC794 946E1402 */ lhu $t6, 0x1402($v1) ## 8015FA62 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s index 46195d543a..420f101b7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s @@ -26,12 +26,12 @@ glabel EnDu_Draw /* 0147C 809FF0AC 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 01480 809FF0B0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01484 809FF0B4 3C0480A0 */ lui $a0, %hi(D_809FF418) ## $a0 = 80A00000 -/* 01488 809FF0B8 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 01488 809FF0B8 3C068016 */ lui $a2, %hi(gSegments) /* 0148C 809FF0BC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01490 809FF0C0 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 01494 809FF0C4 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 01498 809FF0C8 921901EF */ lbu $t9, 0x01EF($s0) ## 000001EF -/* 0149C 809FF0CC 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 0149C 809FF0CC 24C66FA8 */ addiu $a2, %lo(gSegments) /* 014A0 809FF0D0 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 /* 014A4 809FF0D4 00194880 */ sll $t1, $t9, 2 /* 014A8 809FF0D8 00892021 */ addu $a0, $a0, $t1 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s index e459191dc1..a8086a99a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s @@ -4,8 +4,8 @@ glabel EnDu_Init /* 00584 809FE1B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00588 809FE1B8 AFBF002C */ sw $ra, 0x002C($sp) /* 0058C 809FE1BC AFA5004C */ sw $a1, 0x004C($sp) -/* 00590 809FE1C0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00594 809FE1C4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00590 809FE1C0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00594 809FE1C4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00598 809FE1C8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0059C 809FE1CC 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 005A0 809FE1D0 0C00AC78 */ jal ActorShape_Init @@ -61,9 +61,9 @@ glabel EnDu_Init /* 00650 809FE280 0C00B58B */ jal Actor_SetScale /* 00654 809FE284 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00658 809FE288 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00658 809FE288 3C038016 */ lui $v1, %hi(gSaveContext) /* 0065C 809FE28C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00660 809FE290 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00660 809FE290 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00664 809FE294 A20E001F */ sb $t6, 0x001F($s0) ## 0000001F /* 00668 809FE298 A60001F4 */ sh $zero, 0x01F4($s0) ## 000001F4 /* 0066C 809FE29C 8C6F0008 */ lw $t7, 0x0008($v1) ## 8015E668 @@ -76,10 +76,10 @@ glabel EnDu_Init /* 00688 809FE2B8 0002C100 */ sll $t8, $v0, 4 /* 0068C 809FE2BC 0018CF02 */ srl $t9, $t8, 28 /* 00690 809FE2C0 00194080 */ sll $t0, $t9, 2 -/* 00694 809FE2C4 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 00694 809FE2C4 3C098016 */ lui $t1, %hi(gSegments) /* 00698 809FE2C8 01284821 */ addu $t1, $t1, $t0 /* 0069C 809FE2CC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 006A0 809FE2D0 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 +/* 006A0 809FE2D0 8D296FA8 */ lw $t1, %lo(gSegments)($t1) /* 006A4 809FE2D4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 006A8 809FE2D8 00415024 */ and $t2, $v0, $at /* 006AC 809FE2DC 8FAD004C */ lw $t5, 0x004C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s index aab0db27f7..15c6355765 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s @@ -9,19 +9,19 @@ glabel func_809FDC38 /* 00024 809FDC54 1000001D */ beq $zero, $zero, .L809FDCCC /* 00028 809FDC58 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L809FDC5C: -/* 0002C 809FDC5C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00030 809FDC60 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 00034 809FDC64 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 00038 809FDC68 8DEF71B8 */ lw $t7, 0x71B8($t7) ## 801271B8 +/* 0002C 809FDC5C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00030 809FDC60 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00034 809FDC64 3C0F8012 */ lui $t7, %hi(gUpgradeMasks+8) +/* 00038 809FDC68 8DEF71B8 */ lw $t7, %lo(gUpgradeMasks+8)($t7) /* 0003C 809FDC6C 8C4E00A0 */ lw $t6, 0x00A0($v0) ## 8015E700 -/* 00040 809FDC70 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 -/* 00044 809FDC74 933971F6 */ lbu $t9, 0x71F6($t9) ## 801271F6 +/* 00040 809FDC70 3C198012 */ lui $t9, %hi(gUpgradeShifts+2) +/* 00044 809FDC74 933971F6 */ lbu $t9, %lo(gUpgradeShifts+2)($t9) /* 00048 809FDC78 01CFC024 */ and $t8, $t6, $t7 -/* 0004C 809FDC7C 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 +/* 0004C 809FDC7C 3C098012 */ lui $t1, %hi(gBitFlags+0x4c) /* 00050 809FDC80 03384007 */ srav $t0, $t8, $t9 /* 00054 809FDC84 5100000B */ beql $t0, $zero, .L809FDCB4 /* 00058 809FDC88 944C0F1A */ lhu $t4, 0x0F1A($v0) ## 8015F57A -/* 0005C 809FDC8C 8D29716C */ lw $t1, 0x716C($t1) ## 8012716C +/* 0005C 809FDC8C 8D29716C */ lw $t1, %lo(gBitFlags+0x4c)($t1) /* 00060 809FDC90 8C4A00A4 */ lw $t2, 0x00A4($v0) ## 8015E704 /* 00064 809FDC94 012A5824 */ and $t3, $t1, $t2 /* 00068 809FDC98 11600003 */ beq $t3, $zero, .L809FDCA8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDCDC.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDCDC.s index 777aca98df..5f2becd0a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDCDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDCDC.s @@ -42,8 +42,8 @@ glabel L809FDD14 /* 00110 809FDD40 10000018 */ beq $zero, $zero, .L809FDDA4 /* 00114 809FDD44 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L809FDD48: -/* 00118 809FDD48 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0011C 809FDD4C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00118 809FDD48 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0011C 809FDD4C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00120 809FDD50 94580F1A */ lhu $t8, 0x0F1A($v0) ## 8015F57A /* 00124 809FDD54 37190008 */ ori $t9, $t8, 0x0008 ## $t9 = 00000008 /* 00128 809FDD58 A4590F1A */ sh $t9, 0x0F1A($v0) ## 8015F57A @@ -53,8 +53,8 @@ glabel L809FDD14 /* 00134 809FDD64 1000000F */ beq $zero, $zero, .L809FDDA4 /* 00138 809FDD68 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 .L809FDD6C: -/* 0013C 809FDD6C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00140 809FDD70 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0013C 809FDD6C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00140 809FDD70 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00144 809FDD74 94480ED8 */ lhu $t0, 0x0ED8($v0) ## 8015F538 /* 00148 809FDD78 35090004 */ ori $t1, $t0, 0x0004 ## $t1 = 00000004 /* 0014C 809FDD7C A4490ED8 */ sh $t1, 0x0ED8($v0) ## 8015F538 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDDB4.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDDB4.s index 9b4ae98902..2598c7ebce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDDB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDDB4.s @@ -2,9 +2,9 @@ glabel func_809FDDB4 /* 00184 809FDDB4 AFA40000 */ sw $a0, 0x0000($sp) /* 00188 809FDDB8 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 /* 0018C 809FDDBC 24010062 */ addiu $at, $zero, 0x0062 ## $at = 00000062 -/* 00190 809FDDC0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00190 809FDDC0 3C038016 */ lui $v1, %hi(gSaveContext) /* 00194 809FDDC4 14410007 */ bne $v0, $at, .L809FDDE4 -/* 00198 809FDDC8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00198 809FDDC8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0019C 809FDDCC 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 /* 001A0 809FDDD0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 001A4 809FDDD4 15C10003 */ bne $t6, $at, .L809FDDE4 @@ -12,10 +12,10 @@ glabel func_809FDDB4 /* 001AC 809FDDDC 03E00008 */ jr $ra /* 001B0 809FDDE0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L809FDDE4: -/* 001B4 809FDDE4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 001B4 809FDDE4 3C038016 */ lui $v1, %hi(gSaveContext) /* 001B8 809FDDE8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 001BC 809FDDEC 1441000A */ bne $v0, $at, .L809FDE18 -/* 001C0 809FDDF0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 001C0 809FDDF0 2463E660 */ addiu $v1, %lo(gSaveContext) /* 001C4 809FDDF4 946F0F1A */ lhu $t7, 0x0F1A($v1) ## 8015F57A /* 001C8 809FDDF8 31F80400 */ andi $t8, $t7, 0x0400 ## $t8 = 00000000 /* 001CC 809FDDFC 57000007 */ bnel $t8, $zero, .L809FDE1C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE4A4.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE4A4.s index aaf114968b..9530ca05bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE4A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE4A4.s @@ -22,7 +22,7 @@ glabel func_809FE4A4 .L809FE4F4: /* 008C4 809FE4F4 28410006 */ slti $at, $v0, 0x0006 /* 008C8 809FE4F8 1420001D */ bne $at, $zero, .L809FE570 -/* 008CC 809FE4FC 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 008CC 809FE4FC 3C198016 */ lui $t9, %hi(gSegments) /* 008D0 809FE500 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 /* 008D4 809FE504 24427DE0 */ addiu $v0, $v0, 0x7DE0 ## $v0 = 02007DE0 /* 008D8 809FE508 00027100 */ sll $t6, $v0, 4 @@ -30,16 +30,16 @@ glabel func_809FE4A4 /* 008E0 809FE510 000FC080 */ sll $t8, $t7, 2 /* 008E4 809FE514 0338C821 */ addu $t9, $t9, $t8 /* 008E8 809FE518 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 008EC 809FE51C 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 008EC 809FE51C 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 008F0 809FE520 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 008F4 809FE524 00414024 */ and $t0, $v0, $at /* 008F8 809FE528 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 008FC 809FE52C 03284821 */ addu $t1, $t9, $t0 /* 00900 809FE530 01215021 */ addu $t2, $t1, $at /* 00904 809FE534 AE0A1D68 */ sw $t2, 0x1D68($s0) ## 00001D68 -/* 00908 809FE538 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00908 809FE538 3C018016 */ lui $at, %hi(gSaveContext+0x1414) /* 0090C 809FE53C 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00910 809FE540 A02BFA74 */ sb $t3, -0x058C($at) ## 8015FA74 +/* 00910 809FE540 A02BFA74 */ sb $t3, %lo(gSaveContext+0x1414)($at) /* 00914 809FE544 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 00918 809FE548 3C0580A0 */ lui $a1, %hi(func_809FE890) ## $a1 = 80A00000 /* 0091C 809FE54C A62C01E8 */ sh $t4, 0x01E8($s1) ## 000001E8 @@ -54,12 +54,12 @@ glabel func_809FE4A4 .L809FE570: /* 00940 809FE570 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00944 809FE574 14410027 */ bne $v0, $at, .L809FE614 -/* 00948 809FE578 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0094C 809FE57C 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 00950 809FE580 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00954 809FE584 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 00958 809FE588 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0095C 809FE58C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00948 809FE578 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0094C 809FE57C 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 00950 809FE580 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00954 809FE584 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 00958 809FE588 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0095C 809FE58C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00960 809FE590 AFAE0014 */ sw $t6, 0x0014($sp) /* 00964 809FE594 AFA70010 */ sw $a3, 0x0010($sp) /* 00968 809FE598 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 @@ -71,19 +71,19 @@ glabel func_809FE4A4 /* 0097C 809FE5AC 00027900 */ sll $t7, $v0, 4 /* 00980 809FE5B0 000FC702 */ srl $t8, $t7, 28 /* 00984 809FE5B4 0018C880 */ sll $t9, $t8, 2 -/* 00988 809FE5B8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 00988 809FE5B8 3C088016 */ lui $t0, %hi(gSegments) /* 0098C 809FE5BC 01194021 */ addu $t0, $t0, $t9 /* 00990 809FE5C0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00994 809FE5C4 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 +/* 00994 809FE5C4 8D086FA8 */ lw $t0, %lo(gSegments)($t0) /* 00998 809FE5C8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0099C 809FE5CC 00414824 */ and $t1, $v0, $at /* 009A0 809FE5D0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 009A4 809FE5D4 01095021 */ addu $t2, $t0, $t1 /* 009A8 809FE5D8 01415821 */ addu $t3, $t2, $at /* 009AC 809FE5DC AE0B1D68 */ sw $t3, 0x1D68($s0) ## 00001D68 -/* 009B0 809FE5E0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 009B0 809FE5E0 3C018016 */ lui $at, %hi(gSaveContext+0x1414) /* 009B4 809FE5E4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 009B8 809FE5E8 A02CFA74 */ sb $t4, -0x058C($at) ## 8015FA74 +/* 009B8 809FE5E8 A02CFA74 */ sb $t4, %lo(gSaveContext+0x1414)($at) /* 009BC 809FE5EC 3C0580A0 */ lui $a1, %hi(func_809FE890) ## $a1 = 80A00000 /* 009C0 809FE5F0 A62001E8 */ sh $zero, 0x01E8($s1) ## 000001E8 /* 009C4 809FE5F4 24A5E890 */ addiu $a1, $a1, %lo(func_809FE890) ## $a1 = 809FE890 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE798.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE798.s index 4753ed1c2c..773da5fc05 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE798.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE798.s @@ -63,8 +63,8 @@ glabel func_809FE798 /* 00C30 809FE860 0C00B55C */ jal Actor_Kill /* 00C34 809FE864 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C38 809FE868 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00C3C 809FE86C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00C38 809FE868 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00C3C 809FE86C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00C40 809FE870 944F0F1A */ lhu $t7, 0x0F1A($v0) ## 8015F57A /* 00C44 809FE874 35F80400 */ ori $t8, $t7, 0x0400 ## $t8 = 00000400 /* 00C48 809FE878 A4580F1A */ sh $t8, 0x0F1A($v0) ## 8015F57A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEB08.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEB08.s index bab0150196..4a3fe52851 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEB08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEB08.s @@ -28,12 +28,12 @@ glabel func_809FEB08 /* 00F40 809FEB70 10000024 */ beq $zero, $zero, .L809FEC04 /* 00F44 809FEB74 8FBF001C */ lw $ra, 0x001C($sp) .L809FEB78: -/* 00F48 809FEB78 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 00F4C 809FEB7C 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 -/* 00F50 809FEB80 8F3971B8 */ lw $t9, 0x71B8($t9) ## 801271B8 -/* 00F54 809FEB84 8F18E700 */ lw $t8, -0x1900($t8) ## 8015E700 -/* 00F58 809FEB88 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 -/* 00F5C 809FEB8C 912971F6 */ lbu $t1, 0x71F6($t1) ## 801271F6 +/* 00F48 809FEB78 3C188016 */ lui $t8, %hi(gSaveContext+0xa0) +/* 00F4C 809FEB7C 3C198012 */ lui $t9, %hi(gUpgradeMasks+8) +/* 00F50 809FEB80 8F3971B8 */ lw $t9, %lo(gUpgradeMasks+8)($t9) +/* 00F54 809FEB84 8F18E700 */ lw $t8, %lo(gSaveContext+0xa0)($t8) +/* 00F58 809FEB88 3C098012 */ lui $t1, %hi(gUpgradeShifts+2) +/* 00F5C 809FEB8C 912971F6 */ lbu $t1, %lo(gUpgradeShifts+2)($t1) /* 00F60 809FEB90 03194024 */ and $t0, $t8, $t9 /* 00F64 809FEB94 240C301F */ addiu $t4, $zero, 0x301F ## $t4 = 0000301F /* 00F68 809FEB98 01285007 */ srav $t2, $t0, $t1 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s index 37d30324d1..acb12e88c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s @@ -18,11 +18,11 @@ glabel EnDyExtra_Draw /* 0027C 809FF96C 00077900 */ sll $t7, $a3, 4 /* 00280 809FF970 000FC702 */ srl $t8, $t7, 28 /* 00284 809FF974 0018C880 */ sll $t9, $t8, 2 -/* 00288 809FF978 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 00288 809FF978 3C0A8016 */ lui $t2, %hi(gSegments) /* 0028C 809FF97C 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 00290 809FF980 01595021 */ addu $t2, $t2, $t9 /* 00294 809FF984 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00298 809FF988 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 00298 809FF988 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 0029C 809FF98C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 002A0 809FF990 00E15824 */ and $t3, $a3, $at /* 002A4 809FF994 AFBF003C */ sw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s index 25dcfa4e88..f85e80b0f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s @@ -32,10 +32,10 @@ glabel EnEiyer_Draw /* 0188C 80A0182C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01890 80A01830 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 01894 80A01834 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 01898 80A01838 3C088011 */ lui $t0, 0x8011 ## $t0 = 80110000 +/* 01898 80A01838 3C088011 */ lui $t0, %hi(D_80116280+0x10) /* 0189C 80A0183C 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 /* 018A0 80A01840 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 018A4 80A01844 25086290 */ addiu $t0, $t0, 0x6290 ## $t0 = 80116290 +/* 018A4 80A01844 25086290 */ addiu $t0, %lo(D_80116280+0x10) /* 018A8 80A01848 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 018AC 80A0184C AC790000 */ sw $t9, 0x0000($v1) ## 00000000 /* 018B0 80A01850 AC680004 */ sw $t0, 0x0004($v1) ## 00000004 @@ -63,10 +63,10 @@ glabel EnEiyer_Draw /* 01904 80A018A4 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01908 80A018A8 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 /* 0190C 80A018AC 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 01910 80A018B0 3C0F8011 */ lui $t7, 0x8011 ## $t7 = 80110000 +/* 01910 80A018B0 3C0F8011 */ lui $t7, %hi(D_80116280) /* 01914 80A018B4 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 /* 01918 80A018B8 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 0191C 80A018BC 25EF6280 */ addiu $t7, $t7, 0x6280 ## $t7 = 80116280 +/* 0191C 80A018BC 25EF6280 */ addiu $t7, %lo(D_80116280) /* 01920 80A018C0 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 /* 01924 80A018C4 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 /* 01928 80A018C8 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Init.s index 68c9fa996e..a8a65d3f3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Init.s @@ -9,8 +9,8 @@ glabel EnEiyer_Init /* 0001C 809FFFBC 0C01E037 */ jal Actor_ProcessInitChain /* 00020 809FFFC0 24A519C4 */ addiu $a1, $a1, %lo(D_80A019C4) ## $a1 = 80A019C4 -/* 00024 809FFFC4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00028 809FFFC8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00024 809FFFC4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00028 809FFFC8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0002C 809FFFCC 262400B4 */ addiu $a0, $s1, 0x00B4 ## $a0 = 000000B4 /* 00030 809FFFD0 3C054416 */ lui $a1, 0x4416 ## $a1 = 44160000 /* 00034 809FFFD4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s index 54d813c2a7..2d28c3bf1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s @@ -13,12 +13,12 @@ glabel EnElf_Draw /* 03C54 80A05884 5700019E */ bnel $t8, $zero, .L80A05F00 /* 03C58 80A05888 8FBF002C */ lw $ra, 0x002C($sp) /* 03C5C 80A0588C 8C59067C */ lw $t9, 0x067C($v0) ## 0000067C -/* 03C60 80A05890 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 03C60 80A05890 3C0B8016 */ lui $t3, %hi(gGameInfo) /* 03C64 80A05894 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 /* 03C68 80A05898 001952C0 */ sll $t2, $t9, 11 /* 03C6C 80A0589C 0543000C */ bgezl $t2, .L80A058D0 /* 03C70 80A058A0 8CC40000 */ lw $a0, 0x0000($a2) ## 00000000 -/* 03C74 80A058A4 8D6BFA90 */ lw $t3, -0x0570($t3) ## 8015FA90 +/* 03C74 80A058A4 8D6BFA90 */ lw $t3, %lo(gGameInfo)($t3) /* 03C78 80A058A8 C48800EC */ lwc1 $f8, 0x00EC($a0) ## 000000EC /* 03C7C 80A058AC 856C1508 */ lh $t4, 0x1508($t3) ## 80161508 /* 03C80 80A058B0 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Init.s index 9bc4b2e131..ae91e0ba46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Init.s @@ -125,11 +125,11 @@ glabel L80A025C0 /* 009B0 80A025E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 009B4 80A025E4 960E02C4 */ lhu $t6, 0x02C4($s0) ## 000002C4 /* 009B8 80A025E8 3C1880A0 */ lui $t8, %hi(func_80A053F0) ## $t8 = 80A00000 -/* 009BC 80A025EC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 009BC 80A025EC 3C038016 */ lui $v1, %hi(gSaveContext) /* 009C0 80A025F0 271853F0 */ addiu $t8, $t8, %lo(func_80A053F0) ## $t8 = 80A053F0 /* 009C4 80A025F4 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 /* 009C8 80A025F8 35CF0004 */ ori $t7, $t6, 0x0004 ## $t7 = 00000004 -/* 009CC 80A025FC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 009CC 80A025FC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 009D0 80A02600 A60F02C4 */ sh $t7, 0x02C4($s0) ## 000002C4 /* 009D4 80A02604 AE180130 */ sw $t8, 0x0130($s0) ## 00000130 /* 009D8 80A02608 AE000298 */ sw $zero, 0x0298($s0) ## 00000298 @@ -194,8 +194,8 @@ glabel L80A02694 /* 00AB4 80A026E4 E6080290 */ swc1 $f8, 0x0290($s0) ## 00000290 glabel L80A026E8 /* 00AB8 80A026E8 960F02C4 */ lhu $t7, 0x02C4($s0) ## 000002C4 -/* 00ABC 80A026EC 3C198003 */ lui $t9, 0x8003 ## $t9 = 80030000 -/* 00AC0 80A026F0 2739B614 */ addiu $t9, $t9, 0xB614 ## $t9 = 8002B614 +/* 00ABC 80A026EC 3C198003 */ lui $t9, %hi(ActorShadow_DrawFunc_WhiteCircle) +/* 00AC0 80A026F0 2739B614 */ addiu $t9, %lo(ActorShadow_DrawFunc_WhiteCircle) /* 00AC4 80A026F4 35F80200 */ ori $t8, $t7, 0x0200 ## $t8 = 00000200 /* 00AC8 80A026F8 A61802C4 */ sh $t8, 0x02C4($s0) ## 000002C4 /* 00ACC 80A026FC AE1900C0 */ sw $t9, 0x00C0($s0) ## 000000C0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03CF8.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03CF8.s index f65d168c3e..5055db2964 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03CF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03CF8.s @@ -62,11 +62,11 @@ glabel func_80A03CF8 /* 021B0 80A03DE0 8FB80064 */ lw $t8, 0x0064($sp) .L80A03DE4: /* 021B4 80A03DE4 24010034 */ addiu $at, $zero, 0x0034 ## $at = 00000034 -/* 021B8 80A03DE8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 021B8 80A03DE8 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1360) /* 021BC 80A03DEC 871900A4 */ lh $t9, 0x00A4($t8) ## 000000A4 /* 021C0 80A03DF0 17210028 */ bne $t9, $at, .L80A03E94 /* 021C4 80A03DF4 00000000 */ nop -/* 021C8 80A03DF8 8DEFF9C0 */ lw $t7, -0x0640($t7) ## 8015F9C0 +/* 021C8 80A03DF8 8DEFF9C0 */ lw $t7, %lo(gSaveContext+0x1360)($t7) /* 021CC 80A03DFC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 021D0 80A03E00 8FA80064 */ lw $t0, 0x0064($sp) /* 021D4 80A03E04 15E10023 */ bne $t7, $at, .L80A03E94 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0461C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0461C.s index a18d61feac..d8b483f4e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0461C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0461C.s @@ -37,11 +37,11 @@ glabel func_80A0461C .L80A04698: /* 02A68 80A04698 8D18067C */ lw $t8, 0x067C($t0) ## 0000067C /* 02A6C 80A0469C 8CC31CC8 */ lw $v1, 0x1CC8($a2) ## 00001CD2 -/* 02A70 80A046A0 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 02A70 80A046A0 3C098016 */ lui $t1, %hi(gGameInfo) /* 02A74 80A046A4 33190400 */ andi $t9, $t8, 0x0400 ## $t9 = 00000000 /* 02A78 80A046A8 57200011 */ bnel $t9, $zero, .L80A046F0 /* 02A7C 80A046AC 240C0064 */ addiu $t4, $zero, 0x0064 ## $t4 = 00000064 -/* 02A80 80A046B0 8D29FA90 */ lw $t1, -0x0570($t1) ## 8015FA90 +/* 02A80 80A046B0 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) /* 02A84 80A046B4 00C02025 */ or $a0, $a2, $zero ## $a0 = 0000000A /* 02A88 80A046B8 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 02A8C 80A046BC 852A04B2 */ lh $t2, 0x04B2($t1) ## 801604B2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s index 66a38501e9..e0d1ce10a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s @@ -10,18 +10,18 @@ glabel func_80A053F0 /* 037E0 80A05410 1440001A */ bne $v0, $zero, .L80A0547C /* 037E4 80A05414 00000000 */ nop /* 037E8 80A05418 8DF80664 */ lw $t8, 0x0664($t7) ## 00000664 -/* 037EC 80A0541C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 037EC 80A0541C 3C028016 */ lui $v0, %hi(gSaveContext+0x38) /* 037F0 80A05420 5700001D */ bnel $t8, $zero, .L80A05498 /* 037F4 80A05424 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 037F8 80A05428 9442E698 */ lhu $v0, -0x1968($v0) ## 8015E698 -/* 037FC 80A0542C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 037F8 80A05428 9442E698 */ lhu $v0, %lo(gSaveContext+0x38)($v0) +/* 037FC 80A0542C 3C198016 */ lui $t9, %hi(gGameInfo) /* 03800 80A05430 28410258 */ slti $at, $v0, 0x0258 /* 03804 80A05434 14200003 */ bne $at, $zero, .L80A05444 /* 03808 80A05438 28410BB9 */ slti $at, $v0, 0x0BB9 /* 0380C 80A0543C 14200005 */ bne $at, $zero, .L80A05454 /* 03810 80A05440 00000000 */ nop .L80A05444: -/* 03814 80A05444 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 03814 80A05444 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 03818 80A05448 872812C6 */ lh $t0, 0x12C6($t9) ## 801612C6 /* 0381C 80A0544C 51000012 */ beql $t0, $zero, .L80A05498 /* 03820 80A05450 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -49,8 +49,8 @@ glabel func_80A053F0 /* 03868 80A05498 0C00BC65 */ jal func_8002F194 /* 0386C 80A0549C 8FA5003C */ lw $a1, 0x003C($sp) /* 03870 80A054A0 1040002C */ beq $v0, $zero, .L80A05554 -/* 03874 80A054A4 3C048013 */ lui $a0, 0x8013 ## $a0 = 80130000 -/* 03878 80A054A8 248433D4 */ addiu $a0, $a0, 0x33D4 ## $a0 = 801333D4 +/* 03874 80A054A4 3C048013 */ lui $a0, %hi(D_801333D4) +/* 03878 80A054A8 248433D4 */ addiu $a0, %lo(D_801333D4) /* 0387C 80A054AC 24056873 */ addiu $a1, $zero, 0x6873 ## $a1 = 00006873 /* 03880 80A054B0 0C03D149 */ jal func_800F4524 /* 03884 80A054B4 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 @@ -69,10 +69,10 @@ glabel func_80A053F0 /* 038B8 80A054E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 038BC 80A054EC 960F02C4 */ lhu $t7, 0x02C4($s0) ## 000002C4 /* 038C0 80A054F0 24190BB9 */ addiu $t9, $zero, 0x0BB9 ## $t9 = 00000BB9 -/* 038C4 80A054F4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 038C4 80A054F4 3C018016 */ lui $at, %hi(gSaveContext+0x38) /* 038C8 80A054F8 35F80080 */ ori $t8, $t7, 0x0080 ## $t8 = 00000080 /* 038CC 80A054FC A61802C4 */ sh $t8, 0x02C4($s0) ## 000002C4 -/* 038D0 80A05500 A439E698 */ sh $t9, -0x1968($at) ## 8015E698 +/* 038D0 80A05500 A439E698 */ sh $t9, %lo(gSaveContext+0x38)($at) .L80A05504: /* 038D4 80A05504 960802C4 */ lhu $t0, 0x02C4($s0) ## 000002C4 /* 038D8 80A05508 AE0C0130 */ sw $t4, 0x0130($s0) ## 00000130 @@ -102,19 +102,19 @@ glabel func_80A053F0 /* 03930 80A05560 0320F809 */ jalr $ra, $t9 /* 03934 80A05564 00000000 */ nop /* 03938 80A05568 860802BC */ lh $t0, 0x02BC($s0) ## 000002BC -/* 0393C 80A0556C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 03940 80A05570 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 0393C 80A0556C 3C098016 */ lui $t1, %hi(gSaveContext+0xeb8) +/* 03940 80A05570 3C0A8016 */ lui $t2, %hi(gGameInfo) /* 03944 80A05574 A60800B6 */ sh $t0, 0x00B6($s0) ## 000000B6 -/* 03948 80A05578 8D4AFA90 */ lw $t2, -0x0570($t2) ## 8015FA90 -/* 0394C 80A0557C 8D29F518 */ lw $t1, -0x0AE8($t1) ## 8015F518 -/* 03950 80A05580 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 03954 80A05584 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 03948 80A05578 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) +/* 0394C 80A0557C 8D29F518 */ lw $t1, %lo(gSaveContext+0xeb8)($t1) +/* 03950 80A05580 3C0B8016 */ lui $t3, %hi(gGameInfo) +/* 03954 80A05584 3C0D8016 */ lui $t5, %hi(gSaveContext+0xeb8) /* 03958 80A05588 A54912B4 */ sh $t1, 0x12B4($t2) ## 801612B4 -/* 0395C 80A0558C 8D6BFA90 */ lw $t3, -0x0570($t3) ## 8015FA90 +/* 0395C 80A0558C 8D6BFA90 */ lw $t3, %lo(gGameInfo)($t3) /* 03960 80A05590 856C12B6 */ lh $t4, 0x12B6($t3) ## 801612B6 /* 03964 80A05594 1180000D */ beq $t4, $zero, .L80A055CC /* 03968 80A05598 00000000 */ nop -/* 0396C 80A0559C 8DADF518 */ lw $t5, -0x0AE8($t5) ## 8015F518 +/* 0396C 80A0559C 8DADF518 */ lw $t5, %lo(gSaveContext+0xeb8)($t5) /* 03970 80A055A0 3C0480A0 */ lui $a0, %hi(D_80A060D8) ## $a0 = 80A00000 /* 03974 80A055A4 248460D8 */ addiu $a0, $a0, %lo(D_80A060D8) ## $a0 = 80A060D8 /* 03978 80A055A8 11A00008 */ beq $t5, $zero, .L80A055CC @@ -123,8 +123,8 @@ glabel func_80A053F0 /* 03984 80A055B4 24050A23 */ addiu $a1, $zero, 0x0A23 ## $a1 = 00000A23 /* 03988 80A055B8 3C0480A0 */ lui $a0, %hi(D_80A060E8) ## $a0 = 80A00000 -/* 0398C 80A055BC 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 03990 80A055C0 8CA5F518 */ lw $a1, -0x0AE8($a1) ## 8015F518 +/* 0398C 80A055BC 3C058016 */ lui $a1, %hi(gSaveContext+0xeb8) +/* 03990 80A055C0 8CA5F518 */ lw $a1, %lo(gSaveContext+0xeb8)($a1) /* 03994 80A055C4 0C00084C */ jal osSyncPrintf /* 03998 80A055C8 248460E8 */ addiu $a0, $a0, %lo(D_80A060E8) ## $a0 = 80A060E8 @@ -132,21 +132,21 @@ glabel func_80A053F0 /* 0399C 80A055CC 0C02FF21 */ jal Gameplay_InCsMode /* 039A0 80A055D0 8FA4003C */ lw $a0, 0x003C($sp) /* 039A4 80A055D4 1440000E */ bne $v0, $zero, .L80A05610 -/* 039A8 80A055D8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 039AC 80A055DC 9442E698 */ lhu $v0, -0x1968($v0) ## 8015E698 +/* 039A8 80A055D8 3C028016 */ lui $v0, %hi(gSaveContext+0x38) +/* 039AC 80A055DC 9442E698 */ lhu $v0, %lo(gSaveContext+0x38)($v0) /* 039B0 80A055E0 284164C8 */ slti $at, $v0, 0x64C8 /* 039B4 80A055E4 10200004 */ beq $at, $zero, .L80A055F8 /* 039B8 80A055E8 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 80160001 -/* 039BC 80A055EC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 039BC 80A055EC 3C018016 */ lui $at, %hi(gSaveContext+0x38) /* 039C0 80A055F0 10000007 */ beq $zero, $zero, .L80A05610 -/* 039C4 80A055F4 A42EE698 */ sh $t6, -0x1968($at) ## 8015E698 +/* 039C4 80A055F4 A42EE698 */ sh $t6, %lo(gSaveContext+0x38)($at) .L80A055F8: /* 039C8 80A055F8 960F02C4 */ lhu $t7, 0x02C4($s0) ## 000002C4 -/* 039CC 80A055FC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 039CC 80A055FC 3C018016 */ lui $at, %hi(gSaveContext+0x38) /* 039D0 80A05600 31F80080 */ andi $t8, $t7, 0x0080 ## $t8 = 00000000 /* 039D4 80A05604 57000003 */ bnel $t8, $zero, .L80A05614 /* 039D8 80A05608 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 039DC 80A0560C A420E698 */ sh $zero, -0x1968($at) ## 8015E698 +/* 039DC 80A0560C A420E698 */ sh $zero, %lo(gSaveContext+0x38)($at) .L80A05610: /* 039E0 80A05610 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80A05614: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount1/EnEncount1_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Encount1/EnEncount1_Update.s index 81a7dcd439..61976c8a23 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount1/EnEncount1_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount1/EnEncount1_Update.s @@ -11,8 +11,8 @@ glabel EnEncount1_Update /* 00C08 80A07328 8C99014C */ lw $t9, 0x014C($a0) ## 0000014C /* 00C0C 80A0732C 0320F809 */ jalr $ra, $t9 /* 00C10 80A07330 00000000 */ nop -/* 00C14 80A07334 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00C18 80A07338 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 00C14 80A07334 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 00C18 80A07338 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 00C1C 80A0733C 8FA40048 */ lw $a0, 0x0048($sp) /* 00C20 80A07340 8FA5004C */ lw $a1, 0x004C($sp) /* 00C24 80A07344 85F812D4 */ lh $t8, 0x12D4($t7) ## 801612D4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06E88.s b/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06E88.s index 38a109588d..7879534ec4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06E88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06E88.s @@ -54,8 +54,8 @@ glabel func_80A06E88 /* 007FC 80A06F1C 100000EC */ beq $zero, $zero, .L80A072D0 /* 00800 80A06F20 A638015A */ sh $t8, 0x015A($s1) ## 0000015A .L80A06F24: -/* 00804 80A06F24 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 00808 80A06F28 8F39E670 */ lw $t9, -0x1990($t9) ## 8015E670 +/* 00804 80A06F24 3C198016 */ lui $t9, %hi(gSaveContext+0x10) +/* 00808 80A06F28 8F39E670 */ lw $t9, %lo(gSaveContext+0x10)($t9) /* 0080C 80A06F2C 13200006 */ beq $t9, $zero, .L80A06F48 /* 00810 80A06F30 00000000 */ nop /* 00814 80A06F34 0C023C20 */ jal func_8008F080 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount2/EnEncount2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Encount2/EnEncount2_Init.s index b9f2e8cfc1..2389c2d710 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount2/EnEncount2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount2/EnEncount2_Init.s @@ -40,8 +40,8 @@ glabel EnEncount2_Init /* 00048 80A079D8 0C00084C */ jal osSyncPrintf /* 0004C 80A079DC 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00050 80A079E0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00054 80A079E4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00050 80A079E0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00054 80A079E4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00058 80A079E8 8C590004 */ lw $t9, 0x0004($v0) ## 8015E664 /* 0005C 80A079EC 1720000F */ bne $t9, $zero, .L80A07A2C /* 00060 80A079F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07CA4.s b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07CA4.s index 2c686d2f82..2f3eba5cb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07CA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07CA4.s @@ -285,13 +285,13 @@ glabel func_80A07CA4 /* 0069C 80A0802C C42C8D68 */ lwc1 $f12, %lo(D_80A08D68)($at) /* 006A0 80A08030 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 006A4 80A08034 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 006A8 80A08038 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 006A8 80A08038 3C0E8016 */ lui $t6, %hi(gSaveContext+4) /* 006AC 80A0803C 8FB90094 */ lw $t9, 0x0094($sp) /* 006B0 80A08040 4604003C */ c.lt.s $f0, $f4 /* 006B4 80A08044 00000000 */ nop /* 006B8 80A08048 45020015 */ bc1fl .L80A080A0 /* 006BC 80A0804C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 006C0 80A08050 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 +/* 006C0 80A08050 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) /* 006C4 80A08054 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 006C8 80A08058 51C00011 */ beql $t6, $zero, .L80A080A0 /* 006CC 80A0805C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09054.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09054.s index d4aedcad6e..342c7587ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09054.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09054.s @@ -112,8 +112,8 @@ glabel L80A09128 glabel L80A0912C /* 0028C 80A0912C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 00290 80A09130 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 -/* 00294 80A09134 3C198003 */ lui $t9, 0x8003 ## $t9 = 80030000 -/* 00298 80A09138 2739EBCC */ addiu $t9, $t9, 0xEBCC ## $t9 = 8002EBCC +/* 00294 80A09134 3C198003 */ lui $t9, %hi(func_8002EBCC) +/* 00298 80A09138 2739EBCC */ addiu $t9, %lo(func_8002EBCC) /* 0029C 80A0913C 24080018 */ addiu $t0, $zero, 0x0018 ## $t0 = 00000018 /* 002A0 80A09140 24090041 */ addiu $t1, $zero, 0x0041 ## $t1 = 00000041 /* 002A4 80A09144 240A0023 */ addiu $t2, $zero, 0x0023 ## $t2 = 00000023 @@ -140,8 +140,8 @@ glabel L80A0918C glabel L80A09190 /* 002F0 80A09190 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 002F4 80A09194 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 -/* 002F8 80A09198 3C0D8003 */ lui $t5, 0x8003 ## $t5 = 80030000 -/* 002FC 80A0919C 25ADED80 */ addiu $t5, $t5, 0xED80 ## $t5 = 8002ED80 +/* 002F8 80A09198 3C0D8003 */ lui $t5, %hi(func_8002ED80) +/* 002FC 80A0919C 25ADED80 */ addiu $t5, %lo(func_8002ED80) /* 00300 80A091A0 240E0041 */ addiu $t6, $zero, 0x0041 ## $t6 = 00000041 /* 00304 80A091A4 240F0023 */ addiu $t7, $zero, 0x0023 ## $t7 = 00000023 /* 00308 80A091A8 ACCD017C */ sw $t5, 0x017C($a2) ## 0000017C @@ -170,8 +170,8 @@ glabel L80A091F8 glabel L80A091FC /* 0035C 80A091FC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 00360 80A09200 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 -/* 00364 80A09204 3C088003 */ lui $t0, 0x8003 ## $t0 = 80030000 -/* 00368 80A09208 2508EBCC */ addiu $t0, $t0, 0xEBCC ## $t0 = 8002EBCC +/* 00364 80A09204 3C088003 */ lui $t0, %hi(func_8002EBCC) +/* 00368 80A09208 2508EBCC */ addiu $t0, %lo(func_8002EBCC) /* 0036C 80A0920C 24090027 */ addiu $t1, $zero, 0x0027 ## $t1 = 00000027 /* 00370 80A09210 240A0041 */ addiu $t2, $zero, 0x0041 ## $t2 = 00000041 /* 00374 80A09214 240B0023 */ addiu $t3, $zero, 0x0023 ## $t3 = 00000023 @@ -193,8 +193,8 @@ glabel L80A091FC glabel L80A09250 /* 003B0 80A09250 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 003B4 80A09254 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 -/* 003B8 80A09258 3C0E8003 */ lui $t6, 0x8003 ## $t6 = 80030000 -/* 003BC 80A0925C 25CEEBCC */ addiu $t6, $t6, 0xEBCC ## $t6 = 8002EBCC +/* 003B8 80A09258 3C0E8003 */ lui $t6, %hi(func_8002EBCC) +/* 003BC 80A0925C 25CEEBCC */ addiu $t6, %lo(func_8002EBCC) /* 003C0 80A09260 240F001F */ addiu $t7, $zero, 0x001F ## $t7 = 0000001F /* 003C4 80A09264 24180041 */ addiu $t8, $zero, 0x0041 ## $t8 = 00000041 /* 003C8 80A09268 24190023 */ addiu $t9, $zero, 0x0023 ## $t9 = 00000023 @@ -221,10 +221,10 @@ glabel L80A09250 glabel L80A092B8 /* 00418 80A092B8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0041C 80A092BC 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 -/* 00420 80A092C0 3C0A8003 */ lui $t2, 0x8003 ## $t2 = 80030000 -/* 00424 80A092C4 3C0B8003 */ lui $t3, 0x8003 ## $t3 = 80030000 -/* 00428 80A092C8 254AEBCC */ addiu $t2, $t2, 0xEBCC ## $t2 = 8002EBCC -/* 0042C 80A092CC 256BED80 */ addiu $t3, $t3, 0xED80 ## $t3 = 8002ED80 +/* 00420 80A092C0 3C0A8003 */ lui $t2, %hi(func_8002EBCC) +/* 00424 80A092C4 3C0B8003 */ lui $t3, %hi(func_8002ED80) +/* 00428 80A092C8 254AEBCC */ addiu $t2, %lo(func_8002EBCC) +/* 0042C 80A092CC 256BED80 */ addiu $t3, %lo(func_8002ED80) /* 00430 80A092D0 240C0070 */ addiu $t4, $zero, 0x0070 ## $t4 = 00000070 /* 00434 80A092D4 240D0041 */ addiu $t5, $zero, 0x0041 ## $t5 = 00000041 /* 00438 80A092D8 240E0023 */ addiu $t6, $zero, 0x0023 ## $t6 = 00000023 @@ -254,10 +254,10 @@ glabel L80A0932C /* 00490 80A09330 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 /* 00494 80A09334 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00498 80A09338 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 0049C 80A0933C 3C198003 */ lui $t9, 0x8003 ## $t9 = 80030000 -/* 004A0 80A09340 3C088003 */ lui $t0, 0x8003 ## $t0 = 80030000 -/* 004A4 80A09344 2739EBCC */ addiu $t9, $t9, 0xEBCC ## $t9 = 8002EBCC -/* 004A8 80A09348 2508ED80 */ addiu $t0, $t0, 0xED80 ## $t0 = 8002ED80 +/* 0049C 80A0933C 3C198003 */ lui $t9, %hi(func_8002EBCC) +/* 004A0 80A09340 3C088003 */ lui $t0, %hi(func_8002ED80) +/* 004A4 80A09344 2739EBCC */ addiu $t9, %lo(func_8002EBCC) +/* 004A8 80A09348 2508ED80 */ addiu $t0, %lo(func_8002ED80) /* 004AC 80A0934C 24090007 */ addiu $t1, $zero, 0x0007 ## $t1 = 00000007 /* 004B0 80A09350 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 004B4 80A09354 ACD9017C */ sw $t9, 0x017C($a2) ## 0000017C @@ -304,8 +304,8 @@ glabel L80A093CC /* 00540 80A093E0 10000010 */ beq $zero, $zero, .L80A09424 /* 00544 80A093E4 E4D20164 */ swc1 $f18, 0x0164($a2) ## 00000164 glabel L80A093E8 -/* 00548 80A093E8 3C188003 */ lui $t8, 0x8003 ## $t8 = 80030000 -/* 0054C 80A093EC 2718EBCC */ addiu $t8, $t8, 0xEBCC ## $t8 = 8002EBCC +/* 00548 80A093E8 3C188003 */ lui $t8, %hi(func_8002EBCC) +/* 0054C 80A093EC 2718EBCC */ addiu $t8, %lo(func_8002EBCC) /* 00550 80A093F0 2419006B */ addiu $t9, $zero, 0x006B ## $t9 = 0000006B /* 00554 80A093F4 ACD8017C */ sw $t8, 0x017C($a2) ## 0000017C /* 00558 80A093F8 A4D90156 */ sh $t9, 0x0156($a2) ## 00000156 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09724.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09724.s index 8f5cba7618..ca43400e07 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09724.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09724.s @@ -126,12 +126,12 @@ glabel func_80A09724 /* 00A5C 80A098FC 0C00B7D5 */ jal func_8002DF54 /* 00A60 80A09900 AE000134 */ sw $zero, 0x0134($s0) ## 00000134 /* 00A64 80A09904 AE000118 */ sw $zero, 0x0118($s0) ## 00000118 -/* 00A68 80A09908 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 00A6C 80A0990C 3C0B8012 */ lui $t3, 0x8012 ## $t3 = 80120000 -/* 00A70 80A09910 8D6B71C4 */ lw $t3, 0x71C4($t3) ## 801271C4 -/* 00A74 80A09914 8D4AE700 */ lw $t2, -0x1900($t2) ## 8015E700 -/* 00A78 80A09918 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 -/* 00A7C 80A0991C 91AD71F9 */ lbu $t5, 0x71F9($t5) ## 801271F9 +/* 00A68 80A09908 3C0A8016 */ lui $t2, %hi(gSaveContext+0xa0) +/* 00A6C 80A0990C 3C0B8012 */ lui $t3, %hi(gUpgradeMasks+0x14) +/* 00A70 80A09910 8D6B71C4 */ lw $t3, %lo(gUpgradeMasks+0x14)($t3) +/* 00A74 80A09914 8D4AE700 */ lw $t2, %lo(gSaveContext+0xa0)($t2) +/* 00A78 80A09918 3C0D8012 */ lui $t5, %hi(gUpgradeShifts+5) +/* 00A7C 80A0991C 91AD71F9 */ lbu $t5, %lo(gUpgradeShifts+5)($t5) /* 00A80 80A09920 014B6024 */ and $t4, $t2, $t3 /* 00A84 80A09924 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00A88 80A09928 01AC7007 */ srav $t6, $t4, $t5 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09978.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09978.s index 664ecbe695..59823f4003 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09978.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09978.s @@ -11,12 +11,12 @@ glabel func_80A09978 /* 00AFC 80A0999C 10000014 */ beq $zero, $zero, .L80A099F0 /* 00B00 80A099A0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C .L80A099A4: -/* 00B04 80A099A4 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00B08 80A099A8 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 -/* 00B0C 80A099AC 8F1871C4 */ lw $t8, 0x71C4($t8) ## 801271C4 -/* 00B10 80A099B0 8DEFE700 */ lw $t7, -0x1900($t7) ## 8015E700 -/* 00B14 80A099B4 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 00B18 80A099B8 910871F9 */ lbu $t0, 0x71F9($t0) ## 801271F9 +/* 00B04 80A099A4 3C0F8016 */ lui $t7, %hi(gSaveContext+0xa0) +/* 00B08 80A099A8 3C188012 */ lui $t8, %hi(gUpgradeMasks+0x14) +/* 00B0C 80A099AC 8F1871C4 */ lw $t8, %lo(gUpgradeMasks+0x14)($t8) +/* 00B10 80A099B0 8DEFE700 */ lw $t7, %lo(gSaveContext+0xa0)($t7) +/* 00B14 80A099B4 3C088012 */ lui $t0, %hi(gUpgradeShifts+5) +/* 00B18 80A099B8 910871F9 */ lbu $t0, %lo(gUpgradeShifts+5)($t0) /* 00B1C 80A099BC 01F8C824 */ and $t9, $t7, $t8 /* 00B20 80A099C0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 00B24 80A099C4 01194807 */ srav $t1, $t9, $t0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09A00.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09A00.s index 8e1b933739..184ecb6b41 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09A00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09A00.s @@ -21,8 +21,8 @@ glabel func_80A09A00 /* 00B94 80A09A34 0C00084C */ jal osSyncPrintf /* 00B98 80A09A38 2484A01C */ addiu $a0, $a0, %lo(D_80A0A01C) ## $a0 = 80A0A01C -/* 00B9C 80A09A3C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00BA0 80A09A40 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00B9C 80A09A3C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00BA0 80A09A40 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00BA4 80A09A44 944E0EF2 */ lhu $t6, 0x0EF2($v0) ## 8015F552 /* 00BA8 80A09A48 8FA40018 */ lw $a0, 0x0018($sp) /* 00BAC 80A09A4C 35CF2000 */ ori $t7, $t6, 0x2000 ## $t7 = 00002000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09C40.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09C40.s index 2a0c0a4659..689b73f56d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09C40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09C40.s @@ -48,7 +48,7 @@ glabel func_80A09C40 /* 00E20 80A09CC0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00E24 80A09CC4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00E28 80A09CC8 3C0480A1 */ lui $a0, %hi(D_80A09E08) ## $a0 = 80A10000 -/* 00E2C 80A09CCC 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 00E2C 80A09CCC 3C198016 */ lui $t9, %hi(gSegments) /* 00E30 80A09CD0 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 00E34 80A09CD4 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 00E38 80A09CD8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 @@ -64,7 +64,7 @@ glabel func_80A09C40 /* 00E60 80A09D00 000E7F02 */ srl $t7, $t6, 28 /* 00E64 80A09D04 000FC080 */ sll $t8, $t7, 2 /* 00E68 80A09D08 0338C821 */ addu $t9, $t9, $t8 -/* 00E6C 80A09D0C 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 00E6C 80A09D0C 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 00E70 80A09D10 00816824 */ and $t5, $a0, $at /* 00E74 80A09D14 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00E78 80A09D18 01B94021 */ addu $t0, $t5, $t9 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Draw.s index 54e91529a3..31b897efa3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Draw.s @@ -52,7 +52,7 @@ glabel EnExRuppy_Draw /* 00E5C 80A0B26C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00E60 80A0B270 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00E64 80A0B274 3C0480A1 */ lui $a0, %hi(D_80A0B3B8) ## $a0 = 80A10000 -/* 00E68 80A0B278 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 00E68 80A0B278 3C198016 */ lui $t9, %hi(gSegments) /* 00E6C 80A0B27C 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 00E70 80A0B280 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 /* 00E74 80A0B284 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 @@ -71,7 +71,7 @@ glabel EnExRuppy_Draw /* 00EA8 80A0B2B8 000E7F02 */ srl $t7, $t6, 28 /* 00EAC 80A0B2BC 000FC080 */ sll $t8, $t7, 2 /* 00EB0 80A0B2C0 0338C821 */ addu $t9, $t9, $t8 -/* 00EB4 80A0B2C4 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 00EB4 80A0B2C4 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 00EB8 80A0B2C8 00816824 */ and $t5, $a0, $at /* 00EBC 80A0B2CC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00EC0 80A0B2D0 01B94021 */ addu $t0, $t5, $t9 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Init.s index c855728f49..0cf6d4c3d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Init.s @@ -53,8 +53,8 @@ glabel EnExRuppy_Init /* 00024 80A0A434 0C00084C */ jal osSyncPrintf /* 00028 80A0A438 86050152 */ lh $a1, 0x0152($s0) ## 00000152 -/* 0002C 80A0A43C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00030 80A0A440 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0002C 80A0A43C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00030 80A0A440 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00034 80A0A444 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00038 80A0A448 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0003C 80A0A44C 0C00AC78 */ jal ActorShape_Init @@ -80,9 +80,9 @@ glabel L80A0A478 /* 00080 80A0A490 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00084 80A0A494 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF /* 00088 80A0A498 A2180003 */ sb $t8, 0x0003($s0) ## 00000003 -/* 0008C 80A0A49C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 0008C 80A0A49C 3C198016 */ lui $t9, %hi(gSaveContext+0xeda) /* 00090 80A0A4A0 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 00094 80A0A4A4 9739F53A */ lhu $t9, -0x0AC6($t9) ## 8015F53A +/* 00094 80A0A4A4 9739F53A */ lhu $t9, %lo(gSaveContext+0xeda)($t9) /* 00098 80A0A4A8 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 /* 0009C 80A0A4AC 3C0180A1 */ lui $at, %hi(D_80A0B524) ## $at = 80A10000 /* 000A0 80A0A4B0 33280100 */ andi $t0, $t9, 0x0100 ## $t0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AB1C.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AB1C.s index 78d708766b..fbcb56dfb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AB1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AB1C.s @@ -40,14 +40,14 @@ glabel func_80A0AB1C /* 0079C 80A0ABAC 46083282 */ mul.s $f10, $f6, $f8 /* 007A0 80A0ABB0 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 007A4 80A0ABB4 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 -/* 007A8 80A0ABB8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 007A8 80A0ABB8 3C198016 */ lui $t9, %hi(gSaveContext+0xeda) /* 007AC 80A0ABBC 44814000 */ mtc1 $at, $f8 ## $f8 = -50.00 /* 007B0 80A0ABC0 3C01C396 */ lui $at, 0xC396 ## $at = C3960000 /* 007B4 80A0ABC4 468021A0 */ cvt.s.w $f6, $f4 /* 007B8 80A0ABC8 46105480 */ add.s $f18, $f10, $f16 /* 007BC 80A0ABCC 46083082 */ mul.s $f2, $f6, $f8 /* 007C0 80A0ABD0 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 007C4 80A0ABD4 9739F53A */ lhu $t9, -0x0AC6($t9) ## 8015F53A +/* 007C4 80A0ABD4 9739F53A */ lhu $t9, %lo(gSaveContext+0xeda)($t9) /* 007C8 80A0ABD8 33280100 */ andi $t0, $t9, 0x0100 ## $t0 = 00000000 /* 007CC 80A0ABDC 55000012 */ bnel $t0, $zero, .L80A0AC28 /* 007D0 80A0ABE0 44815000 */ mtc1 $at, $f10 ## $f10 = -300.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s index 6b61f051a8..0c468b2dd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s @@ -236,8 +236,8 @@ glabel EnFd_Draw /* 01CA4 80A0D364 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 01CA8 80A0D368 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01CAC 80A0D36C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01CB0 80A0D370 3C098011 */ lui $t1, 0x8011 ## $t1 = 80110000 -/* 01CB4 80A0D374 25296280 */ addiu $t1, $t1, 0x6280 ## $t1 = 80116280 +/* 01CB0 80A0D370 3C098011 */ lui $t1, %hi(D_80116280) +/* 01CB4 80A0D374 25296280 */ addiu $t1, %lo(D_80116280) /* 01CB8 80A0D378 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 01CBC 80A0D37C AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 /* 01CC0 80A0D380 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s index de23de7457..586f150359 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s @@ -16,8 +16,8 @@ glabel EnFd_Init /* 00B24 80A0C1E4 AFAE0010 */ sw $t6, 0x0010($sp) /* 00B28 80A0C1E8 0C0291BE */ jal SkelAnime_InitSV /* 00B2C 80A0C1EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00B30 80A0C1F0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00B34 80A0C1F4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00B30 80A0C1F0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00B34 80A0C1F4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00B38 80A0C1F8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00B3C 80A0C1FC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00B40 80A0C200 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s index 13d940ce79..5b8d71cc1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s @@ -228,7 +228,7 @@ glabel func_80A0D730 /* 02398 80A0DA58 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 0239C 80A0DA5C 3C0480A1 */ lui $a0, %hi(D_80A0E0F8) ## $a0 = 80A10000 /* 023A0 80A0DA60 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 023A4 80A0DA64 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 023A4 80A0DA64 3C198016 */ lui $t9, %hi(gSegments) /* 023A8 80A0DA68 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 023AC 80A0DA6C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 023B0 80A0DA70 46085402 */ mul.s $f16, $f10, $f8 @@ -244,7 +244,7 @@ glabel func_80A0D730 /* 023D8 80A0DA98 000E7F02 */ srl $t7, $t6, 28 /* 023DC 80A0DA9C 000FC080 */ sll $t8, $t7, 2 /* 023E0 80A0DAA0 0338C821 */ addu $t9, $t9, $t8 -/* 023E4 80A0DAA4 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 023E4 80A0DAA4 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 023E8 80A0DAA8 00816824 */ and $t5, $a0, $at /* 023EC 80A0DAAC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 023F0 80A0DAB0 01B94021 */ addu $t0, $t5, $t9 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Init.s index c7813b6823..e61bbbf79c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Init.s @@ -10,8 +10,8 @@ glabel EnFdFire_Init /* 00138 80A0E5E8 AFA50034 */ sw $a1, 0x0034($sp) /* 0013C 80A0E5EC 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 /* 00140 80A0E5F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00144 80A0E5F4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00148 80A0E5F8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00144 80A0E5F4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00148 80A0E5F8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0014C 80A0E5FC 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00150 80A0E600 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00154 80A0E604 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s index b02d61ea27..4076dbc2fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s @@ -112,11 +112,11 @@ glabel EnFhgFire_Draw /* 01FE8 80A11248 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 01FEC 80A1124C 00194880 */ sll $t1, $t9, 2 /* 01FF0 80A11250 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 -/* 01FF4 80A11254 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 01FF4 80A11254 3C0A8016 */ lui $t2, %hi(gSegments) /* 01FF8 80A11258 01495021 */ addu $t2, $t2, $t1 /* 01FFC 80A1125C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 02000 80A11260 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 02004 80A11264 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 02004 80A11264 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 02008 80A11268 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0200C 80A1126C 00815824 */ and $t3, $a0, $at /* 02010 80A11270 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FD8C.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FD8C.s index 01051b5261..226196152c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FD8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FD8C.s @@ -151,12 +151,12 @@ glabel func_80A0FD8C /* 00D34 80A0FF94 A20001FC */ sb $zero, 0x01FC($s0) ## 000001FC /* 00D38 80A0FF98 920B01FC */ lbu $t3, 0x01FC($s0) ## 000001FC .L80A0FF9C: -/* 00D3C 80A0FF9C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00D40 80A0FFA0 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 00D44 80A0FFA4 A02BFCF0 */ sb $t3, -0x0310($at) ## 8015FCF0 +/* 00D3C 80A0FF9C 3C018016 */ lui $at, %hi(D_8015FCF0) +/* 00D40 80A0FFA0 3C0C8016 */ lui $t4, %hi(D_8015FCF8) +/* 00D44 80A0FFA4 A02BFCF0 */ sb $t3, %lo(D_8015FCF0)($at) /* 00D48 80A0FFA8 8E0E0024 */ lw $t6, 0x0024($s0) ## 00000024 -/* 00D4C 80A0FFAC 258CFCF8 */ addiu $t4, $t4, 0xFCF8 ## $t4 = 8015FCF8 -/* 00D50 80A0FFB0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00D4C 80A0FFAC 258CFCF8 */ addiu $t4, %lo(D_8015FCF8) +/* 00D50 80A0FFB0 3C018016 */ lui $at, %hi(D_8015FD06) /* 00D54 80A0FFB4 AD8E0000 */ sw $t6, 0x0000($t4) ## 8015FCF8 /* 00D58 80A0FFB8 8E0D0028 */ lw $t5, 0x0028($s0) ## 00000028 /* 00D5C 80A0FFBC AD8D0004 */ sw $t5, 0x0004($t4) ## 8015FCFC @@ -170,11 +170,11 @@ glabel func_80A0FD8C /* 00D7C 80A0FFDC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 00D80 80A0FFE0 44189000 */ mfc1 $t8, $f18 /* 00D84 80A0FFE4 00000000 */ nop -/* 00D88 80A0FFE8 A438FD06 */ sh $t8, -0x02FA($at) ## 8015FD06 +/* 00D88 80A0FFE8 A438FD06 */ sh $t8, %lo(D_8015FD06)($at) /* 00D8C 80A0FFEC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00D90 80A0FFF0 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 00D94 80A0FFF4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00D98 80A0FFF8 E424FD08 */ swc1 $f4, -0x02F8($at) ## 8015FD08 -/* 00D9C 80A0FFFC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00D94 80A0FFF4 3C018016 */ lui $at, %hi(D_8015FD08) +/* 00D98 80A0FFF8 E424FD08 */ swc1 $f4, %lo(D_8015FD08)($at) +/* 00D9C 80A0FFFC 3C018016 */ lui $at, %hi(D_8015FD0C) /* 00DA0 80A10000 03E00008 */ jr $ra -/* 00DA4 80A10004 A420FD0C */ sh $zero, -0x02F4($at) ## 8015FD0C +/* 00DA4 80A10004 A420FD0C */ sh $zero, %lo(D_8015FD0C)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s index 59fe766655..f2ce32eb3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s @@ -324,14 +324,14 @@ glabel func_80A10220 /* 013B8 80A10618 54400019 */ bnel $v0, $zero, .L80A10680 /* 013BC 80A1061C 914801C9 */ lbu $t0, 0x01C9($t2) ## 000001C9 /* 013C0 80A10620 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 013C4 80A10624 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 013C8 80A10628 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 013C4 80A10624 3C078013 */ lui $a3, %hi(D_801333E0) +/* 013C8 80A10628 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 013CC 80A1062C 0018CAC0 */ sll $t9, $t8, 11 /* 013D0 80A10630 07210012 */ bgez $t9, .L80A1067C /* 013D4 80A10634 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 /* 013D8 80A10638 8FA500EC */ lw $a1, 0x00EC($sp) -/* 013DC 80A1063C 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 013E0 80A10640 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 +/* 013DC 80A1063C 3C098013 */ lui $t1, %hi(D_801333E8) +/* 013E0 80A10640 252933E8 */ addiu $t1, %lo(D_801333E8) /* 013E4 80A10644 A3AD00F3 */ sb $t5, 0x00F3($sp) /* 013E8 80A10648 AFA90014 */ sw $t1, 0x0014($sp) /* 013EC 80A1064C 2404180C */ addiu $a0, $zero, 0x180C ## $a0 = 0000180C @@ -444,11 +444,11 @@ glabel func_80A10220 /* 0156C 80A107CC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 01570 80A107D0 A60B0158 */ sh $t3, 0x0158($s0) ## 00000158 /* 01574 80A107D4 A60E0152 */ sh $t6, 0x0152($s0) ## 00000152 -/* 01578 80A107D8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0157C 80A107DC 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 01580 80A107E0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01578 80A107D8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0157C 80A107DC 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 01580 80A107E0 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01584 80A107E4 4600520D */ trunc.w.s $f8, $f10 -/* 01588 80A107E8 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 01588 80A107E8 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 0158C 80A107EC 2404182A */ addiu $a0, $zero, 0x182A ## $a0 = 0000182A /* 01590 80A107F0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 01594 80A107F4 440A4000 */ mfc1 $t2, $f8 @@ -622,9 +622,9 @@ glabel func_80A10220 /* 0180C 80A10A6C 00000000 */ nop /* 01810 80A10A70 44815000 */ mtc1 $at, $f10 ## $f10 = 45.00 /* 01814 80A10A74 46000005 */ abs.s $f0, $f0 -/* 01818 80A10A78 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 01818 80A10A78 3C078013 */ lui $a3, %hi(D_801333E0) /* 0181C 80A10A7C 460A003C */ c.lt.s $f0, $f10 -/* 01820 80A10A80 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01820 80A10A80 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01824 80A10A84 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 /* 01828 80A10A88 240438A8 */ addiu $a0, $zero, 0x38A8 ## $a0 = 000038A8 /* 0182C 80A10A8C 45000018 */ bc1f .L80A10AF0 @@ -632,21 +632,21 @@ glabel func_80A10220 /* 01834 80A10A94 A3AD00F3 */ sb $t5, 0x00F3($sp) /* 01838 80A10A98 8609015A */ lh $t1, 0x015A($s0) ## 0000015A /* 0183C 80A10A9C 8FA800E4 */ lw $t0, 0x00E4($sp) -/* 01840 80A10AA0 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 +/* 01840 80A10AA0 3C0C8013 */ lui $t4, %hi(D_801333E8) /* 01844 80A10AA4 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 /* 01848 80A10AA8 A10A01C7 */ sb $t2, 0x01C7($t0) ## 000001C7 /* 0184C 80A10AAC 8FA500E4 */ lw $a1, 0x00E4($sp) -/* 01850 80A10AB0 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 +/* 01850 80A10AB0 258C33E8 */ addiu $t4, %lo(D_801333E8) /* 01854 80A10AB4 AFAC0014 */ sw $t4, 0x0014($sp) /* 01858 80A10AB8 24A500E4 */ addiu $a1, $a1, 0x00E4 ## $a1 = 000000E4 /* 0185C 80A10ABC AFA50050 */ sw $a1, 0x0050($sp) /* 01860 80A10AC0 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 01864 80A10AC4 AFA70010 */ sw $a3, 0x0010($sp) -/* 01868 80A10AC8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0186C 80A10ACC 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 -/* 01870 80A10AD0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 01874 80A10AD4 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 +/* 01868 80A10AC8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0186C 80A10ACC 3C0B8013 */ lui $t3, %hi(D_801333E8) +/* 01870 80A10AD0 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 01874 80A10AD4 256B33E8 */ addiu $t3, %lo(D_801333E8) /* 01878 80A10AD8 8FA50050 */ lw $a1, 0x0050($sp) /* 0187C 80A10ADC AFAB0014 */ sw $t3, 0x0014($sp) /* 01880 80A10AE0 AFA70010 */ sw $a3, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Init.s index a1bd7ab187..6c205747d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Init.s @@ -47,11 +47,11 @@ glabel EnFireRock_Init /* 0000C 80A11C2C AFA5003C */ sw $a1, 0x003C($sp) /* 00010 80A11C30 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 /* 00014 80A11C34 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00018 80A11C38 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 00018 80A11C38 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 0001C 80A11C3C AFAF0030 */ sw $t7, 0x0030($sp) /* 00020 80A11C40 8498001C */ lh $t8, 0x001C($a0) ## 0000001C /* 00024 80A11C44 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00028 80A11C48 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00028 80A11C48 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0002C 80A11C4C A498018C */ sh $t8, 0x018C($a0) ## 0000018C /* 00030 80A11C50 8482018C */ lh $v0, 0x018C($a0) ## 0000018C /* 00034 80A11C54 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A125B8.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A125B8.s index 11696f8195..0c23d543b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A125B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A125B8.s @@ -72,8 +72,8 @@ glabel func_80A125B8 /* 00A7C 80A1269C A209018E */ sb $t1, 0x018E($s0) ## 0000018E /* 00A80 80A126A0 A200018E */ sb $zero, 0x018E($s0) ## 0000018E .L80A126A4: -/* 00A84 80A126A4 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 00A88 80A126A8 8D4AFA90 */ lw $t2, -0x0570($t2) ## 8015FA90 +/* 00A84 80A126A4 3C0A8016 */ lui $t2, %hi(gGameInfo) +/* 00A88 80A126A8 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) /* 00A8C 80A126AC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00A90 80A126B0 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF /* 00A94 80A126B4 854B12D4 */ lh $t3, 0x12D4($t2) ## 801612D4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Init.s index 4d448bf2ed..e334a5b58a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Init.s @@ -8,8 +8,8 @@ glabel EnFirefly_Init /* 0007C 80A130EC 0C01E037 */ jal Actor_ProcessInitChain /* 00080 80A130F0 24A54F8C */ addiu $a1, $a1, %lo(D_80A14F8C) ## $a1 = 80A14F8C -/* 00084 80A130F4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00088 80A130F8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00084 80A130F4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00088 80A130F8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0008C 80A130FC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00090 80A13100 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00094 80A13104 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s index c51f9130ca..7bb41998c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s @@ -60,14 +60,14 @@ glabel EnFish_Init /* 002A8 80A15528 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 002AC 80A1552C 460A0402 */ mul.s $f16, $f0, $f10 /* 002B0 80A15530 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 002B4 80A15534 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 002B4 80A15534 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 002B8 80A15538 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 002BC 80A1553C 4600848D */ trunc.w.s $f18, $f16 /* 002C0 80A15540 440D9000 */ mfc1 $t5, $f18 /* 002C4 80A15544 1440000B */ bne $v0, $zero, .L80A15574 /* 002C8 80A15548 A60D024E */ sh $t5, 0x024E($s0) ## 0000024E /* 002CC 80A1554C 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 002D0 80A15550 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 002D0 80A15550 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 002D4 80A15554 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 /* 002D8 80A15558 35CF0010 */ ori $t7, $t6, 0x0010 ## $t7 = 00000010 /* 002DC 80A1555C 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s index 46d7824b84..0034637f82 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s @@ -9,8 +9,8 @@ glabel EnFloormas_Init /* 0001C 80A1752C 0C01E037 */ jal Actor_ProcessInitChain /* 00020 80A17530 24A5A4C4 */ addiu $a1, $a1, %lo(D_80A1A4C4) ## $a1 = 80A1A4C4 -/* 00024 80A17534 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00028 80A17538 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00024 80A17534 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00028 80A17538 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0002C 80A1753C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00030 80A17540 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00034 80A17544 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17FA4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17FA4.s index 9ba3c835f4..b212ff4602 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17FA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17FA4.s @@ -33,8 +33,8 @@ glabel func_80A17FA4 /* 00AF8 80A18008 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 00AFC 80A1800C 0C285DD2 */ jal func_80A17748 /* 00B00 80A18010 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 00B04 80A18014 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 00B08 80A18018 8F39E664 */ lw $t9, -0x199C($t9) ## 8015E664 +/* 00B04 80A18014 3C198016 */ lui $t9, %hi(gSaveContext+4) +/* 00B08 80A18018 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) /* 00B0C 80A1801C 8FA80044 */ lw $t0, 0x0044($sp) /* 00B10 80A18020 5320001D */ beql $t9, $zero, .L80A18098 /* 00B14 80A18024 C6000094 */ lwc1 $f0, 0x0094($s0) ## 00000094 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A193C4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A193C4.s index 56445fd4a0..c91075f482 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A193C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A193C4.s @@ -44,8 +44,8 @@ glabel func_80A193C4 /* 01F40 80A19450 E4D00168 */ swc1 $f16, 0x0168($a2) ## 00000168 /* 01F44 80A19454 E4D20158 */ swc1 $f18, 0x0158($a2) ## 00000158 .L80A19458: -/* 01F48 80A19458 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 01F4C 80A1945C 8DEFE664 */ lw $t7, -0x199C($t7) ## 8015E664 +/* 01F48 80A19458 3C0F8016 */ lui $t7, %hi(gSaveContext+4) +/* 01F4C 80A1945C 8DEFE664 */ lw $t7, %lo(gSaveContext+4)($t7) /* 01F50 80A19460 3C014234 */ lui $at, 0x4234 ## $at = 42340000 /* 01F54 80A19464 44816000 */ mtc1 $at, $f12 ## $f12 = 45.00 /* 01F58 80A19468 51E0001D */ beql $t7, $zero, .L80A194E0 @@ -185,12 +185,12 @@ glabel func_80A193C4 /* 02138 80A19648 84CE0196 */ lh $t6, 0x0196($a2) ## 00000196 .L80A1964C: /* 0213C 80A1964C 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 02140 80A19650 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 02140 80A19650 3C188016 */ lui $t8, %hi(gSaveContext+4) /* 02144 80A19654 01C1001A */ div $zero, $t6, $at /* 02148 80A19658 00007810 */ mfhi $t7 /* 0214C 80A1965C 55E00019 */ bnel $t7, $zero, .L80A196C4 /* 02150 80A19660 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02154 80A19664 8F18E664 */ lw $t8, -0x199C($t8) ## 8015E664 +/* 02154 80A19664 8F18E664 */ lw $t8, %lo(gSaveContext+4)($t8) /* 02158 80A19668 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 0215C 80A1966C 24056805 */ addiu $a1, $zero, 0x6805 ## $a1 = 00006805 /* 02160 80A19670 13000007 */ beq $t8, $zero, .L80A19690 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s index bac4f46255..4f29dc6ddd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s @@ -100,8 +100,8 @@ glabel EnFr_Update /* 003FC 80A1AD9C 3C0D80A2 */ lui $t5, %hi(D_80A1D008) ## $t5 = 80A20000 /* 00400 80A1ADA0 016A5821 */ addu $t3, $t3, $t2 /* 00404 80A1ADA4 916BD018 */ lbu $t3, %lo(D_80A1D018)($t3) -/* 00408 80A1ADA8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0040C 80A1ADAC 95CEF54E */ lhu $t6, -0x0AB2($t6) ## 8015F54E +/* 00408 80A1ADA8 3C0E8016 */ lui $t6, %hi(gSaveContext+0xeee) +/* 0040C 80A1ADAC 95CEF54E */ lhu $t6, %lo(gSaveContext+0xeee)($t6) /* 00410 80A1ADB0 000B6040 */ sll $t4, $t3, 1 /* 00414 80A1ADB4 01AC6821 */ addu $t5, $t5, $t4 /* 00418 80A1ADB8 95ADD008 */ lhu $t5, %lo(D_80A1D008)($t5) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BDFC.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BDFC.s index c3476f6b1b..eab99815e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BDFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BDFC.s @@ -6,8 +6,8 @@ glabel func_80A1BDFC /* 0146C 80A1BE0C AFBF0014 */ sw $ra, 0x0014($sp) /* 01470 80A1BE10 15C1001D */ bne $t6, $at, .L80A1BE88 /* 01474 80A1BE14 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01478 80A1BE18 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0147C 80A1BE1C 9442F54E */ lhu $v0, -0x0AB2($v0) ## 8015F54E +/* 01478 80A1BE18 3C028016 */ lui $v0, %hi(gSaveContext+0xeee) +/* 0147C 80A1BE1C 9442F54E */ lhu $v0, %lo(gSaveContext+0xeee)($v0) /* 01480 80A1BE20 3C0D80A2 */ lui $t5, %hi(func_80A1BE98) ## $t5 = 80A20000 /* 01484 80A1BE24 25ADBE98 */ addiu $t5, $t5, %lo(func_80A1BE98) ## $t5 = 80A1BE98 /* 01488 80A1BE28 304F0002 */ andi $t7, $v0, 0x0002 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C05C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C05C.s index 47dd95f2ec..796cdd37ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C05C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C05C.s @@ -30,8 +30,8 @@ glabel func_80A1C05C /* 01728 80A1C0C8 8FBF0014 */ lw $ra, 0x0014($sp) .L80A1C0CC: /* 0172C 80A1C0CC 01284821 */ addu $t1, $t1, $t0 -/* 01730 80A1C0D0 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 01734 80A1C0D4 954AF54E */ lhu $t2, -0x0AB2($t2) ## 8015F54E +/* 01730 80A1C0D0 3C0A8016 */ lui $t2, %hi(gSaveContext+0xeee) +/* 01734 80A1C0D4 954AF54E */ lhu $t2, %lo(gSaveContext+0xeee)($t2) /* 01738 80A1C0D8 9529D008 */ lhu $t1, %lo(D_80A1D008)($t1) /* 0173C 80A1C0DC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 01740 80A1C0E0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C388.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C388.s index 74c9edbb3b..177ae9e4ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C388.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C388.s @@ -1,14 +1,14 @@ glabel func_80A1C388 -/* 019E8 80A1C388 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 019EC 80A1C38C 95CEF54E */ lhu $t6, -0x0AB2($t6) ## 8015F54E +/* 019E8 80A1C388 3C0E8016 */ lui $t6, %hi(gSaveContext+0xeee) +/* 019EC 80A1C38C 95CEF54E */ lhu $t6, %lo(gSaveContext+0xeee)($t6) /* 019F0 80A1C390 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 019F4 80A1C394 AFA40018 */ sw $a0, 0x0018($sp) /* 019F8 80A1C398 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 /* 019FC 80A1C39C 308400FF */ andi $a0, $a0, 0x00FF ## $a0 = 00000000 /* 01A00 80A1C3A0 15E00006 */ bne $t7, $zero, .L80A1C3BC /* 01A04 80A1C3A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01A08 80A1C3A8 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 01A0C 80A1C3AC 8F181854 */ lw $t8, 0x1854($t8) ## 80131854 +/* 01A08 80A1C3A8 3C188013 */ lui $t8, %hi(D_80131854) +/* 01A0C 80A1C3AC 8F181854 */ lw $t8, %lo(D_80131854)($t8) /* 01A10 80A1C3B0 0098C821 */ addu $t9, $a0, $t8 /* 01A14 80A1C3B4 1000000E */ beq $zero, $zero, .L80A1C3F0 /* 01A18 80A1C3B8 93220000 */ lbu $v0, 0x0000($t9) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C830.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C830.s index 37beb6a1a5..12f6f44af8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C830.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C830.s @@ -12,10 +12,10 @@ glabel func_80A1C830 /* 01EB8 80A1C858 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 /* 01EBC 80A1C85C 28610005 */ slti $at, $v1, 0x0005 /* 01EC0 80A1C860 10200011 */ beq $at, $zero, .L80A1C8A8 -/* 01EC4 80A1C864 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 01EC4 80A1C864 3C068016 */ lui $a2, %hi(gSaveContext) /* 01EC8 80A1C868 0002C040 */ sll $t8, $v0, 1 /* 01ECC 80A1C86C 3C0380A2 */ lui $v1, %hi(D_80A1D008) ## $v1 = 80A20000 -/* 01ED0 80A1C870 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 +/* 01ED0 80A1C870 24C6E660 */ addiu $a2, %lo(gSaveContext) /* 01ED4 80A1C874 00781821 */ addu $v1, $v1, $t8 /* 01ED8 80A1C878 9463D008 */ lhu $v1, %lo(D_80A1D008)($v1) /* 01EDC 80A1C87C 94C50EEE */ lhu $a1, 0x0EEE($a2) ## 8015F54E @@ -33,10 +33,10 @@ glabel func_80A1C830 .L80A1C8A8: /* 01F08 80A1C8A8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 01F0C 80A1C8AC 14610011 */ bne $v1, $at, .L80A1C8F4 -/* 01F10 80A1C8B0 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 01F10 80A1C8B0 3C068016 */ lui $a2, %hi(gSaveContext) /* 01F14 80A1C8B4 00025840 */ sll $t3, $v0, 1 /* 01F18 80A1C8B8 3C0380A2 */ lui $v1, %hi(D_80A1D008) ## $v1 = 80A20000 -/* 01F1C 80A1C8BC 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 +/* 01F1C 80A1C8BC 24C6E660 */ addiu $a2, %lo(gSaveContext) /* 01F20 80A1C8C0 006B1821 */ addu $v1, $v1, $t3 /* 01F24 80A1C8C4 9463D008 */ lhu $v1, %lo(D_80A1D008)($v1) /* 01F28 80A1C8C8 94C50EEE */ lhu $a1, 0x0EEE($a2) ## 8015F54E @@ -54,10 +54,10 @@ glabel func_80A1C830 .L80A1C8F4: /* 01F54 80A1C8F4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 01F58 80A1C8F8 14610010 */ bne $v1, $at, .L80A1C93C -/* 01F5C 80A1C8FC 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 01F5C 80A1C8FC 3C068016 */ lui $a2, %hi(gSaveContext) /* 01F60 80A1C900 0002C040 */ sll $t8, $v0, 1 /* 01F64 80A1C904 3C0380A2 */ lui $v1, %hi(D_80A1D008) ## $v1 = 80A20000 -/* 01F68 80A1C908 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 +/* 01F68 80A1C908 24C6E660 */ addiu $a2, %lo(gSaveContext) /* 01F6C 80A1C90C 00781821 */ addu $v1, $v1, $t8 /* 01F70 80A1C910 9463D008 */ lhu $v1, %lo(D_80A1D008)($v1) /* 01F74 80A1C914 94C50EEE */ lhu $a1, 0x0EEE($a2) ## 8015F54E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB58.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB58.s index a5e4745168..20c4f0d35f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB58.s @@ -1,6 +1,6 @@ glabel func_80A1CB58 -/* 021B8 80A1CB58 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 021BC 80A1CB5C 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 021B8 80A1CB58 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 021BC 80A1CB5C 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 021C0 80A1CB60 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 021C4 80A1CB64 AFBF0044 */ sw $ra, 0x0044($sp) /* 021C8 80A1CB68 AFA5004C */ sw $a1, 0x004C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s index efb030ef8d..6be928d390 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s @@ -89,7 +89,7 @@ glabel func_80A1CD24 /* 0249C 80A1CE3C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 024A0 80A1CE40 87B8005E */ lh $t8, 0x005E($sp) /* 024A4 80A1CE44 24A5D0FC */ addiu $a1, $a1, %lo(D_80A1D0FC) ## $a1 = 80A1D0FC -/* 024A8 80A1CE48 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 +/* 024A8 80A1CE48 3C078016 */ lui $a3, %hi(gSegments) /* 024AC 80A1CE4C 0018C880 */ sll $t9, $t8, 2 /* 024B0 80A1CE50 032A1821 */ addu $v1, $t9, $t2 /* 024B4 80A1CE54 906C0002 */ lbu $t4, 0x0002($v1) ## 00000002 @@ -109,7 +109,7 @@ glabel func_80A1CD24 /* 024EC 80A1CE8C AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 /* 024F0 80A1CE90 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 024F4 80A1CE94 920A0378 */ lbu $t2, 0x0378($s0) ## 00000378 -/* 024F8 80A1CE98 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 +/* 024F8 80A1CE98 24E76FA8 */ addiu $a3, %lo(gSegments) /* 024FC 80A1CE9C 3C0600FF */ lui $a2, 0x00FF ## $a2 = 00FF0000 /* 02500 80A1CEA0 000A5880 */ sll $t3, $t2, 2 /* 02504 80A1CEA4 00ABC821 */ addu $t9, $a1, $t3 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s index 99a3856b69..db5315b7c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s @@ -29,12 +29,12 @@ glabel EnFu_Draw /* 00AE0 80A1E2F0 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00AE4 80A1E2F4 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 00AE8 80A1E2F8 3C0480A2 */ lui $a0, %hi(D_80A1E458) ## $a0 = 80A20000 -/* 00AEC 80A1E2FC 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 00AEC 80A1E2FC 3C068016 */ lui $a2, %hi(gSegments) /* 00AF0 80A1E300 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 /* 00AF4 80A1E304 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 /* 00AF8 80A1E308 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 /* 00AFC 80A1E30C 960902AA */ lhu $t1, 0x02AA($s0) ## 000002AA -/* 00B00 80A1E310 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 00B00 80A1E310 24C66FA8 */ addiu $a2, %lo(gSegments) /* 00B04 80A1E314 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 /* 00B08 80A1E318 00095080 */ sll $t2, $t1, 2 /* 00B0C 80A1E31C 008A2021 */ addu $a0, $a0, $t2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s index 6c4995c21d..cf8762277e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s @@ -4,8 +4,8 @@ glabel EnFu_Init /* 00008 80A1D818 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0000C 80A1D81C AFBF002C */ sw $ra, 0x002C($sp) /* 00010 80A1D820 AFA50044 */ sw $a1, 0x0044($sp) -/* 00014 80A1D824 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00018 80A1D828 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00014 80A1D824 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00018 80A1D828 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0001C 80A1D82C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00020 80A1D830 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00024 80A1D834 0C00AC78 */ jal ActorShape_Init @@ -48,8 +48,8 @@ glabel EnFu_Init /* 000AC 80A1D8BC 0C00B58B */ jal Actor_SetScale /* 000B0 80A1D8C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000B4 80A1D8C4 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 000B8 80A1D8C8 8D08E664 */ lw $t0, -0x199C($t0) ## 8015E664 +/* 000B4 80A1D8C4 3C088016 */ lui $t0, %hi(gSaveContext+4) +/* 000B8 80A1D8C8 8D08E664 */ lw $t0, %lo(gSaveContext+4)($t0) /* 000BC 80A1D8CC 3C0A80A2 */ lui $t2, %hi(func_80A1DE24) ## $t2 = 80A20000 /* 000C0 80A1D8D0 254ADE24 */ addiu $t2, $t2, %lo(func_80A1DE24) ## $t2 = 80A1DE24 /* 000C4 80A1D8D4 11000006 */ beq $t0, $zero, .L80A1D8F0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA9C.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA9C.s index 0fb327659e..8efbf19160 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA9C.s @@ -8,8 +8,8 @@ glabel func_80A1DA9C /* 002A4 80A1DAB4 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B /* 002A8 80A1DAB8 14400009 */ bne $v0, $zero, .L80A1DAE0 /* 002AC 80A1DABC 3046FFFF */ andi $a2, $v0, 0xFFFF ## $a2 = 00000000 -/* 002B0 80A1DAC0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 002B4 80A1DAC4 95CEF540 */ lhu $t6, -0x0AC0($t6) ## 8015F540 +/* 002B0 80A1DAC0 3C0E8016 */ lui $t6, %hi(gSaveContext+0xee0) +/* 002B4 80A1DAC4 95CEF540 */ lhu $t6, %lo(gSaveContext+0xee0)($t6) /* 002B8 80A1DAC8 24065032 */ addiu $a2, $zero, 0x5032 ## $a2 = 00005032 /* 002BC 80A1DACC 31CF0080 */ andi $t7, $t6, 0x0080 ## $t7 = 00000000 /* 002C0 80A1DAD0 11E00003 */ beq $t7, $zero, .L80A1DAE0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DB60.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DB60.s index cb697eba37..4c9826664f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DB60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DB60.s @@ -1,7 +1,7 @@ glabel func_80A1DB60 /* 00350 80A1DB60 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00354 80A1DB64 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00358 80A1DB68 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00354 80A1DB64 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00358 80A1DB68 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0035C 80A1DB6C 15C0000A */ bne $t6, $zero, .L80A1DB98 /* 00360 80A1DB70 3C0F80A2 */ lui $t7, %hi(func_80A1DE24) ## $t7 = 80A20000 /* 00364 80A1DB74 25EFDE24 */ addiu $t7, $t7, %lo(func_80A1DE24) ## $t7 = 80A1DE24 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DBD4.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DBD4.s index 2ce5796147..8a88d477a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DBD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DBD4.s @@ -42,28 +42,28 @@ glabel func_80A1DBD4 /* 00460 80A1DC70 01215024 */ and $t2, $t1, $at /* 00464 80A1DC74 2508DB60 */ addiu $t0, $t0, %lo(func_80A1DB60) ## $t0 = 80A1DB60 /* 00468 80A1DC78 000C6880 */ sll $t5, $t4, 2 -/* 0046C 80A1DC7C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0046C 80A1DC7C 3C0E8016 */ lui $t6, %hi(gSegments) /* 00470 80A1DC80 01CD7021 */ addu $t6, $t6, $t5 /* 00474 80A1DC84 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00478 80A1DC88 ACC802AC */ sw $t0, 0x02AC($a2) ## 000002AC /* 0047C 80A1DC8C ACCA0004 */ sw $t2, 0x0004($a2) ## 00000004 -/* 00480 80A1DC90 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 00480 80A1DC90 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 00484 80A1DC94 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00488 80A1DC98 00417824 */ and $t7, $v0, $at /* 0048C 80A1DC9C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00490 80A1DCA0 01CFC021 */ addu $t8, $t6, $t7 /* 00494 80A1DCA4 0301C821 */ addu $t9, $t8, $at -/* 00498 80A1DCA8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00498 80A1DCA8 3C018016 */ lui $at, %hi(gSaveContext+0x1414) /* 0049C 80A1DCAC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 004A0 80A1DCB0 AC991D68 */ sw $t9, 0x1D68($a0) ## 00001D68 -/* 004A4 80A1DCB4 A028FA74 */ sb $t0, -0x058C($at) ## 8015FA74 +/* 004A4 80A1DCB4 A028FA74 */ sb $t0, %lo(gSaveContext+0x1414)($at) /* 004A8 80A1DCB8 0C021344 */ jal Item_Give /* 004AC 80A1DCBC 24050065 */ addiu $a1, $zero, 0x0065 ## $a1 = 00000065 /* 004B0 80A1DCC0 8FA7001C */ lw $a3, 0x001C($sp) /* 004B4 80A1DCC4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 004B8 80A1DCC8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 004B8 80A1DCC8 3C028016 */ lui $v0, %hi(gSaveContext) /* 004BC 80A1DCCC 00270821 */ addu $at, $at, $a3 -/* 004C0 80A1DCD0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 004C0 80A1DCD0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 004C4 80A1DCD4 A42004C6 */ sh $zero, 0x04C6($at) ## 000104C6 /* 004C8 80A1DCD8 94490EE0 */ lhu $t1, 0x0EE0($v0) ## 8015F540 /* 004CC 80A1DCDC 352A0020 */ ori $t2, $t1, 0x0020 ## $t2 = 00000020 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DE24.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DE24.s index 2cb533d2e6..204e861ee1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DE24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DE24.s @@ -3,10 +3,10 @@ glabel func_80A1DE24 /* 00618 80A1DE28 AFBF001C */ sw $ra, 0x001C($sp) /* 0061C 80A1DE2C AFB10018 */ sw $s1, 0x0018($sp) /* 00620 80A1DE30 AFB00014 */ sw $s0, 0x0014($sp) -/* 00624 80A1DE34 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 00624 80A1DE34 3C198016 */ lui $t9, %hi(gSaveContext+0xede) /* 00628 80A1DE38 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 /* 0062C 80A1DE3C 848E008A */ lh $t6, 0x008A($a0) ## 0000008A -/* 00630 80A1DE40 9739F53E */ lhu $t9, -0x0AC2($t9) ## 8015F53E +/* 00630 80A1DE40 9739F53E */ lhu $t9, %lo(gSaveContext+0xede)($t9) /* 00634 80A1DE44 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 /* 00638 80A1DE48 3C0180A2 */ lui $at, %hi(D_80A1E590) ## $at = 80A20000 /* 0063C 80A1DE4C 01CFC023 */ subu $t8, $t6, $t7 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s index 8696dbddd5..183e0cafc4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s @@ -22,8 +22,8 @@ glabel EnFw_Init /* 005F0 80A1EB90 8FA40034 */ lw $a0, 0x0034($sp) /* 005F4 80A1EB94 0C00D3B0 */ jal func_80034EC0 /* 005F8 80A1EB98 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 005FC 80A1EB9C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00600 80A1EBA0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 005FC 80A1EB9C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00600 80A1EBA0 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00604 80A1EBA4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00608 80A1EBA8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0060C 80A1EBAC 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s index df0d57f954..6bd2c4373e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s @@ -168,7 +168,7 @@ glabel func_80A1F814 /* 014BC 80A1FA5C AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 014C0 80A1FA60 3C0480A2 */ lui $a0, %hi(D_80A1FC18) ## $a0 = 80A20000 /* 014C4 80A1FA64 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 014C8 80A1FA68 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 014C8 80A1FA68 3C0A8016 */ lui $t2, %hi(gSegments) /* 014CC 80A1FA6C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 014D0 80A1FA70 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 014D4 80A1FA74 46128182 */ mul.s $f6, $f16, $f18 @@ -184,7 +184,7 @@ glabel func_80A1F814 /* 014FC 80A1FA9C 00194702 */ srl $t0, $t9, 28 /* 01500 80A1FAA0 00084880 */ sll $t1, $t0, 2 /* 01504 80A1FAA4 01495021 */ addu $t2, $t2, $t1 -/* 01508 80A1FAA8 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 01508 80A1FAA8 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 0150C 80A1FAAC 0081C024 */ and $t8, $a0, $at /* 01510 80A1FAB0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01514 80A1FAB4 030A5821 */ addu $t3, $t8, $t2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s index e7801b85e6..567d91f42a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s @@ -57,10 +57,10 @@ glabel func_80A218A8 /* 01B88 80A21948 0002C900 */ sll $t9, $v0, 4 /* 01B8C 80A2194C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01B90 80A21950 00194F02 */ srl $t1, $t9, 28 -/* 01B94 80A21954 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 01B94 80A21954 3C0B8016 */ lui $t3, %hi(gSegments) /* 01B98 80A21958 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 06003160 /* 01B9C 80A2195C AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 01BA0 80A21960 256B6FA8 */ addiu $t3, $t3, 0x6FA8 ## $t3 = 80166FA8 +/* 01BA0 80A21960 256B6FA8 */ addiu $t3, %lo(gSegments) /* 01BA4 80A21964 00095080 */ sll $t2, $t1, 2 /* 01BA8 80A21968 3C0DE700 */ lui $t5, 0xE700 ## $t5 = E7000000 /* 01BAC 80A2196C 014BB021 */ addu $s6, $t2, $t3 @@ -75,10 +75,10 @@ glabel func_80A218A8 /* 01BD0 80A21990 00027100 */ sll $t6, $v0, 4 /* 01BD4 80A21994 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01BD8 80A21998 000E7F02 */ srl $t7, $t6, 28 -/* 01BDC 80A2199C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 01BDC 80A2199C 3C198016 */ lui $t9, %hi(gSegments) /* 01BE0 80A219A0 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 060030A8 /* 01BE4 80A219A4 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 01BE8 80A219A8 27396FA8 */ addiu $t9, $t9, 0x6FA8 ## $t9 = 80166FA8 +/* 01BE8 80A219A8 27396FA8 */ addiu $t9, %lo(gSegments) /* 01BEC 80A219AC 000FC080 */ sll $t8, $t7, 2 /* 01BF0 80A219B0 03192021 */ addu $a0, $t8, $t9 /* 01BF4 80A219B4 AC5E0000 */ sw $s8, 0x0000($v0) ## 060030A0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Update.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Update.s index e5fc064d42..2e0a2375e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Update.s @@ -79,8 +79,8 @@ glabel EnGSwitch_Update ## CollisionCheck_setAC /* 01084 80A22F44 00812821 */ addu $a1, $a0, $at .L80A22F48: -/* 01088 80A22F48 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 0108C 80A22F4C 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 01088 80A22F48 3C198016 */ lui $t9, %hi(gGameInfo) +/* 0108C 80A22F4C 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 01090 80A22F50 872E12D4 */ lh $t6, 0x12D4($t9) ## 801612D4 /* 01094 80A22F54 51C0001D */ beql $t6, $zero, .L80A22FCC /* 01098 80A22F58 8FBF004C */ lw $ra, 0x004C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A223F8.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A223F8.s index 81f5ab6a7b..94957e8d2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A223F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A223F8.s @@ -24,8 +24,8 @@ glabel func_80A223F8 /* 0058C 80A2244C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00590 80A22450 3C0B80A2 */ lui $t3, %hi(func_80A22FDC) ## $t3 = 80A20000 /* 00594 80A22454 01014821 */ addu $t1, $t0, $at -/* 00598 80A22458 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 0059C 80A2245C AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 +/* 00598 80A22458 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 0059C 80A2245C AC296FC0 */ sw $t1, %lo(gSegments+0x18)($at) /* 005A0 80A22460 80CA0178 */ lb $t2, 0x0178($a2) ## 00000178 /* 005A4 80A22464 3C0C80A2 */ lui $t4, %hi(func_80A22B1C) ## $t4 = 80A20000 /* 005A8 80A22468 256B2FDC */ addiu $t3, $t3, %lo(func_80A22FDC) ## $t3 = 80A22FDC diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A2248C.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A2248C.s index 7f78dd0e76..07c1bc70b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A2248C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A2248C.s @@ -32,10 +32,10 @@ glabel func_80A2248C /* 00608 80A224C8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 /* 0060C 80A224CC 860E016A */ lh $t6, 0x016A($s0) ## 0000016A /* 00610 80A224D0 3C0680A2 */ lui $a2, %hi(D_80A23754) ## $a2 = 80A20000 -/* 00614 80A224D4 3C048013 */ lui $a0, 0x8013 ## $a0 = 80130000 +/* 00614 80A224D4 3C048013 */ lui $a0, %hi(D_801333D4) /* 00618 80A224D8 00CE3021 */ addu $a2, $a2, $t6 /* 0061C 80A224DC 80C63754 */ lb $a2, %lo(D_80A23754)($a2) -/* 00620 80A224E0 248433D4 */ addiu $a0, $a0, 0x33D4 ## $a0 = 801333D4 +/* 00620 80A224E0 248433D4 */ addiu $a0, %lo(D_801333D4) /* 00624 80A224E4 0C03D2FD */ jal func_800F4BF4 /* 00628 80A224E8 240528E8 */ addiu $a1, $zero, 0x28E8 ## $a1 = 000028E8 /* 0062C 80A224EC 3C0F80A2 */ lui $t7, %hi(D_80A236E0) ## $t7 = 80A20000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22598.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22598.s index 6e9789ad86..f46c7462df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22598.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22598.s @@ -28,7 +28,7 @@ glabel func_80A22598 /* 00740 80A22600 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00744 80A22604 8D2B0024 */ lw $t3, 0x0024($t1) ## 00000024 /* 00748 80A22608 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 0074C 80A2260C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 0074C 80A2260C 3C0C8016 */ lui $t4, %hi(gSaveContext+4) /* 00750 80A22610 ACCB0024 */ sw $t3, 0x0024($a2) ## 00000024 /* 00754 80A22614 8D2A0028 */ lw $t2, 0x0028($t1) ## 00000028 /* 00758 80A22618 3C0E80A2 */ lui $t6, %hi(func_80A22680) ## $t6 = 80A20000 @@ -42,7 +42,7 @@ glabel func_80A22598 /* 00778 80A22638 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 0077C 80A2263C 25CE2680 */ addiu $t6, $t6, %lo(func_80A22680) ## $t6 = 80A22680 /* 00780 80A22640 E4D00028 */ swc1 $f16, 0x0028($a2) ## 00000028 -/* 00784 80A22644 8D8CE664 */ lw $t4, -0x199C($t4) ## 8015E664 +/* 00784 80A22644 8D8CE664 */ lw $t4, %lo(gSaveContext+4)($t4) /* 00788 80A22648 55800007 */ bnel $t4, $zero, .L80A22668 /* 0078C 80A2264C E4C8006C */ swc1 $f8, 0x006C($a2) ## 0000006C /* 00790 80A22650 C4D20028 */ lwc1 $f18, 0x0028($a2) ## 00000028 diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22680.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22680.s index b9a96758af..95cc44ad95 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22680.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22680.s @@ -43,7 +43,7 @@ glabel func_80A22680 /* 00844 80A22704 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00848 80A22708 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 /* 0084C 80A2270C C4520028 */ lwc1 $f18, 0x0028($v0) ## 00000028 -/* 00850 80A22710 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 00850 80A22710 3C0A8016 */ lui $t2, %hi(gSaveContext+4) /* 00854 80A22714 468021A0 */ cvt.s.w $f6, $f4 /* 00858 80A22718 44812000 */ mtc1 $at, $f4 ## $f4 = 40.00 /* 0085C 80A2271C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -52,7 +52,7 @@ glabel func_80A22680 /* 00868 80A22728 460A0402 */ mul.s $f16, $f0, $f10 /* 0086C 80A2272C 46068200 */ add.s $f8, $f16, $f6 /* 00870 80A22730 E4C80028 */ swc1 $f8, 0x0028($a2) ## 00000028 -/* 00874 80A22734 8D4AE664 */ lw $t2, -0x199C($t2) ## 8015E664 +/* 00874 80A22734 8D4AE664 */ lw $t2, %lo(gSaveContext+4)($t2) /* 00878 80A22738 55400007 */ bnel $t2, $zero, .L80A22758 /* 0087C 80A2273C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00880 80A22740 C4CA0028 */ lwc1 $f10, 0x0028($a2) ## 00000028 diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22764.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22764.s index ae45fa65e0..43000b40c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22764.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22764.s @@ -223,11 +223,11 @@ glabel func_80A22764 .L80A22A5C: /* 00B9C 80A22A5C 9203018D */ lbu $v1, 0x018D($s0) ## 0000018D .L80A22A60: -/* 00BA0 80A22A60 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 00BA0 80A22A60 3C0B8016 */ lui $t3, %hi(gGameInfo) /* 00BA4 80A22A64 30690002 */ andi $t1, $v1, 0x0002 ## $t1 = 00000000 /* 00BA8 80A22A68 55200006 */ bnel $t1, $zero, .L80A22A84 /* 00BAC 80A22A6C 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 -/* 00BB0 80A22A70 8D6BFA90 */ lw $t3, -0x0570($t3) ## 8015FA90 +/* 00BB0 80A22A70 8D6BFA90 */ lw $t3, %lo(gGameInfo)($t3) /* 00BB4 80A22A74 856C12E4 */ lh $t4, 0x12E4($t3) ## 801612E4 /* 00BB8 80A22A78 51800024 */ beql $t4, $zero, .L80A22B0C /* 00BBC 80A22A7C 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A230A8.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A230A8.s index 4823bb6721..2c7722eb84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A230A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A230A8.s @@ -52,7 +52,7 @@ glabel func_80A230A8 /* 01278 80A23138 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0127C 80A2313C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 01280 80A23140 3C0480A2 */ lui $a0, %hi(D_80A2375C) ## $a0 = 80A20000 -/* 01284 80A23144 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 01284 80A23144 3C198016 */ lui $t9, %hi(gSegments) /* 01288 80A23148 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 0128C 80A2314C AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 /* 01290 80A23150 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 @@ -71,7 +71,7 @@ glabel func_80A230A8 /* 012C4 80A23184 000E7F02 */ srl $t7, $t6, 28 /* 012C8 80A23188 000FC080 */ sll $t8, $t7, 2 /* 012CC 80A2318C 0338C821 */ addu $t9, $t9, $t8 -/* 012D0 80A23190 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 012D0 80A23190 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 012D4 80A23194 00816824 */ and $t5, $a0, $at /* 012D8 80A23198 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 012DC 80A2319C 01B94021 */ addu $t0, $t5, $t9 diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A234D4.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A234D4.s index 2b6cee1e72..1a49023f4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A234D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A234D4.s @@ -98,7 +98,7 @@ glabel func_80A234D4 /* 01748 80A23608 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 0174C 80A2360C 86090010 */ lh $t1, 0x0010($s0) ## 000001D8 /* 01750 80A23610 3C0480A2 */ lui $a0, %hi(D_80A2375C) ## $a0 = 80A20000 -/* 01754 80A23614 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 01754 80A23614 3C0F8016 */ lui $t7, %hi(gSegments) /* 01758 80A23618 00095080 */ sll $t2, $t1, 2 /* 0175C 80A2361C 008A2021 */ addu $a0, $a0, $t2 /* 01760 80A23620 8C84375C */ lw $a0, %lo(D_80A2375C)($a0) @@ -108,7 +108,7 @@ glabel func_80A234D4 /* 01770 80A23630 000C6F02 */ srl $t5, $t4, 28 /* 01774 80A23634 000D7080 */ sll $t6, $t5, 2 /* 01778 80A23638 01EE7821 */ addu $t7, $t7, $t6 -/* 0177C 80A2363C 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 0177C 80A2363C 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 01780 80A23640 00815824 */ and $t3, $a0, $at /* 01784 80A23644 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01788 80A23648 016FC021 */ addu $t8, $t3, $t7 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A245A4.s b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A245A4.s index 7df3e57194..66cfe9666e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A245A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A245A4.s @@ -21,10 +21,10 @@ glabel func_80A245A4 /* 00890 80A245F0 0003C100 */ sll $t8, $v1, 4 /* 00894 80A245F4 0018CF02 */ srl $t9, $t8, 28 /* 00898 80A245F8 00194080 */ sll $t0, $t9, 2 -/* 0089C 80A245FC 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 0089C 80A245FC 3C098016 */ lui $t1, %hi(gSegments) /* 008A0 80A24600 01284821 */ addu $t1, $t1, $t0 /* 008A4 80A24604 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 008A8 80A24608 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 +/* 008A8 80A24608 8D296FA8 */ lw $t1, %lo(gSegments)($t1) /* 008AC 80A2460C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 008B0 80A24610 00615024 */ and $t2, $v1, $at /* 008B4 80A24614 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -38,10 +38,10 @@ glabel func_80A245A4 /* 008D0 80A24630 00025900 */ sll $t3, $v0, 4 /* 008D4 80A24634 000B6702 */ srl $t4, $t3, 28 /* 008D8 80A24638 000C6880 */ sll $t5, $t4, 2 -/* 008DC 80A2463C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 008DC 80A2463C 3C0E8016 */ lui $t6, %hi(gSegments) /* 008E0 80A24640 01CD7021 */ addu $t6, $t6, $t5 /* 008E4 80A24644 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 008E8 80A24648 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 008E8 80A24648 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 008EC 80A2464C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 008F0 80A24650 00417824 */ and $t7, $v0, $at /* 008F4 80A24654 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s index 29601d06c3..5d7770f332 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s @@ -111,8 +111,8 @@ glabel EnGb_Init /* 001C4 80A2F344 02002025 */ or $a0, $s0, $zero ## $a0 = 00000370 /* 001C8 80A2F348 4480C000 */ mtc1 $zero, $f24 ## $f24 = 0.00 -/* 001CC 80A2F34C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 001D0 80A2F350 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 001CC 80A2F34C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 001D0 80A2F350 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 001D4 80A2F354 4405C000 */ mfc1 $a1, $f24 /* 001D8 80A2F358 264400B4 */ addiu $a0, $s2, 0x00B4 ## $a0 = 000000B4 /* 001DC 80A2F35C 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F180.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F180.s index b61fc95c2f..f384ea6961 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F180.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F180.s @@ -1,6 +1,6 @@ glabel func_80A2F180 -/* 00000 80A2F180 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00004 80A2F184 95CEF56E */ lhu $t6, -0x0A92($t6) ## 8015F56E +/* 00000 80A2F180 3C0E8016 */ lui $t6, %hi(gSaveContext+0xf0e) +/* 00004 80A2F184 95CEF56E */ lhu $t6, %lo(gSaveContext+0xf0e)($t6) /* 00008 80A2F188 241870F5 */ addiu $t8, $zero, 0x70F5 ## $t8 = 000070F5 /* 0000C 80A2F18C 241970F4 */ addiu $t9, $zero, 0x70F4 ## $t9 = 000070F4 /* 00010 80A2F190 31CF0040 */ andi $t7, $t6, 0x0040 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F94C.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F94C.s index 9ca36dda0d..e46bad11a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F94C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F94C.s @@ -11,8 +11,8 @@ glabel func_80A2F94C /* 007F0 80A2F970 0C041AF2 */ jal func_80106BC8 /* 007F4 80A2F974 8FA4001C */ lw $a0, 0x001C($sp) /* 007F8 80A2F978 1040000D */ beq $v0, $zero, .L80A2F9B0 -/* 007FC 80A2F97C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00800 80A2F980 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 007FC 80A2F97C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00800 80A2F980 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00804 80A2F984 94620F0E */ lhu $v0, 0x0F0E($v1) ## 8015F56E /* 00808 80A2F988 304E0040 */ andi $t6, $v0, 0x0040 ## $t6 = 00000000 /* 0080C 80A2F98C 15C00002 */ bne $t6, $zero, .L80A2F998 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F9C0.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F9C0.s index d0e655884f..3867eeb846 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F9C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F9C0.s @@ -11,8 +11,8 @@ glabel func_80A2F9C0 /* 00864 80A2F9E4 0C041AF2 */ jal func_80106BC8 /* 00868 80A2F9E8 8FA4001C */ lw $a0, 0x001C($sp) /* 0086C 80A2F9EC 10400014 */ beq $v0, $zero, .L80A2FA40 -/* 00870 80A2F9F0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00874 80A2F9F4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00870 80A2F9F0 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00874 80A2F9F4 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00878 80A2F9F8 94620F0E */ lhu $v0, 0x0F0E($v1) ## 8015F56E /* 0087C 80A2F9FC 304E0040 */ andi $t6, $v0, 0x0040 ## $t6 = 00000000 /* 00880 80A2FA00 15C00002 */ bne $t6, $zero, .L80A2FA0C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FA50.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FA50.s index a5cf73345c..3be53dc20b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FA50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FA50.s @@ -13,8 +13,8 @@ glabel func_80A2FA50 /* 008FC 80A2FA7C 0C041AF2 */ jal func_80106BC8 /* 00900 80A2FA80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00904 80A2FA84 10400029 */ beq $v0, $zero, .L80A2FB2C -/* 00908 80A2FA88 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0090C 80A2FA8C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00908 80A2FA88 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0090C 80A2FA8C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00910 80A2FA90 94430F0E */ lhu $v1, 0x0F0E($v0) ## 8015F56E /* 00914 80A2FA94 306E0040 */ andi $t6, $v1, 0x0040 ## $t6 = 00000000 /* 00918 80A2FA98 15C00002 */ bne $t6, $zero, .L80A2FAA4 @@ -30,8 +30,8 @@ glabel func_80A2FA50 /* 0093C 80A2FABC 2407001E */ addiu $a3, $zero, 0x001E ## $a3 = 0000001E /* 00940 80A2FAC0 0C021CC3 */ jal Rupees_ChangeBy /* 00944 80A2FAC4 24040032 */ addiu $a0, $zero, 0x0032 ## $a0 = 00000032 -/* 00948 80A2FAC8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0094C 80A2FACC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00948 80A2FAC8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0094C 80A2FACC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00950 80A2FAD0 8C580EBC */ lw $t8, 0x0EBC($v0) ## 8015F51C /* 00954 80A2FAD4 240103E8 */ addiu $at, $zero, 0x03E8 ## $at = 000003E8 /* 00958 80A2FAD8 240A70F8 */ addiu $t2, $zero, 0x70F8 ## $t2 = 000070F8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s index a4c1fb797f..655fc83f80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s @@ -77,13 +77,13 @@ glabel func_80A30350 /* 012F8 80A30478 AE3902D0 */ sw $t9, 0x02D0($s1) ## 000002D0 /* 012FC 80A3047C AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 01300 80A30480 8E040008 */ lw $a0, 0x0008($s0) ## 00000008 -/* 01304 80A30484 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 01304 80A30484 3C0E8016 */ lui $t6, %hi(gSegments) /* 01308 80A30488 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0130C 80A3048C 00045900 */ sll $t3, $a0, 4 /* 01310 80A30490 000B6702 */ srl $t4, $t3, 28 /* 01314 80A30494 000C6880 */ sll $t5, $t4, 2 /* 01318 80A30498 01CD7021 */ addu $t6, $t6, $t5 -/* 0131C 80A3049C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 0131C 80A3049C 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 01320 80A304A0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 01324 80A304A4 00815024 */ and $t2, $a0, $at /* 01328 80A304A8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s index 226a33463d..87d51d0cfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s @@ -29,7 +29,7 @@ glabel EnGe1_Draw /* 01D1C 80A3268C 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 01D20 80A32690 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 01D24 80A32694 3C0480A3 */ lui $a0, %hi(D_80A327B4) ## $a0 = 80A30000 -/* 01D28 80A32698 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 01D28 80A32698 3C0E8016 */ lui $t6, %hi(gSegments) /* 01D2C 80A3269C 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 /* 01D30 80A326A0 ACB802C0 */ sw $t8, 0x02C0($a1) ## 000002C0 /* 01D34 80A326A4 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 @@ -45,7 +45,7 @@ glabel EnGe1_Draw /* 01D5C 80A326CC 000B6702 */ srl $t4, $t3, 28 /* 01D60 80A326D0 000C6880 */ sll $t5, $t4, 2 /* 01D64 80A326D4 01CD7021 */ addu $t6, $t6, $t5 -/* 01D68 80A326D8 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 01D68 80A326D8 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 01D6C 80A326DC 00815024 */ and $t2, $a0, $at /* 01D70 80A326E0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01D74 80A326E4 014E7821 */ addu $t7, $t2, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s index ff1ee22404..3d94f03cca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s @@ -14,8 +14,8 @@ glabel EnGe1_Init /* 00008 80A30978 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0000C 80A3097C AFBF002C */ sw $ra, 0x002C($sp) /* 00010 80A30980 AFA50044 */ sw $a1, 0x0044($sp) -/* 00014 80A30984 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00018 80A30988 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00014 80A30984 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00018 80A30988 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0001C 80A3098C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00020 80A30990 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00024 80A30994 0C00AC78 */ jal ActorShape_Init @@ -95,10 +95,10 @@ glabel EnGe1_Init /* 00134 80A30AA4 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 00138 80A30AA8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 0013C 80A30AAC 10410022 */ beq $v0, $at, .L80A30B38 -/* 00140 80A30AB0 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 00140 80A30AB0 3C0B8016 */ lui $t3, %hi(gSaveContext+4) /* 00144 80A30AB4 24010045 */ addiu $at, $zero, 0x0045 ## $at = 00000045 /* 00148 80A30AB8 1041002D */ beq $v0, $at, .L80A30B70 -/* 0014C 80A30ABC 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 +/* 0014C 80A30ABC 3C0D8012 */ lui $t5, %hi(gItemSlots+3) /* 00150 80A30AC0 24010046 */ addiu $at, $zero, 0x0046 ## $at = 00000046 /* 00154 80A30AC4 10410050 */ beq $v0, $at, .L80A30C08 /* 00158 80A30AC8 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 @@ -135,7 +135,7 @@ glabel EnGe1_Init /* 001C0 80A30B30 1000003F */ beq $zero, $zero, .L80A30C30 /* 001C4 80A30B34 AE0A02B4 */ sw $t2, 0x02B4($s0) ## 000002B4 .L80A30B38: -/* 001C8 80A30B38 8D6BE664 */ lw $t3, -0x199C($t3) ## FFFFE664 +/* 001C8 80A30B38 8D6BE664 */ lw $t3, %lo(gSaveContext+4)($t3) /* 001CC 80A30B3C 3C0C80A3 */ lui $t4, %hi(func_80A3118C) ## $t4 = 80A30000 /* 001D0 80A30B40 3C0480A3 */ lui $a0, %hi(D_80A327C0) ## $a0 = 80A30000 /* 001D4 80A30B44 15600007 */ bne $t3, $zero, .L80A30B64 @@ -153,9 +153,9 @@ glabel EnGe1_Init /* 001F8 80A30B68 10000031 */ beq $zero, $zero, .L80A30C30 /* 001FC 80A30B6C AE0C02B4 */ sw $t4, 0x02B4($s0) ## 000002B4 .L80A30B70: -/* 00200 80A30B70 91AD7467 */ lbu $t5, 0x7467($t5) ## 00007467 -/* 00204 80A30B74 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00208 80A30B78 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00200 80A30B70 91AD7467 */ lbu $t5, %lo(gItemSlots+3)($t5) +/* 00204 80A30B74 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00208 80A30B78 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0020C 80A30B7C 004D7021 */ addu $t6, $v0, $t5 /* 00210 80A30B80 91CF0074 */ lbu $t7, 0x0074($t6) ## 00000074 /* 00214 80A30B84 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF @@ -174,8 +174,8 @@ glabel EnGe1_Init /* 00240 80A30BB0 0C00084C */ jal osSyncPrintf /* 00244 80A30BB4 248427DC */ addiu $a0, $a0, %lo(D_80A327DC) ## $a0 = 000027DC -/* 00248 80A30BB8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 0024C 80A30BBC 9739FA5A */ lhu $t9, -0x05A6($t9) ## 8015FA5A +/* 00248 80A30BB8 3C198016 */ lui $t9, %hi(gSaveContext+0x13fa) +/* 0024C 80A30BBC 9739FA5A */ lhu $t9, %lo(gSaveContext+0x13fa)($t9) /* 00250 80A30BC0 3C0980A3 */ lui $t1, %hi(func_80A31E2C) ## $t1 = 80A30000 /* 00254 80A30BC4 25291E2C */ addiu $t1, $t1, %lo(func_80A31E2C) ## $t1 = 80A31E2C /* 00258 80A30BC8 33280100 */ andi $t0, $t9, 0x0100 ## $t0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30DCC.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30DCC.s index 1e3cbb49a6..1b6395566f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30DCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30DCC.s @@ -1,6 +1,6 @@ glabel func_80A30DCC -/* 0045C 80A30DCC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00460 80A30DD0 9442F546 */ lhu $v0, -0x0ABA($v0) ## 8015F546 +/* 0045C 80A30DCC 3C028016 */ lui $v0, %hi(gSaveContext+0xee6) +/* 00460 80A30DD0 9442F546 */ lhu $v0, %lo(gSaveContext+0xee6)($v0) /* 00464 80A30DD4 304E0001 */ andi $t6, $v0, 0x0001 ## $t6 = 00000000 /* 00468 80A30DD8 11C00007 */ beq $t6, $zero, .L80A30DF8 /* 0046C 80A30DDC 304F0002 */ andi $t7, $v0, 0x0002 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30E08.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30E08.s index 5b6b218d4f..80479b08d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30E08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30E08.s @@ -13,11 +13,11 @@ glabel func_80A30E08 /* 004C0 80A30E30 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 004C4 80A30E34 0C01B41D */ jal func_8006D074 /* 004C8 80A30E38 AFA5001C */ sw $a1, 0x001C($sp) -/* 004CC 80A30E3C 3C048012 */ lui $a0, 0x8012 ## $a0 = 80120000 -/* 004D0 80A30E40 24847464 */ addiu $a0, $a0, 0x7464 ## $a0 = 80127464 +/* 004CC 80A30E3C 3C048012 */ lui $a0, %hi(gItemSlots) +/* 004D0 80A30E40 24847464 */ addiu $a0, %lo(gItemSlots) /* 004D4 80A30E44 9099000A */ lbu $t9, 0x000A($a0) ## 8012746E -/* 004D8 80A30E48 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 004DC 80A30E4C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 004D8 80A30E48 3C028016 */ lui $v0, %hi(gSaveContext) +/* 004DC 80A30E4C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 004E0 80A30E50 00594021 */ addu $t0, $v0, $t9 /* 004E4 80A30E54 91090074 */ lbu $t1, 0x0074($t0) ## 00000074 /* 004E8 80A30E58 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A313E0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A313E0.s index 784f3ca166..de1396ad60 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A313E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A313E0.s @@ -23,7 +23,7 @@ glabel func_80A313E0 /* 00AC4 80A31434 00501021 */ addu $v0, $v0, $s0 /* 00AC8 80A31438 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD /* 00ACC 80A3143C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00AD0 80A31440 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 00AD0 80A31440 3C188016 */ lui $t8, %hi(gSaveContext+0x34) /* 00AD4 80A31444 10400005 */ beq $v0, $zero, .L80A3145C /* 00AD8 80A31448 00000000 */ nop /* 00ADC 80A3144C 10410017 */ beq $v0, $at, .L80A314AC @@ -31,7 +31,7 @@ glabel func_80A313E0 /* 00AE4 80A31454 1000001A */ beq $zero, $zero, .L80A314C0 /* 00AE8 80A31458 8FBF001C */ lw $ra, 0x001C($sp) .L80A3145C: -/* 00AEC 80A3145C 8718E694 */ lh $t8, -0x196C($t8) ## 8015E694 +/* 00AEC 80A3145C 8718E694 */ lh $t8, %lo(gSaveContext+0x34)($t8) /* 00AF0 80A31460 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00AF4 80A31464 2B01000A */ slti $at, $t8, 0x000A /* 00AF8 80A31468 10200007 */ beq $at, $zero, .L80A31488 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31514.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31514.s index 8aa4933d65..a57416a0af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31514.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31514.s @@ -1,8 +1,8 @@ glabel func_80A31514 -/* 00BA4 80A31514 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 00BA8 80A31518 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00BAC 80A3151C 8DEFE704 */ lw $t7, -0x18FC($t7) ## 8015E704 -/* 00BB0 80A31520 8DCE7178 */ lw $t6, 0x7178($t6) ## 80127178 +/* 00BA4 80A31514 3C0E8012 */ lui $t6, %hi(gBitFlags+0x58) +/* 00BA8 80A31518 3C0F8016 */ lui $t7, %hi(gSaveContext+0xa4) +/* 00BAC 80A3151C 8DEFE704 */ lw $t7, %lo(gSaveContext+0xa4)($t7) +/* 00BB0 80A31520 8DCE7178 */ lw $t6, %lo(gBitFlags+0x58)($t6) /* 00BB4 80A31524 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00BB8 80A31528 AFBF001C */ sw $ra, 0x001C($sp) /* 00BBC 80A3152C 01CFC024 */ and $t8, $t6, $t7 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3196C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3196C.s index 65929b3a0b..381eb60892 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3196C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3196C.s @@ -12,15 +12,15 @@ glabel func_80A3196C /* 01024 80A31994 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 /* 01028 80A31998 13000007 */ beq $t8, $zero, .L80A319B8 /* 0102C 80A3199C AC8E02B4 */ sw $t6, 0x02B4($a0) ## 000002B4 -/* 01030 80A319A0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 01034 80A319A4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 01030 80A319A0 3C038016 */ lui $v1, %hi(gSaveContext) +/* 01034 80A319A4 2463E660 */ addiu $v1, %lo(gSaveContext) /* 01038 80A319A8 94790EF0 */ lhu $t9, 0x0EF0($v1) ## 8015F550 /* 0103C 80A319AC 37288000 */ ori $t0, $t9, 0x8000 ## $t0 = 00008000 /* 01040 80A319B0 10000026 */ beq $zero, $zero, .L80A31A4C /* 01044 80A319B4 A4680EF0 */ sh $t0, 0x0EF0($v1) ## 8015F550 .L80A319B8: -/* 01048 80A319B8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0104C 80A319BC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 01048 80A319B8 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0104C 80A319BC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 01050 80A319C0 94690F2A */ lhu $t1, 0x0F2A($v1) ## 8015F58A /* 01054 80A319C4 352A0001 */ ori $t2, $t1, 0x0001 ## $t2 = 00000001 /* 01058 80A319C8 10000020 */ beq $zero, $zero, .L80A31A4C @@ -32,13 +32,13 @@ glabel func_80A3196C /* 0106C 80A319DC 316C0002 */ andi $t4, $t3, 0x0002 ## $t4 = 00000000 /* 01070 80A319E0 11800015 */ beq $t4, $zero, .L80A31A38 /* 01074 80A319E4 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 01078 80A319E8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0107C 80A319EC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 01080 80A319F0 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 01084 80A319F4 8DCE71B0 */ lw $t6, 0x71B0($t6) ## 801271B0 +/* 01078 80A319E8 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0107C 80A319EC 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 01080 80A319F0 3C0E8012 */ lui $t6, %hi(gUpgradeMasks) +/* 01084 80A319F4 8DCE71B0 */ lw $t6, %lo(gUpgradeMasks)($t6) /* 01088 80A319F8 8C6D00A0 */ lw $t5, 0x00A0($v1) ## 8015E700 -/* 0108C 80A319FC 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 -/* 01090 80A31A00 931871F4 */ lbu $t8, 0x71F4($t8) ## 801271F4 +/* 0108C 80A319FC 3C188012 */ lui $t8, %hi(gUpgradeShifts) +/* 01090 80A31A00 931871F4 */ lbu $t8, %lo(gUpgradeShifts)($t8) /* 01094 80A31A04 01AE7824 */ and $t7, $t5, $t6 /* 01098 80A31A08 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0109C 80A31A0C 030F1007 */ srav $v0, $t7, $t8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31A5C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31A5C.s index a9bfa9b1bb..00c37d2479 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31A5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31A5C.s @@ -21,12 +21,12 @@ glabel func_80A31A5C /* 01134 80A31AA4 33280002 */ andi $t0, $t9, 0x0002 ## $t0 = 00000000 /* 01138 80A31AA8 11000014 */ beq $t0, $zero, .L80A31AFC /* 0113C 80A31AAC 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 01140 80A31AB0 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 01144 80A31AB4 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 01148 80A31AB8 8D4A71B0 */ lw $t2, 0x71B0($t2) ## 801271B0 -/* 0114C 80A31ABC 8D29E700 */ lw $t1, -0x1900($t1) ## 8015E700 -/* 01150 80A31AC0 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 -/* 01154 80A31AC4 918C71F4 */ lbu $t4, 0x71F4($t4) ## 801271F4 +/* 01140 80A31AB0 3C098016 */ lui $t1, %hi(gSaveContext+0xa0) +/* 01144 80A31AB4 3C0A8012 */ lui $t2, %hi(gUpgradeMasks) +/* 01148 80A31AB8 8D4A71B0 */ lw $t2, %lo(gUpgradeMasks)($t2) +/* 0114C 80A31ABC 8D29E700 */ lw $t1, %lo(gSaveContext+0xa0)($t1) +/* 01150 80A31AC0 3C0C8012 */ lui $t4, %hi(gUpgradeShifts) +/* 01154 80A31AC4 918C71F4 */ lbu $t4, %lo(gUpgradeShifts)($t4) /* 01158 80A31AC8 012A5824 */ and $t3, $t1, $t2 /* 0115C 80A31ACC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 01160 80A31AD0 018B1007 */ srav $v0, $t3, $t4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31BE8.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31BE8.s index e249829fda..ebbe214709 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31BE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31BE8.s @@ -31,8 +31,8 @@ glabel func_80A31BE8 /* 012EC 80A31C5C 10000046 */ beq $zero, $zero, .L80A31D78 /* 012F0 80A31C60 8FBF0024 */ lw $ra, 0x0024($sp) .L80A31C64: -/* 012F4 80A31C64 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 012F8 80A31C68 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 012F4 80A31C64 3C028016 */ lui $v0, %hi(gSaveContext) +/* 012F8 80A31C68 2442E660 */ addiu $v0, %lo(gSaveContext) /* 012FC 80A31C6C 84590034 */ lh $t9, 0x0034($v0) ## 8015E694 /* 01300 80A31C70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01304 80A31C74 2B210014 */ slti $at, $t9, 0x0014 @@ -51,9 +51,9 @@ glabel func_80A31BE8 /* 01334 80A31CA4 8FA5002C */ lw $a1, 0x002C($sp) /* 01338 80A31CA8 00300821 */ addu $at, $at, $s0 /* 0133C 80A31CAC 24090129 */ addiu $t1, $zero, 0x0129 ## $t1 = 00000129 -/* 01340 80A31CB0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 01340 80A31CB0 3C028016 */ lui $v0, %hi(gSaveContext) /* 01344 80A31CB4 A4291E1A */ sh $t1, 0x1E1A($at) ## 00011E1A -/* 01348 80A31CB8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01348 80A31CB8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0134C 80A31CBC 340AFFF0 */ ori $t2, $zero, 0xFFF0 ## $t2 = 0000FFF0 /* 01350 80A31CC0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01354 80A31CC4 A44A1412 */ sh $t2, 0x1412($v0) ## 8015FA72 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31E2C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31E2C.s index 6d7767c820..52eaf6311a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31E2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31E2C.s @@ -19,8 +19,8 @@ glabel D_80A3284C glabel func_80A31E2C /* 014BC 80A31E2C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 014C0 80A31E30 AFB00018 */ sw $s0, 0x0018($sp) -/* 014C4 80A31E34 3C108016 */ lui $s0, 0x8016 ## $s0 = 80160000 -/* 014C8 80A31E38 2610E660 */ addiu $s0, $s0, 0xE660 ## $s0 = 8015E660 +/* 014C4 80A31E34 3C108016 */ lui $s0, %hi(gSaveContext) +/* 014C8 80A31E38 2610E660 */ addiu $s0, %lo(gSaveContext) /* 014CC 80A31E3C 960E13FA */ lhu $t6, 0x13FA($s0) ## 8015FA5A /* 014D0 80A31E40 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 014D4 80A31E44 AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31FE0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31FE0.s index 27d0595d5a..0f122092e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31FE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31FE0.s @@ -5,8 +5,8 @@ glabel func_80A31FE0 /* 0167C 80A31FEC 3C0B80A3 */ lui $t3, %hi(func_80A31D88) ## $t3 = 80A30000 /* 01680 80A31FF0 256B1D88 */ addiu $t3, $t3, %lo(func_80A31D88) ## $t3 = 80A31D88 /* 01684 80A31FF4 8C4E067C */ lw $t6, 0x067C($v0) ## 0000067C -/* 01688 80A31FF8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0168C 80A31FFC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01688 80A31FF8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0168C 80A31FFC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01690 80A32000 000E7A00 */ sll $t7, $t6, 8 /* 01694 80A32004 05E00009 */ bltz $t7, .L80A3202C /* 01698 80A32008 3C074348 */ lui $a3, 0x4348 ## $a3 = 43480000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s index 84530599c9..26cbe78217 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s @@ -29,7 +29,7 @@ glabel EnGe2_Draw /* 01654 80A34224 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 01658 80A34228 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 0165C 80A3422C 3C0480A3 */ lui $a0, %hi(D_80A343BC) ## $a0 = 80A30000 -/* 01660 80A34230 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 01660 80A34230 3C0C8016 */ lui $t4, %hi(gSegments) /* 01664 80A34234 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 /* 01668 80A34238 ACAE02C0 */ sw $t6, 0x02C0($a1) ## 000002C0 /* 0166C 80A3423C AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 @@ -45,7 +45,7 @@ glabel EnGe2_Draw /* 01694 80A34264 00095702 */ srl $t2, $t1, 28 /* 01698 80A34268 000A5880 */ sll $t3, $t2, 2 /* 0169C 80A3426C 018B6021 */ addu $t4, $t4, $t3 -/* 016A0 80A34270 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 016A0 80A34270 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 016A4 80A34274 00814024 */ and $t0, $a0, $at /* 016A8 80A34278 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 016AC 80A3427C 010C6821 */ addu $t5, $t0, $t4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s index 048b8c7768..e0ed8d5c33 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s @@ -14,8 +14,8 @@ glabel EnGe2_Init /* 000AC 80A32C7C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 000B0 80A32C80 AFBF002C */ sw $ra, 0x002C($sp) /* 000B4 80A32C84 AFA50044 */ sw $a1, 0x0044($sp) -/* 000B8 80A32C88 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 000BC 80A32C8C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 000B8 80A32C88 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 000BC 80A32C8C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 000C0 80A32C90 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 000C4 80A32C94 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 000C8 80A32C98 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32ECC.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32ECC.s index 023b073e41..6599e85de0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32ECC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32ECC.s @@ -1,6 +1,6 @@ glabel func_80A32ECC -/* 002FC 80A32ECC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00300 80A32ED0 8DCEE670 */ lw $t6, -0x1990($t6) ## 8015E670 +/* 002FC 80A32ECC 3C0E8016 */ lui $t6, %hi(gSaveContext+0x10) +/* 00300 80A32ED0 8DCEE670 */ lw $t6, %lo(gSaveContext+0x10)($t6) /* 00304 80A32ED4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00308 80A32ED8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0030C 80A32EDC 11C00005 */ beq $t6, $zero, .L80A32EF4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32F74.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32F74.s index f32a56bfeb..ad9fa9c165 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32F74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32F74.s @@ -1,7 +1,7 @@ glabel func_80A32F74 /* 003A4 80A32F74 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 003A8 80A32F78 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 003AC 80A32F7C 8DEFE670 */ lw $t7, -0x1990($t7) ## 8015E670 +/* 003A8 80A32F78 3C0F8016 */ lui $t7, %hi(gSaveContext+0x10) +/* 003AC 80A32F7C 8DEFE670 */ lw $t7, %lo(gSaveContext+0x10)($t7) /* 003B0 80A32F80 AFA70054 */ sw $a3, 0x0054($sp) /* 003B4 80A32F84 00073C00 */ sll $a3, $a3, 16 /* 003B8 80A32F88 AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A330A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A330A0.s index 48beb7c8a8..c8ca08997d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A330A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A330A0.s @@ -1,6 +1,6 @@ glabel func_80A330A0 -/* 004D0 80A330A0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 004D4 80A330A4 95CFF546 */ lhu $t7, -0x0ABA($t6) ## 8015F546 +/* 004D0 80A330A0 3C0E8016 */ lui $t6, %hi(gSaveContext+0xee6) +/* 004D4 80A330A4 95CFF546 */ lhu $t7, %lo(gSaveContext+0xee6)($t6) /* 004D8 80A330A8 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 004DC 80A330AC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 004E0 80A330B0 31F8000F */ andi $t8, $t7, 0x000F ## $t8 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A330CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A330CC.s index d6db63efa2..370e0ef3aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A330CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A330CC.s @@ -10,11 +10,11 @@ glabel func_80A330CC /* 00518 80A330E8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0051C 80A330EC 0C01B41D */ jal func_8006D074 /* 00520 80A330F0 AFA5001C */ sw $a1, 0x001C($sp) -/* 00524 80A330F4 3C048012 */ lui $a0, 0x8012 ## $a0 = 80120000 -/* 00528 80A330F8 24847464 */ addiu $a0, $a0, 0x7464 ## $a0 = 80127464 +/* 00524 80A330F4 3C048012 */ lui $a0, %hi(gItemSlots) +/* 00528 80A330F8 24847464 */ addiu $a0, %lo(gItemSlots) /* 0052C 80A330FC 908F000A */ lbu $t7, 0x000A($a0) ## 8012746E -/* 00530 80A33100 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00534 80A33104 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00530 80A33100 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00534 80A33104 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00538 80A33108 004FC021 */ addu $t8, $v0, $t7 /* 0053C 80A3310C 93190074 */ lbu $t9, 0x0074($t8) ## 00000074 /* 00540 80A33110 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A331A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A331A0.s index 880783f867..9556f0e835 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A331A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A331A0.s @@ -36,11 +36,11 @@ glabel func_80A331A0 .L80A33220: /* 00650 80A33220 0C01B41D */ jal func_8006D074 /* 00654 80A33224 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00658 80A33228 3C048012 */ lui $a0, 0x8012 ## $a0 = 80120000 -/* 0065C 80A3322C 24847464 */ addiu $a0, $a0, 0x7464 ## $a0 = 80127464 +/* 00658 80A33228 3C048012 */ lui $a0, %hi(gItemSlots) +/* 0065C 80A3322C 24847464 */ addiu $a0, %lo(gItemSlots) /* 00660 80A33230 9099000A */ lbu $t9, 0x000A($a0) ## 8012746E -/* 00664 80A33234 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00668 80A33238 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00664 80A33234 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00668 80A33238 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0066C 80A3323C 00594021 */ addu $t0, $v0, $t9 /* 00670 80A33240 91090074 */ lbu $t1, 0x0074($t0) ## 00000074 /* 00674 80A33244 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s index 07d704a1a8..fb12f9ca21 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s @@ -29,7 +29,7 @@ glabel EnGe3_Draw /* 00A84 80A350A4 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 00A88 80A350A8 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 00A8C 80A350AC 3C0480A3 */ lui $a0, %hi(D_80A351D4) ## $a0 = 80A30000 -/* 00A90 80A350B0 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 00A90 80A350B0 3C0C8016 */ lui $t4, %hi(gSegments) /* 00A94 80A350B4 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 /* 00A98 80A350B8 ACAE02C0 */ sw $t6, 0x02C0($a1) ## 000002C0 /* 00A9C 80A350BC AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 @@ -45,7 +45,7 @@ glabel EnGe3_Draw /* 00AC4 80A350E4 00095702 */ srl $t2, $t1, 28 /* 00AC8 80A350E8 000A5880 */ sll $t3, $t2, 2 /* 00ACC 80A350EC 018B6021 */ addu $t4, $t4, $t3 -/* 00AD0 80A350F0 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 00AD0 80A350F0 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 00AD4 80A350F4 00814024 */ and $t0, $a0, $at /* 00AD8 80A350F8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00ADC 80A350FC 010C6821 */ addu $t5, $t0, $t4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s index d81109e7ea..5bbc115089 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s @@ -4,8 +4,8 @@ glabel EnGe3_Init /* 000AC 80A346CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 000B0 80A346D0 AFBF002C */ sw $ra, 0x002C($sp) /* 000B4 80A346D4 AFA50044 */ sw $a1, 0x0044($sp) -/* 000B8 80A346D8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 000BC 80A346DC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 000B8 80A346D8 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 000BC 80A346DC 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 000C0 80A346E0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 000C4 80A346E4 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 000C8 80A346E8 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s index 43578762e6..b07bd283e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s @@ -62,14 +62,14 @@ glabel EnGeldB_Draw /* 04848 80A39B58 A6820032 */ sh $v0, 0x0032($s4) ## 00000032 .L80A39B5C: /* 0484C 80A39B5C 8E8A0300 */ lw $t2, 0x0300($s4) ## 00000300 -/* 04850 80A39B60 3C048012 */ lui $a0, 0x8012 ## $a0 = 80120000 -/* 04854 80A39B64 24847464 */ addiu $a0, $a0, 0x7464 ## $a0 = 80127464 +/* 04850 80A39B60 3C048012 */ lui $a0, %hi(gItemSlots) +/* 04854 80A39B64 24847464 */ addiu $a0, %lo(gItemSlots) /* 04858 80A39B68 254BFFFF */ addiu $t3, $t2, 0xFFFF ## $t3 = FFFFFFFF /* 0485C 80A39B6C 1560002A */ bne $t3, $zero, .L80A39C18 /* 04860 80A39B70 AE8B0300 */ sw $t3, 0x0300($s4) ## 00000300 /* 04864 80A39B74 908D000A */ lbu $t5, 0x000A($a0) ## 8012746E -/* 04868 80A39B78 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0486C 80A39B7C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 04868 80A39B78 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0486C 80A39B7C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 04870 80A39B80 004D7021 */ addu $t6, $v0, $t5 /* 04874 80A39B84 91CF0074 */ lbu $t7, 0x0074($t6) ## 00000074 /* 04878 80A39B88 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF @@ -132,7 +132,7 @@ glabel EnGeldB_Draw /* 04940 80A39C50 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 /* 04944 80A39C54 9298031A */ lbu $t8, 0x031A($s4) ## 0000031A /* 04948 80A39C58 3C0480A4 */ lui $a0, %hi(D_80A3A1C4) ## $a0 = 80A40000 -/* 0494C 80A39C5C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 0494C 80A39C5C 3C0C8016 */ lui $t4, %hi(gSegments) /* 04950 80A39C60 0018C880 */ sll $t9, $t8, 2 /* 04954 80A39C64 00992021 */ addu $a0, $a0, $t9 /* 04958 80A39C68 8C84A1C4 */ lw $a0, %lo(D_80A3A1C4)($a0) @@ -142,7 +142,7 @@ glabel EnGeldB_Draw /* 04968 80A39C78 00095702 */ srl $t2, $t1, 28 /* 0496C 80A39C7C 000A5880 */ sll $t3, $t2, 2 /* 04970 80A39C80 018B6021 */ addu $t4, $t4, $t3 -/* 04974 80A39C84 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 04974 80A39C84 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 04978 80A39C88 00814024 */ and $t0, $a0, $at /* 0497C 80A39C8C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 04980 80A39C90 010C6821 */ addu $t5, $t0, $t4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s index 56958951f9..0073d87910 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s @@ -12,11 +12,11 @@ glabel EnGeldB_Init /* 0002C 80A3533C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00030 80A35340 3C0E80A4 */ lui $t6, %hi(D_80A3A0E4) ## $t6 = 80A40000 /* 00034 80A35344 25CEA0E4 */ addiu $t6, $t6, %lo(D_80A3A0E4) ## $t6 = 80A3A0E4 -/* 00038 80A35348 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 00038 80A35348 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Teardrop) /* 0003C 80A3534C 44050000 */ mfc1 $a1, $f0 /* 00040 80A35350 44070000 */ mfc1 $a3, $f0 /* 00044 80A35354 AE0E0098 */ sw $t6, 0x0098($s0) ## 00000098 -/* 00048 80A35358 24C6B8C4 */ addiu $a2, $a2, 0xB8C4 ## $a2 = 8002B8C4 +/* 00048 80A35358 24C6B8C4 */ addiu $a2, %lo(ActorShadow_DrawFunc_Teardrop) /* 0004C 80A3535C 0C00AC78 */ jal ActorShape_Init /* 00050 80A35360 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A392D8.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A392D8.s index 576dc61f03..40043f4bd7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A392D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A392D8.s @@ -94,16 +94,16 @@ glabel func_80A392D8 /* 0411C 80A3942C 8FA30028 */ lw $v1, 0x0028($sp) /* 04120 80A39430 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 04124 80A39434 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 04128 80A39438 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0412C 80A3943C 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 04130 80A39440 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 04134 80A39444 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 04138 80A39448 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 +/* 04128 80A39438 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0412C 80A3943C 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 04130 80A39440 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 04134 80A39444 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 04138 80A39448 3C058013 */ lui $a1, %hi(D_801333D4) /* 0413C 80A3944C A4620032 */ sh $v0, 0x0032($v1) ## 00000032 /* 04140 80A39450 E4640068 */ swc1 $f4, 0x0068($v1) ## 00000068 /* 04144 80A39454 AFAF0014 */ sw $t7, 0x0014($sp) /* 04148 80A39458 AFA70010 */ sw $a3, 0x0010($sp) -/* 0414C 80A3945C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0414C 80A3945C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 04150 80A39460 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 /* 04154 80A39464 0C03DCE3 */ jal Audio_PlaySoundGeneral diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A758.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A758.s index 72e7e98ae5..a8726c0444 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A758.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A758.s @@ -27,8 +27,8 @@ glabel func_80A3A758 /* 00028 80A3A778 01E00008 */ jr $t7 /* 0002C 80A3A77C 00000000 */ nop glabel L80A3A780 -/* 00030 80A3A780 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 00034 80A3A784 9718F550 */ lhu $t8, -0x0AB0($t8) ## 8015F550 +/* 00030 80A3A780 3C188016 */ lui $t8, %hi(gSaveContext+0xef0) +/* 00034 80A3A784 9718F550 */ lhu $t8, %lo(gSaveContext+0xef0)($t8) /* 00038 80A3A788 24080010 */ addiu $t0, $zero, 0x0010 ## $t0 = 00000010 /* 0003C 80A3A78C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 00040 80A3A790 33190004 */ andi $t9, $t8, 0x0004 ## $t9 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7A4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7A4.s index 16b2178902..7cd58fa5fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7A4.s @@ -1,6 +1,6 @@ glabel func_80A3A7A4 -/* 00054 80A3A7A4 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 00058 80A3A7A8 9529F550 */ lhu $t1, -0x0AB0($t1) ## 8015F550 +/* 00054 80A3A7A4 3C098016 */ lui $t1, %hi(gSaveContext+0xef0) +/* 00058 80A3A7A8 9529F550 */ lhu $t1, %lo(gSaveContext+0xef0)($t1) /* 0005C 80A3A7AC 240B0026 */ addiu $t3, $zero, 0x0026 ## $t3 = 00000026 /* 00060 80A3A7B0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 00064 80A3A7B4 312A0040 */ andi $t2, $t1, 0x0040 ## $t2 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7C8.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7C8.s index ee5cc6be5d..39c2076a52 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7C8.s @@ -1,6 +1,6 @@ glabel func_80A3A7C8 -/* 00078 80A3A7C8 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 0007C 80A3A7CC 958CF550 */ lhu $t4, -0x0AB0($t4) ## 8015F550 +/* 00078 80A3A7C8 3C0C8016 */ lui $t4, %hi(gSaveContext+0xef0) +/* 0007C 80A3A7CC 958CF550 */ lhu $t4, %lo(gSaveContext+0xef0)($t4) /* 00080 80A3A7D0 240E0026 */ addiu $t6, $zero, 0x0026 ## $t6 = 00000026 /* 00084 80A3A7D4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 00088 80A3A7D8 318D0080 */ andi $t5, $t4, 0x0080 ## $t5 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7EC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7EC.s index dffd02bbdb..a621e4f38d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7EC.s @@ -1,6 +1,6 @@ glabel func_80A3A7EC -/* 0009C 80A3A7EC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 000A0 80A3A7F0 95EFF550 */ lhu $t7, -0x0AB0($t7) ## 8015F550 +/* 0009C 80A3A7EC 3C0F8016 */ lui $t7, %hi(gSaveContext+0xef0) +/* 000A0 80A3A7F0 95EFF550 */ lhu $t7, %lo(gSaveContext+0xef0)($t7) /* 000A4 80A3A7F4 24190026 */ addiu $t9, $zero, 0x0026 ## $t9 = 00000026 /* 000A8 80A3A7F8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 000AC 80A3A7FC 31F80100 */ andi $t8, $t7, 0x0100 ## $t8 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A810.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A810.s index ac8caade5d..017ab887b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A810.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A810.s @@ -1,6 +1,6 @@ glabel func_80A3A810 -/* 000C0 80A3A810 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 000C4 80A3A814 9508F550 */ lhu $t0, -0x0AB0($t0) ## 8015F550 +/* 000C0 80A3A810 3C088016 */ lui $t0, %hi(gSaveContext+0xef0) +/* 000C4 80A3A814 9508F550 */ lhu $t0, %lo(gSaveContext+0xef0)($t0) /* 000C8 80A3A818 240A0026 */ addiu $t2, $zero, 0x0026 ## $t2 = 00000026 /* 000CC 80A3A81C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 000D0 80A3A820 31090200 */ andi $t1, $t0, 0x0200 ## $t1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A834.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A834.s index 06ddad9854..313cab62a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A834.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A834.s @@ -1,6 +1,6 @@ glabel func_80A3A834 -/* 000E4 80A3A834 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 000E8 80A3A838 956BF550 */ lhu $t3, -0x0AB0($t3) ## 8015F550 +/* 000E4 80A3A834 3C0B8016 */ lui $t3, %hi(gSaveContext+0xef0) +/* 000E8 80A3A838 956BF550 */ lhu $t3, %lo(gSaveContext+0xef0)($t3) /* 000EC 80A3A83C 240D0026 */ addiu $t5, $zero, 0x0026 ## $t5 = 00000026 /* 000F0 80A3A840 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 000F4 80A3A844 316C0400 */ andi $t4, $t3, 0x0400 ## $t4 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A858.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A858.s index 74431e11ab..dda0e1c325 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A858.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A858.s @@ -1,6 +1,6 @@ glabel func_80A3A858 -/* 00108 80A3A858 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0010C 80A3A85C 95CEF550 */ lhu $t6, -0x0AB0($t6) ## 8015F550 +/* 00108 80A3A858 3C0E8016 */ lui $t6, %hi(gSaveContext+0xef0) +/* 0010C 80A3A85C 95CEF550 */ lhu $t6, %lo(gSaveContext+0xef0)($t6) /* 00110 80A3A860 24180026 */ addiu $t8, $zero, 0x0026 ## $t8 = 00000026 /* 00114 80A3A864 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 00118 80A3A868 31CF0008 */ andi $t7, $t6, 0x0008 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A87C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A87C.s index 0d48199f21..7d0f86dc5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A87C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A87C.s @@ -1,6 +1,6 @@ glabel func_80A3A87C -/* 0012C 80A3A87C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 00130 80A3A880 9739F550 */ lhu $t9, -0x0AB0($t9) ## 8015F550 +/* 0012C 80A3A87C 3C198016 */ lui $t9, %hi(gSaveContext+0xef0) +/* 00130 80A3A880 9739F550 */ lhu $t9, %lo(gSaveContext+0xef0)($t9) /* 00134 80A3A884 24090026 */ addiu $t1, $zero, 0x0026 ## $t1 = 00000026 /* 00138 80A3A888 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 0013C 80A3A88C 33280010 */ andi $t0, $t9, 0x0010 ## $t0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8A0.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8A0.s index 010187e14b..97806f497a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8A0.s @@ -1,6 +1,6 @@ glabel func_80A3A8A0 -/* 00150 80A3A8A0 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 00154 80A3A8A4 954AF550 */ lhu $t2, -0x0AB0($t2) ## 8015F550 +/* 00150 80A3A8A0 3C0A8016 */ lui $t2, %hi(gSaveContext+0xef0) +/* 00154 80A3A8A4 954AF550 */ lhu $t2, %lo(gSaveContext+0xef0)($t2) /* 00158 80A3A8A8 240C0026 */ addiu $t4, $zero, 0x0026 ## $t4 = 00000026 /* 0015C 80A3A8AC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 00160 80A3A8B0 314B0020 */ andi $t3, $t2, 0x0020 ## $t3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AAA8.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AAA8.s index 2ef8b1c344..9c5f2b3ded 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AAA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AAA8.s @@ -11,23 +11,23 @@ glabel func_80A3AAA8 /* 0037C 80A3AACC 10000020 */ beq $zero, $zero, .L80A3AB50 /* 00380 80A3AAD0 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 .L80A3AAD4: -/* 00384 80A3AAD4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00388 80A3AAD8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 0038C 80A3AADC 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 00390 80A3AAE0 8D0871B0 */ lw $t0, 0x71B0($t0) ## 801271B0 +/* 00384 80A3AAD4 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00388 80A3AAD8 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 0038C 80A3AADC 3C088012 */ lui $t0, %hi(gUpgradeMasks) +/* 00390 80A3AAE0 8D0871B0 */ lw $t0, %lo(gUpgradeMasks)($t0) /* 00394 80A3AAE4 8C5900A0 */ lw $t9, 0x00A0($v0) ## 8015E700 -/* 00398 80A3AAE8 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 0039C 80A3AAEC 914A71F4 */ lbu $t2, 0x71F4($t2) ## 801271F4 -/* 003A0 80A3AAF0 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 003A4 80A3AAF4 91CE7467 */ lbu $t6, 0x7467($t6) ## 80127467 +/* 00398 80A3AAE8 3C0A8012 */ lui $t2, %hi(gUpgradeShifts) +/* 0039C 80A3AAEC 914A71F4 */ lbu $t2, %lo(gUpgradeShifts)($t2) +/* 003A0 80A3AAF0 3C0E8012 */ lui $t6, %hi(gItemSlots+3) +/* 003A4 80A3AAF4 91CE7467 */ lbu $t6, %lo(gItemSlots+3)($t6) /* 003A8 80A3AAF8 03284824 */ and $t1, $t9, $t0 /* 003AC 80A3AAFC 01495807 */ srav $t3, $t1, $t2 /* 003B0 80A3AB00 000B6040 */ sll $t4, $t3, 1 -/* 003B4 80A3AB04 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 +/* 003B4 80A3AB04 3C0D8012 */ lui $t5, %hi(gUpgradeCapacities) /* 003B8 80A3AB08 01AC6821 */ addu $t5, $t5, $t4 /* 003BC 80A3AB0C 004E7821 */ addu $t7, $v0, $t6 /* 003C0 80A3AB10 81F8008C */ lb $t8, 0x008C($t7) ## 0000008C -/* 003C4 80A3AB14 95AD71FC */ lhu $t5, 0x71FC($t5) ## 801271FC +/* 003C4 80A3AB14 95AD71FC */ lhu $t5, %lo(gUpgradeCapacities)($t5) /* 003C8 80A3AB18 8FAF001C */ lw $t7, 0x001C($sp) /* 003CC 80A3AB1C 030D082A */ slt $at, $t8, $t5 /* 003D0 80A3AB20 54200004 */ bnel $at, $zero, .L80A3AB34 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AB58.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AB58.s index cedb177d34..354407949a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AB58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AB58.s @@ -1,30 +1,30 @@ glabel func_80A3AB58 -/* 00408 80A3AB58 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0040C 80A3AB5C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 00410 80A3AB60 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 00414 80A3AB64 8DCE716C */ lw $t6, 0x716C($t6) ## 8012716C +/* 00408 80A3AB58 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0040C 80A3AB5C 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00410 80A3AB60 3C0E8012 */ lui $t6, %hi(gBitFlags+0x4c) +/* 00414 80A3AB64 8DCE716C */ lw $t6, %lo(gBitFlags+0x4c)($t6) /* 00418 80A3AB68 8C4F00A4 */ lw $t7, 0x00A4($v0) ## 8015E704 /* 0041C 80A3AB6C AFA40000 */ sw $a0, 0x0000($sp) -/* 00420 80A3AB70 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 +/* 00420 80A3AB70 3C198012 */ lui $t9, %hi(gItemSlots+2) /* 00424 80A3AB74 01CFC024 */ and $t8, $t6, $t7 /* 00428 80A3AB78 17000003 */ bne $t8, $zero, .L80A3AB88 -/* 0042C 80A3AB7C 3C0B8012 */ lui $t3, 0x8012 ## $t3 = 80120000 +/* 0042C 80A3AB7C 3C0B8012 */ lui $t3, %hi(gUpgradeMasks+4) /* 00430 80A3AB80 03E00008 */ jr $ra /* 00434 80A3AB84 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 .L80A3AB88: /* 00438 80A3AB88 8C4A00A0 */ lw $t2, 0x00A0($v0) ## 000000A2 -/* 0043C 80A3AB8C 8D6B71B4 */ lw $t3, 0x71B4($t3) ## 801271B4 -/* 00440 80A3AB90 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 -/* 00444 80A3AB94 91AD71F5 */ lbu $t5, 0x71F5($t5) ## 801271F5 -/* 00448 80A3AB98 93397466 */ lbu $t9, 0x7466($t9) ## 80127466 +/* 0043C 80A3AB8C 8D6B71B4 */ lw $t3, %lo(gUpgradeMasks+4)($t3) +/* 00440 80A3AB90 3C0D8012 */ lui $t5, %hi(gUpgradeShifts+1) +/* 00444 80A3AB94 91AD71F5 */ lbu $t5, %lo(gUpgradeShifts+1)($t5) +/* 00448 80A3AB98 93397466 */ lbu $t9, %lo(gItemSlots+2)($t9) /* 0044C 80A3AB9C 014B6024 */ and $t4, $t2, $t3 /* 00450 80A3ABA0 01AC7007 */ srav $t6, $t4, $t5 /* 00454 80A3ABA4 000E7840 */ sll $t7, $t6, 1 -/* 00458 80A3ABA8 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 +/* 00458 80A3ABA8 3C188012 */ lui $t8, %hi(gUpgradeCapacities+8) /* 0045C 80A3ABAC 030FC021 */ addu $t8, $t8, $t7 /* 00460 80A3ABB0 00594021 */ addu $t0, $v0, $t9 /* 00464 80A3ABB4 8109008C */ lb $t1, 0x008C($t0) ## 0000008C -/* 00468 80A3ABB8 97187204 */ lhu $t8, 0x7204($t8) ## 80127204 +/* 00468 80A3ABB8 97187204 */ lhu $t8, %lo(gUpgradeCapacities+8)($t8) /* 0046C 80A3ABBC 0138082A */ slt $at, $t1, $t8 /* 00470 80A3ABC0 54200004 */ bnel $at, $zero, .L80A3ABD4 /* 00474 80A3ABC4 84590034 */ lh $t9, 0x0034($v0) ## 00000036 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ABF8.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ABF8.s index b529f90b22..54a868bca1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ABF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ABF8.s @@ -1,23 +1,23 @@ glabel func_80A3ABF8 -/* 004A8 80A3ABF8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 004AC 80A3ABFC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 004B0 80A3AC00 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 004B4 80A3AC04 8DEF71CC */ lw $t7, 0x71CC($t7) ## 801271CC +/* 004A8 80A3ABF8 3C038016 */ lui $v1, %hi(gSaveContext) +/* 004AC 80A3ABFC 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 004B0 80A3AC00 3C0F8012 */ lui $t7, %hi(gUpgradeMasks+0x1c) +/* 004B4 80A3AC04 8DEF71CC */ lw $t7, %lo(gUpgradeMasks+0x1c)($t7) /* 004B8 80A3AC08 8C6E00A0 */ lw $t6, 0x00A0($v1) ## 8015E700 -/* 004BC 80A3AC0C 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 -/* 004C0 80A3AC10 933971FB */ lbu $t9, 0x71FB($t9) ## 801271FB +/* 004BC 80A3AC0C 3C198012 */ lui $t9, %hi(gUpgradeShifts+7) +/* 004C0 80A3AC10 933971FB */ lbu $t9, %lo(gUpgradeShifts+7)($t9) /* 004C4 80A3AC14 01CFC024 */ and $t8, $t6, $t7 -/* 004C8 80A3AC18 3C028012 */ lui $v0, 0x8012 ## $v0 = 80120000 +/* 004C8 80A3AC18 3C028012 */ lui $v0, %hi(gUpgradeCapacities+0x38) /* 004CC 80A3AC1C 03384007 */ srav $t0, $t8, $t9 /* 004D0 80A3AC20 00084840 */ sll $t1, $t0, 1 /* 004D4 80A3AC24 00491021 */ addu $v0, $v0, $t1 -/* 004D8 80A3AC28 94427234 */ lhu $v0, 0x7234($v0) ## 80127234 +/* 004D8 80A3AC28 94427234 */ lhu $v0, %lo(gUpgradeCapacities+0x38)($v0) /* 004DC 80A3AC2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 004E0 80A3AC30 AFBF0014 */ sw $ra, 0x0014($sp) /* 004E4 80A3AC34 1040000A */ beq $v0, $zero, .L80A3AC60 /* 004E8 80A3AC38 AFA40018 */ sw $a0, 0x0018($sp) -/* 004EC 80A3AC3C 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 004F0 80A3AC40 914A7465 */ lbu $t2, 0x7465($t2) ## 80127465 +/* 004EC 80A3AC3C 3C0A8012 */ lui $t2, %hi(gItemSlots+1) +/* 004F0 80A3AC40 914A7465 */ lbu $t2, %lo(gItemSlots+1)($t2) /* 004F4 80A3AC44 006A5821 */ addu $t3, $v1, $t2 /* 004F8 80A3AC48 816C008C */ lb $t4, 0x008C($t3) ## 0000008C /* 004FC 80A3AC4C 0182082A */ slt $at, $t4, $v0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ACAC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ACAC.s index acba1174ad..814661e7f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ACAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ACAC.s @@ -1,23 +1,23 @@ glabel func_80A3ACAC -/* 0055C 80A3ACAC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00560 80A3ACB0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00564 80A3ACB4 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 00568 80A3ACB8 8DEF71C8 */ lw $t7, 0x71C8($t7) ## 801271C8 +/* 0055C 80A3ACAC 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00560 80A3ACB0 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 00564 80A3ACB4 3C0F8012 */ lui $t7, %hi(gUpgradeMasks+0x18) +/* 00568 80A3ACB8 8DEF71C8 */ lw $t7, %lo(gUpgradeMasks+0x18)($t7) /* 0056C 80A3ACBC 8C6E00A0 */ lw $t6, 0x00A0($v1) ## 8015E700 -/* 00570 80A3ACC0 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 -/* 00574 80A3ACC4 933971FA */ lbu $t9, 0x71FA($t9) ## 801271FA +/* 00570 80A3ACC0 3C198012 */ lui $t9, %hi(gUpgradeShifts+6) +/* 00574 80A3ACC4 933971FA */ lbu $t9, %lo(gUpgradeShifts+6)($t9) /* 00578 80A3ACC8 01CFC024 */ and $t8, $t6, $t7 -/* 0057C 80A3ACCC 3C028012 */ lui $v0, 0x8012 ## $v0 = 80120000 +/* 0057C 80A3ACCC 3C028012 */ lui $v0, %hi(gUpgradeCapacities+0x30) /* 00580 80A3ACD0 03384007 */ srav $t0, $t8, $t9 /* 00584 80A3ACD4 00084840 */ sll $t1, $t0, 1 /* 00588 80A3ACD8 00491021 */ addu $v0, $v0, $t1 -/* 0058C 80A3ACDC 9442722C */ lhu $v0, 0x722C($v0) ## 8012722C +/* 0058C 80A3ACDC 9442722C */ lhu $v0, %lo(gUpgradeCapacities+0x30)($v0) /* 00590 80A3ACE0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00594 80A3ACE4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00598 80A3ACE8 1040000A */ beq $v0, $zero, .L80A3AD14 /* 0059C 80A3ACEC AFA40018 */ sw $a0, 0x0018($sp) -/* 005A0 80A3ACF0 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 005A4 80A3ACF4 914A7464 */ lbu $t2, 0x7464($t2) ## 80127464 +/* 005A0 80A3ACF0 3C0A8012 */ lui $t2, %hi(gItemSlots) +/* 005A4 80A3ACF4 914A7464 */ lbu $t2, %lo(gItemSlots)($t2) /* 005A8 80A3ACF8 006A5821 */ addu $t3, $v1, $t2 /* 005AC 80A3ACFC 816C008C */ lb $t4, 0x008C($t3) ## 0000008C /* 005B0 80A3AD00 0182082A */ slt $at, $t4, $v0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AD60.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AD60.s index b703c0511a..ff612c23fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AD60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AD60.s @@ -9,8 +9,8 @@ glabel func_80A3AD60 /* 0062C 80A3AD7C 10000011 */ beq $zero, $zero, .L80A3ADC4 /* 00630 80A3AD80 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 .L80A3AD84: -/* 00634 80A3AD84 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00638 80A3AD88 85CEE694 */ lh $t6, -0x196C($t6) ## 8015E694 +/* 00634 80A3AD84 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) +/* 00638 80A3AD88 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) /* 0063C 80A3AD8C 85F801C8 */ lh $t8, 0x01C8($t7) ## 000001C8 /* 00640 80A3AD90 01D8082A */ slt $at, $t6, $t8 /* 00644 80A3AD94 10200003 */ beq $at, $zero, .L80A3ADA4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ADD4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ADD4.s index f748248e6a..c53f5986a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ADD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ADD4.s @@ -9,8 +9,8 @@ glabel func_80A3ADD4 /* 006A0 80A3ADF0 10000011 */ beq $zero, $zero, .L80A3AE38 /* 006A4 80A3ADF4 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 .L80A3ADF8: -/* 006A8 80A3ADF8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 006AC 80A3ADFC 85CEE694 */ lh $t6, -0x196C($t6) ## 8015E694 +/* 006A8 80A3ADF8 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) +/* 006AC 80A3ADFC 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) /* 006B0 80A3AE00 85F801C8 */ lh $t8, 0x01C8($t7) ## 000001C8 /* 006B4 80A3AE04 01D8082A */ slt $at, $t6, $t8 /* 006B8 80A3AE08 10200003 */ beq $at, $zero, .L80A3AE18 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AE48.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AE48.s index c8202167c3..00fd19e65c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AE48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AE48.s @@ -9,8 +9,8 @@ glabel func_80A3AE48 /* 00714 80A3AE64 10000011 */ beq $zero, $zero, .L80A3AEAC /* 00718 80A3AE68 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 .L80A3AE6C: -/* 0071C 80A3AE6C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00720 80A3AE70 85CEE694 */ lh $t6, -0x196C($t6) ## 8015E694 +/* 0071C 80A3AE6C 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) +/* 00720 80A3AE70 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) /* 00724 80A3AE74 85F801C8 */ lh $t8, 0x01C8($t7) ## 000001C8 /* 00728 80A3AE78 01D8082A */ slt $at, $t6, $t8 /* 0072C 80A3AE7C 10200003 */ beq $at, $zero, .L80A3AE8C diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AEBC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AEBC.s index c965b70c96..89d6f45dbd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AEBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AEBC.s @@ -9,8 +9,8 @@ glabel func_80A3AEBC /* 00788 80A3AED8 10000011 */ beq $zero, $zero, .L80A3AF20 /* 0078C 80A3AEDC 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 .L80A3AEE0: -/* 00790 80A3AEE0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00794 80A3AEE4 85CEE694 */ lh $t6, -0x196C($t6) ## 8015E694 +/* 00790 80A3AEE0 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) +/* 00794 80A3AEE4 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) /* 00798 80A3AEE8 85F801C8 */ lh $t8, 0x01C8($t7) ## 000001C8 /* 0079C 80A3AEEC 01D8082A */ slt $at, $t6, $t8 /* 007A0 80A3AEF0 10200003 */ beq $at, $zero, .L80A3AF00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AF30.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AF30.s index 589a3abeac..40afe79458 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AF30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AF30.s @@ -1,10 +1,10 @@ glabel func_80A3AF30 /* 007E0 80A3AF30 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 007E4 80A3AF34 AFA40018 */ sw $a0, 0x0018($sp) -/* 007E8 80A3AF38 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 007EC 80A3AF3C 3C038012 */ lui $v1, 0x8012 ## $v1 = 80120000 -/* 007F0 80A3AF40 24637120 */ addiu $v1, $v1, 0x7120 ## $v1 = 80127120 -/* 007F4 80A3AF44 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 007E8 80A3AF38 3C048016 */ lui $a0, %hi(gSaveContext) +/* 007EC 80A3AF3C 3C038012 */ lui $v1, %hi(gBitFlags) +/* 007F0 80A3AF40 24637120 */ addiu $v1, %lo(gBitFlags) +/* 007F4 80A3AF44 2484E660 */ addiu $a0, %lo(gSaveContext) /* 007F8 80A3AF48 9482009C */ lhu $v0, 0x009C($a0) ## 8015E6FC /* 007FC 80A3AF4C 8C6E0008 */ lw $t6, 0x0008($v1) ## 80127128 /* 00800 80A3AF50 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AFC4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AFC4.s index ff3cbd9610..3d000206bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AFC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AFC4.s @@ -1,8 +1,8 @@ glabel func_80A3AFC4 -/* 00874 80A3AFC4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00878 80A3AFC8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 0087C 80A3AFCC 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 00880 80A3AFD0 8DCE7134 */ lw $t6, 0x7134($t6) ## 80127134 +/* 00874 80A3AFC4 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00878 80A3AFC8 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 0087C 80A3AFCC 3C0E8012 */ lui $t6, %hi(gBitFlags+0x14) +/* 00880 80A3AFD0 8DCE7134 */ lw $t6, %lo(gBitFlags+0x14)($t6) /* 00884 80A3AFD4 944F009C */ lhu $t7, 0x009C($v0) ## 8015E6FC /* 00888 80A3AFD8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0088C 80A3AFDC AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B040.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B040.s index e2c0847244..cdc99e04eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B040.s @@ -1,8 +1,8 @@ glabel func_80A3B040 -/* 008F0 80A3B040 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 008F4 80A3B044 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 008F8 80A3B048 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 008FC 80A3B04C 8DCE7130 */ lw $t6, 0x7130($t6) ## 80127130 +/* 008F0 80A3B040 3C028016 */ lui $v0, %hi(gSaveContext) +/* 008F4 80A3B044 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 008F8 80A3B048 3C0E8012 */ lui $t6, %hi(gBitFlags+0x10) +/* 008FC 80A3B04C 8DCE7130 */ lw $t6, %lo(gBitFlags+0x10)($t6) /* 00900 80A3B050 944F009C */ lhu $t7, 0x009C($v0) ## 8015E6FC /* 00904 80A3B054 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00908 80A3B058 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B0BC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B0BC.s index f4476d2bce..ee5e4929b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B0BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B0BC.s @@ -1,6 +1,6 @@ glabel func_80A3B0BC -/* 0096C 80A3B0BC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00970 80A3B0C0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0096C 80A3B0BC 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00970 80A3B0C0 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00974 80A3B0C4 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 /* 00978 80A3B0C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0097C 80A3B0CC AFBF0014 */ sw $ra, 0x0014($sp) @@ -13,11 +13,11 @@ glabel func_80A3B0BC .L80A3B0E4: /* 00994 80A3B0E4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00998 80A3B0E8 14410003 */ bne $v0, $at, .L80A3B0F8 -/* 0099C 80A3B0EC 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 +/* 0099C 80A3B0EC 3C0F8012 */ lui $t7, %hi(gBitFlags+0x24) /* 009A0 80A3B0F0 10000017 */ beq $zero, $zero, .L80A3B150 /* 009A4 80A3B0F4 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 .L80A3B0F8: -/* 009A8 80A3B0F8 8DEF7144 */ lw $t7, 0x7144($t7) ## 80127144 +/* 009A8 80A3B0F8 8DEF7144 */ lw $t7, %lo(gBitFlags+0x24)($t7) /* 009AC 80A3B0FC 9478009C */ lhu $t8, 0x009C($v1) ## 8015E6FC /* 009B0 80A3B100 01F8C824 */ and $t9, $t7, $t8 /* 009B4 80A3B104 53200004 */ beql $t9, $zero, .L80A3B118 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B160.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B160.s index d733be9a65..95b50c721b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B160.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B160.s @@ -1,6 +1,6 @@ glabel func_80A3B160 -/* 00A10 80A3B160 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00A14 80A3B164 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00A10 80A3B160 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00A14 80A3B164 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00A18 80A3B168 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 /* 00A1C 80A3B16C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00A20 80A3B170 AFBF0014 */ sw $ra, 0x0014($sp) @@ -13,11 +13,11 @@ glabel func_80A3B160 .L80A3B188: /* 00A38 80A3B188 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00A3C 80A3B18C 14410003 */ bne $v0, $at, .L80A3B19C -/* 00A40 80A3B190 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 +/* 00A40 80A3B190 3C0F8012 */ lui $t7, %hi(gBitFlags+0x28) /* 00A44 80A3B194 10000017 */ beq $zero, $zero, .L80A3B1F4 /* 00A48 80A3B198 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 .L80A3B19C: -/* 00A4C 80A3B19C 8DEF7148 */ lw $t7, 0x7148($t7) ## 80127148 +/* 00A4C 80A3B19C 8DEF7148 */ lw $t7, %lo(gBitFlags+0x28)($t7) /* 00A50 80A3B1A0 9478009C */ lhu $t8, 0x009C($v1) ## 8015E6FC /* 00A54 80A3B1A4 01F8C824 */ and $t9, $t7, $t8 /* 00A58 80A3B1A8 53200004 */ beql $t9, $zero, .L80A3B1BC diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B204.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B204.s index ea13bd6e63..23db56a6b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B204.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B204.s @@ -1,6 +1,6 @@ glabel func_80A3B204 -/* 00AB4 80A3B204 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00AB8 80A3B208 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00AB4 80A3B204 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00AB8 80A3B208 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00ABC 80A3B20C 844E0030 */ lh $t6, 0x0030($v0) ## 8015E690 /* 00AC0 80A3B210 844F002E */ lh $t7, 0x002E($v0) ## 8015E68E /* 00AC4 80A3B214 AFA40000 */ sw $a0, 0x0000($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B250.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B250.s index d04a689705..53ef154cb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B250.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B250.s @@ -2,8 +2,8 @@ glabel func_80A3B250 /* 00B00 80A3B250 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00B04 80A3B254 AFBF0014 */ sw $ra, 0x0014($sp) /* 00B08 80A3B258 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B0C 80A3B25C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00B10 80A3B260 85CEE694 */ lh $t6, -0x196C($t6) ## 8015E694 +/* 00B0C 80A3B25C 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) +/* 00B10 80A3B260 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) /* 00B14 80A3B264 84AF01C8 */ lh $t7, 0x01C8($a1) ## 000001C8 /* 00B18 80A3B268 01CF082A */ slt $at, $t6, $t7 /* 00B1C 80A3B26C 10200003 */ beq $at, $zero, .L80A3B27C diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B2AC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B2AC.s index 2dd096ebb6..3979ae70a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B2AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B2AC.s @@ -2,8 +2,8 @@ glabel func_80A3B2AC /* 00B5C 80A3B2AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00B60 80A3B2B0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00B64 80A3B2B4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B68 80A3B2B8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00B6C 80A3B2BC 85CEE694 */ lh $t6, -0x196C($t6) ## 8015E694 +/* 00B68 80A3B2B8 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) +/* 00B6C 80A3B2BC 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) /* 00B70 80A3B2C0 84AF01C8 */ lh $t7, 0x01C8($a1) ## 000001C8 /* 00B74 80A3B2C4 01CF082A */ slt $at, $t6, $t7 /* 00B78 80A3B2C8 10200003 */ beq $at, $zero, .L80A3B2D8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B328.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B328.s index d40931193e..674497b311 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B328.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B328.s @@ -1,8 +1,8 @@ glabel func_80A3B328 -/* 00BD8 80A3B328 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 00BDC 80A3B32C 91CE746D */ lbu $t6, 0x746D($t6) ## 8012746D -/* 00BE0 80A3B330 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00BE4 80A3B334 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00BD8 80A3B328 3C0E8012 */ lui $t6, %hi(gItemSlots+9) +/* 00BDC 80A3B32C 91CE746D */ lbu $t6, %lo(gItemSlots+9)($t6) +/* 00BE0 80A3B330 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00BE4 80A3B334 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00BE8 80A3B338 004E7821 */ addu $t7, $v0, $t6 /* 00BEC 80A3B33C 81F8008C */ lb $t8, 0x008C($t7) ## 0000008C /* 00BF0 80A3B340 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B3A8.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B3A8.s index 46590fe1bf..b23fd8ceba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B3A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B3A8.s @@ -1,21 +1,21 @@ glabel func_80A3B3A8 -/* 00C58 80A3B3A8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00C5C 80A3B3AC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 00C60 80A3B3B0 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 00C64 80A3B3B4 8D0871C4 */ lw $t0, 0x71C4($t0) ## 801271C4 +/* 00C58 80A3B3A8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00C5C 80A3B3AC 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00C60 80A3B3B0 3C088012 */ lui $t0, %hi(gUpgradeMasks+0x14) +/* 00C64 80A3B3B4 8D0871C4 */ lw $t0, %lo(gUpgradeMasks+0x14)($t0) /* 00C68 80A3B3B8 8C5900A0 */ lw $t9, 0x00A0($v0) ## 8015E700 -/* 00C6C 80A3B3BC 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 00C70 80A3B3C0 914A71F9 */ lbu $t2, 0x71F9($t2) ## 801271F9 -/* 00C74 80A3B3C4 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 00C78 80A3B3C8 91CE746A */ lbu $t6, 0x746A($t6) ## 8012746A +/* 00C6C 80A3B3BC 3C0A8012 */ lui $t2, %hi(gUpgradeShifts+5) +/* 00C70 80A3B3C0 914A71F9 */ lbu $t2, %lo(gUpgradeShifts+5)($t2) +/* 00C74 80A3B3C4 3C0E8012 */ lui $t6, %hi(gItemSlots+6) +/* 00C78 80A3B3C8 91CE746A */ lbu $t6, %lo(gItemSlots+6)($t6) /* 00C7C 80A3B3CC 03284824 */ and $t1, $t9, $t0 /* 00C80 80A3B3D0 01495807 */ srav $t3, $t1, $t2 /* 00C84 80A3B3D4 000B6040 */ sll $t4, $t3, 1 -/* 00C88 80A3B3D8 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 +/* 00C88 80A3B3D8 3C0D8012 */ lui $t5, %hi(gUpgradeCapacities+0x28) /* 00C8C 80A3B3DC 01AC6821 */ addu $t5, $t5, $t4 /* 00C90 80A3B3E0 004E7821 */ addu $t7, $v0, $t6 /* 00C94 80A3B3E4 81F8008C */ lb $t8, 0x008C($t7) ## 0000008C -/* 00C98 80A3B3E8 95AD7224 */ lhu $t5, 0x7224($t5) ## 80127224 +/* 00C98 80A3B3E8 95AD7224 */ lhu $t5, %lo(gUpgradeCapacities+0x28)($t5) /* 00C9C 80A3B3EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00CA0 80A3B3F0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00CA4 80A3B3F4 030D082A */ slt $at, $t8, $t5 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B464.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B464.s index bf1f3573d4..f59c579a30 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B464.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B464.s @@ -9,8 +9,8 @@ glabel func_80A3B464 /* 00D30 80A3B480 10000011 */ beq $zero, $zero, .L80A3B4C8 /* 00D34 80A3B484 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 .L80A3B488: -/* 00D38 80A3B488 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00D3C 80A3B48C 85CEE694 */ lh $t6, -0x196C($t6) ## 8015E694 +/* 00D38 80A3B488 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) +/* 00D3C 80A3B48C 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) /* 00D40 80A3B490 85F801C8 */ lh $t8, 0x01C8($t7) ## 000001C8 /* 00D44 80A3B494 01D8082A */ slt $at, $t6, $t8 /* 00D48 80A3B498 10200003 */ beq $at, $zero, .L80A3B4A8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B4D8.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B4D8.s index d4475e3b8e..27814d9fa4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B4D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B4D8.s @@ -9,8 +9,8 @@ glabel func_80A3B4D8 /* 00DA4 80A3B4F4 10000011 */ beq $zero, $zero, .L80A3B53C /* 00DA8 80A3B4F8 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 .L80A3B4FC: -/* 00DAC 80A3B4FC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00DB0 80A3B500 85CEE694 */ lh $t6, -0x196C($t6) ## 8015E694 +/* 00DAC 80A3B4FC 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) +/* 00DB0 80A3B500 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) /* 00DB4 80A3B504 85F801C8 */ lh $t8, 0x01C8($t7) ## 000001C8 /* 00DB8 80A3B508 01D8082A */ slt $at, $t6, $t8 /* 00DBC 80A3B50C 10200003 */ beq $at, $zero, .L80A3B51C diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B54C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B54C.s index 4f3e2e45af..06cc98cdad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B54C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B54C.s @@ -9,8 +9,8 @@ glabel func_80A3B54C /* 00E18 80A3B568 10000011 */ beq $zero, $zero, .L80A3B5B0 /* 00E1C 80A3B56C 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 .L80A3B570: -/* 00E20 80A3B570 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00E24 80A3B574 85CEE694 */ lh $t6, -0x196C($t6) ## 8015E694 +/* 00E20 80A3B570 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) +/* 00E24 80A3B574 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) /* 00E28 80A3B578 85F801C8 */ lh $t8, 0x01C8($t7) ## 000001C8 /* 00E2C 80A3B57C 01D8082A */ slt $at, $t6, $t8 /* 00E30 80A3B580 10200003 */ beq $at, $zero, .L80A3B590 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B5C0.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B5C0.s index 30eaf23547..0b4314e1f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B5C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B5C0.s @@ -9,8 +9,8 @@ glabel func_80A3B5C0 /* 00E8C 80A3B5DC 10000011 */ beq $zero, $zero, .L80A3B624 /* 00E90 80A3B5E0 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 .L80A3B5E4: -/* 00E94 80A3B5E4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00E98 80A3B5E8 85CEE694 */ lh $t6, -0x196C($t6) ## 8015E694 +/* 00E94 80A3B5E4 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) +/* 00E98 80A3B5E8 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) /* 00E9C 80A3B5EC 85F801C8 */ lh $t8, 0x01C8($t7) ## 000001C8 /* 00EA0 80A3B5F0 01D8082A */ slt $at, $t6, $t8 /* 00EA4 80A3B5F4 10200003 */ beq $at, $zero, .L80A3B604 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B7BC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B7BC.s index bd08066b68..72ee00cb18 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B7BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B7BC.s @@ -5,8 +5,8 @@ glabel func_80A3B7BC /* 01078 80A3B7C8 AFA5001C */ sw $a1, 0x001C($sp) /* 0107C 80A3B7CC 8FAF001C */ lw $t7, 0x001C($sp) /* 01080 80A3B7D0 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 01084 80A3B7D4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 01088 80A3B7D8 A42EE696 */ sh $t6, -0x196A($at) ## 8015E696 +/* 01084 80A3B7D4 3C018016 */ lui $at, %hi(gSaveContext+0x36) +/* 01088 80A3B7D8 A42EE696 */ sh $t6, %lo(gSaveContext+0x36)($at) /* 0108C 80A3B7DC 85E401C8 */ lh $a0, 0x01C8($t7) ## 000001C8 /* 01090 80A3B7E0 00042023 */ subu $a0, $zero, $a0 /* 01094 80A3B7E4 00042400 */ sll $a0, $a0, 16 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BB6C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BB6C.s index a48a9eed11..5a10bffd79 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BB6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BB6C.s @@ -9,10 +9,10 @@ glabel func_80A3BB6C /* 01424 80A3BB74 AFA40018 */ sw $a0, 0x0018($sp) /* 01428 80A3BB78 84AE001C */ lh $t6, 0x001C($a1) ## 0000001C /* 0142C 80A3BB7C 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 01430 80A3BB80 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 01430 80A3BB80 3C0F8016 */ lui $t7, %hi(gSaveContext+0xf06) /* 01434 80A3BB84 55C10019 */ bnel $t6, $at, .L80A3BBEC /* 01438 80A3BB88 84A401C8 */ lh $a0, 0x01C8($a1) ## 000001C8 -/* 0143C 80A3BB8C 95EFF566 */ lhu $t7, -0x0A9A($t7) ## 8015F566 +/* 0143C 80A3BB8C 95EFF566 */ lhu $t7, %lo(gSaveContext+0xf06)($t7) /* 01440 80A3BB90 3C0180A4 */ lui $at, %hi(D_80A3D0EC) ## $at = 80A40000 /* 01444 80A3BB94 31F80040 */ andi $t8, $t7, 0x0040 ## $t8 = 00000000 /* 01448 80A3BB98 53000014 */ beql $t8, $zero, .L80A3BBEC diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC6C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC6C.s index 9b452b4862..b1ee45f137 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC6C.s @@ -25,57 +25,57 @@ glabel func_80A3BC6C /* 01548 80A3BC98 01E00008 */ jr $t7 /* 0154C 80A3BC9C 00000000 */ nop glabel L80A3BCA0 -/* 01550 80A3BCA0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01554 80A3BCA4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01550 80A3BCA0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01554 80A3BCA4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01558 80A3BCA8 94580EF0 */ lhu $t8, 0x0EF0($v0) ## 8015F550 /* 0155C 80A3BCAC 37190040 */ ori $t9, $t8, 0x0040 ## $t9 = 00000040 /* 01560 80A3BCB0 1000002A */ beq $zero, $zero, .L80A3BD5C /* 01564 80A3BCB4 A4590EF0 */ sh $t9, 0x0EF0($v0) ## 8015F550 glabel L80A3BCB8 -/* 01568 80A3BCB8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0156C 80A3BCBC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01568 80A3BCB8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0156C 80A3BCBC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01570 80A3BCC0 94480EF0 */ lhu $t0, 0x0EF0($v0) ## 8015F550 /* 01574 80A3BCC4 35090080 */ ori $t1, $t0, 0x0080 ## $t1 = 00000080 /* 01578 80A3BCC8 10000024 */ beq $zero, $zero, .L80A3BD5C /* 0157C 80A3BCCC A4490EF0 */ sh $t1, 0x0EF0($v0) ## 8015F550 glabel L80A3BCD0 -/* 01580 80A3BCD0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01584 80A3BCD4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01580 80A3BCD0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01584 80A3BCD4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01588 80A3BCD8 944A0EF0 */ lhu $t2, 0x0EF0($v0) ## 8015F550 /* 0158C 80A3BCDC 354B0100 */ ori $t3, $t2, 0x0100 ## $t3 = 00000100 /* 01590 80A3BCE0 1000001E */ beq $zero, $zero, .L80A3BD5C /* 01594 80A3BCE4 A44B0EF0 */ sh $t3, 0x0EF0($v0) ## 8015F550 glabel L80A3BCE8 -/* 01598 80A3BCE8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0159C 80A3BCEC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01598 80A3BCE8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0159C 80A3BCEC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 015A0 80A3BCF0 944C0EF0 */ lhu $t4, 0x0EF0($v0) ## 8015F550 /* 015A4 80A3BCF4 358D0200 */ ori $t5, $t4, 0x0200 ## $t5 = 00000200 /* 015A8 80A3BCF8 10000018 */ beq $zero, $zero, .L80A3BD5C /* 015AC 80A3BCFC A44D0EF0 */ sh $t5, 0x0EF0($v0) ## 8015F550 glabel L80A3BD00 -/* 015B0 80A3BD00 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 015B4 80A3BD04 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 015B0 80A3BD00 3C028016 */ lui $v0, %hi(gSaveContext) +/* 015B4 80A3BD04 2442E660 */ addiu $v0, %lo(gSaveContext) /* 015B8 80A3BD08 944E0EF0 */ lhu $t6, 0x0EF0($v0) ## 8015F550 /* 015BC 80A3BD0C 35CF0400 */ ori $t7, $t6, 0x0400 ## $t7 = 00000400 /* 015C0 80A3BD10 10000012 */ beq $zero, $zero, .L80A3BD5C /* 015C4 80A3BD14 A44F0EF0 */ sh $t7, 0x0EF0($v0) ## 8015F550 glabel L80A3BD18 -/* 015C8 80A3BD18 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 015CC 80A3BD1C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 015C8 80A3BD18 3C028016 */ lui $v0, %hi(gSaveContext) +/* 015CC 80A3BD1C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 015D0 80A3BD20 94580EF0 */ lhu $t8, 0x0EF0($v0) ## 8015F550 /* 015D4 80A3BD24 37190008 */ ori $t9, $t8, 0x0008 ## $t9 = 00000008 /* 015D8 80A3BD28 1000000C */ beq $zero, $zero, .L80A3BD5C /* 015DC 80A3BD2C A4590EF0 */ sh $t9, 0x0EF0($v0) ## 8015F550 glabel L80A3BD30 -/* 015E0 80A3BD30 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 015E4 80A3BD34 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 015E0 80A3BD30 3C028016 */ lui $v0, %hi(gSaveContext) +/* 015E4 80A3BD34 2442E660 */ addiu $v0, %lo(gSaveContext) /* 015E8 80A3BD38 94480EF0 */ lhu $t0, 0x0EF0($v0) ## 8015F550 /* 015EC 80A3BD3C 35090010 */ ori $t1, $t0, 0x0010 ## $t1 = 00000010 /* 015F0 80A3BD40 10000006 */ beq $zero, $zero, .L80A3BD5C /* 015F4 80A3BD44 A4490EF0 */ sh $t1, 0x0EF0($v0) ## 8015F550 glabel L80A3BD48 -/* 015F8 80A3BD48 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 015FC 80A3BD4C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 015F8 80A3BD48 3C028016 */ lui $v0, %hi(gSaveContext) +/* 015FC 80A3BD4C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01600 80A3BD50 944A0EF0 */ lhu $t2, 0x0EF0($v0) ## 8015F550 /* 01604 80A3BD54 354B0020 */ ori $t3, $t2, 0x0020 ## $t3 = 00000020 /* 01608 80A3BD58 A44B0EF0 */ sh $t3, 0x0EF0($v0) ## 8015F550 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD8C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD8C.s index a6a9eb50d6..c006924379 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD8C.s @@ -30,40 +30,40 @@ glabel func_80A3BD8C /* 01688 80A3BDD8 03000008 */ jr $t8 /* 0168C 80A3BDDC 00000000 */ nop glabel L80A3BDE0 -/* 01690 80A3BDE0 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 01694 80A3BDE4 9739F556 */ lhu $t9, -0x0AAA($t9) ## 8015F556 +/* 01690 80A3BDE0 3C198016 */ lui $t9, %hi(gSaveContext+0xef6) +/* 01694 80A3BDE4 9739F556 */ lhu $t9, %lo(gSaveContext+0xef6)($t9) /* 01698 80A3BDE8 33280100 */ andi $t0, $t9, 0x0100 ## $t0 = 00000000 /* 0169C 80A3BDEC 1100001E */ beq $t0, $zero, .L80A3BE68 /* 016A0 80A3BDF0 00000000 */ nop /* 016A4 80A3BDF4 1000001C */ beq $zero, $zero, .L80A3BE68 /* 016A8 80A3BDF8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 glabel L80A3BDFC -/* 016AC 80A3BDFC 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 016B0 80A3BE00 9529F556 */ lhu $t1, -0x0AAA($t1) ## 8015F556 +/* 016AC 80A3BDFC 3C098016 */ lui $t1, %hi(gSaveContext+0xef6) +/* 016B0 80A3BE00 9529F556 */ lhu $t1, %lo(gSaveContext+0xef6)($t1) /* 016B4 80A3BE04 312A0400 */ andi $t2, $t1, 0x0400 ## $t2 = 00000000 /* 016B8 80A3BE08 11400017 */ beq $t2, $zero, .L80A3BE68 /* 016BC 80A3BE0C 00000000 */ nop /* 016C0 80A3BE10 10000015 */ beq $zero, $zero, .L80A3BE68 /* 016C4 80A3BE14 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 glabel L80A3BE18 -/* 016C8 80A3BE18 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 016CC 80A3BE1C 956BF556 */ lhu $t3, -0x0AAA($t3) ## 8015F556 +/* 016C8 80A3BE18 3C0B8016 */ lui $t3, %hi(gSaveContext+0xef6) +/* 016CC 80A3BE1C 956BF556 */ lhu $t3, %lo(gSaveContext+0xef6)($t3) /* 016D0 80A3BE20 316C0200 */ andi $t4, $t3, 0x0200 ## $t4 = 00000000 /* 016D4 80A3BE24 11800010 */ beq $t4, $zero, .L80A3BE68 /* 016D8 80A3BE28 00000000 */ nop /* 016DC 80A3BE2C 1000000E */ beq $zero, $zero, .L80A3BE68 /* 016E0 80A3BE30 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 glabel L80A3BE34 -/* 016E4 80A3BE34 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 016E8 80A3BE38 95ADF556 */ lhu $t5, -0x0AAA($t5) ## 8015F556 +/* 016E4 80A3BE34 3C0D8016 */ lui $t5, %hi(gSaveContext+0xef6) +/* 016E8 80A3BE38 95ADF556 */ lhu $t5, %lo(gSaveContext+0xef6)($t5) /* 016EC 80A3BE3C 31AE0800 */ andi $t6, $t5, 0x0800 ## $t6 = 00000000 /* 016F0 80A3BE40 11C00009 */ beq $t6, $zero, .L80A3BE68 /* 016F4 80A3BE44 00000000 */ nop /* 016F8 80A3BE48 10000007 */ beq $zero, $zero, .L80A3BE68 /* 016FC 80A3BE4C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 glabel L80A3BE50 -/* 01700 80A3BE50 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 01704 80A3BE54 95EFF556 */ lhu $t7, -0x0AAA($t7) ## 8015F556 +/* 01700 80A3BE50 3C0F8016 */ lui $t7, %hi(gSaveContext+0xef6) +/* 01704 80A3BE54 95EFF556 */ lhu $t7, %lo(gSaveContext+0xef6)($t7) /* 01708 80A3BE58 31F80800 */ andi $t8, $t7, 0x0800 ## $t8 = 00000000 /* 0170C 80A3BE5C 13000002 */ beq $t8, $zero, .L80A3BE68 /* 01710 80A3BE60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BF54.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BF54.s index 16cd344713..f8bd346673 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BF54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BF54.s @@ -9,14 +9,14 @@ glabel func_80A3BF54 /* 01820 80A3BF70 28410026 */ slti $at, $v0, 0x0026 /* 01824 80A3BF74 10200016 */ beq $at, $zero, .L80A3BFD0 /* 01828 80A3BF78 2443FFE2 */ addiu $v1, $v0, 0xFFE2 ## $v1 = FFFFFFE2 -/* 0182C 80A3BF7C 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 01830 80A3BF80 91CE7485 */ lbu $t6, 0x7485($t6) ## 80127485 -/* 01834 80A3BF84 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0182C 80A3BF7C 3C0E8012 */ lui $t6, %hi(gItemSlots+0x21) +/* 01830 80A3BF80 91CE7485 */ lbu $t6, %lo(gItemSlots+0x21)($t6) +/* 01834 80A3BF84 3C0F8016 */ lui $t7, %hi(gSaveContext+0x74) /* 01838 80A3BF88 0003C040 */ sll $t8, $v1, 1 /* 0183C 80A3BF8C 3C1980A4 */ lui $t9, %hi(D_80A3C658) ## $t9 = 80A40000 /* 01840 80A3BF90 0338C821 */ addu $t9, $t9, $t8 /* 01844 80A3BF94 01EE7821 */ addu $t7, $t7, $t6 -/* 01848 80A3BF98 91EFE6D4 */ lbu $t7, -0x192C($t7) ## 8015E6D4 +/* 01848 80A3BF98 91EFE6D4 */ lbu $t7, %lo(gSaveContext+0x74)($t7) /* 0184C 80A3BF9C 8739C658 */ lh $t9, %lo(D_80A3C658)($t9) /* 01850 80A3BFA0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 01854 80A3BFA4 15F90006 */ bne $t7, $t9, .L80A3BFC0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BFE4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BFE4.s index 7d8952c972..94e4df8bb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BFE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BFE4.s @@ -48,8 +48,8 @@ glabel func_80A3BFE4 /* 01904 80A3C054 01000008 */ jr $t0 /* 01908 80A3C058 00000000 */ nop glabel L80A3C05C -/* 0190C 80A3C05C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 01910 80A3C060 9529F556 */ lhu $t1, -0x0AAA($t1) ## 8015F556 +/* 0190C 80A3C05C 3C098016 */ lui $t1, %hi(gSaveContext+0xef6) +/* 01910 80A3C060 9529F556 */ lhu $t1, %lo(gSaveContext+0xef6)($t1) /* 01914 80A3C064 3C0F80A4 */ lui $t7, %hi(D_80A3C674) ## $t7 = 80A40000 /* 01918 80A3C068 25EFC674 */ addiu $t7, $t7, %lo(D_80A3C674) ## $t7 = 80A3C674 /* 0191C 80A3C06C 312A0100 */ andi $t2, $t1, 0x0100 ## $t2 = 00000000 @@ -71,8 +71,8 @@ glabel L80A3C05C /* 01954 80A3C0A4 10000076 */ beq $zero, $zero, .L80A3C280 /* 01958 80A3C0A8 A61901A0 */ sh $t9, 0x01A0($s0) ## 000001A0 glabel L80A3C0AC -/* 0195C 80A3C0AC 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 01960 80A3C0B0 9508F556 */ lhu $t0, -0x0AAA($t0) ## 8015F556 +/* 0195C 80A3C0AC 3C088016 */ lui $t0, %hi(gSaveContext+0xef6) +/* 01960 80A3C0B0 9508F556 */ lhu $t0, %lo(gSaveContext+0xef6)($t0) /* 01964 80A3C0B4 3C0E80A4 */ lui $t6, %hi(D_80A3C674) ## $t6 = 80A40000 /* 01968 80A3C0B8 25CEC674 */ addiu $t6, $t6, %lo(D_80A3C674) ## $t6 = 80A3C674 /* 0196C 80A3C0BC 31090400 */ andi $t1, $t0, 0x0400 ## $t1 = 00000000 @@ -94,8 +94,8 @@ glabel L80A3C0AC /* 019A4 80A3C0F4 10000062 */ beq $zero, $zero, .L80A3C280 /* 019A8 80A3C0F8 A61801A0 */ sh $t8, 0x01A0($s0) ## 000001A0 glabel L80A3C0FC -/* 019AC 80A3C0FC 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 019B0 80A3C100 9739F556 */ lhu $t9, -0x0AAA($t9) ## 8015F556 +/* 019AC 80A3C0FC 3C198016 */ lui $t9, %hi(gSaveContext+0xef6) +/* 019B0 80A3C100 9739F556 */ lhu $t9, %lo(gSaveContext+0xef6)($t9) /* 019B4 80A3C104 3C0D80A4 */ lui $t5, %hi(D_80A3C674) ## $t5 = 80A40000 /* 019B8 80A3C108 25ADC674 */ addiu $t5, $t5, %lo(D_80A3C674) ## $t5 = 80A3C674 /* 019BC 80A3C10C 33280200 */ andi $t0, $t9, 0x0200 ## $t0 = 00000000 @@ -117,8 +117,8 @@ glabel L80A3C0FC /* 019F4 80A3C144 1000004E */ beq $zero, $zero, .L80A3C280 /* 019F8 80A3C148 A60F01A0 */ sh $t7, 0x01A0($s0) ## 000001A0 glabel L80A3C14C -/* 019FC 80A3C14C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 01A00 80A3C150 9718F556 */ lhu $t8, -0x0AAA($t8) ## 8015F556 +/* 019FC 80A3C14C 3C188016 */ lui $t8, %hi(gSaveContext+0xef6) +/* 01A00 80A3C150 9718F556 */ lhu $t8, %lo(gSaveContext+0xef6)($t8) /* 01A04 80A3C154 3C0C80A4 */ lui $t4, %hi(D_80A3C674) ## $t4 = 80A40000 /* 01A08 80A3C158 258CC674 */ addiu $t4, $t4, %lo(D_80A3C674) ## $t4 = 80A3C674 /* 01A0C 80A3C15C 33190800 */ andi $t9, $t8, 0x0800 ## $t9 = 00000000 @@ -140,8 +140,8 @@ glabel L80A3C14C /* 01A44 80A3C194 1000003A */ beq $zero, $zero, .L80A3C280 /* 01A48 80A3C198 A60E01A0 */ sh $t6, 0x01A0($s0) ## 000001A0 glabel L80A3C19C -/* 01A4C 80A3C19C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 01A50 80A3C1A0 95EFF556 */ lhu $t7, -0x0AAA($t7) ## 8015F556 +/* 01A4C 80A3C19C 3C0F8016 */ lui $t7, %hi(gSaveContext+0xef6) +/* 01A50 80A3C1A0 95EFF556 */ lhu $t7, %lo(gSaveContext+0xef6)($t7) /* 01A54 80A3C1A4 3C0C80A4 */ lui $t4, %hi(D_80A3C674) ## $t4 = 80A40000 /* 01A58 80A3C1A8 258CC674 */ addiu $t4, $t4, %lo(D_80A3C674) ## $t4 = 80A3C674 /* 01A5C 80A3C1AC 31F80800 */ andi $t8, $t7, 0x0800 ## $t8 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D7C8.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D7C8.s index 33cac0a120..6e1e2fd017 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D7C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D7C8.s @@ -1,16 +1,16 @@ glabel func_80A3D7C8 -/* 000E8 80A3D7C8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 000EC 80A3D7CC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 000E8 80A3D7C8 3C038016 */ lui $v1, %hi(gSaveContext) +/* 000EC 80A3D7CC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 000F0 80A3D7D0 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 /* 000F4 80A3D7D4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 000F8 80A3D7D8 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 /* 000FC 80A3D7DC 11C00003 */ beq $t6, $zero, .L80A3D7EC -/* 00100 80A3D7E0 3C048012 */ lui $a0, 0x8012 ## $a0 = 80120000 +/* 00100 80A3D7E0 3C048012 */ lui $a0, %hi(gBitFlags) /* 00104 80A3D7E4 10000001 */ beq $zero, $zero, .L80A3D7EC /* 00108 80A3D7E8 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 .L80A3D7EC: /* 0010C 80A3D7EC 14410003 */ bne $v0, $at, .L80A3D7FC -/* 00110 80A3D7F0 24847120 */ addiu $a0, $a0, 0x7120 ## $a0 = 80127120 +/* 00110 80A3D7F0 24847120 */ addiu $a0, %lo(gBitFlags) /* 00114 80A3D7F4 03E00008 */ jr $ra /* 00118 80A3D7F8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A3D7FC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s index a919504197..24f6894b51 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s @@ -41,10 +41,10 @@ glabel func_80A3D838 /* 001F0 80A3D8D0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 001F4 80A3D8D4 248402B8 */ addiu $a0, $a0, 0x02B8 ## $a0 = 060002B8 /* 001F8 80A3D8D8 01816821 */ addu $t5, $t4, $at -/* 001FC 80A3D8DC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 001FC 80A3D8DC 3C018016 */ lui $at, %hi(gSegments+0x18) /* 00200 80A3D8E0 0C028800 */ jal SkelAnime_GetFrameCount -/* 00204 80A3D8E4 AC2D6FC0 */ sw $t5, 0x6FC0($at) ## 80166FC0 +/* 00204 80A3D8E4 AC2D6FC0 */ sw $t5, %lo(gSegments+0x18)($at) /* 00208 80A3D8E8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0020C 80A3D8EC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00210 80A3D8F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 @@ -72,8 +72,8 @@ glabel func_80A3D838 /* 00260 80A3D940 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00264 80A3D944 0C017114 */ jal func_8005C450 /* 00268 80A3D948 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0026C 80A3D94C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00270 80A3D950 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0026C 80A3D94C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00270 80A3D950 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00274 80A3D954 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00278 80A3D958 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0027C 80A3D95C 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DA50.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DA50.s index 3f7333452c..ce0bd09afa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DA50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DA50.s @@ -7,7 +7,7 @@ glabel func_80A3DA50 /* 00384 80A3DA64 8FA40018 */ lw $a0, 0x0018($sp) /* 00388 80A3DA68 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0038C 80A3DA6C 10410014 */ beq $v0, $at, .L80A3DAC0 -/* 00390 80A3DA70 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 00390 80A3DA70 3C088016 */ lui $t0, %hi(gSaveContext+0xf0e) /* 00394 80A3DA74 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 00398 80A3DA78 1041001B */ beq $v0, $at, .L80A3DAE8 /* 0039C 80A3DA7C 240C304E */ addiu $t4, $zero, 0x304E ## $t4 = 0000304E @@ -17,8 +17,8 @@ glabel func_80A3DA50 /* 003AC 80A3DA8C 1000001A */ beq $zero, $zero, .L80A3DAF8 /* 003B0 80A3DA90 8FBF0014 */ lw $ra, 0x0014($sp) .L80A3DA94: -/* 003B4 80A3DA94 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 003B8 80A3DA98 95CEF56E */ lhu $t6, -0x0A92($t6) ## 8015F56E +/* 003B4 80A3DA94 3C0E8016 */ lui $t6, %hi(gSaveContext+0xf0e) +/* 003B8 80A3DA98 95CEF56E */ lhu $t6, %lo(gSaveContext+0xf0e)($t6) /* 003BC 80A3DA9C 2418304B */ addiu $t8, $zero, 0x304B ## $t8 = 0000304B /* 003C0 80A3DAA0 2419304A */ addiu $t9, $zero, 0x304A ## $t9 = 0000304A /* 003C4 80A3DAA4 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 @@ -30,7 +30,7 @@ glabel func_80A3DA50 /* 003D8 80A3DAB8 1000000E */ beq $zero, $zero, .L80A3DAF4 /* 003DC 80A3DABC A499010E */ sh $t9, 0x010E($a0) ## 0000010E .L80A3DAC0: -/* 003E0 80A3DAC0 9508F56E */ lhu $t0, -0x0A92($t0) ## 8015F56E +/* 003E0 80A3DAC0 9508F56E */ lhu $t0, %lo(gSaveContext+0xf0e)($t0) /* 003E4 80A3DAC4 240A304F */ addiu $t2, $zero, 0x304F ## $t2 = 0000304F /* 003E8 80A3DAC8 240B304C */ addiu $t3, $zero, 0x304C ## $t3 = 0000304C /* 003EC 80A3DACC 31090002 */ andi $t1, $t0, 0x0002 ## $t1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DC44.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DC44.s index d677e007e7..248ec97fe3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DC44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DC44.s @@ -42,8 +42,8 @@ glabel func_80A3DC44 /* 005F0 80A3DCD0 10000027 */ beq $zero, $zero, .L80A3DD70 /* 005F4 80A3DCD4 8FBF0014 */ lw $ra, 0x0014($sp) .L80A3DCD8: -/* 005F8 80A3DCD8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 005FC 80A3DCDC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 005F8 80A3DCD8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 005FC 80A3DCDC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00600 80A3DCE0 944F0F0E */ lhu $t7, 0x0F0E($v0) ## 8015F56E /* 00604 80A3DCE4 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 /* 00608 80A3DCE8 A4580F0E */ sh $t8, 0x0F0E($v0) ## 8015F56E @@ -53,8 +53,8 @@ glabel func_80A3DC44 /* 00614 80A3DCF4 1000001D */ beq $zero, $zero, .L80A3DD6C /* 00618 80A3DCF8 AC99026C */ sw $t9, 0x026C($a0) ## 0000026C .L80A3DCFC: -/* 0061C 80A3DCFC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00620 80A3DD00 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0061C 80A3DCFC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00620 80A3DD00 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00624 80A3DD04 94480F0E */ lhu $t0, 0x0F0E($v0) ## 8015F56E /* 00628 80A3DD08 35090002 */ ori $t1, $t0, 0x0002 ## $t1 = 00000002 /* 0062C 80A3DD0C A4490F0E */ sh $t1, 0x0F0E($v0) ## 8015F56E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DE10.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DE10.s index b64deec8be..86a263975a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DE10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DE10.s @@ -16,7 +16,7 @@ glabel func_80A3DE10 /* 00768 80A3DE48 00501021 */ addu $v0, $v0, $s0 /* 0076C 80A3DE4C 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD /* 00770 80A3DE50 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00774 80A3DE54 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 00774 80A3DE54 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) /* 00778 80A3DE58 10400005 */ beq $v0, $zero, .L80A3DE70 /* 0077C 80A3DE5C 00000000 */ nop /* 00780 80A3DE60 1041001C */ beq $v0, $at, .L80A3DED4 @@ -24,7 +24,7 @@ glabel func_80A3DE10 /* 00788 80A3DE68 10000021 */ beq $zero, $zero, .L80A3DEF0 /* 0078C 80A3DE6C 8FBF0024 */ lw $ra, 0x0024($sp) .L80A3DE70: -/* 00790 80A3DE70 85CEE694 */ lh $t6, -0x196C($t6) ## 8015E694 +/* 00790 80A3DE70 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) /* 00794 80A3DE74 8FA40028 */ lw $a0, 0x0028($sp) /* 00798 80A3DE78 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0079C 80A3DE7C 29C100C8 */ slti $at, $t6, 0x00C8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DFBC.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DFBC.s index bc307f688d..ed2b584c6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DFBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DFBC.s @@ -13,8 +13,8 @@ glabel func_80A3DFBC /* 00908 80A3DFE8 8F3917B4 */ lw $t9, 0x17B4($t9) ## 000117B4 /* 0090C 80A3DFEC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00910 80A3DFF0 03214021 */ addu $t0, $t9, $at -/* 00914 80A3DFF4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00918 80A3DFF8 AC286FC0 */ sw $t0, 0x6FC0($at) ## 80166FC0 +/* 00914 80A3DFF4 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 00918 80A3DFF8 AC286FC0 */ sw $t0, %lo(gSegments+0x18)($at) /* 0091C 80A3DFFC 848902BE */ lh $t1, 0x02BE($a0) ## 000002BE /* 00920 80A3E000 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 /* 00924 80A3E004 A48A02BE */ sh $t2, 0x02BE($a0) ## 000002BE diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s index 5581a0a6b7..de9d8ddf66 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s @@ -29,12 +29,12 @@ glabel func_80A3E1EC /* 00B50 80A3E230 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00B54 80A3E234 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 00B58 80A3E238 3C0480A4 */ lui $a0, %hi(D_80A3E384) ## $a0 = 80A40000 -/* 00B5C 80A3E23C 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 00B5C 80A3E23C 3C068016 */ lui $a2, %hi(gSegments) /* 00B60 80A3E240 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 /* 00B64 80A3E244 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 /* 00B68 80A3E248 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 /* 00B6C 80A3E24C 920902C2 */ lbu $t1, 0x02C2($s0) ## 000002C2 -/* 00B70 80A3E250 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 00B70 80A3E250 24C66FA8 */ addiu $a2, %lo(gSegments) /* 00B74 80A3E254 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 /* 00B78 80A3E258 00095080 */ sll $t2, $t1, 2 /* 00B7C 80A3E25C 008A2021 */ addu $a0, $a0, $t2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s index e2819c6b7e..c187e9d23f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s @@ -58,11 +58,11 @@ glabel EnGo_Draw /* 02F98 80A41508 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 02F9C 80A4150C 00045100 */ sll $t2, $a0, 4 /* 02FA0 80A41510 000A5F02 */ srl $t3, $t2, 28 -/* 02FA4 80A41514 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 02FA4 80A41514 3C068016 */ lui $a2, %hi(gSegments) /* 02FA8 80A41518 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 02FAC 80A4151C 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 /* 02FB0 80A41520 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 02FB4 80A41524 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 02FB4 80A41524 24C66FA8 */ addiu $a2, %lo(gSegments) /* 02FB8 80A41528 000B6080 */ sll $t4, $t3, 2 /* 02FBC 80A4152C ACB902C0 */ sw $t9, 0x02C0($a1) ## 000002C0 /* 02FC0 80A41530 00CC6821 */ addu $t5, $a2, $t4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s index 670914cbe3..ace2459645 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s @@ -20,8 +20,8 @@ glabel EnGo_Init /* 01604 80A3FB74 AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFE0 /* 01608 80A3FB78 8D2B0008 */ lw $t3, 0x0008($t1) ## 80A41BB0 /* 0160C 80A3FB7C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01610 80A3FB80 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 01614 80A3FB84 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 01610 80A3FB80 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 01614 80A3FB84 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 01618 80A3FB88 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 0161C 80A3FB8C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 01620 80A3FB90 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 @@ -116,12 +116,12 @@ glabel L80A3FCC8 /* 01760 80A3FCD0 0C00B58B */ jal Actor_SetScale /* 01764 80A3FCD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01768 80A3FCD8 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 0176C 80A3FCDC 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 -/* 01770 80A3FCE0 912971F2 */ lbu $t1, 0x71F2($t1) ## 801271F2 -/* 01774 80A3FCE4 8D087124 */ lw $t0, 0x7124($t0) ## 80127124 -/* 01778 80A3FCE8 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 0177C 80A3FCEC 956BE6FC */ lhu $t3, -0x1904($t3) ## 8015E6FC +/* 01768 80A3FCD8 3C088012 */ lui $t0, %hi(gBitFlags+4) +/* 0176C 80A3FCDC 3C098012 */ lui $t1, %hi(gEquipShifts+2) +/* 01770 80A3FCE0 912971F2 */ lbu $t1, %lo(gEquipShifts+2)($t1) +/* 01774 80A3FCE4 8D087124 */ lw $t0, %lo(gBitFlags+4)($t0) +/* 01778 80A3FCE8 3C0B8016 */ lui $t3, %hi(gSaveContext+0x9c) +/* 0177C 80A3FCEC 956BE6FC */ lhu $t3, %lo(gSaveContext+0x9c)($t3) /* 01780 80A3FCF0 01285004 */ sllv $t2, $t0, $t1 /* 01784 80A3FCF4 3C0144AF */ lui $at, 0x44AF ## $at = 44AF0000 /* 01788 80A3FCF8 014B6024 */ and $t4, $t2, $t3 @@ -167,8 +167,8 @@ glabel L80A3FD50 /* 01818 80A3FD88 10000038 */ beq $zero, $zero, .L80A3FE6C /* 0181C 80A3FD8C 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A3FD90 -/* 01820 80A3FD90 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 01824 80A3FD94 95ADF574 */ lhu $t5, -0x0A8C($t5) ## 8015F574 +/* 01820 80A3FD90 3C0D8016 */ lui $t5, %hi(gSaveContext+0xf14) +/* 01824 80A3FD94 95ADF574 */ lhu $t5, %lo(gSaveContext+0xf14)($t5) /* 01828 80A3FD98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0182C 80A3FD9C 31AE0800 */ andi $t6, $t5, 0x0800 ## $t6 = 00000000 /* 01830 80A3FDA0 51C00004 */ beql $t6, $zero, .L80A3FDB4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E578.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E578.s index 774c621dc1..afe49d9607 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E578.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E578.s @@ -8,7 +8,7 @@ glabel func_80A3E578 /* 00020 80A3E590 14200005 */ bne $at, $zero, .L80A3E5A8 /* 00024 80A3E594 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 /* 00028 80A3E598 1041000B */ beq $v0, $at, .L80A3E5C8 -/* 0002C 80A3E59C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 0002C 80A3E59C 3C038016 */ lui $v1, %hi(gSaveContext) /* 00030 80A3E5A0 100000D5 */ beq $zero, $zero, .L80A3E8F8 /* 00034 80A3E5A4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A3E5A8: @@ -21,15 +21,15 @@ glabel func_80A3E578 /* 00050 80A3E5C0 01C00008 */ jr $t6 /* 00054 80A3E5C4 00000000 */ nop .L80A3E5C8: -/* 00058 80A3E5C8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00058 80A3E5C8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0005C 80A3E5CC 906F003E */ lbu $t7, 0x003E($v1) ## 8015E69E -/* 00060 80A3E5D0 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 +/* 00060 80A3E5D0 3C188012 */ lui $t8, %hi(gItemSlots+0x2d) /* 00064 80A3E5D4 11E00003 */ beq $t7, $zero, .L80A3E5E4 /* 00068 80A3E5D8 00000000 */ nop /* 0006C 80A3E5DC 100000C6 */ beq $zero, $zero, .L80A3E8F8 /* 00070 80A3E5E0 2402305E */ addiu $v0, $zero, 0x305E ## $v0 = 0000305E .L80A3E5E4: -/* 00074 80A3E5E4 93187491 */ lbu $t8, 0x7491($t8) ## 80127491 +/* 00074 80A3E5E4 93187491 */ lbu $t8, %lo(gItemSlots+0x2d)($t8) /* 00078 80A3E5E8 0078C821 */ addu $t9, $v1, $t8 /* 0007C 80A3E5EC 93220074 */ lbu $v0, 0x0074($t9) ## 00000074 /* 00080 80A3E5F0 28410037 */ slti $at, $v0, 0x0037 @@ -63,12 +63,12 @@ glabel func_80A3E578 /* 000E0 80A3E650 100000A9 */ beq $zero, $zero, .L80A3E8F8 /* 000E4 80A3E654 24023053 */ addiu $v0, $zero, 0x3053 ## $v0 = 00003053 glabel L80A3E658 -/* 000E8 80A3E658 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 000EC 80A3E65C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 000F0 80A3E660 3C028012 */ lui $v0, 0x8012 ## $v0 = 80120000 -/* 000F4 80A3E664 8C427124 */ lw $v0, 0x7124($v0) ## 80127124 +/* 000E8 80A3E658 3C038016 */ lui $v1, %hi(gSaveContext) +/* 000EC 80A3E65C 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 000F0 80A3E660 3C028012 */ lui $v0, %hi(gBitFlags+4) +/* 000F4 80A3E664 8C427124 */ lw $v0, %lo(gBitFlags+4)($v0) /* 000F8 80A3E668 8C6A00A4 */ lw $t2, 0x00A4($v1) ## 8015E704 -/* 000FC 80A3E66C 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 +/* 000FC 80A3E66C 3C0E8012 */ lui $t6, %hi(gEquipShifts+2) /* 00100 80A3E670 004A5824 */ and $t3, $v0, $t2 /* 00104 80A3E674 11600009 */ beq $t3, $zero, .L80A3E69C /* 00108 80A3E678 00000000 */ nop @@ -82,7 +82,7 @@ glabel L80A3E658 /* 00124 80A3E694 10000098 */ beq $zero, $zero, .L80A3E8F8 /* 00128 80A3E698 24023041 */ addiu $v0, $zero, 0x3041 ## $v0 = 00003041 .L80A3E69C: -/* 0012C 80A3E69C 91CE71F2 */ lbu $t6, 0x71F2($t6) ## 801271F2 +/* 0012C 80A3E69C 91CE71F2 */ lbu $t6, %lo(gEquipShifts+2)($t6) /* 00130 80A3E6A0 9478009C */ lhu $t8, 0x009C($v1) ## 8015E6FC /* 00134 80A3E6A4 01C27804 */ sllv $t7, $v0, $t6 /* 00138 80A3E6A8 01F8C824 */ and $t9, $t7, $t8 @@ -127,10 +127,10 @@ glabel L80A3E70C /* 001B4 80A3E724 10000074 */ beq $zero, $zero, .L80A3E8F8 /* 001B8 80A3E728 24023051 */ addiu $v0, $zero, 0x3051 ## $v0 = 00003051 glabel L80A3E72C -/* 001BC 80A3E72C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 001C0 80A3E730 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 001C4 80A3E734 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 -/* 001C8 80A3E738 8DAD716C */ lw $t5, 0x716C($t5) ## 8012716C +/* 001BC 80A3E72C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 001C0 80A3E730 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 001C4 80A3E734 3C0D8012 */ lui $t5, %hi(gBitFlags+0x4c) +/* 001C8 80A3E738 8DAD716C */ lw $t5, %lo(gBitFlags+0x4c)($t5) /* 001CC 80A3E73C 8C6E00A4 */ lw $t6, 0x00A4($v1) ## 8015E704 /* 001D0 80A3E740 01AE7824 */ and $t7, $t5, $t6 /* 001D4 80A3E744 51E00004 */ beql $t7, $zero, .L80A3E758 @@ -155,10 +155,10 @@ glabel L80A3E72C /* 00214 80A3E784 1000005C */ beq $zero, $zero, .L80A3E8F8 /* 00218 80A3E788 24023008 */ addiu $v0, $zero, 0x3008 ## $v0 = 00003008 glabel L80A3E78C -/* 0021C 80A3E78C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00220 80A3E790 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00224 80A3E794 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 00228 80A3E798 8D4A716C */ lw $t2, 0x716C($t2) ## 8012716C +/* 0021C 80A3E78C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00220 80A3E790 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 00224 80A3E794 3C0A8012 */ lui $t2, %hi(gBitFlags+0x4c) +/* 00228 80A3E798 8D4A716C */ lw $t2, %lo(gBitFlags+0x4c)($t2) /* 0022C 80A3E79C 8C6B00A4 */ lw $t3, 0x00A4($v1) ## 8015E704 /* 00230 80A3E7A0 014B6024 */ and $t4, $t2, $t3 /* 00234 80A3E7A4 51800004 */ beql $t4, $zero, .L80A3E7B8 @@ -176,10 +176,10 @@ glabel L80A3E78C /* 0025C 80A3E7CC 1000004A */ beq $zero, $zero, .L80A3E8F8 /* 00260 80A3E7D0 24023009 */ addiu $v0, $zero, 0x3009 ## $v0 = 00003009 glabel L80A3E7D4 -/* 00264 80A3E7D4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00268 80A3E7D8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 0026C 80A3E7DC 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 00270 80A3E7E0 8DEF716C */ lw $t7, 0x716C($t7) ## 8012716C +/* 00264 80A3E7D4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00268 80A3E7D8 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 0026C 80A3E7DC 3C0F8012 */ lui $t7, %hi(gBitFlags+0x4c) +/* 00270 80A3E7E0 8DEF716C */ lw $t7, %lo(gBitFlags+0x4c)($t7) /* 00274 80A3E7E4 8C7800A4 */ lw $t8, 0x00A4($v1) ## 8015E704 /* 00278 80A3E7E8 01F8C824 */ and $t9, $t7, $t8 /* 0027C 80A3E7EC 53200004 */ beql $t9, $zero, .L80A3E800 @@ -197,10 +197,10 @@ glabel L80A3E7D4 /* 002A4 80A3E814 10000038 */ beq $zero, $zero, .L80A3E8F8 /* 002A8 80A3E818 2402300A */ addiu $v0, $zero, 0x300A ## $v0 = 0000300A glabel L80A3E81C -/* 002AC 80A3E81C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 002B0 80A3E820 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 002B4 80A3E824 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 002B8 80A3E828 8D4A716C */ lw $t2, 0x716C($t2) ## 8012716C +/* 002AC 80A3E81C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 002B0 80A3E820 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 002B4 80A3E824 3C0A8012 */ lui $t2, %hi(gBitFlags+0x4c) +/* 002B8 80A3E828 8D4A716C */ lw $t2, %lo(gBitFlags+0x4c)($t2) /* 002BC 80A3E82C 8C6B00A4 */ lw $t3, 0x00A4($v1) ## 8015E704 /* 002C0 80A3E830 014B6024 */ and $t4, $t2, $t3 /* 002C4 80A3E834 51800004 */ beql $t4, $zero, .L80A3E848 @@ -218,10 +218,10 @@ glabel L80A3E81C /* 002EC 80A3E85C 10000026 */ beq $zero, $zero, .L80A3E8F8 /* 002F0 80A3E860 24023014 */ addiu $v0, $zero, 0x3014 ## $v0 = 00003014 glabel L80A3E864 -/* 002F4 80A3E864 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 002F8 80A3E868 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 002FC 80A3E86C 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 00300 80A3E870 8DEF716C */ lw $t7, 0x716C($t7) ## 8012716C +/* 002F4 80A3E864 3C038016 */ lui $v1, %hi(gSaveContext) +/* 002F8 80A3E868 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 002FC 80A3E86C 3C0F8012 */ lui $t7, %hi(gBitFlags+0x4c) +/* 00300 80A3E870 8DEF716C */ lw $t7, %lo(gBitFlags+0x4c)($t7) /* 00304 80A3E874 8C7800A4 */ lw $t8, 0x00A4($v1) ## 8015E704 /* 00308 80A3E878 01F8C824 */ and $t9, $t7, $t8 /* 0030C 80A3E87C 53200004 */ beql $t9, $zero, .L80A3E890 @@ -239,10 +239,10 @@ glabel L80A3E864 /* 00334 80A3E8A4 10000014 */ beq $zero, $zero, .L80A3E8F8 /* 00338 80A3E8A8 24023016 */ addiu $v0, $zero, 0x3016 ## $v0 = 00003016 glabel L80A3E8AC -/* 0033C 80A3E8AC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00340 80A3E8B0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00344 80A3E8B4 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 00348 80A3E8B8 8D4A716C */ lw $t2, 0x716C($t2) ## 8012716C +/* 0033C 80A3E8AC 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00340 80A3E8B0 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 00344 80A3E8B4 3C0A8012 */ lui $t2, %hi(gBitFlags+0x4c) +/* 00348 80A3E8B8 8D4A716C */ lw $t2, %lo(gBitFlags+0x4c)($t2) /* 0034C 80A3E8BC 8C6B00A4 */ lw $t3, 0x00A4($v1) ## 8015E704 /* 00350 80A3E8C0 014B6024 */ and $t4, $t2, $t3 /* 00354 80A3E8C4 51800004 */ beql $t4, $zero, .L80A3E8D8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E908.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E908.s index ae03dd998f..7b27c30177 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E908.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E908.s @@ -50,40 +50,40 @@ glabel L80A3E970 /* 00450 80A3E9C0 03000008 */ jr $t8 /* 00454 80A3E9C4 00000000 */ nop glabel L80A3E9C8 -/* 00458 80A3E9C8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0045C 80A3E9CC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00458 80A3E9C8 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0045C 80A3E9CC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00460 80A3E9D0 94790F14 */ lhu $t9, 0x0F14($v1) ## 8015F574 /* 00464 80A3E9D4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00468 80A3E9D8 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 /* 0046C 80A3E9DC 100000CC */ beq $zero, $zero, .L80A3ED10 /* 00470 80A3E9E0 A4680F14 */ sh $t0, 0x0F14($v1) ## 8015F574 glabel L80A3E9E4 -/* 00474 80A3E9E4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00478 80A3E9E8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00474 80A3E9E4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00478 80A3E9E8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0047C 80A3E9EC 94690F14 */ lhu $t1, 0x0F14($v1) ## 8015F574 /* 00480 80A3E9F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00484 80A3E9F4 352A0800 */ ori $t2, $t1, 0x0800 ## $t2 = 00000800 /* 00488 80A3E9F8 100000C5 */ beq $zero, $zero, .L80A3ED10 /* 0048C 80A3E9FC A46A0F14 */ sh $t2, 0x0F14($v1) ## 8015F574 glabel L80A3EA00 -/* 00490 80A3EA00 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00494 80A3EA04 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00490 80A3EA00 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00494 80A3EA04 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00498 80A3EA08 946B0F16 */ lhu $t3, 0x0F16($v1) ## 8015F576 /* 0049C 80A3EA0C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 004A0 80A3EA10 356C0001 */ ori $t4, $t3, 0x0001 ## $t4 = 00000001 /* 004A4 80A3EA14 100000BE */ beq $zero, $zero, .L80A3ED10 /* 004A8 80A3EA18 A46C0F16 */ sh $t4, 0x0F16($v1) ## 8015F576 glabel L80A3EA1C -/* 004AC 80A3EA1C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 004B0 80A3EA20 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 004AC 80A3EA1C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 004B0 80A3EA20 2463E660 */ addiu $v1, %lo(gSaveContext) /* 004B4 80A3EA24 946D0F16 */ lhu $t5, 0x0F16($v1) ## 8015F576 /* 004B8 80A3EA28 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 004BC 80A3EA2C 35AE0010 */ ori $t6, $t5, 0x0010 ## $t6 = 00000010 /* 004C0 80A3EA30 100000B7 */ beq $zero, $zero, .L80A3ED10 /* 004C4 80A3EA34 A46E0F16 */ sh $t6, 0x0F16($v1) ## 8015F576 glabel L80A3EA38 -/* 004C8 80A3EA38 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 004CC 80A3EA3C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 004C8 80A3EA38 3C038016 */ lui $v1, %hi(gSaveContext) +/* 004CC 80A3EA3C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 004D0 80A3EA40 946F0F16 */ lhu $t7, 0x0F16($v1) ## 8015F576 /* 004D4 80A3EA44 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 004D8 80A3EA48 35F80100 */ ori $t8, $t7, 0x0100 ## $t8 = FFFFCFCA @@ -96,24 +96,24 @@ glabel L80A3EA54 /* 004F0 80A3EA60 8FA70028 */ lw $a3, 0x0028($sp) /* 004F4 80A3EA64 0C00BD0D */ jal func_8002F434 /* 004F8 80A3EA68 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 004FC 80A3EA6C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00500 80A3EA70 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 004FC 80A3EA6C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00500 80A3EA70 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00504 80A3EA74 94790F18 */ lhu $t9, 0x0F18($v1) ## 8015F578 /* 00508 80A3EA78 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 /* 0050C 80A3EA7C 37282000 */ ori $t0, $t9, 0x2000 ## $t0 = 00002000 /* 00510 80A3EA80 100000A3 */ beq $zero, $zero, .L80A3ED10 /* 00514 80A3EA84 A4680F18 */ sh $t0, 0x0F18($v1) ## 8015F578 glabel L80A3EA88 -/* 00518 80A3EA88 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0051C 80A3EA8C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00518 80A3EA88 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0051C 80A3EA8C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00520 80A3EA90 94690F18 */ lhu $t1, 0x0F18($v1) ## 8015F578 /* 00524 80A3EA94 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00528 80A3EA98 352A4000 */ ori $t2, $t1, 0x4000 ## $t2 = 00004000 /* 0052C 80A3EA9C 1000009C */ beq $zero, $zero, .L80A3ED10 /* 00530 80A3EAA0 A46A0F18 */ sh $t2, 0x0F18($v1) ## 8015F578 glabel L80A3EAA4 -/* 00534 80A3EAA4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00538 80A3EAA8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00534 80A3EAA4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00538 80A3EAA8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0053C 80A3EAAC 946B0F18 */ lhu $t3, 0x0F18($v1) ## 8015F578 /* 00540 80A3EAB0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00544 80A3EAB4 356C8000 */ ori $t4, $t3, 0x8000 ## $t4 = 00008000 @@ -158,14 +158,14 @@ glabel L80A3EAE0 /* 005C8 80A3EB38 8FBF001C */ lw $ra, 0x001C($sp) .L80A3EB3C: /* 005CC 80A3EB3C 91CE04BD */ lbu $t6, 0x04BD($t6) ## 000104BD -/* 005D0 80A3EB40 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 005D4 80A3EB44 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 005D0 80A3EB40 3C038016 */ lui $v1, %hi(gSaveContext) +/* 005D4 80A3EB44 2463E660 */ addiu $v1, %lo(gSaveContext) /* 005D8 80A3EB48 15C00013 */ bne $t6, $zero, .L80A3EB98 -/* 005DC 80A3EB4C 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 +/* 005DC 80A3EB4C 3C188012 */ lui $t8, %hi(gUpgradeMasks+8) /* 005E0 80A3EB50 8C6F00A0 */ lw $t7, 0x00A0($v1) ## 8015E700 -/* 005E4 80A3EB54 8F1871B8 */ lw $t8, 0x71B8($t8) ## 801271B8 -/* 005E8 80A3EB58 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 005EC 80A3EB5C 910871F6 */ lbu $t0, 0x71F6($t0) ## 801271F6 +/* 005E4 80A3EB54 8F1871B8 */ lw $t8, %lo(gUpgradeMasks+8)($t8) +/* 005E8 80A3EB58 3C088012 */ lui $t0, %hi(gUpgradeShifts+2) +/* 005EC 80A3EB5C 910871F6 */ lbu $t0, %lo(gUpgradeShifts+2)($t0) /* 005F0 80A3EB60 01F8C824 */ and $t9, $t7, $t8 /* 005F4 80A3EB64 240C300B */ addiu $t4, $zero, 0x300B ## $t4 = 0000300B /* 005F8 80A3EB68 01194807 */ srav $t1, $t9, $t0 @@ -196,12 +196,12 @@ glabel L80A3EAE0 /* 00648 80A3EBB8 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 /* 0064C 80A3EBBC 01E47821 */ addu $t7, $t7, $a0 /* 00650 80A3EBC0 91EF04BD */ lbu $t7, 0x04BD($t7) ## 000104BD -/* 00654 80A3EBC4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00658 80A3EBC8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00654 80A3EBC4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00658 80A3EBC8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0065C 80A3EBCC 55E0000E */ bnel $t7, $zero, .L80A3EC08 /* 00660 80A3EBD0 946A0F18 */ lhu $t2, 0x0F18($v1) ## 8015F578 -/* 00664 80A3EBD4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00668 80A3EBD8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00664 80A3EBD4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00668 80A3EBD8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0066C 80A3EBDC 94780F18 */ lhu $t8, 0x0F18($v1) ## 8015F578 /* 00670 80A3EBE0 24083033 */ addiu $t0, $zero, 0x3033 ## $t0 = 00003033 /* 00674 80A3EBE4 24093035 */ addiu $t1, $zero, 0x3035 ## $t1 = 00003035 @@ -246,8 +246,8 @@ glabel L80A3EAE0 /* 006F8 80A3EC68 A7A7002E */ sh $a3, 0x002E($sp) /* 006FC 80A3EC6C 87A7002E */ lh $a3, 0x002E($sp) .L80A3EC70: -/* 00700 80A3EC70 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00704 80A3EC74 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00700 80A3EC70 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00704 80A3EC74 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00708 80A3EC78 94780F0E */ lhu $t8, 0x0F0E($v1) ## 8015F56E /* 0070C 80A3EC7C 37190010 */ ori $t9, $t8, 0x0010 ## $t9 = 00000010 /* 00710 80A3EC80 10000023 */ beq $zero, $zero, .L80A3ED10 @@ -268,11 +268,11 @@ glabel L80A3EC88 /* 00748 80A3ECB8 10410009 */ beq $v0, $at, .L80A3ECE0 /* 0074C 80A3ECBC 24013035 */ addiu $at, $zero, 0x3035 ## $at = 00003035 /* 00750 80A3ECC0 10410003 */ beq $v0, $at, .L80A3ECD0 -/* 00754 80A3ECC4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00754 80A3ECC4 3C038016 */ lui $v1, %hi(gSaveContext) /* 00758 80A3ECC8 10000011 */ beq $zero, $zero, .L80A3ED10 /* 0075C 80A3ECCC 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 .L80A3ECD0: -/* 00760 80A3ECD0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00760 80A3ECD0 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00764 80A3ECD4 94680F18 */ lhu $t0, 0x0F18($v1) ## 8015F578 /* 00768 80A3ECD8 35090800 */ ori $t1, $t0, 0x0800 ## $t1 = 00000800 /* 0076C 80A3ECDC A4690F18 */ sh $t1, 0x0F18($v1) ## 8015F578 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EE8C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EE8C.s index bfb8e19e1f..81149295f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EE8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EE8C.s @@ -22,8 +22,8 @@ glabel func_80A3EE8C /* 00964 80A3EED4 8FA60018 */ lw $a2, 0x0018($sp) /* 00968 80A3EED8 1440000D */ bne $v0, $zero, .L80A3EF10 /* 0096C 80A3EEDC 8FA7001C */ lw $a3, 0x001C($sp) -/* 00970 80A3EEE0 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 00974 80A3EEE4 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 00970 80A3EEE0 3C048016 */ lui $a0, %hi(gSaveContext) +/* 00974 80A3EEE4 2484E660 */ addiu $a0, %lo(gSaveContext) /* 00978 80A3EEE8 8C980004 */ lw $t8, 0x0004($a0) ## 8015E664 /* 0097C 80A3EEEC 57000009 */ bnel $t8, $zero, .L80A3EF14 /* 00980 80A3EEF0 84E300A4 */ lh $v1, 0x00A4($a3) ## 000000A4 @@ -37,10 +37,10 @@ glabel func_80A3EE8C .L80A3EF10: /* 009A0 80A3EF10 84E300A4 */ lh $v1, 0x00A4($a3) ## 000000A4 .L80A3EF14: -/* 009A4 80A3EF14 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 009A4 80A3EF14 3C048016 */ lui $a0, %hi(gSaveContext) /* 009A8 80A3EF18 24050062 */ addiu $a1, $zero, 0x0062 ## $a1 = 00000062 /* 009AC 80A3EF1C 14A3000A */ bne $a1, $v1, .L80A3EF48 -/* 009B0 80A3EF20 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 009B0 80A3EF20 2484E660 */ addiu $a0, %lo(gSaveContext) /* 009B4 80A3EF24 8C890004 */ lw $t1, 0x0004($a0) ## 8015E664 /* 009B8 80A3EF28 55200008 */ bnel $t1, $zero, .L80A3EF4C /* 009BC 80A3EF2C 24070060 */ addiu $a3, $zero, 0x0060 ## $a3 = 00000060 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s index d32b2d03db..bf0385387f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s @@ -16,7 +16,7 @@ glabel func_80A3F300 /* 00DC4 80A3F334 01EE7821 */ addu $t7, $t7, $t6 /* 00DC8 80A3F338 8DEF1E08 */ lw $t7, 0x1E08($t7) ## 00011E08 /* 00DCC 80A3F33C 0006C0C0 */ sll $t8, $a2, 3 -/* 00DD0 80A3F340 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 00DD0 80A3F340 3C0A8016 */ lui $t2, %hi(gSegments) /* 00DD4 80A3F344 01F82021 */ addu $a0, $t7, $t8 /* 00DD8 80A3F348 8C830004 */ lw $v1, 0x0004($a0) ## 00000004 /* 00DDC 80A3F34C 860C0218 */ lh $t4, 0x0218($s0) ## 00000218 @@ -25,7 +25,7 @@ glabel func_80A3F300 /* 00DE8 80A3F358 00194702 */ srl $t0, $t9, 28 /* 00DEC 80A3F35C 00084880 */ sll $t1, $t0, 2 /* 00DF0 80A3F360 01495021 */ addu $t2, $t2, $t1 -/* 00DF4 80A3F364 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 00DF4 80A3F364 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 00DF8 80A3F368 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00DFC 80A3F36C 00615824 */ and $t3, $v1, $at /* 00E00 80A3F370 000C6880 */ sll $t5, $t4, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F4BC.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F4BC.s index 4fe413f509..d4c4618968 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F4BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F4BC.s @@ -11,7 +11,7 @@ glabel func_80A3F4BC /* 00F6C 80A3F4DC 01C67021 */ addu $t6, $t6, $a2 /* 00F70 80A3F4E0 8DCE1E08 */ lw $t6, 0x1E08($t6) ## 00011E08 /* 00F74 80A3F4E4 000378C0 */ sll $t7, $v1, 3 -/* 00F78 80A3F4E8 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 00F78 80A3F4E8 3C0A8016 */ lui $t2, %hi(gSegments) /* 00F7C 80A3F4EC 01CF2821 */ addu $a1, $t6, $t7 /* 00F80 80A3F4F0 8CA80004 */ lw $t0, 0x0004($a1) ## 00000004 /* 00F84 80A3F4F4 90AC0000 */ lbu $t4, 0x0000($a1) ## 00000000 @@ -20,7 +20,7 @@ glabel func_80A3F4BC /* 00F90 80A3F500 0018CF02 */ srl $t9, $t8, 28 /* 00F94 80A3F504 00194880 */ sll $t1, $t9, 2 /* 00F98 80A3F508 01495021 */ addu $t2, $t2, $t1 -/* 00F9C 80A3F50C 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 00F9C 80A3F50C 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 00FA0 80A3F510 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00FA4 80A3F514 01015824 */ and $t3, $t0, $at /* 00FA8 80A3F518 000C6880 */ sll $t5, $t4, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F908.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F908.s index bfaef57c9c..0d6c4d2efd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F908.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F908.s @@ -87,12 +87,12 @@ glabel func_80A3F908 /* 014DC 80A3FA4C 15410032 */ bne $t2, $at, .L80A3FB18 /* 014E0 80A3FA50 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 014E4 80A3FA54 14410030 */ bne $v0, $at, .L80A3FB18 -/* 014E8 80A3FA58 3C0B8012 */ lui $t3, 0x8012 ## $t3 = 80120000 -/* 014EC 80A3FA5C 916B7491 */ lbu $t3, 0x7491($t3) ## 80127491 -/* 014F0 80A3FA60 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 014E8 80A3FA58 3C0B8012 */ lui $t3, %hi(gItemSlots+0x2d) +/* 014EC 80A3FA5C 916B7491 */ lbu $t3, %lo(gItemSlots+0x2d)($t3) +/* 014F0 80A3FA60 3C028016 */ lui $v0, %hi(gSaveContext+0x74) /* 014F4 80A3FA64 24010033 */ addiu $at, $zero, 0x0033 ## $at = 00000033 /* 014F8 80A3FA68 004B1021 */ addu $v0, $v0, $t3 -/* 014FC 80A3FA6C 9042E6D4 */ lbu $v0, -0x192C($v0) ## 8015E6D4 +/* 014FC 80A3FA6C 9042E6D4 */ lbu $v0, %lo(gSaveContext+0x74)($v0) /* 01500 80A3FA70 5441001B */ bnel $v0, $at, .L80A3FAE0 /* 01504 80A3FA74 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 /* 01508 80A3FA78 0C00BCDA */ jal func_8002F368 @@ -100,8 +100,8 @@ glabel func_80A3F908 /* 01510 80A3FA80 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B /* 01514 80A3FA84 1441000C */ bne $v0, $at, .L80A3FAB8 /* 01518 80A3FA88 24183053 */ addiu $t8, $zero, 0x3053 ## $t8 = 00003053 -/* 0151C 80A3FA8C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 01520 80A3FA90 958CF56E */ lhu $t4, -0x0A92($t4) ## 8015F56E +/* 0151C 80A3FA8C 3C0C8016 */ lui $t4, %hi(gSaveContext+0xf0e) +/* 01520 80A3FA90 958CF56E */ lhu $t4, %lo(gSaveContext+0xf0e)($t4) /* 01524 80A3FA94 240E3055 */ addiu $t6, $zero, 0x3055 ## $t6 = 00003055 /* 01528 80A3FA98 240F3054 */ addiu $t7, $zero, 0x3054 ## $t7 = 00003054 /* 0152C 80A3FA9C 318D0010 */ andi $t5, $t4, 0x0010 ## $t5 = 00000000 @@ -117,12 +117,12 @@ glabel func_80A3F908 .L80A3FABC: /* 0154C 80A3FABC 9619010E */ lhu $t9, 0x010E($s0) ## 0000010E /* 01550 80A3FAC0 8FA8002C */ lw $t0, 0x002C($sp) -/* 01554 80A3FAC4 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 -/* 01558 80A3FAC8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 01554 80A3FAC4 3C098012 */ lui $t1, %hi(gItemSlots+0x2d) +/* 01558 80A3FAC8 3C028016 */ lui $v0, %hi(gSaveContext+0x74) /* 0155C 80A3FACC A519010E */ sh $t9, 0x010E($t0) ## 0000010E -/* 01560 80A3FAD0 91297491 */ lbu $t1, 0x7491($t1) ## 80127491 +/* 01560 80A3FAD0 91297491 */ lbu $t1, %lo(gItemSlots+0x2d)($t1) /* 01564 80A3FAD4 00491021 */ addu $v0, $v0, $t1 -/* 01568 80A3FAD8 9042E6D4 */ lbu $v0, -0x192C($v0) ## 8015E6D4 +/* 01568 80A3FAD8 9042E6D4 */ lbu $v0, %lo(gSaveContext+0x74)($v0) /* 0156C 80A3FADC 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 .L80A3FAE0: /* 01570 80A3FAE0 5441000E */ bnel $v0, $at, .L80A3FB1C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4011C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4011C.s index a415337a30..56ed5768d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4011C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4011C.s @@ -24,8 +24,8 @@ glabel func_80A4011C /* 01C00 80A40170 24A5008C */ addiu $a1, $a1, %lo(func_80A4008C) ## $a1 = 80A4008C /* 01C04 80A40174 0C28F95C */ jal func_80A3E570 /* 01C08 80A40178 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 01C0C 80A4017C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01C10 80A40180 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01C0C 80A4017C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01C10 80A40180 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01C14 80A40184 944F0F18 */ lhu $t7, 0x0F18($v0) ## 8015F578 /* 01C18 80A40188 35F80200 */ ori $t8, $t7, 0x0200 ## $t8 = 00000200 /* 01C1C 80A4018C A4580F18 */ sh $t8, 0x0F18($v0) ## 8015F578 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40218.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40218.s index 91cd875c5f..a2224ad091 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40218.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40218.s @@ -19,10 +19,10 @@ glabel func_80A40218 /* 01CE4 80A40254 0C28FC57 */ jal func_80A3F15C /* 01CE8 80A40258 8FA5002C */ lw $a1, 0x002C($sp) /* 01CEC 80A4025C 10400029 */ beq $v0, $zero, .L80A40304 -/* 01CF0 80A40260 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01CF4 80A40264 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 01CF8 80A40268 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 01CFC 80A4026C 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 01CF0 80A40260 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01CF4 80A40264 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 01CF8 80A40268 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 01CFC 80A4026C 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 01D00 80A40270 AFAF0014 */ sw $t7, 0x0014($sp) /* 01D04 80A40274 AFA70010 */ sw $a3, 0x0010($sp) /* 01D08 80A40278 240438FC */ addiu $a0, $zero, 0x38FC ## $a0 = 000038FC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40318.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40318.s index ad81622a1a..bf1821ab76 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40318.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40318.s @@ -58,7 +58,7 @@ glabel func_80A40318 .L80A403EC: /* 01E7C 80A403EC 86020212 */ lh $v0, 0x0212($s0) ## 00000212 .L80A403F0: -/* 01E80 80A403F0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 01E80 80A403F0 3C078013 */ lui $a3, %hi(D_801333E0) /* 01E84 80A403F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01E88 80A403F8 14400003 */ bne $v0, $zero, .L80A40408 /* 01E8C 80A403FC 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF @@ -69,9 +69,9 @@ glabel func_80A40318 /* 01E9C 80A4040C 86030212 */ lh $v1, 0x0212($s0) ## 00000212 .L80A40410: /* 01EA0 80A40410 1460000F */ bne $v1, $zero, .L80A40450 -/* 01EA4 80A40414 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 01EA8 80A40418 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 01EAC 80A4041C 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 +/* 01EA4 80A40414 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 01EA8 80A40418 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 01EAC 80A4041C 254A33E8 */ addiu $t2, %lo(D_801333E8) /* 01EB0 80A40420 AFAA0014 */ sw $t2, 0x0014($sp) /* 01EB4 80A40424 240438FD */ addiu $a0, $zero, 0x38FD ## $a0 = 000038FD /* 01EB8 80A40428 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40494.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40494.s index 378532eef5..66909432c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40494.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40494.s @@ -33,11 +33,11 @@ glabel func_80A40494 /* 01F94 80A40504 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 /* 01F98 80A40508 C6080168 */ lwc1 $f8, 0x0168($s0) ## 00000168 /* 01F9C 80A4050C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01FA0 80A40510 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 01FA0 80A40510 3C078013 */ lui $a3, %hi(D_801333E0) /* 01FA4 80A40514 46080000 */ add.s $f0, $f0, $f8 -/* 01FA8 80A40518 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 01FAC 80A4051C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 01FB0 80A40520 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 01FA8 80A40518 3C188013 */ lui $t8, %hi(D_801333E8) +/* 01FAC 80A4051C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 01FB0 80A40520 271833E8 */ addiu $t8, %lo(D_801333E8) /* 01FB4 80A40524 4600503E */ c.le.s $f10, $f0 /* 01FB8 80A40528 2404387B */ addiu $a0, $zero, 0x387B ## $a0 = 0000387B /* 01FBC 80A4052C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A405CC.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A405CC.s index 2ca15e6169..bfc9e6ce82 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A405CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A405CC.s @@ -53,8 +53,8 @@ glabel func_80A405CC /* 02114 80A40684 A6020212 */ sh $v0, 0x0212($s0) ## 00000212 /* 02118 80A40688 331900F0 */ andi $t9, $t8, 0x00F0 ## $t9 = 00000000 /* 0211C 80A4068C 1721000B */ bne $t9, $at, .L80A406BC -/* 02120 80A40690 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 02124 80A40694 9508F574 */ lhu $t0, -0x0A8C($t0) ## 8015F574 +/* 02120 80A40690 3C088016 */ lui $t0, %hi(gSaveContext+0xf14) +/* 02124 80A40694 9508F574 */ lhu $t0, %lo(gSaveContext+0xf14)($t0) /* 02128 80A40698 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0212C 80A4069C 3C0580A4 */ lui $a1, %hi(func_80A40B1C) ## $a1 = 80A40000 /* 02130 80A406A0 31090800 */ andi $t1, $t0, 0x0800 ## $t1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A406E0.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A406E0.s index ad59be275e..85ea72985c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A406E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A406E0.s @@ -13,16 +13,16 @@ glabel func_80A406E0 /* 0219C 80A4070C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 021A0 80A40710 15C10033 */ bne $t6, $at, .L80A407E0 /* 021A4 80A40714 00000000 */ nop -/* 021A8 80A40718 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 021AC 80A4071C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 021A8 80A40718 3C028016 */ lui $v0, %hi(gSaveContext) +/* 021AC 80A4071C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 021B0 80A40720 904F003E */ lbu $t7, 0x003E($v0) ## 8015E69E -/* 021B4 80A40724 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 +/* 021B4 80A40724 3C188012 */ lui $t8, %hi(gItemSlots+0x2d) /* 021B8 80A40728 11E00003 */ beq $t7, $zero, .L80A40738 /* 021BC 80A4072C 00000000 */ nop /* 021C0 80A40730 10000064 */ beq $zero, $zero, .L80A408C4 /* 021C4 80A40734 A48001E0 */ sh $zero, 0x01E0($a0) ## 000001E0 .L80A40738: -/* 021C8 80A40738 93187491 */ lbu $t8, 0x7491($t8) ## 80127491 +/* 021C8 80A40738 93187491 */ lbu $t8, %lo(gItemSlots+0x2d)($t8) /* 021CC 80A4073C 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 /* 021D0 80A40740 3C0580A4 */ lui $a1, %hi(func_80A40B74) ## $a1 = 80A40000 /* 021D4 80A40744 0058C821 */ addu $t9, $v0, $t8 @@ -46,8 +46,8 @@ glabel func_80A406E0 /* 0221C 80A4078C 240A0037 */ addiu $t2, $zero, 0x0037 ## $t2 = 00000037 /* 02220 80A40790 00240821 */ addu $at, $at, $a0 /* 02224 80A40794 A02A03DC */ sb $t2, 0x03DC($at) ## 000103DC -/* 02228 80A40798 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 0222C 80A4079C A420FA32 */ sh $zero, -0x05CE($at) ## 8015FA32 +/* 02228 80A40798 3C018016 */ lui $at, %hi(gSaveContext+0x13d2) +/* 0222C 80A4079C A420FA32 */ sh $zero, %lo(gSaveContext+0x13d2)($at) /* 02230 80A407A0 AFA00010 */ sw $zero, 0x0010($sp) /* 02234 80A407A4 2405105E */ addiu $a1, $zero, 0x105E ## $a1 = 0000105E /* 02238 80A407A8 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A408D8.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A408D8.s index 3c714c30ee..30c31a541f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A408D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A408D8.s @@ -81,10 +81,10 @@ glabel func_80A408D8 /* 02484 80A409F4 8FBF0024 */ lw $ra, 0x0024($sp) /* 02488 80A409F8 0C28FC98 */ jal func_80A3F260 /* 0248C 80A409FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02490 80A40A00 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 02494 80A40A04 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 02498 80A40A08 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0249C 80A40A0C 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 +/* 02490 80A40A00 3C078013 */ lui $a3, %hi(D_801333E0) +/* 02494 80A40A04 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 02498 80A40A08 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0249C 80A40A0C 254A33E8 */ addiu $t2, %lo(D_801333E8) /* 024A0 80A40A10 AFAA0014 */ sw $t2, 0x0014($sp) /* 024A4 80A40A14 AFA70010 */ sw $a3, 0x0010($sp) /* 024A8 80A40A18 240438FD */ addiu $a0, $zero, 0x38FD ## $a0 = 000038FD diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B1C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B1C.s index 58540c83c4..668351f5a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B1C.s @@ -1,6 +1,6 @@ glabel func_80A40B1C -/* 025AC 80A40B1C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 025B0 80A40B20 95CEF574 */ lhu $t6, -0x0A8C($t6) ## 8015F574 +/* 025AC 80A40B1C 3C0E8016 */ lui $t6, %hi(gSaveContext+0xf14) +/* 025B0 80A40B20 95CEF574 */ lhu $t6, %lo(gSaveContext+0xf14)($t6) /* 025B4 80A40B24 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 025B8 80A40B28 AFBF0014 */ sw $ra, 0x0014($sp) /* 025BC 80A40B2C 31CF0800 */ andi $t7, $t6, 0x0800 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B74.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B74.s index d7f3119794..abbd9087a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B74.s @@ -20,23 +20,23 @@ glabel func_80A40B74 /* 02648 80A40BB8 A480020C */ sh $zero, 0x020C($a0) ## 0000020C /* 0264C 80A40BBC 306300F0 */ andi $v1, $v1, 0x00F0 ## $v1 = 00000000 /* 02650 80A40BC0 1461001A */ bne $v1, $at, .L80A40C2C -/* 02654 80A40BC4 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 02658 80A40BC8 91EF7491 */ lbu $t7, 0x7491($t7) ## 80127491 -/* 0265C 80A40BCC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 02654 80A40BC4 3C0F8012 */ lui $t7, %hi(gItemSlots+0x2d) +/* 02658 80A40BC8 91EF7491 */ lbu $t7, %lo(gItemSlots+0x2d)($t7) +/* 0265C 80A40BCC 3C028016 */ lui $v0, %hi(gSaveContext+0x74) /* 02660 80A40BD0 24010037 */ addiu $at, $zero, 0x0037 ## $at = 00000037 /* 02664 80A40BD4 004F1021 */ addu $v0, $v0, $t7 -/* 02668 80A40BD8 9042E6D4 */ lbu $v0, -0x192C($v0) ## 8015E6D4 +/* 02668 80A40BD8 9042E6D4 */ lbu $v0, %lo(gSaveContext+0x74)($v0) /* 0266C 80A40BDC 24180057 */ addiu $t8, $zero, 0x0057 ## $t8 = 00000057 /* 02670 80A40BE0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 02674 80A40BE4 14410009 */ bne $v0, $at, .L80A40C0C -/* 02678 80A40BE8 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 +/* 02678 80A40BE8 3C088012 */ lui $t0, %hi(gItemSlots+0x2d) /* 0267C 80A40BEC AFB80024 */ sw $t8, 0x0024($sp) /* 02680 80A40BF0 A499020C */ sh $t9, 0x020C($a0) ## 0000020C -/* 02684 80A40BF4 91087491 */ lbu $t0, 0x7491($t0) ## 80127491 +/* 02684 80A40BF4 91087491 */ lbu $t0, %lo(gItemSlots+0x2d)($t0) /* 02688 80A40BF8 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 0268C 80A40BFC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 0268C 80A40BFC 3C028016 */ lui $v0, %hi(gSaveContext+0x74) /* 02690 80A40C00 00481021 */ addu $v0, $v0, $t0 -/* 02694 80A40C04 9042E6D4 */ lbu $v0, -0x192C($v0) ## 8015E6D4 +/* 02694 80A40C04 9042E6D4 */ lbu $v0, %lo(gSaveContext+0x74)($v0) /* 02698 80A40C08 306300F0 */ andi $v1, $v1, 0x00F0 ## $v1 = 00000000 .L80A40C0C: /* 0269C 80A40C0C 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40C78.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40C78.s index 520de09e54..b47e7f3611 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40C78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40C78.s @@ -22,18 +22,18 @@ glabel func_80A40C78 /* 02758 80A40CC8 8619020C */ lh $t9, 0x020C($s0) ## 0000020C .L80A40CCC: /* 0275C 80A40CCC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 02760 80A40CD0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 02760 80A40CD0 3C018016 */ lui $at, %hi(gSaveContext+0x3e) /* 02764 80A40CD4 13200004 */ beq $t9, $zero, .L80A40CE8 -/* 02768 80A40CD8 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 +/* 02768 80A40CD8 3C098012 */ lui $t1, %hi(gItemSlots+0x2d) /* 0276C 80A40CDC A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 /* 02770 80A40CE0 10000019 */ beq $zero, $zero, .L80A40D48 -/* 02774 80A40CE4 A028E69E */ sb $t0, -0x1962($at) ## 8015E69E +/* 02774 80A40CE4 A028E69E */ sb $t0, %lo(gSaveContext+0x3e)($at) .L80A40CE8: -/* 02778 80A40CE8 91297491 */ lbu $t1, 0x7491($t1) ## 80127491 -/* 0277C 80A40CEC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 02778 80A40CE8 91297491 */ lbu $t1, %lo(gItemSlots+0x2d)($t1) +/* 0277C 80A40CEC 3C028016 */ lui $v0, %hi(gSaveContext+0x74) /* 02780 80A40CF0 24010034 */ addiu $at, $zero, 0x0034 ## $at = 00000034 /* 02784 80A40CF4 00491021 */ addu $v0, $v0, $t1 -/* 02788 80A40CF8 9042E6D4 */ lbu $v0, -0x192C($v0) ## 8015E6D4 +/* 02788 80A40CF8 9042E6D4 */ lbu $v0, %lo(gSaveContext+0x74)($v0) /* 0278C 80A40CFC 240A3058 */ addiu $t2, $zero, 0x3058 ## $t2 = 00003058 /* 02790 80A40D00 3145FFFF */ andi $a1, $t2, 0xFFFF ## $a1 = 00003058 /* 02794 80A40D04 14410006 */ bne $v0, $at, .L80A40D20 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s index bd0e563b07..d887bdd678 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s @@ -154,7 +154,7 @@ glabel func_80A417B4 /* 0348C 80A419FC AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 03490 80A41A00 3C0480A4 */ lui $a0, %hi(D_80A41BD8) ## $a0 = 80A40000 /* 03494 80A41A04 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 03498 80A41A08 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 03498 80A41A08 3C0A8016 */ lui $t2, %hi(gSegments) /* 0349C 80A41A0C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 034A0 80A41A10 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 034A4 80A41A14 46128182 */ mul.s $f6, $f16, $f18 @@ -170,7 +170,7 @@ glabel func_80A417B4 /* 034CC 80A41A3C 00194702 */ srl $t0, $t9, 28 /* 034D0 80A41A40 00084880 */ sll $t1, $t0, 2 /* 034D4 80A41A44 01495021 */ addu $t2, $t2, $t1 -/* 034D8 80A41A48 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 034D8 80A41A48 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 034DC 80A41A4C 0081C024 */ and $t8, $a0, $at /* 034E0 80A41A50 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 034E4 80A41A54 030A5821 */ addu $t3, $t8, $t2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s index 7f848b889e..57eecbac1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s @@ -82,8 +82,8 @@ glabel EnGo2_Draw /* 05294 80A47FC4 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 05298 80A47FC8 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 0529C 80A47FCC 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 052A0 80A47FD0 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 052A4 80A47FD4 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 052A0 80A47FD0 3C068016 */ lui $a2, %hi(gSegments) +/* 052A4 80A47FD4 24C66FA8 */ addiu $a2, %lo(gSegments) /* 052A8 80A47FD8 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 /* 052AC 80A47FDC AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 /* 052B0 80A47FE0 AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s index 2811dd4283..39e77b0bce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s @@ -4,8 +4,8 @@ glabel EnGo2_Init /* 037A4 80A464D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 037A8 80A464D8 AFBF002C */ sw $ra, 0x002C($sp) /* 037AC 80A464DC AFA50044 */ sw $a1, 0x0044($sp) -/* 037B0 80A464E0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 037B4 80A464E4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 037B0 80A464E0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 037B4 80A464E4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 037B8 80A464E8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 037BC 80A464EC 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 037C0 80A464F0 0C00AC78 */ jal ActorShape_Init @@ -113,10 +113,10 @@ glabel L80A46594 /* 03940 80A46670 03200008 */ jr $t9 /* 03944 80A46674 00000000 */ nop glabel L80A46678 -/* 03948 80A46678 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0394C 80A4667C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 03950 80A46680 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 03954 80A46684 8D087124 */ lw $t0, 0x7124($t0) ## 80127124 +/* 03948 80A46678 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0394C 80A4667C 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 03950 80A46680 3C088012 */ lui $t0, %hi(gBitFlags+4) +/* 03954 80A46684 8D087124 */ lw $t0, %lo(gBitFlags+4)($t0) /* 03958 80A46688 8C6900A4 */ lw $t1, 0x00A4($v1) ## 8015E704 /* 0395C 80A4668C 01095024 */ and $t2, $t0, $t1 /* 03960 80A46690 15400006 */ bne $t2, $zero, .L80A466AC @@ -133,13 +133,13 @@ glabel L80A46678 /* 03984 80A466B4 100000A5 */ beq $zero, $zero, .L80A4694C /* 03988 80A466B8 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 glabel L80A466BC -/* 0398C 80A466BC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 03990 80A466C0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0398C 80A466BC 3C038016 */ lui $v1, %hi(gSaveContext) +/* 03990 80A466C0 2463E660 */ addiu $v1, %lo(gSaveContext) /* 03994 80A466C4 8C6D0004 */ lw $t5, 0x0004($v1) ## 8015E664 -/* 03998 80A466C8 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 +/* 03998 80A466C8 3C0E8012 */ lui $t6, %hi(gBitFlags+0x4c) /* 0399C 80A466CC 11A00006 */ beq $t5, $zero, .L80A466E8 /* 039A0 80A466D0 00000000 */ nop -/* 039A4 80A466D4 8DCE716C */ lw $t6, 0x716C($t6) ## 8012716C +/* 039A4 80A466D4 8DCE716C */ lw $t6, %lo(gBitFlags+0x4c)($t6) /* 039A8 80A466D8 8C6F00A4 */ lw $t7, 0x00A4($v1) ## 8015E704 /* 039AC 80A466DC 01CFC024 */ and $t8, $t6, $t7 /* 039B0 80A466E0 57000004 */ bnel $t8, $zero, .L80A466F4 @@ -155,8 +155,8 @@ glabel L80A466BC /* 039CC 80A466FC 10000094 */ beq $zero, $zero, .L80A46950 /* 039D0 80A46700 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A46704 -/* 039D4 80A46704 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 039D8 80A46708 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 039D4 80A46704 3C038016 */ lui $v1, %hi(gSaveContext) +/* 039D8 80A46708 2463E660 */ addiu $v1, %lo(gSaveContext) /* 039DC 80A4670C 94620F18 */ lhu $v0, 0x0F18($v1) ## 8015F578 /* 039E0 80A46710 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 039E4 80A46714 30590200 */ andi $t9, $v0, 0x0200 ## $t9 = 00000000 @@ -166,24 +166,24 @@ glabel L80A46704 /* 039F4 80A46724 0C023983 */ jal Path_CopyLastPoint /* 039F8 80A46728 AFA50030 */ sw $a1, 0x0030($sp) /* 039FC 80A4672C 8FA50030 */ lw $a1, 0x0030($sp) -/* 03A00 80A46730 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 03A04 80A46734 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 03A00 80A46730 3C038016 */ lui $v1, %hi(gSaveContext) +/* 03A04 80A46734 2463E660 */ addiu $v1, %lo(gSaveContext) /* 03A08 80A46738 8CA90000 */ lw $t1, 0x0000($a1) ## 00000000 -/* 03A0C 80A4673C 3C028012 */ lui $v0, 0x8012 ## $v0 = 80120000 +/* 03A0C 80A4673C 3C028012 */ lui $v0, %hi(gBitFlags+4) /* 03A10 80A46740 3C1880A4 */ lui $t8, %hi(func_80A4696C) ## $t8 = 80A40000 /* 03A14 80A46744 AE090008 */ sw $t1, 0x0008($s0) ## 00000008 /* 03A18 80A46748 8CA80004 */ lw $t0, 0x0004($a1) ## 00000004 -/* 03A1C 80A4674C 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 +/* 03A1C 80A4674C 3C0C8012 */ lui $t4, %hi(gEquipShifts+2) /* 03A20 80A46750 2718696C */ addiu $t8, $t8, %lo(func_80A4696C) ## $t8 = 80A4696C /* 03A24 80A46754 AE08000C */ sw $t0, 0x000C($s0) ## 0000000C /* 03A28 80A46758 8CA90008 */ lw $t1, 0x0008($a1) ## 00000008 /* 03A2C 80A4675C AE090010 */ sw $t1, 0x0010($s0) ## 00000010 /* 03A30 80A46760 8C6A00A4 */ lw $t2, 0x00A4($v1) ## 8015E704 -/* 03A34 80A46764 8C427124 */ lw $v0, 0x7124($v0) ## 80127124 +/* 03A34 80A46764 8C427124 */ lw $v0, %lo(gBitFlags+4)($v0) /* 03A38 80A46768 004A5824 */ and $t3, $v0, $t2 /* 03A3C 80A4676C 1560000C */ bne $t3, $zero, .L80A467A0 /* 03A40 80A46770 00000000 */ nop -/* 03A44 80A46774 918C71F2 */ lbu $t4, 0x71F2($t4) ## 801271F2 +/* 03A44 80A46774 918C71F2 */ lbu $t4, %lo(gEquipShifts+2)($t4) /* 03A48 80A46778 946E009C */ lhu $t6, 0x009C($v1) ## 8015E6FC /* 03A4C 80A4677C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03A50 80A46780 01826804 */ sllv $t5, $v0, $t4 @@ -270,10 +270,10 @@ glabel L80A4689C /* 03B74 80A468A4 AE0000C0 */ sw $zero, 0x00C0($s0) ## 000000C0 /* 03B78 80A468A8 01616024 */ and $t4, $t3, $at /* 03B7C 80A468AC AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 -/* 03B80 80A468B0 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 -/* 03B84 80A468B4 91AD7491 */ lbu $t5, 0x7491($t5) ## 80127491 -/* 03B88 80A468B8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 03B8C 80A468BC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 03B80 80A468B0 3C0D8012 */ lui $t5, %hi(gItemSlots+0x2d) +/* 03B84 80A468B4 91AD7491 */ lbu $t5, %lo(gItemSlots+0x2d)($t5) +/* 03B88 80A468B8 3C038016 */ lui $v1, %hi(gSaveContext) +/* 03B8C 80A468BC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 03B90 80A468C0 006D7021 */ addu $t6, $v1, $t5 /* 03B94 80A468C4 91C20074 */ lbu $v0, 0x0074($t6) ## 00000074 /* 03B98 80A468C8 3C1980A4 */ lui $t9, %hi(func_80A4696C) ## $t9 = 80A40000 @@ -291,8 +291,8 @@ glabel L80A4689C /* 03BC4 80A468F4 10000015 */ beq $zero, $zero, .L80A4694C /* 03BC8 80A468F8 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 glabel L80A468FC -/* 03BCC 80A468FC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 03BD0 80A46900 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 03BCC 80A468FC 3C038016 */ lui $v1, %hi(gSaveContext) +/* 03BD0 80A46900 2463E660 */ addiu $v1, %lo(gSaveContext) /* 03BD4 80A46904 94680F14 */ lhu $t0, 0x0F14($v1) ## 8015F574 /* 03BD8 80A46908 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 03BDC 80A4690C 31090800 */ andi $t1, $t0, 0x0800 ## $t1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s index 622bc29a65..dd90758c7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s @@ -154,7 +154,7 @@ glabel func_80A42EE0 /* 003F8 80A43128 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 003FC 80A4312C 3C0480A5 */ lui $a0, %hi(D_80A480D0) ## $a0 = 80A50000 /* 00400 80A43130 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 00404 80A43134 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 00404 80A43134 3C0A8016 */ lui $t2, %hi(gSegments) /* 00408 80A43138 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0040C 80A4313C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00410 80A43140 46128182 */ mul.s $f6, $f16, $f18 @@ -170,7 +170,7 @@ glabel func_80A42EE0 /* 00438 80A43168 00194702 */ srl $t0, $t9, 28 /* 0043C 80A4316C 00084880 */ sll $t1, $t0, 2 /* 00440 80A43170 01495021 */ addu $t2, $t2, $t1 -/* 00444 80A43174 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 00444 80A43174 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 00448 80A43178 0081C024 */ and $t8, $a0, $at /* 0044C 80A4317C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00450 80A43180 030A5821 */ addu $t3, $t8, $t2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43564.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43564.s index 0ac8b3e988..474b0c4088 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43564.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43564.s @@ -1,24 +1,24 @@ glabel func_80A43564 -/* 00834 80A43564 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00838 80A43568 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00834 80A43564 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00838 80A43568 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0083C 80A4356C 944E0F1A */ lhu $t6, 0x0F1A($v0) ## 8015F57A /* 00840 80A43570 AFA40000 */ sw $a0, 0x0000($sp) -/* 00844 80A43574 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 +/* 00844 80A43574 3C198012 */ lui $t9, %hi(gUpgradeMasks+4) /* 00848 80A43578 31CF4000 */ andi $t7, $t6, 0x4000 ## $t7 = 00000000 /* 0084C 80A4357C 11E00003 */ beq $t7, $zero, .L80A4358C -/* 00850 80A43580 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 +/* 00850 80A43580 3C098012 */ lui $t1, %hi(gUpgradeShifts+1) /* 00854 80A43584 03E00008 */ jr $ra /* 00858 80A43588 24023013 */ addiu $v0, $zero, 0x3013 ## $v0 = 00003013 .L80A4358C: /* 0085C 80A4358C 8C5800A0 */ lw $t8, 0x00A0($v0) ## 000030B3 -/* 00860 80A43590 8F3971B4 */ lw $t9, 0x71B4($t9) ## 801271B4 -/* 00864 80A43594 912971F5 */ lbu $t1, 0x71F5($t1) ## 801271F5 -/* 00868 80A43598 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 +/* 00860 80A43590 8F3971B4 */ lw $t9, %lo(gUpgradeMasks+4)($t9) +/* 00864 80A43594 912971F5 */ lbu $t1, %lo(gUpgradeShifts+1)($t1) +/* 00868 80A43598 3C0C8012 */ lui $t4, %hi(gUpgradeCapacities+8) /* 0086C 80A4359C 03194024 */ and $t0, $t8, $t9 /* 00870 80A435A0 01285007 */ srav $t2, $t0, $t1 /* 00874 80A435A4 000A5840 */ sll $t3, $t2, 1 /* 00878 80A435A8 018B6021 */ addu $t4, $t4, $t3 -/* 0087C 80A435AC 958C7204 */ lhu $t4, 0x7204($t4) ## 80127204 +/* 0087C 80A435AC 958C7204 */ lhu $t4, %lo(gUpgradeCapacities+8)($t4) /* 00880 80A435B0 29810014 */ slti $at, $t4, 0x0014 /* 00884 80A435B4 5420000A */ bnel $at, $zero, .L80A435E0 /* 00888 80A435B8 24023011 */ addiu $v0, $zero, 0x3011 ## $v0 = 00003011 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A435E8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A435E8.s index e460fe8fc0..84f542ecd2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A435E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A435E8.s @@ -26,18 +26,18 @@ glabel func_80A435E8 /* 00910 80A43640 15C1001F */ bne $t6, $at, .L80A436C0 /* 00914 80A43644 25EF70E8 */ addiu $t7, $t7, %lo(func_80A470E8) ## $t7 = 80A470E8 /* 00918 80A43648 ACEF0190 */ sw $t7, 0x0190($a3) ## 00000190 -/* 0091C 80A4364C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 00920 80A43650 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 -/* 00924 80A43654 8F3971B4 */ lw $t9, 0x71B4($t9) ## 801271B4 -/* 00928 80A43658 8F18E700 */ lw $t8, -0x1900($t8) ## 8015E700 -/* 0092C 80A4365C 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 -/* 00930 80A43660 912971F5 */ lbu $t1, 0x71F5($t1) ## 801271F5 +/* 0091C 80A4364C 3C188016 */ lui $t8, %hi(gSaveContext+0xa0) +/* 00920 80A43650 3C198012 */ lui $t9, %hi(gUpgradeMasks+4) +/* 00924 80A43654 8F3971B4 */ lw $t9, %lo(gUpgradeMasks+4)($t9) +/* 00928 80A43658 8F18E700 */ lw $t8, %lo(gSaveContext+0xa0)($t8) +/* 0092C 80A4365C 3C098012 */ lui $t1, %hi(gUpgradeShifts+1) +/* 00930 80A43660 912971F5 */ lbu $t1, %lo(gUpgradeShifts+1)($t1) /* 00934 80A43664 03194024 */ and $t0, $t8, $t9 -/* 00938 80A43668 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 +/* 00938 80A43668 3C0C8012 */ lui $t4, %hi(gUpgradeCapacities+8) /* 0093C 80A4366C 01285007 */ srav $t2, $t0, $t1 /* 00940 80A43670 000A5840 */ sll $t3, $t2, 1 /* 00944 80A43674 018B6021 */ addu $t4, $t4, $t3 -/* 00948 80A43678 958C7204 */ lhu $t4, 0x7204($t4) ## 80127204 +/* 00948 80A43678 958C7204 */ lhu $t4, %lo(gUpgradeCapacities+8)($t4) /* 0094C 80A4367C 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 00950 80A43680 24060033 */ addiu $a2, $zero, 0x0033 ## $a2 = 00000033 /* 00954 80A43684 15810003 */ bne $t4, $at, .L80A43694 @@ -49,8 +49,8 @@ glabel func_80A435E8 /* 00968 80A43698 8FA50018 */ lw $a1, 0x0018($sp) /* 0096C 80A4369C 0C041B33 */ jal func_80106CCC /* 00970 80A436A0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00974 80A436A4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00978 80A436A8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00974 80A436A4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00978 80A436A8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0097C 80A436AC 946D0F1A */ lhu $t5, 0x0F1A($v1) ## 8015F57A /* 00980 80A436B0 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 /* 00984 80A436B4 35AE4000 */ ori $t6, $t5, 0x4000 ## $t6 = 00004000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A436DC.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A436DC.s index 4e886c83a4..36dcfd3fa0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A436DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A436DC.s @@ -1,8 +1,8 @@ glabel func_80A436DC -/* 009AC 80A436DC 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 009B0 80A436E0 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 009B4 80A436E4 8DEFE704 */ lw $t7, -0x18FC($t7) ## 8015E704 -/* 009B8 80A436E8 8DCE716C */ lw $t6, 0x716C($t6) ## 8012716C +/* 009AC 80A436DC 3C0E8012 */ lui $t6, %hi(gBitFlags+0x4c) +/* 009B0 80A436E0 3C0F8016 */ lui $t7, %hi(gSaveContext+0xa4) +/* 009B4 80A436E4 8DEFE704 */ lw $t7, %lo(gSaveContext+0xa4)($t7) +/* 009B8 80A436E8 8DCE716C */ lw $t6, %lo(gBitFlags+0x4c)($t6) /* 009BC 80A436EC AFA40000 */ sw $a0, 0x0000($sp) /* 009C0 80A436F0 AFA50004 */ sw $a1, 0x0004($sp) /* 009C4 80A436F4 01CFC024 */ and $t8, $t6, $t7 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43714.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43714.s index 02a9587612..0d1e5431ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43714.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43714.s @@ -16,9 +16,9 @@ glabel func_80A43714 .L80A4374C: /* 00A1C 80A4374C 94CE010E */ lhu $t6, 0x010E($a2) ## 0000010E /* 00A20 80A43750 2401300B */ addiu $at, $zero, 0x300B ## $at = 0000300B -/* 00A24 80A43754 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 00A24 80A43754 3C048016 */ lui $a0, %hi(gSaveContext) /* 00A28 80A43758 15C10008 */ bne $t6, $at, .L80A4377C -/* 00A2C 80A4375C 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 00A2C 80A4375C 2484E660 */ addiu $a0, %lo(gSaveContext) /* 00A30 80A43760 94830F14 */ lhu $v1, 0x0F14($a0) ## 8015F574 /* 00A34 80A43764 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 /* 00A38 80A43768 306F0800 */ andi $t7, $v1, 0x0800 ## $t7 = 00000000 @@ -41,15 +41,15 @@ glabel func_80A43714 /* 00A74 80A437A4 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 /* 00A78 80A437A8 01284821 */ addu $t1, $t1, $t0 /* 00A7C 80A437AC 912904BD */ lbu $t1, 0x04BD($t1) ## 000104BD -/* 00A80 80A437B0 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 00A84 80A437B4 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 00A80 80A437B0 3C048016 */ lui $a0, %hi(gSaveContext) +/* 00A84 80A437B4 2484E660 */ addiu $a0, %lo(gSaveContext) /* 00A88 80A437B8 1520000F */ bne $t1, $zero, .L80A437F8 /* 00A8C 80A437BC 2419300D */ addiu $t9, $zero, 0x300D ## $t9 = 0000300D -/* 00A90 80A437C0 3C0B8012 */ lui $t3, 0x8012 ## $t3 = 80120000 -/* 00A94 80A437C4 8D6B71B8 */ lw $t3, 0x71B8($t3) ## 801271B8 +/* 00A90 80A437C0 3C0B8012 */ lui $t3, %hi(gUpgradeMasks+8) +/* 00A94 80A437C4 8D6B71B8 */ lw $t3, %lo(gUpgradeMasks+8)($t3) /* 00A98 80A437C8 8C8A00A0 */ lw $t2, 0x00A0($a0) ## 8015E700 -/* 00A9C 80A437CC 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 -/* 00AA0 80A437D0 91AD71F6 */ lbu $t5, 0x71F6($t5) ## 801271F6 +/* 00A9C 80A437CC 3C0D8012 */ lui $t5, %hi(gUpgradeShifts+2) +/* 00AA0 80A437D0 91AD71F6 */ lbu $t5, %lo(gUpgradeShifts+2)($t5) /* 00AA4 80A437D4 014B6024 */ and $t4, $t2, $t3 /* 00AA8 80A437D8 2418300C */ addiu $t8, $zero, 0x300C ## $t8 = 0000300C /* 00AAC 80A437DC 01AC7007 */ srav $t6, $t4, $t5 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43824.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43824.s index 3055073195..a80a5bd7b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43824.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43824.s @@ -1,8 +1,8 @@ glabel func_80A43824 -/* 00AF4 80A43824 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00AF8 80A43828 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 00AFC 80A4382C 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 00B00 80A43830 8DCE716C */ lw $t6, 0x716C($t6) ## 8012716C +/* 00AF4 80A43824 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00AF8 80A43828 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00AFC 80A4382C 3C0E8012 */ lui $t6, %hi(gBitFlags+0x4c) +/* 00B00 80A43830 8DCE716C */ lw $t6, %lo(gBitFlags+0x4c)($t6) /* 00B04 80A43834 8C4F00A4 */ lw $t7, 0x00A4($v0) ## 8015E704 /* 00B08 80A43838 AFA40000 */ sw $a0, 0x0000($sp) /* 00B0C 80A4383C AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A438B4.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A438B4.s index aef87d4e82..295c576382 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A438B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A438B4.s @@ -1,9 +1,9 @@ glabel func_80A438B4 /* 00B84 80A438B4 AFA40000 */ sw $a0, 0x0000($sp) -/* 00B88 80A438B8 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 00B8C 80A438BC 3C038012 */ lui $v1, 0x8012 ## $v1 = 80120000 -/* 00B90 80A438C0 24637120 */ addiu $v1, $v1, 0x7120 ## $v1 = 80127120 -/* 00B94 80A438C4 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 00B88 80A438B8 3C048016 */ lui $a0, %hi(gSaveContext) +/* 00B8C 80A438BC 3C038012 */ lui $v1, %hi(gBitFlags) +/* 00B90 80A438C0 24637120 */ addiu $v1, %lo(gBitFlags) +/* 00B94 80A438C4 2484E660 */ addiu $a0, %lo(gSaveContext) /* 00B98 80A438C8 8C8200A4 */ lw $v0, 0x00A4($a0) ## 8015E704 /* 00B9C 80A438CC 8C6E0004 */ lw $t6, 0x0004($v1) ## 80127124 /* 00BA0 80A438D0 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43950.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43950.s index bb5f6d2370..d689753ba8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43950.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43950.s @@ -9,9 +9,9 @@ glabel func_80A43950 /* 00C3C 80A4396C 8FAE001C */ lw $t6, 0x001C($sp) /* 00C40 80A43970 95CF010E */ lhu $t7, 0x010E($t6) ## 0000010E /* 00C44 80A43974 24013008 */ addiu $at, $zero, 0x3008 ## $at = 00003008 -/* 00C48 80A43978 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00C48 80A43978 3C028016 */ lui $v0, %hi(gSaveContext) /* 00C4C 80A4397C 15E10004 */ bne $t7, $at, .L80A43990 -/* 00C50 80A43980 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00C50 80A43980 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00C54 80A43984 94580F14 */ lhu $t8, 0x0F14($v0) ## 8015F574 /* 00C58 80A43988 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 /* 00C5C 80A4398C A4590F14 */ sh $t9, 0x0F14($v0) ## 8015F574 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A439AC.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A439AC.s index 749ed98ae0..eb60123b2e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A439AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A439AC.s @@ -1,9 +1,9 @@ glabel func_80A439AC /* 00C7C 80A439AC AFA40000 */ sw $a0, 0x0000($sp) -/* 00C80 80A439B0 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 00C84 80A439B4 3C038012 */ lui $v1, 0x8012 ## $v1 = 80120000 -/* 00C88 80A439B8 24637120 */ addiu $v1, $v1, 0x7120 ## $v1 = 80127120 -/* 00C8C 80A439BC 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 00C80 80A439B0 3C048016 */ lui $a0, %hi(gSaveContext) +/* 00C84 80A439B4 3C038012 */ lui $v1, %hi(gBitFlags) +/* 00C88 80A439B8 24637120 */ addiu $v1, %lo(gBitFlags) +/* 00C8C 80A439BC 2484E660 */ addiu $a0, %lo(gSaveContext) /* 00C90 80A439C0 8C8200A4 */ lw $v0, 0x00A4($a0) ## 8015E704 /* 00C94 80A439C4 8C6E0004 */ lw $t6, 0x0004($v1) ## 80127124 /* 00C98 80A439C8 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A2C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A2C.s index b27ae10957..fdcb682cf9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A2C.s @@ -9,9 +9,9 @@ glabel func_80A43A2C /* 00D18 80A43A48 8FAE001C */ lw $t6, 0x001C($sp) /* 00D1C 80A43A4C 95CF010E */ lhu $t7, 0x010E($t6) ## 0000010E /* 00D20 80A43A50 24013014 */ addiu $at, $zero, 0x3014 ## $at = 00003014 -/* 00D24 80A43A54 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00D24 80A43A54 3C028016 */ lui $v0, %hi(gSaveContext) /* 00D28 80A43A58 15E10004 */ bne $t7, $at, .L80A43A6C -/* 00D2C 80A43A5C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00D2C 80A43A5C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00D30 80A43A60 94580F16 */ lhu $t8, 0x0F16($v0) ## 8015F576 /* 00D34 80A43A64 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 /* 00D38 80A43A68 A4590F16 */ sh $t9, 0x0F16($v0) ## 8015F576 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A88.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A88.s index b7a5cb4a27..b1aab3a81f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A88.s @@ -1,9 +1,9 @@ glabel func_80A43A88 /* 00D58 80A43A88 AFA40000 */ sw $a0, 0x0000($sp) -/* 00D5C 80A43A8C 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 00D60 80A43A90 3C038012 */ lui $v1, 0x8012 ## $v1 = 80120000 -/* 00D64 80A43A94 24637120 */ addiu $v1, $v1, 0x7120 ## $v1 = 80127120 -/* 00D68 80A43A98 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 00D5C 80A43A8C 3C048016 */ lui $a0, %hi(gSaveContext) +/* 00D60 80A43A90 3C038012 */ lui $v1, %hi(gBitFlags) +/* 00D64 80A43A94 24637120 */ addiu $v1, %lo(gBitFlags) +/* 00D68 80A43A98 2484E660 */ addiu $a0, %lo(gSaveContext) /* 00D6C 80A43A9C 8C8200A4 */ lw $v0, 0x00A4($a0) ## 8015E704 /* 00D70 80A43AA0 8C6E0004 */ lw $t6, 0x0004($v1) ## 80127124 /* 00D74 80A43AA4 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B08.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B08.s index 039b1e9f48..f063a07b19 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B08.s @@ -9,9 +9,9 @@ glabel func_80A43B08 /* 00DF4 80A43B24 8FAE001C */ lw $t6, 0x001C($sp) /* 00DF8 80A43B28 95CF010E */ lhu $t7, 0x010E($t6) ## 0000010E /* 00DFC 80A43B2C 24013016 */ addiu $at, $zero, 0x3016 ## $at = 00003016 -/* 00E00 80A43B30 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00E00 80A43B30 3C028016 */ lui $v0, %hi(gSaveContext) /* 00E04 80A43B34 15E10004 */ bne $t7, $at, .L80A43B48 -/* 00E08 80A43B38 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00E08 80A43B38 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00E0C 80A43B3C 94580F16 */ lhu $t8, 0x0F16($v0) ## 8015F576 /* 00E10 80A43B40 37190010 */ ori $t9, $t8, 0x0010 ## $t9 = 00000010 /* 00E14 80A43B44 A4590F16 */ sh $t9, 0x0F16($v0) ## 8015F576 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B64.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B64.s index 749dd600df..c18c69af6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B64.s @@ -1,10 +1,10 @@ glabel func_80A43B64 /* 00E34 80A43B64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00E38 80A43B68 AFA5001C */ sw $a1, 0x001C($sp) -/* 00E3C 80A43B6C 3C058012 */ lui $a1, 0x8012 ## $a1 = 80120000 -/* 00E40 80A43B70 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00E44 80A43B74 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00E48 80A43B78 24A57120 */ addiu $a1, $a1, 0x7120 ## $a1 = 80127120 +/* 00E3C 80A43B6C 3C058012 */ lui $a1, %hi(gBitFlags) +/* 00E40 80A43B70 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00E44 80A43B74 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 00E48 80A43B78 24A57120 */ addiu $a1, %lo(gBitFlags) /* 00E4C 80A43B7C 8CAE0004 */ lw $t6, 0x0004($a1) ## 80127124 /* 00E50 80A43B80 8C6200A4 */ lw $v0, 0x00A4($v1) ## 8015E704 /* 00E54 80A43B84 AFBF0014 */ sw $ra, 0x0014($sp) @@ -18,8 +18,8 @@ glabel func_80A43B64 /* 00E74 80A43BA4 24023043 */ addiu $v0, $zero, 0x3043 ## $v0 = 00003043 /* 00E78 80A43BA8 8CB9004C */ lw $t9, 0x004C($a1) ## 8012716C .L80A43BAC: -/* 00E7C 80A43BAC 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 00E80 80A43BB0 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 +/* 00E7C 80A43BAC 3C0A8012 */ lui $t2, %hi(gUpgradeMasks+8) +/* 00E80 80A43BB0 3C0C8012 */ lui $t4, %hi(gUpgradeShifts+2) /* 00E84 80A43BB4 03224024 */ and $t0, $t9, $v0 /* 00E88 80A43BB8 51000004 */ beql $t0, $zero, .L80A43BCC /* 00E8C 80A43BBC 8C6900A0 */ lw $t1, 0x00A0($v1) ## 8015E700 @@ -27,8 +27,8 @@ glabel func_80A43B64 /* 00E94 80A43BC4 24023027 */ addiu $v0, $zero, 0x3027 ## $v0 = 00003027 /* 00E98 80A43BC8 8C6900A0 */ lw $t1, 0x00A0($v1) ## 8015E700 .L80A43BCC: -/* 00E9C 80A43BCC 8D4A71B8 */ lw $t2, 0x71B8($t2) ## 801271B8 -/* 00EA0 80A43BD0 918C71F6 */ lbu $t4, 0x71F6($t4) ## 801271F6 +/* 00E9C 80A43BCC 8D4A71B8 */ lw $t2, %lo(gUpgradeMasks+8)($t2) +/* 00EA0 80A43BD0 918C71F6 */ lbu $t4, %lo(gUpgradeShifts+2)($t4) /* 00EA4 80A43BD4 012A5824 */ and $t3, $t1, $t2 /* 00EA8 80A43BD8 018B6807 */ srav $t5, $t3, $t4 /* 00EAC 80A43BDC 11A00003 */ beq $t5, $zero, .L80A43BEC @@ -39,9 +39,9 @@ glabel func_80A43B64 /* 00EBC 80A43BEC 0C00B2D0 */ jal Flags_GetSwitch /* 00EC0 80A43BF0 2405001B */ addiu $a1, $zero, 0x001B ## $a1 = 0000001B -/* 00EC4 80A43BF4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00EC4 80A43BF4 3C038016 */ lui $v1, %hi(gSaveContext) /* 00EC8 80A43BF8 14400003 */ bne $v0, $zero, .L80A43C08 -/* 00ECC 80A43BFC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00ECC 80A43BFC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00ED0 80A43C00 10000009 */ beq $zero, $zero, .L80A43C28 /* 00ED4 80A43C04 24023017 */ addiu $v0, $zero, 0x3017 ## $v0 = 00003017 .L80A43C08: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C40.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C40.s index 0c5c99662d..ae49fcc3e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C40.s @@ -9,9 +9,9 @@ glabel func_80A43C40 /* 00F2C 80A43C5C 8FAE001C */ lw $t6, 0x001C($sp) /* 00F30 80A43C60 95CF010E */ lhu $t7, 0x010E($t6) ## 0000010E /* 00F34 80A43C64 24013018 */ addiu $at, $zero, 0x3018 ## $at = 00003018 -/* 00F38 80A43C68 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00F38 80A43C68 3C028016 */ lui $v0, %hi(gSaveContext) /* 00F3C 80A43C6C 15E10004 */ bne $t7, $at, .L80A43C80 -/* 00F40 80A43C70 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00F40 80A43C70 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00F44 80A43C74 94580F16 */ lhu $t8, 0x0F16($v0) ## 8015F576 /* 00F48 80A43C78 37190100 */ ori $t9, $t8, 0x0100 ## $t9 = 00000100 /* 00F4C 80A43C7C A4590F16 */ sh $t9, 0x0F16($v0) ## 8015F576 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C9C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C9C.s index cfb521e07a..c58299ac31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C9C.s @@ -1,11 +1,11 @@ glabel func_80A43C9C -/* 00F6C 80A43C9C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00F70 80A43CA0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00F74 80A43CA4 3C028012 */ lui $v0, 0x8012 ## $v0 = 80120000 -/* 00F78 80A43CA8 8C427124 */ lw $v0, 0x7124($v0) ## 80127124 +/* 00F6C 80A43C9C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00F70 80A43CA0 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 00F74 80A43CA4 3C028012 */ lui $v0, %hi(gBitFlags+4) +/* 00F78 80A43CA8 8C427124 */ lw $v0, %lo(gBitFlags+4)($v0) /* 00F7C 80A43CAC 8C6E00A4 */ lw $t6, 0x00A4($v1) ## 8015E704 /* 00F80 80A43CB0 AFA40000 */ sw $a0, 0x0000($sp) -/* 00F84 80A43CB4 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 +/* 00F84 80A43CB4 3C088012 */ lui $t0, %hi(gEquipShifts+2) /* 00F88 80A43CB8 004E7824 */ and $t7, $v0, $t6 /* 00F8C 80A43CBC 11E0000B */ beq $t7, $zero, .L80A43CEC /* 00F90 80A43CC0 00000000 */ nop @@ -21,7 +21,7 @@ glabel func_80A43C9C /* 00FB4 80A43CE4 03E00008 */ jr $ra /* 00FB8 80A43CE8 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003042 .L80A43CEC: -/* 00FBC 80A43CEC 910871F2 */ lbu $t0, 0x71F2($t0) ## 801271F2 +/* 00FBC 80A43CEC 910871F2 */ lbu $t0, %lo(gEquipShifts+2)($t0) /* 00FC0 80A43CF0 946A009C */ lhu $t2, 0x009C($v1) ## 000030DE /* 00FC4 80A43CF4 01024804 */ sllv $t1, $v0, $t0 /* 00FC8 80A43CF8 012A5824 */ and $t3, $t1, $t2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43D78.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43D78.s index 95ca8c9ab7..a987e611b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43D78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43D78.s @@ -40,8 +40,8 @@ glabel func_80A43D78 /* 010D8 80A43E08 1000005D */ beq $zero, $zero, .L80A43F80 /* 010DC 80A43E0C ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 .L80A43E10: -/* 010E0 80A43E10 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 010E4 80A43E14 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 010E0 80A43E10 3C028016 */ lui $v0, %hi(gSaveContext) +/* 010E4 80A43E14 2442E660 */ addiu $v0, %lo(gSaveContext) /* 010E8 80A43E18 944F0F18 */ lhu $t7, 0x0F18($v0) ## 8015F578 /* 010EC 80A43E1C 35F84000 */ ori $t8, $t7, 0x4000 ## $t8 = 00004000 /* 010F0 80A43E20 A4580F18 */ sh $t8, 0x0F18($v0) ## 8015F578 @@ -59,12 +59,12 @@ glabel func_80A43D78 /* 0111C 80A43E4C 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 /* 01120 80A43E50 01284821 */ addu $t1, $t1, $t0 /* 01124 80A43E54 912904BD */ lbu $t1, 0x04BD($t1) ## 000104BD -/* 01128 80A43E58 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0112C 80A43E5C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01128 80A43E58 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0112C 80A43E5C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01130 80A43E60 55200016 */ bnel $t1, $zero, .L80A43EBC /* 01134 80A43E64 944E0F18 */ lhu $t6, 0x0F18($v0) ## 8015F578 -/* 01138 80A43E68 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0113C 80A43E6C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01138 80A43E68 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0113C 80A43E6C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01140 80A43E70 944A0F18 */ lhu $t2, 0x0F18($v0) ## 8015F578 /* 01144 80A43E74 240D3035 */ addiu $t5, $zero, 0x3035 ## $t5 = 00003035 /* 01148 80A43E78 240C3033 */ addiu $t4, $zero, 0x3033 ## $t4 = 00003033 @@ -129,8 +129,8 @@ glabel func_80A43D78 /* 01210 80A43F40 10410007 */ beq $v0, $at, .L80A43F60 /* 01214 80A43F44 24013035 */ addiu $at, $zero, 0x3035 ## $at = 00003035 /* 01218 80A43F48 1441000A */ bne $v0, $at, .L80A43F74 -/* 0121C 80A43F4C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01220 80A43F50 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0121C 80A43F4C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01220 80A43F50 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01224 80A43F54 94480F18 */ lhu $t0, 0x0F18($v0) ## 8015F578 /* 01228 80A43F58 35090800 */ ori $t1, $t0, 0x0800 ## $t1 = 00000800 /* 0122C 80A43F5C A4490F18 */ sh $t1, 0x0F18($v0) ## 8015F578 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43F90.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43F90.s index 88486319c2..789f4c0026 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43F90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43F90.s @@ -1,17 +1,17 @@ glabel func_80A43F90 /* 01260 80A43F90 AFA50004 */ sw $a1, 0x0004($sp) -/* 01264 80A43F94 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 01268 80A43F98 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 +/* 01264 80A43F94 3C058016 */ lui $a1, %hi(gSaveContext) +/* 01268 80A43F98 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 0126C 80A43F9C 90AE003E */ lbu $t6, 0x003E($a1) ## 8015E69E /* 01270 80A43FA0 8C831C44 */ lw $v1, 0x1C44($a0) ## 00001C44 /* 01274 80A43FA4 240F000F */ addiu $t7, $zero, 0x000F ## $t7 = 0000000F /* 01278 80A43FA8 11C00004 */ beq $t6, $zero, .L80A43FBC -/* 0127C 80A43FAC 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 +/* 0127C 80A43FAC 3C188012 */ lui $t8, %hi(gItemSlots+0x2d) /* 01280 80A43FB0 A06F0693 */ sb $t7, 0x0693($v1) ## 00000693 /* 01284 80A43FB4 03E00008 */ jr $ra /* 01288 80A43FB8 2402305E */ addiu $v0, $zero, 0x305E ## $v0 = 0000305E .L80A43FBC: -/* 0128C 80A43FBC 93187491 */ lbu $t8, 0x7491($t8) ## 80127491 +/* 0128C 80A43FBC 93187491 */ lbu $t8, %lo(gItemSlots+0x2d)($t8) /* 01290 80A43FC0 2408000F */ addiu $t0, $zero, 0x000F ## $t0 = 0000000F /* 01294 80A43FC4 00B8C821 */ addu $t9, $a1, $t8 /* 01298 80A43FC8 93220074 */ lbu $v0, 0x0074($t9) ## 00000074 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44010.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44010.s index 700a896fd4..ee5e551eda 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44010.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44010.s @@ -23,10 +23,10 @@ glabel func_80A44010 /* 01334 80A44064 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 01338 80A44068 94EF010E */ lhu $t7, 0x010E($a3) ## 0000010E /* 0133C 80A4406C 2401305E */ addiu $at, $zero, 0x305E ## $at = 0000305E -/* 01340 80A44070 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 01340 80A44070 3C188016 */ lui $t8, %hi(gSaveContext+0x3e) /* 01344 80A44074 15E10010 */ bne $t7, $at, .L80A440B8 /* 01348 80A44078 00000000 */ nop -/* 0134C 80A4407C 9318E69E */ lbu $t8, -0x1962($t8) ## 8015E69E +/* 0134C 80A4407C 9318E69E */ lbu $t8, %lo(gSaveContext+0x3e)($t8) /* 01350 80A44080 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 01354 80A44084 8FA50028 */ lw $a1, 0x0028($sp) /* 01358 80A44088 17000009 */ bne $t8, $zero, .L80A440B0 @@ -61,22 +61,22 @@ glabel func_80A44010 /* 013C0 80A440F0 00000000 */ nop .L80A440F4: /* 013C4 80A440F4 93A80023 */ lbu $t0, 0x0023($sp) -/* 013C8 80A440F8 3C048013 */ lui $a0, 0x8013 ## $a0 = 80130000 -/* 013CC 80A440FC 248433D4 */ addiu $a0, $a0, 0x33D4 ## $a0 = 801333D4 +/* 013C8 80A440F8 3C048013 */ lui $a0, %hi(D_801333D4) +/* 013CC 80A440FC 248433D4 */ addiu $a0, %lo(D_801333D4) /* 013D0 80A44100 15000003 */ bne $t0, $zero, .L80A44110 /* 013D4 80A44104 240538FC */ addiu $a1, $zero, 0x38FC ## $a1 = 000038FC /* 013D8 80A44108 0C03D149 */ jal func_800F4524 /* 013DC 80A4410C 2406003C */ addiu $a2, $zero, 0x003C ## $a2 = 0000003C .L80A44110: /* 013E0 80A44110 93A90023 */ lbu $t1, 0x0023($sp) -/* 013E4 80A44114 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 013E8 80A44118 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 013E4 80A44114 3C078013 */ lui $a3, %hi(D_801333E0) +/* 013E8 80A44118 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 013EC 80A4411C 15200009 */ bne $t1, $zero, .L80A44144 /* 013F0 80A44120 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 013F4 80A44124 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 013F8 80A44128 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 -/* 013FC 80A4412C 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 01400 80A44130 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 013F4 80A44124 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 013F8 80A44128 254A33E8 */ addiu $t2, %lo(D_801333E8) +/* 013FC 80A4412C 3C058013 */ lui $a1, %hi(D_801333D4) +/* 01400 80A44130 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 01404 80A44134 AFAA0014 */ sw $t2, 0x0014($sp) /* 01408 80A44138 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 0140C 80A4413C 0C03DCE3 */ jal Audio_PlaySoundGeneral diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A442F0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A442F0.s index 611f494b22..13b473ee80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A442F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A442F0.s @@ -1,6 +1,6 @@ glabel func_80A442F0 -/* 015C0 80A442F0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 015C4 80A442F4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 015C0 80A442F0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 015C4 80A442F4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 015C8 80A442F8 8C4E0004 */ lw $t6, 0x0004($v0) ## 8015E664 /* 015CC 80A442FC AFA40000 */ sw $a0, 0x0000($sp) /* 015D0 80A44300 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4433C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4433C.s index cada9a0bd2..e0f4227784 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4433C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4433C.s @@ -9,9 +9,9 @@ glabel func_80A4433C /* 01628 80A44358 8FAE001C */ lw $t6, 0x001C($sp) /* 0162C 80A4435C 95CF010E */ lhu $t7, 0x010E($t6) ## 0000010E /* 01630 80A44360 2401300E */ addiu $at, $zero, 0x300E ## $at = 0000300E -/* 01634 80A44364 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 01634 80A44364 3C028016 */ lui $v0, %hi(gSaveContext) /* 01638 80A44368 15E10004 */ bne $t7, $at, .L80A4437C -/* 0163C 80A4436C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0163C 80A4436C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01640 80A44370 94580F14 */ lhu $t8, 0x0F14($v0) ## 8015F574 /* 01644 80A44374 37190008 */ ori $t9, $t8, 0x0008 ## $t9 = 00000008 /* 01648 80A44378 A4590F14 */ sh $t9, 0x0F14($v0) ## 8015F574 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443E0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443E0.s index 409800d89e..9a5fa9bc30 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443E0.s @@ -1,6 +1,6 @@ glabel func_80A443E0 -/* 016B0 80A443E0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 016B4 80A443E4 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 +/* 016B0 80A443E0 3C0E8016 */ lui $t6, %hi(gSaveContext+4) +/* 016B4 80A443E4 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) /* 016B8 80A443E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 016BC 80A443EC AFBF0014 */ sw $ra, 0x0014($sp) /* 016C0 80A443F0 11C00011 */ beq $t6, $zero, .L80A44438 @@ -9,11 +9,11 @@ glabel func_80A443E0 /* 016CC 80A443FC 2405001C */ addiu $a1, $zero, 0x001C ## $a1 = 0000001C /* 016D0 80A44400 10400003 */ beq $v0, $zero, .L80A44410 -/* 016D4 80A44404 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 016D4 80A44404 3C0F8016 */ lui $t7, %hi(gSaveContext+0xf14) /* 016D8 80A44408 1000000C */ beq $zero, $zero, .L80A4443C /* 016DC 80A4440C 2402302F */ addiu $v0, $zero, 0x302F ## $v0 = 0000302F .L80A44410: -/* 016E0 80A44410 95EFF574 */ lhu $t7, -0x0A8C($t7) ## 8015F574 +/* 016E0 80A44410 95EFF574 */ lhu $t7, %lo(gSaveContext+0xf14)($t7) /* 016E4 80A44414 24033024 */ addiu $v1, $zero, 0x3024 ## $v1 = 00003024 /* 016E8 80A44418 31F80040 */ andi $t8, $t7, 0x0040 ## $t8 = 00000000 /* 016EC 80A4441C 13000004 */ beq $t8, $zero, .L80A44430 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4444C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4444C.s index 15753387f7..1d2ca63309 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4444C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4444C.s @@ -9,9 +9,9 @@ glabel func_80A4444C /* 01738 80A44468 8FAE001C */ lw $t6, 0x001C($sp) /* 0173C 80A4446C 95CF010E */ lhu $t7, 0x010E($t6) ## 0000010E /* 01740 80A44470 24013024 */ addiu $at, $zero, 0x3024 ## $at = 00003024 -/* 01744 80A44474 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 01744 80A44474 3C028016 */ lui $v0, %hi(gSaveContext) /* 01748 80A44478 15E10004 */ bne $t7, $at, .L80A4448C -/* 0174C 80A4447C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0174C 80A4447C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01750 80A44480 94580F14 */ lhu $t8, 0x0F14($v0) ## 8015F574 /* 01754 80A44484 37190040 */ ori $t9, $t8, 0x0040 ## $t9 = 00000040 /* 01758 80A44488 A4590F14 */ sh $t9, 0x0F14($v0) ## 8015F574 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444A8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444A8.s index 7c1fd46bb3..3b6fb8780f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444A8.s @@ -1,12 +1,12 @@ glabel func_80A444A8 -/* 01778 80A444A8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0177C 80A444AC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01778 80A444A8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0177C 80A444AC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01780 80A444B0 8C4E0004 */ lw $t6, 0x0004($v0) ## 8015E664 /* 01784 80A444B4 AFA40000 */ sw $a0, 0x0000($sp) /* 01788 80A444B8 AFA50004 */ sw $a1, 0x0004($sp) /* 0178C 80A444BC 11C0000C */ beq $t6, $zero, .L80A444F0 -/* 01790 80A444C0 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 01794 80A444C4 8DEF716C */ lw $t7, 0x716C($t7) ## 8012716C +/* 01790 80A444C0 3C0F8012 */ lui $t7, %hi(gBitFlags+0x4c) +/* 01794 80A444C4 8DEF716C */ lw $t7, %lo(gBitFlags+0x4c)($t7) /* 01798 80A444C8 8C5800A4 */ lw $t8, 0x00A4($v0) ## 8015E704 /* 0179C 80A444CC 24033064 */ addiu $v1, $zero, 0x3064 ## $v1 = 00003064 /* 017A0 80A444D0 01F8C824 */ and $t9, $t7, $t8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44AB0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44AB0.s index 8108dd4bee..16097784eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44AB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44AB0.s @@ -28,15 +28,15 @@ glabel func_80A44AB0 .L80A44B14: /* 01DE4 80A44B14 920A01CD */ lbu $t2, 0x01CD($s0) ## 000001CD .L80A44B18: -/* 01DE8 80A44B18 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01DEC 80A44B1C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01DE8 80A44B18 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01DEC 80A44B1C 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01DF0 80A44B20 314B0002 */ andi $t3, $t2, 0x0002 ## $t3 = 00000000 /* 01DF4 80A44B24 11600016 */ beq $t3, $zero, .L80A44B80 /* 01DF8 80A44B28 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 01DFC 80A44B2C 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 01E00 80A44B30 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 -/* 01E04 80A44B34 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 01E08 80A44B38 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 01DFC 80A44B2C 3C0C8013 */ lui $t4, %hi(D_801333E8) +/* 01E00 80A44B30 258C33E8 */ addiu $t4, %lo(D_801333E8) +/* 01E04 80A44B34 3C058013 */ lui $a1, %hi(D_801333D4) +/* 01E08 80A44B38 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 01E0C 80A44B3C AFAC0014 */ sw $t4, 0x0014($sp) /* 01E10 80A44B40 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 01E14 80A44B44 0C03DCE3 */ jal Audio_PlaySoundGeneral diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45088.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45088.s index 0f27590983..b8be120dc9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45088.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45088.s @@ -7,8 +7,8 @@ glabel func_80A45088 /* 0236C 80A4509C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 02370 80A450A0 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 /* 02374 80A450A4 15E10074 */ bne $t7, $at, .L80A45278 -/* 02378 80A450A8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0237C 80A450AC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 02378 80A450A8 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0237C 80A450AC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 02380 80A450B0 9062003E */ lbu $v0, 0x003E($v1) ## 8015E69E /* 02384 80A450B4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 02388 80A450B8 1040000F */ beq $v0, $zero, .L80A450F8 @@ -31,8 +31,8 @@ glabel func_80A45088 /* 023C4 80A450F4 A528010E */ sh $t0, 0x010E($t1) ## 0000010E .L80A450F8: /* 023C8 80A450F8 14400024 */ bne $v0, $zero, .L80A4518C -/* 023CC 80A450FC 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 023D0 80A45100 914A7491 */ lbu $t2, 0x7491($t2) ## 80127491 +/* 023CC 80A450FC 3C0A8012 */ lui $t2, %hi(gItemSlots+0x2d) +/* 023D0 80A45100 914A7491 */ lbu $t2, %lo(gItemSlots+0x2d)($t2) /* 023D4 80A45104 24010037 */ addiu $at, $zero, 0x0037 ## $at = 00000037 /* 023D8 80A45108 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 023DC 80A4510C 006A5821 */ addu $t3, $v1, $t2 @@ -74,8 +74,8 @@ glabel func_80A45088 /* 02454 80A45184 1000003C */ beq $zero, $zero, .L80A45278 /* 02458 80A45188 A5CD010E */ sh $t5, 0x010E($t6) ## 0000010E .L80A4518C: -/* 0245C 80A4518C 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 02460 80A45190 91EF7491 */ lbu $t7, 0x7491($t7) ## 80127491 +/* 0245C 80A4518C 3C0F8012 */ lui $t7, %hi(gItemSlots+0x2d) +/* 02460 80A45190 91EF7491 */ lbu $t7, %lo(gItemSlots+0x2d)($t7) /* 02464 80A45194 006FC021 */ addu $t8, $v1, $t7 /* 02468 80A45198 93020074 */ lbu $v0, 0x0074($t8) ## 00000074 /* 0246C 80A4519C 28410034 */ slti $at, $v0, 0x0034 @@ -85,9 +85,9 @@ glabel func_80A45088 /* 0247C 80A451AC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 02480 80A451B0 0C00BCDA */ jal func_8002F368 /* 02484 80A451B4 AFA70018 */ sw $a3, 0x0018($sp) -/* 02488 80A451B8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 02488 80A451B8 3C038016 */ lui $v1, %hi(gSaveContext) /* 0248C 80A451BC 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 02490 80A451C0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 02490 80A451C0 2463E660 */ addiu $v1, %lo(gSaveContext) /* 02494 80A451C4 14410004 */ bne $v0, $at, .L80A451D8 /* 02498 80A451C8 8FA70018 */ lw $a3, 0x0018($sp) /* 0249C 80A451CC 24193059 */ addiu $t9, $zero, 0x3059 ## $t9 = 00003059 @@ -114,9 +114,9 @@ glabel func_80A45088 /* 024E0 80A45210 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 024E4 80A45214 0C00BCDA */ jal func_8002F368 /* 024E8 80A45218 AFA70018 */ sw $a3, 0x0018($sp) -/* 024EC 80A4521C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 024EC 80A4521C 3C038016 */ lui $v1, %hi(gSaveContext) /* 024F0 80A45220 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 024F4 80A45224 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 024F4 80A45224 2463E660 */ addiu $v1, %lo(gSaveContext) /* 024F8 80A45228 1441000A */ bne $v0, $at, .L80A45254 /* 024FC 80A4522C 8FA70018 */ lw $a3, 0x0018($sp) /* 02500 80A45230 946A0F0E */ lhu $t2, 0x0F0E($v1) ## 8015F56E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45288.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45288.s index e10483b682..8d63499f22 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45288.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45288.s @@ -11,7 +11,7 @@ glabel func_80A45288 /* 0257C 80A452AC 00000000 */ nop /* 02580 80A452B0 8DE80024 */ lw $t0, 0x0024($t7) ## 00000024 /* 02584 80A452B4 8489001C */ lh $t1, 0x001C($a0) ## 0000001C -/* 02588 80A452B8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 02588 80A452B8 3C028016 */ lui $v0, %hi(gSaveContext+4) /* 0258C 80A452BC AC8801AC */ sw $t0, 0x01AC($a0) ## 000001AC /* 02590 80A452C0 8DF90028 */ lw $t9, 0x0028($t7) ## 00000028 /* 02594 80A452C4 312A001F */ andi $t2, $t1, 0x001F ## $t2 = 00000000 @@ -21,7 +21,7 @@ glabel func_80A45288 /* 025A4 80A452D4 3C0180A5 */ lui $at, %hi(D_80A482D8) ## $at = 80A50000 /* 025A8 80A452D8 8487026E */ lh $a3, 0x026E($a0) ## 0000026E /* 025AC 80A452DC AC8801B4 */ sw $t0, 0x01B4($a0) ## 000001B4 -/* 025B0 80A452E0 8C42E664 */ lw $v0, -0x199C($v0) ## 8015E664 +/* 025B0 80A452E0 8C42E664 */ lw $v0, %lo(gSaveContext+4)($v0) /* 025B4 80A452E4 24850194 */ addiu $a1, $a0, 0x0194 ## $a1 = 00000194 /* 025B8 80A452E8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 025BC 80A452EC 00026080 */ sll $t4, $v0, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A454CC.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A454CC.s index a77b097edc..5e3dd396c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A454CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A454CC.s @@ -21,11 +21,11 @@ glabel L80A45500 /* 027E4 80A45514 10000015 */ beq $zero, $zero, .L80A4556C /* 027E8 80A45518 8FBF0014 */ lw $ra, 0x0014($sp) glabel L80A4551C -/* 027EC 80A4551C 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 -/* 027F0 80A45520 93187491 */ lbu $t8, 0x7491($t8) ## 80127491 -/* 027F4 80A45524 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 027EC 80A4551C 3C188012 */ lui $t8, %hi(gItemSlots+0x2d) +/* 027F0 80A45520 93187491 */ lbu $t8, %lo(gItemSlots+0x2d)($t8) +/* 027F4 80A45524 3C028016 */ lui $v0, %hi(gSaveContext+0x74) /* 027F8 80A45528 00581021 */ addu $v0, $v0, $t8 -/* 027FC 80A4552C 9042E6D4 */ lbu $v0, -0x192C($v0) ## 8015E6D4 +/* 027FC 80A4552C 9042E6D4 */ lbu $v0, %lo(gSaveContext+0x74)($v0) /* 02800 80A45530 28410033 */ slti $at, $v0, 0x0033 /* 02804 80A45534 14200009 */ bne $at, $zero, .L80A4555C /* 02808 80A45538 28410037 */ slti $at, $v0, 0x0037 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4561C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4561C.s index 1da1910dc6..7c96885c7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4561C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4561C.s @@ -50,20 +50,20 @@ glabel func_80A4561C /* 029A0 80A456D0 10410003 */ beq $v0, $at, .L80A456E0 /* 029A4 80A456D4 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D /* 029A8 80A456D8 14410003 */ bne $v0, $at, .L80A456E8 -/* 029AC 80A456DC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 029AC 80A456DC 3C038016 */ lui $v1, %hi(gSaveContext) .L80A456E0: /* 029B0 80A456E0 10000012 */ beq $zero, $zero, .L80A4572C /* 029B4 80A456E4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80A456E8: -/* 029B8 80A456E8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 029BC 80A456EC 3C028012 */ lui $v0, 0x8012 ## $v0 = 80120000 -/* 029C0 80A456F0 8C427124 */ lw $v0, 0x7124($v0) ## 80127124 +/* 029B8 80A456E8 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 029BC 80A456EC 3C028012 */ lui $v0, %hi(gBitFlags+4) +/* 029C0 80A456F0 8C427124 */ lw $v0, %lo(gBitFlags+4)($v0) /* 029C4 80A456F4 8C6A00A4 */ lw $t2, 0x00A4($v1) ## 8015E704 -/* 029C8 80A456F8 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 +/* 029C8 80A456F8 3C0C8012 */ lui $t4, %hi(gEquipShifts+2) /* 029CC 80A456FC 004A5824 */ and $t3, $v0, $t2 /* 029D0 80A45700 5560000A */ bnel $t3, $zero, .L80A4572C /* 029D4 80A45704 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 029D8 80A45708 918C71F2 */ lbu $t4, 0x71F2($t4) ## 801271F2 +/* 029D8 80A45708 918C71F2 */ lbu $t4, %lo(gEquipShifts+2)($t4) /* 029DC 80A4570C 946E009C */ lhu $t6, 0x009C($v1) ## 8015E6FC /* 029E0 80A45710 01826804 */ sllv $t5, $v0, $t4 /* 029E4 80A45714 01AEC024 */ and $t8, $t5, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45848.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45848.s index cfb0c96ac9..0bcb3a42dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45848.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45848.s @@ -3,10 +3,10 @@ glabel func_80A45848 /* 02B1C 80A4584C AFBF0014 */ sw $ra, 0x0014($sp) /* 02B20 80A45850 8482001C */ lh $v0, 0x001C($a0) ## 0000001C /* 02B24 80A45854 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02B28 80A45858 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 02B28 80A45858 3C038016 */ lui $v1, %hi(gSaveContext) /* 02B2C 80A4585C 3042001F */ andi $v0, $v0, 0x001F ## $v0 = 00000000 /* 02B30 80A45860 1041001B */ beq $v0, $at, .L80A458D0 -/* 02B34 80A45864 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 02B34 80A45864 2463E660 */ addiu $v1, %lo(gSaveContext) /* 02B38 80A45868 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 02B3C 80A4586C 10410014 */ beq $v0, $at, .L80A458C0 /* 02B40 80A45870 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 @@ -37,14 +37,14 @@ glabel func_80A45848 /* 02B98 80A458C8 10000015 */ beq $zero, $zero, .L80A45920 /* 02B9C 80A458CC 8FBF0014 */ lw $ra, 0x0014($sp) .L80A458D0: -/* 02BA0 80A458D0 3C028012 */ lui $v0, 0x8012 ## $v0 = 80120000 -/* 02BA4 80A458D4 8C427124 */ lw $v0, 0x7124($v0) ## 80127124 +/* 02BA0 80A458D0 3C028012 */ lui $v0, %hi(gBitFlags+4) +/* 02BA4 80A458D4 8C427124 */ lw $v0, %lo(gBitFlags+4)($v0) /* 02BA8 80A458D8 8C7900A4 */ lw $t9, 0x00A4($v1) ## 000000A4 -/* 02BAC 80A458DC 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 +/* 02BAC 80A458DC 3C098012 */ lui $t1, %hi(gEquipShifts+2) /* 02BB0 80A458E0 00594024 */ and $t0, $v0, $t9 /* 02BB4 80A458E4 1500000B */ bne $t0, $zero, .L80A45914 /* 02BB8 80A458E8 00000000 */ nop -/* 02BBC 80A458EC 912971F2 */ lbu $t1, 0x71F2($t1) ## 801271F2 +/* 02BBC 80A458EC 912971F2 */ lbu $t1, %lo(gEquipShifts+2)($t1) /* 02BC0 80A458F0 946B009C */ lhu $t3, 0x009C($v1) ## 0000009C /* 02BC4 80A458F4 01225004 */ sllv $t2, $v0, $t1 /* 02BC8 80A458F8 014B6024 */ and $t4, $t2, $t3 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45A00.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45A00.s index 85da73eb18..c45eea974a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45A00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45A00.s @@ -37,9 +37,9 @@ glabel func_80A45A00 /* 02D58 80A45A88 10000006 */ beq $zero, $zero, .L80A45AA4 /* 02D5C 80A45A8C C6000168 */ lwc1 $f0, 0x0168($s0) ## 00000168 .L80A45A90: -/* 02D60 80A45A90 3C048013 */ lui $a0, 0x8013 ## $a0 = 80130000 +/* 02D60 80A45A90 3C048013 */ lui $a0, %hi(D_801333D4) /* 02D64 80A45A94 0C03D149 */ jal func_800F4524 -/* 02D68 80A45A98 248433D4 */ addiu $a0, $a0, 0x33D4 ## $a0 = 801333D4 +/* 02D68 80A45A98 248433D4 */ addiu $a0, %lo(D_801333D4) /* 02D6C 80A45A9C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 02D70 80A45AA0 C6000168 */ lwc1 $f0, 0x0168($s0) ## 00000168 .L80A45AA4: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45C50.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45C50.s index a320c5da63..e17cc02c0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45C50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45C50.s @@ -22,9 +22,9 @@ glabel func_80A45C50 /* 02F6C 80A45C9C 10000005 */ beq $zero, $zero, .L80A45CB4 /* 02F70 80A45CA0 8618001C */ lh $t8, 0x001C($s0) ## 0000001C .L80A45CA4: -/* 02F74 80A45CA4 3C048013 */ lui $a0, 0x8013 ## $a0 = 80130000 +/* 02F74 80A45CA4 3C048013 */ lui $a0, %hi(D_801333D4) /* 02F78 80A45CA8 0C03D149 */ jal func_800F4524 -/* 02F7C 80A45CAC 248433D4 */ addiu $a0, $a0, 0x33D4 ## $a0 = 801333D4 +/* 02F7C 80A45CAC 248433D4 */ addiu $a0, %lo(D_801333D4) /* 02F80 80A45CB0 8618001C */ lh $t8, 0x001C($s0) ## 0000001C .L80A45CB4: /* 02F84 80A45CB4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45DA4.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45DA4.s index e74d617228..570429644d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45DA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45DA4.s @@ -11,8 +11,8 @@ glabel func_80A45DA4 .L80A45DC8: /* 03098 80A45DC8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 0309C 80A45DCC A08E01EA */ sb $t6, 0x01EA($a0) ## 000001EA -/* 030A0 80A45DD0 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 030A4 80A45DD4 95EFF57A */ lhu $t7, -0x0A86($t7) ## 8015F57A +/* 030A0 80A45DD0 3C0F8016 */ lui $t7, %hi(gSaveContext+0xf1a) +/* 030A4 80A45DD4 95EFF57A */ lhu $t7, %lo(gSaveContext+0xf1a)($t7) /* 030A8 80A45DD8 3C0180A5 */ lui $at, %hi(D_80A48728) ## $at = 80A50000 /* 030AC 80A45DDC 31F84000 */ andi $t8, $t7, 0x4000 ## $t8 = 00000000 /* 030B0 80A45DE0 13000005 */ beq $t8, $zero, .L80A45DF8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46418.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46418.s index 140c95c612..6021c176b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46418.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46418.s @@ -1,10 +1,10 @@ glabel func_80A46418 -/* 036E8 80A46418 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 036EC 80A4641C 91CE7491 */ lbu $t6, 0x7491($t6) ## 80127491 -/* 036F0 80A46420 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 036E8 80A46418 3C0E8012 */ lui $t6, %hi(gItemSlots+0x2d) +/* 036EC 80A4641C 91CE7491 */ lbu $t6, %lo(gItemSlots+0x2d)($t6) +/* 036F0 80A46420 3C028016 */ lui $v0, %hi(gSaveContext+0x74) /* 036F4 80A46424 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 036F8 80A46428 004E1021 */ addu $v0, $v0, $t6 -/* 036FC 80A4642C 9042E6D4 */ lbu $v0, -0x192C($v0) ## 8015E6D4 +/* 036FC 80A4642C 9042E6D4 */ lbu $v0, %lo(gSaveContext+0x74)($v0) /* 03700 80A46430 AFBF0014 */ sw $ra, 0x0014($sp) /* 03704 80A46434 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 03708 80A46438 28410033 */ slti $at, $v0, 0x0033 @@ -37,8 +37,8 @@ glabel func_80A46418 /* 0376C 80A4649C AFA70018 */ sw $a3, 0x0018($sp) /* 03770 80A464A0 8FA70018 */ lw $a3, 0x0018($sp) -/* 03774 80A464A4 3C048013 */ lui $a0, 0x8013 ## $a0 = 80130000 -/* 03778 80A464A8 248433D4 */ addiu $a0, $a0, 0x33D4 ## $a0 = 801333D4 +/* 03774 80A464A4 3C048013 */ lui $a0, %hi(D_801333D4) +/* 03778 80A464A8 248433D4 */ addiu $a0, %lo(D_801333D4) /* 0377C 80A464AC 2405391C */ addiu $a1, $zero, 0x391C ## $a1 = 0000391C /* 03780 80A464B0 2406003C */ addiu $a2, $zero, 0x003C ## $a2 = 0000003C /* 03784 80A464B4 0C03D149 */ jal func_800F4524 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47158.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47158.s index 5bcf9694bb..92b3b67543 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47158.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47158.s @@ -38,8 +38,8 @@ glabel func_80A47158 /* 044B4 80A471E4 10000019 */ beq $zero, $zero, .L80A4724C /* 044B8 80A471E8 8FBF001C */ lw $ra, 0x001C($sp) .L80A471EC: -/* 044BC 80A471EC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 044C0 80A471F0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 044BC 80A471EC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 044C0 80A471F0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 044C4 80A471F4 944E0F18 */ lhu $t6, 0x0F18($v0) ## 8015F578 /* 044C8 80A471F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 044CC 80A471FC 8FA50024 */ lw $a1, 0x0024($sp) @@ -49,8 +49,8 @@ glabel func_80A47158 /* 044DC 80A4720C 1000000F */ beq $zero, $zero, .L80A4724C /* 044E0 80A47210 8FBF001C */ lw $ra, 0x001C($sp) .L80A47214: -/* 044E4 80A47214 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 044E8 80A47218 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 044E4 80A47214 3C028016 */ lui $v0, %hi(gSaveContext) +/* 044E8 80A47218 2442E660 */ addiu $v0, %lo(gSaveContext) /* 044EC 80A4721C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 044F0 80A47220 10000008 */ beq $zero, $zero, .L80A47244 /* 044F4 80A47224 A058003E */ sb $t8, 0x003E($v0) ## 8015E69E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4725C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4725C.s index 2086e0820a..80633581c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4725C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4725C.s @@ -55,8 +55,8 @@ glabel func_80A4725C /* 045FC 80A4732C 8FBF0024 */ lw $ra, 0x0024($sp) .L80A47330: /* 04600 80A47330 86030592 */ lh $v1, 0x0592($s0) ## 00000592 -/* 04604 80A47334 3C048013 */ lui $a0, 0x8013 ## $a0 = 80130000 -/* 04608 80A47338 248433D4 */ addiu $a0, $a0, 0x33D4 ## $a0 = 801333D4 +/* 04604 80A47334 3C048013 */ lui $a0, %hi(D_801333D4) +/* 04608 80A47338 248433D4 */ addiu $a0, %lo(D_801333D4) /* 0460C 80A4733C 14600003 */ bne $v1, $zero, .L80A4734C /* 04610 80A47340 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF /* 04614 80A47344 10000004 */ beq $zero, $zero, .L80A47358 @@ -80,8 +80,8 @@ glabel func_80A4725C /* 04650 80A47380 01F94021 */ addu $t0, $t7, $t9 /* 04654 80A47384 0C016C69 */ jal func_8005B1A4 /* 04658 80A47388 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 0465C 80A4738C 3C048013 */ lui $a0, 0x8013 ## $a0 = 80130000 -/* 04660 80A47390 248433D4 */ addiu $a0, $a0, 0x33D4 ## $a0 = 801333D4 +/* 0465C 80A4738C 3C048013 */ lui $a0, %hi(D_801333D4) +/* 04660 80A47390 248433D4 */ addiu $a0, %lo(D_801333D4) /* 04664 80A47394 240528B5 */ addiu $a1, $zero, 0x28B5 ## $a1 = 000028B5 /* 04668 80A47398 0C03D149 */ jal func_800F4524 /* 0466C 80A4739C 2406003C */ addiu $a2, $zero, 0x003C ## $a2 = 0000003C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47490.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47490.s index a9ecc83d49..0047231d3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47490.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47490.s @@ -44,8 +44,8 @@ glabel func_80A47490 /* 04800 80A47530 1000000D */ beq $zero, $zero, .L80A47568 /* 04804 80A47534 A56A0110 */ sh $t2, 0x0110($t3) ## 00000110 .L80A47538: -/* 04808 80A47538 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0480C 80A4753C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 04808 80A47538 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0480C 80A4753C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 04810 80A47540 944C0F18 */ lhu $t4, 0x0F18($v0) ## 8015F578 /* 04814 80A47544 3C0F80A4 */ lui $t7, %hi(func_80A4696C) ## $t7 = 80A40000 /* 04818 80A47548 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s index d374cbe1bf..0f87051a65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s @@ -65,12 +65,12 @@ glabel EnGoma_Init /* 00074 80A48F34 3C1880A5 */ lui $t8, %hi(func_80A4B554) ## $t8 = 80A50000 /* 00078 80A48F38 2718B554 */ addiu $t8, $t8, %lo(func_80A4B554) ## $t8 = 80A4B554 /* 0007C 80A48F3C 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -/* 00080 80A48F40 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 00080 80A48F40 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 00084 80A48F44 44051000 */ mfc1 $a1, $f2 /* 00088 80A48F48 44071000 */ mfc1 $a3, $f2 /* 0008C 80A48F4C AE1802B0 */ sw $t8, 0x02B0($s0) ## 000002B0 /* 00090 80A48F50 A61902B8 */ sh $t9, 0x02B8($s0) ## 000002B8 -/* 00094 80A48F54 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00094 80A48F54 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00098 80A48F58 0C00AC78 */ jal ActorShape_Init /* 0009C 80A48F5C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 @@ -147,8 +147,8 @@ glabel EnGoma_Init /* 001A0 80A49060 C42AB90C */ lwc1 $f10, %lo(D_80A4B90C)($at) /* 001A4 80A49064 46060202 */ mul.s $f8, $f0, $f6 /* 001A8 80A49068 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 001AC 80A4906C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 001B0 80A49070 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 001AC 80A4906C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 001B0 80A49070 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 001B4 80A49074 44051000 */ mfc1 $a1, $f2 /* 001B8 80A49078 44071000 */ mfc1 $a3, $f2 /* 001BC 80A4907C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 @@ -160,8 +160,8 @@ glabel EnGoma_Init /* 001D0 80A49090 8FBF002C */ lw $ra, 0x002C($sp) .L80A49094: /* 001D4 80A49094 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 001D8 80A49098 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 001DC 80A4909C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 001D8 80A49098 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 001DC 80A4909C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 001E0 80A490A0 44051000 */ mfc1 $a1, $f2 /* 001E4 80A490A4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49D0C.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49D0C.s index 32064b5287..955326c4d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49D0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49D0C.s @@ -72,16 +72,16 @@ glabel func_80A49D0C /* 00F28 80A49DE8 E7A80010 */ swc1 $f8, 0x0010($sp) /* 00F2C 80A49DEC 3C0180A5 */ lui $at, %hi(D_80A4B92C) ## $at = 80A50000 /* 00F30 80A49DF0 C42AB92C */ lwc1 $f10, %lo(D_80A4B92C)($at) -/* 00F34 80A49DF4 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00F38 80A49DF8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00F34 80A49DF4 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00F38 80A49DF8 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00F3C 80A49DFC 460A003E */ c.le.s $f0, $f10 /* 00F40 80A49E00 24043878 */ addiu $a0, $zero, 0x3878 ## $a0 = 00003878 /* 00F44 80A49E04 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 00F48 80A49E08 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 00F4C 80A49E0C 45000015 */ bc1f .L80A49E64 -/* 00F50 80A49E10 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 +/* 00F50 80A49E10 3C0A8013 */ lui $t2, %hi(D_801333E8) /* 00F54 80A49E14 8603001C */ lh $v1, 0x001C($s0) ## 0000001C -/* 00F58 80A49E18 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 +/* 00F58 80A49E18 254A33E8 */ addiu $t2, %lo(D_801333E8) /* 00F5C 80A49E1C 28610006 */ slti $at, $v1, 0x0006 /* 00F60 80A49E20 50200007 */ beql $at, $zero, .L80A49E40 /* 00F64 80A49E24 AFA70010 */ sw $a3, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Init.s index 61ac52ce32..bcad15ad19 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Init.s @@ -82,7 +82,7 @@ glabel EnGoroiwa_Init /* 01844 80A4D4E4 24C6DEB4 */ addiu $a2, $a2, %lo(D_80A4DEB4) ## $a2 = FFFFDEB4 /* 01848 80A4D4E8 8628001C */ lh $t0, 0x001C($s1) ## 0000001C /* 0184C 80A4D4EC 3C0580A5 */ lui $a1, %hi(D_80A4DF10) ## $a1 = 80A50000 -/* 01850 80A4D4F0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 01850 80A4D4F0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 01854 80A4D4F4 00084A83 */ sra $t1, $t0, 10 /* 01858 80A4D4F8 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 /* 0185C 80A4D4FC 000A5880 */ sll $t3, $t2, 2 @@ -90,7 +90,7 @@ glabel EnGoroiwa_Init /* 01864 80A4D504 3C074116 */ lui $a3, 0x4116 ## $a3 = 41160000 /* 01868 80A4D508 34E76666 */ ori $a3, $a3, 0x6666 ## $a3 = 41166666 /* 0186C 80A4D50C 8CA5DF10 */ lw $a1, %lo(D_80A4DF10)($a1) -/* 01870 80A4D510 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 01870 80A4D510 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 01874 80A4D514 0C00AC78 */ jal ActorShape_Init /* 01878 80A4D518 262400B4 */ addiu $a0, $s1, 0x00B4 ## $a0 = 000000B4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE10.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE10.s index 09551c4e83..6124399396 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE10.s @@ -3,16 +3,16 @@ glabel func_80A4BE10 /* 00174 80A4BE14 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 /* 00178 80A4BE18 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 0017C 80A4BE1C 15C10007 */ bne $t6, $at, .L80A4BE3C -/* 00180 80A4BE20 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 00180 80A4BE20 3C098016 */ lui $t1, %hi(gGameInfo) /* 00184 80A4BE24 A08F01D2 */ sb $t7, 0x01D2($a0) ## 000001D2 -/* 00188 80A4BE28 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 0018C 80A4BE2C 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 00188 80A4BE28 3C198016 */ lui $t9, %hi(gGameInfo) +/* 0018C 80A4BE2C 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 00190 80A4BE30 24180398 */ addiu $t8, $zero, 0x0398 ## $t8 = 00000398 /* 00194 80A4BE34 03E00008 */ jr $ra /* 00198 80A4BE38 A738116C */ sh $t8, 0x116C($t9) ## 8016116C .L80A4BE3C: /* 0019C 80A4BE3C A08001D2 */ sb $zero, 0x01D2($a0) ## 000001D2 -/* 001A0 80A4BE40 8D29FA90 */ lw $t1, -0x0570($t1) ## 8015FA90 +/* 001A0 80A4BE40 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) /* 001A4 80A4BE44 240803E8 */ addiu $t0, $zero, 0x03E8 ## $t0 = 000003E8 /* 001A8 80A4BE48 A528116C */ sh $t0, 0x116C($t1) ## 8016116C /* 001AC 80A4BE4C 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE54.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE54.s index ef250869e4..e9c53a699e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE54.s @@ -11,12 +11,12 @@ glabel func_80A4BE54 /* 001D8 80A4BE78 01E83021 */ addu $a2, $t7, $t0 /* 001DC 80A4BE7C 8CC30004 */ lw $v1, 0x0004($a2) ## 00000004 /* 001E0 80A4BE80 849801CE */ lh $t8, 0x01CE($a0) ## 000001CE -/* 001E4 80A4BE84 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 001E4 80A4BE84 3C0C8016 */ lui $t4, %hi(gSegments) /* 001E8 80A4BE88 00034900 */ sll $t1, $v1, 4 /* 001EC 80A4BE8C 00095702 */ srl $t2, $t1, 28 /* 001F0 80A4BE90 000A5880 */ sll $t3, $t2, 2 /* 001F4 80A4BE94 018B6021 */ addu $t4, $t4, $t3 -/* 001F8 80A4BE98 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 001F8 80A4BE98 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 001FC 80A4BE9C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00200 80A4BEA0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00204 80A4BEA4 0018C880 */ sll $t9, $t8, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BF28.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BF28.s index 5bf2181642..afc5397f06 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BF28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BF28.s @@ -53,13 +53,13 @@ glabel func_80A4BF28 .L80A4BFDC: /* 0033C 80A4BFDC 012A0019 */ multu $t1, $t2 /* 00340 80A4BFE0 8CE30004 */ lw $v1, 0x0004($a3) ## 00000004 -/* 00344 80A4BFE4 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00344 80A4BFE4 3C0F8016 */ lui $t7, %hi(gSegments) /* 00348 80A4BFE8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0034C 80A4BFEC 00035900 */ sll $t3, $v1, 4 /* 00350 80A4BFF0 000B6702 */ srl $t4, $t3, 28 /* 00354 80A4BFF4 000C6880 */ sll $t5, $t4, 2 /* 00358 80A4BFF8 01ED7821 */ addu $t7, $t7, $t5 -/* 0035C 80A4BFFC 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 0035C 80A4BFFC 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 00360 80A4C000 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00364 80A4C004 0000C012 */ mflo $t8 /* 00368 80A4C008 00617024 */ and $t6, $v1, $at diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C1C4.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C1C4.s index 16daf596e3..b8503682fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C1C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C1C4.s @@ -7,13 +7,13 @@ glabel func_80A4C1C4 /* 00538 80A4C1D8 0018C8C0 */ sll $t9, $t8, 3 /* 0053C 80A4C1DC 01D91021 */ addu $v0, $t6, $t9 /* 00540 80A4C1E0 8C470004 */ lw $a3, 0x0004($v0) ## 00000004 -/* 00544 80A4C1E4 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 00544 80A4C1E4 3C0B8016 */ lui $t3, %hi(gSegments) /* 00548 80A4C1E8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0054C 80A4C1EC 00074100 */ sll $t0, $a3, 4 /* 00550 80A4C1F0 00084F02 */ srl $t1, $t0, 28 /* 00554 80A4C1F4 00095080 */ sll $t2, $t1, 2 /* 00558 80A4C1F8 016A5821 */ addu $t3, $t3, $t2 -/* 0055C 80A4C1FC 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 +/* 0055C 80A4C1FC 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) /* 00560 80A4C200 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00564 80A4C204 00067880 */ sll $t7, $a2, 2 /* 00568 80A4C208 01E67823 */ subu $t7, $t7, $a2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C27C.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C27C.s index f97a29e618..4867322334 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C27C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C27C.s @@ -26,14 +26,14 @@ glabel func_80A4C27C /* 00604 80A4C2A4 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 /* 00608 80A4C2A8 8CC20004 */ lw $v0, 0x0004($a2) ## 00000004 /* 0060C 80A4C2AC 01CA0019 */ multu $t6, $t2 -/* 00610 80A4C2B0 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00610 80A4C2B0 3C0F8016 */ lui $t7, %hi(gSegments) /* 00614 80A4C2B4 00025900 */ sll $t3, $v0, 4 /* 00618 80A4C2B8 000B6702 */ srl $t4, $t3, 28 /* 0061C 80A4C2BC 848B01CC */ lh $t3, 0x01CC($a0) ## 000001CC /* 00620 80A4C2C0 000C6880 */ sll $t5, $t4, 2 /* 00624 80A4C2C4 01ED7821 */ addu $t7, $t7, $t5 /* 00628 80A4C2C8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0062C 80A4C2CC 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 0062C 80A4C2CC 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 00630 80A4C2D0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00634 80A4C2D4 0000C812 */ mflo $t9 /* 00638 80A4C2D8 0041C024 */ and $t8, $v0, $at diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C6C8.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C6C8.s index 5799b9fdfd..55ebbb6a74 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C6C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C6C8.s @@ -5,8 +5,8 @@ glabel D_80A4E068 .text glabel func_80A4C6C8 /* 00A28 80A4C6C8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00A2C 80A4C6CC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00A30 80A4C6D0 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 00A2C 80A4C6CC 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 00A30 80A4C6D0 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 00A34 80A4C6D4 AFBF001C */ sw $ra, 0x001C($sp) /* 00A38 80A4C6D8 AFB00018 */ sw $s0, 0x0018($sp) /* 00A3C 80A4C6DC AFA50034 */ sw $a1, 0x0034($sp) @@ -36,12 +36,12 @@ glabel func_80A4C6C8 /* 00A98 80A4C738 032A1821 */ addu $v1, $t9, $t2 /* 00A9C 80A4C73C 8C620004 */ lw $v0, 0x0004($v1) ## 00000004 /* 00AA0 80A4C740 860801CE */ lh $t0, 0x01CE($s0) ## 000001CE -/* 00AA4 80A4C744 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 00AA4 80A4C744 3C0E8016 */ lui $t6, %hi(gSegments) /* 00AA8 80A4C748 00025900 */ sll $t3, $v0, 4 /* 00AAC 80A4C74C 000B6702 */ srl $t4, $t3, 28 /* 00AB0 80A4C750 000C6880 */ sll $t5, $t4, 2 /* 00AB4 80A4C754 01CD7021 */ addu $t6, $t6, $t5 -/* 00AB8 80A4C758 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 00AB8 80A4C758 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 00ABC 80A4C75C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00AC0 80A4C760 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00AC4 80A4C764 00084880 */ sll $t1, $t0, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C814.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C814.s index c145c98eca..e498fd106f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C814.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C814.s @@ -22,10 +22,10 @@ glabel func_80A4C814 /* 00BB0 80A4C850 00036100 */ sll $t4, $v1, 4 /* 00BB4 80A4C854 000C6F02 */ srl $t5, $t4, 28 /* 00BB8 80A4C858 000D7080 */ sll $t6, $t5, 2 -/* 00BBC 80A4C85C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 00BBC 80A4C85C 3C188016 */ lui $t8, %hi(gSegments) /* 00BC0 80A4C860 030EC021 */ addu $t8, $t8, $t6 /* 00BC4 80A4C864 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00BC8 80A4C868 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 00BC8 80A4C868 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 00BCC 80A4C86C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00BD0 80A4C870 0061C824 */ and $t9, $v1, $at /* 00BD4 80A4C874 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -35,9 +35,9 @@ glabel func_80A4C814 /* 00BE4 80A4C884 00EB1021 */ addu $v0, $a3, $t3 /* 00BE8 80A4C888 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 /* 00BEC 80A4C88C 848C01CC */ lh $t4, 0x01CC($a0) ## 000001CC -/* 00BF0 80A4C890 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00BF0 80A4C890 3C0F8016 */ lui $t7, %hi(gGameInfo) /* 00BF4 80A4C894 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00BF8 80A4C898 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 00BF8 80A4C898 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 00BFC 80A4C89C 018A0019 */ multu $t4, $t2 /* 00C00 80A4C8A0 468021A0 */ cvt.s.w $f6, $f4 /* 00C04 80A4C8A4 3C0180A5 */ lui $at, %hi(D_80A4E06C) ## $at = 80A50000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CA50.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CA50.s index cf80cf8bd3..82b9ef6fd1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CA50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CA50.s @@ -15,16 +15,16 @@ glabel func_80A4CA50 /* 00DD0 80A4CA70 001948C0 */ sll $t1, $t9, 3 /* 00DD4 80A4CA74 01E91821 */ addu $v1, $t7, $t1 /* 00DD8 80A4CA78 8C620004 */ lw $v0, 0x0004($v1) ## 00000004 -/* 00DDC 80A4CA7C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 00DE0 80A4CA80 8D29FA90 */ lw $t1, -0x0570($t1) ## 8015FA90 +/* 00DDC 80A4CA7C 3C098016 */ lui $t1, %hi(gGameInfo) +/* 00DE0 80A4CA80 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) /* 00DE4 80A4CA84 00025100 */ sll $t2, $v0, 4 /* 00DE8 80A4CA88 000A5F02 */ srl $t3, $t2, 28 /* 00DEC 80A4CA8C 849901CE */ lh $t9, 0x01CE($a0) ## 000001CE /* 00DF0 80A4CA90 852A116C */ lh $t2, 0x116C($t1) ## 8016116C /* 00DF4 80A4CA94 000B6080 */ sll $t4, $t3, 2 -/* 00DF8 80A4CA98 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 00DF8 80A4CA98 3C0D8016 */ lui $t5, %hi(gSegments) /* 00DFC 80A4CA9C 01AC6821 */ addu $t5, $t5, $t4 -/* 00E00 80A4CAA0 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 +/* 00E00 80A4CAA0 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) /* 00E04 80A4CAA4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00E08 80A4CAA8 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 /* 00E0C 80A4CAAC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s index 304a01af5f..aabbcab2e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s @@ -22,12 +22,12 @@ glabel func_80A4CB78 /* 00F00 80A4CBA0 01D91821 */ addu $v1, $t6, $t9 /* 00F04 80A4CBA4 8C620004 */ lw $v0, 0x0004($v1) ## 00000004 /* 00F08 80A4CBA8 848F01CE */ lh $t7, 0x01CE($a0) ## 000001CE -/* 00F0C 80A4CBAC 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 00F0C 80A4CBAC 3C0B8016 */ lui $t3, %hi(gSegments) /* 00F10 80A4CBB0 00024100 */ sll $t0, $v0, 4 /* 00F14 80A4CBB4 00084F02 */ srl $t1, $t0, 28 /* 00F18 80A4CBB8 00095080 */ sll $t2, $t1, 2 /* 00F1C 80A4CBBC 016A5821 */ addu $t3, $t3, $t2 -/* 00F20 80A4CBC0 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 +/* 00F20 80A4CBC0 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) /* 00F24 80A4CBC4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00F28 80A4CBC8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00F2C 80A4CBCC 000FC080 */ sll $t8, $t7, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E470.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E470.s index c32c5c80de..87d52b668a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E470.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E470.s @@ -1,7 +1,7 @@ glabel func_80A4E470 /* 00150 80A4E470 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00154 80A4E474 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 00158 80A4E478 24C6FA90 */ addiu $a2, $a2, 0xFA90 ## $a2 = 8015FA90 +/* 00154 80A4E474 3C068016 */ lui $a2, %hi(gGameInfo) +/* 00158 80A4E478 24C6FA90 */ addiu $a2, %lo(gGameInfo) /* 0015C 80A4E47C 8CCE0000 */ lw $t6, 0x0000($a2) ## 8015FA90 /* 00160 80A4E480 AFBF0034 */ sw $ra, 0x0034($sp) /* 00164 80A4E484 AFB10030 */ sw $s1, 0x0030($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4ED34.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4ED34.s index 014ec2c1aa..fb45f38e87 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4ED34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4ED34.s @@ -72,16 +72,16 @@ glabel func_80A4ED34 /* 00AF4 80A4EE14 02002025 */ or $a0, $s0, $zero ## $a0 = 000001E4 /* 00AF8 80A4EE18 96220200 */ lhu $v0, 0x0200($s1) ## 00000200 /* 00AFC 80A4EE1C 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 00B00 80A4EE20 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 00B00 80A4EE20 3C078013 */ lui $a3, %hi(D_801333E0) /* 00B04 80A4EE24 0041001A */ div $zero, $v0, $at /* 00B08 80A4EE28 0000C010 */ mfhi $t8 /* 00B0C 80A4EE2C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 /* 00B10 80A4EE30 17010021 */ bne $t8, $at, .L80A4EEB8 -/* 00B14 80A4EE34 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00B18 80A4EE38 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 00B1C 80A4EE3C 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 00B20 80A4EE40 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00B24 80A4EE44 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00B14 80A4EE34 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00B18 80A4EE38 3C198013 */ lui $t9, %hi(D_801333E8) +/* 00B1C 80A4EE3C 273933E8 */ addiu $t9, %lo(D_801333E8) +/* 00B20 80A4EE40 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00B24 80A4EE44 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00B28 80A4EE48 AFB90014 */ sw $t9, 0x0014($sp) /* 00B2C 80A4EE4C 2404481A */ addiu $a0, $zero, 0x481A ## $a0 = 0000481A /* 00B30 80A4EE50 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 @@ -97,16 +97,16 @@ glabel func_80A4ED34 /* 00B4C 80A4EE6C 24A5FE00 */ addiu $a1, $a1, %lo(D_80A4FE00) ## $a1 = 80A4FE00 /* 00B50 80A4EE70 96220200 */ lhu $v0, 0x0200($s1) ## 00000200 /* 00B54 80A4EE74 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 00B58 80A4EE78 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 00B58 80A4EE78 3C078013 */ lui $a3, %hi(D_801333E0) /* 00B5C 80A4EE7C 0041001A */ div $zero, $v0, $at /* 00B60 80A4EE80 00004010 */ mfhi $t0 /* 00B64 80A4EE84 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 /* 00B68 80A4EE88 1501000B */ bne $t0, $at, .L80A4EEB8 -/* 00B6C 80A4EE8C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00B70 80A4EE90 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 00B74 80A4EE94 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 -/* 00B78 80A4EE98 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00B7C 80A4EE9C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00B6C 80A4EE8C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00B70 80A4EE90 3C098013 */ lui $t1, %hi(D_801333E8) +/* 00B74 80A4EE94 252933E8 */ addiu $t1, %lo(D_801333E8) +/* 00B78 80A4EE98 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00B7C 80A4EE9C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00B80 80A4EEA0 AFA90014 */ sw $t1, 0x0014($sp) /* 00B84 80A4EEA4 24044819 */ addiu $a0, $zero, 0x4819 ## $a0 = 00004819 /* 00B88 80A4EEA8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Init.s index 535cc2563b..07907bc515 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Init.s @@ -25,8 +25,8 @@ glabel D_80A50BF4 .text glabel EnGuest_Init -/* 00000 80A50220 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00004 80A50224 95CEF566 */ lhu $t6, -0x0A9A($t6) ## 8015F566 +/* 00000 80A50220 3C0E8016 */ lui $t6, %hi(gSaveContext+0xf06) +/* 00004 80A50224 95CEF566 */ lhu $t6, %lo(gSaveContext+0xf06)($t6) /* 00008 80A50228 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0000C 80A5022C AFBF0014 */ sw $ra, 0x0014($sp) /* 00010 80A50230 31CF0040 */ andi $t7, $t6, 0x0040 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s index 33b723ff9b..e7cd263a58 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s @@ -46,10 +46,10 @@ glabel EnGuest_Update /* 00184 80A503A4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00188 80A503A8 248442AC */ addiu $a0, $a0, 0x42AC ## $a0 = 060042AC /* 0018C 80A503AC 01816821 */ addu $t5, $t4, $at -/* 00190 80A503B0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00190 80A503B0 3C018016 */ lui $at, %hi(gSegments+0x18) /* 00194 80A503B4 0C028800 */ jal SkelAnime_GetFrameCount -/* 00198 80A503B8 AC2D6FC0 */ sw $t5, 0x6FC0($at) ## 80166FC0 +/* 00198 80A503B8 AC2D6FC0 */ sw $t5, %lo(gSegments+0x18)($at) /* 0019C 80A503BC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 001A0 80A503C0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 001A4 80A503C4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A505CC.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A505CC.s index 72699e8d6a..7e328d5ad2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A505CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A505CC.s @@ -17,7 +17,7 @@ glabel func_80A505CC /* 003E8 80A50608 0320F809 */ jalr $ra, $t9 /* 003EC 80A5060C 00000000 */ nop /* 003F0 80A50610 8FA80024 */ lw $t0, 0x0024($sp) -/* 003F4 80A50614 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 003F4 80A50614 3C0B8016 */ lui $t3, %hi(gSaveContext+4) /* 003F8 80A50618 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 003FC 80A5061C 8D0A0024 */ lw $t2, 0x0024($t0) ## 00000024 /* 00400 80A50620 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -28,7 +28,7 @@ glabel func_80A505CC /* 00414 80A50634 AE0902BC */ sw $t1, 0x02BC($s0) ## 000002BC /* 00418 80A50638 8D0A002C */ lw $t2, 0x002C($t0) ## 0000002C /* 0041C 80A5063C AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 00420 80A50640 8D6BE664 */ lw $t3, -0x199C($t3) ## 8015E664 +/* 00420 80A50640 8D6BE664 */ lw $t3, %lo(gSaveContext+4)($t3) /* 00424 80A50644 55600006 */ bnel $t3, $zero, .L80A50660 /* 00428 80A50648 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 /* 0042C 80A5064C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -58,10 +58,10 @@ glabel func_80A505CC /* 00484 80A506A4 8DEF17B4 */ lw $t7, 0x17B4($t7) ## 000117B4 /* 00488 80A506A8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0048C 80A506AC 01E1C021 */ addu $t8, $t7, $at -/* 00490 80A506B0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00490 80A506B0 3C018016 */ lui $at, %hi(gSegments+0x18) /* 00494 80A506B4 0C02927F */ jal SkelAnime_FrameUpdateMatrix -/* 00498 80A506B8 AC386FC0 */ sw $t8, 0x6FC0($at) ## 80166FC0 +/* 00498 80A506B8 AC386FC0 */ sw $t8, %lo(gSegments+0x18)($at) /* 0049C 80A506BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004A0 80A506C0 0C00B56E */ jal Actor_SetHeight diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s index 224b03c360..5c07d038f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s @@ -61,7 +61,7 @@ glabel func_80A509D4 /* 00878 80A50A98 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0087C 80A50A9C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00880 80A50AA0 3C0480A5 */ lui $a0, %hi(D_80A50BA4) ## $a0 = 80A50000 -/* 00884 80A50AA4 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 00884 80A50AA4 3C088016 */ lui $t0, %hi(gSegments) /* 00888 80A50AA8 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 0088C 80A50AAC AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 /* 00890 80A50AB0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 @@ -77,7 +77,7 @@ glabel func_80A509D4 /* 008B8 80A50AD8 000FC702 */ srl $t8, $t7, 28 /* 008BC 80A50ADC 0018C880 */ sll $t9, $t8, 2 /* 008C0 80A50AE0 01194021 */ addu $t0, $t0, $t9 -/* 008C4 80A50AE4 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 +/* 008C4 80A50AE4 8D086FA8 */ lw $t0, %lo(gSegments)($t0) /* 008C8 80A50AE8 00817024 */ and $t6, $a0, $at /* 008CC 80A50AEC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 008D0 80A50AF0 01C84821 */ addu $t1, $t6, $t0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Draw.s index a9b9a6c37f..60d99673d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Draw.s @@ -30,8 +30,8 @@ glabel EnHeishi1_Draw /* 01418 80A526E8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 0141C 80A526EC 0C00CF0C */ jal func_80033C30 /* 01420 80A526F0 8FA7006C */ lw $a3, 0x006C($sp) -/* 01424 80A526F4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01428 80A526F8 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 01424 80A526F4 3C028016 */ lui $v0, %hi(gGameInfo) +/* 01428 80A526F8 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0142C 80A526FC 8609026C */ lh $t1, 0x026C($s0) ## 0000026C /* 01430 80A52700 844A12D6 */ lh $t2, 0x12D6($v0) ## 801612D6 /* 01434 80A52704 552A0020 */ bnel $t1, $t2, .L80A52788 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Init.s index 416b0c8638..a1385d29ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Init.s @@ -181,12 +181,12 @@ glabel EnHeishi1_Init /* 001C4 80A51494 0C00084C */ jal osSyncPrintf /* 001C8 80A51498 00000000 */ nop -/* 001CC 80A5149C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 001CC 80A5149C 3C028016 */ lui $v0, %hi(gSaveContext+0xc) /* 001D0 80A514A0 3C0480A5 */ lui $a0, %hi(D_80A52AE8) ## $a0 = 80A50000 /* 001D4 80A514A4 24842AE8 */ addiu $a0, $a0, %lo(D_80A52AE8) ## $a0 = 80A52AE8 /* 001D8 80A514A8 0C00084C */ jal osSyncPrintf -/* 001DC 80A514AC 9445E66C */ lhu $a1, -0x1994($v0) ## 8015E66C +/* 001DC 80A514AC 9445E66C */ lhu $a1, %lo(gSaveContext+0xc)($v0) /* 001E0 80A514B0 3C0480A5 */ lui $a0, %hi(D_80A52AFC) ## $a0 = 80A50000 /* 001E4 80A514B4 24842AFC */ addiu $a0, $a0, %lo(D_80A52AFC) ## $a0 = 80A52AFC /* 001E8 80A514B8 0C00084C */ jal osSyncPrintf @@ -236,11 +236,11 @@ glabel EnHeishi1_Init .L80A51558: /* 00288 80A51558 862A026A */ lh $t2, 0x026A($s1) ## 0000026A /* 0028C 80A5155C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00290 80A51560 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00290 80A51560 3C028016 */ lui $v0, %hi(gSaveContext) /* 00294 80A51564 11410017 */ beq $t2, $at, .L80A515C4 -/* 00298 80A51568 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 0029C 80A5156C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 002A0 80A51570 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00298 80A51568 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 0029C 80A5156C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 002A0 80A51570 2442E660 */ addiu $v0, %lo(gSaveContext) /* 002A4 80A51574 944B000C */ lhu $t3, 0x000C($v0) ## 8015E66C /* 002A8 80A51578 3401B888 */ ori $at, $zero, 0xB888 ## $at = 0000B888 /* 002AC 80A5157C 0161082A */ slt $at, $t3, $at diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A516E4.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A516E4.s index 7799d33755..e96dd473ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A516E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A516E4.s @@ -62,7 +62,7 @@ glabel func_80A516E4 /* 00474 80A51744 030FC021 */ addu $t8, $t8, $t7 /* 00478 80A51748 8619026C */ lh $t9, 0x026C($s0) ## 0000026C /* 0047C 80A5174C 8F181E08 */ lw $t8, 0x1E08($t8) ## 00011E08 -/* 00480 80A51750 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 00480 80A51750 3C0D8016 */ lui $t5, %hi(gSegments) /* 00484 80A51754 001948C0 */ sll $t1, $t9, 3 /* 00488 80A51758 03094021 */ addu $t0, $t8, $t1 /* 0048C 80A5175C 8D030004 */ lw $v1, 0x0004($t0) ## 00000004 @@ -72,7 +72,7 @@ glabel func_80A516E4 /* 0049C 80A5176C 000A5F02 */ srl $t3, $t2, 28 /* 004A0 80A51770 000B6080 */ sll $t4, $t3, 2 /* 004A4 80A51774 01AC6821 */ addu $t5, $t5, $t4 -/* 004A8 80A51778 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 +/* 004A8 80A51778 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) /* 004AC 80A5177C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 004B0 80A51780 00617024 */ and $t6, $v1, $at /* 004B4 80A51784 000FC880 */ sll $t9, $t7, 2 @@ -192,8 +192,8 @@ glabel func_80A516E4 /* 0065C 80A5192C 0C01E107 */ jal Math_SmoothScaleMaxF /* 00660 80A51930 8E0702A0 */ lw $a3, 0x02A0($s0) ## 000002A0 -/* 00664 80A51934 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00668 80A51938 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00664 80A51934 3C028016 */ lui $v0, %hi(gGameInfo) +/* 00668 80A51938 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0066C 80A5193C 8605026C */ lh $a1, 0x026C($s0) ## 0000026C /* 00670 80A51940 844912D6 */ lh $t1, 0x12D6($v0) ## 801612D6 /* 00674 80A51944 54A90020 */ bnel $a1, $t1, .L80A519C8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51D18.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51D18.s index 92d9a60aa8..bc8175272b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51D18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51D18.s @@ -143,8 +143,8 @@ glabel func_80A51D18 /* 00BE8 80A51EB8 0C01E107 */ jal Math_SmoothScaleMaxF /* 00BEC 80A51EBC 00000000 */ nop -/* 00BF0 80A51EC0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00BF4 80A51EC4 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00BF0 80A51EC0 3C028016 */ lui $v0, %hi(gGameInfo) +/* 00BF4 80A51EC4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 00BF8 80A51EC8 8605026C */ lh $a1, 0x026C($s0) ## 0000026C /* 00BFC 80A51ECC 845912D6 */ lh $t9, 0x12D6($v0) ## 801612D6 /* 00C00 80A51ED0 54B9001B */ bnel $a1, $t9, .L80A51F40 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5212C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5212C.s index 4f6e675248..da3a45b4ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5212C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5212C.s @@ -23,8 +23,8 @@ glabel func_80A5212C /* 00EAC 80A5217C 0C041B33 */ jal func_80106CCC /* 00EB0 80A52180 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00EB4 80A52184 8FA40020 */ lw $a0, 0x0020($sp) -/* 00EB8 80A52188 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00EBC 80A5218C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00EB8 80A52188 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00EBC 80A5218C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00EC0 80A52190 84980268 */ lh $t8, 0x0268($a0) ## 00000268 /* 00EC4 80A52194 2403002E */ addiu $v1, $zero, 0x002E ## $v1 = 0000002E /* 00EC8 80A52198 240904FA */ addiu $t1, $zero, 0x04FA ## $t1 = 000004FA diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s index bf60263f07..1fa792e220 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s @@ -48,10 +48,10 @@ glabel EnHeishi2_Draw /* 01EF0 80A54D90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01EF4 80A54D94 864F02FE */ lh $t7, 0x02FE($s2) ## 000002FE /* 01EF8 80A54D98 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01EFC 80A54D9C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 01EFC 80A54D9C 3C188016 */ lui $t8, %hi(gSaveContext+0xf06) /* 01F00 80A54DA0 15E10046 */ bne $t7, $at, .L80A54EBC /* 01F04 80A54DA4 00000000 */ nop -/* 01F08 80A54DA8 9718F566 */ lhu $t8, -0x0A9A($t8) ## 8015F566 +/* 01F08 80A54DA8 9718F566 */ lhu $t8, %lo(gSaveContext+0xf06)($t8) /* 01F0C 80A54DAC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01F10 80A54DB0 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 /* 01F14 80A54DB4 33190080 */ andi $t9, $t8, 0x0080 ## $t9 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Init.s index a55e815eec..823e2722a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Init.s @@ -129,8 +129,8 @@ glabel EnHeishi2_Init .L80A52FF4: /* 00154 80A52FF4 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 00158 80A52FF8 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 -/* 0015C 80A52FFC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00160 80A53000 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0015C 80A52FFC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00160 80A53000 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00164 80A53004 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00168 80A53008 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 0016C 80A5300C 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s index 188c1c0909..5eebe04744 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s @@ -49,8 +49,8 @@ glabel func_80A53278 /* 0042C 80A532CC 1000005A */ beq $zero, $zero, .L80A53438 /* 00430 80A532D0 AE18025C */ sw $t8, 0x025C($s0) ## 0000025C .L80A532D4: -/* 00434 80A532D4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00438 80A532D8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00434 80A532D4 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00438 80A532D8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0043C 80A532DC 94590ED4 */ lhu $t9, 0x0ED4($v0) ## 8015F534 /* 00440 80A532E0 33280200 */ andi $t0, $t9, 0x0200 ## $t0 = 00000000 /* 00444 80A532E4 51000015 */ beql $t0, $zero, .L80A5333C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5344C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5344C.s index 0b0bb9434e..4e9fc320d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5344C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5344C.s @@ -23,7 +23,7 @@ glabel func_80A5344C /* 005FC 80A5349C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00600 80A534A0 004F1021 */ addu $v0, $v0, $t7 /* 00604 80A534A4 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 00608 80A534A8 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 00608 80A534A8 3C188016 */ lui $t8, %hi(gSaveContext+0x34) /* 0060C 80A534AC 10400005 */ beq $v0, $zero, .L80A534C4 /* 00610 80A534B0 00000000 */ nop /* 00614 80A534B4 10410014 */ beq $v0, $at, .L80A53508 @@ -31,7 +31,7 @@ glabel func_80A5344C /* 0061C 80A534BC 10000017 */ beq $zero, $zero, .L80A5351C /* 00620 80A534C0 8FA40024 */ lw $a0, 0x0024($sp) .L80A534C4: -/* 00624 80A534C4 8718E694 */ lh $t8, -0x196C($t8) ## 8015E694 +/* 00624 80A534C4 8718E694 */ lh $t8, %lo(gSaveContext+0x34)($t8) /* 00628 80A534C8 3C0A80A5 */ lui $t2, %hi(func_80A54954) ## $t2 = 80A50000 /* 0062C 80A534CC 24097097 */ addiu $t1, $zero, 0x7097 ## $t1 = 00007097 /* 00630 80A534D0 2B01000A */ slti $at, $t8, 0x000A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s index 37853fc642..2897a3e3b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s @@ -9,8 +9,8 @@ glabel func_80A5399C /* 00B00 80A539A0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00B04 80A539A4 AFA50024 */ sw $a1, 0x0024($sp) /* 00B08 80A539A8 A080030B */ sb $zero, 0x030B($a0) ## 0000030B -/* 00B0C 80A539AC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00B10 80A539B0 9442F566 */ lhu $v0, -0x0A9A($v0) ## 8015F566 +/* 00B0C 80A539AC 3C028016 */ lui $v0, %hi(gSaveContext+0xf06) +/* 00B10 80A539B0 9442F566 */ lhu $v0, %lo(gSaveContext+0xf06)($v0) /* 00B14 80A539B4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00B18 80A539B8 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 00B1C 80A539BC 304E0040 */ andi $t6, $v0, 0x0040 ## $t6 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54038.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54038.s index 539cf88c94..97d01c669d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54038.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54038.s @@ -15,8 +15,8 @@ glabel func_80A54038 /* 011C8 80A54068 0C041AF2 */ jal func_80106BC8 /* 011CC 80A5406C 8FA4001C */ lw $a0, 0x001C($sp) /* 011D0 80A54070 1040000F */ beq $v0, $zero, .L80A540B0 -/* 011D4 80A54074 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 011D8 80A54078 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 011D4 80A54074 3C028016 */ lui $v0, %hi(gSaveContext) +/* 011D8 80A54078 2442E660 */ addiu $v0, %lo(gSaveContext) /* 011DC 80A5407C 944E0F06 */ lhu $t6, 0x0F06($v0) ## 8015F566 /* 011E0 80A54080 8FA4001C */ lw $a0, 0x001C($sp) /* 011E4 80A54084 35CF0040 */ ori $t7, $t6, 0x0040 ## $t7 = 00000040 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A540C0.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A540C0.s index 44466163df..8bf74c28bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A540C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A540C0.s @@ -33,8 +33,8 @@ glabel func_80A540C0 /* 01294 80A54134 A60E010E */ sh $t6, 0x010E($s0) ## 0000010E /* 01298 80A54138 0C023C23 */ jal func_8008F08C /* 0129C 80A5413C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 012A0 80A54140 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 012A4 80A54144 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 012A0 80A54140 3C038016 */ lui $v1, %hi(gSaveContext) +/* 012A4 80A54144 2463E660 */ addiu $v1, %lo(gSaveContext) /* 012A8 80A54148 946F0F06 */ lhu $t7, 0x0F06($v1) ## 8015F566 /* 012AC 80A5414C 94790EF6 */ lhu $t9, 0x0EF6($v1) ## 8015F556 /* 012B0 80A54150 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Init.s index 48b9037e2d..969f7be2d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Init.s @@ -33,8 +33,8 @@ glabel EnHeishi3_Init /* 0005C 80A5569C 0C00B58B */ jal Actor_SetScale /* 00060 80A556A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00064 80A556A4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00068 80A556A8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00064 80A556A4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00068 80A556A8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0006C 80A556AC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00070 80A556B0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00074 80A556B4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55850.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55850.s index 423dd9da96..f9569b9422 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55850.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55850.s @@ -17,8 +17,8 @@ glabel func_80A55850 /* 00230 80A55870 AFAF0024 */ sw $t7, 0x0024($sp) /* 00234 80A55874 8618008A */ lh $t8, 0x008A($s0) ## 0000008A /* 00238 80A55878 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 0023C 80A5587C 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 00240 80A55880 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 0023C 80A5587C 3C088016 */ lui $t0, %hi(gSaveContext+0x10) +/* 00240 80A55880 3C098016 */ lui $t1, %hi(gSaveContext+0x10) /* 00244 80A55884 03191023 */ subu $v0, $t8, $t9 /* 00248 80A55888 00021400 */ sll $v0, $v0, 16 /* 0024C 80A5588C 00021403 */ sra $v0, $v0, 16 @@ -34,7 +34,7 @@ glabel func_80A55850 /* 0026C 80A558AC 28614300 */ slti $at, $v1, 0x4300 /* 00270 80A558B0 1020000C */ beq $at, $zero, .L80A558E4 /* 00274 80A558B4 8FAA0024 */ lw $t2, 0x0024($sp) -/* 00278 80A558B8 8D08E670 */ lw $t0, -0x1990($t0) ## 8015E670 +/* 00278 80A558B8 8D08E670 */ lw $t0, %lo(gSaveContext+0x10)($t0) /* 0027C 80A558BC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 00280 80A558C0 55000006 */ bnel $t0, $zero, .L80A558DC /* 00284 80A558C4 44810000 */ mtc1 $at, $f0 ## $f0 = 200.00 @@ -47,7 +47,7 @@ glabel func_80A55850 /* 0029C 80A558DC 1000000C */ beq $zero, $zero, .L80A55910 /* 002A0 80A558E0 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 .L80A558E4: -/* 002A4 80A558E4 8D29E670 */ lw $t1, -0x1990($t1) ## 8015E670 +/* 002A4 80A558E4 8D29E670 */ lw $t1, %lo(gSaveContext+0x10)($t1) /* 002A8 80A558E8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 002AC 80A558EC 55200006 */ bnel $t1, $zero, .L80A55908 /* 002B0 80A558F0 44810000 */ mtc1 $at, $f0 ## $f0 = 100.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55D00.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55D00.s index 7cb0bf57d2..d34618435d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55D00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55D00.s @@ -17,8 +17,8 @@ glabel func_80A55D00 /* 006F8 80A55D38 10400017 */ beq $v0, $zero, .L80A55D98 /* 006FC 80A55D3C 8FA40020 */ lw $a0, 0x0020($sp) /* 00700 80A55D40 908E0276 */ lbu $t6, 0x0276($a0) ## 00000276 -/* 00704 80A55D44 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00708 80A55D48 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00704 80A55D44 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00708 80A55D48 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0070C 80A55D4C 15C00012 */ bne $t6, $zero, .L80A55D98 /* 00710 80A55D50 2403002E */ addiu $v1, $zero, 0x002E ## $v1 = 0000002E /* 00714 80A55D54 944F0EDC */ lhu $t7, 0x0EDC($v0) ## 8015F53C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Init.s index 094b7354b2..8d63694942 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Init.s @@ -76,9 +76,9 @@ glabel EnHeishi4_Init /* 000C0 80A56190 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 /* 000C4 80A56194 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 000C8 80A56198 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 -/* 000CC 80A5619C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 000CC 80A5619C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 000D0 80A561A0 44070000 */ mfc1 $a3, $f0 -/* 000D4 80A561A4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 000D4 80A561A4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 000D8 80A561A8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 000DC 80A561AC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 000E0 80A561B0 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Update.s index 99db4f2809..0cf2bf28c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Update.s @@ -22,7 +22,7 @@ glabel EnHeishi4_Update /* 00C30 80A56D00 11C10021 */ beq $t6, $at, .L80A56D88 /* 00C34 80A56D04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00C38 80A56D08 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 -/* 00C3C 80A56D0C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 00C3C 80A56D0C 3C198016 */ lui $t9, %hi(gSaveContext+4) /* 00C40 80A56D10 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00C44 80A56D14 AE1802A4 */ sw $t8, 0x02A4($s0) ## 000002A4 /* 00C48 80A56D18 8C4F0028 */ lw $t7, 0x0028($v0) ## 00000028 @@ -31,7 +31,7 @@ glabel EnHeishi4_Update /* 00C54 80A56D24 AE0F02A8 */ sw $t7, 0x02A8($s0) ## 000002A8 /* 00C58 80A56D28 8C58002C */ lw $t8, 0x002C($v0) ## 0000002C /* 00C5C 80A56D2C AE1802AC */ sw $t8, 0x02AC($s0) ## 000002AC -/* 00C60 80A56D30 8F39E664 */ lw $t9, -0x199C($t9) ## 8015E664 +/* 00C60 80A56D30 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) /* 00C64 80A56D34 13200006 */ beq $t9, $zero, .L80A56D50 /* 00C68 80A56D38 00000000 */ nop /* 00C6C 80A56D3C C44A0028 */ lwc1 $f10, 0x0028($v0) ## 00000028 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A563BC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A563BC.s index 9d236503d1..23a09eae13 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A563BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A563BC.s @@ -40,8 +40,8 @@ glabel func_80A563BC /* 0037C 80A5644C 10000039 */ beq $zero, $zero, .L80A56534 /* 00380 80A56450 ACD9025C */ sw $t9, 0x025C($a2) ## 0000025C .L80A56454: -/* 00384 80A56454 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00388 80A56458 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00384 80A56454 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00388 80A56458 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0038C 80A5645C 94480EE4 */ lhu $t0, 0x0EE4($v0) ## 8015F544 /* 00390 80A56460 3C0B80A5 */ lui $t3, %hi(func_80A56B40) ## $t3 = 80A50000 /* 00394 80A56464 240A5065 */ addiu $t2, $zero, 0x5065 ## $t2 = 00005065 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56544.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56544.s index 5e58763b49..f32c5bc79a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56544.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56544.s @@ -36,8 +36,8 @@ glabel func_80A56544 /* 004E0 80A565B0 0C029468 */ jal SkelAnime_ChangeAnim /* 004E4 80A565B4 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 004E8 80A565B8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 004EC 80A565BC 8D08E664 */ lw $t0, -0x199C($t0) ## 8015E664 +/* 004E8 80A565B8 3C088016 */ lui $t0, %hi(gSaveContext+4) +/* 004EC 80A565BC 8D08E664 */ lw $t0, %lo(gSaveContext+4)($t0) /* 004F0 80A565C0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 004F4 80A565C4 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 /* 004F8 80A565C8 11000003 */ beq $t0, $zero, .L80A565D8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56614.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56614.s index b4ba6b0d51..0e4568b8b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56614.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56614.s @@ -47,8 +47,8 @@ glabel func_80A56614 /* 005EC 80A566BC 3C0F80A5 */ lui $t7, %hi(func_80A56B40) ## $t7 = 80A50000 /* 005F0 80A566C0 1441000B */ bne $v0, $at, .L80A566F0 /* 005F4 80A566C4 25EF6B40 */ addiu $t7, $t7, %lo(func_80A56B40) ## $t7 = 80A56B40 -/* 005F8 80A566C8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 005FC 80A566CC 8D08E670 */ lw $t0, -0x1990($t0) ## 8015E670 +/* 005F8 80A566C8 3C088016 */ lui $t0, %hi(gSaveContext+0x10) +/* 005FC 80A566CC 8D08E670 */ lw $t0, %lo(gSaveContext+0x10)($t0) /* 00600 80A566D0 24097004 */ addiu $t1, $zero, 0x7004 ## $t1 = 00007004 /* 00604 80A566D4 240A709A */ addiu $t2, $zero, 0x709A ## $t2 = 0000709A /* 00608 80A566D8 15000003 */ bne $t0, $zero, .L80A566E8 @@ -62,8 +62,8 @@ glabel func_80A56614 /* 00620 80A566F0 24010021 */ addiu $at, $zero, 0x0021 ## $at = 00000021 /* 00624 80A566F4 1041000B */ beq $v0, $at, .L80A56724 /* 00628 80A566F8 240E7003 */ addiu $t6, $zero, 0x7003 ## $t6 = 00007003 -/* 0062C 80A566FC 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 00630 80A56700 8D6BE670 */ lw $t3, -0x1990($t3) ## 8015E670 +/* 0062C 80A566FC 3C0B8016 */ lui $t3, %hi(gSaveContext+0x10) +/* 00630 80A56700 8D6BE670 */ lw $t3, %lo(gSaveContext+0x10)($t3) /* 00634 80A56704 240C7002 */ addiu $t4, $zero, 0x7002 ## $t4 = 00007002 /* 00638 80A56708 240D7003 */ addiu $t5, $zero, 0x7003 ## $t5 = 00007003 /* 0063C 80A5670C 15600003 */ bne $t3, $zero, .L80A5671C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A5673C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A5673C.s index b3c6302054..8a7305cc57 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A5673C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A5673C.s @@ -13,8 +13,8 @@ glabel D_80A57074 .text glabel func_80A5673C -/* 0066C 80A5673C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00670 80A56740 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0066C 80A5673C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00670 80A56740 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00674 80A56744 944E0EDC */ lhu $t6, 0x0EDC($v0) ## 8015F53C /* 00678 80A56748 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0067C 80A5674C AFB00028 */ sw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56994.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56994.s index e1407f53a4..e144d6b295 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56994.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56994.s @@ -30,8 +30,8 @@ glabel func_80A56994 /* 00930 80A56A00 8FBF002C */ lw $ra, 0x002C($sp) /* 00934 80A56A04 0C041B33 */ jal func_80106CCC /* 00938 80A56A08 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0093C 80A56A0C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00940 80A56A10 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0093C 80A56A0C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00940 80A56A10 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00944 80A56A14 94590F04 */ lhu $t9, 0x0F04($v0) ## 8015F564 /* 00948 80A56A18 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0094C 80A56A1C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Init.s index 9b95fd51d2..01ac7c7d93 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Init.s @@ -20,8 +20,8 @@ glabel EnHintnuts_Init /* 00044 80A57244 10000050 */ beq $zero, $zero, .L80A57388 /* 00048 80A57248 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 .L80A5724C: -/* 0004C 80A5724C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00050 80A57250 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0004C 80A5724C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00050 80A57250 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00054 80A57254 0C00AC78 */ jal ActorShape_Init /* 00058 80A57258 3C07420C */ lui $a3, 0x420C ## $a3 = 420C0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C18.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C18.s index fa814f85b8..77d69f3f92 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C18.s @@ -1,6 +1,6 @@ glabel func_80A58C18 -/* 00008 80A58C18 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0000C 80A58C1C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00008 80A58C18 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0000C 80A58C1C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00010 80A58C20 8C620000 */ lw $v0, 0x0000($v1) ## 8015E660 /* 00014 80A58C24 384200EE */ xori $v0, $v0, 0x00EE ## $v0 = 000000EE /* 00018 80A58C28 2C420001 */ sltiu $v0, $v0, 0x0001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59014.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59014.s index a28b9aeee8..f4fce97b46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59014.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59014.s @@ -1,6 +1,6 @@ glabel func_80A59014 -/* 00404 80A59014 3C068012 */ lui $a2, 0x8012 ## $a2 = 80120000 -/* 00408 80A59018 8CC6D394 */ lw $a2, -0x2C6C($a2) ## 8011D394 +/* 00404 80A59014 3C068012 */ lui $a2, %hi(D_8011D394) +/* 00408 80A59018 8CC6D394 */ lw $a2, %lo(D_8011D394)($a2) /* 0040C 80A5901C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00410 80A59020 AFBF0014 */ sw $ra, 0x0014($sp) /* 00414 80A59024 AFA40058 */ sw $a0, 0x0058($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59F08.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59F08.s index 90b5e8fd59..516e0c5458 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59F08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59F08.s @@ -37,8 +37,8 @@ glabel func_80A59F08 /* 00340 80A59F70 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00344 80A59F74 0C0187B5 */ jal func_80061ED4 /* 00348 80A59F78 E6040070 */ swc1 $f4, 0x0070($s0) ## 00000070 -/* 0034C 80A59F7C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00350 80A59F80 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0034C 80A59F7C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00350 80A59F80 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00354 80A59F84 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00358 80A59F88 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0035C 80A59F8C 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5ABFC.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5ABFC.s index 5db8d54e88..32e2f2059d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5ABFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5ABFC.s @@ -36,7 +36,7 @@ glabel func_80A5ABFC /* 0101C 80A5AC4C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 01020 80A5AC50 8FA80048 */ lw $t0, 0x0048($sp) /* 01024 80A5AC54 3C0480A6 */ lui $a0, %hi(D_80A5B060) ## $a0 = 80A60000 -/* 01028 80A5AC58 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 01028 80A5AC58 3C0F8016 */ lui $t7, %hi(gSegments) /* 0102C 80A5AC5C 8509022A */ lh $t1, 0x022A($t0) ## 0000022A /* 01030 80A5AC60 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01034 80A5AC64 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF @@ -49,7 +49,7 @@ glabel func_80A5ABFC /* 01050 80A5AC80 000C6F02 */ srl $t5, $t4, 28 /* 01054 80A5AC84 000D7080 */ sll $t6, $t5, 2 /* 01058 80A5AC88 01EE7821 */ addu $t7, $t7, $t6 -/* 0105C 80A5AC8C 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 0105C 80A5AC8C 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 01060 80A5AC90 00815824 */ and $t3, $a0, $at /* 01064 80A5AC94 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01068 80A5AC98 016FC021 */ addu $t8, $t3, $t7 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s index fa6e8f6305..f4af5f1b18 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s @@ -15,8 +15,8 @@ glabel D_80A6687C glabel EnHorse_Init /* 00DE0 80A5C0D0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00DE4 80A5C0D4 AFB10030 */ sw $s1, 0x0030($sp) -/* 00DE8 80A5C0D8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00DEC 80A5C0DC 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 00DE8 80A5C0D8 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 00DEC 80A5C0DC 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 00DF0 80A5C0E0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00DF4 80A5C0E4 AFBF0034 */ sw $ra, 0x0034($sp) /* 00DF8 80A5C0E8 AFB0002C */ sw $s0, 0x002C($sp) @@ -28,15 +28,15 @@ glabel EnHorse_Init /* 00E0C 80A5C0FC A5C00E60 */ sh $zero, 0x0E60($t6) ## 80160E60 /* 00E10 80A5C100 0C297032 */ jal func_80A5C0C8 /* 00E14 80A5C104 260403C8 */ addiu $a0, $s0, 0x03C8 ## $a0 = 000003C8 -/* 00E18 80A5C108 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00E1C 80A5C10C 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 00E18 80A5C108 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 00E1C 80A5C10C 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 00E20 80A5C110 26180024 */ addiu $t8, $s0, 0x0024 ## $t8 = 00000024 /* 00E24 80A5C114 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 00E28 80A5C118 A5E005BE */ sh $zero, 0x05BE($t7) ## 801605BE /* 00E2C 80A5C11C AFB8003C */ sw $t8, 0x003C($sp) /* 00E30 80A5C120 8F090000 */ lw $t1, 0x0000($t8) ## 00000024 /* 00E34 80A5C124 44813000 */ mtc1 $at, $f6 ## $f6 = 70.00 -/* 00E38 80A5C128 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00E38 80A5C128 3C028016 */ lui $v0, %hi(gGameInfo) /* 00E3C 80A5C12C AE090258 */ sw $t1, 0x0258($s0) ## 00000258 /* 00E40 80A5C130 8F080004 */ lw $t0, 0x0004($t8) ## 00000028 /* 00E44 80A5C134 AE08025C */ sw $t0, 0x025C($s0) ## 0000025C @@ -47,7 +47,7 @@ glabel EnHorse_Init /* 00E58 80A5C148 AE000154 */ sw $zero, 0x0154($s0) ## 00000154 /* 00E5C 80A5C14C AE090260 */ sw $t1, 0x0260($s0) ## 00000260 /* 00E60 80A5C150 E608025C */ swc1 $f8, 0x025C($s0) ## 0000025C -/* 00E64 80A5C154 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00E64 80A5C154 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 00E68 80A5C158 844A055C */ lh $t2, 0x055C($v0) ## 8016055C /* 00E6C 80A5C15C 15400002 */ bne $t2, $zero, .L80A5C168 /* 00E70 80A5C160 240B0046 */ addiu $t3, $zero, 0x0046 ## $t3 = 00000046 @@ -140,9 +140,9 @@ glabel EnHorse_Init /* 00F98 80A5C288 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 /* 00F9C 80A5C28C 14400006 */ bne $v0, $zero, .L80A5C2A8 -/* 00FA0 80A5C290 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 00FA4 80A5C294 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 -/* 00FA8 80A5C298 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 00FA0 80A5C290 3C198016 */ lui $t9, %hi(gGameInfo) +/* 00FA4 80A5C294 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) +/* 00FA8 80A5C298 3C0D8016 */ lui $t5, %hi(gSaveContext+0x13fa) /* 00FAC 80A5C29C 87280556 */ lh $t0, 0x0556($t9) ## 80160556 /* 00FB0 80A5C2A0 1100000A */ beq $t0, $zero, .L80A5C2CC /* 00FB4 80A5C2A4 00000000 */ nop @@ -157,7 +157,7 @@ glabel EnHorse_Init /* 00FD4 80A5C2C4 10000014 */ beq $zero, $zero, .L80A5C318 /* 00FD8 80A5C2C8 AE0C01F0 */ sw $t4, 0x01F0($s0) ## 000001F0 .L80A5C2CC: -/* 00FDC 80A5C2CC 95ADFA5A */ lhu $t5, -0x05A6($t5) ## 8015FA5A +/* 00FDC 80A5C2CC 95ADFA5A */ lhu $t5, %lo(gSaveContext+0x13fa)($t5) /* 00FE0 80A5C2D0 31AE0040 */ andi $t6, $t5, 0x0040 ## $t6 = 00000000 /* 00FE4 80A5C2D4 51C00011 */ beql $t6, $zero, .L80A5C31C /* 00FE8 80A5C2D8 862900A4 */ lh $t1, 0x00A4($s1) ## 000000A4 @@ -183,8 +183,8 @@ glabel EnHorse_Init .L80A5C31C: /* 0102C 80A5C31C 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 /* 01030 80A5C320 15210012 */ bne $t1, $at, .L80A5C36C -/* 01034 80A5C324 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 01038 80A5C328 954AFA5A */ lhu $t2, -0x05A6($t2) ## 8015FA5A +/* 01034 80A5C324 3C0A8016 */ lui $t2, %hi(gSaveContext+0x13fa) +/* 01038 80A5C328 954AFA5A */ lhu $t2, %lo(gSaveContext+0x13fa)($t2) /* 0103C 80A5C32C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 01040 80A5C330 314B000F */ andi $t3, $t2, 0x000F ## $t3 = 00000000 /* 01044 80A5C334 5561000E */ bnel $t3, $at, .L80A5C370 @@ -193,8 +193,8 @@ glabel EnHorse_Init /* 01050 80A5C340 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 /* 01054 80A5C344 14400009 */ bne $v0, $zero, .L80A5C36C -/* 01058 80A5C348 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 0105C 80A5C34C 8D8CFA90 */ lw $t4, -0x0570($t4) ## 8015FA90 +/* 01058 80A5C348 3C0C8016 */ lui $t4, %hi(gGameInfo) +/* 0105C 80A5C34C 8D8CFA90 */ lw $t4, %lo(gGameInfo)($t4) /* 01060 80A5C350 858D0556 */ lh $t5, 0x0556($t4) ## 80160556 /* 01064 80A5C354 55A00006 */ bnel $t5, $zero, .L80A5C370 /* 01068 80A5C358 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 @@ -211,8 +211,8 @@ glabel EnHorse_Init /* 01088 80A5C378 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0108C 80A5C37C 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 /* 01090 80A5C380 44815000 */ mtc1 $at, $f10 ## $f10 = -3.50 -/* 01094 80A5C384 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 01098 80A5C388 24C6B644 */ addiu $a2, $a2, 0xB644 ## $a2 = 8002B644 +/* 01094 80A5C384 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Squiggly) +/* 01098 80A5C388 24C6B644 */ addiu $a2, %lo(ActorShadow_DrawFunc_Squiggly) /* 0109C 80A5C38C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 010A0 80A5C390 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 010A4 80A5C394 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 @@ -272,7 +272,7 @@ glabel EnHorse_Init /* 01164 80A5C454 44812000 */ mtc1 $at, $f4 ## $f4 = 70.00 /* 01168 80A5C458 8D0A0000 */ lw $t2, 0x0000($t0) ## 00000000 /* 0116C 80A5C45C 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 -/* 01170 80A5C460 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 01170 80A5C460 3C0B8016 */ lui $t3, %hi(gSaveContext+0x1360) /* 01174 80A5C464 AE0A0038 */ sw $t2, 0x0038($s0) ## 00000038 /* 01178 80A5C468 8D090004 */ lw $t1, 0x0004($t0) ## 00000004 /* 0117C 80A5C46C AE09003C */ sw $t1, 0x003C($s0) ## 0000003C @@ -285,7 +285,7 @@ glabel EnHorse_Init /* 01198 80A5C488 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 /* 0119C 80A5C48C 54410035 */ bnel $v0, $at, .L80A5C564 /* 011A0 80A5C490 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 -/* 011A4 80A5C494 8D6BF9C0 */ lw $t3, -0x0640($t3) ## 8015F9C0 +/* 011A4 80A5C494 8D6BF9C0 */ lw $t3, %lo(gSaveContext+0x1360)($t3) /* 011A8 80A5C498 29610004 */ slti $at, $t3, 0x0004 /* 011AC 80A5C49C 50200031 */ beql $at, $zero, .L80A5C564 /* 011B0 80A5C4A0 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 @@ -294,10 +294,10 @@ glabel EnHorse_Init /* 011BC 80A5C4AC 1581001C */ bne $t4, $at, .L80A5C520 /* 011C0 80A5C4B0 00000000 */ nop /* 011C4 80A5C4B4 860D0034 */ lh $t5, 0x0034($s0) ## 00000034 -/* 011C8 80A5C4B8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 011C8 80A5C4B8 3C0E8016 */ lui $t6, %hi(gSaveContext+0x10) /* 011CC 80A5C4BC 11A00004 */ beq $t5, $zero, .L80A5C4D0 /* 011D0 80A5C4C0 00000000 */ nop -/* 011D4 80A5C4C4 8DCEE670 */ lw $t6, -0x1990($t6) ## 8015E670 +/* 011D4 80A5C4C4 8DCEE670 */ lw $t6, %lo(gSaveContext+0x10)($t6) /* 011D8 80A5C4C8 11C00005 */ beq $t6, $zero, .L80A5C4E0 /* 011DC 80A5C4CC 00000000 */ nop .L80A5C4D0: @@ -332,13 +332,13 @@ glabel EnHorse_Init /* 01234 80A5C524 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 /* 01238 80A5C528 14400027 */ bne $v0, $zero, .L80A5C5C8 -/* 0123C 80A5C52C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 01240 80A5C530 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 -/* 01244 80A5C534 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 0123C 80A5C52C 3C188016 */ lui $t8, %hi(gGameInfo) +/* 01240 80A5C530 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) +/* 01244 80A5C534 3C088016 */ lui $t0, %hi(gSaveContext+0x10) /* 01248 80A5C538 87190556 */ lh $t9, 0x0556($t8) ## 80160556 /* 0124C 80A5C53C 57200023 */ bnel $t9, $zero, .L80A5C5CC /* 01250 80A5C540 8E020158 */ lw $v0, 0x0158($s0) ## 00000158 -/* 01254 80A5C544 8D08E670 */ lw $t0, -0x1990($t0) ## 8015E670 +/* 01254 80A5C544 8D08E670 */ lw $t0, %lo(gSaveContext+0x10)($t0) /* 01258 80A5C548 51000020 */ beql $t0, $zero, .L80A5C5CC /* 0125C 80A5C54C 8E020158 */ lw $v0, 0x0158($s0) ## 00000158 /* 01260 80A5C550 0C00B55C */ jal Actor_Kill @@ -349,21 +349,21 @@ glabel EnHorse_Init /* 01270 80A5C560 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 .L80A5C564: /* 01274 80A5C564 14410018 */ bne $v0, $at, .L80A5C5C8 -/* 01278 80A5C568 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 0127C 80A5C56C 8D29E670 */ lw $t1, -0x1990($t1) ## 8015E670 +/* 01278 80A5C568 3C098016 */ lui $t1, %hi(gSaveContext+0x10) +/* 0127C 80A5C56C 8D29E670 */ lw $t1, %lo(gSaveContext+0x10)($t1) /* 01280 80A5C570 1120000D */ beq $t1, $zero, .L80A5C5A8 /* 01284 80A5C574 00000000 */ nop /* 01288 80A5C578 0C00D6D3 */ jal Flags_GetEventChkInf /* 0128C 80A5C57C 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 /* 01290 80A5C580 14400009 */ bne $v0, $zero, .L80A5C5A8 -/* 01294 80A5C584 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 01298 80A5C588 8D4AFA90 */ lw $t2, -0x0570($t2) ## 8015FA90 -/* 0129C 80A5C58C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 01294 80A5C584 3C0A8016 */ lui $t2, %hi(gGameInfo) +/* 01298 80A5C588 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) +/* 0129C 80A5C58C 3C0C8016 */ lui $t4, %hi(gSaveContext+4) /* 012A0 80A5C590 854B0556 */ lh $t3, 0x0556($t2) ## 80160556 /* 012A4 80A5C594 15600004 */ bne $t3, $zero, .L80A5C5A8 /* 012A8 80A5C598 00000000 */ nop -/* 012AC 80A5C59C 8D8CE664 */ lw $t4, -0x199C($t4) ## 8015E664 +/* 012AC 80A5C59C 8D8CE664 */ lw $t4, %lo(gSaveContext+4)($t4) /* 012B0 80A5C5A0 51800006 */ beql $t4, $zero, .L80A5C5BC /* 012B4 80A5C5A4 8E0D01F0 */ lw $t5, 0x01F0($s0) ## 000001F0 .L80A5C5A8: @@ -456,8 +456,8 @@ glabel EnHorse_Init /* 013F8 80A5C6E8 24060C05 */ addiu $a2, $zero, 0x0C05 ## $a2 = 00000C05 .L80A5C6EC: -/* 013FC 80A5C6EC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 01400 80A5C6F0 95CEFA5A */ lhu $t6, -0x05A6($t6) ## 8015FA5A +/* 013FC 80A5C6EC 3C0E8016 */ lui $t6, %hi(gSaveContext+0x13fa) +/* 01400 80A5C6F0 95CEFA5A */ lhu $t6, %lo(gSaveContext+0x13fa)($t6) /* 01404 80A5C6F4 3C01414A */ lui $at, 0x414A ## $at = 414A0000 /* 01408 80A5C6F8 31CF0040 */ andi $t7, $t6, 0x0040 ## $t7 = 00000000 /* 0140C 80A5C6FC 55E00006 */ bnel $t7, $zero, .L80A5C718 @@ -497,8 +497,8 @@ glabel EnHorse_Init /* 01484 80A5C774 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 /* 01488 80A5C778 14400009 */ bne $v0, $zero, .L80A5C7A0 -/* 0148C 80A5C77C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 01490 80A5C780 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 0148C 80A5C77C 3C198016 */ lui $t9, %hi(gGameInfo) +/* 01490 80A5C780 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 01494 80A5C784 87280556 */ lh $t0, 0x0556($t9) ## 80160556 /* 01498 80A5C788 55000006 */ bnel $t0, $zero, .L80A5C7A4 /* 0149C 80A5C78C 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s index 176f0b7ccf..c6bcca941c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s @@ -178,14 +178,14 @@ glabel EnHorse_Update /* 0963C 80A6492C 8E0B014C */ lw $t3, 0x014C($s0) ## 0000014C /* 09640 80A64930 8E180228 */ lw $t8, 0x0228($s0) ## 00000228 /* 09644 80A64934 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C -/* 09648 80A64938 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 09648 80A64938 3C078013 */ lui $a3, %hi(D_801333E0) /* 0964C 80A6493C ACB80000 */ sw $t8, 0x0000($a1) ## 0000021C /* 09650 80A64940 8E0F022C */ lw $t7, 0x022C($s0) ## 0000022C -/* 09654 80A64944 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 09658 80A64948 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 09654 80A64944 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 09658 80A64948 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 0965C 80A6494C ACAF0004 */ sw $t7, 0x0004($a1) ## 00000220 /* 09660 80A64950 8E180230 */ lw $t8, 0x0230($s0) ## 00000230 -/* 09664 80A64954 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 +/* 09664 80A64954 254A33E8 */ addiu $t2, %lo(D_801333E8) /* 09668 80A64958 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 /* 0966C 80A6495C ACB80008 */ sw $t8, 0x0008($a1) ## 00000224 /* 09670 80A64960 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 @@ -346,10 +346,10 @@ glabel EnHorse_Update .L80A64B88: /* 09898 80A64B88 84AB00A4 */ lh $t3, 0x00A4($a1) ## 000000A4 /* 0989C 80A64B8C 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -/* 098A0 80A64B90 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 098A0 80A64B90 3C0C8016 */ lui $t4, %hi(gSaveContext+0xee6) /* 098A4 80A64B94 55610009 */ bnel $t3, $at, .L80A64BBC /* 098A8 80A64B98 8FB9003C */ lw $t9, 0x003C($sp) -/* 098AC 80A64B9C 958CF546 */ lhu $t4, -0x0ABA($t4) ## 8015F546 +/* 098AC 80A64B9C 958CF546 */ lhu $t4, %lo(gSaveContext+0xee6)($t4) /* 098B0 80A64BA0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 098B4 80A64BA4 318D000F */ andi $t5, $t4, 0x000F ## $t5 = 00000000 /* 098B8 80A64BA8 51A10004 */ beql $t5, $at, .L80A64BBC @@ -399,8 +399,8 @@ glabel EnHorse_Update /* 09954 80A64C44 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 09958 80A64C48 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 0995C 80A64C4C 46105032 */ c.eq.s $f10, $f16 -/* 09960 80A64C50 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 09964 80A64C54 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 09960 80A64C50 3C088016 */ lui $t0, %hi(gSaveContext) +/* 09964 80A64C54 3C098016 */ lui $t1, %hi(gSaveContext+0x1360) /* 09968 80A64C58 45020009 */ bc1fl .L80A64C80 /* 0996C 80A64C5C A20D00AE */ sb $t5, 0x00AE($s0) ## 000000AE /* 09970 80A64C60 8E0A01F0 */ lw $t2, 0x01F0($s0) ## 000001F0 @@ -426,11 +426,11 @@ glabel EnHorse_Update /* 099B8 80A64CA8 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 00000000 /* 099BC 80A64CAC A2180288 */ sb $t8, 0x0288($s0) ## 00000288 .L80A64CB0: -/* 099C0 80A64CB0 8D08E660 */ lw $t0, -0x19A0($t0) ## 8015E660 +/* 099C0 80A64CB0 8D08E660 */ lw $t0, %lo(gSaveContext)($t0) /* 099C4 80A64CB4 24010157 */ addiu $at, $zero, 0x0157 ## $at = 00000157 /* 099C8 80A64CB8 55010006 */ bnel $t0, $at, .L80A64CD4 /* 099CC 80A64CBC 960203C8 */ lhu $v0, 0x03C8($s0) ## 000003C8 -/* 099D0 80A64CC0 8D29F9C0 */ lw $t1, -0x0640($t1) ## 8015F9C0 +/* 099D0 80A64CC0 8D29F9C0 */ lw $t1, %lo(gSaveContext+0x1360)($t1) /* 099D4 80A64CC4 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 /* 099D8 80A64CC8 51210079 */ beql $t1, $at, .L80A64EB0 /* 099DC 80A64CCC 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B2F0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B2F0.s index 9c76285d4d..f6295d9ea1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B2F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B2F0.s @@ -14,7 +14,7 @@ glabel func_80A5B2F0 /* 00018 80A5B308 3C0180A6 */ lui $at, %hi(D_80A6684C) ## $at = 80A60000 /* 0001C 80A5B30C C426684C */ lwc1 $f6, %lo(D_80A6684C)($at) /* 00020 80A5B310 C4840068 */ lwc1 $f4, 0x0068($a0) ## 00000068 -/* 00024 80A5B314 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00024 80A5B314 3C0F8016 */ lui $t7, %hi(gSaveContext+0xee6) /* 00028 80A5B318 4606203C */ c.lt.s $f4, $f6 /* 0002C 80A5B31C 00000000 */ nop /* 00030 80A5B320 45000003 */ bc1f .L80A5B330 @@ -22,7 +22,7 @@ glabel func_80A5B2F0 /* 00038 80A5B328 03E00008 */ jr $ra /* 0003C 80A5B32C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A5B330: -/* 00040 80A5B330 95EFF546 */ lhu $t7, -0x0ABA($t7) ## 8015F546 +/* 00040 80A5B330 95EFF546 */ lhu $t7, %lo(gSaveContext+0xee6)($t7) /* 00044 80A5B334 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 00048 80A5B338 3C0380A6 */ lui $v1, %hi(D_80A665DC) ## $v1 = 80A60000 /* 0004C 80A5B33C 31F8000F */ andi $t8, $t7, 0x000F ## $t8 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B9C8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B9C8.s index 82fdef28e8..6e79dbae63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B9C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B9C8.s @@ -18,7 +18,7 @@ glabel func_80A5B9C8 /* 00718 80A5BA08 4502001A */ bc1fl .L80A5BA74 /* 0071C 80A5BA0C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00720 80A5BA10 14400008 */ bne $v0, $zero, .L80A5BA34 -/* 00724 80A5BA14 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 00724 80A5BA14 3C078013 */ lui $a3, %hi(D_801333E0) /* 00728 80A5BA18 8C790004 */ lw $t9, 0x0004($v1) ## 80A66660 /* 0072C 80A5BA1C 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 /* 00730 80A5BA20 00000000 */ nop @@ -27,9 +27,9 @@ glabel func_80A5B9C8 /* 0073C 80A5BA2C 00000000 */ nop /* 00740 80A5BA30 4501000F */ bc1t .L80A5BA70 .L80A5BA34: -/* 00744 80A5BA34 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 00748 80A5BA38 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0074C 80A5BA3C 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 +/* 00744 80A5BA34 3C088013 */ lui $t0, %hi(D_801333E8) +/* 00748 80A5BA38 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0074C 80A5BA3C 250833E8 */ addiu $t0, %lo(D_801333E8) /* 00750 80A5BA40 AFA80014 */ sw $t0, 0x0014($sp) /* 00754 80A5BA44 AFA70010 */ sw $a3, 0x0010($sp) /* 00758 80A5BA48 24042803 */ addiu $a0, $zero, 0x2803 ## $a0 = 00002803 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BA84.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BA84.s index 7a0c6de87a..8f30bbb8d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BA84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BA84.s @@ -2,11 +2,11 @@ glabel func_80A5BA84 /* 00794 80A5BA84 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00798 80A5BA88 AFA40020 */ sw $a0, 0x0020($sp) /* 0079C 80A5BA8C 8FA50020 */ lw $a1, 0x0020($sp) -/* 007A0 80A5BA90 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 007A4 80A5BA94 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 007A8 80A5BA98 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 007A0 80A5BA90 3C078013 */ lui $a3, %hi(D_801333E0) +/* 007A4 80A5BA94 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 007A8 80A5BA98 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 007AC 80A5BA9C AFBF001C */ sw $ra, 0x001C($sp) -/* 007B0 80A5BAA0 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 +/* 007B0 80A5BAA0 25CE33E8 */ addiu $t6, %lo(D_801333E8) /* 007B4 80A5BAA4 AFAE0014 */ sw $t6, 0x0014($sp) /* 007B8 80A5BAA8 AFA70010 */ sw $a3, 0x0010($sp) /* 007BC 80A5BAAC 24042804 */ addiu $a0, $zero, 0x2804 ## $a0 = 00002804 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BACC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BACC.s index 56b5c6505a..20050f64f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BACC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BACC.s @@ -2,11 +2,11 @@ glabel func_80A5BACC /* 007DC 80A5BACC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 007E0 80A5BAD0 AFA40020 */ sw $a0, 0x0020($sp) /* 007E4 80A5BAD4 8FA50020 */ lw $a1, 0x0020($sp) -/* 007E8 80A5BAD8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 007EC 80A5BADC 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 007F0 80A5BAE0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 007E8 80A5BAD8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 007EC 80A5BADC 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 007F0 80A5BAE0 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 007F4 80A5BAE4 AFBF001C */ sw $ra, 0x001C($sp) -/* 007F8 80A5BAE8 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 +/* 007F8 80A5BAE8 25CE33E8 */ addiu $t6, %lo(D_801333E8) /* 007FC 80A5BAEC AFAE0014 */ sw $t6, 0x0014($sp) /* 00800 80A5BAF0 AFA70010 */ sw $a3, 0x0010($sp) /* 00804 80A5BAF4 24042804 */ addiu $a0, $zero, 0x2804 ## $a0 = 00002804 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BC68.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BC68.s index ce81d06e50..9f8cffc97b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BC68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BC68.s @@ -31,14 +31,14 @@ glabel func_80A5BC68 /* 009E8 80A5BCD8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 009EC 80A5BCDC 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 .L80A5BCE0: -/* 009F0 80A5BCE0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 009F4 80A5BCE4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 009F0 80A5BCE0 3C078013 */ lui $a3, %hi(D_801333E0) +/* 009F4 80A5BCE4 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 009F8 80A5BCE8 30581000 */ andi $t8, $v0, 0x1000 ## $t8 = 00000000 /* 009FC 80A5BCEC 1700000C */ bne $t8, $zero, .L80A5BD20 /* 00A00 80A5BCF0 34591000 */ ori $t9, $v0, 0x1000 ## $t9 = 00001000 -/* 00A04 80A5BCF4 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 +/* 00A04 80A5BCF4 3C088013 */ lui $t0, %hi(D_801333E8) /* 00A08 80A5BCF8 AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 -/* 00A0C 80A5BCFC 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 +/* 00A0C 80A5BCFC 250833E8 */ addiu $t0, %lo(D_801333E8) /* 00A10 80A5BD00 AFA80014 */ sw $t0, 0x0014($sp) /* 00A14 80A5BD04 AFA70010 */ sw $a3, 0x0010($sp) /* 00A18 80A5BD08 2404282C */ addiu $a0, $zero, 0x282C ## $a0 = 0000282C @@ -60,14 +60,14 @@ glabel func_80A5BC68 /* 00A4C 80A5BD3C 45020011 */ bc1fl .L80A5BD84 /* 00A50 80A5BD40 8FBF0024 */ lw $ra, 0x0024($sp) /* 00A54 80A5BD44 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -/* 00A58 80A5BD48 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00A5C 80A5BD4C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00A58 80A5BD48 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00A5C 80A5BD4C 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00A60 80A5BD50 30490800 */ andi $t1, $v0, 0x0800 ## $t1 = 00000000 /* 00A64 80A5BD54 1520000A */ bne $t1, $zero, .L80A5BD80 /* 00A68 80A5BD58 344A0800 */ ori $t2, $v0, 0x0800 ## $t2 = 00000800 -/* 00A6C 80A5BD5C 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 +/* 00A6C 80A5BD5C 3C0B8013 */ lui $t3, %hi(D_801333E8) /* 00A70 80A5BD60 AE0A01F0 */ sw $t2, 0x01F0($s0) ## 000001F0 -/* 00A74 80A5BD64 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 +/* 00A74 80A5BD64 256B33E8 */ addiu $t3, %lo(D_801333E8) /* 00A78 80A5BD68 AFAB0014 */ sw $t3, 0x0014($sp) /* 00A7C 80A5BD6C AFA70010 */ sw $a3, 0x0010($sp) /* 00A80 80A5BD70 2404282B */ addiu $a0, $zero, 0x282B ## $a0 = 0000282B diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BD94.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BD94.s index a2f83a0821..1dea2ec8ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BD94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BD94.s @@ -36,9 +36,9 @@ glabel func_80A5BD94 /* 00B14 80A5BE04 0C00D6D3 */ jal Flags_GetEventChkInf /* 00B18 80A5BE08 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 00B1C 80A5BE0C 1040000A */ beq $v0, $zero, .L80A5BE38 -/* 00B20 80A5BE10 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00B24 80A5BE14 95EFFA5A */ lhu $t7, -0x05A6($t7) ## 8015FA5A +/* 00B1C 80A5BE0C 1040000A */ beq $v0, $zero, .L80A5BE38 +/* 00B20 80A5BE10 3C0F8016 */ lui $t7, %hi(gSaveContext+0x13fa) +/* 00B24 80A5BE14 95EFFA5A */ lhu $t7, %lo(gSaveContext+0x13fa)($t7) /* 00B28 80A5BE18 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 00B2C 80A5BE1C 31F8000F */ andi $t8, $t7, 0x000F ## $t8 = 00000000 /* 00B30 80A5BE20 5701001A */ bnel $t8, $at, .L80A5BE8C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF64.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF64.s index 1b07d7d70e..5ddf54ca71 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF64.s @@ -28,14 +28,14 @@ glabel func_80A5CF64 /* 01CD8 80A5CFC8 C60801C4 */ lwc1 $f8, 0x01C4($s0) ## 000001C4 /* 01CDC 80A5CFCC 8E0301F0 */ lw $v1, 0x01F0($s0) ## 000001F0 .L80A5CFD0: -/* 01CE0 80A5CFD0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01CE4 80A5CFD4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01CE0 80A5CFD0 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01CE4 80A5CFD4 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01CE8 80A5CFD8 306F1000 */ andi $t7, $v1, 0x1000 ## $t7 = 00000000 /* 01CEC 80A5CFDC 15E0000B */ bne $t7, $zero, .L80A5D00C /* 01CF0 80A5CFE0 34781000 */ ori $t8, $v1, 0x1000 ## $t8 = 00001000 -/* 01CF4 80A5CFE4 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 +/* 01CF4 80A5CFE4 3C198013 */ lui $t9, %hi(D_801333E8) /* 01CF8 80A5CFE8 AE1801F0 */ sw $t8, 0x01F0($s0) ## 000001F0 -/* 01CFC 80A5CFEC 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 01CFC 80A5CFEC 273933E8 */ addiu $t9, %lo(D_801333E8) /* 01D00 80A5CFF0 AFB90014 */ sw $t9, 0x0014($sp) /* 01D04 80A5CFF4 AFA70010 */ sw $a3, 0x0010($sp) /* 01D08 80A5CFF8 2404282C */ addiu $a0, $zero, 0x282C ## $a0 = 0000282C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1C4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1C4.s index 71be443a01..4686c357ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1C4.s @@ -41,14 +41,14 @@ glabel func_80A5D1C4 /* 01F68 80A5D258 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 01F6C 80A5D25C 8E190228 */ lw $t9, 0x0228($s0) ## 00000228 /* 01F70 80A5D260 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C -/* 01F74 80A5D264 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 01F74 80A5D264 3C078013 */ lui $a3, %hi(D_801333E0) /* 01F78 80A5D268 ACB90000 */ sw $t9, 0x0000($a1) ## 0000021C /* 01F7C 80A5D26C 8E18022C */ lw $t8, 0x022C($s0) ## 0000022C -/* 01F80 80A5D270 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 01F84 80A5D274 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01F80 80A5D270 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 01F84 80A5D274 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01F88 80A5D278 ACB80004 */ sw $t8, 0x0004($a1) ## 00000220 /* 01F8C 80A5D27C 8E190230 */ lw $t9, 0x0230($s0) ## 00000230 -/* 01F90 80A5D280 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 +/* 01F90 80A5D280 254A33E8 */ addiu $t2, %lo(D_801333E8) /* 01F94 80A5D284 24042816 */ addiu $a0, $zero, 0x2816 ## $a0 = 00002816 /* 01F98 80A5D288 ACB90008 */ sw $t9, 0x0008($a1) ## 00000224 /* 01F9C 80A5D28C 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E00C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E00C.s index b5579c22f1..6313037883 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E00C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E00C.s @@ -15,15 +15,15 @@ glabel func_80A5E00C /* 02D50 80A5E040 ACA90000 */ sw $t1, 0x0000($a1) ## 0000021C /* 02D54 80A5E044 8C88022C */ lw $t0, 0x022C($a0) ## 0000022C /* 02D58 80A5E048 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02D5C 80A5E04C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 02D5C 80A5E04C 3C078013 */ lui $a3, %hi(D_801333E0) /* 02D60 80A5E050 ACA80004 */ sw $t0, 0x0004($a1) ## 00000220 /* 02D64 80A5E054 8C890230 */ lw $t1, 0x0230($a0) ## 00000230 -/* 02D68 80A5E058 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 02D6C 80A5E05C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 02D68 80A5E058 3C0C8013 */ lui $t4, %hi(D_801333E8) +/* 02D6C 80A5E05C 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 02D70 80A5E060 ACA90008 */ sw $t1, 0x0008($a1) ## 00000224 /* 02D74 80A5E064 8C8A01F0 */ lw $t2, 0x01F0($a0) ## 000001F0 /* 02D78 80A5E068 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 -/* 02D7C 80A5E06C 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 +/* 02D7C 80A5E06C 258C33E8 */ addiu $t4, %lo(D_801333E8) /* 02D80 80A5E070 000A5900 */ sll $t3, $t2, 4 /* 02D84 80A5E074 05610004 */ bgez $t3, .L80A5E088 /* 02D88 80A5E078 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E12C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E12C.s index cc76286d90..6ae1ad4d79 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E12C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E12C.s @@ -13,14 +13,14 @@ glabel func_80A5E12C /* 02E68 80A5E158 45020016 */ bc1fl .L80A5E1B4 /* 02E6C 80A5E15C 26040264 */ addiu $a0, $s0, 0x0264 ## $a0 = 00000264 /* 02E70 80A5E160 8C8201F0 */ lw $v0, 0x01F0($a0) ## 00000454 -/* 02E74 80A5E164 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 02E78 80A5E168 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 02E74 80A5E164 3C078013 */ lui $a3, %hi(D_801333E0) +/* 02E78 80A5E168 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 02E7C 80A5E16C 304E0800 */ andi $t6, $v0, 0x0800 ## $t6 = 00000000 /* 02E80 80A5E170 15C0000F */ bne $t6, $zero, .L80A5E1B0 /* 02E84 80A5E174 344F0800 */ ori $t7, $v0, 0x0800 ## $t7 = 00000800 /* 02E88 80A5E178 AC8F01F0 */ sw $t7, 0x01F0($a0) ## 00000454 -/* 02E8C 80A5E17C 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 02E90 80A5E180 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 02E8C 80A5E17C 3C188013 */ lui $t8, %hi(D_801333E8) +/* 02E90 80A5E180 271833E8 */ addiu $t8, %lo(D_801333E8) /* 02E94 80A5E184 AFB80014 */ sw $t8, 0x0014($sp) /* 02E98 80A5E188 AFA70010 */ sw $a3, 0x0010($sp) /* 02E9C 80A5E18C 2404282B */ addiu $a0, $zero, 0x282B ## $a0 = 0000282B diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E2A8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E2A8.s index 7db4ab986f..cee7a232a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E2A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E2A8.s @@ -5,13 +5,13 @@ glabel func_80A5E2A8 /* 02FC4 80A5E2B4 AFA50034 */ sw $a1, 0x0034($sp) /* 02FC8 80A5E2B8 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C /* 02FCC 80A5E2BC 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 02FD0 80A5E2C0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 02FD0 80A5E2C0 3C078013 */ lui $a3, %hi(D_801333E0) /* 02FD4 80A5E2C4 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 02FD8 80A5E2C8 AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 02FDC 80A5E2CC 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 02FE0 80A5E2D0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 02FDC 80A5E2CC 3C188013 */ lui $t8, %hi(D_801333E8) +/* 02FE0 80A5E2D0 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 02FE4 80A5E2D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02FE8 80A5E2D8 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 02FE8 80A5E2D8 271833E8 */ addiu $t8, %lo(D_801333E8) /* 02FEC 80A5E2DC AFB80014 */ sw $t8, 0x0014($sp) /* 02FF0 80A5E2E0 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 02FF4 80A5E2E4 2404281A */ addiu $a0, $zero, 0x281A ## $a0 = 0000281A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E39C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E39C.s index 334157d2a7..d85a8c6d3a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E39C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E39C.s @@ -50,14 +50,14 @@ glabel func_80A5E39C /* 03150 80A5E440 00000000 */ nop /* 03154 80A5E444 8E190228 */ lw $t9, 0x0228($s0) ## 00000228 /* 03158 80A5E448 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C -/* 0315C 80A5E44C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 0315C 80A5E44C 3C078013 */ lui $a3, %hi(D_801333E0) /* 03160 80A5E450 ACB90000 */ sw $t9, 0x0000($a1) ## 0000021C /* 03164 80A5E454 8E18022C */ lw $t8, 0x022C($s0) ## 0000022C -/* 03168 80A5E458 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 0316C 80A5E45C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 03168 80A5E458 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 0316C 80A5E45C 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 03170 80A5E460 ACB80004 */ sw $t8, 0x0004($a1) ## 00000220 /* 03174 80A5E464 8E190230 */ lw $t9, 0x0230($s0) ## 00000230 -/* 03178 80A5E468 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 +/* 03178 80A5E468 254A33E8 */ addiu $t2, %lo(D_801333E8) /* 0317C 80A5E46C 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 /* 03180 80A5E470 ACB90008 */ sw $t9, 0x0008($a1) ## 00000224 /* 03184 80A5E474 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EA1C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EA1C.s index 0c4d8815c8..1cedb75add 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EA1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EA1C.s @@ -58,11 +58,11 @@ glabel func_80A5EA1C /* 037F0 80A5EAE0 C42A68D0 */ lwc1 $f10, %lo(D_80A668D0)($at) /* 037F4 80A5EAE4 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 /* 037F8 80A5EAE8 C608025C */ lwc1 $f8, 0x025C($s0) ## 0000025C -/* 037FC 80A5EAEC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 037FC 80A5EAEC 3C078013 */ lui $a3, %hi(D_801333E0) /* 03800 80A5EAF0 46803020 */ cvt.s.w $f0, $f6 -/* 03804 80A5EAF4 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 03808 80A5EAF8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0380C 80A5EAFC 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 03804 80A5EAF4 3C198013 */ lui $t9, %hi(D_801333E8) +/* 03808 80A5EAF8 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0380C 80A5EAFC 273933E8 */ addiu $t9, %lo(D_801333E8) /* 03810 80A5EB00 24042818 */ addiu $a0, $zero, 0x2818 ## $a0 = 00002818 /* 03814 80A5EB04 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 03818 80A5EB08 460A0402 */ mul.s $f16, $f0, $f10 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB54.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB54.s index 4653b673b7..c86074b004 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB54.s @@ -87,10 +87,10 @@ glabel func_80A5EB54 /* 03990 80A5EC80 00000000 */ nop /* 03994 80A5EC84 4500001F */ bc1f .L80A5ED04 .L80A5EC88: -/* 03998 80A5EC88 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0399C 80A5EC8C 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 039A0 80A5EC90 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 039A4 80A5EC94 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 03998 80A5EC88 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0399C 80A5EC8C 3C198013 */ lui $t9, %hi(D_801333E8) +/* 039A0 80A5EC90 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 039A4 80A5EC94 273933E8 */ addiu $t9, %lo(D_801333E8) /* 039A8 80A5EC98 AFB90014 */ sw $t9, 0x0014($sp) /* 039AC 80A5EC9C AFA70010 */ sw $a3, 0x0010($sp) /* 039B0 80A5ECA0 24042819 */ addiu $a0, $zero, 0x2819 ## $a0 = 00002819 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED3C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED3C.s index a6d3523336..a9db0a2c54 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED3C.s @@ -60,13 +60,13 @@ glabel func_80A5ED3C /* 03B18 80A5EE08 C608025C */ lwc1 $f8, 0x025C($s0) ## 0000025C /* 03B1C 80A5EE0C 8E1901F0 */ lw $t9, 0x01F0($s0) ## 000001F0 /* 03B20 80A5EE10 46803020 */ cvt.s.w $f0, $f6 -/* 03B24 80A5EE14 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 03B28 80A5EE18 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 +/* 03B24 80A5EE14 3C078013 */ lui $a3, %hi(D_801333E0) +/* 03B28 80A5EE18 3C098013 */ lui $t1, %hi(D_801333E8) /* 03B2C 80A5EE1C 37280008 */ ori $t0, $t9, 0x0008 ## $t0 = 00000008 -/* 03B30 80A5EE20 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 03B30 80A5EE20 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 03B34 80A5EE24 AE0801F0 */ sw $t0, 0x01F0($s0) ## 000001F0 /* 03B38 80A5EE28 460A0402 */ mul.s $f16, $f0, $f10 -/* 03B3C 80A5EE2C 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 +/* 03B3C 80A5EE2C 252933E8 */ addiu $t1, %lo(D_801333E8) /* 03B40 80A5EE30 24042818 */ addiu $a0, $zero, 0x2818 ## $a0 = 00002818 /* 03B44 80A5EE34 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 03B48 80A5EE38 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE80.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE80.s index b0561b78a2..28499b02a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE80.s @@ -87,10 +87,10 @@ glabel func_80A5EE80 /* 03CBC 80A5EFAC 00000000 */ nop /* 03CC0 80A5EFB0 4500001F */ bc1f .L80A5F030 .L80A5EFB4: -/* 03CC4 80A5EFB4 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 03CC8 80A5EFB8 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 03CCC 80A5EFBC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 03CD0 80A5EFC0 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 03CC4 80A5EFB4 3C078013 */ lui $a3, %hi(D_801333E0) +/* 03CC8 80A5EFB8 3C198013 */ lui $t9, %hi(D_801333E8) +/* 03CCC 80A5EFBC 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 03CD0 80A5EFC0 273933E8 */ addiu $t9, %lo(D_801333E8) /* 03CD4 80A5EFC4 AFB90014 */ sw $t9, 0x0014($sp) /* 03CD8 80A5EFC8 AFA70010 */ sw $a3, 0x0010($sp) /* 03CDC 80A5EFCC 24042819 */ addiu $a0, $zero, 0x2819 ## $a0 = 00002819 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F08C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F08C.s index c871b0fbcc..05c091932f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F08C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F08C.s @@ -1,7 +1,7 @@ glabel func_80A5F08C /* 03D9C 80A5F08C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03DA0 80A5F090 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 03DA4 80A5F094 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 03DA0 80A5F090 3C028016 */ lui $v0, %hi(gGameInfo) +/* 03DA4 80A5F094 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 03DA8 80A5F098 AFBF002C */ sw $ra, 0x002C($sp) /* 03DAC 80A5F09C AFB10028 */ sw $s1, 0x0028($sp) /* 03DB0 80A5F0A0 AFB00024 */ sw $s0, 0x0024($sp) @@ -16,10 +16,10 @@ glabel func_80A5F08C /* 03DD4 80A5F0C4 0C296F65 */ jal func_80A5BD94 /* 03DD8 80A5F0C8 A44005BE */ sh $zero, 0x05BE($v0) ## 801605BE /* 03DDC 80A5F0CC 10400021 */ beq $v0, $zero, .L80A5F154 -/* 03DE0 80A5F0D0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 03DE4 80A5F0D4 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 03DE8 80A5F0D8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 03DEC 80A5F0DC 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 03DE0 80A5F0D0 3C078013 */ lui $a3, %hi(D_801333E0) +/* 03DE4 80A5F0D4 3C188013 */ lui $t8, %hi(D_801333E8) +/* 03DE8 80A5F0D8 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 03DEC 80A5F0DC 271833E8 */ addiu $t8, %lo(D_801333E8) /* 03DF0 80A5F0E0 AFB80014 */ sw $t8, 0x0014($sp) /* 03DF4 80A5F0E4 AFA70010 */ sw $a3, 0x0010($sp) /* 03DF8 80A5F0E8 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 @@ -33,9 +33,9 @@ glabel func_80A5F08C /* 03E14 80A5F104 03214024 */ and $t0, $t9, $at /* 03E18 80A5F108 AE0801F0 */ sw $t0, 0x01F0($s0) ## 000001F0 /* 03E1C 80A5F10C 862900A4 */ lh $t1, 0x00A4($s1) ## 000000A4 -/* 03E20 80A5F110 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 03E20 80A5F110 3C018016 */ lui $at, %hi(gSaveContext+0x1348) /* 03E24 80A5F114 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 03E28 80A5F118 A429F9A8 */ sh $t1, -0x0658($at) ## 8015F9A8 +/* 03E28 80A5F118 A429F9A8 */ sh $t1, %lo(gSaveContext+0x1348)($at) /* 03E2C 80A5F11C 0C016AA4 */ jal func_8005AA90 /* 03E30 80A5F120 8E240790 */ lw $a0, 0x0790($s1) ## 00000790 /* 03E34 80A5F124 8E240790 */ lw $a0, 0x0790($s1) ## 00000790 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F1B0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F1B0.s index feea57fe7c..a1bcd50248 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F1B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F1B0.s @@ -36,14 +36,14 @@ glabel func_80A5F1B0 /* 03F3C 80A5F22C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 03F40 80A5F230 8E090228 */ lw $t1, 0x0228($s0) ## 00000228 /* 03F44 80A5F234 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C -/* 03F48 80A5F238 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 03F48 80A5F238 3C078013 */ lui $a3, %hi(D_801333E0) /* 03F4C 80A5F23C ACA90000 */ sw $t1, 0x0000($a1) ## 0000021C /* 03F50 80A5F240 8E08022C */ lw $t0, 0x022C($s0) ## 0000022C -/* 03F54 80A5F244 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 03F58 80A5F248 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 03F54 80A5F244 3C0C8013 */ lui $t4, %hi(D_801333E8) +/* 03F58 80A5F248 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 03F5C 80A5F24C ACA80004 */ sw $t0, 0x0004($a1) ## 00000220 /* 03F60 80A5F250 8E090230 */ lw $t1, 0x0230($s0) ## 00000230 -/* 03F64 80A5F254 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 +/* 03F64 80A5F254 258C33E8 */ addiu $t4, %lo(D_801333E8) /* 03F68 80A5F258 24042816 */ addiu $a0, $zero, 0x2816 ## $a0 = 00002816 /* 03F6C 80A5F25C ACA90008 */ sw $t1, 0x0008($a1) ## 00000224 /* 03F70 80A5F260 8E0A01F0 */ lw $t2, 0x01F0($s0) ## 000001F0 @@ -64,14 +64,14 @@ glabel func_80A5F1B0 /* 03FA0 80A5F290 8E080158 */ lw $t0, 0x0158($s0) ## 00000158 /* 03FA4 80A5F294 8E0E0228 */ lw $t6, 0x0228($s0) ## 00000228 /* 03FA8 80A5F298 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C -/* 03FAC 80A5F29C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 03FAC 80A5F29C 3C078013 */ lui $a3, %hi(D_801333E0) /* 03FB0 80A5F2A0 ACAE0000 */ sw $t6, 0x0000($a1) ## 0000021C /* 03FB4 80A5F2A4 8E0D022C */ lw $t5, 0x022C($s0) ## 0000022C -/* 03FB8 80A5F2A8 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 03FBC 80A5F2AC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 03FB8 80A5F2A8 3C188013 */ lui $t8, %hi(D_801333E8) +/* 03FBC 80A5F2AC 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 03FC0 80A5F2B0 ACAD0004 */ sw $t5, 0x0004($a1) ## 00000220 /* 03FC4 80A5F2B4 8E0E0230 */ lw $t6, 0x0230($s0) ## 00000230 -/* 03FC8 80A5F2B8 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 03FC8 80A5F2B8 271833E8 */ addiu $t8, %lo(D_801333E8) /* 03FCC 80A5F2BC 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 /* 03FD0 80A5F2C0 ACAE0008 */ sw $t6, 0x0008($a1) ## 00000224 /* 03FD4 80A5F2C4 8E0301F0 */ lw $v1, 0x01F0($s0) ## 000001F0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s index b8befeb9e7..195ac91175 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s @@ -8,8 +8,8 @@ glabel func_80A5F414 /* 0413C 80A5F42C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 04140 80A5F430 0C296F1A */ jal func_80A5BC68 /* 04144 80A5F434 8FA5003C */ lw $a1, 0x003C($sp) -/* 04148 80A5F438 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0414C 80A5F43C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 04148 80A5F438 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0414C 80A5F43C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 04150 80A5F440 844E05BE */ lh $t6, 0x05BE($v0) ## 801605BE /* 04154 80A5F444 11C00041 */ beq $t6, $zero, .L80A5F54C /* 04158 80A5F448 00000000 */ nop @@ -22,15 +22,15 @@ glabel func_80A5F414 /* 04174 80A5F464 0C296EEF */ jal func_80A5BBBC /* 04178 80A5F468 8FA4003C */ lw $a0, 0x003C($sp) /* 0417C 80A5F46C 14400028 */ bne $v0, $zero, .L80A5F510 -/* 04180 80A5F470 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 04180 80A5F470 3C078013 */ lui $a3, %hi(D_801333E0) /* 04184 80A5F474 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04188 80A5F478 0C296F65 */ jal func_80A5BD94 /* 0418C 80A5F47C 8FA5003C */ lw $a1, 0x003C($sp) /* 04190 80A5F480 10400032 */ beq $v0, $zero, .L80A5F54C -/* 04194 80A5F484 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 04198 80A5F488 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 0419C 80A5F48C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 041A0 80A5F490 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 04194 80A5F484 3C078013 */ lui $a3, %hi(D_801333E0) +/* 04198 80A5F488 3C188013 */ lui $t8, %hi(D_801333E8) +/* 0419C 80A5F48C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 041A0 80A5F490 271833E8 */ addiu $t8, %lo(D_801333E8) /* 041A4 80A5F494 AFB80014 */ sw $t8, 0x0014($sp) /* 041A8 80A5F498 AFA70010 */ sw $a3, 0x0010($sp) /* 041AC 80A5F49C 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 @@ -65,9 +65,9 @@ glabel func_80A5F414 /* 04218 80A5F508 10000010 */ beq $zero, $zero, .L80A5F54C /* 0421C 80A5F50C 00000000 */ nop .L80A5F510: -/* 04220 80A5F510 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 -/* 04224 80A5F514 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 000033E0 -/* 04228 80A5F518 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 +/* 04220 80A5F510 3C0B8013 */ lui $t3, %hi(D_801333E8) +/* 04224 80A5F514 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 04228 80A5F518 256B33E8 */ addiu $t3, %lo(D_801333E8) /* 0422C 80A5F51C AFAB0014 */ sw $t3, 0x0014($sp) /* 04230 80A5F520 AFA70010 */ sw $a3, 0x0010($sp) /* 04234 80A5F524 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s index ce0d02664c..1a90e89210 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s @@ -13,8 +13,8 @@ glabel D_80A668F0 .text glabel func_80A5F890 /* 045A0 80A5F890 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 045A4 80A5F894 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 045A8 80A5F898 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 045A4 80A5F894 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 045A8 80A5F898 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 045AC 80A5F89C AFBF0024 */ sw $ra, 0x0024($sp) /* 045B0 80A5F8A0 AFB00020 */ sw $s0, 0x0020($sp) /* 045B4 80A5F8A4 AFA50044 */ sw $a1, 0x0044($sp) @@ -148,11 +148,11 @@ glabel func_80A5F890 /* 04798 80A5FA88 30580800 */ andi $t8, $v0, 0x0800 ## $t8 = 00000000 /* 0479C 80A5FA8C 1700000A */ bne $t8, $zero, .L80A5FAB8 /* 047A0 80A5FA90 34590800 */ ori $t9, $v0, 0x0800 ## $t9 = 00000800 -/* 047A4 80A5FA94 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 047A8 80A5FA98 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 +/* 047A4 80A5FA94 3C088013 */ lui $t0, %hi(D_801333E0) +/* 047A8 80A5FA98 3C098013 */ lui $t1, %hi(D_801333E8) /* 047AC 80A5FA9C AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 -/* 047B0 80A5FAA0 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 -/* 047B4 80A5FAA4 250733E0 */ addiu $a3, $t0, 0x33E0 ## $a3 = 801333E0 +/* 047B0 80A5FAA0 252933E8 */ addiu $t1, %lo(D_801333E8) +/* 047B4 80A5FAA4 250733E0 */ addiu $a3, $t0, %lo(D_801333E0) /* 047B8 80A5FAA8 AFA70010 */ sw $a3, 0x0010($sp) /* 047BC 80A5FAAC AFA90014 */ sw $t1, 0x0014($sp) /* 047C0 80A5FAB0 0C03DCE3 */ jal Audio_PlaySoundGeneral @@ -230,13 +230,13 @@ glabel func_80A5F890 /* 048C0 80A5FBB0 AFA50034 */ sw $a1, 0x0034($sp) /* 048C4 80A5FBB4 8FA8002C */ lw $t0, 0x002C($sp) /* 048C8 80A5FBB8 8FA50034 */ lw $a1, 0x0034($sp) -/* 048CC 80A5FBBC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 048CC 80A5FBBC 3C078013 */ lui $a3, %hi(D_801333E0) /* 048D0 80A5FBC0 8D0A0000 */ lw $t2, 0x0000($t0) ## 00000000 -/* 048D4 80A5FBC4 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 048D8 80A5FBC8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 048D4 80A5FBC4 3C0C8013 */ lui $t4, %hi(D_801333E8) +/* 048D8 80A5FBC8 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 048DC 80A5FBCC ACAA0000 */ sw $t2, 0x0000($a1) ## 00000000 /* 048E0 80A5FBD0 8D090004 */ lw $t1, 0x0004($t0) ## 00000004 -/* 048E4 80A5FBD4 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 +/* 048E4 80A5FBD4 258C33E8 */ addiu $t4, %lo(D_801333E8) /* 048E8 80A5FBD8 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 /* 048EC 80A5FBDC ACA90004 */ sw $t1, 0x0004($a1) ## 00000004 /* 048F0 80A5FBE0 8D0A0008 */ lw $t2, 0x0008($t0) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FCAC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FCAC.s index fe9c3f33d0..4ec2e547b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FCAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FCAC.s @@ -8,14 +8,14 @@ glabel func_80A5FCAC /* 049D4 80A5FCC4 0C297F75 */ jal func_80A5FDD4 /* 049D8 80A5FCC8 AFA40020 */ sw $a0, 0x0020($sp) /* 049DC 80A5FCCC 8FA40020 */ lw $a0, 0x0020($sp) -/* 049E0 80A5FCD0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 049E4 80A5FCD4 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 +/* 049E0 80A5FCD0 3C078013 */ lui $a3, %hi(D_801333E0) +/* 049E4 80A5FCD4 3C088013 */ lui $t0, %hi(D_801333E8) /* 049E8 80A5FCD8 8C8F0228 */ lw $t7, 0x0228($a0) ## 00000228 /* 049EC 80A5FCDC 2485021C */ addiu $a1, $a0, 0x021C ## $a1 = 0000021C -/* 049F0 80A5FCE0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 049F0 80A5FCE0 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 049F4 80A5FCE4 ACAF0000 */ sw $t7, 0x0000($a1) ## 0000021C /* 049F8 80A5FCE8 8C8E022C */ lw $t6, 0x022C($a0) ## 0000022C -/* 049FC 80A5FCEC 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 +/* 049FC 80A5FCEC 250833E8 */ addiu $t0, %lo(D_801333E8) /* 04A00 80A5FCF0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 04A04 80A5FCF4 ACAE0004 */ sw $t6, 0x0004($a1) ## 00000220 /* 04A08 80A5FCF8 8C8F0230 */ lw $t7, 0x0230($a0) ## 00000230 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FDD4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FDD4.s index 199b3aa283..5b79ef7104 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FDD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FDD4.s @@ -80,14 +80,14 @@ glabel func_80A5FDD4 /* 04BEC 80A5FEDC E7B20030 */ swc1 $f18, 0x0030($sp) .L80A5FEE0: /* 04BF0 80A5FEE0 14820013 */ bne $a0, $v0, .L80A5FF30 -/* 04BF4 80A5FEE4 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 04BF4 80A5FEE4 3C078013 */ lui $a3, %hi(D_801333E0) /* 04BF8 80A5FEE8 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 04BFC 80A5FEEC 44813000 */ mtc1 $at, $f6 ## $f6 = 0.25 /* 04C00 80A5FEF0 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 04C04 80A5FEF4 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 04C08 80A5FEF8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 04C04 80A5FEF4 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 04C08 80A5FEF8 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 04C0C 80A5FEFC 46062202 */ mul.s $f8, $f4, $f6 -/* 04C10 80A5FF00 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 +/* 04C10 80A5FF00 254A33E8 */ addiu $t2, %lo(D_801333E8) /* 04C14 80A5FF04 AFAA0014 */ sw $t2, 0x0014($sp) /* 04C18 80A5FF08 AFA70010 */ sw $a3, 0x0010($sp) /* 04C1C 80A5FF0C AFA30034 */ sw $v1, 0x0034($sp) @@ -106,11 +106,11 @@ glabel func_80A5FDD4 /* 04C48 80A5FF38 3C0180A6 */ lui $at, %hi(D_80A668F4) ## $at = 80A60000 /* 04C4C 80A5FF3C C43068F4 */ lwc1 $f16, %lo(D_80A668F4)($at) /* 04C50 80A5FF40 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -/* 04C54 80A5FF44 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 04C58 80A5FF48 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 +/* 04C54 80A5FF44 3C078013 */ lui $a3, %hi(D_801333E0) +/* 04C58 80A5FF48 3C0B8013 */ lui $t3, %hi(D_801333E8) /* 04C5C 80A5FF4C 46105482 */ mul.s $f18, $f10, $f16 -/* 04C60 80A5FF50 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 04C64 80A5FF54 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 +/* 04C60 80A5FF50 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 04C64 80A5FF54 256B33E8 */ addiu $t3, %lo(D_801333E8) /* 04C68 80A5FF58 AFAB0014 */ sw $t3, 0x0014($sp) /* 04C6C 80A5FF5C AFA70010 */ sw $a3, 0x0010($sp) /* 04C70 80A5FF60 AFA30034 */ sw $v1, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60470.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60470.s index f4476a60ff..b3bd2f7795 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60470.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60470.s @@ -58,13 +58,13 @@ glabel func_80A60470 /* 05244 80A60534 C608025C */ lwc1 $f8, 0x025C($s0) ## 0000025C /* 05248 80A60538 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 /* 0524C 80A6053C 46803020 */ cvt.s.w $f0, $f6 -/* 05250 80A60540 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 05254 80A60544 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 +/* 05250 80A60540 3C078013 */ lui $a3, %hi(D_801333E0) +/* 05254 80A60544 3C088013 */ lui $t0, %hi(D_801333E8) /* 05258 80A60548 37190008 */ ori $t9, $t8, 0x0008 ## $t9 = 00000008 -/* 0525C 80A6054C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 0525C 80A6054C 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 05260 80A60550 AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 /* 05264 80A60554 460A0402 */ mul.s $f16, $f0, $f10 -/* 05268 80A60558 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 +/* 05268 80A60558 250833E8 */ addiu $t0, %lo(D_801333E8) /* 0526C 80A6055C 24042818 */ addiu $a0, $zero, 0x2818 ## $a0 = 00002818 /* 05270 80A60560 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 05274 80A60564 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s index 6c37a2fd5d..58126b190e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s @@ -103,12 +103,12 @@ glabel func_80A605E0 /* 0544C 80A6073C 8FBF0024 */ lw $ra, 0x0024($sp) .L80A60740: /* 05450 80A60740 96090384 */ lhu $t1, 0x0384($s0) ## 00000384 -/* 05454 80A60744 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 05458 80A60748 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 +/* 05454 80A60744 3C078013 */ lui $a3, %hi(D_801333E0) +/* 05458 80A60748 3C0B8013 */ lui $t3, %hi(D_801333E8) /* 0545C 80A6074C 352A0001 */ ori $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 05460 80A60750 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 05460 80A60750 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 05464 80A60754 A60A0384 */ sh $t2, 0x0384($s0) ## 00000384 -/* 05468 80A60758 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 +/* 05468 80A60758 256B33E8 */ addiu $t3, %lo(D_801333E8) /* 0546C 80A6075C AFAB0014 */ sw $t3, 0x0014($sp) /* 05470 80A60760 AFA70010 */ sw $a3, 0x0010($sp) /* 05474 80A60764 24042819 */ addiu $a0, $zero, 0x2819 ## $a0 = 00002819 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60838.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60838.s index bac5965ba2..d0b7d56dc9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60838.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60838.s @@ -19,15 +19,15 @@ glabel func_80A60838 /* 0558C 80A6087C ACA90000 */ sw $t1, 0x0000($a1) ## 0000021C /* 05590 80A60880 8C88022C */ lw $t0, 0x022C($a0) ## 0000022C /* 05594 80A60884 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05598 80A60888 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 05598 80A60888 3C078013 */ lui $a3, %hi(D_801333E0) /* 0559C 80A6088C ACA80004 */ sw $t0, 0x0004($a1) ## 00000220 /* 055A0 80A60890 8C890230 */ lw $t1, 0x0230($a0) ## 00000230 -/* 055A4 80A60894 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 055A8 80A60898 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 055A4 80A60894 3C0C8013 */ lui $t4, %hi(D_801333E8) +/* 055A8 80A60898 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 055AC 80A6089C ACA90008 */ sw $t1, 0x0008($a1) ## 00000224 /* 055B0 80A608A0 8C8A01F0 */ lw $t2, 0x01F0($a0) ## 000001F0 /* 055B4 80A608A4 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 -/* 055B8 80A608A8 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 +/* 055B8 80A608A8 258C33E8 */ addiu $t4, %lo(D_801333E8) /* 055BC 80A608AC 000A5900 */ sll $t3, $t2, 4 /* 055C0 80A608B0 05610004 */ bgez $t3, .L80A608C4 /* 055C4 80A608B4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60954.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60954.s index 42f036d1c2..2ab646d779 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60954.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60954.s @@ -14,14 +14,14 @@ glabel func_80A60954 /* 05694 80A60984 45020011 */ bc1fl .L80A609CC /* 05698 80A60988 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 0569C 80A6098C 8C8201F0 */ lw $v0, 0x01F0($a0) ## 0000039C -/* 056A0 80A60990 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 056A4 80A60994 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 056A0 80A60990 3C078013 */ lui $a3, %hi(D_801333E0) +/* 056A4 80A60994 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 056A8 80A60998 304E0800 */ andi $t6, $v0, 0x0800 ## $t6 = 00000000 /* 056AC 80A6099C 15C0000A */ bne $t6, $zero, .L80A609C8 /* 056B0 80A609A0 344F0800 */ ori $t7, $v0, 0x0800 ## $t7 = 00000800 /* 056B4 80A609A4 AC8F01F0 */ sw $t7, 0x01F0($a0) ## 0000039C -/* 056B8 80A609A8 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 056BC 80A609AC 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 056B8 80A609A8 3C188013 */ lui $t8, %hi(D_801333E8) +/* 056BC 80A609AC 271833E8 */ addiu $t8, %lo(D_801333E8) /* 056C0 80A609B0 AFB80014 */ sw $t8, 0x0014($sp) /* 056C4 80A609B4 AFA70010 */ sw $a3, 0x0010($sp) /* 056C8 80A609B8 2404282B */ addiu $a0, $zero, 0x282B ## $a0 = 0000282B diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60D28.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60D28.s index 4e2298f5b7..9f0cd05867 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60D28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60D28.s @@ -12,8 +12,8 @@ glabel func_80A60D28 /* 05A60 80A60D50 468021A0 */ cvt.s.w $f6, $f4 /* 05A64 80A60D54 2485021C */ addiu $a1, $a0, 0x021C ## $a1 = 0000021C /* 05A68 80A60D58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05A6C 80A60D5C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 05A70 80A60D60 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 05A6C 80A60D5C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 05A70 80A60D60 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 05A74 80A60D64 E4860024 */ swc1 $f6, 0x0024($a0) ## 00000024 /* 05A78 80A60D68 8CCF0010 */ lw $t7, 0x0010($a2) ## 00000010 /* 05A7C 80A60D6C 8C880024 */ lw $t0, 0x0024($a0) ## 00000024 @@ -44,11 +44,11 @@ glabel func_80A60D28 /* 05AE0 80A60DD0 B88B00B7 */ swr $t3, 0x00B7($a0) ## 000000B7 /* 05AE4 80A60DD4 948B0034 */ lhu $t3, 0x0034($a0) ## 00000034 /* 05AE8 80A60DD8 AC9901F0 */ sw $t9, 0x01F0($a0) ## 000001F0 -/* 05AEC 80A60DDC 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 +/* 05AEC 80A60DDC 3C0C8013 */ lui $t4, %hi(D_801333E8) /* 05AF0 80A60DE0 A48B00B8 */ sh $t3, 0x00B8($a0) ## 000000B8 /* 05AF4 80A60DE4 ACA90000 */ sw $t1, 0x0000($a1) ## 0000021C /* 05AF8 80A60DE8 8C88022C */ lw $t0, 0x022C($a0) ## 0000022C -/* 05AFC 80A60DEC 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 +/* 05AFC 80A60DEC 258C33E8 */ addiu $t4, %lo(D_801333E8) /* 05B00 80A60DF0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 05B04 80A60DF4 ACA80004 */ sw $t0, 0x0004($a1) ## 00000220 /* 05B08 80A60DF8 8C890230 */ lw $t1, 0x0230($a0) ## 00000230 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60EB0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60EB0.s index 805e0139f5..185c676ad5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60EB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60EB0.s @@ -14,14 +14,14 @@ glabel func_80A60EB0 /* 05BF0 80A60EE0 45020011 */ bc1fl .L80A60F28 /* 05BF4 80A60EE4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 05BF8 80A60EE8 8C8201F0 */ lw $v0, 0x01F0($a0) ## 0000039C -/* 05BFC 80A60EEC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 05C00 80A60EF0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 05BFC 80A60EEC 3C078013 */ lui $a3, %hi(D_801333E0) +/* 05C00 80A60EF0 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 05C04 80A60EF4 304E0800 */ andi $t6, $v0, 0x0800 ## $t6 = 00000000 /* 05C08 80A60EF8 15C0000A */ bne $t6, $zero, .L80A60F24 /* 05C0C 80A60EFC 344F0800 */ ori $t7, $v0, 0x0800 ## $t7 = 00000800 /* 05C10 80A60F00 AC8F01F0 */ sw $t7, 0x01F0($a0) ## 0000039C -/* 05C14 80A60F04 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 05C18 80A60F08 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 05C14 80A60F04 3C188013 */ lui $t8, %hi(D_801333E8) +/* 05C18 80A60F08 271833E8 */ addiu $t8, %lo(D_801333E8) /* 05C1C 80A60F0C AFB80014 */ sw $t8, 0x0014($sp) /* 05C20 80A60F10 AFA70010 */ sw $a3, 0x0010($sp) /* 05C24 80A60F14 2404282B */ addiu $a0, $zero, 0x282B ## $a0 = 0000282B diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6121C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6121C.s index dda6f2a300..d573c23955 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6121C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6121C.s @@ -40,8 +40,8 @@ glabel func_80A6121C /* 05FA4 80A61294 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 05FA8 80A61298 0C032D9E */ jal Math3D_Vec3f_DistXYZ /* 05FAC 80A6129C 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 05FB0 80A612A0 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 05FB4 80A612A4 8D8CFA90 */ lw $t4, -0x0570($t4) ## 8015FA90 +/* 05FB0 80A612A0 3C0C8016 */ lui $t4, %hi(gGameInfo) +/* 05FB4 80A612A4 8D8CFA90 */ lw $t4, %lo(gGameInfo)($t4) /* 05FB8 80A612A8 858D0564 */ lh $t5, 0x0564($t4) ## 80160564 /* 05FBC 80A612AC 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 /* 05FC0 80A612B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61440.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61440.s index 533c3c1626..3fd5dbe407 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61440.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61440.s @@ -79,14 +79,14 @@ glabel func_80A61440 /* 06254 80A61544 E7B20030 */ swc1 $f18, 0x0030($sp) .L80A61548: /* 06258 80A61548 14A20018 */ bne $a1, $v0, .L80A615AC -/* 0625C 80A6154C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 0625C 80A6154C 3C078013 */ lui $a3, %hi(D_801333E0) /* 06260 80A61550 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 06264 80A61554 44813000 */ mtc1 $at, $f6 ## $f6 = 0.25 /* 06268 80A61558 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 0626C 80A6155C 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 06270 80A61560 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 0626C 80A6155C 3C098013 */ lui $t1, %hi(D_801333E8) +/* 06270 80A61560 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 06274 80A61564 46062202 */ mul.s $f8, $f4, $f6 -/* 06278 80A61568 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 +/* 06278 80A61568 252933E8 */ addiu $t1, %lo(D_801333E8) /* 0627C 80A6156C AFA90014 */ sw $t1, 0x0014($sp) /* 06280 80A61570 AFA70010 */ sw $a3, 0x0010($sp) /* 06284 80A61574 AFA30034 */ sw $v1, 0x0034($sp) @@ -110,11 +110,11 @@ glabel func_80A61440 /* 062C4 80A615B4 3C0180A6 */ lui $at, %hi(D_80A66928) ## $at = 80A60000 /* 062C8 80A615B8 C4306928 */ lwc1 $f16, %lo(D_80A66928)($at) /* 062CC 80A615BC C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -/* 062D0 80A615C0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 062D4 80A615C4 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 +/* 062D0 80A615C0 3C078013 */ lui $a3, %hi(D_801333E0) +/* 062D4 80A615C4 3C0A8013 */ lui $t2, %hi(D_801333E8) /* 062D8 80A615C8 46105482 */ mul.s $f18, $f10, $f16 -/* 062DC 80A615CC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 062E0 80A615D0 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 +/* 062DC 80A615CC 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 062E0 80A615D0 254A33E8 */ addiu $t2, %lo(D_801333E8) /* 062E4 80A615D4 AFAA0014 */ sw $t2, 0x0014($sp) /* 062E8 80A615D8 AFA70010 */ sw $a3, 0x0010($sp) /* 062EC 80A615DC AFA30034 */ sw $v1, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61778.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61778.s index 3b2e507a81..75f50598c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61778.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61778.s @@ -51,8 +51,8 @@ glabel func_80A61778 /* 06530 80A61820 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 .L80A61824: /* 06534 80A61824 11610013 */ beq $t3, $at, .L80A61874 -/* 06538 80A61828 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 0653C 80A6182C 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 06538 80A61828 3C048016 */ lui $a0, %hi(gSaveContext) +/* 0653C 80A6182C 2484E660 */ addiu $a0, %lo(gSaveContext) /* 06540 80A61830 948C1404 */ lhu $t4, 0x1404($a0) ## 8015FA64 /* 06544 80A61834 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 06548 80A61838 240D03B0 */ addiu $t5, $zero, 0x03B0 ## $t5 = 000003B0 @@ -72,8 +72,8 @@ glabel func_80A61778 /* 06580 80A61870 8CE303A4 */ lw $v1, 0x03A4($a3) ## 000003A4 .L80A61874: /* 06584 80A61874 9502072E */ lhu $v0, 0x072E($t0) ## 0000072E -/* 06588 80A61878 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 0658C 80A6187C 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 06588 80A61878 3C048016 */ lui $a0, %hi(gSaveContext) +/* 0658C 80A6187C 2484E660 */ addiu $a0, %lo(gSaveContext) /* 06590 80A61880 10400018 */ beq $v0, $zero, .L80A618E4 /* 06594 80A61884 30780002 */ andi $t8, $v1, 0x0002 ## $t8 = 00000000 /* 06598 80A61888 17000016 */ bne $t8, $zero, .L80A618E4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s index 4c6b3767f0..36164c8261 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s @@ -22,8 +22,8 @@ glabel func_80A61A28 /* 06740 80A61A30 AFB00028 */ sw $s0, 0x0028($sp) /* 06744 80A61A34 AFA50064 */ sw $a1, 0x0064($sp) /* 06748 80A61A38 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 0674C 80A61A3C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 06750 80A61A40 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 0674C 80A61A3C 3C188016 */ lui $t8, %hi(gGameInfo) +/* 06750 80A61A40 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 06754 80A61A44 AFAF005C */ sw $t7, 0x005C($sp) /* 06758 80A61A48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0675C 80A61A4C 871905BE */ lh $t9, 0x05BE($t8) ## 801605BE @@ -36,10 +36,10 @@ glabel func_80A61A28 .L80A61A68: /* 06778 80A61A68 0C297CF7 */ jal func_80A5F3DC /* 0677C 80A61A6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06780 80A61A70 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 06784 80A61A74 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 06788 80A61A78 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0678C 80A61A7C 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 +/* 06780 80A61A70 3C078013 */ lui $a3, %hi(D_801333E0) +/* 06784 80A61A74 3C098013 */ lui $t1, %hi(D_801333E8) +/* 06788 80A61A78 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0678C 80A61A7C 252933E8 */ addiu $t1, %lo(D_801333E8) /* 06790 80A61A80 AFA90014 */ sw $t1, 0x0014($sp) /* 06794 80A61A84 AFA70010 */ sw $a3, 0x0010($sp) /* 06798 80A61A88 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 @@ -431,12 +431,12 @@ glabel func_80A61A28 /* 06D08 80A61FF8 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C /* 06D0C 80A61FFC ACAD0000 */ sw $t5, 0x0000($a1) ## 0000021C /* 06D10 80A62000 8E0E022C */ lw $t6, 0x022C($s0) ## 0000022C -/* 06D14 80A62004 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 06D18 80A62008 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 +/* 06D14 80A62004 3C198013 */ lui $t9, %hi(D_801333E0) +/* 06D18 80A62008 3C088013 */ lui $t0, %hi(D_801333E8) /* 06D1C 80A6200C ACAE0004 */ sw $t6, 0x0004($a1) ## 00000220 /* 06D20 80A62010 8E0D0230 */ lw $t5, 0x0230($s0) ## 00000230 -/* 06D24 80A62014 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 -/* 06D28 80A62018 272733E0 */ addiu $a3, $t9, 0x33E0 ## $a3 = 801333E0 +/* 06D24 80A62014 250833E8 */ addiu $t0, %lo(D_801333E8) +/* 06D28 80A62018 272733E0 */ addiu $a3, $t9, %lo(D_801333E0) /* 06D2C 80A6201C ACAD0008 */ sw $t5, 0x0008($a1) ## 00000224 /* 06D30 80A62020 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 /* 06D34 80A62024 24042816 */ addiu $a0, $zero, 0x2816 ## $a0 = 00002816 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62278.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62278.s index e12e99e93e..268f6ac076 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62278.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62278.s @@ -111,14 +111,14 @@ glabel func_80A62278 /* 07114 80A62404 E7A80018 */ swc1 $f8, 0x0018($sp) /* 07118 80A62408 8E0F0228 */ lw $t7, 0x0228($s0) ## 00000228 /* 0711C 80A6240C 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C -/* 07120 80A62410 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 07120 80A62410 3C078013 */ lui $a3, %hi(D_801333E0) /* 07124 80A62414 ACAF0000 */ sw $t7, 0x0000($a1) ## 0000021C /* 07128 80A62418 8E0D022C */ lw $t5, 0x022C($s0) ## 0000022C -/* 0712C 80A6241C 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 07130 80A62420 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 0712C 80A6241C 3C088013 */ lui $t0, %hi(D_801333E8) +/* 07130 80A62420 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 07134 80A62424 ACAD0004 */ sw $t5, 0x0004($a1) ## 00000220 /* 07138 80A62428 8E0F0230 */ lw $t7, 0x0230($s0) ## 00000230 -/* 0713C 80A6242C 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 +/* 0713C 80A6242C 250833E8 */ addiu $t0, %lo(D_801333E8) /* 07140 80A62430 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 /* 07144 80A62434 ACAF0008 */ sw $t7, 0x0008($a1) ## 00000224 /* 07148 80A62438 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 @@ -131,10 +131,10 @@ glabel func_80A62278 /* 07164 80A62454 AFA80014 */ sw $t0, 0x0014($sp) .L80A62458: -/* 07168 80A62458 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 0716C 80A6245C 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 07170 80A62460 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 -/* 07174 80A62464 254733E0 */ addiu $a3, $t2, 0x33E0 ## $a3 = 801333E0 +/* 07168 80A62458 3C0A8013 */ lui $t2, %hi(D_801333E0) +/* 0716C 80A6245C 3C098013 */ lui $t1, %hi(D_801333E8) +/* 07170 80A62460 252933E8 */ addiu $t1, %lo(D_801333E8) +/* 07174 80A62464 254733E0 */ addiu $a3, $t2, %lo(D_801333E0) /* 07178 80A62468 AFA70010 */ sw $a3, 0x0010($sp) /* 0717C 80A6246C AFA90014 */ sw $t1, 0x0014($sp) /* 07180 80A62470 24042818 */ addiu $a0, $zero, 0x2818 ## $a0 = 00002818 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A624AC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A624AC.s index 0abae48f74..8a0e873971 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A624AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A624AC.s @@ -9,38 +9,38 @@ glabel func_80A624AC /* 071D8 80A624C8 0002C100 */ sll $t8, $v0, 4 /* 071DC 80A624CC 0018CF02 */ srl $t9, $t8, 28 /* 071E0 80A624D0 00194080 */ sll $t0, $t9, 2 -/* 071E4 80A624D4 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 071E4 80A624D4 3C098016 */ lui $t1, %hi(gSegments) /* 071E8 80A624D8 01284821 */ addu $t1, $t1, $t0 /* 071EC 80A624DC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 071F0 80A624E0 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 +/* 071F0 80A624E0 8D296FA8 */ lw $t1, %lo(gSegments)($t1) /* 071F4 80A624E4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 071F8 80A624E8 00415024 */ and $t2, $v0, $at /* 071FC 80A624EC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 07200 80A624F0 012A5821 */ addu $t3, $t1, $t2 /* 07204 80A624F4 01616021 */ addu $t4, $t3, $at /* 07208 80A624F8 ACAC1D68 */ sw $t4, 0x1D68($a1) ## 00001D68 -/* 0720C 80A624FC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 0720C 80A624FC 3C018016 */ lui $at, %hi(gSaveContext+0x1414) /* 07210 80A62500 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 07214 80A62504 03E00008 */ jr $ra -/* 07218 80A62508 A02DFA74 */ sb $t5, -0x058C($at) ## 8015FA74 +/* 07218 80A62508 A02DFA74 */ sb $t5, %lo(gSaveContext+0x1414)($at) .L80A6250C: /* 0721C 80A6250C 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 /* 07220 80A62510 24420230 */ addiu $v0, $v0, 0x0230 ## $v0 = 02000230 /* 07224 80A62514 00027100 */ sll $t6, $v0, 4 /* 07228 80A62518 000E7F02 */ srl $t7, $t6, 28 /* 0722C 80A6251C 000FC080 */ sll $t8, $t7, 2 -/* 07230 80A62520 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 07230 80A62520 3C198016 */ lui $t9, %hi(gSegments) /* 07234 80A62524 0338C821 */ addu $t9, $t9, $t8 /* 07238 80A62528 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0723C 80A6252C 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 0723C 80A6252C 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 07240 80A62530 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 07244 80A62534 00414024 */ and $t0, $v0, $at /* 07248 80A62538 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 0724C 80A6253C 03284821 */ addu $t1, $t9, $t0 /* 07250 80A62540 01215021 */ addu $t2, $t1, $at /* 07254 80A62544 ACAA1D68 */ sw $t2, 0x1D68($a1) ## 00001D68 -/* 07258 80A62548 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 07258 80A62548 3C018016 */ lui $at, %hi(gSaveContext+0x1414) /* 0725C 80A6254C 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 07260 80A62550 A02BFA74 */ sb $t3, -0x058C($at) ## 8015FA74 +/* 07260 80A62550 A02BFA74 */ sb $t3, %lo(gSaveContext+0x1414)($at) /* 07264 80A62554 03E00008 */ jr $ra /* 07268 80A62558 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A626B8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A626B8.s index 9fde3744f4..1664312e72 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A626B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A626B8.s @@ -39,10 +39,10 @@ glabel func_80A626B8 /* 07458 80A62748 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0745C 80A6274C 0C29776C */ jal func_80A5DDB0 /* 07460 80A62750 8FA5002C */ lw $a1, 0x002C($sp) -/* 07464 80A62754 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 07468 80A62758 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 0746C 80A6275C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 07470 80A62760 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 +/* 07464 80A62754 3C078013 */ lui $a3, %hi(D_801333E0) +/* 07468 80A62758 3C098013 */ lui $t1, %hi(D_801333E8) +/* 0746C 80A6275C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 07470 80A62760 252933E8 */ addiu $t1, %lo(D_801333E8) /* 07474 80A62764 AFA90014 */ sw $t1, 0x0014($sp) /* 07478 80A62768 AFA70010 */ sw $a3, 0x0010($sp) /* 0747C 80A6276C 24042819 */ addiu $a0, $zero, 0x2819 ## $a0 = 00002819 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s index 7e6a6a5a08..57df75d227 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s @@ -78,16 +78,16 @@ glabel func_80A634A0 /* 08270 80A63560 8E0C01F0 */ lw $t4, 0x01F0($s0) ## 000001F0 /* 08274 80A63564 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 /* 08278 80A63568 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 -/* 0827C 80A6356C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 08280 80A63570 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 08284 80A63574 4600403C */ c.lt.s $f8, $f0 +/* 0827C 80A6356C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 08280 80A63570 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 08284 80A63574 4600403C */ c.lt.s $f8, $f0 /* 08288 80A63578 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0828C 80A6357C 4502000D */ bc1fl .L80A635B4 /* 08290 80A63580 8E0C01F0 */ lw $t4, 0x01F0($s0) ## 000001F0 /* 08294 80A63584 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 08298 80A63588 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 -/* 0829C 80A6358C 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 -/* 082A0 80A63590 460A0401 */ sub.s $f16, $f0, $f10 +/* 08298 80A63588 3C0B8013 */ lui $t3, %hi(D_801333E8) +/* 0829C 80A6358C 256B33E8 */ addiu $t3, %lo(D_801333E8) +/* 082A0 80A63590 460A0401 */ sub.s $f16, $f0, $f10 /* 082A4 80A63594 2404282C */ addiu $a0, $zero, 0x282C ## $a0 = 0000282C /* 082A8 80A63598 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 082AC 80A6359C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 @@ -653,8 +653,8 @@ glabel func_80A634A0 /* 08AE4 80A63DD4 0C010753 */ jal func_80041D4C /* 08AE8 80A63DD8 8FA60080 */ lw $a2, 0x0080($sp) /* 08AEC 80A63DDC 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 08AF0 80A63DE0 14410011 */ bne $v0, $at, .L80A63E28 -/* 08AF4 80A63DE4 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 08AF0 80A63DE0 14410011 */ bne $v0, $at, .L80A63E28 +/* 08AF4 80A63DE4 3C0D8016 */ lui $t5, %hi(gGameInfo) .L80A63DE8: /* 08AF8 80A63DE8 8FAC0070 */ lw $t4, 0x0070($sp) .L80A63DEC: @@ -674,9 +674,9 @@ glabel func_80A634A0 /* 08B30 80A63E20 1000005D */ beq $zero, $zero, .L80A63F98 /* 08B34 80A63E24 8FBF0034 */ lw $ra, 0x0034($sp) .L80A63E28: -/* 08B38 80A63E28 8DADFA90 */ lw $t5, -0x0570($t5) ## FFFFFA90 -/* 08B3C 80A63E2C C7A60078 */ lwc1 $f6, 0x0078($sp) -/* 08B40 80A63E30 8FAB0070 */ lw $t3, 0x0070($sp) +/* 08B38 80A63E28 8DADFA90 */ lw $t5, %lo(gGameInfo)($t5) +/* 08B3C 80A63E2C C7A60078 */ lwc1 $f6, 0x0078($sp) +/* 08B40 80A63E30 8FAB0070 */ lw $t3, 0x0070($sp) /* 08B44 80A63E34 85B9055C */ lh $t9, 0x055C($t5) ## 0000055C /* 08B48 80A63E38 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 08B4C 80A63E3C 8FAE0070 */ lw $t6, 0x0070($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63FA8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63FA8.s index 223ca54b30..9639f5acad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63FA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63FA8.s @@ -99,15 +99,15 @@ glabel func_80A63FA8 /* 08E10 80A64100 AFA50028 */ sw $a1, 0x0028($sp) /* 08E14 80A64104 3C0180A6 */ lui $at, %hi(D_80A669A8) ## $at = 80A60000 /* 08E18 80A64108 C42469A8 */ lwc1 $f4, %lo(D_80A669A8)($at) -/* 08E1C 80A6410C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 08E20 80A64110 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 08E1C 80A6410C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 08E20 80A64110 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 08E24 80A64114 4604003C */ c.lt.s $f0, $f4 /* 08E28 80A64118 8FA50028 */ lw $a1, 0x0028($sp) /* 08E2C 80A6411C 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 /* 08E30 80A64120 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 08E34 80A64124 45000005 */ bc1f .L80A6413C -/* 08E38 80A64128 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 -/* 08E3C 80A6412C 25AD33E8 */ addiu $t5, $t5, 0x33E8 ## $t5 = 801333E8 +/* 08E38 80A64128 3C0D8013 */ lui $t5, %hi(D_801333E8) +/* 08E3C 80A6412C 25AD33E8 */ addiu $t5, %lo(D_801333E8) /* 08E40 80A64130 AFAD0014 */ sw $t5, 0x0014($sp) /* 08E44 80A64134 0C03DCE3 */ jal Audio_PlaySoundGeneral diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64150.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64150.s index 237b597a02..5a1aff152a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64150.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64150.s @@ -40,12 +40,12 @@ glabel func_80A64150 /* 08EF0 80A641E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A641E4: /* 08EF4 80A641E4 1440000B */ bne $v0, $zero, .L80A64214 -/* 08EF8 80A641E8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 08EFC 80A641EC 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 -/* 08F00 80A641F0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 08F04 80A641F4 25AD33E8 */ addiu $t5, $t5, 0x33E8 ## $t5 = 801333E8 -/* 08F08 80A641F8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 08F0C 80A641FC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 08EF8 80A641E8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 08EFC 80A641EC 3C0D8013 */ lui $t5, %hi(D_801333E8) +/* 08F00 80A641F0 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 08F04 80A641F4 25AD33E8 */ addiu $t5, %lo(D_801333E8) +/* 08F08 80A641F8 3C058013 */ lui $a1, %hi(D_801333D4) +/* 08F0C 80A641FC 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 08F10 80A64200 AFAD0014 */ sw $t5, 0x0014($sp) /* 08F14 80A64204 AFA70010 */ sw $a3, 0x0010($sp) /* 08F18 80A64208 24044845 */ addiu $a0, $zero, 0x4845 ## $a0 = 00004845 @@ -94,12 +94,12 @@ glabel func_80A64150 .L80A642A0: /* 08FB0 80A642A0 1440000B */ bne $v0, $zero, .L80A642D0 /* 08FB4 80A642A4 24044845 */ addiu $a0, $zero, 0x4845 ## $a0 = 00004845 -/* 08FB8 80A642A8 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 08FBC 80A642AC 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 08FC0 80A642B0 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 08FC4 80A642B4 25C733E0 */ addiu $a3, $t6, 0x33E0 ## $a3 = 801333E0 -/* 08FC8 80A642B8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 08FCC 80A642BC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 08FB8 80A642A8 3C0E8013 */ lui $t6, %hi(D_801333E0) +/* 08FBC 80A642AC 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 08FC0 80A642B0 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 08FC4 80A642B4 25C733E0 */ addiu $a3, $t6, %lo(D_801333E0) +/* 08FC8 80A642B8 3C058013 */ lui $a1, %hi(D_801333D4) +/* 08FCC 80A642BC 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 08FD0 80A642C0 AFA70010 */ sw $a3, 0x0010($sp) /* 08FD4 80A642C4 AFAF0014 */ sw $t7, 0x0014($sp) /* 08FD8 80A642C8 0C03DCE3 */ jal Audio_PlaySoundGeneral @@ -123,14 +123,14 @@ glabel func_80A64150 /* 09010 80A64300 8FAE002C */ lw $t6, 0x002C($sp) /* 09014 80A64304 8E080228 */ lw $t0, 0x0228($s0) ## 00000228 /* 09018 80A64308 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C -/* 0901C 80A6430C 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 +/* 0901C 80A6430C 3C0B8013 */ lui $t3, %hi(D_801333E0) /* 09020 80A64310 ACA80000 */ sw $t0, 0x0000($a1) ## 0000021C /* 09024 80A64314 8E19022C */ lw $t9, 0x022C($s0) ## 0000022C -/* 09028 80A64318 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 0902C 80A6431C 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 +/* 09028 80A64318 3C0C8013 */ lui $t4, %hi(D_801333E8) +/* 0902C 80A6431C 258C33E8 */ addiu $t4, %lo(D_801333E8) /* 09030 80A64320 ACB90004 */ sw $t9, 0x0004($a1) ## 00000220 /* 09034 80A64324 8E080230 */ lw $t0, 0x0230($s0) ## 00000230 -/* 09038 80A64328 256733E0 */ addiu $a3, $t3, 0x33E0 ## $a3 = 801333E0 +/* 09038 80A64328 256733E0 */ addiu $a3, $t3, %lo(D_801333E0) /* 0903C 80A6432C 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 /* 09040 80A64330 ACA80008 */ sw $t0, 0x0008($a1) ## 00000224 /* 09044 80A64334 8E0901F0 */ lw $t1, 0x01F0($s0) ## 000001F0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s index 83a4c6944a..5af34a1b64 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s @@ -46,13 +46,13 @@ glabel func_80A65C00 /* 0A998 80A65C88 008B2021 */ addu $a0, $a0, $t3 /* 0A99C 80A65C8C AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 0A9A0 80A65C90 8C8467EC */ lw $a0, %lo(D_80A667EC)($a0) -/* 0A9A4 80A65C94 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0A9A4 80A65C94 3C188016 */ lui $t8, %hi(gSegments) /* 0A9A8 80A65C98 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0A9AC 80A65C9C 00046900 */ sll $t5, $a0, 4 /* 0A9B0 80A65CA0 000D7702 */ srl $t6, $t5, 28 /* 0A9B4 80A65CA4 000E7880 */ sll $t7, $t6, 2 /* 0A9B8 80A65CA8 030FC021 */ addu $t8, $t8, $t7 -/* 0A9BC 80A65CAC 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 0A9BC 80A65CAC 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 0A9C0 80A65CB0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0A9C4 80A65CB4 00816024 */ and $t4, $a0, $at /* 0A9C8 80A65CB8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Init.s index ab5991b5b6..762147e66f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/EnHorseGameCheck_Init.s @@ -13,8 +13,8 @@ glabel EnHorseGameCheck_Init /* 00DE8 80A68338 8FA5001C */ lw $a1, 0x001C($sp) /* 00DEC 80A6833C 14400005 */ bne $v0, $zero, .L80A68354 /* 00DF0 80A68340 8FA60018 */ lw $a2, 0x0018($sp) -/* 00DF4 80A68344 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00DF8 80A68348 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 00DF4 80A68344 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 00DF8 80A68348 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 00DFC 80A6834C 85F80556 */ lh $t8, 0x0556($t7) ## 80160556 /* 00E00 80A68350 13000002 */ beq $t8, $zero, .L80A6835C .L80A68354: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67618.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67618.s index 362a85b353..84376d44a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67618.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67618.s @@ -1,6 +1,6 @@ glabel func_80A67618 -/* 000C8 80A67618 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 000CC 80A6761C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 000C8 80A67618 3C028016 */ lui $v0, %hi(gSaveContext) +/* 000CC 80A6761C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 000D0 80A67620 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 000D4 80A67624 AFBF0014 */ sw $ra, 0x0014($sp) /* 000D8 80A67628 AC400008 */ sw $zero, 0x0008($v0) ## 8015E668 @@ -34,8 +34,8 @@ glabel func_80A67618 /* 00148 80A67698 AFA5001C */ sw $a1, 0x001C($sp) /* 0014C 80A6769C 0C01DD7C */ jal func_800775F0 /* 00150 80A676A0 24040042 */ addiu $a0, $zero, 0x0042 ## $a0 = 00000042 -/* 00154 80A676A4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00158 80A676A8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00154 80A676A4 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00158 80A676A8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0015C 80A676AC 10000021 */ beq $zero, $zero, .L80A67734 /* 00160 80A676B0 8FA5001C */ lw $a1, 0x001C($sp) .L80A676B4: @@ -49,10 +49,10 @@ glabel func_80A67618 /* 00180 80A676D0 AFA5001C */ sw $a1, 0x001C($sp) /* 00184 80A676D4 8FA5001C */ lw $a1, 0x001C($sp) /* 00188 80A676D8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0018C 80A676DC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 0018C 80A676DC 3C028016 */ lui $v0, %hi(gSaveContext) /* 00190 80A676E0 2408002E */ addiu $t0, $zero, 0x002E ## $t0 = 0000002E /* 00194 80A676E4 00250821 */ addu $at, $at, $a1 -/* 00198 80A676E8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00198 80A676E8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0019C 80A676EC 10000011 */ beq $zero, $zero, .L80A67734 /* 001A0 80A676F0 A0281E5E */ sb $t0, 0x1E5E($at) ## 00011E5E .L80A676F4: @@ -73,8 +73,8 @@ glabel func_80A67618 /* 001DC 80A6772C 35F88000 */ ori $t8, $t7, 0x8000 ## $t8 = 00008000 /* 001E0 80A67730 A45813FA */ sh $t8, 0x13FA($v0) ## 8015FA5A .L80A67734: -/* 001E4 80A67734 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 001E8 80A67738 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 001E4 80A67734 3C198016 */ lui $t9, %hi(gGameInfo) +/* 001E8 80A67738 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 001EC 80A6773C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 001F0 80A67740 00250821 */ addu $at, $at, $a1 /* 001F4 80A67744 24080014 */ addiu $t0, $zero, 0x0014 ## $t0 = 00000014 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67764.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67764.s index 609453e7b2..7bcf4e5d25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67764.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67764.s @@ -50,20 +50,20 @@ glabel func_80A67764 /* 002C4 80A67814 24130001 */ addiu $s3, $zero, 0x0001 ## $s3 = 00000001 /* 002C8 80A67818 24044835 */ addiu $a0, $zero, 0x4835 ## $a0 = 00004835 /* 002CC 80A6781C 314B0004 */ andi $t3, $t2, 0x0004 ## $t3 = 00000000 -/* 002D0 80A67820 15600010 */ bne $t3, $zero, .L80A67864 -/* 002D4 80A67824 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 +/* 002D0 80A67820 15600010 */ bne $t3, $zero, .L80A67864 +/* 002D4 80A67824 3C058013 */ lui $a1, %hi(D_801333D4) /* 002D8 80A67828 8E42016C */ lw $v0, 0x016C($s2) ## 0000016C -/* 002DC 80A6782C 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 002E0 80A67830 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 +/* 002DC 80A6782C 3C0E8013 */ lui $t6, %hi(D_801333E0) +/* 002E0 80A67830 3C0F8013 */ lui $t7, %hi(D_801333E8) /* 002E4 80A67834 AC530388 */ sw $s3, 0x0388($v0) ## 00000388 /* 002E8 80A67838 8E4C0150 */ lw $t4, 0x0150($s2) ## 00000150 -/* 002EC 80A6783C 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 002F0 80A67840 25C733E0 */ addiu $a3, $t6, 0x33E0 ## $a3 = 801333E0 +/* 002EC 80A6783C 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 002F0 80A67840 25C733E0 */ addiu $a3, $t6, %lo(D_801333E0) /* 002F4 80A67844 358D0004 */ ori $t5, $t4, 0x0004 ## $t5 = 00000004 /* 002F8 80A67848 AE4D0150 */ sw $t5, 0x0150($s2) ## 00000150 -/* 002FC 80A6784C AFAF0014 */ sw $t7, 0x0014($sp) -/* 00300 80A67850 AFA70010 */ sw $a3, 0x0010($sp) -/* 00304 80A67854 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 002FC 80A6784C AFAF0014 */ sw $t7, 0x0014($sp) +/* 00300 80A67850 AFA70010 */ sw $a3, 0x0010($sp) +/* 00304 80A67854 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00308 80A67858 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 0030C 80A6785C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 @@ -163,14 +163,14 @@ glabel func_80A67764 /* 00460 80A679B0 0C03E803 */ jal Audio_SetBGM /* 00464 80A679B4 AE4A0178 */ sw $t2, 0x0178($s2) ## 00000178 -/* 00468 80A679B8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0046C 80A679BC 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 -/* 00470 80A679C0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00474 80A679C4 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 -/* 00478 80A679C8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0047C 80A679CC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 -/* 00480 80A679D0 AFAB0014 */ sw $t3, 0x0014($sp) -/* 00484 80A679D4 AFA70010 */ sw $a3, 0x0010($sp) +/* 00468 80A679B8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0046C 80A679BC 3C0B8013 */ lui $t3, %hi(D_801333E8) +/* 00470 80A679C0 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00474 80A679C4 256B33E8 */ addiu $t3, %lo(D_801333E8) +/* 00478 80A679C8 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0047C 80A679CC 24A533D4 */ addiu $a1, %lo(D_801333D4) +/* 00480 80A679D0 AFAB0014 */ sw $t3, 0x0014($sp) +/* 00484 80A679D4 AFA70010 */ sw $a3, 0x0010($sp) /* 00488 80A679D8 24044835 */ addiu $a0, $zero, 0x4835 ## $a0 = 00004835 /* 0048C 80A679DC 0C03DCE3 */ jal Audio_PlaySoundGeneral @@ -220,14 +220,14 @@ glabel func_80A67764 /* 00530 80A67A80 0C03E803 */ jal Audio_SetBGM /* 00534 80A67A84 AC4901F0 */ sw $t1, 0x01F0($v0) ## 000001F0 -/* 00538 80A67A88 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0053C 80A67A8C 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 00540 80A67A90 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00544 80A67A94 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 -/* 00548 80A67A98 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0054C 80A67A9C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 -/* 00550 80A67AA0 AFAA0014 */ sw $t2, 0x0014($sp) -/* 00554 80A67AA4 AFA70010 */ sw $a3, 0x0010($sp) +/* 00538 80A67A88 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0053C 80A67A8C 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 00540 80A67A90 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00544 80A67A94 254A33E8 */ addiu $t2, %lo(D_801333E8) +/* 00548 80A67A98 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0054C 80A67A9C 24A533D4 */ addiu $a1, %lo(D_801333D4) +/* 00550 80A67AA0 AFAA0014 */ sw $t2, 0x0014($sp) +/* 00554 80A67AA4 AFA70010 */ sw $a3, 0x0010($sp) /* 00558 80A67AA8 24044835 */ addiu $a0, $zero, 0x4835 ## $a0 = 00004835 /* 0055C 80A67AAC 0C03DCE3 */ jal Audio_PlaySoundGeneral @@ -281,11 +281,11 @@ glabel func_80A67764 /* 00600 80A67B50 AE4B0174 */ sw $t3, 0x0174($s2) ## 00000174 /* 00604 80A67B54 AE4C0178 */ sw $t4, 0x0178($s2) ## 00000178 .L80A67B58: -/* 00608 80A67B58 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 0060C 80A67B5C 85ADFA30 */ lh $t5, -0x05D0($t5) ## 8015FA30 -/* 00610 80A67B60 29A100B4 */ slti $at, $t5, 0x00B4 -/* 00614 80A67B64 54200014 */ bnel $at, $zero, .L80A67BB8 -/* 00618 80A67B68 8FBF003C */ lw $ra, 0x003C($sp) +/* 00608 80A67B58 3C0D8016 */ lui $t5, %hi(gSaveContext+0x13d0) +/* 0060C 80A67B5C 85ADFA30 */ lh $t5, %lo(gSaveContext+0x13d0)($t5) +/* 00610 80A67B60 29A100B4 */ slti $at, $t5, 0x00B4 +/* 00614 80A67B64 54200014 */ bnel $at, $zero, .L80A67BB8 +/* 00618 80A67B68 8FBF003C */ lw $ra, 0x003C($sp) /* 0061C 80A67B6C 8E4E0150 */ lw $t6, 0x0150($s2) ## 00000150 /* 00620 80A67B70 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 /* 00624 80A67B74 51E00010 */ beql $t7, $zero, .L80A67BB8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67CE4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67CE4.s index fe68389218..f389646143 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67CE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67CE4.s @@ -16,8 +16,8 @@ glabel func_80A67CE4 /* 007B4 80A67D04 54410010 */ bnel $v0, $at, .L80A67D48 /* 007B8 80A67D08 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 .L80A67D0C: -/* 007BC 80A67D0C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 007C0 80A67D10 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 007BC 80A67D0C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 007C0 80A67D10 2442E660 */ addiu $v0, %lo(gSaveContext) /* 007C4 80A67D14 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 007C8 80A67D18 AC400008 */ sw $zero, 0x0008($v0) ## 8015E668 /* 007CC 80A67D1C 00250821 */ addu $at, $at, $a1 @@ -33,8 +33,8 @@ glabel func_80A67CE4 /* 007F4 80A67D44 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 .L80A67D48: /* 007F8 80A67D48 14410014 */ bne $v0, $at, .L80A67D9C -/* 007FC 80A67D4C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00800 80A67D50 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 007FC 80A67D4C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00800 80A67D50 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00804 80A67D54 241900F0 */ addiu $t9, $zero, 0x00F0 ## $t9 = 000000F0 /* 00808 80A67D58 2408000F */ addiu $t0, $zero, 0x000F ## $t0 = 0000000F /* 0080C 80A67D5C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -60,8 +60,8 @@ glabel func_80A67CE4 /* 00858 80A67DA8 AFA5001C */ sw $a1, 0x001C($sp) /* 0085C 80A67DAC 8FA5001C */ lw $a1, 0x001C($sp) -/* 00860 80A67DB0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00864 80A67DB4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00860 80A67DB0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00864 80A67DB4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00868 80A67DB8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0086C 80A67DBC AC400008 */ sw $zero, 0x0008($v0) ## 8015E668 /* 00870 80A67DC0 240C0157 */ addiu $t4, $zero, 0x0157 ## $t4 = 00000157 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67DFC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67DFC.s index 1237eabb19..0fb1689696 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67DFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Game_Check/func_80A67DFC.s @@ -93,16 +93,16 @@ glabel func_80A67DFC /* 009F8 80A67F48 54200013 */ bnel $at, $zero, .L80A67F98 /* 009FC 80A67F4C 8E4D019C */ lw $t5, 0x019C($s2) ## 0000019C /* 00A00 80A67F50 8E420154 */ lw $v0, 0x0154($s2) ## 00000154 -/* 00A04 80A67F54 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00A08 80A67F58 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00A04 80A67F54 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00A08 80A67F58 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00A0C 80A67F5C 30480010 */ andi $t0, $v0, 0x0010 ## $t0 = 00000000 /* 00A10 80A67F60 1500000C */ bne $t0, $zero, .L80A67F94 /* 00A14 80A67F64 34490010 */ ori $t1, $v0, 0x0010 ## $t1 = 00000010 -/* 00A18 80A67F68 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 00A1C 80A67F6C 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 +/* 00A18 80A67F68 3C0A8013 */ lui $t2, %hi(D_801333E0) +/* 00A1C 80A67F6C 3C0B8013 */ lui $t3, %hi(D_801333E8) /* 00A20 80A67F70 AE490154 */ sw $t1, 0x0154($s2) ## 00000154 -/* 00A24 80A67F74 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 -/* 00A28 80A67F78 254733E0 */ addiu $a3, $t2, 0x33E0 ## $a3 = 801333E0 +/* 00A24 80A67F74 256B33E8 */ addiu $t3, %lo(D_801333E8) +/* 00A28 80A67F78 254733E0 */ addiu $a3, $t2, %lo(D_801333E0) /* 00A2C 80A67F7C AFA70010 */ sw $a3, 0x0010($sp) /* 00A30 80A67F80 AFAB0014 */ sw $t3, 0x0014($sp) /* 00A34 80A67F84 24044835 */ addiu $a0, $zero, 0x4835 ## $a0 = 00004835 @@ -246,21 +246,21 @@ glabel func_80A67DFC /* 00C24 80A68174 0C03E803 */ jal Audio_SetBGM /* 00C28 80A68178 AE5901A0 */ sw $t9, 0x01A0($s2) ## 000001A0 -/* 00C2C 80A6817C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00C30 80A68180 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 00C34 80A68184 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00C38 80A68188 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 -/* 00C3C 80A6818C 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00C40 80A68190 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00C2C 80A6817C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00C30 80A68180 3C088013 */ lui $t0, %hi(D_801333E8) +/* 00C34 80A68184 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00C38 80A68188 250833E8 */ addiu $t0, %lo(D_801333E8) +/* 00C3C 80A6818C 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00C40 80A68190 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00C44 80A68194 AFA80014 */ sw $t0, 0x0014($sp) /* 00C48 80A68198 AFA70010 */ sw $a3, 0x0010($sp) /* 00C4C 80A6819C 24044835 */ addiu $a0, $zero, 0x4835 ## $a0 = 00004835 /* 00C50 80A681A0 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 00C54 80A681A4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00C58 80A681A8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00C58 80A681A8 3C028016 */ lui $v0, %hi(gSaveContext) /* 00C5C 80A681AC 24090046 */ addiu $t1, $zero, 0x0046 ## $t1 = 00000046 -/* 00C60 80A681B0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00C60 80A681B0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00C64 80A681B4 AE54019C */ sw $s4, 0x019C($s2) ## 0000019C /* 00C68 80A681B8 AE490198 */ sw $t1, 0x0198($s2) ## 00000198 /* 00C6C 80A681BC 240A000F */ addiu $t2, $zero, 0x000F ## $t2 = 0000000F @@ -318,8 +318,8 @@ glabel func_80A67DFC /* 00D30 80A68280 AE4A019C */ sw $t2, 0x019C($s2) ## 0000019C /* 00D34 80A68284 AE4B0198 */ sw $t3, 0x0198($s2) ## 00000198 .L80A68288: -/* 00D38 80A68288 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00D3C 80A6828C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00D38 80A68288 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00D3C 80A6828C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00D40 80A68290 844C13D0 */ lh $t4, 0x13D0($v0) ## 8015FA30 /* 00D44 80A68294 298100B4 */ slti $at, $t4, 0x00B4 /* 00D48 80A68298 54200015 */ bnel $at, $zero, .L80A682F0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s index 3709d3301e..03ec6f990e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s @@ -16,8 +16,8 @@ glabel EnHorseGanon_Init /* 002FC 80A6895C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00300 80A68960 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 /* 00304 80A68964 44812000 */ mtc1 $at, $f4 ## $f4 = -3.50 -/* 00308 80A68968 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0030C 80A6896C 24C6B644 */ addiu $a2, $a2, 0xB644 ## $a2 = 8002B644 +/* 00308 80A68968 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Squiggly) +/* 0030C 80A6896C 24C6B644 */ addiu $a2, %lo(ActorShadow_DrawFunc_Squiggly) /* 00310 80A68970 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00314 80A68974 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00318 80A68978 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68870.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68870.s index de5b47f2c7..1f3026cc12 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68870.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68870.s @@ -18,7 +18,7 @@ glabel func_80A68870 /* 00250 80A688B0 4502001A */ bc1fl .L80A6891C /* 00254 80A688B4 8FBF0024 */ lw $ra, 0x0024($sp) /* 00258 80A688B8 14400008 */ bne $v0, $zero, .L80A688DC -/* 0025C 80A688BC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 0025C 80A688BC 3C078013 */ lui $a3, %hi(D_801333E0) /* 00260 80A688C0 8C790004 */ lw $t9, 0x0004($v1) ## 80A692BC /* 00264 80A688C4 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 /* 00268 80A688C8 00000000 */ nop @@ -27,9 +27,9 @@ glabel func_80A68870 /* 00274 80A688D4 00000000 */ nop /* 00278 80A688D8 4501000F */ bc1t .L80A68918 .L80A688DC: -/* 0027C 80A688DC 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 00280 80A688E0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00284 80A688E4 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 +/* 0027C 80A688DC 3C088013 */ lui $t0, %hi(D_801333E8) +/* 00280 80A688E0 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00284 80A688E4 250833E8 */ addiu $t0, %lo(D_801333E8) /* 00288 80A688E8 AFA80014 */ sw $t0, 0x0014($sp) /* 0028C 80A688EC AFA70010 */ sw $a3, 0x0010($sp) /* 00290 80A688F0 24042803 */ addiu $a0, $zero, 0x2803 ## $a0 = 00002803 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68B20.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68B20.s index 2e24790fe0..ac6b0c3174 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68B20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68B20.s @@ -59,11 +59,11 @@ glabel func_80A68B20 /* 0058C 80A68BEC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00590 80A68BF0 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 /* 00594 80A68BF4 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 00598 80A68BF8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0059C 80A68BFC 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 +/* 00598 80A68BF8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0059C 80A68BFC 3C088013 */ lui $t0, %hi(D_801333E8) /* 005A0 80A68C00 46105483 */ div.s $f18, $f10, $f16 -/* 005A4 80A68C04 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 005A8 80A68C08 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 +/* 005A4 80A68C04 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 005A8 80A68C08 250833E8 */ addiu $t0, %lo(D_801333E8) /* 005AC 80A68C0C AFA80014 */ sw $t0, 0x0014($sp) /* 005B0 80A68C10 AFA70010 */ sw $a3, 0x0010($sp) /* 005B4 80A68C14 AFA30034 */ sw $v1, 0x0034($sp) @@ -82,11 +82,11 @@ glabel func_80A68B20 /* 005E0 80A68C40 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 005E4 80A68C44 44813000 */ mtc1 $at, $f6 ## $f6 = 7.00 /* 005E8 80A68C48 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 005EC 80A68C4C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 005F0 80A68C50 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 +/* 005EC 80A68C4C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 005F0 80A68C50 3C098013 */ lui $t1, %hi(D_801333E8) /* 005F4 80A68C54 46062203 */ div.s $f8, $f4, $f6 -/* 005F8 80A68C58 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 005FC 80A68C5C 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 +/* 005F8 80A68C58 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 005FC 80A68C5C 252933E8 */ addiu $t1, %lo(D_801333E8) /* 00600 80A68C60 AFA90014 */ sw $t1, 0x0014($sp) /* 00604 80A68C64 AFA70010 */ sw $a3, 0x0010($sp) /* 00608 80A68C68 AFA30034 */ sw $v1, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s index ccb6b84437..7b5574987b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s @@ -15,8 +15,8 @@ glabel EnHorseLinkChild_Init /* 002C4 80A69694 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 002C8 80A69698 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 /* 002CC 80A6969C 44812000 */ mtc1 $at, $f4 ## $f4 = -3.50 -/* 002D0 80A696A0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 002D4 80A696A4 24C6B644 */ addiu $a2, $a2, 0xB644 ## $a2 = 8002B644 +/* 002D0 80A696A0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Squiggly) +/* 002D4 80A696A4 24C6B644 */ addiu $a2, %lo(ActorShadow_DrawFunc_Squiggly) /* 002D8 80A696A8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 002DC 80A696AC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 002E0 80A696B0 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 @@ -80,8 +80,8 @@ glabel EnHorseLinkChild_Init /* 003C0 80A69790 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 003C4 80A69794 AE0001F0 */ sw $zero, 0x01F0($s0) ## 000001F0 /* 003C8 80A69798 A20001EC */ sb $zero, 0x01EC($s0) ## 000001EC -/* 003CC 80A6979C 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 003D0 80A697A0 8D08F9C0 */ lw $t0, -0x0640($t0) ## 8015F9C0 +/* 003CC 80A6979C 3C088016 */ lui $t0, %hi(gSaveContext+0x1360) +/* 003D0 80A697A0 8D08F9C0 */ lw $t0, %lo(gSaveContext+0x1360)($t0) /* 003D4 80A697A4 8FA9003C */ lw $t1, 0x003C($sp) /* 003D8 80A697A8 29010004 */ slti $at, $t0, 0x0004 /* 003DC 80A697AC 54200006 */ bnel $at, $zero, .L80A697C8 @@ -99,14 +99,14 @@ glabel EnHorseLinkChild_Init /* 00408 80A697D8 24040014 */ addiu $a0, $zero, 0x0014 ## $a0 = 00000014 /* 0040C 80A697DC 14400005 */ bne $v0, $zero, .L80A697F4 -/* 00410 80A697E0 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 00410 80A697E0 3C0B8016 */ lui $t3, %hi(gSaveContext+0xed6) /* 00414 80A697E4 0C00B55C */ jal Actor_Kill /* 00418 80A697E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0041C 80A697EC 1000000F */ beq $zero, $zero, .L80A6982C /* 00420 80A697F0 8FBF0024 */ lw $ra, 0x0024($sp) .L80A697F4: -/* 00424 80A697F4 956BF536 */ lhu $t3, -0x0ACA($t3) ## FFFFF536 +/* 00424 80A697F4 956BF536 */ lhu $t3, %lo(gSaveContext+0xed6)($t3) /* 00428 80A697F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0042C 80A697FC 316C0040 */ andi $t4, $t3, 0x0040 ## $t4 = 00000000 /* 00430 80A69800 0C29A7B0 */ jal func_80A69EC0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A693D0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A693D0.s index 0dd05b97cf..ba77c3ef12 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A693D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A693D0.s @@ -18,7 +18,7 @@ glabel func_80A693D0 /* 00040 80A69410 4502001A */ bc1fl .L80A6947C /* 00044 80A69414 8FBF0024 */ lw $ra, 0x0024($sp) /* 00048 80A69418 14400008 */ bne $v0, $zero, .L80A6943C -/* 0004C 80A6941C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 0004C 80A6941C 3C078013 */ lui $a3, %hi(D_801333E0) /* 00050 80A69420 8C790004 */ lw $t9, 0x0004($v1) ## 80A6AF60 /* 00054 80A69424 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 /* 00058 80A69428 00000000 */ nop @@ -27,9 +27,9 @@ glabel func_80A693D0 /* 00064 80A69434 00000000 */ nop /* 00068 80A69438 4501000F */ bc1t .L80A69478 .L80A6943C: -/* 0006C 80A6943C 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 00070 80A69440 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00074 80A69444 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 +/* 0006C 80A6943C 3C088013 */ lui $t0, %hi(D_801333E8) +/* 00070 80A69440 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00074 80A69444 250833E8 */ addiu $t0, %lo(D_801333E8) /* 00078 80A69448 AFA80014 */ sw $t0, 0x0014($sp) /* 0007C 80A6944C AFA70010 */ sw $a3, 0x0010($sp) /* 00080 80A69450 24042842 */ addiu $a0, $zero, 0x2842 ## $a0 = 00002842 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6948C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6948C.s index 147bc485e8..cc317f6b66 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6948C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6948C.s @@ -20,13 +20,13 @@ glabel func_80A6948C /* 00100 80A694D0 45020030 */ bc1fl .L80A69594 /* 00104 80A694D4 8FBF0024 */ lw $ra, 0x0024($sp) /* 00108 80A694D8 10410003 */ beq $v0, $at, .L80A694E8 -/* 0010C 80A694DC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 0010C 80A694DC 3C078013 */ lui $a3, %hi(D_801333E0) /* 00110 80A694E0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 00114 80A694E4 1441000B */ bne $v0, $at, .L80A69514 .L80A694E8: -/* 00118 80A694E8 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 0011C 80A694EC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00120 80A694F0 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 +/* 00118 80A694E8 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 0011C 80A694EC 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00120 80A694F0 25CE33E8 */ addiu $t6, %lo(D_801333E8) /* 00124 80A694F4 AFAE0014 */ sw $t6, 0x0014($sp) /* 00128 80A694F8 AFA70010 */ sw $a3, 0x0010($sp) /* 0012C 80A694FC 24042843 */ addiu $a0, $zero, 0x2843 ## $a0 = 00002843 @@ -45,18 +45,18 @@ glabel func_80A6948C /* 00154 80A69524 00000000 */ nop /* 00158 80A69528 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0015C 80A6952C 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 00160 80A69530 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00164 80A69534 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00160 80A69530 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00164 80A69534 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00168 80A69538 4600403C */ c.lt.s $f8, $f0 /* 0016C 80A6953C 24042844 */ addiu $a0, $zero, 0x2844 ## $a0 = 00002844 /* 00170 80A69540 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 00174 80A69544 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 00178 80A69548 4500000D */ bc1f .L80A69580 -/* 0017C 80A6954C 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 00180 80A69550 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00184 80A69554 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 00188 80A69558 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0018C 80A6955C 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 0017C 80A6954C 3C188013 */ lui $t8, %hi(D_801333E8) +/* 00180 80A69550 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00184 80A69554 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 00188 80A69558 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0018C 80A6955C 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 00190 80A69560 AFAF0014 */ sw $t7, 0x0014($sp) /* 00194 80A69564 AFA70010 */ sw $a3, 0x0010($sp) /* 00198 80A69568 24042845 */ addiu $a0, $zero, 0x2845 ## $a0 = 00002845 @@ -67,7 +67,7 @@ glabel func_80A6948C /* 001A8 80A69578 10000006 */ beq $zero, $zero, .L80A69594 /* 001AC 80A6957C 8FBF0024 */ lw $ra, 0x0024($sp) .L80A69580: -/* 001B0 80A69580 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 000033E8 +/* 001B0 80A69580 271833E8 */ addiu $t8, %lo(D_801333E8) /* 001B4 80A69584 AFB80014 */ sw $t8, 0x0014($sp) /* 001B8 80A69588 0C03DCE3 */ jal Audio_PlaySoundGeneral diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A068.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A068.s index e7efd61b49..9d9a20c2b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A068.s @@ -10,16 +10,16 @@ glabel func_80A6A068 /* 00CB8 80A6A088 8DC51C44 */ lw $a1, 0x1C44($t6) ## 00001C44 /* 00CBC 80A6A08C 0C00B6E3 */ jal func_8002DB8C /* 00CC0 80A6A090 AFA50054 */ sw $a1, 0x0054($sp) -/* 00CC4 80A6A094 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00CC8 80A6A098 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 +/* 00CC4 80A6A094 3C058016 */ lui $a1, %hi(gSaveContext) +/* 00CC8 80A6A098 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 00CCC 80A6A09C 8CAF0000 */ lw $t7, 0x0000($a1) ## 8015E660 /* 00CD0 80A6A0A0 240102AE */ addiu $at, $zero, 0x02AE ## $at = 000002AE /* 00CD4 80A6A0A4 E7A00050 */ swc1 $f0, 0x0050($sp) /* 00CD8 80A6A0A8 15E1000E */ bne $t7, $at, .L80A6A0E4 -/* 00CDC 80A6A0AC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00CE0 80A6A0B0 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 00CE4 80A6A0B4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00CE8 80A6A0B8 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 00CDC 80A6A0AC 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00CE0 80A6A0B0 3C188013 */ lui $t8, %hi(D_801333E8) +/* 00CE4 80A6A0B4 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00CE8 80A6A0B8 271833E8 */ addiu $t8, %lo(D_801333E8) /* 00CEC 80A6A0BC AFB80014 */ sw $t8, 0x0014($sp) /* 00CF0 80A6A0C0 AFA70010 */ sw $a3, 0x0010($sp) /* 00CF4 80A6A0C4 24042844 */ addiu $a0, $zero, 0x2844 ## $a0 = 00002844 @@ -33,12 +33,12 @@ glabel func_80A6A068 /* 00D10 80A6A0E0 8FBF002C */ lw $ra, 0x002C($sp) .L80A6A0E4: /* 00D14 80A6A0E4 94A20ED6 */ lhu $v0, 0x0ED6($a1) ## 00000ED6 -/* 00D18 80A6A0E8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 00D18 80A6A0E8 3C198016 */ lui $t9, %hi(gGameInfo) /* 00D1C 80A6A0EC 8FA9005C */ lw $t1, 0x005C($sp) /* 00D20 80A6A0F0 30420040 */ andi $v0, $v0, 0x0040 ## $v0 = 00000000 /* 00D24 80A6A0F4 50400006 */ beql $v0, $zero, .L80A6A110 /* 00D28 80A6A0F8 852A00A4 */ lh $t2, 0x00A4($t1) ## 000000A4 -/* 00D2C 80A6A0FC 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 00D2C 80A6A0FC 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 00D30 80A6A100 872805BE */ lh $t0, 0x05BE($t9) ## 801605BE /* 00D34 80A6A104 15000009 */ bne $t0, $zero, .L80A6A12C /* 00D38 80A6A108 00000000 */ nop @@ -65,8 +65,8 @@ glabel func_80A6A068 /* 00D7C 80A6A14C 0C02927F */ jal SkelAnime_FrameUpdateMatrix /* 00D80 80A6A150 AFA30048 */ sw $v1, 0x0048($sp) -/* 00D84 80A6A154 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00D88 80A6A158 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 +/* 00D84 80A6A154 3C058016 */ lui $a1, %hi(gSaveContext) +/* 00D88 80A6A158 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 00D8C 80A6A15C 8FA30048 */ lw $v1, 0x0048($sp) /* 00D90 80A6A160 14400007 */ bne $v0, $zero, .L80A6A180 /* 00D94 80A6A164 00403825 */ or $a3, $v0, $zero ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A4DC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A4DC.s index 7ff92a5d16..806e84d0d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A4DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A4DC.s @@ -10,7 +10,7 @@ glabel func_80A6A4DC /* 01128 80A6A4F8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0112C 80A6A4FC 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 01130 80A6A500 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01134 80A6A504 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 01134 80A6A504 3C188016 */ lui $t8, %hi(gGameInfo) /* 01138 80A6A508 4600203C */ c.lt.s $f4, $f0 /* 0113C 80A6A50C 00000000 */ nop /* 01140 80A6A510 45020004 */ bc1fl .L80A6A524 @@ -19,7 +19,7 @@ glabel func_80A6A4DC /* 0114C 80A6A51C AE000150 */ sw $zero, 0x0150($s0) ## 00000150 /* 01150 80A6A520 AE0F0150 */ sw $t7, 0x0150($s0) ## 00000150 .L80A6A524: -/* 01154 80A6A524 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 01154 80A6A524 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 01158 80A6A528 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0115C 80A6A52C 0C29A569 */ jal func_80A695A4 /* 01160 80A6A530 A70005BE */ sh $zero, 0x05BE($t8) ## 801605BE diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A5A4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A5A4.s index d30930afbf..b49d2023b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A5A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A5A4.s @@ -5,19 +5,19 @@ glabel D_80A6AFF0 .text glabel func_80A6A5A4 /* 011D4 80A6A5A4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 011D8 80A6A5A8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 011DC 80A6A5AC 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 011D8 80A6A5A8 3C028016 */ lui $v0, %hi(gGameInfo) +/* 011DC 80A6A5AC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 011E0 80A6A5B0 AFBF002C */ sw $ra, 0x002C($sp) /* 011E4 80A6A5B4 AFB00028 */ sw $s0, 0x0028($sp) /* 011E8 80A6A5B8 AFA5003C */ sw $a1, 0x003C($sp) /* 011EC 80A6A5BC 844E05BE */ lh $t6, 0x05BE($v0) ## 801605BE -/* 011F0 80A6A5C0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 011F0 80A6A5C0 3C078013 */ lui $a3, %hi(D_801333E0) /* 011F4 80A6A5C4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 011F8 80A6A5C8 11C0000E */ beq $t6, $zero, .L80A6A604 -/* 011FC 80A6A5CC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 01200 80A6A5D0 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 +/* 011FC 80A6A5CC 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 01200 80A6A5D0 3C0F8013 */ lui $t7, %hi(D_801333E8) /* 01204 80A6A5D4 A44005BE */ sh $zero, 0x05BE($v0) ## 801605BE -/* 01208 80A6A5D8 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 01208 80A6A5D8 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 0120C 80A6A5DC AFAF0014 */ sw $t7, 0x0014($sp) /* 01210 80A6A5E0 AFA70010 */ sw $a3, 0x0010($sp) /* 01214 80A6A5E4 24042844 */ addiu $a0, $zero, 0x2844 ## $a0 = 00002844 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6AD84.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6AD84.s index b8c88d2a91..8614dfa3df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6AD84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6AD84.s @@ -42,13 +42,13 @@ glabel func_80A6AD84 /* 01A2C 80A6ADFC 008B2021 */ addu $a0, $a0, $t3 /* 01A30 80A6AE00 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 01A34 80A6AE04 8C84AF94 */ lw $a0, %lo(D_80A6AF94)($a0) -/* 01A38 80A6AE08 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 01A38 80A6AE08 3C188016 */ lui $t8, %hi(gSegments) /* 01A3C 80A6AE0C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01A40 80A6AE10 00046900 */ sll $t5, $a0, 4 /* 01A44 80A6AE14 000D7702 */ srl $t6, $t5, 28 /* 01A48 80A6AE18 000E7880 */ sll $t7, $t6, 2 /* 01A4C 80A6AE1C 030FC021 */ addu $t8, $t8, $t7 -/* 01A50 80A6AE20 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 01A50 80A6AE20 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 01A54 80A6AE24 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 01A58 80A6AE28 00816024 */ and $t4, $a0, $at /* 01A5C 80A6AE2C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s index b7e197e901..4ed95be3ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s @@ -228,10 +228,10 @@ glabel EnHorseNormal_Draw /* 01F18 80A6D168 8FA800C4 */ lw $t0, 0x00C4($sp) /* 01F1C 80A6D16C 8D0402C0 */ lw $a0, 0x02C0($t0) ## 000002C0 /* 01F20 80A6D170 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 -/* 01F24 80A6D174 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 +/* 01F24 80A6D174 3C198013 */ lui $t9, %hi(gMtxClear) /* 01F28 80A6D178 24980008 */ addiu $t8, $a0, 0x0008 ## $t8 = 00000008 /* 01F2C 80A6D17C AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 01F30 80A6D180 2739DB20 */ addiu $t9, $t9, 0xDB20 ## $t9 = 8012DB20 +/* 01F30 80A6D180 2739DB20 */ addiu $t9, %lo(gMtxClear) /* 01F34 80A6D184 35290003 */ ori $t1, $t1, 0x0003 ## $t1 = DA380003 /* 01F38 80A6D188 AC890000 */ sw $t1, 0x0000($a0) ## 00000000 /* 01F3C 80A6D18C AC990004 */ sw $t9, 0x0004($a0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s index 6869405a8c..d3e0035383 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s @@ -30,8 +30,8 @@ glabel EnHorseNormal_Init /* 001AC 80A6B3FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001B0 80A6B400 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 /* 001B4 80A6B404 44812000 */ mtc1 $at, $f4 ## $f4 = -3.50 -/* 001B8 80A6B408 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 001BC 80A6B40C 24C6B644 */ addiu $a2, $a2, 0xB644 ## $a2 = 8002B644 +/* 001B8 80A6B408 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Squiggly) +/* 001BC 80A6B40C 24C6B644 */ addiu $a2, %lo(ActorShadow_DrawFunc_Squiggly) /* 001C0 80A6B410 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 001C4 80A6B414 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 001C8 80A6B418 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 @@ -100,8 +100,8 @@ glabel EnHorseNormal_Init /* 002B0 80A6B500 5441007A */ bnel $v0, $at, .L80A6B6EC /* 002B4 80A6B504 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 /* 002B8 80A6B508 86080034 */ lh $t0, 0x0034($s0) ## 00000034 -/* 002BC 80A6B50C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 002C0 80A6B510 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 002BC 80A6B50C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 002C0 80A6B510 2442E660 */ addiu $v0, %lo(gSaveContext) /* 002C4 80A6B514 11000004 */ beq $t0, $zero, .L80A6B528 /* 002C8 80A6B518 00000000 */ nop /* 002CC 80A6B51C 8C490010 */ lw $t1, 0x0010($v0) ## 8015E670 @@ -146,8 +146,8 @@ glabel EnHorseNormal_Init /* 00348 80A6B598 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 /* 0034C 80A6B59C 14400005 */ bne $v0, $zero, .L80A6B5B4 -/* 00350 80A6B5A0 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 00354 80A6B5A4 8DADFA90 */ lw $t5, -0x0570($t5) ## 8015FA90 +/* 00350 80A6B5A0 3C0D8016 */ lui $t5, %hi(gGameInfo) +/* 00354 80A6B5A4 8DADFA90 */ lw $t5, %lo(gGameInfo)($t5) /* 00358 80A6B5A8 85AE0556 */ lh $t6, 0x0556($t5) ## 80160556 /* 0035C 80A6B5AC 51C0000A */ beql $t6, $zero, .L80A6B5D8 /* 00360 80A6B5B0 86180034 */ lh $t8, 0x0034($s0) ## 00000034 @@ -239,8 +239,8 @@ glabel EnHorseNormal_Init .L80A6B6EC: /* 0049C 80A6B6EC 5441001C */ bnel $v0, $at, .L80A6B760 /* 004A0 80A6B6F0 2401005D */ addiu $at, $zero, 0x005D ## $at = 0000005D -/* 004A4 80A6B6F4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 004A8 80A6B6F8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 004A4 80A6B6F4 3C028016 */ lui $v0, %hi(gSaveContext) +/* 004A8 80A6B6F8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 004AC 80A6B6FC 8C490010 */ lw $t1, 0x0010($v0) ## 8015E670 /* 004B0 80A6B700 8FA4003C */ lw $a0, 0x003C($sp) /* 004B4 80A6B704 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B250.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B250.s index 15937e27c7..2d8621d1f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B250.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B250.s @@ -18,7 +18,7 @@ glabel func_80A6B250 /* 00040 80A6B290 4502001A */ bc1fl .L80A6B2FC /* 00044 80A6B294 8FBF0024 */ lw $ra, 0x0024($sp) /* 00048 80A6B298 14400008 */ bne $v0, $zero, .L80A6B2BC -/* 0004C 80A6B29C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 0004C 80A6B29C 3C078013 */ lui $a3, %hi(D_801333E0) /* 00050 80A6B2A0 8C790004 */ lw $t9, 0x0004($v1) ## 80A6D4C4 /* 00054 80A6B2A4 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 /* 00058 80A6B2A8 00000000 */ nop @@ -27,9 +27,9 @@ glabel func_80A6B250 /* 00064 80A6B2B4 00000000 */ nop /* 00068 80A6B2B8 4501000F */ bc1t .L80A6B2F8 .L80A6B2BC: -/* 0006C 80A6B2BC 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 00070 80A6B2C0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00074 80A6B2C4 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 +/* 0006C 80A6B2BC 3C088013 */ lui $t0, %hi(D_801333E8) +/* 00070 80A6B2C0 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00074 80A6B2C4 250833E8 */ addiu $t0, %lo(D_801333E8) /* 00078 80A6B2C8 AFA80014 */ sw $t0, 0x0014($sp) /* 0007C 80A6B2CC AFA70010 */ sw $a3, 0x0010($sp) /* 00080 80A6B2D0 24042803 */ addiu $a0, $zero, 0x2803 ## $a0 = 00002803 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B9D0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B9D0.s index f3f31e8a78..a922c43b5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B9D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B9D0.s @@ -15,14 +15,14 @@ glabel func_80A6B9D0 /* 007A0 80A6B9F0 0018C8C0 */ sll $t9, $t8, 3 /* 007A4 80A6B9F4 01D93021 */ addu $a2, $t6, $t9 /* 007A8 80A6B9F8 8CC30004 */ lw $v1, 0x0004($a2) ## 00000004 -/* 007AC 80A6B9FC 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 007AC 80A6B9FC 3C0B8016 */ lui $t3, %hi(gSegments) /* 007B0 80A6BA00 8C8D0324 */ lw $t5, 0x0324($a0) ## 00000324 /* 007B4 80A6BA04 00034100 */ sll $t0, $v1, 4 /* 007B8 80A6BA08 00084F02 */ srl $t1, $t0, 28 /* 007BC 80A6BA0C 00095080 */ sll $t2, $t1, 2 /* 007C0 80A6BA10 016A5821 */ addu $t3, $t3, $t2 /* 007C4 80A6BA14 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 007C8 80A6BA18 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 +/* 007C8 80A6BA18 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) /* 007CC 80A6BA1C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 007D0 80A6BA20 00616024 */ and $t4, $v1, $at /* 007D4 80A6BA24 000D7880 */ sll $t7, $t5, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BCEC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BCEC.s index 8327711746..e2e1363847 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BCEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BCEC.s @@ -6,10 +6,10 @@ glabel func_80A6BCEC /* 00AAC 80A6BCFC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00AB0 80A6BD00 00807025 */ or $t6, $a0, $zero ## $t6 = 00000000 /* 00AB4 80A6BD04 1441000C */ bne $v0, $at, .L80A6BD38 -/* 00AB8 80A6BD08 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00ABC 80A6BD0C 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 00AC0 80A6BD10 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00AC4 80A6BD14 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 00AB8 80A6BD08 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00ABC 80A6BD0C 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 00AC0 80A6BD10 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00AC4 80A6BD14 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 00AC8 80A6BD18 AFAF0014 */ sw $t7, 0x0014($sp) /* 00ACC 80A6BD1C AFA70010 */ sw $a3, 0x0010($sp) /* 00AD0 80A6BD20 24042804 */ addiu $a0, $zero, 0x2804 ## $a0 = 00002804 @@ -22,11 +22,11 @@ glabel func_80A6BCEC .L80A6BD38: /* 00AE8 80A6BD38 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 00AEC 80A6BD3C 1441000B */ bne $v0, $at, .L80A6BD6C -/* 00AF0 80A6BD40 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 00AF0 80A6BD40 3C078013 */ lui $a3, %hi(D_801333E0) /* 00AF4 80A6BD44 8FA50020 */ lw $a1, 0x0020($sp) -/* 00AF8 80A6BD48 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 00AFC 80A6BD4C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00B00 80A6BD50 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 00AF8 80A6BD48 3C188013 */ lui $t8, %hi(D_801333E8) +/* 00AFC 80A6BD4C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00B00 80A6BD50 271833E8 */ addiu $t8, %lo(D_801333E8) /* 00B04 80A6BD54 AFB80014 */ sw $t8, 0x0014($sp) /* 00B08 80A6BD58 AFA70010 */ sw $a3, 0x0010($sp) /* 00B0C 80A6BD5C 24042804 */ addiu $a0, $zero, 0x2804 ## $a0 = 00002804 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BD7C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BD7C.s index cf2db0cc22..29d461d339 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BD7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BD7C.s @@ -14,14 +14,14 @@ glabel func_80A6BD7C /* 00B5C 80A6BDAC 45020013 */ bc1fl .L80A6BDFC /* 00B60 80A6BDB0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00B64 80A6BDB4 948201E4 */ lhu $v0, 0x01E4($a0) ## 000001E4 -/* 00B68 80A6BDB8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00B6C 80A6BDBC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00B68 80A6BDB8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00B6C 80A6BDBC 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00B70 80A6BDC0 304E0001 */ andi $t6, $v0, 0x0001 ## $t6 = 00000000 /* 00B74 80A6BDC4 15C0000C */ bne $t6, $zero, .L80A6BDF8 /* 00B78 80A6BDC8 344F0001 */ ori $t7, $v0, 0x0001 ## $t7 = 00000001 /* 00B7C 80A6BDCC A48F01E4 */ sh $t7, 0x01E4($a0) ## 000001E4 -/* 00B80 80A6BDD0 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 00B84 80A6BDD4 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 00B80 80A6BDD0 3C188013 */ lui $t8, %hi(D_801333E8) +/* 00B84 80A6BDD4 271833E8 */ addiu $t8, %lo(D_801333E8) /* 00B88 80A6BDD8 AFB80014 */ sw $t8, 0x0014($sp) /* 00B8C 80A6BDDC AFA70010 */ sw $a3, 0x0010($sp) /* 00B90 80A6BDE0 2404282C */ addiu $a0, $zero, 0x282C ## $a0 = 0000282C @@ -43,14 +43,14 @@ glabel func_80A6BD7C /* 00BC4 80A6BE14 45020011 */ bc1fl .L80A6BE5C /* 00BC8 80A6BE18 8FBF0024 */ lw $ra, 0x0024($sp) /* 00BCC 80A6BE1C 960201E4 */ lhu $v0, 0x01E4($s0) ## 000001E4 -/* 00BD0 80A6BE20 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00BD4 80A6BE24 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00BD0 80A6BE20 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00BD4 80A6BE24 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00BD8 80A6BE28 30590002 */ andi $t9, $v0, 0x0002 ## $t9 = 00000000 /* 00BDC 80A6BE2C 1720000A */ bne $t9, $zero, .L80A6BE58 /* 00BE0 80A6BE30 34480002 */ ori $t0, $v0, 0x0002 ## $t0 = 00000002 -/* 00BE4 80A6BE34 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 +/* 00BE4 80A6BE34 3C098013 */ lui $t1, %hi(D_801333E8) /* 00BE8 80A6BE38 A60801E4 */ sh $t0, 0x01E4($s0) ## 000001E4 -/* 00BEC 80A6BE3C 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 +/* 00BEC 80A6BE3C 252933E8 */ addiu $t1, %lo(D_801333E8) /* 00BF0 80A6BE40 AFA90014 */ sw $t1, 0x0014($sp) /* 00BF4 80A6BE44 AFA70010 */ sw $a3, 0x0010($sp) /* 00BF8 80A6BE48 2404282B */ addiu $a0, $zero, 0x282B ## $a0 = 0000282B diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BE6C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BE6C.s index 10ffa12207..ec99a89712 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BE6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BE6C.s @@ -237,10 +237,10 @@ glabel func_80A6BE6C /* 00F4C 80A6C19C 316CFFFD */ andi $t4, $t3, 0xFFFD ## $t4 = 00000000 /* 00F50 80A6C1A0 1501000D */ bne $t0, $at, .L80A6C1D8 /* 00F54 80A6C1A4 A60C01E4 */ sh $t4, 0x01E4($s0) ## 000001E4 -/* 00F58 80A6C1A8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00F5C 80A6C1AC 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 -/* 00F60 80A6C1B0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00F64 80A6C1B4 25AD33E8 */ addiu $t5, $t5, 0x33E8 ## $t5 = 801333E8 +/* 00F58 80A6C1A8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00F5C 80A6C1AC 3C0D8013 */ lui $t5, %hi(D_801333E8) +/* 00F60 80A6C1B0 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00F64 80A6C1B4 25AD33E8 */ addiu $t5, %lo(D_801333E8) /* 00F68 80A6C1B8 AFAD0014 */ sw $t5, 0x0014($sp) /* 00F6C 80A6C1BC AFA70010 */ sw $a3, 0x0010($sp) /* 00F70 80A6C1C0 24042816 */ addiu $a0, $zero, 0x2816 ## $a0 = 00002816 @@ -253,10 +253,10 @@ glabel func_80A6BE6C .L80A6C1D8: /* 00F88 80A6C1D8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00F8C 80A6C1DC 1501000C */ bne $t0, $at, .L80A6C210 -/* 00F90 80A6C1E0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00F94 80A6C1E4 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 00F98 80A6C1E8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00F9C 80A6C1EC 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 +/* 00F90 80A6C1E0 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00F94 80A6C1E4 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 00F98 80A6C1E8 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00F9C 80A6C1EC 25CE33E8 */ addiu $t6, %lo(D_801333E8) /* 00FA0 80A6C1F0 AFAE0014 */ sw $t6, 0x0014($sp) /* 00FA4 80A6C1F4 AFA70010 */ sw $a3, 0x0010($sp) /* 00FA8 80A6C1F8 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 @@ -353,15 +353,15 @@ glabel func_80A6BE6C /* 010E8 80A6C338 960F01E4 */ lhu $t7, 0x01E4($s0) ## 000001E4 .L80A6C33C: /* 010EC 80A6C33C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 010F0 80A6C340 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 010F0 80A6C340 3C078013 */ lui $a3, %hi(D_801333E0) /* 010F4 80A6C344 31F9FFFE */ andi $t9, $t7, 0xFFFE ## $t9 = 00000000 /* 010F8 80A6C348 A61901E4 */ sh $t9, 0x01E4($s0) ## 000001E4 /* 010FC 80A6C34C 3329FFFD */ andi $t1, $t9, 0xFFFD ## $t1 = 00000000 /* 01100 80A6C350 1501000D */ bne $t0, $at, .L80A6C388 /* 01104 80A6C354 A60901E4 */ sh $t1, 0x01E4($s0) ## 000001E4 -/* 01108 80A6C358 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 0110C 80A6C35C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 01110 80A6C360 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 +/* 01108 80A6C358 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 0110C 80A6C35C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 01110 80A6C360 254A33E8 */ addiu $t2, %lo(D_801333E8) /* 01114 80A6C364 AFAA0014 */ sw $t2, 0x0014($sp) /* 01118 80A6C368 AFA70010 */ sw $a3, 0x0010($sp) /* 0111C 80A6C36C 24042816 */ addiu $a0, $zero, 0x2816 ## $a0 = 00002816 @@ -376,10 +376,10 @@ glabel func_80A6BE6C /* 01138 80A6C388 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 0113C 80A6C38C 1501000E */ bne $t0, $at, .L80A6C3C8 /* 01140 80A6C390 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01144 80A6C394 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01148 80A6C398 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 -/* 0114C 80A6C39C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 01150 80A6C3A0 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 +/* 01144 80A6C394 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01148 80A6C398 3C0B8013 */ lui $t3, %hi(D_801333E8) +/* 0114C 80A6C39C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 01150 80A6C3A0 256B33E8 */ addiu $t3, %lo(D_801333E8) /* 01154 80A6C3A4 AFAB0014 */ sw $t3, 0x0014($sp) /* 01158 80A6C3A8 AFA70010 */ sw $a3, 0x0010($sp) /* 0115C 80A6C3AC 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C570.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C570.s index dc5a16229f..34f0739bc6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C570.s @@ -32,20 +32,20 @@ glabel func_80A6C570 /* 01370 80A6C5C0 AE000150 */ sw $zero, 0x0150($s0) ## 00000150 .L80A6C5C4: /* 01374 80A6C5C4 C426D5D8 */ lwc1 $f6, %lo(D_80A6D5D8)($at) -/* 01378 80A6C5C8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0137C 80A6C5CC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01378 80A6C5C8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0137C 80A6C5CC 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01380 80A6C5D0 4606003C */ c.lt.s $f0, $f6 /* 01384 80A6C5D4 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 /* 01388 80A6C5D8 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 /* 0138C 80A6C5DC 26050204 */ addiu $a1, $s0, 0x0204 ## $a1 = 00000204 /* 01390 80A6C5E0 4500000F */ bc1f .L80A6C620 /* 01394 80A6C5E4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01398 80A6C5E8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 01398 80A6C5E8 3C078013 */ lui $a3, %hi(D_801333E0) /* 0139C 80A6C5EC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 013A0 80A6C5F0 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 013A4 80A6C5F4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 013A0 80A6C5F0 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 013A4 80A6C5F4 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 013A8 80A6C5F8 AE0E0150 */ sw $t6, 0x0150($s0) ## 00000150 -/* 013AC 80A6C5FC 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 013AC 80A6C5FC 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 013B0 80A6C600 AFAF0014 */ sw $t7, 0x0014($sp) /* 013B4 80A6C604 AFA70010 */ sw $a3, 0x0010($sp) /* 013B8 80A6C608 24042816 */ addiu $a0, $zero, 0x2816 ## $a0 = 00002816 @@ -56,9 +56,9 @@ glabel func_80A6C570 /* 013C8 80A6C618 10000007 */ beq $zero, $zero, .L80A6C638 /* 013CC 80A6C61C 00000000 */ nop .L80A6C620: -/* 013D0 80A6C620 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 +/* 013D0 80A6C620 3C198013 */ lui $t9, %hi(D_801333E8) /* 013D4 80A6C624 AE180150 */ sw $t8, 0x0150($s0) ## 00000150 -/* 013D8 80A6C628 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 013D8 80A6C628 273933E8 */ addiu $t9, %lo(D_801333E8) /* 013DC 80A6C62C AFB90014 */ sw $t9, 0x0014($sp) /* 013E0 80A6C630 0C03DCE3 */ jal Audio_PlaySoundGeneral diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C760.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C760.s index a7212207c0..eaee0a2c9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C760.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C760.s @@ -33,8 +33,8 @@ glabel func_80A6C760 /* 01564 80A6C7B4 AE000150 */ sw $zero, 0x0150($s0) ## 00000150 .L80A6C7B8: /* 01568 80A6C7B8 C426D5E0 */ lwc1 $f6, %lo(D_80A6D5E0)($at) -/* 0156C 80A6C7BC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01570 80A6C7C0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 0156C 80A6C7BC 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01570 80A6C7C0 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01574 80A6C7C4 4606003C */ c.lt.s $f0, $f6 /* 01578 80A6C7C8 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 /* 0157C 80A6C7CC 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 @@ -42,14 +42,14 @@ glabel func_80A6C760 /* 01584 80A6C7D4 45000012 */ bc1f .L80A6C820 /* 01588 80A6C7D8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 0158C 80A6C7DC 960F01E4 */ lhu $t7, 0x01E4($s0) ## 000001E4 -/* 01590 80A6C7E0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 01590 80A6C7E0 3C078013 */ lui $a3, %hi(D_801333E0) /* 01594 80A6C7E4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 01598 80A6C7E8 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 +/* 01598 80A6C7E8 3C198013 */ lui $t9, %hi(D_801333E8) /* 0159C 80A6C7EC 35F80020 */ ori $t8, $t7, 0x0020 ## $t8 = 00000020 -/* 015A0 80A6C7F0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 015A0 80A6C7F0 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 015A4 80A6C7F4 AE0E0150 */ sw $t6, 0x0150($s0) ## 00000150 /* 015A8 80A6C7F8 A61801E4 */ sh $t8, 0x01E4($s0) ## 000001E4 -/* 015AC 80A6C7FC 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 015AC 80A6C7FC 273933E8 */ addiu $t9, %lo(D_801333E8) /* 015B0 80A6C800 AFB90014 */ sw $t9, 0x0014($sp) /* 015B4 80A6C804 AFA70010 */ sw $a3, 0x0010($sp) /* 015B8 80A6C808 24042816 */ addiu $a0, $zero, 0x2816 ## $a0 = 00002816 @@ -61,11 +61,11 @@ glabel func_80A6C760 /* 015CC 80A6C81C 00000000 */ nop .L80A6C820: /* 015D0 80A6C820 960901E4 */ lhu $t1, 0x01E4($s0) ## 000001E4 -/* 015D4 80A6C824 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 +/* 015D4 80A6C824 3C0B8013 */ lui $t3, %hi(D_801333E8) /* 015D8 80A6C828 AE080150 */ sw $t0, 0x0150($s0) ## 00000150 /* 015DC 80A6C82C 352A0020 */ ori $t2, $t1, 0x0020 ## $t2 = 00000020 /* 015E0 80A6C830 A60A01E4 */ sh $t2, 0x01E4($s0) ## 000001E4 -/* 015E4 80A6C834 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 +/* 015E4 80A6C834 256B33E8 */ addiu $t3, %lo(D_801333E8) /* 015E8 80A6C838 AFAB0014 */ sw $t3, 0x0014($sp) /* 015EC 80A6C83C 0C03DCE3 */ jal Audio_PlaySoundGeneral diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6CC88.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6CC88.s index 3fcb97b0a9..7d92acb5d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6CC88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6CC88.s @@ -40,14 +40,14 @@ glabel func_80A6CC88 /* 01AD0 80A6CD20 45000012 */ bc1f .L80A6CD6C /* 01AD4 80A6CD24 00000000 */ nop /* 01AD8 80A6CD28 960201E4 */ lhu $v0, 0x01E4($s0) ## 000001E4 -/* 01ADC 80A6CD2C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01AE0 80A6CD30 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01ADC 80A6CD2C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01AE0 80A6CD30 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01AE4 80A6CD34 30590008 */ andi $t9, $v0, 0x0008 ## $t9 = 00000000 /* 01AE8 80A6CD38 1720000C */ bne $t9, $zero, .L80A6CD6C /* 01AEC 80A6CD3C 34480008 */ ori $t0, $v0, 0x0008 ## $t0 = 00000008 /* 01AF0 80A6CD40 A60801E4 */ sh $t0, 0x01E4($s0) ## 000001E4 -/* 01AF4 80A6CD44 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 01AF8 80A6CD48 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 +/* 01AF4 80A6CD44 3C098013 */ lui $t1, %hi(D_801333E8) +/* 01AF8 80A6CD48 252933E8 */ addiu $t1, %lo(D_801333E8) /* 01AFC 80A6CD4C AFA90014 */ sw $t1, 0x0014($sp) /* 01B00 80A6CD50 AFA70010 */ sw $a3, 0x0010($sp) /* 01B04 80A6CD54 8FA50034 */ lw $a1, 0x0034($sp) @@ -67,14 +67,14 @@ glabel func_80A6CC88 /* 01B34 80A6CD84 45000012 */ bc1f .L80A6CDD0 /* 01B38 80A6CD88 00000000 */ nop /* 01B3C 80A6CD8C 960201E4 */ lhu $v0, 0x01E4($s0) ## 000001E4 -/* 01B40 80A6CD90 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01B44 80A6CD94 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01B40 80A6CD90 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01B44 80A6CD94 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01B48 80A6CD98 304A0010 */ andi $t2, $v0, 0x0010 ## $t2 = 00000000 /* 01B4C 80A6CD9C 1540000C */ bne $t2, $zero, .L80A6CDD0 /* 01B50 80A6CDA0 344B0010 */ ori $t3, $v0, 0x0010 ## $t3 = 00000010 /* 01B54 80A6CDA4 A60B01E4 */ sh $t3, 0x01E4($s0) ## 000001E4 -/* 01B58 80A6CDA8 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 01B5C 80A6CDAC 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 +/* 01B58 80A6CDA8 3C0C8013 */ lui $t4, %hi(D_801333E8) +/* 01B5C 80A6CDAC 258C33E8 */ addiu $t4, %lo(D_801333E8) /* 01B60 80A6CDB0 AFAC0014 */ sw $t4, 0x0014($sp) /* 01B64 80A6CDB4 AFA70010 */ sw $a3, 0x0010($sp) /* 01B68 80A6CDB8 8FA50034 */ lw $a1, 0x0034($sp) @@ -88,14 +88,14 @@ glabel func_80A6CC88 /* 01B80 80A6CDD0 14830011 */ bne $a0, $v1, .L80A6CE18 /* 01B84 80A6CDD4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 01B88 80A6CDD8 960201E4 */ lhu $v0, 0x01E4($s0) ## 000001E4 -/* 01B8C 80A6CDDC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01B90 80A6CDE0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01B8C 80A6CDDC 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01B90 80A6CDE0 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01B94 80A6CDE4 304D0020 */ andi $t5, $v0, 0x0020 ## $t5 = 00000000 /* 01B98 80A6CDE8 11A0000B */ beq $t5, $zero, .L80A6CE18 /* 01B9C 80A6CDEC 304EFFDF */ andi $t6, $v0, 0xFFDF ## $t6 = 00000000 -/* 01BA0 80A6CDF0 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 +/* 01BA0 80A6CDF0 3C0F8013 */ lui $t7, %hi(D_801333E8) /* 01BA4 80A6CDF4 A60E01E4 */ sh $t6, 0x01E4($s0) ## 000001E4 -/* 01BA8 80A6CDF8 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 01BA8 80A6CDF8 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 01BAC 80A6CDFC AFAF0014 */ sw $t7, 0x0014($sp) /* 01BB0 80A6CE00 AFA70010 */ sw $a3, 0x0010($sp) /* 01BB4 80A6CE04 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 @@ -108,14 +108,14 @@ glabel func_80A6CC88 /* 01BC8 80A6CE18 54610010 */ bnel $v1, $at, .L80A6CE5C /* 01BCC 80A6CE1C 8FBF0024 */ lw $ra, 0x0024($sp) /* 01BD0 80A6CE20 960201E4 */ lhu $v0, 0x01E4($s0) ## 000001E4 -/* 01BD4 80A6CE24 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01BD8 80A6CE28 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01BD4 80A6CE24 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01BD8 80A6CE28 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01BDC 80A6CE2C 30580020 */ andi $t8, $v0, 0x0020 ## $t8 = 00000000 /* 01BE0 80A6CE30 13000009 */ beq $t8, $zero, .L80A6CE58 /* 01BE4 80A6CE34 3059FFDF */ andi $t9, $v0, 0xFFDF ## $t9 = 00000000 -/* 01BE8 80A6CE38 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 +/* 01BE8 80A6CE38 3C088013 */ lui $t0, %hi(D_801333E8) /* 01BEC 80A6CE3C A61901E4 */ sh $t9, 0x01E4($s0) ## 000001E4 -/* 01BF0 80A6CE40 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 +/* 01BF0 80A6CE40 250833E8 */ addiu $t0, %lo(D_801333E8) /* 01BF4 80A6CE44 AFA80014 */ sw $t0, 0x0014($sp) /* 01BF8 80A6CE48 AFA70010 */ sw $a3, 0x0010($sp) /* 01BFC 80A6CE4C 24042816 */ addiu $a0, $zero, 0x2816 ## $a0 = 00002816 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s index ccaeedfa74..a9f81b0741 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s @@ -16,8 +16,8 @@ glabel EnHorseZelda_Init /* 00240 80A6DB10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00244 80A6DB14 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 /* 00248 80A6DB18 44812000 */ mtc1 $at, $f4 ## $f4 = -3.50 -/* 0024C 80A6DB1C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00250 80A6DB20 24C6B644 */ addiu $a2, $a2, 0xB644 ## $a2 = 8002B644 +/* 0024C 80A6DB1C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Squiggly) +/* 00250 80A6DB20 24C6B644 */ addiu $a2, %lo(ActorShadow_DrawFunc_Squiggly) /* 00254 80A6DB24 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00258 80A6DB28 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0025C 80A6DB2C 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DD14.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DD14.s index 9b11a1b647..1340fa1b6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DD14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DD14.s @@ -9,11 +9,11 @@ glabel func_80A6DD14 /* 00460 80A6DD30 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 00464 80A6DD34 46062203 */ div.s $f8, $f4, $f6 /* 00468 80A6DD38 AC800150 */ sw $zero, 0x0150($a0) ## 00000150 -/* 0046C 80A6DD3C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00470 80A6DD40 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 00474 80A6DD44 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 0046C 80A6DD3C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00470 80A6DD40 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 00474 80A6DD44 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00478 80A6DD48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0047C 80A6DD4C 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 0047C 80A6DD4C 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 00480 80A6DD50 AFAF0014 */ sw $t7, 0x0014($sp) /* 00484 80A6DD54 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 00488 80A6DD58 24042804 */ addiu $a0, $zero, 0x2804 ## $a0 = 00002804 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s index cf7c591e5e..21892b7d19 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s @@ -18,8 +18,8 @@ glabel EnHs_Init /* 00010 80A6E3B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00014 80A6E3B4 AFBF002C */ sw $ra, 0x002C($sp) /* 00018 80A6E3B8 AFA50044 */ sw $a1, 0x0044($sp) -/* 0001C 80A6E3BC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00020 80A6E3C0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0001C 80A6E3BC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00020 80A6E3C0 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00024 80A6E3C4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00028 80A6E3C8 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 0002C 80A6E3CC 0C00AC78 */ jal ActorShape_Init @@ -62,8 +62,8 @@ glabel EnHs_Init /* 000B4 80A6E454 0C00B58B */ jal Actor_SetScale /* 000B8 80A6E458 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000BC 80A6E45C 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 000C0 80A6E460 8D08E664 */ lw $t0, -0x199C($t0) ## 8015E664 +/* 000BC 80A6E45C 3C088016 */ lui $t0, %hi(gSaveContext+4) +/* 000C0 80A6E460 8D08E664 */ lw $t0, %lo(gSaveContext+4)($t0) /* 000C4 80A6E464 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 000C8 80A6E468 3C0480A7 */ lui $a0, %hi(D_80A6EE48) ## $a0 = 80A70000 /* 000CC 80A6E46C 51000004 */ beql $t0, $zero, .L80A6E480 @@ -84,8 +84,8 @@ glabel EnHs_Init /* 00100 80A6E4A0 24A5E9AC */ addiu $a1, $a1, %lo(func_80A6E9AC) ## $a1 = 80A6E9AC /* 00104 80A6E4A4 0C29B8E8 */ jal func_80A6E3A0 /* 00108 80A6E4A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0010C 80A6E4AC 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 00110 80A6E4B0 956BF556 */ lhu $t3, -0x0AAA($t3) ## 8015F556 +/* 0010C 80A6E4AC 3C0B8016 */ lui $t3, %hi(gSaveContext+0xef6) +/* 00110 80A6E4B0 956BF556 */ lhu $t3, %lo(gSaveContext+0xef6)($t3) /* 00114 80A6E4B4 3C0480A7 */ lui $a0, %hi(D_80A6EE30) ## $a0 = 80A70000 /* 00118 80A6E4B8 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 /* 0011C 80A6E4BC 5180000E */ beql $t4, $zero, .L80A6E4F8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E630.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E630.s index 24fd5b2fb0..0fede38af0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E630.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E630.s @@ -18,8 +18,8 @@ glabel func_80A6E630 /* 002D0 80A6E670 24A5E6B0 */ addiu $a1, $a1, %lo(func_80A6E6B0) ## $a1 = 80A6E6B0 /* 002D4 80A6E674 0C29B8E8 */ jal func_80A6E3A0 /* 002D8 80A6E678 8FA40018 */ lw $a0, 0x0018($sp) -/* 002DC 80A6E67C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 002E0 80A6E680 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 002DC 80A6E67C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 002E0 80A6E680 2442E660 */ addiu $v0, %lo(gSaveContext) /* 002E4 80A6E684 944E13FC */ lhu $t6, 0x13FC($v0) ## 8015FA5C /* 002E8 80A6E688 31CFFFFE */ andi $t7, $t6, 0xFFFE ## $t7 = 00000000 /* 002EC 80A6E68C A44F13FC */ sh $t7, 0x13FC($v0) ## 8015FA5C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s index a1222630cc..61b5bc5f4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s @@ -10,8 +10,8 @@ glabel EnHs2_Init /* 00008 80A6EFA8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0000C 80A6EFAC AFBF002C */ sw $ra, 0x002C($sp) /* 00010 80A6EFB0 AFA50044 */ sw $a1, 0x0044($sp) -/* 00014 80A6EFB4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00018 80A6EFB8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00014 80A6EFB4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00018 80A6EFB8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0001C 80A6EFBC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00020 80A6EFC0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00024 80A6EFC4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Update.s index 7357b2e608..98a0c09dba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Update.s @@ -20,10 +20,10 @@ glabel EnHy_Update /* 02074 80A71624 8D0817B4 */ lw $t0, 0x17B4($t0) ## 000117B4 /* 02078 80A71628 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0207C 80A7162C 01014821 */ addu $t1, $t0, $at -/* 02080 80A71630 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 02080 80A71630 3C018016 */ lui $at, %hi(gSegments+0x18) /* 02084 80A71634 0C02927F */ jal SkelAnime_FrameUpdateMatrix -/* 02088 80A71638 AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 +/* 02088 80A71638 AC296FC0 */ sw $t1, %lo(gSegments+0x18)($at) /* 0208C 80A7163C 0C29C169 */ jal func_80A705A4 /* 02090 80A71640 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02094 80A71644 860A01E8 */ lh $t2, 0x01E8($s0) ## 000001E8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F810.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F810.s index 4c482314de..e6ac895ec6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F810.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F810.s @@ -68,8 +68,8 @@ glabel L80A6F8A0 /* 002F8 80A6F8A8 54410014 */ bnel $v0, $at, .L80A6F8FC /* 002FC 80A6F8AC 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 /* 00300 80A6F8B0 94C90330 */ lhu $t1, 0x0330($a2) ## 00000330 -/* 00304 80A6F8B4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00308 80A6F8B8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00304 80A6F8B4 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00308 80A6F8B8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0030C 80A6F8BC 312A0800 */ andi $t2, $t1, 0x0800 ## $t2 = 00000000 /* 00310 80A6F8C0 11400003 */ beq $t2, $zero, .L80A6F8D0 /* 00314 80A6F8C4 2403508D */ addiu $v1, $zero, 0x508D ## $v1 = 0000508D @@ -90,8 +90,8 @@ glabel L80A6F8A0 /* 00348 80A6F8F8 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 .L80A6F8FC: /* 0034C 80A6F8FC 1441000C */ bne $v0, $at, .L80A6F930 -/* 00350 80A6F900 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00354 80A6F904 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00350 80A6F900 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00354 80A6F904 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00358 80A6F908 944D1400 */ lhu $t5, 0x1400($v0) ## 8015FA60 /* 0035C 80A6F90C 2403709C */ addiu $v1, $zero, 0x709C ## $v1 = 0000709C /* 00360 80A6F910 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 @@ -104,8 +104,8 @@ glabel L80A6F8A0 /* 00378 80A6F928 100001C7 */ beq $zero, $zero, .L80A70048 /* 0037C 80A6F92C 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 0000709B .L80A6F930: -/* 00380 80A6F930 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00384 80A6F934 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00380 80A6F930 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00384 80A6F934 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00388 80A6F938 904F141C */ lbu $t7, 0x141C($v0) ## 8015FA7C /* 0038C 80A6F93C 11E00013 */ beq $t7, $zero, .L80A6F98C /* 00390 80A6F940 00000000 */ nop @@ -133,8 +133,8 @@ glabel L80A6F8A0 /* 003DC 80A6F98C 100001AE */ beq $zero, $zero, .L80A70048 /* 003E0 80A6F990 240270A0 */ addiu $v0, $zero, 0x70A0 ## $v0 = 000070A0 glabel L80A6F994 -/* 003E4 80A6F994 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 003E8 80A6F998 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 003E4 80A6F994 3C028016 */ lui $v0, %hi(gSaveContext) +/* 003E8 80A6F998 2442E660 */ addiu $v0, %lo(gSaveContext) /* 003EC 80A6F99C 94580EE4 */ lhu $t8, 0x0EE4($v0) ## 8015F544 /* 003F0 80A6F9A0 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000001 /* 003F4 80A6F9A4 5320000C */ beql $t9, $zero, .L80A6F9D8 @@ -176,8 +176,8 @@ glabel L80A6F9FC /* 00470 80A6FA20 10000189 */ beq $zero, $zero, .L80A70048 /* 00474 80A6FA24 24025085 */ addiu $v0, $zero, 0x5085 ## $v0 = 00005085 .L80A6FA28: -/* 00478 80A6FA28 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0047C 80A6FA2C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00478 80A6FA28 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0047C 80A6FA2C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00480 80A6FA30 944C0EE4 */ lhu $t4, 0x0EE4($v0) ## 8015F544 /* 00484 80A6FA34 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 /* 00488 80A6FA38 51A0000C */ beql $t5, $zero, .L80A6FA6C @@ -216,8 +216,8 @@ glabel L80A6F9FC /* 004F8 80A6FAA8 10000167 */ beq $zero, $zero, .L80A70048 /* 004FC 80A6FAAC 2402701A */ addiu $v0, $zero, 0x701A ## $v0 = 0000701A glabel L80A6FAB0 -/* 00500 80A6FAB0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00504 80A6FAB4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00500 80A6FAB0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00504 80A6FAB4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00508 80A6FAB8 944A0EE4 */ lhu $t2, 0x0EE4($v0) ## 8015F544 /* 0050C 80A6FABC 24037001 */ addiu $v1, $zero, 0x7001 ## $v1 = 00007001 /* 00510 80A6FAC0 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 @@ -238,8 +238,8 @@ glabel L80A6FAB0 /* 00544 80A6FAF4 10000154 */ beq $zero, $zero, .L80A70048 /* 00548 80A6FAF8 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00007001 glabel L80A6FAFC -/* 0054C 80A6FAFC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00550 80A6FB00 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0054C 80A6FAFC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00550 80A6FB00 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00554 80A6FB04 944E0EE4 */ lhu $t6, 0x0EE4($v0) ## 8015F544 /* 00558 80A6FB08 2403704B */ addiu $v1, $zero, 0x704B ## $v1 = 0000704B /* 0055C 80A6FB0C 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 @@ -265,8 +265,8 @@ glabel L80A6FB48 /* 005A0 80A6FB50 1000013D */ beq $zero, $zero, .L80A70048 /* 005A4 80A6FB54 2402700C */ addiu $v0, $zero, 0x700C ## $v0 = 0000700C glabel L80A6FB58 -/* 005A8 80A6FB58 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 005AC 80A6FB5C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 005A8 80A6FB58 3C028016 */ lui $v0, %hi(gSaveContext) +/* 005AC 80A6FB5C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 005B0 80A6FB60 94490EE4 */ lhu $t1, 0x0EE4($v0) ## 8015F544 /* 005B4 80A6FB64 2403704A */ addiu $v1, $zero, 0x704A ## $v1 = 0000704A /* 005B8 80A6FB68 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 @@ -300,8 +300,8 @@ glabel L80A6FBA4 /* 00618 80A6FBC8 1000011F */ beq $zero, $zero, .L80A70048 /* 0061C 80A6FBCC 24025087 */ addiu $v0, $zero, 0x5087 ## $v0 = 00005087 .L80A6FBD0: -/* 00620 80A6FBD0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00624 80A6FBD4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00620 80A6FBD0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00624 80A6FBD4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00628 80A6FBD8 944D0EE4 */ lhu $t5, 0x0EE4($v0) ## 8015F544 /* 0062C 80A6FBDC 2403704D */ addiu $v1, $zero, 0x704D ## $v1 = 0000704D /* 00630 80A6FBE0 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 @@ -322,8 +322,8 @@ glabel L80A6FBA4 /* 00664 80A6FC14 1000010C */ beq $zero, $zero, .L80A70048 /* 00668 80A6FC18 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00007028 glabel L80A6FC1C -/* 0066C 80A6FC1C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00670 80A6FC20 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0066C 80A6FC1C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00670 80A6FC20 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00674 80A6FC24 94590EE4 */ lhu $t9, 0x0EE4($v0) ## 8015F544 /* 00678 80A6FC28 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 /* 0067C 80A6FC2C 5100000C */ beql $t0, $zero, .L80A6FC60 @@ -356,8 +356,8 @@ glabel L80A6FC84 /* 006D8 80A6FC88 2401002A */ addiu $at, $zero, 0x002A ## $at = 0000002A /* 006DC 80A6FC8C 5441000E */ bnel $v0, $at, .L80A6FCC8 /* 006E0 80A6FC90 24010052 */ addiu $at, $zero, 0x0052 ## $at = 00000052 -/* 006E4 80A6FC94 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 006E8 80A6FC98 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 006E4 80A6FC94 3C028016 */ lui $v0, %hi(gSaveContext) +/* 006E8 80A6FC98 2442E660 */ addiu $v0, %lo(gSaveContext) /* 006EC 80A6FC9C 944D0EE8 */ lhu $t5, 0x0EE8($v0) ## 8015F548 /* 006F0 80A6FCA0 24035081 */ addiu $v1, $zero, 0x5081 ## $v1 = 00005081 /* 006F4 80A6FCA4 31AE0400 */ andi $t6, $t5, 0x0400 ## $t6 = 00000000 @@ -372,11 +372,11 @@ glabel L80A6FC84 /* 00714 80A6FCC4 24010052 */ addiu $at, $zero, 0x0052 ## $at = 00000052 .L80A6FCC8: /* 00718 80A6FCC8 1441000E */ bne $v0, $at, .L80A6FD04 -/* 0071C 80A6FCCC 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 00720 80A6FCD0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00724 80A6FCD4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0071C 80A6FCCC 3C0F8012 */ lui $t7, %hi(gBitFlags+0x10) +/* 00720 80A6FCD0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00724 80A6FCD4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00728 80A6FCD8 8C5800A4 */ lw $t8, 0x00A4($v0) ## 8015E704 -/* 0072C 80A6FCDC 8DEF7130 */ lw $t7, 0x7130($t7) ## 80127130 +/* 0072C 80A6FCDC 8DEF7130 */ lw $t7, %lo(gBitFlags+0x10)($t7) /* 00730 80A6FCE0 2403507F */ addiu $v1, $zero, 0x507F ## $v1 = 0000507F /* 00734 80A6FCE4 01F8C824 */ and $t9, $t7, $t8 /* 00738 80A6FCE8 13200004 */ beq $t9, $zero, .L80A6FCFC @@ -388,8 +388,8 @@ glabel L80A6FC84 /* 0074C 80A6FCFC 100000D2 */ beq $zero, $zero, .L80A70048 /* 00750 80A6FD00 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00005080 .L80A6FD04: -/* 00754 80A6FD04 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00758 80A6FD08 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00754 80A6FD04 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00758 80A6FD08 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0075C 80A6FD0C 94480EE4 */ lhu $t0, 0x0EE4($v0) ## 8015F544 /* 00760 80A6FD10 24037049 */ addiu $v1, $zero, 0x7049 ## $v1 = 00007049 /* 00764 80A6FD14 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 @@ -414,8 +414,8 @@ glabel L80A6FD50 /* 007A4 80A6FD54 24010037 */ addiu $at, $zero, 0x0037 ## $at = 00000037 /* 007A8 80A6FD58 5441000E */ bnel $v0, $at, .L80A6FD94 /* 007AC 80A6FD5C 24010052 */ addiu $at, $zero, 0x0052 ## $at = 00000052 -/* 007B0 80A6FD60 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 007B4 80A6FD64 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 007B0 80A6FD60 3C028016 */ lui $v0, %hi(gSaveContext) +/* 007B4 80A6FD64 2442E660 */ addiu $v0, %lo(gSaveContext) /* 007B8 80A6FD68 944C0EE8 */ lhu $t4, 0x0EE8($v0) ## 8015F548 /* 007BC 80A6FD6C 2403507D */ addiu $v1, $zero, 0x507D ## $v1 = 0000507D /* 007C0 80A6FD70 318D0400 */ andi $t5, $t4, 0x0400 ## $t5 = 00000000 @@ -430,11 +430,11 @@ glabel L80A6FD50 /* 007E0 80A6FD90 24010052 */ addiu $at, $zero, 0x0052 ## $at = 00000052 .L80A6FD94: /* 007E4 80A6FD94 1441000E */ bne $v0, $at, .L80A6FDD0 -/* 007E8 80A6FD98 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 007EC 80A6FD9C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 007F0 80A6FDA0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 007E8 80A6FD98 3C0E8012 */ lui $t6, %hi(gBitFlags+0x10) +/* 007EC 80A6FD9C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 007F0 80A6FDA0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 007F4 80A6FDA4 8C4F00A4 */ lw $t7, 0x00A4($v0) ## 8015E704 -/* 007F8 80A6FDA8 8DCE7130 */ lw $t6, 0x7130($t6) ## 80127130 +/* 007F8 80A6FDA8 8DCE7130 */ lw $t6, %lo(gBitFlags+0x10)($t6) /* 007FC 80A6FDAC 2403507B */ addiu $v1, $zero, 0x507B ## $v1 = 0000507B /* 00800 80A6FDB0 01CFC024 */ and $t8, $t6, $t7 /* 00804 80A6FDB4 13000004 */ beq $t8, $zero, .L80A6FDC8 @@ -446,8 +446,8 @@ glabel L80A6FD50 /* 00818 80A6FDC8 1000009F */ beq $zero, $zero, .L80A70048 /* 0081C 80A6FDCC 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 0000507C .L80A6FDD0: -/* 00820 80A6FDD0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00824 80A6FDD4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00820 80A6FDD0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00824 80A6FDD4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00828 80A6FDD8 94590EE4 */ lhu $t9, 0x0EE4($v0) ## 8015F544 /* 0082C 80A6FDDC 24037046 */ addiu $v1, $zero, 0x7046 ## $v1 = 00007046 /* 00830 80A6FDE0 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 @@ -468,8 +468,8 @@ glabel L80A6FD50 /* 00864 80A6FE14 1000008C */ beq $zero, $zero, .L80A70048 /* 00868 80A6FE18 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00007019 glabel L80A6FE1C -/* 0086C 80A6FE1C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00870 80A6FE20 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0086C 80A6FE1C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00870 80A6FE20 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00874 80A6FE24 944B0F08 */ lhu $t3, 0x0F08($v0) ## 8015F568 /* 00878 80A6FE28 24037014 */ addiu $v1, $zero, 0x7014 ## $v1 = 00007014 /* 0087C 80A6FE2C 316C0800 */ andi $t4, $t3, 0x0800 ## $t4 = 00000000 @@ -492,11 +492,11 @@ glabel L80A6FE1C glabel L80A6FE68 /* 008B8 80A6FE68 848F00A4 */ lh $t7, 0x00A4($a0) ## 000000A4 /* 008BC 80A6FE6C 24010052 */ addiu $at, $zero, 0x0052 ## $at = 00000052 -/* 008C0 80A6FE70 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 008C0 80A6FE70 3C028016 */ lui $v0, %hi(gSaveContext) /* 008C4 80A6FE74 15E1000C */ bne $t7, $at, .L80A6FEA8 -/* 008C8 80A6FE78 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 008CC 80A6FE7C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 008D0 80A6FE80 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 008C8 80A6FE78 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 008CC 80A6FE7C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 008D0 80A6FE80 2442E660 */ addiu $v0, %lo(gSaveContext) /* 008D4 80A6FE84 8C580010 */ lw $t8, 0x0010($v0) ## 8015E670 /* 008D8 80A6FE88 24035083 */ addiu $v1, $zero, 0x5083 ## $v1 = 00005083 /* 008DC 80A6FE8C 13000004 */ beq $t8, $zero, .L80A6FEA0 @@ -532,8 +532,8 @@ glabel L80A6FEE8 /* 00938 80A6FEE8 10000057 */ beq $zero, $zero, .L80A70048 /* 0093C 80A6FEEC 2402700E */ addiu $v0, $zero, 0x700E ## $v0 = 0000700E glabel L80A6FEF0 -/* 00940 80A6FEF0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00944 80A6FEF4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00940 80A6FEF0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00944 80A6FEF4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00948 80A6FEF8 8C490004 */ lw $t1, 0x0004($v0) ## 8015E664 /* 0094C 80A6FEFC 51200019 */ beql $t1, $zero, .L80A6FF64 /* 00950 80A6FF00 8C4F0010 */ lw $t7, 0x0010($v0) ## 8015E670 @@ -582,8 +582,8 @@ glabel L80A6FEF0 /* 009E4 80A6FF94 1000002C */ beq $zero, $zero, .L80A70048 /* 009E8 80A6FF98 24025058 */ addiu $v0, $zero, 0x5058 ## $v0 = 00005058 glabel L80A6FF9C -/* 009EC 80A6FF9C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 009F0 80A6FFA0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 009EC 80A6FF9C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 009F0 80A6FFA0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 009F4 80A6FFA4 8C480004 */ lw $t0, 0x0004($v0) ## 8015E664 /* 009F8 80A6FFA8 51000013 */ beql $t0, $zero, .L80A6FFF8 /* 009FC 80A6FFAC 94CD0330 */ lhu $t5, 0x0330($a2) ## 00000330 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70058.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70058.s index a336897f38..03d15ff6f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70058.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70058.s @@ -107,22 +107,22 @@ glabel L80A700D8 /* 00B6C 80A7011C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80A70120: /* 00B70 80A70120 806D0215 */ lb $t5, 0x0215($v1) ## 00000215 -/* 00B74 80A70124 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00B78 80A70128 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00B74 80A70124 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00B78 80A70128 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00B7C 80A7012C 15A0001E */ bne $t5, $zero, .L80A701A8 /* 00B80 80A70130 2401709F */ addiu $at, $zero, 0x709F ## $at = 0000709F /* 00B84 80A70134 14410003 */ bne $v0, $at, .L80A70144 -/* 00B88 80A70138 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 +/* 00B88 80A70138 3C058013 */ lui $a1, %hi(D_801333D4) /* 00B8C 80A7013C 10000002 */ beq $zero, $zero, .L80A70148 /* 00B90 80A70140 24104802 */ addiu $s0, $zero, 0x4802 ## $s0 = 00004802 .L80A70144: /* 00B94 80A70144 24104806 */ addiu $s0, $zero, 0x4806 ## $s0 = 00004806 .L80A70148: -/* 00B98 80A70148 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 00B9C 80A7014C 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 +/* 00B98 80A70148 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 00B9C 80A7014C 25CE33E8 */ addiu $t6, %lo(D_801333E8) /* 00BA0 80A70150 AFAE0014 */ sw $t6, 0x0014($sp) /* 00BA4 80A70154 3204FFFF */ andi $a0, $s0, 0xFFFF ## $a0 = 00004806 -/* 00BA8 80A70158 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00BA8 80A70158 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00BAC 80A7015C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 00BB0 80A70160 0C03DCE3 */ jal Audio_PlaySoundGeneral @@ -170,19 +170,19 @@ glabel L80A701B0 .L80A701F8: /* 00C48 80A701F8 240170A4 */ addiu $at, $zero, 0x70A4 ## $at = 000070A4 /* 00C4C 80A701FC 12010097 */ beq $s0, $at, .L80A7045C -/* 00C50 80A70200 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00C50 80A70200 3C028016 */ lui $v0, %hi(gSaveContext) /* 00C54 80A70204 100000E2 */ beq $zero, $zero, .L80A70590 /* 00C58 80A70208 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A7020C: /* 00C5C 80A7020C 24017048 */ addiu $at, $zero, 0x7048 ## $at = 00007048 /* 00C60 80A70210 1201007E */ beq $s0, $at, .L80A7040C -/* 00C64 80A70214 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00C64 80A70214 3C028016 */ lui $v0, %hi(gSaveContext) /* 00C68 80A70218 2401709E */ addiu $at, $zero, 0x709E ## $at = 0000709E /* 00C6C 80A7021C 120100BE */ beq $s0, $at, .L80A70518 -/* 00C70 80A70220 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00C70 80A70220 3C028016 */ lui $v0, %hi(gSaveContext) /* 00C74 80A70224 2401709F */ addiu $at, $zero, 0x709F ## $at = 0000709F /* 00C78 80A70228 120100BF */ beq $s0, $at, .L80A70528 -/* 00C7C 80A7022C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00C7C 80A7022C 3C028016 */ lui $v0, %hi(gSaveContext) /* 00C80 80A70230 100000D7 */ beq $zero, $zero, .L80A70590 /* 00C84 80A70234 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A70238: @@ -191,10 +191,10 @@ glabel L80A701B0 /* 00C90 80A70240 260A8FEA */ addiu $t2, $s0, 0x8FEA ## $t2 = FFFF8FEB /* 00C94 80A70244 24017045 */ addiu $at, $zero, 0x7045 ## $at = 00007045 /* 00C98 80A70248 1201003A */ beq $s0, $at, .L80A70334 -/* 00C9C 80A7024C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00C9C 80A7024C 3C028016 */ lui $v0, %hi(gSaveContext) /* 00CA0 80A70250 24017047 */ addiu $at, $zero, 0x7047 ## $at = 00007047 /* 00CA4 80A70254 12010044 */ beq $s0, $at, .L80A70368 -/* 00CA8 80A70258 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00CA8 80A70258 3C028016 */ lui $v0, %hi(gSaveContext) /* 00CAC 80A7025C 100000CC */ beq $zero, $zero, .L80A70590 /* 00CB0 80A70260 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A70264: @@ -214,7 +214,7 @@ glabel L80A701B0 /* 00CE4 80A70294 14200005 */ bne $at, $zero, .L80A702AC /* 00CE8 80A70298 2401508B */ addiu $at, $zero, 0x508B ## $at = 0000508B /* 00CEC 80A7029C 12010098 */ beq $s0, $at, .L80A70500 -/* 00CF0 80A702A0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00CF0 80A702A0 3C028016 */ lui $v0, %hi(gSaveContext) /* 00CF4 80A702A4 100000BA */ beq $zero, $zero, .L80A70590 /* 00CF8 80A702A8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A702AC: @@ -247,159 +247,159 @@ glabel L80A702CC /* 00D60 80A70310 1000009F */ beq $zero, $zero, .L80A70590 /* 00D64 80A70314 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A70318 -/* 00D68 80A70318 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00D6C 80A7031C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00D68 80A70318 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00D6C 80A7031C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00D70 80A70320 944D0F10 */ lhu $t5, 0x0F10($v0) ## 8015F570 /* 00D74 80A70324 35AE0001 */ ori $t6, $t5, 0x0001 ## $t6 = 00000001 /* 00D78 80A70328 A44E0F10 */ sh $t6, 0x0F10($v0) ## 8015F570 /* 00D7C 80A7032C 10000098 */ beq $zero, $zero, .L80A70590 /* 00D80 80A70330 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A70334: -/* 00D84 80A70334 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = FFFFE660 +/* 00D84 80A70334 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00D88 80A70338 944F0F10 */ lhu $t7, 0x0F10($v0) ## FFFFF570 /* 00D8C 80A7033C 35F80002 */ ori $t8, $t7, 0x0002 ## $t8 = 00000002 /* 00D90 80A70340 A4580F10 */ sh $t8, 0x0F10($v0) ## FFFFF570 /* 00D94 80A70344 10000092 */ beq $zero, $zero, .L80A70590 /* 00D98 80A70348 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A7034C -/* 00D9C 80A7034C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00DA0 80A70350 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00D9C 80A7034C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00DA0 80A70350 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00DA4 80A70354 94590F10 */ lhu $t9, 0x0F10($v0) ## 8015F570 /* 00DA8 80A70358 37280004 */ ori $t0, $t9, 0x0004 ## $t0 = 00000004 /* 00DAC 80A7035C A4480F10 */ sh $t0, 0x0F10($v0) ## 8015F570 /* 00DB0 80A70360 1000008B */ beq $zero, $zero, .L80A70590 /* 00DB4 80A70364 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A70368: -/* 00DB8 80A70368 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = FFFFE660 +/* 00DB8 80A70368 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00DBC 80A7036C 94490F10 */ lhu $t1, 0x0F10($v0) ## FFFFF570 /* 00DC0 80A70370 352A0008 */ ori $t2, $t1, 0x0008 ## $t2 = 00000008 /* 00DC4 80A70374 A44A0F10 */ sh $t2, 0x0F10($v0) ## FFFFF570 /* 00DC8 80A70378 10000085 */ beq $zero, $zero, .L80A70590 /* 00DCC 80A7037C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A70380 -/* 00DD0 80A70380 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00DD4 80A70384 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00DD0 80A70380 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00DD4 80A70384 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00DD8 80A70388 944B0F10 */ lhu $t3, 0x0F10($v0) ## 8015F570 /* 00DDC 80A7038C 356C0010 */ ori $t4, $t3, 0x0010 ## $t4 = 00000010 /* 00DE0 80A70390 A44C0F10 */ sh $t4, 0x0F10($v0) ## 8015F570 /* 00DE4 80A70394 1000007E */ beq $zero, $zero, .L80A70590 /* 00DE8 80A70398 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A7039C -/* 00DEC 80A7039C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00DF0 80A703A0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00DEC 80A7039C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00DF0 80A703A0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00DF4 80A703A4 944D0F10 */ lhu $t5, 0x0F10($v0) ## 8015F570 /* 00DF8 80A703A8 35AE0020 */ ori $t6, $t5, 0x0020 ## $t6 = 00000020 /* 00DFC 80A703AC A44E0F10 */ sh $t6, 0x0F10($v0) ## 8015F570 /* 00E00 80A703B0 10000077 */ beq $zero, $zero, .L80A70590 /* 00E04 80A703B4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A703B8 -/* 00E08 80A703B8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00E0C 80A703BC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00E08 80A703B8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00E0C 80A703BC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00E10 80A703C0 944F0F10 */ lhu $t7, 0x0F10($v0) ## 8015F570 /* 00E14 80A703C4 35F80040 */ ori $t8, $t7, 0x0040 ## $t8 = 00000040 /* 00E18 80A703C8 A4580F10 */ sh $t8, 0x0F10($v0) ## 8015F570 /* 00E1C 80A703CC 10000070 */ beq $zero, $zero, .L80A70590 /* 00E20 80A703D0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A703D4 -/* 00E24 80A703D4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00E28 80A703D8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00E24 80A703D4 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00E28 80A703D8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00E2C 80A703DC 94590F10 */ lhu $t9, 0x0F10($v0) ## 8015F570 /* 00E30 80A703E0 37280080 */ ori $t0, $t9, 0x0080 ## $t0 = 00000080 /* 00E34 80A703E4 A4480F10 */ sh $t0, 0x0F10($v0) ## 8015F570 /* 00E38 80A703E8 10000069 */ beq $zero, $zero, .L80A70590 /* 00E3C 80A703EC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A703F0 -/* 00E40 80A703F0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00E44 80A703F4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00E40 80A703F0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00E44 80A703F4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00E48 80A703F8 94490F10 */ lhu $t1, 0x0F10($v0) ## 8015F570 /* 00E4C 80A703FC 352A0100 */ ori $t2, $t1, 0x0100 ## $t2 = 00000100 /* 00E50 80A70400 A44A0F10 */ sh $t2, 0x0F10($v0) ## 8015F570 /* 00E54 80A70404 10000062 */ beq $zero, $zero, .L80A70590 /* 00E58 80A70408 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A7040C: -/* 00E5C 80A7040C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = FFFFE660 +/* 00E5C 80A7040C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00E60 80A70410 944B0F10 */ lhu $t3, 0x0F10($v0) ## FFFFF570 /* 00E64 80A70414 356C0200 */ ori $t4, $t3, 0x0200 ## $t4 = 00000200 /* 00E68 80A70418 A44C0F10 */ sh $t4, 0x0F10($v0) ## FFFFF570 /* 00E6C 80A7041C 1000005C */ beq $zero, $zero, .L80A70590 /* 00E70 80A70420 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A70424 -/* 00E74 80A70424 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00E78 80A70428 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00E74 80A70424 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00E78 80A70428 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00E7C 80A7042C 944D0F10 */ lhu $t5, 0x0F10($v0) ## 8015F570 /* 00E80 80A70430 35AE0400 */ ori $t6, $t5, 0x0400 ## $t6 = 00000400 /* 00E84 80A70434 A44E0F10 */ sh $t6, 0x0F10($v0) ## 8015F570 /* 00E88 80A70438 10000055 */ beq $zero, $zero, .L80A70590 /* 00E8C 80A7043C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A70440 -/* 00E90 80A70440 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00E94 80A70444 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00E90 80A70440 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00E94 80A70444 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00E98 80A70448 944F0F10 */ lhu $t7, 0x0F10($v0) ## 8015F570 /* 00E9C 80A7044C 35F82000 */ ori $t8, $t7, 0x2000 ## $t8 = 00002000 /* 00EA0 80A70450 A4580F10 */ sh $t8, 0x0F10($v0) ## 8015F570 /* 00EA4 80A70454 1000004E */ beq $zero, $zero, .L80A70590 /* 00EA8 80A70458 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A7045C: -/* 00EAC 80A7045C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = FFFFE660 +/* 00EAC 80A7045C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00EB0 80A70460 94590F10 */ lhu $t9, 0x0F10($v0) ## FFFFF570 /* 00EB4 80A70464 37281000 */ ori $t0, $t9, 0x1000 ## $t0 = 00001000 /* 00EB8 80A70468 A4480F10 */ sh $t0, 0x0F10($v0) ## FFFFF570 /* 00EBC 80A7046C 10000048 */ beq $zero, $zero, .L80A70590 /* 00EC0 80A70470 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A70474 -/* 00EC4 80A70474 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00EC8 80A70478 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00EC4 80A70474 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00EC8 80A70478 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00ECC 80A7047C 94490F24 */ lhu $t1, 0x0F24($v0) ## 8015F584 /* 00ED0 80A70480 352A0001 */ ori $t2, $t1, 0x0001 ## $t2 = 00000001 /* 00ED4 80A70484 A44A0F24 */ sh $t2, 0x0F24($v0) ## 8015F584 /* 00ED8 80A70488 10000041 */ beq $zero, $zero, .L80A70590 /* 00EDC 80A7048C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A70490 -/* 00EE0 80A70490 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00EE4 80A70494 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00EE0 80A70490 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00EE4 80A70494 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00EE8 80A70498 944B0F24 */ lhu $t3, 0x0F24($v0) ## 8015F584 /* 00EEC 80A7049C 356C0002 */ ori $t4, $t3, 0x0002 ## $t4 = 00000002 /* 00EF0 80A704A0 A44C0F24 */ sh $t4, 0x0F24($v0) ## 8015F584 /* 00EF4 80A704A4 1000003A */ beq $zero, $zero, .L80A70590 /* 00EF8 80A704A8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A704AC -/* 00EFC 80A704AC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00F00 80A704B0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00EFC 80A704AC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00F00 80A704B0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00F04 80A704B4 944D0F24 */ lhu $t5, 0x0F24($v0) ## 8015F584 /* 00F08 80A704B8 35AE0004 */ ori $t6, $t5, 0x0004 ## $t6 = 00000004 /* 00F0C 80A704BC A44E0F24 */ sh $t6, 0x0F24($v0) ## 8015F584 /* 00F10 80A704C0 10000033 */ beq $zero, $zero, .L80A70590 /* 00F14 80A704C4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A704C8 -/* 00F18 80A704C8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00F1C 80A704CC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00F18 80A704C8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00F1C 80A704CC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00F20 80A704D0 944F0F24 */ lhu $t7, 0x0F24($v0) ## 8015F584 /* 00F24 80A704D4 35F80008 */ ori $t8, $t7, 0x0008 ## $t8 = 00000008 /* 00F28 80A704D8 A4580F24 */ sh $t8, 0x0F24($v0) ## 8015F584 /* 00F2C 80A704DC 1000002C */ beq $zero, $zero, .L80A70590 /* 00F30 80A704E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A704E4 -/* 00F34 80A704E4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00F38 80A704E8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00F34 80A704E4 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00F38 80A704E8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00F3C 80A704EC 94590F24 */ lhu $t9, 0x0F24($v0) ## 8015F584 /* 00F40 80A704F0 37280010 */ ori $t0, $t9, 0x0010 ## $t0 = 00000010 /* 00F44 80A704F4 A4480F24 */ sh $t0, 0x0F24($v0) ## 8015F584 /* 00F48 80A704F8 10000025 */ beq $zero, $zero, .L80A70590 /* 00F4C 80A704FC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A70500: -/* 00F50 80A70500 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = FFFFE660 +/* 00F50 80A70500 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00F54 80A70504 94490F10 */ lhu $t1, 0x0F10($v0) ## FFFFF570 /* 00F58 80A70508 352A0800 */ ori $t2, $t1, 0x0800 ## $t2 = 00000800 /* 00F5C 80A7050C A44A0F10 */ sh $t2, 0x0F10($v0) ## FFFFF570 /* 00F60 80A70510 1000001F */ beq $zero, $zero, .L80A70590 /* 00F64 80A70514 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A70518: -/* 00F68 80A70518 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = FFFFE660 +/* 00F68 80A70518 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00F6C 80A7051C A44013C4 */ sh $zero, 0x13C4($v0) ## FFFFFA24 /* 00F70 80A70520 1000001B */ beq $zero, $zero, .L80A70590 /* 00F74 80A70524 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A70528: -/* 00F78 80A70528 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = FFFFE660 +/* 00F78 80A70528 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00F7C 80A7052C 944B0F2A */ lhu $t3, 0x0F2A($v0) ## FFFFF58A /* 00F80 80A70530 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00F84 80A70534 8FA50048 */ lw $a1, 0x0048($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70978.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70978.s index 398fd8b0ee..11c7b6be05 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70978.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70978.s @@ -67,7 +67,7 @@ glabel L80A70A00 /* 01450 80A70A00 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 .L80A70A04: /* 01454 80A70A04 8C4A0024 */ lw $t2, 0x0024($v0) ## 00000024 -/* 01458 80A70A08 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 01458 80A70A08 3C0B8016 */ lui $t3, %hi(gSaveContext+4) /* 0145C 80A70A0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01460 80A70A10 AE0A0200 */ sw $t2, 0x0200($s0) ## 00000200 /* 01464 80A70A14 8C490028 */ lw $t1, 0x0028($v0) ## 00000028 @@ -75,7 +75,7 @@ glabel L80A70A00 /* 0146C 80A70A1C AE090204 */ sw $t1, 0x0204($s0) ## 00000204 /* 01470 80A70A20 8C4A002C */ lw $t2, 0x002C($v0) ## 0000002C /* 01474 80A70A24 AE0A0208 */ sw $t2, 0x0208($s0) ## 00000208 -/* 01478 80A70A28 8D6BE664 */ lw $t3, -0x199C($t3) ## 8015E664 +/* 01478 80A70A28 8D6BE664 */ lw $t3, %lo(gSaveContext+4)($t3) /* 0147C 80A70A2C 5560000D */ bnel $t3, $zero, .L80A70A64 /* 01480 80A70A30 8618001C */ lh $t8, 0x001C($s0) ## 0000001C /* 01484 80A70A34 860C001C */ lh $t4, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70AE4.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70AE4.s index 004f456fe3..306ea1981a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70AE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70AE4.s @@ -54,7 +54,7 @@ glabel func_80A70AE4 /* 01580 80A70B30 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A /* 01584 80A70B34 3042007F */ andi $v0, $v0, 0x007F ## $v0 = 00000000 /* 01588 80A70B38 1041000B */ beq $v0, $at, .L80A70B68 -/* 0158C 80A70B3C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 0158C 80A70B3C 3C038016 */ lui $v1, %hi(gSaveContext) /* 01590 80A70B40 10A20009 */ beq $a1, $v0, .L80A70B68 /* 01594 80A70B44 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 01598 80A70B48 10410007 */ beq $v0, $at, .L80A70B68 @@ -66,7 +66,7 @@ glabel func_80A70AE4 /* 015B0 80A70B60 03E00008 */ jr $ra /* 015B4 80A70B64 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80A70B68: -/* 015B8 80A70B68 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 015B8 80A70B68 2463E660 */ addiu $v1, %lo(gSaveContext) /* 015BC 80A70B6C 8C6F0004 */ lw $t7, 0x0004($v1) ## 8015E664 /* 015C0 80A70B70 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 015C4 80A70B74 11E00003 */ beq $t7, $zero, .L80A70B84 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70BAC.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70BAC.s index 59d7e745bd..c57e080b1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70BAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70BAC.s @@ -1,10 +1,10 @@ glabel func_80A70BAC /* 015FC 80A70BAC 8482001C */ lh $v0, 0x001C($a0) ## 0000001C /* 01600 80A70BB0 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 01604 80A70BB4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 01604 80A70BB4 3C038016 */ lui $v1, %hi(gSaveContext) /* 01608 80A70BB8 3042007F */ andi $v0, $v0, 0x007F ## $v0 = 00000000 /* 0160C 80A70BBC 10A20003 */ beq $a1, $v0, .L80A70BCC -/* 01610 80A70BC0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 01610 80A70BC0 2463E660 */ addiu $v1, %lo(gSaveContext) /* 01614 80A70BC4 03E00008 */ jr $ra /* 01618 80A70BC8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80A70BCC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70C08.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70C08.s index 3953a8ad63..a848577b0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70C08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70C08.s @@ -1,7 +1,7 @@ glabel func_80A70C08 /* 01658 80A70C08 8489001C */ lh $t1, 0x001C($a0) ## 0000001C -/* 0165C 80A70C0C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 01660 80A70C10 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0165C 80A70C0C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 01660 80A70C10 2463E660 */ addiu $v1, %lo(gSaveContext) /* 01664 80A70C14 312A007F */ andi $t2, $t1, 0x007F ## $t2 = 00000000 /* 01668 80A70C18 51400004 */ beql $t2, $zero, .L80A70C2C /* 0166C 80A70C1C 8C6B0010 */ lw $t3, 0x0010($v1) ## 8015E670 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70C44.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70C44.s index 870ba1f737..b65d92358d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70C44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70C44.s @@ -1,7 +1,7 @@ glabel func_80A70C44 /* 01694 80A70C44 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 01698 80A70C48 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0169C 80A70C4C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 01698 80A70C48 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0169C 80A70C4C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 016A0 80A70C50 3042007F */ andi $v0, $v0, 0x007F ## $v0 = 00000000 /* 016A4 80A70C54 14400009 */ bne $v0, $zero, .L80A70C7C /* 016A8 80A70C58 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 @@ -16,7 +16,7 @@ glabel func_80A70C44 /* 016C8 80A70C78 00601025 */ or $v0, $v1, $zero ## $v0 = 00000001 .L80A70C7C: /* 016CC 80A70C7C 10410008 */ beq $v0, $at, .L80A70CA0 -/* 016D0 80A70C80 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 016D0 80A70C80 3C038016 */ lui $v1, %hi(gSaveContext) /* 016D4 80A70C84 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 016D8 80A70C88 10410005 */ beq $v0, $at, .L80A70CA0 /* 016DC 80A70C8C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 @@ -25,7 +25,7 @@ glabel func_80A70C44 /* 016E8 80A70C98 03E00008 */ jr $ra /* 016EC 80A70C9C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80A70CA0: -/* 016F0 80A70CA0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 016F0 80A70CA0 2463E660 */ addiu $v1, %lo(gSaveContext) /* 016F4 80A70CA4 8C6D0010 */ lw $t5, 0x0010($v1) ## 8015E670 /* 016F8 80A70CA8 55A00004 */ bnel $t5, $zero, .L80A70CBC /* 016FC 80A70CAC 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70CD8.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70CD8.s index 500751fea7..36450621de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70CD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70CD8.s @@ -1,10 +1,10 @@ glabel func_80A70CD8 /* 01728 80A70CD8 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 0172C 80A70CDC 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 01730 80A70CE0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 01730 80A70CE0 3C038016 */ lui $v1, %hi(gSaveContext) /* 01734 80A70CE4 31F8007F */ andi $t8, $t7, 0x007F ## $t8 = 00000000 /* 01738 80A70CE8 13010003 */ beq $t8, $at, .L80A70CF8 -/* 0173C 80A70CEC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0173C 80A70CEC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 01740 80A70CF0 03E00008 */ jr $ra /* 01744 80A70CF4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80A70CF8: @@ -39,8 +39,8 @@ glabel L80A70D40 /* 017A0 80A70D50 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 /* 017A4 80A70D54 14610007 */ bne $v1, $at, .L80A70D74 .L80A70D58: -/* 017A8 80A70D58 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 017AC 80A70D5C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 017A8 80A70D58 3C038016 */ lui $v1, %hi(gSaveContext) +/* 017AC 80A70D5C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 017B0 80A70D60 8C6C0004 */ lw $t4, 0x0004($v1) ## 8015E664 /* 017B4 80A70D64 55800004 */ bnel $t4, $zero, .L80A70D78 /* 017B8 80A70D68 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s index d3736ce90d..bf50d40db1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s @@ -52,8 +52,8 @@ glabel func_80A70E34 /* 018E8 80A70E98 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 /* 018EC 80A70E9C 261802D0 */ addiu $t8, $s0, 0x02D0 ## $t8 = 000002D0 /* 018F0 80A70EA0 01014821 */ addu $t1, $t0, $at -/* 018F4 80A70EA4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 018F8 80A70EA8 AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 +/* 018F4 80A70EA4 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 018F8 80A70EA8 AC296FC0 */ sw $t1, %lo(gSegments+0x18)($at) /* 018FC 80A70EAC 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 01900 80A70EB0 260F0270 */ addiu $t7, $s0, 0x0270 ## $t7 = 00000270 /* 01904 80A70EB4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C @@ -73,8 +73,8 @@ glabel func_80A70E34 /* 0193C 80A70EEC 0C0291BE */ jal SkelAnime_InitSV /* 01940 80A70EF0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01944 80A70EF4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01948 80A70EF8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0194C 80A70EFC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 01948 80A70EF8 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 0194C 80A70EFC 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 01950 80A70F00 44050000 */ mfc1 $a1, $f0 /* 01954 80A70F04 44070000 */ mfc1 $a3, $f0 /* 01958 80A70F08 0C00AC78 */ jal ActorShape_Init @@ -92,8 +92,8 @@ glabel func_80A70E34 /* 01984 80A70F34 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01988 80A70F38 2605019C */ addiu $a1, $s0, 0x019C ## $a1 = 0000019C /* 0198C 80A70F3C 01616021 */ addu $t4, $t3, $at -/* 01990 80A70F40 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 01994 80A70F44 AC2C6FC0 */ sw $t4, 0x6FC0($at) ## 80166FC0 +/* 01990 80A70F40 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 01994 80A70F44 AC2C6FC0 */ sw $t4, %lo(gSegments+0x18)($at) /* 01998 80A70F48 0C0170D9 */ jal ActorCollider_AllocCylinder /* 0199C 80A70F4C AFA50030 */ sw $a1, 0x0030($sp) @@ -125,7 +125,7 @@ glabel func_80A70E34 /* 01A00 80A70FB0 8FA40034 */ lw $a0, 0x0034($sp) /* 01A04 80A70FB4 8FB8003C */ lw $t8, 0x003C($sp) /* 01A08 80A70FB8 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 01A0C 80A70FBC 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 01A0C 80A70FBC 3C0A8016 */ lui $t2, %hi(gSaveContext+0xee0) /* 01A10 80A70FC0 870200A4 */ lh $v0, 0x00A4($t8) ## 000000A4 /* 01A14 80A70FC4 10410003 */ beq $v0, $at, .L80A70FD4 /* 01A18 80A70FC8 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 @@ -144,7 +144,7 @@ glabel func_80A70E34 .L80A70FF8: /* 01A48 80A70FF8 14410003 */ bne $v0, $at, .L80A71008 /* 01A4C 80A70FFC 00000000 */ nop -/* 01A50 80A71000 954AF540 */ lhu $t2, -0x0AC0($t2) ## 8015F540 +/* 01A50 80A71000 954AF540 */ lhu $t2, %lo(gSaveContext+0xee0)($t2) /* 01A54 80A71004 A60A0330 */ sh $t2, 0x0330($s0) ## 00000330 .L80A71008: /* 01A58 80A71008 0C29C1A6 */ jal func_80A70698 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A710F8.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A710F8.s index 6415028d48..39537b55f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A710F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A710F8.s @@ -4,7 +4,7 @@ glabel func_80A710F8 /* 01B50 80A71100 AFA5001C */ sw $a1, 0x001C($sp) /* 01B54 80A71104 848E01E8 */ lh $t6, 0x01E8($a0) ## 000001E8 /* 01B58 80A71108 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01B5C 80A7110C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 01B5C 80A7110C 3C198016 */ lui $t9, %hi(gSaveContext+0x1400) /* 01B60 80A71110 11C0000C */ beq $t6, $zero, .L80A71144 /* 01B64 80A71114 00000000 */ nop /* 01B68 80A71118 8C980154 */ lw $t8, 0x0154($a0) ## 00000154 @@ -19,7 +19,7 @@ glabel func_80A710F8 /* 01B8C 80A7113C 1000001A */ beq $zero, $zero, .L80A711A8 /* 01B90 80A71140 8FBF0014 */ lw $ra, 0x0014($sp) .L80A71144: -/* 01B94 80A71144 9739FA60 */ lhu $t9, -0x05A0($t9) ## FFFFFA60 +/* 01B94 80A71144 9739FA60 */ lhu $t9, %lo(gSaveContext+0x1400)($t9) /* 01B98 80A71148 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 /* 01B9C 80A7114C 5100000D */ beql $t0, $zero, .L80A71184 /* 01BA0 80A71150 8CEC0154 */ lw $t4, 0x0154($a3) ## 00000154 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71530.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71530.s index 588819a926..083f9868e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71530.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71530.s @@ -21,8 +21,8 @@ glabel func_80A71530 /* 01FCC 80A7157C 10000010 */ beq $zero, $zero, .L80A715C0 /* 01FD0 80A71580 8FA80018 */ lw $t0, 0x0018($sp) .L80A71584: -/* 01FD4 80A71584 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01FD8 80A71588 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01FD4 80A71584 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01FD8 80A71588 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01FDC 80A7158C 944F0F2A */ lhu $t7, 0x0F2A($v0) ## 8015F58A /* 01FE0 80A71590 A44013C4 */ sh $zero, 0x13C4($v0) ## 8015FA24 /* 01FE4 80A71594 A040141C */ sb $zero, 0x141C($v0) ## 8015FA7C @@ -32,8 +32,8 @@ glabel func_80A71530 .L80A715A4: /* 01FF4 80A715A4 0C021CC3 */ jal Rupees_ChangeBy /* 01FF8 80A715A8 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 -/* 01FFC 80A715AC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 02000 80A715B0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01FFC 80A715AC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 02000 80A715B0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 02004 80A715B4 A44013C4 */ sh $zero, 0x13C4($v0) ## 8015FA24 /* 02008 80A715B8 A040141C */ sb $zero, 0x141C($v0) ## 8015FA7C .L80A715BC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s index ec10c00562..ba6e90e8e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s @@ -52,7 +52,7 @@ glabel func_80A716B8 /* 02174 80A71724 01A60019 */ multu $t5, $a2 /* 02178 80A71728 3C070001 */ lui $a3, 0x0001 ## $a3 = 00010000 /* 0217C 80A7172C 3C0B8000 */ lui $t3, 0x8000 ## $t3 = 80000000 -/* 02180 80A71730 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 02180 80A71730 3C018016 */ lui $at, %hi(gSegments+0x18) /* 02184 80A71734 00007012 */ mflo $t6 /* 02188 80A71738 032E7821 */ addu $t7, $t9, $t6 /* 0218C 80A7173C 01E7C021 */ addu $t8, $t7, $a3 @@ -67,7 +67,7 @@ glabel func_80A716B8 /* 021B0 80A71760 03076821 */ addu $t5, $t8, $a3 /* 021B4 80A71764 8DAE17B4 */ lw $t6, 0x17B4($t5) ## 000017B4 /* 021B8 80A71768 01CBC821 */ addu $t9, $t6, $t3 -/* 021BC 80A7176C AC396FC0 */ sw $t9, 0x6FC0($at) ## 80166FC0 +/* 021BC 80A7176C AC396FC0 */ sw $t9, %lo(gSegments+0x18)($at) /* 021C0 80A71770 854F001C */ lh $t7, 0x001C($t2) ## 0000001C /* 021C4 80A71774 3C1980A7 */ lui $t9, %hi(D_80A71F50) ## $t9 = 80A70000 /* 021C8 80A71778 27391F50 */ addiu $t9, $t9, %lo(D_80A71F50) ## $t9 = 80A71F50 @@ -101,10 +101,10 @@ glabel func_80A716B8 /* 02238 80A717E8 00056900 */ sll $t5, $a1, 4 /* 0223C 80A717EC 000D7702 */ srl $t6, $t5, 28 /* 02240 80A717F0 000EC880 */ sll $t9, $t6, 2 -/* 02244 80A717F4 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 02244 80A717F4 3C0F8016 */ lui $t7, %hi(gSegments) /* 02248 80A717F8 01F97821 */ addu $t7, $t7, $t9 /* 0224C 80A717FC AC780000 */ sw $t8, 0x0000($v1) ## 80A70000 -/* 02250 80A71800 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 02250 80A71800 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 02254 80A71804 00A1C024 */ and $t8, $a1, $at /* 02258 80A71808 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 0225C 80A7180C 01F86821 */ addu $t5, $t7, $t8 @@ -113,14 +113,14 @@ glabel func_80A716B8 /* 02268 80A71818 814F0198 */ lb $t7, 0x0198($t2) ## 00000198 .L80A7181C: /* 0226C 80A7181C 8FB90058 */ lw $t9, 0x0058($sp) -/* 02270 80A71820 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 02270 80A71820 3C018016 */ lui $at, %hi(gSegments+0x18) /* 02274 80A71824 01E60019 */ multu $t7, $a2 /* 02278 80A71828 0000C012 */ mflo $t8 /* 0227C 80A7182C 03386821 */ addu $t5, $t9, $t8 /* 02280 80A71830 01A77021 */ addu $t6, $t5, $a3 /* 02284 80A71834 8DCF17B4 */ lw $t7, 0x17B4($t6) ## 000017B4 /* 02288 80A71838 01EBC821 */ addu $t9, $t7, $t3 -/* 0228C 80A7183C AC396FC0 */ sw $t9, 0x6FC0($at) ## 80166FC0 +/* 0228C 80A7183C AC396FC0 */ sw $t9, %lo(gSegments+0x18)($at) .L80A71840: /* 02290 80A71840 152C002F */ bne $t1, $t4, .L80A71900 /* 02294 80A71844 8FAA006C */ lw $t2, 0x006C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71A64.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71A64.s index 57d425ab7e..8a61bf781a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71A64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71A64.s @@ -61,8 +61,8 @@ glabel func_80A71A64 /* 02578 80A71B28 01876821 */ addu $t5, $t4, $a3 /* 0257C 80A71B2C 8DAE17B4 */ lw $t6, 0x17B4($t5) ## 000017B4 /* 02580 80A71B30 01C17821 */ addu $t7, $t6, $at -/* 02584 80A71B34 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 02588 80A71B38 AC2F6FC0 */ sw $t7, 0x6FC0($at) ## 80166FC0 +/* 02584 80A71B34 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 02588 80A71B38 AC2F6FC0 */ sw $t7, %lo(gSegments+0x18)($at) .L80A71B3C: /* 0258C 80A71B3C 8FA60060 */ lw $a2, 0x0060($sp) /* 02590 80A71B40 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Init.s index 71c7efd942..93a92e99ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Init.s @@ -5,11 +5,11 @@ glabel EnIk_Init /* 03F5C 80A7826C AFA50034 */ sw $a1, 0x0034($sp) /* 03F60 80A78270 8482001C */ lh $v0, 0x001C($a0) ## 0000001C /* 03F64 80A78274 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03F68 80A78278 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 03F68 80A78278 3C0F8016 */ lui $t7, %hi(gSaveContext+0xeda) /* 03F6C 80A7827C 304E00FF */ andi $t6, $v0, 0x00FF ## $t6 = 00000000 /* 03F70 80A78280 15C00005 */ bne $t6, $zero, .L80A78298 /* 03F74 80A78284 3043FF00 */ andi $v1, $v0, 0xFF00 ## $v1 = 00000000 -/* 03F78 80A78288 95EFF53A */ lhu $t7, -0x0AC6($t7) ## 8015F53A +/* 03F78 80A78288 95EFF53A */ lhu $t7, %lo(gSaveContext+0xeda)($t7) /* 03F7C 80A7828C 31F81000 */ andi $t8, $t7, 0x1000 ## $t8 = 00000000 /* 03F80 80A78290 17000007 */ bne $t8, $zero, .L80A782B0 /* 03F84 80A78294 00000000 */ nop @@ -28,8 +28,8 @@ glabel EnIk_Init /* 03FA8 80A782B8 1000001B */ beq $zero, $zero, .L80A78328 /* 03FAC 80A782BC 8FBF002C */ lw $ra, 0x002C($sp) .L80A782C0: -/* 03FB0 80A782C0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 03FB4 80A782C4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 03FB0 80A782C0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 03FB4 80A782C4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 03FB8 80A782C8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 03FBC 80A782CC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 03FC0 80A782D0 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76C14.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76C14.s index db67cbbc5f..991f0eae01 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76C14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76C14.s @@ -10,10 +10,10 @@ glabel func_80A76C14 /* 02924 80A76C34 1040000E */ beq $v0, $zero, .L80A76C70 /* 02928 80A76C38 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C /* 0292C 80A76C3C 8FA50028 */ lw $a1, 0x0028($sp) -/* 02930 80A76C40 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 02934 80A76C44 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 02938 80A76C48 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0293C 80A76C4C 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 +/* 02930 80A76C40 3C078013 */ lui $a3, %hi(D_801333E0) +/* 02934 80A76C44 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 02938 80A76C48 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0293C 80A76C4C 25CE33E8 */ addiu $t6, %lo(D_801333E8) /* 02940 80A76C50 AFAE0014 */ sw $t6, 0x0014($sp) /* 02944 80A76C54 AFA70010 */ sw $a3, 0x0010($sp) /* 02948 80A76C58 240439C2 */ addiu $a0, $zero, 0x39C2 ## $a0 = 000039C2 @@ -29,10 +29,10 @@ glabel func_80A76C14 /* 02968 80A76C78 1040000E */ beq $v0, $zero, .L80A76CB4 /* 0296C 80A76C7C 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C /* 02970 80A76C80 8FA50028 */ lw $a1, 0x0028($sp) -/* 02974 80A76C84 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 02978 80A76C88 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 0297C 80A76C8C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 02980 80A76C90 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 02974 80A76C84 3C078013 */ lui $a3, %hi(D_801333E0) +/* 02978 80A76C88 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 0297C 80A76C8C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 02980 80A76C90 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 02984 80A76C94 AFAF0014 */ sw $t7, 0x0014($sp) /* 02988 80A76C98 AFA70010 */ sw $a3, 0x0010($sp) /* 0298C 80A76C9C 24043928 */ addiu $a0, $zero, 0x3928 ## $a0 = 00003928 @@ -53,10 +53,10 @@ glabel func_80A76C14 /* 029C0 80A76CD0 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C .L80A76CD4: /* 029C4 80A76CD4 8FA50028 */ lw $a1, 0x0028($sp) -/* 029C8 80A76CD8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 029CC 80A76CDC 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 029D0 80A76CE0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 029D4 80A76CE4 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 029C8 80A76CD8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 029CC 80A76CDC 3C188013 */ lui $t8, %hi(D_801333E8) +/* 029D0 80A76CE0 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 029D4 80A76CE4 271833E8 */ addiu $t8, %lo(D_801333E8) /* 029D8 80A76CE8 AFB80014 */ sw $t8, 0x0014($sp) /* 029DC 80A76CEC AFA70010 */ sw $a3, 0x0010($sp) /* 029E0 80A76CF0 2404392A */ addiu $a0, $zero, 0x392A ## $a0 = 0000392A @@ -72,10 +72,10 @@ glabel func_80A76C14 /* 02A00 80A76D10 1040000E */ beq $v0, $zero, .L80A76D4C /* 02A04 80A76D14 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C /* 02A08 80A76D18 8FA50028 */ lw $a1, 0x0028($sp) -/* 02A0C 80A76D1C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 02A10 80A76D20 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 02A14 80A76D24 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 02A18 80A76D28 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 02A0C 80A76D1C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 02A10 80A76D20 3C198013 */ lui $t9, %hi(D_801333E8) +/* 02A14 80A76D24 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 02A18 80A76D28 273933E8 */ addiu $t9, %lo(D_801333E8) /* 02A1C 80A76D2C AFB90014 */ sw $t9, 0x0014($sp) /* 02A20 80A76D30 AFA70010 */ sw $a3, 0x0010($sp) /* 02A24 80A76D34 24043939 */ addiu $a0, $zero, 0x3939 ## $a0 = 00003939 @@ -91,10 +91,10 @@ glabel func_80A76C14 /* 02A44 80A76D54 1040000E */ beq $v0, $zero, .L80A76D90 /* 02A48 80A76D58 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C /* 02A4C 80A76D5C 8FA50028 */ lw $a1, 0x0028($sp) -/* 02A50 80A76D60 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 02A54 80A76D64 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 02A58 80A76D68 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 02A5C 80A76D6C 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 +/* 02A50 80A76D60 3C078013 */ lui $a3, %hi(D_801333E0) +/* 02A54 80A76D64 3C088013 */ lui $t0, %hi(D_801333E8) +/* 02A58 80A76D68 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 02A5C 80A76D6C 250833E8 */ addiu $t0, %lo(D_801333E8) /* 02A60 80A76D70 AFA80014 */ sw $t0, 0x0014($sp) /* 02A64 80A76D74 AFA70010 */ sw $a3, 0x0010($sp) /* 02A68 80A76D78 2404392A */ addiu $a0, $zero, 0x392A ## $a0 = 0000392A @@ -108,11 +108,11 @@ glabel func_80A76C14 /* 02A80 80A76D90 0C0295B2 */ jal func_800A56C8 /* 02A84 80A76D94 3C05433C */ lui $a1, 0x433C ## $a1 = 433C0000 /* 02A88 80A76D98 1040000B */ beq $v0, $zero, .L80A76DC8 -/* 02A8C 80A76D9C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 02A8C 80A76D9C 3C078013 */ lui $a3, %hi(D_801333E0) /* 02A90 80A76DA0 8FA50028 */ lw $a1, 0x0028($sp) -/* 02A94 80A76DA4 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 02A98 80A76DA8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 02A9C 80A76DAC 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 +/* 02A94 80A76DA4 3C098013 */ lui $t1, %hi(D_801333E8) +/* 02A98 80A76DA8 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 02A9C 80A76DAC 252933E8 */ addiu $t1, %lo(D_801333E8) /* 02AA0 80A76DB0 AFA90014 */ sw $t1, 0x0014($sp) /* 02AA4 80A76DB4 AFA70010 */ sw $a3, 0x0010($sp) /* 02AA8 80A76DB8 24043938 */ addiu $a0, $zero, 0x3938 ## $a0 = 00003938 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76DDC.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76DDC.s index 7dd309ab59..0c941fd405 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76DDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76DDC.s @@ -3,12 +3,12 @@ glabel func_80A76DDC /* 02AD0 80A76DE0 AFA40020 */ sw $a0, 0x0020($sp) /* 02AD4 80A76DE4 AFA50024 */ sw $a1, 0x0024($sp) /* 02AD8 80A76DE8 8FA50020 */ lw $a1, 0x0020($sp) -/* 02ADC 80A76DEC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 02AE0 80A76DF0 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 02AE4 80A76DF4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 02ADC 80A76DEC 3C078013 */ lui $a3, %hi(D_801333E0) +/* 02AE0 80A76DF0 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 02AE4 80A76DF4 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 02AE8 80A76DF8 AFBF001C */ sw $ra, 0x001C($sp) /* 02AEC 80A76DFC AFA60028 */ sw $a2, 0x0028($sp) -/* 02AF0 80A76E00 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 +/* 02AF0 80A76E00 25CE33E8 */ addiu $t6, %lo(D_801333E8) /* 02AF4 80A76E04 AFAE0014 */ sw $t6, 0x0014($sp) /* 02AF8 80A76E08 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 02AFC 80A76E0C AFA70010 */ sw $a3, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A772A4.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A772A4.s index 21ebfd68ba..c2dc11b707 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A772A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A772A4.s @@ -2,11 +2,11 @@ glabel func_80A772A4 /* 02F94 80A772A4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 02F98 80A772A8 AFA40020 */ sw $a0, 0x0020($sp) /* 02F9C 80A772AC 8FA50020 */ lw $a1, 0x0020($sp) -/* 02FA0 80A772B0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 02FA4 80A772B4 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 02FA8 80A772B8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 02FA0 80A772B0 3C078013 */ lui $a3, %hi(D_801333E0) +/* 02FA4 80A772B4 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 02FA8 80A772B8 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 02FAC 80A772BC AFBF001C */ sw $ra, 0x001C($sp) -/* 02FB0 80A772C0 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 +/* 02FB0 80A772C0 25CE33E8 */ addiu $t6, %lo(D_801333E8) /* 02FB4 80A772C4 AFAE0014 */ sw $t6, 0x0014($sp) /* 02FB8 80A772C8 AFA70010 */ sw $a3, 0x0010($sp) /* 02FBC 80A772CC 2404392B */ addiu $a0, $zero, 0x392B ## $a0 = 0000392B diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A772EC.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A772EC.s index 10a4af5e77..257525d15f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A772EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A772EC.s @@ -12,10 +12,10 @@ glabel func_80A772EC /* 03004 80A77314 27A70024 */ addiu $a3, $sp, 0x0024 ## $a3 = FFFFFFF4 /* 03008 80A77318 0C029B84 */ jal func_800A6E10 /* 0300C 80A7731C 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 03010 80A77320 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 03014 80A77324 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 03018 80A77328 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0301C 80A7732C 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 +/* 03010 80A77320 3C078013 */ lui $a3, %hi(D_801333E0) +/* 03014 80A77324 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 03018 80A77328 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0301C 80A7732C 25CE33E8 */ addiu $t6, %lo(D_801333E8) /* 03020 80A77330 3C0580A8 */ lui $a1, %hi(D_80A78FA0) ## $a1 = 80A80000 /* 03024 80A77334 24A58FA0 */ addiu $a1, $a1, %lo(D_80A78FA0) ## $a1 = 80A78FA0 /* 03028 80A77338 AFAE0014 */ sw $t6, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A780D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A780D0.s index 820905730b..d3cee10271 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A780D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A780D0.s @@ -10,10 +10,10 @@ glabel func_80A780D0 /* 03DC8 80A780D8 AFB00018 */ sw $s0, 0x0018($sp) /* 03DCC 80A780DC 8486001C */ lh $a2, 0x001C($a0) ## 0000001C /* 03DD0 80A780E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03DD4 80A780E4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 03DD4 80A780E4 3C0E8016 */ lui $t6, %hi(gSaveContext+0xeda) /* 03DD8 80A780E8 14C00014 */ bne $a2, $zero, .L80A7813C /* 03DDC 80A780EC 00000000 */ nop -/* 03DE0 80A780F0 95CEF53A */ lhu $t6, -0x0AC6($t6) ## 8015F53A +/* 03DE0 80A780F0 95CEF53A */ lhu $t6, %lo(gSaveContext+0xeda)($t6) /* 03DE4 80A780F4 3C1880A7 */ lui $t8, %hi(EnIk_Update) ## $t8 = 80A70000 /* 03DE8 80A780F8 27187B9C */ addiu $t8, $t8, %lo(EnIk_Update) ## $t8 = 80A77B9C /* 03DEC 80A780FC 31CF0800 */ andi $t7, $t6, 0x0800 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A78160.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A78160.s index 3971886a28..bdb583e5d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A78160.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A78160.s @@ -5,11 +5,11 @@ glabel func_80A78160 /* 03E5C 80A7816C 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 /* 03E60 80A78170 3C0E80A7 */ lui $t6, %hi(func_80A75FA0) ## $t6 = 80A70000 /* 03E64 80A78174 3C0F80A7 */ lui $t7, %hi(func_80A76798) ## $t7 = 80A70000 -/* 03E68 80A78178 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 03E68 80A78178 3C028016 */ lui $v0, %hi(gSaveContext) /* 03E6C 80A7817C 25CE5FA0 */ addiu $t6, $t6, %lo(func_80A75FA0) ## $t6 = 80A75FA0 /* 03E70 80A78180 25EF6798 */ addiu $t7, $t7, %lo(func_80A76798) ## $t7 = 80A76798 /* 03E74 80A78184 37190005 */ ori $t9, $t8, 0x0005 ## $t9 = 00000005 -/* 03E78 80A78188 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 03E78 80A78188 2442E660 */ addiu $v0, %lo(gSaveContext) /* 03E7C 80A7818C AC8E0130 */ sw $t6, 0x0130($a0) ## 00000130 /* 03E80 80A78190 AC8F0134 */ sw $t7, 0x0134($a0) ## 00000134 /* 03E84 80A78194 AC990004 */ sw $t9, 0x0004($a0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A781CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A781CC.s index 8009122b9d..44f8932d37 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A781CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A781CC.s @@ -19,15 +19,15 @@ glabel func_80A781CC /* 03F00 80A78210 24A53F80 */ addiu $a1, $a1, 0x3F80 ## $a1 = 02003F80 /* 03F04 80A78214 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 03F08 80A78218 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 03F08 80A78218 3C018016 */ lui $at, %hi(gSaveContext+0x1414) /* 03F0C 80A7821C 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 03F10 80A78220 A038FA74 */ sb $t8, -0x058C($at) ## 8015FA74 +/* 03F10 80A78220 A038FA74 */ sb $t8, %lo(gSaveContext+0x1414)($at) /* 03F14 80A78224 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 03F18 80A78228 0C00B58B */ jal Actor_SetScale /* 03F1C 80A7822C 8FA40018 */ lw $a0, 0x0018($sp) -/* 03F20 80A78230 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 03F24 80A78234 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 03F20 80A78230 3C028016 */ lui $v0, %hi(gSaveContext) +/* 03F24 80A78234 2442E660 */ addiu $v0, %lo(gSaveContext) /* 03F28 80A78238 94590EDA */ lhu $t9, 0x0EDA($v0) ## 8015F53A /* 03F2C 80A7823C 8FA40018 */ lw $a0, 0x0018($sp) /* 03F30 80A78240 8FA5001C */ lw $a1, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s index fada25567f..042ac43265 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s @@ -35,12 +35,12 @@ glabel EnIn_Draw /* 02760 80A7B710 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 /* 02764 80A7B714 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 02768 80A7B718 3C0480A8 */ lui $a0, %hi(D_80A7B9B4) ## $a0 = 80A80000 -/* 0276C 80A7B71C 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 0276C 80A7B71C 3C068016 */ lui $a2, %hi(gSegments) /* 02770 80A7B720 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 /* 02774 80A7B724 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 /* 02778 80A7B728 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 0277C 80A7B72C 860B01EE */ lh $t3, 0x01EE($s0) ## 000001EE -/* 02780 80A7B730 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 02780 80A7B730 24C66FA8 */ addiu $a2, %lo(gSegments) /* 02784 80A7B734 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 /* 02788 80A7B738 000B6080 */ sll $t4, $t3, 2 /* 0278C 80A7B73C 008C2021 */ addu $a0, $a0, $t4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Init.s b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Init.s index eec95e16ea..cac8630824 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Init.s @@ -17,12 +17,12 @@ glabel EnIn_Init ## ObjectIndex /* 00EDC 80A79E8C AFA60030 */ sw $a2, 0x0030($sp) /* 00EE0 80A79E90 8FA60030 */ lw $a2, 0x0030($sp) -/* 00EE4 80A79E94 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 00EE4 80A79E94 3C198016 */ lui $t9, %hi(gSaveContext+0x1368) /* 00EE8 80A79E98 3C0C80A8 */ lui $t4, %hi(func_80A79FB0) ## $t4 = 80A80000 /* 00EEC 80A79E9C A0C201E4 */ sb $v0, 0x01E4($a2) ## 000001E4 /* 00EF0 80A79EA0 80CE01E4 */ lb $t6, 0x01E4($a2) ## 000001E4 /* 00EF4 80A79EA4 3C0280A8 */ lui $v0, %hi(D_80A7B998) ## $v0 = 80A80000 -/* 00EF8 80A79EA8 2739F9C8 */ addiu $t9, $t9, 0xF9C8 ## $t9 = 8015F9C8 +/* 00EF8 80A79EA8 2739F9C8 */ addiu $t9, %lo(gSaveContext+0x1368) /* 00EFC 80A79EAC 05C10009 */ bgez $t6, .L80A79ED4 /* 00F00 80A79EB0 258C9FB0 */ addiu $t4, $t4, %lo(func_80A79FB0) ## $t4 = 80A79FB0 /* 00F04 80A79EB4 84CF001C */ lh $t7, 0x001C($a2) ## 0000001C @@ -63,13 +63,13 @@ glabel EnIn_Init /* 00F84 80A79F34 4502000B */ bc1fl .L80A79F64 /* 00F88 80A79F38 ACCC0190 */ sw $t4, 0x0190($a2) ## 00000190 /* 00F8C 80A79F3C C432BA98 */ lwc1 $f18, %lo(D_80A7BA98)($at) -/* 00F90 80A79F40 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00F90 80A79F40 3C018016 */ lui $at, %hi(gSaveContext+0x13fa) /* 00F94 80A79F44 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 00F98 80A79F48 46128032 */ c.eq.s $f16, $f18 /* 00F9C 80A79F4C 00000000 */ nop /* 00FA0 80A79F50 45020004 */ bc1fl .L80A79F64 /* 00FA4 80A79F54 ACCC0190 */ sw $t4, 0x0190($a2) ## 00000190 -/* 00FA8 80A79F58 A420FA5A */ sh $zero, -0x05A6($at) ## 8015FA5A +/* 00FA8 80A79F58 A420FA5A */ sh $zero, %lo(gSaveContext+0x13fa)($at) /* 00FAC 80A79F5C AC4B0000 */ sw $t3, 0x0000($v0) ## FFFFB998 /* 00FB0 80A79F60 ACCC0190 */ sw $t4, 0x0190($a2) ## 00000190 .L80A79F64: diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Update.s b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Update.s index f0450e71f6..ef47a86564 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Update.s @@ -42,8 +42,8 @@ glabel EnIn_Update /* 021F0 80A7B1A0 27391BE0 */ addiu $t9, $t9, 0x1BE0 ## $t9 = 06001BE0 /* 021F4 80A7B1A4 1728000A */ bne $t9, $t0, .L80A7B1D0 /* 021F8 80A7B1A8 8FA4002C */ lw $a0, 0x002C($sp) -/* 021FC 80A7B1AC 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 02200 80A7B1B0 9529FA5A */ lhu $t1, -0x05A6($t1) ## 8015FA5A +/* 021FC 80A7B1AC 3C098016 */ lui $t1, %hi(gSaveContext+0x13fa) +/* 02200 80A7B1B0 9529FA5A */ lhu $t1, %lo(gSaveContext+0x13fa)($t1) /* 02204 80A7B1B4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 02208 80A7B1B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0220C 80A7B1BC 312A000F */ andi $t2, $t1, 0x000F ## $t2 = 00000000 @@ -77,13 +77,13 @@ glabel EnIn_Update /* 02270 80A7B220 8FBF0024 */ lw $ra, 0x0024($sp) /* 02274 80A7B224 0C29E6AD */ jal func_80A79AB4 /* 02278 80A7B228 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0227C 80A7B22C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 02280 80A7B230 85CEFA34 */ lh $t6, -0x05CC($t6) ## 8015FA34 -/* 02284 80A7B234 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0227C 80A7B22C 3C0E8016 */ lui $t6, %hi(gSaveContext+0x13d4) +/* 02280 80A7B230 85CEFA34 */ lh $t6, %lo(gSaveContext+0x13d4)($t6) +/* 02284 80A7B234 3C0F8016 */ lui $t7, %hi(gSaveContext+0x13d2) /* 02288 80A7B238 29C10006 */ slti $at, $t6, 0x0006 /* 0228C 80A7B23C 5020000F */ beql $at, $zero, .L80A7B27C /* 02290 80A7B240 8208001F */ lb $t0, 0x001F($s0) ## 0000001F -/* 02294 80A7B244 85EFFA32 */ lh $t7, -0x05CE($t7) ## 8015FA32 +/* 02294 80A7B244 85EFFA32 */ lh $t7, %lo(gSaveContext+0x13d2)($t7) /* 02298 80A7B248 51E0000C */ beql $t7, $zero, .L80A7B27C /* 0229C 80A7B24C 8208001F */ lb $t0, 0x001F($s0) ## 0000001F /* 022A0 80A7B250 86180308 */ lh $t8, 0x0308($s0) ## 00000308 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A78FB0.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A78FB0.s index 954a3c730b..095483b824 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A78FB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A78FB0.s @@ -1,6 +1,6 @@ glabel func_80A78FB0 -/* 00000 80A78FB0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00004 80A78FB4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00000 80A78FB0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00004 80A78FB4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00008 80A78FB8 944E0ED6 */ lhu $t6, 0x0ED6($v0) ## 8015F536 /* 0000C 80A78FBC AFA40000 */ sw $a0, 0x0000($sp) /* 00010 80A78FC0 31CF0010 */ andi $t7, $t6, 0x0010 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79010.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79010.s index 20d59f1524..261ac257d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79010.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79010.s @@ -21,8 +21,8 @@ glabel func_80A79010 /* 00080 80A79030 10000049 */ beq $zero, $zero, .L80A79158 /* 00084 80A79034 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L80A79038: -/* 00088 80A79038 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0008C 80A7903C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00088 80A79038 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0008C 80A7903C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00090 80A79040 94640ED6 */ lhu $a0, 0x0ED6($v1) ## 8015F536 /* 00094 80A79044 308F0100 */ andi $t7, $a0, 0x0100 ## $t7 = 00000000 /* 00098 80A79048 51E00009 */ beql $t7, $zero, .L80A79070 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79168.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79168.s index f5012fdedf..8838ea3a48 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79168.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79168.s @@ -11,8 +11,8 @@ glabel func_80A79168 /* 001DC 80A7918C 1000000B */ beq $zero, $zero, .L80A791BC /* 001E0 80A79190 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L80A79194: -/* 001E4 80A79194 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 001E8 80A79198 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 +/* 001E4 80A79194 3C0E8016 */ lui $t6, %hi(gSaveContext+4) +/* 001E8 80A79198 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) /* 001EC 80A7919C 11C00005 */ beq $t6, $zero, .L80A791B4 /* 001F0 80A791A0 00000000 */ nop /* 001F4 80A791A4 0C29E3EC */ jal func_80A78FB0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A791CC.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A791CC.s index 1b5bba98ac..c948cd4041 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A791CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A791CC.s @@ -8,8 +8,8 @@ glabel func_80A791CC /* 00234 80A791E4 1041000E */ beq $v0, $at, .L80A79220 /* 00238 80A791E8 24012045 */ addiu $at, $zero, 0x2045 ## $at = 00002045 /* 0023C 80A791EC 14410014 */ bne $v0, $at, .L80A79240 -/* 00240 80A791F0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00244 80A791F4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00240 80A791F0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00244 80A791F4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00248 80A791F8 944E0F0A */ lhu $t6, 0x0F0A($v0) ## 8015F56A /* 0024C 80A791FC 35CF0080 */ ori $t7, $t6, 0x0080 ## $t7 = 00000080 /* 00250 80A79200 A44F0F0A */ sh $t7, 0x0F0A($v0) ## 8015F56A @@ -22,8 +22,8 @@ glabel func_80A791CC /* 00268 80A79218 03E00008 */ jr $ra /* 0026C 80A7921C 00021403 */ sra $v0, $v0, 16 .L80A79220: -/* 00270 80A79220 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00274 80A79224 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00270 80A79220 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00274 80A79224 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00278 80A79228 94580ED6 */ lhu $t8, 0x0ED6($v0) ## 8015F536 /* 0027C 80A7922C 94480F0A */ lhu $t0, 0x0F0A($v0) ## 8015F56A /* 00280 80A79230 37190002 */ ori $t9, $t8, 0x0002 ## $t9 = 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7924C.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7924C.s index cdb607c925..6434f27896 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7924C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7924C.s @@ -41,14 +41,14 @@ glabel L80A792A8 /* 002FC 80A792AC 0307C021 */ addu $t8, $t8, $a3 /* 00300 80A792B0 931804BD */ lbu $t8, 0x04BD($t8) ## 000104BD /* 00304 80A792B4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00308 80A792B8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00308 80A792B8 3C028016 */ lui $v0, %hi(gSaveContext) /* 0030C 80A792BC 17010004 */ bne $t8, $at, .L80A792D0 /* 00310 80A792C0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00314 80A792C4 24192032 */ addiu $t9, $zero, 0x2032 ## $t9 = 00002032 /* 00318 80A792C8 1000000B */ beq $zero, $zero, .L80A792F8 /* 0031C 80A792CC A4D9010E */ sh $t9, 0x010E($a2) ## 0000010E .L80A792D0: -/* 00320 80A792D0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00320 80A792D0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00324 80A792D4 84480034 */ lh $t0, 0x0034($v0) ## 8015E694 /* 00328 80A792D8 24092033 */ addiu $t1, $zero, 0x2033 ## $t1 = 00002033 /* 0032C 80A792DC 240A2034 */ addiu $t2, $zero, 0x2034 ## $t2 = 00002034 @@ -61,8 +61,8 @@ glabel L80A792A8 .L80A792F8: /* 00348 80A792F8 0C042DC8 */ jal func_8010B720 /* 0034C 80A792FC 94C5010E */ lhu $a1, 0x010E($a2) ## 0000010E -/* 00350 80A79300 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00354 80A79304 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00350 80A79300 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00354 80A79304 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00358 80A79308 944B0F0A */ lhu $t3, 0x0F0A($v0) ## 8015F56A /* 0035C 80A7930C 356C0400 */ ori $t4, $t3, 0x0400 ## $t4 = 00000400 /* 00360 80A79310 1000005D */ beq $zero, $zero, .L80A79488 @@ -112,8 +112,8 @@ glabel L80A793A8 /* 003F8 80A793A8 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 /* 003FC 80A793AC 01274821 */ addu $t1, $t1, $a3 /* 00400 80A793B0 912904BD */ lbu $t1, 0x04BD($t1) ## 000104BD -/* 00404 80A793B4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00408 80A793B8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00404 80A793B4 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00408 80A793B8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0040C 80A793BC 15200008 */ bne $t1, $zero, .L80A793E0 /* 00410 80A793C0 240C2039 */ addiu $t4, $zero, 0x2039 ## $t4 = 00002039 /* 00414 80A793C4 844A0034 */ lh $t2, 0x0034($v0) ## 8015E694 @@ -129,8 +129,8 @@ glabel L80A793A8 /* 00434 80A793E4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00438 80A793E8 0C042DC8 */ jal func_8010B720 /* 0043C 80A793EC 3185FFFF */ andi $a1, $t4, 0xFFFF ## $a1 = 00002039 -/* 00440 80A793F0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00444 80A793F4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00440 80A793F0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00444 80A793F4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00448 80A793F8 944D0F0C */ lhu $t5, 0x0F0C($v0) ## 8015F56C /* 0044C 80A793FC 35AE0004 */ ori $t6, $t5, 0x0004 ## $t6 = 00000004 /* 00450 80A79400 10000021 */ beq $zero, $zero, .L80A79488 @@ -140,8 +140,8 @@ glabel L80A793A8 /* 0045C 80A7940C 01E77821 */ addu $t7, $t7, $a3 /* 00460 80A79410 91EF04BD */ lbu $t7, 0x04BD($t7) ## 000104BD /* 00464 80A79414 15E00009 */ bne $t7, $zero, .L80A7943C -/* 00468 80A79418 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0046C 80A7941C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00468 80A79418 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0046C 80A7941C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00470 80A79420 84580034 */ lh $t8, 0x0034($v0) ## 8015E694 /* 00474 80A79424 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 00478 80A79428 2B010032 */ slti $at, $t8, 0x0032 @@ -157,8 +157,8 @@ glabel L80A793A8 /* 00498 80A79448 3105FFFF */ andi $a1, $t0, 0xFFFF ## $a1 = 00002039 /* 0049C 80A7944C 0C042DC8 */ jal func_8010B720 /* 004A0 80A79450 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 004A4 80A79454 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 004A8 80A79458 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 004A4 80A79454 3C028016 */ lui $v0, %hi(gSaveContext) +/* 004A8 80A79458 2442E660 */ addiu $v0, %lo(gSaveContext) /* 004AC 80A7945C 944913FA */ lhu $t1, 0x13FA($v0) ## 8015FA5A /* 004B0 80A79460 8FA60024 */ lw $a2, 0x0024($sp) /* 004B4 80A79464 3C0F80A8 */ lui $t7, %hi(func_80A7A4C8) ## $t7 = 80A80000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7975C.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7975C.s index 6cefd962ab..d8316423ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7975C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7975C.s @@ -9,10 +9,10 @@ glabel func_80A7975C /* 007C8 80A79778 144E0008 */ bne $v0, $t6, .L80A7979C /* 007CC 80A7977C 00000000 */ nop /* 007D0 80A79780 848F00B8 */ lh $t7, 0x00B8($a0) ## 000000B8 -/* 007D4 80A79784 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 007D4 80A79784 3C188016 */ lui $t8, %hi(gSaveContext+4) /* 007D8 80A79788 144F0004 */ bne $v0, $t7, .L80A7979C /* 007DC 80A7978C 00000000 */ nop -/* 007E0 80A79790 8F18E664 */ lw $t8, -0x199C($t8) ## 8015E664 +/* 007E0 80A79790 8F18E664 */ lw $t8, %lo(gSaveContext+4)($t8) /* 007E4 80A79794 53000004 */ beql $t8, $zero, .L80A797A8 /* 007E8 80A79798 A60201E6 */ sh $v0, 0x01E6($s0) ## 000001E6 .L80A7979C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79830.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79830.s index 40b35a4aa5..236fe3766d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79830.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79830.s @@ -1,9 +1,9 @@ glabel func_80A79830 /* 00880 80A79830 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 /* 00884 80A79834 24060063 */ addiu $a2, $zero, 0x0063 ## $a2 = 00000063 -/* 00888 80A79838 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 +/* 00888 80A79838 3C078016 */ lui $a3, %hi(gSaveContext) /* 0088C 80A7983C 14C20011 */ bne $a2, $v0, .L80A79884 -/* 00890 80A79840 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 00890 80A79840 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 00894 80A79844 8CEE0004 */ lw $t6, 0x0004($a3) ## 8015E664 /* 00898 80A79848 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0089C 80A7984C 54AE000E */ bnel $a1, $t6, .L80A79888 @@ -23,8 +23,8 @@ glabel func_80A79830 .L80A79884: /* 008D4 80A79884 24030036 */ addiu $v1, $zero, 0x0036 ## $v1 = 00000036 .L80A79888: -/* 008D8 80A79888 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 008DC 80A7988C 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 008D8 80A79888 3C078016 */ lui $a3, %hi(gSaveContext) +/* 008DC 80A7988C 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 008E0 80A79890 14620011 */ bne $v1, $v0, .L80A798D8 /* 008E4 80A79894 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 008E8 80A79898 8CE90004 */ lw $t1, 0x0004($a3) ## 8015E664 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79BAC.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79BAC.s index e9b52c4648..e58086423e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79BAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79BAC.s @@ -20,8 +20,8 @@ glabel func_80A79BAC /* 00C44 80A79BF4 A4281E1A */ sh $t0, 0x1E1A($at) ## 00011E1A /* 00C48 80A79BF8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 00C4C 80A79BFC 14C10002 */ bne $a2, $at, .L80A79C08 -/* 00C50 80A79C00 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00C54 80A79C04 A42AFA72 */ sh $t2, -0x058E($at) ## 8015FA72 +/* 00C50 80A79C00 3C018016 */ lui $at, %hi(gSaveContext+0x1412) +/* 00C54 80A79C04 A42AFA72 */ sh $t2, %lo(gSaveContext+0x1412)($at) .L80A79C08: /* 00C58 80A79C08 8FAB002C */ lw $t3, 0x002C($sp) /* 00C5C 80A79C0C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -41,14 +41,14 @@ glabel func_80A79BAC /* 00C94 80A79C44 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 /* 00C98 80A79C48 8FA2001C */ lw $v0, 0x001C($sp) /* 00C9C 80A79C4C 27AE0020 */ addiu $t6, $sp, 0x0020 ## $t6 = FFFFFFF8 -/* 00CA0 80A79C50 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00CA0 80A79C50 3C0F8016 */ lui $t7, %hi(gGameInfo) /* 00CA4 80A79C54 544E0004 */ bnel $v0, $t6, .L80A79C68 /* 00CA8 80A79C58 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00CAC 80A79C5C 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 00CAC 80A79C5C 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 00CB0 80A79C60 A5E00E60 */ sh $zero, 0x0E60($t7) ## 80160E60 /* 00CB4 80A79C64 8FBF0014 */ lw $ra, 0x0014($sp) .L80A79C68: -/* 00CB8 80A79C68 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00CBC 80A79C6C A420FA2E */ sh $zero, -0x05D2($at) ## 8015FA2E +/* 00CB8 80A79C68 3C018016 */ lui $at, %hi(gSaveContext+0x13ce) +/* 00CBC 80A79C6C A420FA2E */ sh $zero, %lo(gSaveContext+0x13ce)($at) /* 00CC0 80A79C70 03E00008 */ jr $ra /* 00CC4 80A79C74 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s index 1873c7b82b..ae4bfc1504 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s @@ -37,8 +37,8 @@ glabel func_80A79FB0 /* 01034 80A79FE4 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 01038 80A79FE8 1DC000C1 */ bgtz $t6, .L80A7A2F0 .L80A79FEC: -/* 0103C 80A79FEC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 01040 80A79FF0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0103C 80A79FEC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 01040 80A79FF0 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 01044 80A79FF4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01048 80A79FF8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0104C 80A79FFC 0C00AC78 */ jal ActorShape_Init @@ -77,8 +77,8 @@ glabel func_80A79FB0 /* 010C4 80A7A074 0C29E5D7 */ jal func_80A7975C /* 010C8 80A7A078 8FA50044 */ lw $a1, 0x0044($sp) /* 010CC 80A7A07C 10400008 */ beq $v0, $zero, .L80A7A0A0 -/* 010D0 80A7A080 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 010D4 80A7A084 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 +/* 010D0 80A7A080 3C068016 */ lui $a2, %hi(gSaveContext) +/* 010D4 80A7A084 24C6E660 */ addiu $a2, %lo(gSaveContext) /* 010D8 80A7A088 94C813FA */ lhu $t0, 0x13FA($a2) ## 8015FA5A /* 010DC 80A7A08C 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 010E0 80A7A090 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF @@ -109,8 +109,8 @@ glabel func_80A79FB0 /* 0113C 80A7A0EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01140 80A7A0F0 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 /* 01144 80A7A0F4 1044001F */ beq $v0, $a0, .L80A7A174 -/* 01148 80A7A0F8 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 0114C 80A7A0FC 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 +/* 01148 80A7A0F8 3C068016 */ lui $a2, %hi(gSaveContext) +/* 0114C 80A7A0FC 24C6E660 */ addiu $a2, %lo(gSaveContext) /* 01150 80A7A100 94C213FA */ lhu $v0, 0x13FA($a2) ## 8015FA5A /* 01154 80A7A104 3042000F */ andi $v0, $v0, 0x000F ## $v0 = 00000000 /* 01158 80A7A108 2C410008 */ sltiu $at, $v0, 0x0008 @@ -132,8 +132,8 @@ glabel func_80A79FB0 /* 01190 80A7A140 0C29E5BB */ jal func_80A796EC /* 01194 80A7A144 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 /* 01198 80A7A148 8FAD0034 */ lw $t5, 0x0034($sp) -/* 0119C 80A7A14C 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 011A0 80A7A150 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 +/* 0119C 80A7A14C 3C068016 */ lui $a2, %hi(gSaveContext) +/* 011A0 80A7A150 24C6E660 */ addiu $a2, %lo(gSaveContext) /* 011A4 80A7A154 AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 /* 011A8 80A7A158 94CE0ED6 */ lhu $t6, 0x0ED6($a2) ## 8015F536 /* 011AC 80A7A15C 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 @@ -199,9 +199,9 @@ glabel L80A7A21C /* 01270 80A7A220 0C29E5BB */ jal func_80A796EC /* 01274 80A7A224 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 01278 80A7A228 3C0D80A8 */ lui $t5, %hi(func_80A7A4C8) ## $t5 = 80A80000 -/* 0127C 80A7A22C 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 0127C 80A7A22C 3C068016 */ lui $a2, %hi(gSaveContext) /* 01280 80A7A230 25ADA4C8 */ addiu $t5, $t5, %lo(func_80A7A4C8) ## $t5 = 80A7A4C8 -/* 01284 80A7A234 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 +/* 01284 80A7A234 24C6E660 */ addiu $a2, %lo(gSaveContext) /* 01288 80A7A238 AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 /* 0128C 80A7A23C 1000002C */ beq $zero, $zero, .L80A7A2F0 /* 01290 80A7A240 A4C013FA */ sh $zero, 0x13FA($a2) ## 8015FA5A diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A304.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A304.s index a2cccec80a..e117f50327 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A304.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A304.s @@ -54,7 +54,7 @@ glabel func_80A7A304 /* 013F8 80A7A3A8 8FBF002C */ lw $ra, 0x002C($sp) /* 013FC 80A7A3AC 861901E6 */ lh $t9, 0x01E6($s0) ## 000001E6 /* 01400 80A7A3B0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01404 80A7A3B4 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 01404 80A7A3B4 3C078013 */ lui $a3, %hi(D_801333E0) /* 01408 80A7A3B8 07210004 */ bgez $t9, .L80A7A3CC /* 0140C 80A7A3BC 33280007 */ andi $t0, $t9, 0x0007 ## $t0 = 00000000 /* 01410 80A7A3C0 11000002 */ beq $t0, $zero, .L80A7A3CC @@ -63,15 +63,15 @@ glabel func_80A7A304 .L80A7A3CC: /* 0141C 80A7A3CC A60801E6 */ sh $t0, 0x01E6($s0) ## 000001E6 /* 01420 80A7A3D0 860201E6 */ lh $v0, 0x01E6($s0) ## 000001E6 -/* 01424 80A7A3D4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01424 80A7A3D4 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01428 80A7A3D8 2404181E */ addiu $a0, $zero, 0x181E ## $a0 = 0000181E /* 0142C 80A7A3DC 10410003 */ beq $v0, $at, .L80A7A3EC /* 01430 80A7A3E0 A60201E8 */ sh $v0, 0x01E8($s0) ## 000001E8 /* 01434 80A7A3E4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 01438 80A7A3E8 14410018 */ bne $v0, $at, .L80A7A44C .L80A7A3EC: -/* 0143C 80A7A3EC 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 01440 80A7A3F0 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 +/* 0143C 80A7A3EC 3C098013 */ lui $t1, %hi(D_801333E8) +/* 01440 80A7A3F0 252933E8 */ addiu $t1, %lo(D_801333E8) /* 01444 80A7A3F4 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 01448 80A7A3F8 AFA50038 */ sw $a1, 0x0038($sp) /* 0144C 80A7A3FC AFA90014 */ sw $t1, 0x0014($sp) @@ -84,15 +84,15 @@ glabel func_80A7A304 /* 01460 80A7A410 00000000 */ nop /* 01464 80A7A414 3C0180A8 */ lui $at, %hi(D_80A7BADC) ## $at = 80A80000 /* 01468 80A7A418 C430BADC */ lwc1 $f16, %lo(D_80A7BADC)($at) -/* 0146C 80A7A41C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01470 80A7A420 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 0146C 80A7A41C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01470 80A7A420 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01474 80A7A424 4610003C */ c.lt.s $f0, $f16 /* 01478 80A7A428 24041844 */ addiu $a0, $zero, 0x1844 ## $a0 = 00001844 /* 0147C 80A7A42C 8FA50038 */ lw $a1, 0x0038($sp) /* 01480 80A7A430 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 01484 80A7A434 45000005 */ bc1f .L80A7A44C -/* 01488 80A7A438 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 0148C 80A7A43C 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 +/* 01488 80A7A438 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 0148C 80A7A43C 254A33E8 */ addiu $t2, %lo(D_801333E8) /* 01490 80A7A440 AFAA0014 */ sw $t2, 0x0014($sp) /* 01494 80A7A444 0C03DCE3 */ jal Audio_PlaySoundGeneral diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A4C8.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A4C8.s index 4ec7ec313e..e595b94895 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A4C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A4C8.s @@ -9,8 +9,8 @@ glabel func_80A7A4C8 /* 01534 80A7A4E4 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 /* 01538 80A7A4E8 0C29E6EB */ jal func_80A79BAC /* 0153C 80A7A4EC AFA40018 */ sw $a0, 0x0018($sp) -/* 01540 80A7A4F0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01544 80A7A4F4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01540 80A7A4F0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01544 80A7A4F4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01548 80A7A4F8 944F13FA */ lhu $t7, 0x13FA($v0) ## 8015FA5A /* 0154C 80A7A4FC 944B0F0C */ lhu $t3, 0x0F0C($v0) ## 8015F56C /* 01550 80A7A500 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A568.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A568.s index 5c4957697e..932f30045a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A568.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A568.s @@ -1,6 +1,6 @@ glabel func_80A7A568 -/* 015B8 80A7A568 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 015BC 80A7A56C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 015B8 80A7A568 3C028016 */ lui $v0, %hi(gSaveContext) +/* 015BC 80A7A56C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 015C0 80A7A570 944E0ED6 */ lhu $t6, 0x0ED6($v0) ## 8015F536 /* 015C4 80A7A574 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 015C8 80A7A578 AFBF0024 */ sw $ra, 0x0024($sp) @@ -22,13 +22,13 @@ glabel func_80A7A568 /* 01604 80A7A5B4 844A13CE */ lh $t2, 0x13CE($v0) ## 8015FA2E .L80A7A5B8: /* 01608 80A7A5B8 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0160C 80A7A5BC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 0160C 80A7A5BC 3C078013 */ lui $a3, %hi(D_801333E0) /* 01610 80A7A5C0 15410014 */ bne $t2, $at, .L80A7A614 -/* 01614 80A7A5C4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 01618 80A7A5C8 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 -/* 0161C 80A7A5CC 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 -/* 01620 80A7A5D0 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 01624 80A7A5D4 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 01614 80A7A5C4 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 01618 80A7A5C8 3C0B8013 */ lui $t3, %hi(D_801333E8) +/* 0161C 80A7A5CC 256B33E8 */ addiu $t3, %lo(D_801333E8) +/* 01620 80A7A5D0 3C058013 */ lui $a1, %hi(D_801333D4) +/* 01624 80A7A5D4 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 01628 80A7A5D8 AFAB0014 */ sw $t3, 0x0014($sp) /* 0162C 80A7A5DC 2404482C */ addiu $a0, $zero, 0x482C ## $a0 = 0000482C /* 01630 80A7A5E0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 @@ -39,9 +39,9 @@ glabel func_80A7A568 /* 01640 80A7A5F0 0C29E71E */ jal func_80A79C78 /* 01644 80A7A5F4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01648 80A7A5F8 3C0C80A8 */ lui $t4, %hi(func_80A7B024) ## $t4 = 80A80000 -/* 0164C 80A7A5FC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 0164C 80A7A5FC 3C028016 */ lui $v0, %hi(gSaveContext) /* 01650 80A7A600 258CB024 */ addiu $t4, $t4, %lo(func_80A7B024) ## $t4 = 80A7B024 -/* 01654 80A7A604 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01654 80A7A604 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01658 80A7A608 AE2C0190 */ sw $t4, 0x0190($s1) ## 00000190 /* 0165C 80A7A60C 10000053 */ beq $zero, $zero, .L80A7A75C /* 01660 80A7A610 A44013CE */ sh $zero, 0x13CE($v0) ## 8015FA2E @@ -52,8 +52,8 @@ glabel func_80A7A568 /* 01670 80A7A620 15A1004E */ bne $t5, $at, .L80A7A75C /* 01674 80A7A624 01D07021 */ addu $t6, $t6, $s0 /* 01678 80A7A628 91CE04BD */ lbu $t6, 0x04BD($t6) ## 000104BD -/* 0167C 80A7A62C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01680 80A7A630 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 0167C 80A7A62C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01680 80A7A630 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01684 80A7A634 15C0001C */ bne $t6, $zero, .L80A7A6A8 /* 01688 80A7A638 2404482C */ addiu $a0, $zero, 0x482C ## $a0 = 0000482C /* 0168C 80A7A63C 844F0034 */ lh $t7, 0x0034($v0) ## 8015E694 @@ -85,17 +85,17 @@ glabel func_80A7A568 /* 016F0 80A7A6A0 1000001B */ beq $zero, $zero, .L80A7A710 /* 016F4 80A7A6A4 A45913FA */ sh $t9, 0x13FA($v0) ## 8015FA5A .L80A7A6A8: -/* 016F8 80A7A6A8 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 016FC 80A7A6AC 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 -/* 01700 80A7A6B0 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 01704 80A7A6B4 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 016F8 80A7A6A8 3C088013 */ lui $t0, %hi(D_801333E8) +/* 016FC 80A7A6AC 250833E8 */ addiu $t0, %lo(D_801333E8) +/* 01700 80A7A6B0 3C058013 */ lui $a1, %hi(D_801333D4) +/* 01704 80A7A6B4 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 01708 80A7A6B8 AFA80014 */ sw $t0, 0x0014($sp) /* 0170C 80A7A6BC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 01710 80A7A6C0 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 01714 80A7A6C4 AFA70010 */ sw $a3, 0x0010($sp) -/* 01718 80A7A6C8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0171C 80A7A6CC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01718 80A7A6C8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0171C 80A7A6CC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01720 80A7A6D0 94430ED6 */ lhu $v1, 0x0ED6($v0) ## 8015F536 /* 01724 80A7A6D4 30690800 */ andi $t1, $v1, 0x0800 ## $t1 = 00000000 /* 01728 80A7A6D8 55200009 */ bnel $t1, $zero, .L80A7A700 @@ -119,9 +119,9 @@ glabel func_80A7A568 /* 01764 80A7A714 0C29E6EB */ jal func_80A79BAC /* 01768 80A7A718 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0176C 80A7A71C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01770 80A7A720 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 01770 80A7A720 3C028016 */ lui $v0, %hi(gSaveContext) /* 01774 80A7A724 00300821 */ addu $at, $at, $s0 -/* 01778 80A7A728 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01778 80A7A728 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0177C 80A7A72C A02004BF */ sb $zero, 0x04BF($at) ## 000104BF /* 01780 80A7A730 944F13FA */ lhu $t7, 0x13FA($v0) ## 8015FA5A /* 01784 80A7A734 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A770.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A770.s index d077a17796..971286e206 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A770.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A770.s @@ -27,9 +27,9 @@ glabel func_80A7A770 /* 01820 80A7A7D0 AC990004 */ sw $t9, 0x0004($a0) ## 00000004 /* 01824 80A7A7D4 8FA60018 */ lw $a2, 0x0018($sp) /* 01828 80A7A7D8 3C0880A8 */ lui $t0, %hi(func_80A7A848) ## $t0 = 80A80000 -/* 0182C 80A7A7DC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 0182C 80A7A7DC 3C028016 */ lui $v0, %hi(gSaveContext) /* 01830 80A7A7E0 2508A848 */ addiu $t0, $t0, %lo(func_80A7A848) ## $t0 = 80A7A848 -/* 01834 80A7A7E4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01834 80A7A7E4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01838 80A7A7E8 ACC80190 */ sw $t0, 0x0190($a2) ## 00000190 /* 0183C 80A7A7EC 944913FA */ lhu $t1, 0x13FA($v0) ## 8015FA5A /* 01840 80A7A7F0 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A848.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A848.s index 538e7883d1..bc73ba49b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A848.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A848.s @@ -7,8 +7,8 @@ glabel func_80A7A848 /* 018AC 80A7A85C 15C10034 */ bne $t6, $at, .L80A7A930 /* 018B0 80A7A860 00651821 */ addu $v1, $v1, $a1 /* 018B4 80A7A864 906304BD */ lbu $v1, 0x04BD($v1) ## 000104BD -/* 018B8 80A7A868 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 018BC 80A7A86C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 018B8 80A7A868 3C028016 */ lui $v0, %hi(gSaveContext) +/* 018BC 80A7A86C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 018C0 80A7A870 14600005 */ bne $v1, $zero, .L80A7A888 /* 018C4 80A7A874 00000000 */ nop /* 018C8 80A7A878 844F0034 */ lh $t7, 0x0034($v0) ## 8015E694 @@ -16,10 +16,10 @@ glabel func_80A7A848 /* 018D0 80A7A880 54200006 */ bnel $at, $zero, .L80A7A89C /* 018D4 80A7A884 945813FA */ lhu $t8, 0x13FA($v0) ## 8015FA5A .L80A7A888: -/* 018D8 80A7A888 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 018D8 80A7A888 3C028016 */ lui $v0, %hi(gSaveContext) /* 018DC 80A7A88C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 018E0 80A7A890 14610008 */ bne $v1, $at, .L80A7A8B4 -/* 018E4 80A7A894 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 018E4 80A7A894 2442E660 */ addiu $v0, %lo(gSaveContext) /* 018E8 80A7A898 945813FA */ lhu $t8, 0x13FA($v0) ## 8015FA5A .L80A7A89C: /* 018EC 80A7A89C 3C0880A8 */ lui $t0, %hi(func_80A7A4C8) ## $t0 = 80A80000 @@ -34,8 +34,8 @@ glabel func_80A7A848 /* 0190C 80A7A8BC AFA40018 */ sw $a0, 0x0018($sp) /* 01910 80A7A8C0 0C29E6EB */ jal func_80A79BAC /* 01914 80A7A8C4 AFA5001C */ sw $a1, 0x001C($sp) -/* 01918 80A7A8C8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0191C 80A7A8CC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01918 80A7A8C8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0191C 80A7A8CC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01920 80A7A8D0 944913FA */ lhu $t1, 0x13FA($v0) ## 8015FA5A /* 01924 80A7A8D4 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 01928 80A7A8D8 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A940.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A940.s index 20102809af..9250f8cead 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A940.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A940.s @@ -38,8 +38,8 @@ glabel func_80A7A940 /* 01A10 80A7A9C0 AFA40018 */ sw $a0, 0x0018($sp) /* 01A14 80A7A9C4 0C29E6EB */ jal func_80A79BAC /* 01A18 80A7A9C8 8FA5001C */ lw $a1, 0x001C($sp) -/* 01A1C 80A7A9CC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01A20 80A7A9D0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01A1C 80A7A9CC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01A20 80A7A9D0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01A24 80A7A9D4 944C13FA */ lhu $t4, 0x13FA($v0) ## 8015FA5A /* 01A28 80A7A9D8 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 01A2C 80A7A9DC 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B024.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B024.s index 6875776f16..99f15a0c66 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B024.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B024.s @@ -15,9 +15,9 @@ glabel func_80A7B024 .L80A7B058: /* 020A8 80A7B058 8FB80018 */ lw $t8, 0x0018($sp) /* 020AC 80A7B05C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 020B0 80A7B060 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 020B0 80A7B060 3C028016 */ lui $v0, %hi(gSaveContext) /* 020B4 80A7B064 87190308 */ lh $t9, 0x0308($t8) ## 00000308 -/* 020B8 80A7B068 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 020B8 80A7B068 2442E660 */ addiu $v0, %lo(gSaveContext) /* 020BC 80A7B06C 57210025 */ bnel $t9, $at, .L80A7B104 /* 020C0 80A7B070 8FBF0014 */ lw $ra, 0x0014($sp) /* 020C4 80A7B074 94430ED6 */ lhu $v1, 0x0ED6($v0) ## 8015F536 @@ -36,8 +36,8 @@ glabel func_80A7B024 .L80A7B0A4: /* 020F4 80A7B0A4 0C29E6EB */ jal func_80A79BAC /* 020F8 80A7B0A8 AFA5001C */ sw $a1, 0x001C($sp) -/* 020FC 80A7B0AC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 02100 80A7B0B0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 020FC 80A7B0AC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 02100 80A7B0B0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 02104 80A7B0B4 944C13FA */ lhu $t4, 0x13FA($v0) ## 8015FA5A /* 02108 80A7B0B8 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 0210C 80A7B0BC 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D460.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D460.s index 676e6e8fc9..a1b93caef0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D460.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7D460.s @@ -472,12 +472,12 @@ glabel func_80A7D460 /* 01B9C 80A7D9BC 14200023 */ bne $at, $zero, .L80A7DA4C /* 01BA0 80A7D9C0 24580001 */ addiu $t8, $v0, 0x0001 ## $t8 = 00000001 /* 01BA4 80A7D9C4 8E020320 */ lw $v0, 0x0320($s0) ## 00000320 -/* 01BA8 80A7D9C8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 01BA8 80A7D9C8 3C088016 */ lui $t0, %hi(gSaveContext+0xe9c) /* 01BAC 80A7D9CC 5040001C */ beql $v0, $zero, .L80A7DA40 /* 01BB0 80A7D9D0 34CF0080 */ ori $t7, $a2, 0x0080 ## $t7 = 000000C0 /* 01BB4 80A7D9D4 8443001C */ lh $v1, 0x001C($v0) ## 0000001C -/* 01BB8 80A7D9D8 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 -/* 01BBC 80A7D9DC 3C0B8012 */ lui $t3, 0x8012 ## $t3 = 80120000 +/* 01BB8 80A7D9D8 3C098012 */ lui $t1, %hi(D_8012723C) +/* 01BBC 80A7D9DC 3C0B8012 */ lui $t3, %hi(D_8012724C) /* 01BC0 80A7D9E0 00032203 */ sra $a0, $v1, 8 /* 01BC4 80A7D9E4 3084001F */ andi $a0, $a0, 0x001F ## $a0 = 00000000 /* 01BC8 80A7D9E8 2484FFFF */ addiu $a0, $a0, 0xFFFF ## $a0 = FFFFFFFF @@ -487,10 +487,10 @@ glabel func_80A7D460 /* 01BD8 80A7D9F8 00052880 */ sll $a1, $a1, 2 /* 01BDC 80A7D9FC 01254821 */ addu $t1, $t1, $a1 /* 01BE0 80A7DA00 01194021 */ addu $t0, $t0, $t9 -/* 01BE4 80A7DA04 8D08F4FC */ lw $t0, -0x0B04($t0) ## 8015F4FC -/* 01BE8 80A7DA08 8D29723C */ lw $t1, 0x723C($t1) ## 8012723C +/* 01BE4 80A7DA04 8D08F4FC */ lw $t0, %lo(gSaveContext+0xe9c)($t0) +/* 01BE8 80A7DA08 8D29723C */ lw $t1, %lo(D_8012723C)($t1) /* 01BEC 80A7DA0C 01655821 */ addu $t3, $t3, $a1 -/* 01BF0 80A7DA10 8D6B724C */ lw $t3, 0x724C($t3) ## 8012724C +/* 01BF0 80A7DA10 8D6B724C */ lw $t3, %lo(D_8012724C)($t3) /* 01BF4 80A7DA14 01095024 */ and $t2, $t0, $t1 /* 01BF8 80A7DA18 306D00FF */ andi $t5, $v1, 0x00FF ## $t5 = 00000000 /* 01BFC 80A7DA1C 016A6006 */ srlv $t4, $t2, $t3 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s index e499a0409a..bac2390302 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s @@ -54,7 +54,7 @@ glabel EnJj_Draw /* 00894 80A88094 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00898 80A88098 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 0089C 80A8809C 3C0480A9 */ lui $a0, %hi(D_80A88CFC) ## $a0 = 80A90000 -/* 008A0 80A880A0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 008A0 80A880A0 3C0E8016 */ lui $t6, %hi(gSegments) /* 008A4 80A880A4 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 /* 008A8 80A880A8 ACB802C0 */ sw $t8, 0x02C0($a1) ## 000002C0 /* 008AC 80A880AC AC790000 */ sw $t9, 0x0000($v1) ## 00000000 @@ -68,7 +68,7 @@ glabel EnJj_Draw /* 008CC 80A880CC 000B6702 */ srl $t4, $t3, 28 /* 008D0 80A880D0 000C6880 */ sll $t5, $t4, 2 /* 008D4 80A880D4 01CD7021 */ addu $t6, $t6, $t5 -/* 008D8 80A880D8 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 008D8 80A880D8 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 008DC 80A880DC 00815024 */ and $t2, $a0, $at /* 008E0 80A880E0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 008E4 80A880E4 014E7821 */ addu $t7, $t2, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s index 25ad5e1c99..b69c3c1ae6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s @@ -52,8 +52,8 @@ glabel EnJj_Init /* 000C4 80A878C4 A200030F */ sb $zero, 0x030F($s0) ## 0000030F /* 000C8 80A878C8 A2000310 */ sb $zero, 0x0310($s0) ## 00000310 /* 000CC 80A878CC A2000311 */ sb $zero, 0x0311($s0) ## 00000311 -/* 000D0 80A878D0 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 000D4 80A878D4 9739F53A */ lhu $t9, -0x0AC6($t9) ## 8015F53A +/* 000D0 80A878D0 3C198016 */ lui $t9, %hi(gSaveContext+0xeda) +/* 000D4 80A878D4 9739F53A */ lhu $t9, %lo(gSaveContext+0xeda)($t9) /* 000D8 80A878D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000DC 80A878DC 3C0580A8 */ lui $a1, %hi(func_80A87C30) ## $a1 = 80A80000 /* 000E0 80A878E0 33280400 */ andi $t0, $t9, 0x0400 ## $t0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87CEC.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87CEC.s index ab771c0228..2e1b0dd6cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87CEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87CEC.s @@ -19,9 +19,9 @@ glabel func_80A87CEC /* 0052C 80A87D2C 8FA3001C */ lw $v1, 0x001C($sp) /* 00530 80A87D30 25EF8164 */ addiu $t7, $t7, %lo(D_80A88164) ## $t7 = 80A88164 /* 00534 80A87D34 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00538 80A87D38 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00538 80A87D38 3C018016 */ lui $at, %hi(gSaveContext+0x1414) /* 0053C 80A87D3C AC8F1D68 */ sw $t7, 0x1D68($a0) ## 00001D68 -/* 00540 80A87D40 A038FA74 */ sb $t8, -0x058C($at) ## 8015FA74 +/* 00540 80A87D40 A038FA74 */ sb $t8, %lo(gSaveContext+0x1414)($at) /* 00544 80A87D44 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 /* 00548 80A87D48 0C00FAFE */ jal func_8003EBF8 /* 0054C 80A87D4C 8C66014C */ lw $a2, 0x014C($v1) ## 0000014C @@ -31,8 +31,8 @@ glabel func_80A87CEC /* 0055C 80A87D5C 00E84821 */ addu $t1, $a3, $t0 /* 00560 80A87D60 0C016C69 */ jal func_8005B1A4 /* 00564 80A87D64 8D240790 */ lw $a0, 0x0790($t1) ## 00000790 -/* 00568 80A87D68 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0056C 80A87D6C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00568 80A87D68 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0056C 80A87D6C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00570 80A87D70 944A0EDA */ lhu $t2, 0x0EDA($v0) ## 8015F53A /* 00574 80A87D74 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 /* 00578 80A87D78 354B0400 */ ori $t3, $t2, 0x0400 ## $t3 = 00000400 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Update.s index 7218006f8d..6c8b70c094 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Update.s @@ -30,7 +30,7 @@ glabel EnJs_Update /* 0058C 80A8939C E7A00010 */ swc1 $f0, 0x0010($sp) /* 00590 80A893A0 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 /* 00594 80A893A4 8FA4004C */ lw $a0, 0x004C($sp) -/* 00598 80A893A8 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 00598 80A893A8 3C098016 */ lui $t1, %hi(gGameInfo) /* 0059C 80A893AC 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 /* 005A0 80A893B0 1300001F */ beq $t8, $zero, .L80A89430 /* 005A4 80A893B4 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 @@ -39,8 +39,8 @@ glabel EnJs_Update /* 005B0 80A893C0 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D /* 005B4 80A893C4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 005B8 80A893C8 14410028 */ bne $v0, $at, .L80A8946C -/* 005BC 80A893CC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 005C0 80A893D0 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 005BC 80A893CC 3C028016 */ lui $v0, %hi(gGameInfo) +/* 005C0 80A893D0 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 005C4 80A893D4 3C01C4FA */ lui $at, 0xC4FA ## $at = C4FA0000 /* 005C8 80A893D8 44814000 */ mtc1 $at, $f8 ## $f8 = -2000.00 /* 005CC 80A893DC 84590CB4 */ lh $t9, 0x0CB4($v0) ## 80160CB4 @@ -66,7 +66,7 @@ glabel EnJs_Update /* 00618 80A89428 10000010 */ beq $zero, $zero, .L80A8946C /* 0061C 80A8942C 00000000 */ nop .L80A89430: -/* 00620 80A89430 8D29FA90 */ lw $t1, -0x0570($t1) ## FFFFFA90 +/* 00620 80A89430 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) /* 00624 80A89434 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00628 80A89438 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 0062C 80A8943C 852A0CB6 */ lh $t2, 0x0CB6($t1) ## 00000CB6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A891C4.s b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A891C4.s index c6229ed555..352c91a486 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A891C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A891C4.s @@ -17,7 +17,7 @@ glabel func_80A891C4 /* 003F0 80A89200 00461021 */ addu $v0, $v0, $a2 /* 003F4 80A89204 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD /* 003F8 80A89208 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 003FC 80A8920C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 003FC 80A8920C 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) /* 00400 80A89210 10400005 */ beq $v0, $zero, .L80A89228 /* 00404 80A89214 00000000 */ nop /* 00408 80A89218 10410016 */ beq $v0, $at, .L80A89274 @@ -25,7 +25,7 @@ glabel func_80A891C4 /* 00410 80A89220 10000019 */ beq $zero, $zero, .L80A89288 /* 00414 80A89224 8FBF0014 */ lw $ra, 0x0014($sp) .L80A89228: -/* 00418 80A89228 85CEE694 */ lh $t6, -0x196C($t6) ## 8015E694 +/* 00418 80A89228 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) /* 0041C 80A8922C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 00420 80A89230 29C100C8 */ slti $at, $t6, 0x00C8 /* 00424 80A89234 10200007 */ beq $at, $zero, .L80A89254 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89860.s b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89860.s index 14ca64ddba..30440605e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89860.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89860.s @@ -30,11 +30,11 @@ glabel func_80A89860 /* 0011C 80A898BC 8FD80008 */ lw $t8, 0x0008($s8) ## 0000002C /* 00120 80A898C0 0002C900 */ sll $t9, $v0, 4 /* 00124 80A898C4 2463C398 */ addiu $v1, $v1, %lo(D_80A8C398) ## $v1 = 80A8C398 -/* 00128 80A898C8 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 00128 80A898C8 3C068016 */ lui $a2, %hi(gSegments) /* 0012C 80A898CC 00194F02 */ srl $t1, $t9, 28 /* 00130 80A898D0 00037900 */ sll $t7, $v1, 4 /* 00134 80A898D4 ADD80008 */ sw $t8, 0x0008($t6) ## FFFFFFF0 -/* 00138 80A898D8 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 00138 80A898D8 24C66FA8 */ addiu $a2, %lo(gSegments) /* 0013C 80A898DC 00095080 */ sll $t2, $t1, 2 /* 00140 80A898E0 000FC702 */ srl $t8, $t7, 28 /* 00144 80A898E4 00CA5821 */ addu $t3, $a2, $t2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89A6C.s b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89A6C.s index 3dfbc860ad..ee0dccf253 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89A6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89A6C.s @@ -58,9 +58,9 @@ glabel func_80A89A6C /* 00334 80A89AD4 3C0280A9 */ lui $v0, %hi(D_80A8CC98) ## $v0 = 80A90000 /* 00338 80A89AD8 2442CC98 */ addiu $v0, $v0, %lo(D_80A8CC98) ## $v0 = 80A8CC98 /* 0033C 80A89ADC 00027100 */ sll $t6, $v0, 4 -/* 00340 80A89AE0 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 00340 80A89AE0 3C048016 */ lui $a0, %hi(gSegments) /* 00344 80A89AE4 000E7F02 */ srl $t7, $t6, 28 -/* 00348 80A89AE8 24846FA8 */ addiu $a0, $a0, 0x6FA8 ## $a0 = 80166FA8 +/* 00348 80A89AE8 24846FA8 */ addiu $a0, %lo(gSegments) /* 0034C 80A89AEC 000FC080 */ sll $t8, $t7, 2 /* 00350 80A89AF0 0098C821 */ addu $t9, $a0, $t8 /* 00354 80A89AF4 8F2E0000 */ lw $t6, 0x0000($t9) ## 00000000 @@ -85,9 +85,9 @@ glabel func_80A89A6C /* 0039C 80A89B3C 3C0280A9 */ lui $v0, %hi(D_80A8DAB8) ## $v0 = 80A90000 /* 003A0 80A89B40 2442DAB8 */ addiu $v0, $v0, %lo(D_80A8DAB8) ## $v0 = 80A8DAB8 /* 003A4 80A89B44 0002C100 */ sll $t8, $v0, 4 -/* 003A8 80A89B48 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 003A8 80A89B48 3C048016 */ lui $a0, %hi(gSegments) /* 003AC 80A89B4C 0018CF02 */ srl $t9, $t8, 28 -/* 003B0 80A89B50 24846FA8 */ addiu $a0, $a0, 0x6FA8 ## $a0 = 80166FA8 +/* 003B0 80A89B50 24846FA8 */ addiu $a0, %lo(gSegments) /* 003B4 80A89B54 00197080 */ sll $t6, $t9, 2 /* 003B8 80A89B58 008E7821 */ addu $t7, $a0, $t6 /* 003BC 80A89B5C 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 @@ -128,7 +128,7 @@ glabel func_80A89A6C /* 00444 80A89BE4 46009005 */ abs.s $f0, $f18 /* 00448 80A89BE8 46025582 */ mul.s $f22, $f10, $f2 /* 0044C 80A89BEC 460C003C */ c.lt.s $f0, $f12 -/* 00450 80A89BF0 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 00450 80A89BF0 3C198016 */ lui $t9, %hi(gSaveContext) /* 00454 80A89BF4 4502000F */ bc1fl .L80A89C34 /* 00458 80A89BF8 C5040024 */ lwc1 $f4, 0x0024($t0) ## 00000024 /* 0045C 80A89BFC C430E488 */ lwc1 $f16, %lo(D_80A8E488)($at) @@ -155,7 +155,7 @@ glabel func_80A89A6C /* 004AC 80A89C4C 46023202 */ mul.s $f8, $f6, $f2 /* 004B0 80A89C50 24110001 */ addiu $s1, $zero, 0x0001 ## $s1 = 00000001 /* 004B4 80A89C54 27AA00E0 */ addiu $t2, $sp, 0x00E0 ## $t2 = FFFFFFB8 -/* 004B8 80A89C58 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 004B8 80A89C58 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) /* 004BC 80A89C5C E7A800D4 */ swc1 $f8, 0x00D4($sp) /* 004C0 80A89C60 C50A0028 */ lwc1 $f10, 0x0028($t0) ## 00000028 /* 004C4 80A89C64 C6480168 */ lwc1 $f8, 0x0168($s2) ## 00000168 @@ -177,12 +177,12 @@ glabel func_80A89A6C /* 00500 80A89CA0 2A210003 */ slti $at, $s1, 0x0003 /* 00504 80A89CA4 1420FFFA */ bne $at, $zero, .L80A89C90 /* 00508 80A89CA8 A3000000 */ sb $zero, 0x0000($t8) ## 00000000 -/* 0050C 80A89CAC 8F39E660 */ lw $t9, -0x19A0($t9) ## 8015E660 +/* 0050C 80A89CAC 8F39E660 */ lw $t9, %lo(gSaveContext)($t9) /* 00510 80A89CB0 24010157 */ addiu $at, $zero, 0x0157 ## $at = 00000157 /* 00514 80A89CB4 24110001 */ addiu $s1, $zero, 0x0001 ## $s1 = 00000001 /* 00518 80A89CB8 1721003C */ bne $t9, $at, .L80A89DAC /* 0051C 80A89CBC 00000000 */ nop -/* 00520 80A89CC0 8DCEF9C0 */ lw $t6, -0x0640($t6) ## 8015F9C0 +/* 00520 80A89CC0 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) /* 00524 80A89CC4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 /* 00528 80A89CC8 15C10038 */ bne $t6, $at, .L80A89DAC /* 0052C 80A89CCC 00000000 */ nop @@ -578,9 +578,9 @@ glabel func_80A89A6C /* 00AD0 80A8A270 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 /* 00AD4 80A8A274 C6460168 */ lwc1 $f6, 0x0168($s2) ## 00000168 /* 00AD8 80A8A278 E6580060 */ swc1 $f24, 0x0060($s2) ## 00000060 -/* 00ADC 80A8A27C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00ADC 80A8A27C 3C028016 */ lui $v0, %hi(gSaveContext+0xc) /* 00AE0 80A8A280 E6460028 */ swc1 $f6, 0x0028($s2) ## 00000028 -/* 00AE4 80A8A284 9442E66C */ lhu $v0, -0x1994($v0) ## 8015E66C +/* 00AE4 80A8A284 9442E66C */ lhu $v0, %lo(gSaveContext+0xc)($v0) /* 00AE8 80A8A288 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 00AEC 80A8A28C 3419FFFF */ ori $t9, $zero, 0xFFFF ## $t9 = 0000FFFF /* 00AF0 80A8A290 0041082A */ slt $at, $v0, $at diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s index 5722a683b1..268b920ba2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s @@ -10,8 +10,8 @@ glabel D_80A8FEBC .text glabel EnKakasi_Draw /* 00BE0 80A8FD50 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00BE4 80A8FD54 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00BE8 80A8FD58 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 00BE4 80A8FD54 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 00BE8 80A8FD58 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 00BEC 80A8FD5C AFBF0024 */ sw $ra, 0x0024($sp) /* 00BF0 80A8FD60 AFA40028 */ sw $a0, 0x0028($sp) /* 00BF4 80A8FD64 AFA5002C */ sw $a1, 0x002C($sp) @@ -23,8 +23,8 @@ glabel EnKakasi_Draw /* 00C0C 80A8FD7C 2484FEB8 */ addiu $a0, $a0, %lo(D_80A8FEB8) ## $a0 = 80A8FEB8 /* 00C10 80A8FD80 3C0480A9 */ lui $a0, %hi(D_80A8FEBC) ## $a0 = 80A90000 -/* 00C14 80A8FD84 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00C18 80A8FD88 90A5F5A0 */ lbu $a1, -0x0A60($a1) ## 8015F5A0 +/* 00C14 80A8FD84 3C058016 */ lui $a1, %hi(gSaveContext+0xf40) +/* 00C18 80A8FD88 90A5F5A0 */ lbu $a1, %lo(gSaveContext+0xf40)($a1) /* 00C1C 80A8FD8C 0C00084C */ jal osSyncPrintf /* 00C20 80A8FD90 2484FEBC */ addiu $a0, $a0, %lo(D_80A8FEBC) ## $a0 = 80A8FEBC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F660.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F660.s index c24f2751f8..6c6121aed5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F660.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F660.s @@ -30,10 +30,10 @@ glabel func_80A8F660 /* 0055C 80A8F6CC 0C029468 */ jal SkelAnime_ChangeAnim /* 00560 80A8F6D0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00564 80A8F6D4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00564 80A8F6D4 3C028016 */ lui $v0, %hi(gSaveContext) /* 00568 80A8F6D8 24084076 */ addiu $t0, $zero, 0x4076 ## $t0 = 00004076 /* 0056C 80A8F6DC 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 -/* 00570 80A8F6E0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00570 80A8F6E0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00574 80A8F6E4 A608010E */ sh $t0, 0x010E($s0) ## 0000010E /* 00578 80A8F6E8 A6090196 */ sh $t1, 0x0196($s0) ## 00000196 /* 0057C 80A8F6EC 8C4A0004 */ lw $t2, 0x0004($v0) ## 8015E664 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Update.s index d79d6bfb15..6a535e1b1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Update.s @@ -61,8 +61,8 @@ glabel EnKakasi2_Update ## CollisionCheck_setOT /* 007C4 80A907D4 8FA60050 */ lw $a2, 0x0050($sp) .L80A907D8: -/* 007C8 80A907D8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 007CC 80A907DC 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 007C8 80A907D8 3C028016 */ lui $v0, %hi(gGameInfo) +/* 007CC 80A907DC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 007D0 80A907E0 845812D4 */ lh $t8, 0x12D4($v0) ## 801612D4 /* 007D4 80A907E4 53000054 */ beql $t8, $zero, .L80A90938 /* 007D8 80A907E8 8FBF004C */ lw $ra, 0x004C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s index 3aef5c5eb7..a33cdc7cae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s @@ -15,10 +15,10 @@ glabel func_80A90264 /* 00260 80A90270 AFB00024 */ sw $s0, 0x0024($sp) /* 00264 80A90274 848E0194 */ lh $t6, 0x0194($a0) ## 00000194 /* 00268 80A90278 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 0026C 80A9027C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0026C 80A9027C 3C188016 */ lui $t8, %hi(gGameInfo) /* 00270 80A90280 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 /* 00274 80A90284 A48F0194 */ sh $t7, 0x0194($a0) ## 00000194 -/* 00278 80A90288 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 00278 80A90288 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 0027C 80A9028C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00280 80A90290 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00284 80A90294 871912D6 */ lh $t9, 0x12D6($t8) ## 801612D6 @@ -100,14 +100,14 @@ glabel func_80A90264 /* 0039C 80A903AC C4460028 */ lwc1 $f6, 0x0028($v0) ## 00000028 /* 003A0 80A903B0 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 003A4 80A903B4 C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 -/* 003A8 80A903B8 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 003A8 80A903B8 3C0C8016 */ lui $t4, %hi(gSaveContext+0xee6) /* 003AC 80A903BC 46083001 */ sub.s $f0, $f6, $f8 /* 003B0 80A903C0 46000005 */ abs.s $f0, $f0 /* 003B4 80A903C4 460A003C */ c.lt.s $f0, $f10 /* 003B8 80A903C8 00000000 */ nop /* 003BC 80A903CC 4502003E */ bc1fl .L80A904C8 /* 003C0 80A903D0 8FBF002C */ lw $ra, 0x002C($sp) -/* 003C4 80A903D4 958CF546 */ lhu $t4, -0x0ABA($t4) ## 8015F546 +/* 003C4 80A903D4 958CF546 */ lhu $t4, %lo(gSaveContext+0xee6)($t4) /* 003C8 80A903D8 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 /* 003CC 80A903DC 01D17021 */ addu $t6, $t6, $s1 /* 003D0 80A903E0 318D1000 */ andi $t5, $t4, 0x1000 ## $t5 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Update.s index bb2e066ffa..f3c781ccfb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Update.s @@ -10,8 +10,8 @@ glabel D_80A91E08 .text glabel EnKakasi3_Update /* 00E6C 80A91B8C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00E70 80A91B90 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00E74 80A91B94 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 00E70 80A91B90 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 00E74 80A91B94 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 00E78 80A91B98 AFBF0024 */ sw $ra, 0x0024($sp) /* 00E7C 80A91B9C AFB00020 */ sw $s0, 0x0020($sp) /* 00E80 80A91BA0 AFA5003C */ sw $a1, 0x003C($sp) @@ -24,8 +24,8 @@ glabel EnKakasi3_Update /* 00E9C 80A91BBC 24841E04 */ addiu $a0, $a0, %lo(D_80A91E04) ## $a0 = 80A91E04 /* 00EA0 80A91BC0 3C0480A9 */ lui $a0, %hi(D_80A91E08) ## $a0 = 80A90000 -/* 00EA4 80A91BC4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00EA8 80A91BC8 90A5F925 */ lbu $a1, -0x06DB($a1) ## 8015F925 +/* 00EA4 80A91BC4 3C058016 */ lui $a1, %hi(gSaveContext+0x12c5) +/* 00EA8 80A91BC8 90A5F925 */ lbu $a1, %lo(gSaveContext+0x12c5)($a1) /* 00EAC 80A91BCC 0C00084C */ jal osSyncPrintf /* 00EB0 80A91BD0 24841E08 */ addiu $a0, $a0, %lo(D_80A91E08) ## $a0 = 80A91E08 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91284.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91284.s index ee29721d44..3377b3ed0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91284.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91284.s @@ -9,10 +9,10 @@ glabel func_80A91284 /* 00580 80A912A0 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 /* 00584 80A912A4 8FA50018 */ lw $a1, 0x0018($sp) -/* 00588 80A912A8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00588 80A912A8 3C028016 */ lui $v0, %hi(gSaveContext) /* 0058C 80A912AC 240E40A1 */ addiu $t6, $zero, 0x40A1 ## $t6 = 000040A1 /* 00590 80A912B0 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 -/* 00594 80A912B4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00594 80A912B4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00598 80A912B8 A4AE010E */ sh $t6, 0x010E($a1) ## 0000010E /* 0059C 80A912BC A4AF0196 */ sh $t7, 0x0196($a1) ## 00000196 /* 005A0 80A912C0 A4A0019A */ sh $zero, 0x019A($a1) ## 0000019A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91348.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91348.s index 00e0138441..417be907f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91348.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91348.s @@ -60,7 +60,7 @@ glabel func_80A91348 /* 006F8 80A91418 50200063 */ beql $at, $zero, .L80A915A8 /* 006FC 80A9141C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00700 80A91420 920E0194 */ lbu $t6, 0x0194($s0) ## 00000194 -/* 00704 80A91424 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 00704 80A91424 3C0D8016 */ lui $t5, %hi(gSaveContext+0x12c5) /* 00708 80A91428 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0070C 80A9142C 15C0002B */ bne $t6, $zero, .L80A914DC /* 00710 80A91430 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 @@ -108,7 +108,7 @@ glabel func_80A91348 /* 007B4 80A914D4 10000031 */ beq $zero, $zero, .L80A9159C /* 007B8 80A914D8 AD0C0680 */ sw $t4, 0x0680($t0) ## 00000680 .L80A914DC: -/* 007BC 80A914DC 91ADF925 */ lbu $t5, -0x06DB($t5) ## FFFFF925 +/* 007BC 80A914DC 91ADF925 */ lbu $t5, %lo(gSaveContext+0x12c5)($t5) /* 007C0 80A914E0 11A0002E */ beq $t5, $zero, .L80A9159C /* 007C4 80A914E4 00000000 */ nop /* 007C8 80A914E8 920E0195 */ lbu $t6, 0x0195($s0) ## 00000195 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A918E4.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A918E4.s index eeec89bc61..bd9e67c7b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A918E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A918E4.s @@ -14,8 +14,8 @@ glabel D_80A91DC4 .text glabel func_80A918E4 /* 00BC4 80A918E4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00BC8 80A918E8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00BCC 80A918EC 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 00BC8 80A918E8 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 00BCC 80A918EC 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 00BD0 80A918F0 AFBF001C */ sw $ra, 0x001C($sp) /* 00BD4 80A918F4 AFB10018 */ sw $s1, 0x0018($sp) /* 00BD8 80A918F8 AFB00014 */ sw $s0, 0x0014($sp) @@ -78,8 +78,8 @@ glabel func_80A918E4 /* 00CA8 80A919C8 15400020 */ bne $t2, $zero, .L80A91A4C /* 00CAC 80A919CC 240B0004 */ addiu $t3, $zero, 0x0004 ## $t3 = 00000004 /* 00CB0 80A919D0 A42B04C6 */ sh $t3, 0x04C6($at) ## 000104C6 -/* 00CB4 80A919D4 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 00CB8 80A919D8 8D8CFA90 */ lw $t4, -0x0570($t4) ## 8015FA90 +/* 00CB4 80A919D4 3C0C8016 */ lui $t4, %hi(gGameInfo) +/* 00CB8 80A919D8 8D8CFA90 */ lw $t4, %lo(gGameInfo)($t4) /* 00CBC 80A919DC 3C0480A9 */ lui $a0, %hi(D_80A91DC0) ## $a0 = 80A90000 /* 00CC0 80A919E0 24841DC0 */ addiu $a0, $a0, %lo(D_80A91DC0) ## $a0 = 80A91DC0 /* 00CC4 80A919E4 858D12DA */ lh $t5, 0x12DA($t4) ## 801612DA diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91A90.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91A90.s index b84c33bd5b..9d9060f7bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91A90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91A90.s @@ -23,8 +23,8 @@ glabel func_80A91A90 /* 00DC0 80A91AE0 10400025 */ beq $v0, $zero, .L80A91B78 /* 00DC4 80A91AE4 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF /* 00DC8 80A91AE8 922F0195 */ lbu $t7, 0x0195($s1) ## 00000195 -/* 00DCC 80A91AEC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00DD0 80A91AF0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00DCC 80A91AEC 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00DD0 80A91AF0 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00DD4 80A91AF4 11E00006 */ beq $t7, $zero, .L80A91B10 /* 00DD8 80A91AF8 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF /* 00DDC 80A91AFC 94620EE6 */ lhu $v0, 0x0EE6($v1) ## 8015F546 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s index dc86a66ccc..1441441d68 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s @@ -419,8 +419,8 @@ glabel EnKanban_Draw /* 0213C 80A940DC 450200D6 */ bc1fl .L80A94438 /* 02140 80A940E0 8FAF00A4 */ lw $t7, 0x00A4($sp) /* 02144 80A940E4 860C0176 */ lh $t4, 0x0176($s0) ## 00000176 -/* 02148 80A940E8 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 0214C 80A940EC 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 02148 80A940E8 3C048016 */ lui $a0, %hi(gSaveContext) +/* 0214C 80A940EC 2484E660 */ addiu $a0, %lo(gSaveContext) /* 02150 80A940F0 55800005 */ bnel $t4, $zero, .L80A94108 /* 02154 80A940F4 9482000C */ lhu $v0, 0x000C($a0) ## 8015E66C /* 02158 80A940F8 860D0178 */ lh $t5, 0x0178($s0) ## 00000178 @@ -620,11 +620,11 @@ glabel EnKanban_Draw /* 0243C 80A943DC AE2C02D0 */ sw $t4, 0x02D0($s1) ## 000002D0 /* 02440 80A943E0 000FC080 */ sll $t8, $t7, 2 /* 02444 80A943E4 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 02448 80A943E8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 02448 80A943E8 3C198016 */ lui $t9, %hi(gSegments) /* 0244C 80A943EC 0338C821 */ addu $t9, $t9, $t8 /* 02450 80A943F0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 02454 80A943F4 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000001 -/* 02458 80A943F8 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 02458 80A943F8 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 0245C 80A943FC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 02460 80A94400 00A14824 */ and $t1, $a1, $at /* 02464 80A94404 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Init.s index 864a135617..5987c7a279 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Init.s @@ -44,8 +44,8 @@ glabel EnKanban_Init /* 00138 80A920D8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 0013C 80A920DC 1441000B */ bne $v0, $at, .L80A9210C /* 00140 80A920E0 340CFFFF */ ori $t4, $zero, 0xFFFF ## $t4 = 0000FFFF -/* 00144 80A920E4 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 00148 80A920E8 8F39E664 */ lw $t9, -0x199C($t9) ## 8015E664 +/* 00144 80A920E4 3C198016 */ lui $t9, %hi(gSaveContext+4) +/* 00148 80A920E8 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) /* 0014C 80A920EC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00150 80A920F0 2408409D */ addiu $t0, $zero, 0x409D ## $t0 = 0000409D /* 00154 80A920F4 17210003 */ bne $t9, $at, .L80A92104 @@ -75,8 +75,8 @@ glabel EnKanban_Init /* 001A8 80A92148 E7A40010 */ swc1 $f4, 0x0010($sp) /* 001AC 80A9214C 0C2A47E8 */ jal func_80A91FA0 /* 001B0 80A92150 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001B4 80A92154 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 001B8 80A92158 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 +/* 001B4 80A92154 3C0E8016 */ lui $t6, %hi(gSaveContext+4) +/* 001B8 80A92158 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) /* 001BC 80A9215C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 001C0 80A92160 15C10005 */ bne $t6, $at, .L80A92178 /* 001C4 80A92164 3C014170 */ lui $at, 0x4170 ## $at = 41700000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s index 750d32e2b0..dec1db8e71 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s @@ -1663,16 +1663,16 @@ glabel L80A930DC /* 01930 80A938D0 8FBF003C */ lw $ra, 0x003C($sp) /* 01934 80A938D4 960B04CA */ lhu $t3, 0x04CA($s0) ## 00000532 /* 01938 80A938D8 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 0193C 80A938DC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 0193C 80A938DC 3C078013 */ lui $a3, %hi(D_801333E0) /* 01940 80A938E0 156100A4 */ bne $t3, $at, .L80A93B74 -/* 01944 80A938E4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01944 80A938E4 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01948 80A938E8 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 0194C 80A938EC 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 +/* 0194C 80A938EC 3C0D8013 */ lui $t5, %hi(D_801333E8) /* 01950 80A938F0 A2380154 */ sb $t8, 0x0154($s1) ## 00000154 /* 01954 80A938F4 A6280176 */ sh $t0, 0x0176($s1) ## 00000176 -/* 01958 80A938F8 25AD33E8 */ addiu $t5, $t5, 0x33E8 ## $t5 = 801333E8 -/* 0195C 80A938FC 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 01960 80A93900 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 01958 80A938F8 25AD33E8 */ addiu $t5, %lo(D_801333E8) +/* 0195C 80A938FC 3C058013 */ lui $a1, %hi(D_801333D4) +/* 01960 80A93900 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 01964 80A93904 AFAD0014 */ sw $t5, 0x0014($sp) /* 01968 80A93908 AFA70010 */ sw $a3, 0x0010($sp) /* 0196C 80A9390C 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Init.s index b0029271cd..e40ea64ca5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Init.s @@ -9,8 +9,8 @@ glabel EnKarebaba_Init /* 0001C 80A9536C 0C01E037 */ jal Actor_ProcessInitChain /* 00020 80A95370 24A56A50 */ addiu $a1, $a1, %lo(D_80A96A50) ## $a1 = 80A96A50 -/* 00024 80A95374 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00028 80A95378 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00024 80A95374 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00028 80A95378 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0002C 80A9537C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00030 80A95380 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00034 80A95384 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95618.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95618.s index 828bb86077..cecf633a7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95618.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95618.s @@ -12,13 +12,13 @@ glabel func_80A95618 /* 002EC 80A9563C AFA40018 */ sw $a0, 0x0018($sp) /* 002F0 80A95640 8FA40018 */ lw $a0, 0x0018($sp) /* 002F4 80A95644 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 002F8 80A95648 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 002F8 80A95648 3C098016 */ lui $t1, %hi(gSaveContext+4) /* 002FC 80A9564C 90990255 */ lbu $t9, 0x0255($a0) ## 00000255 /* 00300 80A95650 A0980258 */ sb $t8, 0x0258($a0) ## 00000258 /* 00304 80A95654 3C0B0FC0 */ lui $t3, 0x0FC0 ## $t3 = 0FC00000 /* 00308 80A95658 3328FFFB */ andi $t0, $t9, 0xFFFB ## $t0 = 00000000 /* 0030C 80A9565C A0880255 */ sb $t0, 0x0255($a0) ## 00000255 -/* 00310 80A95660 8D29E664 */ lw $t1, -0x199C($t1) ## 8015E664 +/* 00310 80A95660 8D29E664 */ lw $t1, %lo(gSaveContext+4)($t1) /* 00314 80A95664 356B0710 */ ori $t3, $t3, 0x0710 ## $t3 = 0FC00710 /* 00318 80A95668 24020050 */ addiu $v0, $zero, 0x0050 ## $v0 = 00000050 /* 0031C 80A9566C 11200005 */ beq $t1, $zero, .L80A95684 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Update.s index ec15bf5562..5bc22e6964 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Update.s @@ -26,10 +26,10 @@ glabel EnKo_Update /* 029B4 80A99764 8D6B17B4 */ lw $t3, 0x17B4($t3) ## 000117B4 /* 029B8 80A99768 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 029BC 80A9976C 01616021 */ addu $t4, $t3, $at -/* 029C0 80A99770 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 029C0 80A99770 3C018016 */ lui $at, %hi(gSegments+0x18) /* 029C4 80A99774 0C02927F */ jal SkelAnime_FrameUpdateMatrix -/* 029C8 80A99778 AC2C6FC0 */ sw $t4, 0x6FC0($at) ## 80166FC0 +/* 029C8 80A99778 AC2C6FC0 */ sw $t4, %lo(gSegments+0x18)($at) /* 029CC 80A9977C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 029D0 80A99780 0C2A636D */ jal func_80A98DB4 /* 029D4 80A99784 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96FD0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96FD0.s index ac335a7a61..4fe7d34177 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96FD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96FD0.s @@ -12,17 +12,17 @@ glabel func_80A96FD0 /* 00248 80A96FF8 01E00008 */ jr $t7 /* 0024C 80A96FFC 00000000 */ nop glabel L80A97000 -/* 00250 80A97000 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00254 80A97004 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00250 80A97000 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00254 80A97004 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00258 80A97008 94580EDC */ lhu $t8, 0x0EDC($v0) ## 8015F53C -/* 0025C 80A9700C 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 +/* 0025C 80A9700C 3C088012 */ lui $t0, %hi(gBitFlags+0x48) /* 00260 80A97010 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 /* 00264 80A97014 13200003 */ beq $t9, $zero, .L80A97024 /* 00268 80A97018 00000000 */ nop /* 0026C 80A9701C 03E00008 */ jr $ra /* 00270 80A97020 240210DA */ addiu $v0, $zero, 0x10DA ## $v0 = 000010DA .L80A97024: -/* 00274 80A97024 8D087168 */ lw $t0, 0x7168($t0) ## 80127168 +/* 00274 80A97024 8D087168 */ lw $t0, %lo(gBitFlags+0x48)($t0) /* 00278 80A97028 8C4900A4 */ lw $t1, 0x00A4($v0) ## 0000117E /* 0027C 80A9702C 01095024 */ and $t2, $t0, $t1 /* 00280 80A97030 51400004 */ beql $t2, $zero, .L80A97044 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97068.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97068.s index 65abe6deb7..f3ae67bd81 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97068.s @@ -1,15 +1,15 @@ glabel func_80A97068 -/* 002B8 80A97068 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 002BC 80A9706C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 002B8 80A97068 3C028016 */ lui $v0, %hi(gSaveContext) +/* 002BC 80A9706C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 002C0 80A97070 944D0EDC */ lhu $t5, 0x0EDC($v0) ## 8015F53C -/* 002C4 80A97074 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 +/* 002C4 80A97074 3C0F8012 */ lui $t7, %hi(gBitFlags+0x48) /* 002C8 80A97078 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 /* 002CC 80A9707C 11C00003 */ beq $t6, $zero, .L80A9708C /* 002D0 80A97080 00000000 */ nop /* 002D4 80A97084 03E00008 */ jr $ra /* 002D8 80A97088 24021025 */ addiu $v0, $zero, 0x1025 ## $v0 = 00001025 .L80A9708C: -/* 002DC 80A9708C 8DEF7168 */ lw $t7, 0x7168($t7) ## 80127168 +/* 002DC 80A9708C 8DEF7168 */ lw $t7, %lo(gBitFlags+0x48)($t7) /* 002E0 80A97090 8C5800A4 */ lw $t8, 0x00A4($v0) ## 000010C9 /* 002E4 80A97094 01F8C824 */ and $t9, $t7, $t8 /* 002E8 80A97098 13200003 */ beq $t9, $zero, .L80A970A8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A970B0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A970B0.s index 31242f41f3..cbecce1a2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A970B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A970B0.s @@ -1,15 +1,15 @@ glabel func_80A970B0 -/* 00300 80A970B0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00304 80A970B4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00300 80A970B0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00304 80A970B4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00308 80A970B8 94480EDC */ lhu $t0, 0x0EDC($v0) ## 8015F53C -/* 0030C 80A970BC 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 +/* 0030C 80A970BC 3C0A8012 */ lui $t2, %hi(gBitFlags+0x48) /* 00310 80A970C0 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 /* 00314 80A970C4 11200003 */ beq $t1, $zero, .L80A970D4 /* 00318 80A970C8 00000000 */ nop /* 0031C 80A970CC 03E00008 */ jr $ra /* 00320 80A970D0 24021023 */ addiu $v0, $zero, 0x1023 ## $v0 = 00001023 .L80A970D4: -/* 00324 80A970D4 8D4A7168 */ lw $t2, 0x7168($t2) ## 80127168 +/* 00324 80A970D4 8D4A7168 */ lw $t2, %lo(gBitFlags+0x48)($t2) /* 00328 80A970D8 8C4B00A4 */ lw $t3, 0x00A4($v0) ## 000010C7 /* 0032C 80A970DC 014B6024 */ and $t4, $t2, $t3 /* 00330 80A970E0 51800004 */ beql $t4, $zero, .L80A970F4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97110.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97110.s index 83cd06f618..6e19167c2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97110.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97110.s @@ -1,6 +1,6 @@ glabel func_80A97110 -/* 00360 80A97110 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00364 80A97114 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00360 80A97110 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00364 80A97114 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00368 80A97118 944F0EDC */ lhu $t7, 0x0EDC($v0) ## 8015F53C /* 0036C 80A9711C 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 /* 00370 80A97120 13000003 */ beq $t8, $zero, .L80A97130 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97138.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97138.s index 622bec13e3..d5c008636d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97138.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97138.s @@ -1,15 +1,15 @@ glabel func_80A97138 -/* 00388 80A97138 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0038C 80A9713C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00388 80A97138 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0038C 80A9713C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00390 80A97140 94590EDC */ lhu $t9, 0x0EDC($v0) ## 8015F53C -/* 00394 80A97144 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 +/* 00394 80A97144 3C098012 */ lui $t1, %hi(gBitFlags+0x48) /* 00398 80A97148 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 /* 0039C 80A9714C 11000003 */ beq $t0, $zero, .L80A9715C /* 003A0 80A97150 00000000 */ nop /* 003A4 80A97154 03E00008 */ jr $ra /* 003A8 80A97158 24021021 */ addiu $v0, $zero, 0x1021 ## $v0 = 00001021 .L80A9715C: -/* 003AC 80A9715C 8D297168 */ lw $t1, 0x7168($t1) ## 80127168 +/* 003AC 80A9715C 8D297168 */ lw $t1, %lo(gBitFlags+0x48)($t1) /* 003B0 80A97160 8C4A00A4 */ lw $t2, 0x00A4($v0) ## 000010C5 /* 003B4 80A97164 012A5824 */ and $t3, $t1, $t2 /* 003B8 80A97168 51600004 */ beql $t3, $zero, .L80A9717C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97198.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97198.s index a944e20eb6..9bcd3ba37f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97198.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97198.s @@ -1,15 +1,15 @@ glabel func_80A97198 -/* 003E8 80A97198 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 003EC 80A9719C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 003E8 80A97198 3C028016 */ lui $v0, %hi(gSaveContext) +/* 003EC 80A9719C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 003F0 80A971A0 944E0EDC */ lhu $t6, 0x0EDC($v0) ## 8015F53C -/* 003F4 80A971A4 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 +/* 003F4 80A971A4 3C188012 */ lui $t8, %hi(gBitFlags+0x48) /* 003F8 80A971A8 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 /* 003FC 80A971AC 11E00003 */ beq $t7, $zero, .L80A971BC /* 00400 80A971B0 00000000 */ nop /* 00404 80A971B4 03E00008 */ jr $ra /* 00408 80A971B8 24021097 */ addiu $v0, $zero, 0x1097 ## $v0 = 00001097 .L80A971BC: -/* 0040C 80A971BC 8F187168 */ lw $t8, 0x7168($t8) ## 80127168 +/* 0040C 80A971BC 8F187168 */ lw $t8, %lo(gBitFlags+0x48)($t8) /* 00410 80A971C0 8C5900A4 */ lw $t9, 0x00A4($v0) ## 0000113B /* 00414 80A971C4 03194024 */ and $t0, $t8, $t9 /* 00418 80A971C8 51000004 */ beql $t0, $zero, .L80A971DC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A971F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A971F8.s index 0bf77ed442..9b18cf0262 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A971F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A971F8.s @@ -1,15 +1,15 @@ glabel func_80A971F8 -/* 00448 80A971F8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0044C 80A971FC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00448 80A971F8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0044C 80A971FC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00450 80A97200 944B0EDC */ lhu $t3, 0x0EDC($v0) ## 8015F53C -/* 00454 80A97204 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 +/* 00454 80A97204 3C0D8012 */ lui $t5, %hi(gBitFlags+0x48) /* 00458 80A97208 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 /* 0045C 80A9720C 11800003 */ beq $t4, $zero, .L80A9721C /* 00460 80A97210 00000000 */ nop /* 00464 80A97214 03E00008 */ jr $ra /* 00468 80A97218 240210B0 */ addiu $v0, $zero, 0x10B0 ## $v0 = 000010B0 .L80A9721C: -/* 0046C 80A9721C 8DAD7168 */ lw $t5, 0x7168($t5) ## 80127168 +/* 0046C 80A9721C 8DAD7168 */ lw $t5, %lo(gBitFlags+0x48)($t5) /* 00470 80A97220 8C4E00A4 */ lw $t6, 0x00A4($v0) ## 00001154 /* 00474 80A97224 01AE7824 */ and $t7, $t5, $t6 /* 00478 80A97228 51E00004 */ beql $t7, $zero, .L80A9723C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97258.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97258.s index 59954d9d08..aa652853c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97258.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97258.s @@ -1,15 +1,15 @@ glabel func_80A97258 -/* 004A8 80A97258 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 004AC 80A9725C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 004A8 80A97258 3C028016 */ lui $v0, %hi(gSaveContext) +/* 004AC 80A9725C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 004B0 80A97260 94480EDC */ lhu $t0, 0x0EDC($v0) ## 8015F53C -/* 004B4 80A97264 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 +/* 004B4 80A97264 3C0A8012 */ lui $t2, %hi(gBitFlags+0x48) /* 004B8 80A97268 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 /* 004BC 80A9726C 11200003 */ beq $t1, $zero, .L80A9727C /* 004C0 80A97270 00000000 */ nop /* 004C4 80A97274 03E00008 */ jr $ra /* 004C8 80A97278 240210B5 */ addiu $v0, $zero, 0x10B5 ## $v0 = 000010B5 .L80A9727C: -/* 004CC 80A9727C 8D4A7168 */ lw $t2, 0x7168($t2) ## 80127168 +/* 004CC 80A9727C 8D4A7168 */ lw $t2, %lo(gBitFlags+0x48)($t2) /* 004D0 80A97280 8C4B00A4 */ lw $t3, 0x00A4($v0) ## 00001159 /* 004D4 80A97284 014B6024 */ and $t4, $t2, $t3 /* 004D8 80A97288 51800004 */ beql $t4, $zero, .L80A9729C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972C8.s index ef5b657790..78d4480141 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972C8.s @@ -1,8 +1,8 @@ glabel func_80A972C8 -/* 00518 80A972C8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0051C 80A972CC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 00520 80A972D0 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 00524 80A972D4 8DEF7168 */ lw $t7, 0x7168($t7) ## 80127168 +/* 00518 80A972C8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0051C 80A972CC 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00520 80A972D0 3C0F8012 */ lui $t7, %hi(gBitFlags+0x48) +/* 00524 80A972D4 8DEF7168 */ lw $t7, %lo(gBitFlags+0x48)($t7) /* 00528 80A972D8 8C5800A4 */ lw $t8, 0x00A4($v0) ## 8015E704 /* 0052C 80A972DC 01F8C824 */ and $t9, $t7, $t8 /* 00530 80A972E0 13200003 */ beq $t9, $zero, .L80A972F0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972F8.s index 759632fe27..38b3e4beb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972F8.s @@ -1,8 +1,8 @@ glabel func_80A972F8 -/* 00548 80A972F8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0054C 80A972FC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 00550 80A97300 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 00554 80A97304 8D087168 */ lw $t0, 0x7168($t0) ## 80127168 +/* 00548 80A972F8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0054C 80A972FC 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00550 80A97300 3C088012 */ lui $t0, %hi(gBitFlags+0x48) +/* 00554 80A97304 8D087168 */ lw $t0, %lo(gBitFlags+0x48)($t0) /* 00558 80A97308 8C4900A4 */ lw $t1, 0x00A4($v0) ## 8015E704 /* 0055C 80A9730C 01095024 */ and $t2, $t0, $t1 /* 00560 80A97310 11400003 */ beq $t2, $zero, .L80A97320 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97378.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97378.s index 2498e4314d..3483d476a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97378.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97378.s @@ -1,8 +1,8 @@ glabel func_80A97378 -/* 005C8 80A97378 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 005CC 80A9737C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 005D0 80A97380 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 -/* 005D4 80A97384 8F397120 */ lw $t9, 0x7120($t9) ## 80127120 +/* 005C8 80A97378 3C028016 */ lui $v0, %hi(gSaveContext) +/* 005CC 80A9737C 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 005D0 80A97380 3C198012 */ lui $t9, %hi(gBitFlags) +/* 005D4 80A97384 8F397120 */ lw $t9, %lo(gBitFlags)($t9) /* 005D8 80A97388 8C4800A4 */ lw $t0, 0x00A4($v0) ## 8015E704 /* 005DC 80A9738C 03284824 */ and $t1, $t9, $t0 /* 005E0 80A97390 51200004 */ beql $t1, $zero, .L80A973A4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973C0.s index 8de132ccab..b3ef6d30e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973C0.s @@ -1,8 +1,8 @@ glabel func_80A973C0 -/* 00610 80A973C0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00614 80A973C4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 00618 80A973C8 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 -/* 0061C 80A973CC 8D8C7120 */ lw $t4, 0x7120($t4) ## 80127120 +/* 00610 80A973C0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00614 80A973C4 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00618 80A973C8 3C0C8012 */ lui $t4, %hi(gBitFlags) +/* 0061C 80A973CC 8D8C7120 */ lw $t4, %lo(gBitFlags)($t4) /* 00620 80A973D0 8C4D00A4 */ lw $t5, 0x00A4($v0) ## 8015E704 /* 00624 80A973D4 018D7024 */ and $t6, $t4, $t5 /* 00628 80A973D8 11C00003 */ beq $t6, $zero, .L80A973E8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973F0.s index b61b5074d0..4939f12b65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973F0.s @@ -1,8 +1,8 @@ glabel func_80A973F0 -/* 00640 80A973F0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00644 80A973F4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 00648 80A973F8 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 0064C 80A973FC 8DEF7120 */ lw $t7, 0x7120($t7) ## 80127120 +/* 00640 80A973F0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00644 80A973F4 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00648 80A973F8 3C0F8012 */ lui $t7, %hi(gBitFlags) +/* 0064C 80A973FC 8DEF7120 */ lw $t7, %lo(gBitFlags)($t7) /* 00650 80A97400 8C5800A4 */ lw $t8, 0x00A4($v0) ## 8015E704 /* 00654 80A97404 01F8C824 */ and $t9, $t7, $t8 /* 00658 80A97408 53200004 */ beql $t9, $zero, .L80A9741C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97438.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97438.s index e77a418df9..c7bb03cf87 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97438.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97438.s @@ -1,8 +1,8 @@ glabel func_80A97438 -/* 00688 80A97438 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0068C 80A9743C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 00690 80A97440 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 00694 80A97444 8D4A7120 */ lw $t2, 0x7120($t2) ## 80127120 +/* 00688 80A97438 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0068C 80A9743C 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00690 80A97440 3C0A8012 */ lui $t2, %hi(gBitFlags) +/* 00694 80A97444 8D4A7120 */ lw $t2, %lo(gBitFlags)($t2) /* 00698 80A97448 8C4B00A4 */ lw $t3, 0x00A4($v0) ## 8015E704 /* 0069C 80A9744C 014B6024 */ and $t4, $t2, $t3 /* 006A0 80A97450 11800003 */ beq $t4, $zero, .L80A97460 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97468.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97468.s index ea02a2e5ff..17f6d50832 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97468.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97468.s @@ -1,8 +1,8 @@ glabel func_80A97468 -/* 006B8 80A97468 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 006BC 80A9746C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 006C0 80A97470 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 -/* 006C4 80A97474 8DAD7120 */ lw $t5, 0x7120($t5) ## 80127120 +/* 006B8 80A97468 3C028016 */ lui $v0, %hi(gSaveContext) +/* 006BC 80A9746C 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 006C0 80A97470 3C0D8012 */ lui $t5, %hi(gBitFlags) +/* 006C4 80A97474 8DAD7120 */ lw $t5, %lo(gBitFlags)($t5) /* 006C8 80A97478 8C4E00A4 */ lw $t6, 0x00A4($v0) ## 8015E704 /* 006CC 80A9747C 01AE7824 */ and $t7, $t5, $t6 /* 006D0 80A97480 11E00003 */ beq $t7, $zero, .L80A97490 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974A0.s index ba8c7b68d1..1f5ca6df02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974A0.s @@ -1,8 +1,8 @@ glabel func_80A974A0 -/* 006F0 80A974A0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 006F4 80A974A4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 006F8 80A974A8 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 -/* 006FC 80A974AC 8F187120 */ lw $t8, 0x7120($t8) ## 80127120 +/* 006F0 80A974A0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 006F4 80A974A4 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 006F8 80A974A8 3C188012 */ lui $t8, %hi(gBitFlags) +/* 006FC 80A974AC 8F187120 */ lw $t8, %lo(gBitFlags)($t8) /* 00700 80A974B0 8C5900A4 */ lw $t9, 0x00A4($v0) ## 8015E704 /* 00704 80A974B4 03194024 */ and $t0, $t8, $t9 /* 00708 80A974B8 51000004 */ beql $t0, $zero, .L80A974CC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974E8.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974E8.s index aa064026e8..d3cc89d12d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974E8.s @@ -1,8 +1,8 @@ glabel func_80A974E8 -/* 00738 80A974E8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0073C 80A974EC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 00740 80A974F0 3C0B8012 */ lui $t3, 0x8012 ## $t3 = 80120000 -/* 00744 80A974F4 8D6B7120 */ lw $t3, 0x7120($t3) ## 80127120 +/* 00738 80A974E8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0073C 80A974EC 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00740 80A974F0 3C0B8012 */ lui $t3, %hi(gBitFlags) +/* 00744 80A974F4 8D6B7120 */ lw $t3, %lo(gBitFlags)($t3) /* 00748 80A974F8 8C4C00A4 */ lw $t4, 0x00A4($v0) ## 8015E704 /* 0074C 80A974FC 016C6824 */ and $t5, $t3, $t4 /* 00750 80A97500 11A00003 */ beq $t5, $zero, .L80A97510 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97518.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97518.s index 8e94305292..9d8415aafb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97518.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97518.s @@ -1,8 +1,8 @@ glabel func_80A97518 -/* 00768 80A97518 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0076C 80A9751C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 00770 80A97520 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 00774 80A97524 8DCE7120 */ lw $t6, 0x7120($t6) ## 80127120 +/* 00768 80A97518 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0076C 80A9751C 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00770 80A97520 3C0E8012 */ lui $t6, %hi(gBitFlags) +/* 00774 80A97524 8DCE7120 */ lw $t6, %lo(gBitFlags)($t6) /* 00778 80A97528 8C4F00A4 */ lw $t7, 0x00A4($v0) ## 8015E704 /* 0077C 80A9752C 01CFC024 */ and $t8, $t6, $t7 /* 00780 80A97530 53000004 */ beql $t8, $zero, .L80A97544 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97560.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97560.s index 824e92478f..5f9bf06002 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97560.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97560.s @@ -1,8 +1,8 @@ glabel func_80A97560 -/* 007B0 80A97560 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 007B4 80A97564 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 007B8 80A97568 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 -/* 007BC 80A9756C 8D297120 */ lw $t1, 0x7120($t1) ## 80127120 +/* 007B0 80A97560 3C028016 */ lui $v0, %hi(gSaveContext) +/* 007B4 80A97564 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 007B8 80A97568 3C098012 */ lui $t1, %hi(gBitFlags) +/* 007BC 80A9756C 8D297120 */ lw $t1, %lo(gBitFlags)($t1) /* 007C0 80A97570 8C4A00A4 */ lw $t2, 0x00A4($v0) ## 8015E704 /* 007C4 80A97574 012A5824 */ and $t3, $t1, $t2 /* 007C8 80A97578 11600003 */ beq $t3, $zero, .L80A97588 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97590.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97590.s index 8b14028506..4633feaa38 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97590.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97590.s @@ -1,8 +1,8 @@ glabel func_80A97590 -/* 007E0 80A97590 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 007E4 80A97594 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 007E8 80A97598 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 -/* 007EC 80A9759C 8D8C7120 */ lw $t4, 0x7120($t4) ## 80127120 +/* 007E0 80A97590 3C028016 */ lui $v0, %hi(gSaveContext) +/* 007E4 80A97594 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 007E8 80A97598 3C0C8012 */ lui $t4, %hi(gBitFlags) +/* 007EC 80A9759C 8D8C7120 */ lw $t4, %lo(gBitFlags)($t4) /* 007F0 80A975A0 8C4D00A4 */ lw $t5, 0x00A4($v0) ## 8015E704 /* 007F4 80A975A4 018D7024 */ and $t6, $t4, $t5 /* 007F8 80A975A8 11C00003 */ beq $t6, $zero, .L80A975B8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A975C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A975C0.s index 3ec3cdd476..56d4153fca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A975C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A975C0.s @@ -1,8 +1,8 @@ glabel func_80A975C0 -/* 00810 80A975C0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00814 80A975C4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 00818 80A975C8 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 0081C 80A975CC 8DEF7120 */ lw $t7, 0x7120($t7) ## 80127120 +/* 00810 80A975C0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00814 80A975C4 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00818 80A975C8 3C0F8012 */ lui $t7, %hi(gBitFlags) +/* 0081C 80A975CC 8DEF7120 */ lw $t7, %lo(gBitFlags)($t7) /* 00820 80A975D0 8C5800A4 */ lw $t8, 0x00A4($v0) ## 8015E704 /* 00824 80A975D4 01F8C824 */ and $t9, $t7, $t8 /* 00828 80A975D8 53200004 */ beql $t9, $zero, .L80A975EC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97610.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97610.s index 15d1097d7f..e4ace18efa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97610.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97610.s @@ -60,11 +60,11 @@ glabel func_80A97610 /* 00938 80A976E8 3044FFFF */ andi $a0, $v0, 0xFFFF ## $a0 = 00000000 .L80A976EC: /* 0093C 80A976EC 10800003 */ beq $a0, $zero, .L80A976FC -/* 00940 80A976F0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 00940 80A976F0 3C0E8016 */ lui $t6, %hi(gSaveContext+4) /* 00944 80A976F4 1000000C */ beq $zero, $zero, .L80A97728 /* 00948 80A976F8 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 .L80A976FC: -/* 0094C 80A976FC 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 +/* 0094C 80A976FC 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) /* 00950 80A97700 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 /* 00954 80A97704 8FA40020 */ lw $a0, 0x0020($sp) /* 00958 80A97708 15C00005 */ bne $t6, $zero, .L80A97720 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97738.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97738.s index 72d6492ed3..673b596465 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97738.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97738.s @@ -28,7 +28,7 @@ glabel func_80A97738 /* 009EC 80A9779C 10610065 */ beq $v1, $at, .L80A97934 /* 009F0 80A977A0 240110D7 */ addiu $at, $zero, 0x10D7 ## $at = 000010D7 /* 009F4 80A977A4 1061005D */ beq $v1, $at, .L80A9791C -/* 009F8 80A977A8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 009F8 80A977A8 3C028016 */ lui $v0, %hi(gSaveContext) /* 009FC 80A977AC 100000DE */ beq $zero, $zero, .L80A97B28 /* 00A00 80A977B0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A977B4: @@ -54,8 +54,8 @@ glabel func_80A97738 /* 00A4C 80A977FC 01E00008 */ jr $t7 /* 00A50 80A97800 00000000 */ nop glabel L80A97804 -/* 00A54 80A97804 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00A58 80A97808 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00A54 80A97804 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00A58 80A97808 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00A5C 80A9780C 94580EFA */ lhu $t8, 0x0EFA($v0) ## 8015F55A /* 00A60 80A97810 37194000 */ ori $t9, $t8, 0x4000 ## $t9 = 00004000 /* 00A64 80A97814 A4590EFA */ sh $t9, 0x0EFA($v0) ## 8015F55A @@ -64,79 +64,79 @@ glabel L80A97818 /* 00A68 80A97818 100000C3 */ beq $zero, $zero, .L80A97B28 /* 00A6C 80A9781C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A97820 -/* 00A70 80A97820 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00A74 80A97824 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00A70 80A97820 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00A74 80A97824 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00A78 80A97828 94490EFC */ lhu $t1, 0x0EFC($v0) ## 8015F55C /* 00A7C 80A9782C 352A0004 */ ori $t2, $t1, 0x0004 ## $t2 = 00000004 /* 00A80 80A97830 A44A0EFC */ sh $t2, 0x0EFC($v0) ## 8015F55C /* 00A84 80A97834 100000BC */ beq $zero, $zero, .L80A97B28 /* 00A88 80A97838 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A9783C -/* 00A8C 80A9783C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00A90 80A97840 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00A8C 80A9783C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00A90 80A97840 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00A94 80A97844 944B0EFC */ lhu $t3, 0x0EFC($v0) ## 8015F55C /* 00A98 80A97848 356C0010 */ ori $t4, $t3, 0x0010 ## $t4 = 00000010 /* 00A9C 80A9784C A44C0EFC */ sh $t4, 0x0EFC($v0) ## 8015F55C /* 00AA0 80A97850 100000B5 */ beq $zero, $zero, .L80A97B28 /* 00AA4 80A97854 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A97858 -/* 00AA8 80A97858 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00AAC 80A9785C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00AA8 80A97858 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00AAC 80A9785C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00AB0 80A97860 944D0EFC */ lhu $t5, 0x0EFC($v0) ## 8015F55C /* 00AB4 80A97864 35AE0040 */ ori $t6, $t5, 0x0040 ## $t6 = 00000040 /* 00AB8 80A97868 A44E0EFC */ sh $t6, 0x0EFC($v0) ## 8015F55C /* 00ABC 80A9786C 100000AE */ beq $zero, $zero, .L80A97B28 /* 00AC0 80A97870 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A97874 -/* 00AC4 80A97874 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00AC8 80A97878 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00AC4 80A97874 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00AC8 80A97878 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00ACC 80A9787C 944F0EFC */ lhu $t7, 0x0EFC($v0) ## 8015F55C /* 00AD0 80A97880 35F80100 */ ori $t8, $t7, 0x0100 ## $t8 = FFFFEFFB /* 00AD4 80A97884 A4580EFC */ sh $t8, 0x0EFC($v0) ## 8015F55C /* 00AD8 80A97888 100000A7 */ beq $zero, $zero, .L80A97B28 /* 00ADC 80A9788C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A97890 -/* 00AE0 80A97890 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00AE4 80A97894 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00AE0 80A97890 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00AE4 80A97894 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00AE8 80A97898 94590F02 */ lhu $t9, 0x0F02($v0) ## 8015F562 /* 00AEC 80A9789C 37290200 */ ori $t1, $t9, 0x0200 ## $t1 = 00004200 /* 00AF0 80A978A0 A4490F02 */ sh $t1, 0x0F02($v0) ## 8015F562 /* 00AF4 80A978A4 100000A0 */ beq $zero, $zero, .L80A97B28 /* 00AF8 80A978A8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A978AC -/* 00AFC 80A978AC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00B00 80A978B0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00AFC 80A978AC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00B00 80A978B0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00B04 80A978B4 944A0F04 */ lhu $t2, 0x0F04($v0) ## 8015F564 /* 00B08 80A978B8 354B0002 */ ori $t3, $t2, 0x0002 ## $t3 = 00000006 /* 00B0C 80A978BC A44B0F04 */ sh $t3, 0x0F04($v0) ## 8015F564 /* 00B10 80A978C0 10000099 */ beq $zero, $zero, .L80A97B28 /* 00B14 80A978C4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A978C8 -/* 00B18 80A978C8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00B1C 80A978CC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00B18 80A978C8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00B1C 80A978CC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00B20 80A978D0 944C0F00 */ lhu $t4, 0x0F00($v0) ## 8015F560 /* 00B24 80A978D4 358D0002 */ ori $t5, $t4, 0x0002 ## $t5 = 00000012 /* 00B28 80A978D8 A44D0F00 */ sh $t5, 0x0F00($v0) ## 8015F560 /* 00B2C 80A978DC 10000092 */ beq $zero, $zero, .L80A97B28 /* 00B30 80A978E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A978E4 -/* 00B34 80A978E4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00B38 80A978E8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00B34 80A978E4 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00B38 80A978E8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00B3C 80A978EC 944E0F02 */ lhu $t6, 0x0F02($v0) ## 8015F562 /* 00B40 80A978F0 35CF0002 */ ori $t7, $t6, 0x0002 ## $t7 = 00000042 /* 00B44 80A978F4 A44F0F02 */ sh $t7, 0x0F02($v0) ## 8015F562 /* 00B48 80A978F8 1000008B */ beq $zero, $zero, .L80A97B28 /* 00B4C 80A978FC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 glabel L80A97900 -/* 00B50 80A97900 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00B54 80A97904 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00B50 80A97900 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00B54 80A97904 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00B58 80A97908 94580F00 */ lhu $t8, 0x0F00($v0) ## 8015F560 /* 00B5C 80A9790C 37190080 */ ori $t9, $t8, 0x0080 ## $t9 = FFFFEFFB /* 00B60 80A97910 A4590F00 */ sh $t9, 0x0F00($v0) ## 8015F560 /* 00B64 80A97914 10000084 */ beq $zero, $zero, .L80A97B28 /* 00B68 80A97918 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A9791C: -/* 00B6C 80A9791C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = FFFFE660 +/* 00B6C 80A9791C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00B70 80A97920 94490F0E */ lhu $t1, 0x0F0E($v0) ## FFFFF56E /* 00B74 80A97924 352A0080 */ ori $t2, $t1, 0x0080 ## $t2 = 00004280 /* 00B78 80A97928 A44A0F0E */ sh $t2, 0x0F0E($v0) ## FFFFF56E @@ -154,14 +154,14 @@ glabel L80A97900 /* 00BA0 80A97950 00000000 */ nop .L80A97954: /* 00BA4 80A97954 910B0210 */ lbu $t3, 0x0210($t0) ## 00000210 -/* 00BA8 80A97958 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00BAC 80A9795C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00BA8 80A97958 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00BAC 80A9795C 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00BB0 80A97960 1560000C */ bne $t3, $zero, .L80A97994 /* 00BB4 80A97964 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 00BB8 80A97968 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 00BBC 80A9796C 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 -/* 00BC0 80A97970 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00BC4 80A97974 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00BB8 80A97968 3C0C8013 */ lui $t4, %hi(D_801333E8) +/* 00BBC 80A9796C 258C33E8 */ addiu $t4, %lo(D_801333E8) +/* 00BC0 80A97970 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00BC4 80A97974 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00BC8 80A97978 AFAC0014 */ sw $t4, 0x0014($sp) /* 00BCC 80A9797C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 00BD0 80A97980 0C03DCE3 */ jal Audio_PlaySoundGeneral @@ -192,7 +192,7 @@ glabel L80A97900 /* 00C28 80A979D8 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 /* 00C2C 80A979DC 240110B7 */ addiu $at, $zero, 0x10B7 ## $at = 000010B7 /* 00C30 80A979E0 10610030 */ beq $v1, $at, .L80A97AA4 -/* 00C34 80A979E4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00C34 80A979E4 3C028016 */ lui $v0, %hi(gSaveContext) /* 00C38 80A979E8 240110B8 */ addiu $at, $zero, 0x10B8 ## $at = 000010B8 /* 00C3C 80A979EC 50610032 */ beql $v1, $at, .L80A97AB8 /* 00C40 80A979F0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -251,7 +251,7 @@ glabel L80A97900 /* 00CEC 80A97A9C 10000022 */ beq $zero, $zero, .L80A97B28 /* 00CF0 80A97AA0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80A97AA4: -/* 00CF4 80A97AA4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = FFFFE661 +/* 00CF4 80A97AA4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00CF8 80A97AA8 944C0F0E */ lhu $t4, 0x0F0E($v0) ## FFFFF56F /* 00CFC 80A97AAC 358D1000 */ ori $t5, $t4, 0x1000 ## $t5 = 00001000 /* 00D00 80A97AB0 A44D0F0E */ sh $t5, 0x0F0E($v0) ## FFFFF56F diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97B38.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97B38.s index 60de57b824..b564209673 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97B38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97B38.s @@ -1,20 +1,20 @@ glabel func_80A97B38 -/* 00D88 80A97B38 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00D8C 80A97B3C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00D88 80A97B38 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00D8C 80A97B3C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00D90 80A97B40 8C4E0004 */ lw $t6, 0x0004($v0) ## 8015E664 /* 00D94 80A97B44 AFA40000 */ sw $a0, 0x0000($sp) -/* 00D98 80A97B48 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 +/* 00D98 80A97B48 3C0A8012 */ lui $t2, %hi(gBitFlags) /* 00D9C 80A97B4C 11C00011 */ beq $t6, $zero, .L80A97B94 /* 00DA0 80A97B50 00000000 */ nop /* 00DA4 80A97B54 944F0EDC */ lhu $t7, 0x0EDC($v0) ## 8015F53C -/* 00DA8 80A97B58 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 +/* 00DA8 80A97B58 3C198012 */ lui $t9, %hi(gBitFlags+0x48) /* 00DAC 80A97B5C 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 /* 00DB0 80A97B60 13000003 */ beq $t8, $zero, .L80A97B70 /* 00DB4 80A97B64 00000000 */ nop /* 00DB8 80A97B68 03E00008 */ jr $ra /* 00DBC 80A97B6C 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 .L80A97B70: -/* 00DC0 80A97B70 8F397168 */ lw $t9, 0x7168($t9) ## 80127168 +/* 00DC0 80A97B70 8F397168 */ lw $t9, %lo(gBitFlags+0x48)($t9) /* 00DC4 80A97B74 8C4800A4 */ lw $t0, 0x00A4($v0) ## 000000A6 /* 00DC8 80A97B78 03284824 */ and $t1, $t9, $t0 /* 00DCC 80A97B7C 11200003 */ beq $t1, $zero, .L80A97B8C @@ -25,7 +25,7 @@ glabel func_80A97B38 /* 00DDC 80A97B8C 03E00008 */ jr $ra /* 00DE0 80A97B90 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A97B94: -/* 00DE4 80A97B94 8D4A7120 */ lw $t2, 0x7120($t2) ## 80127120 +/* 00DE4 80A97B94 8D4A7120 */ lw $t2, %lo(gBitFlags)($t2) /* 00DE8 80A97B98 8C4B00A4 */ lw $t3, 0x00A4($v0) ## 000000A4 /* 00DEC 80A97B9C 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 /* 00DF0 80A97BA0 014B6024 */ and $t4, $t2, $t3 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97BC0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97BC0.s index 48e2425f20..166fd18101 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97BC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97BC0.s @@ -17,10 +17,10 @@ glabel func_80A97BC0 /* 00E48 80A97BF8 ADD9FFFC */ sw $t9, -0x0004($t6) ## FFFFFF04 /* 00E4C 80A97BFC 8DF90000 */ lw $t9, 0x0000($t7) ## 80A9A638 /* 00E50 80A97C00 8DF80004 */ lw $t8, 0x0004($t7) ## 80A9A63C -/* 00E54 80A97C04 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 00E54 80A97C04 3C098016 */ lui $t1, %hi(gSaveContext+4) /* 00E58 80A97C08 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFF08 /* 00E5C 80A97C0C ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFF0C -/* 00E60 80A97C10 8D29E664 */ lw $t1, -0x199C($t1) ## 8015E664 +/* 00E60 80A97C10 8D29E664 */ lw $t1, %lo(gSaveContext+4)($t1) /* 00E64 80A97C14 15200009 */ bne $t1, $zero, .L80A97C3C /* 00E68 80A97C18 00000000 */ nop /* 00E6C 80A97C1C 848A001C */ lh $t2, 0x001C($a0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A9877C.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A9877C.s index 6569f0273f..ad3e253fe9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A9877C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A9877C.s @@ -5,13 +5,13 @@ glabel func_80A9877C /* 019D8 80A98788 AFA50034 */ sw $a1, 0x0034($sp) /* 019DC 80A9878C 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 /* 019E0 80A98790 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 019E4 80A98794 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 +/* 019E4 80A98794 3C198012 */ lui $t9, %hi(D_8011D394) /* 019E8 80A98798 AFAF002C */ sw $t7, 0x002C($sp) /* 019EC 80A9879C 90B81D6C */ lbu $t8, 0x1D6C($a1) ## 00001D6C /* 019F0 80A987A0 8FA80034 */ lw $t0, 0x0034($sp) /* 019F4 80A987A4 57000006 */ bnel $t8, $zero, .L80A987C0 /* 019F8 80A987A8 8D0A00E0 */ lw $t2, 0x00E0($t0) ## 000000E0 -/* 019FC 80A987AC 8F39D394 */ lw $t9, -0x2C6C($t9) ## 8011D394 +/* 019FC 80A987AC 8F39D394 */ lw $t9, %lo(D_8011D394)($t9) /* 01A00 80A987B0 8FAD002C */ lw $t5, 0x002C($sp) /* 01A04 80A987B4 53200015 */ beql $t9, $zero, .L80A9880C /* 01A08 80A987B8 8DAE0024 */ lw $t6, 0x0024($t5) ## 00000024 @@ -74,14 +74,14 @@ glabel func_80A9877C /* 01AE0 80A98890 8FBF0024 */ lw $ra, 0x0024($sp) /* 01AE4 80A98894 856C00A4 */ lh $t4, 0x00A4($t3) ## 000000A4 /* 01AE8 80A98898 2401005B */ addiu $at, $zero, 0x005B ## $at = 0000005B -/* 01AEC 80A9889C 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 +/* 01AEC 80A9889C 3C0D8012 */ lui $t5, %hi(gItemSlots+0x2d) /* 01AF0 80A988A0 55810020 */ bnel $t4, $at, .L80A98924 /* 01AF4 80A988A4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01AF8 80A988A8 91AD7491 */ lbu $t5, 0x7491($t5) ## 80127491 -/* 01AFC 80A988AC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 01AF8 80A988A8 91AD7491 */ lbu $t5, %lo(gItemSlots+0x2d)($t5) +/* 01AFC 80A988AC 3C0F8016 */ lui $t7, %hi(gSaveContext+0x74) /* 01B00 80A988B0 241810DF */ addiu $t8, $zero, 0x10DF ## $t8 = 000010DF /* 01B04 80A988B4 01ED7821 */ addu $t7, $t7, $t5 -/* 01B08 80A988B8 91EFE6D4 */ lbu $t7, -0x192C($t7) ## 8015E6D4 +/* 01B08 80A988B8 91EFE6D4 */ lbu $t7, %lo(gSaveContext+0x74)($t7) /* 01B0C 80A988BC 240E10B9 */ addiu $t6, $zero, 0x10B9 ## $t6 = 000010B9 /* 01B10 80A988C0 29E10032 */ slti $at, $t7, 0x0032 /* 01B14 80A988C4 54200004 */ bnel $at, $zero, .L80A988D8 @@ -94,8 +94,8 @@ glabel func_80A9877C /* 01B2C 80A988DC 8FA40034 */ lw $a0, 0x0034($sp) /* 01B30 80A988E0 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 /* 01B34 80A988E4 1441000B */ bne $v0, $at, .L80A98914 -/* 01B38 80A988E8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 01B3C 80A988EC 9739F56E */ lhu $t9, -0x0A92($t9) ## 8015F56E +/* 01B38 80A988E8 3C198016 */ lui $t9, %hi(gSaveContext+0xf0e) +/* 01B3C 80A988EC 9739F56E */ lhu $t9, %lo(gSaveContext+0xf0e)($t9) /* 01B40 80A988F0 240A10B7 */ addiu $t2, $zero, 0x10B7 ## $t2 = 000010B7 /* 01B44 80A988F4 240910B8 */ addiu $t1, $zero, 0x10B8 ## $t1 = 000010B8 /* 01B48 80A988F8 33281000 */ andi $t0, $t9, 0x1000 ## $t0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98934.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98934.s index faf0403354..e89b771c4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98934.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98934.s @@ -4,7 +4,7 @@ glabel func_80A98934 /* 01B8C 80A9893C 14200005 */ bne $at, $zero, .L80A98954 /* 01B90 80A98940 2401005B */ addiu $at, $zero, 0x005B ## $at = 0000005B /* 01B94 80A98944 106100A4 */ beq $v1, $at, .L80A98BD8 -/* 01B98 80A98948 3C0B8012 */ lui $t3, 0x8012 ## $t3 = 80120000 +/* 01B98 80A98948 3C0B8012 */ lui $t3, %hi(gItemSlots+0x2d) /* 01B9C 80A9894C 100000B0 */ beq $zero, $zero, .L80A98C10 /* 01BA0 80A98950 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A98954: @@ -27,7 +27,7 @@ glabel func_80A98934 /* 01BE0 80A98990 00000000 */ nop /* 01BE4 80A98994 8482001C */ lh $v0, 0x001C($a0) ## 0000001C .L80A98998: -/* 01BE8 80A98998 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 +/* 01BE8 80A98998 3C0F8012 */ lui $t7, %hi(gBitFlags) /* 01BEC 80A9899C 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 /* 01BF0 80A989A0 28410007 */ slti $at, $v0, 0x0007 /* 01BF4 80A989A4 14200005 */ bne $at, $zero, .L80A989BC @@ -37,10 +37,10 @@ glabel func_80A98934 /* 01C04 80A989B4 03E00008 */ jr $ra /* 01C08 80A989B8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A989BC: -/* 01C0C 80A989BC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01C10 80A989C0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01C0C 80A989BC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01C10 80A989C0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01C14 80A989C4 8C5800A4 */ lw $t8, 0x00A4($v0) ## 8015E704 -/* 01C18 80A989C8 8DEF7120 */ lw $t7, 0x7120($t7) ## 80127120 +/* 01C18 80A989C8 8DEF7120 */ lw $t7, %lo(gBitFlags)($t7) /* 01C1C 80A989CC 01F8C824 */ and $t9, $t7, $t8 /* 01C20 80A989D0 17200006 */ bne $t9, $zero, .L80A989EC /* 01C24 80A989D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98A28.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98A28.s index 40ccd8d1cf..620136e654 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98A28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98A28.s @@ -1,11 +1,11 @@ glabel func_80A98A28 -/* 01C78 80A98A28 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01C7C 80A98A2C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01C78 80A98A28 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01C7C 80A98A2C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01C80 80A98A30 8C490004 */ lw $t1, 0x0004($v0) ## 8015E664 -/* 01C84 80A98A34 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 +/* 01C84 80A98A34 3C0A8012 */ lui $t2, %hi(gBitFlags) /* 01C88 80A98A38 55200012 */ bnel $t1, $zero, .L80A98A84 /* 01C8C 80A98A3C 848D001C */ lh $t5, 0x001C($a0) ## 0000001C -/* 01C90 80A98A40 8D4A7120 */ lw $t2, 0x7120($t2) ## 80127120 +/* 01C90 80A98A40 8D4A7120 */ lw $t2, %lo(gBitFlags)($t2) /* 01C94 80A98A44 8C4B00A4 */ lw $t3, 0x00A4($v0) ## 8015E704 /* 01C98 80A98A48 014B6024 */ and $t4, $t2, $t3 /* 01C9C 80A98A4C 5580000D */ bnel $t4, $zero, .L80A98A84 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98AA4.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98AA4.s index 40c04ab646..d8804a4bcb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98AA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98AA4.s @@ -1,11 +1,11 @@ glabel func_80A98AA4 -/* 01CF4 80A98AA4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01CF8 80A98AA8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01CF4 80A98AA4 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01CF8 80A98AA8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01CFC 80A98AAC 8C4F0004 */ lw $t7, 0x0004($v0) ## 8015E664 -/* 01D00 80A98AB0 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 +/* 01D00 80A98AB0 3C188012 */ lui $t8, %hi(gBitFlags) /* 01D04 80A98AB4 15E00011 */ bne $t7, $zero, .L80A98AFC /* 01D08 80A98AB8 00000000 */ nop -/* 01D0C 80A98ABC 8F187120 */ lw $t8, 0x7120($t8) ## 80127120 +/* 01D0C 80A98ABC 8F187120 */ lw $t8, %lo(gBitFlags)($t8) /* 01D10 80A98AC0 8C5900A4 */ lw $t9, 0x00A4($v0) ## 8015E704 /* 01D14 80A98AC4 03194024 */ and $t0, $t8, $t9 /* 01D18 80A98AC8 1500000C */ bne $t0, $zero, .L80A98AFC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B04.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B04.s index 11c1341c25..5a56a089cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B04.s @@ -1,11 +1,11 @@ glabel func_80A98B04 -/* 01D54 80A98B04 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01D58 80A98B08 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01D54 80A98B04 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01D58 80A98B08 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01D5C 80A98B0C 8C490004 */ lw $t1, 0x0004($v0) ## 8015E664 -/* 01D60 80A98B10 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 +/* 01D60 80A98B10 3C0A8012 */ lui $t2, %hi(gBitFlags) /* 01D64 80A98B14 1520000F */ bne $t1, $zero, .L80A98B54 /* 01D68 80A98B18 00000000 */ nop -/* 01D6C 80A98B1C 8D4A7120 */ lw $t2, 0x7120($t2) ## 80127120 +/* 01D6C 80A98B1C 8D4A7120 */ lw $t2, %lo(gBitFlags)($t2) /* 01D70 80A98B20 8C4B00A4 */ lw $t3, 0x00A4($v0) ## 8015E704 /* 01D74 80A98B24 014B6024 */ and $t4, $t2, $t3 /* 01D78 80A98B28 1580000A */ bne $t4, $zero, .L80A98B54 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B5C.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B5C.s index bb97a9b33d..bfa33f7cb2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B5C.s @@ -1,11 +1,11 @@ glabel func_80A98B5C -/* 01DAC 80A98B5C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01DB0 80A98B60 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01DAC 80A98B5C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01DB0 80A98B60 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01DB4 80A98B64 8C4F0004 */ lw $t7, 0x0004($v0) ## 8015E664 -/* 01DB8 80A98B68 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 +/* 01DB8 80A98B68 3C188012 */ lui $t8, %hi(gBitFlags) /* 01DBC 80A98B6C 55E00012 */ bnel $t7, $zero, .L80A98BB8 /* 01DC0 80A98B70 8489001C */ lh $t1, 0x001C($a0) ## 0000001C -/* 01DC4 80A98B74 8F187120 */ lw $t8, 0x7120($t8) ## 80127120 +/* 01DC4 80A98B74 8F187120 */ lw $t8, %lo(gBitFlags)($t8) /* 01DC8 80A98B78 8C5900A4 */ lw $t9, 0x00A4($v0) ## 8015E704 /* 01DCC 80A98B7C 03194024 */ and $t0, $t8, $t9 /* 01DD0 80A98B80 5500000D */ bnel $t0, $zero, .L80A98BB8 @@ -35,9 +35,9 @@ glabel func_80A98B5C /* 01E20 80A98BD0 03E00008 */ jr $ra /* 01E24 80A98BD4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80A98BD8: -/* 01E28 80A98BD8 916B7491 */ lbu $t3, 0x7491($t3) ## 00007491 -/* 01E2C 80A98BDC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01E30 80A98BE0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01E28 80A98BD8 916B7491 */ lbu $t3, %lo(gItemSlots+0x2d)($t3) +/* 01E2C 80A98BDC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01E30 80A98BE0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01E34 80A98BE4 004B6021 */ addu $t4, $v0, $t3 /* 01E38 80A98BE8 918D0074 */ lbu $t5, 0x0074($t4) ## 00000074 /* 01E3C 80A98BEC 24010031 */ addiu $at, $zero, 0x0031 ## $at = 00000031 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98D2C.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98D2C.s index 2861964995..bc923a6bdc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98D2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98D2C.s @@ -1,12 +1,12 @@ glabel func_80A98D2C -/* 01F7C 80A98D2C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01F80 80A98D30 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01F7C 80A98D2C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01F80 80A98D30 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01F84 80A98D34 8C4E0004 */ lw $t6, 0x0004($v0) ## 8015E664 /* 01F88 80A98D38 AFA40000 */ sw $a0, 0x0000($sp) -/* 01F8C 80A98D3C 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 +/* 01F8C 80A98D3C 3C0F8012 */ lui $t7, %hi(gBitFlags) /* 01F90 80A98D40 15C0000B */ bne $t6, $zero, .L80A98D70 -/* 01F94 80A98D44 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 01F98 80A98D48 8DEF7120 */ lw $t7, 0x7120($t7) ## 80127120 +/* 01F94 80A98D44 3C088012 */ lui $t0, %hi(gBitFlags+0x48) +/* 01F98 80A98D48 8DEF7120 */ lw $t7, %lo(gBitFlags)($t7) /* 01F9C 80A98D4C 8C5800A4 */ lw $t8, 0x00A4($v0) ## 8015E704 /* 01FA0 80A98D50 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 /* 01FA4 80A98D54 01F8C824 */ and $t9, $t7, $t8 @@ -18,7 +18,7 @@ glabel func_80A98D2C /* 01FB8 80A98D68 03E00008 */ jr $ra /* 01FBC 80A98D6C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000003 .L80A98D70: -/* 01FC0 80A98D70 8D087168 */ lw $t0, 0x7168($t0) ## 80127168 +/* 01FC0 80A98D70 8D087168 */ lw $t0, %lo(gBitFlags+0x48)($t0) /* 01FC4 80A98D74 8C4900A4 */ lw $t1, 0x00A4($v0) ## 000000A7 /* 01FC8 80A98D78 01095024 */ and $t2, $t0, $t1 /* 01FCC 80A98D7C 5140000B */ beql $t2, $zero, .L80A98DAC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98DB4.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98DB4.s index 39d338fb6a..13ee479545 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98DB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98DB4.s @@ -15,11 +15,11 @@ glabel func_80A98DB4 /* 02038 80A98DE8 E4840220 */ swc1 $f4, 0x0220($a0) ## 00000220 .L80A98DEC: /* 0203C 80A98DEC 90CE1D6C */ lbu $t6, 0x1D6C($a2) ## 00001D6C -/* 02040 80A98DF0 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 +/* 02040 80A98DF0 3C0F8012 */ lui $t7, %hi(D_8011D394) /* 02044 80A98DF4 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 02048 80A98DF8 15C00004 */ bne $t6, $zero, .L80A98E0C /* 0204C 80A98DFC 00000000 */ nop -/* 02050 80A98E00 8DEFD394 */ lw $t7, -0x2C6C($t7) ## 8011D394 +/* 02050 80A98E00 8DEFD394 */ lw $t7, %lo(D_8011D394)($t7) /* 02054 80A98E04 51E0000A */ beql $t7, $zero, .L80A98E30 /* 02058 80A98E08 C6020090 */ lwc1 $f2, 0x0090($s0) ## 00000090 .L80A98E0C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s index 72455623ed..89bc6bfd90 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s @@ -28,8 +28,8 @@ glabel func_80A99048 /* 02300 80A990B0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 02304 80A990B4 3C0F80AA */ lui $t7, %hi(D_80A9A506) ## $t7 = 80AA0000 /* 02308 80A990B8 01415821 */ addu $t3, $t2, $at -/* 0230C 80A990BC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 02310 80A990C0 AC2B6FC0 */ sw $t3, 0x6FC0($at) ## 80166FC0 +/* 0230C 80A990BC 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 02310 80A990C0 AC2B6FC0 */ sw $t3, %lo(gSegments+0x18)($at) /* 02314 80A990C4 860C001C */ lh $t4, 0x001C($s0) ## 0000001C /* 02318 80A990C8 3C0680AA */ lui $a2, %hi(D_80A9A180) ## $a2 = 80AA0000 /* 0231C 80A990CC 24090010 */ addiu $t1, $zero, 0x0010 ## $t1 = 00000010 @@ -53,8 +53,8 @@ glabel func_80A99048 /* 02364 80A99114 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02368 80A99118 0C0291BE */ jal SkelAnime_InitSV /* 0236C 80A9911C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02370 80A99120 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 02374 80A99124 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 02370 80A99120 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 02374 80A99124 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 02378 80A99128 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0237C 80A9912C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02380 80A99130 0C00AC78 */ jal ActorShape_Init @@ -72,8 +72,8 @@ glabel func_80A99048 /* 023AC 80A9915C 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 023B0 80A99160 AFA50040 */ sw $a1, 0x0040($sp) /* 023B4 80A99164 01A17021 */ addu $t6, $t5, $at -/* 023B8 80A99168 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 023BC 80A9916C AC2E6FC0 */ sw $t6, 0x6FC0($at) ## 80166FC0 +/* 023B8 80A99168 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 023BC 80A9916C AC2E6FC0 */ sw $t6, %lo(gSegments+0x18)($at) /* 023C0 80A99170 0C0170D9 */ jal ActorCollider_AllocCylinder /* 023C4 80A99174 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 @@ -98,14 +98,14 @@ glabel func_80A99048 /* 0240C 80A991BC 0C00084C */ jal osSyncPrintf /* 02410 80A991C0 860500B8 */ lh $a1, 0x00B8($s0) ## 000000B8 -/* 02414 80A991C4 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 02418 80A991C8 8F39E664 */ lw $t9, -0x199C($t9) ## 8015E664 -/* 0241C 80A991CC 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 02420 80A991D0 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 02414 80A991C4 3C198016 */ lui $t9, %hi(gSaveContext+4) +/* 02418 80A991C8 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) +/* 0241C 80A991CC 3C088012 */ lui $t0, %hi(gBitFlags) +/* 02420 80A991D0 3C098016 */ lui $t1, %hi(gSaveContext+0xa4) /* 02424 80A991D4 5720000F */ bnel $t9, $zero, .L80A99214 /* 02428 80A991D8 860C00B8 */ lh $t4, 0x00B8($s0) ## 000000B8 -/* 0242C 80A991DC 8D087120 */ lw $t0, 0x7120($t0) ## 80127120 -/* 02430 80A991E0 8D29E704 */ lw $t1, -0x18FC($t1) ## 8015E704 +/* 0242C 80A991DC 8D087120 */ lw $t0, %lo(gBitFlags)($t0) +/* 02430 80A991E0 8D29E704 */ lw $t1, %lo(gSaveContext+0xa4)($t1) /* 02434 80A991E4 01095024 */ and $t2, $t0, $t1 /* 02438 80A991E8 5540000A */ bnel $t2, $zero, .L80A99214 /* 0243C 80A991EC 860C00B8 */ lh $t4, 0x00B8($s0) ## 000000B8 @@ -191,12 +191,12 @@ glabel func_80A99048 /* 0255C 80A9930C E7AA0018 */ swc1 $f10, 0x0018($sp) /* 02560 80A99310 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 02564 80A99314 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02568 80A99318 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 +/* 02568 80A99318 3C0F8012 */ lui $t7, %hi(gBitFlags+0x48) /* 0256C 80A9931C 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 /* 02570 80A99320 15C10010 */ bne $t6, $at, .L80A99364 -/* 02574 80A99324 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 02578 80A99328 8DEF7168 */ lw $t7, 0x7168($t7) ## 80127168 -/* 0257C 80A9932C 8F18E704 */ lw $t8, -0x18FC($t8) ## 8015E704 +/* 02574 80A99324 3C188016 */ lui $t8, %hi(gSaveContext+0xa4) +/* 02578 80A99328 8DEF7168 */ lw $t7, %lo(gBitFlags+0x48)($t7) +/* 0257C 80A9932C 8F18E704 */ lw $t8, %lo(gSaveContext+0xa4)($t8) /* 02580 80A99330 3C0A80AA */ lui $t2, %hi(func_80A995CC) ## $t2 = 80AA0000 /* 02584 80A99334 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 02588 80A99338 01F8C824 */ and $t9, $t7, $t8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99560.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99560.s index ae5fd1c4f5..61d7bdae15 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99560.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99560.s @@ -12,9 +12,9 @@ glabel func_80A99560 /* 027D8 80A99588 0C042DC8 */ jal func_8010B720 /* 027DC 80A9958C AFA60018 */ sw $a2, 0x0018($sp) /* 027E0 80A99590 8FA60018 */ lw $a2, 0x0018($sp) -/* 027E4 80A99594 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 027E4 80A99594 3C028016 */ lui $v0, %hi(gSaveContext) /* 027E8 80A99598 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 027EC 80A9959C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 027EC 80A9959C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 027F0 80A995A0 A4D801E8 */ sh $t8, 0x01E8($a2) ## 000001E8 /* 027F4 80A995A4 94590EF6 */ lhu $t9, 0x0EF6($v0) ## 8015F556 /* 027F8 80A995A8 3C0980AA */ lui $t1, %hi(func_80A99384) ## $t1 = 80AA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99864.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99864.s index 30c330b7b0..fa16f21d86 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99864.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99864.s @@ -22,7 +22,7 @@ glabel func_80A99864 /* 02B04 80A998B4 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 /* 02B08 80A998B8 3C0A8000 */ lui $t2, 0x8000 ## $t2 = 80000000 /* 02B0C 80A998BC 03080019 */ multu $t8, $t0 -/* 02B10 80A998C0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 02B10 80A998C0 3C018016 */ lui $at, %hi(gSegments+0x18) /* 02B14 80A998C4 0000C812 */ mflo $t9 /* 02B18 80A998C8 00F95821 */ addu $t3, $a3, $t9 /* 02B1C 80A998CC 01696021 */ addu $t4, $t3, $t1 @@ -38,7 +38,7 @@ glabel func_80A99864 /* 02B44 80A998F4 3C1980AA */ lui $t9, %hi(D_80A9A158) ## $t9 = 80AA0000 /* 02B48 80A998F8 2739A158 */ addiu $t9, $t9, %lo(D_80A9A158) ## $t9 = 80A9A158 /* 02B4C 80A998FC 016A6021 */ addu $t4, $t3, $t2 -/* 02B50 80A99900 AC2C6FC0 */ sw $t4, 0x6FC0($at) ## 80166FC0 +/* 02B50 80A99900 AC2C6FC0 */ sw $t4, %lo(gSegments+0x18)($at) /* 02B54 80A99904 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 02B58 80A99908 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 02B5C 80A9990C 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 @@ -70,10 +70,10 @@ glabel func_80A99864 /* 02BC4 80A99974 0006C900 */ sll $t9, $a2, 4 /* 02BC8 80A99978 00195F02 */ srl $t3, $t9, 28 /* 02BCC 80A9997C 000B6080 */ sll $t4, $t3, 2 -/* 02BD0 80A99980 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 02BD0 80A99980 3C0D8016 */ lui $t5, %hi(gSegments) /* 02BD4 80A99984 01AC6821 */ addu $t5, $t5, $t4 /* 02BD8 80A99988 AC780000 */ sw $t8, 0x0000($v1) ## 80AA0000 -/* 02BDC 80A9998C 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 +/* 02BDC 80A9998C 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) /* 02BE0 80A99990 00C17024 */ and $t6, $a2, $at /* 02BE4 80A99994 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 02BE8 80A99998 01AE7821 */ addu $t7, $t5, $t6 @@ -81,14 +81,14 @@ glabel func_80A99864 /* 02BF0 80A999A0 AC780004 */ sw $t8, 0x0004($v1) ## 80AA0004 /* 02BF4 80A999A4 82190196 */ lb $t9, 0x0196($s0) ## 00000196 .L80A999A8: -/* 02BF8 80A999A8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 02BF8 80A999A8 3C018016 */ lui $at, %hi(gSegments+0x18) /* 02BFC 80A999AC 03280019 */ multu $t9, $t0 /* 02C00 80A999B0 00005812 */ mflo $t3 /* 02C04 80A999B4 00EB6021 */ addu $t4, $a3, $t3 /* 02C08 80A999B8 01896821 */ addu $t5, $t4, $t1 /* 02C0C 80A999BC 8DAE17B4 */ lw $t6, 0x17B4($t5) ## 801617B4 /* 02C10 80A999C0 01CA7821 */ addu $t7, $t6, $t2 -/* 02C14 80A999C4 AC2F6FC0 */ sw $t7, 0x6FC0($at) ## 80166FC0 +/* 02C14 80A999C4 AC2F6FC0 */ sw $t7, %lo(gSegments+0x18)($at) .L80A999C8: /* 02C18 80A999C8 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 /* 02C1C 80A999CC 16210021 */ bne $s1, $at, .L80A99A54 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99BC4.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99BC4.s index 1cbeae4332..0c69eaade5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99BC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99BC4.s @@ -39,8 +39,8 @@ glabel func_80A99BC4 /* 02EA8 80A99C58 01696021 */ addu $t4, $t3, $t1 /* 02EAC 80A99C5C 8D8D17B4 */ lw $t5, 0x17B4($t4) ## 000017B4 /* 02EB0 80A99C60 01A17021 */ addu $t6, $t5, $at -/* 02EB4 80A99C64 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 02EB8 80A99C68 AC2E6FC0 */ sw $t6, 0x6FC0($at) ## 80166FC0 +/* 02EB4 80A99C64 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 02EB8 80A99C68 AC2E6FC0 */ sw $t6, %lo(gSegments+0x18)($at) .L80A99C6C: /* 02EBC 80A99C6C 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 02EC0 80A99C70 14A10004 */ bne $a1, $at, .L80A99C84 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s index b273d7fd2e..6d7c1a08b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s @@ -26,7 +26,7 @@ glabel EnKz_Draw /* 01288 80A9D7D8 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 0128C 80A9D7DC 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 01290 80A9D7E0 3C0480AA */ lui $a0, %hi(D_80A9D964) ## $a0 = 80AA0000 -/* 01294 80A9D7E4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 01294 80A9D7E4 3C0E8016 */ lui $t6, %hi(gSegments) /* 01298 80A9D7E8 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 /* 0129C 80A9D7EC AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 012A0 80A9D7F0 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 @@ -40,7 +40,7 @@ glabel EnKz_Draw /* 012C0 80A9D810 000B6702 */ srl $t4, $t3, 28 /* 012C4 80A9D814 000C6880 */ sll $t5, $t4, 2 /* 012C8 80A9D818 01CD7021 */ addu $t6, $t6, $t5 -/* 012CC 80A9D81C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 012CC 80A9D81C 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 012D0 80A9D820 00815024 */ and $t2, $a0, $at /* 012D4 80A9D824 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 012D8 80A9D828 014E7821 */ addu $t7, $t2, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s index 6bd54fb4f2..2e93398e0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s @@ -56,8 +56,8 @@ glabel EnKz_Init /* 00A84 80A9CFD4 8FA40044 */ lw $a0, 0x0044($sp) /* 00A88 80A9CFD8 0C00D3B0 */ jal func_80034EC0 /* 00A8C 80A9CFDC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00A90 80A9CFE0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00A94 80A9CFE4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00A90 80A9CFE0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00A94 80A9CFE4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00A98 80A9CFE8 94480EDA */ lhu $t0, 0x0EDA($v0) ## 8015F53A /* 00A9C 80A9CFEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00AA0 80A9CFF0 31090008 */ andi $t1, $t0, 0x0008 ## $t1 = 00000000 @@ -65,8 +65,8 @@ glabel EnKz_Init /* 00AA8 80A9CFF8 8C4A0004 */ lw $t2, 0x0004($v0) ## 8015E664 /* 00AAC 80A9CFFC 0C2A7391 */ jal func_80A9CE44 /* 00AB0 80A9D000 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00AB4 80A9D004 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00AB8 80A9D008 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00AB4 80A9D004 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00AB8 80A9D008 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00ABC 80A9D00C 8C4A0004 */ lw $t2, 0x0004($v0) ## 8015E664 .L80A9D010: /* 00AC0 80A9D010 3C0F80AA */ lui $t7, %hi(func_80A9D0C0) ## $t7 = 80AA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Update.s index 284838f73c..d27d9580de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Update.s @@ -1,6 +1,6 @@ glabel EnKz_Update -/* 01064 80A9D5B4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 01068 80A9D5B8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 01064 80A9D5B4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 01068 80A9D5B8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0106C 80A9D5BC 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 /* 01070 80A9D5C0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 01074 80A9D5C4 AFB00018 */ sw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C550.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C550.s index b5420414fe..8b030e98e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C550.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C550.s @@ -1,8 +1,8 @@ glabel func_80A9C550 -/* 00000 80A9C550 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00004 80A9C554 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 00008 80A9C558 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 0000C 80A9C55C 8DCE7170 */ lw $t6, 0x7170($t6) ## 80127170 +/* 00000 80A9C550 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00004 80A9C554 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00008 80A9C558 3C0E8012 */ lui $t6, %hi(gBitFlags+0x50) +/* 0000C 80A9C55C 8DCE7170 */ lw $t6, %lo(gBitFlags+0x50)($t6) /* 00010 80A9C560 8C4F00A4 */ lw $t7, 0x00A4($v0) ## 8015E704 /* 00014 80A9C564 AFA50004 */ sw $a1, 0x0004($sp) /* 00018 80A9C568 8C831C44 */ lw $v1, 0x1C44($a0) ## 00001C44 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C5AC.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C5AC.s index 126748bf7d..0527636c0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C5AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C5AC.s @@ -1,8 +1,8 @@ glabel func_80A9C5AC -/* 0005C 80A9C5AC 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 00060 80A9C5B0 91CE7491 */ lbu $t6, 0x7491($t6) ## 80127491 -/* 00064 80A9C5B4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00068 80A9C5B8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0005C 80A9C5AC 3C0E8012 */ lui $t6, %hi(gItemSlots+0x2d) +/* 00060 80A9C5B0 91CE7491 */ lbu $t6, %lo(gItemSlots+0x2d)($t6) +/* 00064 80A9C5B4 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00068 80A9C5B8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0006C 80A9C5BC 004E7821 */ addu $t7, $v0, $t6 /* 00070 80A9C5C0 91F80074 */ lbu $t8, 0x0074($t7) ## 00000074 /* 00074 80A9C5C4 AFA50004 */ sw $a1, 0x0004($sp) @@ -11,13 +11,13 @@ glabel func_80A9C5AC /* 00080 80A9C5D0 1420001D */ bne $at, $zero, .L80A9C648 /* 00084 80A9C5D4 2419000C */ addiu $t9, $zero, 0x000C ## $t9 = 0000000C /* 00088 80A9C5D8 94590F1E */ lhu $t9, 0x0F1E($v0) ## 8015F57E -/* 0008C 80A9C5DC 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 -/* 00090 80A9C5E0 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 +/* 0008C 80A9C5DC 3C098012 */ lui $t1, %hi(gBitFlags+8) +/* 00090 80A9C5E0 3C0A8012 */ lui $t2, %hi(gEquipShifts+2) /* 00094 80A9C5E4 33280200 */ andi $t0, $t9, 0x0200 ## $t0 = 00000000 /* 00098 80A9C5E8 1500000C */ bne $t0, $zero, .L80A9C61C -/* 0009C 80A9C5EC 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 000A0 80A9C5F0 8D297128 */ lw $t1, 0x7128($t1) ## 80127128 -/* 000A4 80A9C5F4 914A71F2 */ lbu $t2, 0x71F2($t2) ## 801271F2 +/* 0009C 80A9C5EC 3C0E8012 */ lui $t6, %hi(gBitFlags+0x20) +/* 000A0 80A9C5F0 8D297128 */ lw $t1, %lo(gBitFlags+8)($t1) +/* 000A4 80A9C5F4 914A71F2 */ lbu $t2, %lo(gEquipShifts+2)($t2) /* 000A8 80A9C5F8 944C009C */ lhu $t4, 0x009C($v0) ## 8015E6FC /* 000AC 80A9C5FC 01495804 */ sllv $t3, $t1, $t2 /* 000B0 80A9C600 016C6824 */ and $t5, $t3, $t4 @@ -29,7 +29,7 @@ glabel func_80A9C5AC /* 000C4 80A9C614 03E00008 */ jr $ra /* 000C8 80A9C618 24024012 */ addiu $v0, $zero, 0x4012 ## $v0 = 00004012 .L80A9C61C: -/* 000CC 80A9C61C 8DCE7140 */ lw $t6, 0x7140($t6) ## 80127140 +/* 000CC 80A9C61C 8DCE7140 */ lw $t6, %lo(gBitFlags+0x20)($t6) /* 000D0 80A9C620 8C4F00A4 */ lw $t7, 0x00A4($v0) ## 000040B6 /* 000D4 80A9C624 2403401A */ addiu $v1, $zero, 0x401A ## $v1 = 0000401A /* 000D8 80A9C628 01CFC024 */ and $t8, $t6, $t7 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C658.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C658.s index 1b00fe98f5..02ac0b6ce2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C658.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C658.s @@ -12,8 +12,8 @@ glabel func_80A9C658 /* 00130 80A9C680 1000000B */ beq $zero, $zero, .L80A9C6B0 /* 00134 80A9C684 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L80A9C688: -/* 00138 80A9C688 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0013C 80A9C68C 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 +/* 00138 80A9C688 3C0E8016 */ lui $t6, %hi(gSaveContext+4) +/* 0013C 80A9C68C 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) /* 00140 80A9C690 15C00005 */ bne $t6, $zero, .L80A9C6A8 /* 00144 80A9C694 00000000 */ nop /* 00148 80A9C698 0C2A716B */ jal func_80A9C5AC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C6C0.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C6C0.s index 7352445848..8df6cb7986 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C6C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C6C0.s @@ -47,8 +47,8 @@ glabel L80A9C710 /* 001E8 80A9C738 10000066 */ beq $zero, $zero, .L80A9C8D4 /* 001EC 80A9C73C 8FBF001C */ lw $ra, 0x001C($sp) .L80A9C740: -/* 001F0 80A9C740 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 001F4 80A9C744 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 001F0 80A9C740 3C028016 */ lui $v0, %hi(gSaveContext) +/* 001F4 80A9C744 2442E660 */ addiu $v0, %lo(gSaveContext) /* 001F8 80A9C748 94580F1E */ lhu $t8, 0x0F1E($v0) ## 8015F57E /* 001FC 80A9C74C 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 00200 80A9C750 37190200 */ ori $t9, $t8, 0x0200 ## $t9 = 00000200 @@ -65,8 +65,8 @@ glabel L80A9C710 /* 00224 80A9C774 10000056 */ beq $zero, $zero, .L80A9C8D0 /* 00228 80A9C778 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 .L80A9C77C: -/* 0022C 80A9C77C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00230 80A9C780 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0022C 80A9C77C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00230 80A9C780 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00234 80A9C784 94490F1E */ lhu $t1, 0x0F1E($v0) ## 8015F57E /* 00238 80A9C788 352A0200 */ ori $t2, $t1, 0x0200 ## $t2 = 00000200 /* 0023C 80A9C78C 10000050 */ beq $zero, $zero, .L80A9C8D0 @@ -79,14 +79,14 @@ glabel L80A9C794 /* 00254 80A9C7A4 5441004B */ bnel $v0, $at, .L80A9C8D4 /* 00258 80A9C7A8 8FBF001C */ lw $ra, 0x001C($sp) /* 0025C 80A9C7AC 906B0208 */ lbu $t3, 0x0208($v1) ## 00000208 -/* 00260 80A9C7B0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00264 80A9C7B4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00260 80A9C7B0 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00264 80A9C7B4 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00268 80A9C7B8 15600045 */ bne $t3, $zero, .L80A9C8D0 /* 0026C 80A9C7BC 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 00270 80A9C7C0 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 00274 80A9C7C4 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 -/* 00278 80A9C7C8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0027C 80A9C7CC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00270 80A9C7C0 3C0C8013 */ lui $t4, %hi(D_801333E8) +/* 00274 80A9C7C4 258C33E8 */ addiu $t4, %lo(D_801333E8) +/* 00278 80A9C7C8 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0027C 80A9C7CC 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00280 80A9C7D0 AFAC0014 */ sw $t4, 0x0014($sp) /* 00284 80A9C7D4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 00288 80A9C7D8 AFA70010 */ sw $a3, 0x0010($sp) @@ -100,14 +100,14 @@ glabel L80A9C794 /* 002A4 80A9C7F4 A06D0208 */ sb $t5, 0x0208($v1) ## 00000208 .L80A9C7F8: /* 002A8 80A9C7F8 906E0208 */ lbu $t6, 0x0208($v1) ## 00000208 -/* 002AC 80A9C7FC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 002B0 80A9C800 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 002AC 80A9C7FC 3C078013 */ lui $a3, %hi(D_801333E0) +/* 002B0 80A9C800 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 002B4 80A9C804 15C00032 */ bne $t6, $zero, .L80A9C8D0 /* 002B8 80A9C808 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 002BC 80A9C80C 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 002C0 80A9C810 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 002C4 80A9C814 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 002C8 80A9C818 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 002BC 80A9C80C 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 002C0 80A9C810 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 002C4 80A9C814 3C058013 */ lui $a1, %hi(D_801333D4) +/* 002C8 80A9C818 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 002CC 80A9C81C AFAF0014 */ sw $t7, 0x0014($sp) /* 002D0 80A9C820 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 002D4 80A9C824 AFA70010 */ sw $a3, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CB18.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CB18.s index 026d745f55..49f5ef098a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CB18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CB18.s @@ -23,9 +23,9 @@ glabel func_80A9CB18 /* 0061C 80A9CB6C 8FA80024 */ lw $t0, 0x0024($sp) /* 00620 80A9CB70 94B9010E */ lhu $t9, 0x010E($a1) ## 0000010E /* 00624 80A9CB74 2401401A */ addiu $at, $zero, 0x401A ## $at = 0000401A -/* 00628 80A9CB78 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00628 80A9CB78 3C038016 */ lui $v1, %hi(gSaveContext) /* 0062C 80A9CB7C 17210015 */ bne $t9, $at, .L80A9CBD4 -/* 00630 80A9CB80 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00630 80A9CB80 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00634 80A9CB84 94690EDA */ lhu $t1, 0x0EDA($v1) ## 8015F53A /* 00638 80A9CB88 312A0008 */ andi $t2, $t1, 0x0008 ## $t2 = 00000000 /* 0063C 80A9CB8C 15400011 */ bne $t2, $zero, .L80A9CBD4 @@ -49,13 +49,13 @@ glabel func_80A9CB18 /* 0067C 80A9CBCC 1000003E */ beq $zero, $zero, .L80A9CCC8 /* 00680 80A9CBD0 A50D010E */ sh $t5, 0x010E($t0) ## 0000010E .L80A9CBD4: -/* 00684 80A9CBD4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00688 80A9CBD8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00684 80A9CBD4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00688 80A9CBD8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0068C 80A9CBDC 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 -/* 00690 80A9CBE0 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 +/* 00690 80A9CBE0 3C0F8012 */ lui $t7, %hi(gItemSlots+0x2d) /* 00694 80A9CBE4 55C00039 */ bnel $t6, $zero, .L80A9CCCC /* 00698 80A9CBE8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0069C 80A9CBEC 91EF7491 */ lbu $t7, 0x7491($t7) ## 80127491 +/* 0069C 80A9CBEC 91EF7491 */ lbu $t7, %lo(gItemSlots+0x2d)($t7) /* 006A0 80A9CBF0 24010034 */ addiu $at, $zero, 0x0034 ## $at = 00000034 /* 006A4 80A9CBF4 006FC021 */ addu $t8, $v1, $t7 /* 006A8 80A9CBF8 93190074 */ lbu $t9, 0x0074($t8) ## 00000074 @@ -64,9 +64,9 @@ glabel func_80A9CB18 /* 006B4 80A9CC04 AFA50028 */ sw $a1, 0x0028($sp) /* 006B8 80A9CC08 0C00BCDA */ jal func_8002F368 /* 006BC 80A9CC0C AFA80024 */ sw $t0, 0x0024($sp) -/* 006C0 80A9CC10 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 006C0 80A9CC10 3C038016 */ lui $v1, %hi(gSaveContext) /* 006C4 80A9CC14 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 006C8 80A9CC18 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 006C8 80A9CC18 2463E660 */ addiu $v1, %lo(gSaveContext) /* 006CC 80A9CC1C 8FA50028 */ lw $a1, 0x0028($sp) /* 006D0 80A9CC20 14410008 */ bne $v0, $at, .L80A9CC44 /* 006D4 80A9CC24 8FA80024 */ lw $t0, 0x0024($sp) @@ -81,12 +81,12 @@ glabel func_80A9CB18 /* 006F4 80A9CC44 A0A00209 */ sb $zero, 0x0209($a1) ## 00000209 .L80A9CC48: /* 006F8 80A9CC48 946C0F1E */ lhu $t4, 0x0F1E($v1) ## 8015F57E -/* 006FC 80A9CC4C 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 00700 80A9CC50 3C0B8012 */ lui $t3, 0x8012 ## $t3 = 80120000 +/* 006FC 80A9CC4C 3C0E8012 */ lui $t6, %hi(gBitFlags+0x20) +/* 00700 80A9CC50 3C0B8012 */ lui $t3, %hi(gBitFlags+8) /* 00704 80A9CC54 318D0200 */ andi $t5, $t4, 0x0200 ## $t5 = 00000000 /* 00708 80A9CC58 11A0000E */ beq $t5, $zero, .L80A9CC94 -/* 0070C 80A9CC5C 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 -/* 00710 80A9CC60 8DCE7140 */ lw $t6, 0x7140($t6) ## 80127140 +/* 0070C 80A9CC5C 3C0C8012 */ lui $t4, %hi(gEquipShifts+2) +/* 00710 80A9CC60 8DCE7140 */ lw $t6, %lo(gBitFlags+0x20)($t6) /* 00714 80A9CC64 8C6F00A4 */ lw $t7, 0x00A4($v1) ## 8015E704 /* 00718 80A9CC68 2409401A */ addiu $t1, $zero, 0x401A ## $t1 = 0000401A /* 0071C 80A9CC6C 24194045 */ addiu $t9, $zero, 0x4045 ## $t9 = 00004045 @@ -101,8 +101,8 @@ glabel func_80A9CB18 /* 0073C 80A9CC8C 1000000E */ beq $zero, $zero, .L80A9CCC8 /* 00740 80A9CC90 A50A010E */ sh $t2, 0x010E($t0) ## 0000010E .L80A9CC94: -/* 00744 80A9CC94 8D6B7128 */ lw $t3, 0x7128($t3) ## 80127128 -/* 00748 80A9CC98 918C71F2 */ lbu $t4, 0x71F2($t4) ## 801271F2 +/* 00744 80A9CC94 8D6B7128 */ lw $t3, %lo(gBitFlags+8)($t3) +/* 00748 80A9CC98 918C71F2 */ lbu $t4, %lo(gEquipShifts+2)($t4) /* 0074C 80A9CC9C 946E009C */ lhu $t6, 0x009C($v1) ## 8015E6FC /* 00750 80A9CCA0 24194012 */ addiu $t9, $zero, 0x4012 ## $t9 = 00004012 /* 00754 80A9CCA4 018B6804 */ sllv $t5, $t3, $t4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CCD8.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CCD8.s index ce00953afc..515ba9d204 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CCD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CCD8.s @@ -22,14 +22,14 @@ glabel func_80A9CCD8 /* 007C0 80A9CD10 000FC0C0 */ sll $t8, $t7, 3 /* 007C4 80A9CD14 01D82021 */ addu $a0, $t6, $t8 /* 007C8 80A9CD18 8C830004 */ lw $v1, 0x0004($a0) ## 00000004 -/* 007CC 80A9CD1C 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 007CC 80A9CD1C 3C0A8016 */ lui $t2, %hi(gSegments) /* 007D0 80A9CD20 860C020A */ lh $t4, 0x020A($s0) ## 0000020A /* 007D4 80A9CD24 0003C900 */ sll $t9, $v1, 4 /* 007D8 80A9CD28 00194702 */ srl $t0, $t9, 28 /* 007DC 80A9CD2C 00084880 */ sll $t1, $t0, 2 /* 007E0 80A9CD30 01495021 */ addu $t2, $t2, $t1 /* 007E4 80A9CD34 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 007E8 80A9CD38 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 007E8 80A9CD38 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 007EC 80A9CD3C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 007F0 80A9CD40 00615824 */ and $t3, $v1, $at /* 007F4 80A9CD44 000C6880 */ sll $t5, $t4, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CE44.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CE44.s index cb0055d662..ed93ec514e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CE44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CE44.s @@ -14,14 +14,14 @@ glabel func_80A9CE44 /* 00920 80A9CE70 000FC0C0 */ sll $t8, $t7, 3 /* 00924 80A9CE74 01D82821 */ addu $a1, $t6, $t8 /* 00928 80A9CE78 8CA80004 */ lw $t0, 0x0004($a1) ## 00000004 -/* 0092C 80A9CE7C 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 0092C 80A9CE7C 3C0B8016 */ lui $t3, %hi(gSegments) /* 00930 80A9CE80 90AD0000 */ lbu $t5, 0x0000($a1) ## 00000000 /* 00934 80A9CE84 0008C900 */ sll $t9, $t0, 4 /* 00938 80A9CE88 00194F02 */ srl $t1, $t9, 28 /* 0093C 80A9CE8C 00095080 */ sll $t2, $t1, 2 /* 00940 80A9CE90 016A5821 */ addu $t3, $t3, $t2 /* 00944 80A9CE94 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00948 80A9CE98 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 +/* 00948 80A9CE98 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) /* 0094C 80A9CE9C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00950 80A9CEA0 01016024 */ and $t4, $t0, $at /* 00954 80A9CEA4 000D7880 */ sll $t7, $t5, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D25C.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D25C.s index da18deeb75..1fcb00487c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D25C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D25C.s @@ -65,8 +65,8 @@ glabel func_80A9D25C /* 00E08 80A9D358 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E0C 80A9D35C 0C2A7391 */ jal func_80A9CE44 /* 00E10 80A9D360 8FA5004C */ lw $a1, 0x004C($sp) -/* 00E14 80A9D364 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00E18 80A9D368 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00E14 80A9D364 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00E18 80A9D368 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00E1C 80A9D36C 946D0EDA */ lhu $t5, 0x0EDA($v1) ## 8015F53A /* 00E20 80A9D370 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 00E24 80A9D374 3C0F80AA */ lui $t7, %hi(func_80A9D3C8) ## $t7 = 80AA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D520.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D520.s index c57bee372d..f898c250f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D520.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D520.s @@ -11,10 +11,10 @@ glabel func_80A9D520 /* 00FF4 80A9D544 0C041AF2 */ jal func_80106BC8 /* 00FF8 80A9D548 8FA4001C */ lw $a0, 0x001C($sp) /* 00FFC 80A9D54C 10400015 */ beq $v0, $zero, .L80A9D5A4 -/* 01000 80A9D550 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 01004 80A9D554 91CE7491 */ lbu $t6, 0x7491($t6) ## 80127491 -/* 01008 80A9D558 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0100C 80A9D55C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01000 80A9D550 3C0E8012 */ lui $t6, %hi(gItemSlots+0x2d) +/* 01004 80A9D554 91CE7491 */ lbu $t6, %lo(gItemSlots+0x2d)($t6) +/* 01008 80A9D558 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0100C 80A9D55C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01010 80A9D560 004E7821 */ addu $t7, $v0, $t6 /* 01014 80A9D564 91F80074 */ lbu $t8, 0x0074($t7) ## 00000074 /* 01018 80A9D568 24010035 */ addiu $at, $zero, 0x0035 ## $at = 00000035 @@ -22,8 +22,8 @@ glabel func_80A9D520 /* 01020 80A9D570 8FA20018 */ lw $v0, 0x0018($sp) /* 01024 80A9D574 0C0222A8 */ jal func_80088AA0 /* 01028 80A9D578 240400B4 */ addiu $a0, $zero, 0x00B4 ## $a0 = 000000B4 -/* 0102C 80A9D57C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01030 80A9D580 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0102C 80A9D57C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01030 80A9D580 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01034 80A9D584 945913FC */ lhu $t9, 0x13FC($v0) ## 8015FA5C /* 01038 80A9D588 3328FFFE */ andi $t0, $t9, 0xFFFE ## $t0 = 00000000 /* 0103C 80A9D58C A44813FC */ sh $t0, 0x13FC($v0) ## 8015FA5C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Init.s index 4668338594..41c98e8b76 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Init.s @@ -4,8 +4,8 @@ glabel D_80A9E8F0 .text glabel EnLight_Init -/* 00000 80A9DB40 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00004 80A9DB44 8DCEF9BC */ lw $t6, -0x0644($t6) ## 8015F9BC +/* 00000 80A9DB40 3C0E8016 */ lui $t6, %hi(gSaveContext+0x135c) +/* 00004 80A9DB44 8DCEF9BC */ lw $t6, %lo(gSaveContext+0x135c)($t6) /* 00008 80A9DB48 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0000C 80A9DB4C AFB00024 */ sw $s0, 0x0024($sp) /* 00010 80A9DB50 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Init.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Init.s index 96b0a9f2a8..ed864e85d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Init.s @@ -84,12 +84,12 @@ glabel EnMThunder_Init /* 0013C 80A9F11C A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 /* 00140 80A9F120 A20001CA */ sb $zero, 0x01CA($s0) ## 000001CA /* 00144 80A9F124 8E2B0680 */ lw $t3, 0x0680($s1) ## 00000680 -/* 00148 80A9F128 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00148 80A9F128 3C028016 */ lui $v0, %hi(gSaveContext) /* 0014C 80A9F12C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00150 80A9F130 000B6380 */ sll $t4, $t3, 14 /* 00154 80A9F134 05810054 */ bgez $t4, .L80A9F288 /* 00158 80A9F138 3C0580AA */ lui $a1, %hi(func_80A9F408) ## $a1 = 80AA0000 -/* 0015C 80A9F13C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0015C 80A9F13C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00160 80A9F140 904D003A */ lbu $t5, 0x003A($v0) ## 8015E69A /* 00164 80A9F144 11A0000E */ beq $t5, $zero, .L80A9F180 /* 00168 80A9F148 00000000 */ nop @@ -107,10 +107,10 @@ glabel EnMThunder_Init /* 00198 80A9F178 00052C03 */ sra $a1, $a1, 16 /* 0019C 80A9F17C 14400019 */ bne $v0, $zero, .L80A9F1E4 .L80A9F180: -/* 001A0 80A9F180 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 001A4 80A9F184 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 001A8 80A9F188 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 001AC 80A9F18C 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 001A0 80A9F180 3C078013 */ lui $a3, %hi(D_801333E0) +/* 001A4 80A9F184 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 001A8 80A9F188 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 001AC 80A9F18C 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 001B0 80A9F190 262500E4 */ addiu $a1, $s1, 0x00E4 ## $a1 = 000000E4 /* 001B4 80A9F194 AFA50030 */ sw $a1, 0x0030($sp) /* 001B8 80A9F198 AFAF0014 */ sw $t7, 0x0014($sp) @@ -119,10 +119,10 @@ glabel EnMThunder_Init /* 001C4 80A9F1A4 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 001C8 80A9F1A8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 001CC 80A9F1AC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 001D0 80A9F1B0 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 001D4 80A9F1B4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 001D8 80A9F1B8 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 001CC 80A9F1AC 3C078013 */ lui $a3, %hi(D_801333E0) +/* 001D0 80A9F1B0 3C188013 */ lui $t8, %hi(D_801333E8) +/* 001D4 80A9F1B4 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 001D8 80A9F1B8 271833E8 */ addiu $t8, %lo(D_801333E8) /* 001DC 80A9F1BC 8FA50030 */ lw $a1, 0x0030($sp) /* 001E0 80A9F1C0 AFB80014 */ sw $t8, 0x0014($sp) /* 001E4 80A9F1C4 AFA70010 */ sw $a3, 0x0010($sp) @@ -163,12 +163,12 @@ glabel EnMThunder_Init /* 0025C 80A9F23C 24A5F9B4 */ addiu $a1, $a1, %lo(func_80A9F9B4) ## $a1 = 80A9F9B4 /* 00260 80A9F240 0C2A7BF8 */ jal func_80A9EFE0 /* 00264 80A9F244 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00268 80A9F248 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 00268 80A9F248 3C078013 */ lui $a3, %hi(D_801333E0) /* 0026C 80A9F24C 240D0008 */ addiu $t5, $zero, 0x0008 ## $t5 = 00000008 -/* 00270 80A9F250 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 00274 80A9F254 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00270 80A9F250 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 00274 80A9F254 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00278 80A9F258 A60D01C4 */ sh $t5, 0x01C4($s0) ## 000001C4 -/* 0027C 80A9F25C 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 +/* 0027C 80A9F25C 25CE33E8 */ addiu $t6, %lo(D_801333E8) /* 00280 80A9F260 AFAE0014 */ sw $t6, 0x0014($sp) /* 00284 80A9F264 AFA70010 */ sw $a3, 0x0010($sp) /* 00288 80A9F268 2404182E */ addiu $a0, $zero, 0x182E ## $a0 = 0000182E diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F350.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F350.s index fbfaa1b7d7..6b51fff68b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F350.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F350.s @@ -8,13 +8,13 @@ glabel func_80A9F350 /* 00388 80A9F368 05E3001E */ bgezl $t7, .L80A9F3E4 /* 0038C 80A9F36C 8C49067C */ lw $t1, 0x067C($v0) ## 0000067C /* 00390 80A9F370 80580842 */ lb $t8, 0x0842($v0) ## 00000842 -/* 00394 80A9F374 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00398 80A9F378 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00394 80A9F374 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00398 80A9F378 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 0039C 80A9F37C 2B010018 */ slti $at, $t8, 0x0018 /* 003A0 80A9F380 14200013 */ bne $at, $zero, .L80A9F3D0 /* 003A4 80A9F384 24041823 */ addiu $a0, $zero, 0x1823 ## $a0 = 00001823 -/* 003A8 80A9F388 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 003AC 80A9F38C 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 003A8 80A9F388 3C198013 */ lui $t9, %hi(D_801333E8) +/* 003AC 80A9F38C 273933E8 */ addiu $t9, %lo(D_801333E8) /* 003B0 80A9F390 244500E4 */ addiu $a1, $v0, 0x00E4 ## $a1 = 000000E4 /* 003B4 80A9F394 AFA50020 */ sw $a1, 0x0020($sp) /* 003B8 80A9F398 AFB90014 */ sw $t9, 0x0014($sp) @@ -22,10 +22,10 @@ glabel func_80A9F350 /* 003C0 80A9F3A0 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 003C4 80A9F3A4 AFA70010 */ sw $a3, 0x0010($sp) -/* 003C8 80A9F3A8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 003CC 80A9F3AC 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 003D0 80A9F3B0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 003D4 80A9F3B4 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 +/* 003C8 80A9F3A8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 003CC 80A9F3AC 3C088013 */ lui $t0, %hi(D_801333E8) +/* 003D0 80A9F3B0 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 003D4 80A9F3B4 250833E8 */ addiu $t0, %lo(D_801333E8) /* 003D8 80A9F3B8 8FA50020 */ lw $a1, 0x0020($sp) /* 003DC 80A9F3BC AFA80014 */ sw $t0, 0x0014($sp) /* 003E0 80A9F3C0 AFA70010 */ sw $a3, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F408.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F408.s index 930d0c883b..a0b3c172fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F408.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F408.s @@ -55,12 +55,12 @@ glabel func_80A9F408 /* 0047C 80A9F45C 3C0180AA */ lui $at, %hi(D_80AA04E0) ## $at = 80AA0000 /* 00480 80A9F460 C42804E0 */ lwc1 $f8, %lo(D_80AA04E0)($at) /* 00484 80A9F464 C4660858 */ lwc1 $f6, 0x0858($v1) ## 00000858 -/* 00488 80A9F468 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 00488 80A9F468 3C0B8016 */ lui $t3, %hi(gSaveContext+0x13f0) /* 0048C 80A9F46C 4606403E */ c.le.s $f8, $f6 /* 00490 80A9F470 00000000 */ nop /* 00494 80A9F474 45000021 */ bc1f .L80A9F4FC /* 00498 80A9F478 00000000 */ nop -/* 0049C 80A9F47C 856BFA50 */ lh $t3, -0x05B0($t3) ## 8015FA50 +/* 0049C 80A9F47C 856BFA50 */ lh $t3, %lo(gSaveContext+0x13f0)($t3) /* 004A0 80A9F480 55600010 */ bnel $t3, $zero, .L80A9F4C4 /* 004A4 80A9F484 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004A8 80A9F488 8482001C */ lh $v0, 0x001C($a0) ## 0000001C @@ -144,13 +144,13 @@ glabel func_80A9F408 /* 005CC 80A9F5AC 45000019 */ bc1f .L80A9F614 /* 005D0 80A9F5B0 00000000 */ nop /* 005D4 80A9F5B4 80790842 */ lb $t9, 0x0842($v1) ## 00000842 -/* 005D8 80A9F5B8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 005DC 80A9F5BC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 005D8 80A9F5B8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 005DC 80A9F5BC 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 005E0 80A9F5C0 2B210018 */ slti $at, $t9, 0x0018 /* 005E4 80A9F5C4 14200013 */ bne $at, $zero, .L80A9F614 /* 005E8 80A9F5C8 24041823 */ addiu $a0, $zero, 0x1823 ## $a0 = 00001823 -/* 005EC 80A9F5CC 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 005F0 80A9F5D0 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 +/* 005EC 80A9F5CC 3C098013 */ lui $t1, %hi(D_801333E8) +/* 005F0 80A9F5D0 252933E8 */ addiu $t1, %lo(D_801333E8) /* 005F4 80A9F5D4 246500E4 */ addiu $a1, $v1, 0x00E4 ## $a1 = 000000E4 /* 005F8 80A9F5D8 AFA50044 */ sw $a1, 0x0044($sp) /* 005FC 80A9F5DC AFA90014 */ sw $t1, 0x0014($sp) @@ -158,10 +158,10 @@ glabel func_80A9F408 /* 00604 80A9F5E4 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 00608 80A9F5E8 AFA70010 */ sw $a3, 0x0010($sp) -/* 0060C 80A9F5EC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00610 80A9F5F0 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 00614 80A9F5F4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00618 80A9F5F8 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 +/* 0060C 80A9F5EC 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00610 80A9F5F0 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 00614 80A9F5F4 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00618 80A9F5F8 254A33E8 */ addiu $t2, %lo(D_801333E8) /* 0061C 80A9F5FC 8FA50044 */ lw $a1, 0x0044($sp) /* 00620 80A9F600 AFAA0014 */ sw $t2, 0x0014($sp) /* 00624 80A9F604 AFA70010 */ sw $a3, 0x0010($sp) @@ -183,12 +183,12 @@ glabel func_80A9F408 /* 00654 80A9F634 AC6C0680 */ sw $t4, 0x0680($v1) ## 00000680 /* 00658 80A9F638 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 0065C 80A9F63C 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 00660 80A9F640 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00660 80A9F640 3C018016 */ lui $at, %hi(gSaveContext+0x13f0) /* 00664 80A9F644 31AEFF00 */ andi $t6, $t5, 0xFF00 ## $t6 = 00000000 /* 00668 80A9F648 000E7A03 */ sra $t7, $t6, 8 /* 0066C 80A9F64C 11E00002 */ beq $t7, $zero, .L80A9F658 /* 00670 80A9F650 00000000 */ nop -/* 00674 80A9F654 A424FA50 */ sh $a0, -0x05B0($at) ## 8015FA50 +/* 00674 80A9F654 A424FA50 */ sh $a0, %lo(gSaveContext+0x13f0)($at) .L80A9F658: /* 00678 80A9F658 3C0180AA */ lui $at, %hi(D_80AA04F0) ## $at = 80AA0000 /* 0067C 80A9F65C C43204F0 */ lwc1 $f18, %lo(D_80AA04F0)($at) @@ -236,14 +236,14 @@ glabel func_80A9F408 /* 00714 80A9F6F4 921901C6 */ lbu $t9, 0x01C6($s0) ## 000001C6 /* 00718 80A9F6F8 8FA3004C */ lw $v1, 0x004C($sp) /* 0071C 80A9F6FC 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 -/* 00720 80A9F700 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 00720 80A9F700 3C078013 */ lui $a3, %hi(D_801333E0) /* 00724 80A9F704 A61801C4 */ sh $t8, 0x01C4($s0) ## 000001C4 /* 00728 80A9F708 3C0480AA */ lui $a0, %hi(D_80AA0464) ## $a0 = 80AA0000 -/* 0072C 80A9F70C 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 +/* 0072C 80A9F70C 3C0A8013 */ lui $t2, %hi(D_801333E8) /* 00730 80A9F710 00194840 */ sll $t1, $t9, 1 -/* 00734 80A9F714 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00734 80A9F714 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00738 80A9F718 00892021 */ addu $a0, $a0, $t1 -/* 0073C 80A9F71C 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 +/* 0073C 80A9F71C 254A33E8 */ addiu $t2, %lo(D_801333E8) /* 00740 80A9F720 AFAA0014 */ sw $t2, 0x0014($sp) /* 00744 80A9F724 94840464 */ lhu $a0, %lo(D_80AA0464)($a0) /* 00748 80A9F728 AFA70010 */ sw $a3, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s index 9a2cc77aa2..45ef7d8081 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s @@ -44,11 +44,11 @@ glabel EnMa1_Draw /* 00E90 80AA1520 AC680000 */ sw $t0, 0x0000($v1) ## 00000000 /* 00E94 80AA1524 860901E6 */ lh $t1, 0x01E6($s0) ## 000001E6 /* 00E98 80AA1528 3C0480AA */ lui $a0, %hi(D_80AA16C4) ## $a0 = 80AA0000 -/* 00E9C 80AA152C 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 00E9C 80AA152C 3C068016 */ lui $a2, %hi(gSegments) /* 00EA0 80AA1530 00095080 */ sll $t2, $t1, 2 /* 00EA4 80AA1534 008A2021 */ addu $a0, $a0, $t2 /* 00EA8 80AA1538 8C8416C4 */ lw $a0, %lo(D_80AA16C4)($a0) -/* 00EAC 80AA153C 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 00EAC 80AA153C 24C66FA8 */ addiu $a2, %lo(gSegments) /* 00EB0 80AA1540 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 /* 00EB4 80AA1544 00046100 */ sll $t4, $a0, 4 /* 00EB8 80AA1548 000C6F02 */ srl $t5, $t4, 28 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s index 70c57a7bfb..c33e26a32f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s @@ -4,8 +4,8 @@ glabel EnMa1_Init /* 00560 80AA0BF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00564 80AA0BF4 AFBF002C */ sw $ra, 0x002C($sp) /* 00568 80AA0BF8 AFA50044 */ sw $a1, 0x0044($sp) -/* 0056C 80AA0BFC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00570 80AA0C00 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0056C 80AA0BFC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00570 80AA0C00 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00574 80AA0C04 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00578 80AA0C08 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 0057C 80AA0C0C 0C00AC78 */ jal ActorShape_Init @@ -64,18 +64,18 @@ glabel EnMa1_Init /* 00638 80AA0CC8 0C00B58B */ jal Actor_SetScale /* 0063C 80AA0CCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00640 80AA0CD0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00640 80AA0CD0 3C028016 */ lui $v0, %hi(gSaveContext) /* 00644 80AA0CD4 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 -/* 00648 80AA0CD8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00648 80AA0CD8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0064C 80AA0CDC A20F001F */ sb $t7, 0x001F($s0) ## 0000001F /* 00650 80AA0CE0 A60001E8 */ sh $zero, 0x01E8($s0) ## 000001E8 /* 00654 80AA0CE4 94580ED6 */ lhu $t8, 0x0ED6($v0) ## 8015F536 /* 00658 80AA0CE8 3C0B80AA */ lui $t3, %hi(func_80AA0D88) ## $t3 = 80AA0000 -/* 0065C 80AA0CEC 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 +/* 0065C 80AA0CEC 3C088012 */ lui $t0, %hi(gBitFlags+0x34) /* 00660 80AA0CF0 33190010 */ andi $t9, $t8, 0x0010 ## $t9 = 00000000 /* 00664 80AA0CF4 13200008 */ beq $t9, $zero, .L80AA0D18 /* 00668 80AA0CF8 256B0D88 */ addiu $t3, $t3, %lo(func_80AA0D88) ## $t3 = 80AA0D88 -/* 0066C 80AA0CFC 8D087154 */ lw $t0, 0x7154($t0) ## 80127154 +/* 0066C 80AA0CFC 8D087154 */ lw $t0, %lo(gBitFlags+0x34)($t0) /* 00670 80AA0D00 8C4900A4 */ lw $t1, 0x00A4($v0) ## 8015E704 /* 00674 80AA0D04 3C0C80AA */ lui $t4, %hi(func_80AA0F44) ## $t4 = 80AA0000 /* 00678 80AA0D08 258C0F44 */ addiu $t4, $t4, %lo(func_80AA0F44) ## $t4 = 80AA0F44 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0690.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0690.s index b27e5c8f80..8c58a84b63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0690.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0690.s @@ -9,10 +9,10 @@ glabel func_80AA0690 /* 0001C 80AA06AC 1000002E */ beq $zero, $zero, .L80AA0768 /* 00020 80AA06B0 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L80AA06B4: -/* 00024 80AA06B4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00028 80AA06B8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 0002C 80AA06BC 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 00030 80AA06C0 8DCE7154 */ lw $t6, 0x7154($t6) ## 80127154 +/* 00024 80AA06B4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00028 80AA06B8 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 0002C 80AA06BC 3C0E8012 */ lui $t6, %hi(gBitFlags+0x34) +/* 00030 80AA06C0 8DCE7154 */ lw $t6, %lo(gBitFlags+0x34)($t6) /* 00034 80AA06C4 8C6F00A4 */ lw $t7, 0x00A4($v1) ## 8015E704 /* 00038 80AA06C8 01CFC024 */ and $t8, $t6, $t7 /* 0003C 80AA06CC 53000004 */ beql $t8, $zero, .L80AA06E0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0778.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0778.s index 808a4747fc..b8b42ec9cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0778.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0778.s @@ -80,8 +80,8 @@ glabel L80AA07C4 /* 00158 80AA07E8 03200008 */ jr $t9 /* 0015C 80AA07EC 00000000 */ nop glabel L80AA07F0 -/* 00160 80AA07F0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00164 80AA07F4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00160 80AA07F0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00164 80AA07F4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00168 80AA07F8 94480F08 */ lhu $t0, 0x0F08($v0) ## 8015F568 /* 0016C 80AA07FC 944A0ED6 */ lhu $t2, 0x0ED6($v0) ## 8015F536 /* 00170 80AA0800 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 @@ -91,24 +91,24 @@ glabel L80AA07F0 /* 00180 80AA0810 10000027 */ beq $zero, $zero, .L80AA08B0 /* 00184 80AA0814 A44B0ED6 */ sh $t3, 0x0ED6($v0) ## 8015F536 glabel L80AA0818 -/* 00188 80AA0818 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0018C 80AA081C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00188 80AA0818 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0018C 80AA081C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00190 80AA0820 944C0ED6 */ lhu $t4, 0x0ED6($v0) ## 8015F536 /* 00194 80AA0824 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 00198 80AA0828 358D0020 */ ori $t5, $t4, 0x0020 ## $t5 = 00000020 /* 0019C 80AA082C 10000020 */ beq $zero, $zero, .L80AA08B0 /* 001A0 80AA0830 A44D0ED6 */ sh $t5, 0x0ED6($v0) ## 8015F536 glabel L80AA0834 -/* 001A4 80AA0834 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 001A8 80AA0838 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 001A4 80AA0834 3C028016 */ lui $v0, %hi(gSaveContext) +/* 001A8 80AA0838 2442E660 */ addiu $v0, %lo(gSaveContext) /* 001AC 80AA083C 944E0F08 */ lhu $t6, 0x0F08($v0) ## 8015F568 /* 001B0 80AA0840 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 001B4 80AA0844 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 /* 001B8 80AA0848 10000019 */ beq $zero, $zero, .L80AA08B0 /* 001BC 80AA084C A44F0F08 */ sh $t7, 0x0F08($v0) ## 8015F568 glabel L80AA0850 -/* 001C0 80AA0850 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 001C4 80AA0854 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 001C0 80AA0850 3C028016 */ lui $v0, %hi(gSaveContext) +/* 001C4 80AA0854 2442E660 */ addiu $v0, %lo(gSaveContext) /* 001C8 80AA0858 94580ED6 */ lhu $t8, 0x0ED6($v0) ## 8015F536 /* 001CC 80AA085C 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 001D0 80AA0860 37190040 */ ori $t9, $t8, 0x0040 ## $t9 = 00000040 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA08C4.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA08C4.s index 038eee714d..63d9c72757 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA08C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA08C4.s @@ -1,9 +1,9 @@ glabel func_80AA08C4 /* 00234 80AA08C4 848200B8 */ lh $v0, 0x00B8($a0) ## 000000B8 /* 00238 80AA08C8 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 0023C 80AA08CC 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 0023C 80AA08CC 3C048016 */ lui $a0, %hi(gSaveContext) /* 00240 80AA08D0 14C20007 */ bne $a2, $v0, .L80AA08F0 -/* 00244 80AA08D4 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 00244 80AA08D4 2484E660 */ addiu $a0, %lo(gSaveContext) /* 00248 80AA08D8 8C8E1360 */ lw $t6, 0x1360($a0) ## 8015F9C0 /* 0024C 80AA08DC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00250 80AA08E0 15C10003 */ bne $t6, $at, .L80AA08F0 @@ -11,8 +11,8 @@ glabel func_80AA08C4 /* 00258 80AA08E8 03E00008 */ jr $ra /* 0025C 80AA08EC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80AA08F0: -/* 00260 80AA08F0 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 00264 80AA08F4 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 00260 80AA08F0 3C048016 */ lui $a0, %hi(gSaveContext) +/* 00264 80AA08F4 2484E660 */ addiu $a0, %lo(gSaveContext) /* 00268 80AA08F8 8C8F0004 */ lw $t7, 0x0004($a0) ## 8015E664 /* 0026C 80AA08FC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00270 80AA0900 50EF0004 */ beql $a3, $t7, .L80AA0914 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0D88.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0D88.s index 469ae710b7..4e7a5bdf2e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0D88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0D88.s @@ -30,9 +30,9 @@ glabel func_80AA0D88 .L80AA0DF4: /* 00764 80AA0DF4 84C900A4 */ lh $t1, 0x00A4($a2) ## 000000A4 /* 00768 80AA0DF8 2401005F */ addiu $at, $zero, 0x005F ## $at = 0000005F -/* 0076C 80AA0DFC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 0076C 80AA0DFC 3C028016 */ lui $v0, %hi(gSaveContext) /* 00770 80AA0E00 15210009 */ bne $t1, $at, .L80AA0E28 -/* 00774 80AA0E04 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00774 80AA0E04 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00778 80AA0E08 944A0ED6 */ lhu $t2, 0x0ED6($v0) ## 8015F536 /* 0077C 80AA0E0C 314B0010 */ andi $t3, $t2, 0x0010 ## $t3 = 00000000 /* 00780 80AA0E10 11600005 */ beq $t3, $zero, .L80AA0E28 @@ -43,14 +43,14 @@ glabel func_80AA0D88 /* 00790 80AA0E20 1000001C */ beq $zero, $zero, .L80AA0E94 /* 00794 80AA0E24 8FBF0014 */ lw $ra, 0x0014($sp) .L80AA0E28: -/* 00798 80AA0E28 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0079C 80AA0E2C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00798 80AA0E28 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0079C 80AA0E2C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 007A0 80AA0E30 944C0ED6 */ lhu $t4, 0x0ED6($v0) ## 8015F536 -/* 007A4 80AA0E34 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 +/* 007A4 80AA0E34 3C0E8012 */ lui $t6, %hi(gBitFlags+0x34) /* 007A8 80AA0E38 318D0010 */ andi $t5, $t4, 0x0010 ## $t5 = 00000000 /* 007AC 80AA0E3C 51A00007 */ beql $t5, $zero, .L80AA0E5C /* 007B0 80AA0E40 849901E8 */ lh $t9, 0x01E8($a0) ## 000001E8 -/* 007B4 80AA0E44 8DCE7154 */ lw $t6, 0x7154($t6) ## 80127154 +/* 007B4 80AA0E44 8DCE7154 */ lw $t6, %lo(gBitFlags+0x34)($t6) /* 007B8 80AA0E48 8C4F00A4 */ lw $t7, 0x00A4($v0) ## 8015E704 /* 007BC 80AA0E4C 01CFC024 */ and $t8, $t6, $t7 /* 007C0 80AA0E50 53000010 */ beql $t8, $zero, .L80AA0E94 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0EFC.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0EFC.s index b13888cc5f..e022c02c86 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0EFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0EFC.s @@ -1,9 +1,9 @@ glabel func_80AA0EFC /* 0086C 80AA0EFC 848E01E8 */ lh $t6, 0x01E8($a0) ## 000001E8 /* 00870 80AA0F00 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00874 80AA0F04 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00874 80AA0F04 3C028016 */ lui $v0, %hi(gSaveContext) /* 00878 80AA0F08 15C1000C */ bne $t6, $at, .L80AA0F3C -/* 0087C 80AA0F0C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0087C 80AA0F0C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00880 80AA0F10 3C0F80AA */ lui $t7, %hi(func_80AA0D88) ## $t7 = 80AA0000 /* 00884 80AA0F14 25EF0D88 */ addiu $t7, $t7, %lo(func_80AA0D88) ## $t7 = 80AA0D88 /* 00888 80AA0F18 A48001E8 */ sh $zero, 0x01E8($a0) ## 000001E8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0F44.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0F44.s index 4dc37bc821..17300d1c23 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0F44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0F44.s @@ -28,8 +28,8 @@ glabel func_80AA0F44 /* 00918 80AA0FA8 AFA30024 */ sw $v1, 0x0024($sp) /* 0091C 80AA0FAC 8FA30024 */ lw $v1, 0x0024($sp) .L80AA0FB0: -/* 00920 80AA0FB0 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 00924 80AA0FB4 954AF536 */ lhu $t2, -0x0ACA($t2) ## 8015F536 +/* 00920 80AA0FB0 3C0A8016 */ lui $t2, %hi(gSaveContext+0xed6) +/* 00924 80AA0FB4 954AF536 */ lhu $t2, %lo(gSaveContext+0xed6)($t2) /* 00928 80AA0FB8 314B0040 */ andi $t3, $t2, 0x0040 ## $t3 = 00000000 /* 0092C 80AA0FBC 51600027 */ beql $t3, $zero, .L80AA105C /* 00930 80AA0FC0 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA1150.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA1150.s index d42b346dd3..15b28dc145 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA1150.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA1150.s @@ -15,8 +15,8 @@ glabel func_80AA1150 /* 00AF4 80AA1184 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00AF8 80AA1188 00250821 */ addu $at, $at, $a1 /* 00AFC 80AA118C A4391E1A */ sh $t9, 0x1E1A($at) ## 00011E1A -/* 00B00 80AA1190 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00B04 80AA1194 A428FA72 */ sh $t0, -0x058E($at) ## 8015FA72 +/* 00B00 80AA1190 3C018016 */ lui $at, %hi(gSaveContext+0x1412) +/* 00B04 80AA1194 A428FA72 */ sh $t0, %lo(gSaveContext+0x1412)($at) /* 00B08 80AA1198 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00B0C 80AA119C 00250821 */ addu $at, $at, $a1 /* 00B10 80AA11A0 A0291E5E */ sb $t1, 0x1E5E($at) ## 00011E5E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s index 506b363bcf..29b5ec2d81 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s @@ -44,11 +44,11 @@ glabel EnMa2_Draw /* 00D58 80AA26F8 AC680000 */ sw $t0, 0x0000($v1) ## 00000000 /* 00D5C 80AA26FC 86090210 */ lh $t1, 0x0210($s0) ## 00000210 /* 00D60 80AA2700 3C0480AA */ lui $a0, %hi(D_80AA28B4) ## $a0 = 80AA0000 -/* 00D64 80AA2704 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 00D64 80AA2704 3C068016 */ lui $a2, %hi(gSegments) /* 00D68 80AA2708 00095080 */ sll $t2, $t1, 2 /* 00D6C 80AA270C 008A2021 */ addu $a0, $a0, $t2 /* 00D70 80AA2710 8C8428B4 */ lw $a0, %lo(D_80AA28B4)($a0) -/* 00D74 80AA2714 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 00D74 80AA2714 24C66FA8 */ addiu $a2, %lo(gSegments) /* 00D78 80AA2718 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 /* 00D7C 80AA271C 00046100 */ sll $t4, $a0, 4 /* 00D80 80AA2720 000C6F02 */ srl $t5, $t4, 28 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s index bdc37d51db..c80a626591 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s @@ -4,8 +4,8 @@ glabel EnMa2_Init /* 004A4 80AA1E44 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 004A8 80AA1E48 AFBF002C */ sw $ra, 0x002C($sp) /* 004AC 80AA1E4C AFA50044 */ sw $a1, 0x0044($sp) -/* 004B0 80AA1E50 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 004B4 80AA1E54 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 004B0 80AA1E50 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 004B4 80AA1E54 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 004B8 80AA1E58 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 004BC 80AA1E5C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 004C0 80AA1E60 0C00AC78 */ jal ActorShape_Init @@ -52,7 +52,7 @@ glabel EnMa2_Init /* 00554 80AA1EF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00558 80AA1EF8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 0055C 80AA1EFC 1041000F */ beq $v0, $at, .L80AA1F3C -/* 00560 80AA1F00 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 00560 80AA1F00 3C188016 */ lui $t8, %hi(gSaveContext+0xf08) /* 00564 80AA1F04 10000022 */ beq $zero, $zero, .L80AA1F90 /* 00568 80AA1F08 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80AA1F0C: @@ -70,7 +70,7 @@ glabel EnMa2_Init /* 00594 80AA1F34 10000015 */ beq $zero, $zero, .L80AA1F8C /* 00598 80AA1F38 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 .L80AA1F3C: -/* 0059C 80AA1F3C 9718F568 */ lhu $t8, -0x0A98($t8) ## FFFFF568 +/* 0059C 80AA1F3C 9718F568 */ lhu $t8, %lo(gSaveContext+0xf08)($t8) /* 005A0 80AA1F40 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 005A4 80AA1F44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 005A8 80AA1F48 33192000 */ andi $t9, $t8, 0x2000 ## $t9 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA19A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA19A0.s index 975e61ccb1..d5e577a835 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA19A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA19A0.s @@ -9,8 +9,8 @@ glabel func_80AA19A0 /* 0001C 80AA19BC 1000001A */ beq $zero, $zero, .L80AA1A28 /* 00020 80AA19C0 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L80AA19C4: -/* 00024 80AA19C4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00028 80AA19C8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00024 80AA19C4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00028 80AA19C8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0002C 80AA19CC 946E0ED6 */ lhu $t6, 0x0ED6($v1) ## 8015F536 /* 00030 80AA19D0 31CF0100 */ andi $t7, $t6, 0x0100 ## $t7 = 00000000 /* 00034 80AA19D4 51E00004 */ beql $t7, $zero, .L80AA19E8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1A38.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1A38.s index 2301b0b3d0..013130b4b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1A38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1A38.s @@ -40,16 +40,16 @@ glabel L80AA1A78 /* 000F4 80AA1A94 1000000E */ beq $zero, $zero, .L80AA1AD0 /* 000F8 80AA1A98 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 .L80AA1A9C: -/* 000FC 80AA1A9C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00100 80AA1AA0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 000FC 80AA1A9C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00100 80AA1AA0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00104 80AA1AA4 94580F08 */ lhu $t8, 0x0F08($v0) ## 8015F568 /* 00108 80AA1AA8 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 /* 0010C 80AA1AAC 37191000 */ ori $t9, $t8, 0x1000 ## $t9 = 00001000 /* 00110 80AA1AB0 10000007 */ beq $zero, $zero, .L80AA1AD0 /* 00114 80AA1AB4 A4590F08 */ sh $t9, 0x0F08($v0) ## 8015F568 .L80AA1AB8: -/* 00118 80AA1AB8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0011C 80AA1ABC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00118 80AA1AB8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0011C 80AA1ABC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00120 80AA1AC0 94480F08 */ lhu $t0, 0x0F08($v0) ## 8015F568 /* 00124 80AA1AC4 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 00128 80AA1AC8 35092000 */ ori $t1, $t0, 0x2000 ## $t1 = 00002000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1B58.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1B58.s index 556213a90f..0c4014017a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1B58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1B58.s @@ -1,6 +1,6 @@ glabel func_80AA1B58 -/* 001B8 80AA1B58 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 001BC 80AA1B5C 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 +/* 001B8 80AA1B58 3C068016 */ lui $a2, %hi(gSaveContext) +/* 001BC 80AA1B5C 24C6E660 */ addiu $a2, %lo(gSaveContext) /* 001C0 80AA1B60 8CCE0004 */ lw $t6, 0x0004($a2) ## 8015E664 /* 001C4 80AA1B64 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 001C8 80AA1B68 546E0004 */ bnel $v1, $t6, .L80AA1B7C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA20E4.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA20E4.s index af91929adc..0f75f86101 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA20E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA20E4.s @@ -21,12 +21,12 @@ glabel func_80AA20E4 .L80AA2130: /* 00790 80AA2130 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00794 80AA2134 1461001C */ bne $v1, $at, .L80AA21A8 -/* 00798 80AA2138 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0079C 80AA213C 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 007A0 80AA2140 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 007A4 80AA2144 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 -/* 007A8 80AA2148 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 007AC 80AA214C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00798 80AA2138 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0079C 80AA213C 3C098013 */ lui $t1, %hi(D_801333E8) +/* 007A0 80AA2140 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 007A4 80AA2144 252933E8 */ addiu $t1, %lo(D_801333E8) +/* 007A8 80AA2148 3C058013 */ lui $a1, %hi(D_801333D4) +/* 007AC 80AA214C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 007B0 80AA2150 AFA90014 */ sw $t1, 0x0014($sp) /* 007B4 80AA2154 AFA70010 */ sw $a3, 0x0010($sp) /* 007B8 80AA2158 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 @@ -34,9 +34,9 @@ glabel func_80AA20E4 /* 007C0 80AA2160 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 007C4 80AA2164 8FA30020 */ lw $v1, 0x0020($sp) -/* 007C8 80AA2168 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 007C8 80AA2168 3C028016 */ lui $v0, %hi(gSaveContext) /* 007CC 80AA216C 240A001E */ addiu $t2, $zero, 0x001E ## $t2 = 0000001E -/* 007D0 80AA2170 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 007D0 80AA2170 2442E660 */ addiu $v0, %lo(gSaveContext) /* 007D4 80AA2174 A46A0208 */ sh $t2, 0x0208($v1) ## 00000208 /* 007D8 80AA2178 944B0F08 */ lhu $t3, 0x0F08($v0) ## 8015F568 /* 007DC 80AA217C 3C0D80AA */ lui $t5, %hi(func_80AA21C8) ## $t5 = 80AA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s index c0ddc9b5d3..dbc41768c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s @@ -44,11 +44,11 @@ glabel EnMa3_Draw /* 00C48 80AA36E8 AC680000 */ sw $t0, 0x0000($v1) ## 00000000 /* 00C4C 80AA36EC 86090210 */ lh $t1, 0x0210($s0) ## 00000210 /* 00C50 80AA36F0 3C0480AA */ lui $a0, %hi(D_80AA38A4) ## $a0 = 80AA0000 -/* 00C54 80AA36F4 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 00C54 80AA36F4 3C068016 */ lui $a2, %hi(gSegments) /* 00C58 80AA36F8 00095080 */ sll $t2, $t1, 2 /* 00C5C 80AA36FC 008A2021 */ addu $a0, $a0, $t2 /* 00C60 80AA3700 8C8438A4 */ lw $a0, %lo(D_80AA38A4)($a0) -/* 00C64 80AA3704 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 00C64 80AA3704 24C66FA8 */ addiu $a2, %lo(gSegments) /* 00C68 80AA3708 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 /* 00C6C 80AA370C 00046100 */ sll $t4, $a0, 4 /* 00C70 80AA3710 000C6F02 */ srl $t5, $t4, 28 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s index 0971d5b263..38a7e0f061 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s @@ -4,8 +4,8 @@ glabel EnMa3_Init /* 005DC 80AA307C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 005E0 80AA3080 AFBF002C */ sw $ra, 0x002C($sp) /* 005E4 80AA3084 AFA50044 */ sw $a1, 0x0044($sp) -/* 005E8 80AA3088 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 005EC 80AA308C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 005E8 80AA3088 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 005EC 80AA308C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 005F0 80AA3090 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 005F4 80AA3094 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 005F8 80AA3098 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2AA0.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2AA0.s index ae0ab1a276..bd1d754756 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2AA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2AA0.s @@ -1,6 +1,6 @@ glabel func_80AA2AA0 -/* 00000 80AA2AA0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00004 80AA2AA4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00000 80AA2AA0 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00004 80AA2AA4 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00008 80AA2AA8 946E0F0E */ lhu $t6, 0x0F0E($v1) ## 8015F56E /* 0000C 80AA2AAC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00010 80AA2AB0 AFBF001C */ sw $ra, 0x001C($sp) @@ -68,9 +68,9 @@ glabel func_80AA2AA0 /* 000EC 80AA2B8C 0C00D4FD */ jal Actor_FindNearby /* 000F0 80AA2B90 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 000F4 80AA2B94 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 000F4 80AA2B94 3C038016 */ lui $v1, %hi(gSaveContext) /* 000F8 80AA2B98 14400003 */ bne $v0, $zero, .L80AA2BA8 -/* 000FC 80AA2B9C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 000FC 80AA2B9C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00100 80AA2BA0 10000008 */ beq $zero, $zero, .L80AA2BC4 /* 00104 80AA2BA4 24022001 */ addiu $v0, $zero, 0x2001 ## $v0 = 00002001 .L80AA2BA8: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2BD4.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2BD4.s index c34af1c68f..3a45cf225d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2BD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2BD4.s @@ -61,9 +61,9 @@ glabel L80AA2C20 /* 00194 80AA2C34 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00198 80AA2C38 00260821 */ addu $at, $at, $a2 /* 0019C 80AA2C3C 24180157 */ addiu $t8, $zero, 0x0157 ## $t8 = 00000157 -/* 001A0 80AA2C40 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 001A0 80AA2C40 3C028016 */ lui $v0, %hi(gSaveContext) /* 001A4 80AA2C44 A4381E1A */ sh $t8, 0x1E1A($at) ## 00011E1A -/* 001A8 80AA2C48 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 001A8 80AA2C48 2442E660 */ addiu $v0, %lo(gSaveContext) /* 001AC 80AA2C4C 3419FFF0 */ ori $t9, $zero, 0xFFF0 ## $t9 = 0000FFF0 /* 001B0 80AA2C50 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 001B4 80AA2C54 A4591412 */ sh $t9, 0x1412($v0) ## 8015FA72 @@ -86,8 +86,8 @@ glabel L80AA2C8C /* 001F4 80AA2C94 AFA60020 */ sw $a2, 0x0020($sp) /* 001F8 80AA2C98 10400069 */ beq $v0, $zero, .L80AA2E40 /* 001FC 80AA2C9C 8FA60020 */ lw $a2, 0x0020($sp) -/* 00200 80AA2CA0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00204 80AA2CA4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00200 80AA2CA0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00204 80AA2CA4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00208 80AA2CA8 944D0F0E */ lhu $t5, 0x0F0E($v0) ## 8015F56E /* 0020C 80AA2CAC 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 /* 00210 80AA2CB0 01E67821 */ addu $t7, $t7, $a2 @@ -148,22 +148,22 @@ glabel L80AA2D20 /* 002D8 80AA2D78 01200008 */ jr $t1 /* 002DC 80AA2D7C 00000000 */ nop glabel L80AA2D80 -/* 002E0 80AA2D80 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 002E4 80AA2D84 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 002E0 80AA2D80 3C028016 */ lui $v0, %hi(gSaveContext) +/* 002E4 80AA2D84 2442E660 */ addiu $v0, %lo(gSaveContext) /* 002E8 80AA2D88 944A0F0E */ lhu $t2, 0x0F0E($v0) ## 8015F56E /* 002EC 80AA2D8C A7A0001E */ sh $zero, 0x001E($sp) /* 002F0 80AA2D90 354B0100 */ ori $t3, $t2, 0x0100 ## $t3 = 00000100 /* 002F4 80AA2D94 1000002A */ beq $zero, $zero, .L80AA2E40 /* 002F8 80AA2D98 A44B0F0E */ sh $t3, 0x0F0E($v0) ## 8015F56E .L80AA2D9C: -/* 002FC 80AA2D9C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00300 80AA2DA0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 002FC 80AA2D9C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00300 80AA2DA0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00304 80AA2DA4 944C0ED6 */ lhu $t4, 0x0ED6($v0) ## 8015F536 /* 00308 80AA2DA8 358D4000 */ ori $t5, $t4, 0x4000 ## $t5 = 00004000 /* 0030C 80AA2DAC A44D0ED6 */ sh $t5, 0x0ED6($v0) ## 8015F536 glabel L80AA2DB0 -/* 00310 80AA2DB0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00314 80AA2DB4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00310 80AA2DB0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00314 80AA2DB4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00318 80AA2DB8 844313D0 */ lh $v1, 0x13D0($v0) ## 8015FA30 /* 0031C 80AA2DBC 8C4E0EC4 */ lw $t6, 0x0EC4($v0) ## 8015F524 /* 00320 80AA2DC0 006E082A */ slt $at, $v1, $t6 @@ -171,8 +171,8 @@ glabel L80AA2DB0 /* 00328 80AA2DC8 00000000 */ nop /* 0032C 80AA2DCC AC430EC4 */ sw $v1, 0x0EC4($v0) ## 8015F524 .L80AA2DD0: -/* 00330 80AA2DD0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00334 80AA2DD4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00330 80AA2DD0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00334 80AA2DD4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00338 80AA2DD8 944F13FA */ lhu $t7, 0x13FA($v0) ## 8015FA5A /* 0033C 80AA2DDC 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 /* 00340 80AA2DE0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF @@ -186,14 +186,14 @@ glabel L80AA2DB0 /* 00360 80AA2E00 1000000F */ beq $zero, $zero, .L80AA2E40 /* 00364 80AA2E04 A44913CE */ sh $t1, 0x13CE($v0) ## 8015FA2E glabel L80AA2E08 -/* 00368 80AA2E08 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0036C 80AA2E0C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00368 80AA2E08 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0036C 80AA2E0C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00370 80AA2E10 944A0F0E */ lhu $t2, 0x0F0E($v0) ## 8015F56E /* 00374 80AA2E14 354B0200 */ ori $t3, $t2, 0x0200 ## $t3 = 00000200 /* 00378 80AA2E18 A44B0F0E */ sh $t3, 0x0F0E($v0) ## 8015F56E glabel L80AA2E1C -/* 0037C 80AA2E1C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00380 80AA2E20 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0037C 80AA2E1C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00380 80AA2E20 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00384 80AA2E24 944C13FA */ lhu $t4, 0x13FA($v0) ## 8015FA5A /* 00388 80AA2E28 318D0400 */ andi $t5, $t4, 0x0400 ## $t5 = 00000000 /* 0038C 80AA2E2C 55A00005 */ bnel $t5, $zero, .L80AA2E44 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2EC8.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2EC8.s index b141c20684..e712454e0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2EC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA2EC8.s @@ -1,6 +1,6 @@ glabel func_80AA2EC8 -/* 00428 80AA2EC8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0042C 80AA2ECC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00428 80AA2EC8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0042C 80AA2ECC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00430 80AA2ED0 8C4E0004 */ lw $t6, 0x0004($v0) ## 8015E664 /* 00434 80AA2ED4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00438 80AA2ED8 AFA40000 */ sw $a0, 0x0000($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Init.s index 914f9977f1..efe081172e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Init.s @@ -1,6 +1,6 @@ glabel EnMag_Init -/* 00000 80AA3B00 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00004 80AA3B04 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 00000 80AA3B00 3C028016 */ lui $v0, %hi(gGameInfo) +/* 00004 80AA3B04 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 00008 80AA3B08 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0000C 80AA3B0C 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90 /* 00010 80AA3B10 AFBF0014 */ sw $ra, 0x0014($sp) @@ -38,11 +38,11 @@ glabel EnMag_Init /* 00090 80AA3B90 A5EE04A6 */ sh $t6, 0x04A6($t7) ## 000004A6 /* 00094 80AA3B94 8C590000 */ lw $t9, 0x0000($v0) ## 8015FA90 /* 00098 80AA3B98 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 0009C 80AA3B9C 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 +/* 0009C 80AA3B9C 3C078016 */ lui $a3, %hi(gSaveContext) /* 000A0 80AA3BA0 A73804A8 */ sh $t8, 0x04A8($t9) ## 000004A8 /* 000A4 80AA3BA4 8C4D0000 */ lw $t5, 0x0000($v0) ## 8015FA90 /* 000A8 80AA3BA8 24180063 */ addiu $t8, $zero, 0x0063 ## $t8 = 00000063 -/* 000AC 80AA3BAC 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 000AC 80AA3BAC 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 000B0 80AA3BB0 A5AC0F1C */ sh $t4, 0x0F1C($t5) ## 00000F1C /* 000B4 80AA3BB4 8C4E0000 */ lw $t6, 0x0000($v0) ## 8015FA90 /* 000B8 80AA3BB8 240C0009 */ addiu $t4, $zero, 0x0009 ## $t4 = 00000009 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Update.s index c54500db26..13059a97bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Update.s @@ -6,8 +6,8 @@ glabel D_80AA5F34 .text glabel EnMag_Update -/* 002A0 80AA3DA0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 002A4 80AA3DA4 8DCEF9B4 */ lw $t6, -0x064C($t6) ## 8015F9B4 +/* 002A0 80AA3DA0 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1354) +/* 002A4 80AA3DA4 8DCEF9B4 */ lw $t6, %lo(gSaveContext+0x1354)($t6) /* 002A8 80AA3DA8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 002AC 80AA3DAC AFB00020 */ sw $s0, 0x0020($sp) /* 002B0 80AA3DB0 3401FEDC */ ori $at, $zero, 0xFEDC ## $at = 0000FEDC @@ -23,7 +23,7 @@ glabel EnMag_Update /* 002D8 80AA3DD8 28610002 */ slti $at, $v1, 0x0002 /* 002DC 80AA3DDC 94A30020 */ lhu $v1, 0x0020($a1) ## 00000020 /* 002E0 80AA3DE0 2401EFFF */ addiu $at, $zero, 0xEFFF ## $at = FFFFEFFF -/* 002E4 80AA3DE4 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 002E4 80AA3DE4 3C078013 */ lui $a3, %hi(D_801333E0) /* 002E8 80AA3DE8 0061C027 */ nor $t8, $v1, $at /* 002EC 80AA3DEC 13000007 */ beq $t8, $zero, .L80AA3E0C /* 002F0 80AA3DF0 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 @@ -34,11 +34,11 @@ glabel EnMag_Update /* 00304 80AA3E04 00614027 */ nor $t0, $v1, $at /* 00308 80AA3E08 15000039 */ bne $t0, $zero, .L80AA3EF0 .L80AA3E0C: -/* 0030C 80AA3E0C 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 00310 80AA3E10 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00314 80AA3E14 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 -/* 00318 80AA3E18 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0031C 80AA3E1C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0030C 80AA3E0C 3C098013 */ lui $t1, %hi(D_801333E8) +/* 00310 80AA3E10 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00314 80AA3E14 252933E8 */ addiu $t1, %lo(D_801333E8) +/* 00318 80AA3E18 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0031C 80AA3E1C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00320 80AA3E20 AFA90014 */ sw $t1, 0x0014($sp) /* 00324 80AA3E24 AFA70010 */ sw $a3, 0x0010($sp) /* 00328 80AA3E28 24044823 */ addiu $a0, $zero, 0x4823 ## $a0 = 00004823 @@ -83,10 +83,10 @@ glabel EnMag_Update /* 003C0 80AA3EC0 E44A62F0 */ swc1 $f10, 0x62F0($v0) ## 000062F0 /* 003C4 80AA3EC4 E45062F8 */ swc1 $f16, 0x62F8($v0) ## 000062F8 /* 003C8 80AA3EC8 A42A62DD */ sh $t2, 0x62DD($at) ## 0000E2DC -/* 003CC 80AA3ECC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 003CC 80AA3ECC 3C038016 */ lui $v1, %hi(gSaveContext) /* 003D0 80AA3ED0 3C0180AA */ lui $at, %hi(D_80AA5EC0) ## $at = 80AA0000 /* 003D4 80AA3ED4 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 003D8 80AA3ED8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 003D8 80AA3ED8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 003DC 80AA3EDC A42B5EC0 */ sh $t3, %lo(D_80AA5EC0)($at) /* 003E0 80AA3EE0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 003E4 80AA3EE4 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF @@ -125,12 +125,12 @@ glabel EnMag_Update /* 0045C 80AA3F5C 26017FFF */ addiu $at, $s0, 0x7FFF ## $at = 00007FFF /* 00460 80AA3F60 0C03DA2F */ jal func_800F68BC /* 00464 80AA3F64 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 00468 80AA3F68 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0046C 80AA3F6C 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 00470 80AA3F70 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00474 80AA3F74 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 -/* 00478 80AA3F78 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0047C 80AA3F7C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00468 80AA3F68 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0046C 80AA3F6C 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 00470 80AA3F70 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00474 80AA3F74 254A33E8 */ addiu $t2, %lo(D_801333E8) +/* 00478 80AA3F78 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0047C 80AA3F7C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00480 80AA3F80 AFAA0014 */ sw $t2, 0x0014($sp) /* 00484 80AA3F84 AFA70010 */ sw $a3, 0x0010($sp) /* 00488 80AA3F88 24044823 */ addiu $a0, $zero, 0x4823 ## $a0 = 00004823 @@ -139,8 +139,8 @@ glabel EnMag_Update /* 00490 80AA3F90 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 00494 80AA3F94 8FAD0044 */ lw $t5, 0x0044($sp) /* 00498 80AA3F98 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 0049C 80AA3F9C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 004A0 80AA3FA0 AC2BF9BC */ sw $t3, -0x0644($at) ## 8015F9BC +/* 0049C 80AA3F9C 3C018016 */ lui $at, %hi(gSaveContext+0x135c) +/* 004A0 80AA3FA0 AC2BF9BC */ sw $t3, %lo(gSaveContext+0x135c)($at) /* 004A4 80AA3FA4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 004A8 80AA3FA8 240C0014 */ addiu $t4, $zero, 0x0014 ## $t4 = 00000014 /* 004AC 80AA3FAC 002D0821 */ addu $at, $at, $t5 @@ -280,8 +280,8 @@ glabel EnMag_Update .L80AA41AC: /* 006AC 80AA41AC 44818000 */ mtc1 $at, $f16 ## $f16 = 160.00 /* 006B0 80AA41B0 C45262FC */ lwc1 $f18, 0x62FC($v0) ## 000062FC -/* 006B4 80AA41B4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 006B8 80AA41B8 2463FA90 */ addiu $v1, $v1, 0xFA90 ## $v1 = 8015FA90 +/* 006B4 80AA41B4 3C038016 */ lui $v1, %hi(gGameInfo) +/* 006B8 80AA41B8 2463FA90 */ addiu $v1, %lo(gGameInfo) /* 006BC 80AA41BC 4612803C */ c.lt.s $f16, $f18 /* 006C0 80AA41C0 00000000 */ nop /* 006C4 80AA41C4 45020094 */ bc1fl .L80AA4418 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4EB8.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4EB8.s index a2d57dd54d..edc13bffbd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4EB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4EB8.s @@ -1,6 +1,6 @@ glabel func_80AA4EB8 -/* 013B8 80AA4EB8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 013BC 80AA4EBC 2463FA90 */ addiu $v1, $v1, 0xFA90 ## $v1 = 8015FA90 +/* 013B8 80AA4EB8 3C038016 */ lui $v1, %hi(gGameInfo) +/* 013BC 80AA4EBC 2463FA90 */ addiu $v1, %lo(gGameInfo) /* 013C0 80AA4EC0 8C680000 */ lw $t0, 0x0000($v1) ## 8015FA90 /* 013C4 80AA4EC4 AFA50004 */ sw $a1, 0x0004($sp) /* 013C8 80AA4EC8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA507C.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA507C.s index bd278616a0..587c5df1f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA507C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA507C.s @@ -460,7 +460,7 @@ glabel func_80AA507C /* 01C88 80AA5788 ADEE0004 */ sw $t6, 0x0004($t7) ## 00000004 /* 01C8C 80AA578C 8FA30148 */ lw $v1, 0x0148($sp) /* 01C90 80AA5790 3C08FA00 */ lui $t0, 0xFA00 ## $t0 = FA000000 -/* 01C94 80AA5794 3C138016 */ lui $s3, 0x8016 ## $s3 = 80160000 +/* 01C94 80AA5794 3C138016 */ lui $s3, %hi(gGameInfo) /* 01C98 80AA5798 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 /* 01C9C 80AA579C AFB90148 */ sw $t9, 0x0148($sp) /* 01CA0 80AA57A0 AC680000 */ sw $t0, 0x0000($v1) ## 00000000 @@ -468,7 +468,7 @@ glabel func_80AA507C /* 01CA8 80AA57A8 3C08F570 */ lui $t0, 0xF570 ## $t0 = F5700000 /* 01CAC 80AA57AC 3C05E700 */ lui $a1, 0xE700 ## $a1 = E7000000 /* 01CB0 80AA57B0 C5886308 */ lwc1 $f8, 0x6308($t4) ## 00006308 -/* 01CB4 80AA57B4 2673FA90 */ addiu $s3, $s3, 0xFA90 ## $s3 = 8015FA90 +/* 01CB4 80AA57B4 2673FA90 */ addiu $s3, %lo(gGameInfo) /* 01CB8 80AA57B8 0000B825 */ or $s7, $zero, $zero ## $s7 = 00000000 /* 01CBC 80AA57BC 4600428D */ trunc.w.s $f10, $f8 /* 01CC0 80AA57C0 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 @@ -569,8 +569,8 @@ glabel func_80AA507C /* 01E3C 80AA593C AD790004 */ sw $t9, 0x0004($t3) ## 00000014 /* 01E40 80AA5940 AD6A0000 */ sw $t2, 0x0000($t3) ## 00000010 .L80AA5944: -/* 01E44 80AA5944 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 01E48 80AA5948 8D08F9B4 */ lw $t0, -0x064C($t0) ## 8015F9B4 +/* 01E44 80AA5944 3C088016 */ lui $t0, %hi(gSaveContext+0x1354) +/* 01E48 80AA5948 8D08F9B4 */ lw $t0, %lo(gSaveContext+0x1354)($t0) /* 01E4C 80AA594C 3401FEDC */ ori $at, $zero, 0xFEDC ## $at = 0000FEDC /* 01E50 80AA5950 3C05E700 */ lui $a1, 0xE700 ## $a1 = E7000000 /* 01E54 80AA5954 15010072 */ bne $t0, $at, .L80AA5B20 @@ -716,7 +716,7 @@ glabel func_80AA507C /* 0206C 80AA5B6C 00031C03 */ sra $v1, $v1, 16 /* 02070 80AA5B70 286100FF */ slti $at, $v1, 0x00FF /* 02074 80AA5B74 14200002 */ bne $at, $zero, .L80AA5B80 -/* 02078 80AA5B78 3C138016 */ lui $s3, 0x8016 ## $s3 = 80160000 +/* 02078 80AA5B78 3C138016 */ lui $s3, %hi(gGameInfo) /* 0207C 80AA5B7C 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF .L80AA5B80: /* 02080 80AA5B80 AFA80148 */ sw $t0, 0x0148($sp) @@ -730,7 +730,7 @@ glabel func_80AA507C /* 020A0 80AA5BA0 AD8F0004 */ sw $t7, 0x0004($t4) ## 00000004 /* 020A4 80AA5BA4 AD890000 */ sw $t1, 0x0000($t4) ## 00000000 /* 020A8 80AA5BA8 8FB80148 */ lw $t8, 0x0148($sp) -/* 020AC 80AA5BAC 2673FA90 */ addiu $s3, $s3, 0xFA90 ## $s3 = 8015FA90 +/* 020AC 80AA5BAC 2673FA90 */ addiu $s3, %lo(gGameInfo) /* 020B0 80AA5BB0 3C1680AA */ lui $s6, %hi(D_80AA5EDC) ## $s6 = 80AA0000 /* 020B4 80AA5BB4 270B0008 */ addiu $t3, $t8, 0x0008 ## $t3 = 00000008 /* 020B8 80AA5BB8 AFAB0148 */ sw $t3, 0x0148($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s index 1e73e63085..4c772ed122 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s @@ -21,8 +21,8 @@ glabel EnMb_Init /* 00030 80AA6080 AFAE0044 */ sw $t6, 0x0044($sp) /* 00034 80AA6084 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00038 80AA6088 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0003C 80AA608C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00038 80AA6088 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 0003C 80AA608C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00040 80AA6090 AFA40034 */ sw $a0, 0x0034($sp) /* 00044 80AA6094 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00048 80AA6098 0C00AC78 */ jal ActorShape_Init @@ -151,8 +151,8 @@ glabel EnMb_Init /* 0021C 80AA626C 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 /* 00220 80AA6270 86050032 */ lh $a1, 0x0032($s0) ## 00000032 -/* 00224 80AA6274 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00228 80AA6278 24C6B8C4 */ addiu $a2, $a2, 0xB8C4 ## $a2 = 8002B8C4 +/* 00224 80AA6274 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Teardrop) +/* 00228 80AA6278 24C6B8C4 */ addiu $a2, %lo(ActorShadow_DrawFunc_Teardrop) /* 0022C 80AA627C 00A22023 */ subu $a0, $a1, $v0 /* 00230 80AA6280 00042400 */ sll $a0, $a0, 16 /* 00234 80AA6284 00042403 */ sra $a0, $a0, 16 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6444.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6444.s index 927a7721fe..261a8f5f54 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6444.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6444.s @@ -24,7 +24,7 @@ glabel func_80AA6444 .L80AA6498: /* 00448 80AA6498 808D035E */ lb $t5, 0x035E($a0) ## 0000035E .L80AA649C: -/* 0044C 80AA649C 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 0044C 80AA649C 3C088016 */ lui $t0, %hi(gSegments) /* 00450 80AA64A0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00454 80AA64A4 006D7821 */ addu $t7, $v1, $t5 /* 00458 80AA64A8 A08F035C */ sb $t7, 0x035C($a0) ## 0000035C @@ -35,7 +35,7 @@ glabel func_80AA6444 /* 0046C 80AA64BC 000EC702 */ srl $t8, $t6, 28 /* 00470 80AA64C0 0018C880 */ sll $t9, $t8, 2 /* 00474 80AA64C4 01194021 */ addu $t0, $t0, $t9 -/* 00478 80AA64C8 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 +/* 00478 80AA64C8 8D086FA8 */ lw $t0, %lo(gSegments)($t0) /* 0047C 80AA64CC 000B6080 */ sll $t4, $t3, 2 /* 00480 80AA64D0 00C14824 */ and $t1, $a2, $at /* 00484 80AA64D4 018B6023 */ subu $t4, $t4, $t3 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA66A0.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA66A0.s index a083888fd9..e284a34ec6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA66A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA66A0.s @@ -24,8 +24,8 @@ glabel func_80AA66A0 /* 006A8 80AA66F8 06000041 */ bltz $s0, .L80AA6800 /* 006AC 80AA66FC 24950024 */ addiu $s5, $a0, 0x0024 ## $s5 = 00000024 /* 006B0 80AA6700 3C1E00FF */ lui $s8, 0x00FF ## $s8 = 00FF0000 -/* 006B4 80AA6704 3C178016 */ lui $s7, 0x8016 ## $s7 = 80160000 -/* 006B8 80AA6708 26F76FA8 */ addiu $s7, $s7, 0x6FA8 ## $s7 = 80166FA8 +/* 006B4 80AA6704 3C178016 */ lui $s7, %hi(gSegments) +/* 006B8 80AA6708 26F76FA8 */ addiu $s7, %lo(gSegments) /* 006BC 80AA670C 37DEFFFF */ ori $s8, $s8, 0xFFFF ## $s8 = 00FFFFFF /* 006C0 80AA6710 27B6005C */ addiu $s6, $sp, 0x005C ## $s6 = FFFFFFEC .L80AA6714: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s index 5dbb4a0bd6..97707249fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s @@ -33,7 +33,7 @@ glabel EnMd_Draw /* 01F64 80AAC1B4 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 01F68 80AAC1B8 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 /* 01F6C 80AAC1BC 8619020E */ lh $t9, 0x020E($s0) ## 0000020E -/* 01F70 80AAC1C0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 01F70 80AAC1C0 3C0E8016 */ lui $t6, %hi(gSegments) /* 01F74 80AAC1C4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01F78 80AAC1C8 00194880 */ sll $t1, $t9, 2 /* 01F7C 80AAC1CC 00892021 */ addu $a0, $a0, $t1 @@ -44,7 +44,7 @@ glabel EnMd_Draw /* 01F90 80AAC1E0 000B6702 */ srl $t4, $t3, 28 /* 01F94 80AAC1E4 000C6880 */ sll $t5, $t4, 2 /* 01F98 80AAC1E8 01CD7021 */ addu $t6, $t6, $t5 -/* 01F9C 80AAC1EC 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 01F9C 80AAC1EC 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 01FA0 80AAC1F0 00815024 */ and $t2, $a0, $at /* 01FA4 80AAC1F4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01FA8 80AAC1F8 014E7821 */ addu $t7, $t2, $t6 @@ -71,7 +71,7 @@ glabel EnMd_Draw /* 01FF8 80AAC248 AD0902D0 */ sw $t1, 0x02D0($t0) ## 000002D0 /* 01FFC 80AAC24C AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 /* 02000 80AAC250 860C020E */ lh $t4, 0x020E($s0) ## 0000020E -/* 02004 80AAC254 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 02004 80AAC254 3C198016 */ lui $t9, %hi(gSegments) /* 02008 80AAC258 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0200C 80AAC25C 000C6880 */ sll $t5, $t4, 2 /* 02010 80AAC260 008D2021 */ addu $a0, $a0, $t5 @@ -82,7 +82,7 @@ glabel EnMd_Draw /* 02024 80AAC274 000E7F02 */ srl $t7, $t6, 28 /* 02028 80AAC278 000FC080 */ sll $t8, $t7, 2 /* 0202C 80AAC27C 0338C821 */ addu $t9, $t9, $t8 -/* 02030 80AAC280 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 02030 80AAC280 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 02034 80AAC284 00815024 */ and $t2, $a0, $at /* 02038 80AAC288 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 0203C 80AAC28C 01594821 */ addu $t1, $t2, $t9 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s index 7927696454..4dbb73d6d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s @@ -5,8 +5,8 @@ glabel EnMd_Init /* 0140C 80AAB65C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01410 80AAB660 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 01414 80AAB664 AFBF003C */ sw $ra, 0x003C($sp) -/* 01418 80AAB668 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0141C 80AAB66C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 01418 80AAB668 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 0141C 80AAB66C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 01420 80AAB670 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 01424 80AAB674 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 01428 80AAB678 0C00AC78 */ jal ActorShape_Init @@ -85,22 +85,22 @@ glabel EnMd_Init /* 01530 80AAB780 E7A80018 */ swc1 $f8, 0x0018($sp) /* 01534 80AAB784 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 /* 01538 80AAB788 24040055 */ addiu $a0, $zero, 0x0055 ## $a0 = 00000055 -/* 0153C 80AAB78C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 0153C 80AAB78C 3C028016 */ lui $v0, %hi(gSaveContext) /* 01540 80AAB790 14830004 */ bne $a0, $v1, .L80AAB7A4 -/* 01544 80AAB794 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01544 80AAB794 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01548 80AAB798 944A0ED4 */ lhu $t2, 0x0ED4($v0) ## 8015F534 /* 0154C 80AAB79C 314B0010 */ andi $t3, $t2, 0x0010 ## $t3 = 00000000 /* 01550 80AAB7A0 11600013 */ beq $t3, $zero, .L80AAB7F0 .L80AAB7A4: -/* 01554 80AAB7A4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 01554 80AAB7A4 3C028016 */ lui $v0, %hi(gSaveContext) /* 01558 80AAB7A8 1483000A */ bne $a0, $v1, .L80AAB7D4 -/* 0155C 80AAB7AC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0155C 80AAB7AC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01560 80AAB7B0 944C0ED4 */ lhu $t4, 0x0ED4($v0) ## 8015F534 -/* 01564 80AAB7B4 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 +/* 01564 80AAB7B4 3C0E8012 */ lui $t6, %hi(gBitFlags+0x48) /* 01568 80AAB7B8 318D0010 */ andi $t5, $t4, 0x0010 ## $t5 = 00000000 /* 0156C 80AAB7BC 51A00006 */ beql $t5, $zero, .L80AAB7D8 /* 01570 80AAB7C0 2401005B */ addiu $at, $zero, 0x005B ## $at = 0000005B -/* 01574 80AAB7C4 8DCE7168 */ lw $t6, 0x7168($t6) ## 80127168 +/* 01574 80AAB7C4 8DCE7168 */ lw $t6, %lo(gBitFlags+0x48)($t6) /* 01578 80AAB7C8 8C4F00A4 */ lw $t7, 0x00A4($v0) ## 8015E704 /* 0157C 80AAB7CC 01CFC024 */ and $t8, $t6, $t7 /* 01580 80AAB7D0 17000007 */ bne $t8, $zero, .L80AAB7F0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s index 39981c2855..22d7bef7d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s @@ -10,12 +10,12 @@ glabel func_80AAACF8 /* 00AC8 80AAAD18 1000002D */ beq $zero, $zero, .L80AAADD0 /* 00ACC 80AAAD1C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L80AAAD20: -/* 00AD0 80AAAD20 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00AD0 80AAAD20 3C038016 */ lui $v1, %hi(gSaveContext) /* 00AD4 80AAAD24 A0800208 */ sb $zero, 0x0208($a0) ## 00000208 /* 00AD8 80AAAD28 A0800209 */ sb $zero, 0x0209($a0) ## 00000209 -/* 00ADC 80AAAD2C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00AE0 80AAAD30 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 00AE4 80AAAD34 8DCE7168 */ lw $t6, 0x7168($t6) ## 80127168 +/* 00ADC 80AAAD2C 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 00AE0 80AAAD30 3C0E8012 */ lui $t6, %hi(gBitFlags+0x48) +/* 00AE4 80AAAD34 8DCE7168 */ lw $t6, %lo(gBitFlags+0x48)($t6) /* 00AE8 80AAAD38 8C6F00A4 */ lw $t7, 0x00A4($v1) ## 8015E704 /* 00AEC 80AAAD3C 01CFC024 */ and $t8, $t6, $t7 /* 00AF0 80AAAD40 53000004 */ beql $t8, $zero, .L80AAAD54 @@ -24,17 +24,17 @@ glabel func_80AAACF8 /* 00AFC 80AAAD4C 24021045 */ addiu $v0, $zero, 0x1045 ## $v0 = 00001045 /* 00B00 80AAAD50 94790ED4 */ lhu $t9, 0x0ED4($v1) ## 8015F534 .L80AAAD54: -/* 00B04 80AAAD54 3C058012 */ lui $a1, 0x8012 ## $a1 = 80120000 -/* 00B08 80AAAD58 24A571A0 */ addiu $a1, $a1, 0x71A0 ## $a1 = 801271A0 +/* 00B04 80AAAD54 3C058012 */ lui $a1, %hi(gEquipMasks) +/* 00B08 80AAAD58 24A571A0 */ addiu $a1, %lo(gEquipMasks) /* 00B0C 80AAAD5C 33280010 */ andi $t0, $t9, 0x0010 ## $t0 = 00000000 /* 00B10 80AAAD60 11000003 */ beq $t0, $zero, .L80AAAD70 -/* 00B14 80AAAD64 3C068012 */ lui $a2, 0x8012 ## $a2 = 80120000 +/* 00B14 80AAAD64 3C068012 */ lui $a2, %hi(gEquipShifts) /* 00B18 80AAAD68 10000019 */ beq $zero, $zero, .L80AAADD0 /* 00B1C 80AAAD6C 24021034 */ addiu $v0, $zero, 0x1034 ## $v0 = 00001034 .L80AAAD70: /* 00B20 80AAAD70 94620070 */ lhu $v0, 0x0070($v1) ## 8015E6D0 /* 00B24 80AAAD74 94A90002 */ lhu $t1, 0x0002($a1) ## 801271A2 -/* 00B28 80AAAD78 24C671F0 */ addiu $a2, $a2, 0x71F0 ## $a2 = 801271F0 +/* 00B28 80AAAD78 24C671F0 */ addiu $a2, %lo(gEquipShifts) /* 00B2C 80AAAD7C 90CB0001 */ lbu $t3, 0x0001($a2) ## 801271F1 /* 00B30 80AAAD80 00495024 */ and $t2, $v0, $t1 /* 00B34 80AAAD84 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAADE0.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAADE0.s index 6114ab2da0..6c1835b5c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAADE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAADE0.s @@ -2,8 +2,8 @@ glabel func_80AAADE0 /* 00B90 80AAADE0 AFA40000 */ sw $a0, 0x0000($sp) /* 00B94 80AAADE4 A0A00208 */ sb $zero, 0x0208($a1) ## 00000208 /* 00B98 80AAADE8 A0A00209 */ sb $zero, 0x0209($a1) ## 00000209 -/* 00B9C 80AAADEC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00BA0 80AAADF0 95CEF53C */ lhu $t6, -0x0AC4($t6) ## 8015F53C +/* 00B9C 80AAADEC 3C0E8016 */ lui $t6, %hi(gSaveContext+0xedc) +/* 00BA0 80AAADF0 95CEF53C */ lhu $t6, %lo(gSaveContext+0xedc)($t6) /* 00BA4 80AAADF4 24021046 */ addiu $v0, $zero, 0x1046 ## $v0 = 00001046 /* 00BA8 80AAADF8 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 /* 00BAC 80AAADFC 11E00003 */ beq $t7, $zero, .L80AAAE0C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE14.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE14.s index f3307c4330..0a808ecafa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE14.s @@ -1,7 +1,7 @@ glabel func_80AAAE14 /* 00BC4 80AAAE14 AFA40000 */ sw $a0, 0x0000($sp) -/* 00BC8 80AAAE18 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00BCC 80AAAE1C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00BC8 80AAAE18 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00BCC 80AAAE1C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00BD0 80AAAE20 A0A00208 */ sb $zero, 0x0208($a1) ## 00000208 /* 00BD4 80AAAE24 A0A00209 */ sb $zero, 0x0209($a1) ## 00000209 /* 00BD8 80AAAE28 944E0EDC */ lhu $t6, 0x0EDC($v0) ## 8015F53C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAF04.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAF04.s index 828a1de4bb..6a48c2fa29 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAF04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAF04.s @@ -50,16 +50,16 @@ glabel L80AAAF48 /* 00D34 80AAAF84 10000029 */ beq $zero, $zero, .L80AAB02C /* 00D38 80AAAF88 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80AAAF8C: -/* 00D3C 80AAAF8C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00D40 80AAAF90 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00D3C 80AAAF8C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00D40 80AAAF90 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00D44 80AAAF94 94580ED4 */ lhu $t8, 0x0ED4($v0) ## 8015F534 /* 00D48 80AAAF98 37198000 */ ori $t9, $t8, 0x8000 ## $t9 = 00008000 /* 00D4C 80AAAF9C A4590ED4 */ sh $t9, 0x0ED4($v0) ## 8015F534 /* 00D50 80AAAFA0 10000022 */ beq $zero, $zero, .L80AAB02C /* 00D54 80AAAFA4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80AAAFA8: -/* 00D58 80AAAFA8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00D5C 80AAAFAC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00D58 80AAAFA8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00D5C 80AAAFAC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00D60 80AAAFB0 94480ED4 */ lhu $t0, 0x0ED4($v0) ## 8015F534 /* 00D64 80AAAFB4 944A0EF8 */ lhu $t2, 0x0EF8($v0) ## 8015F558 /* 00D68 80AAAFB8 35090004 */ ori $t1, $t0, 0x0004 ## $t1 = 00000004 @@ -69,16 +69,16 @@ glabel L80AAAF48 /* 00D78 80AAAFC8 10000018 */ beq $zero, $zero, .L80AAB02C /* 00D7C 80AAAFCC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80AAAFD0: -/* 00D80 80AAAFD0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00D84 80AAAFD4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00D80 80AAAFD0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00D84 80AAAFD4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00D88 80AAAFD8 944C0EFA */ lhu $t4, 0x0EFA($v0) ## 8015F55A /* 00D8C 80AAAFDC 358D0020 */ ori $t5, $t4, 0x0020 ## $t5 = 00000020 /* 00D90 80AAAFE0 A44D0EFA */ sh $t5, 0x0EFA($v0) ## 8015F55A /* 00D94 80AAAFE4 10000011 */ beq $zero, $zero, .L80AAB02C /* 00D98 80AAAFE8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80AAAFEC: -/* 00D9C 80AAAFEC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00DA0 80AAAFF0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00D9C 80AAAFEC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00DA0 80AAAFF0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00DA4 80AAAFF4 944E0EFA */ lhu $t6, 0x0EFA($v0) ## 8015F55A /* 00DA8 80AAAFF8 35CF0200 */ ori $t7, $t6, 0x0200 ## $t7 = 00000200 /* 00DAC 80AAAFFC A44F0EFA */ sh $t7, 0x0EFA($v0) ## 8015F55A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB03C.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB03C.s index 4fab3e440e..60f4819f73 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB03C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB03C.s @@ -2,9 +2,9 @@ glabel func_80AAB03C /* 00DEC 80AAB03C AFA40000 */ sw $a0, 0x0000($sp) /* 00DF0 80AAB040 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 /* 00DF4 80AAB044 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 00DF8 80AAB048 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00DF8 80AAB048 3C038016 */ lui $v1, %hi(gSaveContext) /* 00DFC 80AAB04C 1441000B */ bne $v0, $at, .L80AAB07C -/* 00E00 80AAB050 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00E00 80AAB050 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00E04 80AAB054 946E0ED6 */ lhu $t6, 0x0ED6($v1) ## 8015F536 /* 00E08 80AAB058 31CF1000 */ andi $t7, $t6, 0x1000 ## $t7 = 00000000 /* 00E0C 80AAB05C 15E00007 */ bne $t7, $zero, .L80AAB07C @@ -16,10 +16,10 @@ glabel func_80AAB03C /* 00E24 80AAB074 03E00008 */ jr $ra /* 00E28 80AAB078 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80AAB07C: -/* 00E2C 80AAB07C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00E2C 80AAB07C 3C038016 */ lui $v1, %hi(gSaveContext) /* 00E30 80AAB080 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 /* 00E34 80AAB084 1441000E */ bne $v0, $at, .L80AAB0C0 -/* 00E38 80AAB088 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00E38 80AAB088 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00E3C 80AAB08C 94680ED6 */ lhu $t0, 0x0ED6($v1) ## 8015F536 /* 00E40 80AAB090 31091000 */ andi $t1, $t0, 0x1000 ## $t1 = 00000000 /* 00E44 80AAB094 55200006 */ bnel $t1, $zero, .L80AAB0B0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB158.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB158.s index 088123d4c6..5db440e8e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB158.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB158.s @@ -71,11 +71,11 @@ glabel func_80AAB158 /* 01004 80AAB254 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L80AAB258: /* 01008 80AAB258 916C1D6C */ lbu $t4, 0x1D6C($t3) ## 00001D6C -/* 0100C 80AAB25C 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 +/* 0100C 80AAB25C 3C0D8012 */ lui $t5, %hi(D_8011D394) /* 01010 80AAB260 8FAE003C */ lw $t6, 0x003C($sp) /* 01014 80AAB264 55800005 */ bnel $t4, $zero, .L80AAB27C /* 01018 80AAB268 8DD800E0 */ lw $t8, 0x00E0($t6) ## 000000E0 -/* 0101C 80AAB26C 8DADD394 */ lw $t5, -0x2C6C($t5) ## 8011D394 +/* 0101C 80AAB26C 8DADD394 */ lw $t5, %lo(D_8011D394)($t5) /* 01020 80AAB270 51A0000D */ beql $t5, $zero, .L80AAB2A8 /* 01024 80AAB274 8CC80024 */ lw $t0, 0x0024($a2) ## 00000024 /* 01028 80AAB278 8DD800E0 */ lw $t8, 0x00E0($t6) ## 000000E0 @@ -92,14 +92,14 @@ glabel func_80AAB158 /* 01050 80AAB2A0 AE180200 */ sw $t8, 0x0200($s0) ## 00000200 /* 01054 80AAB2A4 8CC80024 */ lw $t0, 0x0024($a2) ## 00000024 .L80AAB2A8: -/* 01058 80AAB2A8 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 01058 80AAB2A8 3C098016 */ lui $t1, %hi(gSaveContext+4) /* 0105C 80AAB2AC 3C01C190 */ lui $at, 0xC190 ## $at = C1900000 /* 01060 80AAB2B0 AE0801F8 */ sw $t0, 0x01F8($s0) ## 000001F8 /* 01064 80AAB2B4 8CD90028 */ lw $t9, 0x0028($a2) ## 00000028 /* 01068 80AAB2B8 AE1901FC */ sw $t9, 0x01FC($s0) ## 000001FC /* 0106C 80AAB2BC 8CC8002C */ lw $t0, 0x002C($a2) ## 0000002C /* 01070 80AAB2C0 AE080200 */ sw $t0, 0x0200($s0) ## 00000200 -/* 01074 80AAB2C4 8D29E664 */ lw $t1, -0x199C($t1) ## 8015E664 +/* 01074 80AAB2C4 8D29E664 */ lw $t1, %lo(gSaveContext+4)($t1) /* 01078 80AAB2C8 59200005 */ blezl $t1, .L80AAB2E0 /* 0107C 80AAB2CC 44815000 */ mtc1 $at, $f10 ## $f10 = -18.00 /* 01080 80AAB2D0 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB370.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB370.s index 0f3dcb576e..1240995f75 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB370.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB370.s @@ -22,14 +22,14 @@ glabel func_80AAB370 /* 01158 80AAB3A8 000FC0C0 */ sll $t8, $t7, 3 /* 0115C 80AAB3AC 01D82021 */ addu $a0, $t6, $t8 /* 01160 80AAB3B0 8C830004 */ lw $v1, 0x0004($a0) ## 00000004 -/* 01164 80AAB3B4 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 01164 80AAB3B4 3C0A8016 */ lui $t2, %hi(gSegments) /* 01168 80AAB3B8 860C0212 */ lh $t4, 0x0212($s0) ## 00000212 /* 0116C 80AAB3BC 0003C900 */ sll $t9, $v1, 4 /* 01170 80AAB3C0 00194702 */ srl $t0, $t9, 28 /* 01174 80AAB3C4 00084880 */ sll $t1, $t0, 2 /* 01178 80AAB3C8 01495021 */ addu $t2, $t2, $t1 /* 0117C 80AAB3CC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01180 80AAB3D0 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 01180 80AAB3D0 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 01184 80AAB3D4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 01188 80AAB3D8 00615824 */ and $t3, $v1, $at /* 0118C 80AAB3DC 000C6880 */ sll $t5, $t4, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB4DC.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB4DC.s index b8a2a4406b..6437ba15aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB4DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB4DC.s @@ -14,14 +14,14 @@ glabel func_80AAB4DC /* 012B8 80AAB508 000FC0C0 */ sll $t8, $t7, 3 /* 012BC 80AAB50C 01D82821 */ addu $a1, $t6, $t8 /* 012C0 80AAB510 8CA80004 */ lw $t0, 0x0004($a1) ## 00000004 -/* 012C4 80AAB514 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 012C4 80AAB514 3C0B8016 */ lui $t3, %hi(gSegments) /* 012C8 80AAB518 90AD0000 */ lbu $t5, 0x0000($a1) ## 00000000 /* 012CC 80AAB51C 0008C900 */ sll $t9, $t0, 4 /* 012D0 80AAB520 00194F02 */ srl $t1, $t9, 28 /* 012D4 80AAB524 00095080 */ sll $t2, $t1, 2 /* 012D8 80AAB528 016A5821 */ addu $t3, $t3, $t2 /* 012DC 80AAB52C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 012E0 80AAB530 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 +/* 012E0 80AAB530 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) /* 012E4 80AAB534 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 012E8 80AAB538 01016024 */ and $t4, $t0, $at /* 012EC 80AAB53C 000D7880 */ sll $t7, $t5, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB5A4.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB5A4.s index 750a19bb8e..3db22443d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB5A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB5A4.s @@ -3,12 +3,12 @@ glabel func_80AAB5A4 /* 01358 80AAB5A8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0135C 80AAB5AC 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 /* 01360 80AAB5B0 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 01364 80AAB5B4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 01364 80AAB5B4 3C038016 */ lui $v1, %hi(gSaveContext) /* 01368 80AAB5B8 1041001E */ beq $v0, $at, .L80AAB634 /* 0136C 80AAB5BC 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 01370 80AAB5C0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 01374 80AAB5C4 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 01378 80AAB5C8 8DCE7168 */ lw $t6, 0x7168($t6) ## 80127168 +/* 01370 80AAB5C0 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 01374 80AAB5C4 3C0E8012 */ lui $t6, %hi(gBitFlags+0x48) +/* 01378 80AAB5C8 8DCE7168 */ lw $t6, %lo(gBitFlags+0x48)($t6) /* 0137C 80AAB5CC 8C6F00A4 */ lw $t7, 0x00A4($v1) ## 8015E704 /* 01380 80AAB5D0 01CFC024 */ and $t8, $t6, $t7 /* 01384 80AAB5D4 5300000C */ beql $t8, $zero, .L80AAB608 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB948.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB948.s index 34e91e6e35..634574821c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB948.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB948.s @@ -89,10 +89,10 @@ glabel func_80AAB948 /* 01828 80AABA78 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 .L80AABA7C: /* 0182C 80AABA7C 14410032 */ bne $v0, $at, .L80AABB48 -/* 01830 80AABA80 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 01834 80AABA84 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 01838 80AABA88 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 -/* 0183C 80AABA8C 8F397168 */ lw $t9, 0x7168($t9) ## 80127168 +/* 01830 80AABA80 3C038016 */ lui $v1, %hi(gSaveContext) +/* 01834 80AABA84 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 01838 80AABA88 3C198012 */ lui $t9, %hi(gBitFlags+0x48) +/* 0183C 80AABA8C 8F397168 */ lw $t9, %lo(gBitFlags+0x48)($t9) /* 01840 80AABA90 8C6800A4 */ lw $t0, 0x00A4($v1) ## 8015E704 /* 01844 80AABA94 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 01848 80AABA98 03284824 */ and $t1, $t9, $t0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABC10.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABC10.s index 7a3b575047..14633307dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABC10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABC10.s @@ -22,12 +22,12 @@ glabel func_80AABC10 .L80AABC60: /* 01A10 80AABC60 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 01A14 80AABC64 14610020 */ bne $v1, $at, .L80AABCE8 -/* 01A18 80AABC68 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01A1C 80AABC6C 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 01A20 80AABC70 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 01A24 80AABC74 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 01A28 80AABC78 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 01A2C 80AABC7C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 01A18 80AABC68 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01A1C 80AABC6C 3C188013 */ lui $t8, %hi(D_801333E8) +/* 01A20 80AABC70 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 01A24 80AABC74 271833E8 */ addiu $t8, %lo(D_801333E8) +/* 01A28 80AABC78 3C058013 */ lui $a1, %hi(D_801333D4) +/* 01A2C 80AABC7C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 01A30 80AABC80 AFB80014 */ sw $t8, 0x0014($sp) /* 01A34 80AABC84 AFA70010 */ sw $a3, 0x0010($sp) /* 01A38 80AABC88 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABD0C.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABD0C.s index ba700c2039..fbdb858960 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABD0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABD0C.s @@ -17,10 +17,10 @@ glabel func_80AABD0C /* 01AF8 80AABD48 50400007 */ beql $v0, $zero, .L80AABD68 /* 01AFC 80AABD4C 8A180030 */ lwl $t8, 0x0030($s0) ## 00000030 /* 01B00 80AABD50 860E0212 */ lh $t6, 0x0212($s0) ## 00000212 -/* 01B04 80AABD54 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01B08 80AABD58 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01B04 80AABD54 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01B08 80AABD58 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01B0C 80AABD5C 11C00008 */ beq $t6, $zero, .L80AABD80 -/* 01B10 80AABD60 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 +/* 01B10 80AABD60 3C198012 */ lui $t9, %hi(gBitFlags+0x48) /* 01B14 80AABD64 8A180030 */ lwl $t8, 0x0030($s0) ## 00000030 .L80AABD68: /* 01B18 80AABD68 9A180033 */ lwr $t8, 0x0033($s0) ## 00000033 @@ -30,7 +30,7 @@ glabel func_80AABD0C /* 01B28 80AABD78 10000029 */ beq $zero, $zero, .L80AABE20 /* 01B2C 80AABD7C A61800B8 */ sh $t8, 0x00B8($s0) ## 000000B8 .L80AABD80: -/* 01B30 80AABD80 8F397168 */ lw $t9, 0x7168($t9) ## 80127168 +/* 01B30 80AABD80 8F397168 */ lw $t9, %lo(gBitFlags+0x48)($t9) /* 01B34 80AABD84 8C4800A4 */ lw $t0, 0x00A4($v0) ## 8015E704 /* 01B38 80AABD88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01B3C 80AABD8C 03284824 */ and $t1, $t9, $t0 @@ -47,8 +47,8 @@ glabel func_80AABD0C /* 01B68 80AABDB8 00000000 */ nop /* 01B6C 80AABDBC 0C041B33 */ jal func_80106CCC /* 01B70 80AABDC0 01802025 */ or $a0, $t4, $zero ## $a0 = 00000000 -/* 01B74 80AABDC4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01B78 80AABDC8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01B74 80AABDC4 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01B78 80AABDC8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01B7C 80AABDCC 944E0ED6 */ lhu $t6, 0x0ED6($v0) ## 8015F536 /* 01B80 80AABDD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01B84 80AABDD4 35CF1000 */ ori $t7, $t6, 0x1000 ## $t7 = 00001000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s index a5aae0defd..3c449c6a8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s @@ -8,8 +8,8 @@ glabel EnMk_Init /* 00018 80AAC918 AFB00028 */ sw $s0, 0x0028($sp) /* 0001C 80AAC91C AFA50044 */ sw $a1, 0x0044($sp) /* 00020 80AAC920 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00024 80AAC924 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00028 80AAC928 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00024 80AAC924 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00028 80AAC928 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0002C 80AAC92C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00030 80AAC930 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00034 80AAC934 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 @@ -61,8 +61,8 @@ glabel EnMk_Init /* 000DC 80AAC9DC A600027E */ sh $zero, 0x027E($s0) ## 0000027E /* 000E0 80AAC9E0 A6000280 */ sh $zero, 0x0280($s0) ## 00000280 /* 000E4 80AAC9E4 A209001F */ sb $t1, 0x001F($s0) ## 0000001F -/* 000E8 80AAC9E8 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 000EC 80AAC9EC 954AF552 */ lhu $t2, -0x0AAE($t2) ## 8015F552 +/* 000E8 80AAC9E8 3C0A8016 */ lui $t2, %hi(gSaveContext+0xef2) +/* 000EC 80AAC9EC 954AF552 */ lhu $t2, %lo(gSaveContext+0xef2)($t2) /* 000F0 80AAC9F0 340D0004 */ ori $t5, $zero, 0x0004 ## $t5 = 00000004 /* 000F4 80AAC9F4 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 /* 000F8 80AAC9F8 51600003 */ beql $t3, $zero, .L80AACA08 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA94.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA94.s index e82bd0102a..a6feda66c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA94.s @@ -12,8 +12,8 @@ glabel func_80AACA94 /* 001BC 80AACABC AC400118 */ sw $zero, 0x0118($v0) ## 00000118 /* 001C0 80AACAC0 0C0222A8 */ jal func_80088AA0 /* 001C4 80AACAC4 AC4E0284 */ sw $t6, 0x0284($v0) ## 00000284 -/* 001C8 80AACAC8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 001CC 80AACACC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 001C8 80AACAC8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 001CC 80AACACC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 001D0 80AACAD0 944F13FC */ lhu $t7, 0x13FC($v0) ## 8015FA5C /* 001D4 80AACAD4 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 00000000 /* 001D8 80AACAD8 1000000A */ beq $zero, $zero, .L80AACB04 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACFA0.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACFA0.s index 8325f1f70f..39339bd681 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACFA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACFA0.s @@ -7,9 +7,9 @@ glabel func_80AACFA0 /* 006B4 80AACFB4 1040000B */ beq $v0, $zero, .L80AACFE4 /* 006B8 80AACFB8 8FA40020 */ lw $a0, 0x0020($sp) /* 006BC 80AACFBC 3C0E80AB */ lui $t6, %hi(func_80AACA40) ## $t6 = 80AB0000 -/* 006C0 80AACFC0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 006C0 80AACFC0 3C028016 */ lui $v0, %hi(gSaveContext) /* 006C4 80AACFC4 25CECA40 */ addiu $t6, $t6, %lo(func_80AACA40) ## $t6 = 80AACA40 -/* 006C8 80AACFC8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 006C8 80AACFC8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 006CC 80AACFCC AC800118 */ sw $zero, 0x0118($a0) ## 00000118 /* 006D0 80AACFD0 AC8E0284 */ sw $t6, 0x0284($a0) ## 00000284 /* 006D4 80AACFD4 944F0EF2 */ lhu $t7, 0x0EF2($v0) ## 8015F552 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s index bb373eb870..669dad04b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s @@ -16,16 +16,16 @@ glabel func_80AAD080 /* 007B8 80AAD0B8 24014018 */ addiu $at, $zero, 0x4018 ## $at = 00004018 /* 007BC 80AAD0BC 8FA30034 */ lw $v1, 0x0034($sp) /* 007C0 80AAD0C0 10810006 */ beq $a0, $at, .L80AAD0DC -/* 007C4 80AAD0C4 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 +/* 007C4 80AAD0C4 3C0F8012 */ lui $t7, %hi(gItemSlots+0x30) /* 007C8 80AAD0C8 3C0E80AB */ lui $t6, %hi(func_80AACA40) ## $t6 = 80AB0000 /* 007CC 80AAD0CC A464010E */ sh $a0, 0x010E($v1) ## 0000010E /* 007D0 80AAD0D0 25CECA40 */ addiu $t6, $t6, %lo(func_80AACA40) ## $t6 = 80AACA40 /* 007D4 80AAD0D4 10000079 */ beq $zero, $zero, .L80AAD2BC /* 007D8 80AAD0D8 AE0E0284 */ sw $t6, 0x0284($s0) ## 00000284 .L80AAD0DC: -/* 007DC 80AAD0DC 91EF7494 */ lbu $t7, 0x7494($t7) ## 80127494 -/* 007E0 80AAD0E0 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 007E4 80AAD0E4 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 +/* 007DC 80AAD0DC 91EF7494 */ lbu $t7, %lo(gItemSlots+0x30)($t7) +/* 007E0 80AAD0E0 3C058016 */ lui $a1, %hi(gSaveContext) +/* 007E4 80AAD0E4 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 007E8 80AAD0E8 00AFC021 */ addu $t8, $a1, $t7 /* 007EC 80AAD0EC 93190074 */ lbu $t9, 0x0074($t8) ## 00000074 /* 007F0 80AAD0F0 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 @@ -109,12 +109,12 @@ glabel func_80AAD080 /* 0090C 80AAD20C E7A80018 */ swc1 $f8, 0x0018($sp) /* 00910 80AAD210 960F027E */ lhu $t7, 0x027E($s0) ## 0000027E -/* 00914 80AAD214 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00914 80AAD214 3C018016 */ lui $at, %hi(gSaveContext+0x13d2) /* 00918 80AAD218 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 /* 0091C 80AAD21C 31F8FFFD */ andi $t8, $t7, 0xFFFD ## $t8 = 00000000 /* 00920 80AAD220 A618027E */ sh $t8, 0x027E($s0) ## 0000027E /* 00924 80AAD224 0C01E221 */ jal func_80078884 -/* 00928 80AAD228 A420FA32 */ sh $zero, -0x05CE($at) ## 8015FA32 +/* 00928 80AAD228 A420FA32 */ sh $zero, %lo(gSaveContext+0x13d2)($at) /* 0092C 80AAD22C 10000024 */ beq $zero, $zero, .L80AAD2C0 /* 00930 80AAD230 8FBF002C */ lw $ra, 0x002C($sp) .L80AAD234: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s index e257db4218..9d74b8d397 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s @@ -51,7 +51,7 @@ glabel EnMm_Draw /* 00F90 80AAE700 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 /* 00F94 80AAE704 8D1801E4 */ lw $t8, 0x01E4($t0) ## 000001E4 /* 00F98 80AAE708 3C0480AB */ lui $a0, %hi(D_80AAEBEC) ## $a0 = 80AB0000 -/* 00F9C 80AAE70C 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 00F9C 80AAE70C 3C0D8016 */ lui $t5, %hi(gSegments) /* 00FA0 80AAE710 0018C880 */ sll $t9, $t8, 2 /* 00FA4 80AAE714 00992021 */ addu $a0, $a0, $t9 /* 00FA8 80AAE718 8C84EBEC */ lw $a0, %lo(D_80AAEBEC)($a0) @@ -61,7 +61,7 @@ glabel EnMm_Draw /* 00FB8 80AAE728 000A5F02 */ srl $t3, $t2, 28 /* 00FBC 80AAE72C 000B6080 */ sll $t4, $t3, 2 /* 00FC0 80AAE730 01AC6821 */ addu $t5, $t5, $t4 -/* 00FC4 80AAE734 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 +/* 00FC4 80AAE734 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) /* 00FC8 80AAE738 00814824 */ and $t1, $a0, $at /* 00FCC 80AAE73C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00FD0 80AAE740 012D7021 */ addu $t6, $t1, $t5 @@ -79,8 +79,8 @@ glabel EnMm_Draw /* 01000 80AAE770 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01004 80AAE774 0C0286B2 */ jal SkelAnime_DrawSV /* 01008 80AAE778 AFA80018 */ sw $t0, 0x0018($sp) -/* 0100C 80AAE77C 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 01010 80AAE780 954AF556 */ lhu $t2, -0x0AAA($t2) ## 8015F556 +/* 0100C 80AAE77C 3C0A8016 */ lui $t2, %hi(gSaveContext+0xef6) +/* 01010 80AAE780 954AF556 */ lhu $t2, %lo(gSaveContext+0xef6)($t2) /* 01014 80AAE784 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01018 80AAE788 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 /* 0101C 80AAE78C 314B0800 */ andi $t3, $t2, 0x0800 ## $t3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s index 78fadcb2ac..da58e70992 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s @@ -8,8 +8,8 @@ glabel EnMm_Init /* 00138 80AAD8A8 0C01E037 */ jal Actor_ProcessInitChain /* 0013C 80AAD8AC 24A5EBE8 */ addiu $a1, $a1, %lo(D_80AAEBE8) ## $a1 = 80AAEBE8 -/* 00140 80AAD8B0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00144 80AAD8B4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00140 80AAD8B0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00144 80AAD8B4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00148 80AAD8B8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0014C 80AAD8BC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00150 80AAD8C0 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADA70.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADA70.s index 27843aff52..9252fb2ec0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADA70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADA70.s @@ -1,6 +1,6 @@ glabel func_80AADA70 -/* 00300 80AADA70 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00304 80AADA74 9442E66C */ lhu $v0, -0x1994($v0) ## 8015E66C +/* 00300 80AADA70 3C028016 */ lui $v0, %hi(gSaveContext+0xc) +/* 00304 80AADA74 9442E66C */ lhu $v0, %lo(gSaveContext+0xc)($v0) /* 00308 80AADA78 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 0030C 80AADA7C 28413556 */ slti $at, $v0, 0x3556 /* 00310 80AADA80 14200005 */ bne $at, $zero, .L80AADA98 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADAA0.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADAA0.s index 23404aae16..3599c6194c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADAA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADAA0.s @@ -42,7 +42,7 @@ glabel L80AADAF0 /* 003A0 80AADB10 01194021 */ addu $t0, $t0, $t9 /* 003A4 80AADB14 910804BD */ lbu $t0, 0x04BD($t0) ## 000104BD /* 003A8 80AADB18 8FAA0020 */ lw $t2, 0x0020($sp) -/* 003AC 80AADB1C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 003AC 80AADB1C 3C038016 */ lui $v1, %hi(gSaveContext) /* 003B0 80AADB20 1500000C */ bne $t0, $zero, .L80AADB54 /* 003B4 80AADB24 8FAE0020 */ lw $t6, 0x0020($sp) /* 003B8 80AADB28 A549010E */ sh $t1, 0x010E($t2) ## 0000010E @@ -58,7 +58,7 @@ glabel L80AADAF0 /* 003E0 80AADB50 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 .L80AADB54: /* 003E4 80AADB54 240D202C */ addiu $t5, $zero, 0x202C ## $t5 = 0000202C -/* 003E8 80AADB58 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = FFFFE660 +/* 003E8 80AADB58 2463E660 */ addiu $v1, %lo(gSaveContext) /* 003EC 80AADB5C A5CD010E */ sh $t5, 0x010E($t6) ## 0000010E /* 003F0 80AADB60 946F0F26 */ lhu $t7, 0x0F26($v1) ## FFFFF586 /* 003F4 80AADB64 35F81000 */ ori $t8, $t7, 0x1000 ## $t8 = 00001000 @@ -77,8 +77,8 @@ glabel L80AADB78 /* 00420 80AADB90 8FA4002C */ lw $a0, 0x002C($sp) /* 00424 80AADB94 0C021344 */ jal Item_Give /* 00428 80AADB98 2405002C */ addiu $a1, $zero, 0x002C ## $a1 = 0000002C -/* 0042C 80AADB9C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00430 80AADBA0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0042C 80AADB9C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00430 80AADBA0 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00434 80AADBA4 94680EF6 */ lhu $t0, 0x0EF6($v1) ## 8015F556 /* 00438 80AADBA8 240401F4 */ addiu $a0, $zero, 0x01F4 ## $a0 = 000001F4 /* 0043C 80AADBAC 35090800 */ ori $t1, $t0, 0x0800 ## $t1 = 00000800 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADC34.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADC34.s index 6d73f69fc4..fa952ac65f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADC34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADC34.s @@ -7,8 +7,8 @@ glabel func_80AADC34 /* 004D8 80AADC48 2405001C */ addiu $a1, $zero, 0x001C ## $a1 = 0000001C /* 004DC 80AADC4C 0C01B0D8 */ jal Text_GetFaceReaction /* 004E0 80AADC50 AFAE001C */ sw $t6, 0x001C($sp) -/* 004E4 80AADC54 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 004E8 80AADC58 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 +/* 004E4 80AADC54 3C058016 */ lui $a1, %hi(gSaveContext) +/* 004E8 80AADC58 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 004EC 80AADC5C 94AF0EF6 */ lhu $t7, 0x0EF6($a1) ## 8015F556 /* 004F0 80AADC60 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 /* 004F4 80AADC64 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADE60.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADE60.s index 2247a2b1e1..ae744929af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADE60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADE60.s @@ -2,13 +2,13 @@ glabel func_80AADE60 /* 006F0 80AADE60 000670C0 */ sll $t6, $a2, 3 /* 006F4 80AADE64 008E7821 */ addu $t7, $a0, $t6 /* 006F8 80AADE68 8DE80004 */ lw $t0, 0x0004($t7) ## 00000004 -/* 006FC 80AADE6C 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 006FC 80AADE6C 3C0A8016 */ lui $t2, %hi(gSegments) /* 00700 80AADE70 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00704 80AADE74 0008C100 */ sll $t8, $t0, 4 /* 00708 80AADE78 0018CF02 */ srl $t9, $t8, 28 /* 0070C 80AADE7C 00194880 */ sll $t1, $t9, 2 /* 00710 80AADE80 01495021 */ addu $t2, $t2, $t1 -/* 00714 80AADE84 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 00714 80AADE84 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 00718 80AADE88 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0071C 80AADE8C 00076880 */ sll $t5, $a3, 2 /* 00720 80AADE90 01A76823 */ subu $t5, $t5, $a3 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE294.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE294.s index ef7dabcd62..52ac9df558 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE294.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE294.s @@ -72,8 +72,8 @@ glabel func_80AAE294 /* 00C00 80AAE370 240538B8 */ addiu $a1, $zero, 0x38B8 ## $a1 = 000038B8 .L80AAE374: -/* 00C04 80AAE374 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00C08 80AAE378 95EFF556 */ lhu $t7, -0x0AAA($t7) ## 8015F556 +/* 00C04 80AAE374 3C0F8016 */ lui $t7, %hi(gSaveContext+0xef6) +/* 00C08 80AAE378 95EFF556 */ lhu $t7, %lo(gSaveContext+0xef6)($t7) /* 00C0C 80AAE37C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 00C10 80AAE380 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00C14 80AAE384 31F80800 */ andi $t8, $t7, 0x0800 ## $t8 = 00000000 @@ -138,8 +138,8 @@ glabel func_80AAE294 /* 00CF0 80AAE460 AE09025C */ sw $t1, 0x025C($s0) ## 0000025C /* 00CF4 80AAE464 AE00025C */ sw $zero, 0x025C($s0) ## 0000025C .L80AAE468: -/* 00CF8 80AAE468 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00CFC 80AAE46C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00CF8 80AAE468 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00CFC 80AAE46C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00D00 80AAE470 944A0EF6 */ lhu $t2, 0x0EF6($v0) ## 8015F556 /* 00D04 80AAE474 314B0800 */ andi $t3, $t2, 0x0800 ## $t3 = 00000000 /* 00D08 80AAE478 51600020 */ beql $t3, $zero, .L80AAE4FC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE50C.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE50C.s index 3fe2138940..8d0b5447dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE50C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE50C.s @@ -12,8 +12,8 @@ glabel func_80AAE50C /* 00DC0 80AAE530 25CEE294 */ addiu $t6, $t6, %lo(func_80AAE294) ## $t6 = 80AAE294 /* 00DC4 80AAE534 AE00025C */ sw $zero, 0x025C($s0) ## 0000025C /* 00DC8 80AAE538 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 00DCC 80AAE53C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00DD0 80AAE540 95EFF556 */ lhu $t7, -0x0AAA($t7) ## 8015F556 +/* 00DCC 80AAE53C 3C0F8016 */ lui $t7, %hi(gSaveContext+0xef6) +/* 00DD0 80AAE540 95EFF556 */ lhu $t7, %lo(gSaveContext+0xef6)($t7) /* 00DD4 80AAE544 26060258 */ addiu $a2, $s0, 0x0258 ## $a2 = 00000258 /* 00DD8 80AAE548 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00DDC 80AAE54C 31F80800 */ andi $t8, $t7, 0x0800 ## $t8 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s index 29de2846c1..46247ebd52 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s @@ -29,7 +29,7 @@ glabel EnMm2_Draw /* 00ACC 80AAF91C 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00AD0 80AAF920 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 00AD4 80AAF924 3C0480AB */ lui $a0, %hi(D_80AAFB60) ## $a0 = 80AB0000 -/* 00AD8 80AAF928 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 00AD8 80AAF928 3C0E8016 */ lui $t6, %hi(gSegments) /* 00ADC 80AAF92C 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 /* 00AE0 80AAF930 ACB802C0 */ sw $t8, 0x02C0($a1) ## 000002C0 /* 00AE4 80AAF934 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 @@ -45,7 +45,7 @@ glabel EnMm2_Draw /* 00B0C 80AAF95C 000B6702 */ srl $t4, $t3, 28 /* 00B10 80AAF960 000C6880 */ sll $t5, $t4, 2 /* 00B14 80AAF964 01CD7021 */ addu $t6, $t6, $t5 -/* 00B18 80AAF968 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 00B18 80AAF968 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 00B1C 80AAF96C 00815024 */ and $t2, $a0, $at /* 00B20 80AAF970 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00B24 80AAF974 014E7821 */ addu $t7, $t2, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s index 3644b645f9..df11b23c25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s @@ -14,8 +14,8 @@ glabel EnMm2_Init /* 00204 80AAF054 0C01E037 */ jal Actor_ProcessInitChain /* 00208 80AAF058 24A5FB5C */ addiu $a1, $a1, %lo(D_80AAFB5C) ## $a1 = 80AAFB5C -/* 0020C 80AAF05C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00210 80AAF060 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0020C 80AAF05C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00210 80AAF060 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00214 80AAF064 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00218 80AAF068 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0021C 80AAF06C 0C00AC78 */ jal ActorShape_Init @@ -94,16 +94,16 @@ glabel EnMm2_Init /* 00328 80AAF178 25EFF57C */ addiu $t7, $t7, %lo(func_80AAF57C) ## $t7 = 80AAF57C /* 0032C 80AAF17C AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 .L80AAF180: -/* 00330 80AAF180 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00334 80AAF184 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00330 80AAF180 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00334 80AAF184 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00338 80AAF188 8C580004 */ lw $t8, 0x0004($v0) ## 8015E664 /* 0033C 80AAF18C 53000006 */ beql $t8, $zero, .L80AAF1A8 /* 00340 80AAF190 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 00344 80AAF194 0C00B55C */ jal Actor_Kill /* 00348 80AAF198 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0034C 80AAF19C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00350 80AAF1A0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0034C 80AAF19C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00350 80AAF1A0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00354 80AAF1A4 8619001C */ lh $t9, 0x001C($s0) ## 0000001C .L80AAF1A8: /* 00358 80AAF1A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAEF70.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAEF70.s index 4f7d7b8302..b0961ad0ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAEF70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAEF70.s @@ -1,6 +1,6 @@ glabel func_80AAEF70 -/* 00120 80AAEF70 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00124 80AAEF74 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00120 80AAEF70 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00124 80AAEF74 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00128 80AAEF78 944E0EE6 */ lhu $t6, 0x0EE6($v0) ## 8015F546 /* 0012C 80AAEF7C 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 00130 80AAEF80 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF330.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF330.s index 092d0e6681..adc24ae427 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF330.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF330.s @@ -27,8 +27,8 @@ glabel func_80AAF330 /* 00540 80AAF390 0C041B33 */ jal func_80106CCC /* 00544 80AAF394 8FA4001C */ lw $a0, 0x001C($sp) .L80AAF398: -/* 00548 80AAF398 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0054C 80AAF39C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00548 80AAF398 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0054C 80AAF39C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00550 80AAF3A0 944813FC */ lhu $t0, 0x13FC($v0) ## 8015FA5C /* 00554 80AAF3A4 A44013D2 */ sh $zero, 0x13D2($v0) ## 8015FA32 /* 00558 80AAF3A8 3109FFFE */ andi $t1, $t0, 0xFFFE ## $t1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF3C0.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF3C0.s index 5abfa7ede7..4260d4176d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF3C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF3C0.s @@ -36,15 +36,15 @@ glabel func_80AAF3C0 /* 005F0 80AAF440 10600005 */ beq $v1, $zero, .L80AAF458 /* 005F4 80AAF444 00000000 */ nop /* 005F8 80AAF448 1061000D */ beq $v1, $at, .L80AAF480 -/* 005FC 80AAF44C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 005FC 80AAF44C 3C038016 */ lui $v1, %hi(gSaveContext) /* 00600 80AAF450 10000012 */ beq $zero, $zero, .L80AAF49C -/* 00604 80AAF454 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00604 80AAF454 2463E660 */ addiu $v1, %lo(gSaveContext) .L80AAF458: /* 00608 80AAF458 0C042DC8 */ jal func_8010B720 /* 0060C 80AAF45C 2405607F */ addiu $a1, $zero, 0x607F ## $a1 = 0000607F -/* 00610 80AAF460 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00610 80AAF460 3C038016 */ lui $v1, %hi(gSaveContext) /* 00614 80AAF464 240F607F */ addiu $t7, $zero, 0x607F ## $t7 = 0000607F -/* 00618 80AAF468 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00618 80AAF468 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0061C 80AAF46C A60F010E */ sh $t7, 0x010E($s0) ## 0000010E /* 00620 80AAF470 947813FC */ lhu $t8, 0x13FC($v1) ## 8015FA5C /* 00624 80AAF474 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 @@ -55,9 +55,9 @@ glabel func_80AAF3C0 /* 00634 80AAF484 0C042DC8 */ jal func_8010B720 /* 00638 80AAF488 24056080 */ addiu $a1, $zero, 0x6080 ## $a1 = 00006080 /* 0063C 80AAF48C 24086080 */ addiu $t0, $zero, 0x6080 ## $t0 = 00006080 -/* 00640 80AAF490 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00640 80AAF490 3C038016 */ lui $v1, %hi(gSaveContext) /* 00644 80AAF494 A608010E */ sh $t0, 0x010E($s0) ## 0000010E -/* 00648 80AAF498 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00648 80AAF498 2463E660 */ addiu $v1, %lo(gSaveContext) .L80AAF49C: /* 0064C 80AAF49C 960201F4 */ lhu $v0, 0x01F4($s0) ## 000001F4 /* 00650 80AAF4A0 30490004 */ andi $t1, $v0, 0x0004 ## $t1 = 00000000 @@ -79,8 +79,8 @@ glabel func_80AAF3C0 /* 0068C 80AAF4DC 50400023 */ beql $v0, $zero, .L80AAF56C /* 00690 80AAF4E0 8FBF001C */ lw $ra, 0x001C($sp) /* 00694 80AAF4E4 960D01F4 */ lhu $t5, 0x01F4($s0) ## 000001F4 -/* 00698 80AAF4E8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0069C 80AAF4EC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00698 80AAF4E8 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0069C 80AAF4EC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 006A0 80AAF4F0 35AE0004 */ ori $t6, $t5, 0x0004 ## $t6 = 00000004 /* 006A4 80AAF4F4 A60E01F4 */ sh $t6, 0x01F4($s0) ## 000001F4 /* 006A8 80AAF4F8 8C6F0EC8 */ lw $t7, 0x0EC8($v1) ## 8015F528 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF57C.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF57C.s index 476704e85b..54536bdb47 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF57C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF57C.s @@ -18,9 +18,9 @@ glabel func_80AAF57C /* 00768 80AAF5B8 8FAE0018 */ lw $t6, 0x0018($sp) /* 0076C 80AAF5BC 95CF010E */ lhu $t7, 0x010E($t6) ## 0000010E /* 00770 80AAF5C0 2401607D */ addiu $at, $zero, 0x607D ## $at = 0000607D -/* 00774 80AAF5C4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00774 80AAF5C4 3C028016 */ lui $v0, %hi(gSaveContext) /* 00778 80AAF5C8 15E10004 */ bne $t7, $at, .L80AAF5DC -/* 0077C 80AAF5CC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0077C 80AAF5CC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00780 80AAF5D0 94580F26 */ lhu $t8, 0x0F26($v0) ## 8015F586 /* 00784 80AAF5D4 37198000 */ ori $t9, $t8, 0x8000 ## $t9 = 00008000 /* 00788 80AAF5D8 A4590F26 */ sh $t9, 0x0F26($v0) ## 8015F586 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF668.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF668.s index 539a7d314b..17522cbc5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF668.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF668.s @@ -21,8 +21,8 @@ glabel func_80AAF668 /* 0083C 80AAF68C 0C02927F */ jal SkelAnime_FrameUpdateMatrix /* 00840 80AAF690 A48FFF6A */ sh $t7, -0x0096($a0) ## 000000B6 -/* 00844 80AAF694 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 00848 80AAF698 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 00844 80AAF694 3C078016 */ lui $a3, %hi(gSaveContext) +/* 00848 80AAF698 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 0084C 80AAF69C 84E313D4 */ lh $v1, 0x13D4($a3) ## 8015FA34 /* 00850 80AAF6A0 8CF80EC8 */ lw $t8, 0x0EC8($a3) ## 8015F528 /* 00854 80AAF6A4 3C0680AB */ lui $a2, %hi(func_80AAF5EC) ## $a2 = 80AB0000 @@ -39,9 +39,9 @@ glabel func_80AAF668 .L80AAF6CC: /* 0087C 80AAF6CC 0C2ABC89 */ jal func_80AAF224 /* 00880 80AAF6D0 8FA50024 */ lw $a1, 0x0024($sp) -/* 00884 80AAF6D4 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 +/* 00884 80AAF6D4 3C078016 */ lui $a3, %hi(gSaveContext) /* 00888 80AAF6D8 1040000B */ beq $v0, $zero, .L80AAF708 -/* 0088C 80AAF6DC 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 0088C 80AAF6DC 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 00890 80AAF6E0 A60001F6 */ sh $zero, 0x01F6($s0) ## 000001F6 /* 00894 80AAF6E4 84E213D4 */ lh $v0, 0x13D4($a3) ## 8015FA34 /* 00898 80AAF6E8 8CE90EC8 */ lw $t1, 0x0EC8($a3) ## 8015F528 @@ -58,16 +58,16 @@ glabel func_80AAF668 /* 008C0 80AAF710 0C000B84 */ jal LogUtils_LogThreadId /* 008C4 80AAF714 2405021D */ addiu $a1, $zero, 0x021D ## $a1 = 0000021D -/* 008C8 80AAF718 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 008CC 80AAF71C 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 008C8 80AAF718 3C078016 */ lui $a3, %hi(gSaveContext) +/* 008CC 80AAF71C 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 008D0 80AAF720 94E513FC */ lhu $a1, 0x13FC($a3) ## 8015FA5C /* 008D4 80AAF724 3C0480AB */ lui $a0, %hi(D_80AAFBB8) ## $a0 = 80AB0000 /* 008D8 80AAF728 2484FBB8 */ addiu $a0, $a0, %lo(D_80AAFBB8) ## $a0 = 80AAFBB8 /* 008DC 80AAF72C 0C00084C */ jal osSyncPrintf /* 008E0 80AAF730 30A50001 */ andi $a1, $a1, 0x0001 ## $a1 = 00000000 -/* 008E4 80AAF734 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 008E8 80AAF738 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 008E4 80AAF734 3C078016 */ lui $a3, %hi(gSaveContext) +/* 008E8 80AAF738 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 008EC 80AAF73C 94EA13FC */ lhu $t2, 0x13FC($a3) ## 8015FA5C /* 008F0 80AAF740 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 008F4 80AAF744 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s index 6876e26bbb..ee20426a98 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s @@ -4,8 +4,8 @@ glabel EnMu_Init /* 00214 80AB0634 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00218 80AB0638 AFBF002C */ sw $ra, 0x002C($sp) /* 0021C 80AB063C AFA50044 */ sw $a1, 0x0044($sp) -/* 00220 80AB0640 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00224 80AB0644 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00220 80AB0640 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00224 80AB0644 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00228 80AB0648 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0022C 80AB064C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00230 80AB0650 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0428.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0428.s index 666146c74b..9d208b554a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0428.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0428.s @@ -11,10 +11,10 @@ glabel func_80AB0428 /* 0002C 80AB044C ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF8 /* 00030 80AB0450 91F90004 */ lbu $t9, 0x0004($t7) ## 80AB0C2C /* 00034 80AB0454 256B0C30 */ addiu $t3, $t3, %lo(D_80AB0C30) ## $t3 = 80AB0C30 -/* 00038 80AB0458 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 00038 80AB0458 3C088016 */ lui $t0, %hi(gSaveContext) /* 0003C 80AB045C A1D90004 */ sb $t9, 0x0004($t6) ## FFFFFFFC /* 00040 80AB0460 8D6D0000 */ lw $t5, 0x0000($t3) ## 80AB0C30 -/* 00044 80AB0464 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 00044 80AB0464 2508E660 */ addiu $t0, %lo(gSaveContext) /* 00048 80AB0468 27A70028 */ addiu $a3, $sp, 0x0028 ## $a3 = FFFFFFF0 /* 0004C 80AB046C 950213FE */ lhu $v0, 0x13FE($t0) ## 8015FA5E /* 00050 80AB0470 ACED0000 */ sw $t5, 0x0000($a3) ## FFFFFFF0 @@ -32,8 +32,8 @@ glabel func_80AB0428 /* 0007C 80AB049C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00080 80AB04A0 46040182 */ mul.s $f6, $f0, $f4 /* 00084 80AB04A4 8F2B009C */ lw $t3, 0x009C($t9) ## 0000009C -/* 00088 80AB04A8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 0008C 80AB04AC 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 00088 80AB04A8 3C088016 */ lui $t0, %hi(gSaveContext) +/* 0008C 80AB04AC 2508E660 */ addiu $t0, %lo(gSaveContext) /* 00090 80AB04B0 93A50027 */ lbu $a1, 0x0027($sp) /* 00094 80AB04B4 27A70028 */ addiu $a3, $sp, 0x0028 ## $a3 = FFFFFFF0 /* 00098 80AB04B8 8FA90038 */ lw $t1, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Init.s index 39bd34a534..210db2387c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Init.s @@ -15,8 +15,8 @@ glabel EnNb_Init /* 03148 80AB3ED8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0314C 80AB3EDC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 03150 80AB3EE0 AFBF002C */ sw $ra, 0x002C($sp) -/* 03154 80AB3EE4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 03158 80AB3EE8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 03154 80AB3EE4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 03158 80AB3EE8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0315C 80AB3EEC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 03160 80AB3EF0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 03164 80AB3EF4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0DAC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0DAC.s index f261da547d..403d12c9d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0DAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0DAC.s @@ -29,13 +29,13 @@ glabel func_80AB0DAC /* 00050 80AB0DE0 AFA20018 */ sw $v0, 0x0018($sp) /* 00054 80AB0DE4 00EE3821 */ addu $a3, $a3, $t6 /* 00058 80AB0DE8 8CE40004 */ lw $a0, 0x0004($a3) ## 00000004 -/* 0005C 80AB0DEC 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 0005C 80AB0DEC 3C088016 */ lui $t0, %hi(gSegments) /* 00060 80AB0DF0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00064 80AB0DF4 00047900 */ sll $t7, $a0, 4 /* 00068 80AB0DF8 000FC702 */ srl $t8, $t7, 28 /* 0006C 80AB0DFC 0018C880 */ sll $t9, $t8, 2 /* 00070 80AB0E00 01194021 */ addu $t0, $t0, $t9 -/* 00074 80AB0E04 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 +/* 00074 80AB0E04 8D086FA8 */ lw $t0, %lo(gSegments)($t0) /* 00078 80AB0E08 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0007C 80AB0E0C 00814824 */ and $t1, $a0, $at /* 00080 80AB0E10 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0FBC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0FBC.s index e1bad4c1c6..d09b32b857 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0FBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0FBC.s @@ -3,8 +3,8 @@ glabel func_80AB0FBC /* 00230 80AB0FC0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00234 80AB0FC4 AFA5001C */ sw $a1, 0x001C($sp) /* 00238 80AB0FC8 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 0023C 80AB0FCC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00240 80AB0FD0 2463FA90 */ addiu $v1, $v1, 0xFA90 ## $v1 = 8015FA90 +/* 0023C 80AB0FCC 3C038016 */ lui $v1, %hi(gGameInfo) +/* 00240 80AB0FD0 2463FA90 */ addiu $v1, %lo(gGameInfo) /* 00244 80AB0FD4 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 /* 00248 80AB0FD8 3C014110 */ lui $at, 0x4110 ## $at = 41100000 /* 0024C 80AB0FDC 44814000 */ mtc1 $at, $f8 ## $f8 = 9.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1040.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1040.s index 1d40cd66d9..4f557f30f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1040.s @@ -3,8 +3,8 @@ glabel func_80AB1040 /* 002B4 80AB1044 AFBF0014 */ sw $ra, 0x0014($sp) /* 002B8 80AB1048 AFA5001C */ sw $a1, 0x001C($sp) /* 002BC 80AB104C 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 002C0 80AB1050 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 002C4 80AB1054 2463FA90 */ addiu $v1, $v1, 0xFA90 ## $v1 = 8015FA90 +/* 002C0 80AB1050 3C038016 */ lui $v1, %hi(gGameInfo) +/* 002C4 80AB1054 2463FA90 */ addiu $v1, %lo(gGameInfo) /* 002C8 80AB1058 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 /* 002CC 80AB105C 3C014110 */ lui $at, 0x4110 ## $at = 41100000 /* 002D0 80AB1060 44814000 */ mtc1 $at, $f8 ## $f8 = 9.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB166C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB166C.s index 2038e6a841..570b125ece 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB166C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB166C.s @@ -1,6 +1,6 @@ glabel func_80AB166C -/* 008DC 80AB166C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 008E0 80AB1670 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 008DC 80AB166C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 008E0 80AB1670 2442E660 */ addiu $v0, %lo(gSaveContext) /* 008E4 80AB1674 904E1415 */ lbu $t6, 0x1415($v0) ## 8015FA75 /* 008E8 80AB1678 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 008EC 80AB167C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A94.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A94.s index 65976b7ba1..6c49e78cd7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A94.s @@ -5,8 +5,8 @@ glabel func_80AB1A94 /* 00D10 80AB1AA0 AFBF0034 */ sw $ra, 0x0034($sp) /* 00D14 80AB1AA4 AFA40038 */ sw $a0, 0x0038($sp) /* 00D18 80AB1AA8 C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 00D1C 80AB1AAC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00D20 80AB1AB0 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 00D1C 80AB1AAC 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 00D20 80AB1AB0 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 00D24 80AB1AB4 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00D28 80AB1AB8 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 /* 00D2C 80AB1ABC 85CF147E */ lh $t7, 0x147E($t6) ## 8016147E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1B68.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1B68.s index 3e68150105..704c491ea7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1B68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1B68.s @@ -13,8 +13,8 @@ glabel func_80AB1B68 /* 00E04 80AB1B94 24820280 */ addiu $v0, $a0, 0x0280 ## $v0 = 00000280 /* 00E08 80AB1B98 C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000280 /* 00E0C 80AB1B9C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00E10 80AB1BA0 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00E14 80AB1BA4 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 +/* 00E10 80AB1BA0 3C058016 */ lui $a1, %hi(gGameInfo) +/* 00E14 80AB1BA4 24A5FA90 */ addiu $a1, %lo(gGameInfo) /* 00E18 80AB1BA8 46062200 */ add.s $f8, $f4, $f6 /* 00E1C 80AB1BAC 24180009 */ addiu $t8, $zero, 0x0009 ## $t8 = 00000009 /* 00E20 80AB1BB0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 @@ -63,8 +63,8 @@ glabel func_80AB1B68 /* 00EC8 80AB1C58 10000014 */ beq $zero, $zero, .L80AB1CAC /* 00ECC 80AB1C5C A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 .L80AB1C60: -/* 00ED0 80AB1C60 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00ED4 80AB1C64 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 +/* 00ED0 80AB1C60 3C058016 */ lui $a1, %hi(gGameInfo) +/* 00ED4 80AB1C64 24A5FA90 */ addiu $a1, %lo(gGameInfo) /* 00ED8 80AB1C68 8CAB0000 */ lw $t3, 0x0000($a1) ## 8015FA90 /* 00EDC 80AB1C6C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00EE0 80AB1C70 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1CBC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1CBC.s index ad8b1d25bd..340ca56359 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1CBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1CBC.s @@ -12,8 +12,8 @@ glabel func_80AB1CBC /* 00F54 80AB1CE4 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 00F58 80AB1CE8 AC8E0278 */ sw $t6, 0x0278($a0) ## 00000278 /* 00F5C 80AB1CEC AC8F027C */ sw $t7, 0x027C($a0) ## 0000027C -/* 00F60 80AB1CF0 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 00F64 80AB1CF4 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 00F60 80AB1CF0 3C188016 */ lui $t8, %hi(gGameInfo) +/* 00F64 80AB1CF4 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 00F68 80AB1CF8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00F6C 80AB1CFC 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 /* 00F70 80AB1D00 8719145E */ lh $t9, 0x145E($t8) ## 8016145E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s index 9c0b4d4ee9..cbbe776316 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s @@ -35,10 +35,10 @@ glabel func_80AB1E2C /* 010F8 80AB1E88 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 010FC 80AB1E8C 00076100 */ sll $t4, $a3, 4 /* 01100 80AB1E90 000C6F02 */ srl $t5, $t4, 28 -/* 01104 80AB1E94 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 01104 80AB1E94 3C0F8016 */ lui $t7, %hi(gSegments) /* 01108 80AB1E98 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 0110C 80AB1E9C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 01110 80AB1EA0 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 +/* 01110 80AB1EA0 25EF6FA8 */ addiu $t7, %lo(gSegments) /* 01114 80AB1EA4 000D7080 */ sll $t6, $t5, 2 /* 01118 80AB1EA8 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 0111C 80AB1EAC 01CF2021 */ addu $a0, $t6, $t7 @@ -65,12 +65,12 @@ glabel func_80AB1E2C /* 01170 80AB1F00 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 01174 80AB1F04 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01178 80AB1F08 8FA80078 */ lw $t0, 0x0078($sp) -/* 0117C 80AB1F0C 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 +/* 0117C 80AB1F0C 3C0C8011 */ lui $t4, %hi(D_80116280) /* 01180 80AB1F10 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01184 80AB1F14 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 01188 80AB1F18 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 0118C 80AB1F1C 8D190284 */ lw $t9, 0x0284($t0) ## 00000284 -/* 01190 80AB1F20 258C6280 */ addiu $t4, $t4, 0x6280 ## $t4 = 80116280 +/* 01190 80AB1F20 258C6280 */ addiu $t4, %lo(D_80116280) /* 01194 80AB1F24 356B0030 */ ori $t3, $t3, 0x0030 ## $t3 = DB060030 /* 01198 80AB1F28 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000000 /* 0119C 80AB1F2C AC490004 */ sw $t1, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1FA4.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1FA4.s index abe00be753..8aaa1868e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1FA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1FA4.s @@ -10,9 +10,9 @@ glabel func_80AB1FA4 /* 01234 80AB1FC4 0C2AC528 */ jal func_80AB14A0 /* 01238 80AB1FC8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 0123C 80AB1FCC 8FA40020 */ lw $a0, 0x0020($sp) -/* 01240 80AB1FD0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 01240 80AB1FD0 3C028016 */ lui $v0, %hi(gSaveContext) /* 01244 80AB1FD4 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 01248 80AB1FD8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01248 80AB1FD8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0124C 80AB1FDC AC8E0278 */ sw $t6, 0x0278($a0) ## 00000278 /* 01250 80AB1FE0 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 /* 01254 80AB1FE4 944F0EE6 */ lhu $t7, 0x0EE6($v0) ## 8015F546 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2610.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2610.s index 354aff9160..30785feb91 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2610.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2610.s @@ -1,6 +1,6 @@ glabel func_80AB2610 -/* 01880 80AB2610 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 01884 80AB2614 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 01880 80AB2610 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 01884 80AB2614 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 01888 80AB2618 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0188C 80AB261C AFBF002C */ sw $ra, 0x002C($sp) /* 01890 80AB2620 AFA40030 */ sw $a0, 0x0030($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s index 482fa14486..05e28a76ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s @@ -30,9 +30,9 @@ glabel func_80AB2E70 /* 02128 80AB2EB8 00044900 */ sll $t1, $a0, 4 /* 0212C 80AB2EBC 00095702 */ srl $t2, $t1, 28 /* 02130 80AB2EC0 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 02134 80AB2EC4 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 02134 80AB2EC4 3C0C8016 */ lui $t4, %hi(gSegments) /* 02138 80AB2EC8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 0213C 80AB2ECC 258C6FA8 */ addiu $t4, $t4, 0x6FA8 ## $t4 = 80166FA8 +/* 0213C 80AB2ECC 258C6FA8 */ addiu $t4, %lo(gSegments) /* 02140 80AB2ED0 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 02144 80AB2ED4 000A5880 */ sll $t3, $t2, 2 /* 02148 80AB2ED8 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 @@ -59,7 +59,7 @@ glabel func_80AB2E70 /* 0219C 80AB2F2C 01475821 */ addu $t3, $t2, $a3 /* 021A0 80AB2F30 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 021A4 80AB2F34 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 021A8 80AB2F38 3C198011 */ lui $t9, 0x8011 ## $t9 = 80110000 +/* 021A8 80AB2F38 3C198011 */ lui $t9, %hi(D_80116280+0x10) /* 021AC 80AB2F3C 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 021B0 80AB2F40 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 021B4 80AB2F44 AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 @@ -67,7 +67,7 @@ glabel func_80AB2E70 /* 021BC 80AB2F4C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 021C0 80AB2F50 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 021C4 80AB2F54 37180030 */ ori $t8, $t8, 0x0030 ## $t8 = DB060030 -/* 021C8 80AB2F58 27396290 */ addiu $t9, $t9, 0x6290 ## $t9 = 80116290 +/* 021C8 80AB2F58 27396290 */ addiu $t9, %lo(D_80116280+0x10) /* 021CC 80AB2F5C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 021D0 80AB2F60 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 021D4 80AB2F64 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s index b5e0e09a2e..f74838b792 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s @@ -35,9 +35,9 @@ glabel func_80AB2FE4 /* 022B0 80AB3040 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 022B4 80AB3044 00076100 */ sll $t4, $a3, 4 /* 022B8 80AB3048 000C6F02 */ srl $t5, $t4, 28 -/* 022BC 80AB304C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 022BC 80AB304C 3C0F8016 */ lui $t7, %hi(gSegments) /* 022C0 80AB3050 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 022C4 80AB3054 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 +/* 022C4 80AB3054 25EF6FA8 */ addiu $t7, %lo(gSegments) /* 022C8 80AB3058 000D7080 */ sll $t6, $t5, 2 /* 022CC 80AB305C 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 022D0 80AB3060 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 @@ -64,7 +64,7 @@ glabel func_80AB2FE4 /* 02324 80AB30B4 01A67021 */ addu $t6, $t5, $a2 /* 02328 80AB30B8 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 0232C 80AB30BC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02330 80AB30C0 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 +/* 02330 80AB30C0 3C0B8011 */ lui $t3, %hi(D_80116280+0x10) /* 02334 80AB30C4 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 02338 80AB30C8 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0233C 80AB30CC AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 @@ -72,7 +72,7 @@ glabel func_80AB2FE4 /* 02344 80AB30D4 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 02348 80AB30D8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 0234C 80AB30DC 354A0030 */ ori $t2, $t2, 0x0030 ## $t2 = DB060030 -/* 02350 80AB30E0 256B6290 */ addiu $t3, $t3, 0x6290 ## $t3 = 80116290 +/* 02350 80AB30E0 256B6290 */ addiu $t3, %lo(D_80116280+0x10) /* 02354 80AB30E4 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 02358 80AB30E8 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 /* 0235C 80AB30EC AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB319C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB319C.s index e1245356bb..1de2b717dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB319C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB319C.s @@ -2,13 +2,13 @@ glabel func_80AB319C /* 0240C 80AB319C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 02410 80AB31A0 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 /* 02414 80AB31A4 C4840280 */ lwc1 $f4, 0x0280($a0) ## 00000280 -/* 02418 80AB31A8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 02418 80AB31A8 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 0241C 80AB31AC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 02420 80AB31B0 46062200 */ add.s $f8, $f4, $f6 /* 02424 80AB31B4 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 02428 80AB31B8 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF /* 0242C 80AB31BC E4880280 */ swc1 $f8, 0x0280($a0) ## 00000280 -/* 02430 80AB31C0 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 02430 80AB31C0 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 02434 80AB31C4 C4840280 */ lwc1 $f4, 0x0280($a0) ## 00000280 /* 02438 80AB31C8 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 /* 0243C 80AB31CC 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3260.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3260.s index 3f397fa320..ad3737215c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3260.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3260.s @@ -1,6 +1,6 @@ glabel func_80AB3260 -/* 024D0 80AB3260 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 024D4 80AB3264 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 024D0 80AB3260 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 024D4 80AB3264 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 024D8 80AB3268 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 024DC 80AB326C 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 024E0 80AB3270 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB34A8.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB34A8.s index 0113204f81..a0ecc1a310 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB34A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB34A8.s @@ -1,6 +1,6 @@ glabel func_80AB34A8 -/* 02718 80AB34A8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0271C 80AB34AC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 02718 80AB34A8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0271C 80AB34AC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 02720 80AB34B0 944E0EE6 */ lhu $t6, 0x0EE6($v0) ## 8015F546 /* 02724 80AB34B4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 02728 80AB34B8 AFB00020 */ sw $s0, 0x0020($sp) @@ -14,8 +14,8 @@ glabel func_80AB34A8 /* 02748 80AB34D8 00000000 */ nop /* 0274C 80AB34DC 0C2AC36B */ jal func_80AB0DAC /* 02750 80AB34E0 00000000 */ nop -/* 02754 80AB34E4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 02758 80AB34E8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 02754 80AB34E4 3C028016 */ lui $v0, %hi(gSaveContext) +/* 02758 80AB34E8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0275C 80AB34EC 94590EE6 */ lhu $t9, 0x0EE6($v0) ## 8015F546 /* 02760 80AB34F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02764 80AB34F4 24A54BB4 */ addiu $a1, $a1, 0x4BB4 ## $a1 = 06004BB4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB359C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB359C.s index 62a2e98697..3b86d4d740 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB359C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB359C.s @@ -3,11 +3,11 @@ glabel func_80AB359C /* 02810 80AB35A0 AFBF0024 */ sw $ra, 0x0024($sp) /* 02814 80AB35A4 AFB00020 */ sw $s0, 0x0020($sp) /* 02818 80AB35A8 948E02FE */ lhu $t6, 0x02FE($a0) ## 000002FE -/* 0281C 80AB35AC 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0281C 80AB35AC 3C188016 */ lui $t8, %hi(gGameInfo) /* 02820 80AB35B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02824 80AB35B4 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 /* 02828 80AB35B8 A48F02FE */ sh $t7, 0x02FE($a0) ## 000002FE -/* 0282C 80AB35BC 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 0282C 80AB35BC 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 02830 80AB35C0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02834 80AB35C4 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 /* 02838 80AB35C8 87191476 */ lh $t9, 0x1476($t8) ## 80161476 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB36DC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB36DC.s index a8a46db772..261067b65d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB36DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB36DC.s @@ -1,7 +1,7 @@ glabel func_80AB36DC /* 0294C 80AB36DC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02950 80AB36E0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 02954 80AB36E4 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 02950 80AB36E0 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 02954 80AB36E4 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 02958 80AB36E8 AFBF0024 */ sw $ra, 0x0024($sp) /* 0295C 80AB36EC AFB00020 */ sw $s0, 0x0020($sp) /* 02960 80AB36F0 AFA5002C */ sw $a1, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3838.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3838.s index ea717efe0e..ac0017b101 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3838.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3838.s @@ -11,11 +11,11 @@ glabel func_80AB3838 /* 02ACC 80AB385C AC8E0278 */ sw $t6, 0x0278($a0) ## 00000278 .L80AB3860: /* 02AD0 80AB3860 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 02AD4 80AB3864 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 02AD4 80AB3864 3C198016 */ lui $t9, %hi(gSaveContext+0xf24) /* 02AD8 80AB3868 2409601D */ addiu $t1, $zero, 0x601D ## $t1 = 0000601D /* 02ADC 80AB386C 35F80009 */ ori $t8, $t7, 0x0009 ## $t8 = 00000009 /* 02AE0 80AB3870 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 02AE4 80AB3874 9739F584 */ lhu $t9, -0x0A7C($t9) ## 8015F584 +/* 02AE4 80AB3874 9739F584 */ lhu $t9, %lo(gSaveContext+0xf24)($t9) /* 02AE8 80AB3878 240A6024 */ addiu $t2, $zero, 0x6024 ## $t2 = 00006024 /* 02AEC 80AB387C 33281000 */ andi $t0, $t9, 0x1000 ## $t0 = 00000000 /* 02AF0 80AB3880 55000004 */ bnel $t0, $zero, .L80AB3894 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB38AC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB38AC.s index cba5cf0800..377c81331a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB38AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB38AC.s @@ -9,8 +9,8 @@ glabel func_80AB38AC /* 02B38 80AB38C8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 02B3C 80AB38CC 0C2AC528 */ jal func_80AB14A0 /* 02B40 80AB38D0 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02B44 80AB38D4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 02B48 80AB38D8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 02B44 80AB38D4 3C028016 */ lui $v0, %hi(gSaveContext) +/* 02B48 80AB38D8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 02B4C 80AB38DC 944E0EE6 */ lhu $t6, 0x0EE6($v0) ## 8015F546 /* 02B50 80AB38E0 8FA40020 */ lw $a0, 0x0020($sp) /* 02B54 80AB38E4 2401FFF6 */ addiu $at, $zero, 0xFFF6 ## $at = FFFFFFF6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3914.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3914.s index b17b6ee8c3..28faafd012 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3914.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3914.s @@ -26,8 +26,8 @@ glabel func_80AB3914 .L80AB3974: /* 02BE4 80AB3974 24016027 */ addiu $at, $zero, 0x6027 ## $at = 00006027 /* 02BE8 80AB3978 14410005 */ bne $v0, $at, .L80AB3990 -/* 02BEC 80AB397C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 02BF0 80AB3980 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 02BEC 80AB397C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 02BF0 80AB3980 2442E660 */ addiu $v0, %lo(gSaveContext) /* 02BF4 80AB3984 944F0F24 */ lhu $t7, 0x0F24($v0) ## 8015F584 /* 02BF8 80AB3988 35F81000 */ ori $t8, $t7, 0x1000 ## $t8 = 00001000 /* 02BFC 80AB398C A4580F24 */ sh $t8, 0x0F24($v0) ## 8015F584 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3A7C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3A7C.s index 390fdddba0..55efa37344 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3A7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3A7C.s @@ -1,6 +1,6 @@ glabel func_80AB3A7C -/* 02CEC 80AB3A7C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 02CF0 80AB3A80 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 02CEC 80AB3A7C 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 02CF0 80AB3A80 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 02CF4 80AB3A84 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 02CF8 80AB3A88 AFBF001C */ sw $ra, 0x001C($sp) /* 02CFC 80AB3A8C AFA50024 */ sw $a1, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s index e3c41bc2be..0b87bbae5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s @@ -35,9 +35,9 @@ glabel func_80AB410C /* 033D8 80AB4168 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 033DC 80AB416C 00076100 */ sll $t4, $a3, 4 /* 033E0 80AB4170 000C6F02 */ srl $t5, $t4, 28 -/* 033E4 80AB4174 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 033E4 80AB4174 3C0F8016 */ lui $t7, %hi(gSegments) /* 033E8 80AB4178 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 033EC 80AB417C 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 +/* 033EC 80AB417C 25EF6FA8 */ addiu $t7, %lo(gSegments) /* 033F0 80AB4180 000D7080 */ sll $t6, $t5, 2 /* 033F4 80AB4184 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 033F8 80AB4188 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 @@ -64,7 +64,7 @@ glabel func_80AB410C /* 0344C 80AB41DC 01A67021 */ addu $t6, $t5, $a2 /* 03450 80AB41E0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 03454 80AB41E4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 03458 80AB41E8 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 +/* 03458 80AB41E8 3C0B8011 */ lui $t3, %hi(D_80116280+0x10) /* 0345C 80AB41EC 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 03460 80AB41F0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 03464 80AB41F4 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 @@ -72,7 +72,7 @@ glabel func_80AB410C /* 0346C 80AB41FC AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 03470 80AB4200 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 03474 80AB4204 354A0030 */ ori $t2, $t2, 0x0030 ## $t2 = DB060030 -/* 03478 80AB4208 256B6290 */ addiu $t3, $t3, 0x6290 ## $t3 = 80116290 +/* 03478 80AB4208 256B6290 */ addiu $t3, %lo(D_80116280+0x10) /* 0347C 80AB420C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 03480 80AB4210 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 /* 03484 80AB4214 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s index 044efb347a..527d242e5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s @@ -62,8 +62,8 @@ glabel EnNiw_Init /* 000CC 80AB584C 24A586DC */ addiu $a1, $a1, %lo(D_80AB86DC) ## $a1 = FFFF86DC /* 000D0 80AB5850 8E4A0004 */ lw $t2, 0x0004($s2) ## 00000004 -/* 000D4 80AB5854 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 000D8 80AB5858 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 000D4 80AB5854 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 000D8 80AB5858 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 000DC 80AB585C 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 /* 000E0 80AB5860 AE4B0004 */ sw $t3, 0x0004($s2) ## 00000004 /* 000E4 80AB5864 264400B4 */ addiu $a0, $s2, 0x00B4 ## $a0 = 000000B4 @@ -121,8 +121,8 @@ glabel EnNiw_Init /* 001AC 80AB592C 0C00084C */ jal osSyncPrintf /* 001B0 80AB5930 AFA2003C */ sw $v0, 0x003C($sp) -/* 001B4 80AB5934 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 001B8 80AB5938 954AF58A */ lhu $t2, -0x0A76($t2) ## 8015F58A +/* 001B4 80AB5934 3C0A8016 */ lui $t2, %hi(gSaveContext+0xf2a) +/* 001B8 80AB5938 954AF58A */ lhu $t2, %lo(gSaveContext+0xf2a)($t2) /* 001BC 80AB593C 86290000 */ lh $t1, 0x0000($s1) ## 00000000 /* 001C0 80AB5940 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 001C4 80AB5944 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 @@ -151,8 +151,8 @@ glabel EnNiw_Init /* 00214 80AB5994 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy /* 00218 80AB5998 264402AC */ addiu $a0, $s2, 0x02AC ## $a0 = 000002AC -/* 0021C 80AB599C 3C118016 */ lui $s1, 0x8016 ## $s1 = 80160000 -/* 00220 80AB59A0 2631E660 */ addiu $s1, $s1, 0xE660 ## $s1 = 8015E660 +/* 0021C 80AB599C 3C118016 */ lui $s1, %hi(gSaveContext) +/* 00220 80AB59A0 2631E660 */ addiu $s1, %lo(gSaveContext) /* 00224 80AB59A4 264402B8 */ addiu $a0, $s2, 0x02B8 ## $a0 = 000002B8 /* 00228 80AB59A8 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6A38.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6A38.s index 358d3cb921..9229b50f44 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6A38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6A38.s @@ -38,7 +38,7 @@ glabel func_80AB6A38 /* 01344 80AB6AC4 030FC021 */ addu $t8, $t8, $t7 /* 01348 80AB6AC8 8F181E08 */ lw $t8, 0x1E08($t8) ## 00011E08 /* 0134C 80AB6ACC 0006C8C0 */ sll $t9, $a2, 3 -/* 01350 80AB6AD0 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 01350 80AB6AD0 3C0B8016 */ lui $t3, %hi(gSegments) /* 01354 80AB6AD4 03192821 */ addu $a1, $t8, $t9 /* 01358 80AB6AD8 8CA30004 */ lw $v1, 0x0004($a1) ## 00000004 /* 0135C 80AB6ADC 848D02EA */ lh $t5, 0x02EA($a0) ## 000002EA @@ -47,7 +47,7 @@ glabel func_80AB6A38 /* 01368 80AB6AE8 00084F02 */ srl $t1, $t0, 28 /* 0136C 80AB6AEC 00095080 */ sll $t2, $t1, 2 /* 01370 80AB6AF0 016A5821 */ addu $t3, $t3, $t2 -/* 01374 80AB6AF4 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 +/* 01374 80AB6AF4 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) /* 01378 80AB6AF8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0137C 80AB6AFC 00616024 */ and $t4, $v1, $at /* 01380 80AB6B00 000D7080 */ sll $t6, $t5, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s index da1a0c014a..443f56016d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s @@ -38,7 +38,7 @@ glabel EnNiwGirl_Draw /* 00930 80AB98B0 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 /* 00934 80AB98B4 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 00938 80AB98B8 3C0480AC */ lui $a0, %hi(D_80AB99D8) ## $a0 = 80AC0000 -/* 0093C 80AB98BC 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0093C 80AB98BC 3C188016 */ lui $t8, %hi(gSegments) /* 00940 80AB98C0 24680008 */ addiu $t0, $v1, 0x0008 ## $t0 = 00000008 /* 00944 80AB98C4 ACA802C0 */ sw $t0, 0x02C0($a1) ## 000002C0 /* 00948 80AB98C8 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 @@ -54,7 +54,7 @@ glabel EnNiwGirl_Draw /* 00970 80AB98F0 000D7702 */ srl $t6, $t5, 28 /* 00974 80AB98F4 000E7880 */ sll $t7, $t6, 2 /* 00978 80AB98F8 030FC021 */ addu $t8, $t8, $t7 -/* 0097C 80AB98FC 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 0097C 80AB98FC 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 00980 80AB9900 00816024 */ and $t4, $a0, $at /* 00984 80AB9904 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00988 80AB9908 0198C821 */ addu $t9, $t4, $t8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Update.s index 92527d9c08..acde0c5e25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Update.s @@ -45,7 +45,7 @@ glabel EnNiwGirl_Update /* 006E0 80AB9660 17280024 */ bne $t9, $t0, .L80AB96F4 /* 006E4 80AB9664 26040268 */ addiu $a0, $s0, 0x0268 ## $a0 = 00000268 /* 006E8 80AB9668 8FA2002C */ lw $v0, 0x002C($sp) -/* 006EC 80AB966C 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 006EC 80AB966C 3C0B8016 */ lui $t3, %hi(gSaveContext+4) /* 006F0 80AB9670 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 006F4 80AB9674 8C4A0024 */ lw $t2, 0x0024($v0) ## 00000024 /* 006F8 80AB9678 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -56,7 +56,7 @@ glabel EnNiwGirl_Update /* 0070C 80AB968C AE0902F0 */ sw $t1, 0x02F0($s0) ## 000002F0 /* 00710 80AB9690 8C4A002C */ lw $t2, 0x002C($v0) ## 0000002C /* 00714 80AB9694 AE0A02F4 */ sw $t2, 0x02F4($s0) ## 000002F4 -/* 00718 80AB9698 8D6BE664 */ lw $t3, -0x199C($t3) ## 8015E664 +/* 00718 80AB9698 8D6BE664 */ lw $t3, %lo(gSaveContext+4)($t3) /* 0071C 80AB969C 11600006 */ beq $t3, $zero, .L80AB96B8 /* 00720 80AB96A0 00000000 */ nop /* 00724 80AB96A4 C4460028 */ lwc1 $f6, 0x0028($v0) ## 00000028 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB93C0.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB93C0.s index 48a5a730b5..23691c1055 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB93C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB93C0.s @@ -40,8 +40,8 @@ glabel func_80AB93C0 /* 0049C 80AB941C A618010E */ sh $t8, 0x010E($s0) ## 0000010E /* 004A0 80AB9420 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 004A4 80AB9424 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 004A8 80AB9428 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 004AC 80AB942C 9739F544 */ lhu $t9, -0x0ABC($t9) ## 8015F544 +/* 004A8 80AB9428 3C198016 */ lui $t9, %hi(gSaveContext+0xee4) +/* 004AC 80AB942C 9739F544 */ lhu $t9, %lo(gSaveContext+0xee4)($t9) /* 004B0 80AB9430 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 /* 004B4 80AB9434 11000006 */ beq $t0, $zero, .L80AB9450 /* 004B8 80AB9438 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Init.s index ea36fcbb28..5f3f7e0535 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Init.s @@ -45,7 +45,7 @@ glabel EnNiwLady_Init /* 00070 80AB9CB0 24010037 */ addiu $at, $zero, 0x0037 ## $at = 00000037 /* 00074 80AB9CB4 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 00078 80AB9CB8 871900A4 */ lh $t9, 0x00A4($t8) ## 000000A4 -/* 0007C 80AB9CBC 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 0007C 80AB9CBC 3C098016 */ lui $t1, %hi(gSaveContext+0x10) /* 00080 80AB9CC0 3C0480AC */ lui $a0, %hi(D_80ABB420) ## $a0 = 80AC0000 /* 00084 80AB9CC4 57210003 */ bnel $t9, $at, .L80AB9CD4 /* 00088 80AB9CC8 86050278 */ lh $a1, 0x0278($s0) ## 00000278 @@ -54,7 +54,7 @@ glabel EnNiwLady_Init .L80AB9CD4: /* 00094 80AB9CD4 10A00008 */ beq $a1, $zero, .L80AB9CF8 /* 00098 80AB9CD8 00000000 */ nop -/* 0009C 80AB9CDC 8D29E670 */ lw $t1, -0x1990($t1) ## 8015E670 +/* 0009C 80AB9CDC 8D29E670 */ lw $t1, %lo(gSaveContext+0x10)($t1) /* 000A0 80AB9CE0 15200005 */ bne $t1, $zero, .L80AB9CF8 /* 000A4 80AB9CE4 00000000 */ nop /* 000A8 80AB9CE8 0C00B55C */ jal Actor_Kill diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Update.s index 4f577e8d76..f9b7c38bad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Update.s @@ -10,7 +10,7 @@ glabel EnNiwLady_Update /* 01220 80ABAE60 AFA2002C */ sw $v0, 0x002C($sp) /* 01224 80ABAE64 8FA2002C */ lw $v0, 0x002C($sp) -/* 01228 80ABAE68 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 01228 80ABAE68 3C198016 */ lui $t9, %hi(gSaveContext+4) /* 0122C 80ABAE6C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01230 80ABAE70 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 /* 01234 80ABAE74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -21,7 +21,7 @@ glabel EnNiwLady_Update /* 01248 80ABAE88 AE0F02A4 */ sw $t7, 0x02A4($s0) ## 000002A4 /* 0124C 80ABAE8C 8C58002C */ lw $t8, 0x002C($v0) ## 0000002C /* 01250 80ABAE90 AE1802A8 */ sw $t8, 0x02A8($s0) ## 000002A8 -/* 01254 80ABAE94 8F39E664 */ lw $t9, -0x199C($t9) ## 8015E664 +/* 01254 80ABAE94 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) /* 01258 80ABAE98 13200006 */ beq $t9, $zero, .L80ABAEB4 /* 0125C 80ABAE9C 00000000 */ nop /* 01260 80ABAEA0 C4440028 */ lwc1 $f4, 0x0028($v0) ## 00000028 @@ -65,8 +65,8 @@ glabel EnNiwLady_Update /* 012EC 80ABAF2C 8F3917B4 */ lw $t9, 0x17B4($t9) ## 000117B4 /* 012F0 80ABAF30 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 012F4 80ABAF34 03214021 */ addu $t0, $t9, $at -/* 012F8 80ABAF38 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 012FC 80ABAF3C AC286FC0 */ sw $t0, 0x6FC0($at) ## 80166FC0 +/* 012F8 80ABAF38 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 012FC 80ABAF3C AC286FC0 */ sw $t0, %lo(gSegments+0x18)($at) /* 01300 80ABAF40 82090281 */ lb $t1, 0x0281($s0) ## 00000281 /* 01304 80ABAF44 05220052 */ bltzl $t1, .L80ABB090 /* 01308 80ABAF48 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s index 7d3c499a9f..6c31abd66f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s @@ -30,11 +30,11 @@ glabel func_80AB9F24 /* 0034C 80AB9F8C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00350 80AB9F90 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00354 80AB9F94 03214021 */ addu $t0, $t9, $at -/* 00358 80AB9F98 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00358 80AB9F98 3C018016 */ lui $at, %hi(gSegments+0x18) /* 0035C 80AB9F9C 26090190 */ addiu $t1, $s0, 0x0190 ## $t1 = 00000190 /* 00360 80AB9FA0 260A01F0 */ addiu $t2, $s0, 0x01F0 ## $t2 = 000001F0 /* 00364 80AB9FA4 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 -/* 00368 80AB9FA8 AC286FC0 */ sw $t0, 0x6FC0($at) ## 80166FC0 +/* 00368 80AB9FA8 AC286FC0 */ sw $t0, %lo(gSegments+0x18)($at) /* 0036C 80AB9FAC AFAB0018 */ sw $t3, 0x0018($sp) /* 00370 80AB9FB0 AFAA0014 */ sw $t2, 0x0014($sp) /* 00374 80AB9FB4 AFA90010 */ sw $t1, 0x0010($sp) @@ -54,8 +54,8 @@ glabel func_80AB9F24 /* 003AC 80AB9FEC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 003B0 80AB9FF0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 003B4 80AB9FF4 0301C821 */ addu $t9, $t8, $at -/* 003B8 80AB9FF8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 003BC 80AB9FFC AC396FC0 */ sw $t9, 0x6FC0($at) ## 80166FC0 +/* 003B8 80AB9FF8 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 003BC 80AB9FFC AC396FC0 */ sw $t9, %lo(gSegments+0x18)($at) /* 003C0 80ABA000 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 003C4 80ABA004 44812000 */ mtc1 $at, $f4 ## $f4 = -3.00 /* 003C8 80ABA008 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 @@ -65,8 +65,8 @@ glabel func_80AB9F24 /* 003D8 80ABA018 0C00B58B */ jal Actor_SetScale /* 003DC 80ABA01C E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 003E0 80ABA020 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 003E4 80ABA024 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 003E0 80ABA020 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 003E4 80ABA024 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 003E8 80ABA028 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 003EC 80ABA02C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 003F0 80ABA030 0C00AC78 */ jal ActorShape_Init @@ -98,8 +98,8 @@ glabel func_80AB9F24 /* 0044C 80ABA08C 1000005F */ beq $zero, $zero, .L80ABA20C /* 00450 80ABA090 8FBF002C */ lw $ra, 0x002C($sp) .L80ABA094: -/* 00454 80ABA094 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00458 80ABA098 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00454 80ABA094 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00458 80ABA098 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0045C 80ABA09C 944B0EF0 */ lhu $t3, 0x0EF0($v0) ## 8015F550 /* 00460 80ABA0A0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00464 80ABA0A4 316D1000 */ andi $t5, $t3, 0x1000 ## $t5 = 00000000 @@ -161,8 +161,8 @@ glabel func_80AB9F24 /* 00534 80ABA174 E7B00010 */ swc1 $f16, 0x0010($sp) .L80ABA178: -/* 00538 80ABA178 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 0053C 80ABA17C 8DADE664 */ lw $t5, -0x199C($t5) ## 8015E664 +/* 00538 80ABA178 3C0D8016 */ lui $t5, %hi(gSaveContext+4) +/* 0053C 80ABA17C 8DADE664 */ lw $t5, %lo(gSaveContext+4)($t5) /* 00540 80ABA180 3C0E80AC */ lui $t6, %hi(func_80ABA21C) ## $t6 = 80AC0000 /* 00544 80ABA184 3C0C80AC */ lui $t4, %hi(func_80ABA778) ## $t4 = 80AC0000 /* 00548 80ABA188 15A00004 */ bne $t5, $zero, .L80ABA19C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s index 158f2a65ff..2d530a1e76 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s @@ -65,10 +65,10 @@ glabel func_80ABA244 /* 00628 80ABA268 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 0062C 80ABA26C 8DD01C64 */ lw $s0, 0x1C64($t6) ## 00001C64 /* 00630 80ABA270 12000044 */ beq $s0, $zero, .L80ABA384 -/* 00634 80ABA274 3C138016 */ lui $s3, 0x8016 ## $s3 = 80160000 +/* 00634 80ABA274 3C138016 */ lui $s3, %hi(gSaveContext) /* 00638 80ABA278 3C1180AC */ lui $s1, %hi(D_80ABB3B4) ## $s1 = 80AC0000 /* 0063C 80ABA27C 2631B3B4 */ addiu $s1, $s1, %lo(D_80ABB3B4) ## $s1 = 80ABB3B4 -/* 00640 80ABA280 2673E660 */ addiu $s3, $s3, 0xE660 ## $s3 = 8015E660 +/* 00640 80ABA280 2673E660 */ addiu $s3, %lo(gSaveContext) /* 00644 80ABA284 860F0000 */ lh $t7, 0x0000($s0) ## 00000000 .L80ABA288: /* 00648 80ABA288 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 @@ -100,13 +100,13 @@ glabel func_80ABA244 /* 006B0 80ABA2F0 86480268 */ lh $t0, 0x0268($s2) ## 00000268 /* 006B4 80ABA2F4 861902AA */ lh $t9, 0x02AA($s0) ## 000002AA /* 006B8 80ABA2F8 96780F2A */ lhu $t8, 0x0F2A($s3) ## 8015F58A -/* 006BC 80ABA2FC 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 006BC 80ABA2FC 3C0C8016 */ lui $t4, %hi(gGameInfo) /* 006C0 80ABA300 00194040 */ sll $t0, $t9, 1 /* 006C4 80ABA304 02284821 */ addu $t1, $s1, $t0 /* 006C8 80ABA308 852A0000 */ lh $t2, 0x0000($t1) ## 00000000 /* 006CC 80ABA30C 030A5825 */ or $t3, $t8, $t2 ## $t3 = 00000000 /* 006D0 80ABA310 A66B0F2A */ sh $t3, 0x0F2A($s3) ## 8015F58A -/* 006D4 80ABA314 8D8CFA90 */ lw $t4, -0x0570($t4) ## 8015FA90 +/* 006D4 80ABA314 8D8CFA90 */ lw $t4, %lo(gGameInfo)($t4) /* 006D8 80ABA318 858D12D6 */ lh $t5, 0x12D6($t4) ## 801612D6 /* 006DC 80ABA31C 51A00009 */ beql $t5, $zero, .L80ABA344 /* 006E0 80ABA320 86480268 */ lh $t0, 0x0268($s2) ## 00000268 @@ -140,10 +140,10 @@ glabel func_80ABA244 /* 0073C 80ABA37C 5600FFC2 */ bnel $s0, $zero, .L80ABA288 /* 00740 80ABA380 860F0000 */ lh $t7, 0x0000($s0) ## 00000000 .L80ABA384: -/* 00744 80ABA384 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 00748 80ABA388 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 -/* 0074C 80ABA38C 3C138016 */ lui $s3, 0x8016 ## $s3 = 80160000 -/* 00750 80ABA390 2673E660 */ addiu $s3, $s3, 0xE660 ## $s3 = 8015E660 +/* 00744 80ABA384 3C198016 */ lui $t9, %hi(gGameInfo) +/* 00748 80ABA388 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) +/* 0074C 80ABA38C 3C138016 */ lui $s3, %hi(gSaveContext) +/* 00750 80ABA390 2673E660 */ addiu $s3, %lo(gSaveContext) /* 00754 80ABA394 872212E2 */ lh $v0, 0x12E2($t9) ## 801612E2 /* 00758 80ABA398 10400002 */ beq $v0, $zero, .L80ABA3A4 /* 0075C 80ABA39C 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA654.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA654.s index 5ede0706dc..60af56cd10 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA654.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA654.s @@ -46,8 +46,8 @@ glabel func_80ABA654 /* 00A80 80ABA6C0 2484B678 */ addiu $a0, $a0, %lo(D_80ABB678) ## $a0 = 80ABB678 /* 00A84 80ABA6C4 240F000B */ addiu $t7, $zero, 0x000B ## $t7 = 0000000B /* 00A88 80ABA6C8 A60F026E */ sh $t7, 0x026E($s0) ## 0000026E -/* 00A8C 80ABA6CC 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 00A90 80ABA6D0 9718F550 */ lhu $t8, -0x0AB0($t8) ## 8015F550 +/* 00A8C 80ABA6CC 3C188016 */ lui $t8, %hi(gSaveContext+0xef0) +/* 00A90 80ABA6D0 9718F550 */ lhu $t8, %lo(gSaveContext+0xef0)($t8) /* 00A94 80ABA6D4 2408000F */ addiu $t0, $zero, 0x000F ## $t0 = 0000000F /* 00A98 80ABA6D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A9C 80ABA6DC 33191000 */ andi $t9, $t8, 0x1000 ## $t9 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA778.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA778.s index f250ed2c24..f70b9ff59e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA778.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA778.s @@ -16,9 +16,9 @@ glabel func_80ABA778 /* 00B58 80ABA798 AFA50018 */ sw $a1, 0x0018($sp) /* 00B5C 80ABA79C 8FA50018 */ lw $a1, 0x0018($sp) -/* 00B60 80ABA7A0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00B60 80ABA7A0 3C028016 */ lui $v0, %hi(gSaveContext) /* 00B64 80ABA7A4 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 00B68 80ABA7A8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00B68 80ABA7A8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00B6C 80ABA7AC A4AE0262 */ sh $t6, 0x0262($a1) ## 00000262 /* 00B70 80ABA7B0 A0A00273 */ sb $zero, 0x0273($a1) ## 00000273 /* 00B74 80ABA7B4 944F0EF4 */ lhu $t7, 0x0EF4($v0) ## 8015F554 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA878.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA878.s index 7ff1d2a09b..65608ba9d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA878.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA878.s @@ -28,8 +28,8 @@ glabel func_80ABA878 /* 00C98 80ABA8D8 8FA40034 */ lw $a0, 0x0034($sp) /* 00C9C 80ABA8DC 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 00CA0 80ABA8E0 14410014 */ bne $v0, $at, .L80ABA934 -/* 00CA4 80ABA8E4 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 00CA8 80ABA8E8 9718F540 */ lhu $t8, -0x0AC0($t8) ## 8015F540 +/* 00CA4 80ABA8E4 3C188016 */ lui $t8, %hi(gSaveContext+0xee0) +/* 00CA8 80ABA8E8 9718F540 */ lhu $t8, %lo(gSaveContext+0xee0)($t8) /* 00CAC 80ABA8EC 33190400 */ andi $t9, $t8, 0x0400 ## $t9 = 00000000 /* 00CB0 80ABA8F0 13200010 */ beq $t9, $zero, .L80ABA934 /* 00CB4 80ABA8F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC00.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC00.s index a84f360dce..4f40eae18d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC00.s @@ -11,8 +11,8 @@ glabel func_80ABAC00 /* 00FE4 80ABAC24 10000013 */ beq $zero, $zero, .L80ABAC74 /* 00FE8 80ABAC28 AC8E0250 */ sw $t6, 0x0250($a0) ## 00000250 .L80ABAC2C: -/* 00FEC 80ABAC2C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00FF0 80ABAC30 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00FEC 80ABAC2C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00FF0 80ABAC30 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00FF4 80ABAC34 8C4F0004 */ lw $t7, 0x0004($v0) ## 8015E664 /* 00FF8 80ABAC38 8C860284 */ lw $a2, 0x0284($a0) ## 00000284 /* 00FFC 80ABAC3C 8FA50024 */ lw $a1, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC84.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC84.s index f3aab3485c..7b597aef9d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC84.s @@ -21,8 +21,8 @@ glabel func_80ABAC84 /* 01078 80ABACB8 0C00084C */ jal osSyncPrintf /* 0107C 80ABACBC 2484B6B8 */ addiu $a0, $a0, %lo(D_80ABB6B8) ## $a0 = 80ABB6B8 -/* 01080 80ABACC0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01084 80ABACC4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01080 80ABACC0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01084 80ABACC4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01088 80ABACC8 8C4E0004 */ lw $t6, 0x0004($v0) ## 8015E664 /* 0108C 80ABACCC 8FA30018 */ lw $v1, 0x0018($sp) /* 01090 80ABACD0 3C0880AC */ lui $t0, %hi(func_80ABA778) ## $t0 = 80AC0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s index 06a924f0ae..a9f1146d5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s @@ -41,7 +41,7 @@ glabel func_80ABB228 /* 0165C 80ABB29C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 01660 80ABB2A0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01664 80ABB2A4 3C0480AC */ lui $a0, %hi(D_80ABB408) ## $a0 = 80AC0000 -/* 01668 80ABB2A8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 01668 80ABB2A8 3C198016 */ lui $t9, %hi(gSegments) /* 0166C 80ABB2AC 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 01670 80ABB2B0 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 /* 01674 80ABB2B4 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 @@ -57,7 +57,7 @@ glabel func_80ABB228 /* 0169C 80ABB2DC 000E7F02 */ srl $t7, $t6, 28 /* 016A0 80ABB2E0 000FC080 */ sll $t8, $t7, 2 /* 016A4 80ABB2E4 0338C821 */ addu $t9, $t9, $t8 -/* 016A8 80ABB2E8 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 016A8 80ABB2E8 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 016AC 80ABB2EC 00816824 */ and $t5, $a0, $at /* 016B0 80ABB2F0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 016B4 80ABB2F4 01B94821 */ addu $t1, $t5, $t9 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Init.s index 6eb76b104d..f556b0e576 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Init.s @@ -43,8 +43,8 @@ glabel EnNy_Init /* 00058 80ABCC08 8FA40034 */ lw $a0, 0x0034($sp) /* 0005C 80ABCC0C 0C017014 */ jal func_8005C050 /* 00060 80ABCC10 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00064 80ABCC14 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00068 80ABCC18 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00064 80ABCC14 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00068 80ABCC18 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0006C 80ABCC1C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00070 80ABCC20 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00074 80ABCC24 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Init.s index bc2133e147..5251b04c16 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Init.s @@ -167,8 +167,8 @@ glabel L80ABEEB8 /* 001A0 80ABEEC0 10000015 */ beq $zero, $zero, .L80ABEF18 /* 001A4 80ABEEC4 AE08014C */ sw $t0, 0x014C($s0) ## 0000014C glabel L80ABEEC8 -/* 001A8 80ABEEC8 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 001AC 80ABEECC 8D29E664 */ lw $t1, -0x199C($t1) ## 8015E664 +/* 001A8 80ABEEC8 3C098016 */ lui $t1, %hi(gSaveContext+4) +/* 001AC 80ABEECC 8D29E664 */ lw $t1, %lo(gSaveContext+4)($t1) /* 001B0 80ABEED0 15200005 */ bne $t1, $zero, .L80ABEEE8 /* 001B4 80ABEED4 00000000 */ nop /* 001B8 80ABEED8 0C00B55C */ jal Actor_Kill diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Update.s index 89019fd4a9..aead0f9178 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/EnOkarinaTag_Update.s @@ -6,8 +6,8 @@ glabel EnOkarinaTag_Update /* 00B98 80ABF8B8 8C99014C */ lw $t9, 0x014C($a0) ## 0000014C /* 00B9C 80ABF8BC 0320F809 */ jalr $ra, $t9 /* 00BA0 80ABF8C0 00000000 */ nop -/* 00BA4 80ABF8C4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00BA8 80ABF8C8 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 00BA4 80ABF8C4 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 00BA8 80ABF8C8 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 00BAC 80ABF8CC 8FA40048 */ lw $a0, 0x0048($sp) /* 00BB0 80ABF8D0 8FA5004C */ lw $a1, 0x004C($sp) /* 00BB4 80ABF8D4 85CF12D4 */ lh $t7, 0x12D4($t6) ## 801612D4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABEF2C.s b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABEF2C.s index 660088dc34..07a3cdde85 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABEF2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABEF2C.s @@ -31,10 +31,10 @@ glabel func_80ABEF2C .L80ABEF84: /* 00264 80ABEF84 860A0152 */ lh $t2, 0x0152($s0) ## 00000152 /* 00268 80ABEF88 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0026C 80ABEF8C 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 0026C 80ABEF8C 3C0B8016 */ lui $t3, %hi(gSaveContext+0x12c5) /* 00270 80ABEF90 55410005 */ bnel $t2, $at, .L80ABEFA8 /* 00274 80ABEF94 8D0C0680 */ lw $t4, 0x0680($t0) ## 00000680 -/* 00278 80ABEF98 916BF925 */ lbu $t3, -0x06DB($t3) ## 8015F925 +/* 00278 80ABEF98 916BF925 */ lbu $t3, %lo(gSaveContext+0x12c5)($t3) /* 0027C 80ABEF9C 51600047 */ beql $t3, $zero, .L80ABF0BC /* 00280 80ABEFA0 8FBF001C */ lw $ra, 0x001C($sp) /* 00284 80ABEFA4 8D0C0680 */ lw $t4, 0x0680($t0) ## 00000680 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF28C.s b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF28C.s index 05a21d9840..de06b68e43 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF28C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF28C.s @@ -17,8 +17,8 @@ glabel func_80ABF28C /* 00590 80ABF2B0 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 /* 00594 80ABF2B4 14790005 */ bne $v1, $t9, .L80ABF2CC /* 00598 80ABF2B8 A498015A */ sh $t8, 0x015A($a0) ## 0000015A -/* 0059C 80ABF2BC 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 005A0 80ABF2C0 9108F925 */ lbu $t0, -0x06DB($t0) ## 8015F925 +/* 0059C 80ABF2BC 3C088016 */ lui $t0, %hi(gSaveContext+0x12c5) +/* 005A0 80ABF2C0 9108F925 */ lbu $t0, %lo(gSaveContext+0x12c5)($t0) /* 005A4 80ABF2C4 5100007D */ beql $t0, $zero, .L80ABF4BC /* 005A8 80ABF2C8 8FBF0014 */ lw $ra, 0x0014($sp) .L80ABF2CC: @@ -43,17 +43,17 @@ glabel func_80ABF28C /* 005EC 80ABF30C 84C50150 */ lh $a1, 0x0150($a2) ## 00000150 .L80ABF310: /* 005F0 80ABF310 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -/* 005F4 80ABF314 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 005F4 80ABF314 3C0B8016 */ lui $t3, %hi(gSaveContext+0xedc) /* 005F8 80ABF318 14850005 */ bne $a0, $a1, .L80ABF330 /* 005FC 80ABF31C 00000000 */ nop -/* 00600 80ABF320 956BF53C */ lhu $t3, -0x0AC4($t3) ## 8015F53C +/* 00600 80ABF320 956BF53C */ lhu $t3, %lo(gSaveContext+0xedc)($t3) /* 00604 80ABF324 316C0800 */ andi $t4, $t3, 0x0800 ## $t4 = 00000000 /* 00608 80ABF328 55800064 */ bnel $t4, $zero, .L80ABF4BC /* 0060C 80ABF32C 8FBF0014 */ lw $ra, 0x0014($sp) .L80ABF330: /* 00610 80ABF330 14650004 */ bne $v1, $a1, .L80ABF344 -/* 00614 80ABF334 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 00618 80ABF338 95ADF536 */ lhu $t5, -0x0ACA($t5) ## 8015F536 +/* 00614 80ABF334 3C0D8016 */ lui $t5, %hi(gSaveContext+0xed6) +/* 00618 80ABF338 95ADF536 */ lhu $t5, %lo(gSaveContext+0xed6)($t5) /* 0061C 80ABF33C 31AE2000 */ andi $t6, $t5, 0x2000 ## $t6 = 00000000 /* 00620 80ABF340 15C0005D */ bne $t6, $zero, .L80ABF4B8 .L80ABF344: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF4C8.s b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF4C8.s index 8abe671eca..e989f1e4eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF4C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF4C8.s @@ -40,21 +40,21 @@ glabel func_80ABF4C8 /* 00820 80ABF540 1041000B */ beq $v0, $at, .L80ABF570 /* 00824 80ABF544 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 00828 80ABF548 10410012 */ beq $v0, $at, .L80ABF594 -/* 0082C 80ABF54C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 0082C 80ABF54C 3C038016 */ lui $v1, %hi(gSaveContext) /* 00830 80ABF550 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 00834 80ABF554 1041001B */ beq $v0, $at, .L80ABF5C4 -/* 00838 80ABF558 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00838 80ABF558 3C038016 */ lui $v1, %hi(gSaveContext) /* 0083C 80ABF55C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 00840 80ABF560 1041001F */ beq $v0, $at, .L80ABF5E0 -/* 00844 80ABF564 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00844 80ABF564 3C038016 */ lui $v1, %hi(gSaveContext) /* 00848 80ABF568 10000048 */ beq $zero, $zero, .L80ABF68C /* 0084C 80ABF56C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 .L80ABF570: /* 00850 80ABF570 0C00B2DD */ jal Flags_SetSwitch /* 00854 80ABF574 84C50154 */ lh $a1, 0x0154($a2) ## 00000154 -/* 00858 80ABF578 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0085C 80ABF57C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00858 80ABF578 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0085C 80ABF57C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00860 80ABF580 946F0EDA */ lhu $t7, 0x0EDA($v1) ## 8015F53A /* 00864 80ABF584 8FA60020 */ lw $a2, 0x0020($sp) /* 00868 80ABF588 35F80200 */ ori $t8, $t7, 0x0200 ## $t8 = 00000200 @@ -63,7 +63,7 @@ glabel func_80ABF4C8 .L80ABF594: /* 00874 80ABF594 3C1980AC */ lui $t9, %hi(D_80ABF9D0) ## $t9 = 80AC0000 /* 00878 80ABF598 2739F9D0 */ addiu $t9, $t9, %lo(D_80ABF9D0) ## $t9 = 80ABF9D0 -/* 0087C 80ABF59C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015CCC0 +/* 0087C 80ABF59C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00880 80ABF5A0 AE191D68 */ sw $t9, 0x1D68($s0) ## 00001D68 /* 00884 80ABF5A4 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 00888 80ABF5A8 A0681414 */ sb $t0, 0x1414($v1) ## 8015E0D4 @@ -76,13 +76,13 @@ glabel func_80ABF4C8 .L80ABF5C4: /* 008A4 80ABF5C4 3C0980AC */ lui $t1, %hi(D_80ABFB40) ## $t1 = 80AC0000 /* 008A8 80ABF5C8 2529FB40 */ addiu $t1, $t1, %lo(D_80ABFB40) ## $t1 = 80ABFB40 -/* 008AC 80ABF5CC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = FFFFE660 +/* 008AC 80ABF5CC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 008B0 80ABF5D0 AE091D68 */ sw $t1, 0x1D68($s0) ## 00001D68 /* 008B4 80ABF5D4 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 008B8 80ABF5D8 1000002B */ beq $zero, $zero, .L80ABF688 /* 008BC 80ABF5DC A06A1414 */ sb $t2, 0x1414($v1) ## FFFFFA74 .L80ABF5E0: -/* 008C0 80ABF5E0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = FFFFCCC0 +/* 008C0 80ABF5E0 2463E660 */ addiu $v1, %lo(gSaveContext) /* 008C4 80ABF5E4 8C6B0004 */ lw $t3, 0x0004($v1) ## FFFFCCC4 /* 008C8 80ABF5E8 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 /* 008CC 80ABF5EC 24425020 */ addiu $v0, $v0, 0x5020 ## $v0 = 02005020 @@ -93,10 +93,10 @@ glabel func_80ABF4C8 /* 008E0 80ABF600 00026100 */ sll $t4, $v0, 4 /* 008E4 80ABF604 000C6F02 */ srl $t5, $t4, 28 /* 008E8 80ABF608 000D7080 */ sll $t6, $t5, 2 -/* 008EC 80ABF60C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 008EC 80ABF60C 3C0F8016 */ lui $t7, %hi(gSegments) /* 008F0 80ABF610 01EE7821 */ addu $t7, $t7, $t6 /* 008F4 80ABF614 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 008F8 80ABF618 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 008F8 80ABF618 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 008FC 80ABF61C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00900 80ABF620 0041C024 */ and $t8, $v0, $at /* 00904 80ABF624 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -108,10 +108,10 @@ glabel func_80ABF4C8 /* 00918 80ABF638 00024900 */ sll $t1, $v0, 4 /* 0091C 80ABF63C 00095702 */ srl $t2, $t1, 28 /* 00920 80ABF640 000A5880 */ sll $t3, $t2, 2 -/* 00924 80ABF644 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 00924 80ABF644 3C0C8016 */ lui $t4, %hi(gSegments) /* 00928 80ABF648 018B6021 */ addu $t4, $t4, $t3 /* 0092C 80ABF64C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00930 80ABF650 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 00930 80ABF650 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 00934 80ABF654 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00938 80ABF658 00416824 */ and $t5, $v0, $at /* 0093C 80ABF65C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF708.s b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF708.s index 223bba22d5..a47be1c462 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF708.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF708.s @@ -24,10 +24,10 @@ glabel func_80ABF708 /* 00A3C 80ABF75C 00031C03 */ sra $v1, $v1, 16 /* 00A40 80ABF760 45010016 */ bc1t .L80ABF7BC /* 00A44 80ABF764 A488015A */ sh $t0, 0x015A($a0) ## 0000015A -/* 00A48 80ABF768 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 -/* 00A4C 80ABF76C 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 00A50 80ABF770 8D4AE704 */ lw $t2, -0x18FC($t2) ## 8015E704 -/* 00A54 80ABF774 8D29715C */ lw $t1, 0x715C($t1) ## 8012715C +/* 00A48 80ABF768 3C098012 */ lui $t1, %hi(gBitFlags+0x3c) +/* 00A4C 80ABF76C 3C0A8016 */ lui $t2, %hi(gSaveContext+0xa4) +/* 00A50 80ABF770 8D4AE704 */ lw $t2, %lo(gSaveContext+0xa4)($t2) +/* 00A54 80ABF774 8D29715C */ lw $t1, %lo(gBitFlags+0x3c)($t1) /* 00A58 80ABF778 00031023 */ subu $v0, $zero, $v1 /* 00A5C 80ABF77C 240C5021 */ addiu $t4, $zero, 0x5021 ## $t4 = 00005021 /* 00A60 80ABF780 012A5824 */ and $t3, $t1, $t2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF7CC.s b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF7CC.s index f06ca0a188..34200caf1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF7CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okarina_Tag/func_80ABF7CC.s @@ -28,10 +28,10 @@ glabel func_80ABF7CC /* 00AF8 80ABF818 8FBF0014 */ lw $ra, 0x0014($sp) /* 00AFC 80ABF81C 0C041B33 */ jal func_80106CCC /* 00B00 80ABF820 8FA40024 */ lw $a0, 0x0024($sp) -/* 00B04 80ABF824 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00B08 80ABF828 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00B0C 80ABF82C 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 00B10 80ABF830 8DCE715C */ lw $t6, 0x715C($t6) ## 8012715C +/* 00B04 80ABF824 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00B08 80ABF828 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 00B0C 80ABF82C 3C0E8012 */ lui $t6, %hi(gBitFlags+0x3c) +/* 00B10 80ABF830 8DCE715C */ lw $t6, %lo(gBitFlags+0x3c)($t6) /* 00B14 80ABF834 8C6F00A4 */ lw $t7, 0x00A4($v1) ## 8015E704 /* 00B18 80ABF838 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 /* 00B1C 80ABF83C 244224A0 */ addiu $v0, $v0, 0x24A0 ## $v0 = 020024A0 @@ -40,10 +40,10 @@ glabel func_80ABF7CC /* 00B28 80ABF848 0002C900 */ sll $t9, $v0, 4 /* 00B2C 80ABF84C 00194702 */ srl $t0, $t9, 28 /* 00B30 80ABF850 00084880 */ sll $t1, $t0, 2 -/* 00B34 80ABF854 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 00B34 80ABF854 3C0A8016 */ lui $t2, %hi(gSegments) /* 00B38 80ABF858 01495021 */ addu $t2, $t2, $t1 /* 00B3C 80ABF85C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00B40 80ABF860 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 00B40 80ABF860 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 00B44 80ABF864 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00B48 80ABF868 00415824 */ and $t3, $v0, $at /* 00B4C 80ABF86C 8FAE0024 */ lw $t6, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Init.s index 030027f43b..360de5b7bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Init.s @@ -99,8 +99,8 @@ glabel EnOkuta_Init /* 00160 80AC07C0 8FBF002C */ lw $ra, 0x002C($sp) .L80AC07C4: /* 00164 80AC07C4 3C054489 */ lui $a1, 0x4489 ## $a1 = 44890000 -/* 00168 80AC07C8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0016C 80AC07CC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00168 80AC07C8 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 0016C 80AC07CC 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00170 80AC07D0 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = 44898000 /* 00174 80AC07D4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1938.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1938.s index ce9c5cda47..cdbb9d473b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1938.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1938.s @@ -80,8 +80,8 @@ glabel func_80AC1938 /* 013E8 80AC1A48 10410006 */ beq $v0, $at, .L80AC1A64 /* 013EC 80AC1A4C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 013F0 80AC1A50 1441001C */ bne $v0, $at, .L80AC1AC4 -/* 013F4 80AC1A54 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 013F8 80AC1A58 8D29E664 */ lw $t1, -0x199C($t1) ## 8015E664 +/* 013F4 80AC1A54 3C098016 */ lui $t1, %hi(gSaveContext+4) +/* 013F8 80AC1A58 8D29E664 */ lw $t1, %lo(gSaveContext+4)($t1) /* 013FC 80AC1A5C 5520001A */ bnel $t1, $zero, .L80AC1AC8 /* 01400 80AC1A60 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 .L80AC1A64: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Init.s index 53b396d6ed..fa5dc9de8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Init.s @@ -113,8 +113,8 @@ glabel EnOssan_Init /* 007E4 80AC3484 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 007E8 80AC3488 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 /* 007EC 80AC348C 14E3000D */ bne $a3, $v1, .L80AC34C4 -/* 007F0 80AC3490 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 007F4 80AC3494 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 007F0 80AC3490 3C048016 */ lui $a0, %hi(gSaveContext) +/* 007F4 80AC3494 2484E660 */ addiu $a0, %lo(gSaveContext) /* 007F8 80AC3498 8C8E0004 */ lw $t6, 0x0004($a0) ## 8015E664 /* 007FC 80AC349C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00800 80AC34A0 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 @@ -128,10 +128,10 @@ glabel EnOssan_Init /* 0081C 80AC34BC A60F001C */ sh $t7, 0x001C($s0) ## 0000001C /* 00820 80AC34C0 8603001C */ lh $v1, 0x001C($s0) ## 0000001C .L80AC34C4: -/* 00824 80AC34C4 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 00824 80AC34C4 3C048016 */ lui $a0, %hi(gSaveContext) /* 00828 80AC34C8 2861000B */ slti $at, $v1, 0x000B /* 0082C 80AC34CC 14200017 */ bne $at, $zero, .L80AC352C -/* 00830 80AC34D0 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 00830 80AC34D0 2484E660 */ addiu $a0, %lo(gSaveContext) /* 00834 80AC34D4 04630016 */ bgezl $v1, .L80AC3530 /* 00838 80AC34D8 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 0083C 80AC34DC 0C00B55C */ jal Actor_Kill diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CB8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CB8.s index 58a58330da..f178e739f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CB8.s @@ -1,6 +1,6 @@ glabel func_80AC2CB8 -/* 00018 80AC2CB8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0001C 80AC2CBC 95CEF556 */ lhu $t6, -0x0AAA($t6) ## 8015F556 +/* 00018 80AC2CB8 3C0E8016 */ lui $t6, %hi(gSaveContext+0xef6) +/* 0001C 80AC2CBC 95CEF556 */ lhu $t6, %lo(gSaveContext+0xef6)($t6) /* 00020 80AC2CC0 AFA40000 */ sw $a0, 0x0000($sp) /* 00024 80AC2CC4 00042400 */ sll $a0, $a0, 16 /* 00028 80AC2CC8 31CF0200 */ andi $t7, $t6, 0x0200 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CE8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CE8.s index ef11dfb516..226143ac69 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CE8.s @@ -1,6 +1,6 @@ glabel func_80AC2CE8 -/* 00048 80AC2CE8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0004C 80AC2CEC 95CEF556 */ lhu $t6, -0x0AAA($t6) ## 8015F556 +/* 00048 80AC2CE8 3C0E8016 */ lui $t6, %hi(gSaveContext+0xef6) +/* 0004C 80AC2CEC 95CEF556 */ lhu $t6, %lo(gSaveContext+0xef6)($t6) /* 00050 80AC2CF0 AFA40000 */ sw $a0, 0x0000($sp) /* 00054 80AC2CF4 00042400 */ sll $a0, $a0, 16 /* 00058 80AC2CF8 31CF0100 */ andi $t7, $t6, 0x0100 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D18.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D18.s index e867153a18..4155c49d4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D18.s @@ -1,6 +1,6 @@ glabel func_80AC2D18 -/* 00078 80AC2D18 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0007C 80AC2D1C 95CEF556 */ lhu $t6, -0x0AAA($t6) ## 8015F556 +/* 00078 80AC2D18 3C0E8016 */ lui $t6, %hi(gSaveContext+0xef6) +/* 0007C 80AC2D1C 95CEF556 */ lhu $t6, %lo(gSaveContext+0xef6)($t6) /* 00080 80AC2D20 AFA40000 */ sw $a0, 0x0000($sp) /* 00084 80AC2D24 00042400 */ sll $a0, $a0, 16 /* 00088 80AC2D28 31CF0400 */ andi $t7, $t6, 0x0400 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D48.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D48.s index c3326ee6c8..403a1e26ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D48.s @@ -1,6 +1,6 @@ glabel func_80AC2D48 -/* 000A8 80AC2D48 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 000AC 80AC2D4C 95CEF556 */ lhu $t6, -0x0AAA($t6) ## 8015F556 +/* 000A8 80AC2D48 3C0E8016 */ lui $t6, %hi(gSaveContext+0xef6) +/* 000AC 80AC2D4C 95CEF556 */ lhu $t6, %lo(gSaveContext+0xef6)($t6) /* 000B0 80AC2D50 AFA40000 */ sw $a0, 0x0000($sp) /* 000B4 80AC2D54 00042400 */ sll $a0, $a0, 16 /* 000B8 80AC2D58 31CF8000 */ andi $t7, $t6, 0x8000 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D78.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D78.s index 5d07a4d82e..fa0af500c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D78.s @@ -1,6 +1,6 @@ glabel func_80AC2D78 -/* 000D8 80AC2D78 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 000DC 80AC2D7C 95CEF556 */ lhu $t6, -0x0AAA($t6) ## 8015F556 +/* 000D8 80AC2D78 3C0E8016 */ lui $t6, %hi(gSaveContext+0xef6) +/* 000DC 80AC2D7C 95CEF556 */ lhu $t6, %lo(gSaveContext+0xef6)($t6) /* 000E0 80AC2D80 AFA40000 */ sw $a0, 0x0000($sp) /* 000E4 80AC2D84 00042400 */ sll $a0, $a0, 16 /* 000E8 80AC2D88 31CF8000 */ andi $t7, $t6, 0x8000 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DA8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DA8.s index 90ef2f8437..0f32a6da4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DA8.s @@ -1,6 +1,6 @@ glabel func_80AC2DA8 -/* 00108 80AC2DA8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0010C 80AC2DAC 95CEF556 */ lhu $t6, -0x0AAA($t6) ## 8015F556 +/* 00108 80AC2DA8 3C0E8016 */ lui $t6, %hi(gSaveContext+0xef6) +/* 0010C 80AC2DAC 95CEF556 */ lhu $t6, %lo(gSaveContext+0xef6)($t6) /* 00110 80AC2DB0 AFA40000 */ sw $a0, 0x0000($sp) /* 00114 80AC2DB4 00042400 */ sll $a0, $a0, 16 /* 00118 80AC2DB8 31CF8000 */ andi $t7, $t6, 0x8000 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31A0.s index f6878537cb..d52e899f2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31A0.s @@ -1,6 +1,6 @@ glabel func_80AC31A0 -/* 00500 80AC31A0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00504 80AC31A4 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 +/* 00500 80AC31A0 3C0E8016 */ lui $t6, %hi(gSaveContext+4) +/* 00504 80AC31A4 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) /* 00508 80AC31A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0050C 80AC31AC AFBF0014 */ sw $ra, 0x0014($sp) /* 00510 80AC31B0 11C00003 */ beq $t6, $zero, .L80AC31C0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31F4.s index 79bcb0e9d7..d8469c75a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31F4.s @@ -1,6 +1,6 @@ glabel func_80AC31F4 -/* 00554 80AC31F4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00558 80AC31F8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00554 80AC31F4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00558 80AC31F8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0055C 80AC31FC 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 /* 00560 80AC3200 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00564 80AC3204 AFBF0014 */ sw $ra, 0x0014($sp) @@ -12,10 +12,10 @@ glabel func_80AC31F4 /* 00578 80AC3218 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 .L80AC321C: /* 0057C 80AC321C 1441001A */ bne $v0, $at, .L80AC3288 -/* 00580 80AC3220 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 +/* 00580 80AC3220 3C0C8012 */ lui $t4, %hi(gBitFlags+4) /* 00584 80AC3224 946F0ED8 */ lhu $t7, 0x0ED8($v1) ## 8015F538 -/* 00588 80AC3228 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 0058C 80AC322C 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 +/* 00588 80AC3228 3C088012 */ lui $t0, %hi(gUpgradeMasks+8) +/* 0058C 80AC322C 3C0A8012 */ lui $t2, %hi(gUpgradeShifts+2) /* 00590 80AC3230 31F80020 */ andi $t8, $t7, 0x0020 ## $t8 = 00000000 /* 00594 80AC3234 53000006 */ beql $t8, $zero, .L80AC3250 /* 00598 80AC3238 8C7900A0 */ lw $t9, 0x00A0($v1) ## 8015E700 @@ -25,8 +25,8 @@ glabel func_80AC31F4 /* 005A8 80AC3248 8FBF0014 */ lw $ra, 0x0014($sp) /* 005AC 80AC324C 8C7900A0 */ lw $t9, 0x00A0($v1) ## 000000A0 .L80AC3250: -/* 005B0 80AC3250 8D0871B8 */ lw $t0, 0x71B8($t0) ## 000071B8 -/* 005B4 80AC3254 914A71F6 */ lbu $t2, 0x71F6($t2) ## 000071F6 +/* 005B0 80AC3250 8D0871B8 */ lw $t0, %lo(gUpgradeMasks+8)($t0) +/* 005B4 80AC3254 914A71F6 */ lbu $t2, %lo(gUpgradeShifts+2)($t2) /* 005B8 80AC3258 03284824 */ and $t1, $t9, $t0 /* 005BC 80AC325C 01495807 */ srav $t3, $t1, $t2 /* 005C0 80AC3260 11600005 */ beq $t3, $zero, .L80AC3278 @@ -41,7 +41,7 @@ glabel func_80AC31F4 /* 005E0 80AC3280 1000000D */ beq $zero, $zero, .L80AC32B8 /* 005E4 80AC3284 8FBF0014 */ lw $ra, 0x0014($sp) .L80AC3288: -/* 005E8 80AC3288 8D8C7124 */ lw $t4, 0x7124($t4) ## 00007124 +/* 005E8 80AC3288 8D8C7124 */ lw $t4, %lo(gBitFlags+4)($t4) /* 005EC 80AC328C 8C6D00A4 */ lw $t5, 0x00A4($v1) ## 000000A4 /* 005F0 80AC3290 018D7024 */ and $t6, $t4, $t5 /* 005F4 80AC3294 15C00005 */ bne $t6, $zero, .L80AC32AC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC32C4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC32C4.s index ce698536dc..0744029ea5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC32C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC32C4.s @@ -1,6 +1,6 @@ glabel func_80AC32C4 -/* 00624 80AC32C4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00628 80AC32C8 9442F556 */ lhu $v0, -0x0AAA($v0) ## 8015F556 +/* 00624 80AC32C4 3C028016 */ lui $v0, %hi(gSaveContext+0xef6) +/* 00628 80AC32C8 9442F556 */ lhu $v0, %lo(gSaveContext+0xef6)($v0) /* 0062C 80AC32CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00630 80AC32D0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00634 80AC32D4 304E0100 */ andi $t6, $v0, 0x0100 ## $t6 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC37A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC37A8.s index 21b4e56f1d..5e7ad2fa77 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC37A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC37A8.s @@ -24,8 +24,8 @@ glabel func_80AC37A8 /* 00B38 80AC37D8 0C00084C */ jal osSyncPrintf /* 00B3C 80AC37DC AFAE0024 */ sw $t6, 0x0024($sp) -/* 00B40 80AC37E0 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00B44 80AC37E4 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 00B40 80AC37E0 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 00B44 80AC37E4 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 00B48 80AC37E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00B4C 80AC37EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00B50 80AC37F0 0C00BC65 */ jal func_8002F194 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3928.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3928.s index 3bc17516e1..24f991801e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3928.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3928.s @@ -1,7 +1,7 @@ glabel func_80AC3928 /* 00C88 80AC3928 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C8C 80AC392C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00C90 80AC3930 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 00C8C 80AC392C 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 00C90 80AC3930 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 00C94 80AC3934 AFBF0014 */ sw $ra, 0x0014($sp) /* 00C98 80AC3938 AFA40018 */ sw $a0, 0x0018($sp) /* 00C9C 80AC393C AFA60020 */ sw $a2, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC39AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC39AC.s index 7b4718de94..c5be8d18c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC39AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC39AC.s @@ -9,8 +9,8 @@ glabel func_80AC39AC /* 00D28 80AC39C8 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 /* 00D2C 80AC39CC 15E10017 */ bne $t7, $at, .L80AC3A2C /* 00D30 80AC39D0 A4AE01FC */ sh $t6, 0x01FC($a1) ## 000001FC -/* 00D34 80AC39D4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00D38 80AC39D8 9442F556 */ lhu $v0, -0x0AAA($v0) ## 8015F556 +/* 00D34 80AC39D4 3C028016 */ lui $v0, %hi(gSaveContext+0xef6) +/* 00D38 80AC39D8 9442F556 */ lhu $v0, %lo(gSaveContext+0xef6)($v0) /* 00D3C 80AC39DC 240570A2 */ addiu $a1, $zero, 0x70A2 ## $a1 = 000070A2 /* 00D40 80AC39E0 30580100 */ andi $t8, $v0, 0x0100 ## $t8 = 00000000 /* 00D44 80AC39E4 1300000C */ beq $t8, $zero, .L80AC3A18 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3F38.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3F38.s index 60feb9f74e..06abc51e15 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3F38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3F38.s @@ -2,10 +2,10 @@ glabel func_80AC3F38 /* 01298 80AC3F38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0129C 80AC3F3C AFBF0014 */ sw $ra, 0x0014($sp) /* 012A0 80AC3F40 908E01EB */ lbu $t6, 0x01EB($a0) ## 000001EB -/* 012A4 80AC3F44 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 012A4 80AC3F44 3C038016 */ lui $v1, %hi(gSaveContext) /* 012A8 80AC3F48 3C0280AD */ lui $v0, %hi(D_80AC88EC) ## $v0 = 80AD0000 /* 012AC 80AC3F4C 000E7840 */ sll $t7, $t6, 1 -/* 012B0 80AC3F50 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 012B0 80AC3F50 2463E660 */ addiu $v1, %lo(gSaveContext) /* 012B4 80AC3F54 004F1021 */ addu $v0, $v0, $t7 /* 012B8 80AC3F58 844288EC */ lh $v0, %lo(D_80AC88EC)($v0) /* 012BC 80AC3F5C 84780034 */ lh $t8, 0x0034($v1) ## 8015E694 @@ -32,10 +32,10 @@ glabel func_80AC3F38 /* 0130C 80AC3FAC AFA7001C */ sw $a3, 0x001C($sp) /* 01310 80AC3FB0 8FA60018 */ lw $a2, 0x0018($sp) /* 01314 80AC3FB4 8FA7001C */ lw $a3, 0x001C($sp) -/* 01318 80AC3FB8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 01318 80AC3FB8 3C038016 */ lui $v1, %hi(gSaveContext) /* 0131C 80AC3FBC 90C201EB */ lbu $v0, 0x01EB($a2) ## 000001EB /* 01320 80AC3FC0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01324 80AC3FC4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 01324 80AC3FC4 2463E660 */ addiu $v1, %lo(gSaveContext) /* 01328 80AC3FC8 1441000C */ bne $v0, $at, .L80AC3FFC /* 0132C 80AC3FCC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 01330 80AC3FD0 94690EE4 */ lhu $t1, 0x0EE4($v1) ## 8015F544 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5014.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5014.s index 78fbf42a9c..9b607683dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5014.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5014.s @@ -35,10 +35,10 @@ glabel func_80AC5014 glabel L80AC5070 /* 023D0 80AC5070 84E9001C */ lh $t1, 0x001C($a3) ## 0000001C /* 023D4 80AC5074 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 023D8 80AC5078 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 023D8 80AC5078 3C0A8016 */ lui $t2, %hi(gSaveContext+0xf06) /* 023DC 80AC507C 1521000A */ bne $t1, $at, .L80AC50A8 /* 023E0 80AC5080 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 023E4 80AC5084 954AF566 */ lhu $t2, -0x0A9A($t2) ## 8015F566 +/* 023E4 80AC5084 954AF566 */ lhu $t2, %lo(gSaveContext+0xf06)($t2) /* 023E8 80AC5088 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 023EC 80AC508C 314B0040 */ andi $t3, $t2, 0x0040 ## $t3 = 00000000 /* 023F0 80AC5090 51600006 */ beql $t3, $zero, .L80AC50AC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC54F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC54F4.s index 33cdec4fe8..bf09105ec3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC54F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC54F4.s @@ -1,6 +1,6 @@ glabel func_80AC54F4 -/* 02854 80AC54F4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 02858 80AC54F8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 02854 80AC54F4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 02858 80AC54F8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0285C 80AC54FC 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 /* 02860 80AC5500 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02864 80AC5504 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5900.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5900.s index f5b21db172..057b4f5cf7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5900.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5900.s @@ -33,8 +33,8 @@ glabel func_80AC5900 /* 02CA0 80AC5940 10000035 */ beq $zero, $zero, .L80AC5A18 /* 02CA4 80AC5944 8FBF001C */ lw $ra, 0x001C($sp) .L80AC5948: -/* 02CA8 80AC5948 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 02CAC 80AC594C 94A5F576 */ lhu $a1, -0x0A8A($a1) ## 8015F576 +/* 02CA8 80AC5948 3C058016 */ lui $a1, %hi(gSaveContext+0xf16) +/* 02CAC 80AC594C 94A5F576 */ lhu $a1, %lo(gSaveContext+0xf16)($a1) /* 02CB0 80AC5950 248492A4 */ addiu $a0, $a0, %lo(D_80AC92A4) ## $a0 = FFFF92A4 /* 02CB4 80AC5954 0C00084C */ jal osSyncPrintf diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5A28.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5A28.s index 8df9911125..4712560c0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5A28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5A28.s @@ -102,29 +102,29 @@ glabel func_80AC5A28 /* 02EB4 80AC5B54 01E00008 */ jr $t7 /* 02EB8 80AC5B58 00000000 */ nop glabel L80AC5B5C -/* 02EBC 80AC5B5C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 02EC0 80AC5B60 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 02EBC 80AC5B5C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 02EC0 80AC5B60 2442E660 */ addiu $v0, %lo(gSaveContext) /* 02EC4 80AC5B64 94580EF4 */ lhu $t8, 0x0EF4($v0) ## 8015F554 /* 02EC8 80AC5B68 37190008 */ ori $t9, $t8, 0x0008 ## $t9 = 00000008 /* 02ECC 80AC5B6C 10000012 */ beq $zero, $zero, .L80AC5BB8 /* 02ED0 80AC5B70 A4590EF4 */ sh $t9, 0x0EF4($v0) ## 8015F554 glabel L80AC5B74 -/* 02ED4 80AC5B74 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 02ED8 80AC5B78 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 02ED4 80AC5B74 3C028016 */ lui $v0, %hi(gSaveContext) +/* 02ED8 80AC5B78 2442E660 */ addiu $v0, %lo(gSaveContext) /* 02EDC 80AC5B7C 94480EF4 */ lhu $t0, 0x0EF4($v0) ## 8015F554 /* 02EE0 80AC5B80 35090020 */ ori $t1, $t0, 0x0020 ## $t1 = 00000020 /* 02EE4 80AC5B84 1000000C */ beq $zero, $zero, .L80AC5BB8 /* 02EE8 80AC5B88 A4490EF4 */ sh $t1, 0x0EF4($v0) ## 8015F554 glabel L80AC5B8C -/* 02EEC 80AC5B8C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 02EF0 80AC5B90 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 02EEC 80AC5B8C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 02EF0 80AC5B90 2442E660 */ addiu $v0, %lo(gSaveContext) /* 02EF4 80AC5B94 944A0EF4 */ lhu $t2, 0x0EF4($v0) ## 8015F554 /* 02EF8 80AC5B98 354B0010 */ ori $t3, $t2, 0x0010 ## $t3 = 00000010 /* 02EFC 80AC5B9C 10000006 */ beq $zero, $zero, .L80AC5BB8 /* 02F00 80AC5BA0 A44B0EF4 */ sh $t3, 0x0EF4($v0) ## 8015F554 glabel L80AC5BA4 -/* 02F04 80AC5BA4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 02F08 80AC5BA8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 02F04 80AC5BA4 3C028016 */ lui $v0, %hi(gSaveContext) +/* 02F08 80AC5BA8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 02F0C 80AC5BAC 944C0EF4 */ lhu $t4, 0x0EF4($v0) ## 8015F554 /* 02F10 80AC5BB0 358D0040 */ ori $t5, $t4, 0x0040 ## $t5 = 00000040 /* 02F14 80AC5BB4 A44D0EF4 */ sh $t5, 0x0EF4($v0) ## 8015F554 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5DAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5DAC.s index 7b0e14da8e..655e05a901 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5DAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5DAC.s @@ -36,9 +36,9 @@ glabel func_80AC5DAC /* 03194 80AC5E34 00000000 */ nop /* 03198 80AC5E38 8FAC0020 */ lw $t4, 0x0020($sp) /* 0319C 80AC5E3C 24010022 */ addiu $at, $zero, 0x0022 ## $at = 00000022 -/* 031A0 80AC5E40 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 031A0 80AC5E40 3C038016 */ lui $v1, %hi(gSaveContext) /* 031A4 80AC5E44 858D001C */ lh $t5, 0x001C($t4) ## 0000001C -/* 031A8 80AC5E48 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 031A8 80AC5E48 2463E660 */ addiu $v1, %lo(gSaveContext) /* 031AC 80AC5E4C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 031B0 80AC5E50 15A10011 */ bne $t5, $at, .L80AC5E98 /* 031B4 80AC5E54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC60E4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC60E4.s index 6143d7b91c..11733b558f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC60E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC60E4.s @@ -12,8 +12,8 @@ glabel func_80AC60E4 /* 0346C 80AC610C 0C041AF2 */ jal func_80106BC8 /* 03470 80AC6110 8FA4001C */ lw $a0, 0x001C($sp) /* 03474 80AC6114 10400008 */ beq $v0, $zero, .L80AC6138 -/* 03478 80AC6118 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0347C 80AC611C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 03478 80AC6118 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0347C 80AC611C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 03480 80AC6120 944E0F16 */ lhu $t6, 0x0F16($v0) ## 8015F576 /* 03484 80AC6124 8FA4001C */ lw $a0, 0x001C($sp) /* 03488 80AC6128 8FA50018 */ lw $a1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6148.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6148.s index 3e517d4a18..e801f31259 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6148.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6148.s @@ -18,8 +18,8 @@ glabel func_80AC6148 /* 034E8 80AC6188 8FA4001C */ lw $a0, 0x001C($sp) /* 034EC 80AC618C 0C042DC8 */ jal func_8010B720 /* 034F0 80AC6190 24053012 */ addiu $a1, $zero, 0x3012 ## $a1 = 00003012 -/* 034F4 80AC6194 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 034F8 80AC6198 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 034F4 80AC6194 3C028016 */ lui $v0, %hi(gSaveContext) +/* 034F8 80AC6198 2442E660 */ addiu $v0, %lo(gSaveContext) /* 034FC 80AC619C 94580F16 */ lhu $t8, 0x0F16($v0) ## 8015F576 /* 03500 80AC61A0 37191000 */ ori $t9, $t8, 0x1000 ## $t9 = 00001000 /* 03504 80AC61A4 A4590F16 */ sh $t9, 0x0F16($v0) ## 8015F576 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6258.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6258.s index 2b47148e8c..45f630ee41 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6258.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6258.s @@ -12,8 +12,8 @@ glabel func_80AC6258 /* 035E0 80AC6280 0C041AF2 */ jal func_80106BC8 /* 035E4 80AC6284 8FA4001C */ lw $a0, 0x001C($sp) /* 035E8 80AC6288 1040000A */ beq $v0, $zero, .L80AC62B4 -/* 035EC 80AC628C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 035F0 80AC6290 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 035EC 80AC628C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 035F0 80AC6290 2442E660 */ addiu $v0, %lo(gSaveContext) /* 035F4 80AC6294 944E0EF4 */ lhu $t6, 0x0EF4($v0) ## 8015F554 /* 035F8 80AC6298 8FA50018 */ lw $a1, 0x0018($sp) /* 035FC 80AC629C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s index 60d77647ba..c02336cc85 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s @@ -26,8 +26,8 @@ glabel func_80AC6B3C /* 03EFC 80AC6B9C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 03F00 80AC6BA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 03F04 80AC6BA4 01014821 */ addu $t1, $t0, $at -/* 03F08 80AC6BA8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 03F0C 80AC6BAC AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 +/* 03F08 80AC6BA8 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 03F0C 80AC6BAC AC296FC0 */ sw $t1, %lo(gSegments+0x18)($at) /* 03F10 80AC6BB0 0C028800 */ jal SkelAnime_GetFrameCount /* 03F14 80AC6BB4 248404A8 */ addiu $a0, $a0, 0x04A8 ## $a0 = 060004A8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s index 7218c81fd3..da276dc929 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s @@ -28,10 +28,10 @@ glabel func_80AC6C54 /* 0401C 80AC6CBC 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 /* 04020 80AC6CC0 248400FC */ addiu $a0, $a0, 0x00FC ## $a0 = 060000FC /* 04024 80AC6CC4 01215021 */ addu $t2, $t1, $at -/* 04028 80AC6CC8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 04028 80AC6CC8 3C018016 */ lui $at, %hi(gSegments+0x18) /* 0402C 80AC6CCC 0C028800 */ jal SkelAnime_GetFrameCount -/* 04030 80AC6CD0 AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 +/* 04030 80AC6CD0 AC2A6FC0 */ sw $t2, %lo(gSegments+0x18)($at) /* 04034 80AC6CD4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04038 80AC6CD8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0403C 80AC6CDC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s index 84cf39f01a..3a261b9154 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s @@ -28,10 +28,10 @@ glabel func_80AC6D30 /* 040F8 80AC6D98 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 /* 040FC 80AC6D9C 2484078C */ addiu $a0, $a0, 0x078C ## $a0 = 0600078C /* 04100 80AC6DA0 01215021 */ addu $t2, $t1, $at -/* 04104 80AC6DA4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 04104 80AC6DA4 3C018016 */ lui $at, %hi(gSegments+0x18) /* 04108 80AC6DA8 0C028800 */ jal SkelAnime_GetFrameCount -/* 0410C 80AC6DAC AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 +/* 0410C 80AC6DAC AC2A6FC0 */ sw $t2, %lo(gSegments+0x18)($at) /* 04110 80AC6DB0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04114 80AC6DB4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04118 80AC6DB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6F2C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6F2C.s index acc9ae7c57..7788bef7cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6F2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6F2C.s @@ -4,10 +4,10 @@ glabel func_80AC6F2C /* 04294 80AC6F34 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 04298 80AC6F38 15E10053 */ bne $t7, $at, .L80AC7088 /* 0429C 80AC6F3C A08E01EB */ sb $t6, 0x01EB($a0) ## 000001EB -/* 042A0 80AC6F40 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 -/* 042A4 80AC6F44 93187485 */ lbu $t8, 0x7485($t8) ## 80127485 -/* 042A8 80AC6F48 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 042AC 80AC6F4C 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 +/* 042A0 80AC6F40 3C188012 */ lui $t8, %hi(gItemSlots+0x21) +/* 042A4 80AC6F44 93187485 */ lbu $t8, %lo(gItemSlots+0x21)($t8) +/* 042A8 80AC6F48 3C058016 */ lui $a1, %hi(gSaveContext) +/* 042AC 80AC6F4C 24A5E660 */ addiu $a1, %lo(gSaveContext) /* 042B0 80AC6F50 00B8C821 */ addu $t9, $a1, $t8 /* 042B4 80AC6F54 93280074 */ lbu $t0, 0x0074($t9) ## 00000074 /* 042B8 80AC6F58 2401002C */ addiu $at, $zero, 0x002C ## $at = 0000002C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7094.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7094.s index 7ccf69c432..5eb84c8c06 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7094.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7094.s @@ -80,9 +80,9 @@ glabel func_80AC7094 /* 044C8 80AC7168 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 /* 044CC 80AC716C C4500004 */ lwc1 $f16, 0x0004($v0) ## 00000004 /* 044D0 80AC7170 012A5821 */ addu $t3, $t1, $t2 -/* 044D4 80AC7174 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 044D4 80AC7174 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 044D8 80AC7178 46105480 */ add.s $f18, $f10, $f16 -/* 044DC 80AC717C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 044DC 80AC717C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 044E0 80AC7180 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 044E4 80AC7184 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 044E8 80AC7188 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7380.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7380.s index c8d92527ca..d0f7ddcd84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7380.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7380.s @@ -9,6 +9,6 @@ glabel func_80AC7380 /* 046FC 80AC739C 0338C821 */ addu $t9, $t9, $t8 /* 04700 80AC73A0 8F3917B4 */ lw $t9, 0x17B4($t9) ## 000117B4 /* 04704 80AC73A4 03214021 */ addu $t0, $t9, $at -/* 04708 80AC73A8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 04708 80AC73A8 3C018016 */ lui $at, %hi(gSegments+0x18) /* 0470C 80AC73AC 03E00008 */ jr $ra -/* 04710 80AC73B0 AC286FC0 */ sw $t0, 0x6FC0($at) ## 80166FC0 +/* 04710 80AC73B0 AC286FC0 */ sw $t0, %lo(gSegments+0x18)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s index ebc4b3fac8..3a56428dcf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s @@ -29,7 +29,7 @@ glabel func_80AC7DAC /* 05150 80AC7DF0 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 05154 80AC7DF4 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 05158 80AC7DF8 3C0480AD */ lui $a0, %hi(D_80AC8EA0) ## $a0 = 80AD0000 -/* 0515C 80AC7DFC 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 0515C 80AC7DFC 3C0C8016 */ lui $t4, %hi(gSegments) /* 05160 80AC7E00 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 /* 05164 80AC7E04 ACAE02C0 */ sw $t6, 0x02C0($a1) ## 000002C0 /* 05168 80AC7E08 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 @@ -45,7 +45,7 @@ glabel func_80AC7DAC /* 05190 80AC7E30 00095702 */ srl $t2, $t1, 28 /* 05194 80AC7E34 000A5880 */ sll $t3, $t2, 2 /* 05198 80AC7E38 018B6021 */ addu $t4, $t4, $t3 -/* 0519C 80AC7E3C 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 0519C 80AC7E3C 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 051A0 80AC7E40 00814024 */ and $t0, $a0, $at /* 051A4 80AC7E44 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 051A8 80AC7E48 010C6821 */ addu $t5, $t0, $t4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s index 14238742c3..f9370461a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s @@ -57,8 +57,8 @@ glabel func_80AC7ED0 /* 052E4 80AC7F84 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 052E8 80AC7F88 37180028 */ ori $t8, $t8, 0x0028 ## $t8 = DB060028 /* 052EC 80AC7F8C 01616021 */ addu $t4, $t3, $at -/* 052F0 80AC7F90 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 052F4 80AC7F94 AC2C6FC0 */ sw $t4, 0x6FC0($at) ## 80166FC0 +/* 052F0 80AC7F90 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 052F4 80AC7F94 AC2C6FC0 */ sw $t4, %lo(gSegments+0x18)($at) /* 052F8 80AC7F98 ADCD0000 */ sw $t5, 0x0000($t6) ## 00000000 /* 052FC 80AC7F9C 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 05300 80AC7FA0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 @@ -67,7 +67,7 @@ glabel func_80AC7ED0 /* 0530C 80AC7FAC AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 05310 80AC7FB0 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 /* 05314 80AC7FB4 84B901F2 */ lh $t9, 0x01F2($a1) ## 000001F2 -/* 05318 80AC7FB8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 05318 80AC7FB8 3C0F8016 */ lui $t7, %hi(gSegments) /* 0531C 80AC7FBC 00195080 */ sll $t2, $t9, 2 /* 05320 80AC7FC0 008A2021 */ addu $a0, $a0, $t2 /* 05324 80AC7FC4 8C848EAC */ lw $a0, %lo(D_80AC8EAC)($a0) @@ -75,7 +75,7 @@ glabel func_80AC7ED0 /* 0532C 80AC7FCC 000C6F02 */ srl $t5, $t4, 28 /* 05330 80AC7FD0 000D7080 */ sll $t6, $t5, 2 /* 05334 80AC7FD4 01EE7821 */ addu $t7, $t7, $t6 -/* 05338 80AC7FD8 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 05338 80AC7FD8 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 0533C 80AC7FDC 00815824 */ and $t3, $a0, $at /* 05340 80AC7FE0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 05344 80AC7FE4 016FC021 */ addu $t8, $t3, $t7 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s index 66b95b21e3..7c31352d2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s @@ -29,12 +29,12 @@ glabel func_80AC8244 /* 055E8 80AC8288 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 055EC 80AC828C 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 055F0 80AC8290 3C0480AD */ lui $a0, %hi(D_80AC8EB8) ## $a0 = 80AD0000 -/* 055F4 80AC8294 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 055F4 80AC8294 3C068016 */ lui $a2, %hi(gSegments) /* 055F8 80AC8298 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 /* 055FC 80AC829C AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 05600 80AC82A0 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 /* 05604 80AC82A4 861801F2 */ lh $t8, 0x01F2($s0) ## 000001F2 -/* 05608 80AC82A8 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 05608 80AC82A8 24C66FA8 */ addiu $a2, %lo(gSegments) /* 0560C 80AC82AC 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 /* 05610 80AC82B0 0018C880 */ sll $t9, $t8, 2 /* 05614 80AC82B4 00992021 */ addu $a0, $a0, $t9 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s index 60cd81bbf9..f54c0fbddd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s @@ -47,7 +47,7 @@ glabel func_80AC83DC /* 057C8 80AC8468 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 057CC 80AC846C 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 057D0 80AC8470 3C0480AD */ lui $a0, %hi(D_80AC8EC4) ## $a0 = 80AD0000 -/* 057D4 80AC8474 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 057D4 80AC8474 3C198016 */ lui $t9, %hi(gSegments) /* 057D8 80AC8478 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 057DC 80AC847C AE2902C0 */ sw $t1, 0x02C0($s1) ## 000002C0 /* 057E0 80AC8480 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 @@ -63,7 +63,7 @@ glabel func_80AC83DC /* 05808 80AC84A8 000E7F02 */ srl $t7, $t6, 28 /* 0580C 80AC84AC 000FC080 */ sll $t8, $t7, 2 /* 05810 80AC84B0 0338C821 */ addu $t9, $t9, $t8 -/* 05814 80AC84B4 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 05814 80AC84B4 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 05818 80AC84B8 00816824 */ and $t5, $a0, $at /* 0581C 80AC84BC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 05820 80AC84C0 01B94021 */ addu $t0, $t5, $t9 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s index aee3f552e2..024712bc1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s @@ -29,7 +29,7 @@ glabel func_80AC854C /* 058F0 80AC8590 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 058F4 80AC8594 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 058F8 80AC8598 3C0480AD */ lui $a0, %hi(D_80AC8ED0) ## $a0 = 80AD0000 -/* 058FC 80AC859C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 058FC 80AC859C 3C0C8016 */ lui $t4, %hi(gSegments) /* 05900 80AC85A0 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 /* 05904 80AC85A4 ACAE02C0 */ sw $t6, 0x02C0($a1) ## 000002C0 /* 05908 80AC85A8 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 @@ -43,7 +43,7 @@ glabel func_80AC854C /* 05928 80AC85C8 00095702 */ srl $t2, $t1, 28 /* 0592C 80AC85CC 000A5880 */ sll $t3, $t2, 2 /* 05930 80AC85D0 018B6021 */ addu $t4, $t4, $t3 -/* 05934 80AC85D4 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 05934 80AC85D4 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 05938 80AC85D8 00814024 */ and $t0, $a0, $at /* 0593C 80AC85DC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 05940 80AC85E0 010C6821 */ addu $t5, $t0, $t4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s index d807455e07..2dd0f70ccc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s @@ -29,7 +29,7 @@ glabel func_80AC8668 /* 05A0C 80AC86AC 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 05A10 80AC86B0 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 05A14 80AC86B4 3C0480AD */ lui $a0, %hi(D_80AC8EDC) ## $a0 = 80AD0000 -/* 05A18 80AC86B8 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 05A18 80AC86B8 3C0C8016 */ lui $t4, %hi(gSegments) /* 05A1C 80AC86BC 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 /* 05A20 80AC86C0 ACAE02C0 */ sw $t6, 0x02C0($a1) ## 000002C0 /* 05A24 80AC86C4 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 @@ -43,7 +43,7 @@ glabel func_80AC8668 /* 05A44 80AC86E4 00095702 */ srl $t2, $t1, 28 /* 05A48 80AC86E8 000A5880 */ sll $t3, $t2, 2 /* 05A4C 80AC86EC 018B6021 */ addu $t4, $t4, $t3 -/* 05A50 80AC86F0 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 05A50 80AC86F0 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 05A54 80AC86F4 00814024 */ and $t0, $a0, $at /* 05A58 80AC86F8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 05A5C 80AC86FC 010C6821 */ addu $t5, $t0, $t4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s index 1a37153b61..7711fcdde8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s @@ -29,7 +29,7 @@ glabel func_80AC8784 /* 05B28 80AC87C8 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 05B2C 80AC87CC 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 05B30 80AC87D0 3C0480AD */ lui $a0, %hi(D_80AC8EE4) ## $a0 = 80AD0000 -/* 05B34 80AC87D4 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 05B34 80AC87D4 3C0C8016 */ lui $t4, %hi(gSegments) /* 05B38 80AC87D8 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 /* 05B3C 80AC87DC ACAE02C0 */ sw $t6, 0x02C0($a1) ## 000002C0 /* 05B40 80AC87E0 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 @@ -43,7 +43,7 @@ glabel func_80AC8784 /* 05B60 80AC8800 00095702 */ srl $t2, $t1, 28 /* 05B64 80AC8804 000A5880 */ sll $t3, $t2, 2 /* 05B68 80AC8808 018B6021 */ addu $t4, $t4, $t3 -/* 05B6C 80AC880C 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 05B6C 80AC880C 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 05B70 80AC8810 00814024 */ and $t0, $a0, $at /* 05B74 80AC8814 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 05B78 80AC8818 010C6821 */ addu $t5, $t0, $t4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s index 2d2d7e5a8e..e1e7f1038c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s @@ -33,7 +33,7 @@ glabel EnOwl_Draw /* 030EC 80ACD00C ACB802C0 */ sw $t8, 0x02C0($a1) ## 000002C0 /* 030F0 80ACD010 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 /* 030F4 80ACD014 850903F4 */ lh $t1, 0x03F4($t0) ## 000003F4 -/* 030F8 80ACD018 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 030F8 80ACD018 3C0F8016 */ lui $t7, %hi(gSegments) /* 030FC 80ACD01C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 03100 80ACD020 00095080 */ sll $t2, $t1, 2 /* 03104 80ACD024 008A2021 */ addu $a0, $a0, $t2 @@ -44,7 +44,7 @@ glabel EnOwl_Draw /* 03118 80ACD038 000C6F02 */ srl $t5, $t4, 28 /* 0311C 80ACD03C 000D7080 */ sll $t6, $t5, 2 /* 03120 80ACD040 01EE7821 */ addu $t7, $t7, $t6 -/* 03124 80ACD044 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 03124 80ACD044 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 03128 80ACD048 00815824 */ and $t3, $a0, $at /* 0312C 80ACD04C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 03130 80ACD050 016FC021 */ addu $t8, $t3, $t7 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s index 6c29726fac..f36d0564b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s @@ -70,8 +70,8 @@ glabel EnOwl_Init /* 00018 80AC9F38 0C01E037 */ jal Actor_ProcessInitChain /* 0001C 80AC9F3C 24A5D61C */ addiu $a1, $a1, %lo(D_80ACD61C) ## $a1 = 80ACD61C -/* 00020 80AC9F40 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00024 80AC9F44 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00020 80AC9F40 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00024 80AC9F44 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00028 80AC9F48 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0002C 80AC9F4C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00030 80AC9F50 0C00AC78 */ jal ActorShape_Init @@ -220,8 +220,8 @@ glabel L80ACA13C /* 00238 80ACA158 10000088 */ beq $zero, $zero, .L80ACA37C /* 0023C 80ACA15C AE0A040C */ sw $t2, 0x040C($s0) ## 0000040C glabel L80ACA160 -/* 00240 80ACA160 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00244 80ACA164 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00240 80ACA160 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00244 80ACA164 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00248 80ACA168 944B0EDC */ lhu $t3, 0x0EDC($v0) ## 8015F53C /* 0024C 80ACA16C 3C0D80AD */ lui $t5, %hi(func_80ACACD8) ## $t5 = 80AD0000 /* 00250 80ACA170 3C0480AD */ lui $a0, %hi(D_80ACD694) ## $a0 = 80AD0000 @@ -240,8 +240,8 @@ glabel L80ACA160 /* 00278 80ACA198 10000078 */ beq $zero, $zero, .L80ACA37C /* 0027C 80ACA19C AE0D040C */ sw $t5, 0x040C($s0) ## 0000040C glabel L80ACA1A0 -/* 00280 80ACA1A0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00284 80ACA1A4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00280 80ACA1A0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00284 80ACA1A4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00288 80ACA1A8 944E0EDC */ lhu $t6, 0x0EDC($v0) ## 8015F53C /* 0028C 80ACA1AC 3C1880AD */ lui $t8, %hi(func_80ACAE5C) ## $t8 = 80AD0000 /* 00290 80ACA1B0 3C0480AD */ lui $a0, %hi(D_80ACD6A4) ## $a0 = 80AD0000 @@ -265,8 +265,8 @@ glabel L80ACA1E0 /* 002C8 80ACA1E8 10000064 */ beq $zero, $zero, .L80ACA37C /* 002CC 80ACA1EC AE19040C */ sw $t9, 0x040C($s0) ## 0000040C glabel L80ACA1F0 -/* 002D0 80ACA1F0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 002D4 80ACA1F4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 002D0 80ACA1F0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 002D4 80ACA1F4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 002D8 80ACA1F8 94480EDA */ lhu $t0, 0x0EDA($v0) ## 8015F53A /* 002DC 80ACA1FC 3C0480AD */ lui $a0, %hi(D_80ACD6B4) ## $a0 = 80AD0000 /* 002E0 80ACA200 31090200 */ andi $t1, $t0, 0x0200 ## $t1 = 00000000 @@ -316,10 +316,10 @@ glabel L80ACA284 /* 0036C 80ACA28C 1000003B */ beq $zero, $zero, .L80ACA37C /* 00370 80ACA290 AE18040C */ sw $t8, 0x040C($s0) ## 0000040C glabel L80ACA294 -/* 00374 80ACA294 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00378 80ACA298 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 0037C 80ACA29C 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 -/* 00380 80ACA2A0 8F397150 */ lw $t9, 0x7150($t9) ## 80127150 +/* 00374 80ACA294 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00378 80ACA298 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 0037C 80ACA29C 3C198012 */ lui $t9, %hi(gBitFlags+0x30) +/* 00380 80ACA2A0 8F397150 */ lw $t9, %lo(gBitFlags+0x30)($t9) /* 00384 80ACA2A4 8C4800A4 */ lw $t0, 0x00A4($v0) ## 8015E704 /* 00388 80ACA2A8 3C0A80AD */ lui $t2, %hi(func_80ACB568) ## $t2 = 80AD0000 /* 0038C 80ACA2AC 3C0480AD */ lui $a0, %hi(D_80ACD6C4) ## $a0 = 80AD0000 @@ -338,10 +338,10 @@ glabel L80ACA294 /* 003B4 80ACA2D4 10000029 */ beq $zero, $zero, .L80ACA37C /* 003B8 80ACA2D8 AE0A040C */ sw $t2, 0x040C($s0) ## 0000040C glabel L80ACA2DC -/* 003BC 80ACA2DC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 003C0 80ACA2E0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 003C4 80ACA2E4 3C0B8012 */ lui $t3, 0x8012 ## $t3 = 80120000 -/* 003C8 80ACA2E8 8D6B7158 */ lw $t3, 0x7158($t3) ## 80127158 +/* 003BC 80ACA2DC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 003C0 80ACA2E0 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 003C4 80ACA2E4 3C0B8012 */ lui $t3, %hi(gBitFlags+0x38) +/* 003C8 80ACA2E8 8D6B7158 */ lw $t3, %lo(gBitFlags+0x38)($t3) /* 003CC 80ACA2EC 8C4C00A4 */ lw $t4, 0x00A4($v0) ## 8015E704 /* 003D0 80ACA2F0 3C0E80AD */ lui $t6, %hi(func_80ACB6EC) ## $t6 = 80AD0000 /* 003D4 80ACA2F4 3C0480AD */ lui $a0, %hi(D_80ACD6D4) ## $a0 = 80AD0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA928.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA928.s index a2c39ddfd9..44d204f00d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA928.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA928.s @@ -16,9 +16,9 @@ glabel func_80ACA928 /* 00A40 80ACA960 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A /* 00A44 80ACA964 8FAF0020 */ lw $t7, 0x0020($sp) /* 00A48 80ACA968 3C0E80AD */ lui $t6, %hi(func_80ACA88C) ## $t6 = 80AD0000 -/* 00A4C 80ACA96C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00A4C 80ACA96C 3C028016 */ lui $v0, %hi(gSaveContext) /* 00A50 80ACA970 25CEA88C */ addiu $t6, $t6, %lo(func_80ACA88C) ## $t6 = 80ACA88C -/* 00A54 80ACA974 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00A54 80ACA974 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00A58 80ACA978 ADEE040C */ sw $t6, 0x040C($t7) ## 0000040C /* 00A5C 80ACA97C 94580EE0 */ lhu $t8, 0x0EE0($v0) ## 8015F540 /* 00A60 80ACA980 37198000 */ ori $t9, $t8, 0x8000 ## $t9 = 00008000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB88.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB88.s index 3513f388e8..9e13f2febe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB88.s @@ -18,7 +18,7 @@ glabel func_80ACAB88 /* 00CA8 80ACABC8 00461021 */ addu $v0, $v0, $a2 /* 00CAC 80ACABCC 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD /* 00CB0 80ACABD0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00CB4 80ACABD4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 00CB4 80ACABD4 3C0E8016 */ lui $t6, %hi(gSaveContext+0xedc) /* 00CB8 80ACABD8 10400005 */ beq $v0, $zero, .L80ACABF0 /* 00CBC 80ACABDC 00000000 */ nop /* 00CC0 80ACABE0 10410013 */ beq $v0, $at, .L80ACAC30 @@ -26,7 +26,7 @@ glabel func_80ACAB88 /* 00CC8 80ACABE8 10000017 */ beq $zero, $zero, .L80ACAC48 /* 00CCC 80ACABEC 960803FC */ lhu $t0, 0x03FC($s0) ## 000003FC .L80ACABF0: -/* 00CD0 80ACABF0 95CEF53C */ lhu $t6, -0x0AC4($t6) ## 8015F53C +/* 00CD0 80ACABF0 95CEF53C */ lhu $t6, %lo(gSaveContext+0xedc)($t6) /* 00CD4 80ACABF4 2405206D */ addiu $a1, $zero, 0x206D ## $a1 = 0000206D /* 00CD8 80ACABF8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 00CDC 80ACABFC 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB0B0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB0B0.s index 7095a083bd..c57b18776c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB0B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB0B0.s @@ -4,10 +4,10 @@ glabel func_80ACB0B0 /* 01198 80ACB0B8 AFA40020 */ sw $a0, 0x0020($sp) /* 0119C 80ACB0BC 0C2B28EE */ jal func_80ACA3B8 /* 011A0 80ACB0C0 AFA50024 */ sw $a1, 0x0024($sp) -/* 011A4 80ACB0C4 3C038012 */ lui $v1, 0x8012 ## $v1 = 80120000 -/* 011A8 80ACB0C8 24637120 */ addiu $v1, $v1, 0x7120 ## $v1 = 80127120 -/* 011AC 80ACB0CC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 011B0 80ACB0D0 8C42E704 */ lw $v0, -0x18FC($v0) ## 8015E704 +/* 011A4 80ACB0C4 3C038012 */ lui $v1, %hi(gBitFlags) +/* 011A8 80ACB0C8 24637120 */ addiu $v1, %lo(gBitFlags) +/* 011AC 80ACB0CC 3C028016 */ lui $v0, %hi(gSaveContext+0xa4) +/* 011B0 80ACB0D0 8C42E704 */ lw $v0, %lo(gSaveContext+0xa4)($v0) /* 011B4 80ACB0D4 8C6E0038 */ lw $t6, 0x0038($v1) ## 80127158 /* 011B8 80ACB0D8 8FA40020 */ lw $a0, 0x0020($sp) /* 011BC 80ACB0DC 8FA50024 */ lw $a1, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB1A0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB1A0.s index 082826b4a3..e80a09cffc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB1A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB1A0.s @@ -1,6 +1,6 @@ glabel func_80ACB1A0 -/* 01280 80ACB1A0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 01284 80ACB1A4 95CEF58A */ lhu $t6, -0x0A76($t6) ## 8015F58A +/* 01280 80ACB1A0 3C0E8016 */ lui $t6, %hi(gSaveContext+0xf2a) +/* 01284 80ACB1A4 95CEF58A */ lhu $t6, %lo(gSaveContext+0xf2a)($t6) /* 01288 80ACB1A8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0128C 80ACB1AC AFBF0014 */ sw $ra, 0x0014($sp) /* 01290 80ACB1B0 31CF0020 */ andi $t7, $t6, 0x0020 ## $t7 = 00000000 @@ -21,8 +21,8 @@ glabel func_80ACB1A0 /* 012C4 80ACB1E4 0C2B2956 */ jal func_80ACA558 /* 012C8 80ACB1E8 8FA50024 */ lw $a1, 0x0024($sp) /* 012CC 80ACB1EC 1040000B */ beq $v0, $zero, .L80ACB21C -/* 012D0 80ACB1F0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 012D4 80ACB1F4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 012D0 80ACB1F0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 012D4 80ACB1F4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 012D8 80ACB1F8 94580F2A */ lhu $t8, 0x0F2A($v0) ## 8015F58A /* 012DC 80ACB1FC 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A /* 012E0 80ACB200 37190020 */ ori $t9, $t8, 0x0020 ## $t9 = 00000020 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB2B4.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB2B4.s index 0d2d35ed0f..6d461f9bba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB2B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB2B4.s @@ -5,8 +5,8 @@ glabel func_80ACB2B4 /* 013A0 80ACB2C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 013A4 80ACB2C4 0C2B28EE */ jal func_80ACA3B8 /* 013A8 80ACB2C8 AFA50024 */ sw $a1, 0x0024($sp) -/* 013AC 80ACB2CC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 013B0 80ACB2D0 91CEE69A */ lbu $t6, -0x1966($t6) ## 8015E69A +/* 013AC 80ACB2CC 3C0E8016 */ lui $t6, %hi(gSaveContext+0x3a) +/* 013B0 80ACB2D0 91CEE69A */ lbu $t6, %lo(gSaveContext+0x3a)($t6) /* 013B4 80ACB2D4 8FA50024 */ lw $a1, 0x0024($sp) /* 013B8 80ACB2D8 24063062 */ addiu $a2, $zero, 0x3062 ## $a2 = 00003062 /* 013BC 80ACB2DC 15C0000B */ bne $t6, $zero, .L80ACB30C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s index 001735e536..2f68df012e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s @@ -81,7 +81,7 @@ glabel func_80ACC00C /* 02190 80ACC0B0 10410008 */ beq $v0, $at, .L80ACC0D4 /* 02194 80ACC0B4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 /* 02198 80ACC0B8 10410020 */ beq $v0, $at, .L80ACC13C -/* 0219C 80ACC0BC 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 0219C 80ACC0BC 3C0A8016 */ lui $t2, %hi(gSegments) /* 021A0 80ACC0C0 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 /* 021A4 80ACC0C4 1041001D */ beq $v0, $at, .L80ACC13C /* 021A8 80ACC0C8 3C0480AD */ lui $a0, %hi(D_80ACD798) ## $a0 = 80AD0000 @@ -104,10 +104,10 @@ glabel func_80ACC00C /* 021DC 80ACC0FC 00024900 */ sll $t1, $v0, 4 /* 021E0 80ACC100 00095702 */ srl $t2, $t1, 28 /* 021E4 80ACC104 000A5880 */ sll $t3, $t2, 2 -/* 021E8 80ACC108 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 021E8 80ACC108 3C0C8016 */ lui $t4, %hi(gSegments) /* 021EC 80ACC10C 018B6021 */ addu $t4, $t4, $t3 /* 021F0 80ACC110 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 021F4 80ACC114 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 021F4 80ACC114 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 021F8 80ACC118 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 021FC 80ACC11C 00416824 */ and $t5, $v0, $at /* 02200 80ACC120 8FB80034 */ lw $t8, 0x0034($sp) @@ -125,7 +125,7 @@ glabel func_80ACC00C /* 0222C 80ACC14C 00084880 */ sll $t1, $t0, 2 /* 02230 80ACC150 01495021 */ addu $t2, $t2, $t1 /* 02234 80ACC154 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 02238 80ACC158 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 00006FA8 +/* 02238 80ACC158 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 0223C 80ACC15C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 02240 80ACC160 00415824 */ and $t3, $v0, $at /* 02244 80ACC164 8FAE0034 */ lw $t6, 0x0034($sp) @@ -145,8 +145,8 @@ glabel func_80ACC00C /* 02270 80ACC190 0C01E221 */ jal func_80078884 /* 02274 80ACC194 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 /* 02278 80ACC198 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0227C 80ACC19C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 02280 80ACC1A0 A02FFA74 */ sb $t7, -0x058C($at) ## 8015FA74 +/* 0227C 80ACC19C 3C018016 */ lui $at, %hi(gSaveContext+0x1414) +/* 02280 80ACC1A0 A02FFA74 */ sb $t7, %lo(gSaveContext+0x1414)($at) /* 02284 80ACC1A4 24040014 */ addiu $a0, $zero, 0x0014 ## $a0 = 00000014 /* 02288 80ACC1A8 0C03D13B */ jal func_800F44EC /* 0228C 80ACC1AC 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A @@ -157,8 +157,8 @@ glabel func_80ACC00C /* 022A0 80ACC1C0 AE18040C */ sw $t8, 0x040C($s0) ## 0000040C /* 022A4 80ACC1C4 A200040A */ sb $zero, 0x040A($s0) ## 0000040A /* 022A8 80ACC1C8 A60803FC */ sh $t0, 0x03FC($s0) ## 000003FC -/* 022AC 80ACC1CC 3C018012 */ lui $at, 0x8012 ## $at = 80120000 -/* 022B0 80ACC1D0 A420FB40 */ sh $zero, -0x04C0($at) ## 8011FB40 +/* 022AC 80ACC1CC 3C018012 */ lui $at, %hi(D_8011FB40) +/* 022B0 80ACC1D0 A420FB40 */ sh $zero, %lo(D_8011FB40)($at) /* 022B4 80ACC1D4 3C014214 */ lui $at, 0x4214 ## $at = 42140000 .L80ACC1D8: /* 022B8 80ACC1D8 44815000 */ mtc1 $at, $f10 ## $f10 = 37.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s index eca6d79b5b..8a0c38638f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s @@ -248,7 +248,7 @@ glabel EnPart_Draw /* 0113C 80ACEF0C 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 /* 01140 80ACEF10 254A2FF0 */ addiu $t2, $t2, 0x2FF0 ## $t2 = 06002FF0 /* 01144 80ACEF14 154B003A */ bne $t2, $t3, .L80ACF000 -/* 01148 80ACEF18 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 01148 80ACEF18 3C068016 */ lui $a2, %hi(gSegments) /* 0114C 80ACEF1C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 01150 80ACEF20 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01154 80ACEF24 24841300 */ addiu $a0, $a0, 0x1300 ## $a0 = 06001300 @@ -259,7 +259,7 @@ glabel EnPart_Draw /* 01168 80ACEF38 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 0116C 80ACEF3C 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 /* 01170 80ACEF40 00187880 */ sll $t7, $t8, 2 -/* 01174 80ACEF44 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 01174 80ACEF44 24C66FA8 */ addiu $a2, %lo(gSegments) /* 01178 80ACEF48 00CFC821 */ addu $t9, $a2, $t7 /* 0117C 80ACEF4C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01180 80ACEF50 8F2A0000 */ lw $t2, 0x0000($t9) ## 00000000 @@ -314,7 +314,7 @@ glabel EnPart_Draw /* 0123C 80ACF00C 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 /* 01240 80ACF010 254A2FF0 */ addiu $t2, $t2, 0x2FF0 ## $t2 = 06002FF0 /* 01244 80ACF014 15450039 */ bne $t2, $a1, .L80ACF0FC -/* 01248 80ACF018 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 01248 80ACF018 3C068016 */ lui $a2, %hi(gSegments) /* 0124C 80ACF01C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 01250 80ACF020 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01254 80ACF024 24841B00 */ addiu $a0, $a0, 0x1B00 ## $a0 = 06001B00 @@ -325,7 +325,7 @@ glabel EnPart_Draw /* 01268 80ACF038 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 /* 0126C 80ACF03C 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 /* 01270 80ACF040 000EC080 */ sll $t8, $t6, 2 -/* 01274 80ACF044 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 01274 80ACF044 24C66FA8 */ addiu $a2, %lo(gSegments) /* 01278 80ACF048 00D87821 */ addu $t7, $a2, $t8 /* 0127C 80ACF04C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 01280 80ACF050 8DF90000 */ lw $t9, 0x0000($t7) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACDDE8.s b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACDDE8.s index 3e89101164..e775c9536b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACDDE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACDDE8.s @@ -264,9 +264,9 @@ glabel L80ACE0AC /* 00310 80ACE0E0 3C0180AD */ lui $at, %hi(D_80ACF2A4) ## $at = 80AD0000 /* 00314 80ACE0E4 46029182 */ mul.s $f6, $f18, $f2 /* 00318 80ACE0E8 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 0031C 80ACE0EC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 0031C 80ACE0EC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 00320 80ACE0F0 44050000 */ mfc1 $a1, $f0 -/* 00324 80ACE0F4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00324 80ACE0F4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00328 80ACE0F8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0032C 80ACE0FC 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 00330 80ACE100 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Init.s index 6102a3d714..60f7be36fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Init.s @@ -37,8 +37,8 @@ glabel EnPeehat_Init /* 00068 80ACF508 0C02915F */ jal SkelAnime_Init /* 0006C 80ACF50C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00070 80ACF510 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00074 80ACF514 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00070 80ACF510 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00074 80ACF514 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00078 80ACF518 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0007C 80ACF51C 3C0542C8 */ lui $a1, 0x42C8 ## $a1 = 42C80000 /* 00080 80ACF520 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFBCC.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFBCC.s index d550601180..3be6629d18 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFBCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFBCC.s @@ -1,6 +1,6 @@ glabel func_80ACFBCC -/* 0072C 80ACFBCC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00730 80ACFBD0 8DCEE670 */ lw $t6, -0x1990($t6) ## 8015E670 +/* 0072C 80ACFBCC 3C0E8016 */ lui $t6, %hi(gSaveContext+0x10) +/* 00730 80ACFBD0 8DCEE670 */ lw $t6, %lo(gSaveContext+0x10)($t6) /* 00734 80ACFBD4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00738 80ACFBD8 AFB00020 */ sw $s0, 0x0020($sp) /* 0073C 80ACFBDC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFDAC.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFDAC.s index 77291eb198..66a9aeaeac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFDAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFDAC.s @@ -1,6 +1,6 @@ glabel func_80ACFDAC -/* 0090C 80ACFDAC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00910 80ACFDB0 8DCEE670 */ lw $t6, -0x1990($t6) ## 8015E670 +/* 0090C 80ACFDAC 3C0E8016 */ lui $t6, %hi(gSaveContext+0x10) +/* 00910 80ACFDB0 8DCEE670 */ lw $t6, %lo(gSaveContext+0x10)($t6) /* 00914 80ACFDB4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00918 80ACFDB8 AFB00020 */ sw $s0, 0x0020($sp) /* 0091C 80ACFDBC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s index 333c89c9c3..4b920b9a43 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s @@ -15,8 +15,8 @@ glabel func_80ACFEF8 /* 00A74 80ACFF14 0C02927F */ jal SkelAnime_FrameUpdateMatrix /* 00A78 80ACFF18 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00A7C 80ACFF1C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00A80 80ACFF20 8DCEE670 */ lw $t6, -0x1990($t6) ## 8015E670 +/* 00A7C 80ACFF1C 3C0E8016 */ lui $t6, %hi(gSaveContext+0x10) +/* 00A80 80ACFF20 8DCEE670 */ lw $t6, %lo(gSaveContext+0x10)($t6) /* 00A84 80ACFF24 15C00007 */ bne $t6, $zero, .L80ACFF44 /* 00A88 80ACFF28 00000000 */ nop /* 00A8C 80ACFF2C C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD05A8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD05A8.s index d874042d07..d167bccdaa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD05A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD05A8.s @@ -38,8 +38,8 @@ glabel func_80AD05A8 .L80AD0630: /* 01190 80AD0630 A61902F8 */ sh $t9, 0x02F8($s0) ## 000002F8 .L80AD0634: -/* 01194 80AD0634 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 01198 80AD0638 8D08E670 */ lw $t0, -0x1990($t0) ## 8015E670 +/* 01194 80AD0634 3C088016 */ lui $t0, %hi(gSaveContext+0x10) +/* 01198 80AD0638 8D08E670 */ lw $t0, %lo(gSaveContext+0x10)($t0) /* 0119C 80AD063C 8FA5002C */ lw $a1, 0x002C($sp) /* 011A0 80AD0640 15000018 */ bne $t0, $zero, .L80AD06A4 /* 011A4 80AD0644 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0FC8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0FC8.s index 533e87f54d..a2527846a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0FC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0FC8.s @@ -114,10 +114,10 @@ glabel func_80AD0FC8 /* 01CA0 80AD1140 A61902F8 */ sh $t9, 0x02F8($s0) ## 000002F8 .L80AD1144: /* 01CA4 80AD1144 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 01CA8 80AD1148 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 01CA8 80AD1148 3C0A8016 */ lui $t2, %hi(gSaveContext+0x10) /* 01CAC 80AD114C 2509015E */ addiu $t1, $t0, 0x015E ## $t1 = 0000015E /* 01CB0 80AD1150 A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 -/* 01CB4 80AD1154 8D4AE670 */ lw $t2, -0x1990($t2) ## 8015E670 +/* 01CB4 80AD1154 8D4AE670 */ lw $t2, %lo(gSaveContext+0x10)($t2) /* 01CB8 80AD1158 8FA50028 */ lw $a1, 0x0028($sp) /* 01CBC 80AD115C 15400013 */ bne $t2, $zero, .L80AD11AC /* 01CC0 80AD1160 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1258.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1258.s index 9c942035dd..248305039e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1258.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1258.s @@ -109,8 +109,8 @@ glabel func_80AD1258 /* 01F20 80AD13C0 240B003C */ addiu $t3, $zero, 0x003C ## $t3 = 0000003C /* 01F24 80AD13C4 A60B02F6 */ sh $t3, 0x02F6($s0) ## 000002F6 .L80AD13C8: -/* 01F28 80AD13C8 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 01F2C 80AD13CC 8D8CE670 */ lw $t4, -0x1990($t4) ## 8015E670 +/* 01F28 80AD13C8 3C0C8016 */ lui $t4, %hi(gSaveContext+0x10) +/* 01F2C 80AD13CC 8D8CE670 */ lw $t4, %lo(gSaveContext+0x10)($t4) /* 01F30 80AD13D0 8FA50034 */ lw $a1, 0x0034($sp) /* 01F34 80AD13D4 15800012 */ bne $t4, $zero, .L80AD1420 /* 01F38 80AD13D8 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s index cb29e9155e..2e64fb08ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s @@ -66,10 +66,10 @@ glabel EnPoDesert_Draw /* 00C1C 80AD38CC 3C0880AD */ lui $t0, %hi(func_80AD3594) ## $t0 = 80AD0000 /* 00C20 80AD38D0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00C24 80AD38D4 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 00C28 80AD38D8 3C0E8011 */ lui $t6, 0x8011 ## $t6 = 80110000 +/* 00C28 80AD38D8 3C0E8011 */ lui $t6, %hi(D_80116280) /* 00C2C 80AD38DC 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 00C30 80AD38E0 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 00C34 80AD38E4 25CE6280 */ addiu $t6, $t6, 0x6280 ## $t6 = 80116280 +/* 00C34 80AD38E4 25CE6280 */ addiu $t6, %lo(D_80116280) /* 00C38 80AD38E8 35AD0030 */ ori $t5, $t5, 0x0030 ## $t5 = DB060030 /* 00C3C 80AD38EC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 00C40 80AD38F0 1000000A */ beq $zero, $zero, .L80AD391C @@ -77,10 +77,10 @@ glabel EnPoDesert_Draw .L80AD38F8: /* 00C48 80AD38F8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00C4C 80AD38FC 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 00C50 80AD3900 3C198011 */ lui $t9, 0x8011 ## $t9 = 80110000 +/* 00C50 80AD3900 3C198011 */ lui $t9, %hi(D_80116280+0x10) /* 00C54 80AD3904 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 00C58 80AD3908 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 00C5C 80AD390C 27396290 */ addiu $t9, $t9, 0x6290 ## $t9 = 80116290 +/* 00C5C 80AD390C 27396290 */ addiu $t9, %lo(D_80116280+0x10) /* 00C60 80AD3910 37180030 */ ori $t8, $t8, 0x0030 ## $t8 = DB060030 /* 00C64 80AD3914 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 00C68 80AD3918 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Init.s index 5acd7c5aee..c925afe113 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Init.s @@ -74,8 +74,8 @@ glabel EnPoDesert_Init /* 0010C 80AD2DBC 0C01E763 */ jal Lights_InitType0PositionalLight /* 00110 80AD2DC0 8FA40034 */ lw $a0, 0x0034($sp) -/* 00114 80AD2DC4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00118 80AD2DC8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00114 80AD2DC4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00118 80AD2DC8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0011C 80AD2DCC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00120 80AD2DD0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00124 80AD2DD4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Update.s index f34669eb79..eca04fd919 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Update.s @@ -46,11 +46,11 @@ glabel EnPoDesert_Update ## CollisionCheck_setOT /* 00800 80AD34B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00804 80AD34B4 922F1C27 */ lbu $t7, 0x1C27($s1) ## 00001C27 -/* 00808 80AD34B8 3C098003 */ lui $t1, 0x8003 ## $t1 = 80030000 +/* 00808 80AD34B8 3C098003 */ lui $t1, %hi(ActorShadow_DrawFunc_Circle) /* 0080C 80AD34BC 51E00008 */ beql $t7, $zero, .L80AD34E0 /* 00810 80AD34C0 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 /* 00814 80AD34C4 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 -/* 00818 80AD34C8 2529B5EC */ addiu $t1, $t1, 0xB5EC ## $t1 = 8002B5EC +/* 00818 80AD34C8 2529B5EC */ addiu $t1, %lo(ActorShadow_DrawFunc_Circle) /* 0081C 80AD34CC AE0900C0 */ sw $t1, 0x00C0($s0) ## 000000C0 /* 00820 80AD34D0 37080081 */ ori $t0, $t8, 0x0081 ## $t0 = 00000081 /* 00824 80AD34D4 10000006 */ beq $zero, $zero, .L80AD34F0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s index 01d914a2ec..8aa3842f35 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s @@ -18,7 +18,7 @@ glabel func_80AD2E64 /* 001F4 80AD2EA4 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 /* 001F8 80AD2EA8 8FA9001C */ lw $t1, 0x001C($sp) /* 001FC 80AD2EAC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00200 80AD2EB0 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 00200 80AD2EB0 3C0D8016 */ lui $t5, %hi(gSegments) /* 00204 80AD2EB4 8D230004 */ lw $v1, 0x0004($t1) ## 00000004 /* 00208 80AD2EB8 8C8F0198 */ lw $t7, 0x0198($a0) ## 00000198 /* 0020C 80AD2EBC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 @@ -26,7 +26,7 @@ glabel func_80AD2E64 /* 00214 80AD2EC4 000A5F02 */ srl $t3, $t2, 28 /* 00218 80AD2EC8 000B6080 */ sll $t4, $t3, 2 /* 0021C 80AD2ECC 01AC6821 */ addu $t5, $t5, $t4 -/* 00220 80AD2ED0 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 +/* 00220 80AD2ED0 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) /* 00224 80AD2ED4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00228 80AD2ED8 000FC880 */ sll $t9, $t7, 2 /* 0022C 80AD2EDC 00617024 */ and $t6, $v1, $at diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s index 57bee6cf01..5fa2cf4c0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s @@ -81,10 +81,10 @@ glabel EnPoField_Draw /* 02EE4 80AD69E4 AFAF0010 */ sw $t7, 0x0010($sp) /* 02EE8 80AD69E8 8FA3005C */ lw $v1, 0x005C($sp) /* 02EEC 80AD69EC 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 02EF0 80AD69F0 3C098011 */ lui $t1, 0x8011 ## $t1 = 80110000 +/* 02EF0 80AD69F0 3C098011 */ lui $t1, %hi(D_80116280+0x10) /* 02EF4 80AD69F4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 02EF8 80AD69F8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02EFC 80AD69FC 25296290 */ addiu $t1, $t1, 0x6290 ## $t1 = 80116290 +/* 02EFC 80AD69FC 25296290 */ addiu $t1, %lo(D_80116280+0x10) /* 02F00 80AD6A00 37390030 */ ori $t9, $t9, 0x0030 ## $t9 = DB060030 /* 02F04 80AD6A04 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 02F08 80AD6A08 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 @@ -121,10 +121,10 @@ glabel EnPoField_Draw /* 02F80 80AD6A80 AFAE0010 */ sw $t6, 0x0010($sp) /* 02F84 80AD6A84 8FA30054 */ lw $v1, 0x0054($sp) /* 02F88 80AD6A88 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 02F8C 80AD6A8C 3C198011 */ lui $t9, 0x8011 ## $t9 = 80110000 +/* 02F8C 80AD6A8C 3C198011 */ lui $t9, %hi(D_80116280) /* 02F90 80AD6A90 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 02F94 80AD6A94 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 02F98 80AD6A98 27396280 */ addiu $t9, $t9, 0x6280 ## $t9 = 80116280 +/* 02F98 80AD6A98 27396280 */ addiu $t9, %lo(D_80116280) /* 02F9C 80AD6A9C 37180030 */ ori $t8, $t8, 0x0030 ## $t8 = DB060030 /* 02FA0 80AD6AA0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 02FA4 80AD6AA4 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Init.s index 87fe1cf3d0..686c0795d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Init.s @@ -129,8 +129,8 @@ glabel EnPoField_Init /* 001D4 80AD3CD4 0C01E77C */ jal Lights_InitType2PositionalLight /* 001D8 80AD3CD8 8FA40034 */ lw $a0, 0x0034($sp) -/* 001DC 80AD3CDC 3C0F8003 */ lui $t7, 0x8003 ## $t7 = 80030000 -/* 001E0 80AD3CE0 25EFB5EC */ addiu $t7, $t7, 0xB5EC ## $t7 = 8002B5EC +/* 001DC 80AD3CDC 3C0F8003 */ lui $t7, %hi(ActorShadow_DrawFunc_Circle) +/* 001E0 80AD3CE0 25EFB5EC */ addiu $t7, %lo(ActorShadow_DrawFunc_Circle) /* 001E4 80AD3CE4 AE0F00C0 */ sw $t7, 0x00C0($s0) ## 000000C0 /* 001E8 80AD3CE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001EC 80AD3CEC 0C2B4F5A */ jal func_80AD3D68 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s index d6c4d75bc6..002f1e2ae3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s @@ -180,7 +180,7 @@ glabel func_80AD6C4C /* 033B4 80AD6EB4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 033B8 80AD6EB8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 033BC 80AD6EBC 37390024 */ ori $t9, $t9, 0x0024 ## $t9 = DB060024 -/* 033C0 80AD6EC0 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 033C0 80AD6EC0 3C0C8016 */ lui $t4, %hi(gSegments) /* 033C4 80AD6EC4 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 033C8 80AD6EC8 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 /* 033CC 80AD6ECC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 @@ -191,7 +191,7 @@ glabel func_80AD6C4C /* 033E0 80AD6EE0 000F4F02 */ srl $t1, $t7, 28 /* 033E4 80AD6EE4 00095880 */ sll $t3, $t1, 2 /* 033E8 80AD6EE8 018B6021 */ addu $t4, $t4, $t3 -/* 033EC 80AD6EEC 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 033EC 80AD6EEC 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 033F0 80AD6EF0 00815024 */ and $t2, $a0, $at /* 033F4 80AD6EF4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 033F8 80AD6EF8 018A6821 */ addu $t5, $t4, $t2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s index 91a20c45c5..0c72a041ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s @@ -29,7 +29,7 @@ glabel EnPoRelay_Draw /* 0143C 80AD8B7C 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 01440 80AD8B80 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 01444 80AD8B84 3C0480AE */ lui $a0, %hi(D_80AD8D54) ## $a0 = 80AE0000 -/* 01448 80AD8B88 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 01448 80AD8B88 3C0E8016 */ lui $t6, %hi(gSegments) /* 0144C 80AD8B8C 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 /* 01450 80AD8B90 ACB802C0 */ sw $t8, 0x02C0($a1) ## 000002C0 /* 01454 80AD8B94 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 @@ -45,7 +45,7 @@ glabel EnPoRelay_Draw /* 0147C 80AD8BBC 000B6702 */ srl $t4, $t3, 28 /* 01480 80AD8BC0 000C6880 */ sll $t5, $t4, 2 /* 01484 80AD8BC4 01CD7021 */ addu $t6, $t6, $t5 -/* 01488 80AD8BC8 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 01488 80AD8BC8 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 0148C 80AD8BCC 00815024 */ and $t2, $a0, $at /* 01490 80AD8BD0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01494 80AD8BD4 014E7821 */ addu $t7, $t2, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s index 2d0e03021d..5ab9b8d87a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s @@ -9,8 +9,8 @@ glabel EnPoRelay_Init /* 0001C 80AD775C 0C01E037 */ jal Actor_ProcessInitChain /* 00020 80AD7760 24A58D28 */ addiu $a1, $a1, %lo(D_80AD8D28) ## $a1 = 80AD8D28 -/* 00024 80AD7764 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00028 80AD7768 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00024 80AD7764 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00028 80AD7768 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0002C 80AD776C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00030 80AD7770 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00034 80AD7774 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7984.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7984.s index 960e17543d..5e878956b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7984.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7984.s @@ -22,12 +22,12 @@ glabel func_80AD7984 /* 00294 80AD79D4 31AE001F */ andi $t6, $t5, 0x001F ## $t6 = 00000000 /* 00298 80AD79D8 0C0222CD */ jal func_80088B34 /* 0029C 80AD79DC A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 -/* 002A0 80AD79E0 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 002A4 80AD79E4 91EF746E */ lbu $t7, 0x746E($t7) ## 8012746E -/* 002A8 80AD79E8 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 002A0 80AD79E0 3C0F8012 */ lui $t7, %hi(gItemSlots+0xa) +/* 002A4 80AD79E4 91EF746E */ lbu $t7, %lo(gItemSlots+0xa)($t7) +/* 002A8 80AD79E8 3C188016 */ lui $t8, %hi(gSaveContext+0x74) /* 002AC 80AD79EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 002B0 80AD79F0 030FC021 */ addu $t8, $t8, $t7 -/* 002B4 80AD79F4 9318E6D4 */ lbu $t8, -0x192C($t8) ## 8015E6D4 +/* 002B4 80AD79F4 9318E6D4 */ lbu $t8, %lo(gSaveContext+0x74)($t8) /* 002B8 80AD79F8 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 /* 002BC 80AD79FC 3B1900FF */ xori $t9, $t8, 0x00FF ## $t9 = 801600FF /* 002C0 80AD7A00 0019C82B */ sltu $t9, $zero, $t9 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8174.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8174.s index 5f0a0898e3..7599c27376 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8174.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8174.s @@ -29,9 +29,9 @@ glabel func_80AD8174 /* 00A98 80AD81D8 0C00B55C */ jal Actor_Kill /* 00A9C 80AD81DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AA0 80AD81E0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00AA0 80AD81E0 3C018016 */ lui $at, %hi(gSaveContext+0x13ce) /* 00AA4 80AD81E4 1000000B */ beq $zero, $zero, .L80AD8214 -/* 00AA8 80AD81E8 A420FA2E */ sh $zero, -0x05D2($at) ## 8015FA2E +/* 00AA8 80AD81E8 A420FA2E */ sh $zero, %lo(gSaveContext+0x13ce)($at) .L80AD81EC: /* 00AAC 80AD81EC 0C00B84B */ jal func_8002E12C /* 00AB0 80AD81F0 24063000 */ addiu $a2, $zero, 0x3000 ## $a2 = 00003000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8234.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8234.s index b59ae46dad..31a890f3ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8234.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8234.s @@ -45,8 +45,8 @@ glabel func_80AD8234 /* 00B88 80AD82C8 0C00BCCD */ jal func_8002F334 /* 00B8C 80AD82CC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00B90 80AD82D0 10400006 */ beq $v0, $zero, .L80AD82EC -/* 00B94 80AD82D4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00B98 80AD82D8 A420FA2E */ sh $zero, -0x05D2($at) ## 8015FA2E +/* 00B94 80AD82D4 3C018016 */ lui $at, %hi(gSaveContext+0x13ce) +/* 00B98 80AD82D8 A420FA2E */ sh $zero, %lo(gSaveContext+0x13ce)($at) /* 00B9C 80AD82DC 3C0F80AE */ lui $t7, %hi(func_80AD830C) ## $t7 = 80AE0000 /* 00BA0 80AD82E0 25EF830C */ addiu $t7, $t7, %lo(func_80AD830C) ## $t7 = 80AD830C /* 00BA4 80AD82E4 A6000196 */ sh $zero, 0x0196($s0) ## 00000196 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD830C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD830C.s index 6b02c4e6af..0f44ce24c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD830C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD830C.s @@ -250,8 +250,8 @@ glabel func_80AD830C /* 00F7C 80AD86BC 11A00032 */ beq $t5, $zero, .L80AD8788 /* 00F80 80AD86C0 00000000 */ nop /* 00F84 80AD86C4 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 00F88 80AD86C8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00F8C 80AD86CC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00F88 80AD86C8 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00F8C 80AD86CC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00F90 80AD86D0 E7A80060 */ swc1 $f8, 0x0060($sp) /* 00F94 80AD86D4 C6120080 */ lwc1 $f18, 0x0080($s0) ## 00000080 /* 00F98 80AD86D8 846213D0 */ lh $v0, 0x13D0($v1) ## 8015FA30 @@ -267,9 +267,9 @@ glabel func_80AD830C /* 00FBC 80AD86FC 0C00B35B */ jal Flags_GetCollectible /* 00FC0 80AD8700 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00FC4 80AD8704 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00FC4 80AD8704 3C038016 */ lui $v1, %hi(gSaveContext) /* 00FC8 80AD8708 1440000F */ bne $v0, $zero, .L80AD8748 -/* 00FCC 80AD870C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00FCC 80AD870C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00FD0 80AD8710 846F13D0 */ lh $t7, 0x13D0($v1) ## 8015FA30 /* 00FD4 80AD8714 29E1003D */ slti $at, $t7, 0x003D /* 00FD8 80AD8718 5020000C */ beql $at, $zero, .L80AD874C @@ -308,8 +308,8 @@ glabel func_80AD830C /* 01048 80AD8788 0C00B34E */ jal Flags_SetTempClear /* 0104C 80AD878C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01050 80AD8790 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 01054 80AD8794 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 01050 80AD8790 3C038016 */ lui $v1, %hi(gSaveContext) +/* 01054 80AD8794 2463E660 */ addiu $v1, %lo(gSaveContext) /* 01058 80AD8798 847913D0 */ lh $t9, 0x13D0($v1) ## 8015FA30 /* 0105C 80AD879C AC790ED0 */ sw $t9, 0x0ED0($v1) ## 8015F530 .L80AD87A0: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s index d533f766cc..b4f1bd58fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s @@ -81,12 +81,12 @@ glabel EnPoSisters_Draw /* 0414C 80ADD0DC 241200FF */ addiu $s2, $zero, 0x00FF ## $s2 = 000000FF /* 04150 80ADD0E0 3C15FB00 */ lui $s5, 0xFB00 ## $s5 = FB000000 /* 04154 80ADD0E4 12420003 */ beq $s2, $v0, .L80ADD0F4 -/* 04158 80ADD0E8 3C0E8011 */ lui $t6, 0x8011 ## $t6 = 80110000 +/* 04158 80ADD0E8 3C0E8011 */ lui $t6, %hi(D_80116280+0x10) /* 0415C 80ADD0EC 14400026 */ bne $v0, $zero, .L80ADD188 /* 04160 80ADD0F0 2401FF00 */ addiu $at, $zero, 0xFF00 ## $at = FFFFFF00 .L80ADD0F4: /* 04164 80ADD0F4 8E6202C0 */ lw $v0, 0x02C0($s3) ## 000002C0 -/* 04168 80ADD0F8 25CE6290 */ addiu $t6, $t6, 0x6290 ## $t6 = 80116290 +/* 04168 80ADD0F8 25CE6290 */ addiu $t6, %lo(D_80116280+0x10) /* 0416C 80ADD0FC 3C0780AE */ lui $a3, %hi(func_80ADC77C) ## $a3 = 80AE0000 /* 04170 80ADD100 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 04174 80ADD104 AE7802C0 */ sw $t8, 0x02C0($s3) ## 000002C0 @@ -130,8 +130,8 @@ glabel EnPoSisters_Draw /* 04208 80ADD198 AE7802D0 */ sw $t8, 0x02D0($s3) ## 000002D0 /* 0420C 80ADD19C AC550000 */ sw $s5, 0x0000($v0) ## 00000000 /* 04210 80ADD1A0 92990231 */ lbu $t9, 0x0231($s4) ## 00000231 -/* 04214 80ADD1A4 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 -/* 04218 80ADD1A8 258C6280 */ addiu $t4, $t4, 0x6280 ## $t4 = 80116280 +/* 04214 80ADD1A4 3C0C8011 */ lui $t4, %hi(D_80116280) +/* 04218 80ADD1A8 258C6280 */ addiu $t4, %lo(D_80116280) /* 0421C 80ADD1AC 03215025 */ or $t2, $t9, $at ## $t2 = 00000000 /* 04220 80ADD1B0 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 04224 80ADD1B4 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Init.s index 85a46dd31d..237fdf31eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Init.s @@ -9,8 +9,8 @@ glabel EnPoSisters_Init /* 0001C 80AD8FAC 0C01E037 */ jal Actor_ProcessInitChain /* 00020 80AD8FB0 24A5D788 */ addiu $a1, $a1, %lo(D_80ADD788) ## $a1 = 80ADD788 -/* 00024 80AD8FB4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00028 80AD8FB8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00024 80AD8FB4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00028 80AD8FB8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0002C 80AD8FBC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00030 80AD8FC0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00034 80AD8FC4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Init.s index 1d3acb5993..d0759f093d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Init.s @@ -9,8 +9,8 @@ glabel EnPoh_Init /* 0001C 80ADDD6C 0C01E037 */ jal Actor_ProcessInitChain /* 00020 80ADDD70 24A51B5C */ addiu $a1, $a1, %lo(D_80AE1B5C) ## $a1 = 80AE1B5C -/* 00024 80ADDD74 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00028 80ADDD78 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00024 80ADDD74 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00028 80ADDD78 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0002C 80ADDD7C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00030 80ADDD80 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00034 80ADDD84 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE7C0.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE7C0.s index 59ee400b2f..2dd691f6f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE7C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE7C0.s @@ -38,10 +38,10 @@ glabel func_80ADE7C0 /* 00AFC 80ADE84C 14410031 */ bne $v0, $at, .L80ADE914 /* 00B00 80ADE850 240A5005 */ addiu $t2, $zero, 0x5005 ## $t2 = 00005005 .L80ADE854: -/* 00B04 80ADE854 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 -/* 00B08 80ADE858 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00B0C 80ADE85C 8DCEE704 */ lw $t6, -0x18FC($t6) ## 8015E704 -/* 00B10 80ADE860 8DAD715C */ lw $t5, 0x715C($t5) ## 8012715C +/* 00B04 80ADE854 3C0D8012 */ lui $t5, %hi(gBitFlags+0x3c) +/* 00B08 80ADE858 3C0E8016 */ lui $t6, %hi(gSaveContext+0xa4) +/* 00B0C 80ADE85C 8DCEE704 */ lw $t6, %lo(gSaveContext+0xa4)($t6) +/* 00B10 80ADE860 8DAD715C */ lw $t5, %lo(gBitFlags+0x3c)($t5) /* 00B14 80ADE864 24185000 */ addiu $t8, $zero, 0x5000 ## $t8 = 00005000 /* 00B18 80ADE868 8FA4001C */ lw $a0, 0x001C($sp) /* 00B1C 80ADE86C 01AE7824 */ and $t7, $t5, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s index 6fdeb98f83..221b8f6f3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s @@ -38,12 +38,12 @@ glabel func_80AE0EE4 /* 031EC 80AE0F3C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 031F0 80AE0F40 3C08FB00 */ lui $t0, 0xFB00 ## $t0 = FB000000 /* 031F4 80AE0F44 10410003 */ beq $v0, $at, .L80AE0F54 -/* 031F8 80AE0F48 3C188011 */ lui $t8, 0x8011 ## $t8 = 80110000 +/* 031F8 80AE0F48 3C188011 */ lui $t8, %hi(D_80116280+0x10) /* 031FC 80AE0F4C 14400026 */ bne $v0, $zero, .L80AE0FE8 /* 03200 80AE0F50 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 .L80AE0F54: /* 03204 80AE0F54 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03208 80AE0F58 27186290 */ addiu $t8, $t8, 0x6290 ## $t8 = 80116290 +/* 03208 80AE0F58 27186290 */ addiu $t8, %lo(D_80116280+0x10) /* 0320C 80AE0F5C 3C0780AE */ lui $a3, %hi(func_80AE0BF8) ## $a3 = 80AE0000 /* 03210 80AE0F60 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 03214 80AE0F64 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 @@ -87,8 +87,8 @@ glabel func_80AE0EE4 /* 032A8 80AE0FF8 AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 /* 032AC 80AE0FFC AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 032B0 80AE1000 922C029D */ lbu $t4, 0x029D($s1) ## 0000029D -/* 032B4 80AE1004 3C188011 */ lui $t8, 0x8011 ## $t8 = 80110000 -/* 032B8 80AE1008 27186280 */ addiu $t8, $t8, 0x6280 ## $t8 = 80116280 +/* 032B4 80AE1004 3C188011 */ lui $t8, %hi(D_80116280) +/* 032B8 80AE1008 27186280 */ addiu $t8, %lo(D_80116280) /* 032BC 80AE100C 01816825 */ or $t5, $t4, $at ## $t5 = FFFFFF00 /* 032C0 80AE1010 AC6D0004 */ sw $t5, 0x0004($v1) ## 00000004 /* 032C4 80AE1014 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s index 04c8674cb5..59476e0bf7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s @@ -112,10 +112,10 @@ glabel func_80AE1148 /* 0356C 80AE12BC AFAE0010 */ sw $t6, 0x0010($sp) /* 03570 80AE12C0 8FA3006C */ lw $v1, 0x006C($sp) /* 03574 80AE12C4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 03578 80AE12C8 3C198011 */ lui $t9, 0x8011 ## $t9 = 80110000 +/* 03578 80AE12C8 3C198011 */ lui $t9, %hi(D_80116280+0x10) /* 0357C 80AE12CC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 03580 80AE12D0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03584 80AE12D4 27396290 */ addiu $t9, $t9, 0x6290 ## $t9 = 80116290 +/* 03584 80AE12D4 27396290 */ addiu $t9, %lo(D_80116280+0x10) /* 03588 80AE12D8 37180030 */ ori $t8, $t8, 0x0030 ## $t8 = DB060030 /* 0358C 80AE12DC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 03590 80AE12E0 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 @@ -201,10 +201,10 @@ glabel func_80AE1148 /* 036CC 80AE141C AFAB0010 */ sw $t3, 0x0010($sp) /* 036D0 80AE1420 8FA3005C */ lw $v1, 0x005C($sp) /* 036D4 80AE1424 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 036D8 80AE1428 3C0E8011 */ lui $t6, 0x8011 ## $t6 = 80110000 +/* 036D8 80AE1428 3C0E8011 */ lui $t6, %hi(D_80116280) /* 036DC 80AE142C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 036E0 80AE1430 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 036E4 80AE1434 25CE6280 */ addiu $t6, $t6, 0x6280 ## $t6 = 80116280 +/* 036E4 80AE1434 25CE6280 */ addiu $t6, %lo(D_80116280) /* 036E8 80AE1438 35AD0030 */ ori $t5, $t5, 0x0030 ## $t5 = DB060030 /* 036EC 80AE143C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 036F0 80AE1440 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Destroy.s index 0023832a24..d3308d84cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Destroy.s @@ -1,6 +1,6 @@ glabel EnRd_Destroy -/* 001F0 80AE25F0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 001F4 80AE25F4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 001F0 80AE25F0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 001F4 80AE25F4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 001F8 80AE25F8 844E1422 */ lh $t6, 0x1422($v0) ## 8015FA82 /* 001FC 80AE25FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00200 80AE2600 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s index 860a07440e..d3cec6c31b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s @@ -43,8 +43,8 @@ glabel EnRd_Draw /* 022E4 80AE46E4 AE2802C0 */ sw $t0, 0x02C0($s1) ## 000002C0 /* 022E8 80AE46E8 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 /* 022EC 80AE46EC 860A0314 */ lh $t2, 0x0314($s0) ## 00000314 -/* 022F0 80AE46F0 3C0E8011 */ lui $t6, 0x8011 ## $t6 = 80110000 -/* 022F4 80AE46F4 25CE6290 */ addiu $t6, $t6, 0x6290 ## $t6 = 80116290 +/* 022F0 80AE46F0 3C0E8011 */ lui $t6, %hi(D_80116280+0x10) +/* 022F4 80AE46F4 25CE6290 */ addiu $t6, %lo(D_80116280+0x10) /* 022F8 80AE46F8 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000000 /* 022FC 80AE46FC AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 /* 02300 80AE4700 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 @@ -111,8 +111,8 @@ glabel EnRd_Draw /* 023F0 80AE47F0 AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 /* 023F4 80AE47F4 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 /* 023F8 80AE47F8 86190314 */ lh $t9, 0x0314($s0) ## 00000314 -/* 023FC 80AE47FC 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 -/* 02400 80AE4800 256B6280 */ addiu $t3, $t3, 0x6280 ## $t3 = 80116280 +/* 023FC 80AE47FC 3C0B8011 */ lui $t3, %hi(D_80116280) +/* 02400 80AE4800 256B6280 */ addiu $t3, %lo(D_80116280) /* 02404 80AE4804 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000000 /* 02408 80AE4808 AC680004 */ sw $t0, 0x0004($v1) ## 00000004 /* 0240C 80AE480C 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Update.s index a611f8127e..fad4370027 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Update.s @@ -7,8 +7,8 @@ glabel EnRd_Update /* 01EF0 80AE42F0 AFA50044 */ sw $a1, 0x0044($sp) /* 01EF4 80AE42F4 0C2B9045 */ jal func_80AE4114 /* 01EF8 80AE42F8 AFAE0034 */ sw $t6, 0x0034($sp) -/* 01EFC 80AE42FC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01F00 80AE4300 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01EFC 80AE42FC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01F00 80AE4300 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01F04 80AE4304 844F1422 */ lh $t7, 0x1422($v0) ## 8015FA82 /* 01F08 80AE4308 51E00006 */ beql $t7, $zero, .L80AE4324 /* 01F0C 80AE430C 9202031C */ lbu $v0, 0x031C($s0) ## 0000031C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s index 7ef9566039..a947aedf8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s @@ -74,7 +74,7 @@ glabel L80AE3508 glabel L80AE3538 /* 01138 80AE3538 8FAC0040 */ lw $t4, 0x0040($sp) /* 0113C 80AE353C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01140 80AE3540 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 01140 80AE3540 3C0A8016 */ lui $t2, %hi(gSaveContext+4) /* 01144 80AE3544 8D8D0680 */ lw $t5, 0x0680($t4) ## 00000680 /* 01148 80AE3548 31AE0080 */ andi $t6, $t5, 0x0080 ## $t6 = 00000000 /* 0114C 80AE354C 15C00016 */ bne $t6, $zero, .L80AE35A8 @@ -103,7 +103,7 @@ glabel L80AE3538 /* 011A0 80AE35A0 10000081 */ beq $zero, $zero, .L80AE37A8 /* 011A4 80AE35A4 A2080304 */ sb $t0, 0x0304($s0) ## 00000304 .L80AE35A8: -/* 011A8 80AE35A8 8D4AE664 */ lw $t2, -0x199C($t2) ## FFFFE664 +/* 011A8 80AE35A8 8D4AE664 */ lw $t2, %lo(gSaveContext+4)($t2) /* 011AC 80AE35AC 3C05C4BB */ lui $a1, 0xC4BB ## $a1 = C4BB0000 /* 011B0 80AE35B0 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = C4BB8000 /* 011B4 80AE35B4 11400006 */ beq $t2, $zero, .L80AE35D0 @@ -209,8 +209,8 @@ glabel L80AE3538 /* 0131C 80AE371C 10000023 */ beq $zero, $zero, .L80AE37AC /* 01320 80AE3720 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AE3724 -/* 01324 80AE3724 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 01328 80AE3728 8DADE664 */ lw $t5, -0x199C($t5) ## 8015E664 +/* 01324 80AE3724 3C0D8016 */ lui $t5, %hi(gSaveContext+4) +/* 01328 80AE3728 8DADE664 */ lw $t5, %lo(gSaveContext+4)($t5) /* 0132C 80AE372C 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC /* 01330 80AE3730 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 01334 80AE3734 11A0001C */ beq $t5, $zero, .L80AE37A8 @@ -223,8 +223,8 @@ glabel L80AE3724 /* 0134C 80AE374C 10000017 */ beq $zero, $zero, .L80AE37AC /* 01350 80AE3750 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AE3754 -/* 01354 80AE3754 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 01358 80AE3758 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 +/* 01354 80AE3754 3C0E8016 */ lui $t6, %hi(gSaveContext+4) +/* 01358 80AE3758 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) /* 0135C 80AE375C 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC /* 01360 80AE3760 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 01364 80AE3764 11C00005 */ beq $t6, $zero, .L80AE377C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3DE4.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3DE4.s index 4e4e23d5f9..c6c7f38fcb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3DE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3DE4.s @@ -6,10 +6,10 @@ glabel func_80AE3DE4 /* 019F4 80AE3DF4 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 /* 019F8 80AE3DF8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 019FC 80AE3DFC A082031B */ sb $v0, 0x031B($a0) ## 0000031B -/* 01A00 80AE3E00 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 01A00 80AE3E00 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1422) /* 01A04 80AE3E04 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 01A08 80AE3E08 A48E0032 */ sh $t6, 0x0032($a0) ## 00000032 -/* 01A0C 80AE3E0C 85EFFA82 */ lh $t7, -0x057E($t7) ## 8015FA82 +/* 01A0C 80AE3E0C 85EFFA82 */ lh $t7, %lo(gSaveContext+0x1422)($t7) /* 01A10 80AE3E10 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01A14 80AE3E14 24180258 */ addiu $t8, $zero, 0x0258 ## $t8 = 00000258 /* 01A18 80AE3E18 11E0000D */ beq $t7, $zero, .L80AE3E50 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3ECC.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3ECC.s index 57bff38008..b0c6382fe2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3ECC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3ECC.s @@ -23,9 +23,9 @@ glabel func_80AE3ECC /* 01B20 80AE3F20 86020316 */ lh $v0, 0x0316($s0) ## 00000316 .L80AE3F24: /* 01B24 80AE3F24 14400003 */ bne $v0, $zero, .L80AE3F34 -/* 01B28 80AE3F28 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 01B28 80AE3F28 3C018016 */ lui $at, %hi(gSaveContext+0x1422) /* 01B2C 80AE3F2C A2000318 */ sb $zero, 0x0318($s0) ## 00000318 -/* 01B30 80AE3F30 A420FA82 */ sh $zero, -0x057E($at) ## 8015FA82 +/* 01B30 80AE3F30 A420FA82 */ sh $zero, %lo(gSaveContext+0x1422)($at) .L80AE3F34: /* 01B34 80AE3F34 92190114 */ lbu $t9, 0x0114($s0) ## 00000114 .L80AE3F38: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4114.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4114.s index 3f2e8ce194..57905a2edd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4114.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4114.s @@ -1,7 +1,7 @@ glabel func_80AE4114 /* 01D14 80AE4114 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01D18 80AE4118 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 01D1C 80AE411C 85EFFA82 */ lh $t7, -0x057E($t7) ## 8015FA82 +/* 01D18 80AE4118 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1422) +/* 01D1C 80AE411C 85EFFA82 */ lh $t7, %lo(gSaveContext+0x1422)($t7) /* 01D20 80AE4120 AFBF0024 */ sw $ra, 0x0024($sp) /* 01D24 80AE4124 AFB00020 */ sw $s0, 0x0020($sp) /* 01D28 80AE4128 AFA50034 */ sw $a1, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s index dd6e46a034..d817c10245 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s @@ -61,8 +61,8 @@ glabel EnReeba_Draw /* 017AC 80AE647C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 017B0 80AE6480 0C031AD5 */ jal Graph_CloseDisps /* 017B4 80AE6484 24070440 */ addiu $a3, $zero, 0x0440 ## $a3 = 00000440 -/* 017B8 80AE6488 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 017BC 80AE648C 8D8CFA90 */ lw $t4, -0x0570($t4) ## 8015FA90 +/* 017B8 80AE6488 3C0C8016 */ lui $t4, %hi(gGameInfo) +/* 017BC 80AE648C 8D8CFA90 */ lw $t4, %lo(gGameInfo)($t4) /* 017C0 80AE6490 858D12D4 */ lh $t5, 0x12D4($t4) ## 801612D4 /* 017C4 80AE6494 51A0002E */ beql $t5, $zero, .L80AE6550 /* 017C8 80AE6498 8FBF004C */ lw $ra, 0x004C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s index b1d2cc56af..ef5804a6dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s @@ -102,8 +102,8 @@ glabel EnReeba_Init /* 00144 80AE4E14 3C0180AE */ lui $at, %hi(D_80AE6680) ## $at = 80AE0000 /* 00148 80AE4E18 C4286680 */ lwc1 $f8, %lo(D_80AE6680)($at) /* 0014C 80AE4E1C C606028C */ lwc1 $f6, 0x028C($s0) ## 0000028C -/* 00150 80AE4E20 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00154 80AE4E24 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00150 80AE4E20 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00154 80AE4E24 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00158 80AE4E28 46083002 */ mul.s $f0, $f6, $f8 /* 0015C 80AE4E2C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00160 80AE4E30 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Init.s b/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Init.s index dc0e22e369..2329dce72f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Init.s @@ -37,10 +37,10 @@ glabel EnRiverSound_Init .L80AE69B0: /* 00080 80AE69B0 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 00084 80AE69B4 1441000E */ bne $v0, $at, .L80AE69F0 -/* 00088 80AE69B8 3C038012 */ lui $v1, 0x8012 ## $v1 = 80120000 -/* 0008C 80AE69BC 24637120 */ addiu $v1, $v1, 0x7120 ## $v1 = 80127120 -/* 00090 80AE69C0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00094 80AE69C4 8C42E704 */ lw $v0, -0x18FC($v0) ## 8015E704 +/* 00088 80AE69B8 3C038012 */ lui $v1, %hi(gBitFlags) +/* 0008C 80AE69BC 24637120 */ addiu $v1, %lo(gBitFlags) +/* 00090 80AE69C0 3C028016 */ lui $v0, %hi(gSaveContext+0xa4) +/* 00094 80AE69C4 8C42E704 */ lw $v0, %lo(gSaveContext+0xa4)($v0) /* 00098 80AE69C8 8C790030 */ lw $t9, 0x0030($v1) ## 80127150 /* 0009C 80AE69CC 03224024 */ and $t0, $t9, $v0 /* 000A0 80AE69D0 11000005 */ beq $t0, $zero, .L80AE69E8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Update.s b/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Update.s index 8bfe0df806..40ad177d2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_River_Sound/EnRiverSound_Update.s @@ -19,7 +19,7 @@ glabel EnRiverSound_Update .L80AE6F00: /* 005D0 80AE6F00 8608014E */ lh $t0, 0x014E($s0) ## 0000014E /* 005D4 80AE6F04 8F391E08 */ lw $t9, 0x1E08($t9) ## 00011E08 -/* 005D8 80AE6F08 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 005D8 80AE6F08 3C0D8016 */ lui $t5, %hi(gSegments) /* 005DC 80AE6F0C 000848C0 */ sll $t1, $t0, 3 /* 005E0 80AE6F10 03291021 */ addu $v0, $t9, $t1 /* 005E4 80AE6F14 8C430004 */ lw $v1, 0x0004($v0) ## 00000004 @@ -29,7 +29,7 @@ glabel EnRiverSound_Update /* 005F4 80AE6F24 000A5F02 */ srl $t3, $t2, 28 /* 005F8 80AE6F28 000B6080 */ sll $t4, $t3, 2 /* 005FC 80AE6F2C 01AC6821 */ addu $t5, $t5, $t4 -/* 00600 80AE6F30 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 +/* 00600 80AE6F30 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) /* 00604 80AE6F34 00617024 */ and $t6, $v1, $at /* 00608 80AE6F38 8FA6003C */ lw $a2, 0x003C($sp) /* 0060C 80AE6F3C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Init.s index fbc833b36a..fc31ae5dc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Init.s @@ -3,8 +3,8 @@ glabel EnRl_Init /* 00CBC 80AE7F6C AFBF0014 */ sw $ra, 0x0014($sp) /* 00CC0 80AE7F70 AFA40018 */ sw $a0, 0x0018($sp) /* 00CC4 80AE7F74 AFA5001C */ sw $a1, 0x001C($sp) -/* 00CC8 80AE7F78 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00CCC 80AE7F7C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00CC8 80AE7F78 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00CCC 80AE7F7C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00CD0 80AE7F80 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00CD4 80AE7F84 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00CD8 80AE7F88 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7590.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7590.s index 342dafec85..4d27b1b2ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7590.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7590.s @@ -1,7 +1,7 @@ glabel func_80AE7590 /* 002E0 80AE7590 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 002E4 80AE7594 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 002E8 80AE7598 8DCEF9C0 */ lw $t6, -0x0640($t6) ## 8015F9C0 +/* 002E4 80AE7594 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) +/* 002E8 80AE7598 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) /* 002EC 80AE759C AFBF0034 */ sw $ra, 0x0034($sp) /* 002F0 80AE75A0 AFB00030 */ sw $s0, 0x0030($sp) /* 002F4 80AE75A4 AFA40038 */ sw $a0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s index 7b8c06637f..eda49b8d01 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s @@ -5,8 +5,8 @@ glabel func_80AE78D4 /* 00630 80AE78E0 AFBF0034 */ sw $ra, 0x0034($sp) /* 00634 80AE78E4 AFA40038 */ sw $a0, 0x0038($sp) /* 00638 80AE78E8 C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 0063C 80AE78EC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00640 80AE78F0 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 0063C 80AE78EC 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 00640 80AE78F0 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 00644 80AE78F4 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00648 80AE78F8 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 /* 0064C 80AE78FC 85CF1478 */ lh $t7, 0x1478($t6) ## 80161478 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE79A4.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE79A4.s index 79aeb48a04..6868f893c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE79A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE79A4.s @@ -13,8 +13,8 @@ glabel func_80AE79A4 /* 00720 80AE79D0 2482019C */ addiu $v0, $a0, 0x019C ## $v0 = 0000019C /* 00724 80AE79D4 C4440000 */ lwc1 $f4, 0x0000($v0) ## 0000019C /* 00728 80AE79D8 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 0072C 80AE79DC 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00730 80AE79E0 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 +/* 0072C 80AE79DC 3C058016 */ lui $a1, %hi(gGameInfo) +/* 00730 80AE79E0 24A5FA90 */ addiu $a1, %lo(gGameInfo) /* 00734 80AE79E4 46062200 */ add.s $f8, $f4, $f6 /* 00738 80AE79E8 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 /* 0073C 80AE79EC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 @@ -63,8 +63,8 @@ glabel func_80AE79A4 /* 007E4 80AE7A94 10000014 */ beq $zero, $zero, .L80AE7AE8 /* 007E8 80AE7A98 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 .L80AE7A9C: -/* 007EC 80AE7A9C 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 007F0 80AE7AA0 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 +/* 007EC 80AE7A9C 3C058016 */ lui $a1, %hi(gGameInfo) +/* 007F0 80AE7AA0 24A5FA90 */ addiu $a1, %lo(gGameInfo) /* 007F4 80AE7AA4 8CAB0000 */ lw $t3, 0x0000($a1) ## 8015FA90 /* 007F8 80AE7AA8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 007FC 80AE7AAC 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s index 64b275f39c..1ed83f7729 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s @@ -41,8 +41,8 @@ glabel func_80AE7AF8 /* 008D8 80AE7B88 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 008DC 80AE7B8C AE180194 */ sw $t8, 0x0194($s0) ## 00000194 /* 008E0 80AE7B90 AE190198 */ sw $t9, 0x0198($s0) ## 00000198 -/* 008E4 80AE7B94 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 008E8 80AE7B98 8D08FA90 */ lw $t0, -0x0570($t0) ## 8015FA90 +/* 008E4 80AE7B94 3C088016 */ lui $t0, %hi(gGameInfo) +/* 008E8 80AE7B98 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) /* 008EC 80AE7B9C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 008F0 80AE7BA0 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 008F4 80AE7BA4 8509145E */ lh $t1, 0x145E($t0) ## 8016145E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s index 68bf7d87ee..be9012ef01 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s @@ -35,10 +35,10 @@ glabel func_80AE7D94 /* 00B40 80AE7DF0 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 00B44 80AE7DF4 00076100 */ sll $t4, $a3, 4 /* 00B48 80AE7DF8 000C6F02 */ srl $t5, $t4, 28 -/* 00B4C 80AE7DFC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00B4C 80AE7DFC 3C0F8016 */ lui $t7, %hi(gSegments) /* 00B50 80AE7E00 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 00B54 80AE7E04 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00B58 80AE7E08 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 +/* 00B58 80AE7E08 25EF6FA8 */ addiu $t7, %lo(gSegments) /* 00B5C 80AE7E0C 000D7080 */ sll $t6, $t5, 2 /* 00B60 80AE7E10 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 00B64 80AE7E14 01CF2021 */ addu $a0, $t6, $t7 @@ -65,12 +65,12 @@ glabel func_80AE7D94 /* 00BB8 80AE7E68 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 00BBC 80AE7E6C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00BC0 80AE7E70 8FA80078 */ lw $t0, 0x0078($sp) -/* 00BC4 80AE7E74 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 +/* 00BC4 80AE7E74 3C0C8011 */ lui $t4, %hi(D_80116280) /* 00BC8 80AE7E78 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 00BCC 80AE7E7C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 00BD0 80AE7E80 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 00BD4 80AE7E84 8D1901A0 */ lw $t9, 0x01A0($t0) ## 000001A0 -/* 00BD8 80AE7E88 258C6280 */ addiu $t4, $t4, 0x6280 ## $t4 = 80116280 +/* 00BD8 80AE7E88 258C6280 */ addiu $t4, %lo(D_80116280) /* 00BDC 80AE7E8C 356B0030 */ ori $t3, $t3, 0x0030 ## $t3 = DB060030 /* 00BE0 80AE7E90 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000000 /* 00BE4 80AE7E94 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s index a088bfea31..c2884262f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s @@ -35,9 +35,9 @@ glabel func_80AE7FDC /* 00D88 80AE8038 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 00D8C 80AE803C 00076100 */ sll $t4, $a3, 4 /* 00D90 80AE8040 000C6F02 */ srl $t5, $t4, 28 -/* 00D94 80AE8044 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00D94 80AE8044 3C0F8016 */ lui $t7, %hi(gSegments) /* 00D98 80AE8048 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00D9C 80AE804C 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 +/* 00D9C 80AE804C 25EF6FA8 */ addiu $t7, %lo(gSegments) /* 00DA0 80AE8050 000D7080 */ sll $t6, $t5, 2 /* 00DA4 80AE8054 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 00DA8 80AE8058 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 @@ -64,7 +64,7 @@ glabel func_80AE7FDC /* 00DFC 80AE80AC 01A67021 */ addu $t6, $t5, $a2 /* 00E00 80AE80B0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 00E04 80AE80B4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00E08 80AE80B8 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 +/* 00E08 80AE80B8 3C0B8011 */ lui $t3, %hi(D_80116280+0x10) /* 00E0C 80AE80BC 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 00E10 80AE80C0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 00E14 80AE80C4 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 @@ -72,7 +72,7 @@ glabel func_80AE7FDC /* 00E1C 80AE80CC AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 00E20 80AE80D0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 00E24 80AE80D4 354A0030 */ ori $t2, $t2, 0x0030 ## $t2 = DB060030 -/* 00E28 80AE80D8 256B6290 */ addiu $t3, $t3, 0x6290 ## $t3 = 80116290 +/* 00E28 80AE80D8 256B6290 */ addiu $t3, %lo(D_80116280+0x10) /* 00E2C 80AE80DC 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 00E30 80AE80E0 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 /* 00E34 80AE80E4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8968.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8968.s index 2577c8ee39..42517488da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8968.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE8968.s @@ -52,13 +52,13 @@ glabel func_80AE8968 /* 00568 80AE89A8 3C014500 */ lui $at, 0x4500 ## $at = 45000000 /* 0056C 80AE89AC 44814000 */ mtc1 $at, $f8 ## $f8 = 2048.00 /* 00570 80AE89B0 E48601FC */ swc1 $f6, 0x01FC($a0) ## 000001FC -/* 00574 80AE89B4 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 00574 80AE89B4 3C098016 */ lui $t1, %hi(gSaveContext+0x70) /* 00578 80AE89B8 E4880220 */ swc1 $f8, 0x0220($a0) ## 00000220 -/* 0057C 80AE89BC 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 00580 80AE89C0 954A71A2 */ lhu $t2, 0x71A2($t2) ## 801271A2 -/* 00584 80AE89C4 9529E6D0 */ lhu $t1, -0x1930($t1) ## 8015E6D0 -/* 00588 80AE89C8 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 -/* 0058C 80AE89CC 918C71F1 */ lbu $t4, 0x71F1($t4) ## 801271F1 +/* 0057C 80AE89BC 3C0A8012 */ lui $t2, %hi(gEquipMasks+2) +/* 00580 80AE89C0 954A71A2 */ lhu $t2, %lo(gEquipMasks+2)($t2) +/* 00584 80AE89C4 9529E6D0 */ lhu $t1, %lo(gSaveContext+0x70)($t1) +/* 00588 80AE89C8 3C0C8012 */ lui $t4, %hi(gEquipShifts+1) +/* 0058C 80AE89CC 918C71F1 */ lbu $t4, %lo(gEquipShifts+1)($t4) /* 00590 80AE89D0 012A5824 */ and $t3, $t1, $t2 /* 00594 80AE89D4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00598 80AE89D8 018B6807 */ srav $t5, $t3, $t4 @@ -77,12 +77,12 @@ glabel func_80AE8968 /* 005CC 80AE8A0C A2020372 */ sb $v0, 0x0372($s0) ## 00000372 /* 005D0 80AE8A10 A20E0375 */ sb $t6, 0x0375($s0) ## 00000375 .L80AE8A14: -/* 005D4 80AE8A14 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 005D8 80AE8A18 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 -/* 005DC 80AE8A1C 971871A4 */ lhu $t8, 0x71A4($t8) ## 801271A4 -/* 005E0 80AE8A20 95EFE6D0 */ lhu $t7, -0x1930($t7) ## 8015E6D0 -/* 005E4 80AE8A24 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 005E8 80AE8A28 910871F2 */ lbu $t0, 0x71F2($t0) ## 801271F2 +/* 005D4 80AE8A14 3C0F8016 */ lui $t7, %hi(gSaveContext+0x70) +/* 005D8 80AE8A18 3C188012 */ lui $t8, %hi(gEquipMasks+4) +/* 005DC 80AE8A1C 971871A4 */ lhu $t8, %lo(gEquipMasks+4)($t8) +/* 005E0 80AE8A20 95EFE6D0 */ lhu $t7, %lo(gSaveContext+0x70)($t7) +/* 005E4 80AE8A24 3C088012 */ lui $t0, %hi(gEquipShifts+2) +/* 005E8 80AE8A28 910871F2 */ lbu $t0, %lo(gEquipShifts+2)($t0) /* 005EC 80AE8A2C 01F8C824 */ and $t9, $t7, $t8 /* 005F0 80AE8A30 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 005F4 80AE8A34 01194807 */ srav $t1, $t9, $t0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s index ee130d721a..9d8baa7a2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s @@ -38,8 +38,8 @@ glabel EnSa_Draw /* 01A70 80AF6FD0 00195080 */ sll $t2, $t9, 2 /* 01A74 80AF6FD4 012A5821 */ addu $t3, $t1, $t2 /* 01A78 80AF6FD8 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 01A7C 80AF6FDC 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 01A80 80AF6FE0 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 01A7C 80AF6FDC 3C068016 */ lui $a2, %hi(gSegments) +/* 01A80 80AF6FE0 24C66FA8 */ addiu $a2, %lo(gSegments) /* 01A84 80AF6FE4 00046900 */ sll $t5, $a0, 4 /* 01A88 80AF6FE8 000D7702 */ srl $t6, $t5, 28 /* 01A8C 80AF6FEC 000E7880 */ sll $t7, $t6, 2 @@ -117,8 +117,8 @@ glabel EnSa_Draw /* 01BA8 80AF7108 000AC880 */ sll $t9, $t2, 2 /* 01BAC 80AF710C 01395821 */ addu $t3, $t1, $t9 /* 01BB0 80AF7110 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 01BB4 80AF7114 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 01BB8 80AF7118 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 01BB4 80AF7114 3C068016 */ lui $a2, %hi(gSegments) +/* 01BB8 80AF7118 24C66FA8 */ addiu $a2, %lo(gSegments) /* 01BBC 80AF711C 00047100 */ sll $t6, $a0, 4 /* 01BC0 80AF7120 000E7F02 */ srl $t7, $t6, 28 /* 01BC4 80AF7124 000FC080 */ sll $t8, $t7, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s index e8f038a43c..546a7af4c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s @@ -16,8 +16,8 @@ glabel EnSa_Init /* 00C60 80AF61C0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00C64 80AF61C4 AFBF003C */ sw $ra, 0x003C($sp) /* 00C68 80AF61C8 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 00C6C 80AF61CC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00C70 80AF61D0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00C6C 80AF61CC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00C70 80AF61D0 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00C74 80AF61D4 AFA40044 */ sw $a0, 0x0044($sp) /* 00C78 80AF61D8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00C7C 80AF61DC 0C00AC78 */ jal ActorShape_Init @@ -98,21 +98,21 @@ glabel L80AF62DC /* 00D8C 80AF62EC 00025900 */ sll $t3, $v0, 4 /* 00D90 80AF62F0 000B6702 */ srl $t4, $t3, 28 /* 00D94 80AF62F4 000C6880 */ sll $t5, $t4, 2 -/* 00D98 80AF62F8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 00D98 80AF62F8 3C0E8016 */ lui $t6, %hi(gSegments) /* 00D9C 80AF62FC A6000210 */ sh $zero, 0x0210($s0) ## 00000210 /* 00DA0 80AF6300 01CD7021 */ addu $t6, $t6, $t5 /* 00DA4 80AF6304 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00DA8 80AF6308 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C -/* 00DAC 80AF630C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 00DAC 80AF630C 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 00DB0 80AF6310 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00DB4 80AF6314 00417824 */ and $t7, $v0, $at /* 00DB8 80AF6318 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00DBC 80AF631C 01CFC021 */ addu $t8, $t6, $t7 /* 00DC0 80AF6320 0301C821 */ addu $t9, $t8, $at /* 00DC4 80AF6324 AE391D68 */ sw $t9, 0x1D68($s1) ## 00001D68 -/* 00DC8 80AF6328 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00DC8 80AF6328 3C018016 */ lui $at, %hi(gSaveContext+0x1414) /* 00DCC 80AF632C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00DD0 80AF6330 A028FA74 */ sb $t0, -0x058C($at) ## 8015FA74 +/* 00DD0 80AF6330 A028FA74 */ sb $t0, %lo(gSaveContext+0x1414)($at) /* 00DD4 80AF6334 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00DD8 80AF6338 0C2BD763 */ jal func_80AF5D8C /* 00DDC 80AF633C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s index 336d610d49..411c9b6c87 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s @@ -11,10 +11,10 @@ glabel func_80AF55E0 /* 000A4 80AF5604 10000037 */ beq $zero, $zero, .L80AF56E4 /* 000A8 80AF5608 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L80AF560C: -/* 000AC 80AF560C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 000B0 80AF5610 3C048012 */ lui $a0, 0x8012 ## $a0 = 80120000 -/* 000B4 80AF5614 24847120 */ addiu $a0, $a0, 0x7120 ## $a0 = 80127120 -/* 000B8 80AF5618 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 000AC 80AF560C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 000B0 80AF5610 3C048012 */ lui $a0, %hi(gBitFlags) +/* 000B4 80AF5614 24847120 */ addiu $a0, %lo(gBitFlags) +/* 000B8 80AF5618 2442E660 */ addiu $v0, %lo(gSaveContext) /* 000BC 80AF561C 8C4300A4 */ lw $v1, 0x00A4($v0) ## 8015E704 /* 000C0 80AF5620 8C8E0038 */ lw $t6, 0x0038($a0) ## 80127158 /* 000C4 80AF5624 01C37824 */ and $t7, $t6, $v1 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF56F4.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF56F4.s index 91c555e698..ccae7c6f4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF56F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF56F4.s @@ -44,16 +44,16 @@ glabel L80AF573C /* 00200 80AF5760 10000018 */ beq $zero, $zero, .L80AF57C4 /* 00204 80AF5764 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 .L80AF5768: -/* 00208 80AF5768 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0020C 80AF576C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00208 80AF5768 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0020C 80AF576C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00210 80AF5770 94580EF8 */ lhu $t8, 0x0EF8($v0) ## 8015F558 /* 00214 80AF5774 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 00218 80AF5778 37190002 */ ori $t9, $t8, 0x0002 ## $t9 = 00000002 /* 0021C 80AF577C 10000011 */ beq $zero, $zero, .L80AF57C4 /* 00220 80AF5780 A4590EF8 */ sh $t9, 0x0EF8($v0) ## 8015F558 .L80AF5784: -/* 00224 80AF5784 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00228 80AF5788 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00224 80AF5784 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00228 80AF5788 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0022C 80AF578C 94480ED4 */ lhu $t0, 0x0ED4($v0) ## 8015F534 /* 00230 80AF5790 944A0EF8 */ lhu $t2, 0x0EF8($v0) ## 8015F558 /* 00234 80AF5794 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 @@ -63,8 +63,8 @@ glabel L80AF573C /* 00244 80AF57A4 10000007 */ beq $zero, $zero, .L80AF57C4 /* 00248 80AF57A8 A44B0EF8 */ sh $t3, 0x0EF8($v0) ## 8015F558 .L80AF57AC: -/* 0024C 80AF57AC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00250 80AF57B0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0024C 80AF57AC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00250 80AF57B0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00254 80AF57B4 944C0EF8 */ lhu $t4, 0x0EF8($v0) ## 8015F558 /* 00258 80AF57B8 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 0025C 80AF57BC 358D0020 */ ori $t5, $t4, 0x0020 ## $t5 = 00000020 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5DFC.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5DFC.s index 66d068fa8b..eeea78f4d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5DFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5DFC.s @@ -1,6 +1,6 @@ glabel func_80AF5DFC -/* 0089C 80AF5DFC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 008A0 80AF5E00 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0089C 80AF5DFC 3C038016 */ lui $v1, %hi(gSaveContext) +/* 008A0 80AF5E00 2463E660 */ addiu $v1, %lo(gSaveContext) /* 008A4 80AF5E04 8C620008 */ lw $v0, 0x0008($v1) ## 8015E668 /* 008A8 80AF5E08 3401FFF0 */ ori $at, $zero, 0xFFF0 ## $at = 0000FFF0 /* 008AC 80AF5E0C AFA40000 */ sw $a0, 0x0000($sp) @@ -29,10 +29,10 @@ glabel func_80AF5DFC /* 008F8 80AF5E58 54410012 */ bnel $v0, $at, .L80AF5EA4 /* 008FC 80AF5E5C 24010056 */ addiu $at, $zero, 0x0056 ## $at = 00000056 /* 00900 80AF5E60 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 -/* 00904 80AF5E64 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 +/* 00904 80AF5E64 3C0F8012 */ lui $t7, %hi(gItemSlots+7) /* 00908 80AF5E68 51C0000E */ beql $t6, $zero, .L80AF5EA4 /* 0090C 80AF5E6C 24010056 */ addiu $at, $zero, 0x0056 ## $at = 00000056 -/* 00910 80AF5E70 91EF746B */ lbu $t7, 0x746B($t7) ## 8012746B +/* 00910 80AF5E70 91EF746B */ lbu $t7, %lo(gItemSlots+7)($t7) /* 00914 80AF5E74 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 /* 00918 80AF5E78 006FC021 */ addu $t8, $v1, $t7 /* 0091C 80AF5E7C 93190074 */ lbu $t9, 0x0074($t8) ## 00000074 @@ -50,11 +50,11 @@ glabel func_80AF5DFC /* 00944 80AF5EA4 54410011 */ bnel $v0, $at, .L80AF5EEC /* 00948 80AF5EA8 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 /* 0094C 80AF5EAC 946A0EDC */ lhu $t2, 0x0EDC($v1) ## 8015F53C -/* 00950 80AF5EB0 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 +/* 00950 80AF5EB0 3C0C8012 */ lui $t4, %hi(gBitFlags+0x38) /* 00954 80AF5EB4 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 /* 00958 80AF5EB8 5160000C */ beql $t3, $zero, .L80AF5EEC /* 0095C 80AF5EBC 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 00960 80AF5EC0 8D8C7158 */ lw $t4, 0x7158($t4) ## 80127158 +/* 00960 80AF5EC0 8D8C7158 */ lw $t4, %lo(gBitFlags+0x38)($t4) /* 00964 80AF5EC4 8C6D00A4 */ lw $t5, 0x00A4($v1) ## 8015E704 /* 00968 80AF5EC8 24030005 */ addiu $v1, $zero, 0x0005 ## $v1 = 00000005 /* 0096C 80AF5ECC 018D7024 */ and $t6, $t4, $t5 @@ -69,8 +69,8 @@ glabel func_80AF5DFC /* 00988 80AF5EE8 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 .L80AF5EEC: /* 0098C 80AF5EEC 1441000E */ bne $v0, $at, .L80AF5F28 -/* 00990 80AF5EF0 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 00994 80AF5EF4 8DEF7168 */ lw $t7, 0x7168($t7) ## 80127168 +/* 00990 80AF5EF0 3C0F8012 */ lui $t7, %hi(gBitFlags+0x48) +/* 00994 80AF5EF4 8DEF7168 */ lw $t7, %lo(gBitFlags+0x48)($t7) /* 00998 80AF5EF8 8C7800A4 */ lw $t8, 0x00A4($v1) ## 000000A9 /* 0099C 80AF5EFC 01F8C824 */ and $t9, $t7, $t8 /* 009A0 80AF5F00 5720000A */ bnel $t9, $zero, .L80AF5F2C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6448.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6448.s index cba435378f..94d1e836fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6448.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6448.s @@ -9,10 +9,10 @@ glabel func_80AF6448 /* 00F04 80AF6464 55E100AD */ bnel $t7, $at, .L80AF671C /* 00F08 80AF6468 8E0E0154 */ lw $t6, 0x0154($s0) ## 00000154 /* 00F0C 80AF646C 849801E0 */ lh $t8, 0x01E0($a0) ## 000001E0 -/* 00F10 80AF6470 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00F14 80AF6474 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00F10 80AF6470 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00F14 80AF6474 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00F18 80AF6478 1300008E */ beq $t8, $zero, .L80AF66B4 -/* 00F1C 80AF647C 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 +/* 00F1C 80AF647C 3C198012 */ lui $t9, %hi(gBitFlags+0x48) /* 00F20 80AF6480 9482010E */ lhu $v0, 0x010E($a0) ## 0000010E /* 00F24 80AF6484 24011002 */ addiu $at, $zero, 0x1002 ## $at = 00001002 /* 00F28 80AF6488 1041000D */ beq $v0, $at, .L80AF64C0 @@ -166,7 +166,7 @@ glabel func_80AF6448 /* 0114C 80AF66AC 10000018 */ beq $zero, $zero, .L80AF6710 /* 01150 80AF66B0 00000000 */ nop .L80AF66B4: -/* 01154 80AF66B4 8F397168 */ lw $t9, 0x7168($t9) ## 00007168 +/* 01154 80AF66B4 8F397168 */ lw $t9, %lo(gBitFlags+0x48)($t9) /* 01158 80AF66B8 8C6800A4 */ lw $t0, 0x00A4($v1) ## 000000A4 /* 0115C 80AF66BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01160 80AF66C0 03284824 */ and $t1, $t9, $t0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF683C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF683C.s index e1fc4b7903..792ba756c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF683C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF683C.s @@ -25,10 +25,10 @@ glabel func_80AF683C /* 01324 80AF6884 00027100 */ sll $t6, $v0, 4 /* 01328 80AF6888 000E7F02 */ srl $t7, $t6, 28 /* 0132C 80AF688C 000FC080 */ sll $t8, $t7, 2 -/* 01330 80AF6890 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 01330 80AF6890 3C198016 */ lui $t9, %hi(gSegments) /* 01334 80AF6894 0338C821 */ addu $t9, $t9, $t8 /* 01338 80AF6898 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0133C 80AF689C 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 0133C 80AF689C 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 01340 80AF68A0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 01344 80AF68A4 00414024 */ and $t0, $v0, $at /* 01348 80AF68A8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -36,10 +36,10 @@ glabel func_80AF683C /* 01350 80AF68B0 01215021 */ addu $t2, $t1, $at /* 01354 80AF68B4 ACAA1D68 */ sw $t2, 0x1D68($a1) ## 00001D68 /* 01358 80AF68B8 8FAD0018 */ lw $t5, 0x0018($sp) -/* 0135C 80AF68BC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 0135C 80AF68BC 3C018016 */ lui $at, %hi(gSaveContext+0x1414) /* 01360 80AF68C0 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 01364 80AF68C4 3C0C80AF */ lui $t4, %hi(func_80AF68E4) ## $t4 = 80AF0000 -/* 01368 80AF68C8 A02BFA74 */ sb $t3, -0x058C($at) ## 8015FA74 +/* 01368 80AF68C8 A02BFA74 */ sb $t3, %lo(gSaveContext+0x1414)($at) /* 0136C 80AF68CC 258C68E4 */ addiu $t4, $t4, %lo(func_80AF68E4) ## $t4 = 80AF68E4 /* 01370 80AF68D0 ADAC0190 */ sw $t4, 0x0190($t5) ## 00000190 .L80AF68D4: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF68E4.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF68E4.s index 04d35cacdb..3629276a24 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF68E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF68E4.s @@ -69,8 +69,8 @@ glabel func_80AF68E4 /* 01478 80AF69D8 54610016 */ bnel $v1, $at, .L80AF6A34 /* 0147C 80AF69DC 96290006 */ lhu $t1, 0x0006($s1) ## 00000006 /* 01480 80AF69E0 8603020C */ lh $v1, 0x020C($s0) ## 0000020C -/* 01484 80AF69E4 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01488 80AF69E8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01484 80AF69E4 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01488 80AF69E8 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 0148C 80AF69EC 14600003 */ bne $v1, $zero, .L80AF69FC /* 01490 80AF69F0 2478FFFF */ addiu $t8, $v1, 0xFFFF ## $t8 = FFFFFFFF /* 01494 80AF69F4 10000003 */ beq $zero, $zero, .L80AF6A04 @@ -81,8 +81,8 @@ glabel func_80AF68E4 .L80AF6A04: /* 014A4 80AF6A04 1440000A */ bne $v0, $zero, .L80AF6A30 /* 014A8 80AF6A08 24040800 */ addiu $a0, $zero, 0x0800 ## $a0 = 00000800 -/* 014AC 80AF6A0C 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 014B0 80AF6A10 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 014AC 80AF6A0C 3C198013 */ lui $t9, %hi(D_801333E8) +/* 014B0 80AF6A10 273933E8 */ addiu $t9, %lo(D_801333E8) /* 014B4 80AF6A14 AFB90014 */ sw $t9, 0x0014($sp) /* 014B8 80AF6A18 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 014BC 80AF6A1C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6B20.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6B20.s index d4fc399fee..abe3672684 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6B20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6B20.s @@ -31,8 +31,8 @@ glabel func_80AF6B20 /* 01630 80AF6B90 AE180024 */ sw $t8, 0x0024($s0) ## 00000024 /* 01634 80AF6B94 8E180010 */ lw $t8, 0x0010($s0) ## 00000010 /* 01638 80AF6B98 9608021E */ lhu $t0, 0x021E($s0) ## 0000021E -/* 0163C 80AF6B9C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01640 80AF6BA0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0163C 80AF6B9C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01640 80AF6BA0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01644 80AF6BA4 A6000216 */ sh $zero, 0x0216($s0) ## 00000216 /* 01648 80AF6BA8 AE0F0028 */ sw $t7, 0x0028($s0) ## 00000028 /* 0164C 80AF6BAC AE18002C */ sw $t8, 0x002C($s0) ## 0000002C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Draw.s index 13262ab58d..111c4168ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sda/EnSda_Draw.s @@ -38,8 +38,8 @@ glabel EnSda_Draw /* 000EC 80AF8F0C 8FA50024 */ lw $a1, 0x0024($sp) /* 000F0 80AF8F10 0C2BE571 */ jal func_80AF95C4 /* 000F4 80AF8F14 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 000F8 80AF8F18 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 000FC 80AF8F1C 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 000F8 80AF8F18 3C198016 */ lui $t9, %hi(gGameInfo) +/* 000FC 80AF8F1C 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 00100 80AF8F20 8FA40024 */ lw $a0, 0x0024($sp) /* 00104 80AF8F24 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00108 80AF8F28 872809D4 */ lh $t0, 0x09D4($t9) ## 801609D4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF8F60.s b/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF8F60.s index a839eefa01..b074d0776b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF8F60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF8F60.s @@ -47,8 +47,8 @@ glabel func_80AF8F60 /* 001F0 80AF9010 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 .L80AF9014: /* 001F4 80AF9014 4614B03C */ c.lt.s $f22, $f20 -/* 001F8 80AF9018 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 001FC 80AF901C 8C84FA90 */ lw $a0, -0x0570($a0) ## 8015FA90 +/* 001F8 80AF9018 3C048016 */ lui $a0, %hi(gGameInfo) +/* 001FC 80AF901C 8C84FA90 */ lw $a0, %lo(gGameInfo)($a0) /* 00200 80AF9020 45000029 */ bc1f .L80AF90C8 /* 00204 80AF9024 00000000 */ nop /* 00208 80AF9028 01760019 */ multu $t3, $s6 @@ -119,8 +119,8 @@ glabel func_80AF8F60 /* 00304 80AF9124 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFD8 /* 00308 80AF9128 0C0346BD */ jal Matrix_MultVec3f /* 0030C 80AF912C 27A5007C */ addiu $a1, $sp, 0x007C ## $a1 = FFFFFFCC -/* 00310 80AF9130 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 00314 80AF9134 8C84FA90 */ lw $a0, -0x0570($a0) ## 8015FA90 +/* 00310 80AF9130 3C048016 */ lui $a0, %hi(gGameInfo) +/* 00314 80AF9134 8C84FA90 */ lw $a0, %lo(gGameInfo)($a0) /* 00318 80AF9138 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0031C 80AF913C 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 /* 00320 80AF9140 84981336 */ lh $t8, 0x1336($a0) ## 80161336 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF95C4.s b/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF95C4.s index e6898bdfce..cd7c356275 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF95C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF95C4.s @@ -51,8 +51,8 @@ glabel func_80AF95C4 /* 007EC 80AF960C 0C00084C */ jal osSyncPrintf /* 007F0 80AF9610 2484A468 */ addiu $a0, $a0, %lo(D_80AFA468) ## $a0 = 80AFA468 -/* 007F4 80AF9614 3C1E8016 */ lui $s8, 0x8016 ## $s8 = 80160000 -/* 007F8 80AF9618 27DEFA90 */ addiu $s8, $s8, 0xFA90 ## $s8 = 8015FA90 +/* 007F4 80AF9614 3C1E8016 */ lui $s8, %hi(gGameInfo) +/* 007F8 80AF9618 27DEFA90 */ addiu $s8, %lo(gGameInfo) /* 007FC 80AF961C 8FCE0000 */ lw $t6, 0x0000($s8) ## 8015FA90 /* 00800 80AF9620 02201025 */ or $v0, $s1, $zero ## $v0 = 00000000 /* 00804 80AF9624 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF9C70.s b/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF9C70.s index 8123682539..bac4f1e174 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF9C70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF9C70.s @@ -54,11 +54,11 @@ glabel func_80AF9C70 /* 00EA4 80AF9CC4 0C025011 */ jal func_80094044 /* 00EA8 80AF9CC8 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 /* 00EAC 80AF9CCC 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 -/* 00EB0 80AF9CD0 3C138016 */ lui $s3, 0x8016 ## $s3 = 80160000 +/* 00EB0 80AF9CD0 3C138016 */ lui $s3, %hi(gGameInfo) /* 00EB4 80AF9CD4 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 /* 00EB8 80AF9CD8 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 /* 00EBC 80AF9CDC AE4E02D0 */ sw $t6, 0x02D0($s2) ## 000002D0 -/* 00EC0 80AF9CE0 2673FA90 */ addiu $s3, $s3, 0xFA90 ## $s3 = 8015FA90 +/* 00EC0 80AF9CE0 2673FA90 */ addiu $s3, %lo(gGameInfo) /* 00EC4 80AF9CE4 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 /* 00EC8 80AF9CE8 8E780000 */ lw $t8, 0x0000($s3) ## 8015FA90 /* 00ECC 80AF9CEC 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s index ab71e4f2eb..e4f6e7a490 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s @@ -8,8 +8,8 @@ glabel EnShopnuts_Init /* 00018 80AFA738 0C01E037 */ jal Actor_ProcessInitChain /* 0001C 80AFA73C 24A5B514 */ addiu $a1, $a1, %lo(D_80AFB514) ## $a1 = 80AFB514 -/* 00020 80AFA740 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00024 80AFA744 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00020 80AFA740 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00024 80AFA744 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00028 80AFA748 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0002C 80AFA74C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00030 80AFA750 0C00AC78 */ jal ActorShape_Init @@ -51,17 +51,17 @@ glabel EnShopnuts_Init /* 000B0 80AFA7D0 8FA50030 */ lw $a1, 0x0030($sp) /* 000B4 80AFA7D4 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 000B8 80AFA7D8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 000BC 80AFA7DC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 000BC 80AFA7DC 3C038016 */ lui $v1, %hi(gSaveContext) /* 000C0 80AFA7E0 14410004 */ bne $v0, $at, .L80AFA7F4 -/* 000C4 80AFA7E4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 000C4 80AFA7E4 2463E660 */ addiu $v1, %lo(gSaveContext) /* 000C8 80AFA7E8 94790EF0 */ lhu $t9, 0x0EF0($v1) ## 8015F550 /* 000CC 80AFA7EC 33280800 */ andi $t0, $t9, 0x0800 ## $t0 = 00000000 /* 000D0 80AFA7F0 1500000E */ bne $t0, $zero, .L80AFA82C .L80AFA7F4: -/* 000D4 80AFA7F4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 000D4 80AFA7F4 3C038016 */ lui $v1, %hi(gSaveContext) /* 000D8 80AFA7F8 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 /* 000DC 80AFA7FC 14410004 */ bne $v0, $at, .L80AFA810 -/* 000E0 80AFA800 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 000E0 80AFA800 2463E660 */ addiu $v1, %lo(gSaveContext) /* 000E4 80AFA804 94690F2A */ lhu $t1, 0x0F2A($v1) ## 8015F58A /* 000E8 80AFA808 312A0004 */ andi $t2, $t1, 0x0004 ## $t2 = 00000000 /* 000EC 80AFA80C 15400007 */ bne $t2, $zero, .L80AFA82C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB950.s b/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB950.s index 51ada52cb9..5e9014a83a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB950.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB950.s @@ -15,8 +15,8 @@ glabel func_80AFB950 /* 002F4 80AFB984 A70F0110 */ sh $t7, 0x0110($t8) ## 00000110 .L80AFB988: /* 002F8 80AFB988 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 002FC 80AFB98C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 00300 80AFB990 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 +/* 002FC 80AFB98C 3C098016 */ lui $t1, %hi(gSaveContext) +/* 00300 80AFB990 3C0D8012 */ lui $t5, %hi(D_8012724C) /* 00304 80AFB994 30431F00 */ andi $v1, $v0, 0x1F00 ## $v1 = 00000000 /* 00308 80AFB998 00031A03 */ sra $v1, $v1, 8 /* 0030C 80AFB99C 306B0003 */ andi $t3, $v1, 0x0003 ## $t3 = 00000000 @@ -24,8 +24,8 @@ glabel func_80AFB950 /* 00314 80AFB9A4 0003C883 */ sra $t9, $v1, 2 /* 00318 80AFB9A8 00194080 */ sll $t0, $t9, 2 /* 0031C 80AFB9AC 01AC6821 */ addu $t5, $t5, $t4 -/* 00320 80AFB9B0 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 -/* 00324 80AFB9B4 8DAD724C */ lw $t5, 0x724C($t5) ## 8012724C +/* 00320 80AFB9B0 2529E660 */ addiu $t1, %lo(gSaveContext) +/* 00324 80AFB9B4 8DAD724C */ lw $t5, %lo(D_8012724C)($t5) /* 00328 80AFB9B8 01092821 */ addu $a1, $t0, $t1 /* 0032C 80AFB9BC 8CAF0E9C */ lw $t7, 0x0E9C($a1) ## 00000E9C /* 00330 80AFB9C0 304A00FF */ andi $t2, $v0, 0x00FF ## $t2 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Init.s index 77bd98abf0..b945c87e35 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Init.s @@ -19,11 +19,11 @@ glabel EnSkb_Init /* 001D8 80AFCB78 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 001DC 80AFCB7C 3C0E80B0 */ lui $t6, %hi(D_80AFE078) ## $t6 = 80B00000 /* 001E0 80AFCB80 25CEE078 */ addiu $t6, $t6, %lo(D_80AFE078) ## $t6 = 80AFE078 -/* 001E4 80AFCB84 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 001E4 80AFCB84 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 001E8 80AFCB88 44050000 */ mfc1 $a1, $f0 /* 001EC 80AFCB8C 44070000 */ mfc1 $a3, $f0 /* 001F0 80AFCB90 AE0E0098 */ sw $t6, 0x0098($s0) ## 00000098 -/* 001F4 80AFCB94 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 001F4 80AFCB94 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 001F8 80AFCB98 0C00AC78 */ jal ActorShape_Init /* 001FC 80AFCB9C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCD60.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCD60.s index b0f37a79e5..26f4a11760 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCD60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCD60.s @@ -1,6 +1,6 @@ glabel func_80AFCD60 -/* 003C0 80AFCD60 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 003C4 80AFCD64 8DCEE670 */ lw $t6, -0x1990($t6) ## 8015E670 +/* 003C0 80AFCD60 3C0E8016 */ lui $t6, %hi(gSaveContext+0x10) +/* 003C4 80AFCD64 8DCEE670 */ lw $t6, %lo(gSaveContext+0x10)($t6) /* 003C8 80AFCD68 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 003CC 80AFCD6C AFBF0014 */ sw $ra, 0x0014($sp) /* 003D0 80AFCD70 15C00005 */ bne $t6, $zero, .L80AFCD88 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD13C.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD13C.s index 6b87a8f789..d09e9374ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD13C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD13C.s @@ -106,12 +106,12 @@ glabel func_80AFD13C /* 008F8 80AFD298 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 /* 008FC 80AFD29C 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 00900 80AFD2A0 44814000 */ mtc1 $at, $f8 ## $f8 = 800.00 -/* 00904 80AFD2A4 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 00904 80AFD2A4 3C0D8016 */ lui $t5, %hi(gSaveContext+0x10) /* 00908 80AFD2A8 4600403C */ c.lt.s $f8, $f0 /* 0090C 80AFD2AC 00000000 */ nop /* 00910 80AFD2B0 45010005 */ bc1t .L80AFD2C8 /* 00914 80AFD2B4 00000000 */ nop -/* 00918 80AFD2B8 8DADE670 */ lw $t5, -0x1990($t5) ## 8015E670 +/* 00918 80AFD2B8 8DADE670 */ lw $t5, %lo(gSaveContext+0x10)($t5) /* 0091C 80AFD2BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00920 80AFD2C0 15A00005 */ bne $t5, $zero, .L80AFD2D8 /* 00924 80AFD2C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s index 75eb5257f4..19cdb50b69 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s @@ -89,11 +89,11 @@ glabel EnSkj_Init /* 00340 80AFE5F0 1041000E */ beq $v0, $at, .L80AFE62C /* 00344 80AFE5F4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 00348 80AFE5F8 1041000C */ beq $v0, $at, .L80AFE62C -/* 0034C 80AFE5FC 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 -/* 00350 80AFE600 93397491 */ lbu $t9, 0x7491($t9) ## 80127491 -/* 00354 80AFE604 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 0034C 80AFE5FC 3C198012 */ lui $t9, %hi(gItemSlots+0x2d) +/* 00350 80AFE600 93397491 */ lbu $t9, %lo(gItemSlots+0x2d)($t9) +/* 00354 80AFE604 3C088016 */ lui $t0, %hi(gSaveContext+0x74) /* 00358 80AFE608 01194021 */ addu $t0, $t0, $t9 -/* 0035C 80AFE60C 9108E6D4 */ lbu $t0, -0x192C($t0) ## 8015E6D4 +/* 0035C 80AFE60C 9108E6D4 */ lbu $t0, %lo(gSaveContext+0x74)($t0) /* 00360 80AFE610 29010032 */ slti $at, $t0, 0x0032 /* 00364 80AFE614 10200005 */ beq $at, $zero, .L80AFE62C /* 00368 80AFE618 00000000 */ nop @@ -194,8 +194,8 @@ glabel EnSkj_Init /* 004C0 80AFE770 8FA40054 */ lw $a0, 0x0054($sp) /* 004C4 80AFE774 0C017114 */ jal func_8005C450 /* 004C8 80AFE778 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 004CC 80AFE77C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 004D0 80AFE780 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 004CC 80AFE77C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 004D0 80AFE780 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 004D4 80AFE784 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 004D8 80AFE788 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 004DC 80AFE78C 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE428.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE428.s index bb53c52e64..3b6a08dcf6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE428.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE428.s @@ -11,8 +11,8 @@ glabel func_80AFE428 /* 0019C 80AFE44C 03E00008 */ jr $ra /* 001A0 80AFE450 A08E0117 */ sb $t6, 0x0117($a0) ## 00000117 .L80AFE454: -/* 001A4 80AFE454 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 001A8 80AFE458 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 001A4 80AFE454 3C028016 */ lui $v0, %hi(gSaveContext) +/* 001A8 80AFE458 2442E660 */ addiu $v0, %lo(gSaveContext) /* 001AC 80AFE45C 944F0EF6 */ lhu $t7, 0x0EF6($v0) ## 8015F556 /* 001B0 80AFE460 24190041 */ addiu $t9, $zero, 0x0041 ## $t9 = 00000041 /* 001B4 80AFE464 31F80200 */ andi $t8, $t7, 0x0200 ## $t8 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF07C.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF07C.s index 606a3e9b70..2bdaf7405b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF07C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF07C.s @@ -4,10 +4,10 @@ glabel func_80AFF07C /* 00DD4 80AFF084 AFA50024 */ sw $a1, 0x0024($sp) /* 00DD8 80AFF088 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 00DDC 80AFF08C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00DE0 80AFF090 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00DE0 80AFF090 3C0F8016 */ lui $t7, %hi(gSaveContext+0xef2) /* 00DE4 80AFF094 15C0002A */ bne $t6, $zero, .L80AFF140 /* 00DE8 80AFF098 8FA50024 */ lw $a1, 0x0024($sp) -/* 00DEC 80AFF09C 95EFF552 */ lhu $t7, -0x0AAE($t7) ## 8015F552 +/* 00DEC 80AFF09C 95EFF552 */ lhu $t7, %lo(gSaveContext+0xef2)($t7) /* 00DF0 80AFF0A0 3C0280B0 */ lui $v0, %hi(D_80B01640) ## $v0 = 80B00000 /* 00DF4 80AFF0A4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 00DF8 80AFF0A8 31F80040 */ andi $t8, $t7, 0x0040 ## $t8 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s index e0ebd8f682..4fa4849ae7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s @@ -56,8 +56,8 @@ glabel func_80AFF7D8 /* 015FC 80AFF8AC 8FA4002C */ lw $a0, 0x002C($sp) /* 01600 80AFF8B0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 01604 80AFF8B4 1441000C */ bne $v0, $at, .L80AFF8E8 -/* 01608 80AFF8B8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0160C 80AFF8BC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01608 80AFF8B8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0160C 80AFF8BC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01610 80AFF8C0 944F0EF6 */ lhu $t7, 0x0EF6($v0) ## 8015F556 /* 01614 80AFF8C4 31F80200 */ andi $t8, $t7, 0x0200 ## $t8 = 00000000 /* 01618 80AFF8C8 17000007 */ bne $t8, $zero, .L80AFF8E8 @@ -86,9 +86,9 @@ glabel func_80AFF7D8 .L80AFF91C: /* 0166C 80AFF91C 8CD90680 */ lw $t9, 0x0680($a2) ## 00000680 /* 01670 80AFF920 3C010080 */ lui $at, 0x0080 ## $at = 00800000 -/* 01674 80AFF924 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 01674 80AFF924 3C028016 */ lui $v0, %hi(gSaveContext) /* 01678 80AFF928 03214025 */ or $t0, $t9, $at ## $t0 = 00800000 -/* 0167C 80AFF92C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0167C 80AFF92C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01680 80AFF930 ACC80680 */ sw $t0, 0x0680($a2) ## 00000680 /* 01684 80AFF934 94490EF2 */ lhu $t1, 0x0EF2($v0) ## 8015F552 /* 01688 80AFF938 312A0040 */ andi $t2, $t1, 0x0040 ## $t2 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFA0C.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFA0C.s index 8125256619..6e267c4af9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFA0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFA0C.s @@ -1,6 +1,6 @@ glabel func_80AFFA0C -/* 0175C 80AFFA0C 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 01760 80AFFA10 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 0175C 80AFFA0C 3C078016 */ lui $a3, %hi(gSaveContext) +/* 01760 80AFFA10 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 01764 80AFFA14 94EE0EF2 */ lhu $t6, 0x0EF2($a3) ## 8015F552 /* 01768 80AFFA18 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0176C 80AFFA1C AFBF001C */ sw $ra, 0x001C($sp) @@ -54,8 +54,8 @@ glabel func_80AFFA0C /* 01824 80AFFAD4 AFA60024 */ sw $a2, 0x0024($sp) /* 01828 80AFFAD8 0C2BF8AC */ jal func_80AFE2B0 /* 0182C 80AFFADC AFA3002C */ sw $v1, 0x002C($sp) -/* 01830 80AFFAE0 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 01834 80AFFAE4 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 01830 80AFFAE0 3C078016 */ lui $a3, %hi(gSaveContext) +/* 01834 80AFFAE4 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 01838 80AFFAE8 8FA3002C */ lw $v1, 0x002C($sp) /* 0183C 80AFFAEC 10000010 */ beq $zero, $zero, .L80AFFB30 /* 01840 80AFFAF0 8FA60024 */ lw $a2, 0x0024($sp) @@ -72,8 +72,8 @@ glabel func_80AFFA0C /* 01864 80AFFB14 AFA3002C */ sw $v1, 0x002C($sp) /* 01868 80AFFB18 0C2BF8AC */ jal func_80AFE2B0 /* 0186C 80AFFB1C 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 -/* 01870 80AFFB20 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 01874 80AFFB24 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 01870 80AFFB20 3C078016 */ lui $a3, %hi(gSaveContext) +/* 01874 80AFFB24 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 01878 80AFFB28 8FA3002C */ lw $v1, 0x002C($sp) /* 0187C 80AFFB2C 8FA60024 */ lw $a2, 0x0024($sp) .L80AFFB30: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFD84.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFD84.s index e2e38ca07f..af1419c79f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFD84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFD84.s @@ -12,8 +12,8 @@ glabel func_80AFFD84 /* 01AFC 80AFFDAC 0C041AF2 */ jal func_80106BC8 /* 01B00 80AFFDB0 8FA4003C */ lw $a0, 0x003C($sp) /* 01B04 80AFFDB4 10400016 */ beq $v0, $zero, .L80AFFE10 -/* 01B08 80AFFDB8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 01B0C 80AFFDBC 95CEF552 */ lhu $t6, -0x0AAE($t6) ## 8015F552 +/* 01B08 80AFFDB8 3C0E8016 */ lui $t6, %hi(gSaveContext+0xef2) +/* 01B0C 80AFFDBC 95CEF552 */ lhu $t6, %lo(gSaveContext+0xef2)($t6) /* 01B10 80AFFDC0 31CF0040 */ andi $t7, $t6, 0x0040 ## $t7 = 00000000 /* 01B14 80AFFDC4 11E00005 */ beq $t7, $zero, .L80AFFDDC /* 01B18 80AFFDC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFED4.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFED4.s index 4ff1bae5e9..494f46bace 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFED4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFED4.s @@ -11,8 +11,8 @@ glabel func_80AFFED4 /* 01C48 80AFFEF8 0C041AF2 */ jal func_80106BC8 /* 01C4C 80AFFEFC 8FA4001C */ lw $a0, 0x001C($sp) /* 01C50 80AFFF00 10400009 */ beq $v0, $zero, .L80AFFF28 -/* 01C54 80AFFF04 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01C58 80AFFF08 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01C54 80AFFF04 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01C58 80AFFF08 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01C5C 80AFFF0C 944E0EF2 */ lhu $t6, 0x0EF2($v0) ## 8015F552 /* 01C60 80AFFF10 8FA40018 */ lw $a0, 0x0018($sp) /* 01C64 80AFFF14 35CF0040 */ ori $t7, $t6, 0x0040 ## $t7 = 00000040 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B002D8.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B002D8.s index 53e9e090a0..f81c55250d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B002D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B002D8.s @@ -15,8 +15,8 @@ glabel func_80B002D8 /* 0205C 80B0030C 8FBF001C */ lw $ra, 0x001C($sp) /* 02060 80B00310 0C021CC3 */ jal Rupees_ChangeBy /* 02064 80B00314 2404000A */ addiu $a0, $zero, 0x000A ## $a0 = 0000000A -/* 02068 80B00318 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0206C 80B0031C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 02068 80B00318 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0206C 80B0031C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 02070 80B00320 944E0EF6 */ lhu $t6, 0x0EF6($v0) ## 8015F556 /* 02074 80B00324 8FA40020 */ lw $a0, 0x0020($sp) /* 02078 80B00328 35CF0200 */ ori $t7, $t6, 0x0200 ## $t7 = 00000200 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00964.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00964.s index 035da9337c..489fe0eb1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00964.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00964.s @@ -4,8 +4,8 @@ glabel func_80B00964 /* 026BC 80B0096C AFA5004C */ sw $a1, 0x004C($sp) /* 026C0 80B00970 0C00BC65 */ jal func_8002F194 /* 026C4 80B00974 AFA40048 */ sw $a0, 0x0048($sp) -/* 026C8 80B00978 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 026CC 80B0097C 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 026C8 80B00978 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 026CC 80B0097C 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 026D0 80B00980 3C0180B0 */ lui $at, %hi(D_80B01EA0) ## $at = 80B00000 /* 026D4 80B00984 AC221EA0 */ sw $v0, %lo(D_80B01EA0)($at) /* 026D8 80B00988 85CF12D4 */ lh $t7, 0x12D4($t6) ## 801612D4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01040.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01040.s index 46c61ccddf..5e1834e7b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01040.s @@ -12,8 +12,8 @@ glabel func_80B01040 /* 02DB8 80B01068 8FA40024 */ lw $a0, 0x0024($sp) /* 02DBC 80B0106C 10400011 */ beq $v0, $zero, .L80B010B4 /* 02DC0 80B01070 3C0141D0 */ lui $at, 0x41D0 ## $at = 41D00000 -/* 02DC4 80B01074 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 02DC8 80B01078 91CEE69F */ lbu $t6, -0x1961($t6) ## 8015E69F +/* 02DC4 80B01074 3C0E8016 */ lui $t6, %hi(gSaveContext+0x3f) +/* 02DC8 80B01078 91CEE69F */ lbu $t6, %lo(gSaveContext+0x3f)($t6) /* 02DCC 80B0107C 44810000 */ mtc1 $at, $f0 ## $f0 = 26.00 /* 02DD0 80B01080 3C0680B0 */ lui $a2, %hi(D_80B016C4) ## $a2 = 80B00000 /* 02DD4 80B01084 000E7880 */ sll $t7, $t6, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B010C4.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B010C4.s index 83bf822f9c..b1cd7eef1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B010C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B010C4.s @@ -12,8 +12,8 @@ glabel func_80B010C4 /* 02E3C 80B010EC 1000000D */ beq $zero, $zero, .L80B01124 /* 02E40 80B010F0 AC8E0274 */ sw $t6, 0x0274($a0) ## 00000274 .L80B010F4: -/* 02E44 80B010F4 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 02E48 80B010F8 91EFE69F */ lbu $t7, -0x1961($t7) ## 8015E69F +/* 02E44 80B010F4 3C0F8016 */ lui $t7, %hi(gSaveContext+0x3f) +/* 02E48 80B010F8 91EFE69F */ lbu $t7, %lo(gSaveContext+0x3f)($t7) /* 02E4C 80B010FC 3C0141D0 */ lui $at, 0x41D0 ## $at = 41D00000 /* 02E50 80B01100 44810000 */ mtc1 $at, $f0 ## $f0 = 26.00 /* 02E54 80B01104 3C0680B0 */ lui $a2, %hi(D_80B016C4) ## $a2 = 80B00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01134.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01134.s index 1182ad191d..920a0d43d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01134.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01134.s @@ -11,8 +11,8 @@ glabel func_80B01134 /* 02EA8 80B01158 0C041AF2 */ jal func_80106BC8 /* 02EAC 80B0115C 8FA4001C */ lw $a0, 0x001C($sp) /* 02EB0 80B01160 10400016 */ beq $v0, $zero, .L80B011BC -/* 02EB4 80B01164 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 02EB8 80B01168 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 02EB4 80B01164 3C048016 */ lui $a0, %hi(gSaveContext) +/* 02EB8 80B01168 2484E660 */ addiu $a0, %lo(gSaveContext) /* 02EBC 80B0116C 9083003F */ lbu $v1, 0x003F($a0) ## 8015E69F /* 02EC0 80B01170 3C1980B0 */ lui $t9, %hi(func_80B011CC) ## $t9 = 80B00000 /* 02EC4 80B01174 28610003 */ slti $at, $v1, 0x0003 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01244.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01244.s index b9d42db11a..f60d280669 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01244.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01244.s @@ -9,7 +9,7 @@ glabel func_80B01244 /* 02FB0 80B01260 AC221EA0 */ sw $v0, %lo(D_80B01EA0)($at) /* 02FB4 80B01264 860E02C6 */ lh $t6, 0x02C6($s0) ## 000002C6 /* 02FB8 80B01268 3C0180B0 */ lui $at, %hi(D_80B01904) ## $at = 80B00000 -/* 02FBC 80B0126C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 02FBC 80B0126C 3C188016 */ lui $t8, %hi(gGameInfo) /* 02FC0 80B01270 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 /* 02FC4 80B01274 A60F02C6 */ sh $t7, 0x02C6($s0) ## 000002C6 /* 02FC8 80B01278 C4241904 */ lwc1 $f4, %lo(D_80B01904)($at) @@ -20,7 +20,7 @@ glabel func_80B01244 /* 02FDC 80B0128C E6040038 */ swc1 $f4, 0x0038($s0) ## 00000038 /* 02FE0 80B01290 E606003C */ swc1 $f6, 0x003C($s0) ## 0000003C /* 02FE4 80B01294 E6080040 */ swc1 $f8, 0x0040($s0) ## 00000040 -/* 02FE8 80B01298 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 02FE8 80B01298 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 02FEC 80B0129C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 02FF0 80B012A0 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF /* 02FF4 80B012A4 871912D4 */ lh $t9, 0x12D4($t8) ## 801612D4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s index ce73ea8d31..4b7c1d1b6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s @@ -15,10 +15,10 @@ glabel func_80B01360 /* 030E4 80B01394 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 030E8 80B01398 8FAF0044 */ lw $t7, 0x0044($sp) /* 030EC 80B0139C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 030F0 80B013A0 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 030F0 80B013A0 3C188016 */ lui $t8, %hi(gSaveContext+0xef6) /* 030F4 80B013A4 55E10028 */ bnel $t7, $at, .L80B01448 /* 030F8 80B013A8 8FAF0040 */ lw $t7, 0x0040($sp) -/* 030FC 80B013AC 9718F556 */ lhu $t8, -0x0AAA($t8) ## 8015F556 +/* 030FC 80B013AC 9718F556 */ lhu $t8, %lo(gSaveContext+0xef6)($t8) /* 03100 80B013B0 8FA80040 */ lw $t0, 0x0040($sp) /* 03104 80B013B4 33190200 */ andi $t9, $t8, 0x0200 ## $t9 = 00000000 /* 03108 80B013B8 53200023 */ beql $t9, $zero, .L80B01448 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Init.s index a77c510f33..568f468dc5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Init.s @@ -19,8 +19,8 @@ glabel EnSkjneedle_Init /* 0003C 80B01EEC 8FA4002C */ lw $a0, 0x002C($sp) /* 00040 80B01EF0 0C017114 */ jal func_8005C450 /* 00044 80B01EF4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00048 80B01EF8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0004C 80B01EFC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00048 80B01EF8 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 0004C 80B01EFC 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00050 80B01F00 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00054 80B01F04 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00058 80B01F08 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Draw.s index aafbdb2395..303356bc12 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Draw.s @@ -30,7 +30,7 @@ glabel EnSsh_Draw /* 02090 80B04300 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 02094 80B04304 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 02098 80B04308 3C0480B0 */ lui $a0, %hi(D_80B045B8) ## $a0 = 80B00000 -/* 0209C 80B0430C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0209C 80B0430C 3C0E8016 */ lui $t6, %hi(gSegments) /* 020A0 80B04310 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 /* 020A4 80B04314 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 020A8 80B04318 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 @@ -46,7 +46,7 @@ glabel EnSsh_Draw /* 020D0 80B04340 000B6702 */ srl $t4, $t3, 28 /* 020D4 80B04344 000C6880 */ sll $t5, $t4, 2 /* 020D8 80B04348 01CD7021 */ addu $t6, $t6, $t5 -/* 020DC 80B0434C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 020DC 80B0434C 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 020E0 80B04350 00815024 */ and $t2, $a0, $at /* 020E4 80B04354 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 020E8 80B04358 014E7821 */ addu $t7, $t2, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Init.s index 6309194616..47e0d844d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Init.s @@ -9,14 +9,14 @@ glabel EnSsh_Init /* 01500 80B03770 24840304 */ addiu $a0, $a0, 0x0304 ## $a0 = 06000304 /* 01504 80B03774 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01508 80B03778 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0150C 80B0377C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 01508 80B03778 3C0E8016 */ lui $t6, %hi(gSaveContext+0xd0) +/* 0150C 80B0377C 3C0F8016 */ lui $t7, %hi(gSaveContext+0xd0) /* 01510 80B03780 468021A0 */ cvt.s.w $f6, $f4 /* 01514 80B03784 E7A6003C */ swc1 $f6, 0x003C($sp) /* 01518 80B03788 8603001C */ lh $v1, 0x001C($s0) ## 0000001C /* 0151C 80B0378C 14600009 */ bne $v1, $zero, .L80B037B4 /* 01520 80B03790 0003C080 */ sll $t8, $v1, 2 -/* 01524 80B03794 85CEE730 */ lh $t6, -0x18D0($t6) ## 8015E730 +/* 01524 80B03794 85CEE730 */ lh $t6, %lo(gSaveContext+0xd0)($t6) /* 01528 80B03798 29C10064 */ slti $at, $t6, 0x0064 /* 0152C 80B0379C 1420000F */ bne $at, $zero, .L80B037DC /* 01530 80B037A0 00000000 */ nop @@ -26,7 +26,7 @@ glabel EnSsh_Init /* 0153C 80B037AC 1000004A */ beq $zero, $zero, .L80B038D8 /* 01540 80B037B0 8FBF002C */ lw $ra, 0x002C($sp) .L80B037B4: -/* 01544 80B037B4 85EFE730 */ lh $t7, -0x18D0($t7) ## FFFFE730 +/* 01544 80B037B4 85EFE730 */ lh $t7, %lo(gSaveContext+0xd0)($t7) /* 01548 80B037B8 0303C021 */ addu $t8, $t8, $v1 /* 0154C 80B037BC 0018C040 */ sll $t8, $t8, 1 /* 01550 80B037C0 01F8082A */ slt $at, $t7, $t8 @@ -38,8 +38,8 @@ glabel EnSsh_Init /* 01564 80B037D4 10000040 */ beq $zero, $zero, .L80B038D8 /* 01568 80B037D8 8FBF002C */ lw $ra, 0x002C($sp) .L80B037DC: -/* 0156C 80B037DC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 01570 80B037E0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0156C 80B037DC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 01570 80B037E0 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 01574 80B037E4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01578 80B037E8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0157C 80B037EC 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03A00.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03A00.s index 86520a3fe7..b28ecc0f77 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03A00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03A00.s @@ -11,17 +11,17 @@ glabel func_80B03A00 /* 017B4 80B03A24 25CE39BC */ addiu $t6, $t6, %lo(func_80B039BC) ## $t6 = 80B039BC /* 017B8 80B03A28 15E00006 */ bne $t7, $zero, .L80B03A44 /* 017BC 80B03A2C ACEE02F8 */ sw $t6, 0x02F8($a3) ## 000002F8 -/* 017C0 80B03A30 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 017C4 80B03A34 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 017C0 80B03A30 3C038016 */ lui $v1, %hi(gSaveContext) +/* 017C4 80B03A34 2463E660 */ addiu $v1, %lo(gSaveContext) /* 017C8 80B03A38 94780EE6 */ lhu $t8, 0x0EE6($v1) ## 8015F546 /* 017CC 80B03A3C 37190040 */ ori $t9, $t8, 0x0040 ## $t9 = 00000040 /* 017D0 80B03A40 A4790EE6 */ sh $t9, 0x0EE6($v1) ## 8015F546 .L80B03A44: /* 017D4 80B03A44 94E2010E */ lhu $v0, 0x010E($a3) ## 0000010E -/* 017D8 80B03A48 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 017D8 80B03A48 3C038016 */ lui $v1, %hi(gSaveContext) /* 017DC 80B03A4C 24010026 */ addiu $at, $zero, 0x0026 ## $at = 00000026 /* 017E0 80B03A50 10410004 */ beq $v0, $at, .L80B03A64 -/* 017E4 80B03A54 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 017E4 80B03A54 2463E660 */ addiu $v1, %lo(gSaveContext) /* 017E8 80B03A58 24010027 */ addiu $at, $zero, 0x0027 ## $at = 00000027 /* 017EC 80B03A5C 54410006 */ bnel $v0, $at, .L80B03A78 /* 017F0 80B03A60 24010024 */ addiu $at, $zero, 0x0024 ## $at = 00000024 @@ -136,8 +136,8 @@ glabel func_80B03A00 /* 01960 80B03BD0 15000026 */ bne $t0, $zero, .L80B03C6C /* 01964 80B03BD4 A4E2010E */ sh $v0, 0x010E($a3) ## 0000010E /* 01968 80B03BD8 84E9001C */ lh $t1, 0x001C($a3) ## 0000001C -/* 0196C 80B03BDC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 01970 80B03BE0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0196C 80B03BDC 3C038016 */ lui $v1, %hi(gSaveContext) +/* 01970 80B03BE0 2463E660 */ addiu $v1, %lo(gSaveContext) /* 01974 80B03BE4 55200020 */ bnel $t1, $zero, .L80B03C68 /* 01978 80B03BE8 24090022 */ addiu $t1, $zero, 0x0022 ## $t1 = 00000022 /* 0197C 80B03BEC 846200D0 */ lh $v0, 0x00D0($v1) ## 8015E730 diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Init.s b/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Init.s index e25ed4c20e..d97512c8a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Init.s @@ -4,8 +4,8 @@ glabel EnSt_Init /* 01A84 80B06314 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01A88 80B06318 AFBF002C */ sw $ra, 0x002C($sp) /* 01A8C 80B0631C AFA50044 */ sw $a1, 0x0044($sp) -/* 01A90 80B06320 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 01A94 80B06324 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 01A90 80B06320 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 01A94 80B06324 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 01A98 80B06328 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 01A9C 80B0632C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 01AA0 80B06330 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Init.s index 7e355290a0..2b69156279 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Init.s @@ -38,11 +38,11 @@ glabel EnSth_Init /* 0002C 80B0756C AFA50024 */ sw $a1, 0x0024($sp) /* 00030 80B07570 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00034 80B07574 8FA60024 */ lw $a2, 0x0024($sp) -/* 00038 80B07578 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00038 80B07578 3C0F8016 */ lui $t7, %hi(gSaveContext+0xd0) /* 0003C 80B0757C 1440000D */ bne $v0, $zero, .L80B075B4 /* 00040 80B07580 0002C080 */ sll $t8, $v0, 2 -/* 00044 80B07584 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00048 80B07588 85CEE730 */ lh $t6, -0x18D0($t6) ## 8015E730 +/* 00044 80B07584 3C0E8016 */ lui $t6, %hi(gSaveContext+0xd0) +/* 00048 80B07588 85CEE730 */ lh $t6, %lo(gSaveContext+0xd0)($t6) /* 0004C 80B0758C 29C10064 */ slti $at, $t6, 0x0064 /* 00050 80B07590 50200016 */ beql $at, $zero, .L80B075EC /* 00054 80B07594 0006C840 */ sll $t9, $a2, 1 @@ -56,7 +56,7 @@ glabel EnSth_Init /* 0006C 80B075AC 1000003C */ beq $zero, $zero, .L80B076A0 /* 00070 80B075B0 8FBF001C */ lw $ra, 0x001C($sp) .L80B075B4: -/* 00074 80B075B4 85EFE730 */ lh $t7, -0x18D0($t7) ## FFFFE730 +/* 00074 80B075B4 85EFE730 */ lh $t7, %lo(gSaveContext+0xd0)($t7) /* 00078 80B075B8 0302C021 */ addu $t8, $t8, $v0 /* 0007C 80B075BC 0018C040 */ sll $t8, $t8, 1 /* 00080 80B075C0 01F8082A */ slt $at, $t7, $t8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B076B0.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B076B0.s index 5ec5827ac6..a610b0bb73 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B076B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B076B0.s @@ -4,8 +4,8 @@ glabel func_80B076B0 /* 00178 80B076B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0017C 80B076BC AFBF001C */ sw $ra, 0x001C($sp) /* 00180 80B076C0 AFA5002C */ sw $a1, 0x002C($sp) -/* 00184 80B076C4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00188 80B076C8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00184 80B076C4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00188 80B076C8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0018C 80B076CC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00190 80B076D0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00194 80B076D4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s index 70c3a42e34..d833c6aecd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s @@ -17,8 +17,8 @@ glabel func_80B07734 /* 00230 80B07770 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00234 80B07774 3C0680B1 */ lui $a2, %hi(D_80B0B43C) ## $a2 = 80B10000 /* 00238 80B07778 03214021 */ addu $t0, $t9, $at -/* 0023C 80B0777C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00240 80B07780 AC286FC0 */ sw $t0, 0x6FC0($at) ## 80166FC0 +/* 0023C 80B0777C 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 00240 80B07780 AC286FC0 */ sw $t0, %lo(gSegments+0x18)($at) /* 00244 80B07784 8609001C */ lh $t1, 0x001C($s0) ## 0000001C /* 00248 80B07788 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 0024C 80B0778C 260B01DC */ addiu $t3, $s0, 0x01DC ## $t3 = 000001DC @@ -42,14 +42,14 @@ glabel func_80B07734 /* 00294 80B077D4 8CA5B454 */ lw $a1, %lo(D_80B0B454)($a1) /* 00298 80B077D8 8618001C */ lh $t8, 0x001C($s0) ## 0000001C /* 0029C 80B077DC 3C0880B1 */ lui $t0, %hi(D_80B0B484) ## $t0 = 80B10000 -/* 002A0 80B077E0 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 002A0 80B077E0 3C098016 */ lui $t1, %hi(gSaveContext+0xeee) /* 002A4 80B077E4 0018C840 */ sll $t9, $t8, 1 /* 002A8 80B077E8 01194021 */ addu $t0, $t0, $t9 /* 002AC 80B077EC 9508B484 */ lhu $t0, %lo(D_80B0B484)($t0) /* 002B0 80B077F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 002B4 80B077F4 3C0580B0 */ lui $a1, %hi(func_80B07D7C) ## $a1 = 80B00000 /* 002B8 80B077F8 A608029C */ sh $t0, 0x029C($s0) ## 0000029C -/* 002BC 80B077FC 9529F54E */ lhu $t1, -0x0AB2($t1) ## 8015F54E +/* 002BC 80B077FC 9529F54E */ lhu $t1, %lo(gSaveContext+0xeee)($t1) /* 002C0 80B07800 310AFFFF */ andi $t2, $t0, 0xFFFF ## $t2 = 00000000 /* 002C4 80B07804 012A5824 */ and $t3, $t1, $t2 /* 002C8 80B07808 1160000A */ beq $t3, $zero, .L80B07834 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07BEC.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07BEC.s index 47f3771753..e1268b696f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07BEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07BEC.s @@ -11,12 +11,12 @@ glabel func_80B07BEC /* 006D0 80B07C10 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 006D4 80B07C14 14410011 */ bne $v0, $at, .L80B07C5C .L80B07C18: -/* 006D8 80B07C18 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 006DC 80B07C1C 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 -/* 006E0 80B07C20 8F1871C0 */ lw $t8, 0x71C0($t8) ## 801271C0 -/* 006E4 80B07C24 8DEFE700 */ lw $t7, -0x1900($t7) ## 8015E700 -/* 006E8 80B07C28 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 -/* 006EC 80B07C2C 912971F8 */ lbu $t1, 0x71F8($t1) ## 801271F8 +/* 006D8 80B07C18 3C0F8016 */ lui $t7, %hi(gSaveContext+0xa0) +/* 006DC 80B07C1C 3C188012 */ lui $t8, %hi(gUpgradeMasks+0x10) +/* 006E0 80B07C20 8F1871C0 */ lw $t8, %lo(gUpgradeMasks+0x10)($t8) +/* 006E4 80B07C24 8DEFE700 */ lw $t7, %lo(gSaveContext+0xa0)($t7) +/* 006E8 80B07C28 3C098012 */ lui $t1, %hi(gUpgradeShifts+4) +/* 006EC 80B07C2C 912971F8 */ lbu $t1, %lo(gUpgradeShifts+4)($t1) /* 006F0 80B07C30 01F8C824 */ and $t9, $t7, $t8 /* 006F4 80B07C34 01391807 */ srav $v1, $t9, $t1 /* 006F8 80B07C38 10600005 */ beq $v1, $zero, .L80B07C50 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07C88.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07C88.s index 13771ee5be..c5fb92bf08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07C88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07C88.s @@ -11,8 +11,8 @@ glabel func_80B07C88 /* 0076C 80B07CAC AE000118 */ sw $zero, 0x0118($s0) ## 00000118 /* 00770 80B07CB0 0C2C1D50 */ jal func_80B07540 /* 00774 80B07CB4 24A57AF4 */ addiu $a1, $a1, %lo(func_80B07AF4) ## $a1 = 80B07AF4 -/* 00778 80B07CB8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0077C 80B07CBC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00778 80B07CB8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0077C 80B07CBC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00780 80B07CC0 944E0EEE */ lhu $t6, 0x0EEE($v0) ## 8015F54E /* 00784 80B07CC4 960F029C */ lhu $t7, 0x029C($s0) ## 0000029C /* 00788 80B07CC8 01CFC025 */ or $t8, $t6, $t7 ## $t8 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07E18.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07E18.s index d0fbb1fed7..8e5efead4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07E18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07E18.s @@ -6,7 +6,7 @@ glabel func_80B07E18 /* 008E8 80B07E28 0C00BC65 */ jal func_8002F194 /* 008EC 80B07E2C AFA50024 */ sw $a1, 0x0024($sp) /* 008F0 80B07E30 10400007 */ beq $v0, $zero, .L80B07E50 -/* 008F4 80B07E34 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 008F4 80B07E34 3C0E8016 */ lui $t6, %hi(gSaveContext+0xd0) /* 008F8 80B07E38 3C0580B0 */ lui $a1, %hi(func_80B07AF4) ## $a1 = 80B00000 /* 008FC 80B07E3C 24A57AF4 */ addiu $a1, $a1, %lo(func_80B07AF4) ## $a1 = 80B07AF4 /* 00900 80B07E40 0C2C1D50 */ jal func_80B07540 @@ -14,7 +14,7 @@ glabel func_80B07E18 /* 00908 80B07E48 10000015 */ beq $zero, $zero, .L80B07EA0 /* 0090C 80B07E4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B07E50: -/* 00910 80B07E50 85CEE730 */ lh $t6, -0x18D0($t6) ## FFFFE730 +/* 00910 80B07E50 85CEE730 */ lh $t6, %lo(gSaveContext+0xd0)($t6) /* 00914 80B07E54 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 /* 00918 80B07E58 2418001F */ addiu $t8, $zero, 0x001F ## $t8 = 0000001F /* 0091C 80B07E5C 29C10032 */ slti $at, $t6, 0x0032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s index 31fac65f02..6599c95ea4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s @@ -33,8 +33,8 @@ glabel func_80B08258 /* 00D6C 80B082AC 0338C821 */ addu $t9, $t9, $t8 /* 00D70 80B082B0 8F3917B4 */ lw $t9, 0x17B4($t9) ## 000117B4 /* 00D74 80B082B4 03214821 */ addu $t1, $t9, $at -/* 00D78 80B082B8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00D7C 80B082BC AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 +/* 00D78 80B082B8 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 00D7C 80B082BC AC296FC0 */ sw $t1, %lo(gSegments+0x18)($at) /* 00D80 80B082C0 0C0250F2 */ jal func_800943C8 /* 00D84 80B082C4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 00D88 80B082C8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s index 09002c72b7..6b7fd19f62 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s @@ -36,7 +36,7 @@ glabel EnSw_Init /* 007C0 80B0C570 304CE000 */ andi $t4, $v0, 0xE000 ## $t4 = 00000000 /* 007C4 80B0C574 000C6B43 */ sra $t5, $t4, 13 /* 007C8 80B0C578 19A00009 */ blez $t5, .L80B0C5A0 -/* 007CC 80B0C57C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 007CC 80B0C57C 3C098016 */ lui $t1, %hi(gSaveContext+0xe9c) /* 007D0 80B0C580 30431F00 */ andi $v1, $v0, 0x1F00 ## $v1 = 00000000 /* 007D4 80B0C584 00031A03 */ sra $v1, $v1, 8 /* 007D8 80B0C588 2463FFFF */ addiu $v1, $v1, 0xFFFF ## $v1 = FFFFFFFF @@ -52,14 +52,14 @@ glabel EnSw_Init /* 007FC 80B0C5AC 0003C883 */ sra $t9, $v1, 2 /* 00800 80B0C5B0 00194080 */ sll $t0, $t9, 2 /* 00804 80B0C5B4 00042080 */ sll $a0, $a0, 2 -/* 00808 80B0C5B8 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 +/* 00808 80B0C5B8 3C0A8012 */ lui $t2, %hi(D_8012723C) /* 0080C 80B0C5BC 01445021 */ addu $t2, $t2, $a0 /* 00810 80B0C5C0 01284821 */ addu $t1, $t1, $t0 -/* 00814 80B0C5C4 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 -/* 00818 80B0C5C8 8D29F4FC */ lw $t1, -0x0B04($t1) ## 8015F4FC -/* 0081C 80B0C5CC 8D4A723C */ lw $t2, 0x723C($t2) ## 8012723C +/* 00814 80B0C5C4 3C0C8012 */ lui $t4, %hi(D_8012724C) +/* 00818 80B0C5C8 8D29F4FC */ lw $t1, %lo(gSaveContext+0xe9c)($t1) +/* 0081C 80B0C5CC 8D4A723C */ lw $t2, %lo(D_8012723C)($t2) /* 00820 80B0C5D0 01846021 */ addu $t4, $t4, $a0 -/* 00824 80B0C5D4 8D8C724C */ lw $t4, 0x724C($t4) ## 8012724C +/* 00824 80B0C5D4 8D8C724C */ lw $t4, %lo(D_8012724C)($t4) /* 00828 80B0C5D8 012A5824 */ and $t3, $t1, $t2 /* 0082C 80B0C5DC 304E00FF */ andi $t6, $v0, 0x00FF ## $t6 = 00000000 /* 00830 80B0C5E0 018B6806 */ srlv $t5, $t3, $t4 @@ -214,17 +214,17 @@ glabel EnSw_Init /* 00A54 80B0C804 AFAC0038 */ sw $t4, 0x0038($sp) .L80B0C808: /* 00A58 80B0C808 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00A5C 80B0C80C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00A60 80B0C810 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00A5C 80B0C80C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00A60 80B0C810 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00A64 80B0C814 3042E000 */ andi $v0, $v0, 0xE000 ## $v0 = 00000000 /* 00A68 80B0C818 00021343 */ sra $v0, $v0, 13 /* 00A6C 80B0C81C 28410003 */ slti $at, $v0, 0x0003 /* 00A70 80B0C820 1420000C */ bne $at, $zero, .L80B0C854 /* 00A74 80B0C824 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 00A78 80B0C828 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 00A7C 80B0C82C 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 00A80 80B0C830 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00A84 80B0C834 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00A78 80B0C828 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 00A7C 80B0C82C 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 00A80 80B0C830 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00A84 80B0C834 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00A88 80B0C838 AFAF0014 */ sw $t7, 0x0014($sp) /* 00A8C 80B0C83C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 00A90 80B0C840 0C03DCE3 */ jal Audio_PlaySoundGeneral diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C9F0.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C9F0.s index a3fc076836..2a7806e824 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C9F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C9F0.s @@ -69,8 +69,8 @@ glabel func_80B0C9F0 /* 00D10 80B0CAC0 0C00CB1F */ jal func_80032C7C /* 00D14 80B0CAC4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00D18 80B0CAC8 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 00D1C 80B0CACC 3C0E8003 */ lui $t6, 0x8003 ## $t6 = 80030000 -/* 00D20 80B0CAD0 25CEB5EC */ addiu $t6, $t6, 0xB5EC ## $t6 = 8002B5EC +/* 00D1C 80B0CACC 3C0E8003 */ lui $t6, %hi(ActorShadow_DrawFunc_Circle) +/* 00D20 80B0CAD0 25CEB5EC */ addiu $t6, %lo(ActorShadow_DrawFunc_Circle) /* 00D24 80B0CAD4 31F8E000 */ andi $t8, $t7, 0xE000 ## $t8 = 00000000 /* 00D28 80B0CAD8 0018CB43 */ sra $t9, $t8, 13 /* 00D2C 80B0CADC 1320001D */ beq $t9, $zero, .L80B0CB54 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D590.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D590.s index 21ae8bf962..5b6851f0cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D590.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D590.s @@ -22,7 +22,7 @@ glabel func_80B0D590 /* 017FC 80B0D5AC 31CFE000 */ andi $t7, $t6, 0xE000 ## $t7 = 00000000 /* 01800 80B0D5B0 000FC343 */ sra $t8, $t7, 13 /* 01804 80B0D5B4 1701002B */ bne $t8, $at, .L80B0D664 -/* 01808 80B0D5B8 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 01808 80B0D5B8 3C0D8016 */ lui $t5, %hi(gSaveContext+0x10) /* 0180C 80B0D5BC 3C0180B1 */ lui $at, %hi(D_80B0F228) ## $at = 80B10000 /* 01810 80B0D5C0 C422F228 */ lwc1 $f2, %lo(D_80B0F228)($at) /* 01814 80B0D5C4 C4800050 */ lwc1 $f0, 0x0050($a0) ## 00000050 @@ -54,7 +54,7 @@ glabel func_80B0D590 /* 01878 80B0D628 8E0C01B0 */ lw $t4, 0x01B0($s0) ## 000001B0 /* 0187C 80B0D62C A1820017 */ sb $v0, 0x0017($t4) ## 00000017 .L80B0D630: -/* 01880 80B0D630 8DADE670 */ lw $t5, -0x1990($t5) ## 8015E670 +/* 01880 80B0D630 8DADE670 */ lw $t5, %lo(gSaveContext+0x10)($t5) /* 01884 80B0D634 51A00004 */ beql $t5, $zero, .L80B0D648 /* 01888 80B0D638 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0188C 80B0D63C 10000003 */ beq $zero, $zero, .L80B0D64C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s index f5ffce17f4..bac66894ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s @@ -34,14 +34,14 @@ glabel func_80B0D878 /* 01B44 80B0D8F4 14600030 */ bne $v1, $zero, .L80B0D9B8 /* 01B48 80B0D8F8 A60900B8 */ sh $t1, 0x00B8($s0) ## 000000B8 /* 01B4C 80B0D8FC 860A0392 */ lh $t2, 0x0392($s0) ## 00000392 -/* 01B50 80B0D900 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01B54 80B0D904 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01B50 80B0D900 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01B54 80B0D904 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01B58 80B0D908 1540002B */ bne $t2, $zero, .L80B0D9B8 /* 01B5C 80B0D90C 24044843 */ addiu $a0, $zero, 0x4843 ## $a0 = 00004843 -/* 01B60 80B0D910 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 -/* 01B64 80B0D914 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 -/* 01B68 80B0D918 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 01B6C 80B0D91C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 01B60 80B0D910 3C0B8013 */ lui $t3, %hi(D_801333E8) +/* 01B64 80B0D914 256B33E8 */ addiu $t3, %lo(D_801333E8) +/* 01B68 80B0D918 3C058013 */ lui $a1, %hi(D_801333D4) +/* 01B6C 80B0D91C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 01B70 80B0D920 AFAB0014 */ sw $t3, 0x0014($sp) /* 01B74 80B0D924 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 01B78 80B0D928 0C03DCE3 */ jal Audio_PlaySoundGeneral diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Update.s index b0592afabb..e51ffbe9f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Update.s @@ -7,7 +7,7 @@ glabel EnSyatekiItm_Update /* 00ABC 80B1016C 0320F809 */ jalr $ra, $t9 /* 00AC0 80B10170 00000000 */ nop /* 00AC4 80B10174 8FA40048 */ lw $a0, 0x0048($sp) -/* 00AC8 80B10178 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 00AC8 80B10178 3C188016 */ lui $t8, %hi(gGameInfo) /* 00ACC 80B1017C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00AD0 80B10180 84820150 */ lh $v0, 0x0150($a0) ## 00000150 /* 00AD4 80B10184 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF @@ -22,7 +22,7 @@ glabel EnSyatekiItm_Update /* 00AF4 80B101A4 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF /* 00AF8 80B101A8 A48F0152 */ sh $t7, 0x0152($a0) ## 00000152 .L80B101AC: -/* 00AFC 80B101AC 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 00AFC 80B101AC 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 00B00 80B101B0 870812D4 */ lh $t0, 0x12D4($t8) ## 801612D4 /* 00B04 80B101B4 51000017 */ beql $t0, $zero, .L80B10214 /* 00B08 80B101B8 8FBF0044 */ lw $ra, 0x0044($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0F944.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0F944.s index 2e2d577198..a072f287a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0F944.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0F944.s @@ -12,8 +12,8 @@ glabel func_80B0F944 /* 002A8 80B0F958 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 002AC 80B0F95C 8CA61C44 */ lw $a2, 0x1C44($a1) ## 00001C44 /* 002B0 80B0F960 15C00051 */ bne $t6, $zero, .L80B0FAA8 -/* 002B4 80B0F964 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 002B8 80B0F968 8DEFE664 */ lw $t7, -0x199C($t7) ## 8015E664 +/* 002B4 80B0F964 3C0F8016 */ lui $t7, %hi(gSaveContext+4) +/* 002B8 80B0F968 8DEFE664 */ lw $t7, %lo(gSaveContext+4)($t7) /* 002BC 80B0F96C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 002C0 80B0F970 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 002C4 80B0F974 15E00031 */ bne $t7, $zero, .L80B0FA3C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Init.s index 9b7d2ca7ab..0e365efc31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Init.s @@ -42,8 +42,8 @@ glabel EnSyatekiMan_Init /* 0006C 80B108DC 8FA40034 */ lw $a0, 0x0034($sp) /* 00070 80B108E0 0C0291BE */ jal SkelAnime_InitSV /* 00074 80B108E4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00078 80B108E8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 0007C 80B108EC 8D08E664 */ lw $t0, -0x199C($t0) ## 8015E664 +/* 00078 80B108E8 3C088016 */ lui $t0, %hi(gSaveContext+4) +/* 0007C 80B108EC 8D08E664 */ lw $t0, %lo(gSaveContext+4)($t0) /* 00080 80B108F0 3C0B80B1 */ lui $t3, %hi(func_80B11310) ## $t3 = 80B10000 /* 00084 80B108F4 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 /* 00088 80B108F8 11000003 */ beq $t0, $zero, .L80B10908 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10A84.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10A84.s index 0c4fd58e16..905f699544 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10A84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10A84.s @@ -38,7 +38,7 @@ glabel func_80B10A84 /* 0029C 80B10B0C 00491021 */ addu $v0, $v0, $t1 /* 002A0 80B10B10 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD /* 002A4 80B10B14 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 002A8 80B10B18 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 002A8 80B10B18 3C0A8016 */ lui $t2, %hi(gSaveContext+0x34) /* 002AC 80B10B1C 10400005 */ beq $v0, $zero, .L80B10B34 /* 002B0 80B10B20 00000000 */ nop /* 002B4 80B10B24 1041001B */ beq $v0, $at, .L80B10B94 @@ -46,7 +46,7 @@ glabel func_80B10A84 /* 002BC 80B10B2C 10000020 */ beq $zero, $zero, .L80B10BB0 /* 002C0 80B10B30 9605010E */ lhu $a1, 0x010E($s0) ## 0000010E .L80B10B34: -/* 002C4 80B10B34 854AE694 */ lh $t2, -0x196C($t2) ## 8015E694 +/* 002C4 80B10B34 854AE694 */ lh $t2, %lo(gSaveContext+0x34)($t2) /* 002C8 80B10B38 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 /* 002CC 80B10B3C 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 /* 002D0 80B10B40 29410014 */ slti $at, $t2, 0x0014 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10EB0.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10EB0.s index 2f889e573f..0d1f0814b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10EB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10EB0.s @@ -56,8 +56,8 @@ glabel func_80B10EB0 /* 006E8 80B10F58 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 .L80B10F5C: /* 006EC 80B10F5C 8E090118 */ lw $t1, 0x0118($s0) ## 00000118 -/* 006F0 80B10F60 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 006F4 80B10F64 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 006F0 80B10F60 3C038016 */ lui $v1, %hi(gSaveContext) +/* 006F4 80B10F64 2463E660 */ addiu $v1, %lo(gSaveContext) /* 006F8 80B10F68 AE000118 */ sw $zero, 0x0118($s0) ## 00000118 /* 006FC 80B10F6C AE090220 */ sw $t1, 0x0220($s0) ## 00000220 /* 00700 80B10F70 8C6A0004 */ lw $t2, 0x0004($v1) ## 8015E664 @@ -69,22 +69,22 @@ glabel func_80B10EB0 /* 00718 80B10F88 316C2000 */ andi $t4, $t3, 0x2000 ## $t4 = 00000000 /* 0071C 80B10F8C 1580001A */ bne $t4, $zero, .L80B10FF8 /* 00720 80B10F90 240E0055 */ addiu $t6, $zero, 0x0055 ## $t6 = 00000055 -/* 00724 80B10F94 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 00728 80B10F98 8DCE71C4 */ lw $t6, 0x71C4($t6) ## 801271C4 +/* 00724 80B10F94 3C0E8012 */ lui $t6, %hi(gUpgradeMasks+0x14) +/* 00728 80B10F98 8DCE71C4 */ lw $t6, %lo(gUpgradeMasks+0x14)($t6) /* 0072C 80B10F9C 8C6D00A0 */ lw $t5, 0x00A0($v1) ## 8015E700 -/* 00730 80B10FA0 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 -/* 00734 80B10FA4 931871F9 */ lbu $t8, 0x71F9($t8) ## 801271F9 +/* 00730 80B10FA0 3C188012 */ lui $t8, %hi(gUpgradeShifts+5) +/* 00734 80B10FA4 931871F9 */ lbu $t8, %lo(gUpgradeShifts+5)($t8) /* 00738 80B10FA8 01AE7824 */ and $t7, $t5, $t6 /* 0073C 80B10FAC 0C00084C */ jal osSyncPrintf /* 00740 80B10FB0 030F2807 */ srav $a1, $t7, $t8 -/* 00744 80B10FB4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00748 80B10FB8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 0074C 80B10FBC 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 00750 80B10FC0 8D0871C4 */ lw $t0, 0x71C4($t0) ## 801271C4 +/* 00744 80B10FB4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00748 80B10FB8 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 0074C 80B10FBC 3C088012 */ lui $t0, %hi(gUpgradeMasks+0x14) +/* 00750 80B10FC0 8D0871C4 */ lw $t0, %lo(gUpgradeMasks+0x14)($t0) /* 00754 80B10FC4 8C7900A0 */ lw $t9, 0x00A0($v1) ## 8015E700 -/* 00758 80B10FC8 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 0075C 80B10FCC 914A71F9 */ lbu $t2, 0x71F9($t2) ## 801271F9 +/* 00758 80B10FC8 3C0A8012 */ lui $t2, %hi(gUpgradeShifts+5) +/* 0075C 80B10FCC 914A71F9 */ lbu $t2, %lo(gUpgradeShifts+5)($t2) /* 00760 80B10FD0 03284824 */ and $t1, $t9, $t0 /* 00764 80B10FD4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00768 80B10FD8 01495807 */ srav $t3, $t1, $t2 @@ -106,22 +106,22 @@ glabel func_80B10EB0 /* 0079C 80B1100C 31F84000 */ andi $t8, $t7, 0x4000 ## $t8 = 00000000 /* 007A0 80B11010 17000022 */ bne $t8, $zero, .L80B1109C /* 007A4 80B11014 24080055 */ addiu $t0, $zero, 0x0055 ## $t0 = 00000055 -/* 007A8 80B11018 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 007AC 80B1101C 8D0871B0 */ lw $t0, 0x71B0($t0) ## 801271B0 +/* 007A8 80B11018 3C088012 */ lui $t0, %hi(gUpgradeMasks) +/* 007AC 80B1101C 8D0871B0 */ lw $t0, %lo(gUpgradeMasks)($t0) /* 007B0 80B11020 8C7900A0 */ lw $t9, 0x00A0($v1) ## 8015E700 -/* 007B4 80B11024 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 007B8 80B11028 914A71F4 */ lbu $t2, 0x71F4($t2) ## 801271F4 +/* 007B4 80B11024 3C0A8012 */ lui $t2, %hi(gUpgradeShifts) +/* 007B8 80B11028 914A71F4 */ lbu $t2, %lo(gUpgradeShifts)($t2) /* 007BC 80B1102C 03284824 */ and $t1, $t9, $t0 /* 007C0 80B11030 0C00084C */ jal osSyncPrintf /* 007C4 80B11034 01492807 */ srav $a1, $t1, $t2 -/* 007C8 80B11038 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 007CC 80B1103C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 007D0 80B11040 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 -/* 007D4 80B11044 8D8C71B0 */ lw $t4, 0x71B0($t4) ## 801271B0 +/* 007C8 80B11038 3C038016 */ lui $v1, %hi(gSaveContext) +/* 007CC 80B1103C 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 007D0 80B11040 3C0C8012 */ lui $t4, %hi(gUpgradeMasks) +/* 007D4 80B11044 8D8C71B0 */ lw $t4, %lo(gUpgradeMasks)($t4) /* 007D8 80B11048 8C6B00A0 */ lw $t3, 0x00A0($v1) ## 8015E700 -/* 007DC 80B1104C 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 007E0 80B11050 91CE71F4 */ lbu $t6, 0x71F4($t6) ## 801271F4 +/* 007DC 80B1104C 3C0E8012 */ lui $t6, %hi(gUpgradeShifts) +/* 007E0 80B11050 91CE71F4 */ lbu $t6, %lo(gUpgradeShifts)($t6) /* 007E4 80B11054 016C6824 */ and $t5, $t3, $t4 /* 007E8 80B11058 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 007EC 80B1105C 01CD1007 */ srav $v0, $t5, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B111D4.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B111D4.s index a43c28372e..66fcfd4ad3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B111D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B111D4.s @@ -26,8 +26,8 @@ glabel func_80B111D4 /* 009A8 80B11218 0C00084C */ jal osSyncPrintf /* 009AC 80B1121C 24841748 */ addiu $a0, $a0, %lo(D_80B11748) ## $a0 = 80B11748 -/* 009B0 80B11220 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 009B4 80B11224 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 009B0 80B11220 3C038016 */ lui $v1, %hi(gSaveContext) +/* 009B4 80B11224 2463E660 */ addiu $v1, %lo(gSaveContext) /* 009B8 80B11228 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 /* 009BC 80B1122C 3C0C80B1 */ lui $t4, %hi(func_80B109DC) ## $t4 = 80B10000 /* 009C0 80B11230 258C09DC */ addiu $t4, $t4, %lo(func_80B109DC) ## $t4 = 80B109DC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B1156C.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B1156C.s index 43b5ea553f..870496ba08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B1156C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B1156C.s @@ -1,6 +1,6 @@ glabel func_80B1156C -/* 00CFC 80B1156C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00D00 80B11570 2463FA90 */ addiu $v1, $v1, 0xFA90 ## $v1 = 8015FA90 +/* 00CFC 80B1156C 3C038016 */ lui $v1, %hi(gGameInfo) +/* 00D00 80B11570 2463FA90 */ addiu $v1, %lo(gGameInfo) /* 00D04 80B11574 8C620000 */ lw $v0, 0x0000($v1) ## 8015FA90 /* 00D08 80B11578 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00D0C 80B1157C AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s index a1ebcd892f..0c6e1de2f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s @@ -28,10 +28,10 @@ glabel EnSyatekiNiw_Init /* 0001C 80B1190C 24A5368C */ addiu $a1, $a1, %lo(D_80B1368C) ## $a1 = 80B1368C /* 00020 80B11910 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 00024 80B11914 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00028 80B11918 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 00028 80B11918 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 0002C 80B1191C 01C17824 */ and $t7, $t6, $at /* 00030 80B11920 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00034 80B11924 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00034 80B11924 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00038 80B11928 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0003C 80B1192C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00040 80B11930 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12460.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12460.s index 724ec41495..39fb18f429 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12460.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12460.s @@ -221,11 +221,11 @@ glabel L80B126E8 /* 00E38 80B12728 C512002C */ lwc1 $f18, 0x002C($t0) ## 0000002C /* 00E3C 80B1272C 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 /* 00E40 80B12730 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 00E44 80B12734 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 00E44 80B12734 3C078013 */ lui $a3, %hi(D_801333E0) /* 00E48 80B12738 46049181 */ sub.s $f6, $f18, $f4 -/* 00E4C 80B1273C 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 00E50 80B12740 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00E54 80B12744 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 00E4C 80B1273C 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 00E50 80B12740 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00E54 80B12744 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 00E58 80B12748 4608303C */ c.lt.s $f6, $f8 /* 00E5C 80B1274C 2404680B */ addiu $a0, $zero, 0x680B ## $a0 = 0000680B /* 00E60 80B12750 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 @@ -257,8 +257,8 @@ glabel L80B12798 /* 00EC0 80B127B0 00290821 */ addu $at, $at, $t1 /* 00EC4 80B127B4 A0221E15 */ sb $v0, 0x1E15($at) ## 00011E15 /* 00EC8 80B127B8 8FAB0034 */ lw $t3, 0x0034($sp) -/* 00ECC 80B127BC 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 00ED0 80B127C0 8D4AE660 */ lw $t2, -0x19A0($t2) ## 8015E660 +/* 00ECC 80B127BC 3C0A8016 */ lui $t2, %hi(gSaveContext) +/* 00ED0 80B127C0 8D4AE660 */ lw $t2, %lo(gSaveContext)($t2) /* 00ED4 80B127C4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00ED8 80B127C8 002B0821 */ addu $at, $at, $t3 /* 00EDC 80B127CC A42A1E1A */ sh $t2, 0x1E1A($at) ## 00011E1A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B128D8.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B128D8.s index 4de6799bb7..9260b5a8ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B128D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B128D8.s @@ -3,8 +3,8 @@ glabel func_80B128D8 /* 00FEC 80B128DC 848E025E */ lh $t6, 0x025E($a0) ## 0000025E /* 00FF0 80B128E0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00FF4 80B128E4 15C10002 */ bne $t6, $at, .L80B128F0 -/* 00FF8 80B128E8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00FFC 80B128EC A420FA2E */ sh $zero, -0x05D2($at) ## 8015FA2E +/* 00FF8 80B128E8 3C018016 */ lui $at, %hi(gSaveContext+0x13ce) +/* 00FFC 80B128EC A420FA2E */ sh $zero, %lo(gSaveContext+0x13ce)($at) .L80B128F0: /* 01000 80B128F0 03E00008 */ jr $ra /* 01004 80B128F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Destroy.s index d59ab5d33d..e500ba8e5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Destroy.s @@ -18,8 +18,8 @@ glabel EnTa_Destroy /* 00818 80B142B8 85CF00A4 */ lh $t7, 0x00A4($t6) ## 000000A4 /* 0081C 80B142BC 2401004C */ addiu $at, $zero, 0x004C ## $at = 0000004C /* 00820 80B142C0 15E10002 */ bne $t7, $at, .L80B142CC -/* 00824 80B142C4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00828 80B142C8 A420FA2E */ sh $zero, -0x05D2($at) ## 8015FA2E +/* 00824 80B142C4 3C018016 */ lui $at, %hi(gSaveContext+0x13ce) +/* 00828 80B142C8 A420FA2E */ sh $zero, %lo(gSaveContext+0x13ce)($at) .L80B142CC: /* 0082C 80B142CC 94D802E0 */ lhu $t8, 0x02E0($a2) ## 000002E0 /* 00830 80B142D0 33190200 */ andi $t9, $t8, 0x0200 ## $t9 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s index 6e53ba7473..59d4b5b1bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s @@ -29,12 +29,12 @@ glabel EnTa_Draw /* 03284 80B16D24 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 03288 80B16D28 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 0328C 80B16D2C 3C0480B1 */ lui $a0, %hi(D_80B16E88) ## $a0 = 80B10000 -/* 03290 80B16D30 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 03290 80B16D30 3C068016 */ lui $a2, %hi(gSegments) /* 03294 80B16D34 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 /* 03298 80B16D38 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 /* 0329C 80B16D3C AC790000 */ sw $t9, 0x0000($v1) ## 00000000 /* 032A0 80B16D40 860902B4 */ lh $t1, 0x02B4($s0) ## 000002B4 -/* 032A4 80B16D44 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 032A4 80B16D44 24C66FA8 */ addiu $a2, %lo(gSegments) /* 032A8 80B16D48 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 /* 032AC 80B16D4C 00095080 */ sll $t2, $t1, 2 /* 032B0 80B16D50 008A2021 */ addu $a0, $a0, $t2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s index aa6f4642c2..6818c0452a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s @@ -26,8 +26,8 @@ glabel EnTa_Init /* 000F0 80B13B90 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 000F4 80B13B94 AFBF0034 */ sw $ra, 0x0034($sp) /* 000F8 80B13B98 AFA50054 */ sw $a1, 0x0054($sp) -/* 000FC 80B13B9C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00100 80B13BA0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 000FC 80B13B9C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00100 80B13BA0 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00104 80B13BA4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00108 80B13BA8 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 0010C 80B13BAC 0C00AC78 */ jal ActorShape_Init @@ -96,9 +96,9 @@ glabel EnTa_Init /* 001F4 80B13C94 0C00084C */ jal osSyncPrintf /* 001F8 80B13C98 24846EA0 */ addiu $a0, $a0, %lo(D_80B16EA0) ## $a0 = 80B16EA0 -/* 001FC 80B13C9C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00200 80B13CA0 9442F540 */ lhu $v0, -0x0AC0($v0) ## 8015F540 -/* 00204 80B13CA4 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 001FC 80B13C9C 3C028016 */ lui $v0, %hi(gSaveContext+0xee0) +/* 00200 80B13CA0 9442F540 */ lhu $v0, %lo(gSaveContext+0xee0)($v0) +/* 00204 80B13CA4 3C0C8016 */ lui $t4, %hi(gSaveContext+4) /* 00208 80B13CA8 304B0800 */ andi $t3, $v0, 0x0800 ## $t3 = 00000000 /* 0020C 80B13CAC 11600005 */ beq $t3, $zero, .L80B13CC4 /* 00210 80B13CB0 00000000 */ nop @@ -108,7 +108,7 @@ glabel EnTa_Init /* 0021C 80B13CBC 1000015E */ beq $zero, $zero, .L80B14238 /* 00220 80B13CC0 8FBF0034 */ lw $ra, 0x0034($sp) .L80B13CC4: -/* 00224 80B13CC4 8D8CE664 */ lw $t4, -0x199C($t4) ## FFFFE664 +/* 00224 80B13CC4 8D8CE664 */ lw $t4, %lo(gSaveContext+4)($t4) /* 00228 80B13CC8 304D0400 */ andi $t5, $v0, 0x0400 ## $t5 = 00000000 /* 0022C 80B13CCC 11800005 */ beq $t4, $zero, .L80B13CE4 /* 00230 80B13CD0 00000000 */ nop @@ -158,8 +158,8 @@ glabel EnTa_Init /* 002D0 80B13D70 0C00084C */ jal osSyncPrintf /* 002D4 80B13D74 24846EB8 */ addiu $a0, $a0, %lo(D_80B16EB8) ## $a0 = 00006EB8 -/* 002D8 80B13D78 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 002DC 80B13D7C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 002D8 80B13D78 3C028016 */ lui $v0, %hi(gSaveContext) +/* 002DC 80B13D7C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 002E0 80B13D80 94590EE0 */ lhu $t9, 0x0EE0($v0) ## 8015F540 /* 002E4 80B13D84 33280800 */ andi $t0, $t9, 0x0800 ## $t0 = 00000000 /* 002E8 80B13D88 55000006 */ bnel $t0, $zero, .L80B13DA4 @@ -220,8 +220,8 @@ glabel EnTa_Init /* 003A0 80B13E40 846200A4 */ lh $v0, 0x00A4($v1) ## 000000A4 /* 003A4 80B13E44 5441002E */ bnel $v0, $at, .L80B13F00 /* 003A8 80B13E48 2401004C */ addiu $at, $zero, 0x004C ## $at = 0000004C -/* 003AC 80B13E4C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 003B0 80B13E50 9442F536 */ lhu $v0, -0x0ACA($v0) ## 8015F536 +/* 003AC 80B13E4C 3C028016 */ lui $v0, %hi(gSaveContext+0xed6) +/* 003B0 80B13E50 9442F536 */ lhu $v0, %lo(gSaveContext+0xed6)($v0) /* 003B4 80B13E54 304E0010 */ andi $t6, $v0, 0x0010 ## $t6 = 00000000 /* 003B8 80B13E58 11C00005 */ beq $t6, $zero, .L80B13E70 /* 003BC 80B13E5C 304F0008 */ andi $t7, $v0, 0x0008 ## $t7 = 00000000 @@ -275,8 +275,8 @@ glabel EnTa_Init /* 0046C 80B13F0C 0C00084C */ jal osSyncPrintf /* 00470 80B13F10 24846F04 */ addiu $a0, $a0, %lo(D_80B16F04) ## $a0 = 80B16F04 -/* 00474 80B13F14 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00478 80B13F18 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00474 80B13F14 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00478 80B13F18 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0047C 80B13F1C 94690ED6 */ lhu $t1, 0x0ED6($v1) ## 8015F536 /* 00480 80B13F20 312A0010 */ andi $t2, $t1, 0x0010 ## $t2 = 00000000 /* 00484 80B13F24 55400006 */ bnel $t2, $zero, .L80B13F40 @@ -391,8 +391,8 @@ glabel EnTa_Init /* 0061C 80B140BC 8FA50054 */ lw $a1, 0x0054($sp) /* 00620 80B140C0 0C2C4EAB */ jal func_80B13AAC /* 00624 80B140C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00628 80B140C8 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 0062C 80B140CC 9529FA5A */ lhu $t1, -0x05A6($t1) ## 8015FA5A +/* 00628 80B140C8 3C098016 */ lui $t1, %hi(gSaveContext+0x13fa) +/* 0062C 80B140CC 9529FA5A */ lhu $t1, %lo(gSaveContext+0x13fa)($t1) /* 00630 80B140D0 3C0580B1 */ lui $a1, %hi(func_80B16608) ## $a1 = 80B10000 /* 00634 80B140D4 24A56608 */ addiu $a1, $a1, %lo(func_80B16608) ## $a1 = 80B16608 /* 00638 80B140D8 312A0400 */ andi $t2, $t1, 0x0400 ## $t2 = 00000000 @@ -431,8 +431,8 @@ glabel EnTa_Init /* 006B4 80B14154 0C029468 */ jal SkelAnime_ChangeAnim /* 006B8 80B14158 00000000 */ nop -/* 006BC 80B1415C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 006C0 80B14160 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 006BC 80B1415C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 006C0 80B14160 2442E660 */ addiu $v0, %lo(gSaveContext) /* 006C4 80B14164 944D13FA */ lhu $t5, 0x13FA($v0) ## 8015FA5A /* 006C8 80B14168 31AEFBFF */ andi $t6, $t5, 0xFBFF ## $t6 = 00000000 /* 006CC 80B1416C 10000031 */ beq $zero, $zero, .L80B14234 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s index ebcac2a61a..7e95864cf4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s @@ -6,8 +6,8 @@ glabel func_80B13AAC /* 0001C 80B13ABC 24050018 */ addiu $a1, $zero, 0x0018 ## $a1 = 00000018 /* 00020 80B13AC0 0C01B0D8 */ jal Text_GetFaceReaction /* 00024 80B13AC4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00028 80B13AC8 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 0002C 80B13ACC 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 00028 80B13AC8 3C048016 */ lui $a0, %hi(gSaveContext) +/* 0002C 80B13ACC 2484E660 */ addiu $a0, %lo(gSaveContext) /* 00030 80B13AD0 948313FA */ lhu $v1, 0x13FA($a0) ## 8015FA5A /* 00034 80B13AD4 8FA60018 */ lw $a2, 0x0018($sp) /* 00038 80B13AD8 306E0400 */ andi $t6, $v1, 0x0400 ## $t6 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14410.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14410.s index 137ec3f10e..972eae1d45 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14410.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14410.s @@ -1,6 +1,6 @@ glabel func_80B14410 -/* 00970 80B14410 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00974 80B14414 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00970 80B14410 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00974 80B14414 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00978 80B14418 8C4E0004 */ lw $t6, 0x0004($v0) ## 8015E664 /* 0097C 80B1441C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00980 80B14420 AFBF0014 */ sw $ra, 0x0014($sp) @@ -11,8 +11,8 @@ glabel func_80B14410 /* 00994 80B14434 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 /* 00998 80B14438 0C2C4EA8 */ jal func_80B13AA0 /* 0099C 80B1443C 24A54C18 */ addiu $a1, $a1, %lo(func_80B14C18) ## $a1 = 80B14C18 -/* 009A0 80B14440 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 009A4 80B14444 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 009A0 80B14440 3C028016 */ lui $v0, %hi(gSaveContext) +/* 009A4 80B14444 2442E660 */ addiu $v0, %lo(gSaveContext) /* 009A8 80B14448 944F0ED6 */ lhu $t7, 0x0ED6($v0) ## 8015F536 /* 009AC 80B1444C 35F80008 */ ori $t8, $t7, 0x0008 ## $t8 = 00000008 /* 009B0 80B14450 1000000A */ beq $zero, $zero, .L80B1447C @@ -22,8 +22,8 @@ glabel func_80B14410 /* 009BC 80B1445C 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 /* 009C0 80B14460 0C2C4EA8 */ jal func_80B13AA0 /* 009C4 80B14464 24A54CAC */ addiu $a1, $a1, %lo(func_80B14CAC) ## $a1 = 00004CAC -/* 009C8 80B14468 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 009CC 80B1446C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 009C8 80B14468 3C028016 */ lui $v0, %hi(gSaveContext) +/* 009CC 80B1446C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 009D0 80B14470 94590EE0 */ lhu $t9, 0x0EE0($v0) ## 8015F540 /* 009D4 80B14474 37280400 */ ori $t0, $t9, 0x0400 ## $t0 = 00000400 /* 009D8 80B14478 A4480EE0 */ sh $t0, 0x0EE0($v0) ## 8015F540 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s index 02659ae9c1..b128afbbf6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s @@ -20,9 +20,9 @@ glabel func_80B14B6C /* 01114 80B14BB4 24A54AF4 */ addiu $a1, $a1, %lo(func_80B14AF4) ## $a1 = 80B14AF4 /* 01118 80B14BB8 0C2C4EA8 */ jal func_80B13AA0 /* 0111C 80B14BBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01120 80B14BC0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 01120 80B14BC0 3C028016 */ lui $v0, %hi(gSaveContext) /* 01124 80B14BC4 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 01128 80B14BC8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01128 80B14BC8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0112C 80B14BCC A60E02CC */ sh $t6, 0x02CC($s0) ## 000002CC /* 01130 80B14BD0 944F0ED6 */ lhu $t7, 0x0ED6($v0) ## 8015F536 /* 01134 80B14BD4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14CAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14CAC.s index 1ce85dfcbb..9be847c4fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14CAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14CAC.s @@ -1,6 +1,6 @@ glabel func_80B14CAC -/* 0120C 80B14CAC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 01210 80B14CB0 95CEF536 */ lhu $t6, -0x0ACA($t6) ## 8015F536 +/* 0120C 80B14CAC 3C0E8016 */ lui $t6, %hi(gSaveContext+0xed6) +/* 01210 80B14CB0 95CEF536 */ lhu $t6, %lo(gSaveContext+0xed6)($t6) /* 01214 80B14CB4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01218 80B14CB8 AFB00018 */ sw $s0, 0x0018($sp) /* 0121C 80B14CBC 31CF0100 */ andi $t7, $t6, 0x0100 ## $t7 = 00000000 @@ -16,8 +16,8 @@ glabel func_80B14CAC /* 01244 80B14CE4 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 /* 01248 80B14CE8 0C2C4EA8 */ jal func_80B13AA0 /* 0124C 80B14CEC 24A54C60 */ addiu $a1, $a1, %lo(func_80B14C60) ## $a1 = 80B14C60 -/* 01250 80B14CF0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01254 80B14CF4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 01250 80B14CF0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01254 80B14CF4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 01258 80B14CF8 94580EE0 */ lhu $t8, 0x0EE0($v0) ## 8015F540 /* 0125C 80B14CFC 37190800 */ ori $t9, $t8, 0x0800 ## $t9 = 00000800 /* 01260 80B14D00 1000000B */ beq $zero, $zero, .L80B14D30 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14DD8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14DD8.s index 17fbf1e4e0..02896c1442 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14DD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14DD8.s @@ -1,6 +1,6 @@ glabel func_80B14DD8 -/* 01338 80B14DD8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0133C 80B14DDC 85CEE694 */ lh $t6, -0x196C($t6) ## 8015E694 +/* 01338 80B14DD8 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) +/* 0133C 80B14DDC 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) /* 01340 80B14DE0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01344 80B14DE4 AFBF0014 */ sw $ra, 0x0014($sp) /* 01348 80B14DE8 29C1001E */ slti $at, $t6, 0x001E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15424.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15424.s index 72c34bc3d5..30ef03ffbe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15424.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15424.s @@ -15,9 +15,9 @@ glabel func_80B15424 /* 019B8 80B15458 10400023 */ beq $v0, $zero, .L80B154E8 /* 019BC 80B1545C 240E05E4 */ addiu $t6, $zero, 0x05E4 ## $t6 = 000005E4 /* 019C0 80B15460 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 019C4 80B15464 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 019C4 80B15464 3C028016 */ lui $v0, %hi(gSaveContext) /* 019C8 80B15468 00300821 */ addu $at, $at, $s0 -/* 019CC 80B1546C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 019CC 80B1546C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 019D0 80B15470 A42E1E1A */ sh $t6, 0x1E1A($at) ## 00011E1A /* 019D4 80B15474 944F13FA */ lhu $t7, 0x13FA($v0) ## 8015FA5A /* 019D8 80B15478 24090026 */ addiu $t1, $zero, 0x0026 ## $t1 = 00000026 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s index 8ebc638d47..176995e1c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s @@ -69,7 +69,7 @@ glabel func_80B154FC /* 01B44 80B155E4 A62802E0 */ sh $t0, 0x02E0($s1) ## 000002E0 /* 01B48 80B155E8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 01B4C 80B155EC 10410009 */ beq $v0, $at, .L80B15614 -/* 01B50 80B155F0 3C108016 */ lui $s0, 0x8016 ## $s0 = 80160000 +/* 01B50 80B155F0 3C108016 */ lui $s0, %hi(gSaveContext) /* 01B54 80B155F4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 01B58 80B155F8 10410033 */ beq $v0, $at, .L80B156C8 /* 01B5C 80B155FC 24092083 */ addiu $t1, $zero, 0x2083 ## $t1 = 00002083 @@ -79,7 +79,7 @@ glabel func_80B154FC /* 01B6C 80B1560C 10000039 */ beq $zero, $zero, .L80B156F4 /* 01B70 80B15610 8E2C0004 */ lw $t4, 0x0004($s1) ## 00000004 .L80B15614: -/* 01B74 80B15614 2610E660 */ addiu $s0, $s0, 0xE660 ## $s0 = 8015E660 +/* 01B74 80B15614 2610E660 */ addiu $s0, %lo(gSaveContext) /* 01B78 80B15618 A60013CE */ sh $zero, 0x13CE($s0) ## 8015FA2E /* 01B7C 80B1561C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01B80 80B15620 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 @@ -162,8 +162,8 @@ glabel func_80B154FC /* 01C90 80B15730 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 01C94 80B15734 1601FF7A */ bne $s0, $at, .L80B15520 /* 01C98 80B15738 24E70004 */ addiu $a3, $a3, 0x0004 ## $a3 = 00000004 -/* 01C9C 80B1573C 3C108016 */ lui $s0, 0x8016 ## $s0 = 80160000 -/* 01CA0 80B15740 2610E660 */ addiu $s0, $s0, 0xE660 ## $s0 = 8015E660 +/* 01C9C 80B1573C 3C108016 */ lui $s0, %hi(gSaveContext) +/* 01CA0 80B15740 2610E660 */ addiu $s0, %lo(gSaveContext) /* 01CA4 80B15744 860213D0 */ lh $v0, 0x13D0($s0) ## 8015FA30 /* 01CA8 80B15748 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 01CAC 80B1574C 14410004 */ bne $v0, $at, .L80B15760 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E80.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E80.s index 79e1b88dda..9c70d05d23 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E80.s @@ -14,8 +14,8 @@ glabel func_80B15E80 /* 02410 80B15EB0 AE000118 */ sw $zero, 0x0118($s0) ## 00000118 /* 02414 80B15EB4 15E00007 */ bne $t7, $zero, .L80B15ED4 /* 02418 80B15EB8 AE0E025C */ sw $t6, 0x025C($s0) ## 0000025C -/* 0241C 80B15EBC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 02420 80B15EC0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0241C 80B15EBC 3C038016 */ lui $v1, %hi(gSaveContext) +/* 02420 80B15EC0 2463E660 */ addiu $v1, %lo(gSaveContext) /* 02424 80B15EC4 94780EF0 */ lhu $t8, 0x0EF0($v1) ## 8015F550 /* 02428 80B15EC8 37190004 */ ori $t9, $t8, 0x0004 ## $t9 = 00000004 /* 0242C 80B15ECC A4790EF0 */ sh $t9, 0x0EF0($v1) ## 8015F550 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15FE8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15FE8.s index f1efcff9ce..7ea658c932 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15FE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15FE8.s @@ -20,7 +20,7 @@ glabel func_80B15FE8 /* 02590 80B16030 10400008 */ beq $v0, $zero, .L80B16054 /* 02594 80B16034 00000000 */ nop /* 02598 80B16038 1041003B */ beq $v0, $at, .L80B16128 -/* 0259C 80B1603C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0259C 80B1603C 3C188016 */ lui $t8, %hi(gSaveContext+0x34) /* 025A0 80B16040 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 025A4 80B16044 1041004E */ beq $v0, $at, .L80B16180 /* 025A8 80B16048 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -84,7 +84,7 @@ glabel func_80B15FE8 /* 02680 80B16120 1000001E */ beq $zero, $zero, .L80B1619C /* 02684 80B16124 960202E0 */ lhu $v0, 0x02E0($s0) ## 000002E0 .L80B16128: -/* 02688 80B16128 8718E694 */ lh $t8, -0x196C($t8) ## FFFFE694 +/* 02688 80B16128 8718E694 */ lh $t8, %lo(gSaveContext+0x34)($t8) /* 0268C 80B1612C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 02690 80B16130 2B01000A */ slti $at, $t8, 0x000A /* 02694 80B16134 1020000B */ beq $at, $zero, .L80B16164 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B161C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B161C0.s index 380f30e4ed..fb00af250e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B161C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B161C0.s @@ -29,7 +29,7 @@ glabel func_80B161C0 /* 02784 80B16224 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 02788 80B16228 00461021 */ addu $v0, $v0, $a2 /* 0278C 80B1622C 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 02790 80B16230 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 02790 80B16230 3C0F8016 */ lui $t7, %hi(gSaveContext+0x34) /* 02794 80B16234 10400005 */ beq $v0, $zero, .L80B1624C /* 02798 80B16238 00000000 */ nop /* 0279C 80B1623C 1041001A */ beq $v0, $at, .L80B162A8 @@ -37,7 +37,7 @@ glabel func_80B161C0 /* 027A4 80B16244 1000001F */ beq $zero, $zero, .L80B162C4 /* 027A8 80B16248 960202E0 */ lhu $v0, 0x02E0($s0) ## 000002E0 .L80B1624C: -/* 027AC 80B1624C 85EFE694 */ lh $t7, -0x196C($t7) ## 8015E694 +/* 027AC 80B1624C 85EFE694 */ lh $t7, %lo(gSaveContext+0x34)($t7) /* 027B0 80B16250 00032023 */ subu $a0, $zero, $v1 /* 027B4 80B16254 24050085 */ addiu $a1, $zero, 0x0085 ## $a1 = 00000085 /* 027B8 80B16258 01E3082A */ slt $at, $t7, $v1 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16364.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16364.s index 856462127a..7ae3230efa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16364.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16364.s @@ -11,8 +11,8 @@ glabel func_80B16364 /* 028E8 80B16388 0C041AF2 */ jal func_80106BC8 /* 028EC 80B1638C 8FA4001C */ lw $a0, 0x001C($sp) /* 028F0 80B16390 1040001C */ beq $v0, $zero, .L80B16404 -/* 028F4 80B16394 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 028F8 80B16398 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 028F4 80B16394 3C028016 */ lui $v0, %hi(gSaveContext) +/* 028F8 80B16398 2442E660 */ addiu $v0, %lo(gSaveContext) /* 028FC 80B1639C 944E0F06 */ lhu $t6, 0x0F06($v0) ## 8015F566 /* 02900 80B163A0 94580EF0 */ lhu $t8, 0x0EF0($v0) ## 8015F550 /* 02904 80B163A4 2405207F */ addiu $a1, $zero, 0x207F ## $a1 = 0000207F diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s index a1a93b7091..d1611d82b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s @@ -21,8 +21,8 @@ glabel func_80B16504 /* 02AB0 80B16550 24056851 */ addiu $a1, $zero, 0x6851 ## $a1 = 00006851 /* 02AB4 80B16554 97AE0026 */ lhu $t6, 0x0026($sp) -/* 02AB8 80B16558 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 02ABC 80B1655C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 02AB8 80B16558 3C038016 */ lui $v1, %hi(gSaveContext) +/* 02ABC 80B1655C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 02AC0 80B16560 11C00006 */ beq $t6, $zero, .L80B1657C /* 02AC4 80B16564 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02AC8 80B16568 3C0580B1 */ lui $a1, %hi(func_80B15E28) ## $a1 = 80B10000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s index 1cb24eff3c..d001ffe1ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s @@ -29,7 +29,7 @@ glabel EnTakaraMan_Draw /* 00794 80B17CF4 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00798 80B17CF8 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 0079C 80B17CFC 3C0480B1 */ lui $a0, %hi(D_80B17DD4) ## $a0 = 80B10000 -/* 007A0 80B17D00 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 007A0 80B17D00 3C0E8016 */ lui $t6, %hi(gSegments) /* 007A4 80B17D04 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 /* 007A8 80B17D08 ACB802C0 */ sw $t8, 0x02C0($a1) ## 000002C0 /* 007AC 80B17D0C AC790000 */ sw $t9, 0x0000($v1) ## 00000000 @@ -45,7 +45,7 @@ glabel EnTakaraMan_Draw /* 007D4 80B17D34 000B6702 */ srl $t4, $t3, 28 /* 007D8 80B17D38 000C6880 */ sll $t5, $t4, 2 /* 007DC 80B17D3C 01CD7021 */ addu $t6, $t6, $t5 -/* 007E0 80B17D40 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 007E0 80B17D40 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 007E4 80B17D44 00815024 */ and $t2, $a0, $at /* 007E8 80B17D48 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 007EC 80B17D4C 014E7821 */ addu $t7, $t2, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s index 0333b1db98..4a9db37930 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s @@ -45,8 +45,8 @@ glabel EnTakaraMan_Init /* 00070 80B175D0 8F051D38 */ lw $a1, 0x1D38($t8) ## 00001D38 /* 00074 80B175D4 8FA40034 */ lw $a0, 0x0034($sp) -/* 00078 80B175D8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0007C 80B175DC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00078 80B175D8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0007C 80B175DC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00080 80B175E0 AC801D38 */ sw $zero, 0x1D38($a0) ## 00001D38 /* 00084 80B175E4 94481402 */ lhu $t0, 0x1402($v0) ## 8015FA62 /* 00088 80B175E8 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17934.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17934.s index 7fdafc942b..9a30153c3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17934.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17934.s @@ -17,7 +17,7 @@ glabel func_80B17934 /* 00410 80B17970 00511021 */ addu $v0, $v0, $s1 /* 00414 80B17974 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD /* 00418 80B17978 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0041C 80B1797C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0041C 80B1797C 3C0F8016 */ lui $t7, %hi(gSaveContext+0x34) /* 00420 80B17980 10400005 */ beq $v0, $zero, .L80B17998 /* 00424 80B17984 00000000 */ nop /* 00428 80B17988 10410027 */ beq $v0, $at, .L80B17A28 @@ -25,7 +25,7 @@ glabel func_80B17934 /* 00430 80B17990 10000032 */ beq $zero, $zero, .L80B17A5C /* 00434 80B17994 8FBF0024 */ lw $ra, 0x0024($sp) .L80B17998: -/* 00438 80B17998 85EFE694 */ lh $t7, -0x196C($t7) ## 8015E694 +/* 00438 80B17998 85EFE694 */ lh $t7, %lo(gSaveContext+0x34)($t7) /* 0043C 80B1799C 29E1000A */ slti $at, $t7, 0x000A /* 00440 80B179A0 14200014 */ bne $at, $zero, .L80B179F4 /* 00444 80B179A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Init.s index 87737e0d60..24cddb8d29 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Init.s @@ -37,8 +37,8 @@ glabel EnTest_Init /* 0008C 8085F6DC 0C02915F */ jal SkelAnime_Init /* 00090 8085F6E0 260504A8 */ addiu $a1, $s0, 0x04A8 ## $a1 = 000004A8 -/* 00094 8085F6E4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00098 8085F6E8 24C6B8C4 */ addiu $a2, $a2, 0xB8C4 ## $a2 = 8002B8C4 +/* 00094 8085F6E4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Teardrop) +/* 00098 8085F6E8 24C6B8C4 */ addiu $a2, %lo(ActorShadow_DrawFunc_Teardrop) /* 0009C 8085F6EC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 000A0 8085F6F0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 000A4 8085F6F4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s index 6d3f832e69..7288b8946f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s @@ -288,11 +288,11 @@ glabel L808638F4 /* 04410 80863A60 55600011 */ bnel $t3, $zero, .L80863AA8 /* 04414 80863A64 8FBF002C */ lw $ra, 0x002C($sp) /* 04418 80863A68 918D1C27 */ lbu $t5, 0x1C27($t4) ## 00001C27 -/* 0441C 80863A6C 3C188003 */ lui $t8, 0x8003 ## $t8 = 80030000 +/* 0441C 80863A6C 3C188003 */ lui $t8, %hi(ActorShadow_DrawFunc_Teardrop) /* 04420 80863A70 51A00008 */ beql $t5, $zero, .L80863A94 /* 04424 80863A74 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 /* 04428 80863A78 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 0442C 80863A7C 2718B8C4 */ addiu $t8, $t8, 0xB8C4 ## $t8 = 8002B8C4 +/* 0442C 80863A7C 2718B8C4 */ addiu $t8, %lo(ActorShadow_DrawFunc_Teardrop) /* 04430 80863A80 AE1800C0 */ sw $t8, 0x00C0($s0) ## 000000C0 /* 04434 80863A84 35CF0081 */ ori $t7, $t6, 0x0081 ## $t7 = 00000081 /* 04438 80863A88 10000006 */ beq $zero, $zero, .L80863AA4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s index 140cfdd549..bfd80f16a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s @@ -4,8 +4,8 @@ glabel EnTg_Init /* 00158 80B184B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0015C 80B184BC AFBF002C */ sw $ra, 0x002C($sp) /* 00160 80B184C0 AFA5003C */ sw $a1, 0x003C($sp) -/* 00164 80B184C4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00168 80B184C8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00164 80B184C4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00168 80B184C8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0016C 80B184CC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00170 80B184D0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00174 80B184D4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s index 4f203737a1..0fb8be3c24 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s @@ -31,18 +31,18 @@ glabel EnTite_Draw /* 02834 80B1B2B4 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 02838 80B1B2B8 8FA80080 */ lw $t0, 0x0080($sp) /* 0283C 80B1B2BC 1701003A */ bne $t8, $at, .L80B1B3A8 -/* 02840 80B1B2C0 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 02840 80B1B2C0 3C058016 */ lui $a1, %hi(gSegments) /* 02844 80B1B2C4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02848 80B1B2C8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0284C 80B1B2CC 24841300 */ addiu $a0, $a0, 0x1300 ## $a0 = 06001300 /* 02850 80B1B2D0 00045100 */ sll $t2, $a0, 4 /* 02854 80B1B2D4 000A5F02 */ srl $t3, $t2, 28 -/* 02858 80B1B2D8 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 02858 80B1B2D8 3C058016 */ lui $a1, %hi(gSegments) /* 0285C 80B1B2DC 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 02860 80B1B2E0 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 02864 80B1B2E4 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 /* 02868 80B1B2E8 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 0286C 80B1B2EC 24A56FA8 */ addiu $a1, $a1, 0x6FA8 ## $a1 = 80166FA8 +/* 0286C 80B1B2EC 24A56FA8 */ addiu $a1, %lo(gSegments) /* 02870 80B1B2F0 000B6080 */ sll $t4, $t3, 2 /* 02874 80B1B2F4 00AC6821 */ addu $t5, $a1, $t4 /* 02878 80B1B2F8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 @@ -97,7 +97,7 @@ glabel EnTite_Draw /* 02938 80B1B3B8 000D7702 */ srl $t6, $t5, 28 /* 0293C 80B1B3BC 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 02940 80B1B3C0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 02944 80B1B3C4 24A56FA8 */ addiu $a1, $a1, 0x6FA8 ## $a1 = 8016DF50 +/* 02944 80B1B3C4 24A56FA8 */ addiu $a1, %lo(gSegments) /* 02948 80B1B3C8 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 /* 0294C 80B1B3CC 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 /* 02950 80B1B3D0 000E7880 */ sll $t7, $t6, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Init.s index f83f56b34d..8dc3823477 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Init.s @@ -29,8 +29,8 @@ glabel EnTite_Init /* 0006C 80B18AEC 0C02915F */ jal SkelAnime_Init /* 00070 80B18AF0 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00074 80B18AF4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00078 80B18AF8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00074 80B18AF4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00078 80B18AF8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0007C 80B18AFC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00080 80B18B00 3C05C348 */ lui $a1, 0xC348 ## $a1 = C3480000 /* 00084 80B18B04 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s index 6d2ca223de..bdbe72d4bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s @@ -42,11 +42,11 @@ glabel EnTorch2_Draw /* 01EF0 80B1F870 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 /* 01EF4 80B1F874 90880000 */ lbu $t0, 0x0000($a0) ## 80B20165 /* 01EF8 80B1F878 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 01EFC 80B1F87C 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 +/* 01EFC 80B1F87C 3C0C8011 */ lui $t4, %hi(D_80116280+0x10) /* 01F00 80B1F880 01014825 */ or $t1, $t0, $at ## $t1 = FF000000 /* 01F04 80B1F884 AC690004 */ sw $t1, 0x0004($v1) ## 00000004 /* 01F08 80B1F888 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 01F0C 80B1F88C 258C6290 */ addiu $t4, $t4, 0x6290 ## $t4 = 80116290 +/* 01F0C 80B1F88C 258C6290 */ addiu $t4, %lo(D_80116280+0x10) /* 01F10 80B1F890 356B0030 */ ori $t3, $t3, 0x0030 ## $t3 = DB060030 /* 01F14 80B1F894 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 /* 01F18 80B1F898 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 @@ -79,12 +79,12 @@ glabel EnTorch2_Draw .L80B1F904: /* 01F84 80B1F904 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 /* 01F88 80B1F908 3C01FF00 */ lui $at, 0xFF00 ## $at = FF000000 -/* 01F8C 80B1F90C 3C0D8011 */ lui $t5, 0x8011 ## $t5 = 80110000 +/* 01F8C 80B1F90C 3C0D8011 */ lui $t5, %hi(D_80116280) /* 01F90 80B1F910 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 /* 01F94 80B1F914 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 /* 01F98 80B1F918 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 /* 01F9C 80B1F91C 90890000 */ lbu $t1, 0x0000($a0) ## 00000000 -/* 01FA0 80B1F920 25AD6280 */ addiu $t5, $t5, 0x6280 ## $t5 = 80116280 +/* 01FA0 80B1F920 25AD6280 */ addiu $t5, %lo(D_80116280) /* 01FA4 80B1F924 358C0030 */ ori $t4, $t4, 0x0030 ## $t4 = 00000030 /* 01FA8 80B1F928 01215025 */ or $t2, $t1, $at ## $t2 = FF000000 /* 01FAC 80B1F92C AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Init.s index 28e0a52da0..96b78c54f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Init.s @@ -54,8 +54,8 @@ glabel EnTorch2_Init /* 000D0 80B1DA50 A20405F4 */ sb $a0, 0x05F4($s0) ## 000005F4 /* 000D4 80B1DA54 A20605F5 */ sb $a2, 0x05F5($s0) ## 000005F5 /* 000D8 80B1DA58 AE090098 */ sw $t1, 0x0098($s0) ## 00000098 -/* 000DC 80B1DA5C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 000E0 80B1DA60 8739E68E */ lh $t9, -0x1972($t9) ## 8015E68E +/* 000DC 80B1DA5C 3C198016 */ lui $t9, %hi(gSaveContext+0x2e) +/* 000E0 80B1DA60 8739E68E */ lh $t9, %lo(gSaveContext+0x2e)($t9) /* 000E4 80B1DA64 240B003C */ addiu $t3, $zero, 0x003C ## $t3 = 0000003C /* 000E8 80B1DA68 240C0064 */ addiu $t4, $zero, 0x0064 ## $t4 = 00000064 /* 000EC 80B1DA6C 001950C3 */ sra $t2, $t9, 3 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s index 5067d5da10..a3e86cda0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s @@ -192,7 +192,7 @@ glabel EnTorch2_Update /* 006C8 80B1E048 81EF0164 */ lb $t7, %lo(D_80B20164)($t7) /* 006CC 80B1E04C 820E0842 */ lb $t6, 0x0842($s0) ## 00000842 /* 006D0 80B1E050 3C1880B2 */ lui $t8, %hi(D_80B20162) ## $t8 = 80B20000 -/* 006D4 80B1E054 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 006D4 80B1E054 3C0B8016 */ lui $t3, %hi(gSaveContext+0x30) /* 006D8 80B1E058 11CF0008 */ beq $t6, $t7, .L80B1E07C /* 006DC 80B1E05C 3C0C80B2 */ lui $t4, %hi(D_80B20160) ## $t4 = 80B20000 /* 006E0 80B1E060 93180162 */ lbu $t8, %lo(D_80B20162)($t8) @@ -203,7 +203,7 @@ glabel EnTorch2_Update /* 006F4 80B1E074 3C0180B2 */ lui $at, %hi(D_80B20164) ## $at = 80B20000 /* 006F8 80B1E078 A02A0164 */ sb $t2, %lo(D_80B20164)($at) .L80B1E07C: -/* 006FC 80B1E07C 856BE690 */ lh $t3, -0x1970($t3) ## 8015E690 +/* 006FC 80B1E07C 856BE690 */ lh $t3, %lo(gSaveContext+0x30)($t3) /* 00700 80B1E080 29610050 */ slti $at, $t3, 0x0050 /* 00704 80B1E084 10200009 */ beq $at, $zero, .L80B1E0AC /* 00708 80B1E088 00000000 */ nop @@ -1161,8 +1161,8 @@ glabel EnTorch2_Update /* 014C0 80B1EE40 01616021 */ addu $t4, $t3, $at /* 014C4 80B1EE44 AFAC002C */ sw $t4, 0x002C($sp) .L80B1EE48: -/* 014C8 80B1EE48 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 014CC 80B1EE4C 85CEFA50 */ lh $t6, -0x05B0($t6) ## 8015FA50 +/* 014C8 80B1EE48 3C0E8016 */ lui $t6, %hi(gSaveContext+0x13f0) +/* 014CC 80B1EE4C 85CEFA50 */ lh $t6, %lo(gSaveContext+0x13f0)($t6) /* 014D0 80B1EE50 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 014D4 80B1EE54 3C1880B2 */ lui $t8, %hi(D_80B2015E) ## $t8 = 80B20000 /* 014D8 80B1EE58 15C10013 */ bne $t6, $at, .L80B1EEA8 @@ -1487,7 +1487,7 @@ glabel EnTorch2_Update /* 0197C 80B1F2FC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 01980 80B1F300 44C2F800 */ ctc1 $v0, $31 /* 01984 80B1F304 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 01988 80B1F308 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 01988 80B1F308 3C0B8016 */ lui $t3, %hi(gSaveContext+0x30) /* 0198C 80B1F30C 46000124 */ cvt.w.s $f4, $f0 /* 01990 80B1F310 4442F800 */ cfc1 $v0, $31 /* 01994 80B1F314 00000000 */ nop @@ -1518,7 +1518,7 @@ glabel EnTorch2_Update /* 019F0 80B1F370 0440FFFB */ bltz $v0, .L80B1F360 /* 019F4 80B1F374 00000000 */ nop .L80B1F378: -/* 019F8 80B1F378 856BE690 */ lh $t3, -0x1970($t3) ## 8015E690 +/* 019F8 80B1F378 856BE690 */ lh $t3, %lo(gSaveContext+0x30)($t3) /* 019FC 80B1F37C 44CEF800 */ ctc1 $t6, $31 /* 01A00 80B1F380 24420006 */ addiu $v0, $v0, 0x0006 ## $v0 = 00000005 /* 01A04 80B1F384 29610050 */ slti $at, $t3, 0x0050 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DBD8.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DBD8.s index 41c8c5e6d9..55d0f4731d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DBD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DBD8.s @@ -17,7 +17,7 @@ glabel func_80B1DBD8 /* 00280 80B1DC00 00000000 */ nop /* 00284 80B1DC04 C4660838 */ lwc1 $f6, 0x0838($v1) ## 00000838 /* 00288 80B1DC08 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 0028C 80B1DC0C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0028C 80B1DC0C 3C0E8016 */ lui $t6, %hi(gSaveContext+0x30) /* 00290 80B1DC10 4600303C */ c.lt.s $f6, $f0 /* 00294 80B1DC14 3C0F80B2 */ lui $t7, %hi(D_80B20165) ## $t7 = 80B20000 /* 00298 80B1DC18 0304C021 */ addu $t8, $t8, $a0 @@ -27,7 +27,7 @@ glabel func_80B1DBD8 /* 002A4 80B1DC24 1000004E */ beq $zero, $zero, .L80B1DD60 /* 002A8 80B1DC28 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80B1DC2C: -/* 002AC 80B1DC2C 85CEE690 */ lh $t6, -0x1970($t6) ## 8015E690 +/* 002AC 80B1DC2C 85CEE690 */ lh $t6, %lo(gSaveContext+0x30)($t6) /* 002B0 80B1DC30 3C0880B2 */ lui $t0, %hi(D_80B20148) ## $t0 = 80B20000 /* 002B4 80B1DC34 29C10050 */ slti $at, $t6, 0x0050 /* 002B8 80B1DC38 10200004 */ beq $at, $zero, .L80B1DC4C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s index b526ebd39f..711a52181f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s @@ -7,14 +7,14 @@ glabel EnToryo_Init /* 00014 80B20184 2401002A */ addiu $at, $zero, 0x002A ## $at = 0000002A /* 00018 80B20188 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0001C 80B2018C 10410026 */ beq $v0, $at, .L80B20228 -/* 00020 80B20190 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00020 80B20190 3C038016 */ lui $v1, %hi(gSaveContext) /* 00024 80B20194 24010052 */ addiu $at, $zero, 0x0052 ## $at = 00000052 /* 00028 80B20198 10410012 */ beq $v0, $at, .L80B201E4 -/* 0002C 80B2019C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 0002C 80B2019C 3C038016 */ lui $v1, %hi(gSaveContext) /* 00030 80B201A0 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A /* 00034 80B201A4 14410031 */ bne $v0, $at, .L80B2026C -/* 00038 80B201A8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0003C 80B201AC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00038 80B201A8 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0003C 80B201AC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00040 80B201B0 8C6F0004 */ lw $t7, 0x0004($v1) ## 8015E664 /* 00044 80B201B4 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 /* 00048 80B201B8 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 @@ -30,7 +30,7 @@ glabel EnToryo_Init /* 0006C 80B201DC 10000023 */ beq $zero, $zero, .L80B2026C /* 00070 80B201E0 A61901E8 */ sh $t9, 0x01E8($s0) ## 000001E8 .L80B201E4: -/* 00074 80B201E4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015CCC0 +/* 00074 80B201E4 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00078 80B201E8 8C680004 */ lw $t0, 0x0004($v1) ## 8015CCC4 /* 0007C 80B201EC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00080 80B201F0 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 @@ -49,7 +49,7 @@ glabel EnToryo_Init /* 000B0 80B20220 10000012 */ beq $zero, $zero, .L80B2026C /* 000B4 80B20224 A60B01E8 */ sh $t3, 0x01E8($s0) ## 000001E8 .L80B20228: -/* 000B8 80B20228 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015B320 +/* 000B8 80B20228 2463E660 */ addiu $v1, %lo(gSaveContext) /* 000BC 80B2022C 8C6C0004 */ lw $t4, 0x0004($v1) ## 8015B324 /* 000C0 80B20230 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 000C4 80B20234 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 @@ -77,8 +77,8 @@ glabel EnToryo_Init /* 00110 80B20280 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B20284: -/* 00114 80B20284 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00118 80B20288 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00114 80B20284 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00118 80B20288 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0011C 80B2028C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00120 80B20290 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00124 80B20294 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B203D8.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B203D8.s index a20584694c..911857ec32 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B203D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B203D8.s @@ -99,8 +99,8 @@ glabel L80B204AC /* 00390 80B20500 AFA6001C */ sw $a2, 0x001C($sp) /* 00394 80B20504 1040002C */ beq $v0, $zero, .L80B205B8 /* 00398 80B20508 8FA6001C */ lw $a2, 0x001C($sp) -/* 0039C 80B2050C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 003A0 80B20510 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0039C 80B2050C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 003A0 80B20510 2442E660 */ addiu $v0, %lo(gSaveContext) /* 003A4 80B20514 944C0F26 */ lhu $t4, 0x0F26($v0) ## 8015F586 /* 003A8 80B20518 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 003AC 80B2051C 358D0004 */ ori $t5, $t4, 0x0004 ## $t5 = 00000004 @@ -119,8 +119,8 @@ glabel L80B20540 /* 003D8 80B20548 AFA6001C */ sw $a2, 0x001C($sp) /* 003DC 80B2054C 1040001A */ beq $v0, $zero, .L80B205B8 /* 003E0 80B20550 8FA6001C */ lw $a2, 0x001C($sp) -/* 003E4 80B20554 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 003E8 80B20558 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 003E4 80B20554 3C028016 */ lui $v0, %hi(gSaveContext) +/* 003E8 80B20558 2442E660 */ addiu $v0, %lo(gSaveContext) /* 003EC 80B2055C 944E0F26 */ lhu $t6, 0x0F26($v0) ## 8015F586 /* 003F0 80B20560 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 003F4 80B20564 35CF0002 */ ori $t7, $t6, 0x0002 ## $t7 = 00000002 @@ -132,8 +132,8 @@ glabel L80B20570 /* 00408 80B20578 AFA6001C */ sw $a2, 0x001C($sp) /* 0040C 80B2057C 1040000E */ beq $v0, $zero, .L80B205B8 /* 00410 80B20580 8FA6001C */ lw $a2, 0x001C($sp) -/* 00414 80B20584 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00418 80B20588 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00414 80B20584 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00418 80B20588 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0041C 80B2058C 94580F26 */ lhu $t8, 0x0F26($v0) ## 8015F586 /* 00420 80B20590 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00424 80B20594 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20634.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20634.s index b3ee329dc7..7c480dd5cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20634.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20634.s @@ -10,8 +10,8 @@ glabel func_80B20634 /* 004E4 80B20654 2403200F */ addiu $v1, $zero, 0x200F ## $v1 = 0000200F /* 004E8 80B20658 0C01E221 */ jal func_80078884 /* 004EC 80B2065C 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 004F0 80B20660 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 004F4 80B20664 95CEF586 */ lhu $t6, -0x0A7A($t6) ## 8015F586 +/* 004F0 80B20660 3C0E8016 */ lui $t6, %hi(gSaveContext+0xf26) +/* 004F4 80B20664 95CEF586 */ lhu $t6, %lo(gSaveContext+0xf26)($t6) /* 004F8 80B20668 2403606D */ addiu $v1, $zero, 0x606D ## $v1 = 0000606D /* 004FC 80B2066C 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 /* 00500 80B20670 11E00003 */ beq $t7, $zero, .L80B20680 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B206A0.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B206A0.s index bb73cfe6f4..e2808d0c7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B206A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B206A0.s @@ -12,8 +12,8 @@ glabel func_80B206A0 /* 00558 80B206C8 304F0001 */ andi $t7, $v0, 0x0001 ## $t7 = 00000000 /* 0055C 80B206CC 11E00012 */ beq $t7, $zero, .L80B20718 /* 00560 80B206D0 304A0002 */ andi $t2, $v0, 0x0002 ## $t2 = 00000000 -/* 00564 80B206D4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00568 80B206D8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00564 80B206D4 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00568 80B206D8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0056C 80B206DC 94580EE6 */ lhu $t8, 0x0EE6($v0) ## 8015F546 /* 00570 80B206E0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 00574 80B206E4 3319000F */ andi $t9, $t8, 0x000F ## $t9 = 00000000 @@ -34,8 +34,8 @@ glabel func_80B206A0 .L80B20718: /* 005A8 80B20718 1140000B */ beq $t2, $zero, .L80B20748 /* 005AC 80B2071C 304D0004 */ andi $t5, $v0, 0x0004 ## $t5 = 00000000 -/* 005B0 80B20720 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 005B4 80B20724 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 005B0 80B20720 3C028016 */ lui $v0, %hi(gSaveContext) +/* 005B4 80B20724 2442E660 */ addiu $v0, %lo(gSaveContext) /* 005B8 80B20728 944B0F26 */ lhu $t3, 0x0F26($v0) ## 8015F586 /* 005BC 80B2072C 316C0004 */ andi $t4, $t3, 0x0004 ## $t4 = 00000000 /* 005C0 80B20730 11800003 */ beq $t4, $zero, .L80B20740 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Draw.s index 2f31f3d911..a2a4c3b70a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Draw.s @@ -133,11 +133,11 @@ glabel EnTp_Draw /* 01B88 80B22968 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 /* 01B8C 80B2296C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 01B90 80B22970 000FC880 */ sll $t9, $t7, 2 -/* 01B94 80B22974 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 01B94 80B22974 3C0A8016 */ lui $t2, %hi(gSegments) /* 01B98 80B22978 AD0E02D0 */ sw $t6, 0x02D0($t0) ## 000002D0 /* 01B9C 80B2297C 01595021 */ addu $t2, $t2, $t9 /* 01BA0 80B22980 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 01BA4 80B22984 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 01BA4 80B22984 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 01BA8 80B22988 00815824 */ and $t3, $a0, $at /* 01BAC 80B2298C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01BB0 80B22990 014B6021 */ addu $t4, $t2, $t3 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Init.s index f2eff48718..16f4587006 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Init.s @@ -27,12 +27,12 @@ glabel EnTp_Init /* 00054 80B20E34 3C0F80B2 */ lui $t7, %hi(D_80B22AC4) ## $t7 = 80B20000 /* 00058 80B20E38 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 0005C 80B20E3C 25EF2AC4 */ addiu $t7, $t7, %lo(D_80B22AC4) ## $t7 = 80B22AC4 -/* 00060 80B20E40 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 00060 80B20E40 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 00064 80B20E44 3C073E0F */ lui $a3, 0x3E0F ## $a3 = 3E0F0000 /* 00068 80B20E48 A26E001F */ sb $t6, 0x001F($s3) ## 0000001F /* 0006C 80B20E4C AE6F0098 */ sw $t7, 0x0098($s3) ## 00000098 /* 00070 80B20E50 34E75C29 */ ori $a3, $a3, 0x5C29 ## $a3 = 3E0F5C29 -/* 00074 80B20E54 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00074 80B20E54 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00078 80B20E58 266400B4 */ addiu $a0, $s3, 0x00B4 ## $a0 = 000000B4 /* 0007C 80B20E5C 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s index e029aacd50..fc6a1463b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s @@ -70,11 +70,11 @@ glabel EnTp_Update .L80B22544: /* 01764 80B22544 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01768 80B22548 C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 -/* 0176C 80B2254C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01770 80B22550 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 +/* 0176C 80B2254C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01770 80B22550 3C0A8013 */ lui $t2, %hi(D_801333E8) /* 01774 80B22554 46083032 */ c.eq.s $f6, $f8 -/* 01778 80B22558 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0177C 80B2255C 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 +/* 01778 80B22558 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0177C 80B2255C 254A33E8 */ addiu $t2, %lo(D_801333E8) /* 01780 80B22560 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 01784 80B22564 45010019 */ bc1t .L80B225CC /* 01788 80B22568 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B212C0.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B212C0.s index 9df57c4030..1b168df8dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B212C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B212C0.s @@ -23,10 +23,10 @@ glabel func_80B212C0 /* 00520 80B21300 0C01E0C4 */ jal Math_SmoothScaleMaxMinF /* 00524 80B21304 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00528 80B21308 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0052C 80B2130C 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 00530 80B21310 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00534 80B21314 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 00528 80B21308 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0052C 80B2130C 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 00530 80B21310 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00534 80B21314 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 00538 80B21318 AFAF0014 */ sw $t7, 0x0014($sp) /* 0053C 80B2131C AFA70010 */ sw $a3, 0x0010($sp) /* 00540 80B21320 24043064 */ addiu $a0, $zero, 0x3064 ## $a0 = 00003064 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B219A8.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B219A8.s index 6a5977990c..714a045903 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B219A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B219A8.s @@ -41,10 +41,10 @@ glabel func_80B219A8 /* 00C4C 80B21A2C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF /* 00C50 80B21A30 00000000 */ nop -/* 00C54 80B21A34 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00C58 80B21A38 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 00C5C 80B21A3C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00C60 80B21A40 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 00C54 80B21A34 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00C58 80B21A38 3C198013 */ lui $t9, %hi(D_801333E8) +/* 00C5C 80B21A3C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00C60 80B21A40 273933E8 */ addiu $t9, %lo(D_801333E8) /* 00C64 80B21A44 AFB90014 */ sw $t9, 0x0014($sp) /* 00C68 80B21A48 AFA70010 */ sw $a3, 0x0010($sp) /* 00C6C 80B21A4C 24043064 */ addiu $a0, $zero, 0x3064 ## $a0 = 00003064 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21BDC.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21BDC.s index 909a5a82d8..1360783693 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21BDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21BDC.s @@ -206,15 +206,15 @@ glabel func_80B21BDC .L80B21E98: /* 010B8 80B21E98 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 010BC 80B21E9C 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -/* 010C0 80B21EA0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 010C0 80B21EA0 3C078013 */ lui $a3, %hi(D_801333E0) /* 010C4 80B21EA4 460A4032 */ c.eq.s $f8, $f10 -/* 010C8 80B21EA8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 010C8 80B21EA8 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 010CC 80B21EAC 24043064 */ addiu $a0, $zero, 0x3064 ## $a0 = 00003064 /* 010D0 80B21EB0 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 010D4 80B21EB4 45010007 */ bc1t .L80B21ED4 /* 010D8 80B21EB8 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -/* 010DC 80B21EBC 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 010E0 80B21EC0 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 010DC 80B21EBC 3C188013 */ lui $t8, %hi(D_801333E8) +/* 010E0 80B21EC0 271833E8 */ addiu $t8, %lo(D_801333E8) /* 010E4 80B21EC4 AFB80014 */ sw $t8, 0x0014($sp) /* 010E8 80B21EC8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 010EC 80B21ECC 0C03DCE3 */ jal Audio_PlaySoundGeneral diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21F18.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21F18.s index c8d507d9b0..cbbac502ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21F18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21F18.s @@ -113,18 +113,18 @@ glabel func_80B21F18 /* 012C8 80B220A8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 012CC 80B220AC 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 012D0 80B220B0 46120202 */ mul.s $f8, $f0, $f18 -/* 012D4 80B220B4 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 012D4 80B220B4 3C078013 */ lui $a3, %hi(D_801333E0) /* 012D8 80B220B8 460A203C */ c.lt.s $f4, $f10 /* 012DC 80B220BC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 012E0 80B220C0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 012E0 80B220C0 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 012E4 80B220C4 24043064 */ addiu $a0, $zero, 0x3064 ## $a0 = 00003064 /* 012E8 80B220C8 45000002 */ bc1f .L80B220D4 /* 012EC 80B220CC E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 /* 012F0 80B220D0 AFB90044 */ sw $t9, 0x0044($sp) .L80B220D4: /* 012F4 80B220D4 C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C -/* 012F8 80B220D8 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 012FC 80B220DC 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 +/* 012F8 80B220D8 3C088013 */ lui $t0, %hi(D_801333E8) +/* 012FC 80B220DC 250833E8 */ addiu $t0, %lo(D_801333E8) /* 01300 80B220E0 46028032 */ c.eq.s $f16, $f2 /* 01304 80B220E4 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 01308 80B220E8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s index 28e10f5169..57522c9773 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s @@ -19,12 +19,12 @@ glabel EnTr_Draw /* 011D0 80B23EC0 11C0000B */ beq $t6, $zero, .L80B23EF0 /* 011D4 80B23EC4 00000000 */ nop /* 011D8 80B23EC8 848F02D8 */ lh $t7, 0x02D8($a0) ## 000002D8 -/* 011DC 80B23ECC 3C098003 */ lui $t1, 0x8003 ## $t1 = 80030000 +/* 011DC 80B23ECC 3C098003 */ lui $t1, %hi(ActorShadow_DrawFunc_Circle) /* 011E0 80B23ED0 3C0680B2 */ lui $a2, %hi(D_80B24414) ## $a2 = 80B20000 /* 011E4 80B23ED4 000FC080 */ sll $t8, $t7, 2 /* 011E8 80B23ED8 00B8C821 */ addu $t9, $a1, $t8 /* 011EC 80B23EDC 8F281D8C */ lw $t0, 0x1D8C($t9) ## 00001D8C -/* 011F0 80B23EE0 2529B5EC */ addiu $t1, $t1, 0xB5EC ## $t1 = 8002B5EC +/* 011F0 80B23EE0 2529B5EC */ addiu $t1, %lo(ActorShadow_DrawFunc_Circle) /* 011F4 80B23EE4 24C64414 */ addiu $a2, $a2, %lo(D_80B24414) ## $a2 = 80B24414 /* 011F8 80B23EE8 15000003 */ bne $t0, $zero, .L80B23EF8 /* 011FC 80B23EEC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 @@ -44,7 +44,7 @@ glabel EnTr_Draw /* 0122C 80B23F1C 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 01230 80B23F20 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 01234 80B23F24 3C0480B2 */ lui $a0, %hi(D_80B243D0) ## $a0 = 80B20000 -/* 01238 80B23F28 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 01238 80B23F28 3C088016 */ lui $t0, %hi(gSegments) /* 0123C 80B23F2C 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 /* 01240 80B23F30 ACAA02C0 */ sw $t2, 0x02C0($a1) ## 000002C0 /* 01244 80B23F34 AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 @@ -60,7 +60,7 @@ glabel EnTr_Draw /* 0126C 80B23F5C 000FC702 */ srl $t8, $t7, 28 /* 01270 80B23F60 0018C880 */ sll $t9, $t8, 2 /* 01274 80B23F64 01194021 */ addu $t0, $t0, $t9 -/* 01278 80B23F68 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 +/* 01278 80B23F68 8D086FA8 */ lw $t0, %lo(gSegments)($t0) /* 0127C 80B23F6C 00817024 */ and $t6, $a0, $at /* 01280 80B23F70 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01284 80B23F74 01C84821 */ addu $t1, $t6, $t0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s index a9d7b93594..56d3292b64 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s @@ -14,9 +14,9 @@ glabel EnTr_Init /* 00010 80B22D00 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00014 80B22D04 AFBF002C */ sw $ra, 0x002C($sp) /* 00018 80B22D08 AFA50034 */ sw $a1, 0x0034($sp) -/* 0001C 80B22D0C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 0001C 80B22D0C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 00020 80B22D10 AFB10028 */ sw $s1, 0x0028($sp) -/* 00024 80B22D14 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00024 80B22D14 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00028 80B22D18 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0002C 80B22D1C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00030 80B22D20 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22E6C.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22E6C.s index a4b813454a..bc7d99b86e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22E6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22E6C.s @@ -9,18 +9,18 @@ glabel func_80B22E6C /* 00198 80B22E88 14610014 */ bne $v1, $at, .L80B22EDC /* 0019C 80B22E8C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 /* 001A0 80B22E90 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 001A4 80B22E94 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 001A8 80B22E98 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 001A4 80B22E94 3C078013 */ lui $a3, %hi(D_801333E0) +/* 001A8 80B22E98 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 001AC 80B22E9C 15C00004 */ bne $t6, $zero, .L80B22EB0 -/* 001B0 80B22EA0 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 001B4 80B22EA4 8DEFF9C0 */ lw $t7, -0x0640($t7) ## 8015F9C0 +/* 001B0 80B22EA0 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1360) +/* 001B4 80B22EA4 8DEFF9C0 */ lw $t7, %lo(gSaveContext+0x1360)($t7) /* 001B8 80B22EA8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 001BC 80B22EAC 15E1000B */ bne $t7, $at, .L80B22EDC .L80B22EB0: -/* 001C0 80B22EB0 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 001C4 80B22EB4 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 001C8 80B22EB8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 001CC 80B22EBC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 001C0 80B22EB0 3C188013 */ lui $t8, %hi(D_801333E8) +/* 001C4 80B22EB4 271833E8 */ addiu $t8, %lo(D_801333E8) +/* 001C8 80B22EB8 3C058013 */ lui $a1, %hi(D_801333D4) +/* 001CC 80B22EBC 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 001D0 80B22EC0 AFB80014 */ sw $t8, 0x0014($sp) /* 001D4 80B22EC4 240439B3 */ addiu $a0, $zero, 0x39B3 ## $a0 = 000039B3 /* 001D8 80B22EC8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Init.s index a38ae2b034..152a5a6a0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Init.s @@ -245,8 +245,8 @@ glabel EnTrap_Init /* 00374 80B249D4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00378 80B249D8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0037C 80B249DC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00380 80B249E0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0037C 80B249DC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00380 80B249E0 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00384 80B249E4 44050000 */ mfc1 $a1, $f0 /* 00388 80B249E8 44070000 */ mfc1 $a3, $f0 /* 0038C 80B249EC 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Init.s index eff3ef8154..4ba64937b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Init.s @@ -9,8 +9,8 @@ glabel EnVali_Init /* 0001C 80B266CC 0C01E037 */ jal Actor_ProcessInitChain /* 00020 80B266D0 24A58944 */ addiu $a1, $a1, %lo(D_80B28944) ## $a1 = 80B28944 -/* 00024 80B266D4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00028 80B266D8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00024 80B266D4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00028 80B266D8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0002C 80B266DC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00030 80B266E0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00034 80B266E4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Draw.s index 8637d3dd1b..166cdc5d29 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Draw.s @@ -57,7 +57,7 @@ glabel EnVbBall_Draw /* 00E74 80B29E14 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 /* 00E78 80B29E18 294100C8 */ slti $at, $t2, 0x00C8 /* 00E7C 80B29E1C 14200016 */ bne $at, $zero, .L80B29E78 -/* 00E80 80B29E20 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00E80 80B29E20 3C0F8016 */ lui $t7, %hi(gSegments) /* 00E84 80B29E24 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00E88 80B29E28 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00E8C 80B29E2C 2484B2F8 */ addiu $a0, $a0, 0xB2F8 ## $a0 = 0600B2F8 @@ -67,11 +67,11 @@ glabel EnVbBall_Draw /* 00E9C 80B29E3C AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 /* 00EA0 80B29E40 000E7880 */ sll $t7, $t6, 2 /* 00EA4 80B29E44 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 00EA8 80B29E48 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 00EA8 80B29E48 3C188016 */ lui $t8, %hi(gSegments) /* 00EAC 80B29E4C 030FC021 */ addu $t8, $t8, $t7 /* 00EB0 80B29E50 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00EB4 80B29E54 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00EB8 80B29E58 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 00EB8 80B29E58 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 00EBC 80B29E5C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00EC0 80B29E60 0081C824 */ and $t9, $a0, $at /* 00EC4 80B29E64 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -86,7 +86,7 @@ glabel EnVbBall_Draw /* 00EE4 80B29E84 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 00EE8 80B29E88 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 /* 00EEC 80B29E8C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00EF0 80B29E90 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 00EF0 80B29E90 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 00EF4 80B29E94 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00EF8 80B29E98 0081C024 */ and $t8, $a0, $at /* 00EFC 80B29E9C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -146,11 +146,11 @@ glabel EnVbBall_Draw /* 00FD4 80B29F74 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 00FD8 80B29F78 000E7880 */ sll $t7, $t6, 2 /* 00FDC 80B29F7C 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 00FE0 80B29F80 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 00FE0 80B29F80 3C188016 */ lui $t8, %hi(gSegments) /* 00FE4 80B29F84 030FC021 */ addu $t8, $t8, $t7 /* 00FE8 80B29F88 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00FEC 80B29F8C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00FF0 80B29F90 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 00FF0 80B29F90 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 00FF4 80B29F94 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00FF8 80B29F98 0081C824 */ and $t9, $a0, $at /* 00FFC 80B29F9C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s index 6336d53266..676e1239b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s @@ -132,9 +132,9 @@ glabel EnVbBall_Update /* 007D8 80B29778 4481B000 */ mtc1 $at, $f22 ## $f22 = 10.00 /* 007DC 80B2977C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 007E0 80B29780 26991C24 */ addiu $t9, $s4, 0x1C24 ## $t9 = 00001C24 -/* 007E4 80B29784 3C138013 */ lui $s3, 0x8013 ## $s3 = 80130000 +/* 007E4 80B29784 3C138013 */ lui $s3, %hi(D_801333E0) /* 007E8 80B29788 4481A000 */ mtc1 $at, $f20 ## $f20 = 3.00 -/* 007EC 80B2978C 267333E0 */ addiu $s3, $s3, 0x33E0 ## $s3 = 801333E0 +/* 007EC 80B2978C 267333E0 */ addiu $s3, %lo(D_801333E0) /* 007F0 80B29790 AFB9006C */ sw $t9, 0x006C($sp) /* 007F4 80B29794 862E001C */ lh $t6, 0x001C($s1) ## 0000001C .L80B29798: @@ -219,8 +219,8 @@ glabel EnVbBall_Update /* 0090C 80B298AC 244500E4 */ addiu $a1, $v0, 0x00E4 ## $a1 = 000000E4 /* 00910 80B298B0 16AD0007 */ bne $s5, $t5, .L80B298D0 /* 00914 80B298B4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00918 80B298B8 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 0091C 80B298BC 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 00918 80B298B8 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 0091C 80B298BC 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 00920 80B298C0 AFAF0014 */ sw $t7, 0x0014($sp) /* 00924 80B298C4 02603825 */ or $a3, $s3, $zero ## $a3 = 801333E0 /* 00928 80B298C8 0C03DCE3 */ jal Audio_PlaySoundGeneral diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B292D0.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B292D0.s index d10b42f529..82af1bc528 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B292D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B292D0.s @@ -77,17 +77,17 @@ glabel func_80B292D0 /* 00438 80B293D8 46120102 */ mul.s $f4, $f0, $f18 /* 0043C 80B293DC C6660060 */ lwc1 $f6, 0x0060($s3) ## 00000060 /* 00440 80B293E0 8679001C */ lh $t9, 0x001C($s3) ## 0000001C -/* 00444 80B293E4 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 00444 80B293E4 3C078013 */ lui $a3, %hi(D_801333E0) /* 00448 80B293E8 46083282 */ mul.s $f10, $f6, $f8 /* 0044C 80B293EC 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 00450 80B293F0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00450 80B293F0 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00454 80B293F4 E6640064 */ swc1 $f4, 0x0064($s3) ## 00000064 /* 00458 80B293F8 24043927 */ addiu $a0, $zero, 0x3927 ## $a0 = 00003927 /* 0045C 80B293FC 266500E4 */ addiu $a1, $s3, 0x00E4 ## $a1 = 000000E4 /* 00460 80B29400 11000007 */ beq $t0, $zero, .L80B29420 /* 00464 80B29404 E66A0060 */ swc1 $f10, 0x0060($s3) ## 00000060 -/* 00468 80B29408 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 0046C 80B2940C 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 +/* 00468 80B29408 3C098013 */ lui $t1, %hi(D_801333E8) +/* 0046C 80B2940C 252933E8 */ addiu $t1, %lo(D_801333E8) /* 00470 80B29410 AFA90014 */ sw $t1, 0x0014($sp) /* 00474 80B29414 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 00478 80B29418 0C03DCE3 */ jal Audio_PlaySoundGeneral diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Update.s index 3fab45cc21..28754cb9bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Update.s @@ -11,8 +11,8 @@ glabel EnViewer_Update /* 010C4 80B2B2C4 0338C821 */ addu $t9, $t9, $t8 /* 010C8 80B2B2C8 8F3917B4 */ lw $t9, 0x17B4($t9) ## 000117B4 /* 010CC 80B2B2CC 03214021 */ addu $t0, $t9, $at -/* 010D0 80B2B2D0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 010D4 80B2B2D4 AC286FC0 */ sw $t0, 0x6FC0($at) ## 80166FC0 +/* 010D0 80B2B2D0 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 010D4 80B2B2D4 AC286FC0 */ sw $t0, %lo(gSegments+0x18)($at) /* 010D8 80B2B2D8 8C9901E0 */ lw $t9, 0x01E0($a0) ## 000001E0 /* 010DC 80B2B2DC 0320F809 */ jalr $ra, $t9 /* 010E0 80B2B2E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s index 4736832c62..258829218c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s @@ -62,8 +62,8 @@ glabel func_80B2A300 /* 001E0 80B2A3E0 8D4A17B4 */ lw $t2, 0x17B4($t2) ## 000117B4 /* 001E4 80B2A3E4 8FA50044 */ lw $a1, 0x0044($sp) /* 001E8 80B2A3E8 01415821 */ addu $t3, $t2, $at -/* 001EC 80B2A3EC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 001F0 80B2A3F0 AC2B6FC0 */ sw $t3, 0x6FC0($at) ## 80166FC0 +/* 001EC 80B2A3EC 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 001F0 80B2A3F0 AC2B6FC0 */ sw $t3, %lo(gSegments+0x18)($at) /* 001F4 80B2A3F4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 001F8 80B2A3F8 10410007 */ beq $v0, $at, .L80B2A418 /* 001FC 80B2A3FC 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s index 16210bb4a0..e0866bc436 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s @@ -28,9 +28,9 @@ glabel func_80B2A448 /* 002B0 80B2A4B0 8FA5003C */ lw $a1, 0x003C($sp) /* 002B4 80B2A4B4 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 002B8 80B2A4B8 01215021 */ addu $t2, $t1, $at -/* 002BC 80B2A4BC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 002BC 80B2A4BC 3C018016 */ lui $at, %hi(gSegments+0x18) /* 002C0 80B2A4C0 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat -/* 002C4 80B2A4C4 AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 +/* 002C4 80B2A4C4 AC2A6FC0 */ sw $t2, %lo(gSegments+0x18)($at) /* 002C8 80B2A4C8 8FBF0024 */ lw $ra, 0x0024($sp) /* 002CC 80B2A4CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 /* 002D0 80B2A4D0 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s index 703c5a5d53..6f4195c067 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s @@ -31,8 +31,8 @@ glabel func_80B2A75C /* 0057C 80B2A77C 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 /* 00580 80B2A780 14410015 */ bne $v0, $at, .L80B2A7D8 /* 00584 80B2A784 AFA20044 */ sw $v0, 0x0044($sp) -/* 00588 80B2A788 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 0058C 80B2A78C 8DEFF9C0 */ lw $t7, -0x0640($t7) ## 8015F9C0 +/* 00588 80B2A788 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1360) +/* 0058C 80B2A78C 8DEFF9C0 */ lw $t7, %lo(gSaveContext+0x1360)($t7) /* 00590 80B2A790 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00594 80B2A794 15E100C0 */ bne $t7, $at, .L80B2AA98 /* 00598 80B2A798 00000000 */ nop @@ -73,8 +73,8 @@ glabel func_80B2A75C .L80B2A810: /* 00610 80B2A810 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00614 80B2A814 15410066 */ bne $t2, $at, .L80B2A9B0 -/* 00618 80B2A818 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0061C 80B2A81C 8C42F9C0 */ lw $v0, -0x0640($v0) ## 8015F9C0 +/* 00618 80B2A818 3C028016 */ lui $v0, %hi(gSaveContext+0x1360) +/* 0061C 80B2A81C 8C42F9C0 */ lw $v0, %lo(gSaveContext+0x1360)($v0) /* 00620 80B2A820 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 00624 80B2A824 8FAB005C */ lw $t3, 0x005C($sp) /* 00628 80B2A828 5441002B */ bnel $v0, $at, .L80B2A8D8 @@ -109,20 +109,20 @@ glabel func_80B2A75C /* 00698 80B2A898 240100DB */ addiu $at, $zero, 0x00DB ## $at = 000000DB /* 0069C 80B2A89C 1461000D */ bne $v1, $at, .L80B2A8D4 .L80B2A8A0: -/* 006A0 80B2A8A0 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 006A4 80B2A8A4 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 -/* 006A8 80B2A8A8 25AD33E8 */ addiu $t5, $t5, 0x33E8 ## $t5 = 801333E8 -/* 006AC 80B2A8AC 258733E0 */ addiu $a3, $t4, 0x33E0 ## $a3 = 801333E0 -/* 006B0 80B2A8B0 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 006B4 80B2A8B4 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 006A0 80B2A8A0 3C0C8013 */ lui $t4, %hi(D_801333E0) +/* 006A4 80B2A8A4 3C0D8013 */ lui $t5, %hi(D_801333E8) +/* 006A8 80B2A8A8 25AD33E8 */ addiu $t5, %lo(D_801333E8) +/* 006AC 80B2A8AC 258733E0 */ addiu $a3, $t4, %lo(D_801333E0) +/* 006B0 80B2A8B0 3C058013 */ lui $a1, %hi(D_801333D4) +/* 006B4 80B2A8B4 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 006B8 80B2A8B8 AFA70010 */ sw $a3, 0x0010($sp) /* 006BC 80B2A8BC AFAD0014 */ sw $t5, 0x0014($sp) /* 006C0 80B2A8C0 2404481D */ addiu $a0, $zero, 0x481D ## $a0 = 0000481D /* 006C4 80B2A8C4 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 006C8 80B2A8C8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 006CC 80B2A8CC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 006D0 80B2A8D0 8C42F9C0 */ lw $v0, -0x0640($v0) ## 8015F9C0 +/* 006CC 80B2A8CC 3C028016 */ lui $v0, %hi(gSaveContext+0x1360) +/* 006D0 80B2A8D0 8C42F9C0 */ lw $v0, %lo(gSaveContext+0x1360)($v0) .L80B2A8D4: /* 006D4 80B2A8D4 8FAE005C */ lw $t6, 0x005C($sp) .L80B2A8D8: @@ -174,10 +174,10 @@ glabel func_80B2A75C .L80B2A978: /* 00778 80B2A978 240103C0 */ addiu $at, $zero, 0x03C0 ## $at = 000003C0 /* 0077C 80B2A97C 14610046 */ bne $v1, $at, .L80B2AA98 -/* 00780 80B2A980 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00784 80B2A984 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 00788 80B2A988 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0078C 80B2A98C 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 00780 80B2A980 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00784 80B2A984 3C198013 */ lui $t9, %hi(D_801333E8) +/* 00788 80B2A988 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0078C 80B2A98C 273933E8 */ addiu $t9, %lo(D_801333E8) /* 00790 80B2A990 AFB90014 */ sw $t9, 0x0014($sp) /* 00794 80B2A994 AFA70010 */ sw $a3, 0x0010($sp) /* 00798 80B2A998 24042816 */ addiu $a0, $zero, 0x2816 ## $a0 = 00002816 @@ -190,10 +190,10 @@ glabel func_80B2A75C .L80B2A9B0: /* 007B0 80B2A9B0 8FAA0044 */ lw $t2, 0x0044($sp) /* 007B4 80B2A9B4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 007B8 80B2A9B8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 007B8 80B2A9B8 3C028016 */ lui $v0, %hi(gSaveContext+0x1360) /* 007BC 80B2A9BC 1541000C */ bne $t2, $at, .L80B2A9F0 /* 007C0 80B2A9C0 8FAB0044 */ lw $t3, 0x0044($sp) -/* 007C4 80B2A9C4 8C42F9C0 */ lw $v0, -0x0640($v0) ## 8015F9C0 +/* 007C4 80B2A9C4 8C42F9C0 */ lw $v0, %lo(gSaveContext+0x1360)($v0) /* 007C8 80B2A9C8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 007CC 80B2A9CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 007D0 80B2A9D0 10410003 */ beq $v0, $at, .L80B2A9E0 @@ -465,8 +465,8 @@ glabel L80B2AD44 /* 00B80 80B2AD80 8FAA0044 */ lw $t2, 0x0044($sp) /* 00B84 80B2AD84 150C0064 */ bne $t0, $t4, .L80B2AF18 /* 00B88 80B2AD88 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00B8C 80B2AD8C 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 00B90 80B2AD90 8DADF9C0 */ lw $t5, -0x0640($t5) ## 8015F9C0 +/* 00B8C 80B2AD8C 3C0D8016 */ lui $t5, %hi(gSaveContext+0x1360) +/* 00B90 80B2AD90 8DADF9C0 */ lw $t5, %lo(gSaveContext+0x1360)($t5) /* 00B94 80B2AD94 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00B98 80B2AD98 55A10019 */ bnel $t5, $at, .L80B2AE00 /* 00B9C 80B2AD9C 94CF1D74 */ lhu $t7, 0x1D74($a2) ## 00001D74 @@ -700,15 +700,15 @@ glabel L80B2AD44 /* 00EF0 80B2B0F0 50600067 */ beql $v1, $zero, .L80B2B290 /* 00EF4 80B2B0F4 8FBF003C */ lw $ra, 0x003C($sp) /* 00EF8 80B2B0F8 94780000 */ lhu $t8, 0x0000($v1) ## 00000000 -/* 00EFC 80B2B0FC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00F00 80B2B100 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00EFC 80B2B0FC 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00F00 80B2B100 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00F04 80B2B104 14980061 */ bne $a0, $t8, .L80B2B28C -/* 00F08 80B2B108 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00F0C 80B2B10C 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 00F10 80B2B110 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 00F08 80B2B108 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00F0C 80B2B10C 3C198013 */ lui $t9, %hi(D_801333E8) +/* 00F10 80B2B110 273933E8 */ addiu $t9, %lo(D_801333E8) /* 00F14 80B2B114 AFB90014 */ sw $t9, 0x0014($sp) /* 00F18 80B2B118 240439C7 */ addiu $a0, $zero, 0x39C7 ## $a0 = 000039C7 -/* 00F1C 80B2B11C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00F1C 80B2B11C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00F20 80B2B120 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 00F24 80B2B124 0C03DCE3 */ jal Audio_PlaySoundGeneral diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B2F4.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B2F4.s index d0687a9a96..3aad458549 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B2F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B2F4.s @@ -1,6 +1,6 @@ glabel func_80B2B2F4 -/* 010F4 80B2B2F4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 010F8 80B2B2F8 8DCEF9C0 */ lw $t6, -0x0640($t6) ## 8015F9C0 +/* 010F4 80B2B2F4 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) +/* 010F8 80B2B2F8 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) /* 010FC 80B2B2FC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 01100 80B2B300 AFA7000C */ sw $a3, 0x000C($sp) /* 01104 80B2B304 55C1000C */ bnel $t6, $at, .L80B2B338 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B364.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B364.s index 88edd40779..1c0e7ce5c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B364.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B364.s @@ -55,11 +55,11 @@ glabel func_80B2B364 /* 01200 80B2B400 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 /* 01204 80B2B404 000C6880 */ sll $t5, $t4, 2 /* 01208 80B2B408 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 0120C 80B2B40C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0120C 80B2B40C 3C0E8016 */ lui $t6, %hi(gSegments) /* 01210 80B2B410 01CD7021 */ addu $t6, $t6, $t5 /* 01214 80B2B414 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01218 80B2B418 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0121C 80B2B41C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 0121C 80B2B41C 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 01220 80B2B420 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 01224 80B2B424 00817824 */ and $t7, $a0, $at /* 01228 80B2B428 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s index e7351dbc2a..a28112d114 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s @@ -37,8 +37,8 @@ glabel func_80B2B4A8 /* 0130C 80B2B50C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 /* 01310 80B2B510 14E10094 */ bne $a3, $at, .L80B2B764 .L80B2B514: -/* 01314 80B2B514 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 01318 80B2B518 8DEFF9C0 */ lw $t7, -0x0640($t7) ## 8015F9C0 +/* 01314 80B2B514 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1360) +/* 01318 80B2B518 8DEFF9C0 */ lw $t7, %lo(gSaveContext+0x1360)($t7) /* 0131C 80B2B51C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 01320 80B2B520 8FB8007C */ lw $t8, 0x007C($sp) /* 01324 80B2B524 11E10002 */ beq $t7, $at, .L80B2B530 @@ -56,10 +56,10 @@ glabel func_80B2B4A8 /* 01350 80B2B550 2484F178 */ addiu $a0, $a0, 0xF178 ## $a0 = 0600F178 /* 01354 80B2B554 00046900 */ sll $t5, $a0, 4 /* 01358 80B2B558 000D7702 */ srl $t6, $t5, 28 -/* 0135C 80B2B55C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0135C 80B2B55C 3C188016 */ lui $t8, %hi(gSegments) /* 01360 80B2B560 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 01364 80B2B564 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 -/* 01368 80B2B568 27186FA8 */ addiu $t8, $t8, 0x6FA8 ## $t8 = 80166FA8 +/* 01368 80B2B568 27186FA8 */ addiu $t8, %lo(gSegments) /* 0136C 80B2B56C 000E7880 */ sll $t7, $t6, 2 /* 01370 80B2B570 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 /* 01374 80B2B574 01F82821 */ addu $a1, $t7, $t8 @@ -92,10 +92,10 @@ glabel func_80B2B4A8 /* 013DC 80B2B5DC 00047100 */ sll $t6, $a0, 4 /* 013E0 80B2B5E0 000E7F02 */ srl $t7, $t6, 28 /* 013E4 80B2B5E4 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 013E8 80B2B5E8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 013E8 80B2B5E8 3C198016 */ lui $t9, %hi(gSegments) /* 013EC 80B2B5EC 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 013F0 80B2B5F0 AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 -/* 013F4 80B2B5F4 27396FA8 */ addiu $t9, $t9, 0x6FA8 ## $t9 = 80166FA8 +/* 013F4 80B2B5F4 27396FA8 */ addiu $t9, %lo(gSegments) /* 013F8 80B2B5F8 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 /* 013FC 80B2B5FC 000FC080 */ sll $t8, $t7, 2 /* 01400 80B2B600 03192821 */ addu $a1, $t8, $t9 @@ -129,10 +129,10 @@ glabel func_80B2B4A8 /* 0146C 80B2B66C 00047900 */ sll $t7, $a0, 4 /* 01470 80B2B670 000FC702 */ srl $t8, $t7, 28 /* 01474 80B2B674 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 01478 80B2B678 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 01478 80B2B678 3C0B8016 */ lui $t3, %hi(gSegments) /* 0147C 80B2B67C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 01480 80B2B680 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 -/* 01484 80B2B684 256B6FA8 */ addiu $t3, $t3, 0x6FA8 ## $t3 = 80166FA8 +/* 01484 80B2B684 256B6FA8 */ addiu $t3, %lo(gSegments) /* 01488 80B2B688 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 /* 0148C 80B2B68C 0018C880 */ sll $t9, $t8, 2 /* 01490 80B2B690 032B2821 */ addu $a1, $t9, $t3 @@ -163,10 +163,10 @@ glabel func_80B2B4A8 /* 014F0 80B2B6F0 00047900 */ sll $t7, $a0, 4 /* 014F4 80B2B6F4 000FC702 */ srl $t8, $t7, 28 /* 014F8 80B2B6F8 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 014FC 80B2B6FC 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 014FC 80B2B6FC 3C0B8016 */ lui $t3, %hi(gSegments) /* 01500 80B2B700 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 01504 80B2B704 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 -/* 01508 80B2B708 256B6FA8 */ addiu $t3, $t3, 0x6FA8 ## $t3 = 80166FA8 +/* 01508 80B2B708 256B6FA8 */ addiu $t3, %lo(gSegments) /* 0150C 80B2B70C 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 /* 01510 80B2B710 0018C880 */ sll $t9, $t8, 2 /* 01514 80B2B714 032B2821 */ addu $a1, $t9, $t3 @@ -203,10 +203,10 @@ glabel func_80B2B4A8 /* 0158C 80B2B78C AD0D02D0 */ sw $t5, 0x02D0($t0) ## 000002D0 /* 01590 80B2B790 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 /* 01594 80B2B794 0018C880 */ sll $t9, $t8, 2 -/* 01598 80B2B798 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 01598 80B2B798 3C0B8016 */ lui $t3, %hi(gSegments) /* 0159C 80B2B79C 01795821 */ addu $t3, $t3, $t9 /* 015A0 80B2B7A0 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000095 -/* 015A4 80B2B7A4 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 +/* 015A4 80B2B7A4 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) /* 015A8 80B2B7A8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 015AC 80B2B7AC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 015B0 80B2B7B0 00816024 */ and $t4, $a0, $at diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s index 89d3304283..e9a3da7a4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s @@ -27,10 +27,10 @@ glabel func_80B2BA38 /* 01874 80B2BA74 8FAB00A0 */ lw $t3, 0x00A0($sp) /* 01878 80B2BA78 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 /* 0187C 80B2BA7C 15E1015D */ bne $t7, $at, .L80B2BFF4 -/* 01880 80B2BA80 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 01880 80B2BA80 3C098016 */ lui $t1, %hi(gSegments) /* 01884 80B2BA84 95821D74 */ lhu $v0, 0x1D74($t4) ## 00001D74 -/* 01888 80B2BA88 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 0188C 80B2BA8C 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 +/* 01888 80B2BA88 3C098016 */ lui $t1, %hi(gSegments) +/* 0188C 80B2BA8C 25296FA8 */ addiu $t1, %lo(gSegments) /* 01890 80B2BA90 28410303 */ slti $at, $v0, 0x0303 /* 01894 80B2BA94 10200026 */ beq $at, $zero, .L80B2BB30 /* 01898 80B2BA98 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 @@ -80,12 +80,12 @@ glabel func_80B2BA38 /* 01944 80B2BB44 24842EF0 */ addiu $a0, $a0, 0x2EF0 ## $a0 = 06002EF0 /* 01948 80B2BB48 00046900 */ sll $t5, $a0, 4 /* 0194C 80B2BB4C 000D7702 */ srl $t6, $t5, 28 -/* 01950 80B2BB50 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 01950 80B2BB50 3C098016 */ lui $t1, %hi(gSegments) /* 01954 80B2BB54 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 01958 80B2BB58 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 0195C 80B2BB5C AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 /* 01960 80B2BB60 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 01964 80B2BB64 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 +/* 01964 80B2BB64 25296FA8 */ addiu $t1, %lo(gSegments) /* 01968 80B2BB68 000E7880 */ sll $t7, $t6, 2 /* 0196C 80B2BB6C 012F2821 */ addu $a1, $t1, $t7 /* 01970 80B2BB70 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 @@ -117,12 +117,12 @@ glabel func_80B2BA38 /* 019D4 80B2BBD4 246332F0 */ addiu $v1, $v1, 0x32F0 ## $v1 = 060032F0 /* 019D8 80B2BBD8 0003C100 */ sll $t8, $v1, 4 /* 019DC 80B2BBDC 0018CF02 */ srl $t9, $t8, 28 -/* 019E0 80B2BBE0 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 019E0 80B2BBE0 3C098016 */ lui $t1, %hi(gSegments) /* 019E4 80B2BBE4 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 019E8 80B2BBE8 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 019EC 80B2BBEC AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 019F0 80B2BBF0 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 019F4 80B2BBF4 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 +/* 019F4 80B2BBF4 25296FA8 */ addiu $t1, %lo(gSegments) /* 019F8 80B2BBF8 00196880 */ sll $t5, $t9, 2 /* 019FC 80B2BBFC 012D2821 */ addu $a1, $t1, $t5 /* 01A00 80B2BC00 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 @@ -154,12 +154,12 @@ glabel func_80B2BA38 /* 01A64 80B2BC64 248436F0 */ addiu $a0, $a0, 0x36F0 ## $a0 = 060036F0 /* 01A68 80B2BC68 00047100 */ sll $t6, $a0, 4 /* 01A6C 80B2BC6C 000E7F02 */ srl $t7, $t6, 28 -/* 01A70 80B2BC70 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 01A70 80B2BC70 3C098016 */ lui $t1, %hi(gSegments) /* 01A74 80B2BC74 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 01A78 80B2BC78 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01A7C 80B2BC7C AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 /* 01A80 80B2BC80 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 01A84 80B2BC84 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 +/* 01A84 80B2BC84 25296FA8 */ addiu $t1, %lo(gSegments) /* 01A88 80B2BC88 000FC080 */ sll $t8, $t7, 2 /* 01A8C 80B2BC8C 01382821 */ addu $a1, $t1, $t8 /* 01A90 80B2BC90 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 @@ -192,12 +192,12 @@ glabel func_80B2BA38 /* 01AF8 80B2BCF8 24842EF0 */ addiu $a0, $a0, 0x2EF0 ## $a0 = 06002EF0 /* 01AFC 80B2BCFC 0004C900 */ sll $t9, $a0, 4 /* 01B00 80B2BD00 00196F02 */ srl $t5, $t9, 28 -/* 01B04 80B2BD04 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 01B04 80B2BD04 3C098016 */ lui $t1, %hi(gSegments) /* 01B08 80B2BD08 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 01B0C 80B2BD0C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01B10 80B2BD10 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 01B14 80B2BD14 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 01B18 80B2BD18 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 +/* 01B18 80B2BD18 25296FA8 */ addiu $t1, %lo(gSegments) /* 01B1C 80B2BD1C 000D7080 */ sll $t6, $t5, 2 /* 01B20 80B2BD20 012E2821 */ addu $a1, $t1, $t6 /* 01B24 80B2BD24 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 @@ -230,12 +230,12 @@ glabel func_80B2BA38 /* 01B8C 80B2BD8C 246332F0 */ addiu $v1, $v1, 0x32F0 ## $v1 = 060032F0 /* 01B90 80B2BD90 00037900 */ sll $t7, $v1, 4 /* 01B94 80B2BD94 000FC702 */ srl $t8, $t7, 28 -/* 01B98 80B2BD98 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 01B98 80B2BD98 3C098016 */ lui $t1, %hi(gSegments) /* 01B9C 80B2BD9C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 /* 01BA0 80B2BDA0 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 01BA4 80B2BDA4 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 /* 01BA8 80B2BDA8 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 -/* 01BAC 80B2BDAC 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 +/* 01BAC 80B2BDAC 25296FA8 */ addiu $t1, %lo(gSegments) /* 01BB0 80B2BDB0 0018C880 */ sll $t9, $t8, 2 /* 01BB4 80B2BDB4 01392821 */ addu $a1, $t1, $t9 /* 01BB8 80B2BDB8 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 @@ -265,11 +265,11 @@ glabel func_80B2BA38 /* 01C14 80B2BE14 248442F0 */ addiu $a0, $a0, 0x42F0 ## $a0 = 060042F0 /* 01C18 80B2BE18 00046900 */ sll $t5, $a0, 4 /* 01C1C 80B2BE1C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01C20 80B2BE20 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 01C20 80B2BE20 3C098016 */ lui $t1, %hi(gSegments) /* 01C24 80B2BE24 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 /* 01C28 80B2BE28 000D7702 */ srl $t6, $t5, 28 /* 01C2C 80B2BE2C 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 01C30 80B2BE30 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 +/* 01C30 80B2BE30 25296FA8 */ addiu $t1, %lo(gSegments) /* 01C34 80B2BE34 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 01C38 80B2BE38 000E7880 */ sll $t7, $t6, 2 /* 01C3C 80B2BE3C 012FC021 */ addu $t8, $t1, $t7 @@ -301,8 +301,8 @@ glabel func_80B2BA38 /* 01CA4 80B2BEA4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 01CA8 80B2BEA8 8FAC00A4 */ lw $t4, 0x00A4($sp) .L80B2BEAC: -/* 01CAC 80B2BEAC 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 01CB0 80B2BEB0 8F18F9C0 */ lw $t8, -0x0640($t8) ## 8015F9C0 +/* 01CAC 80B2BEAC 3C188016 */ lui $t8, %hi(gSaveContext+0x1360) +/* 01CB0 80B2BEB0 8F18F9C0 */ lw $t8, %lo(gSaveContext+0x1360)($t8) /* 01CB4 80B2BEB4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 01CB8 80B2BEB8 57010014 */ bnel $t8, $at, .L80B2BF0C /* 01CBC 80B2BEBC 95821D74 */ lhu $v0, 0x1D74($t4) ## 00001D74 @@ -394,7 +394,7 @@ glabel func_80B2BA38 /* 01E04 80B2C004 000E7F02 */ srl $t7, $t6, 28 /* 01E08 80B2C008 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 01E0C 80B2C00C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 01E10 80B2C010 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 8016DF50 +/* 01E10 80B2C010 25296FA8 */ addiu $t1, %lo(gSegments) /* 01E14 80B2C014 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 /* 01E18 80B2C018 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 /* 01E1C 80B2C01C 000FC080 */ sll $t8, $t7, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s index 62eeb4199d..1b1156ec37 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s @@ -28,9 +28,9 @@ glabel func_80B2C130 /* 01F70 80B2C170 8FA80058 */ lw $t0, 0x0058($sp) /* 01F74 80B2C174 00195702 */ srl $t2, $t9, 28 /* 01F78 80B2C178 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 01F7C 80B2C17C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 01F7C 80B2C17C 3C0C8016 */ lui $t4, %hi(gSegments) /* 01F80 80B2C180 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01F84 80B2C184 258C6FA8 */ addiu $t4, $t4, 0x6FA8 ## $t4 = 80166FA8 +/* 01F84 80B2C184 258C6FA8 */ addiu $t4, %lo(gSegments) /* 01F88 80B2C188 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 01F8C 80B2C18C 000A5880 */ sll $t3, $t2, 2 /* 01F90 80B2C190 AC6F02C0 */ sw $t7, 0x02C0($v1) ## 000002C0 @@ -57,7 +57,7 @@ glabel func_80B2C130 /* 01FE4 80B2C1E4 01696021 */ addu $t4, $t3, $t1 /* 01FE8 80B2C1E8 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 01FEC 80B2C1EC 8C6202C0 */ lw $v0, 0x02C0($v1) ## 000002C0 -/* 01FF0 80B2C1F0 3C0A8011 */ lui $t2, 0x8011 ## $t2 = 80110000 +/* 01FF0 80B2C1F0 3C0A8011 */ lui $t2, %hi(D_80116280+0x10) /* 01FF4 80B2C1F4 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 01FF8 80B2C1F8 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 01FFC 80B2C1FC AC6D02C0 */ sw $t5, 0x02C0($v1) ## 000002C0 @@ -65,7 +65,7 @@ glabel func_80B2C130 /* 02004 80B2C204 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 02008 80B2C208 8C6202C0 */ lw $v0, 0x02C0($v1) ## 000002C0 /* 0200C 80B2C20C 37390030 */ ori $t9, $t9, 0x0030 ## $t9 = DB060030 -/* 02010 80B2C210 254A6290 */ addiu $t2, $t2, 0x6290 ## $t2 = 80116290 +/* 02010 80B2C210 254A6290 */ addiu $t2, %lo(D_80116280+0x10) /* 02014 80B2C214 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 02018 80B2C218 AC7802C0 */ sw $t8, 0x02C0($v1) ## 000002C0 /* 0201C 80B2C21C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C398.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C398.s index 455fdbf278..ac6ef974b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C398.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C398.s @@ -28,12 +28,12 @@ glabel func_80B2C398 /* 02200 80B2C400 3C0280B3 */ lui $v0, %hi(D_80B2CEC0) ## $v0 = 80B30000 /* 02204 80B2C404 2442CEC0 */ addiu $v0, $v0, %lo(D_80B2CEC0) ## $v0 = 80B2CEC0 /* 02208 80B2C408 90590000 */ lbu $t9, 0x0000($v0) ## 80B2CEC0 -/* 0220C 80B2C40C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 02210 80B2C410 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 0220C 80B2C40C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 02210 80B2C410 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 02214 80B2C414 1720000A */ bne $t9, $zero, .L80B2C440 /* 02218 80B2C418 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 0221C 80B2C41C 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 02220 80B2C420 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 +/* 0221C 80B2C41C 3C098013 */ lui $t1, %hi(D_801333E8) +/* 02220 80B2C420 252933E8 */ addiu $t1, %lo(D_801333E8) /* 02224 80B2C424 A0480000 */ sb $t0, 0x0000($v0) ## 80B2CEC0 /* 02228 80B2C428 AFA90014 */ sw $t1, 0x0014($sp) /* 0222C 80B2C42C 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 @@ -234,12 +234,12 @@ glabel func_80B2C398 /* 02514 80B2C714 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 .L80B2C718: /* 02518 80B2C718 1461000E */ bne $v1, $at, .L80B2C754 -/* 0251C 80B2C71C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 02520 80B2C720 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 -/* 02524 80B2C724 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 02528 80B2C728 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 -/* 0252C 80B2C72C 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 02530 80B2C730 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0251C 80B2C71C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 02520 80B2C720 3C0B8013 */ lui $t3, %hi(D_801333E8) +/* 02524 80B2C724 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 02528 80B2C728 256B33E8 */ addiu $t3, %lo(D_801333E8) +/* 0252C 80B2C72C 3C058013 */ lui $a1, %hi(D_801333D4) +/* 02530 80B2C730 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 02534 80B2C734 AFAB0014 */ sw $t3, 0x0014($sp) /* 02538 80B2C738 AFA70010 */ sw $a3, 0x0010($sp) /* 0253C 80B2C73C 240420B3 */ addiu $a0, $zero, 0x20B3 ## $a0 = 000020B3 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2CC1C.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2CC1C.s index 87dc563d1e..4e286b05f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2CC1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2CC1C.s @@ -13,10 +13,10 @@ glabel func_80B2CC1C /* 02A2C 80B2CC2C AFA40040 */ sw $a0, 0x0040($sp) /* 02A30 80B2CC30 84AE001C */ lh $t6, 0x001C($a1) ## 0000001C /* 02A34 80B2CC34 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 02A38 80B2CC38 3C118016 */ lui $s1, 0x8016 ## $s1 = 80160000 +/* 02A38 80B2CC38 3C118016 */ lui $s1, %hi(gGameInfo) /* 02A3C 80B2CC3C 000E7A03 */ sra $t7, $t6, 8 /* 02A40 80B2CC40 15E10099 */ bne $t7, $at, .L80B2CEA8 -/* 02A44 80B2CC44 2631FA90 */ addiu $s1, $s1, 0xFA90 ## $s1 = 8015FA90 +/* 02A44 80B2CC44 2631FA90 */ addiu $s1, %lo(gGameInfo) /* 02A48 80B2CC48 8E380000 */ lw $t8, 0x0000($s1) ## 8015FA90 /* 02A4C 80B2CC4C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 02A50 80B2CC50 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s index 649215eb2a..bedf5a6455 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s @@ -131,7 +131,7 @@ glabel EnVm_Draw /* 01330 80B2E790 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 01334 80B2E794 8D0A1DE4 */ lw $t2, 0x1DE4($t0) ## 00001DE4 /* 01338 80B2E798 3C0480B3 */ lui $a0, %hi(D_80B2EB88) ## $a0 = 80B30000 -/* 0133C 80B2E79C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 0133C 80B2E79C 3C198016 */ lui $t9, %hi(gSegments) /* 01340 80B2E7A0 314B0007 */ andi $t3, $t2, 0x0007 ## $t3 = 00000000 /* 01344 80B2E7A4 000B6080 */ sll $t4, $t3, 2 /* 01348 80B2E7A8 008C2021 */ addu $a0, $a0, $t4 @@ -142,7 +142,7 @@ glabel EnVm_Draw /* 0135C 80B2E7BC 000E7F02 */ srl $t7, $t6, 28 /* 01360 80B2E7C0 000FC080 */ sll $t8, $t7, 2 /* 01364 80B2E7C4 0338C821 */ addu $t9, $t9, $t8 -/* 01368 80B2E7C8 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 01368 80B2E7C8 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 0136C 80B2E7CC 00816824 */ and $t5, $a0, $at /* 01370 80B2E7D0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01374 80B2E7D4 01B94821 */ addu $t1, $t5, $t9 @@ -190,7 +190,7 @@ glabel EnVm_Draw /* 0141C 80B2E87C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01420 80B2E880 8D191DE4 */ lw $t9, 0x1DE4($t0) ## 00001DE4 /* 01424 80B2E884 3C0480B3 */ lui $a0, %hi(D_80B2EB88) ## $a0 = 80B30000 -/* 01428 80B2E888 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 01428 80B2E888 3C0D8016 */ lui $t5, %hi(gSegments) /* 0142C 80B2E88C 27290004 */ addiu $t1, $t9, 0x0004 ## $t1 = 00000004 /* 01430 80B2E890 312A0007 */ andi $t2, $t1, 0x0007 ## $t2 = 00000004 /* 01434 80B2E894 000A5880 */ sll $t3, $t2, 2 @@ -202,7 +202,7 @@ glabel EnVm_Draw /* 0144C 80B2E8AC 000E7F02 */ srl $t7, $t6, 28 /* 01450 80B2E8B0 000FC080 */ sll $t8, $t7, 2 /* 01454 80B2E8B4 01B86821 */ addu $t5, $t5, $t8 -/* 01458 80B2E8B8 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 +/* 01458 80B2E8B8 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) /* 0145C 80B2E8BC 00816024 */ and $t4, $a0, $at /* 01460 80B2E8C0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01464 80B2E8C4 018DC821 */ addu $t9, $t4, $t5 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/EnWallTubo_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/EnWallTubo_Update.s index 8d9778af15..835ff0a7be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/EnWallTubo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/EnWallTubo_Update.s @@ -12,8 +12,8 @@ glabel EnWallTubo_Update /* 00490 80B2F280 8FA5004C */ lw $a1, 0x004C($sp) /* 00494 80B2F284 0320F809 */ jalr $ra, $t9 /* 00498 80B2F288 00000000 */ nop -/* 0049C 80B2F28C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 004A0 80B2F290 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 0049C 80B2F28C 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 004A0 80B2F290 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 004A4 80B2F294 8FA40048 */ lw $a0, 0x0048($sp) /* 004A8 80B2F298 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 004AC 80B2F29C 85F812D4 */ lh $t8, 0x12D4($t7) ## 801612D4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE9C.s b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE9C.s index b5d546e0d9..02cf3cdbf4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE9C.s @@ -34,9 +34,9 @@ glabel func_80B2EE9C /* 0012C 80B2EF1C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00130 80B2EF20 240400DA */ addiu $a0, $zero, 0x00DA ## $a0 = 000000DA /* 00134 80B2EF24 1040005F */ beq $v0, $zero, .L80B2F0A4 -/* 00138 80B2EF28 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00138 80B2EF28 3C038016 */ lui $v1, %hi(gGameInfo) /* 0013C 80B2EF2C 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00 -/* 00140 80B2EF30 2463FA90 */ addiu $v1, $v1, 0xFA90 ## $v1 = 8015FA90 +/* 00140 80B2EF30 2463FA90 */ addiu $v1, %lo(gGameInfo) .L80B2EF34: /* 00144 80B2EF34 10500004 */ beq $v0, $s0, .L80B2EF48 /* 00148 80B2EF38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Init.s index 1457c87ac2..794b6ec301 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Init.s @@ -144,8 +144,8 @@ glabel L80B310F8 /* 000E8 80B31108 0C00084C */ jal osSyncPrintf /* 000EC 80B3110C 24841EBC */ addiu $a0, $a0, %lo(D_80B31EBC) ## $a0 = 80B31EBC -/* 000F0 80B31110 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 000F4 80B31114 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 000F0 80B31110 3C038016 */ lui $v1, %hi(gSaveContext) +/* 000F4 80B31114 2463E660 */ addiu $v1, %lo(gSaveContext) /* 000F8 80B31118 94680EDC */ lhu $t0, 0x0EDC($v1) ## 8015F53C /* 000FC 80B3111C 31090400 */ andi $t1, $t0, 0x0400 ## $t1 = 00000000 /* 00100 80B31120 11200003 */ beq $t1, $zero, .L80B31130 @@ -169,8 +169,8 @@ glabel L80B31148 /* 00138 80B31158 0C00084C */ jal osSyncPrintf /* 0013C 80B3115C 24841F04 */ addiu $a0, $a0, %lo(D_80B31F04) ## $a0 = 80B31F04 -/* 00140 80B31160 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00144 80B31164 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00140 80B31160 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00144 80B31164 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00148 80B31168 946A0EDC */ lhu $t2, 0x0EDC($v1) ## 8015F53C /* 0014C 80B3116C 314B0400 */ andi $t3, $t2, 0x0400 ## $t3 = 00000000 /* 00150 80B31170 11600003 */ beq $t3, $zero, .L80B31180 @@ -194,8 +194,8 @@ glabel L80B31198 /* 00188 80B311A8 0C00084C */ jal osSyncPrintf /* 0018C 80B311AC 24841F50 */ addiu $a0, $a0, %lo(D_80B31F50) ## $a0 = 80B31F50 -/* 00190 80B311B0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00194 80B311B4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00190 80B311B0 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00194 80B311B4 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00198 80B311B8 946C0EDC */ lhu $t4, 0x0EDC($v1) ## 8015F53C /* 0019C 80B311BC 318D0200 */ andi $t5, $t4, 0x0200 ## $t5 = 00000000 /* 001A0 80B311C0 11A00003 */ beq $t5, $zero, .L80B311D0 @@ -219,8 +219,8 @@ glabel L80B311E8 /* 001D8 80B311F8 0C00084C */ jal osSyncPrintf /* 001DC 80B311FC 24841F90 */ addiu $a0, $a0, %lo(D_80B31F90) ## $a0 = 80B31F90 -/* 001E0 80B31200 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 001E4 80B31204 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 001E0 80B31200 3C038016 */ lui $v1, %hi(gSaveContext) +/* 001E4 80B31204 2463E660 */ addiu $v1, %lo(gSaveContext) /* 001E8 80B31208 94620EDC */ lhu $v0, 0x0EDC($v1) ## 8015F53C /* 001EC 80B3120C 304E0100 */ andi $t6, $v0, 0x0100 ## $t6 = 00000000 /* 001F0 80B31210 11C0000A */ beq $t6, $zero, .L80B3123C @@ -228,8 +228,8 @@ glabel L80B311E8 /* 001F8 80B31218 11E00008 */ beq $t7, $zero, .L80B3123C /* 001FC 80B3121C 30580400 */ andi $t8, $v0, 0x0400 ## $t8 = 00000000 /* 00200 80B31220 13000006 */ beq $t8, $zero, .L80B3123C -/* 00204 80B31224 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 -/* 00208 80B31228 8F397130 */ lw $t9, 0x7130($t9) ## 80127130 +/* 00204 80B31224 3C198012 */ lui $t9, %hi(gBitFlags+0x10) +/* 00208 80B31228 8F397130 */ lw $t9, %lo(gBitFlags+0x10)($t9) /* 0020C 80B3122C 8C6800A4 */ lw $t0, 0x00A4($v1) ## 8015E704 /* 00210 80B31230 03284824 */ and $t1, $t9, $t0 /* 00214 80B31234 11200003 */ beq $t1, $zero, .L80B31244 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Update.s index aefd81bbda..e7b41f0bf1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Update.s @@ -6,8 +6,8 @@ glabel EnWeatherTag_Update /* 00D60 80B31D80 8C99014C */ lw $t9, 0x014C($a0) ## 0000014C /* 00D64 80B31D84 0320F809 */ jalr $ra, $t9 /* 00D68 80B31D88 00000000 */ nop -/* 00D6C 80B31D8C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00D70 80B31D90 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 00D6C 80B31D8C 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 00D70 80B31D90 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 00D74 80B31D94 8FA40048 */ lw $a0, 0x0048($sp) /* 00D78 80B31D98 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00D7C 80B31D9C 85CF12D4 */ lh $t7, 0x12D4($t6) ## 801612D4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B312C8.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B312C8.s index f418e7d661..aeb83df69e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B312C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B312C8.s @@ -26,30 +26,30 @@ glabel func_80B312C8 /* 00308 80B31328 45020058 */ bc1fl .L80B3148C /* 0030C 80B3132C 8FBF001C */ lw $ra, 0x001C($sp) /* 00310 80B31330 90590A42 */ lbu $t9, 0x0A42($v0) ## 00000A42 -/* 00314 80B31334 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 +/* 00314 80B31334 3C088012 */ lui $t0, %hi(D_8011FB3C) /* 00318 80B31338 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0031C 80B3133C 1720000C */ bne $t9, $zero, .L80B31370 -/* 00320 80B31340 3C068012 */ lui $a2, 0x8012 ## $a2 = 80120000 -/* 00324 80B31344 9108FB3C */ lbu $t0, -0x04C4($t0) ## 8011FB3C +/* 00320 80B31340 3C068012 */ lui $a2, %hi(D_8011FB38) +/* 00324 80B31344 9108FB3C */ lbu $t0, %lo(D_8011FB3C)($t0) /* 00328 80B31348 11000009 */ beq $t0, $zero, .L80B31370 /* 0032C 80B3134C 00000000 */ nop /* 00330 80B31350 90491E14 */ lbu $t1, 0x1E14($v0) ## 00001E14 /* 00334 80B31354 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00338 80B31358 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 +/* 00338 80B31358 3C0C8012 */ lui $t4, %hi(D_8011FB40) /* 0033C 80B3135C 11210042 */ beq $t1, $at, .L80B31468 /* 00340 80B31360 00000000 */ nop /* 00344 80B31364 904A0A44 */ lbu $t2, 0x0A44($v0) ## 00000A44 /* 00348 80B31368 904B0A43 */ lbu $t3, 0x0A43($v0) ## 00000A43 /* 0034C 80B3136C 154B003E */ bne $t2, $t3, .L80B31468 .L80B31370: -/* 00350 80B31370 24C6FB38 */ addiu $a2, $a2, 0xFB38 ## $a2 = 8011FB38 +/* 00350 80B31370 24C6FB38 */ addiu $a2, %lo(D_8011FB38) /* 00354 80B31374 A0C50000 */ sb $a1, 0x0000($a2) ## 8011FB38 /* 00358 80B31378 904C0B01 */ lbu $t4, 0x0B01($v0) ## 00000B01 /* 0035C 80B3137C 55800043 */ bnel $t4, $zero, .L80B3148C /* 00360 80B31380 8FBF001C */ lw $ra, 0x001C($sp) /* 00364 80B31384 904D0A42 */ lbu $t5, 0x0A42($v0) ## 00000A42 -/* 00368 80B31388 3C048012 */ lui $a0, 0x8012 ## $a0 = 80120000 -/* 0036C 80B3138C 2484FB30 */ addiu $a0, $a0, 0xFB30 ## $a0 = 8011FB30 +/* 00368 80B31388 3C048012 */ lui $a0, %hi(D_8011FB30) +/* 0036C 80B3138C 2484FB30 */ addiu $a0, %lo(D_8011FB30) /* 00370 80B31390 55A00009 */ bnel $t5, $zero, .L80B313B8 /* 00374 80B31394 93A30047 */ lbu $v1, 0x0047($sp) /* 00378 80B31398 904E0A43 */ lbu $t6, 0x0A43($v0) ## 00000A43 @@ -94,8 +94,8 @@ glabel func_80B312C8 /* 00410 80B31430 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00414 80B31434 00300821 */ addu $at, $at, $s0 /* 00418 80B31438 A0240A44 */ sb $a0, 0x0A44($at) ## 00010A44 -/* 0041C 80B3143C 3C018012 */ lui $at, 0x8012 ## $at = 80120000 -/* 00420 80B31440 A024FB34 */ sb $a0, -0x04CC($at) ## 8011FB34 +/* 0041C 80B3143C 3C018012 */ lui $at, %hi(D_8011FB34) +/* 00420 80B31440 A024FB34 */ sb $a0, %lo(D_8011FB34)($at) /* 00424 80B31444 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00428 80B31448 00300821 */ addu $at, $at, $s0 /* 0042C 80B3144C A4230A48 */ sh $v1, 0x0A48($at) ## 00010A48 @@ -107,9 +107,9 @@ glabel func_80B312C8 /* 00440 80B31460 10000009 */ beq $zero, $zero, .L80B31488 /* 00444 80B31464 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L80B31468: -/* 00448 80B31468 958CFB40 */ lhu $t4, -0x04C0($t4) ## 8011FB40 -/* 0044C 80B3146C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00450 80B31470 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00448 80B31468 958CFB40 */ lhu $t4, %lo(D_8011FB40)($t4) +/* 0044C 80B3146C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00450 80B31470 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00454 80B31474 51800005 */ beql $t4, $zero, .L80B3148C /* 00458 80B31478 8FBF001C */ lw $ra, 0x001C($sp) /* 0045C 80B3147C 944D000C */ lhu $t5, 0x000C($v0) ## 8015E66C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B3149C.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B3149C.s index 16f205d310..f28d7b5e23 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B3149C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B3149C.s @@ -27,11 +27,11 @@ glabel func_80B3149C /* 004E0 80B31500 45020051 */ bc1fl .L80B31648 /* 004E4 80B31504 8FBF001C */ lw $ra, 0x001C($sp) /* 004E8 80B31508 90590A42 */ lbu $t9, 0x0A42($v0) ## 00000A42 -/* 004EC 80B3150C 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 +/* 004EC 80B3150C 3C098012 */ lui $t1, %hi(D_8011FB3C) /* 004F0 80B31510 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 004F4 80B31514 1720000B */ bne $t9, $zero, .L80B31544 -/* 004F8 80B31518 3C068012 */ lui $a2, 0x8012 ## $a2 = 80120000 -/* 004FC 80B3151C 9129FB3C */ lbu $t1, -0x04C4($t1) ## 8011FB3C +/* 004F8 80B31518 3C068012 */ lui $a2, %hi(D_8011FB38) +/* 004FC 80B3151C 9129FB3C */ lbu $t1, %lo(D_8011FB3C)($t1) /* 00500 80B31520 11200008 */ beq $t1, $zero, .L80B31544 /* 00504 80B31524 00000000 */ nop /* 00508 80B31528 904A1E14 */ lbu $t2, 0x1E14($v0) ## 00001E14 @@ -42,7 +42,7 @@ glabel func_80B3149C /* 0051C 80B3153C 904C0A43 */ lbu $t4, 0x0A43($v0) ## 00000A43 /* 00520 80B31540 156C0037 */ bne $t3, $t4, .L80B31620 .L80B31544: -/* 00524 80B31544 24C6FB38 */ addiu $a2, $a2, 0xFB38 ## $a2 = 8011FB38 +/* 00524 80B31544 24C6FB38 */ addiu $a2, %lo(D_8011FB38) /* 00528 80B31548 A0C50000 */ sb $a1, 0x0000($a2) ## 8011FB38 /* 0052C 80B3154C 904D0B01 */ lbu $t5, 0x0B01($v0) ## 00000B01 /* 00530 80B31550 55A0003D */ bnel $t5, $zero, .L80B31648 @@ -61,8 +61,8 @@ glabel func_80B3149C /* 00564 80B31584 8FBF001C */ lw $ra, 0x001C($sp) /* 00568 80B31588 A0C00000 */ sb $zero, 0x0000($a2) ## 8011FB38 .L80B3158C: -/* 0056C 80B3158C 3C018012 */ lui $at, 0x8012 ## $at = 80120000 -/* 00570 80B31590 A020FB30 */ sb $zero, -0x04D0($at) ## 8011FB30 +/* 0056C 80B3158C 3C018012 */ lui $at, %hi(D_8011FB30) +/* 00570 80B31590 A020FB30 */ sb $zero, %lo(D_8011FB30)($at) /* 00574 80B31594 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00578 80B31598 00300821 */ addu $at, $at, $s0 /* 0057C 80B3159C A0250A3D */ sb $a1, 0x0A3D($at) ## 00010A3D @@ -87,8 +87,8 @@ glabel func_80B3149C /* 005C8 80B315E8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 005CC 80B315EC 00300821 */ addu $at, $at, $s0 /* 005D0 80B315F0 A0240A44 */ sb $a0, 0x0A44($at) ## 00010A44 -/* 005D4 80B315F4 3C018012 */ lui $at, 0x8012 ## $at = 80120000 -/* 005D8 80B315F8 A024FB34 */ sb $a0, -0x04CC($at) ## 8011FB34 +/* 005D4 80B315F4 3C018012 */ lui $at, %hi(D_8011FB34) +/* 005D8 80B315F8 A024FB34 */ sb $a0, %lo(D_8011FB34)($at) /* 005DC 80B315FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 005E0 80B31600 00300821 */ addu $at, $at, $s0 /* 005E4 80B31604 A4230A48 */ sh $v1, 0x0A48($at) ## 00010A48 @@ -99,10 +99,10 @@ glabel func_80B3149C /* 005F8 80B31618 1000000A */ beq $zero, $zero, .L80B31644 /* 005FC 80B3161C A42B0A46 */ sh $t3, 0x0A46($at) ## 00010A46 .L80B31620: -/* 00600 80B31620 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 -/* 00604 80B31624 958CFB40 */ lhu $t4, -0x04C0($t4) ## 8011FB40 -/* 00608 80B31628 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0060C 80B3162C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00600 80B31620 3C0C8012 */ lui $t4, %hi(D_8011FB40) +/* 00604 80B31624 958CFB40 */ lhu $t4, %lo(D_8011FB40)($t4) +/* 00608 80B31628 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0060C 80B3162C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00610 80B31630 51800005 */ beql $t4, $zero, .L80B31648 /* 00614 80B31634 8FBF001C */ lw $ra, 0x001C($sp) /* 00618 80B31638 944D000C */ lhu $t5, 0x000C($v0) ## 8015E66C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s index 7cf116b003..f00397ec69 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s @@ -32,10 +32,10 @@ glabel EnWeiyer_Draw /* 016C0 80B33950 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 016C4 80B33954 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 016C8 80B33958 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 016CC 80B3395C 3C088011 */ lui $t0, 0x8011 ## $t0 = 80110000 +/* 016CC 80B3395C 3C088011 */ lui $t0, %hi(D_80116280+0x10) /* 016D0 80B33960 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 /* 016D4 80B33964 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 016D8 80B33968 25086290 */ addiu $t0, $t0, 0x6290 ## $t0 = 80116290 +/* 016D8 80B33968 25086290 */ addiu $t0, %lo(D_80116280+0x10) /* 016DC 80B3396C 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 016E0 80B33970 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 /* 016E4 80B33974 AC680004 */ sw $t0, 0x0004($v1) ## 00000004 @@ -63,10 +63,10 @@ glabel EnWeiyer_Draw /* 01738 80B339C8 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 0173C 80B339CC 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 /* 01740 80B339D0 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 01744 80B339D4 3C0F8011 */ lui $t7, 0x8011 ## $t7 = 80110000 +/* 01744 80B339D4 3C0F8011 */ lui $t7, %hi(D_80116280) /* 01748 80B339D8 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 /* 0174C 80B339DC AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 01750 80B339E0 25EF6280 */ addiu $t7, $t7, 0x6280 ## $t7 = 80116280 +/* 01750 80B339E0 25EF6280 */ addiu $t7, %lo(D_80116280) /* 01754 80B339E4 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 /* 01758 80B339E8 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 /* 0175C 80B339EC AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Init.s index 67ae3ce763..dc08d37c5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Init.s @@ -8,8 +8,8 @@ glabel EnWeiyer_Init /* 00018 80B322A8 0C01E037 */ jal Actor_ProcessInitChain /* 0001C 80B322AC 24A53AE4 */ addiu $a1, $a1, %lo(D_80B33AE4) ## $a1 = 80B33AE4 -/* 00020 80B322B0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00024 80B322B4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00020 80B322B0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 00024 80B322B4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00028 80B322B8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0002C 80B322BC 3C05447A */ lui $a1, 0x447A ## $a1 = 447A0000 /* 00030 80B322C0 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s index 49885633cd..fc5667d5fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s @@ -45,7 +45,7 @@ glabel EnWf_Draw /* 03A0C 80B376BC AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 /* 03A10 80B376C0 920C0302 */ lbu $t4, 0x0302($s0) ## 00000302 /* 03A14 80B376C4 3C0480B3 */ lui $a0, %hi(D_80B37AF4) ## $a0 = 80B30000 -/* 03A18 80B376C8 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 03A18 80B376C8 3C098016 */ lui $t1, %hi(gSegments) /* 03A1C 80B376CC 000C6880 */ sll $t5, $t4, 2 /* 03A20 80B376D0 008D2021 */ addu $a0, $a0, $t5 /* 03A24 80B376D4 8C847AF4 */ lw $a0, %lo(D_80B37AF4)($a0) @@ -55,7 +55,7 @@ glabel EnWf_Draw /* 03A34 80B376E4 000FC702 */ srl $t8, $t7, 28 /* 03A38 80B376E8 0018C880 */ sll $t9, $t8, 2 /* 03A3C 80B376EC 01394821 */ addu $t1, $t1, $t9 -/* 03A40 80B376F0 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 +/* 03A40 80B376F0 8D296FA8 */ lw $t1, %lo(gSegments)($t1) /* 03A44 80B376F4 00817024 */ and $t6, $a0, $at /* 03A48 80B376F8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 03A4C 80B376FC 01C95021 */ addu $t2, $t6, $t1 @@ -71,7 +71,7 @@ glabel EnWf_Draw /* 03A70 80B37720 AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 /* 03A74 80B37724 920F0302 */ lbu $t7, 0x0302($s0) ## 00000302 /* 03A78 80B37728 3C0480B3 */ lui $a0, %hi(D_80B37B04) ## $a0 = 80B30000 -/* 03A7C 80B3772C 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 03A7C 80B3772C 3C0B8016 */ lui $t3, %hi(gSegments) /* 03A80 80B37730 000FC080 */ sll $t8, $t7, 2 /* 03A84 80B37734 00982021 */ addu $a0, $a0, $t8 /* 03A88 80B37738 8C847B04 */ lw $a0, %lo(D_80B37B04)($a0) @@ -81,7 +81,7 @@ glabel EnWf_Draw /* 03A98 80B37748 000E4F02 */ srl $t1, $t6, 28 /* 03A9C 80B3774C 00095080 */ sll $t2, $t1, 2 /* 03AA0 80B37750 016A5821 */ addu $t3, $t3, $t2 -/* 03AA4 80B37754 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 +/* 03AA4 80B37754 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) /* 03AA8 80B37758 0081C824 */ and $t9, $a0, $at /* 03AAC 80B3775C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 03AB0 80B37760 032B6021 */ addu $t4, $t9, $t3 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s index 4f938f30da..0c6af2c0ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s @@ -12,11 +12,11 @@ glabel EnWf_Init /* 0002C 80B33CDC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00030 80B33CE0 3C0E80B3 */ lui $t6, %hi(D_80B37A88) ## $t6 = 80B30000 /* 00034 80B33CE4 25CE7A88 */ addiu $t6, $t6, %lo(D_80B37A88) ## $t6 = 80B37A88 -/* 00038 80B33CE8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 00038 80B33CE8 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 0003C 80B33CEC 44050000 */ mfc1 $a1, $f0 /* 00040 80B33CF0 44070000 */ mfc1 $a3, $f0 /* 00044 80B33CF4 AE0E0098 */ sw $t6, 0x0098($s0) ## 00000098 -/* 00048 80B33CF8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00048 80B33CF8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0004C 80B33CFC 0C00AC78 */ jal ActorShape_Init /* 00050 80B33D00 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Update.s index 8aea3904ab..b1ecbfe69d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Update.s @@ -49,8 +49,8 @@ glabel EnWonderItem_Update /* 00C2C 80B38C8C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 /* 00C30 80B38C90 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 .L80B38C94: -/* 00C34 80B38C94 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00C38 80B38C98 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 00C34 80B38C94 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 00C38 80B38C98 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 00C3C 80B38C9C 3C0B80B4 */ lui $t3, %hi(D_80B38DC0) ## $t3 = 80B40000 /* 00C40 80B38CA0 256B8DC0 */ addiu $t3, $t3, %lo(D_80B38DC0) ## $t3 = 80B38DC0 /* 00C44 80B38CA4 85F812D4 */ lh $t8, 0x12D4($t7) ## 801612D4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38570.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38570.s index f2e685254e..9e0352c0d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38570.s @@ -25,11 +25,11 @@ glabel func_80B38570 /* 0056C 80B385CC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 00570 80B385D0 4481D000 */ mtc1 $at, $f26 ## $f26 = 50.00 /* 00574 80B385D4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00578 80B385D8 3C178016 */ lui $s7, 0x8016 ## $s7 = 80160000 +/* 00578 80B385D8 3C178016 */ lui $s7, %hi(gGameInfo) /* 0057C 80B385DC 3C1580B4 */ lui $s5, %hi(D_80B39010) ## $s5 = 80B40000 /* 00580 80B385E0 4481C000 */ mtc1 $at, $f24 ## $f24 = 1.00 /* 00584 80B385E4 26B59010 */ addiu $s5, $s5, %lo(D_80B39010) ## $s5 = 80B39010 -/* 00588 80B385E8 26F7FA90 */ addiu $s7, $s7, 0xFA90 ## $s7 = 8015FA90 +/* 00588 80B385E8 26F7FA90 */ addiu $s7, %lo(gGameInfo) /* 0058C 80B385EC 2416000C */ addiu $s6, $zero, 0x000C ## $s6 = 0000000C .L80B385F0: /* 00590 80B385F0 02917024 */ and $t6, $s4, $s1 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B388AC.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B388AC.s index f6f18679a5..ca1a5c59e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B388AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B388AC.s @@ -25,11 +25,11 @@ glabel func_80B388AC /* 008A8 80B38908 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 008AC 80B3890C 4481D000 */ mtc1 $at, $f26 ## $f26 = 50.00 /* 008B0 80B38910 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 008B4 80B38914 3C178016 */ lui $s7, 0x8016 ## $s7 = 80160000 +/* 008B4 80B38914 3C178016 */ lui $s7, %hi(gGameInfo) /* 008B8 80B38918 3C1580B4 */ lui $s5, %hi(D_80B39080) ## $s5 = 80B40000 /* 008BC 80B3891C 4481C000 */ mtc1 $at, $f24 ## $f24 = 1.00 /* 008C0 80B38920 26B59080 */ addiu $s5, $s5, %lo(D_80B39080) ## $s5 = 80B39080 -/* 008C4 80B38924 26F7FA90 */ addiu $s7, $s7, 0xFA90 ## $s7 = 8015FA90 +/* 008C4 80B38924 26F7FA90 */ addiu $s7, %lo(gGameInfo) /* 008C8 80B38928 2416000C */ addiu $s6, $zero, 0x000C ## $s6 = 0000000C .L80B3892C: /* 008CC 80B3892C 02931824 */ and $v1, $s4, $s3 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/EnWonderTalk_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/EnWonderTalk_Update.s index b6fac83d61..f7dbca7baa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/EnWonderTalk_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/EnWonderTalk_Update.s @@ -16,8 +16,8 @@ glabel EnWonderTalk_Update /* 00748 80B39838 0C00B56E */ jal Actor_SetHeight /* 0074C 80B3983C 8C850160 */ lw $a1, 0x0160($a0) ## 00000160 -/* 00750 80B39840 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00754 80B39844 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 00750 80B39840 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 00754 80B39844 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 00758 80B39848 8FA40048 */ lw $a0, 0x0048($sp) /* 0075C 80B3984C 85F812D4 */ lh $t8, 0x12D4($t7) ## 801612D4 /* 00760 80B39850 5300003C */ beql $t8, $zero, .L80B39944 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B391CC.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B391CC.s index a3fa1a60d4..d90a05301f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B391CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B391CC.s @@ -96,8 +96,8 @@ glabel L80B39228 /* 00168 80B39258 0C00084C */ jal osSyncPrintf /* 0016C 80B3925C E604015C */ swc1 $f4, 0x015C($s0) ## 0000015C -/* 00170 80B39260 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 00174 80B39264 8F18E664 */ lw $t8, -0x199C($t8) ## 8015E664 +/* 00170 80B39260 3C188016 */ lui $t8, %hi(gSaveContext+4) +/* 00174 80B39264 8F18E664 */ lw $t8, %lo(gSaveContext+4)($t8) /* 00178 80B39268 24197040 */ addiu $t9, $zero, 0x7040 ## $t9 = 00007040 /* 0017C 80B3926C 3C0480B4 */ lui $a0, %hi(D_80B39A6C) ## $a0 = 80B40000 /* 00180 80B39270 13000007 */ beq $t8, $zero, .L80B39290 @@ -184,9 +184,9 @@ glabel L80B39358 /* 00294 80B39384 E6000160 */ swc1 $f0, 0x0160($s0) ## 00000160 /* 00298 80B39388 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 0029C 80B3938C 44813000 */ mtc1 $at, $f6 ## $f6 = 120.00 -/* 002A0 80B39390 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 002A0 80B39390 3C188016 */ lui $t8, %hi(gSaveContext+0xed6) /* 002A4 80B39394 E606015C */ swc1 $f6, 0x015C($s0) ## 0000015C -/* 002A8 80B39398 9718F536 */ lhu $t8, -0x0ACA($t8) ## 8015F536 +/* 002A8 80B39398 9718F536 */ lhu $t8, %lo(gSaveContext+0xed6)($t8) /* 002AC 80B3939C 33192000 */ andi $t9, $t8, 0x2000 ## $t9 = 00000000 /* 002B0 80B393A0 1320001A */ beq $t9, $zero, .L80B3940C /* 002B4 80B393A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B3943C.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B3943C.s index eed30838c9..9649275270 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B3943C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B3943C.s @@ -36,8 +36,8 @@ glabel func_80B3943C /* 0036C 80B3945C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00370 80B39460 1701000A */ bne $t8, $at, .L80B3948C /* 00374 80B39464 A48F015A */ sh $t7, 0x015A($a0) ## 0000015A -/* 00378 80B39468 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 0037C 80B3946C 9739F536 */ lhu $t9, -0x0ACA($t9) ## 8015F536 +/* 00378 80B39468 3C198016 */ lui $t9, %hi(gSaveContext+0xed6) +/* 0037C 80B3946C 9739F536 */ lhu $t9, %lo(gSaveContext+0xed6)($t9) /* 00380 80B39470 33282000 */ andi $t0, $t9, 0x2000 ## $t0 = 00000000 /* 00384 80B39474 51000006 */ beql $t0, $zero, .L80B39490 /* 00388 80B39478 86050154 */ lh $a1, 0x0154($s0) ## 00000154 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B395F0.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B395F0.s index c76dd75c84..d7ed51f530 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B395F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk/func_80B395F0.s @@ -63,7 +63,7 @@ glabel func_80B395F0 /* 005AC 80B3969C 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 /* 005B0 80B396A0 00511021 */ addu $v0, $v0, $s1 /* 005B4 80B396A4 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 005B8 80B396A8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 005B8 80B396A8 3C088016 */ lui $t0, %hi(gSaveContext+4) /* 005BC 80B396AC 10400005 */ beq $v0, $zero, .L80B396C4 /* 005C0 80B396B0 00000000 */ nop /* 005C4 80B396B4 10430012 */ beq $v0, $v1, .L80B39700 @@ -71,7 +71,7 @@ glabel func_80B395F0 /* 005CC 80B396BC 10000015 */ beq $zero, $zero, .L80B39714 /* 005D0 80B396C0 240C0006 */ addiu $t4, $zero, 0x0006 ## $t4 = 00000006 .L80B396C4: -/* 005D4 80B396C4 8D08E664 */ lw $t0, -0x199C($t0) ## 8015E664 +/* 005D4 80B396C4 8D08E664 */ lw $t0, %lo(gSaveContext+4)($t0) /* 005D8 80B396C8 3C0480B4 */ lui $a0, %hi(D_80B39D18) ## $a0 = 80B40000 /* 005DC 80B396CC 11000007 */ beq $t0, $zero, .L80B396EC /* 005E0 80B396D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Update.s index 07eec0dcac..8813f2e7a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Update.s @@ -12,8 +12,8 @@ glabel EnWonderTalk2_Update /* 008D4 80B3A7A4 0C00B56E */ jal Actor_SetHeight /* 008D8 80B3A7A8 E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 -/* 008DC 80B3A7AC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 008E0 80B3A7B0 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 008DC 80B3A7AC 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 008E0 80B3A7B0 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 008E4 80B3A7B4 8FA40048 */ lw $a0, 0x0048($sp) /* 008E8 80B3A7B8 85CF12D4 */ lh $t7, 0x12D4($t6) ## 801612D4 /* 008EC 80B3A7BC 51E0003C */ beql $t7, $zero, .L80B3A8B0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A3D4.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A3D4.s index 4ac5d3d3c6..6ce2732f38 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A3D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A3D4.s @@ -10,8 +10,8 @@ glabel D_80B3ABDC .text glabel func_80B3A3D4 /* 00504 80B3A3D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00508 80B3A3D8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0050C 80B3A3DC 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 00508 80B3A3D8 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 0050C 80B3A3DC 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 00510 80B3A3E0 AFBF001C */ sw $ra, 0x001C($sp) /* 00514 80B3A3E4 AFB00018 */ sw $s0, 0x0018($sp) /* 00518 80B3A3E8 AFA50034 */ sw $a1, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A4F8.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A4F8.s index bea2101727..529a95da3d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A4F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A4F8.s @@ -89,14 +89,14 @@ glabel func_80B3A4F8 /* 00694 80B3A564 860C0154 */ lh $t4, 0x0154($s0) ## 00000154 .L80B3A568: /* 00698 80B3A568 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0069C 80B3A56C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0069C 80B3A56C 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 006A0 80B3A570 15810004 */ bne $t4, $at, .L80B3A584 /* 006A4 80B3A574 00000000 */ nop /* 006A8 80B3A578 920D015A */ lbu $t5, 0x015A($s0) ## 0000015A /* 006AC 80B3A57C 55A00078 */ bnel $t5, $zero, .L80B3A760 /* 006B0 80B3A580 8FBF001C */ lw $ra, 0x001C($sp) .L80B3A584: -/* 006B4 80B3A584 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 006B4 80B3A584 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 006B8 80B3A588 85CF12D8 */ lh $t7, 0x12D8($t6) ## 801612D8 /* 006BC 80B3A58C 51E0000A */ beql $t7, $zero, .L80B3A5B8 /* 006C0 80B3A590 3C014220 */ lui $at, 0x4220 ## $at = 42200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s index 3298b0f272..81d5be9c72 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s @@ -25,8 +25,8 @@ glabel EnXc_Init /* 0572C 80B4190C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 05730 80B41910 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 05734 80B41914 AFBF002C */ sw $ra, 0x002C($sp) -/* 05738 80B41918 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0573C 80B4191C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 05738 80B41918 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 0573C 80B4191C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 05740 80B41920 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 05744 80B41924 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 05748 80B41928 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C298.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C298.s index 47af3faef6..15622eae2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C298.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C298.s @@ -3,8 +3,8 @@ glabel func_80B3C298 /* 000BC 80B3C29C AFBF0014 */ sw $ra, 0x0014($sp) /* 000C0 80B3C2A0 AFA5001C */ sw $a1, 0x001C($sp) /* 000C4 80B3C2A4 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 000C8 80B3C2A8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 000CC 80B3C2AC 2463FA90 */ addiu $v1, $v1, 0xFA90 ## $v1 = 8015FA90 +/* 000C8 80B3C2A8 3C038016 */ lui $v1, %hi(gGameInfo) +/* 000CC 80B3C2AC 2463FA90 */ addiu $v1, %lo(gGameInfo) /* 000D0 80B3C2B0 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 /* 000D4 80B3C2B4 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 000D8 80B3C2B8 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C700.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C700.s index 3076c8e07c..f39b8d036b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C700.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C700.s @@ -2,10 +2,10 @@ glabel func_80B3C700 /* 00520 80B3C700 00057100 */ sll $t6, $a1, 4 /* 00524 80B3C704 000E7F02 */ srl $t7, $t6, 28 /* 00528 80B3C708 000FC080 */ sll $t8, $t7, 2 -/* 0052C 80B3C70C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 0052C 80B3C70C 3C198016 */ lui $t9, %hi(gSegments) /* 00530 80B3C710 0338C821 */ addu $t9, $t9, $t8 /* 00534 80B3C714 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00538 80B3C718 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 00538 80B3C718 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 0053C 80B3C71C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00540 80B3C720 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00544 80B3C724 00A14024 */ and $t0, $a1, $at diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA38.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA38.s index 3961928b42..b058e12238 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA38.s @@ -1,6 +1,6 @@ glabel func_80B3CA38 -/* 00858 80B3CA38 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0085C 80B3CA3C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00858 80B3CA38 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0085C 80B3CA3C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00860 80B3CA40 944E0EDE */ lhu $t6, 0x0EDE($v0) ## 8015F53E /* 00864 80B3CA44 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00868 80B3CA48 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA84.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA84.s index 74b10ddaa2..274e405e0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA84.s @@ -29,17 +29,17 @@ glabel func_80B3CA84 /* 008FC 80B3CADC 00027900 */ sll $t7, $v0, 4 /* 00900 80B3CAE0 000FC702 */ srl $t8, $t7, 28 /* 00904 80B3CAE4 0018C880 */ sll $t9, $t8, 2 -/* 00908 80B3CAE8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 00908 80B3CAE8 3C088016 */ lui $t0, %hi(gSegments) /* 0090C 80B3CAEC 01194021 */ addu $t0, $t0, $t9 /* 00910 80B3CAF0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00914 80B3CAF4 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 +/* 00914 80B3CAF4 8D086FA8 */ lw $t0, %lo(gSegments)($t0) /* 00918 80B3CAF8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0091C 80B3CAFC 00414824 */ and $t1, $v0, $at /* 00920 80B3CB00 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00924 80B3CB04 01095021 */ addu $t2, $t0, $t1 -/* 00928 80B3CB08 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00928 80B3CB08 3C038016 */ lui $v1, %hi(gSaveContext) /* 0092C 80B3CB0C 01415821 */ addu $t3, $t2, $at -/* 00930 80B3CB10 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00930 80B3CB10 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00934 80B3CB14 ACCB1D68 */ sw $t3, 0x1D68($a2) ## 00001D68 /* 00938 80B3CB18 946D0EDE */ lhu $t5, 0x0EDE($v1) ## 8015F53E /* 0093C 80B3CB1C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CB58.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CB58.s index e524368621..c74d00885a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CB58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CB58.s @@ -1,6 +1,6 @@ glabel func_80B3CB58 -/* 00978 80B3CB58 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0097C 80B3CB5C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00978 80B3CB58 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0097C 80B3CB5C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00980 80B3CB60 944E0EDE */ lhu $t6, 0x0EDE($v0) ## 8015F53E /* 00984 80B3CB64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00988 80B3CB68 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CBA4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CBA4.s index 5be18078c4..8935eb10b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CBA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CBA4.s @@ -65,17 +65,17 @@ glabel func_80B3CBA4 /* 00AA4 80B3CC84 00027900 */ sll $t7, $v0, 4 /* 00AA8 80B3CC88 000FC702 */ srl $t8, $t7, 28 /* 00AAC 80B3CC8C 0018C880 */ sll $t9, $t8, 2 -/* 00AB0 80B3CC90 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 00AB0 80B3CC90 3C088016 */ lui $t0, %hi(gSegments) /* 00AB4 80B3CC94 01194021 */ addu $t0, $t0, $t9 /* 00AB8 80B3CC98 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00ABC 80B3CC9C 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 +/* 00ABC 80B3CC9C 8D086FA8 */ lw $t0, %lo(gSegments)($t0) /* 00AC0 80B3CCA0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00AC4 80B3CCA4 00414824 */ and $t1, $v0, $at /* 00AC8 80B3CCA8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00ACC 80B3CCAC 01095021 */ addu $t2, $t0, $t1 -/* 00AD0 80B3CCB0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00AD0 80B3CCB0 3C038016 */ lui $v1, %hi(gSaveContext) /* 00AD4 80B3CCB4 01415821 */ addu $t3, $t2, $at -/* 00AD8 80B3CCB8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00AD8 80B3CCB8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00ADC 80B3CCBC ACCB1D68 */ sw $t3, 0x1D68($a2) ## 00001D68 /* 00AE0 80B3CCC0 946D0EDE */ lhu $t5, 0x0EDE($v1) ## 8015F53E /* 00AE4 80B3CCC4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD00.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD00.s index 4811cd6d63..551f5371ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD00.s @@ -8,12 +8,12 @@ glabel D_80B41F80 .text glabel func_80B3CD00 -/* 00B20 80B3CD00 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00B24 80B3CD04 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 00B28 80B3CD08 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 00B2C 80B3CD0C 91EF71F3 */ lbu $t7, 0x71F3($t7) ## 801271F3 -/* 00B30 80B3CD10 8DCE7124 */ lw $t6, 0x7124($t6) ## 80127124 -/* 00B34 80B3CD14 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00B20 80B3CD00 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00B24 80B3CD04 3C0E8012 */ lui $t6, %hi(gBitFlags+4) +/* 00B28 80B3CD08 3C0F8012 */ lui $t7, %hi(gEquipShifts+3) +/* 00B2C 80B3CD0C 91EF71F3 */ lbu $t7, %lo(gEquipShifts+3)($t7) +/* 00B30 80B3CD10 8DCE7124 */ lw $t6, %lo(gBitFlags+4)($t6) +/* 00B34 80B3CD14 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00B38 80B3CD18 9459009C */ lhu $t9, 0x009C($v0) ## 8015E6FC /* 00B3C 80B3CD1C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00B40 80B3CD20 01EEC004 */ sllv $t8, $t6, $t7 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD98.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD98.s index 3b436a3901..9ba84288e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD98.s @@ -12,14 +12,14 @@ glabel func_80B3CD98 /* 00BBC 80B3CD9C AFBF0014 */ sw $ra, 0x0014($sp) /* 00BC0 80B3CDA0 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 00BC4 80B3CDA4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00BC8 80B3CDA8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00BC8 80B3CDA8 3C038016 */ lui $v1, %hi(gSaveContext) /* 00BCC 80B3CDAC 15C1002E */ bne $t6, $at, .L80B3CE68 /* 00BD0 80B3CDB0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00BD4 80B3CDB4 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 00BD8 80B3CDB8 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 -/* 00BDC 80B3CDBC 931871F3 */ lbu $t8, 0x71F3($t8) ## 801271F3 -/* 00BE0 80B3CDC0 8DEF7124 */ lw $t7, 0x7124($t7) ## 80127124 -/* 00BE4 80B3CDC4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00BD4 80B3CDB4 3C0F8012 */ lui $t7, %hi(gBitFlags+4) +/* 00BD8 80B3CDB8 3C188012 */ lui $t8, %hi(gEquipShifts+3) +/* 00BDC 80B3CDBC 931871F3 */ lbu $t8, %lo(gEquipShifts+3)($t8) +/* 00BE0 80B3CDC0 8DEF7124 */ lw $t7, %lo(gBitFlags+4)($t7) +/* 00BE4 80B3CDC4 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00BE8 80B3CDC8 9468009C */ lhu $t0, 0x009C($v1) ## 8015E6FC /* 00BEC 80B3CDCC 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 /* 00BF0 80B3CDD0 030FC804 */ sllv $t9, $t7, $t8 @@ -41,8 +41,8 @@ glabel func_80B3CD98 /* 00C30 80B3CE10 0C01A4F6 */ jal Cutscene_SetSegment /* 00C34 80B3CE14 24A50330 */ addiu $a1, $a1, 0x0330 ## $a1 = 02000330 -/* 00C38 80B3CE18 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00C3C 80B3CE1C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00C38 80B3CE18 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00C3C 80B3CE1C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00C40 80B3CE20 946E0EDE */ lhu $t6, 0x0EDE($v1) ## 8015F53E /* 00C44 80B3CE24 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 00C48 80B3CE28 A06D1414 */ sb $t5, 0x1414($v1) ## 8015FA74 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF90.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF90.s index e18ebf7ac2..b476c464cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF90.s @@ -1,6 +1,6 @@ glabel func_80B3CF90 -/* 00DB0 80B3CF90 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00DB4 80B3CF94 8DCEF9C0 */ lw $t6, -0x0640($t6) ## 8015F9C0 +/* 00DB0 80B3CF90 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) +/* 00DB4 80B3CF94 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) /* 00DB8 80B3CF98 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00DBC 80B3CF9C AFBF0014 */ sw $ra, 0x0014($sp) /* 00DC0 80B3CFA0 AFA40018 */ sw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D014.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D014.s index 8194098b12..49a3e1fb0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D014.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D014.s @@ -1,6 +1,6 @@ glabel func_80B3D014 -/* 00E34 80B3D014 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00E38 80B3D018 8DCEF9C0 */ lw $t6, -0x0640($t6) ## 8015F9C0 +/* 00E34 80B3D014 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) +/* 00E38 80B3D018 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) /* 00E3C 80B3D01C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00E40 80B3D020 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 00E44 80B3D024 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D118.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D118.s index 033942bafd..1df1d27364 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D118.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D118.s @@ -1,6 +1,6 @@ glabel func_80B3D118 -/* 00F38 80B3D118 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00F3C 80B3D11C 8DCEF9C0 */ lw $t6, -0x0640($t6) ## 8015F9C0 +/* 00F38 80B3D118 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) +/* 00F3C 80B3D11C 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) /* 00F40 80B3D120 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00F44 80B3D124 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 00F48 80B3D128 15C10005 */ bne $t6, $at, .L80B3D140 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D158.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D158.s index 0f321b3989..40594e9a7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D158.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D158.s @@ -14,8 +14,8 @@ glabel D_80B4220C .text glabel func_80B3D158 -/* 00F78 80B3D158 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00F7C 80B3D15C 8DCEF9C0 */ lw $t6, -0x0640($t6) ## 8015F9C0 +/* 00F78 80B3D158 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) +/* 00F7C 80B3D15C 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) /* 00F80 80B3D160 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00F84 80B3D164 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 00F88 80B3D168 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D56C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D56C.s index c47ed0663b..614c8198bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D56C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D56C.s @@ -28,13 +28,13 @@ glabel func_80B3D56C /* 013BC 80B3D59C E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 013C0 80B3D5A0 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 .L80B3D5A4: -/* 013C4 80B3D5A4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 013C8 80B3D5A8 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 013C4 80B3D5A4 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 013C8 80B3D5A8 3C188016 */ lui $t8, %hi(gGameInfo) /* 013CC 80B3D5AC 460C003C */ c.lt.s $f0, $f12 /* 013D0 80B3D5B0 00000000 */ nop /* 013D4 80B3D5B4 45000011 */ bc1f .L80B3D5FC /* 013D8 80B3D5B8 00000000 */ nop -/* 013DC 80B3D5BC 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 013DC 80B3D5BC 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 013E0 80B3D5C0 3C0180B4 */ lui $at, %hi(D_80B42210) ## $at = 80B40000 /* 013E4 80B3D5C4 C42A2210 */ lwc1 $f10, %lo(D_80B42210)($at) /* 013E8 80B3D5C8 85CF1458 */ lh $t7, 0x1458($t6) ## 80161458 @@ -51,7 +51,7 @@ glabel func_80B3D56C /* 01414 80B3D5F4 1000000D */ beq $zero, $zero, .L80B3D62C /* 01418 80B3D5F8 E48A0068 */ swc1 $f10, 0x0068($a0) ## 00000068 .L80B3D5FC: -/* 0141C 80B3D5FC 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 0141C 80B3D5FC 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 01420 80B3D600 3C0180B4 */ lui $at, %hi(D_80B42218) ## $at = 80B40000 /* 01424 80B3D604 C4242218 */ lwc1 $f4, %lo(D_80B42218)($at) /* 01428 80B3D608 87191458 */ lh $t9, 0x1458($t8) ## 80161458 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D664.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D664.s index 2eefff7af4..2fdac86519 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D664.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D664.s @@ -12,12 +12,12 @@ glabel func_80B3D664 /* 0148C 80B3D66C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 01490 80B3D670 44811000 */ mtc1 $at, $f2 ## $f2 = 3.00 /* 01494 80B3D674 C4800268 */ lwc1 $f0, 0x0268($a0) ## 00000268 -/* 01498 80B3D678 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 01498 80B3D678 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 0149C 80B3D67C 4602003C */ c.lt.s $f0, $f2 /* 014A0 80B3D680 00000000 */ nop /* 014A4 80B3D684 45020012 */ bc1fl .L80B3D6D0 /* 014A8 80B3D688 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 014AC 80B3D68C 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 014AC 80B3D68C 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 014B0 80B3D690 3C0180B4 */ lui $at, %hi(D_80B42220) ## $at = 80B40000 /* 014B4 80B3D694 C4282220 */ lwc1 $f8, %lo(D_80B42220)($at) /* 014B8 80B3D698 85CF1458 */ lh $t7, 0x1458($t6) ## 80161458 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D8A4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D8A4.s index b9052468bd..788ae566b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D8A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D8A4.s @@ -33,8 +33,8 @@ glabel func_80B3D8A4 /* 01724 80B3D904 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01728 80B3D908 0C2CF277 */ jal func_80B3C9DC /* 0172C 80B3D90C E60A0268 */ swc1 $f10, 0x0268($s0) ## 00000268 -/* 01730 80B3D910 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01734 80B3D914 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 01730 80B3D910 3C028016 */ lui $v0, %hi(gGameInfo) +/* 01734 80B3D914 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 01738 80B3D918 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90 /* 0173C 80B3D91C 3C0180B4 */ lui $at, %hi(D_80B42228) ## $at = 80B40000 /* 01740 80B3D920 C4202228 */ lwc1 $f0, %lo(D_80B42228)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D990.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D990.s index c4f9d0bfcc..b803390113 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D990.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D990.s @@ -13,14 +13,14 @@ glabel func_80B3D990 /* 017BC 80B3D99C 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 017C0 80B3D9A0 44818000 */ mtc1 $at, $f16 ## $f16 = 12.00 /* 017C4 80B3D9A4 46062200 */ add.s $f8, $f4, $f6 -/* 017C8 80B3D9A8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 017C8 80B3D9A8 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 017CC 80B3D9AC E4880268 */ swc1 $f8, 0x0268($a0) ## 00000268 /* 017D0 80B3D9B0 C48A0268 */ lwc1 $f10, 0x0268($a0) ## 00000268 /* 017D4 80B3D9B4 460A803E */ c.le.s $f16, $f10 /* 017D8 80B3D9B8 00000000 */ nop /* 017DC 80B3D9BC 4500000E */ bc1f .L80B3D9F8 /* 017E0 80B3D9C0 00000000 */ nop -/* 017E4 80B3D9C4 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 017E4 80B3D9C4 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 017E8 80B3D9C8 3C0180B4 */ lui $at, %hi(D_80B4222C) ## $at = 80B40000 /* 017EC 80B3D9CC C426222C */ lwc1 $f6, %lo(D_80B4222C)($at) /* 017F0 80B3D9D0 85CF1458 */ lh $t7, 0x1458($t6) ## 80161458 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DA00.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DA00.s index 1cf2493643..6f484dea19 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DA00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DA00.s @@ -1,6 +1,6 @@ glabel func_80B3DA00 -/* 01820 80B3DA00 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 01824 80B3DA04 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 01820 80B3DA00 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 01824 80B3DA04 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 01828 80B3DA08 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0182C 80B3DA0C AFBF0024 */ sw $ra, 0x0024($sp) /* 01830 80B3DA10 AFA40028 */ sw $a0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DFA4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DFA4.s index 46bd09512c..09b331ebcb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DFA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DFA4.s @@ -13,14 +13,14 @@ glabel func_80B3DFA4 /* 01DD0 80B3DFB0 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 01DD4 80B3DFB4 44818000 */ mtc1 $at, $f16 ## $f16 = 12.00 /* 01DD8 80B3DFB8 46062200 */ add.s $f8, $f4, $f6 -/* 01DDC 80B3DFBC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 01DDC 80B3DFBC 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 01DE0 80B3DFC0 E4880268 */ swc1 $f8, 0x0268($a0) ## 00000268 /* 01DE4 80B3DFC4 C48A0268 */ lwc1 $f10, 0x0268($a0) ## 00000268 /* 01DE8 80B3DFC8 460A803E */ c.le.s $f16, $f10 /* 01DEC 80B3DFCC 00000000 */ nop /* 01DF0 80B3DFD0 4500000E */ bc1f .L80B3E00C /* 01DF4 80B3DFD4 00000000 */ nop -/* 01DF8 80B3DFD8 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 01DF8 80B3DFD8 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 01DFC 80B3DFDC 3C0180B4 */ lui $at, %hi(D_80B42234) ## $at = 80B40000 /* 01E00 80B3DFE0 C4262234 */ lwc1 $f6, %lo(D_80B42234)($at) /* 01E04 80B3DFE4 85CF1458 */ lh $t7, 0x1458($t6) ## 80161458 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E014.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E014.s index f199606350..8736685529 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E014.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E014.s @@ -1,6 +1,6 @@ glabel func_80B3E014 -/* 01E34 80B3E014 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 01E38 80B3E018 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 01E34 80B3E014 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 01E38 80B3E018 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 01E3C 80B3E01C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01E40 80B3E020 AFBF0024 */ sw $ra, 0x0024($sp) /* 01E44 80B3E024 AFA40028 */ sw $a0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s index e2f32393ae..8472d049b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s @@ -32,10 +32,10 @@ glabel func_80B3E908 /* 02778 80B3E958 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 0277C 80B3E95C 00085100 */ sll $t2, $t0, 4 /* 02780 80B3E960 000A5F02 */ srl $t3, $t2, 28 -/* 02784 80B3E964 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 02784 80B3E964 3C0D8016 */ lui $t5, %hi(gSegments) /* 02788 80B3E968 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 0278C 80B3E96C AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 02790 80B3E970 25AD6FA8 */ addiu $t5, $t5, 0x6FA8 ## $t5 = 80166FA8 +/* 02790 80B3E970 25AD6FA8 */ addiu $t5, %lo(gSegments) /* 02794 80B3E974 000B6080 */ sll $t4, $t3, 2 /* 02798 80B3E978 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 /* 0279C 80B3E97C 018D2021 */ addu $a0, $t4, $t5 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s index 81c5b2fd89..2a64929843 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s @@ -32,10 +32,10 @@ glabel func_80B3EA7C /* 028EC 80B3EACC 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 028F0 80B3EAD0 00085100 */ sll $t2, $t0, 4 /* 028F4 80B3EAD4 000A5F02 */ srl $t3, $t2, 28 -/* 028F8 80B3EAD8 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 028F8 80B3EAD8 3C0D8016 */ lui $t5, %hi(gSegments) /* 028FC 80B3EADC 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 02900 80B3EAE0 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 02904 80B3EAE4 25AD6FA8 */ addiu $t5, $t5, 0x6FA8 ## $t5 = 80166FA8 +/* 02904 80B3EAE4 25AD6FA8 */ addiu $t5, %lo(gSegments) /* 02908 80B3EAE8 000B6080 */ sll $t4, $t3, 2 /* 0290C 80B3EAEC 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 /* 02910 80B3EAF0 018D2021 */ addu $a0, $t4, $t5 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ECD8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ECD8.s index c1c9324e50..7255133e1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ECD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ECD8.s @@ -13,14 +13,14 @@ glabel func_80B3ECD8 /* 02B04 80B3ECE4 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 02B08 80B3ECE8 44818000 */ mtc1 $at, $f16 ## $f16 = 12.00 /* 02B0C 80B3ECEC 46062200 */ add.s $f8, $f4, $f6 -/* 02B10 80B3ECF0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 02B10 80B3ECF0 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 02B14 80B3ECF4 E4880268 */ swc1 $f8, 0x0268($a0) ## 00000268 /* 02B18 80B3ECF8 C48A0268 */ lwc1 $f10, 0x0268($a0) ## 00000268 /* 02B1C 80B3ECFC 460A803E */ c.le.s $f16, $f10 /* 02B20 80B3ED00 00000000 */ nop /* 02B24 80B3ED04 4500000E */ bc1f .L80B3ED40 /* 02B28 80B3ED08 00000000 */ nop -/* 02B2C 80B3ED0C 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 02B2C 80B3ED0C 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 02B30 80B3ED10 3C0180B4 */ lui $at, %hi(D_80B4223C) ## $at = 80B40000 /* 02B34 80B3ED14 C426223C */ lwc1 $f6, %lo(D_80B4223C)($at) /* 02B38 80B3ED18 85CF1458 */ lh $t7, 0x1458($t6) ## 80161458 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F010.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F010.s index deddfb2a12..2258730af4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F010.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F010.s @@ -1,6 +1,6 @@ glabel func_80B3F010 -/* 02E30 80B3F010 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 02E34 80B3F014 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 02E30 80B3F010 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 02E34 80B3F014 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 02E38 80B3F018 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 02E3C 80B3F01C AFBF0024 */ sw $ra, 0x0024($sp) /* 02E40 80B3F020 AFA40028 */ sw $a0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA08.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA08.s index 601ccca636..444ba53cc2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA08.s @@ -2,8 +2,8 @@ glabel func_80B3FA08 /* 03828 80B3FA08 AFA50004 */ sw $a1, 0x0004($sp) /* 0382C 80B3FA0C 240E0035 */ addiu $t6, $zero, 0x0035 ## $t6 = 00000035 /* 03830 80B3FA10 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -/* 03834 80B3FA14 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 03838 80B3FA18 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 03834 80B3FA14 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 03838 80B3FA18 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 0383C 80B3FA1C 85F81484 */ lh $t8, 0x1484($t7) ## 80161484 /* 03840 80B3FA20 271953FC */ addiu $t9, $t8, 0x53FC ## $t9 = 000053FC /* 03844 80B3FA24 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FB24.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FB24.s index 048b9e1bb3..58d0fd7fb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FB24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FB24.s @@ -45,8 +45,8 @@ glabel func_80B3FB24 /* 039B8 80B3FB98 504000D7 */ beql $v0, $zero, .L80B3FEF8 /* 039BC 80B3FB9C 8FBF002C */ lw $ra, 0x002C($sp) /* 039C0 80B3FBA0 14620051 */ bne $v1, $v0, .L80B3FCE8 -/* 039C4 80B3FBA4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 039C8 80B3FBA8 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 +/* 039C4 80B3FBA4 3C058016 */ lui $a1, %hi(gGameInfo) +/* 039C8 80B3FBA8 24A5FA90 */ addiu $a1, %lo(gGameInfo) /* 039CC 80B3FBAC 8CB80000 */ lw $t8, 0x0000($a1) ## 8015FA90 /* 039D0 80B3FBB0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 039D4 80B3FBB4 4481A000 */ mtc1 $at, $f20 ## $f20 = 40.00 @@ -131,8 +131,8 @@ glabel func_80B3FB24 .L80B3FCE8: /* 03B08 80B3FCE8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 03B0C 80B3FCEC 14410081 */ bne $v0, $at, .L80B3FEF4 -/* 03B10 80B3FCF0 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 03B14 80B3FCF4 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 +/* 03B10 80B3FCF0 3C058016 */ lui $a1, %hi(gGameInfo) +/* 03B14 80B3FCF4 24A5FA90 */ addiu $a1, %lo(gGameInfo) /* 03B18 80B3FCF8 8CA20000 */ lw $v0, 0x0000($a1) ## 8015FA90 /* 03B1C 80B3FCFC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 03B20 80B3FD00 4481A000 */ mtc1 $at, $f20 ## $f20 = 40.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s index 735035c233..b419dbb624 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s @@ -47,8 +47,8 @@ glabel func_80B402C4 /* 04144 80B40324 24050040 */ addiu $a1, $zero, 0x0040 ## $a1 = 00000040 /* 04148 80B40328 0C034213 */ jal Matrix_Push /* 0414C 80B4032C AFA20064 */ sw $v0, 0x0064($sp) -/* 04150 80B40330 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 04154 80B40334 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 04150 80B40330 3C028016 */ lui $v0, %hi(gGameInfo) +/* 04154 80B40334 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 04158 80B40338 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0415C 80B4033C 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 /* 04160 80B40340 84481474 */ lh $t0, 0x1474($v0) ## 80161474 @@ -71,8 +71,8 @@ glabel func_80B402C4 /* 041A4 80B40384 44065000 */ mfc1 $a2, $f10 /* 041A8 80B40388 0C034261 */ jal Matrix_Translate /* 041AC 80B4038C 00000000 */ nop -/* 041B0 80B40390 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 041B4 80B40394 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 041B0 80B40390 3C028016 */ lui $v0, %hi(gGameInfo) +/* 041B4 80B40394 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 041B8 80B40398 862602A4 */ lh $a2, 0x02A4($s1) ## 000002A4 /* 041BC 80B4039C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 041C0 80B403A0 84441480 */ lh $a0, 0x1480($v0) ## 80161480 @@ -150,10 +150,10 @@ glabel func_80B402C4 /* 042DC 80B404BC 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 042E0 80B404C0 0007C900 */ sll $t9, $a3, 4 /* 042E4 80B404C4 00197F02 */ srl $t7, $t9, 28 -/* 042E8 80B404C8 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 042E8 80B404C8 3C098016 */ lui $t1, %hi(gSegments) /* 042EC 80B404CC 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 /* 042F0 80B404D0 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 042F4 80B404D4 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 +/* 042F4 80B404D4 25296FA8 */ addiu $t1, %lo(gSegments) /* 042F8 80B404D8 000F4080 */ sll $t0, $t7, 2 /* 042FC 80B404DC 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 04300 80B404E0 01092021 */ addu $a0, $t0, $t1 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D98.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D98.s index 375fcc956e..4183a9ba71 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D98.s @@ -1,6 +1,6 @@ glabel func_80B40D98 -/* 04BB8 80B40D98 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 04BBC 80B40D9C 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 04BB8 80B40D98 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 04BBC 80B40D9C 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 04BC0 80B40DA0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 04BC4 80B40DA4 AFBF0024 */ sw $ra, 0x0024($sp) /* 04BC8 80B40DA8 AFA40028 */ sw $a0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s index 8c62533c5d..76bf6858b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s @@ -29,10 +29,10 @@ glabel func_80B414AC /* 05310 80B414F0 0003C900 */ sll $t9, $v1, 4 /* 05314 80B414F4 00194702 */ srl $t0, $t9, 28 /* 05318 80B414F8 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 0531C 80B414FC 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 0531C 80B414FC 3C0A8016 */ lui $t2, %hi(gSegments) /* 05320 80B41500 248F0008 */ addiu $t7, $a0, 0x0008 ## $t7 = 00000008 /* 05324 80B41504 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 05328 80B41508 254A6FA8 */ addiu $t2, $t2, 0x6FA8 ## $t2 = 80166FA8 +/* 05328 80B41508 254A6FA8 */ addiu $t2, %lo(gSegments) /* 0532C 80B4150C 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 05330 80B41510 00084880 */ sll $t1, $t0, 2 /* 05334 80B41514 012A2821 */ addu $a1, $t1, $t2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B415B8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B415B8.s index 89e01d37bb..ca4a95542d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B415B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B415B8.s @@ -1,6 +1,6 @@ glabel func_80B415B8 -/* 053D8 80B415B8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 053DC 80B415BC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 053D8 80B415B8 3C038016 */ lui $v1, %hi(gSaveContext) +/* 053DC 80B415BC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 053E0 80B415C0 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 /* 053E4 80B415C4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 053E8 80B415C8 AFB00018 */ sw $s0, 0x0018($sp) @@ -17,11 +17,11 @@ glabel func_80B415B8 /* 05414 80B415F4 0002C900 */ sll $t9, $v0, 4 /* 05418 80B415F8 00194702 */ srl $t0, $t9, 28 /* 0541C 80B415FC 00084880 */ sll $t1, $t0, 2 -/* 05420 80B41600 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 05420 80B41600 3C0A8016 */ lui $t2, %hi(gSegments) /* 05424 80B41604 A4780EEC */ sh $t8, 0x0EEC($v1) ## 8015F54C /* 05428 80B41608 01495021 */ addu $t2, $t2, $t1 /* 0542C 80B4160C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 05430 80B41610 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 05430 80B41610 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 05434 80B41614 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 05438 80B41618 00415824 */ and $t3, $v0, $at /* 0543C 80B4161C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -53,18 +53,18 @@ glabel func_80B415B8 /* 054A0 80B41680 00024100 */ sll $t0, $v0, 4 /* 054A4 80B41684 00084F02 */ srl $t1, $t0, 28 /* 054A8 80B41688 00095080 */ sll $t2, $t1, 2 -/* 054AC 80B4168C 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 054AC 80B4168C 3C0B8016 */ lui $t3, %hi(gSegments) /* 054B0 80B41690 016A5821 */ addu $t3, $t3, $t2 /* 054B4 80B41694 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 054B8 80B41698 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 +/* 054B8 80B41698 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) /* 054BC 80B4169C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 054C0 80B416A0 00416024 */ and $t4, $v0, $at /* 054C4 80B416A4 8FA70024 */ lw $a3, 0x0024($sp) /* 054C8 80B416A8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 054CC 80B416AC 016C6821 */ addu $t5, $t3, $t4 -/* 054D0 80B416B0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 054D0 80B416B0 3C038016 */ lui $v1, %hi(gSaveContext) /* 054D4 80B416B4 01A17021 */ addu $t6, $t5, $at -/* 054D8 80B416B8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 054D8 80B416B8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 054DC 80B416BC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 054E0 80B416C0 ACEE1D68 */ sw $t6, 0x1D68($a3) ## 00001D68 /* 054E4 80B416C4 A06F1414 */ sb $t7, 0x1414($v1) ## 8015FA74 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41718.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41718.s index 5d9a9ec67f..0ae647ef7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41718.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41718.s @@ -11,15 +11,15 @@ glabel func_80B41718 /* 0555C 80B4173C AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 .L80B41740: /* 05560 80B41740 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 05564 80B41744 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 -/* 05568 80B41748 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 05564 80B41744 3C198012 */ lui $t9, %hi(gItemSlots+0xa) +/* 05568 80B41748 3C088016 */ lui $t0, %hi(gSaveContext+0x74) /* 0556C 80B4174C 35F80009 */ ori $t8, $t7, 0x0009 ## $t8 = 00000009 /* 05570 80B41750 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 05574 80B41754 9339746E */ lbu $t9, 0x746E($t9) ## 8012746E +/* 05574 80B41754 9339746E */ lbu $t9, %lo(gItemSlots+0xa)($t9) /* 05578 80B41758 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 0557C 80B4175C 24097010 */ addiu $t1, $zero, 0x7010 ## $t1 = 00007010 /* 05580 80B41760 01194021 */ addu $t0, $t0, $t9 -/* 05584 80B41764 9108E6D4 */ lbu $t0, -0x192C($t0) ## 8015E6D4 +/* 05584 80B41764 9108E6D4 */ lbu $t0, %lo(gSaveContext+0x74)($t0) /* 05588 80B41768 240A700F */ addiu $t2, $zero, 0x700F ## $t2 = 0000700F /* 0558C 80B4176C 51010004 */ beql $t0, $at, .L80B41780 /* 05590 80B41770 A48A010E */ sh $t2, 0x010E($a0) ## 0000010E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s index 2aea307bf3..abe949b993 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s @@ -38,10 +38,10 @@ glabel func_80B41BA4 /* 05A2C 80B41C0C 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 05A30 80B41C10 00075100 */ sll $t2, $a3, 4 /* 05A34 80B41C14 000A5F02 */ srl $t3, $t2, 28 -/* 05A38 80B41C18 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 05A38 80B41C18 3C0D8016 */ lui $t5, %hi(gSegments) /* 05A3C 80B41C1C 24680008 */ addiu $t0, $v1, 0x0008 ## $t0 = 00000008 /* 05A40 80B41C20 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 -/* 05A44 80B41C24 25AD6FA8 */ addiu $t5, $t5, 0x6FA8 ## $t5 = 80166FA8 +/* 05A44 80B41C24 25AD6FA8 */ addiu $t5, %lo(gSegments) /* 05A48 80B41C28 000B6080 */ sll $t4, $t3, 2 /* 05A4C 80B41C2C 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 /* 05A50 80B41C30 018D2021 */ addu $a0, $t4, $t5 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Init.s index 2448a082a8..16690389f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Init.s @@ -102,10 +102,10 @@ glabel EnYabusameMark_Init /* 00140 80B42F00 8E0D002C */ lw $t5, 0x002C($s0) ## 0000002C /* 00144 80B42F04 35CF0010 */ ori $t7, $t6, 0x0010 ## $t7 = 00000010 /* 00148 80B42F08 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 0014C 80B42F0C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0014C 80B42F0C 3C188016 */ lui $t8, %hi(gSaveContext+0x1360) /* 00150 80B42F10 AE0C0158 */ sw $t4, 0x0158($s0) ## 00000158 /* 00154 80B42F14 AE0D015C */ sw $t5, 0x015C($s0) ## 0000015C -/* 00158 80B42F18 8F18F9C0 */ lw $t8, -0x0640($t8) ## 8015F9C0 +/* 00158 80B42F18 8F18F9C0 */ lw $t8, %lo(gSaveContext+0x1360)($t8) /* 0015C 80B42F1C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 00160 80B42F20 3C0480B4 */ lui $a0, %hi(D_80B436EC) ## $a0 = 80B40000 /* 00164 80B42F24 13010005 */ beq $t8, $at, .L80B42F3C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Update.s index 6c9adc2ae9..fa9a87b91d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Update.s @@ -69,8 +69,8 @@ glabel EnYabusameMark_Update /* 00690 80B43450 0C01767D */ jal Actor_CollisionCheck_SetAC ## CollisionCheck_setAC /* 00694 80B43454 00812821 */ addu $a1, $a0, $at -/* 00698 80B43458 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 0069C 80B4345C 8D08FA90 */ lw $t0, -0x0570($t0) ## 8015FA90 +/* 00698 80B43458 3C088016 */ lui $t0, %hi(gGameInfo) +/* 0069C 80B4345C 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) /* 006A0 80B43460 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 006A4 80B43464 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF /* 006A8 80B43468 850912D4 */ lh $t1, 0x12D4($t0) ## 801612D4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Draw.s index adb9cab38e..b1cf4d0251 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Draw.s @@ -36,7 +36,7 @@ glabel EnYukabyun_Draw /* 00470 80B43E30 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 00474 80B43E34 8FA80048 */ lw $t0, 0x0048($sp) /* 00478 80B43E38 3C0480B4 */ lui $a0, %hi(D_80B43F64) ## $a0 = 80B40000 -/* 0047C 80B43E3C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0047C 80B43E3C 3C0F8016 */ lui $t7, %hi(gSegments) /* 00480 80B43E40 91090152 */ lbu $t1, 0x0152($t0) ## 00000152 /* 00484 80B43E44 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00488 80B43E48 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF @@ -49,7 +49,7 @@ glabel EnYukabyun_Draw /* 004A4 80B43E64 000C6F02 */ srl $t5, $t4, 28 /* 004A8 80B43E68 000D7080 */ sll $t6, $t5, 2 /* 004AC 80B43E6C 01EE7821 */ addu $t7, $t7, $t6 -/* 004B0 80B43E70 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 004B0 80B43E70 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 004B4 80B43E74 00815824 */ and $t3, $a0, $at /* 004B8 80B43E78 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 004BC 80B43E7C 016FC021 */ addu $t8, $t3, $t7 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Init.s index d5d6aa66ae..88334f839b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Init.s @@ -8,10 +8,10 @@ glabel EnYukabyun_Init /* 00018 80B439D8 0C01E037 */ jal Actor_ProcessInitChain /* 0001C 80B439DC 24A53F5C */ addiu $a1, $a1, %lo(D_80B43F5C) ## $a1 = 80B43F5C -/* 00020 80B439E0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 00020 80B439E0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 00024 80B439E4 3C073ECC */ lui $a3, 0x3ECC ## $a3 = 3ECC0000 /* 00028 80B439E8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3ECCCCCD -/* 0002C 80B439EC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 0002C 80B439EC 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00030 80B439F0 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00034 80B439F4 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s index f48d5fffef..8f710ff636 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s @@ -35,8 +35,8 @@ glabel EnZf_Draw /* 058D4 80B49924 35EF0002 */ ori $t7, $t7, 0x0002 ## $t7 = D7000002 /* 058D8 80B49928 2484A2F8 */ addiu $a0, $a0, %lo(D_80B4A2F8) ## $a0 = 80B4A2F8 /* 058DC 80B4992C AC8F0000 */ sw $t7, 0x0000($a0) ## 80B4A2F8 -/* 058E0 80B49930 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 058E4 80B49934 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 058E0 80B49930 3C028016 */ lui $v0, %hi(gGameInfo) +/* 058E4 80B49934 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 058E8 80B49938 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 058EC 80B4993C 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 /* 058F0 80B49940 845806D6 */ lh $t8, 0x06D6($v0) ## 801606D6 @@ -65,8 +65,8 @@ glabel EnZf_Draw /* 0594C 80B4999C AE3802C0 */ sw $t8, 0x02C0($s1) ## 000002C0 /* 05950 80B499A0 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 05954 80B499A4 92190404 */ lbu $t9, 0x0404($s0) ## 00000404 -/* 05958 80B499A8 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 -/* 0595C 80B499AC 258C6290 */ addiu $t4, $t4, 0x6290 ## $t4 = 80116290 +/* 05958 80B499A8 3C0C8011 */ lui $t4, %hi(D_80116280+0x10) +/* 0595C 80B499AC 258C6290 */ addiu $t4, %lo(D_80116280+0x10) /* 05960 80B499B0 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 05964 80B499B4 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 05968 80B499B8 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 @@ -138,12 +138,12 @@ glabel EnZf_Draw /* 05A6C 80B49ABC AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 05A70 80B49AC0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 05A74 80B49AC4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 05A78 80B49AC8 3C088011 */ lui $t0, 0x8011 ## $t0 = 80110000 +/* 05A78 80B49AC8 3C088011 */ lui $t0, %hi(D_80116280) /* 05A7C 80B49ACC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 05A80 80B49AD0 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 /* 05A84 80B49AD4 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 05A88 80B49AD8 920E0404 */ lbu $t6, 0x0404($s0) ## 00000404 -/* 05A8C 80B49ADC 25086280 */ addiu $t0, $t0, 0x6280 ## $t0 = 80116280 +/* 05A8C 80B49ADC 25086280 */ addiu $t0, %lo(D_80116280) /* 05A90 80B49AE0 37180024 */ ori $t8, $t8, 0x0024 ## $t8 = DB060024 /* 05A94 80B49AE4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 05A98 80B49AE8 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Init.s index 82b9d6b089..e9fefba96c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Init.s @@ -26,8 +26,8 @@ glabel EnZf_Init /* 002FC 80B4434C 344CFF00 */ ori $t4, $v0, 0xFF00 ## $t4 = 0000FF00 /* 00300 80B44350 A60C001C */ sh $t4, 0x001C($s0) ## 0000001C .L80B44354: -/* 00304 80B44354 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00308 80B44358 24C6B8C4 */ addiu $a2, $a2, 0xB8C4 ## $a2 = 8002B8C4 +/* 00304 80B44354 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Teardrop) +/* 00308 80B44358 24C6B8C4 */ addiu $a2, %lo(ActorShadow_DrawFunc_Teardrop) /* 0030C 80B4435C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00310 80B44360 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00314 80B44364 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s index 0913071f90..c6ac0ac65c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s @@ -25,8 +25,8 @@ glabel EnZl1_Draw /* 01950 80B4C490 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 01954 80B4C494 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 01958 80B4C498 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 0195C 80B4C49C 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 01960 80B4C4A0 24A56FA8 */ addiu $a1, $a1, 0x6FA8 ## $a1 = 80166FA8 +/* 0195C 80B4C49C 3C058016 */ lui $a1, %hi(gSegments) +/* 01960 80B4C4A0 24A56FA8 */ addiu $a1, %lo(gSegments) /* 01964 80B4C4A4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01968 80B4C4A8 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 0196C 80B4C4AC AC580000 */ sw $t8, 0x0000($v0) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s index fa550ebf96..f891d2a9fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s @@ -50,16 +50,16 @@ glabel EnZl1_Init /* 000C0 80B4AC00 0C00B58B */ jal Actor_SetScale /* 000C4 80B4AC04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000C8 80B4AC08 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 000CC 80B4AC0C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 000C8 80B4AC08 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 000CC 80B4AC0C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 000D0 80B4AC10 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 000D4 80B4AC14 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 000D8 80B4AC18 0C00AC78 */ jal ActorShape_Init /* 000DC 80B4AC1C 3C0741C0 */ lui $a3, 0x41C0 ## $a3 = 41C00000 /* 000E0 80B4AC20 A200001F */ sb $zero, 0x001F($s0) ## 0000001F -/* 000E4 80B4AC24 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 000E8 80B4AC28 8DCEF9C0 */ lw $t6, -0x0640($t6) ## 8015F9C0 +/* 000E4 80B4AC24 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) +/* 000E8 80B4AC28 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) /* 000EC 80B4AC2C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 000F0 80B4AC30 29C10004 */ slti $at, $t6, 0x0004 /* 000F4 80B4AC34 14200014 */ bne $at, $zero, .L80B4AC88 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B240.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B240.s index 0ced76a965..43b788bfcc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B240.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B240.s @@ -350,14 +350,14 @@ glabel L80B4B6FC /* 00BE4 80B4B724 2529C5D0 */ addiu $t1, $t1, %lo(D_80B4C5D0) ## $t1 = 80B4C5D0 /* 00BE8 80B4B728 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 00BEC 80B4B72C 46128032 */ c.eq.s $f16, $f18 -/* 00BF0 80B4B730 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00BF0 80B4B730 3C018016 */ lui $at, %hi(gSaveContext+0x1414) /* 00BF4 80B4B734 3C0B80B5 */ lui $t3, %hi(func_80B4B8B4) ## $t3 = 80B50000 /* 00BF8 80B4B738 4502000B */ bc1fl .L80B4B768 /* 00BFC 80B4B73C 8FAE003C */ lw $t6, 0x003C($sp) /* 00C00 80B4B740 AFB90048 */ sw $t9, 0x0048($sp) /* 00C04 80B4B744 AFA8003C */ sw $t0, 0x003C($sp) /* 00C08 80B4B748 AE291D68 */ sw $t1, 0x1D68($s1) ## 00001D68 -/* 00C0C 80B4B74C A02AFA74 */ sb $t2, -0x058C($at) ## 8015FA74 +/* 00C0C 80B4B74C A02AFA74 */ sb $t2, %lo(gSaveContext+0x1414)($at) /* 00C10 80B4B750 860C01E2 */ lh $t4, 0x01E2($s0) ## 000001E2 /* 00C14 80B4B754 256BB8B4 */ addiu $t3, $t3, %lo(func_80B4B8B4) ## $t3 = 80B4B8B4 /* 00C18 80B4B758 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s index 5f4976c490..6d575a922d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s @@ -4,8 +4,8 @@ glabel EnZl2_Init /* 03918 80B522A8 AFBF0024 */ sw $ra, 0x0024($sp) /* 0391C 80B522AC AFA50044 */ sw $a1, 0x0044($sp) /* 03920 80B522B0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 03924 80B522B4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 03928 80B522B8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 03924 80B522B4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 03928 80B522B8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 0392C 80B522BC AFA4002C */ sw $a0, 0x002C($sp) /* 03930 80B522C0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 03934 80B522C4 0C00AC78 */ jal ActorShape_Init @@ -38,8 +38,8 @@ glabel EnZl2_Init /* 03998 80B52328 10000004 */ beq $zero, $zero, .L80B5233C /* 0399C 80B5232C 8FBF0024 */ lw $ra, 0x0024($sp) .L80B52330: -/* 039A0 80B52330 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 039A4 80B52334 A420FA32 */ sh $zero, -0x05CE($at) ## 8015FA32 +/* 039A0 80B52330 3C018016 */ lui $at, %hi(gSaveContext+0x13d2) +/* 039A4 80B52334 A420FA32 */ sh $zero, %lo(gSaveContext+0x13d2)($at) /* 039A8 80B52338 8FBF0024 */ lw $ra, 0x0024($sp) .L80B5233C: /* 039AC 80B5233C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s index ce60369cab..01590b3c84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s @@ -110,8 +110,8 @@ glabel func_80B4F45C /* 00BC0 80B4F550 0C2D3BD9 */ jal func_80B4EF64 /* 00BC4 80B4F554 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 .L80B4F558: -/* 00BC8 80B4F558 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00BCC 80B4F55C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00BC8 80B4F558 3C028016 */ lui $v0, %hi(gGameInfo) +/* 00BCC 80B4F55C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 00BD0 80B4F560 8FA30094 */ lw $v1, 0x0094($sp) /* 00BD4 80B4F564 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00BD8 80B4F568 84591492 */ lh $t9, 0x1492($v0) ## 80161492 @@ -163,9 +163,9 @@ glabel func_80B4F45C /* 00C90 80B4F620 0C2D3C8C */ jal func_80B4F230 /* 00C94 80B4F624 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 .L80B4F628: -/* 00C98 80B4F628 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00C98 80B4F628 3C028016 */ lui $v0, %hi(gGameInfo) /* 00C9C 80B4F62C 8FA3001C */ lw $v1, 0x001C($sp) -/* 00CA0 80B4F630 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00CA0 80B4F630 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 00CA4 80B4F634 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00CA8 80B4F638 846F0006 */ lh $t7, 0x0006($v1) ## 00000006 /* 00CAC 80B4F63C 84790008 */ lh $t9, 0x0008($v1) ## 00000008 @@ -215,9 +215,9 @@ glabel func_80B4F45C /* 00D5C 80B4F6EC 0C2D3C8C */ jal func_80B4F230 /* 00D60 80B4F6F0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 .L80B4F6F4: -/* 00D64 80B4F6F4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00D64 80B4F6F4 3C028016 */ lui $v0, %hi(gGameInfo) /* 00D68 80B4F6F8 8FA3001C */ lw $v1, 0x001C($sp) -/* 00D6C 80B4F6FC 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00D6C 80B4F6FC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 00D70 80B4F700 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00D74 80B4F704 846C000C */ lh $t4, 0x000C($v1) ## 0000000C /* 00D78 80B4F708 846E000E */ lh $t6, 0x000E($v1) ## 0000000E @@ -283,9 +283,9 @@ glabel func_80B4F45C /* 00E68 80B4F7F8 0C2D3BD9 */ jal func_80B4EF64 /* 00E6C 80B4F7FC 2406000B */ addiu $a2, $zero, 0x000B ## $a2 = 0000000B .L80B4F800: -/* 00E70 80B4F800 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00E70 80B4F800 3C028016 */ lui $v0, %hi(gGameInfo) /* 00E74 80B4F804 8FA3001C */ lw $v1, 0x001C($sp) -/* 00E78 80B4F808 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00E78 80B4F808 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 00E7C 80B4F80C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00E80 80B4F810 84690012 */ lh $t1, 0x0012($v1) ## 00000012 /* 00E84 80B4F814 846B0014 */ lh $t3, 0x0014($v1) ## 00000014 @@ -339,9 +339,9 @@ glabel func_80B4F45C /* 00F44 80B4F8D4 0C2D3BD9 */ jal func_80B4EF64 /* 00F48 80B4F8D8 2406000E */ addiu $a2, $zero, 0x000E ## $a2 = 0000000E .L80B4F8DC: -/* 00F4C 80B4F8DC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00F4C 80B4F8DC 3C028016 */ lui $v0, %hi(gGameInfo) /* 00F50 80B4F8E0 8FA3001C */ lw $v1, 0x001C($sp) -/* 00F54 80B4F8E4 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00F54 80B4F8E4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 00F58 80B4F8E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00F5C 80B4F8EC 846F0018 */ lh $t7, 0x0018($v1) ## 00000018 /* 00F60 80B4F8F0 8479001A */ lh $t9, 0x001A($v1) ## 0000001A @@ -407,9 +407,9 @@ glabel func_80B4F45C /* 01050 80B4F9E0 0C2D3BD9 */ jal func_80B4EF64 /* 01054 80B4F9E4 24060011 */ addiu $a2, $zero, 0x0011 ## $a2 = 00000011 .L80B4F9E8: -/* 01058 80B4F9E8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 01058 80B4F9E8 3C028016 */ lui $v0, %hi(gGameInfo) /* 0105C 80B4F9EC 8FA3001C */ lw $v1, 0x001C($sp) -/* 01060 80B4F9F0 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 01060 80B4F9F0 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 01064 80B4F9F4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01068 80B4F9F8 846C001E */ lh $t4, 0x001E($v1) ## 0000001E /* 0106C 80B4F9FC 846E0020 */ lh $t6, 0x0020($v1) ## 00000020 @@ -462,8 +462,8 @@ glabel func_80B4F45C /* 01128 80B4FAB8 0C2D3BD9 */ jal func_80B4EF64 /* 0112C 80B4FABC 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 .L80B4FAC0: -/* 01130 80B4FAC0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01134 80B4FAC4 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 01130 80B4FAC0 3C028016 */ lui $v0, %hi(gGameInfo) +/* 01134 80B4FAC4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 01138 80B4FAC8 8FA9001C */ lw $t1, 0x001C($sp) /* 0113C 80B4FACC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01140 80B4FAD0 845914B6 */ lh $t9, 0x14B6($v0) ## 801614B6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FCCC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FCCC.s index 6c29919dd6..77d09739ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FCCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FCCC.s @@ -9,6 +9,6 @@ glabel func_80B4FCCC /* 01358 80B4FCE8 030FC021 */ addu $t8, $t8, $t7 /* 0135C 80B4FCEC 8F1817B4 */ lw $t8, 0x17B4($t8) ## 000117B4 /* 01360 80B4FCF0 0301C821 */ addu $t9, $t8, $at -/* 01364 80B4FCF4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 01364 80B4FCF4 3C018016 */ lui $at, %hi(gSegments+0x18) /* 01368 80B4FCF8 03E00008 */ jr $ra -/* 0136C 80B4FCFC AC396FC0 */ sw $t9, 0x6FC0($at) ## 80166FC0 +/* 0136C 80B4FCFC AC396FC0 */ sw $t9, %lo(gSegments+0x18)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FFF0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FFF0.s index e500655ecf..03da27eda2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FFF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FFF0.s @@ -6,8 +6,8 @@ glabel func_80B4FFF0 /* 01670 80B50000 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01674 80B50004 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 /* 01678 80B50008 15C0001B */ bne $t6, $zero, .L80B50078 -/* 0167C 80B5000C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 01680 80B50010 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 0167C 80B5000C 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 01680 80B50010 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 01684 80B50014 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 /* 01688 80B50018 44814000 */ mtc1 $at, $f8 ## $f8 = -26.00 /* 0168C 80B5001C 85F8145E */ lh $t8, 0x145E($t7) ## 8016145E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5008C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5008C.s index 56836a4ba0..5c3fa412d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5008C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5008C.s @@ -3,10 +3,10 @@ glabel func_80B5008C /* 01700 80B50090 10400011 */ beq $v0, $zero, .L80B500D8 /* 01704 80B50094 00000000 */ nop /* 01708 80B50098 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 0170C 80B5009C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0170C 80B5009C 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 01710 80B500A0 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 /* 01714 80B500A4 E4440024 */ swc1 $f4, 0x0024($v0) ## 00000024 -/* 01718 80B500A8 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 01718 80B500A8 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 0171C 80B500AC 44815000 */ mtc1 $at, $f10 ## $f10 = -26.00 /* 01720 80B500B0 C4920028 */ lwc1 $f18, 0x0028($a0) ## 00000028 /* 01724 80B500B4 85CF145E */ lh $t7, 0x145E($t6) ## 8016145E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B518C0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B518C0.s index 3d60a41f41..d07ccd721f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B518C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B518C0.s @@ -4,10 +4,10 @@ glabel func_80B518C0 /* 02F38 80B518C8 00027100 */ sll $t6, $v0, 4 /* 02F3C 80B518CC 000E7F02 */ srl $t7, $t6, 28 /* 02F40 80B518D0 000FC080 */ sll $t8, $t7, 2 -/* 02F44 80B518D4 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 02F44 80B518D4 3C198016 */ lui $t9, %hi(gSegments) /* 02F48 80B518D8 0338C821 */ addu $t9, $t9, $t8 /* 02F4C 80B518DC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 02F50 80B518E0 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 02F50 80B518E0 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 02F54 80B518E4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 02F58 80B518E8 00414024 */ and $t0, $v0, $at /* 02F5C 80B518EC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s index c14a2256d2..10a531b875 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s @@ -45,7 +45,7 @@ glabel func_80B523C8 /* 03ABC 80B5244C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 03AC0 80B52450 8FA70074 */ lw $a3, 0x0074($sp) /* 03AC4 80B52454 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03AC8 80B52458 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 03AC8 80B52458 3C048016 */ lui $a0, %hi(gSegments) /* 03ACC 80B5245C 00075100 */ sll $t2, $a3, 4 /* 03AD0 80B52460 000A5F02 */ srl $t3, $t2, 28 /* 03AD4 80B52464 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 @@ -53,7 +53,7 @@ glabel func_80B523C8 /* 03ADC 80B5246C AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 03AE0 80B52470 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 03AE4 80B52474 000B6080 */ sll $t4, $t3, 2 -/* 03AE8 80B52478 24846FA8 */ addiu $a0, $a0, 0x6FA8 ## $a0 = 80166FA8 +/* 03AE8 80B52478 24846FA8 */ addiu $a0, %lo(gSegments) /* 03AEC 80B5247C 008C6821 */ addu $t5, $a0, $t4 /* 03AF0 80B52480 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 03AF4 80B52484 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000 @@ -99,7 +99,7 @@ glabel func_80B523C8 /* 03B94 80B52524 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 03B98 80B52528 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03B9C 80B5252C 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 -/* 03BA0 80B52530 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 +/* 03BA0 80B52530 3C0B8011 */ lui $t3, %hi(D_80116280+0x10) /* 03BA4 80B52534 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 03BA8 80B52538 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 03BAC 80B5253C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 @@ -109,7 +109,7 @@ glabel func_80B523C8 /* 03BBC 80B5254C 354A002C */ ori $t2, $t2, 0x002C ## $t2 = DB06002C /* 03BC0 80B52550 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 03BC4 80B52554 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 03BC8 80B52558 256B6290 */ addiu $t3, $t3, 0x6290 ## $t3 = 80116290 +/* 03BC8 80B52558 256B6290 */ addiu $t3, %lo(D_80116280+0x10) /* 03BCC 80B5255C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 03BD0 80B52560 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 03BD4 80B52564 2622014C */ addiu $v0, $s1, 0x014C ## $v0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s index e3cdee0777..427588f708 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s @@ -39,7 +39,7 @@ glabel func_80B525D4 /* 03CB0 80B52640 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 /* 03CB4 80B52644 8FA90078 */ lw $t1, 0x0078($sp) /* 03CB8 80B52648 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03CBC 80B5264C 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 +/* 03CBC 80B5264C 3C078016 */ lui $a3, %hi(gSegments) /* 03CC0 80B52650 00097100 */ sll $t6, $t1, 4 /* 03CC4 80B52654 000E7F02 */ srl $t7, $t6, 28 /* 03CC8 80B52658 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -47,7 +47,7 @@ glabel func_80B525D4 /* 03CD0 80B52660 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 03CD4 80B52664 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 /* 03CD8 80B52668 000FC080 */ sll $t8, $t7, 2 -/* 03CDC 80B5266C 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 +/* 03CDC 80B5266C 24E76FA8 */ addiu $a3, %lo(gSegments) /* 03CE0 80B52670 00F82021 */ addu $a0, $a3, $t8 /* 03CE4 80B52674 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 03CE8 80B52678 8C990000 */ lw $t9, 0x0000($a0) ## 00000000 @@ -86,14 +86,14 @@ glabel func_80B525D4 /* 03D6C 80B526FC 03265021 */ addu $t2, $t9, $a2 /* 03D70 80B52700 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 03D74 80B52704 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03D78 80B52708 3C198011 */ lui $t9, 0x8011 ## $t9 = 80110000 +/* 03D78 80B52708 3C198011 */ lui $t9, %hi(D_80116280) /* 03D7C 80B5270C 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 03D80 80B52710 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 03D84 80B52714 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 03D88 80B52718 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 03D8C 80B5271C 8E2D01A8 */ lw $t5, 0x01A8($s1) ## 000001A8 /* 03D90 80B52720 3718002C */ ori $t8, $t8, 0x002C ## $t8 = DB06002C -/* 03D94 80B52724 27396280 */ addiu $t9, $t9, 0x6280 ## $t9 = 80116280 +/* 03D94 80B52724 27396280 */ addiu $t9, %lo(D_80116280) /* 03D98 80B52728 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000024 /* 03D9C 80B5272C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 03DA0 80B52730 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s index 477366d7cf..4cbe7ab9b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s @@ -19,8 +19,8 @@ glabel EnZl3_Init /* 06B08 80B59EB8 2484A994 */ addiu $a0, $a0, %lo(D_80B5A994) ## $a0 = 80B5A994 /* 06B0C 80B59EBC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 06B10 80B59EC0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 06B14 80B59EC4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 06B10 80B59EC0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 06B14 80B59EC4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 06B18 80B59EC8 AFA40034 */ sw $a0, 0x0034($sp) /* 06B1C 80B59ECC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 06B20 80B59ED0 0C00AC78 */ jal ActorShape_Init @@ -53,9 +53,9 @@ glabel EnZl3_Init /* 06B88 80B59F38 10000006 */ beq $zero, $zero, .L80B59F54 /* 06B8C 80B59F3C 00000000 */ nop .L80B59F40: -/* 06B90 80B59F40 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 06B90 80B59F40 3C018016 */ lui $at, %hi(gSaveContext+0x13d2) /* 06B94 80B59F44 10000003 */ beq $zero, $zero, .L80B59F54 -/* 06B98 80B59F48 A420FA32 */ sh $zero, -0x05CE($at) ## 8015FA32 +/* 06B98 80B59F48 A420FA32 */ sh $zero, %lo(gSaveContext+0x13d2)($at) .L80B59F4C: /* 06B9C 80B59F4C 0C2D66A0 */ jal func_80B59A80 /* 06BA0 80B59F50 8FA5004C */ lw $a1, 0x004C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53764.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53764.s index a81f616acf..d180e5e230 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53764.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53764.s @@ -3,8 +3,8 @@ glabel func_80B53764 /* 003B8 80B53768 AFBF0014 */ sw $ra, 0x0014($sp) /* 003BC 80B5376C AFA5001C */ sw $a1, 0x001C($sp) /* 003C0 80B53770 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 003C4 80B53774 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 003C8 80B53778 2463FA90 */ addiu $v1, $v1, 0xFA90 ## $v1 = 8015FA90 +/* 003C4 80B53774 3C038016 */ lui $v1, %hi(gGameInfo) +/* 003C8 80B53778 2463FA90 */ addiu $v1, %lo(gGameInfo) /* 003CC 80B5377C 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 /* 003D0 80B53780 3C014180 */ lui $at, 0x4180 ## $at = 41800000 /* 003D4 80B53784 44814000 */ mtc1 $at, $f8 ## $f8 = 16.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s index ed71bffba2..ba4db9aea6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s @@ -121,8 +121,8 @@ glabel func_80B5458C /* 012FC 80B546AC 0C2D4ED9 */ jal func_80B53B64 /* 01300 80B546B0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 .L80B546B4: -/* 01304 80B546B4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01308 80B546B8 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 01304 80B546B4 3C028016 */ lui $v0, %hi(gGameInfo) +/* 01308 80B546B8 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0130C 80B546BC 8FA300A4 */ lw $v1, 0x00A4($sp) /* 01310 80B546C0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01314 80B546C4 844F1492 */ lh $t7, 0x1492($v0) ## 80161492 @@ -170,9 +170,9 @@ glabel func_80B5458C /* 013BC 80B5476C 0C2D4E60 */ jal func_80B53980 /* 013C0 80B54770 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 .L80B54774: -/* 013C4 80B54774 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 013C4 80B54774 3C028016 */ lui $v0, %hi(gGameInfo) /* 013C8 80B54778 8FA30020 */ lw $v1, 0x0020($sp) -/* 013CC 80B5477C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 013CC 80B5477C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 013D0 80B54780 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 013D4 80B54784 846E0006 */ lh $t6, 0x0006($v1) ## 00000006 /* 013D8 80B54788 84780008 */ lh $t8, 0x0008($v1) ## 00000008 @@ -218,9 +218,9 @@ glabel func_80B5458C /* 01478 80B54828 0C2D50D8 */ jal func_80B54360 /* 0147C 80B5482C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 .L80B54830: -/* 01480 80B54830 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 01480 80B54830 3C028016 */ lui $v0, %hi(gGameInfo) /* 01484 80B54834 8FA30020 */ lw $v1, 0x0020($sp) -/* 01488 80B54838 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 01488 80B54838 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0148C 80B5483C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01490 80B54840 846C000C */ lh $t4, 0x000C($v1) ## 0000000C /* 01494 80B54844 846E000E */ lh $t6, 0x000E($v1) ## 0000000E @@ -286,9 +286,9 @@ glabel func_80B5458C /* 01584 80B54934 0C2D4ED9 */ jal func_80B53B64 /* 01588 80B54938 2406000B */ addiu $a2, $zero, 0x000B ## $a2 = 0000000B .L80B5493C: -/* 0158C 80B5493C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 0158C 80B5493C 3C028016 */ lui $v0, %hi(gGameInfo) /* 01590 80B54940 8FA30020 */ lw $v1, 0x0020($sp) -/* 01594 80B54944 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 01594 80B54944 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 01598 80B54948 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0159C 80B5494C 846A0012 */ lh $t2, 0x0012($v1) ## 00000012 /* 015A0 80B54950 846C0014 */ lh $t4, 0x0014($v1) ## 00000014 @@ -342,9 +342,9 @@ glabel func_80B5458C /* 01660 80B54A10 0C2D4ED9 */ jal func_80B53B64 /* 01664 80B54A14 2406000E */ addiu $a2, $zero, 0x000E ## $a2 = 0000000E .L80B54A18: -/* 01668 80B54A18 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 01668 80B54A18 3C028016 */ lui $v0, %hi(gGameInfo) /* 0166C 80B54A1C 8FA30020 */ lw $v1, 0x0020($sp) -/* 01670 80B54A20 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 01670 80B54A20 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 01674 80B54A24 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01678 80B54A28 84780018 */ lh $t8, 0x0018($v1) ## 00000018 /* 0167C 80B54A2C 846A001A */ lh $t2, 0x001A($v1) ## 0000001A @@ -410,9 +410,9 @@ glabel func_80B5458C /* 0176C 80B54B1C 0C2D4ED9 */ jal func_80B53B64 /* 01770 80B54B20 24060011 */ addiu $a2, $zero, 0x0011 ## $a2 = 00000011 .L80B54B24: -/* 01774 80B54B24 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 01774 80B54B24 3C028016 */ lui $v0, %hi(gGameInfo) /* 01778 80B54B28 8FA30020 */ lw $v1, 0x0020($sp) -/* 0177C 80B54B2C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0177C 80B54B2C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 01780 80B54B30 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01784 80B54B34 846E001E */ lh $t6, 0x001E($v1) ## 0000001E /* 01788 80B54B38 84780020 */ lh $t8, 0x0020($v1) ## 00000020 @@ -465,8 +465,8 @@ glabel func_80B5458C /* 01844 80B54BF4 0C2D4ED9 */ jal func_80B53B64 /* 01848 80B54BF8 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 .L80B54BFC: -/* 0184C 80B54BFC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01850 80B54C00 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0184C 80B54BFC 3C028016 */ lui $v0, %hi(gGameInfo) +/* 01850 80B54C00 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 01854 80B54C04 8FAC0020 */ lw $t4, 0x0020($sp) /* 01858 80B54C08 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0185C 80B54C0C 844B14B6 */ lh $t3, 0x14B6($v0) ## 801614B6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DE0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DE0.s index d15c14aa63..66a07e630e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DE0.s @@ -9,6 +9,6 @@ glabel func_80B54DE0 /* 01A4C 80B54DFC 030FC021 */ addu $t8, $t8, $t7 /* 01A50 80B54E00 8F1817B4 */ lw $t8, 0x17B4($t8) ## 000117B4 /* 01A54 80B54E04 0301C821 */ addu $t9, $t8, $at -/* 01A58 80B54E08 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 01A58 80B54E08 3C018016 */ lui $at, %hi(gSegments+0x18) /* 01A5C 80B54E0C 03E00008 */ jr $ra -/* 01A60 80B54E10 AC396FC0 */ sw $t9, 0x6FC0($at) ## 80166FC0 +/* 01A60 80B54E10 AC396FC0 */ sw $t9, %lo(gSegments+0x18)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54F18.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54F18.s index a6431487a2..af35578cda 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54F18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54F18.s @@ -6,8 +6,8 @@ glabel func_80B54F18 /* 01B78 80B54F28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01B7C 80B54F2C 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 /* 01B80 80B54F30 15C0001B */ bne $t6, $zero, .L80B54FA0 -/* 01B84 80B54F34 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 01B88 80B54F38 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 01B84 80B54F34 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 01B88 80B54F38 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 01B8C 80B54F3C 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 /* 01B90 80B54F40 44814000 */ mtc1 $at, $f8 ## $f8 = -26.00 /* 01B94 80B54F44 85F8145E */ lh $t8, 0x145E($t7) ## 8016145E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B550F0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B550F0.s index 209112ce61..b85d85f883 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B550F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B550F0.s @@ -3,10 +3,10 @@ glabel func_80B550F0 /* 01D44 80B550F4 10400011 */ beq $v0, $zero, .L80B5513C /* 01D48 80B550F8 00000000 */ nop /* 01D4C 80B550FC C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 01D50 80B55100 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 01D50 80B55100 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 01D54 80B55104 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 /* 01D58 80B55108 E4440024 */ swc1 $f4, 0x0024($v0) ## 00000024 -/* 01D5C 80B5510C 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 01D5C 80B5510C 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 01D60 80B55110 44815000 */ mtc1 $at, $f10 ## $f10 = -26.00 /* 01D64 80B55114 C4920028 */ lwc1 $f18, 0x0028($a0) ## 00000028 /* 01D68 80B55118 85CF145E */ lh $t7, 0x145E($t6) ## 8016145E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56FAC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56FAC.s index 773e5457d4..baec7de095 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56FAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56FAC.s @@ -11,12 +11,12 @@ glabel func_80B56FAC /* 03C20 80B56FD0 8FA60018 */ lw $a2, 0x0018($sp) /* 03C24 80B56FD4 8CC30004 */ lw $v1, 0x0004($a2) ## 00000004 /* 03C28 80B56FD8 8FAA0024 */ lw $t2, 0x0024($sp) -/* 03C2C 80B56FDC 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 03C2C 80B56FDC 3C198016 */ lui $t9, %hi(gSegments) /* 03C30 80B56FE0 00037100 */ sll $t6, $v1, 4 /* 03C34 80B56FE4 000E7F02 */ srl $t7, $t6, 28 /* 03C38 80B56FE8 000FC080 */ sll $t8, $t7, 2 /* 03C3C 80B56FEC 0338C821 */ addu $t9, $t9, $t8 -/* 03C40 80B56FF0 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 03C40 80B56FF0 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 03C44 80B56FF4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 03C48 80B56FF8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 03C4C 80B56FFC 000A5880 */ sll $t3, $t2, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57754.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57754.s index d3ed5a3f03..a8910270cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57754.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57754.s @@ -1,6 +1,6 @@ glabel func_80B57754 -/* 043A4 80B57754 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 043A8 80B57758 85CEFA50 */ lh $t6, -0x05B0($t6) ## 8015FA50 +/* 043A4 80B57754 3C0E8016 */ lui $t6, %hi(gSaveContext+0x13f0) +/* 043A8 80B57758 85CEFA50 */ lh $t6, %lo(gSaveContext+0x13f0)($t6) /* 043AC 80B5775C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 043B0 80B57760 AFBF002C */ sw $ra, 0x002C($sp) /* 043B4 80B57764 15C00011 */ bne $t6, $zero, .L80B577AC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AE0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AE0.s index b4b6ff547f..97e0d89a7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AE0.s @@ -73,8 +73,8 @@ glabel func_80B57AE0 /* 0483C 80B57BEC C4720008 */ lwc1 $f18, 0x0008($v1) ## 00000008 /* 04840 80B57BF0 C6240008 */ lwc1 $f4, 0x0008($s1) ## 00000350 /* 04844 80B57BF4 46105081 */ sub.s $f2, $f10, $f16 -/* 04848 80B57BF8 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 0484C 80B57BFC 8D8CFA90 */ lw $t4, -0x0570($t4) ## 8015FA90 +/* 04848 80B57BF8 3C0C8016 */ lui $t4, %hi(gGameInfo) +/* 0484C 80B57BFC 8D8CFA90 */ lw $t4, %lo(gGameInfo)($t4) /* 04850 80B57C00 46049301 */ sub.s $f12, $f18, $f4 /* 04854 80B57C04 46021182 */ mul.s $f6, $f2, $f2 /* 04858 80B57C08 858D1460 */ lh $t5, 0x1460($t4) ## 80161460 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D80.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D80.s index 569d61f1d0..201d896ed4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D80.s @@ -30,8 +30,8 @@ glabel func_80B57D80 /* 04A38 80B57DE8 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C /* 04A3C 80B57DEC 8FA50024 */ lw $a1, 0x0024($sp) /* 04A40 80B57DF0 46120102 */ mul.s $f4, $f0, $f18 -/* 04A44 80B57DF4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 04A48 80B57DF8 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 04A44 80B57DF4 3C028016 */ lui $v0, %hi(gGameInfo) +/* 04A48 80B57DF8 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 04A4C 80B57DFC 3C014180 */ lui $at, 0x4180 ## $at = 41800000 /* 04A50 80B57E00 44819000 */ mtc1 $at, $f18 ## $f18 = 16.00 /* 04A54 80B57E04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B582C8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B582C8.s index a1a88f23f4..beb388dd99 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B582C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B582C8.s @@ -1,6 +1,6 @@ glabel func_80B582C8 -/* 04F18 80B582C8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 04F1C 80B582CC 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 04F18 80B582C8 3C038016 */ lui $v1, %hi(gGameInfo) +/* 04F1C 80B582CC 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) /* 04F20 80B582D0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 04F24 80B582D4 AFBF001C */ sw $ra, 0x001C($sp) /* 04F28 80B582D8 AFA50034 */ sw $a1, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58624.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58624.s index fdeba8bdca..893064563b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58624.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58624.s @@ -1,7 +1,7 @@ glabel func_80B58624 /* 05274 80B58624 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 05278 80B58628 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0527C 80B5862C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 05278 80B58628 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0527C 80B5862C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 05280 80B58630 AFBF0024 */ sw $ra, 0x0024($sp) /* 05284 80B58634 AFB10020 */ sw $s1, 0x0020($sp) /* 05288 80B58638 AFB0001C */ sw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58AAC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58AAC.s index 52d477a837..f481ececc0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58AAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58AAC.s @@ -4,12 +4,12 @@ glabel func_80B58AAC /* 05704 80B58AB4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 05708 80B58AB8 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 /* 0570C 80B58ABC C48402EC */ lwc1 $f4, 0x02EC($a0) ## 000002EC -/* 05710 80B58AC0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 05710 80B58AC0 3C028016 */ lui $v0, %hi(gGameInfo) /* 05714 80B58AC4 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 /* 05718 80B58AC8 46062200 */ add.s $f8, $f4, $f6 /* 0571C 80B58ACC 44812000 */ mtc1 $at, $f4 ## $f4 = 24.00 /* 05720 80B58AD0 E48802EC */ swc1 $f8, 0x02EC($a0) ## 000002EC -/* 05724 80B58AD4 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 05724 80B58AD4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 05728 80B58AD8 C48A02EC */ lwc1 $f10, 0x02EC($a0) ## 000002EC /* 0572C 80B58ADC 844E1462 */ lh $t6, 0x1462($v0) ## 80161462 /* 05730 80B58AE0 448E8000 */ mtc1 $t6, $f16 ## $f16 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58C08.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58C08.s index 7786b05618..7024e3cd5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58C08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58C08.s @@ -4,11 +4,11 @@ glabel func_80B58C08 /* 05860 80B58C10 AFB00020 */ sw $s0, 0x0020($sp) /* 05864 80B58C14 AFA5004C */ sw $a1, 0x004C($sp) /* 05868 80B58C18 948E0344 */ lhu $t6, 0x0344($a0) ## 00000344 -/* 0586C 80B58C1C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0586C 80B58C1C 3C188016 */ lui $t8, %hi(gGameInfo) /* 05870 80B58C20 94890346 */ lhu $t1, 0x0346($a0) ## 00000346 /* 05874 80B58C24 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 /* 05878 80B58C28 A48F0344 */ sh $t7, 0x0344($a0) ## 00000344 -/* 0587C 80B58C2C 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 0587C 80B58C2C 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 05880 80B58C30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 05884 80B58C34 31E8FFFF */ andi $t0, $t7, 0xFFFF ## $t0 = 00000001 /* 05888 80B58C38 8719146A */ lh $t9, 0x146A($t8) ## 8016146A @@ -31,7 +31,7 @@ glabel func_80B58C08 /* 058CC 80B58C7C 8FA9002C */ lw $t1, 0x002C($sp) /* 058D0 80B58C80 46022181 */ sub.s $f6, $f4, $f2 /* 058D4 80B58C84 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 058D8 80B58C88 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 058D8 80B58C88 3C0F8016 */ lui $t7, %hi(gGameInfo) /* 058DC 80B58C8C 46060202 */ mul.s $f8, $f0, $f6 /* 058E0 80B58C90 46081280 */ add.s $f10, $f2, $f8 /* 058E4 80B58C94 E48A0000 */ swc1 $f10, 0x0000($a0) ## 00000024 @@ -53,7 +53,7 @@ glabel func_80B58C08 /* 05924 80B58CD4 010C6823 */ subu $t5, $t0, $t4 /* 05928 80B58CD8 05A20014 */ bltzl $t5, .L80B58D2C /* 0592C 80B58CDC 01286823 */ subu $t5, $t1, $t0 -/* 05930 80B58CE0 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 05930 80B58CE0 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 05934 80B58CE4 01287023 */ subu $t6, $t1, $t0 /* 05938 80B58CE8 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 /* 0593C 80B58CEC 85F8146A */ lh $t8, 0x146A($t7) ## 8016146A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59698.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59698.s index 3df6c72501..608f71b669 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59698.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59698.s @@ -38,8 +38,8 @@ glabel func_80B59698 /* 06370 80B59720 1441000C */ bne $v0, $at, .L80B59754 /* 06374 80B59724 93AF001B */ lbu $t7, 0x001B($sp) /* 06378 80B59728 15E0000A */ bne $t7, $zero, .L80B59754 -/* 0637C 80B5972C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 06380 80B59730 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0637C 80B5972C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 06380 80B59730 2442E660 */ addiu $v0, %lo(gSaveContext) /* 06384 80B59734 845813D4 */ lh $t8, 0x13D4($v0) ## 8015FA34 /* 06388 80B59738 1B000004 */ blez $t8, .L80B5974C /* 0638C 80B5973C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59768.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59768.s index a2d35b31c9..74829dc8bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59768.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59768.s @@ -38,8 +38,8 @@ glabel func_80B59768 /* 06440 80B597F0 14410008 */ bne $v0, $at, .L80B59814 /* 06444 80B597F4 93AF001B */ lbu $t7, 0x001B($sp) /* 06448 80B597F8 15E00006 */ bne $t7, $zero, .L80B59814 -/* 0644C 80B597FC 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 06450 80B59800 8718FA34 */ lh $t8, -0x05CC($t8) ## 8015FA34 +/* 0644C 80B597FC 3C188016 */ lui $t8, %hi(gSaveContext+0x13d4) +/* 06450 80B59800 8718FA34 */ lh $t8, %lo(gSaveContext+0x13d4)($t8) /* 06454 80B59804 5F000004 */ bgtzl $t8, .L80B59818 /* 06458 80B59808 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0645C 80B5980C 10000002 */ beq $zero, $zero, .L80B59818 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s index 602b35aaae..361145987d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s @@ -63,8 +63,8 @@ glabel func_80B59828 /* 06548 80B598F8 0C2D4D1A */ jal func_80B53468 /* 0654C 80B598FC 00000000 */ nop /* 06550 80B59900 240A0140 */ addiu $t2, $zero, 0x0140 ## $t2 = 00000140 -/* 06554 80B59904 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 06558 80B59908 A42AFA84 */ sh $t2, -0x057C($at) ## 8015FA84 +/* 06554 80B59904 3C018016 */ lui $at, %hi(gSaveContext+0x1424) +/* 06558 80B59908 A42AFA84 */ sh $t2, %lo(gSaveContext+0x1424)($at) /* 0655C 80B5990C 0C021DA0 */ jal func_80087680 /* 06560 80B59910 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06564 80B59914 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59A80.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59A80.s index 0c3279b5ab..6d071e3d13 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59A80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59A80.s @@ -4,12 +4,12 @@ glabel func_80B59A80 /* 066D8 80B59A88 0C2D65DA */ jal func_80B59768 /* 066DC 80B59A8C 00000000 */ nop /* 066E0 80B59A90 1040000B */ beq $v0, $zero, .L80B59AC0 -/* 066E4 80B59A94 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 066E8 80B59A98 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 066EC 80B59A9C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 066F0 80B59AA0 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 066F4 80B59AA4 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 066F8 80B59AA8 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 066E4 80B59A94 3C078013 */ lui $a3, %hi(D_801333E0) +/* 066E8 80B59A98 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 066EC 80B59A9C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 066F0 80B59AA0 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 066F4 80B59AA4 3C058013 */ lui $a1, %hi(D_801333D4) +/* 066F8 80B59AA8 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 066FC 80B59AAC AFAE0014 */ sw $t6, 0x0014($sp) /* 06700 80B59AB0 AFA70010 */ sw $a3, 0x0010($sp) /* 06704 80B59AB4 24045806 */ addiu $a0, $zero, 0x5806 ## $a0 = 00005806 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s index 68eca4acca..d8dcd01fe2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s @@ -17,8 +17,8 @@ glabel func_80B59AD0 /* 06758 80B59B08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0675C 80B59B0C 0C2D4D85 */ jal func_80B53614 /* 06760 80B59B10 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 06764 80B59B14 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 06768 80B59B18 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 06764 80B59B14 3C028016 */ lui $v0, %hi(gSaveContext) +/* 06768 80B59B18 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0676C 80B59B1C 944E0EEC */ lhu $t6, 0x0EEC($v0) ## 8015F54C /* 06770 80B59B20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06774 80B59B24 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 @@ -26,8 +26,8 @@ glabel func_80B59AD0 /* 0677C 80B59B2C 0C2D5BC4 */ jal func_80B56F10 /* 06780 80B59B30 A44F0EEC */ sh $t7, 0x0EEC($v0) ## 8015F54C /* 06784 80B59B34 24180140 */ addiu $t8, $zero, 0x0140 ## $t8 = 00000140 -/* 06788 80B59B38 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 0678C 80B59B3C A438FA84 */ sh $t8, -0x057C($at) ## 8015FA84 +/* 06788 80B59B38 3C018016 */ lui $at, %hi(gSaveContext+0x1424) +/* 0678C 80B59B3C A438FA84 */ sh $t8, %lo(gSaveContext+0x1424)($at) /* 06790 80B59B40 0C021DA0 */ jal func_80087680 /* 06794 80B59B44 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 06798 80B59B48 2419001B */ addiu $t9, $zero, 0x001B ## $t9 = 0000001B diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59B6C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59B6C.s index c1e828e91a..f2e5fe45fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59B6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59B6C.s @@ -17,9 +17,9 @@ glabel func_80B59B6C /* 067E0 80B59B90 3C030601 */ lui $v1, 0x0601 ## $v1 = 06010000 /* 067E4 80B59B94 246391D8 */ addiu $v1, $v1, 0x91D8 ## $v1 = 060091D8 /* 067E8 80B59B98 00037100 */ sll $t6, $v1, 4 -/* 067EC 80B59B9C 3C118016 */ lui $s1, 0x8016 ## $s1 = 80160000 +/* 067EC 80B59B9C 3C118016 */ lui $s1, %hi(gSegments) /* 067F0 80B59BA0 000E7F02 */ srl $t7, $t6, 28 -/* 067F4 80B59BA4 26316FA8 */ addiu $s1, $s1, 0x6FA8 ## $s1 = 80166FA8 +/* 067F4 80B59BA4 26316FA8 */ addiu $s1, %lo(gSegments) /* 067F8 80B59BA8 000FC080 */ sll $t8, $t7, 2 /* 067FC 80B59BAC 0238C821 */ addu $t9, $s1, $t8 /* 06800 80B59BB0 8F280000 */ lw $t0, 0x0000($t9) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s index 75a9aa6fa6..60e1a34411 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s @@ -38,7 +38,7 @@ glabel func_80B59FF4 /* 06CAC 80B5A05C 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 /* 06CB0 80B5A060 8FA90078 */ lw $t1, 0x0078($sp) /* 06CB4 80B5A064 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 06CB8 80B5A068 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 +/* 06CB8 80B5A068 3C078016 */ lui $a3, %hi(gSegments) /* 06CBC 80B5A06C 0009C100 */ sll $t8, $t1, 4 /* 06CC0 80B5A070 00187702 */ srl $t6, $t8, 28 /* 06CC4 80B5A074 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -46,7 +46,7 @@ glabel func_80B59FF4 /* 06CCC 80B5A07C AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 /* 06CD0 80B5A080 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 06CD4 80B5A084 000EC880 */ sll $t9, $t6, 2 -/* 06CD8 80B5A088 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 +/* 06CD8 80B5A088 24E76FA8 */ addiu $a3, %lo(gSegments) /* 06CDC 80B5A08C 00F92021 */ addu $a0, $a3, $t9 /* 06CE0 80B5A090 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 06CE4 80B5A094 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 @@ -86,7 +86,7 @@ glabel func_80B59FF4 /* 06D6C 80B5A11C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 06D70 80B5A120 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 06D74 80B5A124 3C0DFB00 */ lui $t5, 0xFB00 ## $t5 = FB000000 -/* 06D78 80B5A128 3C198011 */ lui $t9, 0x8011 ## $t9 = 80110000 +/* 06D78 80B5A128 3C198011 */ lui $t9, %hi(D_80116280+0x10) /* 06D7C 80B5A12C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 06D80 80B5A130 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 06D84 80B5A134 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 @@ -96,7 +96,7 @@ glabel func_80B59FF4 /* 06D94 80B5A144 35CE002C */ ori $t6, $t6, 0x002C ## $t6 = DB06002C /* 06D98 80B5A148 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 06D9C 80B5A14C AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 06DA0 80B5A150 27396290 */ addiu $t9, $t9, 0x6290 ## $t9 = 80116290 +/* 06DA0 80B5A150 27396290 */ addiu $t9, %lo(D_80116280+0x10) /* 06DA4 80B5A154 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 06DA8 80B5A158 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 06DAC 80B5A15C 8FA30088 */ lw $v1, 0x0088($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s index 1b9fbbede9..585907bf2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s @@ -39,7 +39,7 @@ glabel func_80B5A1D0 /* 06E8C 80B5A23C 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 /* 06E90 80B5A240 8FA90078 */ lw $t1, 0x0078($sp) /* 06E94 80B5A244 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 06E98 80B5A248 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 +/* 06E98 80B5A248 3C078016 */ lui $a3, %hi(gSegments) /* 06E9C 80B5A24C 00097100 */ sll $t6, $t1, 4 /* 06EA0 80B5A250 000E7F02 */ srl $t7, $t6, 28 /* 06EA4 80B5A254 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -47,7 +47,7 @@ glabel func_80B5A1D0 /* 06EAC 80B5A25C AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 06EB0 80B5A260 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 /* 06EB4 80B5A264 000FC080 */ sll $t8, $t7, 2 -/* 06EB8 80B5A268 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 +/* 06EB8 80B5A268 24E76FA8 */ addiu $a3, %lo(gSegments) /* 06EBC 80B5A26C 00F82021 */ addu $a0, $a3, $t8 /* 06EC0 80B5A270 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 06EC4 80B5A274 8C990000 */ lw $t9, 0x0000($a0) ## 00000000 @@ -86,14 +86,14 @@ glabel func_80B5A1D0 /* 06F48 80B5A2F8 03265021 */ addu $t2, $t9, $a2 /* 06F4C 80B5A2FC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 06F50 80B5A300 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 06F54 80B5A304 3C198011 */ lui $t9, 0x8011 ## $t9 = 80110000 +/* 06F54 80B5A304 3C198011 */ lui $t9, %hi(D_80116280) /* 06F58 80B5A308 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 06F5C 80B5A30C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 06F60 80B5A310 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 06F64 80B5A314 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 06F68 80B5A318 8E2D0258 */ lw $t5, 0x0258($s1) ## 00000258 /* 06F6C 80B5A31C 3718002C */ ori $t8, $t8, 0x002C ## $t8 = DB06002C -/* 06F70 80B5A320 27396280 */ addiu $t9, $t9, 0x6280 ## $t9 = 80116280 +/* 06F70 80B5A320 27396280 */ addiu $t9, %lo(D_80116280) /* 06F74 80B5A324 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000024 /* 06F78 80B5A328 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 06F7C 80B5A32C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s index 2b911d5075..95593339a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s @@ -55,12 +55,12 @@ glabel EnZl4_Draw /* 02E48 80B5E5F8 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 02E4C 80B5E5FC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02E50 80B5E600 27A90058 */ addiu $t1, $sp, 0x0058 ## $t1 = FFFFFFD0 -/* 02E54 80B5E604 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 02E54 80B5E604 3C068016 */ lui $a2, %hi(gSegments) /* 02E58 80B5E608 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 02E5C 80B5E60C AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 02E60 80B5E610 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 02E64 80B5E614 9219020B */ lbu $t9, 0x020B($s0) ## 0000020B -/* 02E68 80B5E618 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 02E68 80B5E618 24C66FA8 */ addiu $a2, %lo(gSegments) /* 02E6C 80B5E61C 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 /* 02E70 80B5E620 00195080 */ sll $t2, $t9, 2 /* 02E74 80B5E624 012A5821 */ addu $t3, $t1, $t2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s index 3844116ad3..68894c05aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s @@ -18,8 +18,8 @@ glabel EnZl4_Init /* 0063C 80B5BDEC AFAE0010 */ sw $t6, 0x0010($sp) /* 00640 80B5BDF0 0C0291BE */ jal SkelAnime_InitSV /* 00644 80B5BDF4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00648 80B5BDF8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0064C 80B5BDFC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 00648 80B5BDF8 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) +/* 0064C 80B5BDFC 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 00650 80B5BE00 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00654 80B5BE04 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00658 80B5BE08 0C00AC78 */ jal ActorShape_Init @@ -52,10 +52,10 @@ glabel EnZl4_Init /* 006B8 80B5BE68 0C00B58B */ jal Actor_SetScale /* 006BC 80B5BE6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006C0 80B5BE70 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 006C0 80B5BE70 3C028016 */ lui $v0, %hi(gSaveContext) /* 006C4 80B5BE74 24190006 */ addiu $t9, $zero, 0x0006 ## $t9 = 00000006 /* 006C8 80B5BE78 3408FFFF */ ori $t0, $zero, 0xFFFF ## $t0 = 0000FFFF -/* 006CC 80B5BE7C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 006CC 80B5BE7C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 006D0 80B5BE80 A219001F */ sb $t9, 0x001F($s0) ## 0000001F /* 006D4 80B5BE84 A608010E */ sh $t0, 0x010E($s0) ## 0000010E /* 006D8 80B5BE88 A200020E */ sb $zero, 0x020E($s0) ## 0000020E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B90C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B90C.s index 781b7d2fa4..90dacacdae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B90C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B90C.s @@ -9,10 +9,10 @@ glabel func_80B5B90C /* 00178 80B5B928 1000001D */ beq $zero, $zero, .L80B5B9A0 /* 0017C 80B5B92C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L80B5B930: -/* 00180 80B5B930 3C048012 */ lui $a0, 0x8012 ## $a0 = 80120000 -/* 00184 80B5B934 24847120 */ addiu $a0, $a0, 0x7120 ## $a0 = 80127120 -/* 00188 80B5B938 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0018C 80B5B93C 8C63E704 */ lw $v1, -0x18FC($v1) ## 8015E704 +/* 00180 80B5B930 3C048012 */ lui $a0, %hi(gBitFlags) +/* 00184 80B5B934 24847120 */ addiu $a0, %lo(gBitFlags) +/* 00188 80B5B938 3C038016 */ lui $v1, %hi(gSaveContext+0xa4) +/* 0018C 80B5B93C 8C63E704 */ lw $v1, %lo(gSaveContext+0xa4)($v1) /* 00190 80B5B940 8C8E0048 */ lw $t6, 0x0048($a0) ## 80127168 /* 00194 80B5B944 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00198 80B5B948 01C37824 */ and $t7, $t6, $v1 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C160.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C160.s index c236079089..8da9aea39b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C160.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C160.s @@ -86,7 +86,7 @@ glabel L80B5C254 /* 00AB8 80B5C268 0C041AF2 */ jal func_80106BC8 /* 00ABC 80B5C26C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00AC0 80B5C270 1040001D */ beq $v0, $zero, .L80B5C2E8 -/* 00AC4 80B5C274 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 00AC4 80B5C274 3C0C8016 */ lui $t4, %hi(gSegments) /* 00AC8 80B5C278 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 /* 00ACC 80B5C27C 24423994 */ addiu $v0, $v0, 0x3994 ## $v0 = 02003994 /* 00AD0 80B5C280 00024900 */ sll $t1, $v0, 4 @@ -94,16 +94,16 @@ glabel L80B5C254 /* 00AD8 80B5C288 000A5880 */ sll $t3, $t2, 2 /* 00ADC 80B5C28C 018B6021 */ addu $t4, $t4, $t3 /* 00AE0 80B5C290 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00AE4 80B5C294 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 00AE4 80B5C294 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 00AE8 80B5C298 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00AEC 80B5C29C 00416824 */ and $t5, $v0, $at /* 00AF0 80B5C2A0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00AF4 80B5C2A4 018D7021 */ addu $t6, $t4, $t5 /* 00AF8 80B5C2A8 01C17821 */ addu $t7, $t6, $at /* 00AFC 80B5C2AC AE2F1D68 */ sw $t7, 0x1D68($s1) ## 00001D68 -/* 00B00 80B5C2B0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 00B00 80B5C2B0 3C018016 */ lui $at, %hi(gSaveContext+0x1414) /* 00B04 80B5C2B4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00B08 80B5C2B8 A038FA74 */ sb $t8, -0x058C($at) ## 8015FA74 +/* 00B08 80B5C2B8 A038FA74 */ sb $t8, %lo(gSaveContext+0x1414)($at) /* 00B0C 80B5C2BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00B10 80B5C2C0 0C2D6E22 */ jal func_80B5B888 /* 00B14 80B5C2C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C984.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C984.s index fecdf53811..70d6c0fd73 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C984.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C984.s @@ -405,8 +405,8 @@ glabel L80B5CED4 /* 01758 80B5CF08 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0175C 80B5CF0C 00310821 */ addu $at, $at, $s1 /* 01760 80B5CF10 A42D1E1A */ sh $t5, 0x1E1A($at) ## 00011E1A -/* 01764 80B5CF14 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 01768 80B5CF18 A42EFA72 */ sh $t6, -0x058E($at) ## 8015FA72 +/* 01764 80B5CF14 3C018016 */ lui $at, %hi(gSaveContext+0x1412) +/* 01768 80B5CF18 A42EFA72 */ sh $t6, %lo(gSaveContext+0x1412)($at) /* 0176C 80B5CF1C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01770 80B5CF20 00310821 */ addu $at, $at, $s1 /* 01774 80B5CF24 A02F1E15 */ sb $t7, 0x1E15($at) ## 00011E15 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5D3CC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5D3CC.s index f906e276d1..f4e8f60674 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5D3CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5D3CC.s @@ -26,19 +26,19 @@ glabel func_80B5D3CC /* 01C78 80B5D428 00027100 */ sll $t6, $v0, 4 /* 01C7C 80B5D42C 000E7F02 */ srl $t7, $t6, 28 /* 01C80 80B5D430 000FC080 */ sll $t8, $t7, 2 -/* 01C84 80B5D434 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 01C84 80B5D434 3C198016 */ lui $t9, %hi(gSegments) /* 01C88 80B5D438 0338C821 */ addu $t9, $t9, $t8 /* 01C8C 80B5D43C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01C90 80B5D440 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 01C90 80B5D440 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 01C94 80B5D444 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 01C98 80B5D448 00414024 */ and $t0, $v0, $at /* 01C9C 80B5D44C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01CA0 80B5D450 03284821 */ addu $t1, $t9, $t0 /* 01CA4 80B5D454 01215021 */ addu $t2, $t1, $at /* 01CA8 80B5D458 AE0A1D68 */ sw $t2, 0x1D68($s0) ## 00001D68 -/* 01CAC 80B5D45C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 01CAC 80B5D45C 3C018016 */ lui $at, %hi(gSaveContext+0x1414) /* 01CB0 80B5D460 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 01CB4 80B5D464 A02BFA74 */ sb $t3, -0x058C($at) ## 8015FA74 +/* 01CB4 80B5D464 A02BFA74 */ sb $t3, %lo(gSaveContext+0x1414)($at) /* 01CB8 80B5D468 922C0208 */ lbu $t4, 0x0208($s1) ## 00000208 /* 01CBC 80B5D46C 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 /* 01CC0 80B5D470 A22D0208 */ sb $t5, 0x0208($s1) ## 00000208 @@ -61,19 +61,19 @@ glabel func_80B5D3CC .L80B5D4B0: /* 01D00 80B5D4B0 00194702 */ srl $t0, $t9, 28 /* 01D04 80B5D4B4 00084880 */ sll $t1, $t0, 2 -/* 01D08 80B5D4B8 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 01D08 80B5D4B8 3C0A8016 */ lui $t2, %hi(gSegments) /* 01D0C 80B5D4BC 01495021 */ addu $t2, $t2, $t1 /* 01D10 80B5D4C0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01D14 80B5D4C4 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 01D14 80B5D4C4 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 01D18 80B5D4C8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 01D1C 80B5D4CC 00415824 */ and $t3, $v0, $at /* 01D20 80B5D4D0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01D24 80B5D4D4 014B6021 */ addu $t4, $t2, $t3 /* 01D28 80B5D4D8 01816821 */ addu $t5, $t4, $at /* 01D2C 80B5D4DC AE0D1D68 */ sw $t5, 0x1D68($s0) ## 00001D68 -/* 01D30 80B5D4E0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 01D30 80B5D4E0 3C018016 */ lui $at, %hi(gSaveContext+0x1414) /* 01D34 80B5D4E4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 01D38 80B5D4E8 A02EFA74 */ sb $t6, -0x058C($at) ## 8015FA74 +/* 01D38 80B5D4E8 A02EFA74 */ sb $t6, %lo(gSaveContext+0x1414)($at) /* 01D3C 80B5D4EC 922F0208 */ lbu $t7, 0x0208($s1) ## 00000208 /* 01D40 80B5D4F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01D44 80B5D4F4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DE1C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DE1C.s index f244c0f495..04df754743 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DE1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DE1C.s @@ -138,8 +138,8 @@ glabel L80B5DFD0 /* 02834 80B5DFE4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02838 80B5DFE8 0C00B7D5 */ jal func_8002DF54 /* 0283C 80B5DFEC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 02840 80B5DFF0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 02844 80B5DFF4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 02840 80B5DFF0 3C038016 */ lui $v1, %hi(gSaveContext) +/* 02844 80B5DFF4 2463E660 */ addiu $v1, %lo(gSaveContext) /* 02848 80B5DFF8 946F0EDC */ lhu $t7, 0x0EDC($v1) ## 8015F53C /* 0284C 80B5DFFC 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 /* 02850 80B5E000 3C1980B6 */ lui $t9, %hi(func_80B5E090) ## $t9 = 80B60000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Draw.s index 828e5ebce4..1227d22ba6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Draw.s @@ -64,7 +64,7 @@ glabel EnZo_Draw /* 020F0 80B62310 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 /* 020F4 80B62314 AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 /* 020F8 80B62318 860D0654 */ lh $t5, 0x0654($s0) ## 00000654 -/* 020FC 80B6231C 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 020FC 80B6231C 3C0A8016 */ lui $t2, %hi(gSegments) /* 02100 80B62320 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 02104 80B62324 000D7080 */ sll $t6, $t5, 2 /* 02108 80B62328 03AE2021 */ addu $a0, $sp, $t6 @@ -75,7 +75,7 @@ glabel EnZo_Draw /* 0211C 80B6233C 0018CF02 */ srl $t9, $t8, 28 /* 02120 80B62340 00194880 */ sll $t1, $t9, 2 /* 02124 80B62344 01495021 */ addu $t2, $t2, $t1 -/* 02128 80B62348 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 02128 80B62348 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 0212C 80B6234C 00817824 */ and $t7, $a0, $at /* 02130 80B62350 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 02134 80B62354 01EA5821 */ addu $t3, $t7, $t2 @@ -102,7 +102,7 @@ glabel EnZo_Draw /* 02184 80B623A4 AD1802D0 */ sw $t8, 0x02D0($t0) ## 000002D0 /* 02188 80B623A8 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 /* 0218C 80B623AC 86090654 */ lh $t1, 0x0654($s0) ## 00000654 -/* 02190 80B623B0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 02190 80B623B0 3C0E8016 */ lui $t6, %hi(gSegments) /* 02194 80B623B4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 02198 80B623B8 00097880 */ sll $t7, $t1, 2 /* 0219C 80B623BC 03AF2021 */ addu $a0, $sp, $t7 @@ -113,7 +113,7 @@ glabel EnZo_Draw /* 021B0 80B623D0 000B6702 */ srl $t4, $t3, 28 /* 021B4 80B623D4 000C6880 */ sll $t5, $t4, 2 /* 021B8 80B623D8 01CD7021 */ addu $t6, $t6, $t5 -/* 021BC 80B623DC 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 021BC 80B623DC 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 021C0 80B623E0 00815024 */ and $t2, $a0, $at /* 021C4 80B623E4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 021C8 80B623E8 014EC021 */ addu $t8, $t2, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s index caa7289a46..0cc41ac4a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s @@ -41,8 +41,8 @@ glabel EnZo_Init /* 0154C 80B6176C 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 01550 80B61770 0C0187BF */ jal func_80061EFC /* 01554 80B61774 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01558 80B61778 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 0155C 80B6177C 8F39E664 */ lw $t9, -0x199C($t9) ## 8015E664 +/* 01558 80B61778 3C198016 */ lui $t9, %hi(gSaveContext+4) +/* 0155C 80B6177C 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) /* 01560 80B61780 3C0580B6 */ lui $a1, %hi(D_80B624E4) ## $a1 = 80B60000 /* 01564 80B61784 24A524E4 */ addiu $a1, $a1, %lo(D_80B624E4) ## $a1 = 80B624E4 /* 01568 80B61788 1720000A */ bne $t9, $zero, .L80B617B4 @@ -96,10 +96,10 @@ glabel EnZo_Init /* 0161C 80B6183C 3C014258 */ lui $at, 0x4258 ## $at = 42580000 /* 01620 80B61840 44815000 */ mtc1 $at, $f10 ## $f10 = 54.00 /* 01624 80B61844 C6080084 */ lwc1 $f8, 0x0084($s0) ## 00000084 -/* 01628 80B61848 3C198003 */ lui $t9, 0x8003 ## $t9 = 80030000 +/* 01628 80B61848 3C198003 */ lui $t9, %hi(ActorShadow_DrawFunc_Circle) /* 0162C 80B6184C 3C0580B6 */ lui $a1, %hi(D_80B624E4) ## $a1 = 80B60000 /* 01630 80B61850 460A403C */ c.lt.s $f8, $f10 -/* 01634 80B61854 2739B5EC */ addiu $t9, $t9, 0xB5EC ## $t9 = 8002B5EC +/* 01634 80B61854 2739B5EC */ addiu $t9, %lo(ActorShadow_DrawFunc_Circle) /* 01638 80B61858 24A524E4 */ addiu $a1, $a1, %lo(D_80B624E4) ## $a1 = 80B624E4 /* 0163C 80B6185C 45030008 */ bc1tl .L80B61880 /* 01640 80B61860 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61024.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61024.s index 7f9780bdfa..badafb9da0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61024.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61024.s @@ -34,8 +34,8 @@ glabel func_80B61024 /* 00E4C 80B6106C 03000008 */ jr $t8 /* 00E50 80B61070 00000000 */ nop glabel L80B61074 -/* 00E54 80B61074 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00E58 80B61078 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00E54 80B61074 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00E58 80B61078 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00E5C 80B6107C 94790EDA */ lhu $t9, 0x0EDA($v1) ## 8015F53A /* 00E60 80B61080 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 /* 00E64 80B61084 51000080 */ beql $t0, $zero, .L80B61288 @@ -49,10 +49,10 @@ glabel L80B6109C /* 00E7C 80B6109C 1000007A */ beq $zero, $zero, .L80B61288 /* 00E80 80B610A0 24024021 */ addiu $v0, $zero, 0x4021 ## $v0 = 00004021 glabel L80B610A4 -/* 00E84 80B610A4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00E88 80B610A8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00E8C 80B610AC 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 -/* 00E90 80B610B0 8D297170 */ lw $t1, 0x7170($t1) ## 80127170 +/* 00E84 80B610A4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00E88 80B610A8 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 00E8C 80B610AC 3C098012 */ lui $t1, %hi(gBitFlags+0x50) +/* 00E90 80B610B0 8D297170 */ lw $t1, %lo(gBitFlags+0x50)($t1) /* 00E94 80B610B4 8C6A00A4 */ lw $t2, 0x00A4($v1) ## 8015E704 /* 00E98 80B610B8 012A5824 */ and $t3, $t1, $t2 /* 00E9C 80B610BC 51600004 */ beql $t3, $zero, .L80B610D0 @@ -67,10 +67,10 @@ glabel L80B610A4 /* 00EBC 80B610DC 1000006A */ beq $zero, $zero, .L80B61288 /* 00EC0 80B610E0 24024007 */ addiu $v0, $zero, 0x4007 ## $v0 = 00004007 glabel L80B610E4 -/* 00EC4 80B610E4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00EC8 80B610E8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00ECC 80B610EC 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 00ED0 80B610F0 8DCE7170 */ lw $t6, 0x7170($t6) ## 80127170 +/* 00EC4 80B610E4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00EC8 80B610E8 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 00ECC 80B610EC 3C0E8012 */ lui $t6, %hi(gBitFlags+0x50) +/* 00ED0 80B610F0 8DCE7170 */ lw $t6, %lo(gBitFlags+0x50)($t6) /* 00ED4 80B610F4 8C6F00A4 */ lw $t7, 0x00A4($v1) ## 8015E704 /* 00ED8 80B610F8 01CFC024 */ and $t8, $t6, $t7 /* 00EDC 80B610FC 53000004 */ beql $t8, $zero, .L80B61110 @@ -94,10 +94,10 @@ glabel L80B610E4 /* 00F1C 80B6113C 10000052 */ beq $zero, $zero, .L80B61288 /* 00F20 80B61140 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00004009 glabel L80B61144 -/* 00F24 80B61144 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00F28 80B61148 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00F2C 80B6114C 3C0B8012 */ lui $t3, 0x8012 ## $t3 = 80120000 -/* 00F30 80B61150 8D6B7170 */ lw $t3, 0x7170($t3) ## 80127170 +/* 00F24 80B61144 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00F28 80B61148 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 00F2C 80B6114C 3C0B8012 */ lui $t3, %hi(gBitFlags+0x50) +/* 00F30 80B61150 8D6B7170 */ lw $t3, %lo(gBitFlags+0x50)($t3) /* 00F34 80B61154 8C6C00A4 */ lw $t4, 0x00A4($v1) ## 8015E704 /* 00F38 80B61158 016C6824 */ and $t5, $t3, $t4 /* 00F3C 80B6115C 51A00004 */ beql $t5, $zero, .L80B61170 @@ -126,10 +126,10 @@ glabel L80B61144 /* 00F8C 80B611AC 10000036 */ beq $zero, $zero, .L80B61288 /* 00F90 80B611B0 2402400A */ addiu $v0, $zero, 0x400A ## $v0 = 0000400A glabel L80B611B4 -/* 00F94 80B611B4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00F98 80B611B8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00F9C 80B611BC 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 00FA0 80B611C0 8D087170 */ lw $t0, 0x7170($t0) ## 80127170 +/* 00F94 80B611B4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00F98 80B611B8 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 00F9C 80B611BC 3C088012 */ lui $t0, %hi(gBitFlags+0x50) +/* 00FA0 80B611C0 8D087170 */ lw $t0, %lo(gBitFlags+0x50)($t0) /* 00FA4 80B611C4 8C6900A4 */ lw $t1, 0x00A4($v1) ## 8015E704 /* 00FA8 80B611C8 01095024 */ and $t2, $t0, $t1 /* 00FAC 80B611CC 51400004 */ beql $t2, $zero, .L80B611E0 @@ -144,10 +144,10 @@ glabel L80B611B4 /* 00FCC 80B611EC 10000026 */ beq $zero, $zero, .L80B61288 /* 00FD0 80B611F0 2402400C */ addiu $v0, $zero, 0x400C ## $v0 = 0000400C glabel L80B611F4 -/* 00FD4 80B611F4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00FD8 80B611F8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00FDC 80B611FC 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 -/* 00FE0 80B61200 8DAD7170 */ lw $t5, 0x7170($t5) ## 80127170 +/* 00FD4 80B611F4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00FD8 80B611F8 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 00FDC 80B611FC 3C0D8012 */ lui $t5, %hi(gBitFlags+0x50) +/* 00FE0 80B61200 8DAD7170 */ lw $t5, %lo(gBitFlags+0x50)($t5) /* 00FE4 80B61204 8C6E00A4 */ lw $t6, 0x00A4($v1) ## 8015E704 /* 00FE8 80B61208 01AE7824 */ and $t7, $t5, $t6 /* 00FEC 80B6120C 51E00004 */ beql $t7, $zero, .L80B61220 @@ -167,10 +167,10 @@ glabel L80B611F4 /* 0101C 80B6123C 10000012 */ beq $zero, $zero, .L80B61288 /* 01020 80B61240 2402400F */ addiu $v0, $zero, 0x400F ## $v0 = 0000400F glabel L80B61244 -/* 01024 80B61244 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 01028 80B61248 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 0102C 80B6124C 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 01030 80B61250 8D087170 */ lw $t0, 0x7170($t0) ## 80127170 +/* 01024 80B61244 3C038016 */ lui $v1, %hi(gSaveContext) +/* 01028 80B61248 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 0102C 80B6124C 3C088012 */ lui $t0, %hi(gBitFlags+0x50) +/* 01030 80B61250 8D087170 */ lw $t0, %lo(gBitFlags+0x50)($t0) /* 01034 80B61254 8C6900A4 */ lw $t1, 0x00A4($v1) ## 8015E704 /* 01038 80B61258 01095024 */ and $t2, $t0, $t1 /* 0103C 80B6125C 51400004 */ beql $t2, $zero, .L80B61270 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61298.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61298.s index 37b386eef6..183c417403 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61298.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61298.s @@ -36,19 +36,19 @@ glabel L80B612DC glabel L80B612E4 /* 010C4 80B612E4 94E2010E */ lhu $v0, 0x010E($a3) ## 0000010E /* 010C8 80B612E8 24014008 */ addiu $at, $zero, 0x4008 ## $at = 00004008 -/* 010CC 80B612EC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 010CC 80B612EC 3C038016 */ lui $v1, %hi(gSaveContext) /* 010D0 80B612F0 1041000D */ beq $v0, $at, .L80B61328 -/* 010D4 80B612F4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 010D4 80B612F4 2463E660 */ addiu $v1, %lo(gSaveContext) /* 010D8 80B612F8 24014020 */ addiu $at, $zero, 0x4020 ## $at = 00004020 /* 010DC 80B612FC 10410008 */ beq $v0, $at, .L80B61320 /* 010E0 80B61300 24014021 */ addiu $at, $zero, 0x4021 ## $at = 00004021 /* 010E4 80B61304 10410006 */ beq $v0, $at, .L80B61320 /* 010E8 80B61308 2401402F */ addiu $at, $zero, 0x402F ## $at = 0000402F /* 010EC 80B6130C 1041000A */ beq $v0, $at, .L80B61338 -/* 010F0 80B61310 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 010F4 80B61314 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 010F0 80B61310 3C038016 */ lui $v1, %hi(gSaveContext) +/* 010F4 80B61314 3C038016 */ lui $v1, %hi(gSaveContext) /* 010F8 80B61318 1000000B */ beq $zero, $zero, .L80B61348 -/* 010FC 80B6131C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 010FC 80B6131C 2463E660 */ addiu $v1, %lo(gSaveContext) .L80B61320: /* 01100 80B61320 10000031 */ beq $zero, $zero, .L80B613E8 /* 01104 80B61324 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 @@ -58,7 +58,7 @@ glabel L80B612E4 /* 01110 80B61330 10000005 */ beq $zero, $zero, .L80B61348 /* 01114 80B61334 A4780F1C */ sh $t8, 0x0F1C($v1) ## 8015F57C .L80B61338: -/* 01118 80B61338 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015CCC0 +/* 01118 80B61338 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0111C 80B6133C 94790F1C */ lhu $t9, 0x0F1C($v1) ## 8015DBDC /* 01120 80B61340 37280200 */ ori $t0, $t9, 0x0200 ## $t0 = 00000200 /* 01124 80B61344 A4680F1C */ sh $t0, 0x0F1C($v1) ## 8015DBDC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61470.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61470.s index 6c27efa228..58d8bc2d27 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61470.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61470.s @@ -11,14 +11,14 @@ glabel func_80B61470 /* 01274 80B61494 273918F0 */ addiu $t9, $t9, %lo(func_80B618F0) ## $t9 = 80B618F0 /* 01278 80B61498 AC9801AC */ sw $t8, 0x01AC($a0) ## 000001AC /* 0127C 80B6149C 8C4F0028 */ lw $t7, 0x0028($v0) ## 00000028 -/* 01280 80B614A0 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 01280 80B614A0 3C098016 */ lui $t1, %hi(gSaveContext+4) /* 01284 80B614A4 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 01288 80B614A8 AC8F01B0 */ sw $t7, 0x01B0($a0) ## 000001B0 /* 0128C 80B614AC 8C58002C */ lw $t8, 0x002C($v0) ## 0000002C /* 01290 80B614B0 2406000B */ addiu $a2, $zero, 0x000B ## $a2 = 0000000B /* 01294 80B614B4 1728000C */ bne $t9, $t0, .L80B614E8 /* 01298 80B614B8 AC9801B4 */ sw $t8, 0x01B4($a0) ## 000001B4 -/* 0129C 80B614BC 8D29E664 */ lw $t1, -0x199C($t1) ## 8015E664 +/* 0129C 80B614BC 8D29E664 */ lw $t1, %lo(gSaveContext+4)($t1) /* 012A0 80B614C0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 012A4 80B614C4 51200006 */ beql $t1, $zero, .L80B614E0 /* 012A8 80B614C8 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s index f4b28d779d..fc9ee664e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s @@ -129,7 +129,7 @@ glabel L80B62C2C /* 0029C 80B62C5C C4F2002C */ lwc1 $f18, 0x002C($a3) ## 0000002C /* 002A0 80B62C60 C42453E0 */ lwc1 $f4, %lo(D_80B653E0)($at) /* 002A4 80B62C64 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 002A8 80B62C68 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 002A8 80B62C68 3C098016 */ lui $t1, %hi(gSaveContext+0xee2) /* 002AC 80B62C6C 46049001 */ sub.s $f0, $f18, $f4 /* 002B0 80B62C70 46000005 */ abs.s $f0, $f0 /* 002B4 80B62C74 460C003C */ c.lt.s $f0, $f12 @@ -137,7 +137,7 @@ glabel L80B62C2C /* 002BC 80B62C7C 45020436 */ bc1fl .L80B63D58 /* 002C0 80B62C80 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC /* 002C4 80B62C84 A60801CA */ sh $t0, 0x01CA($s0) ## 000001CA -/* 002C8 80B62C88 9529F542 */ lhu $t1, -0x0ABE($t1) ## 8015F542 +/* 002C8 80B62C88 9529F542 */ lhu $t1, %lo(gSaveContext+0xee2)($t1) /* 002CC 80B62C8C 240B0039 */ addiu $t3, $zero, 0x0039 ## $t3 = 00000039 /* 002D0 80B62C90 312A0004 */ andi $t2, $t1, 0x0004 ## $t2 = 00000000 /* 002D4 80B62C94 51400430 */ beql $t2, $zero, .L80B63D58 @@ -145,8 +145,8 @@ glabel L80B62C2C /* 002DC 80B62C9C 1000042D */ beq $zero, $zero, .L80B63D54 /* 002E0 80B62CA0 A60B01D4 */ sh $t3, 0x01D4($s0) ## 000001D4 glabel L80B62CA4 -/* 002E4 80B62CA4 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 002E8 80B62CA8 958CF542 */ lhu $t4, -0x0ABE($t4) ## 8015F542 +/* 002E4 80B62CA4 3C0C8016 */ lui $t4, %hi(gSaveContext+0xee2) +/* 002E8 80B62CA8 958CF542 */ lhu $t4, %lo(gSaveContext+0xee2)($t4) /* 002EC 80B62CAC 8FA4006C */ lw $a0, 0x006C($sp) /* 002F0 80B62CB0 318D0004 */ andi $t5, $t4, 0x0004 ## $t5 = 00000000 /* 002F4 80B62CB4 11A00032 */ beq $t5, $zero, .L80B62D80 @@ -235,8 +235,8 @@ glabel L80B62CA4 /* 00424 80B62DE4 0C03E803 */ jal Audio_SetBGM /* 00428 80B62DE8 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 0042C 80B62DEC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00430 80B62DF0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0042C 80B62DEC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00430 80B62DF0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00434 80B62DF4 944B0EE2 */ lhu $t3, 0x0EE2($v0) ## 8015F542 /* 00438 80B62DF8 8FA4006C */ lw $a0, 0x006C($sp) /* 0043C 80B62DFC 24050023 */ addiu $a1, $zero, 0x0023 ## $a1 = 00000023 @@ -994,10 +994,10 @@ glabel L80B63670 /* 00EDC 80B6389C 00027900 */ sll $t7, $v0, 4 /* 00EE0 80B638A0 000FC702 */ srl $t8, $t7, 28 /* 00EE4 80B638A4 0018C880 */ sll $t9, $t8, 2 -/* 00EE8 80B638A8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 00EE8 80B638A8 3C088016 */ lui $t0, %hi(gSegments) /* 00EEC 80B638AC 01194021 */ addu $t0, $t0, $t9 /* 00EF0 80B638B0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00EF4 80B638B4 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 +/* 00EF4 80B638B4 8D086FA8 */ lw $t0, %lo(gSegments)($t0) /* 00EF8 80B638B8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00EFC 80B638BC 00414824 */ and $t1, $v0, $at /* 00F00 80B638C0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s index c8553c2569..557ebda043 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s @@ -47,17 +47,17 @@ glabel Fishing_Init /* 00BE8 80B6A588 0C00AC78 */ jal ActorShape_Init /* 00BEC 80B6A58C 00000000 */ nop -/* 00BF0 80B6A590 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00BF4 80B6A594 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 00BF8 80B6A598 3C118016 */ lui $s1, 0x8016 ## $s1 = 80160000 -/* 00BFC 80B6A59C 2631E660 */ addiu $s1, $s1, 0xE660 ## $s1 = 8015E660 +/* 00BF0 80B6A590 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 00BF4 80B6A594 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) +/* 00BF8 80B6A598 3C118016 */ lui $s1, %hi(gSaveContext) +/* 00BFC 80B6A59C 2631E660 */ addiu $s1, %lo(gSaveContext) /* 00C00 80B6A5A0 85CF09DE */ lh $t7, 0x09DE($t6) ## 801609DE /* 00C04 80B6A5A4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00C08 80B6A5A8 3C0180B8 */ lui $at, %hi(D_80B7E075) ## $at = 80B80000 /* 00C0C 80B6A5AC 11E00005 */ beq $t7, $zero, .L80B6A5C4 /* 00C10 80B6A5B0 3C1080B8 */ lui $s0, %hi(D_80B7E070) ## $s0 = 80B80000 -/* 00C14 80B6A5B4 3C118016 */ lui $s1, 0x8016 ## $s1 = 80160000 -/* 00C18 80B6A5B8 2631E660 */ addiu $s1, $s1, 0xE660 ## $s1 = 8015E660 +/* 00C14 80B6A5B4 3C118016 */ lui $s1, %hi(gSaveContext) +/* 00C18 80B6A5B8 2631E660 */ addiu $s1, %lo(gSaveContext) /* 00C1C 80B6A5BC 10000004 */ beq $zero, $zero, .L80B6A5D0 /* 00C20 80B6A5C0 A038E075 */ sb $t8, %lo(D_80B7E075)($at) .L80B6A5C4: @@ -170,9 +170,9 @@ glabel Fishing_Init /* 00DB8 80B6A758 261030B8 */ addiu $s0, $s0, %lo(D_80B830B8) ## $s0 = 80B830B8 /* 00DBC 80B6A75C 00330821 */ addu $at, $at, $s3 /* 00DC0 80B6A760 AC301E10 */ sw $s0, 0x1E10($at) ## 00011E10 -/* 00DC4 80B6A764 3C018012 */ lui $at, 0x8012 ## $at = 80120000 +/* 00DC4 80B6A764 3C018012 */ lui $at, %hi(D_8011FB40) /* 00DC8 80B6A768 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00DCC 80B6A76C A42DFB40 */ sh $t5, -0x04C0($at) ## 8011FB40 +/* 00DCC 80B6A76C A42DFB40 */ sh $t5, %lo(D_8011FB40)($at) /* 00DD0 80B6A770 3C0180B8 */ lui $at, %hi(D_80B7E0AC) ## $at = 80B80000 /* 00DD4 80B6A774 A420E0AC */ sh $zero, %lo(D_80B7E0AC)($at) /* 00DD8 80B6A778 3C0180B8 */ lui $at, %hi(D_80B7E0A6) ## $at = 80B80000 @@ -248,14 +248,14 @@ glabel Fishing_Init /* 00ED4 80B6A874 318D0007 */ andi $t5, $t4, 0x0007 ## $t5 = 00000000 /* 00ED8 80B6A878 11A10006 */ beq $t5, $at, .L80B6A894 /* 00EDC 80B6A87C 3C0480B8 */ lui $a0, %hi(D_80B830B0) ## $a0 = 80B80000 -/* 00EE0 80B6A880 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00EE4 80B6A884 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 00EE0 80B6A880 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 00EE4 80B6A884 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 00EE8 80B6A888 3C0180B8 */ lui $at, %hi(D_80B7E077) ## $at = 80B80000 /* 00EEC 80B6A88C 85CF09DA */ lh $t7, 0x09DA($t6) ## 801609DA /* 00EF0 80B6A890 11E00012 */ beq $t7, $zero, .L80B6A8DC .L80B6A894: -/* 00EF4 80B6A894 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00EF8 80B6A898 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00EF4 80B6A894 3C028016 */ lui $v0, %hi(gGameInfo) +/* 00EF8 80B6A898 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 00EFC 80B6A89C 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 /* 00F00 80B6A8A0 3C0180B8 */ lui $at, %hi(D_80B7E077) ## $at = 80B80000 /* 00F04 80B6A8A4 A038E077 */ sb $t8, %lo(D_80B7E077)($at) @@ -461,8 +461,8 @@ glabel Fishing_Init /* 011D0 80B6AB70 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn /* 011D4 80B6AB74 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 011D8 80B6AB78 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 011DC 80B6AB7C 8DADFA90 */ lw $t5, -0x0570($t5) ## 8015FA90 +/* 011D8 80B6AB78 3C0D8016 */ lui $t5, %hi(gGameInfo) +/* 011DC 80B6AB7C 8DADFA90 */ lw $t5, %lo(gGameInfo)($t5) /* 011E0 80B6AB80 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 011E4 80B6AB84 3C0F80B8 */ lui $t7, %hi(D_80B7E07D) ## $t7 = 80B80000 /* 011E8 80B6AB88 85AE09D6 */ lh $t6, 0x09D6($t5) ## 801609D6 @@ -660,8 +660,8 @@ glabel Fishing_Init /* 014A0 80B6AE40 46005480 */ add.s $f18, $f10, $f0 /* 014A4 80B6AE44 E65201AC */ swc1 $f18, 0x01AC($s2) ## 000001AC .L80B6AE48: -/* 014A8 80B6AE48 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 014AC 80B6AE4C 8D08FA90 */ lw $t0, -0x0570($t0) ## 8015FA90 +/* 014A8 80B6AE48 3C088016 */ lui $t0, %hi(gGameInfo) +/* 014AC 80B6AE4C 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) /* 014B0 80B6AE50 3C0980B8 */ lui $t1, %hi(D_80B7E075) ## $t1 = 80B80000 /* 014B4 80B6AE54 850209E0 */ lh $v0, 0x09E0($t0) ## 801609E0 /* 014B8 80B6AE58 10400007 */ beq $v0, $zero, .L80B6AE78 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s index 601ead5073..60bd5bd6b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s @@ -548,8 +548,8 @@ glabel Fishing_Update /* 07EBC 80B7185C 4606203C */ c.lt.s $f4, $f6 /* 07EC0 80B71860 00000000 */ nop /* 07EC4 80B71864 4500000E */ bc1f .L80B718A0 -/* 07EC8 80B71868 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 07ECC 80B7186C 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 07EC8 80B71868 3C188016 */ lui $t8, %hi(gGameInfo) +/* 07ECC 80B7186C 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 07ED0 80B71870 3C0180B8 */ lui $at, %hi(D_80B7B570) ## $at = 80B80000 /* 07ED4 80B71874 C424B570 */ lwc1 $f4, %lo(D_80B7B570)($at) /* 07ED8 80B71878 87190A54 */ lh $t9, 0x0A54($t8) ## 80160A54 @@ -1107,8 +1107,8 @@ glabel L80B71FA8 /* 086D0 80B72070 0C042F6F */ jal func_8010BDBC /* 086D4 80B72074 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 /* 086D8 80B72078 14400022 */ bne $v0, $zero, .L80B72104 -/* 086DC 80B7207C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 086E0 80B72080 9442E66C */ lhu $v0, -0x1994($v0) ## 8015E66C +/* 086DC 80B7207C 3C028016 */ lui $v0, %hi(gSaveContext+0xc) +/* 086E0 80B72080 9442E66C */ lhu $v0, %lo(gSaveContext+0xc)($v0) /* 086E4 80B72084 3401C000 */ ori $at, $zero, 0xC000 ## $at = 0000C000 /* 086E8 80B72088 0041082A */ slt $at, $v0, $at /* 086EC 80B7208C 1420000F */ bne $at, $zero, .L80B720CC @@ -1122,12 +1122,12 @@ glabel L80B71FA8 /* 0870C 80B720AC A60F0158 */ sh $t7, 0x0158($s0) ## 00000158 /* 08710 80B720B0 4600028D */ trunc.w.s $f10, $f0 -/* 08714 80B720B4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 08714 80B720B4 3C028016 */ lui $v0, %hi(gSaveContext+0xc) /* 08718 80B720B8 440C5000 */ mfc1 $t4, $f10 /* 0871C 80B720BC 00000000 */ nop /* 08720 80B720C0 258900C8 */ addiu $t1, $t4, 0x00C8 ## $t1 = 000000C8 /* 08724 80B720C4 A6090180 */ sh $t1, 0x0180($s0) ## 00000180 -/* 08728 80B720C8 9442E66C */ lhu $v0, -0x1994($v0) ## 8015E66C +/* 08728 80B720C8 9442E66C */ lhu $v0, %lo(gSaveContext+0xc)($v0) .L80B720CC: /* 0872C 80B720CC 28413AAA */ slti $at, $v0, 0x3AAA /* 08730 80B720D0 1420000C */ bne $at, $zero, .L80B72104 @@ -1145,8 +1145,8 @@ glabel L80B71FA8 /* 0875C 80B720FC 270A00C8 */ addiu $t2, $t8, 0x00C8 ## $t2 = 000000C8 /* 08760 80B72100 A60A0180 */ sh $t2, 0x0180($s0) ## 00000180 .L80B72104: -/* 08764 80B72104 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 08768 80B72108 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 08764 80B72104 3C038016 */ lui $v1, %hi(gGameInfo) +/* 08768 80B72108 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) /* 0876C 80B7210C 847909F2 */ lh $t9, 0x09F2($v1) ## 801609F2 /* 08770 80B72110 13200C59 */ beq $t9, $zero, .L80B75278 /* 08774 80B72114 3C014316 */ lui $at, 0x4316 ## $at = 43160000 @@ -1469,8 +1469,8 @@ glabel L80B723E8 /* 08BCC 80B7256C 10000022 */ beq $zero, $zero, .L80B725F8 /* 08BD0 80B72570 A602015A */ sh $v0, 0x015A($s0) ## 0000015A .L80B72574: -/* 08BD4 80B72574 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 08BD8 80B72578 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 08BD4 80B72574 3C038016 */ lui $v1, %hi(gGameInfo) +/* 08BD8 80B72578 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) /* 08BDC 80B7257C 846B09D8 */ lh $t3, 0x09D8($v1) ## 801609D8 /* 08BE0 80B72580 15600005 */ bne $t3, $zero, .L80B72598 /* 08BE4 80B72584 304D07FF */ andi $t5, $v0, 0x07FF ## $t5 = 0000000A @@ -1829,8 +1829,8 @@ glabel L80B72928 /* 090E4 80B72A84 00000000 */ nop .L80B72A88: -/* 090E8 80B72A88 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 090EC 80B72A8C 8D8CFA90 */ lw $t4, -0x0570($t4) ## 8015FA90 +/* 090E8 80B72A88 3C0C8016 */ lui $t4, %hi(gGameInfo) +/* 090EC 80B72A8C 8D8CFA90 */ lw $t4, %lo(gGameInfo)($t4) /* 090F0 80B72A90 3C0143C0 */ lui $at, 0x43C0 ## $at = 43C00000 /* 090F4 80B72A94 44812000 */ mtc1 $at, $f4 ## $f4 = 384.00 /* 090F8 80B72A98 858909F4 */ lh $t1, 0x09F4($t4) ## 801609F4 @@ -1972,8 +1972,8 @@ glabel L80B72928 .L80B72C80: /* 092E0 80B72C80 4600A086 */ mov.s $f2, $f20 .L80B72C84: -/* 092E4 80B72C84 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 092E8 80B72C88 9442E66C */ lhu $v0, -0x1994($v0) ## 8015E66C +/* 092E4 80B72C84 3C028016 */ lui $v0, %hi(gSaveContext+0xc) +/* 092E8 80B72C88 9442E66C */ lhu $v0, %lo(gSaveContext+0xc)($v0) /* 092EC 80B72C8C 3401B555 */ ori $at, $zero, 0xB555 ## $at = 0000B555 /* 092F0 80B72C90 0041082A */ slt $at, $v0, $at /* 092F4 80B72C94 14200009 */ bne $at, $zero, .L80B72CBC @@ -2090,8 +2090,8 @@ glabel L80B72928 /* 09484 80B72E24 4604003C */ c.lt.s $f0, $f4 /* 09488 80B72E28 00000000 */ nop /* 0948C 80B72E2C 45010007 */ bc1t .L80B72E4C -/* 09490 80B72E30 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 09494 80B72E34 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 09490 80B72E30 3C198016 */ lui $t9, %hi(gGameInfo) +/* 09494 80B72E34 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 09498 80B72E38 92180150 */ lbu $t8, 0x0150($s0) ## 00000150 /* 0949C 80B72E3C 872C0A5E */ lh $t4, 0x0A5E($t9) ## 80160A5E /* 094A0 80B72E40 270A0001 */ addiu $t2, $t8, 0x0001 ## $t2 = 00000001 @@ -3786,8 +3786,8 @@ glabel L80B738A0 /* 0ACC0 80B74660 91ADE0B6 */ lbu $t5, %lo(D_80B7E0B6)($t5) /* 0ACC4 80B74664 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 0ACC8 80B74668 11A1004A */ beq $t5, $at, .L80B74794 -/* 0ACCC 80B7466C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0ACD0 80B74670 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 0ACCC 80B7466C 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 0ACD0 80B74670 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 0ACD4 80B74674 85CF0A5E */ lh $t7, 0x0A5E($t6) ## 80160A5E /* 0ACD8 80B74678 15E00046 */ bne $t7, $zero, .L80B74794 /* 0ACDC 80B7467C 3C0380B8 */ lui $v1, %hi(D_80B7E122) ## $v1 = 80B80000 @@ -3808,15 +3808,15 @@ glabel L80B738A0 /* 0AD14 80B746B4 3C0180B8 */ lui $at, %hi(D_80B7E086) ## $at = 80B80000 /* 0AD18 80B746B8 14620006 */ bne $v1, $v0, .L80B746D4 /* 0AD1C 80B746BC A42CE086 */ sh $t4, %lo(D_80B7E086)($at) -/* 0AD20 80B746C0 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 0AD24 80B746C4 8F39F520 */ lw $t9, -0x0AE0($t9) ## 8015F520 +/* 0AD20 80B746C0 3C198016 */ lui $t9, %hi(gSaveContext+0xec0) +/* 0AD24 80B746C4 8F39F520 */ lw $t9, %lo(gSaveContext+0xec0)($t9) /* 0AD28 80B746C8 33290400 */ andi $t1, $t9, 0x0400 ## $t1 = 00000000 /* 0AD2C 80B746CC 15200007 */ bne $t1, $zero, .L80B746EC /* 0AD30 80B746D0 00000000 */ nop .L80B746D4: /* 0AD34 80B746D4 10620012 */ beq $v1, $v0, .L80B74720 -/* 0AD38 80B746D8 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 0AD3C 80B746DC 8D6BF520 */ lw $t3, -0x0AE0($t3) ## 8015F520 +/* 0AD38 80B746D8 3C0B8016 */ lui $t3, %hi(gSaveContext+0xec0) +/* 0AD3C 80B746DC 8D6BF520 */ lw $t3, %lo(gSaveContext+0xec0)($t3) /* 0AD40 80B746E0 316D0800 */ andi $t5, $t3, 0x0800 ## $t5 = 00000000 /* 0AD44 80B746E4 51A0000F */ beql $t5, $zero, .L80B74724 /* 0AD48 80B746E8 A600015A */ sh $zero, 0x015A($s0) ## 0000015A @@ -3869,8 +3869,8 @@ glabel L80B738A0 /* 0ADEC 80B7478C 100002BA */ beq $zero, $zero, .L80B75278 /* 0ADF0 80B74790 A2000152 */ sb $zero, 0x0152($s0) ## 00000152 .L80B74794: -/* 0ADF4 80B74794 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 0ADF8 80B74798 8D29FA90 */ lw $t1, -0x0570($t1) ## 8015FA90 +/* 0ADF4 80B74794 3C098016 */ lui $t1, %hi(gGameInfo) +/* 0ADF8 80B74798 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) /* 0ADFC 80B7479C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0AE00 80B747A0 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 /* 0AE04 80B747A4 852B0A4A */ lh $t3, 0x0A4A($t1) ## 80160A4A diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6AF28.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6AF28.s index 1d37a05617..c2f4a877f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6AF28.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6AF28.s @@ -42,7 +42,7 @@ glabel func_80B6AF28 /* 015CC 80B6AF6C AFB0004C */ sw $s0, 0x004C($sp) /* 015D0 80B6AF70 F7B40020 */ sdc1 $f20, 0x0020($sp) /* 015D4 80B6AF74 3C0180B8 */ lui $at, %hi(D_80B7B398) ## $at = 80B80000 -/* 015D8 80B6AF78 3C138016 */ lui $s3, 0x8016 ## $s3 = 80160000 +/* 015D8 80B6AF78 3C138016 */ lui $s3, %hi(gGameInfo) /* 015DC 80B6AF7C 3C1780B8 */ lui $s7, %hi(D_80B7A89C) ## $s7 = 80B80000 /* 015E0 80B6AF80 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 /* 015E4 80B6AF84 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 @@ -50,7 +50,7 @@ glabel func_80B6AF28 /* 015EC 80B6AF8C AFBF006C */ sw $ra, 0x006C($sp) /* 015F0 80B6AF90 AFB10050 */ sw $s1, 0x0050($sp) /* 015F4 80B6AF94 26F7A89C */ addiu $s7, $s7, %lo(D_80B7A89C) ## $s7 = 80B7A89C -/* 015F8 80B6AF98 2673FA90 */ addiu $s3, $s3, 0xFA90 ## $s3 = 8015FA90 +/* 015F8 80B6AF98 2673FA90 */ addiu $s3, %lo(gGameInfo) /* 015FC 80B6AF9C C434B398 */ lwc1 $f20, %lo(D_80B7B398)($at) /* 01600 80B6AFA0 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 /* 01604 80B6AFA4 3C150001 */ lui $s5, 0x0001 ## $s5 = 00010000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s index 8e38a0753a..6c125ddf5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s @@ -608,12 +608,12 @@ glabel func_80B6B674 /* 02500 80B6BEA0 AC440004 */ sw $a0, 0x0004($v0) ## 00000004 /* 02504 80B6BEA4 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 /* 02508 80B6BEA8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0250C 80B6BEAC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0250C 80B6BEAC 3C0F8016 */ lui $t7, %hi(gGameInfo) /* 02510 80B6BEB0 2401FF00 */ addiu $at, $zero, 0xFF00 ## $at = FFFFFF00 /* 02514 80B6BEB4 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 02518 80B6BEB8 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 0251C 80B6BEBC AC570000 */ sw $s7, 0x0000($v0) ## 00000000 -/* 02520 80B6BEC0 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 02520 80B6BEC0 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 02524 80B6BEC4 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 /* 02528 80B6BEC8 329400FF */ andi $s4, $s4, 0x00FF ## $s4 = 00000001 /* 0252C 80B6BECC 85F809FA */ lh $t8, 0x09FA($t7) ## 801609FA diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s index 086fd0262a..da863a4b7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s @@ -108,11 +108,11 @@ glabel func_80B6C134 /* 028E8 80B6C288 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 028EC 80B6C28C 000D7080 */ sll $t6, $t5, 2 /* 028F0 80B6C290 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 -/* 028F4 80B6C294 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 028F4 80B6C294 3C0F8016 */ lui $t7, %hi(gSegments) /* 028F8 80B6C298 01EE7821 */ addu $t7, $t7, $t6 /* 028FC 80B6C29C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 02900 80B6C2A0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 02904 80B6C2A4 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 02904 80B6C2A4 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 02908 80B6C2A8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0290C 80B6C2AC 0081C024 */ and $t8, $a0, $at /* 02910 80B6C2B0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6E9E0.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6E9E0.s index 6ca4177e91..3090cc10f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6E9E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6E9E0.s @@ -259,17 +259,17 @@ glabel func_80B6E9E0 /* 0518C 80B6EB2C A020E082 */ sb $zero, %lo(D_80B7E082)($at) /* 05190 80B6EB30 A1000000 */ sb $zero, 0x0000($t0) ## 80B7E0B6 /* 05194 80B6EB34 9042E075 */ lbu $v0, %lo(D_80B7E075)($v0) -/* 05198 80B6EB38 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 05198 80B6EB38 3C0F8016 */ lui $t7, %hi(gSaveContext+0xec0) /* 0519C 80B6EB3C 15820005 */ bne $t4, $v0, .L80B6EB54 /* 051A0 80B6EB40 00000000 */ nop -/* 051A4 80B6EB44 8DEFF520 */ lw $t7, -0x0AE0($t7) ## 8015F520 +/* 051A4 80B6EB44 8DEFF520 */ lw $t7, %lo(gSaveContext+0xec0)($t7) /* 051A8 80B6EB48 31F80400 */ andi $t8, $t7, 0x0400 ## $t8 = 00000000 /* 051AC 80B6EB4C 17000006 */ bne $t8, $zero, .L80B6EB68 /* 051B0 80B6EB50 00000000 */ nop .L80B6EB54: /* 051B4 80B6EB54 11820037 */ beq $t4, $v0, .L80B6EC34 -/* 051B8 80B6EB58 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 051BC 80B6EB5C 8F39F520 */ lw $t9, -0x0AE0($t9) ## 8015F520 +/* 051B8 80B6EB58 3C198016 */ lui $t9, %hi(gSaveContext+0xec0) +/* 051BC 80B6EB5C 8F39F520 */ lw $t9, %lo(gSaveContext+0xec0)($t9) /* 051C0 80B6EB60 332E0800 */ andi $t6, $t9, 0x0800 ## $t6 = 00000000 /* 051C4 80B6EB64 11C00033 */ beq $t6, $zero, .L80B6EC34 .L80B6EB68: @@ -460,8 +460,8 @@ glabel func_80B6E9E0 /* 0547C 80B6EE1C 03000008 */ jr $t8 /* 05480 80B6EE20 00000000 */ nop glabel L80B6EE24 -/* 05484 80B6EE24 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 05488 80B6EE28 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 05484 80B6EE24 3C028016 */ lui $v0, %hi(gGameInfo) +/* 05488 80B6EE28 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0548C 80B6EE2C 3C0180B8 */ lui $at, %hi(D_80B7FEA0) ## $at = 80B80000 /* 05490 80B6EE30 A420FEA0 */ sh $zero, %lo(D_80B7FEA0)($at) /* 05494 80B6EE34 845909F0 */ lh $t9, 0x09F0($v0) ## 801609F0 @@ -751,7 +751,7 @@ glabel L80B6F0C4 .L80B6F26C: /* 058CC 80B6F26C 460E7102 */ mul.s $f4, $f14, $f14 /* 058D0 80B6F270 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 058D4 80B6F274 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 058D4 80B6F274 3C198016 */ lui $t9, %hi(gGameInfo) /* 058D8 80B6F278 46021182 */ mul.s $f6, $f2, $f2 /* 058DC 80B6F27C 46062200 */ add.s $f8, $f4, $f6 /* 058E0 80B6F280 460C6282 */ mul.s $f10, $f12, $f12 @@ -786,7 +786,7 @@ glabel L80B6F0C4 /* 05950 80B6F2F0 00000000 */ nop /* 05954 80B6F2F4 450200BA */ bc1fl .L80B6F5E0 /* 05958 80B6F2F8 8DD807C0 */ lw $t8, 0x07C0($t6) ## 000007C0 -/* 0595C 80B6F2FC 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 0595C 80B6F2FC 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 05960 80B6F300 8FA500E8 */ lw $a1, 0x00E8($sp) /* 05964 80B6F304 3C0180B8 */ lui $at, %hi(D_80B7E0BC) ## $at = 80B80000 /* 05968 80B6F308 872F0A44 */ lh $t7, 0x0A44($t9) ## 80160A44 @@ -1533,7 +1533,7 @@ glabel L80B6FA3C /* 06440 80B6FDE0 3C0180B8 */ lui $at, %hi(D_80B7E134) ## $at = 80B80000 /* 06444 80B6FDE4 E7A00094 */ swc1 $f0, 0x0094($sp) /* 06448 80B6FDE8 46028102 */ mul.s $f4, $f16, $f2 -/* 0644C 80B6FDEC 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0644C 80B6FDEC 3C188016 */ lui $t8, %hi(gGameInfo) /* 06450 80B6FDF0 3C0380B8 */ lui $v1, %hi(D_80B7E144) ## $v1 = 80B80000 /* 06454 80B6FDF4 2463E144 */ addiu $v1, $v1, %lo(D_80B7E144) ## $v1 = 80B7E144 /* 06458 80B6FDF8 3C0480B8 */ lui $a0, %hi(D_80B7AF94) ## $a0 = 80B80000 @@ -1555,7 +1555,7 @@ glabel L80B6FA3C /* 06498 80B6FE38 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0649C 80B6FE3C 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 /* 064A0 80B6FE40 E6060000 */ swc1 $f6, 0x0000($s0) ## 80B7E0D8 -/* 064A4 80B6FE44 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 064A4 80B6FE44 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 064A8 80B6FE48 3C0180B8 */ lui $at, %hi(D_80B7E10C) ## $at = 80B80000 /* 064AC 80B6FE4C E42AE10C */ swc1 $f10, %lo(D_80B7E10C)($at) /* 064B0 80B6FE50 87190A06 */ lh $t9, 0x0A06($t8) ## 80160A06 @@ -2282,7 +2282,7 @@ glabel L80B70890 /* 06F50 80B708F0 3C0180B8 */ lui $at, %hi(D_80B7B528) ## $at = 80B80000 /* 06F54 80B708F4 46129282 */ mul.s $f10, $f18, $f18 /* 06F58 80B708F8 C424B528 */ lwc1 $f4, %lo(D_80B7B528)($at) -/* 06F5C 80B708FC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 06F5C 80B708FC 3C0F8016 */ lui $t7, %hi(gGameInfo) /* 06F60 80B70900 46000182 */ mul.s $f6, $f0, $f0 /* 06F64 80B70904 3C0180B8 */ lui $at, %hi(D_80B7E11C) ## $at = 80B80000 /* 06F68 80B70908 46065200 */ add.s $f8, $f10, $f6 @@ -2290,7 +2290,7 @@ glabel L80B70890 /* 06F70 80B70910 00000000 */ nop /* 06F74 80B70914 45020011 */ bc1fl .L80B7095C /* 06F78 80B70918 C4680000 */ lwc1 $f8, 0x0000($v1) ## 80B7E144 -/* 06F7C 80B7091C 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 06F7C 80B7091C 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 06F80 80B70920 3C0180B8 */ lui $at, %hi(D_80B7B52C) ## $at = 80B80000 /* 06F84 80B70924 C424B52C */ lwc1 $f4, %lo(D_80B7B52C)($at) /* 06F88 80B70928 85EE0A56 */ lh $t6, 0x0A56($t7) ## 80160A56 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B71438.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B71438.s index 765ecf4f1f..945dc702fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B71438.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B71438.s @@ -5,8 +5,8 @@ glabel func_80B71438 /* 07AA4 80B71444 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 07AA8 80B71448 15C10010 */ bne $t6, $at, .L80B7148C /* 07AAC 80B7144C AFBF0014 */ sw $ra, 0x0014($sp) -/* 07AB0 80B71450 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 07AB4 80B71454 8C42F520 */ lw $v0, -0x0AE0($v0) ## 8015F520 +/* 07AB0 80B71450 3C028016 */ lui $v0, %hi(gSaveContext+0xec0) +/* 07AB4 80B71454 8C42F520 */ lw $v0, %lo(gSaveContext+0xec0)($v0) /* 07AB8 80B71458 240940AE */ addiu $t1, $zero, 0x40AE ## $t1 = 000040AE /* 07ABC 80B7145C 304F007F */ andi $t7, $v0, 0x007F ## $t7 = 00000000 /* 07AC0 80B71460 11E00008 */ beq $t7, $zero, .L80B71484 @@ -23,8 +23,8 @@ glabel func_80B71438 /* 07AE4 80B71484 10000010 */ beq $zero, $zero, .L80B714C8 /* 07AE8 80B71488 A489010E */ sh $t1, 0x010E($a0) ## 0000010E .L80B7148C: -/* 07AEC 80B7148C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 07AF0 80B71490 8C42F520 */ lw $v0, -0x0AE0($v0) ## 8015F520 +/* 07AEC 80B7148C 3C028016 */ lui $v0, %hi(gSaveContext+0xec0) +/* 07AF0 80B71490 8C42F520 */ lw $v0, %lo(gSaveContext+0xec0)($v0) /* 07AF4 80B71494 3C017F00 */ lui $at, 0x7F00 ## $at = 7F000000 /* 07AF8 80B71498 240E40AE */ addiu $t6, $zero, 0x40AE ## $t6 = 000040AE /* 07AFC 80B7149C 00415024 */ and $t2, $v0, $at diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B77404.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B77404.s index 74b690ad61..51a7741c08 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B77404.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B77404.s @@ -56,9 +56,9 @@ glabel L80B7743C /* 0DAB0 80B77450 3C1980B8 */ lui $t9, %hi(D_80B7E075) ## $t9 = 80B80000 /* 0DAB4 80B77454 9339E075 */ lbu $t9, %lo(D_80B7E075)($t9) /* 0DAB8 80B77458 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 0DABC 80B7745C 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 0DABC 80B7745C 3C068016 */ lui $a2, %hi(gSaveContext) /* 0DAC0 80B77460 1119000E */ beq $t0, $t9, .L80B7749C -/* 0DAC4 80B77464 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 +/* 0DAC4 80B77464 24C6E660 */ addiu $a2, %lo(gSaveContext) /* 0DAC8 80B77468 8CC30EC0 */ lw $v1, 0x0EC0($a2) ## 8015F520 /* 0DACC 80B7746C 8FAE0038 */ lw $t6, 0x0038($sp) /* 0DAD0 80B77470 30690100 */ andi $t1, $v1, 0x0100 ## $t1 = 00000000 @@ -93,8 +93,8 @@ glabel L80B7743C /* 0DB30 80B774D0 8FA40038 */ lw $a0, 0x0038($sp) /* 0DB34 80B774D4 0C00BC65 */ jal func_8002F194 /* 0DB38 80B774D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0DB3C 80B774DC 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 0DB40 80B774E0 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 +/* 0DB3C 80B774DC 3C068016 */ lui $a2, %hi(gSaveContext) +/* 0DB40 80B774E0 24C6E660 */ addiu $a2, %lo(gSaveContext) /* 0DB44 80B774E4 10400016 */ beq $v0, $zero, .L80B77540 /* 0DB48 80B774E8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 0DB4C 80B774EC 3C0D80B8 */ lui $t5, %hi(D_80B7E0AC) ## $t5 = 80B80000 @@ -142,8 +142,8 @@ glabel L80B77558 /* 0DBE4 80B77584 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 /* 0DBE8 80B77588 00501021 */ addu $v0, $v0, $s0 /* 0DBEC 80B7758C 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 0DBF0 80B77590 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 0DBF4 80B77594 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 +/* 0DBF0 80B77590 3C068016 */ lui $a2, %hi(gSaveContext) +/* 0DBF4 80B77594 24C6E660 */ addiu $a2, %lo(gSaveContext) /* 0DBF8 80B77598 10400005 */ beq $v0, $zero, .L80B775B0 /* 0DBFC 80B7759C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 0DC00 80B775A0 10480022 */ beq $v0, $t0, .L80B7762C @@ -336,9 +336,9 @@ glabel L80B777F0 /* 0DEB0 80B77850 A428E0AC */ sh $t0, %lo(D_80B7E0AC)($at) /* 0DEB4 80B77854 3C0180B8 */ lui $at, %hi(D_80B7A684) ## $at = 80B80000 /* 0DEB8 80B77858 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 0DEBC 80B7785C 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 0DEBC 80B7785C 3C068016 */ lui $a2, %hi(gSaveContext) /* 0DEC0 80B77860 A438A684 */ sh $t8, %lo(D_80B7A684)($at) -/* 0DEC4 80B77864 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 +/* 0DEC4 80B77864 24C6E660 */ addiu $a2, %lo(gSaveContext) /* 0DEC8 80B77868 A520015C */ sh $zero, 0x015C($t1) ## 0000015C /* 0DECC 80B7786C 8CC30EC0 */ lw $v1, 0x0EC0($a2) ## 8015F520 /* 0DED0 80B77870 3C0400FF */ lui $a0, 0x00FF ## $a0 = 00FF0000 @@ -659,12 +659,12 @@ glabel L80B77C74 /* 0E348 80B77CE8 E4480000 */ swc1 $f8, 0x0000($v0) ## 80B7A670 /* 0E34C 80B77CEC 9084E075 */ lbu $a0, %lo(D_80B7E075)($a0) /* 0E350 80B77CF0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 0E354 80B77CF4 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 0E354 80B77CF4 3C068016 */ lui $a2, %hi(gSaveContext) /* 0E358 80B77CF8 5504002F */ bnel $t0, $a0, .L80B77DB8 /* 0E35C 80B77CFC C4E00000 */ lwc1 $f0, 0x0000($a3) ## 80B7E078 /* 0E360 80B77D00 C4E00000 */ lwc1 $f0, 0x0000($a3) ## 80B7E078 -/* 0E364 80B77D04 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 0E368 80B77D08 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 +/* 0E364 80B77D04 3C068016 */ lui $a2, %hi(gSaveContext) +/* 0E368 80B77D08 24C6E660 */ addiu $a2, %lo(gSaveContext) /* 0E36C 80B77D0C 4600028D */ trunc.w.s $f10, $f0 /* 0E370 80B77D10 8CCF0EC0 */ lw $t7, 0x0EC0($a2) ## 8015F520 /* 0E374 80B77D14 2401FF00 */ addiu $at, $zero, 0xFF00 ## $at = FFFFFF00 @@ -710,7 +710,7 @@ glabel L80B77C74 /* 0E410 80B77DB0 A5C0015C */ sh $zero, 0x015C($t6) ## 80B8015C /* 0E414 80B77DB4 C4E00000 */ lwc1 $f0, 0x0000($a3) ## 80B7E078 .L80B77DB8: -/* 0E418 80B77DB8 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015CCC0 +/* 0E418 80B77DB8 24C6E660 */ addiu $a2, %lo(gSaveContext) /* 0E41C 80B77DBC 8CCF0EC0 */ lw $t7, 0x0EC0($a2) ## 8015DB80 /* 0E420 80B77DC0 4600048D */ trunc.w.s $f18, $f0 /* 0E424 80B77DC4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s index 76cd092375..d0235d45f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s @@ -311,9 +311,9 @@ glabel func_80B7825C /* 0EB30 80B784D0 C44A0008 */ lwc1 $f10, 0x0008($v0) ## 80B7E098 /* 0EB34 80B784D4 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 0EB38 80B784D8 460C6202 */ mul.s $f8, $f12, $f12 -/* 0EB3C 80B784DC 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 0EB3C 80B784DC 3C0B8016 */ lui $t3, %hi(gGameInfo) /* 0EB40 80B784E0 46045381 */ sub.s $f14, $f10, $f4 -/* 0EB44 80B784E4 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 0EB44 80B784E4 3C198016 */ lui $t9, %hi(gGameInfo) /* 0EB48 80B784E8 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 0EB4C 80B784EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0EB50 80B784F0 460E7102 */ mul.s $f4, $f14, $f14 @@ -325,12 +325,12 @@ glabel func_80B7825C /* 0EB68 80B78508 00000000 */ nop /* 0EB6C 80B7850C 45010005 */ bc1t .L80B78524 /* 0EB70 80B78510 00000000 */ nop -/* 0EB74 80B78514 8D6BFA90 */ lw $t3, -0x0570($t3) ## 8015FA90 +/* 0EB74 80B78514 8D6BFA90 */ lw $t3, %lo(gGameInfo)($t3) /* 0EB78 80B78518 85780A6E */ lh $t8, 0x0A6E($t3) ## 80160A6E /* 0EB7C 80B7851C 1B000008 */ blez $t8, .L80B78540 /* 0EB80 80B78520 00000000 */ nop .L80B78524: -/* 0EB84 80B78524 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 0EB84 80B78524 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 0EB88 80B78528 24054087 */ addiu $a1, $zero, 0x4087 ## $a1 = 00004087 /* 0EB8C 80B7852C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0EB90 80B78530 A7200A6E */ sh $zero, 0x0A6E($t9) ## 80160A6E @@ -341,24 +341,24 @@ glabel func_80B7825C /* 0EBA0 80B78540 3C0780B8 */ lui $a3, %hi(D_80B7A688) ## $a3 = 80B80000 /* 0EBA4 80B78544 24E7A688 */ addiu $a3, $a3, %lo(D_80B7A688) ## $a3 = 80B7A688 /* 0EBA8 80B78548 90E30000 */ lbu $v1, 0x0000($a3) ## 80B7A688 -/* 0EBAC 80B7854C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0EBB0 80B78550 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0EBAC 80B7854C 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0EBB0 80B78550 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0EBB4 80B78554 14600007 */ bne $v1, $zero, .L80B78574 /* 0EBB8 80B78558 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0EBBC 80B7855C 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 0EBC0 80B78560 8D4AF520 */ lw $t2, -0x0AE0($t2) ## 8015F520 -/* 0EBC4 80B78564 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 0EBBC 80B7855C 3C0A8016 */ lui $t2, %hi(gSaveContext+0xec0) +/* 0EBC0 80B78560 8D4AF520 */ lw $t2, %lo(gSaveContext+0xec0)($t2) +/* 0EBC4 80B78564 3C018016 */ lui $at, %hi(gSaveContext+0xec0) /* 0EBC8 80B78568 354C1000 */ ori $t4, $t2, 0x1000 ## $t4 = 80161000 /* 0EBCC 80B7856C 10000008 */ beq $zero, $zero, .L80B78590 -/* 0EBD0 80B78570 AC2CF520 */ sw $t4, -0x0AE0($at) ## 8015F520 +/* 0EBD0 80B78570 AC2CF520 */ sw $t4, %lo(gSaveContext+0xec0)($at) .L80B78574: /* 0EBD4 80B78574 14610006 */ bne $v1, $at, .L80B78590 -/* 0EBD8 80B78578 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 0EBDC 80B7857C 8DADF520 */ lw $t5, -0x0AE0($t5) ## 8015F520 +/* 0EBD8 80B78578 3C0D8016 */ lui $t5, %hi(gSaveContext+0xec0) +/* 0EBDC 80B7857C 8DADF520 */ lw $t5, %lo(gSaveContext+0xec0)($t5) /* 0EBE0 80B78580 2401EFFF */ addiu $at, $zero, 0xEFFF ## $at = FFFFEFFF /* 0EBE4 80B78584 01A17024 */ and $t6, $t5, $at -/* 0EBE8 80B78588 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 0EBEC 80B7858C AC2EF520 */ sw $t6, -0x0AE0($at) ## 8015F520 +/* 0EBE8 80B78588 3C018016 */ lui $at, %hi(gSaveContext+0xec0) +/* 0EBEC 80B7858C AC2EF520 */ sw $t6, %lo(gSaveContext+0xec0)($at) .L80B78590: /* 0EBF0 80B78590 844F0A6E */ lh $t7, 0x0A6E($v0) ## 80160A6E /* 0EBF4 80B78594 3C0380B8 */ lui $v1, %hi(D_80B7A67C) ## $v1 = 80B80000 @@ -514,8 +514,8 @@ glabel func_80B7825C /* 0EE30 80B787D0 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 101400FF /* 0EE34 80B787D4 8FA800E4 */ lw $t0, 0x00E4($sp) .L80B787D8: -/* 0EE38 80B787D8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0EE3C 80B787DC 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0EE38 80B787D8 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0EE3C 80B787DC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0EE40 80B787E0 3C0180B8 */ lui $at, %hi(D_80B7E0B6) ## $at = 80B80000 /* 0EE44 80B787E4 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 /* 0EE48 80B787E8 844B09D4 */ lh $t3, 0x09D4($v0) ## 801609D4 @@ -1671,8 +1671,8 @@ glabel L80B7955C /* 0FF30 80B798D0 1420FFB7 */ bne $at, $zero, .L80B797B0 /* 0FF34 80B798D4 A7A200A2 */ sh $v0, 0x00A2($sp) .L80B798D8: -/* 0FF38 80B798D8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0FF3C 80B798DC 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0FF38 80B798D8 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0FF3C 80B798DC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0FF40 80B798E0 84440C32 */ lh $a0, 0x0C32($v0) ## 80160C32 /* 0FF44 80B798E4 10800019 */ beq $a0, $zero, .L80B7994C /* 0FF48 80B798E8 3C0580B8 */ lui $a1, %hi(D_80B7A654) ## $a1 = 80B80000 @@ -1686,8 +1686,8 @@ glabel L80B7955C /* 0FF68 80B79908 00300821 */ addu $at, $at, $s0 /* 0FF6C 80B7990C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 0FF70 80B79910 A02D0B01 */ sb $t5, 0x0B01($at) ## 00010B01 -/* 0FF74 80B79914 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0FF78 80B79918 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0FF74 80B79914 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0FF78 80B79918 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0FF7C 80B7991C 84430C32 */ lh $v1, 0x0C32($v0) ## 80160C32 /* 0FF80 80B79920 10000008 */ beq $zero, $zero, .L80B79944 /* 0FF84 80B79924 2463FFFF */ addiu $v1, $v1, 0xFFFF ## $v1 = FFFFFFFE @@ -1695,8 +1695,8 @@ glabel L80B7955C /* 0FF88 80B79928 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0FF8C 80B7992C 00300821 */ addu $at, $at, $s0 /* 0FF90 80B79930 A02E0B01 */ sb $t6, 0x0B01($at) ## 00010B01 -/* 0FF94 80B79934 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0FF98 80B79938 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0FF94 80B79934 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0FF98 80B79938 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0FF9C 80B7993C 84430C32 */ lh $v1, 0x0C32($v0) ## 80160C32 /* 0FFA0 80B79940 2463FFFF */ addiu $v1, $v1, 0xFFFF ## $v1 = FFFFFFFD .L80B79944: @@ -1712,8 +1712,8 @@ glabel L80B7955C /* 0FFC4 80B79964 00300821 */ addu $at, $at, $s0 /* 0FFC8 80B79968 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 0FFCC 80B7996C A02B0B01 */ sb $t3, 0x0B01($at) ## 00010B01 -/* 0FFD0 80B79970 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0FFD4 80B79974 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0FFD0 80B79970 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0FFD4 80B79974 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0FFD8 80B79978 84430C30 */ lh $v1, 0x0C30($v0) ## 80160C30 .L80B7997C: /* 0FFDC 80B7997C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF @@ -1722,18 +1722,18 @@ glabel L80B7955C /* 0FFE8 80B79988 00300821 */ addu $at, $at, $s0 /* 0FFEC 80B7998C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 0FFF0 80B79990 A0380B01 */ sb $t8, 0x0B01($at) ## 00010B01 -/* 0FFF4 80B79994 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0FFF8 80B79998 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0FFF4 80B79994 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0FFF8 80B79998 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) .L80B7999C: /* 0FFFC 80B7999C 0C00084C */ jal osSyncPrintf /* 10000 80B799A0 A4400C30 */ sh $zero, 0x0C30($v0) ## 80160C30 -/* 10004 80B799A4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 10004 80B799A4 3C028016 */ lui $v0, %hi(gSaveContext+0xc) /* 10008 80B799A8 3C0480B8 */ lui $a0, %hi(D_80B7B2C0) ## $a0 = 80B80000 /* 1000C 80B799AC 2484B2C0 */ addiu $a0, $a0, %lo(D_80B7B2C0) ## $a0 = 80B7B2C0 /* 10010 80B799B0 0C00084C */ jal osSyncPrintf -/* 10014 80B799B4 9445E66C */ lhu $a1, -0x1994($v0) ## 8015E66C +/* 10014 80B799B4 9445E66C */ lhu $a1, %lo(gSaveContext+0xc)($v0) /* 10018 80B799B8 3C0480B8 */ lui $a0, %hi(D_80B7B2D0) ## $a0 = 80B80000 /* 1001C 80B799BC 0C00084C */ jal osSyncPrintf @@ -2169,9 +2169,9 @@ glabel L80B7955C /* 10640 80B79FE0 3C1880B8 */ lui $t8, %hi(D_80B7A678) ## $t8 = 80B80000 /* 10644 80B79FE4 9718A678 */ lhu $t8, %lo(D_80B7A678)($t8) /* 10648 80B79FE8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 1064C 80B79FEC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 1064C 80B79FEC 3C028016 */ lui $v0, %hi(gGameInfo) /* 10650 80B79FF0 44982000 */ mtc1 $t8, $f4 ## $f4 = -0.00 -/* 10654 80B79FF4 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 10654 80B79FF4 3C0A8016 */ lui $t2, %hi(gGameInfo) /* 10658 80B79FF8 07010004 */ bgez $t8, .L80B7A00C /* 1065C 80B79FFC 46802020 */ cvt.s.w $f0, $f4 /* 10660 80B7A000 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 @@ -2220,15 +2220,15 @@ glabel L80B7955C /* 10700 80B7A0A0 05E0FFFB */ bltz $t7, .L80B7A090 /* 10704 80B7A0A4 00000000 */ nop .L80B7A0A8: -/* 10708 80B7A0A8 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 1070C 80B7A0AC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 10710 80B7A0B0 A42FFA66 */ sh $t7, -0x059A($at) ## 8015FA66 +/* 10708 80B7A0A8 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) +/* 1070C 80B7A0AC 3C018016 */ lui $at, %hi(gSaveContext+0x1406) +/* 10710 80B7A0B0 A42FFA66 */ sh $t7, %lo(gSaveContext+0x1406)($at) /* 10714 80B7A0B4 84491308 */ lh $t1, 0x1308($v0) ## 80161308 /* 10718 80B7A0B8 44D9F800 */ ctc1 $t9, $31 /* 1071C 80B7A0BC 11200009 */ beq $t1, $zero, .L80B7A0E4 /* 10720 80B7A0C0 00000000 */ nop /* 10724 80B7A0C4 A4401308 */ sh $zero, 0x1308($v0) ## 80161308 -/* 10728 80B7A0C8 8D4AFA90 */ lw $t2, -0x0570($t2) ## 8015FA90 +/* 10728 80B7A0C8 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) /* 1072C 80B7A0CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 10730 80B7A0D0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 10734 80B7A0D4 8545130A */ lh $a1, 0x130A($t2) ## 8016130A @@ -2237,8 +2237,8 @@ glabel L80B7955C /* 10740 80B7A0E0 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 0000407B .L80B7A0E4: /* 10744 80B7A0E4 3C0480B8 */ lui $a0, %hi(D_80B7B2D4) ## $a0 = 80B80000 -/* 10748 80B7A0E8 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 1074C 80B7A0EC 8CA5F520 */ lw $a1, -0x0AE0($a1) ## 8015F520 +/* 10748 80B7A0E8 3C058016 */ lui $a1, %hi(gSaveContext+0xec0) +/* 1074C 80B7A0EC 8CA5F520 */ lw $a1, %lo(gSaveContext+0xec0)($a1) /* 10750 80B7A0F0 0C00084C */ jal osSyncPrintf /* 10754 80B7A0F4 2484B2D4 */ addiu $a0, $a0, %lo(D_80B7B2D4) ## $a0 = 80B7B2D4 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A140.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A140.s index 70edec1890..54a4108297 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A140.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A140.s @@ -43,11 +43,11 @@ glabel func_80B7A140 /* 1081C 80B7A1BC AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 10820 80B7A1C0 00095080 */ sll $t2, $t1, 2 /* 10824 80B7A1C4 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 10828 80B7A1C8 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 10828 80B7A1C8 3C0B8016 */ lui $t3, %hi(gSegments) /* 1082C 80B7A1CC 016A5821 */ addu $t3, $t3, $t2 /* 10830 80B7A1D0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 10834 80B7A1D4 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 10838 80B7A1D8 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 +/* 10838 80B7A1D8 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) /* 1083C 80B7A1DC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 10840 80B7A1E0 00816024 */ and $t4, $a0, $at /* 10844 80B7A1E4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -67,11 +67,11 @@ glabel func_80B7A140 /* 10878 80B7A218 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 /* 1087C 80B7A21C AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 10880 80B7A220 00095080 */ sll $t2, $t1, 2 -/* 10884 80B7A224 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 10884 80B7A224 3C0B8016 */ lui $t3, %hi(gSegments) /* 10888 80B7A228 016A5821 */ addu $t3, $t3, $t2 /* 1088C 80B7A22C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 10890 80B7A230 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 10894 80B7A234 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 +/* 10894 80B7A234 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) /* 10898 80B7A238 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 1089C 80B7A23C 00816024 */ and $t4, $a0, $at /* 108A0 80B7A240 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s index fcd44c5718..b0083858b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s @@ -69,7 +69,7 @@ glabel func_80B7A278 /* 10974 80B7A314 AD2E02C0 */ sw $t6, 0x02C0($t1) ## 000002C0 /* 10978 80B7A318 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 1097C 80B7A31C 85180160 */ lh $t8, 0x0160($t0) ## 00000160 -/* 10980 80B7A320 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 10980 80B7A320 3C0E8016 */ lui $t6, %hi(gSegments) /* 10984 80B7A324 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 10988 80B7A328 0018C880 */ sll $t9, $t8, 2 /* 1098C 80B7A32C 00992021 */ addu $a0, $a0, $t9 @@ -80,7 +80,7 @@ glabel func_80B7A278 /* 109A0 80B7A340 000B6702 */ srl $t4, $t3, 28 /* 109A4 80B7A344 000C6880 */ sll $t5, $t4, 2 /* 109A8 80B7A348 01CD7021 */ addu $t6, $t6, $t5 -/* 109AC 80B7A34C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 109AC 80B7A34C 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 109B0 80B7A350 00815024 */ and $t2, $a0, $at /* 109B4 80B7A354 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 109B8 80B7A358 014E7821 */ addu $t7, $t2, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/ItemEtcetera_Init.s b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/ItemEtcetera_Init.s index 03794a6e66..6e7e70bf83 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/ItemEtcetera_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/ItemEtcetera_Init.s @@ -118,8 +118,8 @@ glabel L80B85710 /* 0012C 80B8571C 3C0A80B8 */ lui $t2, %hi(func_80B858B4) ## $t2 = 80B80000 /* 00130 80B85720 254A58B4 */ addiu $t2, $t2, %lo(func_80B858B4) ## $t2 = 80B858B4 /* 00134 80B85724 AE0A014C */ sw $t2, 0x014C($s0) ## 0000014C -/* 00138 80B85728 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 0013C 80B8572C 956BF53A */ lhu $t3, -0x0AC6($t3) ## 8015F53A +/* 00138 80B85728 3C0B8016 */ lui $t3, %hi(gSaveContext+0xeda) +/* 0013C 80B8572C 956BF53A */ lhu $t3, %lo(gSaveContext+0xeda)($t3) /* 00140 80B85730 316C0002 */ andi $t4, $t3, 0x0002 ## $t4 = 00000000 /* 00144 80B85734 5180001F */ beql $t4, $zero, .L80B857B4 /* 00148 80B85738 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85824.s b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85824.s index 8b41e98780..59f9edf2da 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85824.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85824.s @@ -9,10 +9,10 @@ glabel func_80B85824 /* 00250 80B85840 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00254 80B85844 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 00258 80B85848 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0025C 80B8584C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 0025C 80B8584C 3C028016 */ lui $v0, %hi(gSaveContext) /* 00260 80B85850 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 /* 00264 80B85854 15E10007 */ bne $t7, $at, .L80B85874 -/* 00268 80B85858 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00268 80B85858 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0026C 80B8585C 94580EDA */ lhu $t8, 0x0EDA($v0) ## 8015F53A /* 00270 80B85860 8FA4002C */ lw $a0, 0x002C($sp) /* 00274 80B85864 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B858B4.s b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B858B4.s index 118c8e1e35..e224c1f7b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B858B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B858B4.s @@ -15,10 +15,10 @@ glabel func_80B858B4 /* 002E4 80B858D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002E8 80B858D8 862E001C */ lh $t6, 0x001C($s1) ## 0000001C /* 002EC 80B858DC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 002F0 80B858E0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 002F0 80B858E0 3C028016 */ lui $v0, %hi(gSaveContext) /* 002F4 80B858E4 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 /* 002F8 80B858E8 15E10007 */ bne $t7, $at, .L80B85908 -/* 002FC 80B858EC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 002FC 80B858EC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00300 80B858F0 94580EDA */ lhu $t8, 0x0EDA($v0) ## 8015F53A /* 00304 80B858F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00308 80B858F8 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Init.s b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Init.s index 966cf7249b..77ae68b980 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/ItemOcarina_Init.s @@ -64,8 +64,8 @@ glabel ItemOcarina_Init /* 000C0 80B861F0 3C0580B8 */ lui $a1, %hi(func_80B866BC) ## $a1 = 80B80000 /* 000C4 80B861F4 0C2E184C */ jal func_80B86130 /* 000C8 80B861F8 24A566BC */ addiu $a1, $a1, %lo(func_80B866BC) ## $a1 = 80B866BC -/* 000CC 80B861FC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 000D0 80B86200 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 000CC 80B861FC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 000D0 80B86200 2442E660 */ addiu $v0, %lo(gSaveContext) /* 000D4 80B86204 944F0EE4 */ lhu $t7, 0x0EE4($v0) ## 8015F544 /* 000D8 80B86208 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 /* 000DC 80B8620C 13000007 */ beq $t8, $zero, .L80B8622C diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B8664C.s b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B8664C.s index 9a40c5d46b..992b982a02 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B8664C.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B8664C.s @@ -4,7 +4,7 @@ glabel func_80B8664C /* 00524 80B86654 0C00BCCD */ jal func_8002F334 /* 00528 80B86658 AFA5001C */ sw $a1, 0x001C($sp) /* 0052C 80B8665C 10400013 */ beq $v0, $zero, .L80B866AC -/* 00530 80B86660 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 00530 80B86660 3C198016 */ lui $t9, %hi(gSegments) /* 00534 80B86664 3C020201 */ lui $v0, 0x0201 ## $v0 = 02010000 /* 00538 80B86668 2442F870 */ addiu $v0, $v0, 0xF870 ## $v0 = 0200F870 /* 0053C 80B8666C 00027100 */ sll $t6, $v0, 4 @@ -12,17 +12,17 @@ glabel func_80B8664C /* 00544 80B86674 000FC080 */ sll $t8, $t7, 2 /* 00548 80B86678 0338C821 */ addu $t9, $t9, $t8 /* 0054C 80B8667C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00550 80B86680 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 00550 80B86680 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 00554 80B86684 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00558 80B86688 00414024 */ and $t0, $v0, $at /* 0055C 80B8668C 8FAB001C */ lw $t3, 0x001C($sp) /* 00560 80B86690 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00564 80B86694 03284821 */ addu $t1, $t9, $t0 /* 00568 80B86698 01215021 */ addu $t2, $t1, $at -/* 0056C 80B8669C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 0056C 80B8669C 3C018016 */ lui $at, %hi(gSaveContext+0x1414) /* 00570 80B866A0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 00574 80B866A4 AD6A1D68 */ sw $t2, 0x1D68($t3) ## 00001D68 -/* 00578 80B866A8 A02CFA74 */ sb $t4, -0x058C($at) ## 8015FA74 +/* 00578 80B866A8 A02CFA74 */ sb $t4, %lo(gSaveContext+0x1414)($at) .L80B866AC: /* 0057C 80B866AC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00580 80B866B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B866BC.s b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B866BC.s index f9498c9306..ccd1a7fc54 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B866BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Ocarina/func_80B866BC.s @@ -13,8 +13,8 @@ glabel func_80B866BC /* 005A4 80B866D4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 005A8 80B866D8 1040000E */ beq $v0, $zero, .L80B86714 /* 005AC 80B866DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005B0 80B866E0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 005B4 80B866E4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 005B0 80B866E0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 005B4 80B866E4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 005B8 80B866E8 944E0EDC */ lhu $t6, 0x0EDC($v0) ## 8015F53C /* 005BC 80B866EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 005C0 80B866F0 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Draw.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Draw.s index 2da7263cc0..6eaeb68dc4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Draw.s @@ -54,11 +54,11 @@ glabel ItemShield_Draw /* 00810 80B87130 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 /* 00814 80B87134 000E7880 */ sll $t7, $t6, 2 /* 00818 80B87138 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 0081C 80B8713C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0081C 80B8713C 3C188016 */ lui $t8, %hi(gSegments) /* 00820 80B87140 030FC021 */ addu $t8, $t8, $t7 /* 00824 80B87144 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00828 80B87148 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 0082C 80B8714C 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 0082C 80B8714C 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 00830 80B87150 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00834 80B87154 0081C824 */ and $t9, $a0, $at /* 00838 80B87158 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Destroy.s index 6015c7f714..951171d50b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Destroy.s @@ -1,6 +1,6 @@ glabel MagicDark_Destroy -/* 000E0 80B874B0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 000E4 80B874B4 85CEFA28 */ lh $t6, -0x05D8($t6) ## 8015FA28 +/* 000E0 80B874B0 3C0E8016 */ lui $t6, %hi(gSaveContext+0x13c8) +/* 000E4 80B874B4 85CEFA28 */ lh $t6, %lo(gSaveContext+0x13c8)($t6) /* 000E8 80B874B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 000EC 80B874BC AFA40018 */ sw $a0, 0x0018($sp) /* 000F0 80B874C0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Init.s b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Init.s index 781f74b527..24fde1e43d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Init.s @@ -13,8 +13,8 @@ glabel D_80B88BB8 .text glabel MagicDark_Init -/* 00000 80B873D0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00004 80B873D4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00000 80B873D0 3C038016 */ lui $v1, %hi(gSaveContext) +/* 00004 80B873D4 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00008 80B873D8 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 /* 0000C 80B873DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00010 80B873E0 AFBF0014 */ sw $ra, 0x0014($sp) @@ -40,9 +40,9 @@ glabel MagicDark_Init /* 00058 80B87428 AFA40018 */ sw $a0, 0x0018($sp) /* 0005C 80B8742C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00060 80B87430 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 00060 80B87430 3C038016 */ lui $v1, %hi(gSaveContext) /* 00064 80B87434 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 00068 80B87438 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00068 80B87438 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0006C 80B8743C A0990003 */ sb $t9, 0x0003($a0) ## 00000003 /* 00070 80B87440 846813C8 */ lh $t0, 0x13C8($v1) ## 8015FA28 /* 00074 80B87444 3C0980B8 */ lui $t1, %hi(func_80B874E4) ## $t1 = 80B80000 diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B874E4.s b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B874E4.s index cffe500c5f..05864e67e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B874E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B874E4.s @@ -21,8 +21,8 @@ glabel func_80B874E4 /* 0011C 80B874EC AFBF0014 */ sw $ra, 0x0014($sp) /* 00120 80B874F0 00451021 */ addu $v0, $v0, $a1 /* 00124 80B874F4 904203DC */ lbu $v0, 0x03DC($v0) ## 000103DC -/* 00128 80B874F8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 0012C 80B874FC 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 00128 80B874F8 3C088016 */ lui $t0, %hi(gSaveContext) +/* 0012C 80B874FC 2508E660 */ addiu $t0, %lo(gSaveContext) /* 00130 80B87500 2409000D */ addiu $t1, $zero, 0x000D ## $t1 = 0000000D /* 00134 80B87504 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00138 80B87508 8CA71C44 */ lw $a3, 0x1C44($a1) ## 00001C44 @@ -150,10 +150,10 @@ glabel func_80B874E4 /* 002F0 80B876C0 A7A30018 */ sh $v1, 0x0018($sp) /* 002F4 80B876C4 8FA60028 */ lw $a2, 0x0028($sp) /* 002F8 80B876C8 87A30018 */ lh $v1, 0x0018($sp) -/* 002FC 80B876CC 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 002FC 80B876CC 3C088016 */ lui $t0, %hi(gSaveContext) /* 00300 80B876D0 84D90032 */ lh $t9, 0x0032($a2) ## 00000032 /* 00304 80B876D4 84CA014C */ lh $t2, 0x014C($a2) ## 0000014C -/* 00308 80B876D8 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 00308 80B876D8 2508E660 */ addiu $t0, %lo(gSaveContext) /* 0030C 80B876DC 0059C021 */ addu $t8, $v0, $t9 /* 00310 80B876E0 254B0001 */ addiu $t3, $t2, 0x0001 ## $t3 = 00000001 /* 00314 80B876E4 A4D800B6 */ sh $t8, 0x00B6($a2) ## 000000B6 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Init.s index 027e9acf07..a7e3cfdd0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Init.s @@ -46,8 +46,8 @@ glabel ObjBean_Init /* 01014 80B8FA94 0C01E037 */ jal Actor_ProcessInitChain /* 01018 80B8FA98 24A50EA8 */ addiu $a1, $a1, %lo(D_80B90EA8) ## $a1 = 80B90EA8 -/* 0101C 80B8FA9C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 01020 80B8FAA0 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 +/* 0101C 80B8FA9C 3C0E8016 */ lui $t6, %hi(gSaveContext+4) +/* 01020 80B8FAA0 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) /* 01024 80B8FAA4 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 /* 01028 80B8FAA8 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 /* 0102C 80B8FAAC 11C00003 */ beq $t6, $zero, .L80B8FABC @@ -63,8 +63,8 @@ glabel ObjBean_Init /* 01050 80B8FAD0 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 /* 01054 80B8FAD4 14400006 */ bne $v0, $zero, .L80B8FAF0 -/* 01058 80B8FAD8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 0105C 80B8FADC 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 01058 80B8FAD8 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 0105C 80B8FADC 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 01060 80B8FAE0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 01064 80B8FAE4 85F81156 */ lh $t8, 0x1156($t7) ## 80161156 /* 01068 80B8FAE8 17010058 */ bne $t8, $at, .L80B8FC4C @@ -151,12 +151,12 @@ glabel ObjBean_Init /* 01180 80B8FC00 0C2E3AA0 */ jal func_80B8EA80 /* 01184 80B8FC04 8FA50024 */ lw $a1, 0x0024($sp) /* 01188 80B8FC08 920D01F7 */ lbu $t5, 0x01F7($s0) ## 000001F7 -/* 0118C 80B8FC0C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 +/* 0118C 80B8FC0C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 01190 80B8FC10 3C07410C */ lui $a3, 0x410C ## $a3 = 410C0000 /* 01194 80B8FC14 35AE0010 */ ori $t6, $t5, 0x0010 ## $t6 = 00000010 /* 01198 80B8FC18 A20E01F7 */ sb $t6, 0x01F7($s0) ## 000001F7 /* 0119C 80B8FC1C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 410CCCCD -/* 011A0 80B8FC20 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC +/* 011A0 80B8FC20 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) /* 011A4 80B8FC24 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 011A8 80B8FC28 0C00AC78 */ jal ActorShape_Init @@ -181,8 +181,8 @@ glabel ObjBean_Init /* 011E8 80B8FC68 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 /* 011EC 80B8FC6C 14400006 */ bne $v0, $zero, .L80B8FC88 -/* 011F0 80B8FC70 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 011F4 80B8FC74 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 011F0 80B8FC70 3C198016 */ lui $t9, %hi(gGameInfo) +/* 011F4 80B8FC74 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 011F8 80B8FC78 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 011FC 80B8FC7C 87281156 */ lh $t0, 0x1156($t9) ## 80161156 /* 01200 80B8FC80 15010005 */ bne $t0, $at, .L80B8FC98 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Update.s index d79004868e..8078d399d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Update.s @@ -73,8 +73,8 @@ glabel ObjBean_Update /* 0211C 80B90B9C 3C0142B0 */ lui $at, 0x42B0 ## $at = 42B00000 /* 02120 80B90BA0 44815000 */ mtc1 $at, $f10 ## $f10 = 88.00 /* 02124 80B90BA4 C6080050 */ lwc1 $f8, 0x0050($s0) ## 00000050 -/* 02128 80B90BA8 3C0A8003 */ lui $t2, 0x8003 ## $t2 = 80030000 -/* 0212C 80B90BAC 254AB5EC */ addiu $t2, $t2, 0xB5EC ## $t2 = 8002B5EC +/* 02128 80B90BA8 3C0A8003 */ lui $t2, %hi(ActorShadow_DrawFunc_Circle) +/* 0212C 80B90BAC 254AB5EC */ addiu $t2, %lo(ActorShadow_DrawFunc_Circle) /* 02130 80B90BB0 460A4402 */ mul.s $f16, $f8, $f10 /* 02134 80B90BB4 AE0A00C0 */ sw $t2, 0x00C0($s0) ## 000000C0 /* 02138 80B90BB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF80.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF80.s index a3b20b10eb..79bbcbf3d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF80.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EF80.s @@ -10,13 +10,13 @@ glabel func_80B8EF80 /* 00520 80B8EFA0 001940C0 */ sll $t0, $t9, 3 /* 00524 80B8EFA4 01C81821 */ addu $v1, $t6, $t0 /* 00528 80B8EFA8 8C620004 */ lw $v0, 0x0004($v1) ## 00000004 -/* 0052C 80B8EFAC 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 0052C 80B8EFAC 3C0C8016 */ lui $t4, %hi(gSegments) /* 00530 80B8EFB0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00534 80B8EFB4 00024900 */ sll $t1, $v0, 4 /* 00538 80B8EFB8 00095702 */ srl $t2, $t1, 28 /* 0053C 80B8EFBC 000A5880 */ sll $t3, $t2, 2 /* 00540 80B8EFC0 018B6021 */ addu $t4, $t4, $t3 -/* 00544 80B8EFC4 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 00544 80B8EFC4 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 00548 80B8EFC8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0054C 80B8EFCC 00416824 */ and $t5, $v0, $at /* 00550 80B8EFD0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EFF4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EFF4.s index 22e908dfac..32912add97 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EFF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EFF4.s @@ -25,12 +25,12 @@ glabel func_80B8EFF4 /* 005CC 80B8F04C 010C3021 */ addu $a2, $t0, $t4 /* 005D0 80B8F050 8CC30004 */ lw $v1, 0x0004($a2) ## 00000004 /* 005D4 80B8F054 860A01F4 */ lh $t2, 0x01F4($s0) ## 000001F4 -/* 005D8 80B8F058 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 005DC 80B8F05C 00036900 */ sll $t5, $v1, 4 -/* 005E0 80B8F060 000D7702 */ srl $t6, $t5, 28 -/* 005E4 80B8F064 000E7880 */ sll $t7, $t6, 2 -/* 005E8 80B8F068 030FC021 */ addu $t8, $t8, $t7 -/* 005EC 80B8F06C 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 005D8 80B8F058 3C188016 */ lui $t8, %hi(gSegments) +/* 005DC 80B8F05C 00036900 */ sll $t5, $v1, 4 +/* 005E0 80B8F060 000D7702 */ srl $t6, $t5, 28 +/* 005E4 80B8F064 000E7880 */ sll $t7, $t6, 2 +/* 005E8 80B8F068 030FC021 */ addu $t8, $t8, $t7 +/* 005EC 80B8F06C 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 005F0 80B8F070 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 005F4 80B8F074 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 005F8 80B8F078 000A5880 */ sll $t3, $t2, 2 @@ -61,9 +61,9 @@ glabel func_80B8EFF4 /* 00654 80B8F0D4 46000386 */ mov.s $f14, $f0 /* 00658 80B8F0D8 4610103C */ c.lt.s $f2, $f16 /* 0065C 80B8F0DC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00660 80B8F0E0 8FA80074 */ lw $t0, 0x0074($sp) -/* 00664 80B8F0E4 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00668 80B8F0E8 45000003 */ bc1f .L80B8F0F8 +/* 00660 80B8F0E0 8FA80074 */ lw $t0, 0x0074($sp) +/* 00664 80B8F0E4 3C0F8016 */ lui $t7, %hi(gSegments) +/* 00668 80B8F0E8 45000003 */ bc1f .L80B8F0F8 /* 0066C 80B8F0EC 27A5005C */ addiu $a1, $sp, 0x005C ## $a1 = FFFFFFE4 /* 00670 80B8F0F0 10000002 */ beq $zero, $zero, .L80B8F0FC /* 00674 80B8F0F4 46008306 */ mov.s $f12, $f16 @@ -76,18 +76,18 @@ glabel func_80B8EFF4 /* 00688 80B8F108 460E1283 */ div.s $f10, $f2, $f14 /* 0068C 80B8F10C 8D030004 */ lw $v1, 0x0004($t0) ## 00000004 /* 00690 80B8F110 860A01F2 */ lh $t2, 0x01F2($s0) ## 000001F2 -/* 00694 80B8F114 8FA40028 */ lw $a0, 0x0028($sp) -/* 00698 80B8F118 00036100 */ sll $t4, $v1, 4 -/* 0069C 80B8F11C 000C6F02 */ srl $t5, $t4, 28 -/* 006A0 80B8F120 000D7080 */ sll $t6, $t5, 2 -/* 006A4 80B8F124 01EE7821 */ addu $t7, $t7, $t6 -/* 006A8 80B8F128 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 -/* 006AC 80B8F12C 000A4880 */ sll $t1, $t2, 2 -/* 006B0 80B8F130 0061C024 */ and $t8, $v1, $at -/* 006B4 80B8F134 012A4823 */ subu $t1, $t1, $t2 -/* 006B8 80B8F138 00094840 */ sll $t1, $t1, 1 -/* 006BC 80B8F13C 01F8C821 */ addu $t9, $t7, $t8 -/* 006C0 80B8F140 03295821 */ addu $t3, $t9, $t1 +/* 00694 80B8F114 8FA40028 */ lw $a0, 0x0028($sp) +/* 00698 80B8F118 00036100 */ sll $t4, $v1, 4 +/* 0069C 80B8F11C 000C6F02 */ srl $t5, $t4, 28 +/* 006A0 80B8F120 000D7080 */ sll $t6, $t5, 2 +/* 006A4 80B8F124 01EE7821 */ addu $t7, $t7, $t6 +/* 006A8 80B8F128 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) +/* 006AC 80B8F12C 000A4880 */ sll $t1, $t2, 2 +/* 006B0 80B8F130 0061C024 */ and $t8, $v1, $at +/* 006B4 80B8F134 012A4823 */ subu $t1, $t1, $t2 +/* 006B8 80B8F138 00094840 */ sll $t1, $t1, 1 +/* 006BC 80B8F13C 01F8C821 */ addu $t9, $t7, $t8 +/* 006C0 80B8F140 03295821 */ addu $t3, $t9, $t1 /* 006C4 80B8F144 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 006C8 80B8F148 01614021 */ addu $t0, $t3, $at /* 006CC 80B8F14C 0C01DF90 */ jal Math_Vec3f_Copy @@ -95,7 +95,7 @@ glabel func_80B8EFF4 /* 006D0 80B8F150 AFA80050 */ sw $t0, 0x0050($sp) /* 006D4 80B8F154 860201F4 */ lh $v0, 0x01F4($s0) ## 000001F4 /* 006D8 80B8F158 860D01F0 */ lh $t5, 0x01F0($s0) ## 000001F0 -/* 006DC 80B8F15C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 006DC 80B8F15C 3C098016 */ lui $t1, %hi(gSegments) /* 006E0 80B8F160 A60201F2 */ sh $v0, 0x01F2($s0) ## 000001F2 /* 006E4 80B8F164 860C01F2 */ lh $t4, 0x01F2($s0) ## 000001F2 /* 006E8 80B8F168 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFC8 @@ -112,17 +112,17 @@ glabel func_80B8EFF4 /* 00710 80B8F190 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00714 80B8F194 8DE30004 */ lw $v1, 0x0004($t7) ## 00000004 /* 00718 80B8F198 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0071C 80B8F19C 000C6880 */ sll $t5, $t4, 2 -/* 00720 80B8F1A0 0003C100 */ sll $t8, $v1, 4 -/* 00724 80B8F1A4 00185702 */ srl $t2, $t8, 28 -/* 00728 80B8F1A8 000AC880 */ sll $t9, $t2, 2 -/* 0072C 80B8F1AC 01394821 */ addu $t1, $t1, $t9 -/* 00730 80B8F1B0 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 -/* 00734 80B8F1B4 01AC6823 */ subu $t5, $t5, $t4 -/* 00738 80B8F1B8 00615824 */ and $t3, $v1, $at -/* 0073C 80B8F1BC 000D6840 */ sll $t5, $t5, 1 -/* 00740 80B8F1C0 012B4021 */ addu $t0, $t1, $t3 -/* 00744 80B8F1C4 010D7021 */ addu $t6, $t0, $t5 +/* 0071C 80B8F19C 000C6880 */ sll $t5, $t4, 2 +/* 00720 80B8F1A0 0003C100 */ sll $t8, $v1, 4 +/* 00724 80B8F1A4 00185702 */ srl $t2, $t8, 28 +/* 00728 80B8F1A8 000AC880 */ sll $t9, $t2, 2 +/* 0072C 80B8F1AC 01394821 */ addu $t1, $t1, $t9 +/* 00730 80B8F1B0 8D296FA8 */ lw $t1, %lo(gSegments)($t1) +/* 00734 80B8F1B4 01AC6823 */ subu $t5, $t5, $t4 +/* 00738 80B8F1B8 00615824 */ and $t3, $v1, $at +/* 0073C 80B8F1BC 000D6840 */ sll $t5, $t5, 1 +/* 00740 80B8F1C0 012B4021 */ addu $t0, $t1, $t3 +/* 00744 80B8F1C4 010D7021 */ addu $t6, $t0, $t5 /* 00748 80B8F1C8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 0074C 80B8F1CC 01C17821 */ addu $t7, $t6, $at /* 00750 80B8F1D0 AFAF004C */ sw $t7, 0x004C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Init.s index c3c6903090..29ab7bce2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Init.s @@ -1,6 +1,6 @@ glabel ObjDekujr_Init -/* 00000 80B92420 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00004 80B92424 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00000 80B92420 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00004 80B92424 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00008 80B92428 8C4E0008 */ lw $t6, 0x0008($v0) ## 8015E668 /* 0000C 80B9242C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00010 80B92430 3401FFF0 */ ori $at, $zero, 0xFFF0 ## $at = 0000FFF0 @@ -28,8 +28,8 @@ glabel ObjDekujr_Init /* 0005C 80B9247C A200019C */ sb $zero, 0x019C($s0) ## 0000019C /* 00060 80B92480 A219019B */ sb $t9, 0x019B($s0) ## 0000019B .L80B92484: -/* 00064 80B92484 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 00068 80B92488 8D087120 */ lw $t0, 0x7120($t0) ## 80127120 +/* 00064 80B92484 3C088012 */ lui $t0, %hi(gBitFlags) +/* 00068 80B92488 8D087120 */ lw $t0, %lo(gBitFlags)($t0) /* 0006C 80B9248C 8C4900A4 */ lw $t1, 0x00A4($v0) ## 000000A4 /* 00070 80B92490 01095024 */ and $t2, $t0, $t1 /* 00074 80B92494 55400006 */ bnel $t2, $zero, .L80B924B0 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Update.s index 420773b24a..2785bbe637 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Update.s @@ -16,8 +16,8 @@ glabel ObjDekujr_Update /* 0037C 80B9279C 0C017713 */ jal Actor_CollisionCheck_SetOT ## CollisionCheck_setOT /* 00380 80B927A0 00812821 */ addu $a1, $a0, $at -/* 00384 80B927A4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00388 80B927A8 8DCEE668 */ lw $t6, -0x1998($t6) ## 8015E668 +/* 00384 80B927A4 3C0E8016 */ lui $t6, %hi(gSaveContext+8) +/* 00388 80B927A8 8DCEE668 */ lw $t6, %lo(gSaveContext+8)($t6) /* 0038C 80B927AC 3401FFF0 */ ori $at, $zero, 0xFFF0 ## $at = 0000FFF0 /* 00390 80B927B0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00394 80B927B4 01C1082A */ slt $at, $t6, $at diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Init.s index ca73c0e5a7..15523fc9a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Init.s @@ -55,8 +55,8 @@ glabel ObjHana_Init /* 000BC 80B9391C 3C0C80B9 */ lui $t4, %hi(D_80B93AC4) ## $t4 = 80B90000 /* 000C0 80B93920 258C3AC4 */ addiu $t4, $t4, %lo(D_80B93AC4) ## $t4 = 80B93AC4 /* 000C4 80B93924 162C0007 */ bne $s1, $t4, .L80B93944 -/* 000C8 80B93928 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 000CC 80B9392C 95ADF53C */ lhu $t5, -0x0AC4($t5) ## 8015F53C +/* 000C8 80B93928 3C0D8016 */ lui $t5, %hi(gSaveContext+0xedc) +/* 000CC 80B9392C 95ADF53C */ lhu $t5, %lo(gSaveContext+0xedc)($t5) /* 000D0 80B93930 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 /* 000D4 80B93934 51C00004 */ beql $t6, $zero, .L80B93948 /* 000D8 80B93938 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Draw.s index ed9c92a3b7..4638751461 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Draw.s @@ -45,13 +45,13 @@ glabel ObjHsblock_Draw /* 00464 80B93FC4 3C0480B9 */ lui $a0, %hi(D_80B940E8) ## $a0 = 80B90000 /* 00468 80B93FC8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0046C 80B93FCC 863800A4 */ lh $t8, 0x00A4($s1) ## 000000A4 -/* 00470 80B93FD0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00470 80B93FD0 3C028016 */ lui $v0, %hi(gGameInfo) /* 00474 80B93FD4 17010003 */ bne $t8, $at, .L80B93FE4 /* 00478 80B93FD8 00000000 */ nop /* 0047C 80B93FDC 10000009 */ beq $zero, $zero, .L80B94004 /* 00480 80B93FE0 248440E8 */ addiu $a0, $a0, %lo(D_80B940E8) ## $a0 = 80B940E8 .L80B93FE4: -/* 00484 80B93FE4 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 00484 80B93FE4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 00488 80B93FE8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFF8 /* 0048C 80B93FEC 8459116E */ lh $t9, 0x116E($v0) ## 8016116E /* 00490 80B93FF0 A3B90048 */ sb $t9, 0x0048($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Init.s index 07ac57380b..60b388ee56 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Init.s @@ -50,8 +50,8 @@ glabel ObjHsblock_Init /* 001C0 80B93D20 0C2E4F6C */ jal func_80B93DB0 /* 001C4 80B93D24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B93D28: -/* 001C8 80B93D28 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 001CC 80B93D2C 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 001C8 80B93D28 3C028016 */ lui $v0, %hi(gGameInfo) +/* 001CC 80B93D2C 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 001D0 80B93D30 8C590000 */ lw $t9, 0x0000($v0) ## 8015FA90 /* 001D4 80B93D34 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF /* 001D8 80B93D38 A723116E */ sh $v1, 0x116E($t9) ## 0000116E diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s index fdd1bc5e6f..ab20d2551b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s @@ -62,12 +62,12 @@ glabel func_80B977D0 /* 00CC8 80B97868 01E95025 */ or $t2, $t7, $t1 ## $t2 = FB000000 /* 00CCC 80B9786C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 00CD0 80B97870 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 00CD4 80B97874 3C088011 */ lui $t0, 0x8011 ## $t0 = 80110000 +/* 00CD4 80B97874 3C088011 */ lui $t0, %hi(D_80116280+0x10) /* 00CD8 80B97878 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 00CDC 80B9787C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 00CE0 80B97880 AE2B02C0 */ sw $t3, 0x02C0($s1) ## 000002C0 /* 00CE4 80B97884 35AD0024 */ ori $t5, $t5, 0x0024 ## $t5 = DB060024 -/* 00CE8 80B97888 25086290 */ addiu $t0, $t0, 0x6290 ## $t0 = 80116290 +/* 00CE8 80B97888 25086290 */ addiu $t0, %lo(D_80116280+0x10) /* 00CEC 80B9788C AC480004 */ sw $t0, 0x0004($v0) ## 00000004 /* 00CF0 80B97890 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 00CF4 80B97894 860E001C */ lh $t6, 0x001C($s0) ## 0000001C @@ -131,7 +131,7 @@ glabel func_80B977D0 /* 00DD0 80B97970 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00DD4 80B97974 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 00DD8 80B97978 3C0480B9 */ lui $a0, %hi(D_80B97F5C) ## $a0 = 80B90000 -/* 00DDC 80B9797C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 00DDC 80B9797C 3C198016 */ lui $t9, %hi(gSegments) /* 00DE0 80B97980 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 00DE4 80B97984 AE2902C0 */ sw $t1, 0x02C0($s1) ## 000002C0 /* 00DE8 80B97988 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 @@ -147,7 +147,7 @@ glabel func_80B977D0 /* 00E10 80B979B0 000EC702 */ srl $t8, $t6, 28 /* 00E14 80B979B4 00186080 */ sll $t4, $t8, 2 /* 00E18 80B979B8 032CC821 */ addu $t9, $t9, $t4 -/* 00E1C 80B979BC 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 00E1C 80B979BC 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 00E20 80B979C0 00814024 */ and $t0, $a0, $at /* 00E24 80B979C4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00E28 80B979C8 01197821 */ addu $t7, $t0, $t9 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s index 0ebb505e84..2ea8366104 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s @@ -62,12 +62,12 @@ glabel func_80B97B50 /* 01048 80B97BE8 01E95025 */ or $t2, $t7, $t1 ## $t2 = FB000000 /* 0104C 80B97BEC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 01050 80B97BF0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 01054 80B97BF4 3C088011 */ lui $t0, 0x8011 ## $t0 = 80110000 +/* 01054 80B97BF4 3C088011 */ lui $t0, %hi(D_80116280) /* 01058 80B97BF8 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 0105C 80B97BFC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 01060 80B97C00 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 /* 01064 80B97C04 35AD0024 */ ori $t5, $t5, 0x0024 ## $t5 = DB060024 -/* 01068 80B97C08 25086280 */ addiu $t0, $t0, 0x6280 ## $t0 = 80116280 +/* 01068 80B97C08 25086280 */ addiu $t0, %lo(D_80116280) /* 0106C 80B97C0C AC480004 */ sw $t0, 0x0004($v0) ## 00000004 /* 01070 80B97C10 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01074 80B97C14 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 @@ -98,7 +98,7 @@ glabel func_80B97B50 /* 010D8 80B97C78 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 010DC 80B97C7C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 010E0 80B97C80 3C0480B9 */ lui $a0, %hi(D_80B97F5C) ## $a0 = 80B90000 -/* 010E4 80B97C84 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 010E4 80B97C84 3C188016 */ lui $t8, %hi(gSegments) /* 010E8 80B97C88 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 010EC 80B97C8C AE3902D0 */ sw $t9, 0x02D0($s1) ## 000002D0 /* 010F0 80B97C90 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 @@ -114,7 +114,7 @@ glabel func_80B97B50 /* 01118 80B97CB8 000D4702 */ srl $t0, $t5, 28 /* 0111C 80B97CBC 00087080 */ sll $t6, $t0, 2 /* 01120 80B97CC0 030EC021 */ addu $t8, $t8, $t6 -/* 01124 80B97CC4 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 01124 80B97CC4 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 01128 80B97CC8 00815824 */ and $t3, $a0, $at /* 0112C 80B97CCC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01130 80B97CD0 01786021 */ addu $t4, $t3, $t8 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Draw.s index b2cfa8317e..64cbb81dcf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Draw.s @@ -41,7 +41,7 @@ glabel ObjOshihiki_Draw /* 0167C 80B9C7FC 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 01680 80B9C800 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 /* 01684 80B9C804 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01688 80B9C808 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 01688 80B9C808 3C0E8016 */ lui $t6, %hi(gSegments) /* 0168C 80B9C80C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01690 80B9C810 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 01694 80B9C814 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 @@ -53,7 +53,7 @@ glabel ObjOshihiki_Draw /* 016AC 80B9C82C 000B6702 */ srl $t4, $t3, 28 /* 016B0 80B9C830 000C6880 */ sll $t5, $t4, 2 /* 016B4 80B9C834 01CD7021 */ addu $t6, $t6, $t5 -/* 016B8 80B9C838 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 016B8 80B9C838 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 016BC 80B9C83C 00817824 */ and $t7, $a0, $at /* 016C0 80B9C840 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 016C4 80B9C844 01CFC021 */ addu $t8, $t6, $t7 @@ -106,11 +106,11 @@ glabel L80B9C8F8 .L80B9C8F8: /* 01778 80B9C8F8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 0177C 80B9C8FC 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 01780 80B9C900 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 01780 80B9C900 3C038016 */ lui $v1, %hi(gGameInfo) /* 01784 80B9C904 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 01788 80B9C908 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 /* 0178C 80B9C90C AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 01790 80B9C910 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 01790 80B9C910 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) /* 01794 80B9C914 846C1172 */ lh $t4, 0x1172($v1) ## 80161172 /* 01798 80B9C918 8478116E */ lh $t8, 0x116E($v1) ## 8016116E /* 0179C 80B9C91C 846B1170 */ lh $t3, 0x1170($v1) ## 80161170 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E7B4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E7B4.s index 5f1802d391..20d39a8c3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E7B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E7B4.s @@ -57,7 +57,7 @@ glabel func_80B9E7B4 /* 01648 80B9E858 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 0164C 80B9E85C 8FB80050 */ lw $t8, 0x0050($sp) /* 01650 80B9E860 00057900 */ sll $t7, $a1, 4 -/* 01654 80B9E864 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 01654 80B9E864 3C0E8016 */ lui $t6, %hi(gSegments) /* 01658 80B9E868 87190170 */ lh $t9, 0x0170($t8) ## 00000170 /* 0165C 80B9E86C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01660 80B9E870 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF @@ -71,7 +71,7 @@ glabel func_80B9E7B4 /* 01680 80B9E890 000B6702 */ srl $t4, $t3, 28 /* 01684 80B9E894 000C6880 */ sll $t5, $t4, 2 /* 01688 80B9E898 01CD7021 */ addu $t6, $t6, $t5 -/* 0168C 80B9E89C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 0168C 80B9E89C 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 01690 80B9E8A0 00815024 */ and $t2, $a0, $at /* 01694 80B9E8A4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01698 80B9E8A8 014EC021 */ addu $t8, $t2, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s index a66723b614..5c9a898f0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s @@ -116,7 +116,7 @@ glabel func_80B9E904 /* 01854 80B9EA64 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01858 80B9EA68 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 0185C 80B9EA6C 35AD0024 */ ori $t5, $t5, 0x0024 ## $t5 = DB060024 -/* 01860 80B9EA70 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 01860 80B9EA70 3C198016 */ lui $t9, %hi(gSegments) /* 01864 80B9EA74 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 01868 80B9EA78 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 /* 0186C 80B9EA7C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 @@ -127,7 +127,7 @@ glabel func_80B9E904 /* 01880 80B9EA90 000E7F02 */ srl $t7, $t6, 28 /* 01884 80B9EA94 000FC080 */ sll $t8, $t7, 2 /* 01888 80B9EA98 0338C821 */ addu $t9, $t9, $t8 -/* 0188C 80B9EA9C 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 0188C 80B9EA9C 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 01890 80B9EAA0 00815024 */ and $t2, $a0, $at /* 01894 80B9EAA4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01898 80B9EAA8 032A6021 */ addu $t4, $t9, $t2 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Update.s index c506861e50..e1d5015646 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Update.s @@ -168,14 +168,14 @@ glabel ObjSyokudai_Update /* 00474 80B9F724 04E10017 */ bgez $a3, .L80B9F784 /* 00478 80B9F728 304F0020 */ andi $t7, $v0, 0x0020 ## $t7 = 00000000 /* 0047C 80B9F72C 85020860 */ lh $v0, 0x0860($t0) ## 00000860 -/* 00480 80B9F730 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00484 80B9F734 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00480 80B9F730 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00484 80B9F734 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00488 80B9F738 1440000D */ bne $v0, $zero, .L80B9F770 /* 0048C 80B9F73C 284100C8 */ slti $at, $v0, 0x00C8 /* 00490 80B9F740 240C00D2 */ addiu $t4, $zero, 0x00D2 ## $t4 = 000000D2 -/* 00494 80B9F744 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 +/* 00494 80B9F744 3C0D8013 */ lui $t5, %hi(D_801333E8) /* 00498 80B9F748 A50C0860 */ sh $t4, 0x0860($t0) ## 00000860 -/* 0049C 80B9F74C 25AD33E8 */ addiu $t5, $t5, 0x33E8 ## $t5 = 801333E8 +/* 0049C 80B9F74C 25AD33E8 */ addiu $t5, %lo(D_801333E8) /* 004A0 80B9F750 AFAD0014 */ sw $t5, 0x0014($sp) /* 004A4 80B9F754 AFA70010 */ sw $a3, 0x0010($sp) /* 004A8 80B9F758 24042822 */ addiu $a0, $zero, 0x2822 ## $a0 = 00002822 @@ -291,10 +291,10 @@ glabel ObjSyokudai_Update /* 00630 80B9F8E0 25F8006E */ addiu $t8, $t7, 0x006E ## $t8 = 0000006E /* 00634 80B9F8E4 A61801E4 */ sh $t8, 0x01E4($s0) ## 000001E4 .L80B9F8E8: -/* 00638 80B9F8E8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0063C 80B9F8EC 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 00640 80B9F8F0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00644 80B9F8F4 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 00638 80B9F8E8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0063C 80B9F8EC 3C198013 */ lui $t9, %hi(D_801333E8) +/* 00640 80B9F8F0 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00644 80B9F8F4 273933E8 */ addiu $t9, %lo(D_801333E8) /* 00648 80B9F8F8 AFB90014 */ sw $t9, 0x0014($sp) /* 0064C 80B9F8FC AFA70010 */ sw $a3, 0x0010($sp) /* 00650 80B9F900 24042822 */ addiu $a0, $zero, 0x2822 ## $a0 = 00002822 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80B9FFA0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80B9FFA0.s index e2d79f3f0b..6ea2936b9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80B9FFA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/func_80B9FFA0.s @@ -18,12 +18,12 @@ glabel func_80B9FFA0 /* 0003C 80B9FFDC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 .L80B9FFE0: /* 00040 80B9FFE0 14610004 */ bne $v1, $at, .L80B9FFF4 -/* 00044 80B9FFE4 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 00044 80B9FFE4 3C098016 */ lui $t1, %hi(gSaveContext+4) /* 00048 80B9FFE8 90880174 */ lbu $t0, 0x0174($a0) ## 00000174 /* 0004C 80B9FFEC 03E00008 */ jr $ra /* 00050 80B9FFF0 01051026 */ xor $v0, $t0, $a1 .L80B9FFF4: -/* 00054 80B9FFF4 8D29E664 */ lw $t1, -0x199C($t1) ## 8015E664 +/* 00054 80B9FFF4 8D29E664 */ lw $t1, %lo(gSaveContext+4)($t1) /* 00058 80B9FFF8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 0005C 80B9FFFC 24030011 */ addiu $v1, $zero, 0x0011 ## $v1 = 00000011 /* 00060 80BA0000 11200003 */ beq $t1, $zero, .L80BA0010 diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Init.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Init.s index 6df2fc37bd..5494d6f652 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/ObjectKankyo_Init.s @@ -167,8 +167,8 @@ glabel L80BA2BE4 /* 00240 80BA2CE0 00000000 */ nop /* 00244 80BA2CE4 E4C60334 */ swc1 $f6, 0x0334($a2) ## 00000334 .L80BA2CE8: -/* 00248 80BA2CE8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0024C 80BA2CEC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 00248 80BA2CE8 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0024C 80BA2CEC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00250 80BA2CF0 906F1414 */ lbu $t7, 0x1414($v1) ## 8015FA74 /* 00254 80BA2CF4 3C0580BA */ lui $a1, %hi(func_80BA5304) ## $a1 = 80BA0000 /* 00258 80BA2CF8 24A55304 */ addiu $a1, $a1, %lo(func_80BA5304) ## $a1 = 80BA5304 @@ -179,36 +179,36 @@ glabel L80BA2BE4 /* 0026C 80BA2D0C 54410005 */ bnel $v0, $at, .L80BA2D24 /* 00270 80BA2D10 2401053C */ addiu $at, $zero, 0x053C ## $at = 0000053C /* 00274 80BA2D14 E4C00190 */ swc1 $f0, 0x0190($a2) ## 00000190 -/* 00278 80BA2D18 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0027C 80BA2D1C 8C42E660 */ lw $v0, -0x19A0($v0) ## 8015E660 +/* 00278 80BA2D18 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0027C 80BA2D1C 8C42E660 */ lw $v0, %lo(gSaveContext)($v0) /* 00280 80BA2D20 2401053C */ addiu $at, $zero, 0x053C ## $at = 0000053C .L80BA2D24: /* 00284 80BA2D24 54410005 */ bnel $v0, $at, .L80BA2D3C /* 00288 80BA2D28 24010540 */ addiu $at, $zero, 0x0540 ## $at = 00000540 /* 0028C 80BA2D2C E4C001E4 */ swc1 $f0, 0x01E4($a2) ## 000001E4 -/* 00290 80BA2D30 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00294 80BA2D34 8C42E660 */ lw $v0, -0x19A0($v0) ## 8015E660 +/* 00290 80BA2D30 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00294 80BA2D34 8C42E660 */ lw $v0, %lo(gSaveContext)($v0) /* 00298 80BA2D38 24010540 */ addiu $at, $zero, 0x0540 ## $at = 00000540 .L80BA2D3C: /* 0029C 80BA2D3C 54410005 */ bnel $v0, $at, .L80BA2D54 /* 002A0 80BA2D40 24010544 */ addiu $at, $zero, 0x0544 ## $at = 00000544 /* 002A4 80BA2D44 E4C00238 */ swc1 $f0, 0x0238($a2) ## 00000238 -/* 002A8 80BA2D48 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 002AC 80BA2D4C 8C42E660 */ lw $v0, -0x19A0($v0) ## 8015E660 +/* 002A8 80BA2D48 3C028016 */ lui $v0, %hi(gSaveContext) +/* 002AC 80BA2D4C 8C42E660 */ lw $v0, %lo(gSaveContext)($v0) /* 002B0 80BA2D50 24010544 */ addiu $at, $zero, 0x0544 ## $at = 00000544 .L80BA2D54: /* 002B4 80BA2D54 54410005 */ bnel $v0, $at, .L80BA2D6C /* 002B8 80BA2D58 24010548 */ addiu $at, $zero, 0x0548 ## $at = 00000548 /* 002BC 80BA2D5C E4C0028C */ swc1 $f0, 0x028C($a2) ## 0000028C -/* 002C0 80BA2D60 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 002C4 80BA2D64 8C42E660 */ lw $v0, -0x19A0($v0) ## 8015E660 +/* 002C0 80BA2D60 3C028016 */ lui $v0, %hi(gSaveContext) +/* 002C4 80BA2D64 8C42E660 */ lw $v0, %lo(gSaveContext)($v0) /* 002C8 80BA2D68 24010548 */ addiu $at, $zero, 0x0548 ## $at = 00000548 .L80BA2D6C: /* 002CC 80BA2D6C 54410005 */ bnel $v0, $at, .L80BA2D84 /* 002D0 80BA2D70 2401054C */ addiu $at, $zero, 0x054C ## $at = 0000054C /* 002D4 80BA2D74 E4C002E0 */ swc1 $f0, 0x02E0($a2) ## 000002E0 -/* 002D8 80BA2D78 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 002DC 80BA2D7C 8C42E660 */ lw $v0, -0x19A0($v0) ## 8015E660 +/* 002D8 80BA2D78 3C028016 */ lui $v0, %hi(gSaveContext) +/* 002DC 80BA2D7C 8C42E660 */ lw $v0, %lo(gSaveContext)($v0) /* 002E0 80BA2D80 2401054C */ addiu $at, $zero, 0x054C ## $at = 0000054C .L80BA2D84: /* 002E4 80BA2D84 14410002 */ bne $v0, $at, .L80BA2D90 diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2DD4.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2DD4.s index f4b8c6d4c5..c385c291c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2DD4.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2DD4.s @@ -37,9 +37,9 @@ glabel func_80BA2DD4 /* 003C0 80BA2E60 84AC00A4 */ lh $t4, 0x00A4($a1) ## 000000A4 /* 003C4 80BA2E64 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 003C8 80BA2E68 8CB41C44 */ lw $s4, 0x1C44($a1) ## 00001C44 -/* 003CC 80BA2E6C 15810047 */ bne $t4, $at, .L80BA2F8C -/* 003D0 80BA2E70 3C108016 */ lui $s0, 0x8016 ## $s0 = 80160000 -/* 003D4 80BA2E74 2610E660 */ addiu $s0, $s0, 0xE660 ## $s0 = 8015E660 +/* 003CC 80BA2E6C 15810047 */ bne $t4, $at, .L80BA2F8C +/* 003D0 80BA2E70 3C108016 */ lui $s0, %hi(gSaveContext) +/* 003D4 80BA2E74 2610E660 */ addiu $s0, %lo(gSaveContext) /* 003D8 80BA2E78 8E0D1360 */ lw $t5, 0x1360($s0) ## 8015F9C0 /* 003DC 80BA2E7C 8FA400F8 */ lw $a0, 0x00F8($sp) /* 003E0 80BA2E80 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 @@ -85,8 +85,8 @@ glabel func_80BA2DD4 /* 0047C 80BA2F1C 240101D9 */ addiu $at, $zero, 0x01D9 ## $at = 000001D9 /* 00480 80BA2F20 1041000A */ beq $v0, $at, .L80BA2F4C /* 00484 80BA2F24 24010247 */ addiu $at, $zero, 0x0247 ## $at = 00000247 -/* 00488 80BA2F28 1041000C */ beq $v0, $at, .L80BA2F5C -/* 0048C 80BA2F2C 3C048013 */ lui $a0, 0x8013 ## $a0 = 80130000 +/* 00488 80BA2F28 1041000C */ beq $v0, $at, .L80BA2F5C +/* 0048C 80BA2F2C 3C048013 */ lui $a0, %hi(D_801333D4) /* 00490 80BA2F30 240102FB */ addiu $at, $zero, 0x02FB ## $at = 000002FB /* 00494 80BA2F34 1041000F */ beq $v0, $at, .L80BA2F74 /* 00498 80BA2F38 24010303 */ addiu $at, $zero, 0x0303 ## $at = 00000303 @@ -100,7 +100,7 @@ glabel func_80BA2DD4 /* 004B4 80BA2F54 1000000E */ beq $zero, $zero, .L80BA2F90 /* 004B8 80BA2F58 3C010001 */ lui $at, 0x0001 ## $at = 00010000 .L80BA2F5C: -/* 004BC 80BA2F5C 248433D4 */ addiu $a0, $a0, 0x33D4 ## $a0 = 000033D4 +/* 004BC 80BA2F5C 248433D4 */ addiu $a0, %lo(D_801333D4) /* 004C0 80BA2F60 2405685F */ addiu $a1, $zero, 0x685F ## $a1 = 0000685F /* 004C4 80BA2F64 0C03D149 */ jal func_800F4524 /* 004C8 80BA2F68 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 @@ -120,10 +120,10 @@ glabel func_80BA2DD4 /* 004F0 80BA2F90 0221C821 */ addu $t9, $s1, $at /* 004F4 80BA2F94 AFB90088 */ sw $t9, 0x0088($sp) /* 004F8 80BA2F98 93220B15 */ lbu $v0, 0x0B15($t9) ## 00000B15 -/* 004FC 80BA2F9C 3C108016 */ lui $s0, 0x8016 ## $s0 = 80160000 -/* 00500 80BA2FA0 2610E660 */ addiu $s0, $s0, 0xE660 ## $s0 = 8015E660 -/* 00504 80BA2FA4 28410040 */ slti $at, $v0, 0x0040 -/* 00508 80BA2FA8 1020000F */ beq $at, $zero, .L80BA2FE8 +/* 004FC 80BA2F9C 3C108016 */ lui $s0, %hi(gSaveContext) +/* 00500 80BA2FA0 2610E660 */ addiu $s0, %lo(gSaveContext) +/* 00504 80BA2FA4 28410040 */ slti $at, $v0, 0x0040 +/* 00508 80BA2FA8 1020000F */ beq $at, $zero, .L80BA2FE8 /* 0050C 80BA2FAC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 /* 00510 80BA2FB0 8E090000 */ lw $t1, 0x0000($s0) ## 8015E660 /* 00514 80BA2FB4 240100EE */ addiu $at, $zero, 0x00EE ## $at = 000000EE diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s index 2cbc4dc6bf..65883c9e4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s @@ -55,11 +55,11 @@ glabel func_80BA3C94 /* 012C8 80BA3D68 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 012CC 80BA3D6C AE4F02D0 */ sw $t7, 0x02D0($s2) ## 000002D0 /* 012D0 80BA3D70 00084880 */ sll $t1, $t0, 2 -/* 012D4 80BA3D74 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 012D4 80BA3D74 3C0A8016 */ lui $t2, %hi(gSegments) /* 012D8 80BA3D78 01495021 */ addu $t2, $t2, $t1 /* 012DC 80BA3D7C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 012E0 80BA3D80 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 012E4 80BA3D84 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 012E4 80BA3D84 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 012E8 80BA3D88 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 012EC 80BA3D8C 00815824 */ and $t3, $a0, $at /* 012F0 80BA3D90 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s index 6517d38bca..41f9a84b38 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s @@ -85,8 +85,8 @@ glabel func_80BA414C /* 017F0 80BA4290 00026100 */ sll $t4, $v0, 4 /* 017F4 80BA4294 000C6F02 */ srl $t5, $t4, 28 /* 017F8 80BA4298 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 017FC 80BA429C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 01800 80BA42A0 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 +/* 017FC 80BA429C 3C0F8016 */ lui $t7, %hi(gSegments) +/* 01800 80BA42A0 25EF6FA8 */ addiu $t7, %lo(gSegments) /* 01804 80BA42A4 000D7080 */ sll $t6, $t5, 2 /* 01808 80BA42A8 3C080100 */ lui $t0, 0x0100 ## $t0 = 01000000 /* 0180C 80BA42AC 3C090401 */ lui $t1, 0x0401 ## $t1 = 04010000 diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA49BC.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA49BC.s index 1e4b42b855..8dec3c90b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA49BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA49BC.s @@ -79,7 +79,7 @@ glabel func_80BA49BC /* 02050 80BA4AF0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 02054 80BA4AF4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 02058 80BA4AF8 3C0480BA */ lui $a0, %hi(D_80BA58E0) ## $a0 = 80BA0000 -/* 0205C 80BA4AFC 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 0205C 80BA4AFC 3C098016 */ lui $t1, %hi(gSegments) /* 02060 80BA4B00 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 02064 80BA4B04 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 02068 80BA4B08 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 @@ -94,7 +94,7 @@ glabel func_80BA49BC /* 0208C 80BA4B2C 0018CF02 */ srl $t9, $t8, 28 /* 02090 80BA4B30 00194080 */ sll $t0, $t9, 2 /* 02094 80BA4B34 01284821 */ addu $t1, $t1, $t0 -/* 02098 80BA4B38 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 +/* 02098 80BA4B38 8D296FA8 */ lw $t1, %lo(gSegments)($t1) /* 0209C 80BA4B3C 00817824 */ and $t7, $a0, $at /* 020A0 80BA4B40 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 020A4 80BA4B44 01E95021 */ addu $t2, $t7, $t1 diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4D7C.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4D7C.s index ee11ad651c..ae55146149 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4D7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4D7C.s @@ -320,7 +320,7 @@ glabel func_80BA4D7C /* 027A0 80BA5240 AD0A02D0 */ sw $t2, 0x02D0($t0) ## 000002D0 /* 027A4 80BA5244 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 027A8 80BA5248 960D019C */ lhu $t5, 0x019C($s0) ## 0000019C -/* 027AC 80BA524C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 027AC 80BA524C 3C188016 */ lui $t8, %hi(gSegments) /* 027B0 80BA5250 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 027B4 80BA5254 000D7080 */ sll $t6, $t5, 2 /* 027B8 80BA5258 008E2021 */ addu $a0, $a0, $t6 @@ -330,7 +330,7 @@ glabel func_80BA4D7C /* 027C8 80BA5268 00097F02 */ srl $t7, $t1, 28 /* 027CC 80BA526C 000FC880 */ sll $t9, $t7, 2 /* 027D0 80BA5270 0319C021 */ addu $t8, $t8, $t9 -/* 027D4 80BA5274 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 027D4 80BA5274 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 027D8 80BA5278 00815824 */ and $t3, $a0, $at /* 027DC 80BA527C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 027E0 80BA5280 01785021 */ addu $t2, $t3, $t8 diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Destroy.s index 2b2136a86a..f7bba9c9d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Destroy.s @@ -21,8 +21,8 @@ glabel OceffSpot_Destroy /* 001A4 80BA6214 8F060160 */ lw $a2, 0x0160($t8) ## 00000160 /* 001A8 80BA6218 0C021DB2 */ jal func_800876C8 /* 001AC 80BA621C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001B0 80BA6220 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 001B4 80BA6224 8739FA28 */ lh $t9, -0x05D8($t9) ## 8015FA28 +/* 001B0 80BA6220 3C198016 */ lui $t9, %hi(gSaveContext+0x13c8) +/* 001B4 80BA6224 8739FA28 */ lh $t9, %lo(gSaveContext+0x13c8)($t9) /* 001B8 80BA6228 53200009 */ beql $t9, $zero, .L80BA6250 /* 001BC 80BA622C 8FBF001C */ lw $ra, 0x001C($sp) /* 001C0 80BA6230 8E081C40 */ lw $t0, 0x1C40($s0) ## 00001C40 diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Init.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Init.s index 7caf66be01..f12ba2d2fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Init.s @@ -78,8 +78,8 @@ glabel OceffSpot_Init /* 0010C 80BA617C 8FA60030 */ lw $a2, 0x0030($sp) /* 00110 80BA6180 AE020160 */ sw $v0, 0x0160($s0) ## 00000160 -/* 00114 80BA6184 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 00118 80BA6188 8D4AFA90 */ lw $t2, -0x0570($t2) ## 8015FA90 +/* 00114 80BA6184 3C0A8016 */ lui $t2, %hi(gGameInfo) +/* 00118 80BA6188 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) /* 0011C 80BA618C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00120 80BA6190 3C0180BA */ lui $at, %hi(D_80BA6FD4) ## $at = 80BA0000 /* 00124 80BA6194 854B04B2 */ lh $t3, 0x04B2($t2) ## 801604B2 diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA6260.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA6260.s index b89449dc70..98b8b5293f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA6260.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/func_80BA6260.s @@ -46,8 +46,8 @@ glabel func_80BA6260 /* 00224 80BA6294 0C00B55C */ jal Actor_Kill /* 00228 80BA6298 AFA5001C */ sw $a1, 0x001C($sp) -/* 0022C 80BA629C 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 00230 80BA62A0 95CEFB40 */ lhu $t6, -0x04C0($t6) ## 8011FB40 +/* 0022C 80BA629C 3C0E8012 */ lui $t6, %hi(D_8011FB40) +/* 00230 80BA62A0 95CEFB40 */ lhu $t6, %lo(D_8011FB40)($t6) /* 00234 80BA62A4 24010190 */ addiu $at, $zero, 0x0190 ## $at = 00000190 /* 00238 80BA62A8 8FA5001C */ lw $a1, 0x001C($sp) /* 0023C 80BA62AC 11C10020 */ beq $t6, $at, .L80BA6330 @@ -55,8 +55,8 @@ glabel func_80BA6260 /* 00244 80BA62B4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00248 80BA62B8 00A11021 */ addu $v0, $a1, $at /* 0024C 80BA62BC 844F04E6 */ lh $t7, 0x04E6($v0) ## 000004E6 -/* 00250 80BA62C0 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 00254 80BA62C4 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 +/* 00250 80BA62C0 3C068016 */ lui $a2, %hi(gSaveContext) +/* 00254 80BA62C4 24C6E660 */ addiu $a2, %lo(gSaveContext) /* 00258 80BA62C8 55E0001A */ bnel $t7, $zero, .L80BA6334 /* 0025C 80BA62CC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00260 80BA62D0 94D813FA */ lhu $t8, 0x13FA($a2) ## 8015FA5A diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Destroy.s index 2ae131308f..1f83a06a61 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Destroy.s @@ -6,8 +6,8 @@ glabel OceffStorm_Destroy /* 000E4 80BA71C4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 000E8 80BA71C8 0C021DB2 */ jal func_800876C8 /* 000EC 80BA71CC AFA20018 */ sw $v0, 0x0018($sp) -/* 000F0 80BA71D0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 000F4 80BA71D4 85CEFA28 */ lh $t6, -0x05D8($t6) ## 8015FA28 +/* 000F0 80BA71D0 3C0E8016 */ lui $t6, %hi(gSaveContext+0x13c8) +/* 000F4 80BA71D4 85CEFA28 */ lh $t6, %lo(gSaveContext+0x13c8)($t6) /* 000F8 80BA71D8 8FA20018 */ lw $v0, 0x0018($sp) /* 000FC 80BA71DC 51C00005 */ beql $t6, $zero, .L80BA71F4 /* 00100 80BA71E0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Destroy.s index f7c9859369..1a1a6fcc92 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Destroy.s @@ -6,8 +6,8 @@ glabel OceffWipe_Destroy /* 00080 80BA8E10 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00084 80BA8E14 0C021DB2 */ jal func_800876C8 /* 00088 80BA8E18 AFA20018 */ sw $v0, 0x0018($sp) -/* 0008C 80BA8E1C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00090 80BA8E20 85CEFA28 */ lh $t6, -0x05D8($t6) ## 8015FA28 +/* 0008C 80BA8E1C 3C0E8016 */ lui $t6, %hi(gSaveContext+0x13c8) +/* 00090 80BA8E20 85CEFA28 */ lh $t6, %lo(gSaveContext+0x13c8)($t6) /* 00094 80BA8E24 8FA20018 */ lw $v0, 0x0018($sp) /* 00098 80BA8E28 51C00005 */ beql $t6, $zero, .L80BA8E40 /* 0009C 80BA8E2C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Destroy.s index 054ab680cf..30b93166e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Destroy.s @@ -6,8 +6,8 @@ glabel OceffWipe2_Destroy /* 00080 80BA9C30 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00084 80BA9C34 0C021DB2 */ jal func_800876C8 /* 00088 80BA9C38 AFA20018 */ sw $v0, 0x0018($sp) -/* 0008C 80BA9C3C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00090 80BA9C40 85CEFA28 */ lh $t6, -0x05D8($t6) ## 8015FA28 +/* 0008C 80BA9C3C 3C0E8016 */ lui $t6, %hi(gSaveContext+0x13c8) +/* 00090 80BA9C40 85CEFA28 */ lh $t6, %lo(gSaveContext+0x13c8)($t6) /* 00094 80BA9C44 8FA20018 */ lw $v0, 0x0018($sp) /* 00098 80BA9C48 51C00005 */ beql $t6, $zero, .L80BA9C60 /* 0009C 80BA9C4C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Destroy.s index 73422d014b..a6cf43dfc1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Destroy.s @@ -6,8 +6,8 @@ glabel OceffWipe3_Destroy /* 00080 80BAB470 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00084 80BAB474 0C021DB2 */ jal func_800876C8 /* 00088 80BAB478 AFA20018 */ sw $v0, 0x0018($sp) -/* 0008C 80BAB47C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00090 80BAB480 85CEFA28 */ lh $t6, -0x05D8($t6) ## 8015FA28 +/* 0008C 80BAB47C 3C0E8016 */ lui $t6, %hi(gSaveContext+0x13c8) +/* 00090 80BAB480 85CEFA28 */ lh $t6, %lo(gSaveContext+0x13c8)($t6) /* 00094 80BAB484 8FA20018 */ lw $v0, 0x0018($sp) /* 00098 80BAB488 51C00005 */ beql $t6, $zero, .L80BAB4A0 /* 0009C 80BAB48C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BAE05C.s b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BAE05C.s index f1b9e800ce..a564f73882 100644 --- a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BAE05C.s +++ b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BAE05C.s @@ -29,12 +29,12 @@ glabel func_80BAE05C /* 003D0 80BAE090 0C00084C */ jal osSyncPrintf /* 003D4 80BAE094 2484E34C */ addiu $a0, $a0, %lo(D_80BAE34C) ## $a0 = 80BAE34C -/* 003D8 80BAE098 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 -/* 003DC 80BAE09C 93187468 */ lbu $t8, 0x7468($t8) ## 80127468 -/* 003E0 80BAE0A0 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 003D8 80BAE098 3C188012 */ lui $t8, %hi(gItemSlots+4) +/* 003DC 80BAE09C 93187468 */ lbu $t8, %lo(gItemSlots+4)($t8) +/* 003E0 80BAE0A0 3C198016 */ lui $t9, %hi(gSaveContext+0x74) /* 003E4 80BAE0A4 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 003E8 80BAE0A8 0338C821 */ addu $t9, $t9, $t8 -/* 003EC 80BAE0AC 9339E6D4 */ lbu $t9, -0x192C($t9) ## 8015E6D4 +/* 003EC 80BAE0AC 9339E6D4 */ lbu $t9, %lo(gSaveContext+0x74)($t9) /* 003F0 80BAE0B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 003F4 80BAE0B4 27A50040 */ addiu $a1, $sp, 0x0040 ## $a1 = FFFFFFE0 /* 003F8 80BAE0B8 17210024 */ bne $t9, $at, .L80BAE14C @@ -61,20 +61,20 @@ glabel func_80BAE05C /* 00448 80BAE108 00034900 */ sll $t1, $v1, 4 /* 0044C 80BAE10C 00095702 */ srl $t2, $t1, 28 /* 00450 80BAE110 000A5880 */ sll $t3, $t2, 2 -/* 00454 80BAE114 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 00454 80BAE114 3C0C8016 */ lui $t4, %hi(gSegments) /* 00458 80BAE118 018B6021 */ addu $t4, $t4, $t3 /* 0045C 80BAE11C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00460 80BAE120 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 00460 80BAE120 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 00464 80BAE124 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00468 80BAE128 00616824 */ and $t5, $v1, $at /* 0046C 80BAE12C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00470 80BAE130 018D7021 */ addu $t6, $t4, $t5 /* 00474 80BAE134 01C17821 */ addu $t7, $t6, $at /* 00478 80BAE138 AE0F1D68 */ sw $t7, 0x1D68($s0) ## 00001D68 -/* 0047C 80BAE13C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 0047C 80BAE13C 3C018016 */ lui $at, %hi(gSaveContext+0x1414) /* 00480 80BAE140 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00484 80BAE144 10000011 */ beq $zero, $zero, .L80BAE18C -/* 00488 80BAE148 A038FA74 */ sb $t8, -0x058C($at) ## 8015FA74 +/* 00488 80BAE148 A038FA74 */ sb $t8, %lo(gSaveContext+0x1414)($at) .L80BAE14C: /* 0048C 80BAE14C 3C01442F */ lui $at, 0x442F ## $at = 442F0000 /* 00490 80BAE150 44814000 */ mtc1 $at, $f8 ## $f8 = 700.00 @@ -103,12 +103,12 @@ glabel func_80BAE05C /* 004DC 80BAE19C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 004E0 80BAE1A0 44812000 */ mtc1 $at, $f4 ## $f4 = 120.00 /* 004E4 80BAE1A4 C4E60090 */ lwc1 $f6, 0x0090($a3) ## 00000090 -/* 004E8 80BAE1A8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 004E8 80BAE1A8 3C028016 */ lui $v0, %hi(gSaveContext+0xc) /* 004EC 80BAE1AC 4606203C */ c.lt.s $f4, $f6 /* 004F0 80BAE1B0 00000000 */ nop /* 004F4 80BAE1B4 45030036 */ bc1tl .L80BAE290 /* 004F8 80BAE1B8 8FBF0034 */ lw $ra, 0x0034($sp) -/* 004FC 80BAE1BC 9442E66C */ lhu $v0, -0x1994($v0) ## 8015E66C +/* 004FC 80BAE1BC 9442E66C */ lhu $v0, %lo(gSaveContext+0xc)($v0) /* 00500 80BAE1C0 28414555 */ slti $at, $v0, 0x4555 /* 00504 80BAE1C4 14200031 */ bne $at, $zero, .L80BAE28C /* 00508 80BAE1C8 28415000 */ slti $at, $v0, 0x5000 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s index 550d86133b..d2453b5440 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s @@ -163,15 +163,15 @@ glabel func_80813820 .L80813A6C: /* 0024C 80813A6C 8686021C */ lh $a2, 0x021C($s4) ## 0000021C .L80813A70: -/* 00250 80813A70 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00254 80813A74 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00250 80813A70 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00254 80813A74 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00258 80813A78 1266000B */ beq $s3, $a2, .L80813AA8 /* 0025C 80813A7C 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 -/* 00260 80813A80 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 +/* 00260 80813A80 3C198013 */ lui $t9, %hi(D_801333E8) /* 00264 80813A84 A68001E4 */ sh $zero, 0x01E4($s4) ## 000001E4 -/* 00268 80813A88 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 0026C 80813A8C 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00270 80813A90 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00268 80813A88 273933E8 */ addiu $t9, %lo(D_801333E8) +/* 0026C 80813A8C 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00270 80813A90 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00274 80813A94 AFB90014 */ sw $t9, 0x0014($sp) /* 00278 80813A98 AFA70010 */ sw $a3, 0x0010($sp) /* 0027C 80813A9C 0C03DCE3 */ jal Audio_PlaySoundGeneral @@ -181,13 +181,13 @@ glabel func_80813820 .L80813AA8: /* 00288 80813AA8 24010018 */ addiu $at, $zero, 0x0018 ## $at = 00000018 /* 0028C 80813AAC 10C10033 */ beq $a2, $at, .L80813B7C -/* 00290 80813AB0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00290 80813AB0 3C028016 */ lui $v0, %hi(gSaveContext+0xa4) /* 00294 80813AB4 00067080 */ sll $t6, $a2, 2 -/* 00298 80813AB8 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 +/* 00298 80813AB8 3C0F8012 */ lui $t7, %hi(gBitFlags) /* 0029C 80813ABC 01EE7821 */ addu $t7, $t7, $t6 -/* 002A0 80813AC0 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 002A4 80813AC4 8F18E704 */ lw $t8, -0x18FC($t8) ## 8015E704 -/* 002A8 80813AC8 8DEF7120 */ lw $t7, 0x7120($t7) ## 80127120 +/* 002A0 80813AC0 3C188016 */ lui $t8, %hi(gSaveContext+0xa4) +/* 002A4 80813AC4 8F18E704 */ lw $t8, %lo(gSaveContext+0xa4)($t8) +/* 002A8 80813AC8 8DEF7120 */ lw $t7, %lo(gBitFlags)($t7) /* 002AC 80813ACC 3C048083 */ lui $a0, %hi(D_8082F46C) ## $a0 = 80830000 /* 002B0 80813AD0 241003E7 */ addiu $s0, $zero, 0x03E7 ## $s0 = 000003E7 /* 002B4 80813AD4 01F8C824 */ and $t9, $t7, $t8 @@ -240,7 +240,7 @@ glabel func_80813820 /* 00354 80813B74 1000000F */ beq $zero, $zero, .L80813BB4 /* 00358 80813B78 968F01E8 */ lhu $t7, 0x01E8($s4) ## 000001E8 .L80813B7C: -/* 0035C 80813B7C 8C42E704 */ lw $v0, -0x18FC($v0) ## FFFFE704 +/* 0035C 80813B7C 8C42E704 */ lw $v0, %lo(gSaveContext+0xa4)($v0) /* 00360 80813B80 3C01F000 */ lui $at, 0xF000 ## $at = F0000000 /* 00364 80813B84 3C048083 */ lui $a0, %hi(D_8082F484) ## $a0 = 80830000 /* 00368 80813B88 00411024 */ and $v0, $v0, $at @@ -288,24 +288,24 @@ glabel func_80813820 /* 003FC 80813C1C 1420004D */ bne $at, $zero, .L80813D54 /* 00400 80813C20 2AE10012 */ slti $at, $s7, 0x0012 /* 00404 80813C24 1020004B */ beq $at, $zero, .L80813D54 -/* 00408 80813C28 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 +/* 00408 80813C28 3C0E8012 */ lui $t6, %hi(gBitFlags) /* 0040C 80813C2C 8698021C */ lh $t8, 0x021C($s4) ## 0000021C -/* 00410 80813C30 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00414 80813C34 8DEFE704 */ lw $t7, -0x18FC($t7) ## 8015E704 +/* 00410 80813C30 3C0F8016 */ lui $t7, %hi(gSaveContext+0xa4) +/* 00414 80813C34 8DEFE704 */ lw $t7, %lo(gSaveContext+0xa4)($t7) /* 00418 80813C38 0018C880 */ sll $t9, $t8, 2 /* 0041C 80813C3C 01D97021 */ addu $t6, $t6, $t9 -/* 00420 80813C40 8DCE7120 */ lw $t6, 0x7120($t6) ## 80127120 +/* 00420 80813C40 8DCE7120 */ lw $t6, %lo(gBitFlags)($t6) /* 00424 80813C44 2402000A */ addiu $v0, $zero, 0x000A ## $v0 = 0000000A /* 00428 80813C48 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 /* 0042C 80813C4C 01CFC024 */ and $t8, $t6, $t7 /* 00430 80813C50 13000040 */ beq $t8, $zero, .L80813D54 -/* 00434 80813C54 3C0E8015 */ lui $t6, 0x8015 ## $t6 = 80150000 +/* 00434 80813C54 3C0E8015 */ lui $t6, %hi(D_80153960) /* 00438 80813C58 8697024A */ lh $s7, 0x024A($s4) ## 0000024A /* 0043C 80813C5C 3C018083 */ lui $at, %hi(D_8082A120) ## $at = 80830000 /* 00440 80813C60 3C158083 */ lui $s5, %hi(D_8082A150) ## $s5 = 80830000 /* 00444 80813C64 0017C840 */ sll $t9, $s7, 1 /* 00448 80813C68 01D97021 */ addu $t6, $t6, $t9 -/* 0044C 80813C6C 85CE3960 */ lh $t6, 0x3960($t6) ## 80153960 +/* 0044C 80813C6C 85CE3960 */ lh $t6, %lo(D_80153960)($t6) /* 00450 80813C70 3C128083 */ lui $s2, %hi(D_8082A124) ## $s2 = 80830000 /* 00454 80813C74 2652A124 */ addiu $s2, $s2, %lo(D_8082A124) ## $s2 = 8082A124 /* 00458 80813C78 A68E0264 */ sh $t6, 0x0264($s4) ## 00000264 @@ -339,26 +339,26 @@ glabel func_80813820 /* 004C4 80813CE4 AE820194 */ sw $v0, 0x0194($s4) ## 00000194 /* 004C8 80813CE8 A0400002 */ sb $zero, 0x0002($v0) ## 00000002 /* 004CC 80813CEC 8E980194 */ lw $t8, 0x0194($s4) ## 00000194 -/* 004D0 80813CF0 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 004D0 80813CF0 3C0F8016 */ lui $t7, %hi(gGameInfo) /* 004D4 80813CF4 2419FFC2 */ addiu $t9, $zero, 0xFFC2 ## $t9 = FFFFFFC2 /* 004D8 80813CF8 A3100001 */ sb $s0, 0x0001($t8) ## 00000001 -/* 004DC 80813CFC 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 -/* 004E0 80813D00 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 004DC 80813CFC 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) +/* 004E0 80813D00 3C188016 */ lui $t8, %hi(gGameInfo) /* 004E4 80813D04 240EFFC8 */ addiu $t6, $zero, 0xFFC8 ## $t6 = FFFFFFC8 /* 004E8 80813D08 A5F90F3E */ sh $t9, 0x0F3E($t7) ## 80160F3E -/* 004EC 80813D0C 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 -/* 004F0 80813D10 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 004EC 80813D0C 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) +/* 004F0 80813D10 3C0F8016 */ lui $t7, %hi(gGameInfo) /* 004F4 80813D14 2419FFCF */ addiu $t9, $zero, 0xFFCF ## $t9 = FFFFFFCF /* 004F8 80813D18 A70E0F40 */ sh $t6, 0x0F40($t8) ## 80160F40 -/* 004FC 80813D1C 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 -/* 00500 80813D20 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 004FC 80813D1C 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) +/* 00500 80813D20 3C188016 */ lui $t8, %hi(gGameInfo) /* 00504 80813D24 240EFFD2 */ addiu $t6, $zero, 0xFFD2 ## $t6 = FFFFFFD2 /* 00508 80813D28 A5F90F42 */ sh $t9, 0x0F42($t7) ## 80160F42 -/* 0050C 80813D2C 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 -/* 00510 80813D30 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0050C 80813D2C 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) +/* 00510 80813D30 3C0F8016 */ lui $t7, %hi(gGameInfo) /* 00514 80813D34 2419FFD7 */ addiu $t9, $zero, 0xFFD7 ## $t9 = FFFFFFD7 /* 00518 80813D38 A70E0F44 */ sh $t6, 0x0F44($t8) ## 80160F44 -/* 0051C 80813D3C 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 0051C 80813D3C 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 00520 80813D40 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 /* 00524 80813D44 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 00528 80813D48 A5F90F46 */ sh $t9, 0x0F46($t7) ## 80160F46 @@ -422,12 +422,12 @@ glabel func_80813820 /* 005F8 80813E18 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 00000000 /* 005FC 80813E1C 0C206785 */ jal func_80819E14 /* 00600 80813E20 8E860164 */ lw $a2, 0x0164($s4) ## 00000164 -/* 00604 80813E24 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00608 80813E28 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 0060C 80813E2C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00610 80813E30 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 00614 80813E34 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00618 80813E38 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00604 80813E24 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00608 80813E28 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 0060C 80813E2C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00610 80813E30 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 00614 80813E34 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00618 80813E38 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 0061C 80813E3C AFAE0014 */ sw $t6, 0x0014($sp) /* 00620 80813E40 AFA70010 */ sw $a3, 0x0010($sp) /* 00624 80813E44 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 @@ -435,12 +435,12 @@ glabel func_80813820 /* 0062C 80813E4C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 00630 80813E50 8686021C */ lh $a2, 0x021C($s4) ## 0000021C -/* 00634 80813E54 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 -/* 00638 80813E58 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00634 80813E54 3C198012 */ lui $t9, %hi(gBitFlags) +/* 00638 80813E58 3C0F8016 */ lui $t7, %hi(gSaveContext+0xa4) /* 0063C 80813E5C 0006C080 */ sll $t8, $a2, 2 /* 00640 80813E60 0338C821 */ addu $t9, $t9, $t8 -/* 00644 80813E64 8F397120 */ lw $t9, 0x7120($t9) ## 80127120 -/* 00648 80813E68 8DEFE704 */ lw $t7, -0x18FC($t7) ## 8015E704 +/* 00644 80813E64 8F397120 */ lw $t9, %lo(gBitFlags)($t9) +/* 00648 80813E68 8DEFE704 */ lw $t7, %lo(gSaveContext+0xa4)($t7) /* 0064C 80813E6C 241003E7 */ addiu $s0, $zero, 0x03E7 ## $s0 = 000003E7 /* 00650 80813E70 032F7024 */ and $t6, $t9, $t7 /* 00654 80813E74 11C00005 */ beq $t6, $zero, .L80813E8C @@ -475,12 +475,12 @@ glabel func_80813820 /* 006C0 80813EE0 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 00000000 /* 006C4 80813EE4 0C206785 */ jal func_80819E14 /* 006C8 80813EE8 8E860164 */ lw $a2, 0x0164($s4) ## 00000164 -/* 006CC 80813EEC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 006D0 80813EF0 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 006D4 80813EF4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 006D8 80813EF8 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 006DC 80813EFC 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 006E0 80813F00 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 006CC 80813EEC 3C078013 */ lui $a3, %hi(D_801333E0) +/* 006D0 80813EF0 3C198013 */ lui $t9, %hi(D_801333E8) +/* 006D4 80813EF4 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 006D8 80813EF8 273933E8 */ addiu $t9, %lo(D_801333E8) +/* 006DC 80813EFC 3C058013 */ lui $a1, %hi(D_801333D4) +/* 006E0 80813F00 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 006E4 80813F04 AFB90014 */ sw $t9, 0x0014($sp) /* 006E8 80813F08 AFA70010 */ sw $a3, 0x0010($sp) /* 006EC 80813F0C 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 @@ -488,12 +488,12 @@ glabel func_80813820 /* 006F4 80813F14 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 006F8 80813F18 8686021C */ lh $a2, 0x021C($s4) ## 0000021C -/* 006FC 80813F1C 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 00700 80813F20 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 006FC 80813F1C 3C0F8012 */ lui $t7, %hi(gBitFlags) +/* 00700 80813F20 3C188016 */ lui $t8, %hi(gSaveContext+0xa4) /* 00704 80813F24 00067080 */ sll $t6, $a2, 2 /* 00708 80813F28 01EE7821 */ addu $t7, $t7, $t6 -/* 0070C 80813F2C 8DEF7120 */ lw $t7, 0x7120($t7) ## 80127120 -/* 00710 80813F30 8F18E704 */ lw $t8, -0x18FC($t8) ## 8015E704 +/* 0070C 80813F2C 8DEF7120 */ lw $t7, %lo(gBitFlags)($t7) +/* 00710 80813F30 8F18E704 */ lw $t8, %lo(gSaveContext+0xa4)($t8) /* 00714 80813F34 241003E7 */ addiu $s0, $zero, 0x03E7 ## $s0 = 000003E7 /* 00718 80813F38 28C10006 */ slti $at, $a2, 0x0006 /* 0071C 80813F3C 01F8C824 */ and $t9, $t7, $t8 @@ -562,9 +562,9 @@ glabel func_80813820 /* 00800 80814020 020E7821 */ addu $t7, $s0, $t6 /* 00804 80814024 1420FFF7 */ bne $at, $zero, .L80814004 /* 00808 80814028 A5E00000 */ sh $zero, 0x0000($t7) ## 80120000 -/* 0080C 8081402C 3C138016 */ lui $s3, 0x8016 ## $s3 = 80160000 +/* 0080C 8081402C 3C138016 */ lui $s3, %hi(gGameInfo) /* 00810 80814030 3C018083 */ lui $at, %hi(D_8082A11C) ## $at = 80830000 -/* 00814 80814034 2673FA90 */ addiu $s3, $s3, 0xFA90 ## $s3 = 8015FA90 +/* 00814 80814034 2673FA90 */ addiu $s3, %lo(gGameInfo) /* 00818 80814038 A420A11C */ sh $zero, %lo(D_8082A11C)($at) /* 0081C 8081403C 8E790000 */ lw $t9, 0x0000($s3) ## 8015FA90 /* 00820 80814040 2418FFC2 */ addiu $t8, $zero, 0xFFC2 ## $t8 = FFFFFFC2 @@ -587,9 +587,9 @@ glabel func_80813820 /* 00864 80814084 0C03B616 */ jal func_800ED858 /* 00868 80814088 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 /* 0086C 8081408C 00167040 */ sll $t6, $s6, 1 -/* 00870 80814090 3C0F8015 */ lui $t7, 0x8015 ## $t7 = 80150000 +/* 00870 80814090 3C0F8015 */ lui $t7, %hi(D_80153960) /* 00874 80814094 01EE7821 */ addu $t7, $t7, $t6 -/* 00878 80814098 85EF3960 */ lh $t7, 0x3960($t7) ## 80153960 +/* 00878 80814098 85EF3960 */ lh $t7, %lo(D_80153960)($t7) /* 0087C 8081409C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00880 808140A0 A68F0264 */ sh $t7, 0x0264($s4) ## 00000264 /* 00884 808140A4 86840264 */ lh $a0, 0x0264($s4) ## 00000264 @@ -667,8 +667,8 @@ glabel func_80813820 /* 00998 808141B8 00004825 */ or $t1, $zero, $zero ## $t1 = 00000000 /* 0099C 808141BC 241E0003 */ addiu $s8, $zero, 0x0003 ## $s8 = 00000003 .L808141C0: -/* 009A0 808141C0 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 009A4 808141C4 8F39E704 */ lw $t9, -0x18FC($t9) ## 8015E704 +/* 009A0 808141C0 3C198016 */ lui $t9, %hi(gSaveContext+0xa4) +/* 009A4 808141C4 8F39E704 */ lw $t9, %lo(gSaveContext+0xa4)($t9) /* 009A8 808141C8 12B70094 */ beq $s5, $s7, .L8081441C /* 009AC 808141CC AFB90078 */ sw $t9, 0x0078($sp) /* 009B0 808141D0 52BE0093 */ beql $s5, $s8, .L80814420 @@ -843,9 +843,9 @@ glabel func_80813820 .L8081441C: /* 00BFC 8081441C 00081880 */ sll $v1, $t0, 2 .L80814420: -/* 00C00 80814420 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 +/* 00C00 80814420 3C188012 */ lui $t8, %hi(gBitFlags) /* 00C04 80814424 0303C021 */ addu $t8, $t8, $v1 -/* 00C08 80814428 8F187120 */ lw $t8, 0x7120($t8) ## 80127120 +/* 00C08 80814428 8F187120 */ lw $t8, %lo(gBitFlags)($t8) /* 00C0C 8081442C 8FB90078 */ lw $t9, 0x0078($sp) /* 00C10 80814430 3C0F8083 */ lui $t7, %hi(D_8082A0D8) ## $t7 = 80830000 /* 00C14 80814434 3C018083 */ lui $at, %hi(D_8082A0FC) ## $at = 80830000 @@ -905,9 +905,9 @@ glabel func_80813820 /* 00CEC 8081450C 00097100 */ sll $t6, $t1, 4 /* 00CF0 80814510 01EEC021 */ addu $t8, $t7, $t6 /* 00CF4 80814514 ACB80004 */ sw $t8, 0x0004($a1) ## 00000004 -/* 00CF8 80814518 3C058012 */ lui $a1, 0x8012 ## $a1 = 80120000 +/* 00CF8 80814518 3C058012 */ lui $a1, %hi(gItemIcons+0x198) /* 00CFC 8081451C 00A32821 */ addu $a1, $a1, $v1 -/* 00D00 80814520 8CA573F4 */ lw $a1, 0x73F4($a1) ## 801273F4 +/* 00D00 80814520 8CA573F4 */ lw $a1, %lo(gItemIcons+0x198)($a1) /* 00D04 80814524 A7A9021A */ sh $t1, 0x021A($sp) /* 00D08 80814528 A7A80218 */ sh $t0, 0x0218($sp) /* 00D0C 8081452C 0C207E1F */ jal func_8081F87C @@ -930,8 +930,8 @@ glabel func_80813820 /* 00D4C 8081456C 3C018083 */ lui $at, %hi(D_8082A0FC) ## $at = 80830000 /* 00D50 80814570 16600011 */ bne $s3, $zero, .L808145B8 /* 00D54 80814574 A433A0FC */ sh $s3, %lo(D_8082A0FC)($at) -/* 00D58 80814578 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 00D5C 8081457C 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 00D58 80814578 3C198016 */ lui $t9, %hi(gGameInfo) +/* 00D5C 8081457C 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 00D60 80814580 00157840 */ sll $t7, $s5, 1 /* 00D64 80814584 26B50001 */ addiu $s5, $s5, 0x0001 ## $s5 = 80830001 /* 00D68 80814588 032F7021 */ addu $t6, $t9, $t7 @@ -1027,11 +1027,11 @@ glabel func_80813820 /* 00ECC 808146EC ACB70000 */ sw $s7, 0x0000($a1) ## 00000000 .L808146F0: /* 00ED0 808146F0 00087080 */ sll $t6, $t0, 2 -/* 00ED4 808146F4 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 +/* 00ED4 808146F4 3C188012 */ lui $t8, %hi(gBitFlags+0x18) /* 00ED8 808146F8 030EC021 */ addu $t8, $t8, $t6 -/* 00EDC 808146FC 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 00EE0 80814700 8F39E704 */ lw $t9, -0x18FC($t9) ## 8015E704 -/* 00EE4 80814704 8F187138 */ lw $t8, 0x7138($t8) ## 80127138 +/* 00EDC 808146FC 3C198016 */ lui $t9, %hi(gSaveContext+0xa4) +/* 00EE0 80814700 8F39E704 */ lw $t9, %lo(gSaveContext+0xa4)($t9) +/* 00EE4 80814704 8F187138 */ lw $t8, %lo(gBitFlags+0x18)($t8) /* 00EE8 80814708 03197824 */ and $t7, $t8, $t9 /* 00EEC 8081470C 11E00055 */ beq $t7, $zero, .L80814864 /* 00EF0 80814710 87B80216 */ lh $t8, 0x0216($sp) @@ -1154,11 +1154,11 @@ glabel func_80813820 /* 010BC 808148DC ACB80000 */ sw $t8, 0x0000($a1) ## 00000000 .L808148E0: /* 010C0 808148E0 00081880 */ sll $v1, $t0, 2 -/* 010C4 808148E4 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 +/* 010C4 808148E4 3C0E8012 */ lui $t6, %hi(gBitFlags+0x48) /* 010C8 808148E8 01C37021 */ addu $t6, $t6, $v1 -/* 010CC 808148EC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 010D0 808148F0 8DEFE704 */ lw $t7, -0x18FC($t7) ## 8015E704 -/* 010D4 808148F4 8DCE7168 */ lw $t6, 0x7168($t6) ## 80127168 +/* 010CC 808148EC 3C0F8016 */ lui $t7, %hi(gSaveContext+0xa4) +/* 010D0 808148F0 8DEFE704 */ lw $t7, %lo(gSaveContext+0xa4)($t7) +/* 010D4 808148F4 8DCE7168 */ lw $t6, %lo(gBitFlags+0x48)($t6) /* 010D8 808148F8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 010DC 808148FC 01CFC024 */ and $t8, $t6, $t7 /* 010E0 80814900 13000015 */ beq $t8, $zero, .L80814958 @@ -1174,9 +1174,9 @@ glabel func_80813820 /* 01108 80814928 24070018 */ addiu $a3, $zero, 0x0018 ## $a3 = 00000018 /* 0110C 8081492C 01F8C821 */ addu $t9, $t7, $t8 /* 01110 80814930 ACB90004 */ sw $t9, 0x0004($a1) ## 00000004 -/* 01114 80814934 3C058012 */ lui $a1, 0x8012 ## $a1 = 80120000 +/* 01114 80814934 3C058012 */ lui $a1, %hi(gItemIcons+0x1b0) /* 01118 80814938 00A32821 */ addu $a1, $a1, $v1 -/* 0111C 8081493C 8CA5740C */ lw $a1, 0x740C($a1) ## 8012740C +/* 0111C 8081493C 8CA5740C */ lw $a1, %lo(gItemIcons+0x1b0)($a1) /* 01120 80814940 A7A9021A */ sh $t1, 0x021A($sp) /* 01124 80814944 A7A80218 */ sh $t0, 0x0218($sp) /* 01128 80814948 0C207E1F */ jal func_8081F87C @@ -1205,17 +1205,17 @@ glabel func_80813820 /* 01180 808149A0 AE2F02C0 */ sw $t7, 0x02C0($s1) ## 000002C0 /* 01184 808149A4 ACB80000 */ sw $t8, 0x0000($a1) ## 00000000 /* 01188 808149A8 96990208 */ lhu $t9, 0x0208($s4) ## 00000208 -/* 0118C 808149AC 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0118C 808149AC 3C188016 */ lui $t8, %hi(gSaveContext+0xa4) /* 01190 808149B0 332E00FF */ andi $t6, $t9, 0x00FF ## $t6 = 00000000 /* 01194 808149B4 01C17825 */ or $t7, $t6, $at ## $t7 = FFFFFF00 /* 01198 808149B8 ACAF0004 */ sw $t7, 0x0004($a1) ## 00000004 -/* 0119C 808149BC 8F18E704 */ lw $t8, -0x18FC($t8) ## 8015E704 +/* 0119C 808149BC 8F18E704 */ lw $t8, %lo(gSaveContext+0xa4)($t8) /* 011A0 808149C0 AFB80078 */ sw $t8, 0x0078($sp) .L808149C4: /* 011A4 808149C4 00081880 */ sll $v1, $t0, 2 -/* 011A8 808149C8 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 +/* 011A8 808149C8 3C198012 */ lui $t9, %hi(gBitFlags+0x54) /* 011AC 808149CC 0323C821 */ addu $t9, $t9, $v1 -/* 011B0 808149D0 8F397174 */ lw $t9, 0x7174($t9) ## 80127174 +/* 011B0 808149D0 8F397174 */ lw $t9, %lo(gBitFlags+0x54)($t9) /* 011B4 808149D4 8FAE0078 */ lw $t6, 0x0078($sp) /* 011B8 808149D8 032E7824 */ and $t7, $t9, $t6 /* 011BC 808149DC 51E00025 */ beql $t7, $zero, .L80814A74 @@ -1243,15 +1243,15 @@ glabel func_80813820 /* 01214 80814A34 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 /* 01218 80814A38 0301C825 */ or $t9, $t8, $at ## $t9 = FFFFFF00 /* 0121C 80814A3C ACB90004 */ sw $t9, 0x0004($a1) ## 00000004 -/* 01220 80814A40 3C058012 */ lui $a1, 0x8012 ## $a1 = 80120000 +/* 01220 80814A40 3C058012 */ lui $a1, %hi(gItemIcons+0x1bc) /* 01224 80814A44 00A32821 */ addu $a1, $a1, $v1 -/* 01228 80814A48 8CA57418 */ lw $a1, 0x7418($a1) ## 80127418 +/* 01228 80814A48 8CA57418 */ lw $a1, %lo(gItemIcons+0x1bc)($a1) /* 0122C 80814A4C A7A9021A */ sh $t1, 0x021A($sp) /* 01230 80814A50 A7A80218 */ sh $t0, 0x0218($sp) /* 01234 80814A54 0C207E1F */ jal func_8081F87C /* 01238 80814A58 AFA00010 */ sw $zero, 0x0010($sp) -/* 0123C 80814A5C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 01240 80814A60 8DCEE704 */ lw $t6, -0x18FC($t6) ## 8015E704 +/* 0123C 80814A5C 3C0E8016 */ lui $t6, %hi(gSaveContext+0xa4) +/* 01240 80814A60 8DCEE704 */ lw $t6, %lo(gSaveContext+0xa4)($t6) /* 01244 80814A64 87A80218 */ lh $t0, 0x0218($sp) /* 01248 80814A68 87A9021A */ lh $t1, 0x021A($sp) /* 0124C 80814A6C AFAE0078 */ sw $t6, 0x0078($sp) @@ -1443,8 +1443,8 @@ glabel func_80813820 /* 014C8 80814CE8 3C018083 */ lui $at, %hi(D_8082A114) ## $at = 80830000 /* 014CC 80814CEC 14800019 */ bne $a0, $zero, .L80814D54 /* 014D0 80814CF0 A424A114 */ sh $a0, %lo(D_8082A114)($at) -/* 014D4 80814CF4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 014D8 80814CF8 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 014D4 80814CF4 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 014D8 80814CF8 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 014DC 80814CFC 000D7840 */ sll $t7, $t5, 1 /* 014E0 80814D00 25AD0001 */ addiu $t5, $t5, 0x0001 ## $t5 = 80830001 /* 014E4 80814D04 01CFC021 */ addu $t8, $t6, $t7 @@ -1578,12 +1578,12 @@ glabel func_80813820 /* 016D4 80814EF4 ACAE0000 */ sw $t6, 0x0000($a1) ## 00000000 /* 016D8 80814EF8 8E990164 */ lw $t9, 0x0164($s4) ## 00000164 /* 016DC 80814EFC 00097900 */ sll $t7, $t1, 4 -/* 016E0 80814F00 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 016E0 80814F00 3C0E8016 */ lui $t6, %hi(gSaveContext+0xa4) /* 016E4 80814F04 032FC021 */ addu $t8, $t9, $t7 /* 016E8 80814F08 ACB80004 */ sw $t8, 0x0004($a1) ## 00000004 -/* 016EC 80814F0C 8DCEE704 */ lw $t6, -0x18FC($t6) ## 8015E704 +/* 016EC 80814F0C 8DCEE704 */ lw $t6, %lo(gSaveContext+0xa4)($t6) /* 016F0 80814F10 3C01F000 */ lui $at, 0xF000 ## $at = F0000000 -/* 016F4 80814F14 3C058012 */ lui $a1, 0x8012 ## $a1 = 80120000 +/* 016F4 80814F14 3C058012 */ lui $a1, %hi(gItemIcons+0x1e4) /* 016F8 80814F18 01C1C824 */ and $t9, $t6, $at /* 016FC 80814F1C 03217824 */ and $t7, $t9, $at /* 01700 80814F20 000FC702 */ srl $t8, $t7, 28 @@ -1593,7 +1593,7 @@ glabel func_80813820 /* 01710 80814F30 A7A9021A */ sh $t1, 0x021A($sp) /* 01714 80814F34 AFA00010 */ sw $zero, 0x0010($sp) /* 01718 80814F38 0C207D43 */ jal func_8081F50C -/* 0171C 80814F3C 8CA57440 */ lw $a1, 0x7440($a1) ## 80127440 +/* 0171C 80814F3C 8CA57440 */ lw $a1, %lo(gItemIcons+0x1e4)($a1) /* 01720 80814F40 87A9021A */ lh $t1, 0x021A($sp) /* 01724 80814F44 AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 .L80814F48: @@ -1699,10 +1699,10 @@ glabel func_80813820 /* 018A0 808150C0 0008C840 */ sll $t9, $t0, 1 /* 018A4 808150C4 032F3021 */ addu $a2, $t9, $t7 /* 018A8 808150C8 84C20000 */ lh $v0, 0x0000($a2) ## 00000000 -/* 018AC 808150CC 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 018AC 808150CC 3C188016 */ lui $t8, %hi(gGameInfo) /* 018B0 808150D0 1142000A */ beq $t2, $v0, .L808150FC /* 018B4 808150D4 00000000 */ nop -/* 018B8 808150D8 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 018B8 808150D8 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 018BC 808150DC 870E0F78 */ lh $t6, 0x0F78($t8) ## 80160F78 /* 018C0 808150E0 004EC821 */ addu $t9, $v0, $t6 /* 018C4 808150E4 A4D90000 */ sh $t9, 0x0000($a2) ## 00000000 @@ -1712,8 +1712,8 @@ glabel func_80813820 /* 018D4 808150F4 00000000 */ nop /* 018D8 808150F8 A4CA0000 */ sh $t2, 0x0000($a2) ## 00000000 .L808150FC: -/* 018DC 808150FC 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 018E0 80815100 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 018DC 808150FC 3C188016 */ lui $t8, %hi(gGameInfo) +/* 018E0 80815100 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 018E4 80815104 00057040 */ sll $t6, $a1, 1 /* 018E8 80815108 8E8F0164 */ lw $t7, 0x0164($s4) ## 00000164 /* 018EC 8081510C 030EC821 */ addu $t9, $t8, $t6 @@ -1854,8 +1854,8 @@ glabel func_80813820 /* 01AF8 80815318 00000000 */ nop .L8081531C: /* 01AFC 8081531C 86860264 */ lh $a2, 0x0264($s4) ## 00000264 -/* 01B00 80815320 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 01B04 80815324 25EF1C00 */ addiu $t7, $t7, 0x1C00 ## $t7 = 80131C00 +/* 01B00 80815320 3C0F8013 */ lui $t7, %hi(D_80131C00) +/* 01B04 80815324 25EF1C00 */ addiu $t7, %lo(D_80131C00) /* 01B08 80815328 0006C8C0 */ sll $t9, $a2, 3 /* 01B0C 8081532C 0326C821 */ addu $t9, $t9, $a2 /* 01B10 80815330 032FC021 */ addu $t8, $t9, $t7 @@ -1885,8 +1885,8 @@ glabel func_80813820 /* 01B70 80815390 00F33021 */ addu $a2, $a3, $s3 .L80815394: /* 01B74 80815394 90D80001 */ lbu $t8, 0x0001($a2) ## 00000001 -/* 01B78 80815398 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 01B7C 8081539C 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 01B78 80815398 3C198016 */ lui $t9, %hi(gGameInfo) +/* 01B7C 8081539C 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 01B80 808153A0 00187040 */ sll $t6, $t8, 1 /* 01B84 808153A4 8E980164 */ lw $t8, 0x0164($s4) ## 00000164 /* 01B88 808153A8 032E7821 */ addu $t7, $t9, $t6 @@ -2083,10 +2083,10 @@ glabel func_80813820 /* 01E68 80815688 00137040 */ sll $t6, $s3, 1 /* 01E6C 8081568C 01CF3021 */ addu $a2, $t6, $t7 /* 01E70 80815690 84C20000 */ lh $v0, 0x0000($a2) ## 00000000 -/* 01E74 80815694 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 01E74 80815694 3C198016 */ lui $t9, %hi(gGameInfo) /* 01E78 80815698 1142000A */ beq $t2, $v0, .L808156C4 /* 01E7C 8081569C 00000000 */ nop -/* 01E80 808156A0 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 01E80 808156A0 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 01E84 808156A4 87380F78 */ lh $t8, 0x0F78($t9) ## 80160F78 /* 01E88 808156A8 00587021 */ addu $t6, $v0, $t8 /* 01E8C 808156AC A4CE0000 */ sh $t6, 0x0000($a2) ## 00000000 @@ -2096,8 +2096,8 @@ glabel func_80813820 /* 01E9C 808156BC 00000000 */ nop /* 01EA0 808156C0 A4CA0000 */ sh $t2, 0x0000($a2) ## 00000000 .L808156C4: -/* 01EA4 808156C4 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 01EA8 808156C8 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 01EA4 808156C4 3C198016 */ lui $t9, %hi(gGameInfo) +/* 01EA8 808156C8 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 01EAC 808156CC 0005C040 */ sll $t8, $a1, 1 /* 01EB0 808156D0 8E8F0164 */ lw $t7, 0x0164($s4) ## 00000164 /* 01EB4 808156D4 03387021 */ addu $t6, $t9, $t8 @@ -2264,10 +2264,10 @@ glabel func_80813820 /* 02128 80815948 A3190001 */ sb $t9, 0x0001($t8) ## 00000001 /* 0212C 8081594C A68F01E4 */ sh $t7, 0x01E4($s4) ## 000001E4 .L80815950: -/* 02130 80815950 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 02134 80815954 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 02138 80815958 8F39E704 */ lw $t9, -0x18FC($t9) ## 8015E704 -/* 0213C 8081595C 8DCE717C */ lw $t6, 0x717C($t6) ## 8012717C +/* 02130 80815950 3C0E8012 */ lui $t6, %hi(gBitFlags+0x5c) +/* 02134 80815954 3C198016 */ lui $t9, %hi(gSaveContext+0xa4) +/* 02138 80815958 8F39E704 */ lw $t9, %lo(gSaveContext+0xa4)($t9) +/* 0213C 8081595C 8DCE717C */ lw $t6, %lo(gBitFlags+0x5c)($t6) /* 02140 80815960 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 /* 02144 80815964 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 /* 02148 80815968 01D9C024 */ and $t8, $t6, $t9 @@ -2282,7 +2282,7 @@ glabel func_80813820 /* 0216C 8081598C ACB60000 */ sw $s6, 0x0000($a1) ## 00000000 /* 02170 80815990 8E2502C0 */ lw $a1, 0x02C0($s1) ## 000002C0 /* 02174 80815994 37399661 */ ori $t9, $t9, 0x9661 ## $t9 = FC309661 -/* 02178 80815998 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 02178 80815998 3C028016 */ lui $v0, %hi(gSaveContext+0xd0) /* 0217C 8081599C 24AE0008 */ addiu $t6, $a1, 0x0008 ## $t6 = 00000008 /* 02180 808159A0 AE2E02C0 */ sw $t6, 0x02C0($s1) ## 000002C0 /* 02184 808159A4 ACB80004 */ sw $t8, 0x0004($a1) ## 00000004 @@ -2294,7 +2294,7 @@ glabel func_80813820 /* 0219C 808159BC AE2F02C0 */ sw $t7, 0x02C0($s1) ## 000002C0 /* 021A0 808159C0 ACA00004 */ sw $zero, 0x0004($a1) ## 00000004 /* 021A4 808159C4 ACAE0000 */ sw $t6, 0x0000($a1) ## 00000000 -/* 021A8 808159C8 8442E730 */ lh $v0, -0x18D0($v0) ## 8015E730 +/* 021A8 808159C8 8442E730 */ lh $v0, %lo(gSaveContext+0xd0)($v0) /* 021AC 808159CC 00031C03 */ sra $v1, $v1, 16 /* 021B0 808159D0 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 021B4 808159D4 28410064 */ slti $at, $v0, 0x0064 @@ -2360,8 +2360,8 @@ glabel func_80813820 /* 02290 80815AB0 1000001C */ beq $zero, $zero, .L80815B24 /* 02294 80815AB4 ACAE0004 */ sw $t6, 0x0004($a1) ## 00000004 .L80815AB8: -/* 02298 80815AB8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 0229C 80815ABC 8739E730 */ lh $t9, -0x18D0($t9) ## 8015E730 +/* 02298 80815AB8 3C198016 */ lui $t9, %hi(gSaveContext+0xd0) +/* 0229C 80815ABC 8739E730 */ lh $t9, %lo(gSaveContext+0xd0)($t9) /* 022A0 80815AC0 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 /* 022A4 80815AC4 5721000E */ bnel $t9, $at, .L80815B00 /* 022A8 80815AC8 8E2502C0 */ lw $a1, 0x02C0($s1) ## 000002C0 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s index d11a634401..c11e2643d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s @@ -126,10 +126,10 @@ glabel func_808161AC /* 02B7C 8081639C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 02B80 808163A0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02B84 808163A4 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 -/* 02B88 808163A8 3C168016 */ lui $s6, 0x8016 ## $s6 = 80160000 +/* 02B88 808163A8 3C168016 */ lui $s6, %hi(gSaveContext) /* 02B8C 808163AC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 02B90 808163B0 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 -/* 02B94 808163B4 26D6E660 */ addiu $s6, $s6, 0xE660 ## $s6 = 8015E660 +/* 02B94 808163B4 26D6E660 */ addiu $s6, %lo(gSaveContext) /* 02B98 808163B8 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 02B9C 808163BC AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 02BA0 808163C0 86C50030 */ lh $a1, 0x0030($s6) ## 8015E690 @@ -322,9 +322,9 @@ glabel func_808161AC /* 02E44 80816664 3C0B8083 */ lui $t3, %hi(D_8082A420) ## $t3 = 80830000 /* 02E48 80816668 01715821 */ addu $t3, $t3, $s1 /* 02E4C 8081666C 916BA420 */ lbu $t3, %lo(D_8082A420)($t3) -/* 02E50 80816670 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 +/* 02E50 80816670 3C0C8012 */ lui $t4, %hi(gItemSlots) /* 02E54 80816674 018B6021 */ addu $t4, $t4, $t3 -/* 02E58 80816678 918C7464 */ lbu $t4, 0x7464($t4) ## 80127464 +/* 02E58 80816678 918C7464 */ lbu $t4, %lo(gItemSlots)($t4) /* 02E5C 8081667C 02CC6821 */ addu $t5, $s6, $t4 /* 02E60 80816680 10000008 */ beq $zero, $zero, .L808166A4 /* 02E64 80816684 81A5008C */ lb $a1, 0x008C($t5) ## 0000008C @@ -431,8 +431,8 @@ glabel func_808161AC /* 02FD0 808167F0 00118C00 */ sll $s1, $s1, 16 /* 02FD4 808167F4 1420FFDD */ bne $at, $zero, .L8081676C /* 02FD8 808167F8 00118C03 */ sra $s1, $s1, 16 -/* 02FDC 808167FC 3C148012 */ lui $s4, 0x8012 ## $s4 = 80120000 -/* 02FE0 80816800 269471B0 */ addiu $s4, $s4, 0x71B0 ## $s4 = 801271B0 +/* 02FDC 808167FC 3C148012 */ lui $s4, %hi(gUpgradeMasks) +/* 02FE0 80816800 269471B0 */ addiu $s4, %lo(gUpgradeMasks) /* 02FE4 80816804 2411004E */ addiu $s1, $zero, 0x004E ## $s1 = 0000004E /* 02FE8 80816808 0000A825 */ or $s5, $zero, $zero ## $s5 = 00000000 .L8081680C: @@ -440,9 +440,9 @@ glabel func_808161AC /* 02FF0 80816810 02895021 */ addu $t2, $s4, $t1 /* 02FF4 80816814 8D4B0000 */ lw $t3, 0x0000($t2) ## 00000000 /* 02FF8 80816818 8ED900A0 */ lw $t9, 0x00A0($s6) ## 8015E700 -/* 02FFC 8081681C 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 +/* 02FFC 8081681C 3C0D8012 */ lui $t5, %hi(gUpgradeShifts) /* 03000 80816820 01B56821 */ addu $t5, $t5, $s5 -/* 03004 80816824 91AD71F4 */ lbu $t5, 0x71F4($t5) ## 801271F4 +/* 03004 80816824 91AD71F4 */ lbu $t5, %lo(gUpgradeShifts)($t5) /* 03008 80816828 032B6024 */ and $t4, $t9, $t3 /* 0300C 8081682C A7B100DA */ sh $s1, 0x00DA($sp) /* 03010 80816830 8FA400F0 */ lw $a0, 0x00F0($sp) @@ -459,10 +459,10 @@ glabel func_808161AC /* 0303C 8081685C 2AA10008 */ slti $at, $s5, 0x0008 /* 03040 80816860 1420FFEA */ bne $at, $zero, .L8081680C /* 03044 80816864 00118C03 */ sra $s1, $s1, 16 -/* 03048 80816868 3C138012 */ lui $s3, 0x8012 ## $s3 = 80120000 -/* 0304C 8081686C 3C128012 */ lui $s2, 0x8012 ## $s2 = 80120000 -/* 03050 80816870 265271A0 */ addiu $s2, $s2, 0x71A0 ## $s2 = 801271A0 -/* 03054 80816874 267371F0 */ addiu $s3, $s3, 0x71F0 ## $s3 = 801271F0 +/* 03048 80816868 3C138012 */ lui $s3, %hi(gEquipShifts) +/* 0304C 8081686C 3C128012 */ lui $s2, %hi(gEquipMasks) +/* 03050 80816870 265271A0 */ addiu $s2, %lo(gEquipMasks) +/* 03054 80816874 267371F0 */ addiu $s3, %lo(gEquipShifts) /* 03058 80816878 241100CA */ addiu $s1, $zero, 0x00CA ## $s1 = 000000CA /* 0305C 8081687C 0000A825 */ or $s5, $zero, $zero ## $s5 = 00000000 .L80816880: @@ -512,8 +512,8 @@ glabel func_808161AC /* 03108 80816928 2AA1000C */ slti $at, $s5, 0x000C /* 0310C 8081692C 1420FFEC */ bne $at, $zero, .L808168E0 /* 03110 80816930 00118C03 */ sra $s1, $s1, 16 -/* 03114 80816934 3C128012 */ lui $s2, 0x8012 ## $s2 = 80120000 -/* 03118 80816938 26527120 */ addiu $s2, $s2, 0x7120 ## $s2 = 80127120 +/* 03114 80816934 3C128012 */ lui $s2, %hi(gBitFlags) +/* 03118 80816938 26527120 */ addiu $s2, %lo(gBitFlags) /* 0311C 8081693C 2411004E */ addiu $s1, $zero, 0x004E ## $s1 = 0000004E /* 03120 80816940 0000A825 */ or $s5, $zero, $zero ## $s5 = 00000000 .L80816944: @@ -997,14 +997,14 @@ glabel func_808161AC /* 037F8 80817018 5700000F */ bnel $t8, $zero, .L80817058 /* 037FC 8081701C 2401FFFD */ addiu $at, $zero, 0xFFFD ## $at = FFFFFFFD /* 03800 80817020 92040000 */ lbu $a0, 0x0000($s0) ## F0000000 -/* 03804 80817024 3C058012 */ lui $a1, 0x8012 ## $a1 = 80120000 +/* 03804 80817024 3C058012 */ lui $a1, %hi(gItemSlots) /* 03808 80817028 00A42821 */ addu $a1, $a1, $a0 /* 0380C 8081702C 0C021A4C */ jal Inventory_DeleteItem -/* 03810 80817030 90A57464 */ lbu $a1, 0x7464($a1) ## 80127464 +/* 03810 80817030 90A57464 */ lbu $a1, %lo(gItemSlots)($a1) /* 03814 80817034 92090000 */ lbu $t1, 0x0000($s0) ## F0000000 -/* 03818 80817038 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 +/* 03818 80817038 3C198012 */ lui $t9, %hi(gItemSlots) /* 0381C 8081703C 0329C821 */ addu $t9, $t9, $t1 -/* 03820 80817040 93397464 */ lbu $t9, 0x7464($t9) ## 80127464 +/* 03820 80817040 93397464 */ lbu $t9, %lo(gItemSlots)($t9) /* 03824 80817044 02D95021 */ addu $t2, $s6, $t9 /* 03828 80817048 A140008C */ sb $zero, 0x008C($t2) ## 0000008C /* 0382C 8081704C 8FAB0054 */ lw $t3, 0x0054($sp) @@ -1017,10 +1017,10 @@ glabel func_808161AC /* 03844 80817064 3C048083 */ lui $a0, %hi(D_8082A420) ## $a0 = 80830000 /* 03848 80817068 00952021 */ addu $a0, $a0, $s5 /* 0384C 8081706C 9084A420 */ lbu $a0, %lo(D_8082A420)($a0) -/* 03850 80817070 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 +/* 03850 80817070 3C0C8012 */ lui $t4, %hi(gItemSlots) /* 03854 80817074 24190063 */ addiu $t9, $zero, 0x0063 ## $t9 = 00000063 /* 03858 80817078 01846021 */ addu $t4, $t4, $a0 -/* 0385C 8081707C 918C7464 */ lbu $t4, 0x7464($t4) ## 80127464 +/* 0385C 8081707C 918C7464 */ lbu $t4, %lo(gItemSlots)($t4) /* 03860 80817080 02CC1021 */ addu $v0, $s6, $t4 /* 03864 80817084 904F0074 */ lbu $t7, 0x0074($v0) ## 00000074 /* 03868 80817088 52AF0003 */ beql $s5, $t7, .L80817098 @@ -1042,9 +1042,9 @@ glabel func_808161AC /* 038A0 808170C0 3C0B8083 */ lui $t3, %hi(D_8082A420) ## $t3 = 80830000 /* 038A4 808170C4 01755821 */ addu $t3, $t3, $s5 /* 038A8 808170C8 916BA420 */ lbu $t3, %lo(D_8082A420)($t3) -/* 038AC 808170CC 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 +/* 038AC 808170CC 3C0D8012 */ lui $t5, %hi(gItemSlots) /* 038B0 808170D0 01AB6821 */ addu $t5, $t5, $t3 -/* 038B4 808170D4 91AD7464 */ lbu $t5, 0x7464($t5) ## 80127464 +/* 038B4 808170D4 91AD7464 */ lbu $t5, %lo(gItemSlots)($t5) /* 038B8 808170D8 02CD1021 */ addu $v0, $s6, $t5 /* 038BC 808170DC 804C008C */ lb $t4, 0x008C($v0) ## 0000008C /* 038C0 808170E0 258FFFFF */ addiu $t7, $t4, 0xFFFF ## $t7 = 8011FFFF @@ -1064,9 +1064,9 @@ glabel func_808161AC /* 038F4 80817114 00414827 */ nor $t1, $v0, $at /* 038F8 80817118 15200006 */ bne $t1, $zero, .L80817134 /* 038FC 8081711C 2401FFFD */ addiu $at, $zero, 0xFFFD ## $at = FFFFFFFD -/* 03900 80817120 3C058012 */ lui $a1, 0x8012 ## $a1 = 80120000 +/* 03900 80817120 3C058012 */ lui $a1, %hi(gItemSlots+7) /* 03904 80817124 0C021A4C */ jal Inventory_DeleteItem -/* 03908 80817128 90A5746B */ lbu $a1, 0x746B($a1) ## 8012746B +/* 03908 80817128 90A5746B */ lbu $a1, %lo(gItemSlots+7)($a1) /* 0390C 8081712C 1000025B */ beq $zero, $zero, .L80817A9C /* 03910 80817130 8FAD00C4 */ lw $t5, 0x00C4($sp) .L80817134: @@ -1119,9 +1119,9 @@ glabel func_808161AC /* 039BC 808171DC 00417027 */ nor $t6, $v0, $at /* 039C0 808171E0 15C00006 */ bne $t6, $zero, .L808171FC /* 039C4 808171E4 2401FFFD */ addiu $at, $zero, 0xFFFD ## $at = FFFFFFFD -/* 039C8 808171E8 3C058012 */ lui $a1, 0x8012 ## $a1 = 80120000 +/* 039C8 808171E8 3C058012 */ lui $a1, %hi(gItemSlots+0xa) /* 039CC 808171EC 0C021A4C */ jal Inventory_DeleteItem -/* 039D0 808171F0 90A5746E */ lbu $a1, 0x746E($a1) ## 8012746E +/* 039D0 808171F0 90A5746E */ lbu $a1, %lo(gItemSlots+0xa)($a1) /* 039D4 808171F4 10000229 */ beq $zero, $zero, .L80817A9C /* 039D8 808171F8 8FAD00C4 */ lw $t5, 0x00C4($sp) .L808171FC: @@ -1173,9 +1173,9 @@ glabel func_808161AC /* 03A80 808172A0 0041C027 */ nor $t8, $v0, $at /* 03A84 808172A4 17000006 */ bne $t8, $zero, .L808172C0 /* 03A88 808172A8 2401FFFD */ addiu $at, $zero, 0xFFFD ## $at = FFFFFFFD -/* 03A8C 808172AC 3C058012 */ lui $a1, 0x8012 ## $a1 = 80120000 +/* 03A8C 808172AC 3C058012 */ lui $a1, %hi(gItemSlots+0x2d) /* 03A90 808172B0 0C021A4C */ jal Inventory_DeleteItem -/* 03A94 808172B4 90A57491 */ lbu $a1, 0x7491($a1) ## 80127491 +/* 03A94 808172B4 90A57491 */ lbu $a1, %lo(gItemSlots+0x2d)($a1) /* 03A98 808172B8 100001F8 */ beq $zero, $zero, .L80817A9C /* 03A9C 808172BC 8FAD00C4 */ lw $t5, 0x00C4($sp) .L808172C0: @@ -1226,9 +1226,9 @@ glabel func_808161AC /* 03B40 80817360 00417827 */ nor $t7, $v0, $at /* 03B44 80817364 15E00006 */ bne $t7, $zero, .L80817380 /* 03B48 80817368 2401FFFD */ addiu $at, $zero, 0xFFFD ## $at = FFFFFFFD -/* 03B4C 8081736C 3C058012 */ lui $a1, 0x8012 ## $a1 = 80120000 +/* 03B4C 8081736C 3C058012 */ lui $a1, %hi(gItemSlots+0x21) /* 03B50 80817370 0C021A4C */ jal Inventory_DeleteItem -/* 03B54 80817374 90A57485 */ lbu $a1, 0x7485($a1) ## 80127485 +/* 03B54 80817374 90A57485 */ lbu $a1, %lo(gItemSlots+0x21)($a1) /* 03B58 80817378 100001C8 */ beq $zero, $zero, .L80817A9C /* 03B5C 8081737C 8FAD00C4 */ lw $t5, 0x00C4($sp) .L80817380: @@ -1278,11 +1278,11 @@ glabel func_808161AC /* 03BFC 8081741C 8FAD0054 */ lw $t5, 0x0054($sp) /* 03C00 80817420 95A2000C */ lhu $v0, 0x000C($t5) ## 0000000C /* 03C04 80817424 2401FFF7 */ addiu $at, $zero, 0xFFF7 ## $at = FFFFFFF7 -/* 03C08 80817428 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 +/* 03C08 80817428 3C0F8012 */ lui $t7, %hi(gItemSlots+0x14) /* 03C0C 8081742C 00416027 */ nor $t4, $v0, $at /* 03C10 80817430 1580000A */ bne $t4, $zero, .L8081745C /* 03C14 80817434 2401FFFD */ addiu $at, $zero, 0xFFFD ## $at = FFFFFFFD -/* 03C18 80817438 91EF7478 */ lbu $t7, 0x7478($t7) ## 80127478 +/* 03C18 80817438 91EF7478 */ lbu $t7, %lo(gItemSlots+0x14)($t7) /* 03C1C 8081743C 26A40002 */ addiu $a0, $s5, 0x0002 ## $a0 = 00000003 /* 03C20 80817440 3084FFFF */ andi $a0, $a0, 0xFFFF ## $a0 = 00000003 /* 03C24 80817444 01F52821 */ addu $a1, $t7, $s5 @@ -1360,8 +1360,8 @@ glabel func_808161AC /* 03D2C 8081754C 10000152 */ beq $zero, $zero, .L80817A98 /* 03D30 80817550 A0790074 */ sb $t9, 0x0074($v1) ## 00000074 .L80817554: -/* 03D34 80817554 3C058012 */ lui $a1, 0x8012 ## $a1 = 80120000 -/* 03D38 80817558 90A57474 */ lbu $a1, 0x7474($a1) ## 80127474 +/* 03D34 80817554 3C058012 */ lui $a1, %hi(gItemSlots+0x10) +/* 03D38 80817558 90A57474 */ lbu $a1, %lo(gItemSlots+0x10)($a1) /* 03D3C 8081755C 0C021A4C */ jal Inventory_DeleteItem /* 03D40 80817560 24040010 */ addiu $a0, $zero, 0x0010 ## $a0 = 00000010 /* 03D44 80817564 1000014D */ beq $zero, $zero, .L80817A9C @@ -1462,7 +1462,7 @@ glabel func_808161AC /* 03E9C 808176BC 8FAE0054 */ lw $t6, 0x0054($sp) /* 03EA0 808176C0 95C2000C */ lhu $v0, 0x000C($t6) ## 8083000C /* 03EA4 808176C4 2401FFF7 */ addiu $at, $zero, 0xFFF7 ## $at = FFFFFFF7 -/* 03EA8 808176C8 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 +/* 03EA8 808176C8 3C0F8012 */ lui $t7, %hi(gUpgradeShifts) /* 03EAC 808176CC 00414827 */ nor $t1, $v0, $at /* 03EB0 808176D0 11200004 */ beq $t1, $zero, .L808176E4 /* 03EB4 808176D4 2401FFFD */ addiu $at, $zero, 0xFFFD ## $at = FFFFFFFD @@ -1474,7 +1474,7 @@ glabel func_808161AC /* 03EC8 808176E8 00021403 */ sra $v0, $v0, 16 /* 03ECC 808176EC 00025080 */ sll $t2, $v0, 2 /* 03ED0 808176F0 028A5821 */ addu $t3, $s4, $t2 -/* 03ED4 808176F4 25EF71F4 */ addiu $t7, $t7, 0x71F4 ## $t7 = 801271F4 +/* 03ED4 808176F4 25EF71F4 */ addiu $t7, %lo(gUpgradeShifts) /* 03ED8 808176F8 8D6D0000 */ lw $t5, 0x0000($t3) ## 80830000 /* 03EDC 808176FC 8EC300A0 */ lw $v1, 0x00A0($s6) ## 8015E700 /* 03EE0 80817700 004FC021 */ addu $t8, $v0, $t7 @@ -1507,8 +1507,8 @@ glabel func_808161AC /* 03F44 80817764 00041400 */ sll $v0, $a0, 16 /* 03F48 80817768 00021403 */ sra $v0, $v0, 16 /* 03F4C 8081776C 0002C880 */ sll $t9, $v0, 2 -/* 03F50 80817770 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 -/* 03F54 80817774 271871F4 */ addiu $t8, $t8, 0x71F4 ## $t8 = 801271F4 +/* 03F50 80817770 3C188012 */ lui $t8, %hi(gUpgradeShifts) +/* 03F54 80817774 271871F4 */ addiu $t8, %lo(gUpgradeShifts) /* 03F58 80817778 02995021 */ addu $t2, $s4, $t9 /* 03F5C 8081777C 8D4B0000 */ lw $t3, 0x0000($t2) ## 00000000 /* 03F60 80817780 8EC300A0 */ lw $v1, 0x00A0($s6) ## 8015E700 @@ -1552,10 +1552,10 @@ glabel func_808161AC /* 03FF4 80817814 000BC403 */ sra $t8, $t3, 16 /* 03FF8 80817818 02787821 */ addu $t7, $s3, $t8 /* 03FFC 8081781C 91ED0000 */ lbu $t5, 0x0000($t7) ## 00000000 -/* 04000 80817820 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 04000 80817820 3C018016 */ lui $at, %hi(gSaveContext+0x9c) /* 04004 80817824 01AC7004 */ sllv $t6, $t4, $t5 /* 04008 80817828 012EC826 */ xor $t9, $t1, $t6 -/* 0400C 8081782C A439E6FC */ sh $t9, -0x1904($at) ## 8015E6FC +/* 0400C 8081782C A439E6FC */ sh $t9, %lo(gSaveContext+0x9c)($at) /* 04010 80817830 9462000C */ lhu $v0, 0x000C($v1) ## 0000000C /* 04014 80817834 2401FFFB */ addiu $at, $zero, 0xFFFB ## $at = FFFFFFFB .L80817838: @@ -1570,10 +1570,10 @@ glabel func_808161AC /* 04038 80817858 000C6C03 */ sra $t5, $t4, 16 /* 0403C 8081785C 026D4821 */ addu $t1, $s3, $t5 /* 04040 80817860 912E0000 */ lbu $t6, 0x0000($t1) ## 00000000 -/* 04044 80817864 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 04044 80817864 3C018016 */ lui $at, %hi(gSaveContext+0x9c) /* 04048 80817868 01D95004 */ sllv $t2, $t9, $t6 /* 0404C 8081786C 016AC026 */ xor $t8, $t3, $t2 -/* 04050 80817870 A438E6FC */ sh $t8, -0x1904($at) ## 8015E6FC +/* 04050 80817870 A438E6FC */ sh $t8, %lo(gSaveContext+0x9c)($at) /* 04054 80817874 9462000C */ lhu $v0, 0x000C($v1) ## 0000000C .L80817878: /* 04058 80817878 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE @@ -1588,10 +1588,10 @@ glabel func_808161AC /* 0407C 8081789C 00197403 */ sra $t6, $t9, 16 /* 04080 808178A0 026E5821 */ addu $t3, $s3, $t6 /* 04084 808178A4 916A0000 */ lbu $t2, 0x0000($t3) ## 00000000 -/* 04088 808178A8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 04088 808178A8 3C018016 */ lui $at, %hi(gSaveContext+0x9c) /* 0408C 808178AC 01587804 */ sllv $t7, $t8, $t2 /* 04090 808178B0 018F6826 */ xor $t5, $t4, $t7 -/* 04094 808178B4 A42DE6FC */ sh $t5, -0x1904($at) ## 8015E6FC +/* 04094 808178B4 A42DE6FC */ sh $t5, %lo(gSaveContext+0x9c)($at) /* 04098 808178B8 9462000C */ lhu $v0, 0x000C($v1) ## 0000000C .L808178BC: /* 0409C 808178BC 2401FFF7 */ addiu $at, $zero, 0xFFF7 ## $at = FFFFFFF7 @@ -1606,11 +1606,11 @@ glabel func_808161AC /* 040C0 808178E0 00185403 */ sra $t2, $t8, 16 /* 040C4 808178E4 026A6021 */ addu $t4, $s3, $t2 /* 040C8 808178E8 918F0000 */ lbu $t7, 0x0000($t4) ## 00000001 -/* 040CC 808178EC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 040CC 808178EC 3C018016 */ lui $at, %hi(gSaveContext+0x9c) /* 040D0 808178F0 01ED4804 */ sllv $t1, $t5, $t7 /* 040D4 808178F4 03297026 */ xor $t6, $t9, $t1 /* 040D8 808178F8 10000067 */ beq $zero, $zero, .L80817A98 -/* 040DC 808178FC A42EE6FC */ sh $t6, -0x1904($at) ## 8015E6FC +/* 040DC 808178FC A42EE6FC */ sh $t6, %lo(gSaveContext+0x9c)($at) .L80817900: /* 040E0 80817900 856BA3D8 */ lh $t3, %lo(D_8082A3D8)($t3) /* 040E4 80817904 8FB80054 */ lw $t8, 0x0054($sp) @@ -1713,7 +1713,7 @@ glabel func_808161AC .L80817A6C: /* 0424C 80817A6C 85ADA3D8 */ lh $t5, %lo(D_8082A3D8)($t5) /* 04250 80817A70 8ECC00A4 */ lw $t4, 0x00A4($s6) ## 8015E704 -/* 04254 80817A74 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 04254 80817A74 3C018016 */ lui $at, %hi(gSaveContext+0xa4) /* 04258 80817A78 25AFFFBC */ addiu $t7, $t5, 0xFFBC ## $t7 = 8082FFBC /* 0425C 80817A7C 000FCC00 */ sll $t9, $t7, 16 /* 04260 80817A80 00194C03 */ sra $t1, $t9, 16 @@ -1721,7 +1721,7 @@ glabel func_808161AC /* 04268 80817A88 024EC021 */ addu $t8, $s2, $t6 /* 0426C 80817A8C 8F0A0000 */ lw $t2, 0x0000($t8) ## 80830000 /* 04270 80817A90 018A5826 */ xor $t3, $t4, $t2 -/* 04274 80817A94 AC2BE704 */ sw $t3, -0x18FC($at) ## 8015E704 +/* 04274 80817A94 AC2BE704 */ sw $t3, %lo(gSaveContext+0xa4)($at) .L80817A98: /* 04278 80817A98 8FAD00C4 */ lw $t5, 0x00C4($sp) .L80817A9C: diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081819C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081819C.s index 5cbbcd9bc7..2ad84bde4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081819C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081819C.s @@ -1,6 +1,6 @@ glabel func_8081819C -/* 0497C 8081819C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 04980 808181A0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0497C 8081819C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 04980 808181A0 2463E660 */ addiu $v1, %lo(gSaveContext) /* 04984 808181A4 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 /* 04988 808181A8 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 0498C 808181AC AFBF002C */ sw $ra, 0x002C($sp) @@ -17,20 +17,20 @@ glabel func_8081819C /* 049B0 808181D0 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 /* 049B4 808181D4 3C01C302 */ lui $at, 0xC302 ## $at = C3020000 /* 049B8 808181D8 44813000 */ mtc1 $at, $f6 ## $f6 = -130.00 -/* 049BC 808181DC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 049C0 808181E0 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 049C4 808181E4 95EF71A0 */ lhu $t7, 0x71A0($t7) ## 801271A0 -/* 049C8 808181E8 9442E6D0 */ lhu $v0, -0x1930($v0) ## 8015E6D0 +/* 049BC 808181DC 3C028016 */ lui $v0, %hi(gSaveContext+0x70) +/* 049C0 808181E0 3C0F8012 */ lui $t7, %hi(gEquipMasks) +/* 049C4 808181E4 95EF71A0 */ lhu $t7, %lo(gEquipMasks)($t7) +/* 049C8 808181E8 9442E6D0 */ lhu $v0, %lo(gSaveContext+0x70)($v0) /* 049CC 808181EC 3C01C316 */ lui $at, 0xC316 ## $at = C3160000 /* 049D0 808181F0 44814000 */ mtc1 $at, $f8 ## $f8 = -150.00 -/* 049D4 808181F4 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 -/* 049D8 808181F8 933971F0 */ lbu $t9, 0x71F0($t9) ## 801271F0 +/* 049D4 808181F4 3C198012 */ lui $t9, %hi(gEquipShifts) +/* 049D8 808181F8 933971F0 */ lbu $t9, %lo(gEquipShifts)($t9) /* 049DC 808181FC 3C018083 */ lui $at, %hi(D_8082F704) ## $at = 80830000 -/* 049E0 80818200 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 049E4 80818204 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 +/* 049E0 80818200 3C0A8012 */ lui $t2, %hi(gEquipShifts) +/* 049E4 80818204 3C098012 */ lui $t1, %hi(gEquipMasks) /* 049E8 80818208 004FC024 */ and $t8, $v0, $t7 -/* 049EC 8081820C 252971A0 */ addiu $t1, $t1, 0x71A0 ## $t1 = 801271A0 -/* 049F0 80818210 254A71F0 */ addiu $t2, $t2, 0x71F0 ## $t2 = 801271F0 +/* 049EC 8081820C 252971A0 */ addiu $t1, %lo(gEquipMasks) +/* 049F0 80818210 254A71F0 */ addiu $t2, %lo(gEquipShifts) /* 049F4 80818214 C420F704 */ lwc1 $f0, %lo(D_8082F704)($at) /* 049F8 80818218 E7A40050 */ swc1 $f4, 0x0050($sp) /* 049FC 8081821C E7A60054 */ swc1 $f6, 0x0054($sp) @@ -38,12 +38,12 @@ glabel func_8081819C /* 04A04 80818224 10000023 */ beq $zero, $zero, .L808182B4 /* 04A08 80818228 03384007 */ srav $t0, $t8, $t9 .L8081822C: -/* 04A0C 8081822C 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 -/* 04A10 80818230 252971A0 */ addiu $t1, $t1, 0x71A0 ## $t1 = 801271A0 -/* 04A14 80818234 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 +/* 04A0C 8081822C 3C098012 */ lui $t1, %hi(gEquipMasks) +/* 04A10 80818230 252971A0 */ addiu $t1, %lo(gEquipMasks) +/* 04A14 80818234 3C0A8012 */ lui $t2, %hi(gEquipShifts) /* 04A18 80818238 952B0000 */ lhu $t3, 0x0000($t1) ## 801271A0 /* 04A1C 8081823C 94620070 */ lhu $v0, 0x0070($v1) ## 8015E6D0 -/* 04A20 80818240 254A71F0 */ addiu $t2, $t2, 0x71F0 ## $t2 = 801271F0 +/* 04A20 80818240 254A71F0 */ addiu $t2, %lo(gEquipShifts) /* 04A24 80818244 914D0000 */ lbu $t5, 0x0000($t2) ## 801271F0 /* 04A28 80818248 004B6024 */ and $t4, $v0, $t3 /* 04A2C 8081824C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s index 5df6cd3acc..564f124955 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s @@ -20,10 +20,10 @@ glabel func_80818340 /* 04B68 80818388 AFA500AC */ sw $a1, 0x00AC($sp) /* 04B6C 8081838C 8FA500AC */ lw $a1, 0x00AC($sp) /* 04B70 80818390 3C17E700 */ lui $s7, 0xE700 ## $s7 = E7000000 -/* 04B74 80818394 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 04B74 80818394 3C068016 */ lui $a2, %hi(gGameInfo) /* 04B78 80818398 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 04B7C 8081839C 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 -/* 04B80 808183A0 24C6FA90 */ addiu $a2, $a2, 0xFA90 ## $a2 = 8015FA90 +/* 04B80 808183A0 24C6FA90 */ addiu $a2, %lo(gGameInfo) /* 04B84 808183A4 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 /* 04B88 808183A8 ACAF02C0 */ sw $t7, 0x02C0($a1) ## 000002C0 /* 04B8C 808183AC AC600004 */ sw $zero, 0x0004($v1) ## 00000004 @@ -59,8 +59,8 @@ glabel func_80818340 /* 04C04 80818424 ACB902C0 */ sw $t9, 0x02C0($a1) ## 000002C0 /* 04C08 80818428 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 04C0C 8081842C 8CC20000 */ lw $v0, 0x0000($a2) ## 8015FA90 -/* 04C10 80818430 3C118012 */ lui $s1, 0x8012 ## $s1 = 80120000 -/* 04C14 80818434 3C108012 */ lui $s0, 0x8012 ## $s0 = 80120000 +/* 04C10 80818430 3C118012 */ lui $s1, %hi(gEquipShifts) +/* 04C14 80818434 3C108012 */ lui $s0, %hi(gEquipMasks) /* 04C18 80818438 845807EE */ lh $t8, 0x07EE($v0) ## 000007EE /* 04C1C 8081843C 844C07EA */ lh $t4, 0x07EA($v0) ## 000007EA /* 04C20 80818440 844A07EC */ lh $t2, 0x07EC($v0) ## 000007EC @@ -71,10 +71,10 @@ glabel func_80818340 /* 04C34 80818454 00185C00 */ sll $t3, $t8, 16 /* 04C38 80818458 01CFC825 */ or $t9, $t6, $t7 ## $t9 = 00000008 /* 04C3C 8081845C 032B6825 */ or $t5, $t9, $t3 ## $t5 = 00000008 -/* 04C40 80818460 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 04C44 80818464 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 -/* 04C48 80818468 261071A0 */ addiu $s0, $s0, 0x71A0 ## $s0 = 801271A0 -/* 04C4C 8081846C 263171F0 */ addiu $s1, $s1, 0x71F0 ## $s1 = 801271F0 +/* 04C40 80818460 3C088016 */ lui $t0, %hi(gSaveContext) +/* 04C44 80818464 2508E660 */ addiu $t0, %lo(gSaveContext) +/* 04C48 80818468 261071A0 */ addiu $s0, %lo(gEquipMasks) +/* 04C4C 8081846C 263171F0 */ addiu $s1, %lo(gEquipShifts) /* 04C50 80818470 36524008 */ ori $s2, $s2, 0x4008 ## $s2 = 01004008 /* 04C54 80818474 26730E00 */ addiu $s3, $s3, 0x0E00 ## $s3 = 02000E00 /* 04C58 80818478 0000A825 */ or $s5, $zero, $zero ## $s5 = 00000000 @@ -112,8 +112,8 @@ glabel func_80818340 /* 04CD4 808184F4 0C207D43 */ jal func_8081F50C /* 04CD8 808184F8 AFA00010 */ sw $zero, 0x0010($sp) /* 04CDC 808184FC 8FAB00AC */ lw $t3, 0x00AC($sp) -/* 04CE0 80818500 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 04CE4 80818504 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 04CE0 80818500 3C088016 */ lui $t0, %hi(gSaveContext) +/* 04CE4 80818504 2508E660 */ addiu $t0, %lo(gSaveContext) /* 04CE8 80818508 AD6202C0 */ sw $v0, 0x02C0($t3) ## 000002C0 /* 04CEC 8081850C 8FA500AC */ lw $a1, 0x00AC($sp) /* 04CF0 80818510 26B50001 */ addiu $s5, $s5, 0x0001 ## $s5 = 00000002 @@ -135,14 +135,14 @@ glabel func_80818340 /* 04D2C 8081854C 56AF0305 */ bnel $s5, $t7, .L80819164 /* 04D30 80818550 96CE01E4 */ lhu $t6, 0x01E4($s6) ## 000001E4 /* 04D34 80818554 86CC021E */ lh $t4, 0x021E($s6) ## 0000021E -/* 04D38 80818558 3C078012 */ lui $a3, 0x8012 ## $a3 = 80120000 -/* 04D3C 8081855C 3C038012 */ lui $v1, 0x8012 ## $v1 = 80120000 +/* 04D38 80818558 3C078012 */ lui $a3, %hi(gUpgradeShifts) +/* 04D3C 8081855C 3C038012 */ lui $v1, %hi(gUpgradeMasks) /* 04D40 80818560 A7AC00B2 */ sh $t4, 0x00B2($sp) /* 04D44 80818564 86C20238 */ lh $v0, 0x0238($s6) ## 00000238 /* 04D48 80818568 A6C00260 */ sh $zero, 0x0260($s6) ## 00000260 -/* 04D4C 8081856C 246371B0 */ addiu $v1, $v1, 0x71B0 ## $v1 = 801271B0 +/* 04D4C 8081856C 246371B0 */ addiu $v1, %lo(gUpgradeMasks) /* 04D50 80818570 14400114 */ bne $v0, $zero, .L808189C4 -/* 04D54 80818574 24E771F4 */ addiu $a3, $a3, 0x71F4 ## $a3 = 801271F4 +/* 04D54 80818574 24E771F4 */ addiu $a3, %lo(gUpgradeShifts) /* 04D58 80818578 96D00244 */ lhu $s0, 0x0244($s6) ## 00000244 /* 04D5C 8081857C A6C0025E */ sh $zero, 0x025E($s6) ## 0000025E /* 04D60 80818580 2A01003B */ slti $at, $s0, 0x003B @@ -197,11 +197,11 @@ glabel func_80818340 /* 04E18 80818638 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 /* 04E1C 8081863C 86CB021E */ lh $t3, 0x021E($s6) ## 0000021E .L80818640: -/* 04E20 80818640 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 +/* 04E20 80818640 3C188012 */ lui $t8, %hi(gBitFlags-4) /* 04E24 80818644 950E009C */ lhu $t6, 0x009C($t0) ## 8015E6FC /* 04E28 80818648 000B6880 */ sll $t5, $t3, 2 /* 04E2C 8081864C 030DC021 */ addu $t8, $t8, $t5 -/* 04E30 80818650 8F18711C */ lw $t8, 0x711C($t8) ## 8012711C +/* 04E30 80818650 8F18711C */ lw $t8, %lo(gBitFlags-4)($t8) /* 04E34 80818654 030E6024 */ and $t4, $t8, $t6 /* 04E38 80818658 11800071 */ beq $t4, $zero, .L80818820 /* 04E3C 8081865C 00000000 */ nop @@ -238,12 +238,12 @@ glabel func_80818340 /* 04EAC 808186CC 8FA400D8 */ lw $a0, 0x00D8($sp) /* 04EB0 808186D0 0C207E07 */ jal func_8081F81C /* 04EB4 808186D4 24100003 */ addiu $s0, $zero, 0x0003 ## $s0 = 00000003 -/* 04EB8 808186D8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 04EBC 808186DC 3C078012 */ lui $a3, 0x8012 ## $a3 = 80120000 -/* 04EC0 808186E0 3C038012 */ lui $v1, 0x8012 ## $v1 = 80120000 -/* 04EC4 808186E4 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 -/* 04EC8 808186E8 246371B0 */ addiu $v1, $v1, 0x71B0 ## $v1 = 801271B0 -/* 04ECC 808186EC 24E771F4 */ addiu $a3, $a3, 0x71F4 ## $a3 = 801271F4 +/* 04EB8 808186D8 3C088016 */ lui $t0, %hi(gSaveContext) +/* 04EBC 808186DC 3C078012 */ lui $a3, %hi(gUpgradeShifts) +/* 04EC0 808186E0 3C038012 */ lui $v1, %hi(gUpgradeMasks) +/* 04EC4 808186E4 2508E660 */ addiu $t0, %lo(gSaveContext) +/* 04EC8 808186E8 246371B0 */ addiu $v1, %lo(gUpgradeMasks) +/* 04ECC 808186EC 24E771F4 */ addiu $a3, %lo(gUpgradeShifts) /* 04ED0 808186F0 1000004B */ beq $zero, $zero, .L80818820 /* 04ED4 808186F4 00000000 */ nop /* 04ED8 808186F8 2841001F */ slti $at, $v0, 0x001F @@ -276,11 +276,11 @@ glabel func_80818340 /* 04F40 80818760 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 /* 04F44 80818764 86D9021E */ lh $t9, 0x021E($s6) ## 0000021E .L80818768: -/* 04F48 80818768 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 +/* 04F48 80818768 3C0A8012 */ lui $t2, %hi(gBitFlags-4) /* 04F4C 8081876C 950D009C */ lhu $t5, 0x009C($t0) ## 8015E6FC /* 04F50 80818770 00195880 */ sll $t3, $t9, 2 /* 04F54 80818774 014B5021 */ addu $t2, $t2, $t3 -/* 04F58 80818778 8D4A711C */ lw $t2, 0x711C($t2) ## 8012711C +/* 04F58 80818778 8D4A711C */ lw $t2, %lo(gBitFlags-4)($t2) /* 04F5C 8081877C 014D7024 */ and $t6, $t2, $t5 /* 04F60 80818780 11C00027 */ beq $t6, $zero, .L80818820 /* 04F64 80818784 00000000 */ nop @@ -317,13 +317,13 @@ glabel func_80818340 /* 04FD4 808187F4 8FA400D8 */ lw $a0, 0x00D8($sp) /* 04FD8 808187F8 0C207E07 */ jal func_8081F81C /* 04FDC 808187FC 24100003 */ addiu $s0, $zero, 0x0003 ## $s0 = 00000003 -/* 04FE0 80818800 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 04FE4 80818804 3C078012 */ lui $a3, 0x8012 ## $a3 = 80120000 -/* 04FE8 80818808 3C038012 */ lui $v1, 0x8012 ## $v1 = 80120000 -/* 04FEC 8081880C 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 -/* 04FF0 80818810 246371B0 */ addiu $v1, $v1, 0x71B0 ## $v1 = 801271B0 +/* 04FE0 80818800 3C088016 */ lui $t0, %hi(gSaveContext) +/* 04FE4 80818804 3C078012 */ lui $a3, %hi(gUpgradeShifts) +/* 04FE8 80818808 3C038012 */ lui $v1, %hi(gUpgradeMasks) +/* 04FEC 8081880C 2508E660 */ addiu $t0, %lo(gSaveContext) +/* 04FF0 80818810 246371B0 */ addiu $v1, %lo(gUpgradeMasks) /* 04FF4 80818814 10000002 */ beq $zero, $zero, .L80818820 -/* 04FF8 80818818 24E771F4 */ addiu $a3, $a3, 0x71F4 ## $a3 = 801271F4 +/* 04FF8 80818818 24E771F4 */ addiu $a3, %lo(gUpgradeShifts) /* 04FFC 8081881C 24100004 */ addiu $s0, $zero, 0x0004 ## $s0 = 00000004 .L80818820: /* 05000 80818820 5200FF62 */ beql $s0, $zero, .L808185AC @@ -371,11 +371,11 @@ glabel func_80818340 /* 050A0 808188C0 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 .L808188C4: /* 050A4 808188C4 86CE021E */ lh $t6, 0x021E($s6) ## 0000021E -/* 050A8 808188C8 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 +/* 050A8 808188C8 3C0D8012 */ lui $t5, %hi(gBitFlags-4) /* 050AC 808188CC 950C009C */ lhu $t4, 0x009C($t0) ## 8015E6FC /* 050B0 808188D0 000EC080 */ sll $t8, $t6, 2 /* 050B4 808188D4 01B86821 */ addu $t5, $t5, $t8 -/* 050B8 808188D8 8DAD711C */ lw $t5, 0x711C($t5) ## 8012711C +/* 050B8 808188D8 8DAD711C */ lw $t5, %lo(gBitFlags-4)($t5) /* 050BC 808188DC 01ACC824 */ and $t9, $t5, $t4 /* 050C0 808188E0 13200034 */ beq $t9, $zero, .L808189B4 /* 050C4 808188E4 00000000 */ nop @@ -417,11 +417,11 @@ glabel func_80818340 /* 0514C 8081896C 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 .L80818970: /* 05150 80818970 86CD021E */ lh $t5, 0x021E($s6) ## 0000021E -/* 05154 80818974 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 +/* 05154 80818974 3C188012 */ lui $t8, %hi(gBitFlags-4) /* 05158 80818978 9519009C */ lhu $t9, 0x009C($t0) ## 8015E6FC /* 0515C 8081897C 000D6080 */ sll $t4, $t5, 2 /* 05160 80818980 030CC021 */ addu $t8, $t8, $t4 -/* 05164 80818984 8F18711C */ lw $t8, 0x711C($t8) ## 8012711C +/* 05164 80818984 8F18711C */ lw $t8, %lo(gBitFlags-4)($t8) /* 05168 80818988 03195824 */ and $t3, $t8, $t9 /* 0516C 8081898C 11600009 */ beq $t3, $zero, .L808189B4 /* 05170 80818990 00000000 */ nop @@ -444,24 +444,24 @@ glabel func_80818340 /* 051A8 808189C8 54410058 */ bnel $v0, $at, .L80818B2C /* 051AC 808189CC 86CB0214 */ lh $t3, 0x0214($s6) ## 00000214 /* 051B0 808189D0 86CF0214 */ lh $t7, 0x0214($s6) ## 00000214 -/* 051B4 808189D4 3C148013 */ lui $s4, 0x8013 ## $s4 = 80130000 -/* 051B8 808189D8 268733E0 */ addiu $a3, $s4, 0x33E0 ## $a3 = 801333E0 +/* 051B4 808189D4 3C148013 */ lui $s4, %hi(D_801333E0) +/* 051B8 808189D8 268733E0 */ addiu $a3, $s4, %lo(D_801333E0) /* 051BC 808189DC 29E1001F */ slti $at, $t7, 0x001F /* 051C0 808189E0 1420004F */ bne $at, $zero, .L80818B20 /* 051C4 808189E4 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 -/* 051C8 808189E8 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 +/* 051C8 808189E8 3C0A8013 */ lui $t2, %hi(D_801333E8) /* 051CC 808189EC A6C0025C */ sh $zero, 0x025C($s6) ## 0000025C /* 051D0 808189F0 A6C00238 */ sh $zero, 0x0238($s6) ## 00000238 -/* 051D4 808189F4 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 -/* 051D8 808189F8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 051DC 808189FC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 051D4 808189F4 254A33E8 */ addiu $t2, %lo(D_801333E8) +/* 051D8 808189F8 3C058013 */ lui $a1, %hi(D_801333D4) +/* 051DC 808189FC 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 051E0 80818A00 AFAA0014 */ sw $t2, 0x0014($sp) /* 051E4 80818A04 AFA70010 */ sw $a3, 0x0010($sp) /* 051E8 80818A08 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 051EC 80818A0C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 051F0 80818A10 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 051F4 80818A14 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 051F0 80818A10 3C088016 */ lui $t0, %hi(gSaveContext) +/* 051F4 80818A14 2508E660 */ addiu $t0, %lo(gSaveContext) /* 051F8 80818A18 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 /* 051FC 80818A1C 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 /* 05200 80818A20 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 @@ -470,10 +470,10 @@ glabel func_80818340 /* 05208 80818A28 00136880 */ sll $t5, $s3, 2 /* 0520C 80818A2C 1640000D */ bne $s2, $zero, .L80818A64 /* 05210 80818A30 8D0300A0 */ lw $v1, 0x00A0($t0) ## 8015E700 -/* 05214 80818A34 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 05218 80818A38 8DCE71C4 */ lw $t6, 0x71C4($t6) ## 801271C4 -/* 0521C 80818A3C 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 -/* 05220 80818A40 918C71F9 */ lbu $t4, 0x71F9($t4) ## 801271F9 +/* 05214 80818A34 3C0E8012 */ lui $t6, %hi(gUpgradeMasks+0x14) +/* 05218 80818A38 8DCE71C4 */ lw $t6, %lo(gUpgradeMasks+0x14)($t6) +/* 0521C 80818A3C 3C0C8012 */ lui $t4, %hi(gUpgradeShifts+5) +/* 05220 80818A40 918C71F9 */ lbu $t4, %lo(gUpgradeShifts+5)($t4) /* 05224 80818A44 006E6824 */ and $t5, $v1, $t6 /* 05228 80818A48 018DC007 */ srav $t8, $t5, $t4 /* 0522C 80818A4C 53000020 */ beql $t8, $zero, .L80818AD0 @@ -484,12 +484,12 @@ glabel func_80818340 /* 05240 80818A60 A6D20232 */ sh $s2, 0x0232($s6) ## 00000232 .L80818A64: /* 05244 80818A64 0012C880 */ sll $t9, $s2, 2 -/* 05248 80818A68 3C0B8012 */ lui $t3, 0x8012 ## $t3 = 80120000 +/* 05248 80818A68 3C0B8012 */ lui $t3, %hi(gUpgradeMasks) /* 0524C 80818A6C 01795821 */ addu $t3, $t3, $t9 -/* 05250 80818A70 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 05254 80818A74 8D6B71B0 */ lw $t3, 0x71B0($t3) ## 801271B0 +/* 05250 80818A70 3C0A8012 */ lui $t2, %hi(gUpgradeShifts) +/* 05254 80818A74 8D6B71B0 */ lw $t3, %lo(gUpgradeMasks)($t3) /* 05258 80818A78 01525021 */ addu $t2, $t2, $s2 -/* 0525C 80818A7C 914A71F4 */ lbu $t2, 0x71F4($t2) ## 801271F4 +/* 0525C 80818A7C 914A71F4 */ lbu $t2, %lo(gUpgradeShifts)($t2) /* 05260 80818A80 006B7824 */ and $t7, $v1, $t3 /* 05264 80818A84 014F7007 */ srav $t6, $t7, $t2 /* 05268 80818A88 51C00011 */ beql $t6, $zero, .L80818AD0 @@ -499,9 +499,9 @@ glabel func_80818340 /* 05278 80818A98 1000006B */ beq $zero, $zero, .L80818C48 /* 0527C 80818A9C A6D20232 */ sh $s2, 0x0232($s6) ## 00000232 .L80818AA0: -/* 05280 80818AA0 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 +/* 05280 80818AA0 3C0C8012 */ lui $t4, %hi(gBitFlags-4) /* 05284 80818AA4 018D6021 */ addu $t4, $t4, $t5 -/* 05288 80818AA8 8D8C711C */ lw $t4, 0x711C($t4) ## 8012711C +/* 05288 80818AA8 8D8C711C */ lw $t4, %lo(gBitFlags-4)($t4) /* 0528C 80818AAC 9518009C */ lhu $t8, 0x009C($t0) ## 8015E6FC /* 05290 80818AB0 0198C824 */ and $t9, $t4, $t8 /* 05294 80818AB4 53200006 */ beql $t9, $zero, .L80818AD0 @@ -530,33 +530,33 @@ glabel func_80818340 /* 052EC 80818B0C 8FA400D8 */ lw $a0, 0x00D8($sp) /* 052F0 80818B10 0C207E07 */ jal func_8081F81C /* 052F4 80818B14 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B -/* 052F8 80818B18 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 052FC 80818B1C 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 052F8 80818B18 3C088016 */ lui $t0, %hi(gSaveContext) +/* 052FC 80818B1C 2508E660 */ addiu $t0, %lo(gSaveContext) .L80818B20: /* 05300 80818B20 1000004A */ beq $zero, $zero, .L80818C4C /* 05304 80818B24 86CD0228 */ lh $t5, 0x0228($s6) ## 00000228 /* 05308 80818B28 86CB0214 */ lh $t3, 0x0214($s6) ## 00000214 .L80818B2C: -/* 0530C 80818B2C 3C148013 */ lui $s4, 0x8013 ## $s4 = 80130000 -/* 05310 80818B30 268733E0 */ addiu $a3, $s4, 0x33E0 ## $a3 = 801333E0 +/* 0530C 80818B2C 3C148013 */ lui $s4, %hi(D_801333E0) +/* 05310 80818B30 268733E0 */ addiu $a3, $s4, %lo(D_801333E0) /* 05314 80818B34 2961FFE2 */ slti $at, $t3, 0xFFE2 /* 05318 80818B38 10200043 */ beq $at, $zero, .L80818C48 /* 0531C 80818B3C 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 -/* 05320 80818B40 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 +/* 05320 80818B40 3C0F8013 */ lui $t7, %hi(D_801333E8) /* 05324 80818B44 A6C0025C */ sh $zero, 0x025C($s6) ## 0000025C /* 05328 80818B48 A6C00238 */ sh $zero, 0x0238($s6) ## 00000238 -/* 0532C 80818B4C 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 05330 80818B50 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 05334 80818B54 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0532C 80818B4C 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 05330 80818B50 3C058013 */ lui $a1, %hi(D_801333D4) +/* 05334 80818B54 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 05338 80818B58 AFAF0014 */ sw $t7, 0x0014($sp) /* 0533C 80818B5C AFA70010 */ sw $a3, 0x0010($sp) /* 05340 80818B60 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 05344 80818B64 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 05348 80818B68 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 05348 80818B68 3C088016 */ lui $t0, %hi(gSaveContext) /* 0534C 80818B6C 00158C00 */ sll $s1, $s5, 16 /* 05350 80818B70 00159C00 */ sll $s3, $s5, 16 -/* 05354 80818B74 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 05354 80818B74 2508E660 */ addiu $t0, %lo(gSaveContext) /* 05358 80818B78 00139C03 */ sra $s3, $s3, 16 /* 0535C 80818B7C 00118C03 */ sra $s1, $s1, 16 /* 05360 80818B80 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 @@ -564,13 +564,13 @@ glabel func_80818340 /* 05364 80818B84 16200011 */ bne $s1, $zero, .L80818BCC /* 05368 80818B88 00135880 */ sll $t3, $s3, 2 /* 0536C 80818B8C 00127080 */ sll $t6, $s2, 2 -/* 05370 80818B90 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 +/* 05370 80818B90 3C0D8012 */ lui $t5, %hi(gUpgradeMasks) /* 05374 80818B94 01AE6821 */ addu $t5, $t5, $t6 -/* 05378 80818B98 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 -/* 0537C 80818B9C 8DAD71B0 */ lw $t5, 0x71B0($t5) ## 801271B0 +/* 05378 80818B98 3C188012 */ lui $t8, %hi(gUpgradeShifts) +/* 0537C 80818B9C 8DAD71B0 */ lw $t5, %lo(gUpgradeMasks)($t5) /* 05380 80818BA0 8D0A00A0 */ lw $t2, 0x00A0($t0) ## 8015E700 /* 05384 80818BA4 0312C021 */ addu $t8, $t8, $s2 -/* 05388 80818BA8 931871F4 */ lbu $t8, 0x71F4($t8) ## 801271F4 +/* 05388 80818BA8 931871F4 */ lbu $t8, %lo(gUpgradeShifts)($t8) /* 0538C 80818BAC 014D6024 */ and $t4, $t2, $t5 /* 05390 80818BB0 030CC807 */ srav $t9, $t4, $t8 /* 05394 80818BB4 53200011 */ beql $t9, $zero, .L80818BFC @@ -580,9 +580,9 @@ glabel func_80818340 /* 053A4 80818BC4 10000020 */ beq $zero, $zero, .L80818C48 /* 053A8 80818BC8 A6D20232 */ sh $s2, 0x0232($s6) ## 00000232 .L80818BCC: -/* 053AC 80818BCC 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 +/* 053AC 80818BCC 3C0F8012 */ lui $t7, %hi(gBitFlags-4) /* 053B0 80818BD0 01EB7821 */ addu $t7, $t7, $t3 -/* 053B4 80818BD4 8DEF711C */ lw $t7, 0x711C($t7) ## 8012711C +/* 053B4 80818BD4 8DEF711C */ lw $t7, %lo(gBitFlags-4)($t7) /* 053B8 80818BD8 950E009C */ lhu $t6, 0x009C($t0) ## 8015E6FC /* 053BC 80818BDC 01EE5024 */ and $t2, $t7, $t6 /* 053C0 80818BE0 51400006 */ beql $t2, $zero, .L80818BFC @@ -610,13 +610,13 @@ glabel func_80818340 /* 05414 80818C34 8FA400D8 */ lw $a0, 0x00D8($sp) /* 05418 80818C38 0C207E07 */ jal func_8081F81C /* 0541C 80818C3C 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 05420 80818C40 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 05424 80818C44 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 05420 80818C40 3C088016 */ lui $t0, %hi(gSaveContext) +/* 05424 80818C44 2508E660 */ addiu $t0, %lo(gSaveContext) .L80818C48: /* 05428 80818C48 86CD0228 */ lh $t5, 0x0228($s6) ## 00000228 .L80818C4C: -/* 0542C 80818C4C 3C148013 */ lui $s4, 0x8013 ## $s4 = 80130000 -/* 05430 80818C50 269433E0 */ addiu $s4, $s4, 0x33E0 ## $s4 = 801333E0 +/* 0542C 80818C4C 3C148013 */ lui $s4, %hi(D_801333E0) +/* 05430 80818C50 269433E0 */ addiu $s4, %lo(D_801333E0) /* 05434 80818C54 55A0005E */ bnel $t5, $zero, .L80818DD0 /* 05438 80818C58 86CE021E */ lh $t6, 0x021E($s6) ## 0000021E /* 0543C 80818C5C A6C00260 */ sh $zero, 0x0260($s6) ## 00000260 @@ -631,13 +631,13 @@ glabel func_80818340 /* 0545C 80818C7C 54410028 */ bnel $v0, $at, .L80818D20 /* 05460 80818C80 86C60232 */ lh $a2, 0x0232($s6) ## 00000232 /* 05464 80818C84 86C60232 */ lh $a2, 0x0232($s6) ## 00000232 -/* 05468 80818C88 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 -/* 0546C 80818C8C 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 +/* 05468 80818C88 3C198012 */ lui $t9, %hi(gUpgradeMasks+0x14) +/* 0546C 80818C8C 3C0F8012 */ lui $t7, %hi(gUpgradeShifts+5) /* 05470 80818C90 14C0000A */ bne $a2, $zero, .L80818CBC -/* 05474 80818C94 3C038012 */ lui $v1, 0x8012 ## $v1 = 80120000 +/* 05474 80818C94 3C038012 */ lui $v1, %hi(gUpgradeMasks) /* 05478 80818C98 8D1800A0 */ lw $t8, 0x00A0($t0) ## 8015E700 -/* 0547C 80818C9C 8F3971C4 */ lw $t9, 0x71C4($t9) ## 801271C4 -/* 05480 80818CA0 91EF71F9 */ lbu $t7, 0x71F9($t7) ## 801271F9 +/* 0547C 80818C9C 8F3971C4 */ lw $t9, %lo(gUpgradeMasks+0x14)($t9) +/* 05480 80818CA0 91EF71F9 */ lbu $t7, %lo(gUpgradeShifts+5)($t7) /* 05484 80818CA4 03195824 */ and $t3, $t8, $t9 /* 05488 80818CA8 01EB1007 */ srav $v0, $t3, $t7 /* 0548C 80818CAC 10400003 */ beq $v0, $zero, .L80818CBC @@ -645,11 +645,11 @@ glabel func_80818340 /* 05494 80818CB4 10000055 */ beq $zero, $zero, .L80818E0C /* 05498 80818CB8 3210FFFF */ andi $s0, $s0, 0xFFFF ## $s0 = 0000004B .L80818CBC: -/* 0549C 80818CBC 246371B0 */ addiu $v1, $v1, 0x71B0 ## $v1 = 801271B0 +/* 0549C 80818CBC 246371B0 */ addiu $v1, %lo(gUpgradeMasks) /* 054A0 80818CC0 00065080 */ sll $t2, $a2, 2 -/* 054A4 80818CC4 3C078012 */ lui $a3, 0x8012 ## $a3 = 80120000 +/* 054A4 80818CC4 3C078012 */ lui $a3, %hi(gUpgradeShifts) /* 054A8 80818CC8 006A6821 */ addu $t5, $v1, $t2 -/* 054AC 80818CCC 24E771F4 */ addiu $a3, $a3, 0x71F4 ## $a3 = 801271F4 +/* 054AC 80818CCC 24E771F4 */ addiu $a3, %lo(gUpgradeShifts) /* 054B0 80818CD0 8DAC0000 */ lw $t4, 0x0000($t5) ## 00000000 /* 054B4 80818CD4 8D0E00A0 */ lw $t6, 0x00A0($t0) ## 8015E700 /* 054B8 80818CD8 00E6C821 */ addu $t9, $a3, $a2 @@ -667,36 +667,36 @@ glabel func_80818340 /* 054E8 80818D08 0C00084C */ jal osSyncPrintf /* 054EC 80818D0C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000094 -/* 054F0 80818D10 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 054F0 80818D10 3C088016 */ lui $t0, %hi(gSaveContext) /* 054F4 80818D14 1000003D */ beq $zero, $zero, .L80818E0C -/* 054F8 80818D18 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 054F8 80818D18 2508E660 */ addiu $t0, %lo(gSaveContext) /* 054FC 80818D1C 86C60232 */ lh $a2, 0x0232($s6) ## 00000232 .L80818D20: -/* 05500 80818D20 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 -/* 05504 80818D24 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 +/* 05500 80818D20 3C0D8012 */ lui $t5, %hi(gUpgradeMasks) +/* 05504 80818D24 3C0C8012 */ lui $t4, %hi(gUpgradeShifts) /* 05508 80818D28 14C00010 */ bne $a2, $zero, .L80818D6C -/* 0550C 80818D2C 3C078012 */ lui $a3, 0x8012 ## $a3 = 80120000 +/* 0550C 80818D2C 3C078012 */ lui $a3, %hi(gUpgradeShifts) /* 05510 80818D30 8D0300A0 */ lw $v1, 0x00A0($t0) ## 8015E700 -/* 05514 80818D34 8DAD71B0 */ lw $t5, 0x71B0($t5) ## 801271B0 -/* 05518 80818D38 918C71F4 */ lbu $t4, 0x71F4($t4) ## 801271F4 -/* 0551C 80818D3C 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 +/* 05514 80818D34 8DAD71B0 */ lw $t5, %lo(gUpgradeMasks)($t5) +/* 05518 80818D38 918C71F4 */ lbu $t4, %lo(gUpgradeShifts)($t4) +/* 0551C 80818D3C 3C188012 */ lui $t8, %hi(gUpgradeMasks+0x14) /* 05520 80818D40 006D7024 */ and $t6, $v1, $t5 /* 05524 80818D44 018EC807 */ srav $t9, $t6, $t4 /* 05528 80818D48 17200008 */ bne $t9, $zero, .L80818D6C -/* 0552C 80818D4C 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 05530 80818D50 8F1871C4 */ lw $t8, 0x71C4($t8) ## 801271C4 -/* 05534 80818D54 91EF71F9 */ lbu $t7, 0x71F9($t7) ## 801271F9 +/* 0552C 80818D4C 3C0F8012 */ lui $t7, %hi(gUpgradeShifts+5) +/* 05530 80818D50 8F1871C4 */ lw $t8, %lo(gUpgradeMasks+0x14)($t8) +/* 05534 80818D54 91EF71F9 */ lbu $t7, %lo(gUpgradeShifts+5)($t7) /* 05538 80818D58 00785824 */ and $t3, $v1, $t8 /* 0553C 80818D5C 01EB8007 */ srav $s0, $t3, $t7 /* 05540 80818D60 26100046 */ addiu $s0, $s0, 0x0046 ## $s0 = 000000DA /* 05544 80818D64 10000029 */ beq $zero, $zero, .L80818E0C /* 05548 80818D68 3210FFFF */ andi $s0, $s0, 0xFFFF ## $s0 = 000000DA .L80818D6C: -/* 0554C 80818D6C 3C038012 */ lui $v1, 0x8012 ## $v1 = 80120000 -/* 05550 80818D70 246371B0 */ addiu $v1, $v1, 0x71B0 ## $v1 = 801271B0 +/* 0554C 80818D6C 3C038012 */ lui $v1, %hi(gUpgradeMasks) +/* 05550 80818D70 246371B0 */ addiu $v1, %lo(gUpgradeMasks) /* 05554 80818D74 00066880 */ sll $t5, $a2, 2 /* 05558 80818D78 006D7021 */ addu $t6, $v1, $t5 -/* 0555C 80818D7C 24E771F4 */ addiu $a3, $a3, 0x71F4 ## $a3 = 801271F4 +/* 0555C 80818D7C 24E771F4 */ addiu $a3, %lo(gUpgradeShifts) /* 05560 80818D80 8DCC0000 */ lw $t4, 0x0000($t6) ## 00000000 /* 05564 80818D84 8D0A00A0 */ lw $t2, 0x00A0($t0) ## 8015E700 /* 05568 80818D88 00E6C021 */ addu $t8, $a3, $a2 @@ -714,9 +714,9 @@ glabel func_80818340 /* 05598 80818DB8 0C00084C */ jal osSyncPrintf /* 0559C 80818DBC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000123 -/* 055A0 80818DC0 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 055A0 80818DC0 3C088016 */ lui $t0, %hi(gSaveContext) /* 055A4 80818DC4 10000011 */ beq $zero, $zero, .L80818E0C -/* 055A8 80818DC8 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 055A8 80818DC8 2508E660 */ addiu $t0, %lo(gSaveContext) /* 055AC 80818DCC 86CE021E */ lh $t6, 0x021E($s6) ## 0000021E .L80818DD0: /* 055B0 80818DD0 3C108083 */ lui $s0, %hi(D_8082A404) ## $s0 = 80830000 @@ -730,8 +730,8 @@ glabel func_80818340 /* 055D0 80818DF0 02002825 */ or $a1, $s0, $zero ## $a1 = 0000003B /* 055D4 80818DF4 86CA0238 */ lh $t2, 0x0238($s6) ## 00000238 -/* 055D8 80818DF8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 055DC 80818DFC 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 055D8 80818DF8 3C088016 */ lui $t0, %hi(gSaveContext) +/* 055DC 80818DFC 2508E660 */ addiu $t0, %lo(gSaveContext) /* 055E0 80818E00 15400002 */ bne $t2, $zero, .L80818E0C /* 055E4 80818E04 240C0008 */ addiu $t4, $zero, 0x0008 ## $t4 = 00000008 /* 055E8 80818E08 A6CC0260 */ sh $t4, 0x0260($s6) ## 00000260 @@ -745,13 +745,13 @@ glabel func_80818340 /* 05604 80818E24 56B9000E */ bnel $s5, $t9, .L80818E60 /* 05608 80818E28 96D7021E */ lhu $s7, 0x021E($s6) ## 0000021E /* 0560C 80818E2C 910B003E */ lbu $t3, 0x003E($t0) ## 8015E69E -/* 05610 80818E30 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 +/* 05610 80818E30 3C0F8012 */ lui $t7, %hi(gBitFlags+0xc) /* 05614 80818E34 11600003 */ beq $t3, $zero, .L80818E44 /* 05618 80818E38 00000000 */ nop /* 0561C 80818E3C 10000007 */ beq $zero, $zero, .L80818E5C /* 05620 80818E40 2410007A */ addiu $s0, $zero, 0x007A ## $s0 = 0000007A .L80818E44: -/* 05624 80818E44 8DEF712C */ lw $t7, 0x712C($t7) ## 8012712C +/* 05624 80818E44 8DEF712C */ lw $t7, %lo(gBitFlags+0xc)($t7) /* 05628 80818E48 950D009C */ lhu $t5, 0x009C($t0) ## 8015E6FC /* 0562C 80818E4C 01ED7024 */ and $t6, $t7, $t5 /* 05630 80818E50 51C00003 */ beql $t6, $zero, .L80818E60 @@ -773,10 +773,10 @@ glabel func_80818340 /* 05664 80818E84 03CCC021 */ addu $t8, $s8, $t4 /* 05668 80818E88 03195821 */ addu $t3, $t8, $t9 /* 0566C 80818E8C 91630000 */ lbu $v1, 0x0000($t3) ## 00000000 -/* 05670 80818E90 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 05670 80818E90 3C088016 */ lui $t0, %hi(gSaveContext) /* 05674 80818E94 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 /* 05678 80818E98 10610005 */ beq $v1, $at, .L80818EB0 -/* 0567C 80818E9C 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 0567C 80818E9C 2508E660 */ addiu $t0, %lo(gSaveContext) /* 05680 80818EA0 8D0F0004 */ lw $t7, 0x0004($t0) ## 8015E664 /* 05684 80818EA4 106F0002 */ beq $v1, $t7, .L80818EB0 /* 05688 80818EA8 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 @@ -835,8 +835,8 @@ glabel func_80818340 /* 05740 80818F60 0C206785 */ jal func_80819E14 /* 05744 80818F64 8EC6015C */ lw $a2, 0x015C($s6) ## 0000015C /* 05748 80818F68 86D90238 */ lh $t9, 0x0238($s6) ## 00000238 -/* 0574C 80818F6C 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 05750 80818F70 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 0574C 80818F6C 3C088016 */ lui $t0, %hi(gSaveContext) +/* 05750 80818F70 2508E660 */ addiu $t0, %lo(gSaveContext) /* 05754 80818F74 17200069 */ bne $t9, $zero, .L8081911C /* 05758 80818F78 240103E7 */ addiu $at, $zero, 0x03E7 ## $at = 000003E7 /* 0575C 80818F7C 52010068 */ beql $s0, $at, .L80819120 @@ -869,16 +869,16 @@ glabel func_80818340 /* 057C8 80818FE8 10610006 */ beq $v1, $at, .L80819004 /* 057CC 80818FEC 00000000 */ nop /* 057D0 80818FF0 8D0B0004 */ lw $t3, 0x0004($t0) ## 8015E664 -/* 057D4 80818FF4 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 057D8 80818FF8 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 057D4 80818FF4 3C058013 */ lui $a1, %hi(D_801333D4) +/* 057D8 80818FF8 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 057DC 80818FFC 146B003E */ bne $v1, $t3, .L808190F8 /* 057E0 80819000 02803825 */ or $a3, $s4, $zero ## $a3 = 801333E0 .L80819004: /* 057E4 80819004 0C025E80 */ jal Inventory_ChangeEquipment /* 057E8 80819008 3045FFFF */ andi $a1, $v0, 0xFFFF ## $a1 = 00000000 /* 057EC 8081900C 86CF0232 */ lh $t7, 0x0232($s6) ## 00000232 -/* 057F0 80819010 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 057F4 80819014 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 057F0 80819010 3C088016 */ lui $t0, %hi(gSaveContext) +/* 057F4 80819014 2508E660 */ addiu $t0, %lo(gSaveContext) /* 057F8 80819018 15E00025 */ bne $t7, $zero, .L808190B0 /* 057FC 8081901C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 05800 80819020 A5000F32 */ sh $zero, 0x0F32($t0) ## 8015F592 @@ -907,10 +907,10 @@ glabel func_80818340 /* 05854 80819074 1441000C */ bne $v0, $at, .L808190A8 /* 05858 80819078 00000000 */ nop /* 0585C 8081907C 9119003E */ lbu $t9, 0x003E($t0) ## 8015E69E -/* 05860 80819080 3C0B8012 */ lui $t3, 0x8012 ## $t3 = 80120000 +/* 05860 80819080 3C0B8012 */ lui $t3, %hi(gBitFlags+0xc) /* 05864 80819084 17200008 */ bne $t9, $zero, .L808190A8 /* 05868 80819088 00000000 */ nop -/* 0586C 8081908C 8D6B712C */ lw $t3, 0x712C($t3) ## 8012712C +/* 0586C 8081908C 8D6B712C */ lw $t3, %lo(gBitFlags+0xc)($t3) /* 05870 80819090 950F009C */ lhu $t7, 0x009C($t0) ## 8015E6FC /* 05874 80819094 240E0055 */ addiu $t6, $zero, 0x0055 ## $t6 = 00000055 /* 05878 80819098 016F6824 */ and $t5, $t3, $t7 @@ -921,10 +921,10 @@ glabel func_80818340 /* 05888 808190A8 0C02129B */ jal Interface_LoadItemIcon1 /* 0588C 808190AC 8FA400D8 */ lw $a0, 0x00D8($sp) .L808190B0: -/* 05890 808190B0 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 05894 808190B4 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 -/* 05898 808190B8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0589C 808190BC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 05890 808190B0 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 05894 808190B4 254A33E8 */ addiu $t2, %lo(D_801333E8) +/* 05898 808190B8 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0589C 808190BC 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 058A0 808190C0 AFAA0014 */ sw $t2, 0x0014($sp) /* 058A4 808190C4 24044808 */ addiu $a0, $zero, 0x4808 ## $a0 = 00004808 /* 058A8 808190C8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 @@ -933,33 +933,33 @@ glabel func_80818340 /* 058B4 808190D4 AFB40010 */ sw $s4, 0x0010($sp) /* 058B8 808190D8 240C0007 */ addiu $t4, $zero, 0x0007 ## $t4 = 00000007 -/* 058BC 808190DC 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 058BC 808190DC 3C088016 */ lui $t0, %hi(gSaveContext) /* 058C0 808190E0 A6CC01E4 */ sh $t4, 0x01E4($s6) ## 000001E4 /* 058C4 808190E4 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A /* 058C8 808190E8 3C018083 */ lui $at, %hi(D_8082A414) ## $at = 80830000 -/* 058CC 808190EC 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 058CC 808190EC 2508E660 */ addiu $t0, %lo(gSaveContext) /* 058D0 808190F0 1000000A */ beq $zero, $zero, .L8081911C /* 058D4 808190F4 A438A414 */ sh $t8, %lo(D_8082A414)($at) .L808190F8: -/* 058D8 808190F8 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 058DC 808190FC 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 058D8 808190F8 3C198013 */ lui $t9, %hi(D_801333E8) +/* 058DC 808190FC 273933E8 */ addiu $t9, %lo(D_801333E8) /* 058E0 80819100 AFB90014 */ sw $t9, 0x0014($sp) /* 058E4 80819104 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 /* 058E8 80819108 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 058EC 8081910C 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 058F0 80819110 AFB40010 */ sw $s4, 0x0010($sp) -/* 058F4 80819114 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 058F8 80819118 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 058F4 80819114 3C088016 */ lui $t0, %hi(gSaveContext) +/* 058F8 80819118 2508E660 */ addiu $t0, %lo(gSaveContext) .L8081911C: /* 058FC 8081911C 87AB00B2 */ lh $t3, 0x00B2($sp) .L80819120: /* 05900 80819120 86CF021E */ lh $t7, 0x021E($s6) ## 0000021E /* 05904 80819124 116F000C */ beq $t3, $t7, .L80819158 -/* 05908 80819128 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 -/* 0590C 8081912C 25AD33E8 */ addiu $t5, $t5, 0x33E8 ## $t5 = 801333E8 -/* 05910 80819130 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 05914 80819134 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 05908 80819128 3C0D8013 */ lui $t5, %hi(D_801333E8) +/* 0590C 8081912C 25AD33E8 */ addiu $t5, %lo(D_801333E8) +/* 05910 80819130 3C058013 */ lui $a1, %hi(D_801333D4) +/* 05914 80819134 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 05918 80819138 AFAD0014 */ sw $t5, 0x0014($sp) /* 0591C 8081913C 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 /* 05920 80819140 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 @@ -967,8 +967,8 @@ glabel func_80818340 /* 05928 80819148 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 0592C 8081914C AFB40010 */ sw $s4, 0x0010($sp) -/* 05930 80819150 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 05934 80819154 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 05930 80819150 3C088016 */ lui $t0, %hi(gSaveContext) +/* 05934 80819154 2508E660 */ addiu $t0, %lo(gSaveContext) .L80819158: /* 05938 80819158 1000001C */ beq $zero, $zero, .L808191CC /* 0593C 8081915C A7B700BA */ sh $s7, 0x00BA($sp) @@ -991,12 +991,12 @@ glabel func_80818340 /* 0597C 8081919C A6CC0260 */ sh $t4, 0x0260($s6) ## 00000260 /* 05980 808191A0 3C188083 */ lui $t8, %hi(D_8082A414) ## $t8 = 80830000 /* 05984 808191A4 8718A414 */ lh $t8, %lo(D_8082A414)($t8) -/* 05988 808191A8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 05988 808191A8 3C088016 */ lui $t0, %hi(gSaveContext) /* 0598C 808191AC 3C018083 */ lui $at, %hi(D_8082A414) ## $at = 80830000 /* 05990 808191B0 2719FFFF */ addiu $t9, $t8, 0xFFFF ## $t9 = 8082FFFF /* 05994 808191B4 00195C00 */ sll $t3, $t9, 16 /* 05998 808191B8 000B7C03 */ sra $t7, $t3, 16 -/* 0599C 808191BC 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 0599C 808191BC 2508E660 */ addiu $t0, %lo(gSaveContext) /* 059A0 808191C0 15E00002 */ bne $t7, $zero, .L808191CC /* 059A4 808191C4 A439A414 */ sh $t9, %lo(D_8082A414)($at) /* 059A8 808191C8 A6C001E4 */ sh $zero, 0x01E4($s6) ## 000001E4 @@ -1016,9 +1016,9 @@ glabel func_80818340 /* 059D8 808191F8 30F1FFFF */ andi $s1, $a3, 0xFFFF ## $s1 = 00000000 .L808191FC: /* 059DC 808191FC 00116880 */ sll $t5, $s1, 2 -/* 059E0 80819200 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 +/* 059E0 80819200 3C0E8012 */ lui $t6, %hi(gBitFlags) /* 059E4 80819204 01CD7021 */ addu $t6, $t6, $t5 -/* 059E8 80819208 8DCE7120 */ lw $t6, 0x7120($t6) ## 80127120 +/* 059E8 80819208 8DCE7120 */ lw $t6, %lo(gBitFlags)($t6) /* 059EC 8081920C 950A009C */ lhu $t2, 0x009C($t0) ## 8015E6FC /* 059F0 80819210 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 /* 059F4 80819214 3231FFFF */ andi $s1, $s1, 0xFFFF ## $s1 = 00000001 @@ -1122,14 +1122,14 @@ glabel func_80818340 /* 05B70 80819390 AC9802C0 */ sw $t8, 0x02C0($a0) ## 000002C0 /* 05B74 80819394 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 /* 05B78 80819398 96CB0208 */ lhu $t3, 0x0208($s6) ## 00000208 -/* 05B7C 8081939C 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 05B80 808193A0 3C1E8012 */ lui $s8, 0x8012 ## $s8 = 80120000 +/* 05B7C 8081939C 3C088016 */ lui $t0, %hi(gSaveContext) +/* 05B80 808193A0 3C1E8012 */ lui $s8, %hi(gItemIcons) /* 05B84 808193A4 316F00FF */ andi $t7, $t3, 0x00FF ## $t7 = 00000000 /* 05B88 808193A8 01E16825 */ or $t5, $t7, $at ## $t5 = FFFFFF00 /* 05B8C 808193AC AC6D0004 */ sw $t5, 0x0004($v1) ## 00000004 -/* 05B90 808193B0 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 05B90 808193B0 2508E660 */ addiu $t0, %lo(gSaveContext) /* 05B94 808193B4 A7A000C2 */ sh $zero, 0x00C2($sp) -/* 05B98 808193B8 27DE725C */ addiu $s8, $s8, 0x725C ## $s8 = 8012725C +/* 05B98 808193B8 27DE725C */ addiu $s8, %lo(gItemIcons) /* 05B9C 808193BC 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 /* 05BA0 808193C0 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 /* 05BA4 808193C4 0000A825 */ or $s5, $zero, $zero ## $s5 = 00000000 @@ -1146,7 +1146,7 @@ glabel func_80818340 /* 05BCC 808193EC AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 05BD0 808193F0 8ECC015C */ lw $t4, 0x015C($s6) ## 0000015C /* 05BD4 808193F4 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -/* 05BD8 808193F8 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 +/* 05BD8 808193F8 3C0E8012 */ lui $t6, %hi(gUpgradeMasks) /* 05BDC 808193FC 0198C821 */ addu $t9, $t4, $t8 /* 05BE0 80819400 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 05BE4 80819404 8D0B0004 */ lw $t3, 0x0004($t0) ## 8015E664 @@ -1159,13 +1159,13 @@ glabel func_80818340 /* 05BFC 8081941C 3C028083 */ lui $v0, %hi(D_8082A3F0) ## $v0 = 80830000 /* 05C00 80819420 00551021 */ addu $v0, $v0, $s5 /* 05C04 80819424 9042A3F0 */ lbu $v0, %lo(D_8082A3F0)($v0) -/* 05C08 80819428 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 +/* 05C08 80819428 3C0C8012 */ lui $t4, %hi(gUpgradeShifts) /* 05C0C 8081942C 8D0F00A0 */ lw $t7, 0x00A0($t0) ## 8015E700 /* 05C10 80819430 00026880 */ sll $t5, $v0, 2 /* 05C14 80819434 01CD7021 */ addu $t6, $t6, $t5 -/* 05C18 80819438 8DCE71B0 */ lw $t6, 0x71B0($t6) ## 801271B0 +/* 05C18 80819438 8DCE71B0 */ lw $t6, %lo(gUpgradeMasks)($t6) /* 05C1C 8081943C 01826021 */ addu $t4, $t4, $v0 -/* 05C20 80819440 918C71F4 */ lbu $t4, 0x71F4($t4) ## 801271F4 +/* 05C20 80819440 918C71F4 */ lbu $t4, %lo(gUpgradeShifts)($t4) /* 05C24 80819444 01EE5024 */ and $t2, $t7, $t6 /* 05C28 80819448 018A1807 */ srav $v1, $t2, $t4 /* 05C2C 8081944C 3072FFFF */ andi $s2, $v1, 0xFFFF ## $s2 = 00000000 @@ -1186,20 +1186,20 @@ glabel func_80818340 /* 05C68 80819488 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 /* 05C6C 8081948C 0C207E1F */ jal func_8081F87C /* 05C70 80819490 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 05C74 80819494 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 05C74 80819494 3C088016 */ lui $t0, %hi(gSaveContext) /* 05C78 80819498 1000004C */ beq $zero, $zero, .L808195CC -/* 05C7C 8081949C 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 05C7C 8081949C 2508E660 */ addiu $t0, %lo(gSaveContext) .L808194A0: /* 05C80 808194A0 16A0002B */ bne $s5, $zero, .L80819550 -/* 05C84 808194A4 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 +/* 05C84 808194A4 3C098012 */ lui $t1, %hi(gUpgradeShifts) /* 05C88 808194A8 3C028083 */ lui $v0, %hi(D_8082A3F4) ## $v0 = 80830000 /* 05C8C 808194AC 00551021 */ addu $v0, $v0, $s5 /* 05C90 808194B0 9042A3F4 */ lbu $v0, %lo(D_8082A3F4)($v0) -/* 05C94 808194B4 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 -/* 05C98 808194B8 258C71B0 */ addiu $t4, $t4, 0x71B0 ## $t4 = 801271B0 +/* 05C94 808194B4 3C0C8012 */ lui $t4, %hi(gUpgradeMasks) +/* 05C98 808194B8 258C71B0 */ addiu $t4, %lo(gUpgradeMasks) /* 05C9C 808194BC 00025080 */ sll $t2, $v0, 2 /* 05CA0 808194C0 014CC021 */ addu $t8, $t2, $t4 -/* 05CA4 808194C4 252971F4 */ addiu $t1, $t1, 0x71F4 ## $t1 = 801271F4 +/* 05CA4 808194C4 252971F4 */ addiu $t1, %lo(gUpgradeShifts) /* 05CA8 808194C8 8F190000 */ lw $t9, 0x0000($t8) ## 00000000 /* 05CAC 808194CC 8D0300A0 */ lw $v1, 0x00A0($t0) ## 8015E700 /* 05CB0 808194D0 01226821 */ addu $t5, $t1, $v0 @@ -1231,19 +1231,19 @@ glabel func_80818340 /* 05D18 80819538 AFA00010 */ sw $zero, 0x0010($sp) /* 05D1C 8081953C 0C207E1F */ jal func_8081F87C /* 05D20 80819540 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 05D24 80819544 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 05D24 80819544 3C088016 */ lui $t0, %hi(gSaveContext) /* 05D28 80819548 10000020 */ beq $zero, $zero, .L808195CC -/* 05D2C 8081954C 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 05D2C 8081954C 2508E660 */ addiu $t0, %lo(gSaveContext) .L80819550: /* 05D30 80819550 3C028083 */ lui $v0, %hi(D_8082A3F4) ## $v0 = 80830000 /* 05D34 80819554 00551021 */ addu $v0, $v0, $s5 /* 05D38 80819558 9042A3F4 */ lbu $v0, %lo(D_8082A3F4)($v0) -/* 05D3C 8081955C 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 -/* 05D40 80819560 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 +/* 05D3C 8081955C 3C098012 */ lui $t1, %hi(gUpgradeShifts) +/* 05D40 80819560 3C0A8012 */ lui $t2, %hi(gUpgradeMasks) /* 05D44 80819564 00027080 */ sll $t6, $v0, 2 -/* 05D48 80819568 252971F4 */ addiu $t1, $t1, 0x71F4 ## $t1 = 801271F4 +/* 05D48 80819568 252971F4 */ addiu $t1, %lo(gUpgradeShifts) /* 05D4C 8081956C 014E5021 */ addu $t2, $t2, $t6 -/* 05D50 80819570 8D4A71B0 */ lw $t2, 0x71B0($t2) ## 801271B0 +/* 05D50 80819570 8D4A71B0 */ lw $t2, %lo(gUpgradeMasks)($t2) /* 05D54 80819574 8D0B00A0 */ lw $t3, 0x00A0($t0) ## 8015E700 /* 05D58 80819578 0122C821 */ addu $t9, $t1, $v0 /* 05D5C 8081957C 932C0000 */ lbu $t4, 0x0000($t9) ## 00000000 @@ -1264,8 +1264,8 @@ glabel func_80818340 /* 05D98 808195B8 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 /* 05D9C 808195BC 0C207E1F */ jal func_8081F87C /* 05DA0 808195C0 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 05DA4 808195C4 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 05DA8 808195C8 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 05DA4 808195C4 3C088016 */ lui $t0, %hi(gSaveContext) +/* 05DA8 808195C8 2508E660 */ addiu $t0, %lo(gSaveContext) .L808195CC: /* 05DAC 808195CC 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 .L808195D0: @@ -1286,17 +1286,17 @@ glabel func_80818340 /* 05DE4 80819604 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 /* 05DE8 80819608 0C207E1F */ jal func_8081F87C /* 05DEC 8081960C 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 05DF0 80819610 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 05DF0 80819610 3C088016 */ lui $t0, %hi(gSaveContext) /* 05DF4 80819614 10000026 */ beq $zero, $zero, .L808196B0 -/* 05DF8 80819618 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 05DF8 80819618 2508E660 */ addiu $t0, %lo(gSaveContext) .L8081961C: /* 05DFC 8081961C 16A00013 */ bne $s5, $zero, .L8081966C /* 05E00 80819620 9502009C */ lhu $v0, 0x009C($t0) ## 8015E6FC /* 05E04 80819624 16F00011 */ bne $s7, $s0, .L8081966C /* 05E08 80819628 00116880 */ sll $t5, $s1, 2 -/* 05E0C 8081962C 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 +/* 05E0C 8081962C 3C0F8012 */ lui $t7, %hi(gBitFlags+4) /* 05E10 80819630 01ED7821 */ addu $t7, $t7, $t5 -/* 05E14 80819634 8DEF7124 */ lw $t7, 0x7124($t7) ## 80127124 +/* 05E14 80819634 8DEF7124 */ lw $t7, %lo(gBitFlags+4)($t7) /* 05E18 80819638 3C050805 */ lui $a1, 0x0805 ## $a1 = 08050000 /* 05E1C 8081963C 24A55000 */ addiu $a1, $a1, 0x5000 ## $a1 = 08055000 /* 05E20 80819640 01E25824 */ and $t3, $t7, $v0 @@ -1307,14 +1307,14 @@ glabel func_80818340 /* 05E34 80819654 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 /* 05E38 80819658 0C207E1F */ jal func_8081F87C /* 05E3C 8081965C 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 05E40 80819660 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 05E40 80819660 3C088016 */ lui $t0, %hi(gSaveContext) /* 05E44 80819664 10000012 */ beq $zero, $zero, .L808196B0 -/* 05E48 80819668 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 05E48 80819668 2508E660 */ addiu $t0, %lo(gSaveContext) .L8081966C: /* 05E4C 8081966C 00115080 */ sll $t2, $s1, 2 -/* 05E50 80819670 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 +/* 05E50 80819670 3C198012 */ lui $t9, %hi(gBitFlags) /* 05E54 80819674 032AC821 */ addu $t9, $t9, $t2 -/* 05E58 80819678 8F397120 */ lw $t9, 0x7120($t9) ## 80127120 +/* 05E58 80819678 8F397120 */ lw $t9, %lo(gBitFlags)($t9) /* 05E5C 8081967C 00136880 */ sll $t5, $s3, 2 /* 05E60 80819680 03CD7821 */ addu $t7, $s8, $t5 /* 05E64 80819684 0322C024 */ and $t8, $t9, $v0 @@ -1326,8 +1326,8 @@ glabel func_80818340 /* 05E7C 8081969C 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 /* 05E80 808196A0 0C207E1F */ jal func_8081F87C /* 05E84 808196A4 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 05E88 808196A8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 05E8C 808196AC 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 05E88 808196A8 3C088016 */ lui $t0, %hi(gSaveContext) +/* 05E8C 808196AC 2508E660 */ addiu $t0, %lo(gSaveContext) .L808196B0: /* 05E90 808196B0 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 05E94 808196B4 3210FFFF */ andi $s0, $s0, 0xFFFF ## $s0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s index 1e5d720a50..dfde39a60d 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s @@ -10,14 +10,14 @@ glabel func_808198A0 /* 060A0 808198C0 0C031AB1 */ jal Graph_OpenDisps /* 060A4 808198C4 24070045 */ addiu $a3, $zero, 0x0045 ## $a3 = 00000045 /* 060A8 808198C8 87A900A2 */ lh $t1, 0x00A2($sp) -/* 060AC 808198CC 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 +/* 060AC 808198CC 3C0E8012 */ lui $t6, %hi(gItemSlots) /* 060B0 808198D0 8FA5009C */ lw $a1, 0x009C($sp) -/* 060B4 808198D4 25CE7464 */ addiu $t6, $t6, 0x7464 ## $t6 = 80127464 +/* 060B4 808198D4 25CE7464 */ addiu $t6, %lo(gItemSlots) /* 060B8 808198D8 012E3821 */ addu $a3, $t1, $t6 /* 060BC 808198DC 90EF0000 */ lbu $t7, 0x0000($a3) ## 00000000 /* 060C0 808198E0 8CA202C0 */ lw $v0, 0x02C0($a1) ## 000002C0 -/* 060C4 808198E4 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 060C8 808198E8 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 060C4 808198E4 3C048016 */ lui $a0, %hi(gSaveContext) +/* 060C8 808198E8 2484E660 */ addiu $a0, %lo(gSaveContext) /* 060CC 808198EC 008FC021 */ addu $t8, $a0, $t7 /* 060D0 808198F0 8FAA0098 */ lw $t2, 0x0098($sp) /* 060D4 808198F4 8306008C */ lb $a2, 0x008C($t8) ## 0000008C @@ -74,33 +74,33 @@ glabel func_808198A0 .L808199BC: /* 0619C 808199BC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 061A0 808199C0 15210012 */ bne $t1, $at, .L80819A0C -/* 061A4 808199C4 3C038012 */ lui $v1, 0x8012 ## $v1 = 80120000 +/* 061A4 808199C4 3C038012 */ lui $v1, %hi(gUpgradeMasks) /* 061A8 808199C8 90F80000 */ lbu $t8, 0x0000($a3) ## 00000000 -/* 061AC 808199CC 246371B0 */ addiu $v1, $v1, 0x71B0 ## $v1 = 801271B0 +/* 061AC 808199CC 246371B0 */ addiu $v1, %lo(gUpgradeMasks) /* 061B0 808199D0 8C8F00A0 */ lw $t7, 0x00A0($a0) ## 8015E700 /* 061B4 808199D4 0098C821 */ addu $t9, $a0, $t8 /* 061B8 808199D8 8C780004 */ lw $t8, 0x0004($v1) ## 801271B4 /* 061BC 808199DC 832E008C */ lb $t6, 0x008C($t9) ## 00000094 -/* 061C0 808199E0 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 061C4 808199E4 250871F4 */ addiu $t0, $t0, 0x71F4 ## $t0 = 801271F4 +/* 061C0 808199E0 3C088012 */ lui $t0, %hi(gUpgradeShifts) +/* 061C4 808199E4 250871F4 */ addiu $t0, %lo(gUpgradeShifts) /* 061C8 808199E8 01F8C824 */ and $t9, $t7, $t8 /* 061CC 808199EC 910F0001 */ lbu $t7, 0x0001($t0) ## 801271F5 -/* 061D0 808199F0 3C028012 */ lui $v0, 0x8012 ## $v0 = 80120000 -/* 061D4 808199F4 244271FC */ addiu $v0, $v0, 0x71FC ## $v0 = 801271FC +/* 061D0 808199F0 3C028012 */ lui $v0, %hi(gUpgradeCapacities) +/* 061D4 808199F4 244271FC */ addiu $v0, %lo(gUpgradeCapacities) /* 061D8 808199F8 01F9C007 */ srav $t8, $t9, $t7 /* 061DC 808199FC 0018C840 */ sll $t9, $t8, 1 /* 061E0 80819A00 00597821 */ addu $t7, $v0, $t9 /* 061E4 80819A04 95F80008 */ lhu $t8, 0x0008($t7) ## 82828210 /* 061E8 80819A08 11D8004A */ beq $t6, $t8, .L80819B34 .L80819A0C: -/* 061EC 80819A0C 3C028012 */ lui $v0, 0x8012 ## $v0 = 80120000 -/* 061F0 80819A10 3C038012 */ lui $v1, 0x8012 ## $v1 = 80120000 -/* 061F4 80819A14 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 +/* 061EC 80819A0C 3C028012 */ lui $v0, %hi(gUpgradeCapacities) +/* 061F0 80819A10 3C038012 */ lui $v1, %hi(gUpgradeMasks) +/* 061F4 80819A14 3C088012 */ lui $t0, %hi(gUpgradeShifts) /* 061F8 80819A18 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 061FC 80819A1C 250871F4 */ addiu $t0, $t0, 0x71F4 ## $t0 = 801271F4 -/* 06200 80819A20 246371B0 */ addiu $v1, $v1, 0x71B0 ## $v1 = 801271B0 +/* 061FC 80819A1C 250871F4 */ addiu $t0, %lo(gUpgradeShifts) +/* 06200 80819A20 246371B0 */ addiu $v1, %lo(gUpgradeMasks) /* 06204 80819A24 1521000D */ bne $t1, $at, .L80819A5C -/* 06208 80819A28 244271FC */ addiu $v0, $v0, 0x71FC ## $v0 = 801271FC +/* 06208 80819A28 244271FC */ addiu $v0, %lo(gUpgradeCapacities) /* 0620C 80819A2C 90F90000 */ lbu $t9, 0x0000($a3) ## 00000000 /* 06210 80819A30 8C9800A0 */ lw $t8, 0x00A0($a0) ## 8015E700 /* 06214 80819A34 00997821 */ addu $t7, $a0, $t9 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s index 3c2e4de42f..5372af9629 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s @@ -80,11 +80,11 @@ glabel func_80819E6C /* 0677C 80819F9C 0C00084C */ jal osSyncPrintf /* 06780 80819FA0 A7A800A0 */ sh $t0, 0x00A0($sp) -/* 06784 80819FA4 3C148016 */ lui $s4, 0x8016 ## $s4 = 80160000 +/* 06784 80819FA4 3C148016 */ lui $s4, %hi(gSaveContext) /* 06788 80819FA8 87A300A2 */ lh $v1, 0x00A2($sp) /* 0678C 80819FAC 87A700A4 */ lh $a3, 0x00A4($sp) /* 06790 80819FB0 87A800A0 */ lh $t0, 0x00A0($sp) -/* 06794 80819FB4 2694E660 */ addiu $s4, $s4, 0xE660 ## $s4 = 8015E660 +/* 06794 80819FB4 2694E660 */ addiu $s4, %lo(gSaveContext) /* 06798 80819FB8 86300222 */ lh $s0, 0x0222($s1) ## 00000222 /* 0679C 80819FBC 241500FF */ addiu $s5, $zero, 0x00FF ## $s5 = 000000FF /* 067A0 80819FC0 86220214 */ lh $v0, 0x0214($s1) ## 00000214 @@ -239,27 +239,27 @@ glabel func_80819E6C /* 069B8 8081A1D8 54410038 */ bnel $v0, $at, .L8081A2BC /* 069BC 8081A1DC 862B0214 */ lh $t3, 0x0214($s1) ## 00000214 /* 069C0 8081A1E0 862E0214 */ lh $t6, 0x0214($s1) ## 00000214 -/* 069C4 8081A1E4 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 069C8 8081A1E8 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 069C4 8081A1E4 3C058013 */ lui $a1, %hi(D_801333D4) +/* 069C8 8081A1E8 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 069CC 8081A1EC 29C1001F */ slti $at, $t6, 0x001F /* 069D0 8081A1F0 1420002F */ bne $at, $zero, .L8081A2B0 /* 069D4 8081A1F4 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 -/* 069D8 8081A1F8 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 069DC 8081A1FC 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 +/* 069D8 8081A1F8 3C0F8013 */ lui $t7, %hi(D_801333E0) +/* 069DC 8081A1FC 3C188013 */ lui $t8, %hi(D_801333E8) /* 069E0 8081A200 A620025C */ sh $zero, 0x025C($s1) ## 0000025C /* 069E4 8081A204 A6200238 */ sh $zero, 0x0238($s1) ## 00000238 -/* 069E8 8081A208 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 069EC 8081A20C 25E733E0 */ addiu $a3, $t7, 0x33E0 ## $a3 = 801333E0 +/* 069E8 8081A208 271833E8 */ addiu $t8, %lo(D_801333E8) +/* 069EC 8081A20C 25E733E0 */ addiu $a3, $t7, %lo(D_801333E0) /* 069F0 8081A210 AFA70010 */ sw $a3, 0x0010($sp) /* 069F4 8081A214 AFB80014 */ sw $t8, 0x0014($sp) /* 069F8 8081A218 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 069FC 8081A21C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 06A00 8081A220 3C148016 */ lui $s4, 0x8016 ## $s4 = 80160000 +/* 06A00 8081A220 3C148016 */ lui $s4, %hi(gSaveContext) /* 06A04 8081A224 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 /* 06A08 8081A228 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 06A0C 8081A22C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 06A10 8081A230 2694E660 */ addiu $s4, $s4, 0xE660 ## $s4 = 8015E660 +/* 06A10 8081A230 2694E660 */ addiu $s4, %lo(gSaveContext) /* 06A14 8081A234 241500FF */ addiu $s5, $zero, 0x00FF ## $s5 = 000000FF .L8081A238: /* 06A18 8081A238 0287C821 */ addu $t9, $s4, $a3 @@ -300,25 +300,25 @@ glabel func_80819E6C .L8081A2BC: /* 06A9C 8081A2BC 2961FFE2 */ slti $at, $t3, 0xFFE2 /* 06AA0 8081A2C0 10200030 */ beq $at, $zero, .L8081A384 -/* 06AA4 8081A2C4 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 06AA8 8081A2C8 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 +/* 06AA4 8081A2C4 3C0C8013 */ lui $t4, %hi(D_801333E0) +/* 06AA8 8081A2C8 3C0D8013 */ lui $t5, %hi(D_801333E8) /* 06AAC 8081A2CC A620025C */ sh $zero, 0x025C($s1) ## 0000025C /* 06AB0 8081A2D0 A6200238 */ sh $zero, 0x0238($s1) ## 00000238 -/* 06AB4 8081A2D4 25AD33E8 */ addiu $t5, $t5, 0x33E8 ## $t5 = 801333E8 -/* 06AB8 8081A2D8 258733E0 */ addiu $a3, $t4, 0x33E0 ## $a3 = 801333E0 -/* 06ABC 8081A2DC 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 06AC0 8081A2E0 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 06AB4 8081A2D4 25AD33E8 */ addiu $t5, %lo(D_801333E8) +/* 06AB8 8081A2D8 258733E0 */ addiu $a3, $t4, %lo(D_801333E0) +/* 06ABC 8081A2DC 3C058013 */ lui $a1, %hi(D_801333D4) +/* 06AC0 8081A2E0 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 06AC4 8081A2E4 AFA70010 */ sw $a3, 0x0010($sp) /* 06AC8 8081A2E8 AFAD0014 */ sw $t5, 0x0014($sp) /* 06ACC 8081A2EC 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 /* 06AD0 8081A2F0 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 06AD4 8081A2F4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 06AD8 8081A2F8 3C148016 */ lui $s4, 0x8016 ## $s4 = 80160000 +/* 06AD8 8081A2F8 3C148016 */ lui $s4, %hi(gSaveContext) /* 06ADC 8081A2FC 24030005 */ addiu $v1, $zero, 0x0005 ## $v1 = 00000005 /* 06AE0 8081A300 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 /* 06AE4 8081A304 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 -/* 06AE8 8081A308 2694E660 */ addiu $s4, $s4, 0xE660 ## $s4 = 8015E660 +/* 06AE8 8081A308 2694E660 */ addiu $s4, %lo(gSaveContext) /* 06AEC 8081A30C 241500FF */ addiu $s5, $zero, 0x00FF ## $s5 = 000000FF .L8081A310: /* 06AF0 8081A310 02877021 */ addu $t6, $s4, $a3 @@ -352,8 +352,8 @@ glabel func_80819E6C /* 06B5C 8081A37C 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A /* 06B60 8081A380 86220238 */ lh $v0, 0x0238($s1) ## 00000238 .L8081A384: -/* 06B64 8081A384 3C148016 */ lui $s4, 0x8016 ## $s4 = 80160000 -/* 06B68 8081A388 2694E660 */ addiu $s4, $s4, 0xE660 ## $s4 = 8015E660 +/* 06B64 8081A384 3C148016 */ lui $s4, %hi(gSaveContext) +/* 06B68 8081A388 2694E660 */ addiu $s4, %lo(gSaveContext) /* 06B6C 8081A38C 1440010D */ bne $v0, $zero, .L8081A7C4 /* 06B70 8081A390 241500FF */ addiu $s5, $zero, 0x00FF ## $s5 = 000000FF /* 06B74 8081A394 97A400AA */ lhu $a0, 0x00AA($sp) @@ -546,12 +546,12 @@ glabel func_80819E6C /* 06E1C 8081A63C 3C018083 */ lui $at, %hi(D_8082A434) ## $at = 80830000 /* 06E20 8081A640 03240019 */ multu $t9, $a0 /* 06E24 8081A644 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 06E28 8081A648 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 06E2C 8081A64C 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 06E30 8081A650 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 06E34 8081A654 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 06E38 8081A658 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 -/* 06E3C 8081A65C 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 +/* 06E28 8081A648 3C078013 */ lui $a3, %hi(D_801333E0) +/* 06E2C 8081A64C 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 06E30 8081A650 3C058013 */ lui $a1, %hi(D_801333D4) +/* 06E34 8081A654 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 06E38 8081A658 24A533D4 */ addiu $a1, %lo(D_801333D4) +/* 06E3C 8081A65C 25CE33E8 */ addiu $t6, %lo(D_801333E8) /* 06E40 8081A660 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 06E44 8081A664 00005012 */ mflo $t2 /* 06E48 8081A668 A62A0254 */ sh $t2, 0x0254($s1) ## 00000254 @@ -601,12 +601,12 @@ glabel func_80819E6C /* 06EE8 8081A708 10000030 */ beq $zero, $zero, .L8081A7CC /* 06EEC 8081A70C A438A438 */ sh $t8, %lo(D_8082A438)($at) .L8081A710: -/* 06EF0 8081A710 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 06EF4 8081A714 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 06EF8 8081A718 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 06EFC 8081A71C 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 06F00 8081A720 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 06F04 8081A724 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 06EF0 8081A710 3C078013 */ lui $a3, %hi(D_801333E0) +/* 06EF4 8081A714 3C198013 */ lui $t9, %hi(D_801333E8) +/* 06EF8 8081A718 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 06EFC 8081A71C 273933E8 */ addiu $t9, %lo(D_801333E8) +/* 06F00 8081A720 3C058013 */ lui $a1, %hi(D_801333D4) +/* 06F04 8081A724 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 06F08 8081A728 AFB90014 */ sw $t9, 0x0014($sp) /* 06F0C 8081A72C AFA70010 */ sw $a3, 0x0010($sp) /* 06F10 8081A730 0C03DCE3 */ jal Audio_PlaySoundGeneral @@ -615,12 +615,12 @@ glabel func_80819E6C /* 06F18 8081A738 10000025 */ beq $zero, $zero, .L8081A7D0 /* 06F1C 8081A73C 87AC009E */ lh $t4, 0x009E($sp) .L8081A740: -/* 06F20 8081A740 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 06F24 8081A744 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 -/* 06F28 8081A748 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 -/* 06F2C 8081A74C 254733E0 */ addiu $a3, $t2, 0x33E0 ## $a3 = 801333E0 -/* 06F30 8081A750 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 06F34 8081A754 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 06F20 8081A740 3C0A8013 */ lui $t2, %hi(D_801333E0) +/* 06F24 8081A744 3C0B8013 */ lui $t3, %hi(D_801333E8) +/* 06F28 8081A748 256B33E8 */ addiu $t3, %lo(D_801333E8) +/* 06F2C 8081A74C 254733E0 */ addiu $a3, $t2, %lo(D_801333E0) +/* 06F30 8081A750 3C058013 */ lui $a1, %hi(D_801333D4) +/* 06F34 8081A754 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 06F38 8081A758 AFA70010 */ sw $a3, 0x0010($sp) /* 06F3C 8081A75C AFAB0014 */ sw $t3, 0x0014($sp) /* 06F40 8081A760 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 @@ -658,12 +658,12 @@ glabel func_80819E6C .L8081A7D0: /* 06FB0 8081A7D0 862D0218 */ lh $t5, 0x0218($s1) ## 00000218 /* 06FB4 8081A7D4 118D001B */ beq $t4, $t5, .L8081A844 -/* 06FB8 8081A7D8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 06FBC 8081A7DC 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 06FC0 8081A7E0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 06FC4 8081A7E4 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 06FC8 8081A7E8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 06FCC 8081A7EC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 06FB8 8081A7D8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 06FBC 8081A7DC 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 06FC0 8081A7E0 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 06FC4 8081A7E4 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 06FC8 8081A7E8 3C058013 */ lui $a1, %hi(D_801333D4) +/* 06FCC 8081A7EC 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 06FD0 8081A7F0 AFAE0014 */ sw $t6, 0x0014($sp) /* 06FD4 8081A7F4 AFA70010 */ sw $a3, 0x0010($sp) /* 06FD8 8081A7F8 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 @@ -706,14 +706,14 @@ glabel func_80819E6C /* 07058 8081A878 AE6D02C0 */ sw $t5, 0x02C0($s3) ## 000002C0 /* 0705C 8081A87C AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 /* 07060 8081A880 962F0208 */ lhu $t7, 0x0208($s1) ## 00000208 -/* 07064 8081A884 3C148016 */ lui $s4, 0x8016 ## $s4 = 80160000 +/* 07064 8081A884 3C148016 */ lui $s4, %hi(gSaveContext) /* 07068 8081A888 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 /* 0706C 8081A88C 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 /* 07070 8081A890 0301C825 */ or $t9, $t8, $at ## $t9 = FFFFFF00 /* 07074 8081A894 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 07078 8081A898 8E6302C0 */ lw $v1, 0x02C0($s3) ## 000002C0 /* 0707C 8081A89C 3C120200 */ lui $s2, 0x0200 ## $s2 = 02000000 -/* 07080 8081A8A0 2694E660 */ addiu $s4, $s4, 0xE660 ## $s4 = 8015E660 +/* 07080 8081A8A0 2694E660 */ addiu $s4, %lo(gSaveContext) /* 07084 8081A8A4 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 /* 07088 8081A8A8 AE6A02C0 */ sw $t2, 0x02C0($s3) ## 000002C0 /* 0708C 8081A8AC 241500FF */ addiu $s5, $zero, 0x00FF ## $s5 = 000000FF @@ -783,7 +783,7 @@ glabel func_80819E6C /* 07180 8081A9A0 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 /* 07184 8081A9A4 962A0208 */ lhu $t2, 0x0208($s1) ## 00000208 /* 07188 8081A9A8 02904821 */ addu $t1, $s4, $s0 -/* 0718C 8081A9AC 3C058012 */ lui $a1, 0x8012 ## $a1 = 80120000 +/* 0718C 8081A9AC 3C058012 */ lui $a1, %hi(gItemIcons) /* 07190 8081A9B0 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000000 /* 07194 8081A9B4 01616025 */ or $t4, $t3, $at ## $t4 = FFFFFF00 /* 07198 8081A9B8 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 @@ -953,7 +953,7 @@ glabel func_80819E6C /* 07414 8081AC34 A7A800AC */ sh $t0, 0x00AC($sp) /* 07418 8081AC38 AFA00010 */ sw $zero, 0x0010($sp) /* 0741C 8081AC3C 0C207E1F */ jal func_8081F87C -/* 07420 8081AC40 8CA5725C */ lw $a1, 0x725C($a1) ## 8012725C +/* 07420 8081AC40 8CA5725C */ lw $a1, %lo(gItemIcons)($a1) /* 07424 8081AC44 97A800AC */ lhu $t0, 0x00AC($sp) /* 07428 8081AC48 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000002 .L8081AC4C: diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081AD44.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081AD44.s index d1f818710a..d66fcb8ead 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081AD44.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081AD44.s @@ -33,7 +33,7 @@ glabel func_8081AD44 /* 07598 8081ADB8 3C038083 */ lui $v1, %hi(D_8082A488) ## $v1 = 80830000 /* 0759C 8081ADBC 8463A488 */ lh $v1, %lo(D_8082A488)($v1) /* 075A0 8081ADC0 3C018083 */ lui $at, %hi(D_8082A488) ## $at = 80830000 -/* 075A4 8081ADC4 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 075A4 8081ADC4 3C078013 */ lui $a3, %hi(D_801333E0) /* 075A8 8081ADC8 2463FFFF */ addiu $v1, $v1, 0xFFFF ## $v1 = 8082FFFF /* 075AC 8081ADCC 00031C00 */ sll $v1, $v1, 16 /* 075B0 8081ADD0 00031C03 */ sra $v1, $v1, 16 @@ -45,24 +45,24 @@ glabel func_8081AD44 /* 075C8 8081ADE8 01014021 */ addu $t0, $t0, $at /* 075CC 8081ADEC 9518024E */ lhu $t8, 0x024E($t0) ## 0000024E /* 075D0 8081ADF0 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 075D4 8081ADF4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 075D4 8081ADF4 3C038016 */ lui $v1, %hi(gGameInfo) /* 075D8 8081ADF8 2719FF79 */ addiu $t9, $t8, 0xFF79 ## $t9 = FFFFFF79 /* 075DC 8081ADFC A519024E */ sh $t9, 0x024E($t0) ## 0000024E /* 075E0 8081AE00 A50D0250 */ sh $t5, 0x0250($t0) ## 00000250 /* 075E4 8081AE04 3C018083 */ lui $at, %hi(D_8082A438) ## $at = 80830000 /* 075E8 8081AE08 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 075EC 8081AE0C 2463FA90 */ addiu $v1, $v1, 0xFA90 ## $v1 = 8015FA90 +/* 075EC 8081AE0C 2463FA90 */ addiu $v1, %lo(gGameInfo) /* 075F0 8081AE10 A42EA438 */ sh $t6, %lo(D_8082A438)($at) /* 075F4 8081AE14 8C780000 */ lw $t8, 0x0000($v1) ## 8015FA90 /* 075F8 8081AE18 240F0140 */ addiu $t7, $zero, 0x0140 ## $t7 = 00000140 -/* 075FC 8081AE1C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 075FC 8081AE1C 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 07600 8081AE20 A70F0E48 */ sh $t7, 0x0E48($t8) ## 00000E48 /* 07604 8081AE24 8C620000 */ lw $v0, 0x0000($v1) ## 8015FA90 -/* 07608 8081AE28 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 0760C 8081AE2C 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 07608 8081AE28 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 0760C 8081AE2C 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 07610 8081AE30 84590E4A */ lh $t9, 0x0E4A($v0) ## 00000E4A -/* 07614 8081AE34 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 07618 8081AE38 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 07614 8081AE34 3C058013 */ lui $a1, %hi(D_801333D4) +/* 07618 8081AE38 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 0761C 8081AE3C A4590E42 */ sh $t9, 0x0E42($v0) ## 00000E42 /* 07620 8081AE40 852D0000 */ lh $t5, 0x0000($t1) ## 8082A430 /* 07624 8081AE44 AFAF0014 */ sw $t7, 0x0014($sp) @@ -226,8 +226,8 @@ glabel func_8081AD44 .L8081B070: /* 07850 8081B070 84620000 */ lh $v0, 0x0000($v1) ## 8082A434 .L8081B074: -/* 07854 8081B074 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 07858 8081B078 256BFA90 */ addiu $t3, $t3, 0xFA90 ## $t3 = 8015FA90 +/* 07854 8081B074 3C0B8016 */ lui $t3, %hi(gGameInfo) +/* 07858 8081B078 256BFA90 */ addiu $t3, %lo(gGameInfo) /* 0785C 8081B07C 54400297 */ bnel $v0, $zero, .L8081BADC /* 07860 8081B080 244DFFFF */ addiu $t5, $v0, 0xFFFF ## $t5 = FFFFFFFF /* 07864 8081B084 8D620000 */ lw $v0, 0x0000($t3) ## 8015FA90 @@ -353,8 +353,8 @@ glabel func_8081AD44 /* 07A18 8081B238 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 07A1C 8081B23C 95020252 */ lhu $v0, 0x0252($t0) ## 00000252 /* 07A20 8081B240 144000A6 */ bne $v0, $zero, .L8081B4DC -/* 07A24 8081B244 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 07A28 8081B248 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 07A24 8081B244 3C038016 */ lui $v1, %hi(gSaveContext) +/* 07A28 8081B248 2463E660 */ addiu $v1, %lo(gSaveContext) /* 07A2C 8081B24C 906D006D */ lbu $t5, 0x006D($v1) ## 8015E6CD /* 07A30 8081B250 95020250 */ lhu $v0, 0x0250($t0) ## 00000250 /* 07A34 8081B254 544D0025 */ bnel $v0, $t5, .L8081B2EC @@ -388,8 +388,8 @@ glabel func_8081AD44 /* 07A9C 8081B2BC AFA80024 */ sw $t0, 0x0024($sp) /* 07AA0 8081B2C0 0C0212CC */ jal Interface_LoadItemIcon2 /* 07AA4 8081B2C4 A078006D */ sb $t8, 0x006D($v1) ## 8015E6CD -/* 07AA8 8081B2C8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 07AAC 8081B2CC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 07AA8 8081B2C8 3C038016 */ lui $v1, %hi(gSaveContext) +/* 07AAC 8081B2CC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 07AB0 8081B2D0 1000002A */ beq $zero, $zero, .L8081B37C /* 07AB4 8081B2D4 8FA80024 */ lw $t0, 0x0024($sp) .L8081B2D8: @@ -430,8 +430,8 @@ glabel func_8081AD44 /* 07B34 8081B354 AFA80024 */ sw $t0, 0x0024($sp) /* 07B38 8081B358 0C0212CC */ jal Interface_LoadItemIcon2 /* 07B3C 8081B35C A06E006E */ sb $t6, 0x006E($v1) ## 8015E6CE -/* 07B40 8081B360 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 07B44 8081B364 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 07B40 8081B360 3C038016 */ lui $v1, %hi(gSaveContext) +/* 07B44 8081B364 2463E660 */ addiu $v1, %lo(gSaveContext) /* 07B48 8081B368 10000004 */ beq $zero, $zero, .L8081B37C /* 07B4C 8081B36C 8FA80024 */ lw $t0, 0x0024($sp) .L8081B370: @@ -500,18 +500,18 @@ glabel func_8081AD44 /* 07C30 8081B450 8FA80024 */ lw $t0, 0x0024($sp) /* 07C34 8081B454 9506024E */ lhu $a2, 0x024E($t0) ## 0000024E .L8081B458: -/* 07C38 8081B458 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 07C3C 8081B45C A026E6C9 */ sb $a2, -0x1937($at) ## 8015E6C9 +/* 07C38 8081B458 3C018016 */ lui $at, %hi(gSaveContext+0x69) +/* 07C3C 8081B45C A026E6C9 */ sb $a2, %lo(gSaveContext+0x69)($at) /* 07C40 8081B460 95190250 */ lhu $t9, 0x0250($t0) ## 00000250 -/* 07C44 8081B464 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 07C44 8081B464 3C018016 */ lui $at, %hi(gSaveContext+0x6c) /* 07C48 8081B468 AFA80024 */ sw $t0, 0x0024($sp) /* 07C4C 8081B46C 8FA40038 */ lw $a0, 0x0038($sp) /* 07C50 8081B470 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 07C54 8081B474 0C02129B */ jal Interface_LoadItemIcon1 -/* 07C58 8081B478 A039E6CC */ sb $t9, -0x1934($at) ## 8015E6CC +/* 07C58 8081B478 A039E6CC */ sb $t9, %lo(gSaveContext+0x6c)($at) /* 07C5C 8081B47C 8FA80024 */ lw $t0, 0x0024($sp) -/* 07C60 8081B480 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 07C64 8081B484 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 07C60 8081B480 3C038016 */ lui $v1, %hi(gSaveContext) +/* 07C64 8081B484 2463E660 */ addiu $v1, %lo(gSaveContext) /* 07C68 8081B488 906D006B */ lbu $t5, 0x006B($v1) ## 8015E6CB /* 07C6C 8081B48C 3C048083 */ lui $a0, %hi(D_8082F830) ## $a0 = 80830000 /* 07C70 8081B490 9505024E */ lhu $a1, 0x024E($t0) ## 0000024E @@ -522,8 +522,8 @@ glabel func_8081AD44 /* 07C84 8081B4A4 AFAD0010 */ sw $t5, 0x0010($sp) /* 07C88 8081B4A8 8FA80024 */ lw $t0, 0x0024($sp) -/* 07C8C 8081B4AC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 07C90 8081B4B0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 07C8C 8081B4AC 3C038016 */ lui $v1, %hi(gSaveContext) +/* 07C90 8081B4B0 2463E660 */ addiu $v1, %lo(gSaveContext) /* 07C94 8081B4B4 906F006E */ lbu $t7, 0x006E($v1) ## 8015E6CE /* 07C98 8081B4B8 3C048083 */ lui $a0, %hi(D_8082F858) ## $a0 = 80830000 /* 07C9C 8081B4BC 95050250 */ lhu $a1, 0x0250($t0) ## 00000250 @@ -537,9 +537,9 @@ glabel func_8081AD44 /* 07CB8 8081B4D8 8FA80024 */ lw $t0, 0x0024($sp) .L8081B4DC: /* 07CBC 8081B4DC 14E200BA */ bne $a3, $v0, .L8081B7C8 -/* 07CC0 8081B4E0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 07CC4 8081B4E4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 07CC8 8081B4E8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 07CC0 8081B4E0 3C038016 */ lui $v1, %hi(gSaveContext) +/* 07CC4 8081B4E4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 07CC8 8081B4E8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 07CCC 8081B4EC 906E006B */ lbu $t6, 0x006B($v1) ## 8015E6CB /* 07CD0 8081B4F0 3C048083 */ lui $a0, %hi(D_8082F880) ## $a0 = 80830000 /* 07CD4 8081B4F4 9505024E */ lhu $a1, 0x024E($t0) ## 0000024E @@ -551,8 +551,8 @@ glabel func_8081AD44 /* 07CEC 8081B50C AFAE0010 */ sw $t6, 0x0010($sp) /* 07CF0 8081B510 8FA80024 */ lw $t0, 0x0024($sp) -/* 07CF4 8081B514 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 07CF8 8081B518 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 07CF4 8081B514 3C038016 */ lui $v1, %hi(gSaveContext) +/* 07CF8 8081B518 2463E660 */ addiu $v1, %lo(gSaveContext) /* 07CFC 8081B51C 9078006E */ lbu $t8, 0x006E($v1) ## 8015E6CE /* 07D00 8081B520 3C048083 */ lui $a0, %hi(D_8082F8A8) ## $a0 = 80830000 /* 07D04 8081B524 95050250 */ lhu $a1, 0x0250($t0) ## 00000250 @@ -563,8 +563,8 @@ glabel func_8081AD44 /* 07D18 8081B538 AFB80010 */ sw $t8, 0x0010($sp) /* 07D1C 8081B53C 8FA80024 */ lw $t0, 0x0024($sp) -/* 07D20 8081B540 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 07D24 8081B544 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 07D20 8081B540 3C038016 */ lui $v1, %hi(gSaveContext) +/* 07D24 8081B544 2463E660 */ addiu $v1, %lo(gSaveContext) /* 07D28 8081B548 9079006C */ lbu $t9, 0x006C($v1) ## 8015E6CC /* 07D2C 8081B54C 95020250 */ lhu $v0, 0x0250($t0) ## 00000250 /* 07D30 8081B550 54590025 */ bnel $v0, $t9, .L8081B5E8 @@ -598,8 +598,8 @@ glabel func_8081AD44 /* 07D98 8081B5B8 AFA80024 */ sw $t0, 0x0024($sp) /* 07D9C 8081B5BC 0C0212CC */ jal Interface_LoadItemIcon2 /* 07DA0 8081B5C0 A06E006C */ sb $t6, 0x006C($v1) ## 8015E6CC -/* 07DA4 8081B5C4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 07DA8 8081B5C8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 07DA4 8081B5C4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 07DA8 8081B5C8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 07DAC 8081B5CC 1000002A */ beq $zero, $zero, .L8081B678 /* 07DB0 8081B5D0 8FA80024 */ lw $t0, 0x0024($sp) .L8081B5D4: @@ -640,8 +640,8 @@ glabel func_8081AD44 /* 07E30 8081B650 AFA80024 */ sw $t0, 0x0024($sp) /* 07E34 8081B654 0C0212CC */ jal Interface_LoadItemIcon2 /* 07E38 8081B658 A06F006E */ sb $t7, 0x006E($v1) ## 8015E6CE -/* 07E3C 8081B65C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 07E40 8081B660 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 07E3C 8081B65C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 07E40 8081B660 2463E660 */ addiu $v1, %lo(gSaveContext) /* 07E44 8081B664 10000004 */ beq $zero, $zero, .L8081B678 /* 07E48 8081B668 8FA80024 */ lw $t0, 0x0024($sp) .L8081B66C: @@ -706,18 +706,18 @@ glabel func_8081AD44 /* 07F1C 8081B73C 8FA80024 */ lw $t0, 0x0024($sp) /* 07F20 8081B740 9506024E */ lhu $a2, 0x024E($t0) ## 0000024E .L8081B744: -/* 07F24 8081B744 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 07F28 8081B748 A026E6CA */ sb $a2, -0x1936($at) ## 8015E6CA +/* 07F24 8081B744 3C018016 */ lui $at, %hi(gSaveContext+0x6a) +/* 07F28 8081B748 A026E6CA */ sb $a2, %lo(gSaveContext+0x6a)($at) /* 07F2C 8081B74C 950F0250 */ lhu $t7, 0x0250($t0) ## 00000250 -/* 07F30 8081B750 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 07F30 8081B750 3C018016 */ lui $at, %hi(gSaveContext+0x6d) /* 07F34 8081B754 AFA80024 */ sw $t0, 0x0024($sp) /* 07F38 8081B758 8FA40038 */ lw $a0, 0x0038($sp) /* 07F3C 8081B75C 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 07F40 8081B760 0C02129B */ jal Interface_LoadItemIcon1 -/* 07F44 8081B764 A02FE6CD */ sb $t7, -0x1933($at) ## 8015E6CD +/* 07F44 8081B764 A02FE6CD */ sb $t7, %lo(gSaveContext+0x6d)($at) /* 07F48 8081B768 8FA80024 */ lw $t0, 0x0024($sp) -/* 07F4C 8081B76C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 07F50 8081B770 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 07F4C 8081B76C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 07F50 8081B770 2463E660 */ addiu $v1, %lo(gSaveContext) /* 07F54 8081B774 906E006B */ lbu $t6, 0x006B($v1) ## 8015E6CB /* 07F58 8081B778 3C048083 */ lui $a0, %hi(D_8082F8D0) ## $a0 = 80830000 /* 07F5C 8081B77C 9505024E */ lhu $a1, 0x024E($t0) ## 0000024E @@ -728,8 +728,8 @@ glabel func_8081AD44 /* 07F70 8081B790 AFAE0010 */ sw $t6, 0x0010($sp) /* 07F74 8081B794 8FA80024 */ lw $t0, 0x0024($sp) -/* 07F78 8081B798 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 07F7C 8081B79C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 07F78 8081B798 3C038016 */ lui $v1, %hi(gSaveContext) +/* 07F7C 8081B79C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 07F80 8081B7A0 9078006E */ lbu $t8, 0x006E($v1) ## 8015E6CE /* 07F84 8081B7A4 3C048083 */ lui $a0, %hi(D_8082F8F8) ## $a0 = 80830000 /* 07F88 8081B7A8 95050250 */ lhu $a1, 0x0250($t0) ## 00000250 @@ -742,7 +742,7 @@ glabel func_8081AD44 /* 07FA0 8081B7C0 100000B8 */ beq $zero, $zero, .L8081BAA4 /* 07FA4 8081B7C4 8FA80024 */ lw $t0, 0x0024($sp) .L8081B7C8: -/* 07FA8 8081B7C8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = FFFFE660 +/* 07FA8 8081B7C8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 07FAC 8081B7CC 9079006B */ lbu $t9, 0x006B($v1) ## FFFFE6CB /* 07FB0 8081B7D0 3C048083 */ lui $a0, %hi(D_8082F920) ## $a0 = 80830000 /* 07FB4 8081B7D4 9505024E */ lhu $a1, 0x024E($t0) ## 0000024E @@ -754,8 +754,8 @@ glabel func_8081AD44 /* 07FCC 8081B7EC AFB90010 */ sw $t9, 0x0010($sp) /* 07FD0 8081B7F0 8FA80024 */ lw $t0, 0x0024($sp) -/* 07FD4 8081B7F4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 07FD8 8081B7F8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 07FD4 8081B7F4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 07FD8 8081B7F8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 07FDC 8081B7FC 906D006E */ lbu $t5, 0x006E($v1) ## 8015E6CE /* 07FE0 8081B800 3C048083 */ lui $a0, %hi(D_8082F948) ## $a0 = 80830000 /* 07FE4 8081B804 95050250 */ lhu $a1, 0x0250($t0) ## 00000250 @@ -766,8 +766,8 @@ glabel func_8081AD44 /* 07FF8 8081B818 AFAD0010 */ sw $t5, 0x0010($sp) /* 07FFC 8081B81C 8FA80024 */ lw $t0, 0x0024($sp) -/* 08000 8081B820 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 08004 8081B824 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 08000 8081B820 3C038016 */ lui $v1, %hi(gSaveContext) +/* 08004 8081B824 2463E660 */ addiu $v1, %lo(gSaveContext) /* 08008 8081B828 906F006C */ lbu $t7, 0x006C($v1) ## 8015E6CC /* 0800C 8081B82C 95020250 */ lhu $v0, 0x0250($t0) ## 00000250 /* 08010 8081B830 544F0025 */ bnel $v0, $t7, .L8081B8C8 @@ -801,8 +801,8 @@ glabel func_8081AD44 /* 08078 8081B898 AFA80024 */ sw $t0, 0x0024($sp) /* 0807C 8081B89C 0C0212CC */ jal Interface_LoadItemIcon2 /* 08080 8081B8A0 A079006C */ sb $t9, 0x006C($v1) ## 8015E6CC -/* 08084 8081B8A4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 08088 8081B8A8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 08084 8081B8A4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 08088 8081B8A8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 0808C 8081B8AC 1000002A */ beq $zero, $zero, .L8081B958 /* 08090 8081B8B0 8FA80024 */ lw $t0, 0x0024($sp) .L8081B8B4: @@ -843,8 +843,8 @@ glabel func_8081AD44 /* 08110 8081B930 AFA80024 */ sw $t0, 0x0024($sp) /* 08114 8081B934 0C0212CC */ jal Interface_LoadItemIcon2 /* 08118 8081B938 A078006D */ sb $t8, 0x006D($v1) ## 8015E6CD -/* 0811C 8081B93C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 08120 8081B940 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0811C 8081B93C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 08120 8081B940 2463E660 */ addiu $v1, %lo(gSaveContext) /* 08124 8081B944 10000004 */ beq $zero, $zero, .L8081B958 /* 08128 8081B948 8FA80024 */ lw $t0, 0x0024($sp) .L8081B94C: @@ -909,18 +909,18 @@ glabel func_8081AD44 /* 081FC 8081BA1C 8FA80024 */ lw $t0, 0x0024($sp) /* 08200 8081BA20 9506024E */ lhu $a2, 0x024E($t0) ## 0000024E .L8081BA24: -/* 08204 8081BA24 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 08208 8081BA28 A026E6CB */ sb $a2, -0x1935($at) ## 8015E6CB +/* 08204 8081BA24 3C018016 */ lui $at, %hi(gSaveContext+0x6b) +/* 08208 8081BA28 A026E6CB */ sb $a2, %lo(gSaveContext+0x6b)($at) /* 0820C 8081BA2C 95180250 */ lhu $t8, 0x0250($t0) ## 00000250 -/* 08210 8081BA30 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 08210 8081BA30 3C018016 */ lui $at, %hi(gSaveContext+0x6e) /* 08214 8081BA34 AFA80024 */ sw $t0, 0x0024($sp) /* 08218 8081BA38 8FA40038 */ lw $a0, 0x0038($sp) /* 0821C 8081BA3C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 08220 8081BA40 0C02129B */ jal Interface_LoadItemIcon1 -/* 08224 8081BA44 A038E6CE */ sb $t8, -0x1932($at) ## 8015E6CE +/* 08224 8081BA44 A038E6CE */ sb $t8, %lo(gSaveContext+0x6e)($at) /* 08228 8081BA48 8FA80024 */ lw $t0, 0x0024($sp) -/* 0822C 8081BA4C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 08230 8081BA50 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 0822C 8081BA4C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 08230 8081BA50 2463E660 */ addiu $v1, %lo(gSaveContext) /* 08234 8081BA54 9079006B */ lbu $t9, 0x006B($v1) ## 8015E6CB /* 08238 8081BA58 3C048083 */ lui $a0, %hi(D_8082F970) ## $a0 = 80830000 /* 0823C 8081BA5C 9505024E */ lhu $a1, 0x024E($t0) ## 0000024E @@ -931,8 +931,8 @@ glabel func_8081AD44 /* 08250 8081BA70 AFB90010 */ sw $t9, 0x0010($sp) /* 08254 8081BA74 8FA80024 */ lw $t0, 0x0024($sp) -/* 08258 8081BA78 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0825C 8081BA7C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 08258 8081BA78 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0825C 8081BA7C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 08260 8081BA80 906D006E */ lbu $t5, 0x006E($v1) ## 8015E6CE /* 08264 8081BA84 3C048083 */ lui $a0, %hi(D_8082F998) ## $a0 = 80830000 /* 08268 8081BA88 95050250 */ lhu $a1, 0x0250($t0) ## 00000250 @@ -944,11 +944,11 @@ glabel func_8081AD44 /* 0827C 8081BA9C AFAD0010 */ sw $t5, 0x0010($sp) /* 08280 8081BAA0 8FA80024 */ lw $t0, 0x0024($sp) .L8081BAA4: -/* 08284 8081BAA4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 08284 8081BAA4 3C038016 */ lui $v1, %hi(gGameInfo) /* 08288 8081BAA8 A50001E4 */ sh $zero, 0x01E4($t0) ## 000001E4 /* 0828C 8081BAAC 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A /* 08290 8081BAB0 3C018083 */ lui $at, %hi(D_8082A438) ## $at = 80830000 -/* 08294 8081BAB4 2463FA90 */ addiu $v1, $v1, 0xFA90 ## $v1 = 8015FA90 +/* 08294 8081BAB4 2463FA90 */ addiu $v1, %lo(gGameInfo) /* 08298 8081BAB8 A42FA438 */ sh $t7, %lo(D_8082A438)($at) /* 0829C 8081BABC 8C780000 */ lw $t8, 0x0000($v1) ## 8015FA90 /* 082A0 8081BAC0 240E0140 */ addiu $t6, $zero, 0x0140 ## $t6 = 00000140 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s index f6fc72fdd1..f2db1d4f88 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s @@ -37,10 +37,10 @@ glabel func_8081BB10 /* 0837C 8081BB9C 54200030 */ bnel $at, $zero, .L8081BC60 /* 08380 8081BBA0 2841FFE2 */ slti $at, $v0, 0xFFE2 /* 08384 8081BBA4 86390224 */ lh $t9, 0x0224($s1) ## 00000224 -/* 08388 8081BBA8 3C128016 */ lui $s2, 0x8016 ## $s2 = 80160000 -/* 0838C 8081BBAC 2652E660 */ addiu $s2, $s2, 0xE660 ## $s2 = 8015E660 +/* 08388 8081BBA8 3C128016 */ lui $s2, %hi(gSaveContext) +/* 0838C 8081BBAC 2652E660 */ addiu $s2, %lo(gSaveContext) /* 08390 8081BBB0 13200006 */ beq $t9, $zero, .L8081BBCC -/* 08394 8081BBB4 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 +/* 08394 8081BBB4 3C0A8012 */ lui $t2, %hi(gBitFlags) /* 08398 8081BBB8 8FA401F0 */ lw $a0, 0x01F0($sp) /* 0839C 8081BBBC 0C207E07 */ jal func_8081F81C /* 083A0 8081BBC0 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B @@ -50,7 +50,7 @@ glabel func_8081BB10 /* 083AC 8081BBCC A6230224 */ sh $v1, 0x0224($s1) ## 00000224 /* 083B0 8081BBD0 A620021A */ sh $zero, 0x021A($s1) ## 0000021A /* 083B4 8081BBD4 964F1402 */ lhu $t7, 0x1402($s2) ## 8015FA62 -/* 083B8 8081BBD8 254A7120 */ addiu $t2, $t2, 0x7120 ## $t2 = 00007120 +/* 083B8 8081BBD8 254A7120 */ addiu $t2, %lo(gBitFlags) /* 083BC 8081BBDC 8D4E0000 */ lw $t6, 0x0000($t2) ## 00007120 /* 083C0 8081BBE0 024FC021 */ addu $t8, $s2, $t7 /* 083C4 8081BBE4 931900A8 */ lbu $t9, 0x00A8($t8) ## 000000A8 @@ -107,17 +107,17 @@ glabel func_8081BB10 /* 08484 8081BCA4 0C00084C */ jal osSyncPrintf /* 08488 8081BCA8 8625021A */ lh $a1, 0x021A($s1) ## 0000021A -/* 0848C 8081BCAC 3C128016 */ lui $s2, 0x8016 ## $s2 = 80160000 -/* 08490 8081BCB0 2652E660 */ addiu $s2, $s2, 0xE660 ## $s2 = 8015E660 -/* 08494 8081BCB4 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 08498 8081BCB8 8F39FFD0 */ lw $t9, -0x0030($t9) ## 8015FFD0 +/* 0848C 8081BCAC 3C128016 */ lui $s2, %hi(gSaveContext) +/* 08490 8081BCB0 2652E660 */ addiu $s2, %lo(gSaveContext) +/* 08494 8081BCB4 3C198016 */ lui $t9, %hi(D_8015FFD0) +/* 08498 8081BCB8 8F39FFD0 */ lw $t9, %lo(D_8015FFD0)($t9) /* 0849C 8081BCBC 96581402 */ lhu $t8, 0x1402($s2) ## 8015FA62 -/* 084A0 8081BCC0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 084A0 8081BCC0 3C038016 */ lui $v1, %hi(gGameInfo) /* 084A4 8081BCC4 8F2F0000 */ lw $t7, 0x0000($t9) ## 80160000 /* 084A8 8081BCC8 00187100 */ sll $t6, $t8, 4 /* 084AC 8081BCCC 8638021A */ lh $t8, 0x021A($s1) ## 0000021A /* 084B0 8081BCD0 01EEC821 */ addu $t9, $t7, $t6 -/* 084B4 8081BCD4 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 084B4 8081BCD4 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) /* 084B8 8081BCD8 00187840 */ sll $t7, $t8, 1 /* 084BC 8081BCDC 032F7021 */ addu $t6, $t9, $t7 /* 084C0 8081BCE0 85D8FFFA */ lh $t8, -0x0006($t6) ## FFFFFFFA @@ -129,12 +129,12 @@ glabel func_8081BB10 /* 084D8 8081BCF8 8625021A */ lh $a1, 0x021A($s1) ## 0000021A /* 084DC 8081BCFC AFA5003C */ sw $a1, 0x003C($sp) .L8081BD00: -/* 084E0 8081BD00 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 084E4 8081BD04 3C128016 */ lui $s2, 0x8016 ## $s2 = 80160000 +/* 084E0 8081BD00 3C0A8012 */ lui $t2, %hi(gBitFlags) +/* 084E4 8081BD04 3C128016 */ lui $s2, %hi(gSaveContext) /* 084E8 8081BD08 28A10003 */ slti $at, $a1, 0x0003 -/* 084EC 8081BD0C 2652E660 */ addiu $s2, $s2, 0xE660 ## $s2 = 8015E660 +/* 084EC 8081BD0C 2652E660 */ addiu $s2, %lo(gSaveContext) /* 084F0 8081BD10 1020003C */ beq $at, $zero, .L8081BE04 -/* 084F4 8081BD14 254A7120 */ addiu $t2, $t2, 0x7120 ## $t2 = 80127120 +/* 084F4 8081BD14 254A7120 */ addiu $t2, %lo(gBitFlags) /* 084F8 8081BD18 86230216 */ lh $v1, 0x0216($s1) ## 00000216 /* 084FC 8081BD1C 2861001F */ slti $at, $v1, 0x001F /* 08500 8081BD20 5420001B */ bnel $at, $zero, .L8081BD90 @@ -215,10 +215,10 @@ glabel func_8081BB10 /* 08610 8081BE30 01C27023 */ subu $t6, $t6, $v0 /* 08614 8081BE34 000E7080 */ sll $t6, $t6, 2 /* 08618 8081BE38 024EC021 */ addu $t8, $s2, $t6 -/* 0861C 8081BE3C 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 0861C 8081BE3C 3C088016 */ lui $t0, %hi(D_8015FFD0) /* 08620 8081BE40 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 /* 08624 8081BE44 346304F0 */ ori $v1, $v1, 0x04F0 ## $v1 = 000104F0 -/* 08628 8081BE48 2508FFD0 */ addiu $t0, $t0, 0xFFD0 ## $t0 = 8015FFD0 +/* 08628 8081BE48 2508FFD0 */ addiu $t0, %lo(D_8015FFD0) /* 0862C 8081BE4C 8F0400EC */ lw $a0, 0x00EC($t8) ## 000000EC /* 08630 8081BE50 8FA601F0 */ lw $a2, 0x01F0($sp) /* 08634 8081BE54 0007C880 */ sll $t9, $a3, 2 @@ -286,11 +286,11 @@ glabel func_8081BB10 /* 08710 8081BF30 24EE0003 */ addiu $t6, $a3, 0x0003 ## $t6 = 00000001 /* 08714 8081BF34 8D590008 */ lw $t9, 0x0008($t2) ## 80127128 /* 08718 8081BF38 91EE00A8 */ lbu $t6, 0x00A8($t7) ## 000000A6 -/* 0871C 8081BF3C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0871C 8081BF3C 3C0F8016 */ lui $t7, %hi(D_8015FFD0) /* 08720 8081BF40 032EC024 */ and $t8, $t9, $t6 /* 08724 8081BF44 1300000F */ beq $t8, $zero, .L8081BF84 /* 08728 8081BF48 8FAE01F0 */ lw $t6, 0x01F0($sp) -/* 0872C 8081BF4C 8DEFFFD0 */ lw $t7, -0x0030($t7) ## 8015FFD0 +/* 0872C 8081BF4C 8DEFFFD0 */ lw $t7, %lo(D_8015FFD0)($t7) /* 08730 8081BF50 01C3C021 */ addu $t8, $t6, $v1 /* 08734 8081BF54 8DF90068 */ lw $t9, 0x0068($t7) ## 80160068 /* 08738 8081BF58 870F025A */ lh $t7, 0x025A($t8) ## 0000025A @@ -313,13 +313,13 @@ glabel func_8081BB10 /* 08774 8081BF94 5420FFE1 */ bnel $at, $zero, .L8081BF1C /* 08778 8081BF98 0007C880 */ sll $t9, $a3, 2 .L8081BF9C: -/* 0877C 8081BF9C 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 08780 8081BFA0 2508FFD0 */ addiu $t0, $t0, 0xFFD0 ## $t0 = 8015FFD0 +/* 0877C 8081BF9C 3C088016 */ lui $t0, %hi(D_8015FFD0) +/* 08780 8081BFA0 2508FFD0 */ addiu $t0, %lo(D_8015FFD0) /* 08784 8081BFA4 8D180000 */ lw $t8, 0x0000($t0) ## 8015FFD0 -/* 08788 8081BFA8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 08788 8081BFA8 3C038016 */ lui $v1, %hi(gGameInfo) /* 0878C 8081BFAC 0002C900 */ sll $t9, $v0, 4 /* 08790 8081BFB0 8F0F0000 */ lw $t7, 0x0000($t8) ## 00000000 -/* 08794 8081BFB4 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 08794 8081BFB4 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) /* 08798 8081BFB8 0005C040 */ sll $t8, $a1, 1 /* 0879C 8081BFBC 01F97021 */ addu $t6, $t7, $t9 /* 087A0 8081BFC0 01D87821 */ addu $t7, $t6, $t8 @@ -330,9 +330,9 @@ glabel func_8081BB10 /* 087B4 8081BFD4 032EC021 */ addu $t8, $t9, $t6 /* 087B8 8081BFD8 A4780F2E */ sh $t8, 0x0F2E($v1) ## 80160F2E /* 087BC 8081BFDC 8625021A */ lh $a1, 0x021A($s1) ## 0000021A -/* 087C0 8081BFE0 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 087C0 8081BFE0 3C0F8016 */ lui $t7, %hi(gGameInfo) /* 087C4 8081BFE4 A6250236 */ sh $a1, 0x0236($s1) ## 00000236 -/* 087C8 8081BFE8 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 087C8 8081BFE8 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 087CC 8081BFEC AFA5003C */ sw $a1, 0x003C($sp) /* 087D0 8081BFF0 85F90F2E */ lh $t9, 0x0F2E($t7) ## 80160F2E /* 087D4 8081BFF4 10F90005 */ beq $a3, $t9, .L8081C00C @@ -367,12 +367,12 @@ glabel func_8081BB10 /* 08840 8081C060 3125FFFF */ andi $a1, $t1, 0xFFFF ## $a1 = 00000048 /* 08844 8081C064 0C206785 */ jal func_80819E14 /* 08848 8081C068 8E26014C */ lw $a2, 0x014C($s1) ## 0000014C -/* 0884C 8081C06C 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 08850 8081C070 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 08854 8081C074 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 08858 8081C078 270733E0 */ addiu $a3, $t8, 0x33E0 ## $a3 = 801333E0 -/* 0885C 8081C07C 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 08860 8081C080 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0884C 8081C06C 3C188013 */ lui $t8, %hi(D_801333E0) +/* 08850 8081C070 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 08854 8081C074 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 08858 8081C078 270733E0 */ addiu $a3, $t8, %lo(D_801333E0) +/* 0885C 8081C07C 3C058013 */ lui $a1, %hi(D_801333D4) +/* 08860 8081C080 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 08864 8081C084 AFA70010 */ sw $a3, 0x0010($sp) /* 08868 8081C088 AFAF0014 */ sw $t7, 0x0014($sp) /* 0886C 8081C08C 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 @@ -386,18 +386,18 @@ glabel func_8081BB10 /* 08884 8081C0A4 8FA5003C */ lw $a1, 0x003C($sp) /* 08888 8081C0A8 86390214 */ lh $t9, 0x0214($s1) ## 00000214 .L8081C0AC: -/* 0888C 8081C0AC 3C128016 */ lui $s2, 0x8016 ## $s2 = 80160000 -/* 08890 8081C0B0 2652E660 */ addiu $s2, $s2, 0xE660 ## $s2 = 8015E660 +/* 0888C 8081C0AC 3C128016 */ lui $s2, %hi(gSaveContext) +/* 08890 8081C0B0 2652E660 */ addiu $s2, %lo(gSaveContext) /* 08894 8081C0B4 2B21FFE2 */ slti $at, $t9, 0xFFE2 /* 08898 8081C0B8 10200055 */ beq $at, $zero, .L8081C210 -/* 0889C 8081C0BC 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 +/* 0889C 8081C0BC 3C0A8012 */ lui $t2, %hi(gBitFlags) /* 088A0 8081C0C0 AFA5003C */ sw $a1, 0x003C($sp) /* 088A4 8081C0C4 A620025C */ sh $zero, 0x025C($s1) ## 0000025C /* 088A8 8081C0C8 A6200238 */ sh $zero, 0x0238($s1) ## 00000238 /* 088AC 8081C0CC A6230224 */ sh $v1, 0x0224($s1) ## 00000224 /* 088B0 8081C0D0 A620021A */ sh $zero, 0x021A($s1) ## 0000021A /* 088B4 8081C0D4 96581402 */ lhu $t8, 0x1402($s2) ## 8015FA62 -/* 088B8 8081C0D8 254A7120 */ addiu $t2, $t2, 0x7120 ## $t2 = 80127120 +/* 088B8 8081C0D8 254A7120 */ addiu $t2, %lo(gBitFlags) /* 088BC 8081C0DC 8D4E0000 */ lw $t6, 0x0000($t2) ## 80127120 /* 088C0 8081C0E0 02587821 */ addu $t7, $s2, $t8 /* 088C4 8081C0E4 91F900A8 */ lbu $t9, 0x00A8($t7) ## 000000A8 @@ -426,16 +426,16 @@ glabel func_8081BB10 /* 08920 8081C140 00000000 */ nop /* 08924 8081C144 86220236 */ lh $v0, 0x0236($s1) ## 00000236 /* 08928 8081C148 A6200224 */ sh $zero, 0x0224($s1) ## 00000224 -/* 0892C 8081C14C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0892C 8081C14C 3C0F8016 */ lui $t7, %hi(D_8015FFD0) /* 08930 8081C150 A622021A */ sh $v0, 0x021A($s1) ## 0000021A /* 08934 8081C154 A6220248 */ sh $v0, 0x0248($s1) ## 00000248 /* 08938 8081C158 96591402 */ lhu $t9, 0x1402($s2) ## 8015FA62 -/* 0893C 8081C15C 8DEFFFD0 */ lw $t7, -0x0030($t7) ## 8015FFD0 -/* 08940 8081C160 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 0893C 8081C15C 8DEFFFD0 */ lw $t7, %lo(D_8015FFD0)($t7) +/* 08940 8081C160 3C038016 */ lui $v1, %hi(gGameInfo) /* 08944 8081C164 0019C100 */ sll $t8, $t9, 4 /* 08948 8081C168 8DEE0000 */ lw $t6, 0x0000($t7) ## 80160000 /* 0894C 8081C16C 8639021A */ lh $t9, 0x021A($s1) ## 0000021A -/* 08950 8081C170 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 08950 8081C170 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) /* 08954 8081C174 01D87821 */ addu $t7, $t6, $t8 /* 08958 8081C178 00197040 */ sll $t6, $t9, 1 /* 0895C 8081C17C 01EEC021 */ addu $t8, $t7, $t6 @@ -466,12 +466,12 @@ glabel func_8081BB10 /* 089B0 8081C1D0 00094C03 */ sra $t1, $t1, 16 /* 089B4 8081C1D4 0C206785 */ jal func_80819E14 /* 089B8 8081C1D8 3125FFFF */ andi $a1, $t1, 0xFFFF ## $a1 = 00000048 -/* 089BC 8081C1DC 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 089C0 8081C1E0 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 089C4 8081C1E4 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 089C8 8081C1E8 270733E0 */ addiu $a3, $t8, 0x33E0 ## $a3 = 801333E0 -/* 089CC 8081C1EC 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 089D0 8081C1F0 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 089BC 8081C1DC 3C188013 */ lui $t8, %hi(D_801333E0) +/* 089C0 8081C1E0 3C198013 */ lui $t9, %hi(D_801333E8) +/* 089C4 8081C1E4 273933E8 */ addiu $t9, %lo(D_801333E8) +/* 089C8 8081C1E8 270733E0 */ addiu $a3, $t8, %lo(D_801333E0) +/* 089CC 8081C1EC 3C058013 */ lui $a1, %hi(D_801333D4) +/* 089D0 8081C1F0 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 089D4 8081C1F4 AFA70010 */ sw $a3, 0x0010($sp) /* 089D8 8081C1F8 AFB90014 */ sw $t9, 0x0014($sp) /* 089DC 8081C1FC 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 @@ -483,12 +483,12 @@ glabel func_8081BB10 .L8081C210: /* 089F0 8081C210 87AF01E2 */ lh $t7, 0x01E2($sp) /* 089F4 8081C214 11E5000B */ beq $t7, $a1, .L8081C244 -/* 089F8 8081C218 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 089FC 8081C21C 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 08A00 8081C220 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 08A04 8081C224 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 08A08 8081C228 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 08A0C 8081C22C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 089F8 8081C218 3C078013 */ lui $a3, %hi(D_801333E0) +/* 089FC 8081C21C 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 08A00 8081C220 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 08A04 8081C224 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 08A08 8081C228 3C058013 */ lui $a1, %hi(D_801333D4) +/* 08A0C 8081C22C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 08A10 8081C230 AFAE0014 */ sw $t6, 0x0014($sp) /* 08A14 8081C234 AFA70010 */ sw $a3, 0x0010($sp) /* 08A18 8081C238 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 @@ -503,11 +503,11 @@ glabel func_8081BB10 /* 08A30 8081C250 0301C821 */ addu $t9, $t8, $at /* 08A34 8081C254 AFB90048 */ sw $t9, 0x0048($sp) /* 08A38 8081C258 862F0238 */ lh $t7, 0x0238($s1) ## 00000238 -/* 08A3C 8081C25C 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 08A40 8081C260 3C128016 */ lui $s2, 0x8016 ## $s2 = 80160000 -/* 08A44 8081C264 2652E660 */ addiu $s2, $s2, 0xE660 ## $s2 = 8015E660 +/* 08A3C 8081C25C 3C0A8012 */ lui $t2, %hi(gBitFlags) +/* 08A40 8081C260 3C128016 */ lui $s2, %hi(gSaveContext) +/* 08A44 8081C264 2652E660 */ addiu $s2, %lo(gSaveContext) /* 08A48 8081C268 15E00042 */ bne $t7, $zero, .L8081C374 -/* 08A4C 8081C26C 254A7120 */ addiu $t2, $t2, 0x7120 ## $t2 = 80127120 +/* 08A4C 8081C26C 254A7120 */ addiu $t2, %lo(gBitFlags) /* 08A50 8081C270 8627021A */ lh $a3, 0x021A($s1) ## 0000021A /* 08A54 8081C274 241803E7 */ addiu $t8, $zero, 0x03E7 ## $t8 = 000003E7 /* 08A58 8081C278 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 @@ -530,8 +530,8 @@ glabel func_8081BB10 /* 08A94 8081C2B4 0C206785 */ jal func_80819E14 /* 08A98 8081C2B8 3125FFFF */ andi $a1, $t1, 0xFFFF ## $a1 = 00000048 /* 08A9C 8081C2BC 86390224 */ lh $t9, 0x0224($s1) ## 00000224 -/* 08AA0 8081C2C0 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 08AA4 8081C2C4 254A7120 */ addiu $t2, $t2, 0x7120 ## $t2 = 80127120 +/* 08AA0 8081C2C0 3C0A8012 */ lui $t2, %hi(gBitFlags) +/* 08AA4 8081C2C4 254A7120 */ addiu $t2, %lo(gBitFlags) /* 08AA8 8081C2C8 1720002A */ bne $t9, $zero, .L8081C374 /* 08AAC 8081C2CC 87A901E4 */ lh $t1, 0x01E4($sp) /* 08AB0 8081C2D0 8E2F014C */ lw $t7, 0x014C($s1) ## 0000014C @@ -844,12 +844,12 @@ glabel func_8081BB10 /* 08F68 8081C788 24E70001 */ addiu $a3, $a3, 0x0001 ## $a3 = 00000001 /* 08F6C 8081C78C 8E0602C0 */ lw $a2, 0x02C0($s0) ## 000002C0 /* 08F70 8081C790 3C19FD70 */ lui $t9, 0xFD70 ## $t9 = FD700000 -/* 08F74 8081C794 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 08F74 8081C794 3C0E8016 */ lui $t6, %hi(D_8015FFD0) /* 08F78 8081C798 24CF0008 */ addiu $t7, $a2, 0x0008 ## $t7 = 00000008 /* 08F7C 8081C79C AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 /* 08F80 8081C7A0 ACD90000 */ sw $t9, 0x0000($a2) ## 00000000 /* 08F84 8081C7A4 8FAF0048 */ lw $t7, 0x0048($sp) -/* 08F88 8081C7A8 8DCEFFD0 */ lw $t6, -0x0030($t6) ## 8015FFD0 +/* 08F88 8081C7A8 8DCEFFD0 */ lw $t6, %lo(D_8015FFD0)($t6) /* 08F8C 8081C7AC 00091040 */ sll $v0, $t1, 1 /* 08F90 8081C7B0 85F9025A */ lh $t9, 0x025A($t7) ## 00000262 /* 08F94 8081C7B4 8DD80068 */ lw $t8, 0x0068($t6) ## 80160068 @@ -952,12 +952,12 @@ glabel func_8081BB10 /* 09110 8081C930 ACD90004 */ sw $t9, 0x0004($a2) ## 00000004 /* 09114 8081C934 8E0602C0 */ lw $a2, 0x02C0($s0) ## 000002C0 /* 09118 8081C938 3C0FFD70 */ lui $t7, 0xFD70 ## $t7 = FD700000 -/* 0911C 8081C93C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0911C 8081C93C 3C0E8016 */ lui $t6, %hi(D_8015FFD0) /* 09120 8081C940 24D80008 */ addiu $t8, $a2, 0x0008 ## $t8 = 00000008 /* 09124 8081C944 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 09128 8081C948 ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 /* 0912C 8081C94C 8FB80048 */ lw $t8, 0x0048($sp) -/* 09130 8081C950 8DCEFFD0 */ lw $t6, -0x0030($t6) ## 8015FFD0 +/* 09130 8081C950 8DCEFFD0 */ lw $t6, %lo(D_8015FFD0)($t6) /* 09134 8081C954 00094C00 */ sll $t1, $t1, 16 /* 09138 8081C958 870F025A */ lh $t7, 0x025A($t8) ## 00000262 /* 0913C 8081C95C 8DD90068 */ lw $t9, 0x0068($t6) ## 80160068 @@ -1095,9 +1095,9 @@ glabel func_8081BB10 /* 0934C 8081CB6C 962F0208 */ lhu $t7, 0x0208($s1) ## 00000208 /* 09350 8081CB70 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000008 /* 09354 8081CB74 0301C825 */ or $t9, $t8, $at ## $t9 = FFFFFF08 -/* 09358 8081CB78 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 09358 8081CB78 3C0F8016 */ lui $t7, %hi(gGameInfo) /* 0935C 8081CB7C ACD90004 */ sw $t9, 0x0004($a2) ## 00000004 -/* 09360 8081CB80 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 09360 8081CB80 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 09364 8081CB84 862E020A */ lh $t6, 0x020A($s1) ## 0000020A /* 09368 8081CB88 85F80F50 */ lh $t8, 0x0F50($t7) ## 80160F50 /* 0936C 8081CB8C 8E2F014C */ lw $t7, 0x014C($s1) ## 0000014C @@ -1175,8 +1175,8 @@ glabel func_8081BB10 /* 0948C 8081CCAC 91F800A8 */ lbu $t8, 0x00A8($t7) ## 000000B0 /* 09490 8081CCB0 03387024 */ and $t6, $t9, $t8 /* 09494 8081CCB4 11C0004C */ beq $t6, $zero, .L8081CDE8 -/* 09498 8081CCB8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 0949C 8081CCBC 8DEFFFD0 */ lw $t7, -0x0030($t7) ## 8015FFD0 +/* 09498 8081CCB8 3C0F8016 */ lui $t7, %hi(D_8015FFD0) +/* 0949C 8081CCBC 8DEFFFD0 */ lw $t7, %lo(D_8015FFD0)($t7) /* 094A0 8081CCC0 0002C040 */ sll $t8, $v0, 1 /* 094A4 8081CCC4 2401FF9D */ addiu $at, $zero, 0xFF9D ## $at = FFFFFF9D /* 094A8 8081CCC8 8DF9006C */ lw $t9, 0x006C($t7) ## 8016006C @@ -1268,16 +1268,16 @@ glabel func_8081BB10 /* 095F8 8081CE18 0019C080 */ sll $t8, $t9, 2 /* 095FC 8081CE1C 30440003 */ andi $a0, $v0, 0x0003 ## $a0 = 00000001 /* 09600 8081CE20 00042080 */ sll $a0, $a0, 2 -/* 09604 8081CE24 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 +/* 09604 8081CE24 3C198012 */ lui $t9, %hi(D_8012723C) /* 09608 8081CE28 0324C821 */ addu $t9, $t9, $a0 /* 0960C 8081CE2C 02587021 */ addu $t6, $s2, $t8 /* 09610 8081CE30 8DCF0E9C */ lw $t7, 0x0E9C($t6) ## 00000EAA -/* 09614 8081CE34 8F39723C */ lw $t9, 0x723C($t9) ## 8012723C -/* 09618 8081CE38 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 +/* 09614 8081CE34 8F39723C */ lw $t9, %lo(D_8012723C)($t9) +/* 09618 8081CE38 3C0E8012 */ lui $t6, %hi(D_8012724C) /* 0961C 8081CE3C 01C47021 */ addu $t6, $t6, $a0 /* 09620 8081CE40 01F9C024 */ and $t8, $t7, $t9 /* 09624 8081CE44 3C198083 */ lui $t9, %hi(D_8082AC7C) ## $t9 = 80830000 -/* 09628 8081CE48 8DCE724C */ lw $t6, 0x724C($t6) ## 8012724C +/* 09628 8081CE48 8DCE724C */ lw $t6, %lo(D_8012724C)($t6) /* 0962C 8081CE4C 0322C821 */ addu $t9, $t9, $v0 /* 09630 8081CE50 9339AC7C */ lbu $t9, %lo(D_8082AC7C)($t9) /* 09634 8081CE54 01D87806 */ srlv $t7, $t8, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s index 75905a62b7..cba00d46c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s @@ -110,8 +110,8 @@ glabel func_8081D398 /* 09D08 8081D528 10000057 */ beq $zero, $zero, .L8081D688 /* 09D0C 8081D52C 86C20220 */ lh $v0, 0x0220($s6) ## 00000220 .L8081D530: -/* 09D10 8081D530 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 09D14 8081D534 8739FA80 */ lh $t9, -0x0580($t9) ## 8015FA80 +/* 09D10 8081D530 3C198016 */ lui $t9, %hi(gSaveContext+0x1420) +/* 09D14 8081D534 8739FA80 */ lh $t9, %lo(gSaveContext+0x1420)($t9) /* 09D18 8081D538 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 09D1C 8081D53C 272E0018 */ addiu $t6, $t9, 0x0018 ## $t6 = 80160018 /* 09D20 8081D540 14810029 */ bne $a0, $at, .L8081D5E8 @@ -143,12 +143,12 @@ glabel func_8081D398 /* 09D80 8081D5A0 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 0000001F /* 09D84 8081D5A4 0C206785 */ jal func_80819E14 /* 09D88 8081D5A8 8EC6014C */ lw $a2, 0x014C($s6) ## 0000014C -/* 09D8C 8081D5AC 3C118013 */ lui $s1, 0x8013 ## $s1 = 80130000 -/* 09D90 8081D5B0 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 09D94 8081D5B4 262733E0 */ addiu $a3, $s1, 0x33E0 ## $a3 = 801333E0 -/* 09D98 8081D5B8 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 09D9C 8081D5BC 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 09DA0 8081D5C0 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 09D8C 8081D5AC 3C118013 */ lui $s1, %hi(D_801333E0) +/* 09D90 8081D5B0 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 09D94 8081D5B4 262733E0 */ addiu $a3, $s1, %lo(D_801333E0) +/* 09D98 8081D5B8 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 09D9C 8081D5BC 3C058013 */ lui $a1, %hi(D_801333D4) +/* 09DA0 8081D5C0 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 09DA4 8081D5C4 AFAE0014 */ sw $t6, 0x0014($sp) /* 09DA8 8081D5C8 AFA70010 */ sw $a3, 0x0010($sp) /* 09DAC 8081D5CC 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 @@ -189,12 +189,12 @@ glabel func_8081D398 /* 09E24 8081D644 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 0000001F /* 09E28 8081D648 0C206785 */ jal func_80819E14 /* 09E2C 8081D64C 8EC6014C */ lw $a2, 0x014C($s6) ## 0000014C -/* 09E30 8081D650 3C118013 */ lui $s1, 0x8013 ## $s1 = 80130000 -/* 09E34 8081D654 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 09E38 8081D658 262733E0 */ addiu $a3, $s1, 0x33E0 ## $a3 = 801333E0 -/* 09E3C 8081D65C 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 09E40 8081D660 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 09E44 8081D664 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 09E30 8081D650 3C118013 */ lui $s1, %hi(D_801333E0) +/* 09E34 8081D654 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 09E38 8081D658 262733E0 */ addiu $a3, $s1, %lo(D_801333E0) +/* 09E3C 8081D65C 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 09E40 8081D660 3C058013 */ lui $a1, %hi(D_801333D4) +/* 09E44 8081D664 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 09E48 8081D668 AFAF0014 */ sw $t7, 0x0014($sp) /* 09E4C 8081D66C AFA70010 */ sw $a3, 0x0010($sp) /* 09E50 8081D670 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 @@ -205,21 +205,21 @@ glabel func_8081D398 /* 09E60 8081D680 A420A6D4 */ sh $zero, %lo(D_8082A6D4)($at) /* 09E64 8081D684 86C20220 */ lh $v0, 0x0220($s6) ## 00000220 .L8081D688: -/* 09E68 8081D688 3C118013 */ lui $s1, 0x8013 ## $s1 = 80130000 -/* 09E6C 8081D68C 263133E0 */ addiu $s1, $s1, 0x33E0 ## $s1 = 801333E0 +/* 09E68 8081D688 3C118013 */ lui $s1, %hi(D_801333E0) +/* 09E6C 8081D68C 263133E0 */ addiu $s1, %lo(D_801333E0) /* 09E70 8081D690 02C2C021 */ addu $t8, $s6, $v0 /* 09E74 8081D694 93190266 */ lbu $t9, 0x0266($t8) ## 00000266 /* 09E78 8081D698 240E03E7 */ addiu $t6, $zero, 0x03E7 ## $t6 = 000003E7 /* 09E7C 8081D69C 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 /* 09E80 8081D6A0 17200003 */ bne $t9, $zero, .L8081D6B0 -/* 09E84 8081D6A4 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 +/* 09E84 8081D6A4 3C058013 */ lui $a1, %hi(D_801333D4) /* 09E88 8081D6A8 A6CE0240 */ sh $t6, 0x0240($s6) ## 00000240 /* 09E8C 8081D6AC 86C20220 */ lh $v0, 0x0220($s6) ## 00000220 .L8081D6B0: /* 09E90 8081D6B0 12420008 */ beq $s2, $v0, .L8081D6D4 -/* 09E94 8081D6B4 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 -/* 09E98 8081D6B8 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 09E9C 8081D6BC 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 09E94 8081D6B4 24A533D4 */ addiu $a1, %lo(D_801333D4) +/* 09E98 8081D6B8 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 09E9C 8081D6BC 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 09EA0 8081D6C0 AFAF0014 */ sw $t7, 0x0014($sp) /* 09EA4 8081D6C4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 09EA8 8081D6C8 02203825 */ or $a3, $s1, $zero ## $a3 = 801333E0 @@ -230,10 +230,10 @@ glabel func_8081D398 /* 09EB4 8081D6D4 8E0602C0 */ lw $a2, 0x02C0($s0) ## 000002C0 .L8081D6D8: /* 09EB8 8081D6D8 3C19E700 */ lui $t9, 0xE700 ## $t9 = E7000000 -/* 09EBC 8081D6DC 3C148016 */ lui $s4, 0x8016 ## $s4 = 80160000 +/* 09EBC 8081D6DC 3C148016 */ lui $s4, %hi(gGameInfo) /* 09EC0 8081D6E0 24D80008 */ addiu $t8, $a2, 0x0008 ## $t8 = 00000008 /* 09EC4 8081D6E4 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 09EC8 8081D6E8 2694FA90 */ addiu $s4, $s4, 0xFA90 ## $s4 = 8015FA90 +/* 09EC8 8081D6E8 2694FA90 */ addiu $s4, %lo(gGameInfo) /* 09ECC 8081D6EC ACC00004 */ sw $zero, 0x0004($a2) ## 00000004 /* 09ED0 8081D6F0 ACD90000 */ sw $t9, 0x0000($a2) ## 00000000 /* 09ED4 8081D6F4 8E820000 */ lw $v0, 0x0000($s4) ## 8015FA90 @@ -688,8 +688,8 @@ glabel func_8081D398 /* 0A5C0 8081DDE0 332F00FF */ andi $t7, $t9, 0x00FF ## $t7 = 000000C3 /* 0A5C4 8081DDE4 01E17025 */ or $t6, $t7, $at ## $t6 = EBEBEBC3 /* 0A5C8 8081DDE8 3C128083 */ lui $s2, %hi(D_8082AB2C) ## $s2 = 80830000 -/* 0A5CC 8081DDEC 3C118012 */ lui $s1, 0x8012 ## $s1 = 80120000 -/* 0A5D0 8081DDF0 26317120 */ addiu $s1, $s1, 0x7120 ## $s1 = 80127120 +/* 0A5CC 8081DDEC 3C118012 */ lui $s1, %hi(gBitFlags) +/* 0A5D0 8081DDF0 26317120 */ addiu $s1, %lo(gBitFlags) /* 0A5D4 8081DDF4 2652AB2C */ addiu $s2, $s2, %lo(D_8082AB2C) ## $s2 = 8082AB2C /* 0A5D8 8081DDF8 2673AAEC */ addiu $s3, $s3, %lo(D_8082AAEC) ## $s3 = 8082AAEC /* 0A5DC 8081DDFC 00005825 */ or $t3, $zero, $zero ## $t3 = 00000000 @@ -721,8 +721,8 @@ glabel func_8081D398 /* 0A63C 8081DE5C 97190000 */ lhu $t9, 0x0000($t8) ## 00000008 /* 0A640 8081DE60 00197880 */ sll $t7, $t9, 2 /* 0A644 8081DE64 022F7021 */ addu $t6, $s1, $t7 -/* 0A648 8081DE68 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 0A64C 8081DE6C 8F39F598 */ lw $t9, -0x0A68($t9) ## 8015F598 +/* 0A648 8081DE68 3C198016 */ lui $t9, %hi(gSaveContext+0xf38) +/* 0A64C 8081DE6C 8F39F598 */ lw $t9, %lo(gSaveContext+0xf38)($t9) /* 0A650 8081DE70 8DD80000 */ lw $t8, 0x0000($t6) ## 8082A568 /* 0A654 8081DE74 000B7080 */ sll $t6, $t3, 2 /* 0A658 8081DE78 03197824 */ and $t7, $t8, $t9 @@ -885,8 +885,8 @@ glabel func_8081D398 /* 0A8AC 8081E0CC 5420FF51 */ bnel $at, $zero, .L8081DE14 /* 0A8B0 8081E0D0 8E0602C0 */ lw $a2, 0x02C0($s0) ## 000002C0 .L8081E0D4: -/* 0A8B4 8081E0D4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0A8B8 8081E0D8 85CEFA80 */ lh $t6, -0x0580($t6) ## 8015FA80 +/* 0A8B4 8081E0D4 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1420) +/* 0A8B8 8081E0D8 85CEFA80 */ lh $t6, %lo(gSaveContext+0x1420)($t6) /* 0A8BC 8081E0DC 3C17FD90 */ lui $s7, 0xFD90 ## $s7 = FD900000 /* 0A8C0 8081E0E0 3C1EF590 */ lui $s8, 0xF590 ## $s8 = F5900000 /* 0A8C4 8081E0E4 29C10016 */ slti $at, $t6, 0x0016 @@ -901,10 +901,10 @@ glabel func_8081D398 /* 0A8E8 8081E108 ACD80000 */ sw $t8, 0x0000($a2) ## 00000002 /* 0A8EC 8081E10C 8E0602C0 */ lw $a2, 0x02C0($s0) ## 000002C0 /* 0A8F0 8081E110 35CE1201 */ ori $t6, $t6, 0x1201 ## $t6 = E3001201 -/* 0A8F4 8081E114 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 0A8F4 8081E114 3C048016 */ lui $a0, %hi(gSaveContext) /* 0A8F8 8081E118 24CF0008 */ addiu $t7, $a2, 0x0008 ## $t7 = 0000000A /* 0A8FC 8081E11C AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 0A900 8081E120 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 0A900 8081E120 2484E660 */ addiu $a0, %lo(gSaveContext) /* 0A904 8081E124 ACC00004 */ sw $zero, 0x0004($a2) ## 00000006 /* 0A908 8081E128 ACCE0000 */ sw $t6, 0x0000($a2) ## 00000002 /* 0A90C 8081E12C 84851420 */ lh $a1, 0x1420($a0) ## 8015FA80 @@ -928,7 +928,7 @@ glabel func_8081D398 /* 0A954 8081E174 87380000 */ lh $t8, 0x0000($t9) ## 0000000A /* 0A958 8081E178 846F0AC0 */ lh $t7, 0x0AC0($v1) ## 00000AC2 /* 0A95C 8081E17C 3421FF00 */ ori $at, $at, 0xFF00 ## $at = 64FFFF00 -/* 0A960 8081E180 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 +/* 0A960 8081E180 3C078016 */ lui $a3, %hi(gSaveContext+0x1420) /* 0A964 8081E184 030F1021 */ addu $v0, $t8, $t7 /* 0A968 8081E188 00021400 */ sll $v0, $v0, 16 /* 0A96C 8081E18C 00021403 */ sra $v0, $v0, 16 @@ -985,7 +985,7 @@ glabel func_8081D398 /* 0AA38 8081E258 8ECF014C */ lw $t7, 0x014C($s6) ## 0000014C /* 0AA3C 8081E25C A5E20AEA */ sh $v0, 0x0AEA($t7) ## 00000AF4 /* 0AA40 8081E260 8E0602C0 */ lw $a2, 0x02C0($s0) ## 000002C0 -/* 0AA44 8081E264 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 0AA44 8081E264 3C028016 */ lui $v0, %hi(gSaveContext+0x1420) /* 0AA48 8081E268 24CE0008 */ addiu $t6, $a2, 0x0008 ## $t6 = 0000000A /* 0AA4C 8081E26C AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 0AA50 8081E270 ACD80000 */ sw $t8, 0x0000($a2) ## 00000002 @@ -1016,7 +1016,7 @@ glabel func_8081D398 /* 0AAB4 8081E2D4 24CE0008 */ addiu $t6, $a2, 0x0008 ## $t6 = 0000000A /* 0AAB8 8081E2D8 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 0AABC 8081E2DC ACD80000 */ sw $t8, 0x0000($a2) ## 00000002 -/* 0AAC0 8081E2E0 8442FA80 */ lh $v0, -0x0580($v0) ## 8015FA80 +/* 0AAC0 8081E2E0 8442FA80 */ lh $v0, %lo(gSaveContext+0x1420)($v0) /* 0AAC4 8081E2E4 3C18F570 */ lui $t8, 0xF570 ## $t8 = F5700000 /* 0AAC8 8081E2E8 0002C880 */ sll $t9, $v0, 2 /* 0AACC 8081E2EC 01F97821 */ addu $t7, $t7, $t9 @@ -1039,7 +1039,7 @@ glabel func_8081D398 /* 0AB10 8081E330 252E0008 */ addiu $t6, $t1, 0x0008 ## $t6 = 00000008 /* 0AB14 8081E334 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 0AB18 8081E338 AD380000 */ sw $t8, 0x0000($t1) ## 00000000 -/* 0AB1C 8081E33C 84E7FA80 */ lh $a3, -0x0580($a3) ## 8015FA80 +/* 0AB1C 8081E33C 84E7FA80 */ lh $a3, %lo(gSaveContext+0x1420)($a3) /* 0AB20 8081E340 00071040 */ sll $v0, $a3, 1 /* 0AB24 8081E344 0142C821 */ addu $t9, $t2, $v0 /* 0AB28 8081E348 01027021 */ addu $t6, $t0, $v0 @@ -1128,13 +1128,13 @@ glabel func_8081D398 /* 0AC48 8081E468 AD2F0004 */ sw $t7, 0x0004($t1) ## 00000004 /* 0AC4C 8081E46C 8E0602C0 */ lw $a2, 0x02C0($s0) ## 000002C0 /* 0AC50 8081E470 3C05E700 */ lui $a1, 0xE700 ## $a1 = E7000000 -/* 0AC54 8081E474 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 0AC54 8081E474 3C048016 */ lui $a0, %hi(gSaveContext) /* 0AC58 8081E478 24D90008 */ addiu $t9, $a2, 0x0008 ## $t9 = 0000000C /* 0AC5C 8081E47C AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 0AC60 8081E480 ACC00004 */ sw $zero, 0x0004($a2) ## 00000008 /* 0AC64 8081E484 ACC50000 */ sw $a1, 0x0000($a2) ## 00000004 /* 0AC68 8081E488 8E0602C0 */ lw $a2, 0x02C0($s0) ## 000002C0 -/* 0AC6C 8081E48C 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 0AC6C 8081E48C 2484E660 */ addiu $a0, %lo(gSaveContext) /* 0AC70 8081E490 3C01F560 */ lui $at, 0xF560 ## $at = F5600000 /* 0AC74 8081E494 24D80008 */ addiu $t8, $a2, 0x0008 ## $t8 = 0000000C /* 0AC78 8081E498 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 @@ -1668,12 +1668,12 @@ glabel func_8081D398 /* 0B400 8081EC20 ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 /* 0B404 8081EC24 8ED8014C */ lw $t8, 0x014C($s6) ## 0000014C /* 0B408 8081EC28 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 0B40C 8081EC2C 3C118016 */ lui $s1, 0x8016 ## $s1 = 80160000 +/* 0B40C 8081EC2C 3C118016 */ lui $s1, %hi(gSaveContext) /* 0B410 8081EC30 27190B00 */ addiu $t9, $t8, 0x0B00 ## $t9 = 00000B00 /* 0B414 8081EC34 ACD90004 */ sw $t9, 0x0004($a2) ## 00000004 /* 0B418 8081EC38 92CE027A */ lbu $t6, 0x027A($s6) ## 0000027A /* 0B41C 8081EC3C 3C03E700 */ lui $v1, 0xE700 ## $v1 = E7000000 -/* 0B420 8081EC40 2631E660 */ addiu $s1, $s1, 0xE660 ## $s1 = 8015E660 +/* 0B420 8081EC40 2631E660 */ addiu $s1, %lo(gSaveContext) /* 0B424 8081EC44 51C10056 */ beql $t6, $at, .L8081EDA0 /* 0B428 8081EC48 862F1420 */ lh $t7, 0x1420($s1) ## 8015FA80 /* 0B42C 8081EC4C 8E0602C0 */ lw $a2, 0x02C0($s0) ## 000002C0 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081EFF0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081EFF0.s index 19f2b9261d..8f4a2890bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081EFF0.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081EFF0.s @@ -31,12 +31,12 @@ glabel func_8081EFF0 /* 0B83C 8081F05C 00000000 */ nop /* 0B840 8081F060 28A1001E */ slti $at, $a1, 0x001E /* 0B844 8081F064 14200010 */ bne $at, $zero, .L8081F0A8 -/* 0B848 8081F068 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0B84C 8081F06C 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 0B850 8081F070 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0B854 8081F074 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 0B858 8081F078 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0B85C 8081F07C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0B848 8081F068 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0B84C 8081F06C 3C188013 */ lui $t8, %hi(D_801333E8) +/* 0B850 8081F070 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0B854 8081F074 271833E8 */ addiu $t8, %lo(D_801333E8) +/* 0B858 8081F078 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0B85C 8081F07C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 0B860 8081F080 AFB80014 */ sw $t8, 0x0014($sp) /* 0B864 8081F084 AFA70010 */ sw $a3, 0x0010($sp) /* 0B868 8081F088 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 @@ -53,12 +53,12 @@ glabel func_8081EFF0 /* 0B88C 8081F0AC 00000000 */ nop /* 0B890 8081F0B0 28A1FFE3 */ slti $at, $a1, 0xFFE3 /* 0B894 8081F0B4 1020000E */ beq $at, $zero, .L8081F0F0 -/* 0B898 8081F0B8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0B89C 8081F0BC 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 0B8A0 8081F0C0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0B8A4 8081F0C4 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 -/* 0B8A8 8081F0C8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0B8AC 8081F0CC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0B898 8081F0B8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0B89C 8081F0BC 3C098013 */ lui $t1, %hi(D_801333E8) +/* 0B8A0 8081F0C0 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0B8A4 8081F0C4 252933E8 */ addiu $t1, %lo(D_801333E8) +/* 0B8A8 8081F0C8 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0B8AC 8081F0CC 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 0B8B0 8081F0D0 AFA90014 */ sw $t1, 0x0014($sp) /* 0B8B4 8081F0D4 AFA70010 */ sw $a3, 0x0010($sp) /* 0B8B8 8081F0D8 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 @@ -69,8 +69,8 @@ glabel func_8081EFF0 /* 0B8C8 8081F0E8 8FA20024 */ lw $v0, 0x0024($sp) /* 0B8CC 8081F0EC A4400262 */ sh $zero, 0x0262($v0) ## 00000262 .L8081F0F0: -/* 0B8D0 8081F0F0 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 0B8D4 8081F0F4 24E7FA90 */ addiu $a3, $a3, 0xFA90 ## $a3 = 8015FA90 +/* 0B8D0 8081F0F0 3C078016 */ lui $a3, %hi(gGameInfo) +/* 0B8D4 8081F0F4 24E7FA90 */ addiu $a3, %lo(gGameInfo) /* 0B8D8 8081F0F8 8CE20000 */ lw $v0, 0x0000($a3) ## 8015FA90 /* 0B8DC 8081F0FC 3C088083 */ lui $t0, %hi(D_8082A6E0) ## $t0 = 80830000 /* 0B8E0 8081F100 2508A6E0 */ addiu $t0, $t0, %lo(D_8082A6E0) ## $t0 = 8082A6E0 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s index 2dc6a869b3..c81eaca99b 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s @@ -48,10 +48,10 @@ glabel func_8081F1F0 /* 0BA88 8081F2A8 0C031B0A */ jal Graph_BranchDlist /* 0BA8C 8081F2AC 8FA40050 */ lw $a0, 0x0050($sp) /* 0BA90 8081F2B0 8FAC0054 */ lw $t4, 0x0054($sp) -/* 0BA94 8081F2B4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 0BA94 8081F2B4 3C038016 */ lui $v1, %hi(gGameInfo) /* 0BA98 8081F2B8 3C068083 */ lui $a2, %hi(D_8082FA7C) ## $a2 = 80830000 /* 0BA9C 8081F2BC AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 0BAA0 8081F2C0 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 0BAA0 8081F2C0 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) /* 0BAA4 8081F2C4 24C6FA7C */ addiu $a2, $a2, %lo(D_8082FA7C) ## $a2 = 8082FA7C /* 0BAA8 8081F2C8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE0 /* 0BAAC 8081F2CC 846D0116 */ lh $t5, 0x0116($v1) ## 80160116 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F81C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F81C.s index 6fde5a4fb4..63aa67187d 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F81C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F81C.s @@ -6,16 +6,16 @@ glabel func_8081F81C /* 0C00C 8081F82C AFBF001C */ sw $ra, 0x001C($sp) /* 0C010 8081F830 AFA40020 */ sw $a0, 0x0020($sp) /* 0C014 8081F834 00811021 */ addu $v0, $a0, $at -/* 0C018 8081F838 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0C01C 8081F83C 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 0C020 8081F840 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 0C018 8081F838 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0C01C 8081F83C 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 0C020 8081F840 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 0C024 8081F844 A440099A */ sh $zero, 0x099A($v0) ## 0000099A -/* 0C028 8081F848 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 0C02C 8081F84C 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 +/* 0C028 8081F848 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 0C02C 8081F84C 3C058013 */ lui $a1, %hi(D_801333D4) /* 0C030 8081F850 A44E0998 */ sh $t6, 0x0998($v0) ## 00000998 /* 0C034 8081F854 AFAF0014 */ sw $t7, 0x0014($sp) /* 0C038 8081F858 AFA70010 */ sw $a3, 0x0010($sp) -/* 0C03C 8081F85C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0C03C 8081F85C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 0C040 8081F860 24044808 */ addiu $a0, $zero, 0x4808 ## $a0 = 00004808 /* 0C044 8081F864 0C03DCE3 */ jal Audio_PlaySoundGeneral diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FABC.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FABC.s index 41223c3fc6..dd8f917a0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FABC.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FABC.s @@ -19,8 +19,8 @@ glabel func_8081FABC /* 0C2DC 8081FAFC 00811021 */ addu $v0, $a0, $at .L8081FB00: /* 0C2E0 8081FB00 84430246 */ lh $v1, 0x0246($v0) ## 00010246 -/* 0C2E4 8081FB04 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 0C2E8 8081FB08 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 0C2E4 8081FB04 3C078016 */ lui $a3, %hi(gSaveContext) +/* 0C2E8 8081FB08 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 0C2EC 8081FB0C 00E37021 */ addu $t6, $a3, $v1 /* 0C2F0 8081FB10 91CF0074 */ lbu $t7, 0x0074($t6) ## 00000074 /* 0C2F4 8081FB14 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FB7C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FB7C.s index 9836e9d01c..1af57d504b 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FB7C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FB7C.s @@ -7,20 +7,20 @@ glabel func_8081FB7C /* 0C370 8081FB90 A48E01E4 */ sh $t6, 0x01E4($a0) ## 000001E4 /* 0C374 8081FB94 A48001EA */ sh $zero, 0x01EA($a0) ## 000001EA /* 0C378 8081FB98 93AF002F */ lbu $t7, 0x002F($sp) -/* 0C37C 8081FB9C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 0C37C 8081FB9C 3C078013 */ lui $a3, %hi(D_801333E0) /* 0C380 8081FBA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0C384 8081FBA4 15E00013 */ bne $t7, $zero, .L8081FBF4 -/* 0C388 8081FBA8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 0C388 8081FBA8 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 0C38C 8081FBAC 949801E8 */ lhu $t8, 0x01E8($a0) ## 000001E8 -/* 0C390 8081FBB0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0C394 8081FBB4 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 +/* 0C390 8081FBB0 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0C394 8081FBB4 3C098013 */ lui $t1, %hi(D_801333E8) /* 0C398 8081FBB8 0018C840 */ sll $t9, $t8, 1 /* 0C39C 8081FBBC 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 /* 0C3A0 8081FBC0 A48801E6 */ sh $t0, 0x01E6($a0) ## 000001E6 -/* 0C3A4 8081FBC4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0C3A8 8081FBC8 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 -/* 0C3AC 8081FBCC 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0C3B0 8081FBD0 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0C3A4 8081FBC4 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0C3A8 8081FBC8 252933E8 */ addiu $t1, %lo(D_801333E8) +/* 0C3AC 8081FBCC 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0C3B0 8081FBD0 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 0C3B4 8081FBD4 AFA90014 */ sw $t1, 0x0014($sp) /* 0C3B8 8081FBD8 AFA70010 */ sw $a3, 0x0010($sp) /* 0C3BC 8081FBDC 24044825 */ addiu $a0, $zero, 0x4825 ## $a0 = 00004825 @@ -32,12 +32,12 @@ glabel func_8081FB7C /* 0C3D0 8081FBF0 A60A0238 */ sh $t2, 0x0238($s0) ## 00000238 .L8081FBF4: /* 0C3D4 8081FBF4 960B01E8 */ lhu $t3, 0x01E8($s0) ## 000001E8 -/* 0C3D8 8081FBF8 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 -/* 0C3DC 8081FBFC 25AD33E8 */ addiu $t5, $t5, 0x33E8 ## $t5 = 801333E8 +/* 0C3D8 8081FBF8 3C0D8013 */ lui $t5, %hi(D_801333E8) +/* 0C3DC 8081FBFC 25AD33E8 */ addiu $t5, %lo(D_801333E8) /* 0C3E0 8081FC00 000B6040 */ sll $t4, $t3, 1 /* 0C3E4 8081FC04 A60C01E6 */ sh $t4, 0x01E6($s0) ## 000001E6 -/* 0C3E8 8081FC08 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0C3EC 8081FC0C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0C3E8 8081FC08 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0C3EC 8081FC0C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 0C3F0 8081FC10 AFAD0014 */ sw $t5, 0x0014($sp) /* 0C3F4 8081FC14 AFA70010 */ sw $a3, 0x0010($sp) /* 0C3F8 8081FC18 24044826 */ addiu $a0, $zero, 0x4826 ## $a0 = 00004826 @@ -58,8 +58,8 @@ glabel func_8081FB7C /* 0C42C 8081FC4C 00431021 */ addu $v0, $v0, $v1 /* 0C430 8081FC50 03224021 */ addu $t0, $t9, $v0 /* 0C434 8081FC54 91090001 */ lbu $t1, 0x0001($t0) ## 00000001 -/* 0C438 8081FC58 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 0C43C 8081FC5C 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 0C438 8081FC58 3C078016 */ lui $a3, %hi(gSaveContext) +/* 0C43C 8081FC5C 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 0C440 8081FC60 A0E913E3 */ sb $t1, 0x13E3($a3) ## 8015FA43 /* 0C444 8081FC64 960A01E8 */ lhu $t2, 0x01E8($s0) ## 000001E8 /* 0C448 8081FC68 3C048083 */ lui $a0, %hi(D_8082FAD0) ## $a0 = 80830000 @@ -88,8 +88,8 @@ glabel func_8081FB7C /* 0C4A4 8081FCC4 0C00084C */ jal osSyncPrintf /* 0C4A8 8081FCC8 01E32821 */ addu $a1, $t7, $v1 -/* 0C4AC 8081FCCC 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 0C4B0 8081FCD0 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 0C4AC 8081FCCC 3C078016 */ lui $a3, %hi(gSaveContext) +/* 0C4B0 8081FCD0 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 0C4B4 8081FCD4 A4E013EA */ sh $zero, 0x13EA($a3) ## 8015FA4A /* 0C4B8 8081FCD8 0C020978 */ jal Interface_ChangeAlpha /* 0C4BC 8081FCDC 24040032 */ addiu $a0, $zero, 0x0032 ## $a0 = 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s index 53aae0da8d..a60c661afa 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s @@ -183,14 +183,14 @@ glabel func_80820434 /* 0CE94 808206B4 A42AAD3C */ sh $t2, %lo(D_8082AD3C)($at) /* 0CE98 808206B8 86390260 */ lh $t9, 0x0260($s1) ## 00000260 /* 0CE9C 808206BC 3C018083 */ lui $at, %hi(D_8082AB8C) ## $at = 80830000 -/* 0CEA0 808206C0 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 0CEA0 808206C0 3C048016 */ lui $a0, %hi(gGameInfo) /* 0CEA4 808206C4 00197080 */ sll $t6, $t9, 2 /* 0CEA8 808206C8 01D97023 */ subu $t6, $t6, $t9 /* 0CEAC 808206CC 000E7040 */ sll $t6, $t6, 1 /* 0CEB0 808206D0 018E7821 */ addu $t7, $t4, $t6 /* 0CEB4 808206D4 01E8C021 */ addu $t8, $t7, $t0 /* 0CEB8 808206D8 87190000 */ lh $t9, 0x0000($t8) ## 00000000 -/* 0CEBC 808206DC 2484FA90 */ addiu $a0, $a0, 0xFA90 ## $a0 = 8015FA90 +/* 0CEBC 808206DC 2484FA90 */ addiu $a0, %lo(gGameInfo) /* 0CEC0 808206E0 A439AB8C */ sh $t9, %lo(D_8082AB8C)($at) /* 0CEC4 808206E4 862E0260 */ lh $t6, 0x0260($s1) ## 00000260 /* 0CEC8 808206E8 3C018083 */ lui $at, %hi(D_8082AB90) ## $at = 80830000 @@ -227,8 +227,8 @@ glabel func_80820434 /* 0CF44 80820764 A420AD40 */ sh $zero, %lo(D_8082AD40)($at) .L80820768: /* 0CF48 80820768 86220214 */ lh $v0, 0x0214($s1) ## 00000214 -/* 0CF4C 8082076C 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 0CF50 80820770 2484FA90 */ addiu $a0, $a0, 0xFA90 ## $a0 = 8015FA90 +/* 0CF4C 8082076C 3C048016 */ lui $a0, %hi(gGameInfo) +/* 0CF50 80820770 2484FA90 */ addiu $a0, %lo(gGameInfo) /* 0CF54 80820774 2841FFE2 */ slti $at, $v0, 0xFFE2 /* 0CF58 80820778 1020001D */ beq $at, $zero, .L808207F0 /* 0CF5C 8082077C 3C0F8083 */ lui $t7, %hi(D_8082AD4C) ## $t7 = 80830000 @@ -391,8 +391,8 @@ glabel func_80820434 /* 0D198 808209B8 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 0D19C 808209BC AC4F0004 */ sw $t7, 0x0004($v0) ## 80830003 /* 0D1A0 808209C0 AC4E0000 */ sw $t6, 0x0000($v0) ## 8082FFFF -/* 0D1A4 808209C4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0D1A8 808209C8 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0D1A4 808209C4 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0D1A8 808209C8 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0D1AC 808209CC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0D1B0 808209D0 44810000 */ mtc1 $at, $f0 ## $f0 = 100.00 /* 0D1B4 808209D4 84590D9A */ lh $t9, 0x0D9A($v0) ## 80160D9A @@ -435,10 +435,10 @@ glabel func_80820434 /* 0D248 80820A68 0C0346A2 */ jal Matrix_NewMtx /* 0D24C 80820A6C AFA200EC */ sw $v0, 0x00EC($sp) /* 0D250 80820A70 8FA300EC */ lw $v1, 0x00EC($sp) -/* 0D254 80820A74 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0D254 80820A74 3C188016 */ lui $t8, %hi(gSaveContext+0x1409) /* 0D258 80820A78 3C068083 */ lui $a2, %hi(D_8082AABC) ## $a2 = 80830000 /* 0D25C 80820A7C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0D260 80820A80 9318FA69 */ lbu $t8, -0x0597($t8) ## 8015FA69 +/* 0D260 80820A80 9318FA69 */ lbu $t8, %lo(gSaveContext+0x1409)($t8) /* 0D264 80820A84 8E250144 */ lw $a1, 0x0144($s1) ## 00000144 /* 0D268 80820A88 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 0D26C 80820A8C 0018C880 */ sll $t9, $t8, 2 @@ -468,8 +468,8 @@ glabel func_80820434 /* 0D2C8 80820AE8 37391824 */ ori $t9, $t9, 0x1824 ## $t9 = FC121824 /* 0D2CC 80820AEC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 0D2D0 80820AF0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 0D2D4 80820AF4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0D2D8 80820AF8 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0D2D4 80820AF4 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0D2D8 80820AF8 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0D2DC 80820AFC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0D2E0 80820B00 44810000 */ mtc1 $at, $f0 ## $f0 = 100.00 /* 0D2E4 80820B04 844F0D9A */ lh $t7, 0x0D9A($v0) ## 80160D9A @@ -513,10 +513,10 @@ glabel func_80820434 /* 0D37C 80820B9C 0C0346A2 */ jal Matrix_NewMtx /* 0D380 80820BA0 AFA200E0 */ sw $v0, 0x00E0($sp) /* 0D384 80820BA4 8FA300E0 */ lw $v1, 0x00E0($sp) -/* 0D388 80820BA8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0D388 80820BA8 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1409) /* 0D38C 80820BAC 3C068083 */ lui $a2, %hi(D_8082AAB0) ## $a2 = 80830000 /* 0D390 80820BB0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0D394 80820BB4 91EFFA69 */ lbu $t7, -0x0597($t7) ## 8015FA69 +/* 0D394 80820BB4 91EFFA69 */ lbu $t7, %lo(gSaveContext+0x1409)($t7) /* 0D398 80820BB8 8E250148 */ lw $a1, 0x0148($s1) ## 00000148 /* 0D39C 80820BBC 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 0D3A0 80820BC0 000FC080 */ sll $t8, $t7, 2 @@ -554,8 +554,8 @@ glabel func_80820434 /* 0D41C 80820C3C 3718FFFF */ ori $t8, $t8, 0xFFFF ## $t8 = FF33FFFF /* 0D420 80820C40 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 0D424 80820C44 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0D428 80820C48 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0D42C 80820C4C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0D428 80820C48 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0D42C 80820C4C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0D430 80820C50 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0D434 80820C54 44810000 */ mtc1 $at, $f0 ## $f0 = 100.00 /* 0D438 80820C58 844E0D9A */ lh $t6, 0x0D9A($v0) ## 80160D9A @@ -600,10 +600,10 @@ glabel func_80820434 /* 0D4D4 80820CF4 0C0346A2 */ jal Matrix_NewMtx /* 0D4D8 80820CF8 AFA200D0 */ sw $v0, 0x00D0($sp) /* 0D4DC 80820CFC 8FA300D0 */ lw $v1, 0x00D0($sp) -/* 0D4E0 80820D00 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 0D4E0 80820D00 3C198016 */ lui $t9, %hi(gSaveContext+0x1409) /* 0D4E4 80820D04 3C068083 */ lui $a2, %hi(D_8082AAD4) ## $a2 = 80830000 /* 0D4E8 80820D08 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0D4EC 80820D0C 9339FA69 */ lbu $t9, -0x0597($t9) ## 8015FA69 +/* 0D4EC 80820D0C 9339FA69 */ lbu $t9, %lo(gSaveContext+0x1409)($t9) /* 0D4F0 80820D10 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 /* 0D4F4 80820D14 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 0D4F8 80820D18 00197080 */ sll $t6, $t9, 2 @@ -633,8 +633,8 @@ glabel func_80820434 /* 0D554 80820D74 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 0D558 80820D78 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 0D55C 80820D7C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 0D560 80820D80 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0D564 80820D84 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0D560 80820D80 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0D564 80820D84 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0D568 80820D88 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0D56C 80820D8C 44810000 */ mtc1 $at, $f0 ## $f0 = 100.00 /* 0D570 80820D90 84580D9A */ lh $t8, 0x0D9A($v0) ## 80160D9A @@ -678,10 +678,10 @@ glabel func_80820434 /* 0D608 80820E28 0C0346A2 */ jal Matrix_NewMtx /* 0D60C 80820E2C AFA200C4 */ sw $v0, 0x00C4($sp) /* 0D610 80820E30 8FA300C4 */ lw $v1, 0x00C4($sp) -/* 0D614 80820E34 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0D614 80820E34 3C188016 */ lui $t8, %hi(gSaveContext+0x1409) /* 0D618 80820E38 3C068083 */ lui $a2, %hi(D_8082AAC8) ## $a2 = 80830000 /* 0D61C 80820E3C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0D620 80820E40 9318FA69 */ lbu $t8, -0x0597($t8) ## 8015FA69 +/* 0D620 80820E40 9318FA69 */ lbu $t8, %lo(gSaveContext+0x1409)($t8) /* 0D624 80820E44 8E25014C */ lw $a1, 0x014C($s1) ## 0000014C /* 0D628 80820E48 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 0D62C 80820E4C 0018C880 */ sll $t9, $t8, 2 @@ -706,15 +706,15 @@ glabel func_80820434 /* 0D678 80820E98 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 /* 0D67C 80820E9C 3739FFFF */ ori $t9, $t9, 0xFFFF ## $t9 = FF2FFFFF /* 0D680 80820EA0 37189623 */ ori $t8, $t8, 0x9623 ## $t8 = FC119623 -/* 0D684 80820EA4 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0D684 80820EA4 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1402) /* 0D688 80820EA8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 0D68C 80820EAC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 0D690 80820EB0 95EFFA62 */ lhu $t7, -0x059E($t7) ## 8015FA62 -/* 0D694 80820EB4 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 0D698 80820EB8 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 +/* 0D690 80820EB0 95EFFA62 */ lhu $t7, %lo(gSaveContext+0x1402)($t7) +/* 0D694 80820EB4 3C188016 */ lui $t8, %hi(gSaveContext+0xa8) +/* 0D698 80820EB8 3C0E8012 */ lui $t6, %hi(gBitFlags+4) /* 0D69C 80820EBC 030FC021 */ addu $t8, $t8, $t7 -/* 0D6A0 80820EC0 9318E708 */ lbu $t8, -0x18F8($t8) ## 8015E708 -/* 0D6A4 80820EC4 8DCE7124 */ lw $t6, 0x7124($t6) ## 80127124 +/* 0D6A0 80820EC0 9318E708 */ lbu $t8, %lo(gSaveContext+0xa8)($t8) +/* 0D6A4 80820EC4 8DCE7124 */ lw $t6, %lo(gBitFlags+4)($t6) /* 0D6A8 80820EC8 01D8C824 */ and $t9, $t6, $t8 /* 0D6AC 80820ECC 53200008 */ beql $t9, $zero, .L80820EF0 /* 0D6B0 80820ED0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -756,8 +756,8 @@ glabel func_80820434 /* 0D734 80820F54 10000132 */ beq $zero, $zero, .L80821420 /* 0D738 80820F58 00000000 */ nop .L80820F5C: -/* 0D73C 80820F5C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0D740 80820F60 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0D73C 80820F5C 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0D740 80820F60 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0D744 80820F64 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0D748 80820F68 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 /* 0D74C 80820F6C 84580D9A */ lh $t8, 0x0D9A($v0) ## 80160D9A @@ -803,10 +803,10 @@ glabel func_80820434 /* 0D7EC 8082100C 0C0346A2 */ jal Matrix_NewMtx /* 0D7F0 80821010 AFA200B4 */ sw $v0, 0x00B4($sp) /* 0D7F4 80821014 8FA300B4 */ lw $v1, 0x00B4($sp) -/* 0D7F8 80821018 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0D7F8 80821018 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1409) /* 0D7FC 8082101C 3C068083 */ lui $a2, %hi(D_8082AABC) ## $a2 = 80830000 /* 0D800 80821020 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0D804 80821024 91CEFA69 */ lbu $t6, -0x0597($t6) ## 8015FA69 +/* 0D804 80821024 91CEFA69 */ lbu $t6, %lo(gSaveContext+0x1409)($t6) /* 0D808 80821028 8E250144 */ lw $a1, 0x0144($s1) ## 00000144 /* 0D80C 8082102C 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 0D810 80821030 000EC080 */ sll $t8, $t6, 2 @@ -819,8 +819,8 @@ glabel func_80820434 /* 0D82C 8082104C 100000F4 */ beq $zero, $zero, .L80821420 /* 0D830 80821050 00000000 */ nop .L80821054: -/* 0D834 80821054 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0D838 80821058 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0D834 80821054 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0D838 80821058 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0D83C 8082105C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0D840 80821060 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 /* 0D844 80821064 84590D9A */ lh $t9, 0x0D9A($v0) ## 80160D9A @@ -867,10 +867,10 @@ glabel func_80820434 /* 0D8E8 80821108 0C0346A2 */ jal Matrix_NewMtx /* 0D8EC 8082110C AFA200B0 */ sw $v0, 0x00B0($sp) /* 0D8F0 80821110 8FA300B0 */ lw $v1, 0x00B0($sp) -/* 0D8F4 80821114 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 0D8F4 80821114 3C198016 */ lui $t9, %hi(gSaveContext+0x1409) /* 0D8F8 80821118 3C068083 */ lui $a2, %hi(D_8082AAC8) ## $a2 = 80830000 /* 0D8FC 8082111C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0D900 80821120 9339FA69 */ lbu $t9, -0x0597($t9) ## 8015FA69 +/* 0D900 80821120 9339FA69 */ lbu $t9, %lo(gSaveContext+0x1409)($t9) /* 0D904 80821124 8E25014C */ lw $a1, 0x014C($s1) ## 0000014C /* 0D908 80821128 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 0D90C 8082112C 00197880 */ sll $t7, $t9, 2 @@ -904,13 +904,13 @@ glabel func_80820434 /* 0D97C 8082119C 0C207F8C */ jal func_8081FE30 /* 0D980 808211A0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 .L808211A4: -/* 0D984 808211A4 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 0D988 808211A8 9739FA62 */ lhu $t9, -0x059E($t9) ## 8015FA62 -/* 0D98C 808211AC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 0D990 808211B0 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 +/* 0D984 808211A4 3C198016 */ lui $t9, %hi(gSaveContext+0x1402) +/* 0D988 808211A8 9739FA62 */ lhu $t9, %lo(gSaveContext+0x1402)($t9) +/* 0D98C 808211AC 3C0F8016 */ lui $t7, %hi(gSaveContext+0xa8) +/* 0D990 808211B0 3C188012 */ lui $t8, %hi(gBitFlags+4) /* 0D994 808211B4 01F97821 */ addu $t7, $t7, $t9 -/* 0D998 808211B8 91EFE708 */ lbu $t7, -0x18F8($t7) ## 8015E708 -/* 0D99C 808211BC 8F187124 */ lw $t8, 0x7124($t8) ## 80127124 +/* 0D998 808211B8 91EFE708 */ lbu $t7, %lo(gSaveContext+0xa8)($t7) +/* 0D99C 808211BC 8F187124 */ lw $t8, %lo(gBitFlags+4)($t8) /* 0D9A0 808211C0 030F7024 */ and $t6, $t8, $t7 /* 0D9A4 808211C4 11C00096 */ beq $t6, $zero, .L80821420 /* 0D9A8 808211C8 00000000 */ nop @@ -931,8 +931,8 @@ glabel func_80820434 /* 0D9DC 808211FC AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 0D9E0 80821200 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 0D9E4 80821204 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0D9E8 80821208 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0D9EC 8082120C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0D9E8 80821208 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0D9EC 8082120C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0D9F0 80821210 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0D9F4 80821214 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 /* 0D9F8 80821218 84590D9A */ lh $t9, 0x0D9A($v0) ## 80160D9A @@ -978,10 +978,10 @@ glabel func_80820434 /* 0DA98 808212B8 0C0346A2 */ jal Matrix_NewMtx /* 0DA9C 808212BC AFA200A4 */ sw $v0, 0x00A4($sp) /* 0DAA0 808212C0 8FA300A4 */ lw $v1, 0x00A4($sp) -/* 0DAA4 808212C4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0DAA4 808212C4 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1409) /* 0DAA8 808212C8 3C068083 */ lui $a2, %hi(D_8082AAD4) ## $a2 = 80830000 /* 0DAAC 808212CC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0DAB0 808212D0 91CEFA69 */ lbu $t6, -0x0597($t6) ## 8015FA69 +/* 0DAB0 808212D0 91CEFA69 */ lbu $t6, %lo(gSaveContext+0x1409)($t6) /* 0DAB4 808212D4 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 /* 0DAB8 808212D8 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 0DABC 808212DC 000EC880 */ sll $t9, $t6, 2 @@ -1001,8 +1001,8 @@ glabel func_80820434 /* 0DAF4 80821314 10000042 */ beq $zero, $zero, .L80821420 /* 0DAF8 80821318 00000000 */ nop .L8082131C: -/* 0DAFC 8082131C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0DB00 80821320 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0DAFC 8082131C 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0DB00 80821320 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0DB04 80821324 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0DB08 80821328 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 /* 0DB0C 8082132C 844F0D9A */ lh $t7, 0x0D9A($v0) ## 80160D9A @@ -1047,10 +1047,10 @@ glabel func_80820434 /* 0DBA8 808213C8 0C0346A2 */ jal Matrix_NewMtx /* 0DBAC 808213CC AFA200A0 */ sw $v0, 0x00A0($sp) /* 0DBB0 808213D0 8FA300A0 */ lw $v1, 0x00A0($sp) -/* 0DBB4 808213D4 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0DBB4 808213D4 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1409) /* 0DBB8 808213D8 3C068083 */ lui $a2, %hi(D_8082AAB0) ## $a2 = 80830000 /* 0DBBC 808213DC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0DBC0 808213E0 91EFFA69 */ lbu $t7, -0x0597($t7) ## 8015FA69 +/* 0DBC0 808213E0 91EFFA69 */ lbu $t7, %lo(gSaveContext+0x1409)($t7) /* 0DBC4 808213E4 8E250148 */ lw $a1, 0x0148($s1) ## 00000148 /* 0DBC8 808213E8 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 0DBCC 808213EC 000F7080 */ sll $t6, $t7, 2 @@ -1096,14 +1096,14 @@ glabel func_80820434 /* 0DC64 80821484 3C01439D */ lui $at, 0x439D ## $at = 439D0000 /* 0DC68 80821488 44815000 */ mtc1 $at, $f10 ## $f10 = 314.00 /* 0DC6C 8082148C C6280204 */ lwc1 $f8, 0x0204($s1) ## 00000204 -/* 0DC70 80821490 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 0DC70 80821490 3C198016 */ lui $t9, %hi(gGameInfo) /* 0DC74 80821494 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0DC78 80821498 460A4400 */ add.s $f16, $f8, $f10 /* 0DC7C 8082149C C62801F0 */ lwc1 $f8, 0x01F0($s1) ## 000001F0 /* 0DC80 808214A0 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 /* 0DC84 808214A4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0DC88 808214A8 E63001F4 */ swc1 $f16, 0x01F4($s1) ## 000001F4 -/* 0DC8C 808214AC 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 0DC8C 808214AC 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 0DC90 808214B0 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 /* 0DC94 808214B4 46004287 */ neg.s $f10, $f8 /* 0DC98 808214B8 87380D98 */ lh $t8, 0x0D98($t9) ## 80160D98 @@ -1138,14 +1138,14 @@ glabel func_80820434 /* 0DD08 80821528 3C01439D */ lui $at, 0x439D ## $at = 439D0000 /* 0DD0C 8082152C 44818000 */ mtc1 $at, $f16 ## $f16 = 314.00 /* 0DD10 80821530 C62A0204 */ lwc1 $f10, 0x0204($s1) ## 00000204 -/* 0DD14 80821534 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0DD14 80821534 3C0F8016 */ lui $t7, %hi(gGameInfo) /* 0DD18 80821538 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0DD1C 8082153C 46105480 */ add.s $f18, $f10, $f16 /* 0DD20 80821540 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 0DD24 80821544 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0DD28 80821548 44818000 */ mtc1 $at, $f16 ## $f16 = 100.00 /* 0DD2C 8082154C E63201FC */ swc1 $f18, 0x01FC($s1) ## 000001FC -/* 0DD30 80821550 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 0DD30 80821550 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 0DD34 80821554 C62401F0 */ lwc1 $f4, 0x01F0($s1) ## 000001F0 /* 0DD38 80821558 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 0DD3C 8082155C 85EE0D98 */ lh $t6, 0x0D98($t7) ## 80160D98 @@ -1178,7 +1178,7 @@ glabel func_80820434 .L808215C8: /* 0DDA8 808215C8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 0DDAC 808215CC 14610029 */ bne $v1, $at, .L80821674 -/* 0DDB0 808215D0 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0DDB0 808215D0 3C0F8016 */ lui $t7, %hi(gGameInfo) /* 0DDB4 808215D4 3C01439D */ lui $at, 0x439D ## $at = 439D0000 /* 0DDB8 808215D8 44815000 */ mtc1 $at, $f10 ## $f10 = 314.00 /* 0DDBC 808215DC C6280204 */ lwc1 $f8, 0x0204($s1) ## 00000204 @@ -1189,9 +1189,9 @@ glabel func_80820434 /* 0DDD0 808215F0 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 0DDD4 808215F4 C62801F0 */ lwc1 $f8, 0x01F0($s1) ## 000001F0 /* 0DDD8 808215F8 E6300200 */ swc1 $f16, 0x0200($s1) ## 00000200 -/* 0DDDC 808215FC 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 0DDDC 808215FC 3C198016 */ lui $t9, %hi(gGameInfo) /* 0DDE0 80821600 460A4403 */ div.s $f16, $f8, $f10 -/* 0DDE4 80821604 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 0DDE4 80821604 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 0DDE8 80821608 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 0DDEC 8082160C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0DDF0 80821610 87380D98 */ lh $t8, 0x0D98($t9) ## 80160D98 @@ -1230,7 +1230,7 @@ glabel func_80820434 /* 0DE70 80821690 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0DE74 80821694 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 0DE78 80821698 E62A01F8 */ swc1 $f10, 0x01F8($s1) ## 000001F8 -/* 0DE7C 8082169C 8DEFFA90 */ lw $t7, -0x0570($t7) ## FFFFFA90 +/* 0DE7C 8082169C 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 0DE80 808216A0 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 /* 0DE84 808216A4 46008487 */ neg.s $f18, $f16 /* 0DE88 808216A8 85EE0D98 */ lh $t6, 0x0D98($t7) ## 00000D98 @@ -1271,7 +1271,7 @@ glabel func_80820434 /* 0DF10 80821730 0C0346A2 */ jal Matrix_NewMtx /* 0DF14 80821734 AFA20098 */ sw $v0, 0x0098($sp) /* 0DF18 80821738 8FA30098 */ lw $v1, 0x0098($sp) -/* 0DF1C 8082173C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0DF1C 8082173C 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1409) /* 0DF20 80821740 3C068083 */ lui $a2, %hi(D_8082AAE0) ## $a2 = 80830000 /* 0DF24 80821744 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0DF28 80821748 962201D4 */ lhu $v0, 0x01D4($s1) ## 000001D4 @@ -1288,7 +1288,7 @@ glabel func_80820434 /* 0DF54 80821774 10000009 */ beq $zero, $zero, .L8082179C /* 0DF58 80821778 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L8082177C: -/* 0DF5C 8082177C 91EFFA69 */ lbu $t7, -0x0597($t7) ## FFFFFA69 +/* 0DF5C 8082177C 91EFFA69 */ lbu $t7, %lo(gSaveContext+0x1409)($t7) /* 0DF60 80821780 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 0DF64 80821784 8E25016C */ lw $a1, 0x016C($s1) ## 0000016C /* 0DF68 80821788 000F7080 */ sll $t6, $t7, 2 @@ -1317,8 +1317,8 @@ glabel func_80820434 .L808217E0: /* 0DFC0 808217E0 14410067 */ bne $v0, $at, .L80821980 .L808217E4: -/* 0DFC4 808217E4 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 0DFC8 808217E8 9318FA69 */ lbu $t8, -0x0597($t8) ## 8015FA69 +/* 0DFC4 808217E4 3C188016 */ lui $t8, %hi(gSaveContext+0x1409) +/* 0DFC8 808217E8 9318FA69 */ lbu $t8, %lo(gSaveContext+0x1409)($t8) /* 0DFCC 808217EC 3C058083 */ lui $a1, %hi(D_8082ACB8) ## $a1 = 80830000 /* 0DFD0 808217F0 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 0DFD4 808217F4 00187880 */ sll $t7, $t8, 2 @@ -1339,11 +1339,11 @@ glabel func_80820434 /* 0E010 80821830 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 0E014 80821834 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0E018 80821838 3C08FA00 */ lui $t0, 0xFA00 ## $t0 = FA000000 -/* 0E01C 8082183C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0E01C 8082183C 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 0E020 80821840 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0E024 80821844 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 /* 0E028 80821848 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 0E02C 8082184C 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 0E02C 8082184C 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 0E030 80821850 3C0164FF */ lui $at, 0x64FF ## $at = 64FF0000 /* 0E034 80821854 34216400 */ ori $at, $at, 0x6400 ## $at = 64FF6400 /* 0E038 80821858 85D90F8E */ lh $t9, 0x0F8E($t6) ## 80160F8E @@ -1394,12 +1394,12 @@ glabel func_80820434 /* 0E0E4 80821904 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 0E0E8 80821908 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 0E0EC 8082190C 96390208 */ lhu $t9, 0x0208($s1) ## 00000208 -/* 0E0F0 80821910 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0E0F0 80821910 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1409) /* 0E0F4 80821914 24070010 */ addiu $a3, $zero, 0x0010 ## $a3 = 00000010 /* 0E0F8 80821918 333800FF */ andi $t8, $t9, 0x00FF ## $t8 = 00000008 /* 0E0FC 8082191C 03017825 */ or $t7, $t8, $at ## $t7 = FFFFFF08 /* 0E100 80821920 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 0E104 80821924 91CEFA69 */ lbu $t6, -0x0597($t6) ## 8015FA69 +/* 0E104 80821924 91CEFA69 */ lbu $t6, %lo(gSaveContext+0x1409)($t6) /* 0E108 80821928 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 0E10C 8082192C 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C /* 0E110 80821930 000EC8C0 */ sll $t9, $t6, 3 @@ -1408,8 +1408,8 @@ glabel func_80820434 /* 0E11C 8082193C 0C207D43 */ jal func_8081F50C /* 0E120 80821940 AFB80010 */ sw $t8, 0x0010($sp) /* 0E124 80821944 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 0E128 80821948 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 0E12C 8082194C 91EFFA69 */ lbu $t7, -0x0597($t7) ## 8015FA69 +/* 0E128 80821948 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1409) +/* 0E12C 8082194C 91EFFA69 */ lbu $t7, %lo(gSaveContext+0x1409)($t7) /* 0E130 80821950 3C058083 */ lui $a1, %hi(D_8082ACE0) ## $a1 = 80830000 /* 0E134 80821954 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 /* 0E138 80821958 000F70C0 */ sll $t6, $t7, 3 @@ -1434,12 +1434,12 @@ glabel func_80820434 /* 0E17C 8082199C 1041006C */ beq $v0, $at, .L80821B50 /* 0E180 808219A0 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 /* 0E184 808219A4 10410004 */ beq $v0, $at, .L808219B8 -/* 0E188 808219A8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0E188 808219A8 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1409) /* 0E18C 808219AC 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 /* 0E190 808219B0 54410068 */ bnel $v0, $at, .L80821B54 /* 0E194 808219B4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 .L808219B8: -/* 0E198 808219B8 91EFFA69 */ lbu $t7, -0x0597($t7) ## 8015FA69 +/* 0E198 808219B8 91EFFA69 */ lbu $t7, %lo(gSaveContext+0x1409)($t7) /* 0E19C 808219BC 3C058083 */ lui $a1, %hi(D_8082ACD0) ## $a1 = 80830000 /* 0E1A0 808219C0 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 0E1A4 808219C4 000F7080 */ sll $t6, $t7, 2 @@ -1460,11 +1460,11 @@ glabel func_80820434 /* 0E1E0 80821A00 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 0E1E4 80821A04 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0E1E8 80821A08 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 -/* 0E1EC 80821A0C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0E1EC 80821A0C 3C188016 */ lui $t8, %hi(gGameInfo) /* 0E1F0 80821A10 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 0E1F4 80821A14 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 0E1F8 80821A18 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 0E1FC 80821A1C 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 0E1FC 80821A1C 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 0E200 80821A20 3C0164FF */ lui $at, 0x64FF ## $at = 64FF0000 /* 0E204 80821A24 34216400 */ ori $at, $at, 0x6400 ## $at = 64FF6400 /* 0E208 80821A28 870F0F8E */ lh $t7, 0x0F8E($t8) ## 80160F8E @@ -1516,12 +1516,12 @@ glabel func_80820434 /* 0E2B8 80821AD8 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 0E2BC 80821ADC AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 0E2C0 80821AE0 962E0208 */ lhu $t6, 0x0208($s1) ## 00000208 -/* 0E2C4 80821AE4 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0E2C4 80821AE4 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1409) /* 0E2C8 80821AE8 24070010 */ addiu $a3, $zero, 0x0010 ## $a3 = 00000010 /* 0E2CC 80821AEC 31D900FF */ andi $t9, $t6, 0x00FF ## $t9 = 00000024 /* 0E2D0 80821AF0 0321C025 */ or $t8, $t9, $at ## $t8 = FFFFFF24 /* 0E2D4 80821AF4 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 0E2D8 80821AF8 91EFFA69 */ lbu $t7, -0x0597($t7) ## 8015FA69 +/* 0E2D8 80821AF8 91EFFA69 */ lbu $t7, %lo(gSaveContext+0x1409)($t7) /* 0E2DC 80821AFC 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 0E2E0 80821B00 2419000C */ addiu $t9, $zero, 0x000C ## $t9 = 0000000C /* 0E2E4 80821B04 000F70C0 */ sll $t6, $t7, 3 @@ -1530,8 +1530,8 @@ glabel func_80820434 /* 0E2F0 80821B10 0C207D43 */ jal func_8081F50C /* 0E2F4 80821B14 AFB90010 */ sw $t9, 0x0010($sp) /* 0E2F8 80821B18 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 0E2FC 80821B1C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 0E300 80821B20 9318FA69 */ lbu $t8, -0x0597($t8) ## 8015FA69 +/* 0E2FC 80821B1C 3C188016 */ lui $t8, %hi(gSaveContext+0x1409) +/* 0E300 80821B20 9318FA69 */ lbu $t8, %lo(gSaveContext+0x1409)($t8) /* 0E304 80821B24 3C058083 */ lui $a1, %hi(D_8082ACE0) ## $a1 = 80830000 /* 0E308 80821B28 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 /* 0E30C 80821B2C 001878C0 */ sll $t7, $t8, 3 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s index eff682648a..53e483ef38 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s @@ -211,8 +211,8 @@ glabel func_80821C10 /* 0E6CC 80821EEC 3C018083 */ lui $at, %hi(D_808321A2) ## $at = 80830000 /* 0E6D0 80821EF0 A42B21A2 */ sh $t3, %lo(D_808321A2)($at) /* 0E6D4 80821EF4 3C018083 */ lui $at, %hi(D_808321A4) ## $at = 80830000 -/* 0E6D8 80821EF8 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 0E6DC 80821EFC 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 0E6D8 80821EF8 3C188016 */ lui $t8, %hi(gGameInfo) +/* 0E6DC 80821EFC 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 0E6E0 80821F00 A42A21A4 */ sh $t2, %lo(D_808321A4)($at) /* 0E6E4 80821F04 3C018083 */ lui $at, %hi(D_808321A6) ## $at = 80830000 /* 0E6E8 80821F08 A42621A6 */ sh $a2, %lo(D_808321A6)($at) @@ -400,8 +400,8 @@ glabel func_80821C10 /* 0E9B8 808221D8 17010023 */ bne $t8, $at, .L80822268 /* 0E9BC 808221DC 00000000 */ nop /* 0E9C0 808221E0 950F01E4 */ lhu $t7, 0x01E4($t0) ## 000001E4 -/* 0E9C4 808221E4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 0E9C8 808221E8 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 +/* 0E9C4 808221E4 3C058016 */ lui $a1, %hi(gGameInfo) +/* 0E9C8 808221E8 24A5FA90 */ addiu $a1, %lo(gGameInfo) /* 0E9CC 808221EC 15E0001E */ bne $t7, $zero, .L80822268 /* 0E9D0 808221F0 00000000 */ nop /* 0E9D4 808221F4 8CB90000 */ lw $t9, 0x0000($a1) ## 8015FA90 @@ -434,13 +434,13 @@ glabel func_80821C10 /* 0EA40 80822260 10000027 */ beq $zero, $zero, .L80822300 /* 0EA44 80822264 A5E200A2 */ sh $v0, 0x00A2($t7) ## 808300A2 .L80822268: -/* 0EA48 80822268 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 0EA4C 8082226C 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 0EA48 80822268 3C198016 */ lui $t9, %hi(gGameInfo) +/* 0EA4C 8082226C 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 0EA50 80822270 8D0E0154 */ lw $t6, 0x0154($t0) ## 00000154 -/* 0EA54 80822274 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 0EA54 80822274 3C058016 */ lui $a1, %hi(gGameInfo) /* 0EA58 80822278 87220DB4 */ lh $v0, 0x0DB4($t9) ## 80160DB4 -/* 0EA5C 8082227C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 0EA60 80822280 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 +/* 0EA5C 8082227C 3C198016 */ lui $t9, %hi(gGameInfo) +/* 0EA60 80822280 24A5FA90 */ addiu $a1, %lo(gGameInfo) /* 0EA64 80822284 24420003 */ addiu $v0, $v0, 0x0003 ## $v0 = 0000008B /* 0EA68 80822288 00021400 */ sll $v0, $v0, 16 /* 0EA6C 8082228C 00021403 */ sra $v0, $v0, 16 @@ -455,7 +455,7 @@ glabel func_80821C10 /* 0EA90 808222B0 A46200B0 */ sh $v0, 0x00B0($v1) ## 000000B0 /* 0EA94 808222B4 8D0F0154 */ lw $t7, 0x0154($t0) ## 00000154 /* 0EA98 808222B8 A5E20090 */ sh $v0, 0x0090($t7) ## 80830090 -/* 0EA9C 808222BC 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 0EA9C 808222BC 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 0EAA0 808222C0 8D0E0154 */ lw $t6, 0x0154($t0) ## 00000154 /* 0EAA4 808222C4 87220DB8 */ lh $v0, 0x0DB8($t9) ## 80160DB8 /* 0EAA8 808222C8 2442FFFD */ addiu $v0, $v0, 0xFFFD ## $v0 = 0000009A @@ -792,10 +792,10 @@ glabel func_80821C10 /* 0EFB8 808227D8 950201E4 */ lhu $v0, 0x01E4($t0) ## 000001E4 /* 0EFBC 808227DC 950F023C */ lhu $t7, 0x023C($t0) ## 0000023C /* 0EFC0 808227E0 240103E7 */ addiu $at, $zero, 0x03E7 ## $at = 000003E7 -/* 0EFC4 808227E4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0EFC4 808227E4 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 0EFC8 808227E8 51E1011B */ beql $t7, $at, .L80822C58 /* 0EFCC 808227EC 950201E4 */ lhu $v0, 0x01E4($t0) ## 000001E4 -/* 0EFD0 808227F0 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 0EFD0 808227F0 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 0EFD4 808227F4 9519025C */ lhu $t9, 0x025C($t0) ## 0000025C /* 0EFD8 808227F8 85D80E46 */ lh $t8, 0x0E46($t6) ## 80160E46 /* 0EFDC 808227FC 0338082A */ slt $at, $t9, $t8 @@ -897,10 +897,10 @@ glabel func_80821C10 /* 0F140 80822960 950401E8 */ lhu $a0, 0x01E8($t0) ## 000001E8 .L80822964: /* 0F144 80822964 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0F148 80822968 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0F148 80822968 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 0F14C 8082296C 14810044 */ bne $a0, $at, .L80822A80 /* 0F150 80822970 00000000 */ nop -/* 0F154 80822974 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 0F154 80822974 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 0F158 80822978 85D904A2 */ lh $t9, 0x04A2($t6) ## 801604A2 /* 0F15C 8082297C 13200040 */ beq $t9, $zero, .L80822A80 /* 0F160 80822980 00000000 */ nop @@ -910,12 +910,12 @@ glabel func_80821C10 /* 0F170 80822990 0C00084C */ jal osSyncPrintf /* 0F174 80822994 AFA80038 */ sw $t0, 0x0038($sp) -/* 0F178 80822998 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 0F17C 8082299C 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 -/* 0F180 808229A0 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 0F184 808229A4 254AE660 */ addiu $t2, $t2, 0xE660 ## $t2 = 8015E660 +/* 0F178 80822998 3C188016 */ lui $t8, %hi(gGameInfo) +/* 0F17C 8082299C 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) +/* 0F180 808229A0 3C0A8016 */ lui $t2, %hi(gSaveContext) +/* 0F184 808229A4 254AE660 */ addiu $t2, %lo(gSaveContext) /* 0F188 808229A8 870504A0 */ lh $a1, 0x04A0($t8) ## 801604A0 -/* 0F18C 808229AC 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 +/* 0F18C 808229AC 3C188012 */ lui $t8, %hi(D_8012723C) /* 0F190 808229B0 3C078083 */ lui $a3, %hi(D_8082AC7C) ## $a3 = 80830000 /* 0F194 808229B4 00057883 */ sra $t7, $a1, 2 /* 0F198 808229B8 000F7080 */ sll $t6, $t7, 2 @@ -923,11 +923,11 @@ glabel func_80821C10 /* 0F1A0 808229C0 00031880 */ sll $v1, $v1, 2 /* 0F1A4 808229C4 014EC821 */ addu $t9, $t2, $t6 /* 0F1A8 808229C8 0303C021 */ addu $t8, $t8, $v1 -/* 0F1AC 808229CC 8F18723C */ lw $t8, 0x723C($t8) ## 8012723C +/* 0F1AC 808229CC 8F18723C */ lw $t8, %lo(D_8012723C)($t8) /* 0F1B0 808229D0 8F220E9C */ lw $v0, 0x0E9C($t9) ## 00000E9C -/* 0F1B4 808229D4 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 +/* 0F1B4 808229D4 3C0E8012 */ lui $t6, %hi(D_8012724C) /* 0F1B8 808229D8 01C37021 */ addu $t6, $t6, $v1 -/* 0F1BC 808229DC 8DCE724C */ lw $t6, 0x724C($t6) ## 8012724C +/* 0F1BC 808229DC 8DCE724C */ lw $t6, %lo(D_8012724C)($t6) /* 0F1C0 808229E0 3C048083 */ lui $a0, %hi(D_8082FC98) ## $a0 = 80830000 /* 0F1C4 808229E4 00E53821 */ addu $a3, $a3, $a1 /* 0F1C8 808229E8 00587824 */ and $t7, $v0, $t8 @@ -941,29 +941,29 @@ glabel func_80821C10 /* 0F1E4 80822A04 0C00084C */ jal osSyncPrintf /* 0F1E8 80822A08 2484FCC4 */ addiu $a0, $a0, %lo(D_8082FCC4) ## $a0 = 8082FCC4 -/* 0F1EC 80822A0C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 0F1F0 80822A10 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 0F1EC 80822A0C 3C198016 */ lui $t9, %hi(gGameInfo) +/* 0F1F0 80822A10 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 0F1F4 80822A14 8FA80038 */ lw $t0, 0x0038($sp) /* 0F1F8 80822A18 8FBF00F0 */ lw $ra, 0x00F0($sp) /* 0F1FC 80822A1C A72004A2 */ sh $zero, 0x04A2($t9) ## 801604A2 /* 0F200 80822A20 85180220 */ lh $t8, 0x0220($t0) ## 00000220 /* 0F204 80822A24 3C028083 */ lui $v0, %hi(D_8082AE30) ## $v0 = 80830000 -/* 0F208 80822A28 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 0F208 80822A28 3C0A8016 */ lui $t2, %hi(gSaveContext) /* 0F20C 80822A2C 00187840 */ sll $t7, $t8, 1 /* 0F210 80822A30 004F1021 */ addu $v0, $v0, $t7 /* 0F214 80822A34 8442AE30 */ lh $v0, %lo(D_8082AE30)($v0) -/* 0F218 80822A38 254AE660 */ addiu $t2, $t2, 0xE660 ## $t2 = 8015E660 +/* 0F218 80822A38 254AE660 */ addiu $t2, %lo(gSaveContext) /* 0F21C 80822A3C 3C188083 */ lui $t8, %hi(D_8082AC7C) ## $t8 = 80830000 /* 0F220 80822A40 00027083 */ sra $t6, $v0, 2 /* 0F224 80822A44 000EC880 */ sll $t9, $t6, 2 /* 0F228 80822A48 01591821 */ addu $v1, $t2, $t9 /* 0F22C 80822A4C 304F0003 */ andi $t7, $v0, 0x0003 ## $t7 = 00000000 /* 0F230 80822A50 000F7080 */ sll $t6, $t7, 2 -/* 0F234 80822A54 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 +/* 0F234 80822A54 3C198012 */ lui $t9, %hi(D_8012724C) /* 0F238 80822A58 032EC821 */ addu $t9, $t9, $t6 /* 0F23C 80822A5C 0302C021 */ addu $t8, $t8, $v0 /* 0F240 80822A60 9318AC7C */ lbu $t8, %lo(D_8082AC7C)($t8) -/* 0F244 80822A64 8F39724C */ lw $t9, 0x724C($t9) ## 8012724C +/* 0F244 80822A64 8F39724C */ lw $t9, %lo(D_8012724C)($t9) /* 0F248 80822A68 8C6E0E9C */ lw $t6, 0x0E9C($v1) ## 00000E9C /* 0F24C 80822A6C 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 /* 0F250 80822A70 03387804 */ sllv $t7, $t8, $t9 @@ -971,10 +971,10 @@ glabel func_80821C10 /* 0F258 80822A78 AC780E9C */ sw $t8, 0x0E9C($v1) ## 00000E9C /* 0F25C 80822A7C 950401E8 */ lhu $a0, 0x01E8($t0) ## 000001E8 .L80822A80: -/* 0F260 80822A80 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 0F260 80822A80 3C0A8016 */ lui $t2, %hi(gSaveContext) /* 0F264 80822A84 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0F268 80822A88 148102A4 */ bne $a0, $at, .L8082351C -/* 0F26C 80822A8C 254AE660 */ addiu $t2, $t2, 0xE660 ## $t2 = 8015E660 +/* 0F26C 80822A8C 254AE660 */ addiu $t2, %lo(gSaveContext) /* 0F270 80822A90 3C198083 */ lui $t9, %hi(D_8082ABA8) ## $t9 = 80830000 /* 0F274 80822A94 8739ABA8 */ lh $t9, %lo(D_8082ABA8)($t9) /* 0F278 80822A98 572002A1 */ bnel $t9, $zero, .L80823520 @@ -988,16 +988,16 @@ glabel func_80821C10 /* 0F298 80822AB8 0018C880 */ sll $t9, $t8, 2 /* 0F29C 80822ABC 30430003 */ andi $v1, $v0, 0x0003 ## $v1 = 00000000 /* 0F2A0 80822AC0 00031880 */ sll $v1, $v1, 2 -/* 0F2A4 80822AC4 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 +/* 0F2A4 80822AC4 3C188012 */ lui $t8, %hi(D_8012723C) /* 0F2A8 80822AC8 0303C021 */ addu $t8, $t8, $v1 /* 0F2AC 80822ACC 01597021 */ addu $t6, $t2, $t9 /* 0F2B0 80822AD0 8DCF0E9C */ lw $t7, 0x0E9C($t6) ## 00000E9C -/* 0F2B4 80822AD4 8F18723C */ lw $t8, 0x723C($t8) ## 8012723C -/* 0F2B8 80822AD8 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 +/* 0F2B4 80822AD4 8F18723C */ lw $t8, %lo(D_8012723C)($t8) +/* 0F2B8 80822AD8 3C0E8012 */ lui $t6, %hi(D_8012724C) /* 0F2BC 80822ADC 01C37021 */ addu $t6, $t6, $v1 /* 0F2C0 80822AE0 01F8C824 */ and $t9, $t7, $t8 /* 0F2C4 80822AE4 3C188083 */ lui $t8, %hi(D_8082AC7C) ## $t8 = 80830000 -/* 0F2C8 80822AE8 8DCE724C */ lw $t6, 0x724C($t6) ## 8012724C +/* 0F2C8 80822AE8 8DCE724C */ lw $t6, %lo(D_8012724C)($t6) /* 0F2CC 80822AEC 0302C021 */ addu $t8, $t8, $v0 /* 0F2D0 80822AF0 9318AC7C */ lbu $t8, %lo(D_8082AC7C)($t8) /* 0F2D4 80822AF4 01D97806 */ srlv $t7, $t9, $t6 @@ -1100,10 +1100,10 @@ glabel func_80821C10 .L80822C74: /* 0F454 80822C74 8D0E0154 */ lw $t6, 0x0154($t0) ## 00000154 /* 0F458 80822C78 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0F45C 80822C7C 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 0F45C 80822C7C 3C0A8016 */ lui $t2, %hi(gSaveContext) /* 0F460 80822C80 A5CD0152 */ sh $t5, 0x0152($t6) ## 00000152 /* 0F464 80822C84 8D030154 */ lw $v1, 0x0154($t0) ## 00000154 -/* 0F468 80822C88 254AE660 */ addiu $t2, $t2, 0xE660 ## $t2 = 8015E660 +/* 0F468 80822C88 254AE660 */ addiu $t2, %lo(gSaveContext) /* 0F46C 80822C8C 846F0152 */ lh $t7, 0x0152($v1) ## 00000152 /* 0F470 80822C90 A46F0142 */ sh $t7, 0x0142($v1) ## 00000142 /* 0F474 80822C94 8D030154 */ lw $v1, 0x0154($t0) ## 00000154 @@ -1132,13 +1132,13 @@ glabel func_80821C10 /* 0F4D0 80822CF0 54410065 */ bnel $v0, $at, .L80822E88 /* 0F4D4 80822CF4 85190238 */ lh $t9, 0x0238($t0) ## 00000238 /* 0F4D8 80822CF8 91581409 */ lbu $t8, 0x1409($t2) ## 8015FA69 -/* 0F4DC 80822CFC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 0F4E0 80822D00 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 0F4DC 80822CFC 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 0F4E0 80822D00 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 0F4E4 80822D04 0018C840 */ sll $t9, $t8, 1 /* 0F4E8 80822D08 8D180154 */ lw $t8, 0x0154($t0) ## 00000154 /* 0F4EC 80822D0C 01F97021 */ addu $t6, $t7, $t9 /* 0F4F0 80822D10 85C20E0E */ lh $v0, 0x0E0E($t6) ## 00000F0E -/* 0F4F4 80822D14 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0F4F4 80822D14 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 0F4F8 80822D18 3C0B8083 */ lui $t3, %hi(D_8082ADE0) ## $t3 = 80830000 /* 0F4FC 80822D1C A7020120 */ sh $v0, 0x0120($t8) ## 01008130 /* 0F500 80822D20 8D0F0154 */ lw $t7, 0x0154($t0) ## 00000154 @@ -1154,7 +1154,7 @@ glabel func_80821C10 /* 0F528 80822D48 8D190154 */ lw $t9, 0x0154($t0) ## 00000154 /* 0F52C 80822D4C A7220110 */ sh $v0, 0x0110($t9) ## 00000110 /* 0F530 80822D50 91581409 */ lbu $t8, 0x1409($t2) ## 8015FA69 -/* 0F534 80822D54 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 0F534 80822D54 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 0F538 80822D58 8D030154 */ lw $v1, 0x0154($t0) ## 00000154 /* 0F53C 80822D5C 00187840 */ sll $t7, $t8, 1 /* 0F540 80822D60 01CFC821 */ addu $t9, $t6, $t7 @@ -1245,9 +1245,9 @@ glabel func_80821C10 /* 0F690 80822EB0 A5EE0120 */ sh $t6, 0x0120($t7) ## 00000120 /* 0F694 80822EB4 8D030154 */ lw $v1, 0x0154($t0) ## 00000154 /* 0F698 80822EB8 240E1000 */ addiu $t6, $zero, 0x1000 ## $t6 = 00001000 -/* 0F69C 80822EBC 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 0F69C 80822EBC 3C0A8016 */ lui $t2, %hi(gSaveContext) /* 0F6A0 80822EC0 84790120 */ lh $t9, 0x0120($v1) ## 00000120 -/* 0F6A4 80822EC4 254AE660 */ addiu $t2, $t2, 0xE660 ## $t2 = 8015E660 +/* 0F6A4 80822EC4 254AE660 */ addiu $t2, %lo(gSaveContext) /* 0F6A8 80822EC8 3C058083 */ lui $a1, %hi(D_8082ADA8) ## $a1 = 80830000 /* 0F6AC 80822ECC A4790100 */ sh $t9, 0x0100($v1) ## 00000100 /* 0F6B0 80822ED0 8D030154 */ lw $v1, 0x0154($t0) ## 00000154 @@ -1281,8 +1281,8 @@ glabel func_80821C10 /* 0F720 80822F40 57210017 */ bnel $t9, $at, .L80822FA0 /* 0F724 80822F44 950F01E8 */ lhu $t7, 0x01E8($t0) ## 000001E8 /* 0F728 80822F48 951801E8 */ lhu $t8, 0x01E8($t0) ## 000001E8 -/* 0F72C 80822F4C 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 0F730 80822F50 254AE660 */ addiu $t2, $t2, 0xE660 ## $t2 = 8015E660 +/* 0F72C 80822F4C 3C0A8016 */ lui $t2, %hi(gSaveContext) +/* 0F730 80822F50 254AE660 */ addiu $t2, %lo(gSaveContext) /* 0F734 80822F54 914F1409 */ lbu $t7, 0x1409($t2) ## 8015FA69 /* 0F738 80822F58 00187080 */ sll $t6, $t8, 2 /* 0F73C 80822F5C 01D87023 */ subu $t6, $t6, $t8 @@ -1320,18 +1320,18 @@ glabel func_80821C10 /* 0F7B8 80822FD8 AFE202C0 */ sw $v0, 0x02C0($ra) ## 000002C0 /* 0F7BC 80822FDC 950201E8 */ lhu $v0, 0x01E8($t0) ## 000001E8 .L80822FE0: -/* 0F7C0 80822FE0 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 0F7C4 80822FE4 254AE660 */ addiu $t2, $t2, 0xE660 ## $t2 = 8015E660 +/* 0F7C0 80822FE0 3C0A8016 */ lui $t2, %hi(gSaveContext) +/* 0F7C4 80822FE4 254AE660 */ addiu $t2, %lo(gSaveContext) /* 0F7C8 80822FE8 14400064 */ bne $v0, $zero, .L8082317C /* 0F7CC 80822FEC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0F7D0 80822FF0 914E1409 */ lbu $t6, 0x1409($t2) ## 8015FA69 -/* 0F7D4 80822FF4 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 0F7D8 80822FF8 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 0F7D4 80822FF4 3C198016 */ lui $t9, %hi(gGameInfo) +/* 0F7D8 80822FF8 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 0F7DC 80822FFC 000EC040 */ sll $t8, $t6, 1 /* 0F7E0 80823000 8D0E0154 */ lw $t6, 0x0154($t0) ## 00000154 /* 0F7E4 80823004 03387821 */ addu $t7, $t9, $t8 /* 0F7E8 80823008 85E20DF6 */ lh $v0, 0x0DF6($t7) ## 00000DF6 -/* 0F7EC 8082300C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0F7EC 8082300C 3C0F8016 */ lui $t7, %hi(gGameInfo) /* 0F7F0 80823010 3C0B8083 */ lui $t3, %hi(D_8082ADD8) ## $t3 = 80830000 /* 0F7F4 80823014 A5C20120 */ sh $v0, 0x0120($t6) ## 00000120 /* 0F7F8 80823018 8D190154 */ lw $t9, 0x0154($t0) ## 00000154 @@ -1347,7 +1347,7 @@ glabel func_80821C10 /* 0F820 80823040 8D180154 */ lw $t8, 0x0154($t0) ## 00000154 /* 0F824 80823044 A7020110 */ sh $v0, 0x0110($t8) ## 00000110 /* 0F828 80823048 914E1409 */ lbu $t6, 0x1409($t2) ## 8015FA69 -/* 0F82C 8082304C 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 0F82C 8082304C 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 0F830 80823050 8D030154 */ lw $v1, 0x0154($t0) ## 00000154 /* 0F834 80823054 000EC840 */ sll $t9, $t6, 1 /* 0F838 80823058 01F9C021 */ addu $t8, $t7, $t9 @@ -1441,17 +1441,17 @@ glabel func_80821C10 /* 0F990 808231B0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 0F994 808231B4 950E023C */ lhu $t6, 0x023C($t0) ## 0000023C /* 0F998 808231B8 240103E7 */ addiu $at, $zero, 0x03E7 ## $at = 000003E7 -/* 0F99C 808231BC 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 0F99C 808231BC 3C0A8016 */ lui $t2, %hi(gSaveContext) /* 0F9A0 808231C0 11C100D6 */ beq $t6, $at, .L8082351C -/* 0F9A4 808231C4 254AE660 */ addiu $t2, $t2, 0xE660 ## $t2 = 8015E660 +/* 0F9A4 808231C4 254AE660 */ addiu $t2, %lo(gSaveContext) /* 0F9A8 808231C8 91591409 */ lbu $t9, 0x1409($t2) ## 8015FA69 -/* 0F9AC 808231CC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 0F9B0 808231D0 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 0F9AC 808231CC 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 0F9B0 808231D0 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 0F9B4 808231D4 0019C040 */ sll $t8, $t9, 1 /* 0F9B8 808231D8 8D190154 */ lw $t9, 0x0154($t0) ## 00000154 /* 0F9BC 808231DC 01F87021 */ addu $t6, $t7, $t8 /* 0F9C0 808231E0 85C20E02 */ lh $v0, 0x0E02($t6) ## 00000E02 -/* 0F9C4 808231E4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0F9C4 808231E4 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 0F9C8 808231E8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0F9CC 808231EC A7220120 */ sh $v0, 0x0120($t9) ## 00000120 /* 0F9D0 808231F0 8D0F0154 */ lw $t7, 0x0154($t0) ## 00000154 @@ -1467,7 +1467,7 @@ glabel func_80821C10 /* 0F9F8 80823218 8D180154 */ lw $t8, 0x0154($t0) ## 00000154 /* 0F9FC 8082321C A7020110 */ sh $v0, 0x0110($t8) ## 80830110 /* 0FA00 80823220 91591409 */ lbu $t9, 0x1409($t2) ## 8015FA69 -/* 0FA04 80823224 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 0FA04 80823224 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 0FA08 80823228 8D030154 */ lw $v1, 0x0154($t0) ## 00000154 /* 0FA0C 8082322C 00197840 */ sll $t7, $t9, 1 /* 0FA10 80823230 01CFC021 */ addu $t8, $t6, $t7 @@ -1560,16 +1560,16 @@ glabel func_80821C10 /* 0FB64 80823384 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 .L80823388: /* 0FB68 80823388 14810064 */ bne $a0, $at, .L8082351C -/* 0FB6C 8082338C 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 0FB70 80823390 254AE660 */ addiu $t2, $t2, 0xE660 ## $t2 = 8015E660 +/* 0FB6C 8082338C 3C0A8016 */ lui $t2, %hi(gSaveContext) +/* 0FB70 80823390 254AE660 */ addiu $t2, %lo(gSaveContext) /* 0FB74 80823394 91591409 */ lbu $t9, 0x1409($t2) ## 8015FA69 -/* 0FB78 80823398 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 0FB7C 8082339C 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 0FB78 80823398 3C188016 */ lui $t8, %hi(gGameInfo) +/* 0FB7C 8082339C 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 0FB80 808233A0 00197040 */ sll $t6, $t9, 1 /* 0FB84 808233A4 8D190154 */ lw $t9, 0x0154($t0) ## 00000154 /* 0FB88 808233A8 030E7821 */ addu $t7, $t8, $t6 /* 0FB8C 808233AC 85E20E14 */ lh $v0, 0x0E14($t7) ## 00000E14 -/* 0FB90 808233B0 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0FB90 808233B0 3C0F8016 */ lui $t7, %hi(gGameInfo) /* 0FB94 808233B4 3C0B8083 */ lui $t3, %hi(D_8082ADD8) ## $t3 = 80830000 /* 0FB98 808233B8 A7220120 */ sh $v0, 0x0120($t9) ## 00000120 /* 0FB9C 808233BC 8D180154 */ lw $t8, 0x0154($t0) ## 00000154 @@ -1585,7 +1585,7 @@ glabel func_80821C10 /* 0FBC4 808233E4 8D0E0154 */ lw $t6, 0x0154($t0) ## 00000154 /* 0FBC8 808233E8 A5C20110 */ sh $v0, 0x0110($t6) ## 00000110 /* 0FBCC 808233EC 91591409 */ lbu $t9, 0x1409($t2) ## 8015FA69 -/* 0FBD0 808233F0 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 0FBD0 808233F0 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 0FBD4 808233F4 8D030154 */ lw $v1, 0x0154($t0) ## 00000154 /* 0FBD8 808233F8 0019C040 */ sll $t8, $t9, 1 /* 0FBDC 808233FC 01F87021 */ addu $t6, $t7, $t8 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823548.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823548.s index de9f497ee3..e6d81d84f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823548.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823548.s @@ -52,8 +52,8 @@ glabel func_80823548 /* 0FDE8 80823608 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 0FDEC 8082360C 17200015 */ bne $t9, $zero, .L80823664 /* 0FDF0 80823610 25CEE000 */ addiu $t6, $t6, 0xE000 ## $t6 = 0087E000 -/* 0FDF4 80823614 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 0FDF8 80823618 9084FA69 */ lbu $a0, -0x0597($a0) ## 8015FA69 +/* 0FDF4 80823614 3C048016 */ lui $a0, %hi(gSaveContext+0x1409) +/* 0FDF8 80823618 9084FA69 */ lbu $a0, %lo(gSaveContext+0x1409)($a0) /* 0FDFC 8082361C 3C078083 */ lui $a3, %hi(D_8082FCE4) ## $a3 = 80830000 /* 0FE00 80823620 24E7FCE4 */ addiu $a3, $a3, %lo(D_8082FCE4) ## $a3 = 8082FCE4 /* 0FE04 80823624 10800003 */ beq $a0, $zero, .L80823634 @@ -80,8 +80,8 @@ glabel func_80823548 /* 0FE4C 8082366C 0C00084C */ jal osSyncPrintf /* 0FE50 80823670 A7A3002A */ sh $v1, 0x002A($sp) -/* 0FE54 80823674 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 0FE58 80823678 9084FA69 */ lbu $a0, -0x0597($a0) ## 8015FA69 +/* 0FE54 80823674 3C048016 */ lui $a0, %hi(gSaveContext+0x1409) +/* 0FE58 80823678 9084FA69 */ lbu $a0, %lo(gSaveContext+0x1409)($a0) /* 0FE5C 8082367C 8FA20024 */ lw $v0, 0x0024($sp) /* 0FE60 80823680 97A3002A */ lhu $v1, 0x002A($sp) /* 0FE64 80823684 10800003 */ beq $a0, $zero, .L80823694 @@ -151,10 +151,10 @@ glabel func_80823548 /* 0FF40 80823760 51010011 */ beql $t0, $at, .L808237A8 /* 0FF44 80823764 8FBF001C */ lw $ra, 0x001C($sp) /* 0FF48 80823768 944E025C */ lhu $t6, 0x025C($v0) ## 0000025C -/* 0FF4C 8082376C 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 0FF4C 8082376C 3C0A8016 */ lui $t2, %hi(gGameInfo) /* 0FF50 80823770 25C90001 */ addiu $t1, $t6, 0x0001 ## $t1 = 00000001 /* 0FF54 80823774 A449025C */ sh $t1, 0x025C($v0) ## 0000025C -/* 0FF58 80823778 8D4AFA90 */ lw $t2, -0x0570($t2) ## 8015FA90 +/* 0FF58 80823778 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) /* 0FF5C 8082377C 312CFFFF */ andi $t4, $t1, 0xFFFF ## $t4 = 00000001 /* 0FF60 80823780 854B0E44 */ lh $t3, 0x0E44($t2) ## 80160E44 /* 0FF64 80823784 016C082A */ slt $at, $t3, $t4 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808237B4.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808237B4.s index 4a6c6d19f4..82ec91fb4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808237B4.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808237B4.s @@ -1,6 +1,6 @@ glabel func_808237B4 -/* 0FF94 808237B4 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 0FF98 808237B8 24C6FA90 */ addiu $a2, $a2, 0xFA90 ## $a2 = 8015FA90 +/* 0FF94 808237B4 3C068016 */ lui $a2, %hi(gGameInfo) +/* 0FF98 808237B8 24C6FA90 */ addiu $a2, %lo(gGameInfo) /* 0FF9C 808237BC 8CCE0000 */ lw $t6, 0x0000($a2) ## 8015FA90 /* 0FFA0 808237C0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0FFA4 808237C4 85CF07AE */ lh $t7, 0x07AE($t6) ## 000007AE diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823A0C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823A0C.s index 73654b2a77..dd03685ba4 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823A0C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823A0C.s @@ -147,8 +147,8 @@ glabel func_80823A0C /* 10428 80823C48 8DAC0000 */ lw $t4, 0x0000($t5) ## 00000000 /* 1042C 80823C4C 1A200066 */ blez $s1, .L80823DE8 /* 10430 80823C50 00005825 */ or $t3, $zero, $zero ## $t3 = 00000000 -/* 10434 80823C54 3C168016 */ lui $s6, 0x8016 ## $s6 = 80160000 -/* 10438 80823C58 26D6FA90 */ addiu $s6, $s6, 0xFA90 ## $s6 = 8015FA90 +/* 10434 80823C54 3C168016 */ lui $s6, %hi(gGameInfo) +/* 10438 80823C58 26D6FA90 */ addiu $s6, %lo(gGameInfo) /* 1043C 80823C5C 241300FF */ addiu $s3, $zero, 0x00FF ## $s3 = 000000FF .L80823C60: /* 10440 80823C60 000B2840 */ sll $a1, $t3, 1 @@ -257,8 +257,8 @@ glabel func_80823A0C /* 105CC 80823DEC 25EFB058 */ addiu $t7, $t7, %lo(D_8082B058) ## $t7 = 8082B058 /* 105D0 80823DF0 15AF00A0 */ bne $t5, $t7, .L80824074 /* 105D4 80823DF4 241300FF */ addiu $s3, $zero, 0x00FF ## $s3 = 000000FF -/* 105D8 80823DF8 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 105DC 80823DFC 856BFA80 */ lh $t3, -0x0580($t3) ## 8015FA80 +/* 105D8 80823DF8 3C0B8016 */ lui $t3, %hi(gSaveContext+0x1420) +/* 105DC 80823DFC 856BFA80 */ lh $t3, %lo(gSaveContext+0x1420)($t3) /* 105E0 80823E00 2529FFF4 */ addiu $t1, $t1, 0xFFF4 ## $t1 = FFFFFFFC /* 105E4 80823E04 3C048083 */ lui $a0, %hi(D_8082B060) ## $a0 = 80830000 /* 105E8 80823E08 000B2840 */ sll $a1, $t3, 1 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082409C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082409C.s index 74e66bb19d..53e8ab63a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082409C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082409C.s @@ -555,9 +555,9 @@ glabel func_8082409C /* 110E0 80824900 240DFED4 */ addiu $t5, $zero, 0xFED4 ## $t5 = FFFFFED4 /* 110E4 80824904 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF .L80824908: -/* 110E8 80824908 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 110E8 80824908 3C068016 */ lui $a2, %hi(gSaveContext+0x6b) /* 110EC 8082490C 00CB3021 */ addu $a2, $a2, $t3 -/* 110F0 80824910 90C6E6CB */ lbu $a2, -0x1935($a2) ## 8015E6CB +/* 110F0 80824910 90C6E6CB */ lbu $a2, %lo(gSaveContext+0x6b)($a2) /* 110F4 80824914 256B0001 */ addiu $t3, $t3, 0x0001 ## $t3 = 00000002 /* 110F8 80824918 000B5C00 */ sll $t3, $t3, 16 /* 110FC 8082491C 11260096 */ beq $t1, $a2, .L80824B78 @@ -1138,16 +1138,16 @@ glabel func_8082409C /* 119DC 808251FC 29410004 */ slti $at, $t2, 0x0004 /* 119E0 80825200 1420FF5E */ bne $at, $zero, .L80824F7C /* 119E4 80825204 000D6C03 */ sra $t5, $t5, 16 -/* 119E8 80825208 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 -/* 119EC 8082520C 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 -/* 119F0 80825210 252971A0 */ addiu $t1, $t1, 0x71A0 ## $t1 = 801271A0 -/* 119F4 80825214 25AD71F0 */ addiu $t5, $t5, 0x71F0 ## $t5 = 801271F0 +/* 119E8 80825208 3C0D8012 */ lui $t5, %hi(gEquipShifts) +/* 119EC 8082520C 3C098012 */ lui $t1, %hi(gEquipMasks) +/* 119F0 80825210 252971A0 */ addiu $t1, %lo(gEquipMasks) +/* 119F4 80825214 25AD71F0 */ addiu $t5, %lo(gEquipShifts) /* 119F8 80825218 00005825 */ or $t3, $zero, $zero ## $t3 = 00000000 .L8082521C: /* 119FC 8082521C 000BC840 */ sll $t9, $t3, 1 /* 11A00 80825220 01397821 */ addu $t7, $t1, $t9 -/* 11A04 80825224 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 11A08 80825228 95CEE6D0 */ lhu $t6, -0x1930($t6) ## 8015E6D0 +/* 11A04 80825224 3C0E8016 */ lui $t6, %hi(gSaveContext+0x70) +/* 11A08 80825228 95CEE6D0 */ lhu $t6, %lo(gSaveContext+0x70)($t6) /* 11A0C 8082522C 95F80000 */ lhu $t8, 0x0000($t7) ## 00000000 /* 11A10 80825230 01AB7821 */ addu $t7, $t5, $t3 /* 11A14 80825234 01D8C824 */ and $t9, $t6, $t8 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s index 9046fe9cc0..7d170efb19 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s @@ -16,7 +16,7 @@ glabel func_80825C14 /* 1242C 80825C4C 37180A01 */ ori $t8, $t8, 0x0A01 ## $t8 = E3000A01 /* 12430 80825C50 8CA202C0 */ lw $v0, 0x02C0($a1) ## 000002C0 /* 12434 80825C54 3C190010 */ lui $t9, 0x0010 ## $t9 = 00100000 -/* 12438 80825C58 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 12438 80825C58 3C068016 */ lui $a2, %hi(gGameInfo) /* 1243C 80825C5C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 12440 80825C60 ACAF02C0 */ sw $t7, 0x02C0($a1) ## 000002C0 /* 12444 80825C64 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 @@ -49,7 +49,7 @@ glabel func_80825C14 /* 124B0 80825CD0 3C0E8083 */ lui $t6, %hi(D_8082AB8C) ## $t6 = 80830000 /* 124B4 80825CD4 85CFAB8C */ lh $t7, %lo(D_8082AB8C)($t6) /* 124B8 80825CD8 8739AB90 */ lh $t9, %lo(D_8082AB90)($t9) -/* 124BC 80825CDC 24C6FA90 */ addiu $a2, $a2, 0xFA90 ## $a2 = 8015FA90 +/* 124BC 80825CDC 24C6FA90 */ addiu $a2, %lo(gGameInfo) /* 124C0 80825CE0 000FC600 */ sll $t8, $t7, 24 /* 124C4 80825CE4 332E00FF */ andi $t6, $t9, 0x00FF ## $t6 = 00000000 /* 124C8 80825CE8 000E7C00 */ sll $t7, $t6, 16 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808265BC.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808265BC.s index 8835459c40..16d880ce4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808265BC.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808265BC.s @@ -1,6 +1,6 @@ glabel func_808265BC -/* 12D9C 808265BC 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 12DA0 808265C0 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 +/* 12D9C 808265BC 3C058016 */ lui $a1, %hi(gGameInfo) +/* 12DA0 808265C0 24A5FA90 */ addiu $a1, %lo(gGameInfo) /* 12DA4 808265C4 8CAE0000 */ lw $t6, 0x0000($a1) ## 8015FA90 /* 12DA8 808265C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 12DAC 808265CC AFBF0014 */ sw $ra, 0x0014($sp) @@ -57,42 +57,42 @@ glabel func_808265BC /* 12E78 80826698 3C038083 */ lui $v1, %hi(D_8082AB6C) ## $v1 = 80830000 /* 12E7C 8082669C 03260019 */ multu $t9, $a2 /* 12E80 808266A0 2463AB6C */ addiu $v1, $v1, %lo(D_8082AB6C) ## $v1 = 8082AB6C -/* 12E84 808266A4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 12E84 808266A4 3C018016 */ lui $at, %hi(gSaveContext+0x13e2) /* 12E88 808266A8 2405000E */ addiu $a1, $zero, 0x000E ## $a1 = 0000000E /* 12E8C 808266AC 00004812 */ mflo $t1 /* 12E90 808266B0 00695021 */ addu $t2, $v1, $t1 /* 12E94 808266B4 91480000 */ lbu $t0, 0x0000($t2) ## 00000000 -/* 12E98 808266B8 A028FA42 */ sb $t0, -0x05BE($at) ## 8015FA42 +/* 12E98 808266B8 A028FA42 */ sb $t0, %lo(gSaveContext+0x13e2)($at) /* 12E9C 808266BC 944B01E8 */ lhu $t3, 0x01E8($v0) ## 000001E8 -/* 12EA0 808266C0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 12EA0 808266C0 3C018016 */ lui $at, %hi(gSaveContext+0x13e3) /* 12EA4 808266C4 01660019 */ multu $t3, $a2 /* 12EA8 808266C8 00006012 */ mflo $t4 /* 12EAC 808266CC 006C7021 */ addu $t6, $v1, $t4 /* 12EB0 808266D0 91CF0001 */ lbu $t7, 0x0001($t6) ## 00000001 -/* 12EB4 808266D4 A02FFA43 */ sb $t7, -0x05BD($at) ## 8015FA43 +/* 12EB4 808266D4 A02FFA43 */ sb $t7, %lo(gSaveContext+0x13e3)($at) /* 12EB8 808266D8 944D01E8 */ lhu $t5, 0x01E8($v0) ## 000001E8 -/* 12EBC 808266DC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 12EBC 808266DC 3C018016 */ lui $at, %hi(gSaveContext+0x13e4) /* 12EC0 808266E0 01A60019 */ multu $t5, $a2 /* 12EC4 808266E4 0000C012 */ mflo $t8 /* 12EC8 808266E8 0078C821 */ addu $t9, $v1, $t8 /* 12ECC 808266EC 93290002 */ lbu $t1, 0x0002($t9) ## 00000002 -/* 12ED0 808266F0 A029FA44 */ sb $t1, -0x05BC($at) ## 8015FA44 +/* 12ED0 808266F0 A029FA44 */ sb $t1, %lo(gSaveContext+0x13e4)($at) /* 12ED4 808266F4 944A01E8 */ lhu $t2, 0x01E8($v0) ## 000001E8 -/* 12ED8 808266F8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 12ED8 808266F8 3C018016 */ lui $at, %hi(gSaveContext+0x13e5) /* 12EDC 808266FC 01460019 */ multu $t2, $a2 /* 12EE0 80826700 3C0A8083 */ lui $t2, %hi(D_8082ABEC) ## $t2 = 80830000 /* 12EE4 80826704 00004012 */ mflo $t0 /* 12EE8 80826708 00685821 */ addu $t3, $v1, $t0 /* 12EEC 8082670C 916C0003 */ lbu $t4, 0x0003($t3) ## 00000003 -/* 12EF0 80826710 A02CFA45 */ sb $t4, -0x05BB($at) ## 8015FA45 +/* 12EF0 80826710 A02CFA45 */ sb $t4, %lo(gSaveContext+0x13e5)($at) /* 12EF4 80826714 944E01E8 */ lhu $t6, 0x01E8($v0) ## 000001E8 -/* 12EF8 80826718 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 12EF8 80826718 3C018016 */ lui $at, %hi(gSaveContext+0x13e6) /* 12EFC 8082671C 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF /* 12F00 80826720 01C60019 */ multu $t6, $a2 /* 12F04 80826724 00007812 */ mflo $t7 /* 12F08 80826728 006F6821 */ addu $t5, $v1, $t7 /* 12F0C 8082672C 91B80004 */ lbu $t8, 0x0004($t5) ## 00000004 -/* 12F10 80826730 A038FA46 */ sb $t8, -0x05BA($at) ## 8015FA46 +/* 12F10 80826730 A038FA46 */ sb $t8, %lo(gSaveContext+0x13e6)($at) /* 12F14 80826734 945901E6 */ lhu $t9, 0x01E6($v0) ## 000001E6 /* 12F18 80826738 944801D4 */ lhu $t0, 0x01D4($v0) ## 000001D4 /* 12F1C 8082673C 00194840 */ sll $t1, $t9, 1 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826AEC.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826AEC.s index 5a26309111..7e6d8d8577 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826AEC.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826AEC.s @@ -1,6 +1,6 @@ glabel func_80826AEC -/* 132CC 80826AEC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 132D0 80826AF0 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 132CC 80826AEC 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 132D0 80826AF0 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 132D4 80826AF4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 132D8 80826AF8 AFBF001C */ sw $ra, 0x001C($sp) /* 132DC 80826AFC AFA40030 */ sw $a0, 0x0030($sp) @@ -22,8 +22,8 @@ glabel func_80826AEC /* 1331C 80826B3C 03222821 */ addu $a1, $t9, $v0 /* 13320 80826B40 0C0006A8 */ jal DmaMgr_SendRequest1 /* 13324 80826B44 240607F8 */ addiu $a2, $zero, 0x07F8 ## $a2 = 000007F8 -/* 13328 80826B48 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 1332C 80826B4C 8D4AFA90 */ lw $t2, -0x0570($t2) ## 8015FA90 +/* 13328 80826B48 3C0A8016 */ lui $t2, %hi(gGameInfo) +/* 1332C 80826B4C 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) /* 13330 80826B50 8FA90030 */ lw $t1, 0x0030($sp) /* 13334 80826B54 8FA20024 */ lw $v0, 0x0024($sp) /* 13338 80826B58 854B0F2E */ lh $t3, 0x0F2E($t2) ## 80160F2E diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826BA8.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826BA8.s index 19672c7c9c..c20eb773cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826BA8.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826BA8.s @@ -27,8 +27,8 @@ glabel func_80826BA8 /* 133E8 80826C08 04400013 */ bltz $v0, .L80826C58 /* 133EC 80826C0C 28410011 */ slti $at, $v0, 0x0011 /* 133F0 80826C10 10200011 */ beq $at, $zero, .L80826C58 -/* 133F4 80826C14 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 133F8 80826C18 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 133F4 80826C14 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 133F8 80826C18 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 133FC 80826C1C 8479021A */ lh $t9, 0x021A($v1) ## 0000021A /* 13400 80826C20 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 13404 80826C24 85CF0F50 */ lh $t7, 0x0F50($t6) ## 80160F50 @@ -48,8 +48,8 @@ glabel func_80826BA8 /* 13438 80826C58 04400011 */ bltz $v0, .L80826CA0 /* 1343C 80826C5C 28410011 */ slti $at, $v0, 0x0011 /* 13440 80826C60 1020000F */ beq $at, $zero, .L80826CA0 -/* 13444 80826C64 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 13448 80826C68 8D08FA90 */ lw $t0, -0x0570($t0) ## 8015FA90 +/* 13444 80826C64 3C088016 */ lui $t0, %hi(gGameInfo) +/* 13448 80826C68 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) /* 1344C 80826C6C 846B021A */ lh $t3, 0x021A($v1) ## 0000021A /* 13450 80826C70 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 13454 80826C74 85090F50 */ lh $t1, 0x0F50($t0) ## 80160F50 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826CB4.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826CB4.s index 9a69319f98..2264766369 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826CB4.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826CB4.s @@ -3,9 +3,9 @@ glabel func_80826CB4 /* 13498 80826CB8 AFBF0024 */ sw $ra, 0x0024($sp) /* 1349C 80826CBC AFB10020 */ sw $s1, 0x0020($sp) /* 134A0 80826CC0 AFB0001C */ sw $s0, 0x001C($sp) -/* 134A4 80826CC4 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 134A4 80826CC4 3C088016 */ lui $t0, %hi(gGameInfo) /* 134A8 80826CC8 8C8E1C44 */ lw $t6, 0x1C44($a0) ## 00001C44 -/* 134AC 80826CCC 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 134AC 80826CCC 2508FA90 */ addiu $t0, %lo(gGameInfo) /* 134B0 80826CD0 8D0F0000 */ lw $t7, 0x0000($t0) ## 8015FA90 /* 134B4 80826CD4 AFAE0078 */ sw $t6, 0x0078($sp) /* 134B8 80826CD8 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 @@ -47,8 +47,8 @@ glabel func_80826CB4 /* 1353C 80826D5C 8FA50034 */ lw $a1, 0x0034($sp) /* 13540 80826D60 0C207F3D */ jal func_8081FCF4 /* 13544 80826D64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 13548 80826D68 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 1354C 80826D6C 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 13548 80826D68 3C088016 */ lui $t0, %hi(gGameInfo) +/* 1354C 80826D6C 2508FA90 */ addiu $t0, %lo(gGameInfo) /* 13550 80826D70 1000000F */ beq $zero, $zero, .L80826DB0 /* 13554 80826D74 960201D4 */ lhu $v0, 0x01D4($s0) ## 000001D4 .L80826D78: @@ -65,8 +65,8 @@ glabel func_80826CB4 .L80826D9C: /* 1357C 80826D9C 0C2099EB */ jal func_808267AC /* 13580 80826DA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 13584 80826DA4 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 13588 80826DA8 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 13584 80826DA4 3C088016 */ lui $t0, %hi(gGameInfo) +/* 13588 80826DA8 2508FA90 */ addiu $t0, %lo(gGameInfo) /* 1358C 80826DAC 960201D4 */ lhu $v0, 0x01D4($s0) ## 000001D4 .L80826DB0: /* 13590 80826DB0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 @@ -75,8 +75,8 @@ glabel func_80826CB4 /* 13598 80826DB8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 1359C 80826DBC 0C208D52 */ jal func_80823548 /* 135A0 80826DC0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 135A4 80826DC4 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 135A8 80826DC8 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 135A4 80826DC4 3C088016 */ lui $t0, %hi(gGameInfo) +/* 135A8 80826DC8 2508FA90 */ addiu $t0, %lo(gGameInfo) .L80826DCC: /* 135AC 80826DCC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 .L80826DD0: @@ -93,8 +93,8 @@ glabel func_80826CB4 /* 135D8 80826DF8 03200008 */ jr $t9 /* 135DC 80826DFC 00000000 */ nop glabel L80826E00 -/* 135E0 80826E00 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 135E4 80826E04 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 135E0 80826E00 3C098016 */ lui $t1, %hi(gSaveContext) +/* 135E4 80826E04 2529E660 */ addiu $t1, %lo(gSaveContext) /* 135E8 80826E08 912E13E2 */ lbu $t6, 0x13E2($t1) ## 8015FA42 /* 135EC 80826E0C 3C078083 */ lui $a3, %hi(D_808321A8) ## $a3 = 80830000 /* 135F0 80826E10 24E721A8 */ addiu $a3, $a3, %lo(D_808321A8) ## $a3 = 808321A8 @@ -169,11 +169,11 @@ glabel L80826E00 /* 136FC 80826F1C 8FA60030 */ lw $a2, 0x0030($sp) /* 13700 80826F20 8E0E0128 */ lw $t6, 0x0128($s0) ## 00000128 /* 13704 80826F24 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 13708 80826F28 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 13708 80826F28 3C098016 */ lui $t1, %hi(gSaveContext) /* 1370C 80826F2C 01C17821 */ addu $t7, $t6, $at -/* 13710 80826F30 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 13714 80826F34 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 -/* 13718 80826F38 AC2F6FC8 */ sw $t7, 0x6FC8($at) ## 80166FC8 +/* 13710 80826F30 3C018016 */ lui $at, %hi(gSegments+0x20) +/* 13714 80826F34 2529E660 */ addiu $t1, %lo(gSaveContext) +/* 13718 80826F38 AC2F6FC8 */ sw $t7, %lo(gSegments+0x20)($at) /* 1371C 80826F3C 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 .L80826F40: /* 13720 80826F40 3C028083 */ lui $v0, %hi(D_8082AC24) ## $v0 = 80830000 @@ -187,24 +187,24 @@ glabel L80826E00 /* 13740 80826F60 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 13744 80826F64 10580014 */ beq $v0, $t8, .L80826FB8 /* 13748 80826F68 0003C880 */ sll $t9, $v1, 2 -/* 1374C 80826F6C 3C028012 */ lui $v0, 0x8012 ## $v0 = 80120000 +/* 1374C 80826F6C 3C028012 */ lui $v0, %hi(gItemIcons) /* 13750 80826F70 00591021 */ addu $v0, $v0, $t9 -/* 13754 80826F74 8C42725C */ lw $v0, 0x725C($v0) ## 8012725C +/* 13754 80826F74 8C42725C */ lw $v0, %lo(gItemIcons)($v0) /* 13758 80826F78 24050400 */ addiu $a1, $zero, 0x0400 ## $a1 = 00000400 /* 1375C 80826F7C A7A30062 */ sh $v1, 0x0062($sp) /* 13760 80826F80 00027900 */ sll $t7, $v0, 4 /* 13764 80826F84 000FC702 */ srl $t8, $t7, 28 /* 13768 80826F88 0018C880 */ sll $t9, $t8, 2 -/* 1376C 80826F8C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 1376C 80826F8C 3C0F8016 */ lui $t7, %hi(gSegments) /* 13770 80826F90 01F97821 */ addu $t7, $t7, $t9 -/* 13774 80826F94 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 13774 80826F94 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 13778 80826F98 00417024 */ and $t6, $v0, $at /* 1377C 80826F9C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 13780 80826FA0 01CF2021 */ addu $a0, $t6, $t7 /* 13784 80826FA4 0C209943 */ jal func_8082650C /* 13788 80826FA8 00812021 */ addu $a0, $a0, $at -/* 1378C 80826FAC 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 13790 80826FB0 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 1378C 80826FAC 3C098016 */ lui $t1, %hi(gSaveContext) +/* 13790 80826FB0 2529E660 */ addiu $t1, %lo(gSaveContext) /* 13794 80826FB4 97A30062 */ lhu $v1, 0x0062($sp) .L80826FB8: /* 13798 80826FB8 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 @@ -242,13 +242,13 @@ glabel L80826E00 /* 13810 80827030 8E0F012C */ lw $t7, 0x012C($s0) ## 0000012C /* 13814 80827034 8FB8002C */ lw $t8, 0x002C($sp) /* 13818 80827038 2401FFF0 */ addiu $at, $zero, 0xFFF0 ## $at = FFFFFFF0 -/* 1381C 8082703C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 1381C 8082703C 3C098016 */ lui $t1, %hi(gSaveContext) /* 13820 80827040 01F8C821 */ addu $t9, $t7, $t8 /* 13824 80827044 272E000F */ addiu $t6, $t9, 0x000F ## $t6 = 0000000F /* 13828 80827048 01C17824 */ and $t7, $t6, $at /* 1382C 8082704C AE0F0130 */ sw $t7, 0x0130($s0) ## 00000130 /* 13830 80827050 963800A4 */ lhu $t8, 0x00A4($s1) ## 000000A4 -/* 13834 80827054 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 13834 80827054 2529E660 */ addiu $t1, %lo(gSaveContext) /* 13838 80827058 2F010019 */ sltiu $at, $t8, 0x0019 /* 1383C 8082705C 10200028 */ beq $at, $zero, L80827100 /* 13840 80827060 0018C080 */ sll $t8, $t8, 2 @@ -290,9 +290,9 @@ glabel L80827078 /* 138C8 808270E8 A079015D */ sb $t9, 0x015D($v1) ## 0000015D /* 138CC 808270EC 0C209AEA */ jal func_80826BA8 /* 138D0 808270F0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 138D4 808270F4 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 138D4 808270F4 3C098016 */ lui $t1, %hi(gSaveContext) /* 138D8 808270F8 10000018 */ beq $zero, $zero, .L8082715C -/* 138DC 808270FC 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 138DC 808270FC 2529E660 */ addiu $t1, %lo(gSaveContext) glabel L80827100 /* 138E0 80827100 3C02007E */ lui $v0, 0x007E ## $v0 = 007E0000 /* 138E4 80827104 3C0E007F */ lui $t6, 0x007F ## $t6 = 007F0000 @@ -316,8 +316,8 @@ glabel L80827100 /* 13928 80827148 24E7FED8 */ addiu $a3, $a3, %lo(D_8082FED8) ## $a3 = 8082FED8 /* 1392C 8082714C 0C0006A8 */ jal DmaMgr_SendRequest1 /* 13930 80827150 8FA50034 */ lw $a1, 0x0034($sp) -/* 13934 80827154 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 13938 80827158 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 13934 80827154 3C098016 */ lui $t1, %hi(gSaveContext) +/* 13938 80827158 2529E660 */ addiu $t1, %lo(gSaveContext) .L8082715C: /* 1393C 8082715C 8E180130 */ lw $t8, 0x0130($s0) ## 00000130 /* 13940 80827160 8FB90064 */ lw $t9, 0x0064($sp) @@ -430,8 +430,8 @@ glabel L80827100 /* 13ACC 808272EC 0C00084C */ jal osSyncPrintf /* 13AD0 808272F0 24A50800 */ addiu $a1, $a1, 0x0800 ## $a1 = 00000800 -/* 13AD4 808272F4 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 13AD8 808272F8 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 13AD4 808272F4 3C098016 */ lui $t1, %hi(gSaveContext) +/* 13AD8 808272F8 2529E660 */ addiu $t1, %lo(gSaveContext) /* 13ADC 808272FC 85281420 */ lh $t0, 0x1420($t1) ## 8015FA80 /* 13AE0 80827300 29010016 */ slti $at, $t0, 0x0016 /* 13AE4 80827304 50200042 */ beql $at, $zero, .L80827410 @@ -526,8 +526,8 @@ glabel L80827100 /* 13C3C 8082745C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 13C40 80827460 0C207C7C */ jal func_8081F1F0 /* 13C44 80827464 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 13C48 80827468 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 13C4C 8082746C 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 13C48 80827468 3C098016 */ lui $t1, %hi(gSaveContext) +/* 13C4C 8082746C 2529E660 */ addiu $t1, %lo(gSaveContext) /* 13C50 80827470 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 .L80827474: /* 13C54 80827474 02037021 */ addu $t6, $s0, $v1 @@ -536,22 +536,22 @@ glabel L80827100 /* 13C60 80827480 28610014 */ slti $at, $v1, 0x0014 /* 13C64 80827484 1420FFFB */ bne $at, $zero, .L80827474 /* 13C68 80827488 A1C00266 */ sb $zero, 0x0266($t6) ## 00000266 -/* 13C6C 8082748C 3C048012 */ lui $a0, 0x8012 ## $a0 = 80120000 -/* 13C70 80827490 24847120 */ addiu $a0, $a0, 0x7120 ## $a0 = 80127120 +/* 13C6C 8082748C 3C048012 */ lui $a0, %hi(gBitFlags) +/* 13C70 80827490 24847120 */ addiu $a0, %lo(gBitFlags) /* 13C74 80827494 8C8F0058 */ lw $t7, 0x0058($a0) ## 80127178 /* 13C78 80827498 8D2200A4 */ lw $v0, 0x00A4($t1) ## 8015E704 -/* 13C7C 8082749C 3C078012 */ lui $a3, 0x8012 ## $a3 = 80120000 -/* 13C80 808274A0 24E77464 */ addiu $a3, $a3, 0x7464 ## $a3 = 80127464 +/* 13C7C 8082749C 3C078012 */ lui $a3, %hi(gItemSlots) +/* 13C80 808274A0 24E77464 */ addiu $a3, %lo(gItemSlots) /* 13C84 808274A4 01E2C024 */ and $t8, $t7, $v0 /* 13C88 808274A8 13000004 */ beq $t8, $zero, .L808274BC -/* 13C8C 808274AC 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 +/* 13C8C 808274AC 3C088012 */ lui $t0, %hi(gEquipShifts) /* 13C90 808274B0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 13C94 808274B4 A2060266 */ sb $a2, 0x0266($s0) ## 00000266 /* 13C98 808274B8 8D2200A4 */ lw $v0, 0x00A4($t1) ## 8015E704 .L808274BC: /* 13C9C 808274BC 8C99000C */ lw $t9, 0x000C($a0) ## 8012712C /* 13CA0 808274C0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 13CA4 808274C4 250871F0 */ addiu $t0, $t0, 0x71F0 ## $t0 = 801271F0 +/* 13CA4 808274C4 250871F0 */ addiu $t0, %lo(gEquipShifts) /* 13CA8 808274C8 03227024 */ and $t6, $t9, $v0 /* 13CAC 808274CC 11C00002 */ beq $t6, $zero, .L808274D8 /* 13CB0 808274D0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 @@ -590,13 +590,13 @@ glabel L80827100 /* 13D20 80827540 8D2F00A4 */ lw $t7, 0x00A4($t1) ## 8015E704 /* 13D24 80827544 01CFC024 */ and $t8, $t6, $t7 /* 13D28 80827548 13000002 */ beq $t8, $zero, .L80827554 -/* 13D2C 8082754C 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 +/* 13D2C 8082754C 3C0E8012 */ lui $t6, %hi(gUpgradeMasks+0xc) /* 13D30 80827550 A2030268 */ sb $v1, 0x0268($s0) ## 00000268 .L80827554: /* 13D34 80827554 8D3900A0 */ lw $t9, 0x00A0($t1) ## 8015E700 -/* 13D38 80827558 8DCE71BC */ lw $t6, 0x71BC($t6) ## 801271BC -/* 13D3C 8082755C 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 -/* 13D40 80827560 931871F7 */ lbu $t8, 0x71F7($t8) ## 801271F7 +/* 13D38 80827558 8DCE71BC */ lw $t6, %lo(gUpgradeMasks+0xc)($t6) +/* 13D3C 8082755C 3C188012 */ lui $t8, %hi(gUpgradeShifts+3) +/* 13D40 80827560 931871F7 */ lbu $t8, %lo(gUpgradeShifts+3)($t8) /* 13D44 80827564 032E7824 */ and $t7, $t9, $t6 /* 13D48 80827568 030FC807 */ srav $t9, $t7, $t8 /* 13D4C 8082756C 53200003 */ beql $t9, $zero, .L8082757C @@ -945,9 +945,9 @@ glabel L808279D0 /* 141D4 808279F4 0C207CBF */ jal func_8081F2FC /* 141D8 808279F8 00000000 */ nop /* 141DC 808279FC 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 141E0 80827A00 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 141E0 80827A00 3C088016 */ lui $t0, %hi(gGameInfo) /* 141E4 80827A04 44811000 */ mtc1 $at, $f2 ## $f2 = 160.00 -/* 141E8 80827A08 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 141E8 80827A08 2508FA90 */ addiu $t0, %lo(gGameInfo) /* 141EC 80827A0C 8D190000 */ lw $t9, 0x0000($t0) ## 8015FA90 .L80827A10: /* 141F0 80827A10 C6060200 */ lwc1 $f6, 0x0200($s0) ## 00000200 @@ -1145,9 +1145,9 @@ glabel L80827CB4 /* 144A8 80827CC8 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF /* 144AC 80827CCC 0C021BC0 */ jal Interface_SetDoAction /* 144B0 80827CD0 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 144B4 80827CD4 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 144B4 80827CD4 3C088016 */ lui $t0, %hi(gGameInfo) /* 144B8 80827CD8 240E0012 */ addiu $t6, $zero, 0x0012 ## $t6 = 00000012 -/* 144BC 80827CDC 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 144BC 80827CDC 2508FA90 */ addiu $t0, %lo(gGameInfo) /* 144C0 80827CE0 A60E01D4 */ sh $t6, 0x01D4($s0) ## 000001D4 /* 144C4 80827CE4 8D190000 */ lw $t9, 0x0000($t0) ## 8015FA90 /* 144C8 80827CE8 240FE7A0 */ addiu $t7, $zero, 0xE7A0 ## $t7 = FFFFE7A0 @@ -1159,22 +1159,22 @@ glabel L80827CB4 .L80827D00: /* 144E0 80827D00 0061C027 */ nor $t8, $v1, $at /* 144E4 80827D04 1700070E */ bne $t8, $zero, L80829940 -/* 144E8 80827D08 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 144EC 80827D0C 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 144F0 80827D10 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 144E8 80827D08 3C078013 */ lui $a3, %hi(D_801333E0) +/* 144EC 80827D0C 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 144F0 80827D10 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 144F4 80827D14 A60001E6 */ sh $zero, 0x01E6($s0) ## 000001E6 /* 144F8 80827D18 A6000262 */ sh $zero, 0x0262($s0) ## 00000262 -/* 144FC 80827D1C 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 14500 80827D20 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 14504 80827D24 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 144FC 80827D1C 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 14500 80827D20 3C058013 */ lui $a1, %hi(D_801333D4) +/* 14504 80827D24 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 14508 80827D28 AFAE0014 */ sw $t6, 0x0014($sp) /* 1450C 80827D2C AFA70010 */ sw $a3, 0x0010($sp) /* 14510 80827D30 24044808 */ addiu $a0, $zero, 0x4808 ## $a0 = 00004808 /* 14514 80827D34 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 14518 80827D38 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 1451C 80827D3C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 14520 80827D40 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 1451C 80827D3C 3C098016 */ lui $t1, %hi(gSaveContext) +/* 14520 80827D40 2529E660 */ addiu $t1, %lo(gSaveContext) /* 14524 80827D44 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF /* 14528 80827D48 A12213E5 */ sb $v0, 0x13E5($t1) ## 8015FA45 /* 1452C 80827D4C A12213E4 */ sb $v0, 0x13E4($t1) ## 8015FA44 @@ -1228,9 +1228,9 @@ glabel L80827DCC /* 145DC 80827DFC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 145E0 80827E00 0C021BC0 */ jal Interface_SetDoAction /* 145E4 80827E04 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 145E8 80827E08 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 145E8 80827E08 3C088016 */ lui $t0, %hi(gGameInfo) /* 145EC 80827E0C 24190012 */ addiu $t9, $zero, 0x0012 ## $t9 = 00000012 -/* 145F0 80827E10 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 145F0 80827E10 2508FA90 */ addiu $t0, %lo(gGameInfo) /* 145F4 80827E14 A61901D4 */ sh $t9, 0x01D4($s0) ## 000001D4 /* 145F8 80827E18 8D0E0000 */ lw $t6, 0x0000($t0) ## 8015FA90 /* 145FC 80827E1C 2418E7A0 */ addiu $t8, $zero, 0xE7A0 ## $t8 = FFFFE7A0 @@ -1245,23 +1245,23 @@ glabel L80827DCC /* 1461C 80827E3C 8E0F0194 */ lw $t7, 0x0194($s0) ## 00000194 /* 14620 80827E40 0C03B616 */ jal func_800ED858 /* 14624 80827E44 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 14628 80827E48 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 1462C 80827E4C 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 14630 80827E50 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 14628 80827E48 3C078013 */ lui $a3, %hi(D_801333E0) +/* 1462C 80827E4C 3C198013 */ lui $t9, %hi(D_801333E8) +/* 14630 80827E50 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 14634 80827E54 A60001E4 */ sh $zero, 0x01E4($s0) ## 000001E4 /* 14638 80827E58 A60001E6 */ sh $zero, 0x01E6($s0) ## 000001E6 /* 1463C 80827E5C A6000262 */ sh $zero, 0x0262($s0) ## 00000262 -/* 14640 80827E60 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 14644 80827E64 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 14648 80827E68 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 14640 80827E60 273933E8 */ addiu $t9, %lo(D_801333E8) +/* 14644 80827E64 3C058013 */ lui $a1, %hi(D_801333D4) +/* 14648 80827E68 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 1464C 80827E6C AFB90014 */ sw $t9, 0x0014($sp) /* 14650 80827E70 AFA70010 */ sw $a3, 0x0010($sp) /* 14654 80827E74 24044808 */ addiu $a0, $zero, 0x4808 ## $a0 = 00004808 /* 14658 80827E78 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 1465C 80827E7C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 14660 80827E80 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 14664 80827E84 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 14660 80827E80 3C098016 */ lui $t1, %hi(gSaveContext) +/* 14664 80827E84 2529E660 */ addiu $t1, %lo(gSaveContext) /* 14668 80827E88 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF /* 1466C 80827E8C A12213E5 */ sb $v0, 0x13E5($t1) ## 8015FA45 /* 14670 80827E90 A12213E4 */ sb $v0, 0x13E4($t1) ## 8015FA44 @@ -1278,16 +1278,16 @@ glabel L80827DCC /* 1469C 80827EBC 8E0F0194 */ lw $t7, 0x0194($s0) ## 00000194 .L80827EC0: /* 146A0 80827EC0 86190264 */ lh $t9, 0x0264($s0) ## 00000264 -/* 146A4 80827EC4 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 146A4 80827EC4 3C078013 */ lui $a3, %hi(D_801333E0) /* 146A8 80827EC8 91E20001 */ lbu $v0, 0x0001($t7) ## 00000001 -/* 146AC 80827ECC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 146AC 80827ECC 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 146B0 80827ED0 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 /* 146B4 80827ED4 17220011 */ bne $t9, $v0, .L80827F1C /* 146B8 80827ED8 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 146BC 80827EDC 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 146C0 80827EE0 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 146C4 80827EE4 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 146C8 80827EE8 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 146BC 80827EDC 3C188013 */ lui $t8, %hi(D_801333E8) +/* 146C0 80827EE0 271833E8 */ addiu $t8, %lo(D_801333E8) +/* 146C4 80827EE4 3C058013 */ lui $a1, %hi(D_801333D4) +/* 146C8 80827EE8 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 146CC 80827EEC AFB80014 */ sw $t8, 0x0014($sp) /* 146D0 80827EF0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 146D4 80827EF4 0C03DCE3 */ jal Audio_PlaySoundGeneral @@ -1303,12 +1303,12 @@ glabel L80827DCC /* 146F8 80827F18 A422B25C */ sh $v0, %lo(D_8082B25C)($at) .L80827F1C: /* 146FC 80827F1C 14A20688 */ bne $a1, $v0, L80829940 -/* 14700 80827F20 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 14704 80827F24 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 14708 80827F28 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 1470C 80827F2C 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 14710 80827F30 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 14714 80827F34 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 14700 80827F20 3C078013 */ lui $a3, %hi(D_801333E0) +/* 14704 80827F24 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 14708 80827F28 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 1470C 80827F2C 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 14710 80827F30 3C058013 */ lui $a1, %hi(D_801333D4) +/* 14714 80827F34 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 14718 80827F38 AFAF0014 */ sw $t7, 0x0014($sp) /* 1471C 80827F3C AFA70010 */ sw $a3, 0x0010($sp) /* 14720 80827F40 24044827 */ addiu $a0, $zero, 0x4827 ## $a0 = 00004827 @@ -1353,9 +1353,9 @@ glabel L80827FB4 /* 147B0 80827FD0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 147B4 80827FD4 0C021BC0 */ jal Interface_SetDoAction /* 147B8 80827FD8 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 147BC 80827FDC 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 147BC 80827FDC 3C088016 */ lui $t0, %hi(gGameInfo) /* 147C0 80827FE0 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 -/* 147C4 80827FE4 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 147C4 80827FE4 2508FA90 */ addiu $t0, %lo(gGameInfo) /* 147C8 80827FE8 A61801D4 */ sh $t8, 0x01D4($s0) ## 000001D4 /* 147CC 80827FEC 8D0F0000 */ lw $t7, 0x0000($t0) ## 8015FA90 /* 147D0 80827FF0 240EE7A0 */ addiu $t6, $zero, 0xE7A0 ## $t6 = FFFFE7A0 @@ -1370,23 +1370,23 @@ glabel L80827FB4 /* 147F0 80828010 8FBF0024 */ lw $ra, 0x0024($sp) /* 147F4 80828014 0C03B616 */ jal func_800ED858 /* 147F8 80828018 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 147FC 8082801C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 14800 80828020 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 14804 80828024 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 147FC 8082801C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 14800 80828020 3C188013 */ lui $t8, %hi(D_801333E8) +/* 14804 80828024 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 14808 80828028 A60001E4 */ sh $zero, 0x01E4($s0) ## 000001E4 /* 1480C 8082802C A60001E6 */ sh $zero, 0x01E6($s0) ## 000001E6 /* 14810 80828030 A6000262 */ sh $zero, 0x0262($s0) ## 00000262 -/* 14814 80828034 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 14818 80828038 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 1481C 8082803C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 14814 80828034 271833E8 */ addiu $t8, %lo(D_801333E8) +/* 14818 80828038 3C058013 */ lui $a1, %hi(D_801333D4) +/* 1481C 8082803C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 14820 80828040 AFB80014 */ sw $t8, 0x0014($sp) /* 14824 80828044 AFA70010 */ sw $a3, 0x0010($sp) /* 14828 80828048 24044808 */ addiu $a0, $zero, 0x4808 ## $a0 = 00004808 /* 1482C 8082804C 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 14830 80828050 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 14834 80828054 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 14838 80828058 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 14834 80828054 3C098016 */ lui $t1, %hi(gSaveContext) +/* 14838 80828058 2529E660 */ addiu $t1, %lo(gSaveContext) /* 1483C 8082805C 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF /* 14840 80828060 A12213E5 */ sb $v0, 0x13E5($t1) ## 8015FA45 /* 14844 80828064 A12213E4 */ sb $v0, 0x13E4($t1) ## 8015FA44 @@ -1481,15 +1481,15 @@ glabel L80828198 /* 14988 808281A8 15C00038 */ bne $t6, $zero, .L8082828C /* 1498C 808281AC 2401EFFF */ addiu $at, $zero, 0xEFFF ## $at = FFFFEFFF /* 14990 808281B0 860F0262 */ lh $t7, 0x0262($s0) ## 00000262 -/* 14994 808281B4 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 14998 808281B8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 14994 808281B4 3C078013 */ lui $a3, %hi(D_801333E0) +/* 14998 808281B8 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 1499C 808281BC 11E0001D */ beq $t7, $zero, .L80828234 /* 149A0 808281C0 24044823 */ addiu $a0, $zero, 0x4823 ## $a0 = 00004823 /* 149A4 808281C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 149A8 808281C8 0C021BC0 */ jal Interface_SetDoAction /* 149AC 808281CC 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 149B0 808281D0 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 149B4 808281D4 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 149B0 808281D0 3C098016 */ lui $t1, %hi(gSaveContext) +/* 149B4 808281D4 2529E660 */ addiu $t1, %lo(gSaveContext) /* 149B8 808281D8 A12013E5 */ sb $zero, 0x13E5($t1) ## 8015FA45 /* 149BC 808281DC A12013E4 */ sb $zero, 0x13E4($t1) ## 8015FA44 /* 149C0 808281E0 A12013E3 */ sb $zero, 0x13E3($t1) ## 8015FA43 @@ -1498,8 +1498,8 @@ glabel L80828198 /* 149CC 808281EC 0C020978 */ jal Interface_ChangeAlpha /* 149D0 808281F0 24040032 */ addiu $a0, $zero, 0x0032 ## $a0 = 00000032 /* 149D4 808281F4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 149D8 808281F8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 149DC 808281FC 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 149D8 808281F8 3C088016 */ lui $t0, %hi(gGameInfo) +/* 149DC 808281FC 2508FA90 */ addiu $t0, %lo(gGameInfo) /* 149E0 80828200 A60601EC */ sh $a2, 0x01EC($s0) ## 000001EC /* 149E4 80828204 8D190000 */ lw $t9, 0x0000($t0) ## 8015FA90 /* 149E8 80828208 2418E7A0 */ addiu $t8, $zero, 0xE7A0 ## $t8 = FFFFE7A0 @@ -1514,10 +1514,10 @@ glabel L80828198 /* 14A0C 8082822C 100005C5 */ beq $zero, $zero, .L80829944 /* 14A10 80828230 8FBF0024 */ lw $ra, 0x0024($sp) .L80828234: -/* 14A14 80828234 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 14A18 80828238 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 14A1C 8082823C 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 14A20 80828240 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 14A14 80828234 3C198013 */ lui $t9, %hi(D_801333E8) +/* 14A18 80828238 273933E8 */ addiu $t9, %lo(D_801333E8) +/* 14A1C 8082823C 3C058013 */ lui $a1, %hi(D_801333D4) +/* 14A20 80828240 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 14A24 80828244 AFB90014 */ sw $t9, 0x0014($sp) /* 14A28 80828248 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 14A2C 8082824C 0C03DCE3 */ jal Audio_PlaySoundGeneral @@ -1526,8 +1526,8 @@ glabel L80828198 /* 14A34 80828254 0C030291 */ jal Gameplay_SaveSceneFlags /* 14A38 80828258 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 14A3C 8082825C 862E00A4 */ lh $t6, 0x00A4($s1) ## 000000A4 -/* 14A40 80828260 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 14A44 80828264 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 14A40 80828260 3C098016 */ lui $t1, %hi(gSaveContext) +/* 14A44 80828264 2529E660 */ addiu $t1, %lo(gSaveContext) /* 14A48 80828268 26241F74 */ addiu $a0, $s1, 0x1F74 ## $a0 = 00001F74 /* 14A4C 8082826C 0C02A235 */ jal func_800A88D4 /* 14A50 80828270 A52E0066 */ sh $t6, 0x0066($t1) ## 8015E6C6 @@ -1548,8 +1548,8 @@ glabel L80828198 /* 14A84 808282A4 0C021BC0 */ jal Interface_SetDoAction /* 14A88 808282A8 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A /* 14A8C 808282AC 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 14A90 808282B0 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 14A94 808282B4 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 14A90 808282B0 3C088016 */ lui $t0, %hi(gGameInfo) +/* 14A94 808282B4 2508FA90 */ addiu $t0, %lo(gGameInfo) /* 14A98 808282B8 A60601EC */ sh $a2, 0x01EC($s0) ## 000001EC /* 14A9C 808282BC 8D0F0000 */ lw $t7, 0x0000($t0) ## 8015FA90 /* 14AA0 808282C0 240EE7A0 */ addiu $t6, $zero, 0xE7A0 ## $t6 = FFFFE7A0 @@ -1561,8 +1561,8 @@ glabel L80828198 /* 14AB8 808282D8 44199000 */ mfc1 $t9, $f18 /* 14ABC 808282DC 0C03D938 */ jal func_800F64E0 /* 14AC0 808282E0 A5D904A4 */ sh $t9, 0x04A4($t6) ## FFFFEC44 -/* 14AC4 808282E4 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 14AC8 808282E8 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 14AC4 808282E4 3C098016 */ lui $t1, %hi(gSaveContext) +/* 14AC8 808282E8 2529E660 */ addiu $t1, %lo(gSaveContext) /* 14ACC 808282EC A12013E5 */ sb $zero, 0x13E5($t1) ## 8015FA45 /* 14AD0 808282F0 A12013E4 */ sb $zero, 0x13E4($t1) ## 8015FA44 /* 14AD4 808282F4 A12013E3 */ sb $zero, 0x13E3($t1) ## 8015FA43 @@ -1596,8 +1596,8 @@ glabel L80828310 .L80828360: /* 14B40 80828360 0C021BC0 */ jal Interface_SetDoAction /* 14B44 80828364 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 14B48 80828368 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 14B4C 8082836C 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 14B48 80828368 3C098016 */ lui $t1, %hi(gSaveContext) +/* 14B4C 8082836C 2529E660 */ addiu $t1, %lo(gSaveContext) /* 14B50 80828370 A12013E5 */ sb $zero, 0x13E5($t1) ## 8015FA45 /* 14B54 80828374 A12013E4 */ sb $zero, 0x13E4($t1) ## 8015FA44 /* 14B58 80828378 A12013E3 */ sb $zero, 0x13E3($t1) ## 8015FA43 @@ -1605,9 +1605,9 @@ glabel L80828310 /* 14B60 80828380 A52013EA */ sh $zero, 0x13EA($t1) ## 8015FA4A /* 14B64 80828384 0C020978 */ jal Interface_ChangeAlpha /* 14B68 80828388 24040032 */ addiu $a0, $zero, 0x0032 ## $a0 = 00000032 -/* 14B6C 8082838C 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 14B6C 8082838C 3C088016 */ lui $t0, %hi(gGameInfo) /* 14B70 80828390 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 14B74 80828394 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 14B74 80828394 2508FA90 */ addiu $t0, %lo(gGameInfo) /* 14B78 80828398 A60E01EC */ sh $t6, 0x01EC($s0) ## 000001EC /* 14B7C 8082839C 8D180000 */ lw $t8, 0x0000($t0) ## 8015FA90 /* 14B80 808283A0 240FE7A0 */ addiu $t7, $zero, 0xE7A0 ## $t7 = FFFFE7A0 @@ -1943,11 +1943,11 @@ glabel L808286FC /* 15054 80828874 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 15058 80828878 8E0E0130 */ lw $t6, 0x0130($s0) ## 00000130 /* 1505C 8082887C 2401FFF0 */ addiu $at, $zero, 0xFFF0 ## $at = FFFFFFF0 -/* 15060 80828880 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 15060 80828880 3C098016 */ lui $t1, %hi(gSaveContext) /* 15064 80828884 01D1C021 */ addu $t8, $t6, $s1 /* 15068 80828888 270F000F */ addiu $t7, $t8, 0x000F ## $t7 = 0000000F /* 1506C 8082888C 01E1C824 */ and $t9, $t7, $at -/* 15070 80828890 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 15070 80828890 2529E660 */ addiu $t1, %lo(gSaveContext) /* 15074 80828894 AE190134 */ sw $t9, 0x0134($s0) ## 00000134 /* 15078 80828898 91231409 */ lbu $v1, 0x1409($t1) ## 8015FA69 /* 1507C 8082889C 3C048083 */ lui $a0, %hi(D_808300E0) ## $a0 = 80830000 @@ -1972,9 +1972,9 @@ glabel L808286FC /* 150C4 808288E4 24E70104 */ addiu $a3, $a3, %lo(D_80830104) ## $a3 = 80830104 /* 150C8 808288E8 0C0006A8 */ jal DmaMgr_SendRequest1 /* 150CC 808288EC 8FA50034 */ lw $a1, 0x0034($sp) -/* 150D0 808288F0 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 150D0 808288F0 3C088016 */ lui $t0, %hi(gGameInfo) /* 150D4 808288F4 1000002D */ beq $zero, $zero, .L808289AC -/* 150D8 808288F8 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 150D8 808288F8 2508FA90 */ addiu $t0, %lo(gGameInfo) .L808288FC: /* 150DC 808288FC 14610017 */ bne $v1, $at, .L8082895C /* 150E0 80828900 3C048083 */ lui $a0, %hi(D_80830160) ## $a0 = 80830000 @@ -1998,9 +1998,9 @@ glabel L808286FC /* 15124 80828944 24E70144 */ addiu $a3, $a3, %lo(D_80830144) ## $a3 = 80830144 /* 15128 80828948 0C0006A8 */ jal DmaMgr_SendRequest1 /* 1512C 8082894C 8FA50034 */ lw $a1, 0x0034($sp) -/* 15130 80828950 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 15130 80828950 3C088016 */ lui $t0, %hi(gGameInfo) /* 15134 80828954 10000015 */ beq $zero, $zero, .L808289AC -/* 15138 80828958 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 15138 80828958 2508FA90 */ addiu $t0, %lo(gGameInfo) .L8082895C: /* 1513C 8082895C 3C020081 */ lui $v0, 0x0081 ## $v0 = 00810000 /* 15140 80828960 3C0E0082 */ lui $t6, 0x0082 ## $t6 = 00820000 @@ -2021,8 +2021,8 @@ glabel L808286FC /* 15178 80828998 24E70184 */ addiu $a3, $a3, %lo(D_80830184) ## $a3 = 80830184 /* 1517C 8082899C 0C0006A8 */ jal DmaMgr_SendRequest1 /* 15180 808289A0 8FA50034 */ lw $a1, 0x0034($sp) -/* 15184 808289A4 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 15188 808289A8 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 15184 808289A4 3C088016 */ lui $t0, %hi(gGameInfo) +/* 15188 808289A8 2508FA90 */ addiu $t0, %lo(gGameInfo) .L808289AC: /* 1518C 808289AC 8D180000 */ lw $t8, 0x0000($t0) ## 8015FA90 /* 15190 808289B0 3C068083 */ lui $a2, %hi(D_8082AB9C) ## $a2 = 80830000 @@ -2383,7 +2383,7 @@ glabel L80828E54 /* 15658 80828E78 468042A0 */ cvt.s.w $f10, $f8 /* 1565C 80828E7C 44816000 */ mtc1 $at, $f12 ## $f12 = -628.00 /* 15660 80828E80 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 15664 80828E84 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 15664 80828E84 3C098016 */ lui $t1, %hi(gSaveContext) /* 15668 80828E88 460A1183 */ div.s $f6, $f2, $f10 /* 1566C 80828E8C 46062401 */ sub.s $f16, $f4, $f6 /* 15670 80828E90 E6100204 */ swc1 $f16, 0x0204($s0) ## 00000204 @@ -2523,7 +2523,7 @@ glabel L80828E54 /* 15858 80829078 A72F0FC4 */ sh $t7, 0x0FC4($t9) ## 00000FCE /* 1585C 8082907C 8D0E0000 */ lw $t6, 0x0000($t0) ## 8015FA90 /* 15860 80829080 240F000E */ addiu $t7, $zero, 0x000E ## $t7 = 0000000E -/* 15864 80829084 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 15864 80829084 2529E660 */ addiu $t1, %lo(gSaveContext) /* 15868 80829088 A5C00D98 */ sh $zero, 0x0D98($t6) ## 00000E2E /* 1586C 8082908C A6180208 */ sh $t8, 0x0208($s0) ## 00000208 /* 15870 80829090 A60F01D4 */ sh $t7, 0x01D4($s0) ## 000001D4 @@ -2555,17 +2555,17 @@ glabel L808290DC /* 158CC 808290EC 55C00215 */ bnel $t6, $zero, .L80829944 /* 158D0 808290F0 8FBF0024 */ lw $ra, 0x0024($sp) /* 158D4 808290F4 86180262 */ lh $t8, 0x0262($s0) ## 00000262 -/* 158D8 808290F8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 158DC 808290FC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 158D8 808290F8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 158DC 808290FC 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 158E0 80829100 13000016 */ beq $t8, $zero, .L8082915C /* 158E4 80829104 24044823 */ addiu $a0, $zero, 0x4823 ## $a0 = 00004823 -/* 158E8 80829108 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 158EC 8082910C 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 158F0 80829110 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 158E8 80829108 3C078013 */ lui $a3, %hi(D_801333E0) +/* 158EC 8082910C 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 158F0 80829110 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 158F4 80829114 A6000262 */ sh $zero, 0x0262($s0) ## 00000262 -/* 158F8 80829118 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 158FC 8082911C 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 15900 80829120 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 158F8 80829118 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 158FC 8082911C 3C058013 */ lui $a1, %hi(D_801333D4) +/* 15900 80829120 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 15904 80829124 AFAF0014 */ sw $t7, 0x0014($sp) /* 15908 80829128 AFA70010 */ sw $a3, 0x0010($sp) /* 1590C 8082912C 24044808 */ addiu $a0, $zero, 0x4808 ## $a0 = 00004808 @@ -2582,10 +2582,10 @@ glabel L808290DC /* 15934 80829154 100001FA */ beq $zero, $zero, L80829940 /* 15938 80829158 A4580000 */ sh $t8, 0x0000($v0) ## 00000000 .L8082915C: -/* 1593C 8082915C 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 15940 80829160 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 15944 80829164 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 15948 80829168 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 1593C 8082915C 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 15940 80829160 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 15944 80829164 3C058013 */ lui $a1, %hi(D_801333D4) +/* 15948 80829168 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 1594C 8082916C AFAF0014 */ sw $t7, 0x0014($sp) /* 15950 80829170 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 15954 80829174 0C03DCE3 */ jal Audio_PlaySoundGeneral @@ -2595,8 +2595,8 @@ glabel L808290DC /* 15960 80829180 0C030291 */ jal Gameplay_SaveSceneFlags /* 15964 80829184 02202025 */ or $a0, $s1, $zero ## $a0 = 8082AB98 /* 15968 80829188 863900A4 */ lh $t9, 0x00A4($s1) ## 8082AC3C -/* 1596C 8082918C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 15970 80829190 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 1596C 8082918C 3C098016 */ lui $t1, %hi(gSaveContext) +/* 15970 80829190 2529E660 */ addiu $t1, %lo(gSaveContext) /* 15974 80829194 26241F74 */ addiu $a0, $s1, 0x1F74 ## $a0 = 8082CB0C /* 15978 80829198 0C02A235 */ jal func_800A88D4 /* 1597C 8082919C A5390066 */ sh $t9, 0x0066($t1) ## 8015E6C6 @@ -2664,14 +2664,14 @@ glabel L80829264 /* 15A64 80829284 8FBF0024 */ lw $ra, 0x0024($sp) .L80829288: /* 15A68 80829288 86190262 */ lh $t9, 0x0262($s0) ## 00000262 -/* 15A6C 8082928C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 15A70 80829290 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 15A6C 8082928C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 15A70 80829290 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 15A74 80829294 1720006D */ bne $t9, $zero, .L8082944C /* 15A78 80829298 24044823 */ addiu $a0, $zero, 0x4823 ## $a0 = 00004823 -/* 15A7C 8082929C 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 15A80 808292A0 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 15A84 808292A4 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 15A88 808292A8 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 15A7C 8082929C 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 15A80 808292A0 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 15A84 808292A4 3C058013 */ lui $a1, %hi(D_801333D4) +/* 15A88 808292A8 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 15A8C 808292AC AFAE0014 */ sw $t6, 0x0014($sp) /* 15A90 808292B0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 15A94 808292B4 0C03DCE3 */ jal Audio_PlaySoundGeneral @@ -2679,8 +2679,8 @@ glabel L80829264 /* 15A98 808292B8 AFA70010 */ sw $a3, 0x0010($sp) /* 15A9C 808292BC 0C030291 */ jal Gameplay_SaveSceneFlags /* 15AA0 808292C0 02202025 */ or $a0, $s1, $zero ## $a0 = 8082AB98 -/* 15AA4 808292C4 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 15AA8 808292C8 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 15AA4 808292C4 3C098016 */ lui $t1, %hi(gSaveContext) +/* 15AA8 808292C8 2529E660 */ addiu $t1, %lo(gSaveContext) /* 15AAC 808292CC 8D220000 */ lw $v0, 0x0000($t1) ## 8015E660 /* 15AB0 808292D0 2841016A */ slti $at, $v0, 0x016A /* 15AB4 808292D4 14200023 */ bne $at, $zero, .L80829364 @@ -2794,12 +2794,12 @@ glabel L80829440 /* 15C24 80829444 1000000C */ beq $zero, $zero, L80829478 /* 15C28 80829448 AD2F0000 */ sw $t7, 0x0000($t1) ## 8015E660 .L8082944C: -/* 15C2C 8082944C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 15C30 80829450 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 15C34 80829454 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 15C38 80829458 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 15C3C 8082945C 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 15C40 80829460 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 15C2C 8082944C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 15C30 80829450 3C198013 */ lui $t9, %hi(D_801333E8) +/* 15C34 80829454 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 15C38 80829458 273933E8 */ addiu $t9, %lo(D_801333E8) +/* 15C3C 8082945C 3C058013 */ lui $a1, %hi(D_801333D4) +/* 15C40 80829460 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 15C44 80829464 AFB90014 */ sw $t9, 0x0014($sp) /* 15C48 80829468 AFA70010 */ sw $a3, 0x0010($sp) /* 15C4C 8082946C 24044808 */ addiu $a0, $zero, 0x4808 ## $a0 = 00004808 @@ -2844,8 +2844,8 @@ glabel L80829484 /* 15CD8 808294F8 00000000 */ nop /* 15CDC 808294FC 0C030322 */ jal Gameplay_TriggerRespawn /* 15CE0 80829500 02202025 */ or $a0, $s1, $zero ## $a0 = 8082AB98 -/* 15CE4 80829504 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 15CE8 80829508 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 15CE4 80829504 3C098016 */ lui $t1, %hi(gSaveContext) +/* 15CE8 80829508 2529E660 */ addiu $t1, %lo(gSaveContext) /* 15CEC 8082950C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 15CF0 80829510 240EFFFE */ addiu $t6, $zero, 0xFFFE ## $t6 = FFFFFFFE /* 15CF4 80829514 24180030 */ addiu $t8, $zero, 0x0030 ## $t8 = 00000030 @@ -2856,8 +2856,8 @@ glabel L80829484 /* 15D08 80829528 0C03E803 */ jal Audio_SetBGM /* 15D0C 8082952C 3484000A */ ori $a0, $a0, 0x000A ## $a0 = F000000A -/* 15D10 80829530 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 15D14 80829534 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 15D10 80829530 3C098016 */ lui $t1, %hi(gSaveContext) +/* 15D14 80829534 2529E660 */ addiu $t1, %lo(gSaveContext) /* 15D18 80829538 3C048083 */ lui $a0, %hi(D_808301B8) ## $a0 = 80830000 /* 15D1C 8082953C A5201424 */ sh $zero, 0x1424($t1) ## 8015FA84 /* 15D20 80829540 A52013F0 */ sh $zero, 0x13F0($t1) ## 8015FA50 @@ -2865,22 +2865,22 @@ glabel L80829484 /* 15D28 80829548 0C00084C */ jal osSyncPrintf /* 15D2C 8082954C 248401B8 */ addiu $a0, $a0, %lo(D_808301B8) ## $a0 = 808301B8 -/* 15D30 80829550 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 15D34 80829554 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 15D30 80829550 3C098016 */ lui $t1, %hi(gSaveContext) +/* 15D34 80829554 2529E660 */ addiu $t1, %lo(gSaveContext) /* 15D38 80829558 3C048083 */ lui $a0, %hi(D_808301C0) ## $a0 = 80830000 /* 15D3C 8082955C 248401C0 */ addiu $a0, $a0, %lo(D_808301C0) ## $a0 = 808301C0 /* 15D40 80829560 0C00084C */ jal osSyncPrintf /* 15D44 80829564 81250033 */ lb $a1, 0x0033($t1) ## 8015E693 -/* 15D48 80829568 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 15D4C 8082956C 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 15D48 80829568 3C098016 */ lui $t1, %hi(gSaveContext) +/* 15D4C 8082956C 2529E660 */ addiu $t1, %lo(gSaveContext) /* 15D50 80829570 3C048083 */ lui $a0, %hi(D_808301D0) ## $a0 = 80830000 /* 15D54 80829574 248401D0 */ addiu $a0, $a0, %lo(D_808301D0) ## $a0 = 808301D0 /* 15D58 80829578 0C00084C */ jal osSyncPrintf /* 15D5C 8082957C 852513F6 */ lh $a1, 0x13F6($t1) ## 8015FA56 -/* 15D60 80829580 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 15D64 80829584 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 15D60 80829580 3C098016 */ lui $t1, %hi(gSaveContext) +/* 15D64 80829584 2529E660 */ addiu $t1, %lo(gSaveContext) /* 15D68 80829588 812F0033 */ lb $t7, 0x0033($t1) ## 8015E693 /* 15D6C 8082958C A1200033 */ sb $zero, 0x0033($t1) ## 8015E693 /* 15D70 80829590 81250033 */ lb $a1, 0x0033($t1) ## 8015E693 @@ -2891,8 +2891,8 @@ glabel L80829484 /* 15D84 808295A4 0C00084C */ jal osSyncPrintf /* 15D88 808295A8 A1250032 */ sb $a1, 0x0032($t1) ## 8015E692 -/* 15D8C 808295AC 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 15D90 808295B0 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 15D8C 808295AC 3C098016 */ lui $t1, %hi(gSaveContext) +/* 15D90 808295B0 2529E660 */ addiu $t1, %lo(gSaveContext) /* 15D94 808295B4 3C048083 */ lui $a0, %hi(D_808301FC) ## $a0 = 80830000 /* 15D98 808295B8 248401FC */ addiu $a0, $a0, %lo(D_808301FC) ## $a0 = 808301FC /* 15D9C 808295BC 0C00084C */ jal osSyncPrintf @@ -2905,8 +2905,8 @@ glabel L80829484 /* 15DB0 808295D0 100000DC */ beq $zero, $zero, .L80829944 /* 15DB4 808295D4 8FBF0024 */ lw $ra, 0x0024($sp) .L808295D8: -/* 15DB8 808295D8 3C198080 */ lui $t9, 0x8080 ## $t9 = 80800000 -/* 15DBC 808295DC 27393CAC */ addiu $t9, $t9, 0x3CAC ## $t9 = 80803CAC +/* 15DB8 808295D8 3C198080 */ lui $t9, %hi(Opening_Init) +/* 15DBC 808295DC 27393CAC */ addiu $t9, %lo(Opening_Init) /* 15DC0 808295E0 AE200098 */ sw $zero, 0x0098($s1) ## 8082AC30 /* 15DC4 808295E4 AE39000C */ sw $t9, 0x000C($s1) ## 8082ABA4 /* 15DC8 808295E8 100000D5 */ beq $zero, $zero, L80829940 @@ -3100,8 +3100,8 @@ glabel L80829894 /* 16074 80829894 3C078083 */ lui $a3, %hi(D_808321A8) ## $a3 = 80830000 /* 16078 80829898 24E721A8 */ addiu $a3, $a3, %lo(D_808321A8) ## $a3 = 808321A8 /* 1607C 8082989C 90F90000 */ lbu $t9, 0x0000($a3) ## 808321A8 -/* 16080 808298A0 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 16084 808298A4 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 16080 808298A0 3C098016 */ lui $t1, %hi(gSaveContext) +/* 16084 808298A4 2529E660 */ addiu $t1, %lo(gSaveContext) /* 16088 808298A8 A13913E2 */ sb $t9, 0x13E2($t1) ## 8015FA42 /* 1608C 808298AC 90F80001 */ lbu $t8, 0x0001($a3) ## 808321A9 /* 16090 808298B0 90EF0002 */ lbu $t7, 0x0002($a3) ## 808321AA @@ -3121,16 +3121,16 @@ glabel L80829894 /* 160C8 808298E8 0C00084C */ jal osSyncPrintf /* 160CC 808298EC A47801FA */ sh $t8, 0x01FA($v1) ## 000001FA -/* 160D0 808298F0 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 160D4 808298F4 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 160D0 808298F0 3C098016 */ lui $t1, %hi(gSaveContext) +/* 160D4 808298F4 2529E660 */ addiu $t1, %lo(gSaveContext) /* 160D8 808298F8 3C048083 */ lui $a0, %hi(D_8083021C) ## $a0 = 80830000 /* 160DC 808298FC 97A50062 */ lhu $a1, 0x0062($sp) /* 160E0 80829900 2484021C */ addiu $a0, $a0, %lo(D_8083021C) ## $a0 = 8083021C /* 160E4 80829904 0C00084C */ jal osSyncPrintf /* 160E8 80829908 952613EE */ lhu $a2, 0x13EE($t1) ## 8015FA4E -/* 160EC 8082990C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 160F0 80829910 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 +/* 160EC 8082990C 3C098016 */ lui $t1, %hi(gSaveContext) +/* 160F0 80829910 2529E660 */ addiu $t1, %lo(gSaveContext) /* 160F4 80829914 A52013EA */ sh $zero, 0x13EA($t1) ## 8015FA4A /* 160F8 80829918 0C020978 */ jal Interface_ChangeAlpha /* 160FC 8082991C 952413EE */ lhu $a0, 0x13EE($t1) ## 8015FA4E diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80829960.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80829960.s index afa5b869dd..c27107ba3a 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80829960.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80829960.s @@ -1,13 +1,13 @@ glabel func_80829960 -/* 16140 80829960 3C018013 */ lui $at, 0x8013 ## $at = 80130000 -/* 16144 80829964 A020D1E0 */ sb $zero, -0x2E20($at) ## 8012D1E0 +/* 16140 80829960 3C018013 */ lui $at, %hi(D_8012D1E0) +/* 16144 80829964 A020D1E0 */ sb $zero, %lo(D_8012D1E0)($at) /* 16148 80829968 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 1614C 8082996C 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 16150 80829970 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 16150 80829970 3C018016 */ lui $at, %hi(D_80161398) /* 16154 80829974 3C0E8083 */ lui $t6, %hi(D_8082B2C0) ## $t6 = 80830000 -/* 16158 80829978 E4241398 */ swc1 $f4, 0x1398($at) ## 80161398 -/* 1615C 8082997C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 16158 80829978 E4241398 */ swc1 $f4, %lo(D_80161398)($at) +/* 1615C 8082997C 3C018016 */ lui $at, %hi(D_801613A0) /* 16160 80829980 25CEB2C0 */ addiu $t6, $t6, %lo(D_8082B2C0) ## $t6 = 8082B2C0 /* 16164 80829984 AFA40000 */ sw $a0, 0x0000($sp) /* 16168 80829988 03E00008 */ jr $ra -/* 1616C 8082998C AC2E13A0 */ sw $t6, 0x13A0($at) ## 801613A0 +/* 1616C 8082998C AC2E13A0 */ sw $t6, %lo(D_801613A0)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80829990.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80829990.s index 4aba288c23..f39b25ad21 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80829990.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80829990.s @@ -1,5 +1,5 @@ glabel func_80829990 -/* 16170 80829990 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 16170 80829990 3C018016 */ lui $at, %hi(D_801613A0) /* 16174 80829994 AFA40000 */ sw $a0, 0x0000($sp) /* 16178 80829998 03E00008 */ jr $ra -/* 1617C 8082999C AC2013A0 */ sw $zero, 0x13A0($at) ## 801613A0 +/* 1617C 8082999C AC2013A0 */ sw $zero, %lo(D_801613A0)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s index 6df8e55fa6..b24149085a 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s @@ -1,7 +1,7 @@ glabel func_808299A0 /* 16180 808299A0 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 -/* 16184 808299A4 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 16188 808299A8 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 16184 808299A4 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 16188 808299A8 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 1618C 808299AC AFBF0054 */ sw $ra, 0x0054($sp) /* 16190 808299B0 AFBE0050 */ sw $s8, 0x0050($sp) /* 16194 808299B4 AFB7004C */ sw $s7, 0x004C($sp) @@ -16,8 +16,8 @@ glabel func_808299A0 /* 161B8 808299D8 F7B60020 */ sdc1 $f22, 0x0020($sp) /* 161BC 808299DC F7B40018 */ sdc1 $f20, 0x0018($sp) /* 161C0 808299E0 85F80F2E */ lh $t8, 0x0F2E($t7) ## 80160F2E -/* 161C4 808299E4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 161C8 808299E8 8DCE13A0 */ lw $t6, 0x13A0($t6) ## 801613A0 +/* 161C4 808299E4 3C0E8016 */ lui $t6, %hi(D_801613A0) +/* 161C8 808299E8 8DCE13A0 */ lw $t6, %lo(D_801613A0)($t6) /* 161CC 808299EC 0018C843 */ sra $t9, $t8, 1 /* 161D0 808299F0 00194940 */ sll $t1, $t9, 5 /* 161D4 808299F4 01394823 */ subu $t1, $t1, $t9 @@ -54,31 +54,31 @@ glabel func_808299A0 /* 1624C 80829A6C 1420002A */ bne $at, $zero, .L80829B18 /* 16250 80829A70 2841001B */ slti $at, $v0, 0x001B /* 16254 80829A74 10200028 */ beq $at, $zero, .L80829B18 -/* 16258 80829A78 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 1625C 80829A7C 914AD1E0 */ lbu $t2, -0x2E20($t2) ## 8012D1E0 -/* 16260 80829A80 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 16264 80829A84 24841398 */ addiu $a0, $a0, 0x1398 ## $a0 = 80161398 +/* 16258 80829A78 3C0A8013 */ lui $t2, %hi(D_8012D1E0) +/* 1625C 80829A7C 914AD1E0 */ lbu $t2, %lo(D_8012D1E0)($t2) +/* 16260 80829A80 3C048016 */ lui $a0, %hi(D_80161398) +/* 16264 80829A84 24841398 */ addiu $a0, %lo(D_80161398) /* 16268 80829A88 15400015 */ bne $t2, $zero, .L80829AE0 /* 1626C 80829A8C 3C073D27 */ lui $a3, 0x3D27 ## $a3 = 3D270000 -/* 16270 80829A90 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 16270 80829A90 3C048016 */ lui $a0, %hi(D_80161398) /* 16274 80829A94 4406C000 */ mfc1 $a2, $f24 /* 16278 80829A98 3C073D27 */ lui $a3, 0x3D27 ## $a3 = 3D270000 /* 1627C 80829A9C 34E7EF9E */ ori $a3, $a3, 0xEF9E ## $a3 = 3D27EF9E -/* 16280 80829AA0 24841398 */ addiu $a0, $a0, 0x1398 ## $a0 = 80161398 +/* 16280 80829AA0 24841398 */ addiu $a0, %lo(D_80161398) /* 16284 80829AA4 0C01E107 */ jal Math_SmoothScaleMaxF /* 16288 80829AA8 3C053FC0 */ lui $a1, 0x3FC0 ## $a1 = 3FC00000 -/* 1628C 80829AAC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 16290 80829AB0 C4201398 */ lwc1 $f0, 0x1398($at) ## 80161398 +/* 1628C 80829AAC 3C018016 */ lui $at, %hi(D_80161398) +/* 16290 80829AB0 C4201398 */ lwc1 $f0, %lo(D_80161398)($at) /* 16294 80829AB4 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 16298 80829AB8 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 -/* 1629C 80829ABC 3C018013 */ lui $at, 0x8013 ## $at = 80130000 +/* 1629C 80829ABC 3C018013 */ lui $at, %hi(D_8012D1E0) /* 162A0 80829AC0 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 162A4 80829AC4 46002032 */ c.eq.s $f4, $f0 /* 162A8 80829AC8 00000000 */ nop /* 162AC 80829ACC 45000010 */ bc1f .L80829B10 /* 162B0 80829AD0 00000000 */ nop -/* 162B4 80829AD4 A02BD1E0 */ sb $t3, -0x2E20($at) ## 8012D1E0 +/* 162B4 80829AD4 A02BD1E0 */ sb $t3, %lo(D_8012D1E0)($at) /* 162B8 80829AD8 10000010 */ beq $zero, $zero, .L80829B1C /* 162BC 80829ADC 46000506 */ mov.s $f20, $f0 .L80829AE0: @@ -87,14 +87,14 @@ glabel func_808299A0 /* 162C8 80829AE8 0C01E107 */ jal Math_SmoothScaleMaxF /* 162CC 80829AEC 34E7EF9E */ ori $a3, $a3, 0xEF9E ## $a3 = 0000EF9E -/* 162D0 80829AF0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 162D4 80829AF4 C4201398 */ lwc1 $f0, 0x1398($at) ## 80161398 -/* 162D8 80829AF8 3C018013 */ lui $at, 0x8013 ## $at = 80130000 +/* 162D0 80829AF0 3C018016 */ lui $at, %hi(D_80161398) +/* 162D4 80829AF4 C4201398 */ lwc1 $f0, %lo(D_80161398)($at) +/* 162D8 80829AF8 3C018013 */ lui $at, %hi(D_8012D1E0) /* 162DC 80829AFC 4600C032 */ c.eq.s $f24, $f0 /* 162E0 80829B00 00000000 */ nop /* 162E4 80829B04 45000002 */ bc1f .L80829B10 /* 162E8 80829B08 00000000 */ nop -/* 162EC 80829B0C A020D1E0 */ sb $zero, -0x2E20($at) ## 8012D1E0 +/* 162EC 80829B0C A020D1E0 */ sb $zero, %lo(D_8012D1E0)($at) .L80829B10: /* 162F0 80829B10 10000002 */ beq $zero, $zero, .L80829B1C /* 162F4 80829B14 46000506 */ mov.s $f20, $f0 @@ -343,8 +343,8 @@ glabel L80829C28 /* 16680 80829EA0 01997025 */ or $t6, $t4, $t9 ## $t6 = F7830009 /* 16684 80829EA4 0C034213 */ jal Matrix_Push /* 16688 80829EA8 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000005 -/* 1668C 80829EAC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 16690 80829EB0 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 1668C 80829EAC 3C028016 */ lui $v0, %hi(gGameInfo) +/* 16690 80829EB0 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 16694 80829EB4 C64A0004 */ lwc1 $f10, 0x0004($s2) ## 00000018 /* 16698 80829EB8 C6440008 */ lwc1 $f4, 0x0008($s2) ## 0000001C /* 1669C 80829EBC 844A114C */ lh $t2, 0x114C($v0) ## 8016114C diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832E48.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832E48.s index 8988d8b7c6..b32b9761c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832E48.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832E48.s @@ -22,11 +22,11 @@ glabel func_80832E48 /* 00C74 80832E84 AFA70028 */ sw $a3, 0x0028($sp) /* 00C78 80832E88 8FA2002C */ lw $v0, 0x002C($sp) /* 00C7C 80832E8C 8FA70028 */ lw $a3, 0x0028($sp) -/* 00C80 80832E90 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 00C80 80832E90 3C088016 */ lui $t0, %hi(gSaveContext+4) /* 00C84 80832E94 30590001 */ andi $t9, $v0, 0x0001 ## $t9 = 00000000 /* 00C88 80832E98 13200019 */ beq $t9, $zero, .L80832F00 /* 00C8C 80832E9C 30490002 */ andi $t1, $v0, 0x0002 ## $t1 = 00000000 -/* 00C90 80832EA0 8D08E664 */ lw $t0, -0x199C($t0) ## 8015E664 +/* 00C90 80832EA0 8D08E664 */ lw $t0, %lo(gSaveContext+4)($t0) /* 00C94 80832EA4 3C018085 */ lui $at, %hi(D_80855350) ## $at = 80850000 /* 00C98 80832EA8 C7A4001C */ lwc1 $f4, 0x001C($sp) /* 00C9C 80832EAC 51000009 */ beql $t0, $zero, .L80832ED4 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833A20.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833A20.s index b8cf8e0dcf..dcd265d0ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833A20.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833A20.s @@ -7,10 +7,10 @@ glabel func_80833A20 /* 01824 80833A34 8FA80024 */ lw $t0, 0x0024($sp) /* 01828 80833A38 80820151 */ lb $v0, 0x0151($a0) ## 00000151 /* 0182C 80833A3C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01830 80833A40 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 01830 80833A40 3C0F8016 */ lui $t7, %hi(gSaveContext+0x36) /* 01834 80833A44 14410010 */ bne $v0, $at, .L80833A88 /* 01838 80833A48 24051801 */ addiu $a1, $zero, 0x1801 ## $a1 = 00001801 -/* 0183C 80833A4C 95EFE696 */ lhu $t7, -0x196A($t7) ## 8015E696 +/* 0183C 80833A4C 95EFE696 */ lhu $t7, %lo(gSaveContext+0x36)($t7) /* 01840 80833A50 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 01844 80833A54 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 01848 80833A58 448F3000 */ mtc1 $t7, $f6 ## $f6 = -0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833CDC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833CDC.s index bc957849a7..2dbfa727e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833CDC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833CDC.s @@ -19,8 +19,8 @@ glabel func_80833CDC .L80833D18: /* 01B08 80833D18 14A00012 */ bne $a1, $zero, .L80833D64 /* 01B0C 80833D1C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01B10 80833D20 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 01B14 80833D24 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 01B10 80833D20 3C048016 */ lui $a0, %hi(gSaveContext) +/* 01B14 80833D24 2484E660 */ addiu $a0, %lo(gSaveContext) /* 01B18 80833D28 908E13E2 */ lbu $t6, 0x13E2($a0) ## 8015FA42 /* 01B1C 80833D2C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 01B20 80833D30 55C10004 */ bnel $t6, $at, .L80833D44 @@ -41,8 +41,8 @@ glabel func_80833CDC /* 01B50 80833D60 00601025 */ or $v0, $v1, $zero ## $v0 = 0000003D .L80833D64: /* 01B54 80833D64 14A1000B */ bne $a1, $at, .L80833D94 -/* 01B58 80833D68 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 01B5C 80833D6C 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 01B58 80833D68 3C048016 */ lui $a0, %hi(gSaveContext) +/* 01B5C 80833D6C 2484E660 */ addiu $a0, %lo(gSaveContext) /* 01B60 80833D70 908F13E3 */ lbu $t7, 0x13E3($a0) ## 8015FA43 /* 01B64 80833D74 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 01B68 80833D78 51E10004 */ beql $t7, $at, .L80833D8C @@ -57,9 +57,9 @@ glabel func_80833CDC .L80833D94: /* 01B84 80833D94 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 01B88 80833D98 14A1000C */ bne $a1, $at, .L80833DCC -/* 01B8C 80833D9C 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 01B90 80833DA0 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 01B94 80833DA4 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 +/* 01B8C 80833D9C 3C048016 */ lui $a0, %hi(gSaveContext) +/* 01B90 80833DA0 3C048016 */ lui $a0, %hi(gSaveContext) +/* 01B94 80833DA4 2484E660 */ addiu $a0, %lo(gSaveContext) /* 01B98 80833DA8 909813E4 */ lbu $t8, 0x13E4($a0) ## 8015FA44 /* 01B9C 80833DAC 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 01BA0 80833DB0 53010004 */ beql $t8, $at, .L80833DC4 @@ -72,7 +72,7 @@ glabel func_80833CDC /* 01BB4 80833DC4 03E00008 */ jr $ra /* 01BB8 80833DC8 00601025 */ or $v0, $v1, $zero ## $v0 = 000000FF .L80833DCC: -/* 01BBC 80833DCC 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015CCC0 +/* 01BBC 80833DCC 2484E660 */ addiu $a0, %lo(gSaveContext) /* 01BC0 80833DD0 909913E5 */ lbu $t9, 0x13E5($a0) ## 8015E0A5 /* 01BC4 80833DD4 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 01BC8 80833DD8 53210004 */ beql $t9, $at, .L80833DEC diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833DF8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833DF8.s index 3019ebce17..63bc223840 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833DF8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833DF8.s @@ -4,8 +4,8 @@ glabel func_80833DF8 /* 01BF0 80833E00 AFA40028 */ sw $a0, 0x0028($sp) /* 01BF4 80833E04 AFA5002C */ sw $a1, 0x002C($sp) /* 01BF8 80833E08 9082015F */ lbu $v0, 0x015F($a0) ## 0000015F -/* 01BFC 80833E0C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 01C00 80833E10 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 01BFC 80833E0C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 01C00 80833E10 2463E660 */ addiu $v1, %lo(gSaveContext) /* 01C04 80833E14 50400027 */ beql $v0, $zero, .L80833EB4 /* 01C08 80833E18 8FA90028 */ lw $t1, 0x0028($sp) /* 01C0C 80833E1C 906F13E3 */ lbu $t7, 0x13E3($v1) ## 8015FA43 @@ -19,9 +19,9 @@ glabel func_80833DF8 /* 01C28 80833E38 00C02025 */ or $a0, $a2, $zero ## $a0 = 000000FF /* 01C2C 80833E3C 0C20CF26 */ jal func_80833C98 /* 01C30 80833E40 AFA50024 */ sw $a1, 0x0024($sp) -/* 01C34 80833E44 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 01C34 80833E44 3C038016 */ lui $v1, %hi(gSaveContext) /* 01C38 80833E48 14400019 */ bne $v0, $zero, .L80833EB0 -/* 01C3C 80833E4C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 01C3C 80833E4C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 01C40 80833E50 907813E4 */ lbu $t8, 0x13E4($v1) ## 8015FA44 /* 01C44 80833E54 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 01C48 80833E58 240400FF */ addiu $a0, $zero, 0x00FF ## $a0 = 000000FF @@ -32,9 +32,9 @@ glabel func_80833DF8 .L80833E6C: /* 01C5C 80833E6C 0C20CF26 */ jal func_80833C98 /* 01C60 80833E70 8FA50024 */ lw $a1, 0x0024($sp) -/* 01C64 80833E74 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 01C64 80833E74 3C038016 */ lui $v1, %hi(gSaveContext) /* 01C68 80833E78 1440000D */ bne $v0, $zero, .L80833EB0 -/* 01C6C 80833E7C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 01C6C 80833E7C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 01C70 80833E80 907913E5 */ lbu $t9, 0x13E5($v1) ## 8015FA45 /* 01C74 80833E84 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 01C78 80833E88 8FA50024 */ lw $a1, 0x0024($sp) @@ -59,9 +59,9 @@ glabel func_80833DF8 /* 01CB8 80833EC8 8FBF0014 */ lw $ra, 0x0014($sp) /* 01CBC 80833ECC 0C023C4A */ jal func_8008F128 /* 01CC0 80833ED0 01202025 */ or $a0, $t1, $zero ## $a0 = 00000000 -/* 01CC4 80833ED4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 01CC4 80833ED4 3C038016 */ lui $v1, %hi(gSaveContext) /* 01CC8 80833ED8 1440007C */ bne $v0, $zero, .L808340CC -/* 01CCC 80833EDC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 01CCC 80833EDC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 01CD0 80833EE0 8FAC0028 */ lw $t4, 0x0028($sp) /* 01CD4 80833EE4 818D0154 */ lb $t5, 0x0154($t4) ## 00000154 /* 01CD8 80833EE8 29A10002 */ slti $at, $t5, 0x0002 @@ -86,9 +86,9 @@ glabel func_80833DF8 /* 01D18 80833F28 8FA40028 */ lw $a0, 0x0028($sp) /* 01D1C 80833F2C 0C20CF14 */ jal func_80833C50 /* 01D20 80833F30 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000003D -/* 01D24 80833F34 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 01D24 80833F34 3C038016 */ lui $v1, %hi(gSaveContext) /* 01D28 80833F38 14400029 */ bne $v0, $zero, .L80833FE0 -/* 01D2C 80833F3C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 01D2C 80833F3C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 01D30 80833F40 906F13E3 */ lbu $t7, 0x13E3($v1) ## 8015FA43 /* 01D34 80833F44 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 01D38 80833F48 8FA40028 */ lw $a0, 0x0028($sp) @@ -99,9 +99,9 @@ glabel func_80833DF8 .L80833F5C: /* 01D4C 80833F5C 0C20CF14 */ jal func_80833C50 /* 01D50 80833F60 00C02825 */ or $a1, $a2, $zero ## $a1 = 000000FF -/* 01D54 80833F64 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 01D54 80833F64 3C038016 */ lui $v1, %hi(gSaveContext) /* 01D58 80833F68 1440001D */ bne $v0, $zero, .L80833FE0 -/* 01D5C 80833F6C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 01D5C 80833F6C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 01D60 80833F70 907813E4 */ lbu $t8, 0x13E4($v1) ## 8015FA44 /* 01D64 80833F74 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 01D68 80833F78 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF @@ -112,9 +112,9 @@ glabel func_80833DF8 .L80833F8C: /* 01D7C 80833F8C 0C20CF14 */ jal func_80833C50 /* 01D80 80833F90 8FA40028 */ lw $a0, 0x0028($sp) -/* 01D84 80833F94 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 01D84 80833F94 3C038016 */ lui $v1, %hi(gSaveContext) /* 01D88 80833F98 14400011 */ bne $v0, $zero, .L80833FE0 -/* 01D8C 80833F9C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 01D8C 80833F9C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 01D90 80833FA0 907913E5 */ lbu $t9, 0x13E5($v1) ## 8015FA45 /* 01D94 80833FA4 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 01D98 80833FA8 53210004 */ beql $t9, $at, .L80833FBC diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s index 0e78e124d1..8e72bf40ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s @@ -23,8 +23,8 @@ glabel func_808340DC /* 01F00 80834110 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 01F04 80834114 92190158 */ lbu $t9, 0x0158($s0) ## 00000158 /* 01F08 80834118 01C50019 */ multu $t6, $a1 -/* 01F0C 8083411C 3C048012 */ lui $a0, 0x8012 ## $a0 = 80120000 -/* 01F10 80834120 24845C98 */ addiu $a0, $a0, 0x5C98 ## $a0 = 80125C98 +/* 01F0C 8083411C 3C048012 */ lui $a0, %hi(D_80125C98) +/* 01F10 80834120 24845C98 */ addiu $a0, %lo(D_80125C98) /* 01F14 80834124 83A70037 */ lb $a3, 0x0037($sp) /* 01F18 80834128 3C038085 */ lui $v1, %hi(D_80854164) ## $v1 = 80850000 /* 01F1C 8083412C 2406001E */ addiu $a2, $zero, 0x001E ## $a2 = 0000001E diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834298.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834298.s index 7d21967063..67ea2072df 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834298.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834298.s @@ -11,8 +11,8 @@ glabel func_80834298 /* 020AC 808342BC 8C98067C */ lw $t8, 0x067C($a0) ## 0000067C /* 020B0 808342C0 80980154 */ lb $t8, 0x0154($a0) ## 00000154 /* 020B4 808342C4 80990151 */ lb $t9, 0x0151($a0) ## 00000151 -/* 020B8 808342C8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 020BC 808342CC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 020B8 808342C8 3C038016 */ lui $v1, %hi(gSaveContext) +/* 020BC 808342CC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 020C0 808342D0 13190003 */ beq $t8, $t9, .L808342E0 /* 020C4 808342D4 00024240 */ sll $t0, $v0, 9 /* 020C8 808342D8 05030020 */ bgezl $t0, .L8083435C diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834380.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834380.s index 6d357abf40..8cd3f190e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834380.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834380.s @@ -1,6 +1,6 @@ glabel func_80834380 -/* 02170 80834380 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 02174 80834384 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 +/* 02170 80834380 3C088016 */ lui $t0, %hi(gSaveContext) +/* 02174 80834384 2508E660 */ addiu $t0, %lo(gSaveContext) /* 02178 80834388 8D0E0004 */ lw $t6, 0x0004($t0) ## 8015E664 /* 0217C 8083438C 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 02180 80834390 240C0006 */ addiu $t4, $zero, 0x0006 ## $t4 = 00000006 @@ -41,9 +41,9 @@ glabel func_80834380 .L8083440C: /* 021FC 8083440C 8CCF0000 */ lw $t7, 0x0000($a2) ## 00000000 .L80834410: -/* 02200 80834410 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 +/* 02200 80834410 3C188012 */ lui $t8, %hi(gItemSlots) /* 02204 80834414 030FC021 */ addu $t8, $t8, $t7 -/* 02208 80834418 93187464 */ lbu $t8, 0x7464($t8) ## 80127464 +/* 02208 80834418 93187464 */ lbu $t8, %lo(gItemSlots)($t8) /* 0220C 8083441C 0118C821 */ addu $t9, $t0, $t8 /* 02210 80834420 8322008C */ lb $v0, 0x008C($t9) ## 0000008C /* 02214 80834424 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083442C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083442C.s index 130217783c..fe1a81ba8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083442C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083442C.s @@ -11,8 +11,8 @@ glabel func_8083442C /* 02240 80834450 3C058083 */ lui $a1, %hi(func_808351D4) ## $a1 = 80830000 /* 02244 80834454 2841000F */ slti $at, $v0, 0x000F /* 02248 80834458 10200008 */ beq $at, $zero, .L8083447C -/* 0224C 8083445C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 02250 80834460 85CEFA50 */ lh $t6, -0x05B0($t6) ## 8015FA50 +/* 0224C 8083445C 3C0E8016 */ lui $t6, %hi(gSaveContext+0x13f0) +/* 02250 80834460 85CEFA50 */ lh $t6, %lo(gSaveContext+0x13f0)($t6) /* 02254 80834464 11C00005 */ beq $t6, $zero, .L8083447C /* 02258 80834468 00000000 */ nop /* 0225C 8083446C 0C01E221 */ jal func_80078884 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808350A4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808350A4.s index 9a5bcfb4c9..95c4da8e2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808350A4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808350A4.s @@ -17,8 +17,8 @@ glabel func_808350A4 /* 02ED0 808350E0 27A60034 */ addiu $a2, $sp, 0x0034 ## $a2 = FFFFFFFC /* 02ED4 808350E4 0C20D0E0 */ jal func_80834380 /* 02ED8 808350E8 27A70030 */ addiu $a3, $sp, 0x0030 ## $a3 = FFFFFFF8 -/* 02EDC 808350EC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 02EE0 808350F0 95EFFA64 */ lhu $t7, -0x059C($t7) ## 8015FA64 +/* 02EDC 808350EC 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1404) +/* 02EE0 808350F0 95EFFA64 */ lhu $t7, %lo(gSaveContext+0x1404)($t7) /* 02EE4 808350F4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 02EE8 808350F8 15E10007 */ bne $t7, $at, .L80835118 /* 02EEC 808350FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808357E8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808357E8.s index 42bb52f6be..5697f6f39d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808357E8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808357E8.s @@ -1,6 +1,6 @@ glabel func_808357E8 -/* 035D8 808357E8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 035DC 808357EC 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 +/* 035D8 808357E8 3C0E8016 */ lui $t6, %hi(gSaveContext+4) +/* 035DC 808357EC 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) /* 035E0 808357F0 000E7880 */ sll $t7, $t6, 2 /* 035E4 808357F4 01E5C021 */ addu $t8, $t7, $a1 /* 035E8 808357F8 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s index f3de7cca35..e77efbe42f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s @@ -25,8 +25,8 @@ glabel func_80835B60 /* 039A8 80835BB8 8FA40024 */ lw $a0, 0x0024($sp) /* 039AC 80835BBC 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop /* 039B0 80835BC0 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 039B4 80835BC4 3C058012 */ lui $a1, 0x8012 ## $a1 = 80120000 -/* 039B8 80835BC8 24A55EF8 */ addiu $a1, $a1, 0x5EF8 ## $a1 = 80125EF8 +/* 039B4 80835BC4 3C058012 */ lui $a1, %hi(D_80125EF8) +/* 039B8 80835BC8 24A55EF8 */ addiu $a1, %lo(D_80125EF8) /* 039BC 80835BCC 0C20D5FA */ jal func_808357E8 /* 039C0 80835BD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 039C4 80835BD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835F44.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835F44.s index 9533f017b6..efe7d39f3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835F44.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835F44.s @@ -62,20 +62,20 @@ glabel func_80835F44 /* 03E14 80836024 15800030 */ bne $t4, $zero, .L808360E8 /* 03E18 80836028 00000000 */ nop /* 03E1C 8083602C 14C10007 */ bne $a2, $at, .L8083604C -/* 03E20 80836030 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 -/* 03E24 80836034 91AD7464 */ lbu $t5, 0x7464($t5) ## 80127464 -/* 03E28 80836038 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 03E2C 8083603C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 03E20 80836030 3C0D8012 */ lui $t5, %hi(gItemSlots) +/* 03E24 80836034 91AD7464 */ lbu $t5, %lo(gItemSlots)($t5) +/* 03E28 80836038 3C038016 */ lui $v1, %hi(gSaveContext) +/* 03E2C 8083603C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 03E30 80836040 006D7021 */ addu $t6, $v1, $t5 /* 03E34 80836044 81CF008C */ lb $t7, 0x008C($t6) ## 0000008C /* 03E38 80836048 11E00023 */ beq $t7, $zero, .L808360D8 .L8083604C: -/* 03E3C 8083604C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 03E3C 8083604C 3C038016 */ lui $v1, %hi(gSaveContext) /* 03E40 80836050 2401002E */ addiu $at, $zero, 0x002E ## $at = 0000002E /* 03E44 80836054 14C10006 */ bne $a2, $at, .L80836070 -/* 03E48 80836058 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 03E4C 8083605C 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 -/* 03E50 80836060 93187474 */ lbu $t8, 0x7474($t8) ## 80127474 +/* 03E48 80836058 2463E660 */ addiu $v1, %lo(gSaveContext) +/* 03E4C 8083605C 3C188012 */ lui $t8, %hi(gItemSlots+0x10) +/* 03E50 80836060 93187474 */ lbu $t8, %lo(gItemSlots+0x10)($t8) /* 03E54 80836064 0078C821 */ addu $t9, $v1, $t8 /* 03E58 80836068 8328008C */ lb $t0, 0x008C($t9) ## 0000008C /* 03E5C 8083606C 1100001A */ beq $t0, $zero, .L808360D8 @@ -85,8 +85,8 @@ glabel func_80835F44 /* 03E68 80836078 A3A60027 */ sb $a2, 0x0027($sp) /* 03E6C 8083607C 0C023C9C */ jal func_8008F270 /* 03E70 80836080 AFA7002C */ sw $a3, 0x002C($sp) -/* 03E74 80836084 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 03E78 80836088 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 03E74 80836084 3C038016 */ lui $v1, %hi(gSaveContext) +/* 03E78 80836088 2463E660 */ addiu $v1, %lo(gSaveContext) /* 03E7C 8083608C 83A60027 */ lb $a2, 0x0027($sp) /* 03E80 80836090 04400015 */ bltz $v0, .L808360E8 /* 03E84 80836094 8FA7002C */ lw $a3, 0x002C($sp) @@ -94,10 +94,10 @@ glabel func_80835F44 /* 03E8C 8083609C 3C0A8085 */ lui $t2, %hi(D_80854188) ## $t2 = 80850000 /* 03E90 808360A0 01495021 */ addu $t2, $t2, $t1 /* 03E94 808360A4 914A4188 */ lbu $t2, %lo(D_80854188)($t2) -/* 03E98 808360A8 3C0B8012 */ lui $t3, 0x8012 ## $t3 = 80120000 +/* 03E98 808360A8 3C0B8012 */ lui $t3, %hi(gItemSlots) /* 03E9C 808360AC 8FAE0028 */ lw $t6, 0x0028($sp) /* 03EA0 808360B0 016A5821 */ addu $t3, $t3, $t2 -/* 03EA4 808360B4 916B7464 */ lbu $t3, 0x7464($t3) ## 80127464 +/* 03EA4 808360B4 916B7464 */ lbu $t3, %lo(gItemSlots)($t3) /* 03EA8 808360B8 006B6021 */ addu $t4, $v1, $t3 /* 03EAC 808360BC 818D008C */ lb $t5, 0x008C($t4) ## 0000008C /* 03EB0 808360C0 11A00005 */ beq $t5, $zero, .L808360D8 @@ -112,10 +112,10 @@ glabel func_80835F44 /* 03ED0 808360E0 100000D6 */ beq $zero, $zero, .L8083643C /* 03ED4 808360E4 8FBF0014 */ lw $ra, 0x0014($sp) .L808360E8: -/* 03ED8 808360E8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 03ED8 808360E8 3C038016 */ lui $v1, %hi(gSaveContext) /* 03EDC 808360EC 24010042 */ addiu $at, $zero, 0x0042 ## $at = 00000042 /* 03EE0 808360F0 14C1001E */ bne $a2, $at, .L8083616C -/* 03EE4 808360F4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 03EE4 808360F4 2463E660 */ addiu $v1, %lo(gSaveContext) /* 03EE8 808360F8 8FA40028 */ lw $a0, 0x0028($sp) /* 03EEC 808360FC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03EF0 80836100 0C021DC2 */ jal func_80087708 @@ -152,8 +152,8 @@ glabel func_80835F44 /* 03F5C 8083616C 2401001B */ addiu $at, $zero, 0x001B ## $at = 0000001B /* 03F60 80836170 14C10010 */ bne $a2, $at, .L808361B4 /* 03F64 80836174 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 03F68 80836178 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 -/* 03F6C 8083617C 91297465 */ lbu $t1, 0x7465($t1) ## 80127465 +/* 03F68 80836178 3C098012 */ lui $t1, %hi(gItemSlots+1) +/* 03F6C 8083617C 91297465 */ lbu $t1, %lo(gItemSlots+1)($t1) /* 03F70 80836180 8FA40028 */ lw $a0, 0x0028($sp) /* 03F74 80836184 00695021 */ addu $t2, $v1, $t1 /* 03F78 80836188 814B008C */ lb $t3, 0x008C($t2) ## 0000008C @@ -173,8 +173,8 @@ glabel func_80835F44 /* 03FA8 808361B8 A3A60027 */ sb $a2, 0x0027($sp) /* 03FAC 808361BC 0C023C36 */ jal func_8008F0D8 /* 03FB0 808361C0 AFA7002C */ sw $a3, 0x002C($sp) -/* 03FB4 808361C4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 03FB8 808361C8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 03FB4 808361C4 3C038016 */ lui $v1, %hi(gSaveContext) +/* 03FB8 808361C8 2463E660 */ addiu $v1, %lo(gSaveContext) /* 03FBC 808361CC 83A60027 */ lb $a2, 0x0027($sp) /* 03FC0 808361D0 0440001B */ bltz $v0, .L80836240 /* 03FC4 808361D4 8FA7002C */ lw $a3, 0x002C($sp) @@ -283,11 +283,11 @@ glabel func_80835F44 /* 04134 80836344 80F80151 */ lb $t8, 0x0151($a3) ## 00000151 /* 04138 80836348 83A60027 */ lb $a2, 0x0027($sp) /* 0413C 8083634C 01EE7821 */ addu $t7, $t7, $t6 -/* 04140 80836350 3C038012 */ lui $v1, 0x8012 ## $v1 = 80120000 +/* 04140 80836350 3C038012 */ lui $v1, %hi(D_80125C98) /* 04144 80836354 006F1821 */ addu $v1, $v1, $t7 /* 04148 80836358 A0E20159 */ sb $v0, 0x0159($a3) ## 00000159 /* 0414C 8083635C 07000023 */ bltz $t8, .L808363EC -/* 04150 80836360 90635C98 */ lbu $v1, 0x5C98($v1) ## 80125C98 +/* 04150 80836360 90635C98 */ lbu $v1, %lo(D_80125C98)($v1) /* 04154 80836364 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 04158 80836368 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 /* 0415C 8083636C AFA3001C */ sw $v1, 0x001C($sp) @@ -303,12 +303,12 @@ glabel func_80835F44 /* 04184 80836394 50590016 */ beql $v0, $t9, .L808363F0 /* 04188 80836398 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 0418C 8083639C 90E80158 */ lbu $t0, 0x0158($a3) ## 00000158 -/* 04190 808363A0 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 +/* 04190 808363A0 3C0A8012 */ lui $t2, %hi(D_80125C98) /* 04194 808363A4 3C0D8085 */ lui $t5, %hi(D_80854164) ## $t5 = 80850000 /* 04198 808363A8 00084880 */ sll $t1, $t0, 2 /* 0419C 808363AC 01284821 */ addu $t1, $t1, $t0 /* 041A0 808363B0 01495021 */ addu $t2, $t2, $t1 -/* 041A4 808363B4 914A5C98 */ lbu $t2, 0x5C98($t2) ## 80125C98 +/* 041A4 808363B4 914A5C98 */ lbu $t2, %lo(D_80125C98)($t2) /* 041A8 808363B8 000A5880 */ sll $t3, $t2, 2 /* 041AC 808363BC 016A5823 */ subu $t3, $t3, $t2 /* 041B0 808363C0 000B5840 */ sll $t3, $t3, 1 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s index 16d9595630..2966b35d72 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s @@ -75,8 +75,8 @@ glabel func_80836448 /* 0434C 8083655C A42E0A20 */ sh $t6, 0x0A20($at) ## 00010A20 /* 04350 80836560 0C03D719 */ jal func_800F5C64 /* 04354 80836564 24040020 */ addiu $a0, $zero, 0x0020 ## $a0 = 00000020 -/* 04358 80836568 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0435C 8083656C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 04358 80836568 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0435C 8083656C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 04360 80836570 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF /* 04364 80836574 A04313E0 */ sb $v1, 0x13E0($v0) ## 8015FA40 /* 04368 80836578 A04313E1 */ sb $v1, 0x13E1($v0) ## 8015FA41 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836BEC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836BEC.s index de2fa06b9f..1e2e0b1614 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836BEC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836BEC.s @@ -113,7 +113,7 @@ glabel func_80836BEC .L80836D7C: /* 04B6C 80836D7C 8F398AB4 */ lw $t9, %lo(D_80858AB4)($t9) /* 04B70 80836D80 2401DFFF */ addiu $at, $zero, 0xDFFF ## $at = FFFFDFFF -/* 04B74 80836D84 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 04B74 80836D84 3C058016 */ lui $a1, %hi(gSaveContext+0x140c) /* 04B78 80836D88 9729000C */ lhu $t1, 0x000C($t9) ## 8086000C /* 04B7C 80836D8C 346B8000 */ ori $t3, $v1, 0x8000 ## $t3 = 00008000 /* 04B80 80836D90 01215027 */ nor $t2, $t1, $at @@ -126,7 +126,7 @@ glabel func_80836BEC /* 04B9C 80836DAC 8CC21CC8 */ lw $v0, 0x1CC8($a2) ## 00001CC8 /* 04BA0 80836DB0 8CC21C44 */ lw $v0, 0x1C44($a2) ## 00001C44 .L80836DB4: -/* 04BA4 80836DB4 90A5FA6C */ lbu $a1, -0x0594($a1) ## 8015FA6C +/* 04BA4 80836DB4 90A5FA6C */ lbu $a1, %lo(gSaveContext+0x140c)($a1) /* 04BA8 80836DB8 0005282B */ sltu $a1, $zero, $a1 /* 04BAC 80836DBC 14A00003 */ bne $a1, $zero, .L80836DCC /* 04BB0 80836DC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083721C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083721C.s index f04a2e288d..29e02663cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083721C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083721C.s @@ -1,6 +1,6 @@ glabel func_8083721C -/* 0500C 8083721C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 05010 80837220 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 0500C 8083721C 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 05010 80837220 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 05014 80837224 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 05018 80837228 AFBF0014 */ sw $ra, 0x0014($sp) /* 0501C 8083722C 85CF006A */ lh $t7, 0x006A($t6) ## 8016006A diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s index 3440d0ff26..c9a8d1fa4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s @@ -94,10 +94,10 @@ glabel func_808382DC /* 0621C 8083842C 0C0302BD */ jal Gameplay_SetupRespawnPoint /* 06220 80838430 AFA20060 */ sw $v0, 0x0060($sp) /* 06224 80838434 8FA20060 */ lw $v0, 0x0060($sp) -/* 06228 80838438 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 0622C 8083843C 258CF9C8 */ addiu $t4, $t4, 0xF9C8 ## $t4 = 8015F9C8 +/* 06228 80838438 3C0C8016 */ lui $t4, %hi(gSaveContext+0x1368) +/* 0622C 8083843C 258CF9C8 */ addiu $t4, %lo(gSaveContext+0x1368) /* 06230 80838440 8C4E0000 */ lw $t6, 0x0000($v0) ## 00000000 -/* 06234 80838444 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 06234 80838444 3C018016 */ lui $at, %hi(gSaveContext+0x1374) /* 06238 80838448 AD8E0000 */ sw $t6, 0x0000($t4) ## 8015F9C8 /* 0623C 8083844C 8C4D0004 */ lw $t5, 0x0004($v0) ## 00000004 /* 06240 80838450 AD8D0004 */ sw $t5, 0x0004($t4) ## 8015F9CC @@ -105,7 +105,7 @@ glabel func_808382DC /* 06248 80838458 AD8E0008 */ sw $t6, 0x0008($t4) ## 8015F9D0 /* 0624C 8083845C 844F000C */ lh $t7, 0x000C($v0) ## 0000000C /* 06250 80838460 8FA40074 */ lw $a0, 0x0074($sp) -/* 06254 80838464 A42FF9D4 */ sh $t7, -0x062C($at) ## 8015F9D4 +/* 06254 80838464 A42FF9D4 */ sh $t7, %lo(gSaveContext+0x1374)($at) .L80838468: /* 06258 80838468 0C0302D8 */ jal Gameplay_TriggerVoidOut /* 0625C 8083846C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839034.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839034.s index 9639f6e456..67fb9852ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839034.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839034.s @@ -98,10 +98,10 @@ glabel func_80839034 /* 06F94 808391A4 24017FFF */ addiu $at, $zero, 0x7FFF ## $at = 00007FFF /* 06F98 808391A8 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 06F9C 808391AC 1441000E */ bne $v0, $at, .L808391E8 -/* 06FA0 808391B0 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 06FA4 808391B4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 06FA8 808391B8 AC2FF9C4 */ sw $t7, -0x063C($at) ## 8015F9C4 -/* 06FAC 808391BC 8739F9F4 */ lh $t9, -0x060C($t9) ## 8015F9F4 +/* 06FA0 808391B0 3C198016 */ lui $t9, %hi(gSaveContext+0x1394) +/* 06FA4 808391B4 3C018016 */ lui $at, %hi(gSaveContext+0x1364) +/* 06FA8 808391B8 AC2FF9C4 */ sw $t7, %lo(gSaveContext+0x1364)($at) +/* 06FAC 808391BC 8739F9F4 */ lh $t9, %lo(gSaveContext+0x1394)($t9) /* 06FB0 808391C0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 06FB4 808391C4 00270821 */ addu $at, $at, $a3 /* 06FB8 808391C8 A4391E1A */ sh $t9, 0x1E1A($at) ## 00011E1A @@ -109,9 +109,9 @@ glabel func_80839034 /* 06FC0 808391D0 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 /* 06FC4 808391D4 00270821 */ addu $at, $at, $a3 /* 06FC8 808391D8 A0221E5E */ sb $v0, 0x1E5E($at) ## 00011E5E -/* 06FCC 808391DC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 06FCC 808391DC 3C018016 */ lui $at, %hi(gSaveContext+0x141d) /* 06FD0 808391E0 1000002A */ beq $zero, $zero, .L8083928C -/* 06FD4 808391E4 A022FA7D */ sb $v0, -0x0583($at) ## 8015FA7D +/* 06FD4 808391E4 A022FA7D */ sb $v0, %lo(gSaveContext+0x141d)($at) .L808391E8: /* 06FD8 808391E8 28417FF9 */ slti $at, $v0, 0x7FF9 /* 06FDC 808391EC 14200012 */ bne $at, $zero, .L80839238 @@ -142,17 +142,17 @@ glabel func_80839034 /* 0703C 8083924C 14410009 */ bne $v0, $at, .L80839274 /* 07040 80839250 8FA30024 */ lw $v1, 0x0024($sp) /* 07044 80839254 846C1E1A */ lh $t4, 0x1E1A($v1) ## 00001E1A -/* 07048 80839258 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 07048 80839258 3C018016 */ lui $at, %hi(gSaveContext+0x1378) /* 0704C 8083925C 8FA40040 */ lw $a0, 0x0040($sp) /* 07050 80839260 0C0302D8 */ jal Gameplay_TriggerVoidOut -/* 07054 80839264 A42CF9D8 */ sh $t4, -0x0628($at) ## 8015F9D8 +/* 07054 80839264 A42CF9D8 */ sh $t4, %lo(gSaveContext+0x1378)($at) /* 07058 80839268 240EFFFE */ addiu $t6, $zero, 0xFFFE ## $t6 = FFFFFFFE -/* 0705C 8083926C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 07060 80839270 AC2EF9C4 */ sw $t6, -0x063C($at) ## 8015F9C4 +/* 0705C 8083926C 3C018016 */ lui $at, %hi(gSaveContext+0x1364) +/* 07060 80839270 AC2EF9C4 */ sw $t6, %lo(gSaveContext+0x1364)($at) .L80839274: /* 07064 80839274 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 07068 80839278 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 0706C 8083927C A02FFA23 */ sb $t7, -0x05DD($at) ## 8015FA23 +/* 07068 80839278 3C018016 */ lui $at, %hi(gSaveContext+0x13c3) +/* 0706C 8083927C A02FFA23 */ sb $t7, %lo(gSaveContext+0x13c3)($at) /* 07070 80839280 0C026528 */ jal func_800994A0 /* 07074 80839284 8FA40040 */ lw $a0, 0x0040($sp) /* 07078 80839288 8FA70040 */ lw $a3, 0x0040($sp) @@ -196,8 +196,8 @@ glabel func_80839034 /* 07104 80839314 24045805 */ addiu $a0, $zero, 0x5805 ## $a0 = 00005805 /* 07108 80839318 0C03DA59 */ jal func_800F6964 /* 0710C 8083931C 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 -/* 07110 80839320 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 07114 80839324 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 07110 80839320 3C038016 */ lui $v1, %hi(gSaveContext) +/* 07114 80839324 2463E660 */ addiu $v1, %lo(gSaveContext) /* 07118 80839328 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF /* 0711C 8083932C A06213E0 */ sb $v0, 0x13E0($v1) ## 8015FA40 /* 07120 80839330 10000031 */ beq $zero, $zero, .L808393F8 @@ -205,7 +205,7 @@ glabel func_80839034 /* 07128 80839338 C6000838 */ lwc1 $f0, 0x0838($s0) ## 00000838 .L8083933C: /* 0712C 8083933C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 07130 80839340 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 07130 80839340 3C198016 */ lui $t9, %hi(gGameInfo) /* 07134 80839344 3C188085 */ lui $t8, %hi(D_808535F4) ## $t8 = 80850000 /* 07138 80839348 4610003C */ c.lt.s $f0, $f16 /* 0713C 8083934C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 @@ -218,7 +218,7 @@ glabel func_80839034 /* 07158 80839368 01C17821 */ addu $t7, $t6, $at /* 0715C 8083936C A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 .L80839370: -/* 07160 80839370 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 07160 80839370 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 07164 80839374 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 07168 80839378 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 /* 0716C 8083937C 8728006E */ lh $t0, 0x006E($t9) ## 8016006E @@ -229,12 +229,12 @@ glabel func_80839034 /* 07180 80839390 4600103C */ c.lt.s $f2, $f0 /* 07184 80839394 00000000 */ nop /* 07188 80839398 45000003 */ bc1f .L808393A8 -/* 0718C 8083939C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 0718C 8083939C 3C018016 */ lui $at, %hi(gSaveContext+0x13bc) /* 07190 808393A0 10000003 */ beq $zero, $zero, .L808393B0 -/* 07194 808393A4 E422FA1C */ swc1 $f2, -0x05E4($at) ## 8015FA1C +/* 07194 808393A4 E422FA1C */ swc1 $f2, %lo(gSaveContext+0x13bc)($at) .L808393A8: -/* 07198 808393A8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 0719C 808393AC E420FA1C */ swc1 $f0, -0x05E4($at) ## 8015FA1C +/* 07198 808393A8 3C018016 */ lui $at, %hi(gSaveContext+0x13bc) +/* 0719C 808393AC E420FA1C */ swc1 $f0, %lo(gSaveContext+0x13bc)($at) .L808393B0: /* 071A0 808393B0 8F1835F4 */ lw $t8, %lo(D_808535F4)($t8) /* 071A4 808393B4 8FA40040 */ lw $a0, 0x0040($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839800.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839800.s index ca7718d309..856f3e61e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839800.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839800.s @@ -181,14 +181,14 @@ glabel func_80839800 /* 07868 80839A78 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0786C 80839A7C 3C068084 */ lui $a2, %hi(func_80845EF8) ## $a2 = 80840000 /* 07870 80839A80 46804420 */ cvt.s.w $f16, $f8 -/* 07874 80839A84 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 07874 80839A84 3C098016 */ lui $t1, %hi(gSaveContext+4) /* 07878 80839A88 24C65EF8 */ addiu $a2, $a2, %lo(func_80845EF8) ## $a2 = 80845EF8 /* 0787C 80839A8C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 07880 80839A90 460A803C */ c.lt.s $f16, $f10 /* 07884 80839A94 00000000 */ nop /* 07888 80839A98 45000009 */ bc1f .L80839AC0 -/* 0788C 80839A9C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 07890 80839AA0 8F39E664 */ lw $t9, -0x199C($t9) ## 8015E664 +/* 0788C 80839A9C 3C198016 */ lui $t9, %hi(gSaveContext+4) +/* 07890 80839AA0 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) /* 07894 80839AA4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 07898 80839AA8 17200003 */ bne $t9, $zero, .L80839AB8 /* 0789C 80839AAC 00000000 */ nop @@ -198,7 +198,7 @@ glabel func_80839800 /* 078A8 80839AB8 10000008 */ beq $zero, $zero, .L80839ADC /* 078AC 80839ABC A2220190 */ sb $v0, 0x0190($s1) ## 00000190 .L80839AC0: -/* 078B0 80839AC0 8D29E664 */ lw $t1, -0x199C($t1) ## 8015E664 +/* 078B0 80839AC0 8D29E664 */ lw $t1, %lo(gSaveContext+4)($t1) /* 078B4 80839AC4 24040003 */ addiu $a0, $zero, 0x0003 ## $a0 = 00000003 /* 078B8 80839AC8 15200003 */ bne $t1, $zero, .L80839AD8 /* 078BC 80839ACC 00000000 */ nop @@ -351,8 +351,8 @@ glabel func_80839800 /* 07AE0 80839CF0 10400007 */ beq $v0, $zero, .L80839D10 /* 07AE4 80839CF4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 07AE8 80839CF8 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 -/* 07AEC 80839CFC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 07AF0 80839D00 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 07AEC 80839CFC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 07AF0 80839D00 2442E660 */ addiu $v0, %lo(gSaveContext) /* 07AF4 80839D04 24185802 */ addiu $t8, $zero, 0x5802 ## $t8 = 00005802 /* 07AF8 80839D08 A45813C0 */ sh $t8, 0x13C0($v0) ## 8015FA20 /* 07AFC 80839D0C E44A13BC */ swc1 $f10, 0x13BC($v0) ## 8015FA1C diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A4A8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A4A8.s index 14491504fc..9f4586dd52 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A4A8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A4A8.s @@ -15,7 +15,7 @@ glabel func_8083A4A8 .L8083A4DC: /* 082CC 8083A4DC 28611000 */ slti $at, $v1, 0x1000 /* 082D0 8083A4E0 1020000B */ beq $at, $zero, .L8083A510 -/* 082D4 8083A4E4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 082D4 8083A4E4 3C028016 */ lui $v0, %hi(gGameInfo) /* 082D8 8083A4E8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 082DC 8083A4EC 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 /* 082E0 8083A4F0 C4800838 */ lwc1 $f0, 0x0838($a0) ## 00000838 @@ -31,7 +31,7 @@ glabel func_8083A4A8 /* 08304 8083A514 24A52FE0 */ addiu $a1, $a1, 0x2FE0 ## $a1 = 04002FE0 /* 08308 8083A518 C4800838 */ lwc1 $f0, 0x0838($a0) ## 00000838 .L8083A51C: -/* 0830C 8083A51C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0830C 8083A51C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 08310 8083A520 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 08314 8083A524 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 08318 8083A528 84580758 */ lh $t8, 0x0758($v0) ## 80160758 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AD4C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AD4C.s index 6fa1eccbd3..d54569ae87 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AD4C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AD4C.s @@ -10,8 +10,8 @@ glabel func_8083AD4C /* 08B5C 8083AD6C 0C00B75B */ jal func_8002DD6C /* 08B60 8083AD70 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 08B64 8083AD74 10400008 */ beq $v0, $zero, .L8083AD98 -/* 08B68 8083AD78 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 08B6C 8083AD7C 8DEFE664 */ lw $t7, -0x199C($t7) ## 8015E664 +/* 08B68 8083AD78 3C0F8016 */ lui $t7, %hi(gSaveContext+4) +/* 08B6C 8083AD7C 8DEFE664 */ lw $t7, %lo(gSaveContext+4)($t7) /* 08B70 8083AD80 15E00003 */ bne $t7, $zero, .L8083AD90 /* 08B74 8083AD84 00000000 */ nop /* 08B78 8083AD88 10000005 */ beq $zero, $zero, .L8083ADA0 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AE40.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AE40.s index 8e93ee1be9..1d9fe71cc1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AE40.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AE40.s @@ -39,8 +39,8 @@ glabel func_8083AE40 /* 08C6C 8083AE7C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 08C70 8083AE80 87A7004E */ lh $a3, 0x004E($sp) -/* 08C74 8083AE84 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 -/* 08C78 8083AE88 27187528 */ addiu $t8, $t8, 0x7528 ## $t8 = 80127528 +/* 08C74 8083AE84 3C188012 */ lui $t8, %hi(gObjectTable) +/* 08C78 8083AE88 27187528 */ addiu $t8, %lo(gObjectTable) /* 08C7C 8083AE8C 000778C0 */ sll $t7, $a3, 3 /* 08C80 8083AE90 01F81021 */ addu $v0, $t7, $t8 /* 08C84 8083AE94 8C590004 */ lw $t9, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s index 777c2534c3..cf3d0657b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s @@ -36,8 +36,8 @@ glabel func_8083B040 /* 08EB4 8083B0C4 AFA2002C */ sw $v0, 0x002C($sp) /* 08EB8 8083B0C8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 08EBC 8083B0CC 14410006 */ bne $v0, $at, .L8083B0E8 -/* 08EC0 8083B0D0 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 08EC4 8083B0D4 814AFA13 */ lb $t2, -0x05ED($t2) ## 8015FA13 +/* 08EC0 8083B0D0 3C0A8016 */ lui $t2, %hi(gSaveContext+0x13b3) +/* 08EC4 8083B0D4 814AFA13 */ lb $t2, %lo(gSaveContext+0x13b3)($t2) /* 08EC8 8083B0D8 8FA40034 */ lw $a0, 0x0034($sp) /* 08ECC 8083B0DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 08ED0 8083B0E0 1D400007 */ bgtz $t2, .L8083B100 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B998.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B998.s index 503b820dec..184fac365f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B998.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B998.s @@ -41,12 +41,12 @@ glabel func_8083B998 /* 09818 8083BA28 3C0B8086 */ lui $t3, %hi(D_80858AB4) ## $t3 = 80860000 /* 0981C 8083BA2C 8D6B8AB4 */ lw $t3, %lo(D_80858AB4)($t3) /* 09820 8083BA30 2401FFF7 */ addiu $at, $zero, 0xFFF7 ## $at = FFFFFFF7 -/* 09824 8083BA34 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 09824 8083BA34 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 09828 8083BA38 956C000C */ lhu $t4, 0x000C($t3) ## 8086000C /* 0982C 8083BA3C 01816827 */ nor $t5, $t4, $at /* 09830 8083BA40 55A0000F */ bnel $t5, $zero, .L8083BA80 /* 09834 8083BA44 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 09838 8083BA48 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 09838 8083BA48 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 0983C 8083BA4C 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 /* 09840 8083BA50 85C204B2 */ lh $v0, 0x04B2($t6) ## 801604B2 /* 09844 8083BA54 10410009 */ beq $v0, $at, .L8083BA7C diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BDBC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BDBC.s index 10fb4280d0..a3484676f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BDBC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BDBC.s @@ -47,8 +47,8 @@ glabel func_8083BDBC /* 09C60 8083BE70 00000000 */ nop /* 09C64 8083BE74 04C10012 */ bgez $a2, .L8083BEC0 /* 09C68 8083BE78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09C6C 8083BE7C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 09C70 8083BE80 8D8CFA90 */ lw $t4, -0x0570($t4) ## 8015FA90 +/* 09C6C 8083BE7C 3C0C8016 */ lui $t4, %hi(gGameInfo) +/* 09C70 8083BE80 8D8CFA90 */ lw $t4, %lo(gGameInfo)($t4) /* 09C74 8083BE84 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 09C78 8083BE88 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 /* 09C7C 8083BE8C 858D009E */ lh $t5, 0x009E($t4) ## 8016009E diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C544.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C544.s index 09861aae02..2cec5847cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C544.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C544.s @@ -27,8 +27,8 @@ glabel func_8083C544 /* 0A398 8083C5A8 10410017 */ beq $v0, $at, .L8083C608 /* 0A39C 8083C5AC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 0A3A0 8083C5B0 1441000E */ bne $v0, $at, .L8083C5EC -/* 0A3A4 8083C5B4 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 0A3A8 8083C5B8 954AE696 */ lhu $t2, -0x196A($t2) ## 8015E696 +/* 0A3A4 8083C5B4 3C0A8016 */ lui $t2, %hi(gSaveContext+0x36) +/* 0A3A8 8083C5B8 954AE696 */ lhu $t2, %lo(gSaveContext+0x36)($t2) /* 0A3AC 8083C5BC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0A3B0 8083C5C0 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 0A3B4 8083C5C4 448A3000 */ mtc1 $t2, $f6 ## $f6 = -0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C61C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C61C.s index 00cc36da7d..ba82e3730b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C61C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C61C.s @@ -9,15 +9,15 @@ glabel func_8083C61C /* 0A428 8083C638 11C1001B */ beq $t6, $at, .L8083C6A8 /* 0A42C 8083C63C 00000000 */ nop /* 0A430 8083C640 94AF0088 */ lhu $t7, 0x0088($a1) ## 00000088 -/* 0A434 8083C644 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 +/* 0A434 8083C644 3C198012 */ lui $t9, %hi(gItemSlots+1) /* 0A438 8083C648 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 /* 0A43C 8083C64C 13000016 */ beq $t8, $zero, .L8083C6A8 /* 0A440 8083C650 00000000 */ nop -/* 0A444 8083C654 93397465 */ lbu $t9, 0x7465($t9) ## 80127465 -/* 0A448 8083C658 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 0A444 8083C654 93397465 */ lbu $t9, %lo(gItemSlots+1)($t9) +/* 0A448 8083C658 3C088016 */ lui $t0, %hi(gSaveContext+0x8c) /* 0A44C 8083C65C 3C068085 */ lui $a2, %hi(func_8084E604) ## $a2 = 80850000 /* 0A450 8083C660 01194021 */ addu $t0, $t0, $t9 -/* 0A454 8083C664 8108E6EC */ lb $t0, -0x1914($t0) ## 8015E6EC +/* 0A454 8083C664 8108E6EC */ lb $t0, %lo(gSaveContext+0x8c)($t0) /* 0A458 8083C668 24C6E604 */ addiu $a2, $a2, %lo(func_8084E604) ## $a2 = 8084E604 /* 0A45C 8083C66C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0A460 8083C670 1100000D */ beq $t0, $zero, .L8083C6A8 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA54.s index 7643c03951..eff627df4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA54.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA54.s @@ -3,12 +3,12 @@ glabel func_8083CA54 /* 0A848 8083CA58 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 /* 0A84C 8083CA5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0A850 8083CA60 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0A854 8083CA64 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 0A854 8083CA64 3C018016 */ lui $at, %hi(gSaveContext+0x13bc) /* 0A858 8083CA68 E4A00838 */ swc1 $f0, 0x0838($a1) ## 00000838 /* 0A85C 8083CA6C AFA5001C */ sw $a1, 0x001C($sp) /* 0A860 8083CA70 3C0642F0 */ lui $a2, 0x42F0 ## $a2 = 42F00000 /* 0A864 8083CA74 0C20F244 */ jal func_8083C910 -/* 0A868 8083CA78 E420FA1C */ swc1 $f0, -0x05E4($at) ## 8015FA1C +/* 0A868 8083CA78 E420FA1C */ swc1 $f0, %lo(gSaveContext+0x13bc)($at) /* 0A86C 8083CA7C 10400003 */ beq $v0, $zero, .L8083CA8C /* 0A870 8083CA80 8FA5001C */ lw $a1, 0x001C($sp) /* 0A874 8083CA84 240EFFF1 */ addiu $t6, $zero, 0xFFF1 ## $t6 = FFFFFFF1 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA9C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA9C.s index 53ea2d820c..df7988aaca 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA9C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA9C.s @@ -4,8 +4,8 @@ glabel D_80855394 .text glabel func_8083CA9C -/* 0A88C 8083CA9C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0A890 8083CAA0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0A88C 8083CA9C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0A890 8083CAA0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0A894 8083CAA4 3C018085 */ lui $at, %hi(D_80855394) ## $at = 80850000 /* 0A898 8083CAA8 C4225394 */ lwc1 $f2, %lo(D_80855394)($at) /* 0A89C 8083CAAC C44013BC */ lwc1 $f0, 0x13BC($v0) ## 8015FA1C diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D6EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D6EC.s index c281ee0bdc..bcc18cde8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D6EC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D6EC.s @@ -27,9 +27,9 @@ glabel func_8083D6EC /* 0B4EC 8083D6FC AFB00028 */ sw $s0, 0x0028($sp) /* 0B4F0 8083D700 F7B40020 */ sdc1 $f20, 0x0020($sp) /* 0B4F4 8083D704 AFA40068 */ sw $a0, 0x0068($sp) -/* 0B4F8 8083D708 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0B4F8 8083D708 3C0E8016 */ lui $t6, %hi(gGameInfo) /* 0B4FC 8083D70C E4A40070 */ swc1 $f4, 0x0070($a1) ## 00000070 -/* 0B500 8083D710 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 0B500 8083D710 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 0B504 8083D714 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0B508 8083D718 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 /* 0B50C 8083D71C 85CF009C */ lh $t7, 0x009C($t6) ## 8016009C diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DF68.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DF68.s index 834fe504b8..2e19a9eb26 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DF68.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DF68.s @@ -1,7 +1,7 @@ glabel func_8083DF68 /* 0BD58 8083DF68 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0BD5C 8083DF6C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0BD60 8083DF70 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 0BD5C 8083DF6C 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 0BD60 8083DF70 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 0BD64 8083DF74 AFBF0014 */ sw $ra, 0x0014($sp) /* 0BD68 8083DF78 AFA40018 */ sw $a0, 0x0018($sp) /* 0BD6C 8083DF7C AFA60020 */ sw $a2, 0x0020($sp) @@ -18,8 +18,8 @@ glabel func_8083DF68 /* 0BD98 8083DFA8 44065000 */ mfc1 $a2, $f10 /* 0BD9C 8083DFAC 0C01DF1B */ jal func_80077C6C /* 0BDA0 8083DFB0 00000000 */ nop -/* 0BDA4 8083DFB4 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 0BDA8 8083DFB8 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 0BDA4 8083DFB4 3C188016 */ lui $t8, %hi(gGameInfo) +/* 0BDA8 8083DFB8 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 0BDAC 8083DFBC 8FA40018 */ lw $a0, 0x0018($sp) /* 0BDB0 8083DFC0 87A50022 */ lh $a1, 0x0022($sp) /* 0BDB4 8083DFC4 8706004A */ lh $a2, 0x004A($t8) ## 8016004A diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DFE0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DFE0.s index 5e2db90d9b..6fd9557e9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DFE0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DFE0.s @@ -12,8 +12,8 @@ glabel func_8083DFE0 /* 0BDF8 8083E008 00031C00 */ sll $v1, $v1, 16 /* 0BDFC 8083E00C 1720001A */ bne $t9, $zero, .L8083E078 /* 0BE00 8083E010 00031C03 */ sra $v1, $v1, 16 -/* 0BE04 8083E014 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 0BE08 8083E018 8D08FA90 */ lw $t0, -0x0570($t0) ## 8015FA90 +/* 0BE04 8083E014 3C088016 */ lui $t0, %hi(gGameInfo) +/* 0BE08 8083E018 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) /* 0BE0C 8083E01C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0BE10 8083E020 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 /* 0BE14 8083E024 8509006E */ lh $t1, 0x006E($t0) ## 8016006E diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E5A8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E5A8.s index 356392061e..16cac3f025 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E5A8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E5A8.s @@ -7,8 +7,8 @@ glabel D_808553C8 .text glabel func_8083E5A8 /* 0C398 8083E5A8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0C39C 8083E5AC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0C3A0 8083E5B0 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 0C39C 8083E5AC 3C038016 */ lui $v1, %hi(gGameInfo) +/* 0C3A0 8083E5B0 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) /* 0C3A4 8083E5B4 AFBF001C */ sw $ra, 0x001C($sp) /* 0C3A8 8083E5B8 AFB00018 */ sw $s0, 0x0018($sp) /* 0C3AC 8083E5BC AFA5003C */ sw $a1, 0x003C($sp) @@ -24,8 +24,8 @@ glabel func_8083E5A8 /* 0C3D4 8083E5E4 0C00B54F */ jal func_8002D53C /* 0C3D8 8083E5E8 AFA20034 */ sw $v0, 0x0034($sp) /* 0C3DC 8083E5EC 10400123 */ beq $v0, $zero, .L8083EA7C -/* 0C3E0 8083E5F0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0C3E4 8083E5F4 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 0C3E0 8083E5F0 3C038016 */ lui $v1, %hi(gGameInfo) +/* 0C3E4 8083E5F4 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) /* 0C3E8 8083E5F8 84660D5A */ lh $a2, 0x0D5A($v1) ## 80160D5A .L8083E5FC: /* 0C3EC 8083E5FC 14C00005 */ bne $a2, $zero, .L8083E614 @@ -49,16 +49,16 @@ glabel func_8083E5A8 /* 0C42C 8083E63C 0302C023 */ subu $t8, $t8, $v0 /* 0C430 8083E640 0018C040 */ sll $t8, $t8, 1 /* 0C434 8083E644 2719FFFA */ addiu $t9, $t8, 0xFFFA ## $t9 = 8085FFFA -/* 0C438 8083E648 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 0C438 8083E648 3C038016 */ lui $v1, %hi(gGameInfo) /* 0C43C 8083E64C 03283021 */ addu $a2, $t9, $t0 /* 0C440 8083E650 12040007 */ beq $s0, $a0, .L8083E670 -/* 0C444 8083E654 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 0C444 8083E654 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) /* 0C448 8083E658 84690D5A */ lh $t1, 0x0D5A($v1) ## 80160D5A /* 0C44C 8083E65C 55200005 */ bnel $t1, $zero, .L8083E674 /* 0C450 8083E660 A4600D5A */ sh $zero, 0x0D5A($v1) ## 80160D5A /* 0C454 8083E664 AC900118 */ sw $s0, 0x0118($a0) ## 00000118 -/* 0C458 8083E668 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0C45C 8083E66C 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 0C458 8083E668 3C038016 */ lui $v1, %hi(gGameInfo) +/* 0C45C 8083E66C 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) .L8083E670: /* 0C460 8083E670 A4600D5A */ sh $zero, 0x0D5A($v1) ## 80160D5A .L8083E674: @@ -268,11 +268,11 @@ glabel func_8083E5A8 /* 0C760 8083E970 8FA90034 */ lw $t1, 0x0034($sp) .L8083E974: /* 0C764 8083E974 2401006C */ addiu $at, $zero, 0x006C ## $at = 0000006C -/* 0C768 8083E978 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 0C768 8083E978 3C0B8016 */ lui $t3, %hi(gSaveContext+4) /* 0C76C 8083E97C 852A0000 */ lh $t2, 0x0000($t1) ## 00000000 /* 0C770 8083E980 15410022 */ bne $t2, $at, .L8083EA0C /* 0C774 8083E984 00000000 */ nop -/* 0C778 8083E988 8D6BE664 */ lw $t3, -0x199C($t3) ## 8015E664 +/* 0C778 8083E988 8D6BE664 */ lw $t3, %lo(gSaveContext+4)($t3) /* 0C77C 8083E98C 1560001F */ bne $t3, $zero, .L8083EA0C /* 0C780 8083E990 00000000 */ nop /* 0C784 8083E994 820C0154 */ lb $t4, 0x0154($s0) ## 00000154 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F0C8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F0C8.s index 25f3940ce5..a203d39f02 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F0C8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F0C8.s @@ -4,8 +4,8 @@ glabel D_808553EC .text glabel func_8083F0C8 -/* 0CEB8 8083F0C8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0CEBC 8083F0CC 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 +/* 0CEB8 8083F0C8 3C0E8016 */ lui $t6, %hi(gSaveContext+4) +/* 0CEBC 8083F0CC 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) /* 0CEC0 8083F0D0 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 0CEC4 8083F0D4 AFB00014 */ sw $s0, 0x0014($sp) /* 0CEC8 8083F0D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084029C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084029C.s index 31fbec526f..cf0d8eefd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084029C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084029C.s @@ -1,6 +1,6 @@ glabel func_8084029C -/* 0E08C 8084029C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0E090 808402A0 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 0E08C 8084029C 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 0E090 808402A0 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 0E094 808402A4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0E098 808402A8 AFBF001C */ sw $ra, 0x001C($sp) /* 0E09C 808402AC AFB00018 */ sw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840DE4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840DE4.s index 7920a280c1..41baaaecaa 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840DE4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840DE4.s @@ -24,8 +24,8 @@ glabel func_80840DE4 /* 0EC04 80840E14 25CE26E8 */ addiu $t6, $t6, 0x26E8 ## $t6 = 040026E8 /* 0EC08 80840E18 144E000E */ bne $v0, $t6, .L80840E54 /* 0EC0C 80840E1C AE0201BC */ sw $v0, 0x01BC($s0) ## 000001BC -/* 0EC10 80840E20 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 0EC14 80840E24 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 0EC10 80840E20 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 0EC14 80840E24 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 0EC18 80840E28 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 /* 0EC1C 80840E2C 44810000 */ mtc1 $at, $f0 ## $f0 = 24.00 /* 0EC20 80840E30 85F80492 */ lh $t8, 0x0492($t7) ## 80160492 @@ -38,8 +38,8 @@ glabel func_80840DE4 /* 0EC3C 80840E4C 1000000C */ beq $zero, $zero, .L80840E80 /* 0EC40 80840E50 46001087 */ neg.s $f2, $f2 .L80840E54: -/* 0EC44 80840E54 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 0EC48 80840E58 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 0EC44 80840E54 3C198016 */ lui $t9, %hi(gGameInfo) +/* 0EC48 80840E58 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 0EC4C 80840E5C 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 /* 0EC50 80840E60 44810000 */ mtc1 $at, $f0 ## $f0 = 29.00 /* 0EC54 80840E64 87280492 */ lh $t0, 0x0492($t9) ## 80160492 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841138.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841138.s index 3960f07a35..e64013b8f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841138.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841138.s @@ -18,13 +18,13 @@ glabel func_80841138 /* 0EF48 80841158 4481B000 */ mtc1 $at, $f22 ## $f22 = 1.00 /* 0EF4C 8084115C C4840864 */ lwc1 $f4, 0x0864($a0) ## 00000864 /* 0EF50 80841160 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0EF54 80841164 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 0EF54 80841164 3C028016 */ lui $v0, %hi(gGameInfo) /* 0EF58 80841168 4616203C */ c.lt.s $f4, $f22 /* 0EF5C 8084116C 00000000 */ nop /* 0EF60 80841170 4500002B */ bc1f .L80841220 /* 0EF64 80841174 00000000 */ nop -/* 0EF68 80841178 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0EF6C 8084117C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0EF68 80841178 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0EF6C 8084117C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0EF70 80841180 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 0EF74 80841184 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 /* 0EF78 80841188 844F005A */ lh $t7, 0x005A($v0) ## 8016005A @@ -67,7 +67,7 @@ glabel func_80841138 /* 0F008 80841218 1000006B */ beq $zero, $zero, .L808413C8 /* 0F00C 8084121C 46000506 */ mov.s $f20, $f0 .L80841220: -/* 0F010 80841220 8C42FA90 */ lw $v0, -0x0570($v0) ## FFFFFA90 +/* 0F010 80841220 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0F014 80841224 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0F018 80841228 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 /* 0F01C 8084122C 84480074 */ lh $t0, 0x0074($v0) ## 00000074 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841860.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841860.s index 51e5d7f768..dc5d147905 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841860.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841860.s @@ -15,10 +15,10 @@ glabel func_80841860 /* 0F670 80841880 01F81021 */ addu $v0, $t7, $t8 /* 0F674 80841884 8C590258 */ lw $t9, 0x0258($v0) ## 00000258 /* 0F678 80841888 8C480240 */ lw $t0, 0x0240($v0) ## 00000240 -/* 0F67C 8084188C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 0F67C 8084188C 3C038016 */ lui $v1, %hi(gGameInfo) /* 0F680 80841890 AFB90034 */ sw $t9, 0x0034($sp) /* 0F684 80841894 ACA801BC */ sw $t0, 0x01BC($a1) ## 000001BC -/* 0F688 80841898 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 0F688 80841898 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) /* 0F68C 8084189C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 0F690 808418A0 44810000 */ mtc1 $at, $f0 ## $f0 = 1000.00 /* 0F694 808418A4 84690054 */ lh $t1, 0x0054($v1) ## 80160054 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841EE4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841EE4.s index fe97502a87..79fd6eaf82 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841EE4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841EE4.s @@ -17,13 +17,13 @@ glabel func_80841EE4 /* 0FCF0 80841F00 4481B000 */ mtc1 $at, $f22 ## $f22 = 1.00 /* 0FCF4 80841F04 C4840864 */ lwc1 $f4, 0x0864($a0) ## 00000864 /* 0FCF8 80841F08 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0FCFC 80841F0C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 0FCFC 80841F0C 3C028016 */ lui $v0, %hi(gGameInfo) /* 0FD00 80841F10 4616203C */ c.lt.s $f4, $f22 /* 0FD04 80841F14 00000000 */ nop /* 0FD08 80841F18 4500002A */ bc1f .L80841FC4 /* 0FD0C 80841F1C 00000000 */ nop -/* 0FD10 80841F20 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0FD14 80841F24 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0FD10 80841F20 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0FD14 80841F24 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0FD18 80841F28 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 0FD1C 80841F2C 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 /* 0FD20 80841F30 844F005A */ lh $t7, 0x005A($v0) ## 8016005A @@ -65,7 +65,7 @@ glabel func_80841EE4 /* 0FDAC 80841FBC 10000060 */ beq $zero, $zero, .L80842140 /* 0FDB0 80841FC0 46000506 */ mov.s $f20, $f0 .L80841FC4: -/* 0FDB4 80841FC4 8C42FA90 */ lw $v0, -0x0570($v0) ## FFFFFA90 +/* 0FDB4 80841FC4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0FDB8 80841FC8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0FDBC 80841FCC 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 /* 0FDC0 80841FD0 84480074 */ lh $t0, 0x0074($v0) ## 00000074 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842AC4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842AC4.s index 1113ce96e9..bc18eba413 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842AC4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842AC4.s @@ -10,16 +10,16 @@ glabel func_80842AC4 /* 108D4 80842AE4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 108D8 80842AE8 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 108DC 80842AEC C4A6085C */ lwc1 $f6, 0x085C($a1) ## 0000085C -/* 108E0 80842AF0 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 +/* 108E0 80842AF0 3C0F8012 */ lui $t7, %hi(gItemSlots) /* 108E4 80842AF4 4606203C */ c.lt.s $f4, $f6 /* 108E8 80842AF8 00000000 */ nop /* 108EC 80842AFC 4500001B */ bc1f .L80842B6C /* 108F0 80842B00 00000000 */ nop -/* 108F4 80842B04 91EF7464 */ lbu $t7, 0x7464($t7) ## 80127464 -/* 108F8 80842B08 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 108F4 80842B04 91EF7464 */ lbu $t7, %lo(gItemSlots)($t7) +/* 108F8 80842B08 3C188016 */ lui $t8, %hi(gSaveContext+0x8c) /* 108FC 80842B0C 24A509BC */ addiu $a1, $a1, 0x09BC ## $a1 = 000009BC /* 10900 80842B10 030FC021 */ addu $t8, $t8, $t7 -/* 10904 80842B14 8318E6EC */ lb $t8, -0x1914($t8) ## 8015E6EC +/* 10904 80842B14 8318E6EC */ lb $t8, %lo(gSaveContext+0x8c)($t8) /* 10908 80842B18 13000012 */ beq $t8, $zero, .L80842B64 /* 1090C 80842B1C 00000000 */ nop /* 10910 80842B20 84E600B6 */ lh $a2, 0x00B6($a3) ## 000000B6 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842B7C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842B7C.s index 299513d214..5e49defc81 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842B7C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842B7C.s @@ -7,8 +7,8 @@ glabel func_80842B7C /* 10980 80842B90 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 /* 10984 80842B94 15C10052 */ bne $t6, $at, .L80842CE0 /* 10988 80842B98 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 1098C 80842B9C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 10990 80842BA0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 1098C 80842B9C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 10990 80842BA0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 10994 80842BA4 904F003E */ lbu $t7, 0x003E($v0) ## 8015E69E /* 10998 80842BA8 15E0004B */ bne $t7, $zero, .L80842CD8 /* 1099C 80842BAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s index e422093489..5f4b96d94c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s @@ -8,7 +8,7 @@ glabel func_80843AE8 /* 118F0 80843B00 50400055 */ beql $v0, $zero, .L80843C58 /* 118F4 80843B04 8208084F */ lb $t0, 0x084F($s0) ## 0000084F /* 118F8 80843B08 18400038 */ blez $v0, .L80843BEC -/* 118FC 80843B0C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 118FC 80843B0C 3C0C8016 */ lui $t4, %hi(gSaveContext+0x1424) /* 11900 80843B10 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 11904 80843B14 A4AE0850 */ sh $t6, 0x0850($a1) ## 00000850 /* 11908 80843B18 84AF0850 */ lh $t7, 0x0850($a1) ## 00000850 @@ -63,13 +63,13 @@ glabel func_80843AE8 /* 119C0 80843BD0 E7A6001C */ swc1 $f6, 0x001C($sp) /* 119C4 80843BD4 240A0140 */ addiu $t2, $zero, 0x0140 ## $t2 = 00000140 .L80843BD8: -/* 119C8 80843BD8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 119CC 80843BDC A42AFA84 */ sh $t2, -0x057C($at) ## 8015FA84 +/* 119C8 80843BD8 3C018016 */ lui $at, %hi(gSaveContext+0x1424) +/* 119CC 80843BDC A42AFA84 */ sh $t2, %lo(gSaveContext+0x1424)($at) /* 119D0 80843BE0 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF /* 119D4 80843BE4 1000003C */ beq $zero, $zero, .L80843CD8 /* 119D8 80843BE8 A60B0850 */ sh $t3, 0x0850($s0) ## 00000850 .L80843BEC: -/* 119DC 80843BEC 858CFA84 */ lh $t4, -0x057C($t4) ## FFFFFA84 +/* 119DC 80843BEC 858CFA84 */ lh $t4, %lo(gSaveContext+0x1424)($t4) /* 119E0 80843BF0 5580003A */ bnel $t4, $zero, .L80843CDC /* 119E4 80843BF4 8FBF002C */ lw $ra, 0x002C($sp) /* 119E8 80843BF8 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s index 2727519aef..2ebd7baef7 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s @@ -4,8 +4,8 @@ glabel D_80855450 .text glabel func_8084411C -/* 11F0C 8084411C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 11F10 80844120 81CEFA13 */ lb $t6, -0x05ED($t6) ## 8015FA13 +/* 11F0C 8084411C 3C0E8016 */ lui $t6, %hi(gSaveContext+0x13b3) +/* 11F10 80844120 81CEFA13 */ lb $t6, %lo(gSaveContext+0x13b3)($t6) /* 11F14 80844124 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 11F18 80844128 AFB00028 */ sw $s0, 0x0028($sp) /* 11F1C 8084412C 29C10029 */ slti $at, $t6, 0x0029 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845668.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845668.s index 35cd9a291d..361a58c751 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845668.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845668.s @@ -30,7 +30,7 @@ glabel func_80845668 /* 134AC 808456BC 0C02914C */ jal func_800A4530 /* 134B0 808456C0 8FA4002C */ lw $a0, 0x002C($sp) /* 134B4 808456C4 1040007D */ beq $v0, $zero, .L808458BC -/* 134B8 808456C8 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 134B8 808456C8 3C0B8016 */ lui $t3, %hi(gSaveContext+4) /* 134BC 808456CC 8E080678 */ lw $t0, 0x0678($s0) ## 00000678 /* 134C0 808456D0 C6000884 */ lwc1 $f0, 0x0884($s0) ## 00000884 /* 134C4 808456D4 3C018085 */ lui $at, %hi(D_80855480) ## $at = 80850000 @@ -58,7 +58,7 @@ glabel func_80845668 /* 13514 80845724 46080002 */ mul.s $f0, $f0, $f8 /* 13518 80845728 00000000 */ nop .L8084572C: -/* 1351C 8084572C 8D6BE664 */ lw $t3, -0x199C($t3) ## 8015E664 +/* 1351C 8084572C 8D6BE664 */ lw $t3, %lo(gSaveContext+4)($t3) /* 13520 80845730 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 13524 80845734 51600005 */ beql $t3, $zero, .L8084574C /* 13528 80845738 44060000 */ mfc1 $a2, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845964.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845964.s index 71bd203631..485d48f789 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845964.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845964.s @@ -21,8 +21,8 @@ glabel func_80845964 /* 1379C 808459AC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 .L808459B0: /* 137A0 808459B0 10E10058 */ beq $a3, $at, .L80845B14 -/* 137A4 808459B4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 137A8 808459B8 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 137A4 808459B4 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 137A8 808459B8 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 137AC 808459BC 8CD80018 */ lw $t8, 0x0018($a2) ## 00000018 /* 137B0 808459C0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 137B4 808459C4 85CF0110 */ lh $t7, 0x0110($t6) ## 80160110 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845C68.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845C68.s index 971cadb0ad..098f328b0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845C68.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845C68.s @@ -10,8 +10,8 @@ glabel func_80845C68 /* 13A78 80845C88 8FA7001C */ lw $a3, 0x001C($sp) .L80845C8C: /* 13A7C 80845C8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 13A80 80845C90 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 13A84 80845C94 A020F9DB */ sb $zero, -0x0625($at) ## 8015F9DB +/* 13A80 80845C90 3C018016 */ lui $at, %hi(gSaveContext+0x137b) +/* 13A84 80845C94 A020F9DB */ sb $zero, %lo(gSaveContext+0x137b)($at) /* 13A88 80845C98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 13A8C 80845C9C 03E00008 */ jr $ra /* 13A90 80845CA0 00E01025 */ or $v0, $a3, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845CA4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845CA4.s index 20ae2e56f4..41fe496fec 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845CA4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845CA4.s @@ -67,7 +67,7 @@ glabel func_80845CA4 /* 13B78 80845D88 44812000 */ mtc1 $at, $f4 ## $f4 = 0.00 .L80845D8C: /* 13B7C 80845D8C 24070014 */ addiu $a3, $zero, 0x0014 ## $a3 = 00000014 -/* 13B80 80845D90 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 13B80 80845D90 3C018016 */ lui $at, %hi(gSaveContext+0x13bc) /* 13B84 80845D94 E7A40034 */ swc1 $f4, 0x0034($sp) /* 13B88 80845D98 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C /* 13B8C 80845D9C 3C0D8085 */ lui $t5, %hi(D_808535F4) ## $t5 = 80850000 @@ -75,7 +75,7 @@ glabel func_80845CA4 /* 13B94 80845DA4 5180001B */ beql $t4, $zero, .L80845E14 /* 13B98 80845DA8 86020850 */ lh $v0, 0x0850($s0) ## 00000850 /* 13B9C 80845DAC 8DAD35F4 */ lw $t5, %lo(D_808535F4)($t5) -/* 13BA0 80845DB0 C426FA1C */ lwc1 $f6, -0x05E4($at) ## 8015FA1C +/* 13BA0 80845DB0 C426FA1C */ lwc1 $f6, %lo(gSaveContext+0x13bc)($at) /* 13BA4 80845DB4 3C048085 */ lui $a0, %hi(D_808535FC) ## $a0 = 80850000 /* 13BA8 80845DB8 11A0001D */ beq $t5, $zero, .L80845E30 /* 13BAC 80845DBC E7A60034 */ swc1 $f6, 0x0034($sp) @@ -103,11 +103,11 @@ glabel func_80845CA4 /* 13BFC 80845E0C E60A0458 */ swc1 $f10, 0x0458($s0) ## 00000458 /* 13C00 80845E10 86020850 */ lh $v0, 0x0850($s0) ## 00000850 .L80845E14: -/* 13C04 80845E14 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 13C04 80845E14 3C018016 */ lui $at, %hi(gSaveContext+0x13bc) /* 13C08 80845E18 04410005 */ bgez $v0, .L80845E30 /* 13C0C 80845E1C 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 00000001 /* 13C10 80845E20 A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 -/* 13C14 80845E24 C430FA1C */ lwc1 $f16, -0x05E4($at) ## 8015FA1C +/* 13C14 80845E24 C430FA1C */ lwc1 $f16, %lo(gSaveContext+0x13bc)($at) /* 13C18 80845E28 2407FFFF */ addiu $a3, $zero, 0xFFFF ## $a3 = FFFFFFFF /* 13C1C 80845E2C E7B00034 */ swc1 $f16, 0x0034($sp) .L80845E30: @@ -139,8 +139,8 @@ glabel func_80845CA4 /* 13C80 80845E90 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 13C84 80845E94 0C016C69 */ jal func_8005B1A4 /* 13C88 80845E98 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 13C8C 80845E9C 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 13C90 80845EA0 80A5F9DB */ lb $a1, -0x0625($a1) ## 8015F9DB +/* 13C8C 80845E9C 3C058016 */ lui $a1, %hi(gSaveContext+0x137b) +/* 13C90 80845EA0 80A5F9DB */ lb $a1, %lo(gSaveContext+0x137b)($a1) /* 13C94 80845EA4 0C21171A */ jal func_80845C68 /* 13C98 80845EA8 8FA40044 */ lw $a0, 0x0044($sp) /* 13C9C 80845EAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s index b2ff40d69e..5082449f6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s @@ -16,8 +16,8 @@ glabel func_80846660 /* 14488 80846698 24C63298 */ addiu $a2, $a2, 0x3298 ## $a2 = 04003298 /* 1448C 8084669C 15C10008 */ bne $t6, $at, .L808466C0 /* 14490 808466A0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 14494 808466A4 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 14498 808466A8 8DEFF9C0 */ lw $t7, -0x0640($t7) ## 8015F9C0 +/* 14494 808466A4 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1360) +/* 14498 808466A8 8DEFF9C0 */ lw $t7, %lo(gSaveContext+0x1360)($t7) /* 1449C 808466AC 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 144A0 808466B0 29E10004 */ slti $at, $t7, 0x0004 /* 144A4 808466B4 54200003 */ bnel $at, $zero, .L808466C4 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846720.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846720.s index e4c94b473c..cdf4455128 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846720.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846720.s @@ -1,6 +1,6 @@ glabel func_80846720 -/* 14510 80846720 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 14514 80846724 8C42E664 */ lw $v0, -0x199C($v0) ## 8015E664 +/* 14510 80846720 3C028016 */ lui $v0, %hi(gSaveContext+4) +/* 14514 80846724 8C42E664 */ lw $v0, %lo(gSaveContext+4)($v0) /* 14518 80846728 3C038085 */ lui $v1, %hi(D_808546F0) ## $v1 = 80850000 /* 1451C 8084672C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 14520 80846730 00621821 */ addu $v1, $v1, $v0 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s index 87244bd9bf..ce60168978 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s @@ -38,8 +38,8 @@ glabel func_808467D4 /* 14650 80846860 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 14654 80846864 0C20CBD5 */ jal func_80832F54 /* 14658 80846868 2406028F */ addiu $a2, $zero, 0x028F ## $a2 = 0000028F -/* 1465C 8084686C 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 14660 80846870 8D4AE664 */ lw $t2, -0x199C($t2) ## 8015E664 +/* 1465C 8084686C 3C0A8016 */ lui $t2, %hi(gSaveContext+4) +/* 14660 80846870 8D4AE664 */ lw $t2, %lo(gSaveContext+4)($t2) /* 14664 80846874 8FA40030 */ lw $a0, 0x0030($sp) /* 14668 80846878 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1466C 8084687C 55400004 */ bnel $t2, $zero, .L80846890 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s index b753d55112..7ba02fcf29 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s @@ -1,6 +1,6 @@ glabel func_80846AAC -/* 1489C 80846AAC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 148A0 80846AB0 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 +/* 1489C 80846AAC 3C0E8016 */ lui $t6, %hi(gSaveContext+4) +/* 148A0 80846AB0 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) /* 148A4 80846AB4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 148A8 80846AB8 AFB10028 */ sw $s1, 0x0028($sp) /* 148AC 80846ABC 000E7880 */ sll $t7, $t6, 2 @@ -87,8 +87,8 @@ glabel func_80846AAC ## Effect_Add /* 149EC 80846BFC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 149F0 80846C00 8E190678 */ lw $t9, 0x0678($s0) ## 00000678 -/* 149F4 80846C04 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 149F8 80846C08 24C6B8C4 */ addiu $a2, $a2, 0xB8C4 ## $a2 = 8002B8C4 +/* 149F4 80846C04 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Teardrop) +/* 149F8 80846C08 24C6B8C4 */ addiu $a2, %lo(ActorShadow_DrawFunc_Teardrop) /* 149FC 80846C0C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 14A00 80846C10 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 14A04 80846C14 0C00AC78 */ jal ActorShape_Init diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846CD8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846CD8.s index 2c87bc0a8b..3158c61b98 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846CD8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846CD8.s @@ -64,10 +64,10 @@ glabel func_80846CD8 /* 14BA8 80846DB8 3C0F8085 */ lui $t7, %hi(func_80853148) ## $t7 = 80850000 /* 14BAC 80846DBC 25EF3148 */ addiu $t7, $t7, %lo(func_80853148) ## $t7 = 80853148 /* 14BB0 80846DC0 00250821 */ addu $at, $at, $a1 -/* 14BB4 80846DC4 3C128016 */ lui $s2, 0x8016 ## $s2 = 80160000 +/* 14BB4 80846DC4 3C128016 */ lui $s2, %hi(gSaveContext) /* 14BB8 80846DC8 2403FFFF */ addiu $v1, $zero, 0xFFFF ## $v1 = FFFFFFFF /* 14BBC 80846DCC AC2F1D5C */ sw $t7, 0x1D5C($at) ## 00011D5C -/* 14BC0 80846DD0 2652E660 */ addiu $s2, $s2, 0xE660 ## $s2 = 8015E660 +/* 14BC0 80846DD0 2652E660 */ addiu $s2, %lo(gSaveContext) /* 14BC4 80846DD4 A0830003 */ sb $v1, 0x0003($a0) ## 00000003 /* 14BC8 80846DD8 8E580004 */ lw $t8, 0x0004($s2) ## 8015E664 /* 14BCC 80846DDC A0830151 */ sb $v1, 0x0151($a0) ## 00000151 @@ -96,7 +96,7 @@ glabel func_80846CD8 /* 14C28 80846E38 0C023B2B */ jal func_8008ECAC /* 14C2C 80846E3C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 14C30 80846E40 820D014F */ lb $t5, 0x014F($s0) ## 0000014F -/* 14C34 80846E44 3C068012 */ lui $a2, 0x8012 ## $a2 = 80120000 +/* 14C34 80846E44 3C068012 */ lui $a2, %hi(D_80125B70) /* 14C38 80846E48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 14C3C 80846E4C A20D0153 */ sb $t5, 0x0153($s0) ## 00000153 /* 14C40 80846E50 8E470004 */ lw $a3, 0x0004($s2) ## 8015E664 @@ -104,7 +104,7 @@ glabel func_80846CD8 /* 14C48 80846E58 00077080 */ sll $t6, $a3, 2 /* 14C4C 80846E5C 00CE3021 */ addu $a2, $a2, $t6 /* 14C50 80846E60 0C211AAB */ jal func_80846AAC -/* 14C54 80846E64 8CC65B70 */ lw $a2, 0x5B70($a2) ## 80125B70 +/* 14C54 80846E64 8CC65B70 */ lw $a2, %lo(D_80125B70)($a2) /* 14C58 80846E68 3C058085 */ lui $a1, %hi(D_80855290) ## $a1 = 80850000 /* 14C5C 80846E6C 24A55290 */ addiu $a1, $a1, %lo(D_80855290) ## $a1 = 80855290 /* 14C60 80846E70 24043008 */ addiu $a0, $zero, 0x3008 ## $a0 = 00003008 @@ -206,11 +206,11 @@ glabel func_80846CD8 /* 14DB8 80846FC8 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 14DBC 80846FCC 8E420000 */ lw $v0, 0x0000($s2) ## 8015E660 /* 14DC0 80846FD0 00037880 */ sll $t7, $v1, 2 -/* 14DC4 80846FD4 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 +/* 14DC4 80846FD4 3C098013 */ lui $t1, %hi(gEntranceTable+2) /* 14DC8 80846FD8 0002C080 */ sll $t8, $v0, 2 /* 14DCC 80846FDC 01F8C821 */ addu $t9, $t7, $t8 /* 14DD0 80846FE0 01394821 */ addu $t1, $t1, $t9 -/* 14DD4 80846FE4 952981C2 */ lhu $t1, -0x7E3E($t1) ## 801281C2 +/* 14DD4 80846FE4 952981C2 */ lhu $t1, %lo(gEntranceTable+2)($t1) /* 14DD8 80846FE8 312A4000 */ andi $t2, $t1, 0x4000 ## $t2 = 00000000 /* 14DDC 80846FEC 5140001E */ beql $t2, $zero, .L80847068 /* 14DE0 80846FF0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 @@ -274,13 +274,13 @@ glabel func_80846CD8 /* 14EA4 808470B4 28410010 */ slti $at, $v0, 0x0010 /* 14EA8 808470B8 10200008 */ beq $at, $zero, .L808470DC /* 14EAC 808470BC 0002C080 */ sll $t8, $v0, 2 -/* 14EB0 808470C0 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 +/* 14EB0 808470C0 3C198012 */ lui $t9, %hi(gBitFlags) /* 14EB4 808470C4 0338C821 */ addu $t9, $t9, $t8 -/* 14EB8 808470C8 8F397120 */ lw $t9, 0x7120($t9) ## 80127120 +/* 14EB8 808470C8 8F397120 */ lw $t9, %lo(gBitFlags)($t9) /* 14EBC 808470CC 964F0F2C */ lhu $t7, 0x0F2C($s2) ## 8015F58C -/* 14EC0 808470D0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 14EC0 808470D0 3C018016 */ lui $at, %hi(gSaveContext+0xf2c) /* 14EC4 808470D4 01F94825 */ or $t1, $t7, $t9 ## $t1 = 80120000 -/* 14EC8 808470D8 A429F58C */ sh $t1, -0x0A74($at) ## 8015F58C +/* 14EC8 808470D8 A429F58C */ sh $t1, %lo(gSaveContext+0xf2c)($at) .L808470DC: /* 14ECC 808470DC 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 14ED0 808470E0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 @@ -351,8 +351,8 @@ glabel func_80846CD8 .L808471C8: /* 14FB8 808471C8 0C0201E8 */ jal func_800807A0 /* 14FBC 808471CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14FC0 808471D0 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 14FC4 808471D4 8D6BFA90 */ lw $t3, -0x0570($t3) ## 8015FA90 +/* 14FC0 808471D0 3C0B8016 */ lui $t3, %hi(gGameInfo) +/* 14FC4 808471D4 8D6BFA90 */ lw $t3, %lo(gGameInfo)($t3) /* 14FC8 808471D8 A5600454 */ sh $zero, 0x0454($t3) ## 80160454 /* 14FCC 808471DC 8FBF0034 */ lw $ra, 0x0034($sp) /* 14FD0 808471E0 8FB20030 */ lw $s2, 0x0030($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808473D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808473D4.s index b4e64986fa..9fdf620378 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808473D4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808473D4.s @@ -106,10 +106,10 @@ glabel func_808473D4 /* 15348 80847558 846C0000 */ lh $t4, 0x0000($v1) ## 00000000 .L8084755C: /* 1534C 8084755C 2401006C */ addiu $at, $zero, 0x006C ## $at = 0000006C -/* 15350 80847560 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 15350 80847560 3C0D8016 */ lui $t5, %hi(gSaveContext+4) /* 15354 80847564 15810006 */ bne $t4, $at, .L80847580 /* 15358 80847568 00000000 */ nop -/* 1535C 8084756C 8DADE664 */ lw $t5, -0x199C($t5) ## 8015E664 +/* 1535C 8084756C 8DADE664 */ lw $t5, %lo(gSaveContext+4)($t5) /* 15360 80847570 15A00003 */ bne $t5, $zero, .L80847580 /* 15364 80847574 00000000 */ nop /* 15368 80847578 10000115 */ beq $zero, $zero, .L808479D0 @@ -283,14 +283,14 @@ glabel func_808473D4 .L808477B4: /* 155A4 808477B4 8CC40680 */ lw $a0, 0x0680($a2) ## 00000680 .L808477B8: -/* 155A8 808477B8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 155AC 808477BC 3C0C8012 */ lui $t4, 0x8012 ## $t4 = 80120000 +/* 155A8 808477B8 3C0E8016 */ lui $t6, %hi(gSaveContext+0xa0) +/* 155AC 808477BC 3C0C8012 */ lui $t4, %hi(gUpgradeMasks+0xc) /* 155B0 808477C0 308D0800 */ andi $t5, $a0, 0x0800 ## $t5 = 00000000 /* 155B4 808477C4 11A0001F */ beq $t5, $zero, .L80847844 -/* 155B8 808477C8 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 -/* 155BC 808477CC 8DCEE700 */ lw $t6, -0x1900($t6) ## 8015E700 -/* 155C0 808477D0 8D8C71BC */ lw $t4, 0x71BC($t4) ## 801271BC -/* 155C4 808477D4 931871F7 */ lbu $t8, 0x71F7($t8) ## 801271F7 +/* 155B8 808477C8 3C188012 */ lui $t8, %hi(gUpgradeShifts+3) +/* 155BC 808477CC 8DCEE700 */ lw $t6, %lo(gSaveContext+0xa0)($t6) +/* 155C0 808477D0 8D8C71BC */ lw $t4, %lo(gUpgradeMasks+0xc)($t4) +/* 155C4 808477D4 931871F7 */ lbu $t8, %lo(gUpgradeShifts+3)($t8) /* 155C8 808477D8 3C018085 */ lui $at, %hi(D_80854784) ## $at = 80850000 /* 155CC 808477DC 01CC7824 */ and $t7, $t6, $t4 /* 155D0 808477E0 030FC807 */ srav $t9, $t7, $t8 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847BA0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847BA0.s index 63c61788a2..ad93a439de 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847BA0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847BA0.s @@ -373,18 +373,18 @@ glabel func_80847BA0 /* 15E94 808480A4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 15E98 808480A8 46803220 */ cvt.s.w $f8, $f6 /* 15E9C 808480AC 312E0001 */ andi $t6, $t1, 0x0001 ## $t6 = 00000000 -/* 15EA0 808480B0 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 15EA4 808480B4 460A4002 */ mul.s $f0, $f8, $f10 -/* 15EA8 808480B8 11C00007 */ beq $t6, $zero, .L808480D8 +/* 15EA0 808480B0 3C0D8016 */ lui $t5, %hi(gGameInfo) +/* 15EA4 808480B4 460A4002 */ mul.s $f0, $f8, $f10 +/* 15EA8 808480B8 11C00007 */ beq $t6, $zero, .L808480D8 /* 15EAC 808480BC 00000000 */ nop /* 15EB0 808480C0 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 15EB4 808480C4 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 15EB8 808480C8 4600903E */ c.le.s $f18, $f0 +/* 15EB4 808480C4 3C198016 */ lui $t9, %hi(gGameInfo) +/* 15EB8 808480C8 4600903E */ c.le.s $f18, $f0 /* 15EBC 808480CC 00000000 */ nop /* 15EC0 808480D0 4500000B */ bc1f .L80848100 /* 15EC4 808480D4 00000000 */ nop .L808480D8: -/* 15EC8 808480D8 8DADFA90 */ lw $t5, -0x0570($t5) ## 8015FA90 +/* 15EC8 808480D8 8DADFA90 */ lw $t5, %lo(gGameInfo)($t5) /* 15ECC 808480DC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 15ED0 808480E0 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 /* 15ED4 808480E4 85A8006E */ lh $t0, 0x006E($t5) ## 8016006E @@ -395,7 +395,7 @@ glabel func_80847BA0 /* 15EE8 808480F8 10000011 */ beq $zero, $zero, .L80848140 /* 15EEC 808480FC E60A0880 */ swc1 $f10, 0x0880($s0) ## 00000880 .L80848100: -/* 15EF0 80848100 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 15EF0 80848100 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 15EF4 80848104 3C018085 */ lui $at, %hi(D_8085548C) ## $at = 80850000 /* 15EF8 80848108 C42C548C */ lwc1 $f12, %lo(D_8085548C)($at) /* 15EFC 8084810C 872F006E */ lh $t7, 0x006E($t9) ## 8016006E @@ -610,8 +610,8 @@ glabel func_80847BA0 /* 1620C 8084841C 1000000D */ beq $zero, $zero, .L80848454 /* 16210 80848420 A3B800C7 */ sb $t8, 0x00C7($sp) .L80848424: -/* 16214 80848424 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 16218 80848428 8D4AFA90 */ lw $t2, -0x0570($t2) ## 8015FA90 +/* 16214 80848424 3C0A8016 */ lui $t2, %hi(gGameInfo) +/* 16218 80848428 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) /* 1621C 8084842C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 16220 80848430 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 /* 16224 80848434 854B006E */ lh $t3, 0x006E($t2) ## 8016006E diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848EF8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848EF8.s index 9cd6e43751..9193ff2dd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848EF8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848EF8.s @@ -6,10 +6,10 @@ glabel D_808554C8 .text glabel func_80848EF8 -/* 16CE8 80848EF8 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 16CEC 80848EFC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 16CF0 80848F00 8DEFE704 */ lw $t7, -0x18FC($t7) ## 8015E704 -/* 16CF4 80848F04 8DCE7174 */ lw $t6, 0x7174($t6) ## 80127174 +/* 16CE8 80848EF8 3C0E8012 */ lui $t6, %hi(gBitFlags+0x54) +/* 16CEC 80848EFC 3C0F8016 */ lui $t7, %hi(gSaveContext+0xa4) +/* 16CF0 80848F00 8DEFE704 */ lw $t7, %lo(gSaveContext+0xa4)($t7) +/* 16CF4 80848F04 8DCE7174 */ lw $t6, %lo(gBitFlags+0x54)($t6) /* 16CF8 80848F08 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 16CFC 80848F0C AFBF001C */ sw $ra, 0x001C($sp) /* 16D00 80848F10 01CFC024 */ and $t8, $t6, $t7 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s index 602c1aadf6..83a180f972 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s @@ -109,20 +109,20 @@ glabel func_80848F9C /* 16ED4 808490E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 16ED8 808490E8 92190692 */ lbu $t9, 0x0692($s0) ## 00000692 .L808490EC: -/* 16EDC 808490EC 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 16EDC 808490EC 3C098016 */ lui $t1, %hi(gSaveContext+0x13c8) /* 16EE0 808490F0 33280040 */ andi $t0, $t9, 0x0040 ## $t0 = 00000000 /* 16EE4 808490F4 51000012 */ beql $t0, $zero, .L80849140 /* 16EE8 808490F8 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 -/* 16EEC 808490FC 8529FA28 */ lh $t1, -0x05D8($t1) ## 8015FA28 -/* 16EF0 80849100 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 16EEC 808490FC 8529FA28 */ lh $t1, %lo(gSaveContext+0x13c8)($t1) +/* 16EF0 80849100 3C0A8016 */ lui $t2, %hi(gSaveContext+0x13f0) /* 16EF4 80849104 5120000E */ beql $t1, $zero, .L80849140 /* 16EF8 80849108 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 -/* 16EFC 8084910C 854AFA50 */ lh $t2, -0x05B0($t2) ## 8015FA50 +/* 16EFC 8084910C 854AFA50 */ lh $t2, %lo(gSaveContext+0x13f0)($t2) /* 16F00 80849110 240B0003 */ addiu $t3, $zero, 0x0003 ## $t3 = 00000003 -/* 16F04 80849114 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 16F04 80849114 3C018016 */ lui $at, %hi(gSaveContext+0x13f0) /* 16F08 80849118 15400008 */ bne $t2, $zero, .L8084913C /* 16F0C 8084911C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 16F10 80849120 A42BFA50 */ sh $t3, -0x05B0($at) ## 8015FA50 +/* 16F10 80849120 A42BFA50 */ sh $t3, %lo(gSaveContext+0x13f0)($at) /* 16F14 80849124 8FA40084 */ lw $a0, 0x0084($sp) /* 16F18 80849128 0C211A80 */ jal func_80846A00 /* 16F1C 8084912C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 @@ -512,8 +512,8 @@ glabel func_80848F9C /* 17480 80849690 0C20E40D */ jal func_80839034 /* 17484 80849694 8FA70058 */ lw $a3, 0x0058($sp) /* 17488 80849698 10400009 */ beq $v0, $zero, .L808496C0 -/* 1748C 8084969C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 17490 808496A0 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 1748C 8084969C 3C028016 */ lui $v0, %hi(gGameInfo) +/* 17490 808496A0 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 17494 808496A4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 17498 808496A8 844B0586 */ lh $t3, 0x0586($v0) ## 80160586 /* 1749C 808496AC 51600004 */ beql $t3, $zero, .L808496C0 @@ -639,10 +639,10 @@ glabel func_80848F9C /* 17640 80849850 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 17644 80849854 920A0002 */ lbu $t2, 0x0002($s0) ## 00000002 /* 17648 80849858 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 1764C 8084985C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 1764C 8084985C 3C098016 */ lui $t1, %hi(gSaveContext+0x30) /* 17650 80849860 5541002D */ bnel $t2, $at, .L80849918 /* 17654 80849864 8E180118 */ lw $t8, 0x0118($s0) ## 00000118 -/* 17658 80849868 8529E690 */ lh $t1, -0x1970($t1) ## 8015E690 +/* 17658 80849868 8529E690 */ lh $t1, %lo(gSaveContext+0x30)($t1) /* 1765C 8084986C 5520002A */ bnel $t1, $zero, .L80849918 /* 17660 80849870 8E180118 */ lw $t8, 0x0118($s0) ## 00000118 /* 17664 80849874 8E03067C */ lw $v1, 0x067C($s0) ## 0000067C diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80849EA8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80849EA8.s index 68744fdacd..51792abfd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80849EA8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80849EA8.s @@ -7,8 +7,8 @@ glabel func_80849EA8 /* 17CAC 80849EBC 0C213F2B */ jal func_8084FCAC /* 17CB0 80849EC0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 17CB4 80849EC4 1040006C */ beq $v0, $zero, .L8084A078 -/* 17CB8 80849EC8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 17CBC 80849ECC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 17CB8 80849EC8 3C038016 */ lui $v1, %hi(gSaveContext) +/* 17CBC 80849ECC 2463E660 */ addiu $v1, %lo(gSaveContext) /* 17CC0 80849ED0 846E13C4 */ lh $t6, 0x13C4($v1) ## 8015FA24 /* 17CC4 80849ED4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 17CC8 80849ED8 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 @@ -17,9 +17,9 @@ glabel func_80849EA8 /* 17CD4 80849EE4 0C02604B */ jal Object_GetIndex ## ObjectIndex /* 17CD8 80849EE8 2405016B */ addiu $a1, $zero, 0x016B ## $a1 = 0000016B -/* 17CDC 80849EEC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 17CDC 80849EEC 3C038016 */ lui $v1, %hi(gSaveContext) /* 17CE0 80849EF0 04410003 */ bgez $v0, .L80849F00 -/* 17CE4 80849EF4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 17CE4 80849EF4 2463E660 */ addiu $v1, %lo(gSaveContext) /* 17CE8 80849EF8 10000023 */ beq $zero, $zero, .L80849F88 /* 17CEC 80849EFC A46013C4 */ sh $zero, 0x13C4($v1) ## 8015FA24 .L80849F00: @@ -37,8 +37,8 @@ glabel func_80849EA8 /* 17D1C 80849F2C C4248ABC */ lwc1 $f4, %lo(D_80858ABC)($at) /* 17D20 80849F30 3C018086 */ lui $at, %hi(D_80858AC0) ## $at = 80860000 /* 17D24 80849F34 C4268AC0 */ lwc1 $f6, %lo(D_80858AC0)($at) -/* 17D28 80849F38 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 17D2C 80849F3C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 17D28 80849F38 3C038016 */ lui $v1, %hi(gSaveContext) +/* 17D2C 80849F3C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 17D30 80849F40 846213C4 */ lh $v0, 0x13C4($v1) ## 8015FA24 /* 17D34 80849F44 AFA00018 */ sw $zero, 0x0018($sp) /* 17D38 80849F48 E7A40010 */ swc1 $f4, 0x0010($sp) @@ -127,8 +127,8 @@ glabel func_80849EA8 /* 17E64 8084A074 27A60044 */ addiu $a2, $sp, 0x0044 ## $a2 = FFFFFFDC .L8084A078: /* 17E68 8084A078 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 17E6C 8084A07C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 17E70 8084A080 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 17E6C 8084A07C 3C028016 */ lui $v0, %hi(gGameInfo) +/* 17E70 8084A080 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 17E74 8084A084 4600428D */ trunc.w.s $f10, $f8 /* 17E78 8084A088 8C4D0000 */ lw $t5, 0x0000($v0) ## 8015FA90 /* 17E7C 8084A08C 440C5000 */ mfc1 $t4, $f10 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s index 64ce068cd6..a58f47ad06 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s @@ -53,8 +53,8 @@ glabel func_8084A0E8 /* 17F2C 8084A13C AC640000 */ sw $a0, 0x0000($v1) ## 00000000 /* 17F30 8084A140 AC650004 */ sw $a1, 0x0004($v1) ## 00000004 /* 17F34 8084A144 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 17F38 8084A148 3C0C8009 */ lui $t4, 0x8009 ## $t4 = 80090000 -/* 17F3C 8084A14C 258C0D20 */ addiu $t4, $t4, 0x0D20 ## $t4 = 80090D20 +/* 17F38 8084A148 3C0C8009 */ lui $t4, %hi(func_80090D20) +/* 17F3C 8084A14C 258C0D20 */ addiu $t4, %lo(func_80090D20) /* 17F40 8084A150 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 17F44 8084A154 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 /* 17F48 8084A158 AC450004 */ sw $a1, 0x0004($v0) ## 00000004 @@ -77,8 +77,8 @@ glabel func_8084A0E8 /* 17F8C 8084A19C 0C023D1C */ jal func_8008F470 /* 17F90 8084A1A0 AFAA001C */ sw $t2, 0x001C($sp) /* 17F94 8084A1A4 8FAD00A0 */ lw $t5, 0x00A0($sp) -/* 17F98 8084A1A8 3C0E8009 */ lui $t6, 0x8009 ## $t6 = 80090000 -/* 17F9C 8084A1AC 25CE0014 */ addiu $t6, $t6, 0x0014 ## $t6 = 80090014 +/* 17F98 8084A1A8 3C0E8009 */ lui $t6, %hi(func_80090014) +/* 17F9C 8084A1AC 25CE0014 */ addiu $t6, %lo(func_80090014) /* 17FA0 8084A1B0 55AE0051 */ bnel $t5, $t6, .L8084A2F8 /* 17FA4 8084A1B4 8209014F */ lb $t1, 0x014F($s0) ## 0000014F /* 17FA8 8084A1B8 920F015F */ lbu $t7, 0x015F($s0) ## 0000015F diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s index 9636a4d863..850e375e8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s @@ -36,8 +36,8 @@ glabel func_8084A5C4 /* 183DC 8084A5EC 0C031AB1 */ jal Graph_OpenDisps /* 183E0 8084A5F0 AFA500A4 */ sw $a1, 0x00A4($sp) /* 183E4 8084A5F4 8E0F0680 */ lw $t7, 0x0680($s0) ## 00000680 -/* 183E8 8084A5F8 3C198009 */ lui $t9, 0x8009 ## $t9 = 80090000 -/* 183EC 8084A5FC 27390014 */ addiu $t9, $t9, 0x0014 ## $t9 = 80090014 +/* 183E8 8084A5F8 3C198009 */ lui $t9, %hi(func_80090014) +/* 183EC 8084A5FC 27390014 */ addiu $t9, %lo(func_80090014) /* 183F0 8084A600 000FC080 */ sll $t8, $t7, 2 /* 183F4 8084A604 07020148 */ bltzl $t8, .L8084AB28 /* 183F8 8084A608 8FB800B4 */ lw $t8, 0x00B4($sp) @@ -131,8 +131,8 @@ glabel func_8084A5C4 /* 1853C 8084A74C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 18540 8084A750 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 /* 18544 8084A754 C7B20084 */ lwc1 $f18, 0x0084($sp) -/* 18548 8084A758 3C198009 */ lui $t9, 0x8009 ## $t9 = 80090000 -/* 1854C 8084A75C 273902F0 */ addiu $t9, $t9, 0x02F0 ## $t9 = 800902F0 +/* 18548 8084A758 3C198009 */ lui $t9, %hi(func_800902F0) +/* 1854C 8084A75C 273902F0 */ addiu $t9, %lo(func_800902F0) /* 18550 8084A760 4604903C */ c.lt.s $f18, $f4 /* 18554 8084A764 00000000 */ nop /* 18558 8084A768 45000002 */ bc1f .L8084A774 @@ -148,8 +148,8 @@ glabel func_8084A5C4 /* 18578 8084A788 00026140 */ sll $t4, $v0, 5 /* 1857C 8084A78C C60600EC */ lwc1 $f6, 0x00EC($s0) ## 000000EC /* 18580 8084A790 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 18584 8084A794 3C0D8009 */ lui $t5, 0x8009 ## $t5 = 80090000 -/* 18588 8084A798 25AD0440 */ addiu $t5, $t5, 0x0440 ## $t5 = 80090440 +/* 18584 8084A794 3C0D8009 */ lui $t5, %hi(func_80090440) +/* 18588 8084A798 25AD0440 */ addiu $t5, %lo(func_80090440) /* 1858C 8084A79C 4608303C */ c.lt.s $f6, $f8 /* 18590 8084A7A0 00000000 */ nop /* 18594 8084A7A4 45020003 */ bc1fl .L8084A7B4 @@ -247,8 +247,8 @@ glabel func_8084A5C4 /* 186F4 8084A904 0C0342DC */ jal Matrix_RotateX /* 186F8 8084A908 46006307 */ neg.s $f12, $f12 /* 186FC 8084A90C 8FAD0090 */ lw $t5, 0x0090($sp) -/* 18700 8084A910 3C078012 */ lui $a3, 0x8012 ## $a3 = 80120000 -/* 18704 8084A914 24E75FA8 */ addiu $a3, $a3, 0x5FA8 ## $a3 = 80125FA8 +/* 18700 8084A910 3C078012 */ lui $a3, %hi(D_80125FA8) +/* 18704 8084A914 24E75FA8 */ addiu $a3, %lo(D_80125FA8) /* 18708 8084A918 8FA400B4 */ lw $a0, 0x00B4($sp) /* 1870C 8084A91C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 18710 8084A920 8FA6008C */ lw $a2, 0x008C($sp) @@ -263,8 +263,8 @@ glabel func_8084A5C4 /* 18730 8084A940 3C04D9FF */ lui $a0, 0xD9FF ## $a0 = D9FF0000 /* 18734 8084A944 3484F9FF */ ori $a0, $a0, 0xF9FF ## $a0 = D9FFF9FF /* 18738 8084A948 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 1873C 8084A94C 3C078012 */ lui $a3, 0x8012 ## $a3 = 80120000 -/* 18740 8084A950 24E75F98 */ addiu $a3, $a3, 0x5F98 ## $a3 = 80125F98 +/* 1873C 8084A94C 3C078012 */ lui $a3, %hi(D_80125F98) +/* 18740 8084A950 24E75F98 */ addiu $a3, %lo(D_80125F98) /* 18744 8084A954 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 18748 8084A958 AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 /* 1874C 8084A95C AC400004 */ sw $zero, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s index 39d59e8b30..517993e792 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s @@ -27,9 +27,9 @@ glabel func_8084AB54 /* 189A4 8084ABB4 8FBF001C */ lw $ra, 0x001C($sp) /* 189A8 8084ABB8 01D17021 */ addu $t6, $t6, $s1 /* 189AC 8084ABBC 91CE1DE8 */ lbu $t6, 0x1DE8($t6) ## 00011DE8 -/* 189B0 8084ABC0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 189B0 8084ABC0 3C018016 */ lui $at, %hi(gSaveContext+4) /* 189B4 8084ABC4 8FB10018 */ lw $s1, 0x0018($sp) /* 189B8 8084ABC8 8FB00014 */ lw $s0, 0x0014($sp) /* 189BC 8084ABCC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 189C0 8084ABD0 03E00008 */ jr $ra -/* 189C4 8084ABD4 AC2EE664 */ sw $t6, -0x199C($at) ## 8015E664 +/* 189C4 8084ABD4 AC2EE664 */ sw $t6, %lo(gSaveContext+4)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AEEC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AEEC.s index 74180a3e5e..8f2185863f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AEEC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AEEC.s @@ -11,8 +11,8 @@ glabel D_80855504 .text glabel func_8084AEEC /* 18CDC 8084AEEC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 18CE0 8084AEF0 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 18CE4 8084AEF4 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 18CE0 8084AEF0 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 18CE4 8084AEF4 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 18CE8 8084AEF8 AFBF0014 */ sw $ra, 0x0014($sp) /* 18CEC 8084AEFC AFA40018 */ sw $a0, 0x0018($sp) /* 18CF0 8084AF00 AFA5001C */ sw $a1, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B498.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B498.s index 05875312d6..19bf23e879 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B498.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B498.s @@ -1,10 +1,10 @@ glabel func_8084B498 -/* 19288 8084B498 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 1928C 8084B49C 91CE746B */ lbu $t6, 0x746B($t6) ## 8012746B -/* 19290 8084B4A0 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 19288 8084B498 3C0E8012 */ lui $t6, %hi(gItemSlots+7) +/* 1928C 8084B49C 91CE746B */ lbu $t6, %lo(gItemSlots+7)($t6) +/* 19290 8084B4A0 3C0F8016 */ lui $t7, %hi(gSaveContext+0x74) /* 19294 8084B4A4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 /* 19298 8084B4A8 01EE7821 */ addu $t7, $t7, $t6 -/* 1929C 8084B4AC 91EFE6D4 */ lbu $t7, -0x192C($t7) ## 8015E6D4 +/* 1929C 8084B4AC 91EFE6D4 */ lbu $t7, %lo(gSaveContext+0x74)($t7) /* 192A0 8084B4B0 2419001D */ addiu $t9, $zero, 0x001D ## $t9 = 0000001D /* 192A4 8084B4B4 2418001C */ addiu $t8, $zero, 0x001C ## $t8 = 0000001C /* 192A8 8084B4B8 55E10004 */ bnel $t7, $at, .L8084B4CC diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D3E4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D3E4.s index 8360e3f576..2ec9a8e1eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D3E4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D3E4.s @@ -26,23 +26,23 @@ glabel func_8084D3E4 /* 1B234 8084D444 0301C824 */ and $t9, $t8, $at /* 1B238 8084D448 AE19067C */ sw $t9, 0x067C($s0) ## 0000067C /* 1B23C 8084D44C AE000118 */ sw $zero, 0x0118($s0) ## 00000118 -/* 1B240 8084D450 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 1B244 8084D454 8D08FA90 */ lw $t0, -0x0570($t0) ## 8015FA90 +/* 1B240 8084D450 3C088016 */ lui $t0, %hi(gGameInfo) +/* 1B244 8084D454 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) /* 1B248 8084D458 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 /* 1B24C 8084D45C 0C00D6D3 */ jal Flags_GetEventChkInf /* 1B250 8084D460 A5000E60 */ sh $zero, 0x0E60($t0) ## 80160E60 /* 1B254 8084D464 14400006 */ bne $v0, $zero, .L8084D480 /* 1B258 8084D468 8FA30024 */ lw $v1, 0x0024($sp) -/* 1B25C 8084D46C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 1B260 8084D470 8D29FA90 */ lw $t1, -0x0570($t1) ## 8015FA90 +/* 1B25C 8084D46C 3C098016 */ lui $t1, %hi(gGameInfo) +/* 1B260 8084D470 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) /* 1B264 8084D474 852A0556 */ lh $t2, 0x0556($t1) ## 80160556 /* 1B268 8084D478 51400029 */ beql $t2, $zero, .L8084D520 /* 1B26C 8084D47C 8FBF001C */ lw $ra, 0x001C($sp) .L8084D480: /* 1B270 8084D480 C4640024 */ lwc1 $f4, 0x0024($v1) ## 00000024 -/* 1B274 8084D484 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 1B278 8084D488 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 1B274 8084D484 3C028016 */ lui $v0, %hi(gSaveContext) +/* 1B278 8084D488 2442E660 */ addiu $v0, %lo(gSaveContext) /* 1B27C 8084D48C 4600218D */ trunc.w.s $f6, $f4 /* 1B280 8084D490 440C3000 */ mfc1 $t4, $f6 /* 1B284 8084D494 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DC48.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DC48.s index 67cd4ef12d..20ffe60f9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DC48.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DC48.s @@ -101,14 +101,14 @@ glabel func_8084DC48 /* 1BB9C 8084DDAC 5440001C */ bnel $v0, $zero, .L8084DE20 /* 1BBA0 8084DDB0 820D084F */ lb $t5, 0x084F($s0) ## 0000084F /* 1BBA4 8084DDB4 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 1BBA8 8084DDB8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 1BBAC 8084DDBC 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 +/* 1BBA8 8084DDB8 3C198016 */ lui $t9, %hi(gSaveContext+0xa0) +/* 1BBAC 8084DDBC 3C088012 */ lui $t0, %hi(gUpgradeMasks+0xc) /* 1BBB0 8084DDC0 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 /* 1BBB4 8084DDC4 17000015 */ bne $t8, $zero, .L8084DE1C -/* 1BBB8 8084DDC8 3C0A8012 */ lui $t2, 0x8012 ## $t2 = 80120000 -/* 1BBBC 8084DDCC 8F39E700 */ lw $t9, -0x1900($t9) ## 8015E700 -/* 1BBC0 8084DDD0 8D0871BC */ lw $t0, 0x71BC($t0) ## 801271BC -/* 1BBC4 8084DDD4 914A71F7 */ lbu $t2, 0x71F7($t2) ## 801271F7 +/* 1BBB8 8084DDC8 3C0A8012 */ lui $t2, %hi(gUpgradeShifts+3) +/* 1BBBC 8084DDCC 8F39E700 */ lw $t9, %lo(gSaveContext+0xa0)($t9) +/* 1BBC0 8084DDD0 8D0871BC */ lw $t0, %lo(gUpgradeMasks+0xc)($t0) +/* 1BBC4 8084DDD4 914A71F7 */ lbu $t2, %lo(gUpgradeShifts+3)($t2) /* 1BBC8 8084DDD8 3C018085 */ lui $at, %hi(D_80854784) ## $at = 80850000 /* 1BBCC 8084DDDC 03284824 */ and $t1, $t9, $t0 /* 1BBD0 8084DDE0 01495807 */ srav $t3, $t1, $t2 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFF4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFF4.s index 4ef51e5155..67a57f7285 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFF4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFF4.s @@ -51,12 +51,12 @@ glabel func_8084DFF4 /* 1BE98 8084E0A8 24010048 */ addiu $at, $zero, 0x0048 ## $at = 00000048 /* 1BE9C 8084E0AC 1461000D */ bne $v1, $at, .L8084E0E4 .L8084E0B0: -/* 1BEA0 8084E0B0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 1BEA4 8084E0B4 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 1BEA8 8084E0B8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 1BEAC 8084E0BC 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 -/* 1BEB0 8084E0C0 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 1BEB4 8084E0C4 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 1BEA0 8084E0B0 3C078013 */ lui $a3, %hi(D_801333E0) +/* 1BEA4 8084E0B4 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 1BEA8 8084E0B8 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 1BEAC 8084E0BC 254A33E8 */ addiu $t2, %lo(D_801333E8) +/* 1BEB0 8084E0C0 3C058013 */ lui $a1, %hi(D_801333D4) +/* 1BEB4 8084E0C4 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 1BEB8 8084E0C8 AFAA0014 */ sw $t2, 0x0014($sp) /* 1BEBC 8084E0CC AFA70010 */ sw $a3, 0x0010($sp) /* 1BEC0 8084E0D0 24044831 */ addiu $a0, $zero, 0x4831 ## $a0 = 00004831 @@ -72,8 +72,8 @@ glabel func_8084DFF4 /* 1BEE0 8084E0F0 10610009 */ beq $v1, $at, .L8084E118 /* 1BEE4 8084E0F4 2402003E */ addiu $v0, $zero, 0x003E ## $v0 = 0000003E /* 1BEE8 8084E0F8 14430009 */ bne $v0, $v1, .L8084E120 -/* 1BEEC 8084E0FC 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 1BEF0 8084E100 8D6BE704 */ lw $t3, -0x18FC($t3) ## 8015E704 +/* 1BEEC 8084E0FC 3C0B8016 */ lui $t3, %hi(gSaveContext+0xa4) +/* 1BEF0 8084E100 8D6BE704 */ lw $t3, %lo(gSaveContext+0xa4)($t3) /* 1BEF4 8084E104 3C01F000 */ lui $at, 0xF000 ## $at = F0000000 /* 1BEF8 8084E108 01616024 */ and $t4, $t3, $at /* 1BEFC 8084E10C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -116,8 +116,8 @@ glabel func_8084DFF4 /* 1BF7C 8084E18C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 1BF80 8084E190 00270821 */ addu $at, $at, $a3 /* 1BF84 8084E194 A02F1E15 */ sb $t7, 0x1E15($at) ## 00011E15 -/* 1BF88 8084E198 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 1BF8C 8084E19C A438FA72 */ sh $t8, -0x058E($at) ## 8015FA72 +/* 1BF88 8084E198 3C018016 */ lui $at, %hi(gSaveContext+0x1412) +/* 1BF8C 8084E19C A438FA72 */ sh $t8, %lo(gSaveContext+0x1412)($at) /* 1BF90 8084E1A0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 1BF94 8084E1A4 00270821 */ addu $at, $at, $a3 /* 1BF98 8084E1A8 A0391E5E */ sb $t9, 0x1E5E($at) ## 00011E5E diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E3C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E3C4.s index 31429f6681..813a7aafe4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E3C4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E3C4.s @@ -92,8 +92,8 @@ glabel func_8084E3C4 /* 1C300 8084E510 14610037 */ bne $v1, $at, .L8084E5F0 /* 1C304 8084E514 3C0E8085 */ lui $t6, %hi(D_808549D4) ## $t6 = 80850000 /* 1C308 8084E518 944C04C4 */ lhu $t4, 0x04C4($v0) ## 000004C4 -/* 1C30C 8084E51C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 1C310 8084E520 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 1C30C 8084E51C 3C038016 */ lui $v1, %hi(gSaveContext) +/* 1C310 8084E520 2463E660 */ addiu $v1, %lo(gSaveContext) /* 1C314 8084E524 000C6840 */ sll $t5, $t4, 1 /* 1C318 8084E528 01CD7021 */ addu $t6, $t6, $t5 /* 1C31C 8084E52C 85CE49D4 */ lh $t6, %lo(D_808549D4)($t6) @@ -142,8 +142,8 @@ glabel func_8084E3C4 /* 1C3C4 8084E5D4 0C01DDB9 */ jal func_800776E4 /* 1C3C8 8084E5D8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L8084E5DC: -/* 1C3CC 8084E5DC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 1C3D0 8084E5E0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 1C3CC 8084E5DC 3C038016 */ lui $v1, %hi(gSaveContext) +/* 1C3D0 8084E5E0 2463E660 */ addiu $v1, %lo(gSaveContext) /* 1C3D4 8084E5E4 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF /* 1C3D8 8084E5E8 A06213E0 */ sb $v0, 0x13E0($v1) ## 8015FA40 /* 1C3DC 8084E5EC A06213E1 */ sb $v0, 0x13E1($v1) ## 8015FA41 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E6D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E6D4.s index 1d63216c23..720f69345e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E6D4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E6D4.s @@ -28,7 +28,7 @@ glabel func_8084E6D4 /* 1C528 8084E738 55E1008F */ bnel $t7, $at, .L8084E978 /* 1C52C 8084E73C 8FBF0034 */ lw $ra, 0x0034($sp) /* 1C530 8084E740 8E020694 */ lw $v0, 0x0694($s0) ## 00000694 -/* 1C534 8084E744 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 1C534 8084E744 3C188016 */ lui $t8, %hi(gSaveContext+0x1424) /* 1C538 8084E748 0002102B */ sltu $v0, $zero, $v0 /* 1C53C 8084E74C 50400006 */ beql $v0, $zero, .L8084E768 /* 1C540 8084E750 92020692 */ lbu $v0, 0x0692($s0) ## 00000692 @@ -43,7 +43,7 @@ glabel func_8084E6D4 .L8084E770: /* 1C560 8084E770 14400004 */ bne $v0, $zero, .L8084E784 /* 1C564 8084E774 00000000 */ nop -/* 1C568 8084E778 8718FA84 */ lh $t8, -0x057C($t8) ## 8015FA84 +/* 1C568 8084E778 8718FA84 */ lh $t8, %lo(gSaveContext+0x1424)($t8) /* 1C56C 8084E77C 5700007E */ bnel $t8, $zero, .L8084E978 /* 1C570 8084E780 8FBF0034 */ lw $ra, 0x0034($sp) .L8084E784: @@ -143,10 +143,10 @@ glabel func_8084E6D4 /* 1C6CC 8084E8DC 8FBF0034 */ lw $ra, 0x0034($sp) /* 1C6D0 8084E8E0 860D0850 */ lh $t5, 0x0850($s0) ## 00000850 .L8084E8E4: -/* 1C6D4 8084E8E4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 1C6D4 8084E8E4 3C0E8016 */ lui $t6, %hi(gSaveContext+4) /* 1C6D8 8084E8E8 55A0000B */ bnel $t5, $zero, .L8084E918 /* 1C6DC 8084E8EC 8E1801BC */ lw $t8, 0x01BC($s0) ## 000001BC -/* 1C6E0 8084E8F0 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 +/* 1C6E0 8084E8F0 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) /* 1C6E4 8084E8F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1C6E8 8084E8F8 3C058085 */ lui $a1, %hi(D_808549E0) ## $a1 = 80850000 /* 1C6EC 8084E8FC 51C0001E */ beql $t6, $zero, .L8084E978 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E9AC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E9AC.s index acf2dc38a0..f87580a13f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E9AC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E9AC.s @@ -41,8 +41,8 @@ glabel func_8084E9AC /* 1C82C 8084EA3C 1000001D */ beq $zero, $zero, .L8084EAB4 /* 1C830 8084EA40 8FBF0014 */ lw $ra, 0x0014($sp) .L8084EA44: -/* 1C834 8084EA44 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 1C838 8084EA48 8F39E664 */ lw $t9, -0x199C($t9) ## 8015E664 +/* 1C834 8084EA44 3C198016 */ lui $t9, %hi(gSaveContext+4) +/* 1C838 8084EA48 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) /* 1C83C 8084EA4C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 1C840 8084EA50 3C05431E */ lui $a1, 0x431E ## $a1 = 431E0000 /* 1C844 8084EA54 1720000A */ bne $t9, $zero, .L8084EA80 @@ -57,8 +57,8 @@ glabel func_8084E9AC /* 1C868 8084EA78 1000000E */ beq $zero, $zero, .L8084EAB4 /* 1C86C 8084EA7C 8FBF0014 */ lw $ra, 0x0014($sp) .L8084EA80: -/* 1C870 8084EA80 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 1C874 8084EA84 8D08E664 */ lw $t0, -0x199C($t0) ## 8015E664 +/* 1C870 8084EA80 3C088016 */ lui $t0, %hi(gSaveContext+4) +/* 1C874 8084EA84 8D08E664 */ lw $t0, %lo(gSaveContext+4)($t0) /* 1C878 8084EA88 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 1C87C 8084EA8C 3C058085 */ lui $a1, %hi(D_808549F4) ## $a1 = 80850000 /* 1C880 8084EA90 11000005 */ beq $t0, $zero, .L8084EAA8 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EAC0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EAC0.s index 1bbcc60b1b..6fd05d948a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EAC0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EAC0.s @@ -29,8 +29,8 @@ glabel func_8084EAC0 /* 1C918 8084EB28 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 .L8084EB2C: /* 1C91C 8084EB2C 04610006 */ bgez $v1, .L8084EB48 -/* 1C920 8084EB30 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 1C924 8084EB34 85EFE690 */ lh $t7, -0x1970($t7) ## 8015E690 +/* 1C920 8084EB30 3C0F8016 */ lui $t7, %hi(gSaveContext+0x30) +/* 1C924 8084EB34 85EFE690 */ lh $t7, %lo(gSaveContext+0x30)($t7) /* 1C928 8084EB38 29E10011 */ slti $at, $t7, 0x0011 /* 1C92C 8084EB3C 10200002 */ beq $at, $zero, .L8084EB48 /* 1C930 8084EB40 00000000 */ nop @@ -44,17 +44,17 @@ glabel func_8084EAC0 /* 1C94C 8084EB5C 10000015 */ beq $zero, $zero, .L8084EBB4 /* 1C950 8084EB60 00000000 */ nop .L8084EB64: -/* 1C954 8084EB64 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 1C954 8084EB64 3C018016 */ lui $at, %hi(gSaveContext+0x1424) /* 1C958 8084EB68 10000012 */ beq $zero, $zero, .L8084EBB4 -/* 1C95C 8084EB6C A438FA84 */ sh $t8, -0x057C($at) ## 8015FA84 +/* 1C95C 8084EB6C A438FA84 */ sh $t8, %lo(gSaveContext+0x1424)($at) .L8084EB70: /* 1C960 8084EB70 906349D7 */ lbu $v1, %lo(D_808549D7)($v1) /* 1C964 8084EB74 24080140 */ addiu $t0, $zero, 0x0140 ## $t0 = 00000140 -/* 1C968 8084EB78 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 1C968 8084EB78 3C018016 */ lui $at, %hi(gSaveContext+0x1424) /* 1C96C 8084EB7C 30790001 */ andi $t9, $v1, 0x0001 ## $t9 = 00000000 /* 1C970 8084EB80 13200002 */ beq $t9, $zero, .L8084EB8C /* 1C974 8084EB84 30690002 */ andi $t1, $v1, 0x0002 ## $t1 = 00000000 -/* 1C978 8084EB88 A428FA84 */ sh $t0, -0x057C($at) ## 8015FA84 +/* 1C978 8084EB88 A428FA84 */ sh $t0, %lo(gSaveContext+0x1424)($at) .L8084EB8C: /* 1C97C 8084EB8C 11200004 */ beq $t1, $zero, .L8084EBA0 /* 1C980 8084EB90 8FA40034 */ lw $a0, 0x0034($sp) @@ -65,8 +65,8 @@ glabel func_8084EAC0 /* 1C990 8084EBA0 306A0004 */ andi $t2, $v1, 0x0004 ## $t2 = 00000000 /* 1C994 8084EBA4 11400003 */ beq $t2, $zero, .L8084EBB4 /* 1C998 8084EBA8 240B0050 */ addiu $t3, $zero, 0x0050 ## $t3 = 00000050 -/* 1C99C 8084EBAC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 1C9A0 8084EBB0 A42BFA84 */ sh $t3, -0x057C($at) ## 8015FA84 +/* 1C99C 8084EBAC 3C018016 */ lui $at, %hi(gSaveContext+0x1424) +/* 1C9A0 8084EBB0 A42BFA84 */ sh $t3, %lo(gSaveContext+0x1424)($at) .L8084EBB4: /* 1C9A4 8084EBB4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 1C9A8 8084EBB8 24C62670 */ addiu $a2, $a2, 0x2670 ## $a2 = 04002670 @@ -89,14 +89,14 @@ glabel func_8084EAC0 .L8084EBF8: /* 1C9E8 8084EBF8 86020850 */ lh $v0, 0x0850($s0) ## 00000850 /* 1C9EC 8084EBFC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 1C9F0 8084EC00 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 1C9F0 8084EC00 3C0D8016 */ lui $t5, %hi(gSaveContext+0x1424) /* 1C9F4 8084EC04 5441001A */ bnel $v0, $at, .L8084EC70 /* 1C9F8 8084EC08 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 1C9FC 8084EC0C 85ADFA84 */ lh $t5, -0x057C($t5) ## 8015FA84 -/* 1CA00 8084EC10 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 1C9FC 8084EC0C 85ADFA84 */ lh $t5, %lo(gSaveContext+0x1424)($t5) +/* 1CA00 8084EC10 3C0E8016 */ lui $t6, %hi(gSaveContext+0x13f0) /* 1CA04 8084EC14 55A00011 */ bnel $t5, $zero, .L8084EC5C /* 1CA08 8084EC18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1CA0C 8084EC1C 85CEFA50 */ lh $t6, -0x05B0($t6) ## 8015FA50 +/* 1CA0C 8084EC1C 85CEFA50 */ lh $t6, %lo(gSaveContext+0x13f0)($t6) /* 1CA10 8084EC20 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 /* 1CA14 8084EC24 8FA40034 */ lw $a0, 0x0034($sp) /* 1CA18 8084EC28 11C1000B */ beq $t6, $at, .L8084EC58 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EED8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EED8.s index be0a3d565c..eaf60edf72 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EED8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EED8.s @@ -52,8 +52,8 @@ glabel func_8084EED8 /* 1CD88 8084EF98 3C05423C */ lui $a1, 0x423C ## $a1 = 423C0000 /* 1CD8C 8084EF9C 10400003 */ beq $v0, $zero, .L8084EFAC /* 1CD90 8084EFA0 240F0140 */ addiu $t7, $zero, 0x0140 ## $t7 = 00000140 -/* 1CD94 8084EFA4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 1CD98 8084EFA8 A42FFA84 */ sh $t7, -0x057C($at) ## 8015FA84 +/* 1CD94 8084EFA4 3C018016 */ lui $at, %hi(gSaveContext+0x1424) +/* 1CD98 8084EFA8 A42FFA84 */ sh $t7, %lo(gSaveContext+0x1424)($at) .L8084EFAC: /* 1CD9C 8084EFAC 8FBF0024 */ lw $ra, 0x0024($sp) .L8084EFB0: diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F88C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F88C.s index f823195131..0b43af0fe6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F88C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F88C.s @@ -57,9 +57,9 @@ glabel func_8084F88C /* 1D748 8084F958 10000009 */ beq $zero, $zero, .L8084F980 /* 1D74C 8084F95C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 .L8084F960: -/* 1D750 8084F960 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 1D750 8084F960 3C028016 */ lui $v0, %hi(gSaveContext) /* 1D754 8084F964 00300821 */ addu $at, $at, $s0 -/* 1D758 8084F968 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 1D758 8084F968 2442E660 */ addiu $v0, %lo(gSaveContext) /* 1D75C 8084F96C A0231E5E */ sb $v1, 0x1E5E($at) ## 00011E5E /* 1D760 8084F970 A043141D */ sb $v1, 0x141D($v0) ## 8015FA7D /* 1D764 8084F974 A04413E0 */ sb $a0, 0x13E0($v0) ## 8015FA40 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085063C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085063C.s index 75839f13e3..f78977da8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085063C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085063C.s @@ -32,8 +32,8 @@ glabel func_8085063C /* 1E4A0 808506B0 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 /* 1E4A4 808506B4 00701821 */ addu $v1, $v1, $s0 /* 1E4A8 808506B8 906304BD */ lbu $v1, 0x04BD($v1) ## 000104BD -/* 1E4AC 808506BC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 1E4B0 808506C0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 1E4AC 808506BC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 1E4B0 808506C0 2442E660 */ addiu $v0, %lo(gSaveContext) /* 1E4B4 808506C4 14600013 */ bne $v1, $zero, .L80850714 /* 1E4B8 808506C8 804613B3 */ lb $a2, 0x13B3($v0) ## 8015FA13 /* 1E4BC 808506CC 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 @@ -58,10 +58,10 @@ glabel func_8085063C /* 1E504 80850714 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 1E508 80850718 14610007 */ bne $v1, $at, .L80850738 /* 1E50C 8085071C 00066023 */ subu $t4, $zero, $a2 -/* 1E510 80850720 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 1E510 80850720 3C048016 */ lui $a0, %hi(gSaveContext+0x13a0) /* 1E514 80850724 A04C13B3 */ sb $t4, 0x13B3($v0) ## 000013B3 /* 1E518 80850728 AC400E80 */ sw $zero, 0x0E80($v0) ## 00000E80 -/* 1E51C 8085072C 2484FA00 */ addiu $a0, $a0, 0xFA00 ## $a0 = 8015FA00 +/* 1E51C 8085072C 2484FA00 */ addiu $a0, %lo(gSaveContext+0x13a0) /* 1E520 80850730 0C01E245 */ jal func_80078914 /* 1E524 80850734 240508C8 */ addiu $a1, $zero, 0x08C8 ## $a1 = 000008C8 .L80850738: diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085076C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085076C.s index 1583c1adb1..5546252c4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085076C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085076C.s @@ -2,8 +2,8 @@ glabel func_8085076C /* 1E55C 8085076C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 1E560 80850770 AFBF0014 */ sw $ra, 0x0014($sp) /* 1E564 80850774 84820850 */ lh $v0, 0x0850($a0) ## 00000850 -/* 1E568 80850778 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 1E56C 8085077C 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 1E568 80850778 3C078016 */ lui $a3, %hi(gSaveContext) +/* 1E56C 8085077C 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 1E570 80850780 28410015 */ slti $at, $v0, 0x0015 /* 1E574 80850784 1420000C */ bne $at, $zero, .L808507B8 /* 1E578 80850788 80E613B3 */ lb $a2, 0x13B3($a3) ## 8015FA13 @@ -25,9 +25,9 @@ glabel func_8085076C /* 1E5B4 808507C4 10600007 */ beq $v1, $zero, .L808507E4 /* 1E5B8 808507C8 A48F0850 */ sh $t7, 0x0850($a0) ## 00000850 /* 1E5BC 808507CC 24D80001 */ addiu $t8, $a2, 0x0001 ## $t8 = 00000001 -/* 1E5C0 808507D0 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 1E5C0 808507D0 3C048016 */ lui $a0, %hi(gSaveContext+0x13a0) /* 1E5C4 808507D4 A0F813B3 */ sb $t8, 0x13B3($a3) ## 000013B3 -/* 1E5C8 808507D8 2484FA00 */ addiu $a0, $a0, 0xFA00 ## $a0 = 8015FA00 +/* 1E5C8 808507D8 2484FA00 */ addiu $a0, %lo(gSaveContext+0x13a0) /* 1E5CC 808507DC 0C01E245 */ jal func_80078914 /* 1E5D0 808507E0 2405087B */ addiu $a1, $zero, 0x087B ## $a1 = 0000087B .L808507E4: diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s index 9018587ffc..e9f2804519 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s @@ -15,9 +15,9 @@ glabel func_808507F4 /* 1E618 80850828 86180850 */ lh $t8, 0x0850($s0) ## 00000850 /* 1E61C 8085082C 820E0154 */ lb $t6, 0x0154($s0) ## 00000154 /* 1E620 80850830 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 1E624 80850834 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 1E624 80850834 3C028016 */ lui $v0, %hi(gSaveContext) /* 1E628 80850838 11C10003 */ beq $t6, $at, .L80850848 -/* 1E62C 8085083C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 1E62C 8085083C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 1E630 80850840 844F13F0 */ lh $t7, 0x13F0($v0) ## 8015FA50 /* 1E634 80850844 15E000A2 */ bne $t7, $zero, .L80850AD0 .L80850848: @@ -58,13 +58,13 @@ glabel func_808507F4 /* 1E6BC 808508CC 01014825 */ or $t1, $t0, $at ## $t1 = 30000000 /* 1E6C0 808508D0 15400005 */ bne $t2, $zero, .L808508E8 /* 1E6C4 808508D4 AE09067C */ sw $t1, 0x067C($s0) ## 0000067C -/* 1E6C8 808508D8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 1E6CC 808508DC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 1E6C8 808508D8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 1E6CC 808508DC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 1E6D0 808508E0 804B13B3 */ lb $t3, 0x13B3($v0) ## 8015FA13 /* 1E6D4 808508E4 1D600014 */ bgtz $t3, .L80850938 .L808508E8: -/* 1E6D8 808508E8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 1E6DC 808508EC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 1E6D8 808508E8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 1E6DC 808508EC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 1E6E0 808508F0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 1E6E4 808508F4 10000010 */ beq $zero, $zero, .L80850938 /* 1E6E8 808508F8 A44C13F0 */ sh $t4, 0x13F0($v0) ## 8015FA50 @@ -97,8 +97,8 @@ glabel func_808507F4 /* 1E740 80850950 24480001 */ addiu $t0, $v0, 0x0001 ## $t0 = 00000001 /* 1E744 80850954 A6080850 */ sh $t0, 0x0850($s0) ## 00000850 /* 1E748 80850958 86090850 */ lh $t1, 0x0850($s0) ## 00000850 -/* 1E74C 8085095C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 1E750 80850960 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 1E74C 8085095C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 1E750 80850960 2442E660 */ addiu $v0, %lo(gSaveContext) /* 1E754 80850964 1520005A */ bne $t1, $zero, .L80850AD0 /* 1E758 80850968 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 1E75C 8085096C A04A13B3 */ sb $t2, 0x13B3($v0) ## 8015FA13 @@ -106,8 +106,8 @@ glabel func_808507F4 /* 1E764 80850974 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 1E768 80850978 0C0302BD */ jal Gameplay_SetupRespawnPoint /* 1E76C 8085097C 240606FF */ addiu $a2, $zero, 0x06FF ## $a2 = 000006FF -/* 1E770 80850980 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 1E774 80850984 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 1E770 80850980 3C028016 */ lui $v0, %hi(gSaveContext) +/* 1E774 80850984 2442E660 */ addiu $v0, %lo(gSaveContext) /* 1E778 80850988 C4441368 */ lwc1 $f4, 0x1368($v0) ## 8015F9C8 /* 1E77C 8085098C C448136C */ lwc1 $f8, 0x136C($v0) ## 8015F9CC /* 1E780 80850990 C4501370 */ lwc1 $f16, 0x1370($v0) ## 8015F9D0 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850C68.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850C68.s index 99d29a644e..ad126c12bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850C68.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850C68.s @@ -11,7 +11,7 @@ glabel func_80850C68 /* 1EA7C 80850C8C 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 /* 1EA80 80850C90 C4840858 */ lwc1 $f4, 0x0858($a0) ## 00000858 /* 1EA84 80850C94 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1EA88 80850C98 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 1EA88 80850C98 3C0F8016 */ lui $t7, %hi(gGameInfo) /* 1EA8C 80850C9C 46047032 */ c.eq.s $f14, $f4 /* 1EA90 80850CA0 24C62C38 */ addiu $a2, $a2, 0x2C38 ## $a2 = 04002C38 /* 1EA94 80850CA4 26190318 */ addiu $t9, $s0, 0x0318 ## $t9 = 00000318 @@ -23,7 +23,7 @@ glabel func_80850C68 /* 1EAAC 80850CBC 45010049 */ bc1t .L80850DE4 /* 1EAB0 80850CC0 00000000 */ nop .L80850CC4: -/* 1EAB4 80850CC4 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 1EAB4 80850CC4 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 1EAB8 80850CC8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 1EABC 80850CCC 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 /* 1EAC0 80850CD0 85F80110 */ lh $t8, 0x0110($t7) ## 80160110 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851A50.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851A50.s index 0bd7dbc6ae..43ee7cf391 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851A50.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851A50.s @@ -7,26 +7,26 @@ glabel func_80851A50 /* 1F854 80851A64 AFA60038 */ sw $a2, 0x0038($sp) /* 1F858 80851A68 0C028EF0 */ jal func_800A3BC0 /* 1F85C 80851A6C AFA50024 */ sw $a1, 0x0024($sp) -/* 1F860 80851A70 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 1F864 80851A74 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 1F860 80851A70 3C078016 */ lui $a3, %hi(gSaveContext) +/* 1F864 80851A74 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 1F868 80851A78 8CE30004 */ lw $v1, 0x0004($a3) ## 8015E664 /* 1F86C 80851A7C 8FA40024 */ lw $a0, 0x0024($sp) /* 1F870 80851A80 14600007 */ bne $v1, $zero, .L80851AA0 /* 1F874 80851A84 00000000 */ nop /* 1F878 80851A88 0C02914C */ jal func_800A4530 /* 1F87C 80851A8C 3C05428C */ lui $a1, 0x428C ## $a1 = 428C0000 -/* 1F880 80851A90 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 +/* 1F880 80851A90 3C078016 */ lui $a3, %hi(gSaveContext) /* 1F884 80851A94 14400009 */ bne $v0, $zero, .L80851ABC -/* 1F888 80851A98 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 1F888 80851A98 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 1F88C 80851A9C 8CE30004 */ lw $v1, 0x0004($a3) ## 8015E664 .L80851AA0: /* 1F890 80851AA0 10600026 */ beq $v1, $zero, .L80851B3C /* 1F894 80851AA4 8FA40024 */ lw $a0, 0x0024($sp) /* 1F898 80851AA8 0C02914C */ jal func_800A4530 /* 1F89C 80851AAC 3C0542AE */ lui $a1, 0x42AE ## $a1 = 42AE0000 -/* 1F8A0 80851AB0 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 +/* 1F8A0 80851AB0 3C078016 */ lui $a3, %hi(gSaveContext) /* 1F8A4 80851AB4 10400021 */ beq $v0, $zero, .L80851B3C -/* 1F8A8 80851AB8 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 1F8A8 80851AB8 24E7E660 */ addiu $a3, %lo(gSaveContext) .L80851ABC: /* 1F8AC 80851ABC 8E190438 */ lw $t9, 0x0438($s0) ## 00000438 /* 1F8B0 80851AC0 8CEE0004 */ lw $t6, 0x0004($a3) ## 8015E664 @@ -37,12 +37,12 @@ glabel func_80851A50 /* 1F8C4 80851AD4 000E7880 */ sll $t7, $t6, 2 /* 1F8C8 80851AD8 10600004 */ beq $v1, $zero, .L80851AEC /* 1F8CC 80851ADC 01F83021 */ addu $a2, $t7, $t8 -/* 1F8D0 80851AE0 3C028012 */ lui $v0, 0x8012 ## $v0 = 80120000 +/* 1F8D0 80851AE0 3C028012 */ lui $v0, %hi(D_80125DE8) /* 1F8D4 80851AE4 10000003 */ beq $zero, $zero, .L80851AF4 -/* 1F8D8 80851AE8 24425DE8 */ addiu $v0, $v0, 0x5DE8 ## $v0 = 80125DE8 +/* 1F8D8 80851AE8 24425DE8 */ addiu $v0, %lo(D_80125DE8) .L80851AEC: -/* 1F8DC 80851AEC 3C028012 */ lui $v0, 0x8012 ## $v0 = 80120000 -/* 1F8E0 80851AF0 24425E18 */ addiu $v0, $v0, 0x5E18 ## $v0 = 80125E18 +/* 1F8DC 80851AEC 3C028012 */ lui $v0, %hi(D_80125E18) +/* 1F8E0 80851AF0 24425E18 */ addiu $v0, %lo(D_80125E18) .L80851AF4: /* 1F8E4 80851AF4 00034080 */ sll $t0, $v1, 2 /* 1F8E8 80851AF8 01024821 */ addu $t1, $t0, $v0 @@ -51,8 +51,8 @@ glabel func_80851A50 /* 1F8F4 80851B04 AFA6002C */ sw $a2, 0x002C($sp) /* 1F8F8 80851B08 0C00BDF7 */ jal func_8002F7DC /* 1F8FC 80851B0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F900 80851B10 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 1F904 80851B14 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 +/* 1F900 80851B10 3C078016 */ lui $a3, %hi(gSaveContext) +/* 1F904 80851B14 24E7E660 */ addiu $a3, %lo(gSaveContext) /* 1F908 80851B18 8CEA0004 */ lw $t2, 0x0004($a3) ## 8015E664 /* 1F90C 80851B1C 8FA6002C */ lw $a2, 0x002C($sp) /* 1F910 80851B20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851FB0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851FB0.s index 02ff30d264..8f4f0ee315 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851FB0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851FB0.s @@ -30,8 +30,8 @@ glabel func_80851FB0 /* 1FE0C 8085201C 0C02914C */ jal func_800A4530 /* 1FE10 80852020 3C054370 */ lui $a1, 0x4370 ## $a1 = 43700000 /* 1FE14 80852024 10400003 */ beq $v0, $zero, .L80852034 -/* 1FE18 80852028 3C188003 */ lui $t8, 0x8003 ## $t8 = 80030000 -/* 1FE1C 8085202C 2718B8C4 */ addiu $t8, $t8, 0xB8C4 ## $t8 = 8002B8C4 +/* 1FE18 80852028 3C188003 */ lui $t8, %hi(ActorShadow_DrawFunc_Teardrop) +/* 1FE1C 8085202C 2718B8C4 */ addiu $t8, %lo(ActorShadow_DrawFunc_Teardrop) /* 1FE20 80852030 AE1800C0 */ sw $t8, 0x00C0($s0) ## 000000C0 .L80852034: /* 1FE24 80852034 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852648.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852648.s index 41130e03cc..99637b5df2 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852648.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852648.s @@ -21,8 +21,8 @@ glabel func_80852648 /* 20484 80852694 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 20488 80852698 0C023A7E */ jal func_8008E9F8 /* 2048C 8085269C A20E0151 */ sb $t6, 0x0151($s0) ## 00000151 -/* 20490 808526A0 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 -/* 20494 808526A4 27185E08 */ addiu $t8, $t8, 0x5E08 ## $t8 = 80125E08 +/* 20490 808526A0 3C188012 */ lui $t8, %hi(D_80125E08) +/* 20494 808526A4 27185E08 */ addiu $t8, %lo(D_80125E08) /* 20498 808526A8 A2020159 */ sb $v0, 0x0159($s0) ## 00000159 /* 2049C 808526AC A2020158 */ sb $v0, 0x0158($s0) ## 00000158 /* 204A0 808526B0 AE180164 */ sw $t8, 0x0164($s0) ## 00000164 @@ -30,8 +30,8 @@ glabel func_80852648 /* 204A8 808526B8 0C025E80 */ jal Inventory_ChangeEquipment /* 204AC 808526BC 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 204B0 808526C0 2419003C */ addiu $t9, $zero, 0x003C ## $t9 = 0000003C -/* 204B4 808526C4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 204B8 808526C8 A039E6C8 */ sb $t9, -0x1938($at) ## 8015E6C8 +/* 204B4 808526C4 3C018016 */ lui $at, %hi(gSaveContext+0x68) +/* 204B8 808526C8 A039E6C8 */ sb $t9, %lo(gSaveContext+0x68)($at) /* 204BC 808526CC 8FA40028 */ lw $a0, 0x0028($sp) /* 204C0 808526D0 0C025E95 */ jal Inventory_DeleteEquipment /* 204C4 808526D4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808526EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808526EC.s index 0e9c8f8be5..2da2152ece 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808526EC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808526EC.s @@ -1,6 +1,6 @@ glabel func_808526EC -/* 204DC 808526EC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 204E0 808526F0 8C42E664 */ lw $v0, -0x199C($v0) ## 8015E664 +/* 204DC 808526EC 3C028016 */ lui $v0, %hi(gSaveContext+4) +/* 204E0 808526F0 8C42E664 */ lw $v0, %lo(gSaveContext+4)($v0) /* 204E4 808526F4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 204E8 808526F8 AFA60058 */ sw $a2, 0x0058($sp) /* 204EC 808526FC 3C068085 */ lui $a2, %hi(D_80855208) ## $a2 = 80850000 @@ -16,13 +16,13 @@ glabel func_808526EC /* 20514 80852724 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 20518 80852728 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF /* 2051C 8085272C 904F015D */ lbu $t7, 0x015D($v0) ## 0000015D -/* 20520 80852730 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 20520 80852730 3C198016 */ lui $t9, %hi(gSaveContext+4) /* 20524 80852734 11E10003 */ beq $t7, $at, .L80852744 /* 20528 80852738 00000000 */ nop /* 2052C 8085273C 1000003A */ beq $zero, $zero, .L80852828 /* 20530 80852740 A058015D */ sb $t8, 0x015D($v0) ## 0000015D .L80852744: -/* 20534 80852744 8F39E664 */ lw $t9, -0x199C($t9) ## 8015E664 +/* 20534 80852744 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) /* 20538 80852748 3C098085 */ lui $t1, %hi(D_80855210) ## $t1 = 80850000 /* 2053C 8085274C 25295210 */ addiu $t1, $t1, %lo(D_80855210) ## $t1 = 80855210 /* 20540 80852750 00194080 */ sll $t0, $t9, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808529D0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808529D0.s index b078f6e5be..7d237b6112 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808529D0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808529D0.s @@ -1,7 +1,7 @@ glabel func_808529D0 /* 207C0 808529D0 8CCE000C */ lw $t6, 0x000C($a2) ## 0000000C /* 207C4 808529D4 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 207C8 808529D8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 207C8 808529D8 3C198016 */ lui $t9, %hi(gSaveContext+4) /* 207CC 808529DC 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 207D0 808529E0 00000000 */ nop /* 207D4 808529E4 468021A0 */ cvt.s.w $f6, $f4 @@ -14,7 +14,7 @@ glabel func_808529D0 /* 207F0 80852A00 849800A4 */ lh $t8, 0x00A4($a0) ## 000000A4 /* 207F4 80852A04 5701000B */ bnel $t8, $at, .L80852A34 /* 207F8 80852A08 8CC80014 */ lw $t0, 0x0014($a2) ## 00000014 -/* 207FC 80852A0C 8F39E664 */ lw $t9, -0x199C($t9) ## 8015E664 +/* 207FC 80852A0C 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) /* 20800 80852A10 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 20804 80852A14 53200007 */ beql $t9, $zero, .L80852A34 /* 20808 80852A18 8CC80014 */ lw $t0, 0x0014($a2) ## 00000014 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EDB0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EDB0.s index d96ab59528..cecd4a6fc1 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EDB0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EDB0.s @@ -18,7 +18,7 @@ glabel func_8099EDB0 /* 00040 8099EDF0 000B6080 */ sll $t4, $t3, 2 /* 00044 8099EDF4 E4C80004 */ swc1 $f8, 0x0004($a2) ## 00000004 /* 00048 8099EDF8 8CF9000C */ lw $t9, 0x000C($a3) ## 0000000C -/* 0004C 8099EDFC 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 0004C 8099EDFC 3C0D8016 */ lui $t5, %hi(gSegments) /* 00050 8099EE00 01AC6821 */ addu $t5, $t5, $t4 /* 00054 8099EE04 ACD9000C */ sw $t9, 0x000C($a2) ## 0000000C /* 00058 8099EE08 8CF80010 */ lw $t8, 0x0010($a3) ## 00000010 @@ -38,7 +38,7 @@ glabel func_8099EDB0 /* 00090 8099EE40 3C08809A */ lui $t0, %hi(func_8099EF08) ## $t0 = 809A0000 /* 00094 8099EE44 2508EF08 */ addiu $t0, $t0, %lo(func_8099EF08) ## $t0 = 8099EF08 /* 00098 8099EE48 ACC90020 */ sw $t1, 0x0020($a2) ## 00000020 -/* 0009C 8099EE4C 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 +/* 0009C 8099EE4C 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) /* 000A0 8099EE50 3C09809A */ lui $t1, %hi(func_8099F0AC) ## $t1 = 809A0000 /* 000A4 8099EE54 2529F0AC */ addiu $t1, $t1, %lo(func_8099F0AC) ## $t1 = 8099F0AC /* 000A8 8099EE58 01AE7821 */ addu $t7, $t5, $t6 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F1B0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F1B0.s index 868eff7927..ca7e3ce390 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F1B0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F1B0.s @@ -25,9 +25,9 @@ glabel func_8099F1B0 /* 00050 8099F200 00037100 */ sll $t6, $v1, 4 /* 00054 8099F204 000E7F02 */ srl $t7, $t6, 28 /* 00058 8099F208 000FC080 */ sll $t8, $t7, 2 -/* 0005C 8099F20C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 0005C 8099F20C 3C198016 */ lui $t9, %hi(gSegments) /* 00060 8099F210 0338C821 */ addu $t9, $t9, $t8 -/* 00064 8099F214 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 00064 8099F214 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 00068 8099F218 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0006C 8099F21C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00070 8099F220 00614024 */ and $t0, $v1, $at diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s index 8bd27cd317..41a22662d7 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s @@ -45,10 +45,10 @@ glabel func_8099F274 /* 00170 8099F320 27A600AC */ addiu $a2, $sp, 0x00AC ## $a2 = FFFFFF3C /* 00174 8099F324 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 /* 00178 8099F328 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 0017C 8099F32C 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 +/* 0017C 8099F32C 3C088013 */ lui $t0, %hi(gMtxClear) /* 00180 8099F330 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 /* 00184 8099F334 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 00188 8099F338 2508DB20 */ addiu $t0, $t0, 0xDB20 ## $t0 = 8012DB20 +/* 00188 8099F338 2508DB20 */ addiu $t0, %lo(gMtxClear) /* 0018C 8099F33C 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 /* 00190 8099F340 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00194 8099F344 27A500AC */ addiu $a1, $sp, 0x00AC ## $a1 = FFFFFF3C @@ -72,7 +72,7 @@ glabel func_8099F274 /* 001DC 8099F38C AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 /* 001E0 8099F390 8FAD0178 */ lw $t5, 0x0178($sp) /* 001E4 8099F394 3C04809A */ lui $a0, %hi(D_8099F588) ## $a0 = 809A0000 -/* 001E8 8099F398 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 001E8 8099F398 3C0A8016 */ lui $t2, %hi(gSegments) /* 001EC 8099F39C 85AE0042 */ lh $t6, 0x0042($t5) ## 00000042 /* 001F0 8099F3A0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 001F4 8099F3A4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF @@ -84,7 +84,7 @@ glabel func_8099F274 /* 0020C 8099F3BC 00194702 */ srl $t0, $t9, 28 /* 00210 8099F3C0 00084880 */ sll $t1, $t0, 2 /* 00214 8099F3C4 01495021 */ addu $t2, $t2, $t1 -/* 00218 8099F3C8 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 00218 8099F3C8 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 0021C 8099F3CC 0081C024 */ and $t8, $a0, $at /* 00220 8099F3D0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00224 8099F3D4 030A5821 */ addu $t3, $t8, $t2 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F650.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F650.s index b1b8a9af50..ed1836dd2f 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F650.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F650.s @@ -24,10 +24,10 @@ glabel func_8099F650 /* 0004C 8099F69C 00037100 */ sll $t6, $v1, 4 /* 00050 8099F6A0 000E7F02 */ srl $t7, $t6, 28 /* 00054 8099F6A4 000FC080 */ sll $t8, $t7, 2 -/* 00058 8099F6A8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 00058 8099F6A8 3C198016 */ lui $t9, %hi(gSegments) /* 0005C 8099F6AC 0338C821 */ addu $t9, $t9, $t8 /* 00060 8099F6B0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00064 8099F6B4 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 00064 8099F6B4 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 00068 8099F6B8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0006C 8099F6BC 00614024 */ and $t0, $v1, $at /* 00070 8099F6C0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s index b6d17b86ca..28de7274e2 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s @@ -95,7 +95,7 @@ glabel func_8099F748 /* 0026C 8099F8BC AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 00270 8099F8C0 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 /* 00274 8099F8C4 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 00278 8099F8C8 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 00278 8099F8C8 3C188016 */ lui $t8, %hi(gSegments) /* 0027C 8099F8CC 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 /* 00280 8099F8D0 AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 /* 00284 8099F8D4 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 @@ -110,7 +110,7 @@ glabel func_8099F748 /* 002A8 8099F8F8 000B7702 */ srl $t6, $t3, 28 /* 002AC 8099F8FC 000E6880 */ sll $t5, $t6, 2 /* 002B0 8099F900 030DC021 */ addu $t8, $t8, $t5 -/* 002B4 8099F904 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 002B4 8099F904 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 002B8 8099F908 00814824 */ and $t1, $a0, $at /* 002BC 8099F90C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 002C0 8099F910 0138C821 */ addu $t9, $t1, $t8 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s index 87def5e2f3..86f41e3fcf 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s @@ -113,7 +113,7 @@ glabel func_8099F960 /* 004CC 8099FB1C AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 004D0 8099FB20 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 /* 004D4 8099FB24 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 004D8 8099FB28 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 004D8 8099FB28 3C188016 */ lui $t8, %hi(gSegments) /* 004DC 8099FB2C 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 /* 004E0 8099FB30 AE4F02D0 */ sw $t7, 0x02D0($s2) ## 000002D0 /* 004E4 8099FB34 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 @@ -129,7 +129,7 @@ glabel func_8099F960 /* 0050C 8099FB5C 000B7702 */ srl $t6, $t3, 28 /* 00510 8099FB60 000E6880 */ sll $t5, $t6, 2 /* 00514 8099FB64 030DC021 */ addu $t8, $t8, $t5 -/* 00518 8099FB68 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 00518 8099FB68 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 0051C 8099FB6C 00814824 */ and $t1, $a0, $at /* 00520 8099FB70 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00524 8099FB74 0138C821 */ addu $t9, $t1, $t8 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0040.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0040.s index 0891eda998..765b14e40a 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0040.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0040.s @@ -40,9 +40,9 @@ glabel func_809A0040 .L809A00C8: /* 00088 809A00C8 000FC702 */ srl $t8, $t7, 28 /* 0008C 809A00CC 0018C880 */ sll $t9, $t8, 2 -/* 00090 809A00D0 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 00090 809A00D0 3C088016 */ lui $t0, %hi(gSegments) /* 00094 809A00D4 01194021 */ addu $t0, $t0, $t9 -/* 00098 809A00D8 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 +/* 00098 809A00D8 8D086FA8 */ lw $t0, %lo(gSegments)($t0) /* 0009C 809A00DC 00417024 */ and $t6, $v0, $at /* 000A0 809A00E0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 000A4 809A00E4 01C84821 */ addu $t1, $t6, $t0 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s index 783c2e9ca8..79fdb88b5b 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s @@ -77,12 +77,12 @@ glabel func_809A01CC /* 002B8 809A02F8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 002BC 809A02FC AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 002C0 809A0300 000A5880 */ sll $t3, $t2, 2 -/* 002C4 809A0304 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 002C4 809A0304 3C0C8016 */ lui $t4, %hi(gSegments) /* 002C8 809A0308 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 /* 002CC 809A030C 018B6021 */ addu $t4, $t4, $t3 /* 002D0 809A0310 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 002D4 809A0314 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 002D8 809A0318 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 002D8 809A0318 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 002DC 809A031C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 002E0 809A0320 00816824 */ and $t5, $a0, $at /* 002E4 809A0324 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0550.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0550.s index f196c93351..0b7429a8bc 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0550.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0550.s @@ -24,7 +24,7 @@ glabel func_809A0550 /* 00054 809A05A4 ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 /* 00058 809A05A8 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 /* 0005C 809A05AC 000B6080 */ sll $t4, $t3, 2 -/* 00060 809A05B0 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 00060 809A05B0 3C0D8016 */ lui $t5, %hi(gSegments) /* 00064 809A05B4 ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 /* 00068 809A05B8 8CF9000C */ lw $t9, 0x000C($a3) ## 0000000C /* 0006C 809A05BC 01AC6821 */ addu $t5, $t5, $t4 @@ -48,7 +48,7 @@ glabel func_809A0550 /* 000B4 809A0604 ACC8001C */ sw $t0, 0x001C($a2) ## 0000001C /* 000B8 809A0608 8CE90020 */ lw $t1, 0x0020($a3) ## 00000020 /* 000BC 809A060C ACC90020 */ sw $t1, 0x0020($a2) ## 00000020 -/* 000C0 809A0610 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 +/* 000C0 809A0610 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) /* 000C4 809A0614 01AE7821 */ addu $t7, $t5, $t6 /* 000C8 809A0618 01E1C021 */ addu $t8, $t7, $at /* 000CC 809A061C ACD80038 */ sw $t8, 0x0038($a2) ## 00000038 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s index 55ab32332e..6edc3c3916 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s @@ -33,8 +33,8 @@ glabel func_809A0698 /* 001C0 809A0710 8FA4005C */ lw $a0, 0x005C($sp) /* 001C4 809A0714 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 001C8 809A0718 00814021 */ addu $t0, $a0, $at -/* 001CC 809A071C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 001D0 809A0720 AC286FC0 */ sw $t0, 0x6FC0($at) ## 80166FC0 +/* 001CC 809A071C 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 001D0 809A0720 AC286FC0 */ sw $t0, %lo(gSegments+0x18)($at) /* 001D4 809A0724 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 /* 001D8 809A0728 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 001DC 809A072C 356B0018 */ ori $t3, $t3, 0x0018 ## $t3 = DB060018 @@ -95,7 +95,7 @@ glabel func_809A0698 /* 002B8 809A0808 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 /* 002BC 809A080C 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 /* 002C0 809A0810 3C0AFA00 */ lui $t2, 0xFA00 ## $t2 = FA000000 -/* 002C4 809A0814 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 002C4 809A0814 3C058016 */ lui $a1, %hi(gSegments) /* 002C8 809A0818 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 /* 002CC 809A081C AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 /* 002D0 809A0820 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 @@ -114,7 +114,7 @@ glabel func_809A0698 /* 00304 809A0854 016C7025 */ or $t6, $t3, $t4 ## $t6 = FA000008 /* 00308 809A0858 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 0030C 809A085C 8FB90024 */ lw $t9, 0x0024($sp) -/* 00310 809A0860 24A56FA8 */ addiu $a1, $a1, 0x6FA8 ## $a1 = 80166FA8 +/* 00310 809A0860 24A56FA8 */ addiu $a1, %lo(gSegments) /* 00314 809A0864 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 00318 809A0868 ACB90018 */ sw $t9, 0x0018($a1) ## 80166FC0 /* 0031C 809A086C 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0AA0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0AA0.s index e7e4d4f357..5c215caa3e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0AA0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0AA0.s @@ -11,7 +11,7 @@ glabel func_809A0AA0 /* 00024 809A0AC4 ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 /* 00028 809A0AC8 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 /* 0002C 809A0ACC 000B6080 */ sll $t4, $t3, 2 -/* 00030 809A0AD0 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 00030 809A0AD0 3C0D8016 */ lui $t5, %hi(gSegments) /* 00034 809A0AD4 ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 /* 00038 809A0AD8 8CF9000C */ lw $t9, 0x000C($a3) ## 0000000C /* 0003C 809A0ADC 01AC6821 */ addu $t5, $t5, $t4 @@ -36,7 +36,7 @@ glabel func_809A0AA0 /* 00088 809A0B28 8CE90020 */ lw $t1, 0x0020($a3) ## 00000020 /* 0008C 809A0B2C 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 /* 00090 809A0B30 ACC90020 */ sw $t1, 0x0020($a2) ## 00000020 -/* 00094 809A0B34 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 +/* 00094 809A0B34 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) /* 00098 809A0B38 01AE7821 */ addu $t7, $t5, $t6 /* 0009C 809A0B3C 01E1C021 */ addu $t8, $t7, $at /* 000A0 809A0B40 ACD80038 */ sw $t8, 0x0038($a2) ## 00000038 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s index 28ab2a0bb5..220aac405a 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s @@ -93,7 +93,7 @@ glabel func_809A0BB8 /* 00284 809A0D24 AE2802D0 */ sw $t0, 0x02D0($s1) ## 000002D0 /* 00288 809A0D28 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 /* 0028C 809A0D2C 860A0042 */ lh $t2, 0x0042($s0) ## 00000042 -/* 00290 809A0D30 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 00290 809A0D30 3C198016 */ lui $t9, %hi(gSegments) /* 00294 809A0D34 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00298 809A0D38 000AC080 */ sll $t8, $t2, 2 /* 0029C 809A0D3C 00982021 */ addu $a0, $a0, $t8 @@ -103,7 +103,7 @@ glabel func_809A0BB8 /* 002AC 809A0D4C 000E7F02 */ srl $t7, $t6, 28 /* 002B0 809A0D50 000F6880 */ sll $t5, $t7, 2 /* 002B4 809A0D54 032DC821 */ addu $t9, $t9, $t5 -/* 002B8 809A0D58 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 002B8 809A0D58 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 002BC 809A0D5C 00815824 */ and $t3, $a0, $at /* 002C0 809A0D60 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 002C4 809A0D64 01796021 */ addu $t4, $t3, $t9 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0DB4.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0DB4.s index dd2ecbf527..159756d993 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0DB4.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0DB4.s @@ -82,10 +82,10 @@ glabel func_809A0DB4 /* 0043C 809A0EDC 27A7002C */ addiu $a3, $sp, 0x002C ## $a3 = FFFFFFFC /* 00440 809A0EE0 0C029B84 */ jal func_800A6E10 /* 00444 809A0EE4 AFA60024 */ sw $a2, 0x0024($sp) -/* 00448 809A0EE8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0044C 809A0EEC 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 00450 809A0EF0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00454 809A0EF4 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 +/* 00448 809A0EE8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0044C 809A0EEC 3C0C8013 */ lui $t4, %hi(D_801333E8) +/* 00450 809A0EF0 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00454 809A0EF4 258C33E8 */ addiu $t4, %lo(D_801333E8) /* 00458 809A0EF8 AFAC0014 */ sw $t4, 0x0014($sp) /* 0045C 809A0EFC AFA70010 */ sw $a3, 0x0010($sp) /* 00460 809A0F00 24043878 */ addiu $a0, $zero, 0x3878 ## $a0 = 00003878 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1CB0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1CB0.s index e64891b379..669c4fbf2a 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1CB0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1CB0.s @@ -44,9 +44,9 @@ glabel func_809A1CB0 .L809A1D48: /* 00098 809A1D48 000FC702 */ srl $t8, $t7, 28 /* 0009C 809A1D4C 0018C880 */ sll $t9, $t8, 2 -/* 000A0 809A1D50 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 000A0 809A1D50 3C088016 */ lui $t0, %hi(gSegments) /* 000A4 809A1D54 01194021 */ addu $t0, $t0, $t9 -/* 000A8 809A1D58 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 +/* 000A8 809A1D58 8D086FA8 */ lw $t0, %lo(gSegments)($t0) /* 000AC 809A1D5C 00417024 */ and $t6, $v0, $at /* 000B0 809A1D60 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 000B4 809A1D64 01C84821 */ addu $t1, $t6, $t0 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s index c0fceac1af..10ff1f873b 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s @@ -139,7 +139,7 @@ glabel func_809A1F04 /* 00468 809A2118 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 0046C 809A211C 8E090038 */ lw $t1, 0x0038($s0) ## 00000038 /* 00470 809A2120 00197080 */ sll $t6, $t9, 2 -/* 00474 809A2124 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00474 809A2124 3C0F8016 */ lui $t7, %hi(gSegments) /* 00478 809A2128 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 0047C 809A212C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 00480 809A2130 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 @@ -148,7 +148,7 @@ glabel func_809A1F04 /* 0048C 809A213C AE2A02D0 */ sw $t2, 0x02D0($s1) ## 000002D0 /* 00490 809A2140 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00494 809A2144 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00498 809A2148 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 00498 809A2148 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 0049C 809A214C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 004A0 809A2150 00816824 */ and $t5, $a0, $at /* 004A4 809A2154 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A22D0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A22D0.s index 80fee09484..d86868e7d4 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A22D0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A22D0.s @@ -24,10 +24,10 @@ glabel func_809A22D0 /* 0004C 809A231C 00027100 */ sll $t6, $v0, 4 /* 00050 809A2320 000E7F02 */ srl $t7, $t6, 28 /* 00054 809A2324 000FC080 */ sll $t8, $t7, 2 -/* 00058 809A2328 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 00058 809A2328 3C198016 */ lui $t9, %hi(gSegments) /* 0005C 809A232C 0338C821 */ addu $t9, $t9, $t8 /* 00060 809A2330 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00064 809A2334 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 00064 809A2334 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 00068 809A2338 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0006C 809A233C 00414024 */ and $t0, $v0, $at /* 00070 809A2340 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s index 042f58b59c..c39074ff06 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s @@ -45,10 +45,10 @@ glabel func_809A2480 /* 0025C 809A252C 27A600C4 */ addiu $a2, $sp, 0x00C4 ## $a2 = FFFFFF3C /* 00260 809A2530 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 /* 00264 809A2534 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 00268 809A2538 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 +/* 00268 809A2538 3C088013 */ lui $t0, %hi(gMtxClear) /* 0026C 809A253C 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 /* 00270 809A2540 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 00274 809A2544 2508DB20 */ addiu $t0, $t0, 0xDB20 ## $t0 = 8012DB20 +/* 00274 809A2544 2508DB20 */ addiu $t0, %lo(gMtxClear) /* 00278 809A2548 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 /* 0027C 809A254C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00280 809A2550 27A500C4 */ addiu $a1, $sp, 0x00C4 ## $a1 = FFFFFF3C @@ -78,7 +78,7 @@ glabel func_809A2480 /* 002E0 809A25B0 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 002E4 809A25B4 AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 /* 002E8 809A25B8 862E0050 */ lh $t6, 0x0050($s1) ## 00000050 -/* 002EC 809A25BC 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 002EC 809A25BC 3C0A8016 */ lui $t2, %hi(gSegments) /* 002F0 809A25C0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 002F4 809A25C4 000E7880 */ sll $t7, $t6, 2 /* 002F8 809A25C8 008F2021 */ addu $a0, $a0, $t7 @@ -89,7 +89,7 @@ glabel func_809A2480 /* 0030C 809A25DC 00194702 */ srl $t0, $t9, 28 /* 00310 809A25E0 00084880 */ sll $t1, $t0, 2 /* 00314 809A25E4 01495021 */ addu $t2, $t2, $t1 -/* 00318 809A25E8 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 00318 809A25E8 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 0031C 809A25EC 0081C024 */ and $t8, $a0, $at /* 00320 809A25F0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00324 809A25F4 030A5821 */ addu $t3, $t8, $t2 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s index 6fcb68ddf6..52823ef8e5 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s @@ -75,7 +75,7 @@ glabel func_809A3E00 /* 000264 809A3F24 35EF0020 */ ori $t7, (0xDB060020 & 0xFFFF) # ori $t7, $t7, 0x20 /* 000268 809A3F28 AC620004 */ sw $v0, 4($v1) /* 00026C 809A3F2C 8E0202D0 */ lw $v0, 0x2d0($s0) -/* 000270 809A3F30 3C04809A */ lui $a0, 0x809a +/* 000270 809A3F30 3C04809A */ lui $a0, %hi(D_809A4070) /* 000274 809A3F34 3C078016 */ lui $a3, %hi(gSegments) # $a3, 0x8016 /* 000278 809A3F38 244E0008 */ addiu $t6, $v0, 8 /* 00027C 809A3F3C AE0E02D0 */ sw $t6, 0x2d0($s0) @@ -85,7 +85,7 @@ glabel func_809A3E00 /* 00028C 809A3F4C 3C0500FF */ lui $a1, (0x00FFFFFF >> 16) # lui $a1, 0xff /* 000290 809A3F50 0018C880 */ sll $t9, $t8, 2 /* 000294 809A3F54 00992021 */ addu $a0, $a0, $t9 -/* 000298 809A3F58 8C844070 */ lw $a0, 0x4070($a0) +/* 000298 809A3F58 8C844070 */ lw $a0, %lo(D_809A4070)($a0) /* 00029C 809A3F5C 34A5FFFF */ ori $a1, (0x00FFFFFF & 0xFFFF) # ori $a1, $a1, 0xffff /* 0002A0 809A3F60 3C068000 */ lui $a2, 0x8000 /* 0002A4 809A3F64 00045100 */ sll $t2, $a0, 4 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4660.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4660.s index d432f1cd1d..35ddd5af7e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4660.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4660.s @@ -51,8 +51,8 @@ glabel func_809A4660 /* 000BC 809A471C 018D7021 */ addu $t6, $t4, $t5 /* 000C0 809A4720 01EE7821 */ addu $t7, $t7, $t6 /* 000C4 809A4724 8DEF17B4 */ lw $t7, 0x17B4($t7) ## 000117B4 -/* 000C8 809A4728 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 000CC 809A472C 24846FA8 */ addiu $a0, $a0, 0x6FA8 ## $a0 = 80166FA8 +/* 000C8 809A4728 3C048016 */ lui $a0, %hi(gSegments) +/* 000CC 809A472C 24846FA8 */ addiu $a0, %lo(gSegments) /* 000D0 809A4730 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 000D4 809A4734 8C830018 */ lw $v1, 0x0018($a0) ## 80166FC0 /* 000D8 809A4738 01E1C021 */ addu $t8, $t7, $at @@ -165,12 +165,12 @@ glabel func_809A4660 /* 00270 809A48D0 AE190028 */ sw $t9, 0x0028($s0) ## 00000028 /* 00274 809A48D4 AE080024 */ sw $t0, 0x0024($s0) ## 00000024 /* 00278 809A48D8 92290026 */ lbu $t1, 0x0026($s1) ## 00000026 -/* 0027C 809A48DC 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 0027C 809A48DC 3C048016 */ lui $a0, %hi(gSegments) /* 00280 809A48E0 3C02809A */ lui $v0, %hi(D_809A5100) ## $v0 = 809A0000 /* 00284 809A48E4 A6090048 */ sh $t1, 0x0048($s0) ## 00000048 /* 00288 809A48E8 922A0026 */ lbu $t2, 0x0026($s1) ## 00000026 /* 0028C 809A48EC 27AB0034 */ addiu $t3, $sp, 0x0034 ## $t3 = FFFFFFDC -/* 00290 809A48F0 24846FA8 */ addiu $a0, $a0, 0x6FA8 ## $a0 = 80166FA8 +/* 00290 809A48F0 24846FA8 */ addiu $a0, %lo(gSegments) /* 00294 809A48F4 11400018 */ beq $t2, $zero, .L809A4958 /* 00298 809A48F8 24425100 */ addiu $v0, $v0, %lo(D_809A5100) ## $v0 = 809A5100 /* 0029C 809A48FC 8D6D0000 */ lw $t5, 0x0000($t3) ## FFFFFFDC @@ -179,11 +179,11 @@ glabel func_809A4660 /* 002A8 809A4908 AE0D0000 */ sw $t5, 0x0000($s0) ## 00000000 /* 002AC 809A490C 8D6C0004 */ lw $t4, 0x0004($t3) ## FFFFFFE0 /* 002B0 809A4910 00027100 */ sll $t6, $v0, 4 -/* 002B4 809A4914 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 002B4 809A4914 3C048016 */ lui $a0, %hi(gSegments) /* 002B8 809A4918 AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 /* 002BC 809A491C 8D6D0008 */ lw $t5, 0x0008($t3) ## FFFFFFE4 /* 002C0 809A4920 000E7F02 */ srl $t7, $t6, 28 -/* 002C4 809A4924 24846FA8 */ addiu $a0, $a0, 0x6FA8 ## $a0 = 80166FA8 +/* 002C4 809A4924 24846FA8 */ addiu $a0, %lo(gSegments) /* 002C8 809A4928 000FC080 */ sll $t8, $t7, 2 /* 002CC 809A492C 0098C821 */ addu $t9, $a0, $t8 /* 002D0 809A4930 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s index 2dbebc06a5..ea3880ca66 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s @@ -43,8 +43,8 @@ glabel func_809A49B8 /* 003FC 809A4A5C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00400 809A4A60 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 00404 809A4A64 00815021 */ addu $t2, $a0, $at -/* 00408 809A4A68 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 0040C 809A4A6C AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 +/* 00408 809A4A68 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 0040C 809A4A6C AC2A6FC0 */ sw $t2, %lo(gSegments+0x18)($at) /* 00410 809A4A70 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00414 809A4A74 358C0018 */ ori $t4, $t4, 0x0018 ## $t4 = DB060018 /* 00418 809A4A78 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A5ED0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A5ED0.s index 466cea07f4..1e2ec5c8c7 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A5ED0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A5ED0.s @@ -36,7 +36,7 @@ glabel func_809A5ED0 /* 00088 809A5F58 00084880 */ sll $t1, $t0, 2 /* 0008C 809A5F5C ACCB0010 */ sw $t3, 0x0010($a2) ## 00000010 /* 00090 809A5F60 8C8C0008 */ lw $t4, 0x0008($a0) ## FFFFFFEC -/* 00094 809A5F64 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 00094 809A5F64 3C0A8016 */ lui $t2, %hi(gSegments) /* 00098 809A5F68 01495021 */ addu $t2, $t2, $t1 /* 0009C 809A5F6C ACCC0014 */ sw $t4, 0x0014($a2) ## 00000014 /* 000A0 809A5F70 8CEE0000 */ lw $t6, 0x0000($a3) ## 00000000 @@ -51,7 +51,7 @@ glabel func_809A5ED0 /* 000C4 809A5F94 ACCF0028 */ sw $t7, 0x0028($a2) ## 00000028 /* 000C8 809A5F98 ACD80024 */ sw $t8, 0x0024($a2) ## 00000024 /* 000CC 809A5F9C ACCE0008 */ sw $t6, 0x0008($a2) ## 00000008 -/* 000D0 809A5FA0 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 000D0 809A5FA0 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 000D4 809A5FA4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 000D8 809A5FA8 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 /* 000DC 809A5FAC 014B6021 */ addu $t4, $t2, $t3 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6150.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6150.s index a3ca3bdd16..c2eed8b4d7 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6150.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6150.s @@ -37,7 +37,7 @@ glabel func_809A6150 /* 0008C 809A61DC 00084880 */ sll $t1, $t0, 2 /* 00090 809A61E0 ACCB0010 */ sw $t3, 0x0010($a2) ## 00000010 /* 00094 809A61E4 8C6C0008 */ lw $t4, 0x0008($v1) ## FFFFFFEC -/* 00098 809A61E8 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 00098 809A61E8 3C0A8016 */ lui $t2, %hi(gSegments) /* 0009C 809A61EC 01495021 */ addu $t2, $t2, $t1 /* 000A0 809A61F0 ACCC0014 */ sw $t4, 0x0014($a2) ## 00000014 /* 000A4 809A61F4 8CEE0000 */ lw $t6, 0x0000($a3) ## 00000000 @@ -52,7 +52,7 @@ glabel func_809A6150 /* 000C8 809A6218 ACCF0028 */ sw $t7, 0x0028($a2) ## 00000028 /* 000CC 809A621C ACD80024 */ sw $t8, 0x0024($a2) ## 00000024 /* 000D0 809A6220 ACCE0008 */ sw $t6, 0x0008($a2) ## 00000008 -/* 000D4 809A6224 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 000D4 809A6224 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 000D8 809A6228 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 /* 000DC 809A622C A4CE005C */ sh $t6, 0x005C($a2) ## 0000005C /* 000E0 809A6230 014B6021 */ addu $t4, $t2, $t3 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A63A0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A63A0.s index 10de62f296..085f4470f1 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A63A0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A63A0.s @@ -38,11 +38,11 @@ glabel func_809A63A0 /* 00088 809A6428 AC6F0004 */ sw $t7, 0x0004($v1) ## FFFFFFF0 /* 0008C 809A642C 8DD80008 */ lw $t8, 0x0008($t6) ## 809A68A4 /* 00090 809A6430 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 00094 809A6434 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 00094 809A6434 3C048016 */ lui $a0, %hi(gSegments) /* 00098 809A6438 AC780008 */ sw $t8, 0x0008($v1) ## FFFFFFF4 /* 0009C 809A643C 8FB90038 */ lw $t9, 0x0038($sp) /* 000A0 809A6440 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 000A4 809A6444 24846FA8 */ addiu $a0, $a0, 0x6FA8 ## $a0 = 80166FA8 +/* 000A4 809A6444 24846FA8 */ addiu $a0, %lo(gSegments) /* 000A8 809A6448 03284821 */ addu $t1, $t9, $t0 /* 000AC 809A644C 01495021 */ addu $t2, $t2, $t1 /* 000B0 809A6450 8D4A17B4 */ lw $t2, 0x17B4($t2) ## 000117B4 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s index 7916a55332..b3cbfc58e8 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s @@ -43,8 +43,8 @@ glabel func_809A6568 /* 0026C 809A660C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00270 809A6610 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 00274 809A6614 00815021 */ addu $t2, $a0, $at -/* 00278 809A6618 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 0027C 809A661C AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 +/* 00278 809A6618 3C018016 */ lui $at, %hi(gSegments+0x18) +/* 0027C 809A661C AC2A6FC0 */ sw $t2, %lo(gSegments+0x18)($at) /* 00280 809A6620 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00284 809A6624 358C0018 */ ori $t4, $t4, 0x0018 ## $t4 = DB060018 /* 00288 809A6628 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 @@ -113,7 +113,7 @@ glabel func_809A6568 /* 0037C 809A671C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 00380 809A6720 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00384 809A6724 3C04809A */ lui $a0, %hi(D_809A6860) ## $a0 = 809A0000 -/* 00388 809A6728 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 00388 809A6728 3C088016 */ lui $t0, %hi(gSegments) /* 0038C 809A672C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 00390 809A6730 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 00394 809A6734 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 @@ -129,7 +129,7 @@ glabel func_809A6568 /* 003BC 809A675C 000ECF02 */ srl $t9, $t6, 28 /* 003C0 809A6760 00196880 */ sll $t5, $t9, 2 /* 003C4 809A6764 010D4021 */ addu $t0, $t0, $t5 -/* 003C8 809A6768 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 +/* 003C8 809A6768 8D086FA8 */ lw $t0, %lo(gSegments)($t0) /* 003CC 809A676C 0081C024 */ and $t8, $a0, $at /* 003D0 809A6770 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 003D4 809A6774 03085021 */ addu $t2, $t8, $t0 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6960.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6960.s index 3058e5469f..969b9903f7 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6960.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6960.s @@ -33,7 +33,7 @@ glabel func_809A6960 /* 0007C 809A69DC 00194880 */ sll $t1, $t9, 2 /* 00080 809A69E0 ACCA001C */ sw $t2, 0x001C($a2) ## 0000001C /* 00084 809A69E4 8CAB0008 */ lw $t3, 0x0008($a1) ## FFFFFFE4 -/* 00088 809A69E8 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 00088 809A69E8 3C0A8016 */ lui $t2, %hi(gSegments) /* 0008C 809A69EC 01495021 */ addu $t2, $t2, $t1 /* 00090 809A69F0 ACCB0020 */ sw $t3, 0x0020($a2) ## 00000020 /* 00094 809A69F4 8CAD0000 */ lw $t5, 0x0000($a1) ## FFFFFFDC @@ -57,7 +57,7 @@ glabel func_809A6960 /* 000DC 809A6A3C ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 /* 000E0 809A6A40 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 /* 000E4 809A6A44 ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 -/* 000E8 809A6A48 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 000E8 809A6A48 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 000EC 809A6A4C 014B6021 */ addu $t4, $t2, $t3 /* 000F0 809A6A50 01816821 */ addu $t5, $t4, $at /* 000F4 809A6A54 ACCD0038 */ sw $t5, 0x0038($a2) ## 00000038 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A6F30.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A6F30.s index 1377027eab..67b234e0c5 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A6F30.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A6F30.s @@ -24,10 +24,10 @@ glabel func_809A6F30 /* 0004C 809A6F7C 00027100 */ sll $t6, $v0, 4 /* 00050 809A6F80 000E7F02 */ srl $t7, $t6, 28 /* 00054 809A6F84 000FC080 */ sll $t8, $t7, 2 -/* 00058 809A6F88 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 00058 809A6F88 3C198016 */ lui $t9, %hi(gSegments) /* 0005C 809A6F8C 0338C821 */ addu $t9, $t9, $t8 /* 00060 809A6F90 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00064 809A6F94 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 +/* 00064 809A6F94 8F396FA8 */ lw $t9, %lo(gSegments)($t9) /* 00068 809A6F98 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0006C 809A6F9C 00414024 */ and $t0, $v0, $at /* 00070 809A6FA0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s index d08651b793..2996ee178d 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s @@ -63,7 +63,7 @@ glabel func_809A70A0 /* 00264 809A7194 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 /* 00268 809A7198 860A0050 */ lh $t2, 0x0050($s0) ## 00000050 /* 0026C 809A719C 3C04809A */ lui $a0, %hi(D_809A7498) ## $a0 = 809A0000 -/* 00270 809A71A0 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 00270 809A71A0 3C188016 */ lui $t8, %hi(gSegments) /* 00274 809A71A4 000A5880 */ sll $t3, $t2, 2 /* 00278 809A71A8 008B2021 */ addu $a0, $a0, $t3 /* 0027C 809A71AC 8C847498 */ lw $a0, %lo(D_809A7498)($a0) @@ -73,7 +73,7 @@ glabel func_809A70A0 /* 0028C 809A71BC 000D7702 */ srl $t6, $t5, 28 /* 00290 809A71C0 000E7880 */ sll $t7, $t6, 2 /* 00294 809A71C4 030FC021 */ addu $t8, $t8, $t7 -/* 00298 809A71C8 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 00298 809A71C8 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 0029C 809A71CC 00816024 */ and $t4, $a0, $at /* 002A0 809A71D0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 002A4 809A71D4 0198C821 */ addu $t9, $t4, $t8 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7540.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7540.s index e18e798913..3e0f13ae48 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7540.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7540.s @@ -40,7 +40,7 @@ glabel func_809A7540 /* 00098 809A75D8 000A5880 */ sll $t3, $t2, 2 /* 0009C 809A75DC ACCC0014 */ sw $t4, 0x0014($a2) ## 00000014 /* 000A0 809A75E0 8CEE0000 */ lw $t6, 0x0000($a3) ## 00000000 -/* 000A4 809A75E4 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 000A4 809A75E4 3C0C8016 */ lui $t4, %hi(gSegments) /* 000A8 809A75E8 24080258 */ addiu $t0, $zero, 0x0258 ## $t0 = 00000258 /* 000AC 809A75EC ACCE0000 */ sw $t6, 0x0000($a2) ## 00000000 /* 000B0 809A75F0 8CED0004 */ lw $t5, 0x0004($a3) ## 00000004 @@ -57,7 +57,7 @@ glabel func_809A7540 /* 000DC 809A761C 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 /* 000E0 809A7620 A4E8000E */ sh $t0, 0x000E($a3) ## 0000000E .L809A7624: -/* 000E4 809A7624 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 000E4 809A7624 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 000E8 809A7628 A4D8005C */ sh $t8, 0x005C($a2) ## 0000005C /* 000EC 809A762C 24080064 */ addiu $t0, $zero, 0x0064 ## $t0 = 00000064 /* 000F0 809A7630 018D7021 */ addu $t6, $t4, $t5 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7A60.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7A60.s index 643d7b95e4..ed3dc4f813 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7A60.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7A60.s @@ -18,7 +18,7 @@ glabel func_809A7A60 /* 000B0 809A7AA0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 000B4 809A7AA4 ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 /* 000B8 809A7AA8 8CF9000C */ lw $t9, 0x000C($a3) ## 0000000C -/* 000BC 809A7AAC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 000BC 809A7AAC 3C0F8016 */ lui $t7, %hi(gSegments) /* 000C0 809A7AB0 ACD9000C */ sw $t9, 0x000C($a2) ## 0000000C /* 000C4 809A7AB4 8CF80010 */ lw $t8, 0x0010($a3) ## 00000010 /* 000C8 809A7AB8 ACD80010 */ sw $t8, 0x0010($a2) ## 00000010 @@ -49,7 +49,7 @@ glabel func_809A7A60 /* 00128 809A7B18 000C6F02 */ srl $t5, $t4, 28 /* 0012C 809A7B1C 000D7080 */ sll $t6, $t5, 2 /* 00130 809A7B20 01EE7821 */ addu $t7, $t7, $t6 -/* 00134 809A7B24 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 00006FA8 +/* 00134 809A7B24 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 00138 809A7B28 0041C024 */ and $t8, $v0, $at /* 0013C 809A7B2C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00140 809A7B30 01F8C821 */ addu $t9, $t7, $t8 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8150.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8150.s index 615f09d81a..44bf3c6e2e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8150.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8150.s @@ -11,11 +11,11 @@ glabel func_809A8150 /* 00024 809A8174 ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 /* 00028 809A8178 8CEF0010 */ lw $t7, 0x0010($a3) ## 00000010 /* 0002C 809A817C 00194080 */ sll $t0, $t9, 2 -/* 00030 809A8180 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 00030 809A8180 3C098016 */ lui $t1, %hi(gSegments) /* 00034 809A8184 01284821 */ addu $t1, $t1, $t0 /* 00038 809A8188 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0003C 809A818C ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 -/* 00040 809A8190 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 +/* 00040 809A8190 8D296FA8 */ lw $t1, %lo(gSegments)($t1) /* 00044 809A8194 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00048 809A8198 00415024 */ and $t2, $v0, $at /* 0004C 809A819C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s index 24466b6943..eaf8430d65 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s @@ -43,10 +43,10 @@ glabel func_809A824C /* 001A0 809A82F0 27A6009C */ addiu $a2, $sp, 0x009C ## $a2 = FFFFFF3C /* 001A4 809A82F4 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 /* 001A8 809A82F8 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 001AC 809A82FC 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 +/* 001AC 809A82FC 3C088013 */ lui $t0, %hi(gMtxClear) /* 001B0 809A8300 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 /* 001B4 809A8304 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 001B8 809A8308 2508DB20 */ addiu $t0, $t0, 0xDB20 ## $t0 = 8012DB20 +/* 001B8 809A8308 2508DB20 */ addiu $t0, %lo(gMtxClear) /* 001BC 809A830C 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 /* 001C0 809A8310 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001C4 809A8314 27A5009C */ addiu $a1, $sp, 0x009C ## $a1 = FFFFFF3C @@ -76,13 +76,13 @@ glabel func_809A824C /* 00224 809A8374 01D94021 */ addu $t0, $t6, $t9 /* 00228 809A8378 00882021 */ addu $a0, $a0, $t0 /* 0022C 809A837C 8C8485E0 */ lw $a0, %lo(D_809A85E0)($a0) -/* 00230 809A8380 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 00230 809A8380 3C0D8016 */ lui $t5, %hi(gSegments) /* 00234 809A8384 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00238 809A8388 00045100 */ sll $t2, $a0, 4 /* 0023C 809A838C 000A5F02 */ srl $t3, $t2, 28 /* 00240 809A8390 000B6080 */ sll $t4, $t3, 2 /* 00244 809A8394 01AC6821 */ addu $t5, $t5, $t4 -/* 00248 809A8398 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 +/* 00248 809A8398 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) /* 0024C 809A839C 00814824 */ and $t1, $a0, $at /* 00250 809A83A0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00254 809A83A4 012D7821 */ addu $t7, $t1, $t5 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8BF0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8BF0.s index ba138e5ce2..f418efa342 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8BF0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8BF0.s @@ -22,9 +22,9 @@ glabel func_809A8BF0 /* 00048 809A8C38 1040002E */ beq $v0, $zero, .L809A8CF4 /* 0004C 809A8C3C 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 /* 00050 809A8C40 8FB8002C */ lw $t8, 0x002C($sp) -/* 00054 809A8C44 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00054 809A8C44 3C028016 */ lui $v0, %hi(gSegments) /* 00058 809A8C48 8FAF0038 */ lw $t7, 0x0038($sp) -/* 0005C 809A8C4C 24426FA8 */ addiu $v0, $v0, 0x6FA8 ## $v0 = 80166FA8 +/* 0005C 809A8C4C 24426FA8 */ addiu $v0, %lo(gSegments) /* 00060 809A8C50 0018C900 */ sll $t9, $t8, 4 /* 00064 809A8C54 8C4E0018 */ lw $t6, 0x0018($v0) ## 80166FC0 /* 00068 809A8C58 0338C821 */ addu $t9, $t9, $t8 @@ -65,10 +65,10 @@ glabel func_809A8BF0 /* 000E8 809A8CD8 AE0F0024 */ sw $t7, 0x0024($s0) ## 00000024 /* 000EC 809A8CDC A60D0044 */ sh $t5, 0x0044($s0) ## 00000044 /* 000F0 809A8CE0 8FB90028 */ lw $t9, 0x0028($sp) -/* 000F4 809A8CE4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 000F4 809A8CE4 3C018016 */ lui $at, %hi(gSegments+0x18) /* 000F8 809A8CE8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 000FC 809A8CEC 10000005 */ beq $zero, $zero, .L809A8D04 -/* 00100 809A8CF0 AC396FC0 */ sw $t9, 0x6FC0($at) ## 80166FC0 +/* 00100 809A8CF0 AC396FC0 */ sw $t9, %lo(gSegments+0x18)($at) .L809A8CF4: /* 00104 809A8CF4 3C04809B */ lui $a0, %hi(D_809A90C0) ## $a0 = 809B0000 /* 00108 809A8CF8 0C00084C */ jal osSyncPrintf diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s index 83118285cd..79ef6768bc 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s @@ -47,9 +47,9 @@ glabel func_809A8D18 /* 001D4 809A8DC4 0C024F61 */ jal func_80093D84 /* 001D8 809A8DC8 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 001DC 809A8DCC 8FA40088 */ lw $a0, 0x0088($sp) -/* 001E0 809A8DD0 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 001E0 809A8DD0 3C0A8016 */ lui $t2, %hi(gSegments) /* 001E4 809A8DD4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 001E8 809A8DD8 254A6FA8 */ addiu $t2, $t2, 0x6FA8 ## $t2 = 80166FA8 +/* 001E8 809A8DD8 254A6FA8 */ addiu $t2, %lo(gSegments) /* 001EC 809A8DDC 0081C821 */ addu $t9, $a0, $at /* 001F0 809A8DE0 AD590018 */ sw $t9, 0x0018($t2) ## 80166FC0 /* 001F4 809A8DE4 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 @@ -171,12 +171,12 @@ glabel func_809A8D18 /* 003C4 809A8FB4 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 /* 003C8 809A8FB8 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 003CC 809A8FBC 000B6080 */ sll $t4, $t3, 2 -/* 003D0 809A8FC0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 003D0 809A8FC0 3C0E8016 */ lui $t6, %hi(gSegments) /* 003D4 809A8FC4 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 /* 003D8 809A8FC8 01CC7021 */ addu $t6, $t6, $t4 /* 003DC 809A8FCC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 003E0 809A8FD0 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 003E4 809A8FD4 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 003E4 809A8FD4 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 003E8 809A8FD8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 003EC 809A8FDC 00816824 */ and $t5, $a0, $at /* 003F0 809A8FE0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA810.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA810.s index 971fda2c49..8f10dfd59c 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA810.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA810.s @@ -8,10 +8,10 @@ glabel func_809AA810 /* 00018 809AA828 8CEE0004 */ lw $t6, 0x0004($a3) ## 00000004 /* 0001C 809AA82C ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 /* 00020 809AA830 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 -/* 00024 809AA834 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 00024 809AA834 3C0E8016 */ lui $t6, %hi(gSegments) /* 00028 809AA838 ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 /* 0002C 809AA83C 8CF9000C */ lw $t9, 0x000C($a3) ## 0000000C -/* 00030 809AA840 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00030 809AA840 3C0F8016 */ lui $t7, %hi(gSegments) /* 00034 809AA844 ACD9000C */ sw $t9, 0x000C($a2) ## 0000000C /* 00038 809AA848 8CF80010 */ lw $t8, 0x0010($a3) ## 00000010 /* 0003C 809AA84C ACD80010 */ sw $t8, 0x0010($a2) ## 00000010 @@ -38,7 +38,7 @@ glabel func_809AA810 /* 00090 809AA8A0 A4CB005C */ sh $t3, 0x005C($a2) ## 0000005C /* 00094 809AA8A4 01EE7821 */ addu $t7, $t7, $t6 /* 00098 809AA8A8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0009C 809AA8AC 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 0009C 809AA8AC 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 000A0 809AA8B0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 000A4 809AA8B4 0041C024 */ and $t8, $v0, $at /* 000A8 809AA8B8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -57,7 +57,7 @@ glabel func_809AA810 /* 000D8 809AA8E8 000B6702 */ srl $t4, $t3, 28 /* 000DC 809AA8EC 000C6880 */ sll $t5, $t4, 2 /* 000E0 809AA8F0 01CD7021 */ addu $t6, $t6, $t5 -/* 000E4 809AA8F4 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 +/* 000E4 809AA8F4 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) /* 000E8 809AA8F8 00417824 */ and $t7, $v0, $at /* 000EC 809AA8FC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 000F0 809AA900 01CFC021 */ addu $t8, $t6, $t7 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s index 1b84cc1ce4..6bfbccc7c8 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s @@ -54,10 +54,10 @@ glabel func_809AA9AC /* 0026C 809AAA7C 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFE74 /* 00270 809AAA80 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 /* 00274 809AAA84 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 00278 809AAA88 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 +/* 00278 809AAA88 3C088013 */ lui $t0, %hi(gMtxClear) /* 0027C 809AAA8C 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 /* 00280 809AAA90 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 -/* 00284 809AAA94 2508DB20 */ addiu $t0, $t0, 0xDB20 ## $t0 = 8012DB20 +/* 00284 809AAA94 2508DB20 */ addiu $t0, %lo(gMtxClear) /* 00288 809AAA98 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 /* 0028C 809AAA9C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00290 809AAAA0 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFE74 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAEF0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAEF0.s index babe052217..22c717de83 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAEF0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAEF0.s @@ -11,11 +11,11 @@ glabel func_809AAEF0 /* 00024 809AAF14 ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 /* 00028 809AAF18 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 /* 0002C 809AAF1C 00194080 */ sll $t0, $t9, 2 -/* 00030 809AAF20 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 +/* 00030 809AAF20 3C098016 */ lui $t1, %hi(gSegments) /* 00034 809AAF24 01284821 */ addu $t1, $t1, $t0 /* 00038 809AAF28 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0003C 809AAF2C ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 -/* 00040 809AAF30 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 +/* 00040 809AAF30 8D296FA8 */ lw $t1, %lo(gSegments)($t1) /* 00044 809AAF34 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00048 809AAF38 00615024 */ and $t2, $v1, $at /* 0004C 809AAF3C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s index 87834d4a3d..20e5215302 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s @@ -76,10 +76,10 @@ glabel func_809AB078 /* 002AC 809AB19C 27A601A4 */ addiu $a2, $sp, 0x01A4 ## $a2 = FFFFFFBC /* 002B0 809AB1A0 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 /* 002B4 809AB1A4 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 -/* 002B8 809AB1A8 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 +/* 002B8 809AB1A8 3C0C8013 */ lui $t4, %hi(gMtxClear) /* 002BC 809AB1AC 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 /* 002C0 809AB1B0 AE2A02D0 */ sw $t2, 0x02D0($s1) ## 000002D0 -/* 002C4 809AB1B4 258CDB20 */ addiu $t4, $t4, 0xDB20 ## $t4 = 8012DB20 +/* 002C4 809AB1B4 258CDB20 */ addiu $t4, %lo(gMtxClear) /* 002C8 809AB1B8 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 /* 002CC 809AB1BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002D0 809AB1C0 27A501A4 */ addiu $a1, $sp, 0x01A4 ## $a1 = FFFFFFBC @@ -104,7 +104,7 @@ glabel func_809AB078 /* 0031C 809AB20C AC780000 */ sw $t8, 0x0000($v1) ## 00000000 /* 00320 809AB210 87B9005A */ lh $t9, 0x005A($sp) /* 00324 809AB214 3C04809B */ lui $a0, %hi(D_809AB538) ## $a0 = 809B0000 -/* 00328 809AB218 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 00328 809AB218 3C0D8016 */ lui $t5, %hi(gSegments) /* 0032C 809AB21C 00194080 */ sll $t0, $t9, 2 /* 00330 809AB220 00882021 */ addu $a0, $a0, $t0 /* 00334 809AB224 8C84B538 */ lw $a0, %lo(D_809AB538)($a0) @@ -114,7 +114,7 @@ glabel func_809AB078 /* 00344 809AB234 000A5F02 */ srl $t3, $t2, 28 /* 00348 809AB238 000B6080 */ sll $t4, $t3, 2 /* 0034C 809AB23C 01AC6821 */ addu $t5, $t5, $t4 -/* 00350 809AB240 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 +/* 00350 809AB240 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) /* 00354 809AB244 00814824 */ and $t1, $a0, $at /* 00358 809AB248 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 0035C 809AB24C 012D7021 */ addu $t6, $t1, $t5 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB630.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB630.s index 31b39e470f..1b08059b99 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB630.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB630.s @@ -4,7 +4,7 @@ glabel func_809AB630 /* 00008 809AB638 AFA40018 */ sw $a0, 0x0018($sp) /* 0000C 809AB63C AFA5001C */ sw $a1, 0x001C($sp) /* 00010 809AB640 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 -/* 00014 809AB644 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 00014 809AB644 3C0A8016 */ lui $t2, %hi(gGameInfo) /* 00018 809AB648 3C020405 */ lui $v0, 0x0405 ## $v0 = 04050000 /* 0001C 809AB64C ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 /* 00020 809AB650 8CEE0004 */ lw $t6, 0x0004($a3) ## 00000004 @@ -13,10 +13,10 @@ glabel func_809AB630 /* 0002C 809AB65C ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 /* 00030 809AB660 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 /* 00034 809AB664 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00038 809AB668 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 00038 809AB668 3C0C8016 */ lui $t4, %hi(gSegments) /* 0003C 809AB66C ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 /* 00040 809AB670 8CF9000C */ lw $t9, 0x000C($a3) ## 0000000C -/* 00044 809AB674 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 00044 809AB674 3C0F8016 */ lui $t7, %hi(gSegments) /* 00048 809AB678 ACD9000C */ sw $t9, 0x000C($a2) ## 0000000C /* 0004C 809AB67C 8CF80010 */ lw $t8, 0x0010($a3) ## 00000010 /* 00050 809AB680 ACD80010 */ sw $t8, 0x0010($a2) ## 00000010 @@ -28,7 +28,7 @@ glabel func_809AB630 /* 00068 809AB698 ACC8001C */ sw $t0, 0x001C($a2) ## 0000001C /* 0006C 809AB69C 8CE90020 */ lw $t1, 0x0020($a3) ## 00000020 /* 00070 809AB6A0 ACC90020 */ sw $t1, 0x0020($a2) ## 00000020 -/* 00074 809AB6A4 8D4AFA90 */ lw $t2, -0x0570($t2) ## 8015FA90 +/* 00074 809AB6A4 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) /* 00078 809AB6A8 00024900 */ sll $t1, $v0, 4 /* 0007C 809AB6AC 854B09D8 */ lh $t3, 0x09D8($t2) ## 801609D8 /* 00080 809AB6B0 00095702 */ srl $t2, $t1, 28 @@ -41,7 +41,7 @@ glabel func_809AB630 /* 0009C 809AB6CC 000D7080 */ sll $t6, $t5, 2 /* 000A0 809AB6D0 01EE7821 */ addu $t7, $t7, $t6 /* 000A4 809AB6D4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 000A8 809AB6D8 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 +/* 000A8 809AB6D8 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) /* 000AC 809AB6DC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 000B0 809AB6E0 0041C024 */ and $t8, $v0, $at /* 000B4 809AB6E4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -52,7 +52,7 @@ glabel func_809AB630 /* 000C8 809AB6F8 000A5880 */ sll $t3, $t2, 2 .L809AB6FC: /* 000CC 809AB6FC 018B6021 */ addu $t4, $t4, $t3 -/* 000D0 809AB700 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 +/* 000D0 809AB700 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) /* 000D4 809AB704 00416824 */ and $t5, $v0, $at /* 000D8 809AB708 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 000DC 809AB70C 018D7021 */ addu $t6, $t4, $t5 @@ -63,8 +63,8 @@ glabel func_809AB630 /* 000EC 809AB71C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 000F0 809AB720 AFA70024 */ sw $a3, 0x0024($sp) -/* 000F4 809AB724 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 000F8 809AB728 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 000F4 809AB724 3C038016 */ lui $v1, %hi(gGameInfo) +/* 000F8 809AB728 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) /* 000FC 809AB72C 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 00100 809AB730 44812000 */ mtc1 $at, $f4 ## $f4 = 500.00 /* 00104 809AB734 84780A54 */ lh $t8, 0x0A54($v1) ## 80160A54 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s index 5e2c4a7048..b6726c304b 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s @@ -98,14 +98,14 @@ glabel func_809AB7EC /* 0033C 809AB96C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 00340 809AB970 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 00344 809AB974 0008C080 */ sll $t8, $t0, 2 -/* 00348 809AB978 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 +/* 00348 809AB978 3C0A8016 */ lui $t2, %hi(gSegments) /* 0034C 809AB97C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 00350 809AB980 AE2902C0 */ sw $t1, 0x02C0($s1) ## 000002C0 /* 00354 809AB984 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 /* 00358 809AB988 01585021 */ addu $t2, $t2, $t8 /* 0035C 809AB98C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00360 809AB990 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 00364 809AB994 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 +/* 00364 809AB994 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) /* 00368 809AB998 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0036C 809AB99C 00817824 */ and $t7, $a0, $at /* 00370 809AB9A0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s index 6589b0042c..0a4c65e96e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s @@ -29,8 +29,8 @@ glabel func_809AB9DC /* 00414 809ABA44 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00418 809ABA48 A7A2002E */ sh $v0, 0x002E($sp) -/* 0041C 809ABA4C 3C118016 */ lui $s1, 0x8016 ## $s1 = 80160000 -/* 00420 809ABA50 2631FA90 */ addiu $s1, $s1, 0xFA90 ## $s1 = 8015FA90 +/* 0041C 809ABA4C 3C118016 */ lui $s1, %hi(gGameInfo) +/* 00420 809ABA50 2631FA90 */ addiu $s1, %lo(gGameInfo) /* 00424 809ABA54 8E220000 */ lw $v0, 0x0000($s1) ## 8015FA90 /* 00428 809ABA58 3C01809B */ lui $at, %hi(D_809ABCDC) ## $at = 809B0000 /* 0042C 809ABA5C C434BCDC */ lwc1 $f20, %lo(D_809ABCDC)($at) @@ -160,8 +160,8 @@ glabel func_809AB9DC /* 00608 809ABC38 E606001C */ swc1 $f6, 0x001C($s0) ## 0000001C .L809ABC3C: /* 0060C 809ABC3C 86020054 */ lh $v0, 0x0054($s0) ## 00000054 -/* 00610 809ABC40 3C118016 */ lui $s1, 0x8016 ## $s1 = 80160000 -/* 00614 809ABC44 2631FA90 */ addiu $s1, $s1, 0xFA90 ## $s1 = 8015FA90 +/* 00610 809ABC40 3C118016 */ lui $s1, %hi(gGameInfo) +/* 00614 809ABC44 2631FA90 */ addiu $s1, %lo(gGameInfo) /* 00618 809ABC48 50400007 */ beql $v0, $zero, .L809ABC68 /* 0061C 809ABC4C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00620 809ABC50 8E2A0000 */ lw $t2, 0x0000($s1) ## 8015FA90 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s index aacb7eb3a5..e48057ce5e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s @@ -68,7 +68,7 @@ glabel func_809ABE0C /* 001B4 809ABF14 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 001B8 809ABF18 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 001BC 809ABF1C 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 001C0 809ABF20 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 +/* 001C0 809ABF20 3C068016 */ lui $a2, %hi(gSegments) /* 001C4 809ABF24 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 001C8 809ABF28 AE2E02D0 */ sw $t6, 0x02D0($s1) ## 000002D0 /* 001CC 809ABF2C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 @@ -93,7 +93,7 @@ glabel func_809ABE0C /* 00218 809ABF78 AE2C02D0 */ sw $t4, 0x02D0($s1) ## 000002D0 /* 0021C 809ABF7C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 00220 809ABF80 860B0050 */ lh $t3, 0x0050($s0) ## 00000050 -/* 00224 809ABF84 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 +/* 00224 809ABF84 24C66FA8 */ addiu $a2, %lo(gSegments) /* 00228 809ABF88 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 /* 0022C 809ABF8C 000B4880 */ sll $t1, $t3, 2 /* 00230 809ABF90 00892021 */ addu $a0, $a0, $t1 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC2D0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC2D0.s index 516cd767a6..7b63f2d40d 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC2D0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC2D0.s @@ -9,7 +9,7 @@ glabel func_809AC2D0 /* 0001C 809AC2EC 25CEC628 */ addiu $t6, $t6, %lo(D_809AC628) ## $t6 = 809AC628 /* 00020 809AC2F0 8DD80000 */ lw $t8, 0x0000($t6) ## 809AC628 /* 00024 809AC2F4 27A20038 */ addiu $v0, $sp, 0x0038 ## $v0 = FFFFFFF0 -/* 00028 809AC2F8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 00028 809AC2F8 3C198016 */ lui $t9, %hi(gSaveContext+4) /* 0002C 809AC2FC AC580000 */ sw $t8, 0x0000($v0) ## FFFFFFF0 /* 00030 809AC300 8DCF0004 */ lw $t7, 0x0004($t6) ## 809AC62C /* 00034 809AC304 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -20,7 +20,7 @@ glabel func_809AC2D0 /* 00048 809AC318 AC580008 */ sw $t8, 0x0008($v0) ## FFFFFFF8 /* 0004C 809AC31C 8DCF000C */ lw $t7, 0x000C($t6) ## 809AC634 /* 00050 809AC320 AC4F000C */ sw $t7, 0x000C($v0) ## FFFFFFFC -/* 00054 809AC324 8F39E664 */ lw $t9, -0x199C($t9) ## 8015E664 +/* 00054 809AC324 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) /* 00058 809AC328 8FA40048 */ lw $a0, 0x0048($sp) /* 0005C 809AC32C 001948C0 */ sll $t1, $t9, 3 /* 00060 809AC330 01224021 */ addu $t0, $t1, $v0 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s index 639b58807d..ab93f68b46 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s @@ -18,8 +18,8 @@ glabel func_809AC42C /* 0019C 809AC46C 8E260008 */ lw $a2, 0x0008($s1) ## 00000008 /* 001A0 809AC470 0C034261 */ jal Matrix_Translate /* 001A4 809AC474 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 001A8 809AC478 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 001AC 809AC47C 8DEFE664 */ lw $t7, -0x199C($t7) ## 8015E664 +/* 001A8 809AC478 3C0F8016 */ lui $t7, %hi(gSaveContext+4) +/* 001AC 809AC47C 8DEFE664 */ lw $t7, %lo(gSaveContext+4)($t7) /* 001B0 809AC480 3C01809B */ lui $at, %hi(D_809AC684) ## $at = 809B0000 /* 001B4 809AC484 11E0000F */ beq $t7, $zero, .L809AC4C4 /* 001B8 809AC488 00000000 */ nop @@ -92,10 +92,10 @@ glabel func_809AC42C /* 002BC 809AC58C 01EE7821 */ addu $t7, $t7, $t6 /* 002C0 809AC590 8DEF17B4 */ lw $t7, 0x17B4($t7) ## 000117B4 /* 002C4 809AC594 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 002C8 809AC598 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 +/* 002C8 809AC598 3C088012 */ lui $t0, %hi(D_80125F98) /* 002CC 809AC59C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 002D0 809AC5A0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 002D4 809AC5A4 25085F98 */ addiu $t0, $t0, 0x5F98 ## $t0 = 80125F98 +/* 002D4 809AC5A4 25085F98 */ addiu $t0, %lo(D_80125F98) /* 002D8 809AC5A8 37390030 */ ori $t9, $t9, 0x0030 ## $t9 = DB060030 /* 002DC 809AC5AC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 002E0 809AC5B0 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s index 0af6499013..7e06b31ecf 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s @@ -80,13 +80,13 @@ glabel func_809AC78C /* 001BC 809AC8BC AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 001C0 809AC8C0 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 001C4 809AC8C4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 001C8 809AC8C8 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 001C8 809AC8C8 3C188016 */ lui $t8, %hi(gSegments) /* 001CC 809AC8CC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 001D0 809AC8D0 00046900 */ sll $t5, $a0, 4 /* 001D4 809AC8D4 000D7702 */ srl $t6, $t5, 28 /* 001D8 809AC8D8 000E7880 */ sll $t7, $t6, 2 /* 001DC 809AC8DC 030FC021 */ addu $t8, $t8, $t7 -/* 001E0 809AC8E0 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 +/* 001E0 809AC8E0 8F186FA8 */ lw $t8, %lo(gSegments)($t8) /* 001E4 809AC8E4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 001E8 809AC8E8 0081C824 */ and $t9, $a0, $at /* 001EC 809AC8EC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC9C0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC9C0.s index 13f29981b6..6c5b6b0393 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC9C0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC9C0.s @@ -6,10 +6,10 @@ glabel func_809AC9C0 /* 002D0 809AC9D0 15C10007 */ bne $t6, $at, .L809AC9F0 /* 002D4 809AC9D4 00000000 */ nop /* 002D8 809AC9D8 84CF0040 */ lh $t7, 0x0040($a2) ## 00000040 -/* 002DC 809AC9DC 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 002DC 809AC9DC 3C188016 */ lui $t8, %hi(gGameInfo) /* 002E0 809AC9E0 11E00003 */ beq $t7, $zero, .L809AC9F0 /* 002E4 809AC9E4 00000000 */ nop -/* 002E8 809AC9E8 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 002E8 809AC9E8 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 002EC 809AC9EC A7000D38 */ sh $zero, 0x0D38($t8) ## 80160D38 .L809AC9F0: /* 002F0 809AC9F0 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80803ED8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80803ED8.s index 6111eaf74b..8c67c265c7 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80803ED8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80803ED8.s @@ -36,15 +36,15 @@ glabel func_80803ED8 /* 00218 80803F58 240A0013 */ addiu $t2, $zero, 0x0013 ## $t2 = 00000013 /* 0021C 80803F5C A42ACA3E */ sh $t2, -0x35C2($at) ## 0001CA3E /* 00220 80803F60 3C010002 */ lui $at, 0x0002 ## $at = 00020000 -/* 00224 80803F64 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 00224 80803F64 3C078013 */ lui $a3, %hi(D_801333E0) /* 00228 80803F68 00300821 */ addu $at, $at, $s0 /* 0022C 80803F6C 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 00230 80803F70 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 00234 80803F74 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00230 80803F70 3C0C8013 */ lui $t4, %hi(D_801333E8) +/* 00234 80803F74 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00238 80803F78 A42BCA60 */ sh $t3, -0x35A0($at) ## 0001CA60 -/* 0023C 80803F7C 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 -/* 00240 80803F80 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00244 80803F84 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0023C 80803F7C 258C33E8 */ addiu $t4, %lo(D_801333E8) +/* 00240 80803F80 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00244 80803F84 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00248 80803F88 AFAC0014 */ sw $t4, 0x0014($sp) /* 0024C 80803F8C AFA70010 */ sw $a3, 0x0010($sp) /* 00250 80803F90 2404483C */ addiu $a0, $zero, 0x483C ## $a0 = 0000483C @@ -56,18 +56,18 @@ glabel func_80803ED8 .L80803FA4: /* 00264 80803FA4 11A00044 */ beq $t5, $zero, .L808040B8 /* 00268 80803FA8 00037040 */ sll $t6, $v1, 1 -/* 0026C 80803FAC 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 +/* 0026C 80803FAC 3C0F8013 */ lui $t7, %hi(D_8012A4E0) /* 00270 80803FB0 01EE7821 */ addu $t7, $t7, $t6 -/* 00274 80803FB4 95EFA4E0 */ lhu $t7, -0x5B20($t7) ## 8012A4E0 +/* 00274 80803FB4 95EFA4E0 */ lhu $t7, %lo(D_8012A4E0)($t7) /* 00278 80803FB8 8E1801E0 */ lw $t8, 0x01E0($s0) ## 000001E0 /* 0027C 80803FBC 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A -/* 00280 80803FC0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 00280 80803FC0 3C078013 */ lui $a3, %hi(D_801333E0) /* 00284 80803FC4 01F81021 */ addu $v0, $t7, $t8 /* 00288 80803FC8 9059001C */ lbu $t9, 0x001C($v0) ## 0000001C -/* 0028C 80803FCC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 0028C 80803FCC 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00290 80803FD0 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 /* 00294 80803FD4 10990016 */ beq $a0, $t9, .L80804030 -/* 00298 80803FD8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 +/* 00298 80803FD8 3C058013 */ lui $a1, %hi(D_801333D4) /* 0029C 80803FDC 904A001D */ lbu $t2, 0x001D($v0) ## 0000001D /* 002A0 80803FE0 24010045 */ addiu $at, $zero, 0x0045 ## $at = 00000045 /* 002A4 80803FE4 51410013 */ beql $t2, $at, .L80804034 @@ -85,8 +85,8 @@ glabel func_80803ED8 /* 002D4 80804014 51A10007 */ beql $t5, $at, .L80804034 /* 002D8 80804018 3C010002 */ lui $at, 0x0002 ## $at = 00020000 /* 002DC 8080401C 904E0021 */ lbu $t6, 0x0021($v0) ## 00000021 -/* 002E0 80804020 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 -/* 002E4 80804024 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 +/* 002E0 80804020 3C0B8013 */ lui $t3, %hi(D_801333E8) +/* 002E4 80804024 256B33E8 */ addiu $t3, %lo(D_801333E8) /* 002E8 80804028 148E0019 */ bne $a0, $t6, .L80804090 /* 002EC 8080402C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 .L80804030: @@ -104,23 +104,23 @@ glabel func_80803ED8 /* 00318 80804058 A439CA3E */ sh $t9, -0x35C2($at) ## 0001CA3E /* 0031C 8080405C 3C010002 */ lui $at, 0x0002 ## $at = 00020000 /* 00320 80804060 00300821 */ addu $at, $at, $s0 -/* 00324 80804064 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 +/* 00324 80804064 3C0A8013 */ lui $t2, %hi(D_801333E8) /* 00328 80804068 A429CA66 */ sh $t1, -0x359A($at) ## 0001CA66 -/* 0032C 8080406C 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 +/* 0032C 8080406C 254A33E8 */ addiu $t2, %lo(D_801333E8) /* 00330 80804070 AFAA0014 */ sw $t2, 0x0014($sp) /* 00334 80804074 AFA70010 */ sw $a3, 0x0010($sp) /* 00338 80804078 2404483B */ addiu $a0, $zero, 0x483B ## $a0 = 0000483B -/* 0033C 8080407C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0033C 8080407C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00340 80804080 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 00344 80804084 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 00348 80804088 1000006B */ beq $zero, $zero, .L80804238 /* 0034C 8080408C 8FBF0024 */ lw $ra, 0x0024($sp) .L80804090: -/* 00350 80804090 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00354 80804094 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00358 80804098 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0035C 8080409C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00350 80804090 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00354 80804094 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00358 80804098 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0035C 8080409C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00360 808040A0 AFA70010 */ sw $a3, 0x0010($sp) /* 00364 808040A4 2404483D */ addiu $a0, $zero, 0x483D ## $a0 = 0000483D /* 00368 808040A8 0C03DCE3 */ jal Audio_PlaySoundGeneral @@ -130,8 +130,8 @@ glabel func_80803ED8 /* 00374 808040B4 8FBF0024 */ lw $ra, 0x0024($sp) .L808040B8: /* 00378 808040B8 85024ABC */ lh $v0, 0x4ABC($t0) ## 00004ABC -/* 0037C 808040BC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00380 808040C0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 0037C 808040BC 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00380 808040C0 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00384 808040C4 04400003 */ bltz $v0, .L808040D4 /* 00388 808040C8 00022023 */ subu $a0, $zero, $v0 /* 0038C 808040CC 10000001 */ beq $zero, $zero, .L808040D4 @@ -140,10 +140,10 @@ glabel func_80803ED8 /* 00394 808040D4 2881001E */ slti $at, $a0, 0x001E /* 00398 808040D8 14200029 */ bne $at, $zero, .L80804180 /* 0039C 808040DC 24044839 */ addiu $a0, $zero, 0x4839 ## $a0 = 00004839 -/* 003A0 808040E0 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 003A4 808040E4 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 -/* 003A8 808040E8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 003AC 808040EC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 003A0 808040E0 3C0C8013 */ lui $t4, %hi(D_801333E8) +/* 003A4 808040E4 258C33E8 */ addiu $t4, %lo(D_801333E8) +/* 003A8 808040E8 3C058013 */ lui $a1, %hi(D_801333D4) +/* 003AC 808040EC 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 003B0 808040F0 AFAC0014 */ sw $t4, 0x0014($sp) /* 003B4 808040F4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 003B8 808040F8 AFA70010 */ sw $a3, 0x0010($sp) @@ -185,9 +185,9 @@ glabel func_80803ED8 .L80804180: /* 00440 80804180 1123002C */ beq $t1, $v1, .L80804234 /* 00444 80804184 00035040 */ sll $t2, $v1, 1 -/* 00448 80804188 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 +/* 00448 80804188 3C0B8013 */ lui $t3, %hi(D_8012A4E0) /* 0044C 8080418C 016A5821 */ addu $t3, $t3, $t2 -/* 00450 80804190 956BA4E0 */ lhu $t3, -0x5B20($t3) ## 8012A4E0 +/* 00450 80804190 956BA4E0 */ lhu $t3, %lo(D_8012A4E0)($t3) /* 00454 80804194 8E0C01E0 */ lw $t4, 0x01E0($s0) ## 000001E0 /* 00458 80804198 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A /* 0045C 8080419C 016C1021 */ addu $v0, $t3, $t4 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808044A0.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808044A0.s index 5b8b68b84d..832318c890 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808044A0.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808044A0.s @@ -34,14 +34,14 @@ glabel func_808044A0 /* 007D8 80804518 00300821 */ addu $at, $at, $s0 /* 007DC 8080451C A422CA50 */ sh $v0, -0x35B0($at) ## 0001CA50 /* 007E0 80804520 3C010002 */ lui $at, 0x0002 ## $at = 00020000 -/* 007E4 80804524 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 007E4 80804524 3C078013 */ lui $a3, %hi(D_801333E0) /* 007E8 80804528 00300821 */ addu $at, $at, $s0 -/* 007EC 8080452C 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 -/* 007F0 80804530 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 007EC 8080452C 3C0B8013 */ lui $t3, %hi(D_801333E8) +/* 007F0 80804530 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 007F4 80804534 A422CA3E */ sh $v0, -0x35C2($at) ## 0001CA3E -/* 007F8 80804538 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 -/* 007FC 8080453C 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00800 80804540 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 007F8 80804538 256B33E8 */ addiu $t3, %lo(D_801333E8) +/* 007FC 8080453C 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00800 80804540 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00804 80804544 AFAB0014 */ sw $t3, 0x0014($sp) /* 00808 80804548 AFA70010 */ sw $a3, 0x0010($sp) /* 0080C 8080454C 2404483C */ addiu $a0, $zero, 0x483C ## $a0 = 0000483C @@ -53,18 +53,18 @@ glabel func_808044A0 .L80804560: /* 00820 80804560 11800044 */ beq $t4, $zero, .L80804674 /* 00824 80804564 00036840 */ sll $t5, $v1, 1 -/* 00828 80804568 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 +/* 00828 80804568 3C0E8013 */ lui $t6, %hi(D_8012A4E0) /* 0082C 8080456C 01CD7021 */ addu $t6, $t6, $t5 -/* 00830 80804570 95CEA4E0 */ lhu $t6, -0x5B20($t6) ## 8012A4E0 +/* 00830 80804570 95CEA4E0 */ lhu $t6, %lo(D_8012A4E0)($t6) /* 00834 80804574 8E0F01E0 */ lw $t7, 0x01E0($s0) ## 000001E0 /* 00838 80804578 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A -/* 0083C 8080457C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 0083C 8080457C 3C078013 */ lui $a3, %hi(D_801333E0) /* 00840 80804580 01CF1021 */ addu $v0, $t6, $t7 /* 00844 80804584 9058001C */ lbu $t8, 0x001C($v0) ## 0000001C -/* 00848 80804588 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0084C 8080458C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00848 80804588 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0084C 8080458C 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00850 80804590 1098002F */ beq $a0, $t8, .L80804650 -/* 00854 80804594 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00854 80804594 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00858 80804598 9059001D */ lbu $t9, 0x001D($v0) ## 0000001D /* 0085C 8080459C 24010045 */ addiu $at, $zero, 0x0045 ## $at = 00000045 /* 00860 808045A0 1321002B */ beq $t9, $at, .L80804650 @@ -95,15 +95,15 @@ glabel func_808044A0 /* 008C4 80804604 00300821 */ addu $at, $at, $s0 /* 008C8 80804608 A422CA50 */ sh $v0, -0x35B0($at) ## 0001CA50 /* 008CC 8080460C 3C010002 */ lui $at, 0x0002 ## $at = 00020000 -/* 008D0 80804610 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 008D0 80804610 3C078013 */ lui $a3, %hi(D_801333E0) /* 008D4 80804614 00300821 */ addu $at, $at, $s0 /* 008D8 80804618 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 008DC 8080461C 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 008E0 80804620 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 008DC 8080461C 3C188013 */ lui $t8, %hi(D_801333E8) +/* 008E0 80804620 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 008E4 80804624 A42FCA3E */ sh $t7, -0x35C2($at) ## 0001CA3E -/* 008E8 80804628 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 008EC 8080462C 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 008F0 80804630 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 008E8 80804628 271833E8 */ addiu $t8, %lo(D_801333E8) +/* 008EC 8080462C 3C058013 */ lui $a1, %hi(D_801333D4) +/* 008F0 80804630 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 008F4 80804634 AFB80014 */ sw $t8, 0x0014($sp) /* 008F8 80804638 AFA70010 */ sw $a3, 0x0010($sp) /* 008FC 8080463C 2404483B */ addiu $a0, $zero, 0x483B ## $a0 = 0000483B @@ -113,8 +113,8 @@ glabel func_808044A0 /* 00908 80804648 1000007F */ beq $zero, $zero, .L80804848 /* 0090C 8080464C 8FBF0024 */ lw $ra, 0x0024($sp) .L80804650: -/* 00910 80804650 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 00914 80804654 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 00910 80804650 3C198013 */ lui $t9, %hi(D_801333E8) +/* 00914 80804654 273933E8 */ addiu $t9, %lo(D_801333E8) /* 00918 80804658 AFB90014 */ sw $t9, 0x0014($sp) /* 0091C 8080465C 2404483D */ addiu $a0, $zero, 0x483D ## $a0 = 0000483D /* 00920 80804660 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 @@ -125,8 +125,8 @@ glabel func_808044A0 /* 00930 80804670 8FBF0024 */ lw $ra, 0x0024($sp) .L80804674: /* 00934 80804674 85024ABC */ lh $v0, 0x4ABC($t0) ## 00004ABC -/* 00938 80804678 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0093C 8080467C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 00938 80804678 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0093C 8080467C 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 00940 80804680 04400003 */ bltz $v0, .L80804690 /* 00944 80804684 00022023 */ subu $a0, $zero, $v0 /* 00948 80804688 10000001 */ beq $zero, $zero, .L80804690 @@ -135,10 +135,10 @@ glabel func_808044A0 /* 00950 80804690 2881001E */ slti $at, $a0, 0x001E /* 00954 80804694 1420003D */ bne $at, $zero, .L8080478C /* 00958 80804698 24044839 */ addiu $a0, $zero, 0x4839 ## $a0 = 00004839 -/* 0095C 8080469C 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 00960 808046A0 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 -/* 00964 808046A4 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00968 808046A8 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0095C 8080469C 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 00960 808046A0 254A33E8 */ addiu $t2, %lo(D_801333E8) +/* 00964 808046A4 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00968 808046A8 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 0096C 808046AC AFAA0014 */ sw $t2, 0x0014($sp) /* 00970 808046B0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 00974 808046B4 AFA70010 */ sw $a3, 0x0010($sp) @@ -202,9 +202,9 @@ glabel func_808044A0 .L8080478C: /* 00A4C 8080478C 1123002D */ beq $t1, $v1, .L80804844 /* 00A50 80804790 00036040 */ sll $t4, $v1, 1 -/* 00A54 80804794 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 +/* 00A54 80804794 3C0D8013 */ lui $t5, %hi(D_8012A4E0) /* 00A58 80804798 01AC6821 */ addu $t5, $t5, $t4 -/* 00A5C 8080479C 95ADA4E0 */ lhu $t5, -0x5B20($t5) ## 8012A4E0 +/* 00A5C 8080479C 95ADA4E0 */ lhu $t5, %lo(D_8012A4E0)($t5) /* 00A60 808047A0 8E0E01E0 */ lw $t6, 0x01E0($s0) ## 000001E0 /* 00A64 808047A4 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A /* 00A68 808047A8 01AE1021 */ addu $v0, $t5, $t6 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804A50.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804A50.s index ee445e3ead..1b12377740 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804A50.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804A50.s @@ -11,12 +11,12 @@ glabel func_80804A50 /* 00D34 80804A74 844E4A6E */ lh $t6, 0x4A6E($v0) ## 00004A6E /* 00D38 80804A78 84584A70 */ lh $t8, 0x4A70($v0) ## 00004A70 /* 00D3C 80804A7C 3C148081 */ lui $s4, %hi(D_808124A4) ## $s4 = 80810000 -/* 00D40 80804A80 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 +/* 00D40 80804A80 3C0D8013 */ lui $t5, %hi(D_8012A4E0) /* 00D44 80804A84 25CFFFE1 */ addiu $t7, $t6, 0xFFE1 ## $t7 = FFFFFFE1 /* 00D48 80804A88 2719001F */ addiu $t9, $t8, 0x001F ## $t9 = 0000001F /* 00D4C 80804A8C A44F4A6E */ sh $t7, 0x4A6E($v0) ## 00004A6E /* 00D50 80804A90 A4594A70 */ sh $t9, 0x4A70($v0) ## 00004A70 -/* 00D54 80804A94 25ADA4E0 */ addiu $t5, $t5, 0xA4E0 ## $t5 = 8012A4E0 +/* 00D54 80804A94 25ADA4E0 */ addiu $t5, %lo(D_8012A4E0) /* 00D58 80804A98 269424A4 */ addiu $s4, $s4, %lo(D_808124A4) ## $s4 = 808124A4 /* 00D5C 80804A9C 24100045 */ addiu $s0, $zero, 0x0045 ## $s0 = 00000045 /* 00D60 80804AA0 2411004C */ addiu $s1, $zero, 0x004C ## $s1 = 0000004C diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804CD0.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804CD0.s index 525a2d921d..6d672ba36d 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804CD0.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804CD0.s @@ -29,15 +29,15 @@ glabel func_80804CD0 /* 00FF4 80804D34 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 /* 00FF8 80804D38 A42ACA66 */ sh $t2, -0x359A($at) ## 0001CA66 /* 00FFC 80804D3C 3C010002 */ lui $at, 0x0002 ## $at = 00020000 -/* 01000 80804D40 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 01000 80804D40 3C078013 */ lui $a3, %hi(D_801333E0) /* 01004 80804D44 00300821 */ addu $at, $at, $s0 /* 01008 80804D48 240B000D */ addiu $t3, $zero, 0x000D ## $t3 = 0000000D -/* 0100C 80804D4C 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 01010 80804D50 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 0100C 80804D4C 3C0C8013 */ lui $t4, %hi(D_801333E8) +/* 01010 80804D50 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01014 80804D54 A42BCA3E */ sh $t3, -0x35C2($at) ## 0001CA3E -/* 01018 80804D58 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 -/* 0101C 80804D5C 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 01020 80804D60 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 01018 80804D58 258C33E8 */ addiu $t4, %lo(D_801333E8) +/* 0101C 80804D5C 3C058013 */ lui $a1, %hi(D_801333D4) +/* 01020 80804D60 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 01024 80804D64 AFAC0014 */ sw $t4, 0x0014($sp) /* 01028 80804D68 AFA70010 */ sw $a3, 0x0010($sp) /* 0102C 80804D6C 2404483C */ addiu $a0, $zero, 0x483C ## $a0 = 0000483C @@ -48,8 +48,8 @@ glabel func_80804CD0 /* 0103C 80804D7C 8FBF0024 */ lw $ra, 0x0024($sp) .L80804D80: /* 01040 80804D80 11A00037 */ beq $t5, $zero, .L80804E60 -/* 01044 80804D84 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 01048 80804D88 95CEE66C */ lhu $t6, -0x1994($t6) ## 8015E66C +/* 01044 80804D84 3C0E8016 */ lui $t6, %hi(gSaveContext+0xc) +/* 01048 80804D88 95CEE66C */ lhu $t6, %lo(gSaveContext+0xc)($t6) /* 0104C 80804D8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01050 80804D90 260501E0 */ addiu $a1, $s0, 0x01E0 ## $a1 = 000001E0 /* 01054 80804D94 AFA30028 */ sw $v1, 0x0028($sp) @@ -57,8 +57,8 @@ glabel func_80804CD0 /* 0105C 80804D9C A7AE0032 */ sh $t6, 0x0032($sp) /* 01060 80804DA0 97AF0032 */ lhu $t7, 0x0032($sp) /* 01064 80804DA4 8FA30028 */ lw $v1, 0x0028($sp) -/* 01068 80804DA8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 0106C 80804DAC A42FE66C */ sh $t7, -0x1994($at) ## 8015E66C +/* 01068 80804DA8 3C018016 */ lui $at, %hi(gSaveContext+0xc) +/* 0106C 80804DAC A42FE66C */ sh $t7, %lo(gSaveContext+0xc)($at) /* 01070 80804DB0 84784A5E */ lh $t8, 0x4A5E($v1) ## 00004A5E /* 01074 80804DB4 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 /* 01078 80804DB8 35088000 */ ori $t0, $t0, 0x8000 ## $t0 = 00018000 @@ -90,12 +90,12 @@ glabel func_80804CD0 /* 010E0 80804E20 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 /* 010E4 80804E24 0C02A800 */ jal func_800AA000 /* 010E8 80804E28 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 010EC 80804E2C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 010F0 80804E30 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 010F4 80804E34 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 010F8 80804E38 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 -/* 010FC 80804E3C 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 01100 80804E40 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 010EC 80804E2C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 010F0 80804E30 3C098013 */ lui $t1, %hi(D_801333E8) +/* 010F4 80804E34 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 010F8 80804E38 252933E8 */ addiu $t1, %lo(D_801333E8) +/* 010FC 80804E3C 3C058013 */ lui $a1, %hi(D_801333D4) +/* 01100 80804E40 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 01104 80804E44 AFA90014 */ sw $t1, 0x0014($sp) /* 01108 80804E48 AFA70010 */ sw $a3, 0x0010($sp) /* 0110C 80804E4C 2404483B */ addiu $a0, $zero, 0x483B ## $a0 = 0000483B @@ -106,8 +106,8 @@ glabel func_80804CD0 /* 0111C 80804E5C 8FBF0024 */ lw $ra, 0x0024($sp) .L80804E60: /* 01120 80804E60 84624ABC */ lh $v0, 0x4ABC($v1) ## 00004ABC -/* 01124 80804E64 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01128 80804E68 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01124 80804E64 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01128 80804E68 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 0112C 80804E6C 04400003 */ bltz $v0, .L80804E7C /* 01130 80804E70 00022023 */ subu $a0, $zero, $v0 /* 01134 80804E74 10000001 */ beq $zero, $zero, .L80804E7C @@ -116,10 +116,10 @@ glabel func_80804CD0 /* 0113C 80804E7C 2881001E */ slti $at, $a0, 0x001E /* 01140 80804E80 14200010 */ bne $at, $zero, .L80804EC4 /* 01144 80804E84 24044839 */ addiu $a0, $zero, 0x4839 ## $a0 = 00004839 -/* 01148 80804E88 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 0114C 80804E8C 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 -/* 01150 80804E90 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 01154 80804E94 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 01148 80804E88 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 0114C 80804E8C 254A33E8 */ addiu $t2, %lo(D_801333E8) +/* 01150 80804E90 3C058013 */ lui $a1, %hi(D_801333D4) +/* 01154 80804E94 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 01158 80804E98 AFAA0014 */ sw $t2, 0x0014($sp) /* 0115C 80804E9C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 01160 80804EA0 AFA70010 */ sw $a3, 0x0010($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804ED8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804ED8.s index 9aec5bee1c..502517ea8c 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804ED8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80804ED8.s @@ -13,12 +13,12 @@ glabel func_80804ED8 /* 011C4 80804F04 25CFFFE1 */ addiu $t7, $t6, 0xFFE1 ## $t7 = FFFFFFE1 /* 011C8 80804F08 844E4A96 */ lh $t6, 0x4A96($v0) ## 00004A96 /* 011CC 80804F0C A44F4A6E */ sh $t7, 0x4A6E($v0) ## 00004A6E -/* 011D0 80804F10 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 +/* 011D0 80804F10 3C0C8013 */ lui $t4, %hi(D_8012A4E0) /* 011D4 80804F14 2719001F */ addiu $t9, $t8, 0x001F ## $t9 = 0000001F /* 011D8 80804F18 25CFFFE7 */ addiu $t7, $t6, 0xFFE7 ## $t7 = FFFFFFE7 /* 011DC 80804F1C A4594A70 */ sh $t9, 0x4A70($v0) ## 00004A70 /* 011E0 80804F20 A44F4A96 */ sh $t7, 0x4A96($v0) ## 00004A96 -/* 011E4 80804F24 258CA4E0 */ addiu $t4, $t4, 0xA4E0 ## $t4 = 8012A4E0 +/* 011E4 80804F24 258CA4E0 */ addiu $t4, %lo(D_8012A4E0) /* 011E8 80804F28 2673248C */ addiu $s3, $s3, %lo(D_8081248C) ## $s3 = 8081248C /* 011EC 80804F2C 2410004C */ addiu $s0, $zero, 0x004C ## $s0 = 0000004C /* 011F0 80804F30 24110044 */ addiu $s1, $zero, 0x0044 ## $s1 = 00000044 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805318.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805318.s index 9fd8449885..51e94c0d73 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805318.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805318.s @@ -9,18 +9,18 @@ glabel func_80805318 /* 015F4 80805334 2401004B */ addiu $at, $zero, 0x004B ## $at = 0000004B /* 015F8 80805338 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 015FC 8080533C 14410014 */ bne $v0, $at, .L80805390 -/* 01600 80805340 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 01600 80805340 3C078013 */ lui $a3, %hi(D_801333E0) /* 01604 80805344 846F4A5E */ lh $t7, 0x4A5E($v1) ## 00004A5E /* 01608 80805348 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 0160C 8080534C 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 +/* 0160C 8080534C 3C0A8013 */ lui $t2, %hi(D_801333E8) /* 01610 80805350 000FC040 */ sll $t8, $t7, 1 /* 01614 80805354 0098C821 */ addu $t9, $a0, $t8 /* 01618 80805358 03284821 */ addu $t1, $t9, $t0 /* 0161C 8080535C A52E4A86 */ sh $t6, 0x4A86($t1) ## 00004A86 -/* 01620 80805360 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 01624 80805364 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 -/* 01628 80805368 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0162C 8080536C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 01620 80805360 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 01624 80805364 254A33E8 */ addiu $t2, %lo(D_801333E8) +/* 01628 80805368 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0162C 8080536C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 01630 80805370 AFAA0014 */ sw $t2, 0x0014($sp) /* 01634 80805374 AFA70010 */ sw $a3, 0x0010($sp) /* 01638 80805378 AFA3002C */ sw $v1, 0x002C($sp) @@ -55,14 +55,14 @@ glabel func_80805318 /* 016A0 808053E0 84784A3E */ lh $t8, 0x4A3E($v1) ## 00004A3E /* 016A4 808053E4 3C010002 */ lui $at, 0x0002 ## $at = 00020000 /* 016A8 808053E8 00300821 */ addu $at, $at, $s0 -/* 016AC 808053EC 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 016B0 808053F0 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 +/* 016AC 808053EC 3C0E8013 */ lui $t6, %hi(D_801333E0) +/* 016B0 808053F0 3C098013 */ lui $t1, %hi(D_801333E8) /* 016B4 808053F4 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 /* 016B8 808053F8 A439CA3E */ sh $t9, -0x35C2($at) ## 0001CA3E -/* 016BC 808053FC 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 -/* 016C0 80805400 25C733E0 */ addiu $a3, $t6, 0x33E0 ## $a3 = 801333E0 -/* 016C4 80805404 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 016C8 80805408 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 016BC 808053FC 252933E8 */ addiu $t1, %lo(D_801333E8) +/* 016C0 80805400 25C733E0 */ addiu $a3, $t6, %lo(D_801333E0) +/* 016C4 80805404 3C058013 */ lui $a1, %hi(D_801333D4) +/* 016C8 80805408 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 016CC 8080540C AFA70010 */ sw $a3, 0x0010($sp) /* 016D0 80805410 AFA90014 */ sw $t1, 0x0014($sp) /* 016D4 80805414 2404483B */ addiu $a0, $zero, 0x483B ## $a0 = 0000483B diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805524.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805524.s index e37ff99862..fcaa27bfff 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805524.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805524.s @@ -51,8 +51,8 @@ glabel func_80805524 .L808055D0: /* 01890 808055D0 5420FFE0 */ bnel $at, $zero, .L80805554 /* 01894 808055D4 00067040 */ sll $t6, $a2, 1 -/* 01898 808055D8 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 0189C 808055DC 258CA4E0 */ addiu $t4, $t4, 0xA4E0 ## $t4 = 8012A4E0 +/* 01898 808055D8 3C0C8013 */ lui $t4, %hi(D_8012A4E0) +/* 0189C 808055DC 258CA4E0 */ addiu $t4, %lo(D_8012A4E0) /* 018A0 808055E0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 018A4 808055E4 24120041 */ addiu $s2, $zero, 0x0041 ## $s2 = 00000041 /* 018A8 808055E8 24110044 */ addiu $s1, $zero, 0x0044 ## $s1 = 00000044 @@ -184,8 +184,8 @@ glabel func_80805524 /* 01A84 808057C4 A44F4AA8 */ sh $t7, 0x4AA8($v0) ## 00004AA8 /* 01A88 808057C8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 01A8C 808057CC A438CAAA */ sh $t8, -0x3556($at) ## 0001CAAA -/* 01A90 808057D0 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 01A94 808057D4 8CA5FA90 */ lw $a1, -0x0570($a1) ## 8015FA90 +/* 01A90 808057D0 3C058016 */ lui $a1, %hi(gGameInfo) +/* 01A94 808057D4 8CA5FA90 */ lw $a1, %lo(gGameInfo)($a1) /* 01A98 808057D8 3C010002 */ lui $at, 0x0002 ## $at = 00020000 /* 01A9C 808057DC 00240821 */ addu $at, $at, $a0 /* 01AA0 808057E0 84B90ADC */ lh $t9, 0x0ADC($a1) ## 80160ADC diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080595C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080595C.s index bc4b9bcbe8..ff93856f53 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080595C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080595C.s @@ -93,8 +93,8 @@ glabel func_8080595C /* 01D68 80805AA8 A5394AA8 */ sh $t9, 0x4AA8($t1) ## 00004AA8 /* 01D6C 80805AAC 00240821 */ addu $at, $at, $a0 /* 01D70 80805AB0 A42CCAAA */ sh $t4, -0x3556($at) ## 0001CAAA -/* 01D74 80805AB4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 01D78 80805AB8 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 +/* 01D74 80805AB4 3C038016 */ lui $v1, %hi(gGameInfo) +/* 01D78 80805AB8 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) /* 01D7C 80805ABC 3C010002 */ lui $at, 0x0002 ## $at = 00020000 /* 01D80 80805AC0 00240821 */ addu $at, $at, $a0 /* 01D84 80805AC4 846D0ADC */ lh $t5, 0x0ADC($v1) ## 80160ADC diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805B2C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805B2C.s index 450ca95490..72baf0983a 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805B2C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805B2C.s @@ -37,15 +37,15 @@ glabel func_80805B2C /* 01E70 80805BB0 240B001E */ addiu $t3, $zero, 0x001E ## $t3 = 0000001E /* 01E74 80805BB4 A42BCA3E */ sh $t3, -0x35C2($at) ## 0001CA3E /* 01E78 80805BB8 3C010002 */ lui $at, 0x0002 ## $at = 00020000 -/* 01E7C 80805BBC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 01E7C 80805BBC 3C078013 */ lui $a3, %hi(D_801333E0) /* 01E80 80805BC0 00300821 */ addu $at, $at, $s0 /* 01E84 80805BC4 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 01E88 80805BC8 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 -/* 01E8C 80805BCC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01E88 80805BC8 3C0D8013 */ lui $t5, %hi(D_801333E8) +/* 01E8C 80805BCC 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01E90 80805BD0 A42CCA60 */ sh $t4, -0x35A0($at) ## 0001CA60 -/* 01E94 80805BD4 25AD33E8 */ addiu $t5, $t5, 0x33E8 ## $t5 = 801333E8 -/* 01E98 80805BD8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 01E9C 80805BDC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 01E94 80805BD4 25AD33E8 */ addiu $t5, %lo(D_801333E8) +/* 01E98 80805BD8 3C058013 */ lui $a1, %hi(D_801333D4) +/* 01E9C 80805BDC 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 01EA0 80805BE0 AFAD0014 */ sw $t5, 0x0014($sp) /* 01EA4 80805BE4 AFA70010 */ sw $a3, 0x0010($sp) /* 01EA8 80805BE8 2404483C */ addiu $a0, $zero, 0x483C ## $a0 = 0000483C @@ -57,18 +57,18 @@ glabel func_80805B2C .L80805BFC: /* 01EBC 80805BFC 11C00045 */ beq $t6, $zero, .L80805D14 /* 01EC0 80805C00 00037840 */ sll $t7, $v1, 1 -/* 01EC4 80805C04 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 +/* 01EC4 80805C04 3C188013 */ lui $t8, %hi(D_8012A4E0) /* 01EC8 80805C08 030FC021 */ addu $t8, $t8, $t7 -/* 01ECC 80805C0C 9718A4E0 */ lhu $t8, -0x5B20($t8) ## 8012A4E0 +/* 01ECC 80805C0C 9718A4E0 */ lhu $t8, %lo(D_8012A4E0)($t8) /* 01ED0 80805C10 8E1901E0 */ lw $t9, 0x01E0($s0) ## 000001E0 /* 01ED4 80805C14 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A -/* 01ED8 80805C18 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 01ED8 80805C18 3C078013 */ lui $a3, %hi(D_801333E0) /* 01EDC 80805C1C 03191021 */ addu $v0, $t8, $t9 /* 01EE0 80805C20 904A001C */ lbu $t2, 0x001C($v0) ## 0000001C -/* 01EE4 80805C24 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01EE4 80805C24 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01EE8 80805C28 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 /* 01EEC 80805C2C 108A0016 */ beq $a0, $t2, .L80805C88 -/* 01EF0 80805C30 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 +/* 01EF0 80805C30 3C058013 */ lui $a1, %hi(D_801333D4) /* 01EF4 80805C34 904B001D */ lbu $t3, 0x001D($v0) ## 0000001D /* 01EF8 80805C38 24010045 */ addiu $at, $zero, 0x0045 ## $at = 00000045 /* 01EFC 80805C3C 51610013 */ beql $t3, $at, .L80805C8C @@ -86,8 +86,8 @@ glabel func_80805B2C /* 01F2C 80805C6C 51C10007 */ beql $t6, $at, .L80805C8C /* 01F30 80805C70 3C010002 */ lui $at, 0x0002 ## $at = 00020000 /* 01F34 80805C74 904F0021 */ lbu $t7, 0x0021($v0) ## 00000021 -/* 01F38 80805C78 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 -/* 01F3C 80805C7C 25AD33E8 */ addiu $t5, $t5, 0x33E8 ## $t5 = 801333E8 +/* 01F38 80805C78 3C0D8013 */ lui $t5, %hi(D_801333E8) +/* 01F3C 80805C7C 25AD33E8 */ addiu $t5, %lo(D_801333E8) /* 01F40 80805C80 148F001A */ bne $a0, $t7, .L80805CEC /* 01F44 80805C84 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 .L80805C88: @@ -106,23 +106,23 @@ glabel func_80805B2C /* 01F74 80805CB4 3C010002 */ lui $at, 0x0002 ## $at = 00020000 /* 01F78 80805CB8 00300821 */ addu $at, $at, $s0 /* 01F7C 80805CBC 240B0007 */ addiu $t3, $zero, 0x0007 ## $t3 = 00000007 -/* 01F80 80805CC0 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 +/* 01F80 80805CC0 3C0C8013 */ lui $t4, %hi(D_801333E8) /* 01F84 80805CC4 A42BCA66 */ sh $t3, -0x359A($at) ## 0001CA66 -/* 01F88 80805CC8 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 +/* 01F88 80805CC8 258C33E8 */ addiu $t4, %lo(D_801333E8) /* 01F8C 80805CCC AFAC0014 */ sw $t4, 0x0014($sp) /* 01F90 80805CD0 AFA70010 */ sw $a3, 0x0010($sp) /* 01F94 80805CD4 2404483B */ addiu $a0, $zero, 0x483B ## $a0 = 0000483B -/* 01F98 80805CD8 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 01F98 80805CD8 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 01F9C 80805CDC 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 01FA0 80805CE0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 01FA4 80805CE4 10000070 */ beq $zero, $zero, .L80805EA8 /* 01FA8 80805CE8 8FBF0024 */ lw $ra, 0x0024($sp) .L80805CEC: -/* 01FAC 80805CEC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01FB0 80805CF0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 01FB4 80805CF4 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 01FB8 80805CF8 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 01FAC 80805CEC 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01FB0 80805CF0 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 01FB4 80805CF4 3C058013 */ lui $a1, %hi(D_801333D4) +/* 01FB8 80805CF8 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 01FBC 80805CFC AFA70010 */ sw $a3, 0x0010($sp) /* 01FC0 80805D00 2404483D */ addiu $a0, $zero, 0x483D ## $a0 = 0000483D /* 01FC4 80805D04 0C03DCE3 */ jal Audio_PlaySoundGeneral @@ -132,8 +132,8 @@ glabel func_80805B2C /* 01FD0 80805D10 8FBF0024 */ lw $ra, 0x0024($sp) .L80805D14: /* 01FD4 80805D14 85024ABC */ lh $v0, 0x4ABC($t0) ## 00004ABC -/* 01FD8 80805D18 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01FDC 80805D1C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 01FD8 80805D18 3C078013 */ lui $a3, %hi(D_801333E0) +/* 01FDC 80805D1C 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 01FE0 80805D20 04400003 */ bltz $v0, .L80805D30 /* 01FE4 80805D24 00022023 */ subu $a0, $zero, $v0 /* 01FE8 80805D28 10000001 */ beq $zero, $zero, .L80805D30 @@ -142,10 +142,10 @@ glabel func_80805B2C /* 01FF0 80805D30 2881001E */ slti $at, $a0, 0x001E /* 01FF4 80805D34 14200029 */ bne $at, $zero, .L80805DDC /* 01FF8 80805D38 24044839 */ addiu $a0, $zero, 0x4839 ## $a0 = 00004839 -/* 01FFC 80805D3C 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 02000 80805D40 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 02004 80805D44 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 02008 80805D48 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 01FFC 80805D3C 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 02000 80805D40 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 02004 80805D44 3C058013 */ lui $a1, %hi(D_801333D4) +/* 02008 80805D48 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 0200C 80805D4C AFAE0014 */ sw $t6, 0x0014($sp) /* 02010 80805D50 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 02014 80805D54 AFA70010 */ sw $a3, 0x0010($sp) @@ -188,9 +188,9 @@ glabel func_80805B2C /* 0209C 80805DDC 1123002E */ beq $t1, $v1, .L80805E98 /* 020A0 80805DE0 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF /* 020A4 80805DE4 00036040 */ sll $t4, $v1, 1 -/* 020A8 80805DE8 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 +/* 020A8 80805DE8 3C0D8013 */ lui $t5, %hi(D_8012A4E0) /* 020AC 80805DEC 01AC6821 */ addu $t5, $t5, $t4 -/* 020B0 80805DF0 95ADA4E0 */ lhu $t5, -0x5B20($t5) ## 8012A4E0 +/* 020B0 80805DF0 95ADA4E0 */ lhu $t5, %lo(D_8012A4E0)($t5) /* 020B4 80805DF4 8E0E01E0 */ lw $t6, 0x01E0($s0) ## 000001E0 /* 020B8 80805DF8 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A /* 020BC 80805DFC 01AE1021 */ addu $v0, $t5, $t6 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805EB8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805EB8.s index f6cfbfeaab..18b6214be8 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805EB8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80805EB8.s @@ -5,8 +5,8 @@ glabel func_80805EB8 /* 02184 80805EC4 AFB10008 */ sw $s1, 0x0008($sp) /* 02188 80805EC8 AFB00004 */ sw $s0, 0x0004($sp) /* 0218C 80805ECC 34228000 */ ori $v0, $at, 0x8000 ## $v0 = 00018000 -/* 02190 80805ED0 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 02194 80805ED4 258CA4E0 */ addiu $t4, $t4, 0xA4E0 ## $t4 = 8012A4E0 +/* 02190 80805ED0 3C0C8013 */ lui $t4, %hi(D_8012A4E0) +/* 02194 80805ED4 258CA4E0 */ addiu $t4, %lo(D_8012A4E0) /* 02198 80805ED8 00821821 */ addu $v1, $a0, $v0 /* 0219C 80805EDC 2410004C */ addiu $s0, $zero, 0x004C ## $s0 = 0000004C /* 021A0 80805EE0 24110044 */ addiu $s1, $zero, 0x0044 ## $s1 = 00000044 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080625C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080625C.s index d0676e3e38..cd5cb5616e 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080625C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080625C.s @@ -34,14 +34,14 @@ glabel func_8080625C /* 02594 808062D4 A42BCA3E */ sh $t3, -0x35C2($at) ## 0001CA3E /* 02598 808062D8 3C010002 */ lui $at, 0x0002 ## $at = 00020000 /* 0259C 808062DC 24020008 */ addiu $v0, $zero, 0x0008 ## $v0 = 00000008 -/* 025A0 808062E0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 025A0 808062E0 3C078013 */ lui $a3, %hi(D_801333E0) /* 025A4 808062E4 00300821 */ addu $at, $at, $s0 -/* 025A8 808062E8 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 025AC 808062EC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 025A8 808062E8 3C0C8013 */ lui $t4, %hi(D_801333E8) +/* 025AC 808062EC 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 025B0 808062F0 A422CA50 */ sh $v0, -0x35B0($at) ## 0001CA50 -/* 025B4 808062F4 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 -/* 025B8 808062F8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 025BC 808062FC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 025B4 808062F4 258C33E8 */ addiu $t4, %lo(D_801333E8) +/* 025B8 808062F8 3C058013 */ lui $a1, %hi(D_801333D4) +/* 025BC 808062FC 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 025C0 80806300 AFAC0014 */ sw $t4, 0x0014($sp) /* 025C4 80806304 AFA70010 */ sw $a3, 0x0010($sp) /* 025C8 80806308 2404483C */ addiu $a0, $zero, 0x483C ## $a0 = 0000483C @@ -52,22 +52,22 @@ glabel func_8080625C /* 025D8 80806318 8FBF0024 */ lw $ra, 0x0024($sp) .L8080631C: /* 025DC 8080631C 11A0002B */ beq $t5, $zero, .L808063CC -/* 025E0 80806320 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 025E0 80806320 3C078013 */ lui $a3, %hi(D_801333E0) /* 025E4 80806324 850E4A46 */ lh $t6, 0x4A46($t0) ## 00004A46 -/* 025E8 80806328 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 -/* 025EC 8080632C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 025E8 80806328 3C0D8013 */ lui $t5, %hi(D_801333E8) +/* 025EC 8080632C 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 025F0 80806330 000E7840 */ sll $t7, $t6, 1 /* 025F4 80806334 020FC021 */ addu $t8, $s0, $t7 /* 025F8 80806338 0303C821 */ addu $t9, $t8, $v1 /* 025FC 8080633C A7204A86 */ sh $zero, 0x4A86($t9) ## 00004A86 /* 02600 80806340 85094A46 */ lh $t1, 0x4A46($t0) ## 00004A46 -/* 02604 80806344 25AD33E8 */ addiu $t5, $t5, 0x33E8 ## $t5 = 801333E8 -/* 02608 80806348 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 +/* 02604 80806344 25AD33E8 */ addiu $t5, %lo(D_801333E8) +/* 02608 80806348 3C058013 */ lui $a1, %hi(D_801333D4) /* 0260C 8080634C 00095040 */ sll $t2, $t1, 1 /* 02610 80806350 020A5821 */ addu $t3, $s0, $t2 /* 02614 80806354 01631021 */ addu $v0, $t3, $v1 /* 02618 80806358 844C4A86 */ lh $t4, 0x4A86($v0) ## 00004A86 -/* 0261C 8080635C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0261C 8080635C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 02620 80806360 240428BA */ addiu $a0, $zero, 0x28BA ## $a0 = 000028BA /* 02624 80806364 A44C4A28 */ sh $t4, 0x4A28($v0) ## 00004A28 /* 02628 80806368 AFAD0014 */ sw $t5, 0x0014($sp) @@ -98,8 +98,8 @@ glabel func_8080625C /* 02688 808063C8 A42F24A0 */ sh $t7, %lo(D_808124A0)($at) .L808063CC: /* 0268C 808063CC 85024ABC */ lh $v0, 0x4ABC($t0) ## 00004ABC -/* 02690 808063D0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 02694 808063D4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 02690 808063D0 3C078013 */ lui $a3, %hi(D_801333E0) +/* 02694 808063D4 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 02698 808063D8 04400003 */ bltz $v0, .L808063E8 /* 0269C 808063DC 00021823 */ subu $v1, $zero, $v0 /* 026A0 808063E0 10000001 */ beq $zero, $zero, .L808063E8 @@ -108,10 +108,10 @@ glabel func_8080625C /* 026A8 808063E8 2861001E */ slti $at, $v1, 0x001E /* 026AC 808063EC 14200010 */ bne $at, $zero, .L80806430 /* 026B0 808063F0 24044839 */ addiu $a0, $zero, 0x4839 ## $a0 = 00004839 -/* 026B4 808063F4 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 026B8 808063F8 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 026BC 808063FC 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 026C0 80806400 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 026B4 808063F4 3C188013 */ lui $t8, %hi(D_801333E8) +/* 026B8 808063F8 271833E8 */ addiu $t8, %lo(D_801333E8) +/* 026BC 808063FC 3C058013 */ lui $a1, %hi(D_801333D4) +/* 026C0 80806400 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 026C4 80806404 AFB80014 */ sw $t8, 0x0014($sp) /* 026C8 80806408 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 026CC 8080640C AFA70010 */ sw $a3, 0x0010($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808064F4.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808064F4.s index f40dc0654d..82655e50e0 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808064F4.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808064F4.s @@ -26,7 +26,7 @@ glabel func_808064F4 .L80806550: /* 02810 80806550 84584A50 */ lh $t8, 0x4A50($v0) ## 00004A50 /* 02814 80806554 240C0045 */ addiu $t4, $zero, 0x0045 ## $t4 = 00000045 -/* 02818 80806558 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 +/* 02818 80806558 3C0B8013 */ lui $t3, %hi(D_8012A4E0) /* 0281C 8080655C 00D8001A */ div $zero, $a2, $t8 /* 02820 80806560 17000002 */ bne $t8, $zero, .L8080656C /* 02824 80806564 00000000 */ nop @@ -52,7 +52,7 @@ glabel func_808064F4 /* 02868 808065A8 A4EE4A52 */ sh $t6, 0x4A52($a3) ## 00004A52 .L808065AC: /* 0286C 808065AC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02870 808065B0 256BA4E0 */ addiu $t3, $t3, 0xA4E0 ## $t3 = 8012A4E0 +/* 02870 808065B0 256BA4E0 */ addiu $t3, %lo(D_8012A4E0) /* 02874 808065B4 240A005A */ addiu $t2, $zero, 0x005A ## $t2 = 0000005A /* 02878 808065B8 844F4A38 */ lh $t7, 0x4A38($v0) ## 00004A38 .L808065BC: diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806710.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806710.s index c27f64acd8..02c2b387b9 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806710.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806710.s @@ -106,14 +106,14 @@ glabel func_80806710 .L808068A8: /* 02B68 808068A8 A46C0000 */ sh $t4, 0x0000($v1) ## 00000000 /* 02B6C 808068AC 846D0000 */ lh $t5, 0x0000($v1) ## 00000000 -/* 02B70 808068B0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 02B74 808068B4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 02B70 808068B0 3C078013 */ lui $a3, %hi(D_801333E0) +/* 02B74 808068B4 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 02B78 808068B8 15A00009 */ bne $t5, $zero, .L808068E0 /* 02B7C 808068BC 24045801 */ addiu $a0, $zero, 0x5801 ## $a0 = 00005801 -/* 02B80 808068C0 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 02B84 808068C4 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 02B88 808068C8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 02B8C 808068CC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 02B80 808068C0 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 02B84 808068C4 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 02B88 808068C8 3C058013 */ lui $a1, %hi(D_801333D4) +/* 02B8C 808068CC 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 02B90 808068D0 AFAE0014 */ sw $t6, 0x0014($sp) /* 02B94 808068D4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 02B98 808068D8 0C03DCE3 */ jal Audio_PlaySoundGeneral diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808068F0.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808068F0.s index 17cdd6b1a3..20eac249c2 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808068F0.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808068F0.s @@ -30,15 +30,15 @@ glabel func_808068F0 /* 02C1C 8080695C A420CA66 */ sh $zero, -0x359A($at) ## 0001CA66 /* 02C20 80806960 844A4A3E */ lh $t2, 0x4A3E($v0) ## 00004A3E /* 02C24 80806964 3C010002 */ lui $at, 0x0002 ## $at = 00020000 -/* 02C28 80806968 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 02C28 80806968 3C078013 */ lui $a3, %hi(D_801333E0) /* 02C2C 8080696C 00300821 */ addu $at, $at, $s0 -/* 02C30 80806970 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 +/* 02C30 80806970 3C0C8013 */ lui $t4, %hi(D_801333E8) /* 02C34 80806974 254B0001 */ addiu $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 02C38 80806978 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 02C38 80806978 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 02C3C 8080697C A42BCA3E */ sh $t3, -0x35C2($at) ## 0001CA3E -/* 02C40 80806980 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 -/* 02C44 80806984 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 02C48 80806988 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 02C40 80806980 258C33E8 */ addiu $t4, %lo(D_801333E8) +/* 02C44 80806984 3C058013 */ lui $a1, %hi(D_801333D4) +/* 02C48 80806988 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 02C4C 8080698C AFAC0014 */ sw $t4, 0x0014($sp) /* 02C50 80806990 AFA70010 */ sw $a3, 0x0010($sp) /* 02C54 80806994 2404483C */ addiu $a0, $zero, 0x483C ## $a0 = 0000483C diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808069B4.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808069B4.s index cd205ac4de..3fa7ec1c1a 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808069B4.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808069B4.s @@ -48,8 +48,8 @@ glabel func_808069B4 .L80806A54: /* 02D14 80806A54 5420FFE0 */ bnel $at, $zero, .L808069D8 /* 02D18 80806A58 00067040 */ sll $t6, $a2, 1 -/* 02D1C 80806A5C 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 -/* 02D20 80806A60 256BA4E0 */ addiu $t3, $t3, 0xA4E0 ## $t3 = 8012A4E0 +/* 02D1C 80806A5C 3C0B8013 */ lui $t3, %hi(D_8012A4E0) +/* 02D20 80806A60 256BA4E0 */ addiu $t3, %lo(D_8012A4E0) /* 02D24 80806A64 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 02D28 80806A68 248501E0 */ addiu $a1, $a0, 0x01E0 ## $a1 = 000001E0 /* 02D2C 80806A6C 24110041 */ addiu $s1, $zero, 0x0041 ## $s1 = 00000041 @@ -128,7 +128,7 @@ glabel func_808069B4 /* 02E40 80806B80 84474A92 */ lh $a3, 0x4A92($v0) ## 00004A92 /* 02E44 80806B84 84594A46 */ lh $t9, 0x4A46($v0) ## 00004A46 /* 02E48 80806B88 00240821 */ addu $at, $at, $a0 -/* 02E4C 80806B8C 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 +/* 02E4C 80806B8C 3C058016 */ lui $a1, %hi(gGameInfo) /* 02E50 80806B90 00197040 */ sll $t6, $t9, 1 /* 02E54 80806B94 008E7821 */ addu $t7, $a0, $t6 /* 02E58 80806B98 01E3C021 */ addu $t8, $t7, $v1 @@ -137,7 +137,7 @@ glabel func_808069B4 /* 02E64 80806BA4 A4594AA8 */ sh $t9, 0x4AA8($v0) ## 00004AA8 /* 02E68 80806BA8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 02E6C 80806BAC A42ECAAA */ sh $t6, -0x3556($at) ## 0001CAAA -/* 02E70 80806BB0 8CA5FA90 */ lw $a1, -0x0570($a1) ## 8015FA90 +/* 02E70 80806BB0 8CA5FA90 */ lw $a1, %lo(gGameInfo)($a1) /* 02E74 80806BB4 241800C8 */ addiu $t8, $zero, 0x00C8 ## $t8 = 000000C8 /* 02E78 80806BB8 3C010002 */ lui $at, 0x0002 ## $at = 00020000 /* 02E7C 80806BBC 84AF0ADC */ lh $t7, 0x0ADC($a1) ## 80160ADC diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806C20.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806C20.s index 83d1209cd6..497b1622da 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806C20.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806C20.s @@ -62,7 +62,7 @@ glabel func_80806C20 /* 02FB4 80806CF4 272AFFCE */ addiu $t2, $t9, 0xFFCE ## $t2 = FFFFFFCE /* 02FB8 80806CF8 A50A4A98 */ sh $t2, 0x4A98($t0) ## 00004A98 /* 02FBC 80806CFC 850B4A98 */ lh $t3, 0x4A98($t0) ## 00004A98 -/* 02FC0 80806D00 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 02FC0 80806D00 3C028016 */ lui $v0, %hi(gGameInfo) /* 02FC4 80806D04 5D600003 */ bgtzl $t3, .L80806D14 /* 02FC8 80806D08 850C4A6E */ lh $t4, 0x4A6E($t0) ## 00004A6E /* 02FCC 80806D0C A5004A98 */ sh $zero, 0x4A98($t0) ## 00004A98 @@ -84,7 +84,7 @@ glabel func_80806C20 /* 03008 80806D48 A50B4AA8 */ sh $t3, 0x4AA8($t0) ## 00004AA8 /* 0300C 80806D4C 00240821 */ addu $at, $at, $a0 /* 03010 80806D50 A42CCAAA */ sh $t4, -0x3556($at) ## 0001CAAA -/* 03014 80806D54 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 03014 80806D54 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 03018 80806D58 240E00C8 */ addiu $t6, $zero, 0x00C8 ## $t6 = 000000C8 /* 0301C 80806D5C 3C010002 */ lui $at, 0x0002 ## $at = 00020000 /* 03020 80806D60 844D0ADC */ lh $t5, 0x0ADC($v0) ## 80160ADC diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080723C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080723C.s index a0508178aa..0499a7ca7d 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080723C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080723C.s @@ -57,10 +57,10 @@ glabel func_8080723C /* 035D8 80807318 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 035DC 8080731C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 035E0 80807320 3C18FD70 */ lui $t8, 0xFD70 ## $t8 = FD700000 -/* 035E4 80807324 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 +/* 035E4 80807324 3C0D8016 */ lui $t5, %hi(gSaveContext) /* 035E8 80807328 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 035EC 8080732C AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 035F0 80807330 25ADE660 */ addiu $t5, $t5, 0xE660 ## $t5 = 8015E660 +/* 035F0 80807330 25ADE660 */ addiu $t5, %lo(gSaveContext) /* 035F4 80807334 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 035F8 80807338 91B91409 */ lbu $t9, 0x1409($t5) ## 8015FA69 /* 035FC 8080733C 3C0F8081 */ lui $t7, %hi(D_808125C4) ## $t7 = 80810000 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808000.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808000.s index 82f1865d06..2585707786 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808000.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808000.s @@ -493,15 +493,15 @@ glabel func_80808000 /* 04A28 80808768 AFB80038 */ sw $t8, 0x0038($sp) /* 04A2C 8080876C 9703000C */ lhu $v1, 0x000C($t8) ## 00000020 /* 04A30 80808770 2401EFFF */ addiu $at, $zero, 0xEFFF ## $at = FFFFEFFF -/* 04A34 80808774 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 04A34 80808774 3C078013 */ lui $a3, %hi(D_801333E0) /* 04A38 80808778 0061C827 */ nor $t9, $v1, $at /* 04A3C 8080877C 17200016 */ bne $t9, $zero, .L808087D8 /* 04A40 80808780 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF -/* 04A44 80808784 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 04A48 80808788 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 04A4C 8080878C 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 04A50 80808790 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 04A54 80808794 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 04A44 80808784 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 04A48 80808788 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 04A4C 8080878C 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 04A50 80808790 3C058013 */ lui $a1, %hi(D_801333D4) +/* 04A54 80808794 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 04A58 80808798 AFAE0014 */ sw $t6, 0x0014($sp) /* 04A5C 8080879C AFA70010 */ sw $a3, 0x0010($sp) /* 04A60 808087A0 2404483B */ addiu $a0, $zero, 0x483B ## $a0 = 0000483B @@ -537,9 +537,9 @@ glabel func_80808000 /* 04AD0 80808810 00031C03 */ sra $v1, $v1, 16 /* 04AD4 80808814 28610007 */ slti $at, $v1, 0x0007 /* 04AD8 80808818 10980022 */ beq $a0, $t8, .L808088A4 -/* 04ADC 8080881C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 04ADC 8080881C 3C078013 */ lui $a3, %hi(D_801333E0) /* 04AE0 80808820 1020000E */ beq $at, $zero, .L8080885C -/* 04AE4 80808824 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 04AE4 80808824 24E733E0 */ addiu $a3, %lo(D_801333E0) .L80808828: /* 04AE8 80808828 850F4A38 */ lh $t7, 0x4A38($t0) ## 00004A38 /* 04AEC 8080882C 000FC8C0 */ sll $t9, $t7, 3 @@ -561,10 +561,10 @@ glabel func_80808000 /* 04B28 80808868 01AAC021 */ addu $t8, $t5, $t2 /* 04B2C 8080886C 240F003E */ addiu $t7, $zero, 0x003E ## $t7 = 0000003E /* 04B30 80808870 A30F49FC */ sb $t7, 0x49FC($t8) ## 00004A00 -/* 04B34 80808874 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 04B38 80808878 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 04B3C 8080887C 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 04B40 80808880 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 04B34 80808874 3C198013 */ lui $t9, %hi(D_801333E8) +/* 04B38 80808878 273933E8 */ addiu $t9, %lo(D_801333E8) +/* 04B3C 8080887C 3C058013 */ lui $a1, %hi(D_801333D4) +/* 04B40 80808880 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 04B44 80808884 AFB90014 */ sw $t9, 0x0014($sp) /* 04B48 80808888 AFAB00D8 */ sw $t3, 0x00D8($sp) /* 04B4C 8080888C AFA70010 */ sw $a3, 0x0010($sp) @@ -581,8 +581,8 @@ glabel func_80808000 /* 04B6C 808088AC 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 04B70 808088B0 A42ECAD4 */ sh $t6, -0x352C($at) ## 0001CAD4 /* 04B74 808088B4 85024AD4 */ lh $v0, 0x4AD4($t0) ## 00004AD4 -/* 04B78 808088B8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 04B7C 808088BC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 04B78 808088B8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 04B7C 808088BC 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 04B80 808088C0 04410009 */ bgez $v0, .L808088E8 /* 04B84 808088C4 00021C00 */ sll $v1, $v0, 16 /* 04B88 808088C8 3C010002 */ lui $at, 0x0002 ## $at = 00020000 @@ -614,18 +614,18 @@ glabel func_80808000 .L80808928: /* 04BE8 80808928 85184A38 */ lh $t8, 0x4A38($t0) ## 00004A38 /* 04BEC 8080892C 240F003E */ addiu $t7, $zero, 0x003E ## $t7 = 0000003E -/* 04BF0 80808930 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 +/* 04BF0 80808930 3C058013 */ lui $a1, %hi(D_801333D4) /* 04BF4 80808934 0018C8C0 */ sll $t9, $t8, 3 /* 04BF8 80808938 02197021 */ addu $t6, $s0, $t9 /* 04BFC 8080893C 01C36821 */ addu $t5, $t6, $v1 /* 04C00 80808940 01AAC021 */ addu $t8, $t5, $t2 /* 04C04 80808944 A30F49FC */ sb $t7, 0x49FC($t8) ## 000049FC -/* 04C08 80808948 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 04C0C 8080894C 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 +/* 04C08 80808948 3C198013 */ lui $t9, %hi(D_801333E8) +/* 04C0C 8080894C 273933E8 */ addiu $t9, %lo(D_801333E8) /* 04C10 80808950 AFB90014 */ sw $t9, 0x0014($sp) /* 04C14 80808954 AFAB00D8 */ sw $t3, 0x00D8($sp) /* 04C18 80808958 AFA70010 */ sw $a3, 0x0010($sp) -/* 04C1C 8080895C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 04C1C 8080895C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 04C20 80808960 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 04C24 80808964 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 @@ -680,12 +680,12 @@ glabel func_80808000 /* 04CE4 80808A24 8FAB00D8 */ lw $t3, 0x00D8($sp) /* 04CE8 80808A28 03216827 */ nor $t5, $t9, $at /* 04CEC 80808A2C 15A00029 */ bne $t5, $zero, .L80808AD4 -/* 04CF0 80808A30 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 04CF4 80808A34 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 04CF8 80808A38 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 04CFC 80808A3C 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 04D00 80808A40 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 04D04 80808A44 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 04CF0 80808A30 3C078013 */ lui $a3, %hi(D_801333E0) +/* 04CF4 80808A34 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 04CF8 80808A38 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 04CFC 80808A3C 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 04D00 80808A40 3C058013 */ lui $a1, %hi(D_801333D4) +/* 04D04 80808A44 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 04D08 80808A48 AFAE0014 */ sw $t6, 0x0014($sp) /* 04D0C 80808A4C AFA70010 */ sw $a3, 0x0010($sp) /* 04D10 80808A50 2404483A */ addiu $a0, $zero, 0x483A ## $a0 = 0000483A @@ -740,9 +740,9 @@ glabel func_80808000 /* 04DC8 80808B08 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 04DCC 80808B0C 85024AD4 */ lh $v0, 0x4AD4($t0) ## 00004AD4 /* 04DD0 80808B10 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 04DD4 80808B14 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 +/* 04DD4 80808B14 3C058013 */ lui $a1, %hi(D_801333D4) /* 04DD8 80808B18 1441002F */ bne $v0, $at, .L80808BD8 -/* 04DDC 80808B1C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 04DDC 80808B1C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 04DE0 80808B20 85094A38 */ lh $t1, 0x4A38($t0) ## 00004A38 /* 04DE4 80808B24 00021C00 */ sll $v1, $v0, 16 /* 04DE8 80808B28 2404003E */ addiu $a0, $zero, 0x003E ## $a0 = 0000003E @@ -753,9 +753,9 @@ glabel func_80808000 /* 04DFC 80808B3C 00031C03 */ sra $v1, $v1, 16 /* 04E00 80808B40 28610007 */ slti $at, $v1, 0x0007 /* 04E04 80808B44 108E0024 */ beq $a0, $t6, .L80808BD8 -/* 04E08 80808B48 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 04E08 80808B48 3C078013 */ lui $a3, %hi(D_801333E0) /* 04E0C 80808B4C 1020000E */ beq $at, $zero, .L80808B88 -/* 04E10 80808B50 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 04E10 80808B50 24E733E0 */ addiu $a3, %lo(D_801333E0) .L80808B54: /* 04E14 80808B54 850F4A38 */ lh $t7, 0x4A38($t0) ## 00004A38 /* 04E18 80808B58 000FC0C0 */ sll $t8, $t7, 3 @@ -777,10 +777,10 @@ glabel func_80808000 /* 04E54 80808B94 032A7021 */ addu $t6, $t9, $t2 /* 04E58 80808B98 240F003E */ addiu $t7, $zero, 0x003E ## $t7 = 0000003E /* 04E5C 80808B9C A1CF49FC */ sb $t7, 0x49FC($t6) ## 000049FC -/* 04E60 80808BA0 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 04E64 80808BA4 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 04E68 80808BA8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 04E6C 80808BAC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 04E60 80808BA0 3C188013 */ lui $t8, %hi(D_801333E8) +/* 04E64 80808BA4 271833E8 */ addiu $t8, %lo(D_801333E8) +/* 04E68 80808BA8 3C058013 */ lui $a1, %hi(D_801333D4) +/* 04E6C 80808BAC 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 04E70 80808BB0 AFB80014 */ sw $t8, 0x0014($sp) /* 04E74 80808BB4 AFAB00D8 */ sw $t3, 0x00D8($sp) /* 04E78 80808BB8 AFA80034 */ sw $t0, 0x0034($sp) @@ -832,10 +832,10 @@ glabel func_80808000 /* 04F1C 80808C5C 03036821 */ addu $t5, $t8, $v1 /* 04F20 80808C60 01AA7821 */ addu $t7, $t5, $t2 /* 04F24 80808C64 A1F949FC */ sb $t9, 0x49FC($t7) ## 000049FC -/* 04F28 80808C68 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 04F2C 80808C6C 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 04F30 80808C70 25C733E0 */ addiu $a3, $t6, 0x33E0 ## $a3 = 801333E0 -/* 04F34 80808C74 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 04F28 80808C68 3C188013 */ lui $t8, %hi(D_801333E8) +/* 04F2C 80808C6C 3C0E8013 */ lui $t6, %hi(D_801333E0) +/* 04F30 80808C70 25C733E0 */ addiu $a3, $t6, %lo(D_801333E0) +/* 04F34 80808C74 271833E8 */ addiu $t8, %lo(D_801333E8) /* 04F38 80808C78 AFB80014 */ sw $t8, 0x0014($sp) /* 04F3C 80808C7C AFA70010 */ sw $a3, 0x0010($sp) /* 04F40 80808C80 AFAB00D8 */ sw $t3, 0x00D8($sp) @@ -874,12 +874,12 @@ glabel func_80808000 .L80808CF0: /* 04FB0 80808CF0 10A0003F */ beq $a1, $zero, .L80808DF0 /* 04FB4 80808CF4 2404483D */ addiu $a0, $zero, 0x483D ## $a0 = 0000483D -/* 04FB8 80808CF8 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 04FBC 80808CFC 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 04FC0 80808D00 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 04FC4 80808D04 272733E0 */ addiu $a3, $t9, 0x33E0 ## $a3 = 801333E0 -/* 04FC8 80808D08 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 04FCC 80808D0C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 04FB8 80808CF8 3C198013 */ lui $t9, %hi(D_801333E0) +/* 04FBC 80808CFC 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 04FC0 80808D00 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 04FC4 80808D04 272733E0 */ addiu $a3, $t9, %lo(D_801333E0) +/* 04FC8 80808D08 3C058013 */ lui $a1, %hi(D_801333D4) +/* 04FCC 80808D0C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 04FD0 80808D10 AFA70010 */ sw $a3, 0x0010($sp) /* 04FD4 80808D14 AFAF0014 */ sw $t7, 0x0014($sp) /* 04FD8 80808D18 2404483B */ addiu $a0, $zero, 0x483B ## $a0 = 0000483B @@ -889,19 +889,19 @@ glabel func_80808000 /* 04FE8 80808D28 AFAB00D8 */ sw $t3, 0x00D8($sp) /* 04FEC 80808D2C 8FA80034 */ lw $t0, 0x0034($sp) -/* 04FF0 80808D30 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 04FF4 80808D34 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 04FF0 80808D30 3C018016 */ lui $at, %hi(gSaveContext+0x1354) +/* 04FF4 80808D34 3C188016 */ lui $t8, %hi(gSaveContext+0xc) /* 04FF8 80808D38 850E4A38 */ lh $t6, 0x4A38($t0) ## 00004A38 /* 04FFC 80808D3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 05000 80808D40 260501E0 */ addiu $a1, $s0, 0x01E0 ## $a1 = 000001E0 -/* 05004 80808D44 AC2EF9B4 */ sw $t6, -0x064C($at) ## 8015F9B4 -/* 05008 80808D48 9718E66C */ lhu $t8, -0x1994($t8) ## 8015E66C +/* 05004 80808D44 AC2EF9B4 */ sw $t6, %lo(gSaveContext+0x1354)($at) +/* 05008 80808D48 9718E66C */ lhu $t8, %lo(gSaveContext+0xc)($t8) /* 0500C 80808D4C 0C02A496 */ jal func_800A9258 /* 05010 80808D50 A7B800DE */ sh $t8, 0x00DE($sp) /* 05014 80808D54 97AD00DE */ lhu $t5, 0x00DE($sp) -/* 05018 80808D58 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 05018 80808D58 3C018016 */ lui $at, %hi(gSaveContext+0xc) /* 0501C 80808D5C 8FA80034 */ lw $t0, 0x0034($sp) -/* 05020 80808D60 A42DE66C */ sh $t5, -0x1994($at) ## 8015E66C +/* 05020 80808D60 A42DE66C */ sh $t5, %lo(gSaveContext+0xc)($at) /* 05024 80808D64 3C010002 */ lui $at, 0x0002 ## $at = 00020000 /* 05028 80808D68 00300821 */ addu $at, $at, $s0 /* 0502C 80808D6C 24190023 */ addiu $t9, $zero, 0x0023 ## $t9 = 00000023 @@ -938,12 +938,12 @@ glabel func_80808000 /* 050A8 80808DE8 10000011 */ beq $zero, $zero, .L80808E30 /* 050AC 80808DEC 95C3000C */ lhu $v1, 0x000C($t6) ## 0000000C .L80808DF0: -/* 050B0 80808DF0 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 050B4 80808DF4 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 -/* 050B8 80808DF8 25AD33E8 */ addiu $t5, $t5, 0x33E8 ## $t5 = 801333E8 -/* 050BC 80808DFC 270733E0 */ addiu $a3, $t8, 0x33E0 ## $a3 = 801333E0 -/* 050C0 80808E00 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 050C4 80808E04 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 050B0 80808DF0 3C188013 */ lui $t8, %hi(D_801333E0) +/* 050B4 80808DF4 3C0D8013 */ lui $t5, %hi(D_801333E8) +/* 050B8 80808DF8 25AD33E8 */ addiu $t5, %lo(D_801333E8) +/* 050BC 80808DFC 270733E0 */ addiu $a3, $t8, %lo(D_801333E0) +/* 050C0 80808E00 3C058013 */ lui $a1, %hi(D_801333D4) +/* 050C4 80808E04 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 050C8 80808E08 AFA70010 */ sw $a3, 0x0010($sp) /* 050CC 80808E0C AFAD0014 */ sw $t5, 0x0014($sp) /* 050D0 80808E10 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 @@ -961,12 +961,12 @@ glabel func_80808000 /* 050F4 80808E34 00617827 */ nor $t7, $v1, $at /* 050F8 80808E38 15E0001D */ bne $t7, $zero, .L80808EB0 /* 050FC 80808E3C 2401FFFD */ addiu $at, $zero, 0xFFFD ## $at = FFFFFFFD -/* 05100 80808E40 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 05104 80808E44 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 05108 80808E48 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0510C 80808E4C 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 05110 80808E50 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 05114 80808E54 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 05100 80808E40 3C078013 */ lui $a3, %hi(D_801333E0) +/* 05104 80808E44 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 05108 80808E48 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0510C 80808E4C 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 05110 80808E50 3C058013 */ lui $a1, %hi(D_801333D4) +/* 05114 80808E54 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 05118 80808E58 AFAE0014 */ sw $t6, 0x0014($sp) /* 0511C 80808E5C AFA70010 */ sw $a3, 0x0010($sp) /* 05120 80808E60 24044839 */ addiu $a0, $zero, 0x4839 ## $a0 = 00004839 @@ -993,12 +993,12 @@ glabel func_80808000 .L80808EB0: /* 05170 80808EB0 00617027 */ nor $t6, $v1, $at /* 05174 80808EB4 15C0001A */ bne $t6, $zero, .L80808F20 -/* 05178 80808EB8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0517C 80808EBC 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 05180 80808EC0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 05184 80808EC4 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 05188 80808EC8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0518C 80808ECC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 05178 80808EB8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0517C 80808EBC 3C188013 */ lui $t8, %hi(D_801333E8) +/* 05180 80808EC0 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 05184 80808EC4 271833E8 */ addiu $t8, %lo(D_801333E8) +/* 05188 80808EC8 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0518C 80808ECC 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 05190 80808ED0 AFB80014 */ sw $t8, 0x0014($sp) /* 05194 80808ED4 AFA70010 */ sw $a3, 0x0010($sp) /* 05198 80808ED8 24044839 */ addiu $a0, $zero, 0x4839 ## $a0 = 00004839 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80809038.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80809038.s index 71379efe10..b39a523ec9 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80809038.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80809038.s @@ -15,15 +15,15 @@ glabel func_80809038 /* 0532C 8080906C 51E10058 */ beql $t7, $at, .L808091D0 /* 05330 80809070 84624ABA */ lh $v0, 0x4ABA($v1) ## 00004ABA /* 05334 80809074 84624ABA */ lh $v0, 0x4ABA($v1) ## 00004ABA -/* 05338 80809078 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0533C 8080907C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 05338 80809078 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0533C 8080907C 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 05340 80809080 2841FFE2 */ slti $at, $v0, 0xFFE2 /* 05344 80809084 10200027 */ beq $at, $zero, .L80809124 /* 05348 80809088 24044839 */ addiu $a0, $zero, 0x4839 ## $a0 = 00004839 -/* 0534C 8080908C 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 05350 80809090 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 05354 80809094 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 05358 80809098 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0534C 8080908C 3C188013 */ lui $t8, %hi(D_801333E8) +/* 05350 80809090 271833E8 */ addiu $t8, %lo(D_801333E8) +/* 05354 80809094 3C058013 */ lui $a1, %hi(D_801333D4) +/* 05358 80809098 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 0535C 8080909C AFB80014 */ sw $t8, 0x0014($sp) /* 05360 808090A0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 05364 808090A4 AFA70010 */ sw $a3, 0x0010($sp) @@ -63,12 +63,12 @@ glabel func_80809038 /* 053E4 80809124 2841001F */ slti $at, $v0, 0x001F /* 053E8 80809128 14200060 */ bne $at, $zero, .L808092AC /* 053EC 8080912C 24044839 */ addiu $a0, $zero, 0x4839 ## $a0 = 00004839 -/* 053F0 80809130 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 053F4 80809134 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 053F8 80809138 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 -/* 053FC 8080913C 272733E0 */ addiu $a3, $t9, 0x33E0 ## $a3 = 801333E0 -/* 05400 80809140 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 05404 80809144 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 053F0 80809130 3C198013 */ lui $t9, %hi(D_801333E0) +/* 053F4 80809134 3C088013 */ lui $t0, %hi(D_801333E8) +/* 053F8 80809138 250833E8 */ addiu $t0, %lo(D_801333E8) +/* 053FC 8080913C 272733E0 */ addiu $a3, $t9, %lo(D_801333E0) +/* 05400 80809140 3C058013 */ lui $a1, %hi(D_801333D4) +/* 05404 80809144 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 05408 80809148 AFA70010 */ sw $a3, 0x0010($sp) /* 0540C 8080914C AFA80014 */ sw $t0, 0x0014($sp) /* 05410 80809150 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 @@ -105,15 +105,15 @@ glabel func_80809038 /* 05488 808091C8 A439CACE */ sh $t9, -0x3532($at) ## 0001CACE /* 0548C 808091CC 84624ABA */ lh $v0, 0x4ABA($v1) ## 00004ABA .L808091D0: -/* 05490 808091D0 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 05494 808091D4 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 05490 808091D0 3C058013 */ lui $a1, %hi(D_801333D4) +/* 05494 808091D4 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 05498 808091D8 2841FFE2 */ slti $at, $v0, 0xFFE2 /* 0549C 808091DC 10200018 */ beq $at, $zero, .L80809240 /* 054A0 808091E0 24044839 */ addiu $a0, $zero, 0x4839 ## $a0 = 00004839 -/* 054A4 808091E4 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 054A8 808091E8 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 054AC 808091EC 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 -/* 054B0 808091F0 250733E0 */ addiu $a3, $t0, 0x33E0 ## $a3 = 801333E0 +/* 054A4 808091E4 3C088013 */ lui $t0, %hi(D_801333E0) +/* 054A8 808091E8 3C098013 */ lui $t1, %hi(D_801333E8) +/* 054AC 808091EC 252933E8 */ addiu $t1, %lo(D_801333E8) +/* 054B0 808091F0 250733E0 */ addiu $a3, $t0, %lo(D_801333E0) /* 054B4 808091F4 AFA70010 */ sw $a3, 0x0010($sp) /* 054B8 808091F8 AFA90014 */ sw $t1, 0x0014($sp) /* 054BC 808091FC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 @@ -138,12 +138,12 @@ glabel func_80809038 /* 05500 80809240 2841001F */ slti $at, $v0, 0x001F /* 05504 80809244 14200019 */ bne $at, $zero, .L808092AC /* 05508 80809248 24044839 */ addiu $a0, $zero, 0x4839 ## $a0 = 00004839 -/* 0550C 8080924C 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 05510 80809250 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 05514 80809254 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 05518 80809258 25C733E0 */ addiu $a3, $t6, 0x33E0 ## $a3 = 801333E0 -/* 0551C 8080925C 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 05520 80809260 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0550C 8080924C 3C0E8013 */ lui $t6, %hi(D_801333E0) +/* 05510 80809250 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 05514 80809254 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 05518 80809258 25C733E0 */ addiu $a3, $t6, %lo(D_801333E0) +/* 0551C 8080925C 3C058013 */ lui $a1, %hi(D_801333D4) +/* 05520 80809260 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 05524 80809264 AFA70010 */ sw $a3, 0x0010($sp) /* 05528 80809268 AFAF0014 */ sw $t7, 0x0014($sp) /* 0552C 8080926C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 @@ -166,15 +166,15 @@ glabel func_80809038 .L808092AC: /* 0556C 808092AC 84624ABC */ lh $v0, 0x4ABC($v1) ## 00004ABC .L808092B0: -/* 05570 808092B0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 05574 808092B4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 05570 808092B0 3C078013 */ lui $a3, %hi(D_801333E0) +/* 05574 808092B4 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 05578 808092B8 2841001F */ slti $at, $v0, 0x001F /* 0557C 808092BC 1420005D */ bne $at, $zero, .L80809434 /* 05580 808092C0 24044839 */ addiu $a0, $zero, 0x4839 ## $a0 = 00004839 -/* 05584 808092C4 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 05588 808092C8 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 -/* 0558C 808092CC 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 05590 808092D0 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 05584 808092C4 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 05588 808092C8 254A33E8 */ addiu $t2, %lo(D_801333E8) +/* 0558C 808092CC 3C058013 */ lui $a1, %hi(D_801333D4) +/* 05590 808092D0 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 05594 808092D4 AFAA0014 */ sw $t2, 0x0014($sp) /* 05598 808092D8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 0559C 808092DC AFA70010 */ sw $a3, 0x0010($sp) @@ -271,12 +271,12 @@ glabel func_80809038 .L80809434: /* 056F4 80809434 2841FFE2 */ slti $at, $v0, 0xFFE2 /* 056F8 80809438 10200067 */ beq $at, $zero, .L808095D8 -/* 056FC 8080943C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 05700 80809440 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 05704 80809444 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 05708 80809448 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 0570C 8080944C 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 05710 80809450 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 056FC 8080943C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 05700 80809440 3C188013 */ lui $t8, %hi(D_801333E8) +/* 05704 80809444 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 05708 80809448 271833E8 */ addiu $t8, %lo(D_801333E8) +/* 0570C 8080944C 3C058013 */ lui $a1, %hi(D_801333D4) +/* 05710 80809450 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 05714 80809454 AFB80014 */ sw $t8, 0x0014($sp) /* 05718 80809458 AFA70010 */ sw $a3, 0x0010($sp) /* 0571C 8080945C 24044839 */ addiu $a0, $zero, 0x4839 ## $a0 = 00004839 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080969C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080969C.s index f0d07274c1..5e7207ce1e 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080969C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080969C.s @@ -8,12 +8,12 @@ glabel func_8080969C /* 05974 808096B4 01C17827 */ nor $t7, $t6, $at /* 05978 808096B8 15E00047 */ bne $t7, $zero, .L808097D8 /* 0597C 808096BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 05980 808096C0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 05984 808096C4 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 05988 808096C8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0598C 808096CC 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 05990 808096D0 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 05994 808096D4 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 05980 808096C0 3C078013 */ lui $a3, %hi(D_801333E0) +/* 05984 808096C4 3C188013 */ lui $t8, %hi(D_801333E8) +/* 05988 808096C8 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0598C 808096CC 271833E8 */ addiu $t8, %lo(D_801333E8) +/* 05990 808096D0 3C058013 */ lui $a1, %hi(D_801333D4) +/* 05994 808096D4 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 05998 808096D8 AFB80014 */ sw $t8, 0x0014($sp) /* 0599C 808096DC AFA70010 */ sw $a3, 0x0010($sp) /* 059A0 808096E0 2404483B */ addiu $a0, $zero, 0x483B ## $a0 = 0000483B @@ -27,8 +27,8 @@ glabel func_8080969C /* 059BC 808096FC 00290821 */ addu $at, $at, $t1 /* 059C0 80809700 A439CA3E */ sh $t9, -0x35C2($at) ## 0001CA3E /* 059C4 80809704 8FA20038 */ lw $v0, 0x0038($sp) -/* 059C8 80809708 3C108016 */ lui $s0, 0x8016 ## $s0 = 80160000 -/* 059CC 8080970C 2610E660 */ addiu $s0, $s0, 0xE660 ## $s0 = 8015E660 +/* 059C8 80809708 3C108016 */ lui $s0, %hi(gSaveContext) +/* 059CC 8080970C 2610E660 */ addiu $s0, %lo(gSaveContext) /* 059D0 80809710 920A140A */ lbu $t2, 0x140A($s0) ## 8015FA6A /* 059D4 80809714 8C4B01E0 */ lw $t3, 0x01E0($v0) ## 000001E0 /* 059D8 80809718 3C048081 */ lui $a0, %hi(D_80812BB4) ## $a0 = 80810000 @@ -92,15 +92,15 @@ glabel func_8080969C /* 05A98 808097D8 34218000 */ ori $at, $at, 0x8000 ## $at = 00008000 /* 05A9C 808097DC 02011821 */ addu $v1, $s0, $at /* 05AA0 808097E0 84624ABA */ lh $v0, 0x4ABA($v1) ## 00004ABA -/* 05AA4 808097E4 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 05AA8 808097E8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 05AA4 808097E4 3C078013 */ lui $a3, %hi(D_801333E0) +/* 05AA8 808097E8 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 05AAC 808097EC 2841FFE2 */ slti $at, $v0, 0xFFE2 /* 05AB0 808097F0 10200022 */ beq $at, $zero, .L8080987C /* 05AB4 808097F4 24044839 */ addiu $a0, $zero, 0x4839 ## $a0 = 00004839 -/* 05AB8 808097F8 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 05ABC 808097FC 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 05AC0 80809800 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 05AC4 80809804 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 05AB8 808097F8 3C198013 */ lui $t9, %hi(D_801333E8) +/* 05ABC 808097FC 273933E8 */ addiu $t9, %lo(D_801333E8) +/* 05AC0 80809800 3C058013 */ lui $a1, %hi(D_801333D4) +/* 05AC4 80809804 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 05AC8 80809808 AFB90014 */ sw $t9, 0x0014($sp) /* 05ACC 8080980C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 05AD0 80809810 AFA70010 */ sw $a3, 0x0010($sp) @@ -111,12 +111,12 @@ glabel func_8080969C /* 05AE0 80809820 3C088081 */ lui $t0, %hi(D_80813810) ## $t0 = 80810000 /* 05AE4 80809824 25083810 */ addiu $t0, $t0, %lo(D_80813810) ## $t0 = 80813810 /* 05AE8 80809828 91090000 */ lbu $t1, 0x0000($t0) ## 80813810 -/* 05AEC 8080982C 3C108016 */ lui $s0, 0x8016 ## $s0 = 80160000 +/* 05AEC 8080982C 3C108016 */ lui $s0, %hi(gSaveContext) /* 05AF0 80809830 8FA30028 */ lw $v1, 0x0028($sp) /* 05AF4 80809834 1520000C */ bne $t1, $zero, .L80809868 -/* 05AF8 80809838 2610E660 */ addiu $s0, $s0, 0xE660 ## $s0 = 8015E660 -/* 05AFC 8080983C 3C108016 */ lui $s0, 0x8016 ## $s0 = 80160000 -/* 05B00 80809840 2610E660 */ addiu $s0, $s0, 0xE660 ## $s0 = 8015E660 +/* 05AF8 80809838 2610E660 */ addiu $s0, %lo(gSaveContext) +/* 05AFC 8080983C 3C108016 */ lui $s0, %hi(gSaveContext) +/* 05B00 80809840 2610E660 */ addiu $s0, %lo(gSaveContext) /* 05B04 80809844 920A140A */ lbu $t2, 0x140A($s0) ## 8015FA6A /* 05B08 80809848 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 /* 05B0C 8080984C 254BFFFF */ addiu $t3, $t2, 0xFFFF ## $t3 = FFFFFFFF @@ -136,12 +136,12 @@ glabel func_8080969C .L8080987C: /* 05B3C 8080987C 2841001F */ slti $at, $v0, 0x001F /* 05B40 80809880 14200023 */ bne $at, $zero, .L80809910 -/* 05B44 80809884 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 05B48 80809888 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 05B4C 8080988C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 05B50 80809890 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 05B54 80809894 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 05B58 80809898 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 05B44 80809884 3C078013 */ lui $a3, %hi(D_801333E0) +/* 05B48 80809888 3C188013 */ lui $t8, %hi(D_801333E8) +/* 05B4C 8080988C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 05B50 80809890 271833E8 */ addiu $t8, %lo(D_801333E8) +/* 05B54 80809894 3C058013 */ lui $a1, %hi(D_801333D4) +/* 05B58 80809898 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 05B5C 8080989C AFB80014 */ sw $t8, 0x0014($sp) /* 05B60 808098A0 AFA70010 */ sw $a3, 0x0010($sp) /* 05B64 808098A4 24044839 */ addiu $a0, $zero, 0x4839 ## $a0 = 00004839 @@ -153,12 +153,12 @@ glabel func_8080969C /* 05B78 808098B8 3C088081 */ lui $t0, %hi(D_80813810) ## $t0 = 80810000 /* 05B7C 808098BC 25083810 */ addiu $t0, $t0, %lo(D_80813810) ## $t0 = 80813810 /* 05B80 808098C0 91190000 */ lbu $t9, 0x0000($t0) ## 80813810 -/* 05B84 808098C4 3C108016 */ lui $s0, 0x8016 ## $s0 = 80160000 +/* 05B84 808098C4 3C108016 */ lui $s0, %hi(gSaveContext) /* 05B88 808098C8 8FA30028 */ lw $v1, 0x0028($sp) /* 05B8C 808098CC 1720000C */ bne $t9, $zero, .L80809900 -/* 05B90 808098D0 2610E660 */ addiu $s0, $s0, 0xE660 ## $s0 = 8015E660 -/* 05B94 808098D4 3C108016 */ lui $s0, 0x8016 ## $s0 = 80160000 -/* 05B98 808098D8 2610E660 */ addiu $s0, $s0, 0xE660 ## $s0 = 8015E660 +/* 05B90 808098D0 2610E660 */ addiu $s0, %lo(gSaveContext) +/* 05B94 808098D4 3C108016 */ lui $s0, %hi(gSaveContext) +/* 05B98 808098D8 2610E660 */ addiu $s0, %lo(gSaveContext) /* 05B9C 808098DC 9209140A */ lbu $t1, 0x140A($s0) ## 8015FA6A /* 05BA0 808098E0 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 /* 05BA4 808098E4 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000001 @@ -176,18 +176,18 @@ glabel func_8080969C /* 05BCC 8080990C 8FB00038 */ lw $s0, 0x0038($sp) .L80809910: /* 05BD0 80809910 84624ABC */ lh $v0, 0x4ABC($v1) ## 00004ABC -/* 05BD4 80809914 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 05BD8 80809918 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 05BD4 80809914 3C078013 */ lui $a3, %hi(D_801333E0) +/* 05BD8 80809918 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 05BDC 8080991C 2841FFE2 */ slti $at, $v0, 0xFFE2 /* 05BE0 80809920 14200003 */ bne $at, $zero, .L80809930 /* 05BE4 80809924 24044839 */ addiu $a0, $zero, 0x4839 ## $a0 = 00004839 /* 05BE8 80809928 2841001F */ slti $at, $v0, 0x001F /* 05BEC 8080992C 1420000E */ bne $at, $zero, .L80809968 .L80809930: -/* 05BF0 80809930 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 05BF4 80809934 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 05BF8 80809938 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 05BFC 8080993C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 05BF0 80809930 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 05BF4 80809934 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 05BF8 80809938 3C058013 */ lui $a1, %hi(D_801333D4) +/* 05BFC 8080993C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 05C00 80809940 AFAE0014 */ sw $t6, 0x0014($sp) /* 05C04 80809944 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 05C08 80809948 0C03DCE3 */ jal Audio_PlaySoundGeneral @@ -206,10 +206,10 @@ glabel func_8080969C /* 05C34 80809974 03214827 */ nor $t1, $t9, $at /* 05C38 80809978 1520000E */ bne $t1, $zero, .L808099B4 /* 05C3C 8080997C 2404483B */ addiu $a0, $zero, 0x483B ## $a0 = 0000483B -/* 05C40 80809980 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 05C44 80809984 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 -/* 05C48 80809988 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 05C4C 8080998C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 05C40 80809980 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 05C44 80809984 254A33E8 */ addiu $t2, %lo(D_801333E8) +/* 05C48 80809988 3C058013 */ lui $a1, %hi(D_801333D4) +/* 05C4C 8080998C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 05C50 80809990 AFAA0014 */ sw $t2, 0x0014($sp) /* 05C54 80809994 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 05C58 80809998 0C03DCE3 */ jal Audio_PlaySoundGeneral diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808099C8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808099C8.s index 888c5f5594..2b6f812031 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808099C8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808099C8.s @@ -338,8 +338,8 @@ glabel func_808099C8 /* 06130 80809E70 3C018081 */ lui $at, %hi(D_808126FC) ## $at = 80810000 /* 06134 80809E74 A42026FC */ sh $zero, %lo(D_808126FC)($at) .L80809E78: -/* 06138 80809E78 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 0613C 80809E7C 256BE660 */ addiu $t3, $t3, 0xE660 ## $t3 = 8015E660 +/* 06138 80809E78 3C0B8016 */ lui $t3, %hi(gSaveContext) +/* 0613C 80809E7C 256BE660 */ addiu $t3, %lo(gSaveContext) /* 06140 80809E80 91781409 */ lbu $t8, 0x1409($t3) ## 8015FA69 /* 06144 80809E84 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 06148 80809E88 3C10FA00 */ lui $s0, 0xFA00 ## $s0 = FA000000 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B22C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B22C.s index 172a5a2941..722a4e2bf9 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B22C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B22C.s @@ -1,7 +1,7 @@ glabel func_8080B22C /* 074EC 8080B22C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 074F0 8080B230 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 074F4 8080B234 254AFA90 */ addiu $t2, $t2, 0xFA90 ## $t2 = 8015FA90 +/* 074F0 8080B230 3C0A8016 */ lui $t2, %hi(gGameInfo) +/* 074F4 8080B234 254AFA90 */ addiu $t2, %lo(gGameInfo) /* 074F8 8080B238 8D4F0000 */ lw $t7, 0x0000($t2) ## 8015FA90 /* 074FC 8080B23C 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 /* 07500 8080B240 35298000 */ ori $t1, $t1, 0x8000 ## $t1 = 00018000 @@ -18,9 +18,9 @@ glabel func_8080B22C /* 0752C 8080B26C A4794A6E */ sh $t9, 0x4A6E($v1) ## 00004A6E /* 07530 8080B270 8D4E0000 */ lw $t6, 0x0000($t2) ## 8015FA90 /* 07534 8080B274 00240821 */ addu $at, $at, $a0 -/* 07538 8080B278 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 +/* 07538 8080B278 3C0C8013 */ lui $t4, %hi(D_8012A4E0) /* 0753C 8080B27C 85D80F18 */ lh $t8, 0x0F18($t6) ## 00000F18 -/* 07540 8080B280 258CA4E0 */ addiu $t4, $t4, 0xA4E0 ## $t4 = 8012A4E0 +/* 07540 8080B280 258CA4E0 */ addiu $t4, %lo(D_8012A4E0) /* 07544 8080B284 2410004C */ addiu $s0, $zero, 0x004C ## $s0 = 0000004C /* 07548 8080B288 01F8C821 */ addu $t9, $t7, $t8 /* 0754C 8080B28C A439CA72 */ sh $t9, -0x358E($at) ## 0001CA72 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B494.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B494.s index 0ff788398c..113a9aecdc 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B494.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B494.s @@ -1,6 +1,6 @@ glabel func_8080B494 -/* 07754 8080B494 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 07758 8080B498 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 07754 8080B494 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 07758 8080B498 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 0775C 8080B49C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 07760 8080B4A0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 07764 8080B4A4 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B52C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B52C.s index ba5735a953..8e36f8dc42 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B52C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080B52C.s @@ -19,8 +19,8 @@ glabel func_8080B52C /* 0782C 8080B56C 34218000 */ ori $at, $at, 0x8000 ## $at = 00018000 /* 07830 8080B570 02011821 */ addu $v1, $s0, $at /* 07834 8080B574 84654A38 */ lh $a1, 0x4A38($v1) ## 00004A38 -/* 07838 8080B578 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 0783C 8080B57C 2529A4E0 */ addiu $t1, $t1, 0xA4E0 ## $t1 = 8012A4E0 +/* 07838 8080B578 3C098013 */ lui $t1, %hi(D_8012A4E0) +/* 0783C 8080B57C 2529A4E0 */ addiu $t1, %lo(D_8012A4E0) /* 07840 8080B580 28A10003 */ slti $at, $a1, 0x0003 /* 07844 8080B584 102000A5 */ beq $at, $zero, .L8080B81C /* 07848 8080B588 260801E0 */ addiu $t0, $s0, 0x01E0 ## $t0 = 000001E0 @@ -47,9 +47,9 @@ glabel func_8080B52C /* 07898 8080B5D8 AFAF001C */ sw $t7, 0x001C($sp) /* 0789C 8080B5DC 8FA30030 */ lw $v1, 0x0030($sp) /* 078A0 8080B5E0 8FA80034 */ lw $t0, 0x0034($sp) -/* 078A4 8080B5E4 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 +/* 078A4 8080B5E4 3C098013 */ lui $t1, %hi(D_8012A4E0) /* 078A8 8080B5E8 84644A38 */ lh $a0, 0x4A38($v1) ## 00004A38 -/* 078AC 8080B5EC 2529A4E0 */ addiu $t1, $t1, 0xA4E0 ## $t1 = 8012A4E0 +/* 078AC 8080B5EC 2529A4E0 */ addiu $t1, %lo(D_8012A4E0) /* 078B0 8080B5F0 8D0D0000 */ lw $t5, 0x0000($t0) ## 00000000 /* 078B4 8080B5F4 00042040 */ sll $a0, $a0, 1 /* 078B8 8080B5F8 0124C021 */ addu $t8, $t1, $a0 @@ -76,14 +76,14 @@ glabel func_8080B52C /* 0790C 8080B64C 518D003F */ beql $t4, $t5, .L8080B74C /* 07910 8080B650 0204C821 */ addu $t9, $s0, $a0 /* 07914 8080B654 904E0021 */ lbu $t6, 0x0021($v0) ## 00000021 -/* 07918 8080B658 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0791C 8080B65C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 07918 8080B658 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0791C 8080B65C 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 07920 8080B660 10AE0039 */ beq $a1, $t6, .L8080B748 /* 07924 8080B664 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 07928 8080B668 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 0792C 8080B66C 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 07930 8080B670 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 07934 8080B674 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 07928 8080B668 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 0792C 8080B66C 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 07930 8080B670 3C058013 */ lui $a1, %hi(D_801333D4) +/* 07934 8080B674 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 07938 8080B678 AFAF0014 */ sw $t7, 0x0014($sp) /* 0793C 8080B67C 2404483B */ addiu $a0, $zero, 0x483B ## $a0 = 0000483B /* 07940 8080B680 AFA70010 */ sw $a3, 0x0010($sp) @@ -145,14 +145,14 @@ glabel func_8080B52C /* 07A10 8080B750 00591021 */ addu $v0, $v0, $t9 /* 07A14 8080B754 8442CA28 */ lh $v0, -0x35D8($v0) ## 0001CA28 /* 07A18 8080B758 906D49F4 */ lbu $t5, 0x49F4($v1) ## 000049F4 -/* 07A1C 8080B75C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 07A20 8080B760 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 07A1C 8080B75C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 07A20 8080B760 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 07A24 8080B764 15A2001F */ bne $t5, $v0, .L8080B7E4 /* 07A28 8080B768 2404483B */ addiu $a0, $zero, 0x483B ## $a0 = 0000483B -/* 07A2C 8080B76C 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 07A30 8080B770 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 07A34 8080B774 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 07A38 8080B778 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 07A2C 8080B76C 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 07A30 8080B770 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 07A34 8080B774 3C058013 */ lui $a1, %hi(D_801333D4) +/* 07A38 8080B778 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 07A3C 8080B77C AFAE0014 */ sw $t6, 0x0014($sp) /* 07A40 8080B780 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 07A44 8080B784 AFA70010 */ sw $a3, 0x0010($sp) @@ -182,12 +182,12 @@ glabel func_8080B52C /* 07AA0 8080B7E0 A42DCA66 */ sh $t5, -0x359A($at) ## 0001CA66 .L8080B7E4: /* 07AA4 8080B7E4 1440018B */ bne $v0, $zero, .L8080BE14 -/* 07AA8 8080B7E8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 07AAC 8080B7EC 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 07AB0 8080B7F0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 07AB4 8080B7F4 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 07AB8 8080B7F8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 07ABC 8080B7FC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 07AA8 8080B7E8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 07AAC 8080B7EC 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 07AB0 8080B7F0 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 07AB4 8080B7F4 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 07AB8 8080B7F8 3C058013 */ lui $a1, %hi(D_801333D4) +/* 07ABC 8080B7FC 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 07AC0 8080B800 AFAE0014 */ sw $t6, 0x0014($sp) /* 07AC4 8080B804 AFA70010 */ sw $a3, 0x0010($sp) /* 07AC8 8080B808 2404483D */ addiu $a0, $zero, 0x483D ## $a0 = 0000483D @@ -199,15 +199,15 @@ glabel func_8080B52C .L8080B81C: /* 07ADC 8080B81C 846F4A60 */ lh $t7, 0x4A60($v1) ## 00004A60 /* 07AE0 8080B820 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 07AE4 8080B824 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 07AE4 8080B824 3C078013 */ lui $a3, %hi(D_801333E0) /* 07AE8 8080B828 15E10045 */ bne $t7, $at, .L8080B940 -/* 07AEC 8080B82C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 07AF0 8080B830 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 07AF4 8080B834 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 07AF8 8080B838 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 07AFC 8080B83C 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 07B00 8080B840 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 07B04 8080B844 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 07AEC 8080B82C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 07AF0 8080B830 3C078013 */ lui $a3, %hi(D_801333E0) +/* 07AF4 8080B834 3C188013 */ lui $t8, %hi(D_801333E8) +/* 07AF8 8080B838 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 07AFC 8080B83C 271833E8 */ addiu $t8, %lo(D_801333E8) +/* 07B00 8080B840 3C058013 */ lui $a1, %hi(D_801333D4) +/* 07B04 8080B844 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 07B08 8080B848 AFB80014 */ sw $t8, 0x0014($sp) /* 07B0C 8080B84C AFA70010 */ sw $a3, 0x0010($sp) /* 07B10 8080B850 2404483B */ addiu $a0, $zero, 0x483B ## $a0 = 0000483B @@ -275,10 +275,10 @@ glabel func_8080B52C /* 07BF8 8080B938 10000136 */ beq $zero, $zero, .L8080BE14 /* 07BFC 8080B93C A42DCA50 */ sh $t5, -0x35B0($at) ## 0001CA50 .L8080B940: -/* 07C00 8080B940 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 07C04 8080B944 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 07C08 8080B948 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 07C0C 8080B94C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 07C00 8080B940 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 07C04 8080B944 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 07C08 8080B948 3C058013 */ lui $a1, %hi(D_801333D4) +/* 07C0C 8080B94C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 07C10 8080B950 AFAE0014 */ sw $t6, 0x0014($sp) /* 07C14 8080B954 2404483D */ addiu $a0, $zero, 0x483D ## $a0 = 0000483D /* 07C18 8080B958 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 @@ -291,8 +291,8 @@ glabel func_8080B52C /* 07C2C 8080B96C 34218000 */ ori $at, $at, 0x8000 ## $at = 00008000 /* 07C30 8080B970 02011821 */ addu $v1, $s0, $at /* 07C34 8080B974 84624ABC */ lh $v0, 0x4ABC($v1) ## 00004ABC -/* 07C38 8080B978 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 07C3C 8080B97C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 07C38 8080B978 3C078013 */ lui $a3, %hi(D_801333E0) +/* 07C3C 8080B97C 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 07C40 8080B980 04400003 */ bltz $v0, .L8080B990 /* 07C44 8080B984 00022023 */ subu $a0, $zero, $v0 /* 07C48 8080B988 10000001 */ beq $zero, $zero, .L8080B990 @@ -301,10 +301,10 @@ glabel func_8080B52C /* 07C50 8080B990 2881001F */ slti $at, $a0, 0x001F /* 07C54 8080B994 14200026 */ bne $at, $zero, .L8080BA30 /* 07C58 8080B998 24044839 */ addiu $a0, $zero, 0x4839 ## $a0 = 00004839 -/* 07C5C 8080B99C 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 07C60 8080B9A0 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 07C64 8080B9A4 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 07C68 8080B9A8 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 07C5C 8080B99C 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 07C60 8080B9A0 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 07C64 8080B9A4 3C058013 */ lui $a1, %hi(D_801333D4) +/* 07C68 8080B9A8 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 07C6C 8080B9AC AFAF0014 */ sw $t7, 0x0014($sp) /* 07C70 8080B9B0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 07C74 8080B9B4 AFA70010 */ sw $a3, 0x0010($sp) @@ -343,10 +343,10 @@ glabel func_8080B52C .L8080BA30: /* 07CF0 8080BA30 84664A38 */ lh $a2, 0x4A38($v1) ## 00004A38 /* 07CF4 8080BA34 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 -/* 07CF8 8080BA38 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 +/* 07CF8 8080BA38 3C098013 */ lui $t1, %hi(D_8012A4E0) /* 07CFC 8080BA3C 1446009B */ bne $v0, $a2, .L8080BCAC /* 07D00 8080BA40 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 07D04 8080BA44 2529A4E0 */ addiu $t1, $t1, 0xA4E0 ## $t1 = 8012A4E0 +/* 07D04 8080BA44 2529A4E0 */ addiu $t1, %lo(D_8012A4E0) /* 07D08 8080BA48 952E0000 */ lhu $t6, 0x0000($t1) ## 8012A4E0 /* 07D0C 8080BA4C 8E0401E0 */ lw $a0, 0x01E0($s0) ## 000001E0 /* 07D10 8080BA50 2405005A */ addiu $a1, $zero, 0x005A ## $a1 = 0000005A @@ -510,8 +510,8 @@ glabel func_8080B52C .L8080BCAC: /* 07F6C 8080BCAC 14C10056 */ bne $a2, $at, .L8080BE08 /* 07F70 8080BCB0 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 07F74 8080BCB4 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 07F78 8080BCB8 2529A4E0 */ addiu $t1, $t1, 0xA4E0 ## $t1 = 8012A4E0 +/* 07F74 8080BCB4 3C098013 */ lui $t1, %hi(D_8012A4E0) +/* 07F78 8080BCB8 2529A4E0 */ addiu $t1, %lo(D_8012A4E0) /* 07F7C 8080BCBC 95390000 */ lhu $t9, 0x0000($t1) ## 8012A4E0 /* 07F80 8080BCC0 8E0401E0 */ lw $a0, 0x01E0($s0) ## 000001E0 /* 07F84 8080BCC4 2405005A */ addiu $a1, $zero, 0x005A ## $a1 = 0000005A diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BE30.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BE30.s index a45a8caf4f..7dd3cf3b57 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BE30.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BE30.s @@ -1,6 +1,6 @@ glabel func_8080BE30 -/* 080F0 8080BE30 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 080F4 8080BE34 2463FA90 */ addiu $v1, $v1, 0xFA90 ## $v1 = 8015FA90 +/* 080F0 8080BE30 3C038016 */ lui $v1, %hi(gGameInfo) +/* 080F4 8080BE34 2463FA90 */ addiu $v1, %lo(gGameInfo) /* 080F8 8080BE38 8C620000 */ lw $v0, 0x0000($v1) ## 8015FA90 /* 080FC 8080BE3C 240100FE */ addiu $at, $zero, 0x00FE ## $at = 000000FE /* 08100 8080BE40 3C080002 */ lui $t0, 0x0002 ## $t0 = 00020000 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BE84.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BE84.s index 49bee17536..acff05cfd2 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BE84.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BE84.s @@ -1,6 +1,6 @@ glabel func_8080BE84 -/* 08144 8080BE84 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 08148 8080BE88 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 08144 8080BE84 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 08148 8080BE88 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 0814C 8080BE8C 3C01439D */ lui $at, 0x439D ## $at = 439D0000 /* 08150 8080BE90 44810000 */ mtc1 $at, $f0 ## $f0 = 314.00 /* 08154 8080BE94 85CF0F34 */ lh $t7, 0x0F34($t6) ## 80160F34 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BEF8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BEF8.s index 8dfcb7e71f..55bd546020 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BEF8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BEF8.s @@ -1,6 +1,6 @@ glabel func_8080BEF8 -/* 081B8 8080BEF8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 081BC 8080BEFC 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 081B8 8080BEF8 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 081BC 8080BEFC 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 081C0 8080BF00 3C01439D */ lui $at, 0x439D ## $at = 439D0000 /* 081C4 8080BF04 44810000 */ mtc1 $at, $f0 ## $f0 = 314.00 /* 081C8 8080BF08 85CF0F34 */ lh $t7, 0x0F34($t6) ## 80160F34 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BF6C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BF6C.s index 1844e59bbb..7d6eadd9c9 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BF6C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BF6C.s @@ -1,6 +1,6 @@ glabel func_8080BF6C -/* 0822C 8080BF6C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 08230 8080BF70 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 +/* 0822C 8080BF6C 3C0E8016 */ lui $t6, %hi(gGameInfo) +/* 08230 8080BF70 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) /* 08234 8080BF74 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 08238 8080BF78 34218000 */ ori $at, $at, 0x8000 ## $at = 00018000 /* 0823C 8080BF7C 85CF0F34 */ lh $t7, 0x0F34($t6) ## 80160F34 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BFE4.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BFE4.s index a9e84bbf42..52fdd899be 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BFE4.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080BFE4.s @@ -8,15 +8,15 @@ glabel func_8080BFE4 /* 082BC 8080BFFC 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 082C0 8080C000 01C17827 */ nor $t7, $t6, $at /* 082C4 8080C004 15E00026 */ bne $t7, $zero, .L8080C0A0 -/* 082C8 8080C008 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 082CC 8080C00C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 082C8 8080C008 3C028016 */ lui $v0, %hi(gSaveContext) +/* 082CC 8080C00C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 082D0 8080C010 A0401409 */ sb $zero, 0x1409($v0) ## 8015FA69 /* 082D4 8080C014 249001E0 */ addiu $s0, $a0, 0x01E0 ## $s0 = 000001E0 /* 082D8 8080C018 8E190000 */ lw $t9, 0x0000($s0) ## 000001E0 -/* 082DC 8080C01C 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 +/* 082DC 8080C01C 3C098000 */ lui $t1, %hi(D_80000002) /* 082E0 8080C020 3C040800 */ lui $a0, 0x0800 ## $a0 = 08000000 /* 082E4 8080C024 A3200002 */ sb $zero, 0x0002($t9) ## 00000002 -/* 082E8 8080C028 A1200002 */ sb $zero, 0x0002($t1) ## 80000002 +/* 082E8 8080C028 A1200002 */ sb $zero, %lo(D_80000002)($t1) /* 082EC 8080C02C 8E050000 */ lw $a1, 0x0000($s0) ## 000001E0 /* 082F0 8080C030 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 082F4 8080C034 0C02A7A8 */ jal Sram_ReadWrite @@ -55,8 +55,8 @@ glabel func_8080BFE4 /* 0836C 8080C0AC 00416027 */ nor $t4, $v0, $at /* 08370 8080C0B0 15800027 */ bne $t4, $zero, .L8080C150 /* 08374 8080C0B4 2401FEFF */ addiu $at, $zero, 0xFEFF ## $at = FFFFFEFF -/* 08378 8080C0B8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0837C 8080C0BC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 08378 8080C0B8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0837C 8080C0BC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 08380 8080C0C0 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 08384 8080C0C4 A04D1409 */ sb $t5, 0x1409($v0) ## 8015FA69 /* 08388 8080C0C8 263001E0 */ addiu $s0, $s1, 0x01E0 ## $s0 = 000001E0 @@ -98,16 +98,16 @@ glabel func_8080BFE4 .L8080C150: /* 08410 8080C150 00414827 */ nor $t1, $v0, $at /* 08414 8080C154 15200025 */ bne $t1, $zero, .L8080C1EC -/* 08418 8080C158 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0841C 8080C15C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 08418 8080C158 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0841C 8080C15C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 08420 8080C160 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 /* 08424 8080C164 A04A1409 */ sb $t2, 0x1409($v0) ## 8015FA69 /* 08428 8080C168 263001E0 */ addiu $s0, $s1, 0x01E0 ## $s0 = 000001E0 /* 0842C 8080C16C 8E0B0000 */ lw $t3, 0x0000($s0) ## 000001E0 -/* 08430 8080C170 3C0C8000 */ lui $t4, 0x8000 ## $t4 = 80000000 +/* 08430 8080C170 3C0C8000 */ lui $t4, %hi(D_80000002) /* 08434 8080C174 3C040800 */ lui $a0, 0x0800 ## $a0 = 08000000 /* 08438 8080C178 A16A0002 */ sb $t2, 0x0002($t3) ## 00000002 -/* 0843C 8080C17C A18A0002 */ sb $t2, 0x0002($t4) ## 80000002 +/* 0843C 8080C17C A18A0002 */ sb $t2, %lo(D_80000002)($t4) /* 08440 8080C180 8E050000 */ lw $a1, 0x0000($s0) ## 000001E0 /* 08444 8080C184 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 08448 8080C188 0C02A7A8 */ jal Sram_ReadWrite @@ -149,8 +149,8 @@ glabel func_8080BFE4 /* 084C8 8080C208 0118C821 */ addu $t9, $t0, $t8 /* 084CC 8080C20C 87260000 */ lh $a2, 0x0000($t9) ## 00000000 /* 084D0 8080C210 84834AA8 */ lh $v1, 0x4AA8($a0) ## 00004AA8 -/* 084D4 8080C214 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 084D8 8080C218 24E7FA90 */ addiu $a3, $a3, 0xFA90 ## $a3 = 8015FA90 +/* 084D4 8080C214 3C078016 */ lui $a3, %hi(gGameInfo) +/* 084D8 8080C218 24E7FA90 */ addiu $a3, %lo(gGameInfo) /* 084DC 8080C21C 00661023 */ subu $v0, $v1, $a2 /* 084E0 8080C220 04400003 */ bltz $v0, .L8080C230 /* 084E4 8080C224 00022823 */ subu $a1, $zero, $v0 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080C60C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080C60C.s index 74c830a086..2758ce4990 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080C60C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080C60C.s @@ -574,26 +574,26 @@ glabel func_8080C60C /* 09198 8080CED8 1420FEFA */ bne $at, $zero, .L8080CAC4 /* 0919C 8080CEDC A4590118 */ sh $t9, 0x0118($v0) ## 00000118 /* 091A0 8080CEE0 260E01E0 */ addiu $t6, $s0, 0x01E0 ## $t6 = 000001E0 -/* 091A4 8080CEE4 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 091A4 8080CEE4 3C0B8016 */ lui $t3, %hi(gGameInfo) /* 091A8 8080CEE8 3C138081 */ lui $s3, %hi(D_80812818) ## $s3 = 80810000 /* 091AC 8080CEEC 3C128081 */ lui $s2, %hi(D_80812828) ## $s2 = 80810000 /* 091B0 8080CEF0 3C118081 */ lui $s1, %hi(D_80812820) ## $s1 = 80810000 -/* 091B4 8080CEF4 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 +/* 091B4 8080CEF4 3C0C8016 */ lui $t4, %hi(gGameInfo) /* 091B8 8080CEF8 241F002C */ addiu $ra, $zero, 0x002C ## $ra = 0000002C -/* 091BC 8080CEFC 258CFA90 */ addiu $t4, $t4, 0xFA90 ## $t4 = 8015FA90 +/* 091BC 8080CEFC 258CFA90 */ addiu $t4, %lo(gGameInfo) /* 091C0 8080CF00 26312820 */ addiu $s1, $s1, %lo(D_80812820) ## $s1 = 80812820 /* 091C4 8080CF04 26522828 */ addiu $s2, $s2, %lo(D_80812828) ## $s2 = 80812828 /* 091C8 8080CF08 26732818 */ addiu $s3, $s3, %lo(D_80812818) ## $s3 = 80812818 -/* 091CC 8080CF0C 8D6BFA90 */ lw $t3, -0x0570($t3) ## 8015FA90 +/* 091CC 8080CF0C 8D6BFA90 */ lw $t3, %lo(gGameInfo)($t3) /* 091D0 8080CF10 AFAE0034 */ sw $t6, 0x0034($sp) /* 091D4 8080CF14 00006825 */ or $t5, $zero, $zero ## $t5 = 00000000 /* 091D8 8080CF18 24140009 */ addiu $s4, $zero, 0x0009 ## $s4 = 00000009 .L8080CF1C: /* 091DC 8080CF1C 8FB80034 */ lw $t8, 0x0034($sp) /* 091E0 8080CF20 000D1840 */ sll $v1, $t5, 1 -/* 091E4 8080CF24 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 +/* 091E4 8080CF24 3C0F8013 */ lui $t7, %hi(D_8012A4E0) /* 091E8 8080CF28 01E37821 */ addu $t7, $t7, $v1 -/* 091EC 8080CF2C 95EFA4E0 */ lhu $t7, -0x5B20($t7) ## 8012A4E0 +/* 091EC 8080CF2C 95EFA4E0 */ lhu $t7, %lo(D_8012A4E0)($t7) /* 091F0 8080CF30 8F190000 */ lw $t9, 0x0000($t8) ## 00000000 /* 091F4 8080CF34 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A /* 091F8 8080CF38 01F91021 */ addu $v0, $t7, $t9 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080D8CC.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080D8CC.s index ad21ef5050..e737b90d5b 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080D8CC.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080D8CC.s @@ -343,11 +343,11 @@ glabel func_8080D8CC /* 0A0BC 8080DDFC 3C0E8081 */ lui $t6, %hi(D_808128B4) ## $t6 = 80810000 /* 0A0C0 8080DE00 01C47021 */ addu $t6, $t6, $a0 /* 0A0C4 8080DE04 85CE28B4 */ lh $t6, %lo(D_808128B4)($t6) -/* 0A0C8 8080DE08 3C0B8012 */ lui $t3, 0x8012 ## $t3 = 80120000 +/* 0A0C8 8080DE08 3C0B8012 */ lui $t3, %hi(gBitFlags) /* 0A0CC 8080DE0C 8D0F4A1C */ lw $t7, 0x4A1C($t0) ## 00004A1C /* 0A0D0 8080DE10 000EC080 */ sll $t8, $t6, 2 /* 0A0D4 8080DE14 01785821 */ addu $t3, $t3, $t8 -/* 0A0D8 8080DE18 8D6B7120 */ lw $t3, 0x7120($t3) ## 80127120 +/* 0A0D8 8080DE18 8D6B7120 */ lw $t3, %lo(gBitFlags)($t3) /* 0A0DC 8080DE1C 016F6024 */ and $t4, $t3, $t7 /* 0A0E0 8080DE20 5180007D */ beql $t4, $zero, .L8080E018 /* 0A0E4 8080DE24 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080E074.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080E074.s index 69f99bfffa..801f642b87 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080E074.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080E074.s @@ -63,7 +63,7 @@ glabel func_8080E074 /* 0A428 8080E168 ACCE0000 */ sw $t6, 0x0000($a2) ## 00000000 /* 0A42C 8080E16C 8C6F49E8 */ lw $t7, 0x49E8($v1) ## 000049E8 /* 0A430 8080E170 3C19FD70 */ lui $t9, 0xFD70 ## $t9 = FD700000 -/* 0A434 8080E174 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 +/* 0A434 8080E174 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1409) /* 0A438 8080E178 ACCF0004 */ sw $t7, 0x0004($a2) ## 00000004 /* 0A43C 8080E17C 8D2602C0 */ lw $a2, 0x02C0($t1) ## 000002C0 /* 0A440 8080E180 3C110700 */ lui $s1, 0x0700 ## $s1 = 07000000 @@ -71,7 +71,7 @@ glabel func_8080E074 /* 0A448 8080E188 24D80008 */ addiu $t8, $a2, 0x0008 ## $t8 = 00000008 /* 0A44C 8080E18C AD3802C0 */ sw $t8, 0x02C0($t1) ## 000002C0 /* 0A450 8080E190 ACD90000 */ sw $t9, 0x0000($a2) ## 00000000 -/* 0A454 8080E194 91CEFA69 */ lbu $t6, -0x0597($t6) ## 8015FA69 +/* 0A454 8080E194 91CEFA69 */ lbu $t6, %lo(gSaveContext+0x1409)($t6) /* 0A458 8080E198 84794A64 */ lh $t9, 0x4A64($v1) ## 00004A64 /* 0A45C 8080E19C 3C16E600 */ lui $s6, 0xE600 ## $s6 = E6000000 /* 0A460 8080E1A0 000E78C0 */ sll $t7, $t6, 3 @@ -153,11 +153,11 @@ glabel func_8080E074 /* 0A590 8080E2D0 ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 /* 0A594 8080E2D4 8D2602C0 */ lw $a2, 0x02C0($t1) ## 000002C0 /* 0A598 8080E2D8 3C19FD70 */ lui $t9, 0xFD70 ## $t9 = FD700000 -/* 0A59C 8080E2DC 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0A59C 8080E2DC 3C188016 */ lui $t8, %hi(gSaveContext+0x1409) /* 0A5A0 8080E2E0 24CF0008 */ addiu $t7, $a2, 0x0008 ## $t7 = 00000008 /* 0A5A4 8080E2E4 AD2F02C0 */ sw $t7, 0x02C0($t1) ## 000002C0 /* 0A5A8 8080E2E8 ACD90000 */ sw $t9, 0x0000($a2) ## 00000000 -/* 0A5AC 8080E2EC 9318FA69 */ lbu $t8, -0x0597($t8) ## 8015FA69 +/* 0A5AC 8080E2EC 9318FA69 */ lbu $t8, %lo(gSaveContext+0x1409)($t8) /* 0A5B0 8080E2F0 84794A66 */ lh $t9, 0x4A66($v1) ## 00004A66 /* 0A5B4 8080E2F4 001870C0 */ sll $t6, $t8, 3 /* 0A5B8 8080E2F8 01D87021 */ addu $t6, $t6, $t8 @@ -468,11 +468,11 @@ glabel func_8080E074 /* 0AA4C 8080E78C ACD80004 */ sw $t8, 0x0004($a2) ## 00000004 /* 0AA50 8080E790 8D2602C0 */ lw $a2, 0x02C0($t1) ## 000002C0 /* 0AA54 8080E794 3C19FD70 */ lui $t9, 0xFD70 ## $t9 = FD700000 -/* 0AA58 8080E798 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 +/* 0AA58 8080E798 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1409) /* 0AA5C 8080E79C 24CE0008 */ addiu $t6, $a2, 0x0008 ## $t6 = 00000008 /* 0AA60 8080E7A0 AD2E02C0 */ sw $t6, 0x02C0($t1) ## 000002C0 /* 0AA64 8080E7A4 ACD90000 */ sw $t9, 0x0000($a2) ## 00000000 -/* 0AA68 8080E7A8 91EFFA69 */ lbu $t7, -0x0597($t7) ## 8015FA69 +/* 0AA68 8080E7A8 91EFFA69 */ lbu $t7, %lo(gSaveContext+0x1409)($t7) /* 0AA6C 8080E7AC 000B7080 */ sll $t6, $t3, 2 /* 0AA70 8080E7B0 256B0001 */ addiu $t3, $t3, 0x0001 ## $t3 = 00000001 /* 0AA74 8080E7B4 000FC080 */ sll $t8, $t7, 2 @@ -860,11 +860,11 @@ glabel func_8080E074 /* 0B054 8080ED94 ACCF0004 */ sw $t7, 0x0004($a2) ## 00000004 /* 0B058 8080ED98 8D2602C0 */ lw $a2, 0x02C0($t1) ## 000002C0 /* 0B05C 8080ED9C 3C0EFD70 */ lui $t6, 0xFD70 ## $t6 = FD700000 -/* 0B060 8080EDA0 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 0B060 8080EDA0 3C198016 */ lui $t9, %hi(gSaveContext+0x1409) /* 0B064 8080EDA4 24D80008 */ addiu $t8, $a2, 0x0008 ## $t8 = 00000008 /* 0B068 8080EDA8 AD3802C0 */ sw $t8, 0x02C0($t1) ## 000002C0 /* 0B06C 8080EDAC ACCE0000 */ sw $t6, 0x0000($a2) ## 00000000 -/* 0B070 8080EDB0 9339FA69 */ lbu $t9, -0x0597($t9) ## 8015FA69 +/* 0B070 8080EDB0 9339FA69 */ lbu $t9, %lo(gSaveContext+0x1409)($t9) /* 0B074 8080EDB4 000B7080 */ sll $t6, $t3, 2 /* 0B078 8080EDB8 306400FF */ andi $a0, $v1, 0x00FF ## $a0 = 00000000 /* 0B07C 8080EDBC 00197900 */ sll $t7, $t9, 4 @@ -970,11 +970,11 @@ glabel func_8080E074 /* 0B208 8080EF48 ACCF0004 */ sw $t7, 0x0004($a2) ## 00000004 /* 0B20C 8080EF4C 8D2602C0 */ lw $a2, 0x02C0($t1) ## 000002C0 /* 0B210 8080EF50 3C19FD70 */ lui $t9, 0xFD70 ## $t9 = FD700000 -/* 0B214 8080EF54 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0B214 8080EF54 3C188016 */ lui $t8, %hi(gSaveContext+0x1409) /* 0B218 8080EF58 24CE0008 */ addiu $t6, $a2, 0x0008 ## $t6 = 00000008 /* 0B21C 8080EF5C AD2E02C0 */ sw $t6, 0x02C0($t1) ## 000002C0 /* 0B220 8080EF60 ACD90000 */ sw $t9, 0x0000($a2) ## 00000000 -/* 0B224 8080EF64 9318FA69 */ lbu $t8, -0x0597($t8) ## 8015FA69 +/* 0B224 8080EF64 9318FA69 */ lbu $t8, %lo(gSaveContext+0x1409)($t8) /* 0B228 8080EF68 0015C880 */ sll $t9, $s5, 2 /* 0B22C 8080EF6C 306400FF */ andi $a0, $v1, 0x00FF ## $a0 = 00000000 /* 0B230 8080EF70 00187900 */ sll $t7, $t8, 4 @@ -1068,11 +1068,11 @@ glabel func_8080E074 /* 0B390 8080F0D0 ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 /* 0B394 8080F0D4 8D2602C0 */ lw $a2, 0x02C0($t1) ## 000002C0 /* 0B398 8080F0D8 3C18FD70 */ lui $t8, 0xFD70 ## $t8 = FD700000 -/* 0B39C 8080F0DC 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 0B39C 8080F0DC 3C198016 */ lui $t9, %hi(gSaveContext+0x1409) /* 0B3A0 8080F0E0 24CF0008 */ addiu $t7, $a2, 0x0008 ## $t7 = 00000008 /* 0B3A4 8080F0E4 AD2F02C0 */ sw $t7, 0x02C0($t1) ## 000002C0 /* 0B3A8 8080F0E8 ACD80000 */ sw $t8, 0x0000($a2) ## 00000000 -/* 0B3AC 8080F0EC 9339FA69 */ lbu $t9, -0x0597($t9) ## 8015FA69 +/* 0B3AC 8080F0EC 9339FA69 */ lbu $t9, %lo(gSaveContext+0x1409)($t9) /* 0B3B0 8080F0F0 3C0F8081 */ lui $t7, %hi(D_80812A04) ## $t7 = 80810000 /* 0B3B4 8080F0F4 00197080 */ sll $t6, $t9, 2 /* 0B3B8 8080F0F8 01EE7821 */ addu $t7, $t7, $t6 @@ -1269,12 +1269,12 @@ glabel func_8080E074 /* 0B6A8 8080F3E8 ACC00004 */ sw $zero, 0x0004($a2) ## 00000004 /* 0B6AC 8080F3EC ACCE0000 */ sw $t6, 0x0000($a2) ## 00000000 /* 0B6B0 8080F3F0 8D2602C0 */ lw $a2, 0x02C0($t1) ## 000002C0 -/* 0B6B4 8080F3F4 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 +/* 0B6B4 8080F3F4 3C198016 */ lui $t9, %hi(gSaveContext+0x1409) /* 0B6B8 8080F3F8 24CF0008 */ addiu $t7, $a2, 0x0008 ## $t7 = 00000008 /* 0B6BC 8080F3FC AD2F02C0 */ sw $t7, 0x02C0($t1) ## 000002C0 /* 0B6C0 8080F400 ACD80000 */ sw $t8, 0x0000($a2) ## 00000000 /* 0B6C4 8080F404 8FAF004C */ lw $t7, 0x004C($sp) -/* 0B6C8 8080F408 9339FA69 */ lbu $t9, -0x0597($t9) ## 8015FA69 +/* 0B6C8 8080F408 9339FA69 */ lbu $t9, %lo(gSaveContext+0x1409)($t9) /* 0B6CC 8080F40C 85F84A60 */ lh $t8, 0x4A60($t7) ## 00004A68 /* 0B6D0 8080F410 00197080 */ sll $t6, $t9, 2 /* 0B6D4 8080F414 01D97021 */ addu $t6, $t6, $t9 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s index 45e8c91a3f..c36ffb7d59 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s @@ -13,17 +13,17 @@ glabel func_8080F560 /* 0B84C 8080F58C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0B850 8080F590 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0B854 8080F594 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 -/* 0B858 8080F598 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0B858 8080F598 3C188016 */ lui $t8, %hi(gGameInfo) /* 0B85C 8080F59C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 0B860 8080F5A0 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 0B864 8080F5A4 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 0B868 8080F5A8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0B86C 8080F5AC 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 0B86C 8080F5AC 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 0B870 8080F5B0 0C01DE0D */ jal Math_Coss ## coss? /* 0B874 8080F5B4 870407AA */ lh $a0, 0x07AA($t8) ## 801607AA -/* 0B878 8080F5B8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 0B87C 8080F5BC 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 0B878 8080F5B8 3C198016 */ lui $t9, %hi(gGameInfo) +/* 0B87C 8080F5BC 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 0B880 8080F5C0 E7A00048 */ swc1 $f0, 0x0048($sp) /* 0B884 8080F5C4 0C01DE1C */ jal Math_Sins ## sins? @@ -31,8 +31,8 @@ glabel func_8080F560 /* 0B88C 8080F5CC 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 0B890 8080F5D0 44811000 */ mtc1 $at, $f2 ## $f2 = 1000.00 /* 0B894 8080F5D4 C7A40048 */ lwc1 $f4, 0x0048($sp) -/* 0B898 8080F5D8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0B89C 8080F5DC 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0B898 8080F5D8 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0B89C 8080F5DC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0B8A0 8080F5E0 46041182 */ mul.s $f6, $f2, $f4 /* 0B8A4 8080F5E4 00000000 */ nop /* 0B8A8 8080F5E8 46020202 */ mul.s $f8, $f0, $f2 @@ -46,8 +46,8 @@ glabel func_8080F560 /* 0B8C8 8080F608 0C01DE1C */ jal Math_Sins ## sins? /* 0B8CC 8080F60C 844407AA */ lh $a0, 0x07AA($v0) ## 801607AA -/* 0B8D0 8080F610 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 0B8D4 8080F614 8D29FA90 */ lw $t1, -0x0570($t1) ## 8015FA90 +/* 0B8D0 8080F610 3C098016 */ lui $t1, %hi(gGameInfo) +/* 0B8D4 8080F614 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) /* 0B8D8 8080F618 E7A00048 */ swc1 $f0, 0x0048($sp) /* 0B8DC 8080F61C 0C01DE0D */ jal Math_Coss ## coss? @@ -87,8 +87,8 @@ glabel func_8080F560 /* 0B964 8080F6A4 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 /* 0B968 8080F6A8 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 0B96C 8080F6AC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 0B970 8080F6B0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0B974 8080F6B4 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0B970 8080F6B0 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0B974 8080F6B4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0B978 8080F6B8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0B97C 8080F6BC 3421C8E8 */ ori $at, $at, 0xC8E8 ## $at = 0001C8E8 /* 0B980 8080F6C0 844C07AA */ lh $t4, 0x07AA($v0) ## 801607AA diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080FE2C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080FE2C.s index 182c240091..5377a0d497 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080FE2C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080FE2C.s @@ -4,8 +4,8 @@ glabel func_8080FE2C /* 0C0F4 8080FE34 AFB1000C */ sw $s1, 0x000C($sp) /* 0C0F8 8080FE38 AFB00008 */ sw $s0, 0x0008($sp) /* 0C0FC 8080FE3C 34298000 */ ori $t1, $at, 0x8000 ## $t1 = 00018000 -/* 0C100 8080FE40 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 -/* 0C104 8080FE44 256BA4E0 */ addiu $t3, $t3, 0xA4E0 ## $t3 = 8012A4E0 +/* 0C100 8080FE40 3C0B8013 */ lui $t3, %hi(D_8012A4E0) +/* 0C104 8080FE44 256BA4E0 */ addiu $t3, %lo(D_8012A4E0) /* 0C108 8080FE48 00893021 */ addu $a2, $a0, $t1 /* 0C10C 8080FE4C 24100044 */ addiu $s0, $zero, 0x0044 ## $s0 = 00000044 /* 0C110 8080FE50 24110041 */ addiu $s1, $zero, 0x0041 ## $s1 = 00000041 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8081017C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8081017C.s index d781ec0f8d..bd43dd5cbe 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8081017C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8081017C.s @@ -19,8 +19,8 @@ glabel func_8081017C /* 0C47C 808101BC 34218000 */ ori $at, $at, 0x8000 ## $at = 00018000 /* 0C480 808101C0 02011021 */ addu $v0, $s0, $at /* 0C484 808101C4 84594A3A */ lh $t9, 0x4A3A($v0) ## 00004A3A -/* 0C488 808101C8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0C48C 808101CC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 0C488 808101C8 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0C48C 808101CC 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 0C490 808101D0 1720001A */ bne $t9, $zero, .L8081023C /* 0C494 808101D4 2404483C */ addiu $a0, $zero, 0x483C ## $a0 = 0000483C /* 0C498 808101D8 3C014396 */ lui $at, 0x4396 ## $at = 43960000 @@ -29,12 +29,12 @@ glabel func_8081017C /* 0C4A4 808101E4 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 /* 0C4A8 808101E8 0C02A800 */ jal func_800AA000 /* 0C4AC 808101EC 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 0C4B0 808101F0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0C4B4 808101F4 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 0C4B8 808101F8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0C4BC 808101FC 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 -/* 0C4C0 80810200 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0C4C4 80810204 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0C4B0 808101F0 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0C4B4 808101F4 3C088013 */ lui $t0, %hi(D_801333E8) +/* 0C4B8 808101F8 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0C4BC 808101FC 250833E8 */ addiu $t0, %lo(D_801333E8) +/* 0C4C0 80810200 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0C4C4 80810204 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 0C4C8 80810208 AFA80014 */ sw $t0, 0x0014($sp) /* 0C4CC 8081020C AFA70010 */ sw $a3, 0x0010($sp) /* 0C4D0 80810210 2404483B */ addiu $a0, $zero, 0x483B ## $a0 = 0000483B @@ -50,10 +50,10 @@ glabel func_8081017C /* 0C4F4 80810234 10000043 */ beq $zero, $zero, .L80810344 /* 0C4F8 80810238 8FBF0024 */ lw $ra, 0x0024($sp) .L8081023C: -/* 0C4FC 8081023C 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 0C500 80810240 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 -/* 0C504 80810244 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0C508 80810248 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0C4FC 8081023C 3C0A8013 */ lui $t2, %hi(D_801333E8) +/* 0C500 80810240 254A33E8 */ addiu $t2, %lo(D_801333E8) +/* 0C504 80810244 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0C508 80810248 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 0C50C 8081024C AFAA0014 */ sw $t2, 0x0014($sp) /* 0C510 80810250 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 0C514 80810254 AFA70010 */ sw $a3, 0x0010($sp) @@ -71,12 +71,12 @@ glabel func_8081017C /* 0C53C 8081027C 00416827 */ nor $t5, $v0, $at /* 0C540 80810280 15A00014 */ bne $t5, $zero, .L808102D4 /* 0C544 80810284 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0C548 80810288 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0C54C 8081028C 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 0C550 80810290 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0C554 80810294 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 0C558 80810298 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0C55C 8081029C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0C548 80810288 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0C54C 8081028C 3C0E8013 */ lui $t6, %hi(D_801333E8) +/* 0C550 80810290 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0C554 80810294 25CE33E8 */ addiu $t6, %lo(D_801333E8) +/* 0C558 80810298 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0C55C 8081029C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 0C560 808102A0 AFAE0014 */ sw $t6, 0x0014($sp) /* 0C564 808102A4 AFA70010 */ sw $a3, 0x0010($sp) /* 0C568 808102A8 2404483C */ addiu $a0, $zero, 0x483C ## $a0 = 0000483C @@ -95,8 +95,8 @@ glabel func_8081017C /* 0C594 808102D4 34218000 */ ori $at, $at, 0x8000 ## $at = 00028000 /* 0C598 808102D8 02011021 */ addu $v0, $s0, $at /* 0C59C 808102DC 84434ABC */ lh $v1, 0x4ABC($v0) ## 00004ABC -/* 0C5A0 808102E0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0C5A4 808102E4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 +/* 0C5A0 808102E0 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0C5A4 808102E4 24E733E0 */ addiu $a3, %lo(D_801333E0) /* 0C5A8 808102E8 04600003 */ bltz $v1, .L808102F8 /* 0C5AC 808102EC 00032023 */ subu $a0, $zero, $v1 /* 0C5B0 808102F0 10000001 */ beq $zero, $zero, .L808102F8 @@ -105,10 +105,10 @@ glabel func_8081017C /* 0C5B8 808102F8 2881001E */ slti $at, $a0, 0x001E /* 0C5BC 808102FC 14200010 */ bne $at, $zero, .L80810340 /* 0C5C0 80810300 24044839 */ addiu $a0, $zero, 0x4839 ## $a0 = 00004839 -/* 0C5C4 80810304 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 0C5C8 80810308 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 0C5CC 8081030C 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0C5D0 80810310 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0C5C4 80810304 3C198013 */ lui $t9, %hi(D_801333E8) +/* 0C5C8 80810308 273933E8 */ addiu $t9, %lo(D_801333E8) +/* 0C5CC 8081030C 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0C5D0 80810310 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 0C5D4 80810314 AFB90014 */ sw $t9, 0x0014($sp) /* 0C5D8 80810318 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 0C5DC 8081031C AFA70010 */ sw $a3, 0x0010($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810440.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810440.s index e8199c1a9b..3d9c410d8f 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810440.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810440.s @@ -9,7 +9,7 @@ glabel func_80810440 /* 0C71C 8081045C AFB00004 */ sw $s0, 0x0004($sp) /* 0C720 80810460 008B1021 */ addu $v0, $a0, $t3 /* 0C724 80810464 844E4A38 */ lh $t6, 0x4A38($v0) ## 00004A38 -/* 0C728 80810468 3C108013 */ lui $s0, 0x8013 ## $s0 = 80130000 +/* 0C728 80810468 3C108013 */ lui $s0, %hi(D_8012A4E0) /* 0C72C 8081046C 24110045 */ addiu $s1, $zero, 0x0045 ## $s1 = 00000045 /* 0C730 80810470 000E7840 */ sll $t7, $t6, 1 /* 0C734 80810474 008FC021 */ addu $t8, $a0, $t7 @@ -25,7 +25,7 @@ glabel func_80810440 /* 0C758 80810498 00053023 */ subu $a2, $zero, $a1 .L8081049C: /* 0C75C 8081049C 84594A50 */ lh $t9, 0x4A50($v0) ## 00004A50 -/* 0C760 808104A0 2610A4E0 */ addiu $s0, $s0, 0xA4E0 ## $s0 = 8012A4E0 +/* 0C760 808104A0 2610A4E0 */ addiu $s0, %lo(D_8012A4E0) /* 0C764 808104A4 240D005A */ addiu $t5, $zero, 0x005A ## $t5 = 0000005A /* 0C768 808104A8 00D9001A */ div $zero, $a2, $t9 /* 0C76C 808104AC 00003812 */ mflo $a3 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810698.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810698.s index 989d50ab73..6a08ef258d 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810698.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810698.s @@ -1,6 +1,6 @@ glabel func_80810698 -/* 0C958 80810698 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 0C95C 8081069C 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 0C958 80810698 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 0C95C 8081069C 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 0C960 808106A0 3C028081 */ lui $v0, %hi(D_80812724) ## $v0 = 80810000 /* 0C964 808106A4 24422724 */ addiu $v0, $v0, %lo(D_80812724) ## $v0 = 80812724 /* 0C968 808106A8 844E0000 */ lh $t6, 0x0000($v0) ## 80812724 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808106F4.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808106F4.s index a26206c51f..46d0401c1e 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808106F4.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808106F4.s @@ -6,14 +6,14 @@ glabel func_808106F4 /* 0C9C4 80810704 AFB00020 */ sw $s0, 0x0020($sp) /* 0C9C8 80810708 00811021 */ addu $v0, $a0, $at /* 0C9CC 8081070C 844E4A38 */ lh $t6, 0x4A38($v0) ## 00004A38 -/* 0C9D0 80810710 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 0C9D0 80810710 3C078013 */ lui $a3, %hi(D_801333E0) /* 0C9D4 80810714 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0C9D8 80810718 15C0001B */ bne $t6, $zero, .L80810788 -/* 0C9DC 8081071C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0C9E0 80810720 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 0C9E4 80810724 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 0C9E8 80810728 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0C9EC 8081072C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0C9DC 8081071C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0C9E0 80810720 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 0C9E4 80810724 25EF33E8 */ addiu $t7, %lo(D_801333E8) +/* 0C9E8 80810728 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0C9EC 8081072C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 0C9F0 80810730 AFAF0014 */ sw $t7, 0x0014($sp) /* 0C9F4 80810734 2404483B */ addiu $a0, $zero, 0x483B ## $a0 = 0000483B /* 0C9F8 80810738 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 @@ -22,28 +22,28 @@ glabel func_808106F4 /* 0CA04 80810744 AFA20028 */ sw $v0, 0x0028($sp) /* 0CA08 80810748 8FA20028 */ lw $v0, 0x0028($sp) -/* 0CA0C 8081074C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 0CA0C 8081074C 3C018016 */ lui $at, %hi(gSaveContext+0x1354) /* 0CA10 80810750 260401E0 */ addiu $a0, $s0, 0x01E0 ## $a0 = 000001E0 /* 0CA14 80810754 84584A38 */ lh $t8, 0x4A38($v0) ## 00004A38 /* 0CA18 80810758 0C02A121 */ jal func_800A8484 -/* 0CA1C 8081075C AC38F9B4 */ sw $t8, -0x064C($at) ## 8015F9B4 -/* 0CA20 80810760 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0CA24 80810764 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0CA1C 8081075C AC38F9B4 */ sw $t8, %lo(gSaveContext+0x1354)($at) +/* 0CA20 80810760 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0CA24 80810764 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0CA28 80810768 AC40135C */ sw $zero, 0x135C($v0) ## 8015F9BC -/* 0CA2C 8081076C 3C198080 */ lui $t9, 0x8080 ## $t9 = 80800000 -/* 0CA30 80810770 27391E44 */ addiu $t9, $t9, 0x1E44 ## $t9 = 80801E44 +/* 0CA2C 8081076C 3C198080 */ lui $t9, %hi(func_80801E44) +/* 0CA30 80810770 27391E44 */ addiu $t9, %lo(func_80801E44) /* 0CA34 80810774 24080240 */ addiu $t0, $zero, 0x0240 ## $t0 = 00000240 /* 0CA38 80810778 AE080010 */ sw $t0, 0x0010($s0) ## 00000010 /* 0CA3C 8081077C AE19000C */ sw $t9, 0x000C($s0) ## 0000000C /* 0CA40 80810780 1000001D */ beq $zero, $zero, .L808107F8 /* 0CA44 80810784 AE000098 */ sw $zero, 0x0098($s0) ## 00000098 .L80810788: -/* 0CA48 80810788 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 0CA4C 8081078C 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 0CA50 80810790 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0CA54 80810794 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 -/* 0CA58 80810798 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0CA5C 8081079C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0CA48 80810788 3C078013 */ lui $a3, %hi(D_801333E0) +/* 0CA4C 8081078C 3C098013 */ lui $t1, %hi(D_801333E8) +/* 0CA50 80810790 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0CA54 80810794 252933E8 */ addiu $t1, %lo(D_801333E8) +/* 0CA58 80810798 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0CA5C 8081079C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 0CA60 808107A0 AFA90014 */ sw $t1, 0x0014($sp) /* 0CA64 808107A4 AFA70010 */ sw $a3, 0x0010($sp) /* 0CA68 808107A8 2404483B */ addiu $a0, $zero, 0x483B ## $a0 = 0000483B @@ -52,18 +52,18 @@ glabel func_808106F4 /* 0CA74 808107B4 AFA20028 */ sw $v0, 0x0028($sp) /* 0CA78 808107B8 8FA20028 */ lw $v0, 0x0028($sp) -/* 0CA7C 808107BC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 0CA7C 808107BC 3C018016 */ lui $at, %hi(gSaveContext+0x1354) /* 0CA80 808107C0 260401E0 */ addiu $a0, $s0, 0x01E0 ## $a0 = 000001E0 /* 0CA84 808107C4 844A4A38 */ lh $t2, 0x4A38($v0) ## 00004A38 /* 0CA88 808107C8 0C02A121 */ jal func_800A8484 -/* 0CA8C 808107CC AC2AF9B4 */ sw $t2, -0x064C($at) ## 8015F9B4 -/* 0CA90 808107D0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0CA94 808107D4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0CA8C 808107CC AC2AF9B4 */ sw $t2, %lo(gSaveContext+0x1354)($at) +/* 0CA90 808107D0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0CA94 808107D4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0CA98 808107D8 AC40135C */ sw $zero, 0x135C($v0) ## 8015F9BC -/* 0CA9C 808107DC 3C0B800C */ lui $t3, 0x800C ## $t3 = 800C0000 +/* 0CA9C 808107DC 3C0B800C */ lui $t3, %hi(Gameplay_Init) /* 0CAA0 808107E0 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 /* 0CAA4 808107E4 358C2518 */ ori $t4, $t4, 0x2518 ## $t4 = 00012518 -/* 0CAA8 808107E8 256BCA64 */ addiu $t3, $t3, 0xCA64 ## $t3 = 800BCA64 +/* 0CAA8 808107E8 256BCA64 */ addiu $t3, %lo(Gameplay_Init) /* 0CAAC 808107EC AE0B000C */ sw $t3, 0x000C($s0) ## 0000000C /* 0CAB0 808107F0 AE0C0010 */ sw $t4, 0x0010($s0) ## 00000010 /* 0CAB4 808107F4 AE000098 */ sw $zero, 0x0098($s0) ## 00000098 @@ -119,8 +119,8 @@ glabel func_808106F4 /* 0CB78 808108B8 0C00084C */ jal osSyncPrintf /* 0CB7C 808108BC A04D0032 */ sb $t5, 0x0032($v0) ## 8015E692 -/* 0CB80 808108C0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0CB84 808108C4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0CB80 808108C0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0CB84 808108C4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0CB88 808108C8 3C048081 */ lui $a0, %hi(D_80812EBC) ## $a0 = 80810000 /* 0CB8C 808108CC 24842EBC */ addiu $a0, $a0, %lo(D_80812EBC) ## $a0 = 80812EBC /* 0CB90 808108D0 844513F6 */ lh $a1, 0x13F6($v0) ## 8015FA56 @@ -131,8 +131,8 @@ glabel func_808106F4 /* 0CBA0 808108E0 0C00084C */ jal osSyncPrintf /* 0CBA4 808108E4 24842EE0 */ addiu $a0, $a0, %lo(D_80812EE0) ## $a0 = 80812EE0 -/* 0CBA8 808108E8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0CBAC 808108EC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 0CBA8 808108E8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0CBAC 808108EC 2442E660 */ addiu $v0, %lo(gSaveContext) /* 0CBB0 808108F0 90430068 */ lbu $v1, 0x0068($v0) ## 8015E6C8 /* 0CBB4 808108F4 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B /* 0CBB8 808108F8 A4400038 */ sh $zero, 0x0038($v0) ## 8015E698 @@ -143,22 +143,22 @@ glabel func_808106F4 /* 0CBCC 8081090C 10610016 */ beq $v1, $at, .L80810968 /* 0CBD0 80810910 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 /* 0CBD4 80810914 10610014 */ beq $v1, $at, .L80810968 -/* 0CBD8 80810918 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 +/* 0CBD8 80810918 3C0E8012 */ lui $t6, %hi(gEquipMasks) /* 0CBDC 8081091C A0500068 */ sb $s0, 0x0068($v0) ## 8015E6C8 -/* 0CBE0 80810920 95CE71A0 */ lhu $t6, 0x71A0($t6) ## 801271A0 +/* 0CBE0 80810920 95CE71A0 */ lhu $t6, %lo(gEquipMasks)($t6) /* 0CBE4 80810924 94430070 */ lhu $v1, 0x0070($v0) ## 8015E6D0 -/* 0CBE8 80810928 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 -/* 0CBEC 8081092C 95EF71A8 */ lhu $t7, 0x71A8($t7) ## 801271A8 +/* 0CBE8 80810928 3C0F8012 */ lui $t7, %hi(gEquipNegMasks) +/* 0CBEC 8081092C 95EF71A8 */ lhu $t7, %lo(gEquipNegMasks)($t7) /* 0CBF0 80810930 01C32024 */ and $a0, $t6, $v1 /* 0CBF4 80810934 3084FFFF */ andi $a0, $a0, 0xFFFF ## $a0 = 00000000 /* 0CBF8 80810938 006FC024 */ and $t8, $v1, $t7 /* 0CBFC 8081093C A4580070 */ sh $t8, 0x0070($v0) ## 8015E6D0 /* 0CC00 80810940 0004C880 */ sll $t9, $a0, 2 -/* 0CC04 80810944 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 +/* 0CC04 80810944 3C088012 */ lui $t0, %hi(gBitFlags-4) /* 0CC08 80810948 01194021 */ addu $t0, $t0, $t9 -/* 0CC0C 8081094C 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 -/* 0CC10 80810950 912971F0 */ lbu $t1, 0x71F0($t1) ## 801271F0 -/* 0CC14 80810954 8D08711C */ lw $t0, 0x711C($t0) ## 8012711C +/* 0CC0C 8081094C 3C098012 */ lui $t1, %hi(gEquipShifts) +/* 0CC10 80810950 912971F0 */ lbu $t1, %lo(gEquipShifts)($t1) +/* 0CC14 80810954 8D08711C */ lw $t0, %lo(gBitFlags-4)($t0) /* 0CC18 80810958 944B009C */ lhu $t3, 0x009C($v0) ## 8015E6FC /* 0CC1C 8081095C 01285004 */ sllv $t2, $t0, $t1 /* 0CC20 80810960 016A6026 */ xor $t4, $t3, $t2 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s index 9f9baa5d52..148c6ead34 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s @@ -13,17 +13,17 @@ glabel func_808109B8 /* 0CCA4 808109E4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0CCA8 808109E8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0CCAC 808109EC 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 -/* 0CCB0 808109F0 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 +/* 0CCB0 808109F0 3C188016 */ lui $t8, %hi(gGameInfo) /* 0CCB4 808109F4 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 0CCB8 808109F8 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 0CCBC 808109FC AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 0CCC0 80810A00 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0CCC4 80810A04 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 +/* 0CCC4 80810A04 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* 0CCC8 80810A08 0C01DE0D */ jal Math_Coss ## coss? /* 0CCCC 80810A0C 870407AA */ lh $a0, 0x07AA($t8) ## 801607AA -/* 0CCD0 80810A10 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 0CCD4 80810A14 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 +/* 0CCD0 80810A10 3C198016 */ lui $t9, %hi(gGameInfo) +/* 0CCD4 80810A14 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 0CCD8 80810A18 E7A00040 */ swc1 $f0, 0x0040($sp) /* 0CCDC 80810A1C 0C01DE1C */ jal Math_Sins ## sins? @@ -31,8 +31,8 @@ glabel func_808109B8 /* 0CCE4 80810A24 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 0CCE8 80810A28 44811000 */ mtc1 $at, $f2 ## $f2 = 1000.00 /* 0CCEC 80810A2C C7A40040 */ lwc1 $f4, 0x0040($sp) -/* 0CCF0 80810A30 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0CCF4 80810A34 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0CCF0 80810A30 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0CCF4 80810A34 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0CCF8 80810A38 46041182 */ mul.s $f6, $f2, $f4 /* 0CCFC 80810A3C 00000000 */ nop /* 0CD00 80810A40 46020202 */ mul.s $f8, $f0, $f2 @@ -46,8 +46,8 @@ glabel func_808109B8 /* 0CD20 80810A60 0C01DE1C */ jal Math_Sins ## sins? /* 0CD24 80810A64 844407AA */ lh $a0, 0x07AA($v0) ## 801607AA -/* 0CD28 80810A68 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 0CD2C 80810A6C 8D29FA90 */ lw $t1, -0x0570($t1) ## 8015FA90 +/* 0CD28 80810A68 3C098016 */ lui $t1, %hi(gGameInfo) +/* 0CD2C 80810A6C 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) /* 0CD30 80810A70 E7A00040 */ swc1 $f0, 0x0040($sp) /* 0CD34 80810A74 0C01DE0D */ jal Math_Coss ## coss? @@ -87,8 +87,8 @@ glabel func_808109B8 /* 0CDBC 80810AFC AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 /* 0CDC0 80810B00 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 0CDC4 80810B04 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 0CDC8 80810B08 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0CDCC 80810B0C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 +/* 0CDC8 80810B08 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0CDCC 80810B0C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* 0CDD0 80810B10 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0CDD4 80810B14 3421C8E8 */ ori $at, $at, 0xC8E8 ## $at = 0001C8E8 /* 0CDD8 80810B18 844C07AA */ lh $t4, 0x07AA($v0) ## 801607AA diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810DAC.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810DAC.s index de39b7ec77..05de2ea392 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810DAC.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810DAC.s @@ -265,7 +265,7 @@ glabel func_80810DAC /* 0D44C 8081118C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 0D450 80811190 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 0D454 80811194 3C0AFD70 */ lui $t2, 0xFD70 ## $t2 = FD700000 -/* 0D458 80811198 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 +/* 0D458 80811198 3C0B8016 */ lui $t3, %hi(gSaveContext+0x1409) /* 0D45C 8081119C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 0D460 808111A0 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 /* 0D464 808111A4 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 @@ -276,7 +276,7 @@ glabel func_80810DAC /* 0D478 808111B8 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 0D47C 808111BC AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 /* 0D480 808111C0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0D484 808111C4 916BFA69 */ lbu $t3, -0x0597($t3) ## 8015FA69 +/* 0D484 808111C4 916BFA69 */ lbu $t3, %lo(gSaveContext+0x1409)($t3) /* 0D488 808111C8 3C0FF570 */ lui $t7, 0xF570 ## $t7 = F5700000 /* 0D48C 808111CC 3C09E600 */ lui $t1, 0xE600 ## $t1 = E6000000 /* 0D490 808111D0 000B6080 */ sll $t4, $t3, 2 @@ -367,8 +367,8 @@ glabel func_80810DAC /* 0D5E0 80811320 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 0D5E4 80811324 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 0D5E8 80811328 87182724 */ lh $t8, %lo(D_80812724)($t8) -/* 0D5EC 8081132C 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 -/* 0D5F0 80811330 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 +/* 0D5EC 8081132C 3C0B8013 */ lui $t3, %hi(gScreenWidth) +/* 0D5F0 80811330 3C198013 */ lui $t9, %hi(gScreenHeight) /* 0D5F4 80811334 330900FF */ andi $t1, $t8, 0x00FF ## $t1 = 00000000 /* 0D5F8 80811338 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 0D5FC 8081133C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 @@ -376,8 +376,8 @@ glabel func_80810DAC /* 0D604 80811344 3C068081 */ lui $a2, %hi(D_80812F34) ## $a2 = 80810000 /* 0D608 80811348 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 0D60C 8081134C AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 0D610 80811350 8D6BD270 */ lw $t3, -0x2D90($t3) ## 8012D270 -/* 0D614 80811354 8F39D274 */ lw $t9, -0x2D8C($t9) ## 8012D274 +/* 0D610 80811350 8D6BD270 */ lw $t3, %lo(gScreenWidth)($t3) +/* 0D614 80811354 8F39D274 */ lw $t9, %lo(gScreenHeight)($t9) /* 0D618 80811358 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 0D61C 8081135C 256CFFFF */ addiu $t4, $t3, 0xFFFF ## $t4 = 8012FFFF /* 0D620 80811360 318D03FF */ andi $t5, $t4, 0x03FF ## $t5 = 000003FF diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s index e6c33412c0..61237ef056 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s @@ -8,8 +8,8 @@ glabel func_808113A8 /* 0D680 808113C0 AFB1001C */ sw $s1, 0x001C($sp) /* 0D684 808113C4 0C02A735 */ jal func_800A9CD4 /* 0D688 808113C8 02402825 */ or $a1, $s2, $zero ## $a1 = 000001E0 -/* 0D68C 808113CC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0D690 808113D0 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 +/* 0D68C 808113CC 3C028016 */ lui $v0, %hi(gGameInfo) +/* 0D690 808113D0 2442FA90 */ addiu $v0, %lo(gGameInfo) /* 0D694 808113D4 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90 /* 0D698 808113D8 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 /* 0D69C 808113DC 24180016 */ addiu $t8, $zero, 0x0016 ## $t8 = 00000016 @@ -338,8 +338,8 @@ glabel func_808113A8 /* 0DBA8 808118E8 AFA30030 */ sw $v1, 0x0030($sp) /* 0DBAC 808118EC 0C02CE10 */ jal func_800B3840 ## letterbox_target_addr /* 0DBB0 808118F0 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 0DBB4 808118F4 3C118016 */ lui $s1, 0x8016 ## $s1 = 80160000 -/* 0DBB8 808118F8 2631E660 */ addiu $s1, $s1, 0xE660 ## $s1 = 8015E660 +/* 0DBB4 808118F4 3C118016 */ lui $s1, %hi(gSaveContext) +/* 0DBB8 808118F8 2631E660 */ addiu $s1, %lo(gSaveContext) /* 0DBBC 808118FC 260701E8 */ addiu $a3, $s0, 0x01E8 ## $a3 = 000001E8 /* 0DBC0 80811900 A620141A */ sh $zero, 0x141A($s1) ## 8015FA7A /* 0DBC4 80811904 A620000C */ sh $zero, 0x000C($s1) ## 8015E66C @@ -351,9 +351,9 @@ glabel func_808113A8 /* 0DBDC 8081191C 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 /* 0DBE0 80811920 3508C8E8 */ ori $t0, $t0, 0xC8E8 ## $t0 = 0001C8E8 /* 0DBE4 80811924 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A -/* 0DBE8 80811928 3C018012 */ lui $at, 0x8012 ## $at = 80120000 +/* 0DBE8 80811928 3C018012 */ lui $at, %hi(D_8011FB40) /* 0DBEC 8081192C 8FA6002C */ lw $a2, 0x002C($sp) -/* 0DBF0 80811930 A439FB40 */ sh $t9, -0x04C0($at) ## 8011FB40 +/* 0DBF0 80811930 A439FB40 */ sh $t9, %lo(D_8011FB40)($at) /* 0DBF4 80811934 02081021 */ addu $v0, $s0, $t0 /* 0DBF8 80811938 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0DBFC 8081193C 24090063 */ addiu $t1, $zero, 0x0063 ## $t1 = 00000063 @@ -395,9 +395,9 @@ glabel func_808113A8 /* 0DC8C 808119CC 0C02A7A8 */ jal Sram_ReadWrite /* 0DC90 808119D0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0DC94 808119D4 8E4F0000 */ lw $t7, 0x0000($s2) ## 000001E0 -/* 0DC98 808119D8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 +/* 0DC98 808119D8 3C018016 */ lui $at, %hi(gSaveContext+0x1409) /* 0DC9C 808119DC 91F80002 */ lbu $t8, 0x0002($t7) ## 00000002 -/* 0DCA0 808119E0 A038FA69 */ sb $t8, -0x0597($at) ## 8015FA69 +/* 0DCA0 808119E0 A038FA69 */ sb $t8, %lo(gSaveContext+0x1409)($at) /* 0DCA4 808119E4 92391409 */ lbu $t9, 0x1409($s1) ## 8015FA69 /* 0DCA8 808119E8 2B210003 */ slti $at, $t9, 0x0003 /* 0DCAC 808119EC 54200005 */ bnel $at, $zero, .L80811A04 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s index cfa4578cc8..d48062ca41 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s @@ -1,6 +1,6 @@ glabel func_80811A20 -/* 0DCE0 80811A20 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 0DCE4 80811A24 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 +/* 0DCE0 80811A20 3C0F8016 */ lui $t7, %hi(gGameInfo) +/* 0DCE4 80811A24 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* 0DCE8 80811A28 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 0DCEC 80811A2C AFB00020 */ sw $s0, 0x0020($sp) /* 0DCF0 80811A30 3C0201AA */ lui $v0, 0x01AA ## $v0 = 01AA0000 diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80800B90.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80800B90.s index f4f09d886e..a6fde40f00 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80800B90.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80800B90.s @@ -1,6 +1,6 @@ glabel func_80800B90 -/* 00000 80800B90 3C0E8080 */ lui $t6, 0x8080 ## $t6 = 80800000 -/* 00004 80800B94 25CE0878 */ addiu $t6, $t6, 0x0878 ## $t6 = 80800878 +/* 00000 80800B90 3C0E8080 */ lui $t6, %hi(Title_Init) +/* 00004 80800B94 25CE0878 */ addiu $t6, %lo(Title_Init) /* 00008 80800B98 240F01E8 */ addiu $t7, $zero, 0x01E8 ## $t7 = 000001E8 /* 0000C 80800B9C AC800098 */ sw $zero, 0x0098($a0) ## 00000098 /* 00010 80800BA0 AC8F0010 */ sw $t7, 0x0010($a0) ## 00000010 diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80800BAC.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80800BAC.s index f2ba6e2323..1970010331 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80800BAC.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80800BAC.s @@ -7,8 +7,8 @@ glabel func_80800BAC /* 00030 80800BC0 AFA50024 */ sw $a1, 0x0024($sp) /* 00034 80800BC4 0C00084C */ jal osSyncPrintf /* 00038 80800BC8 248425E0 */ addiu $a0, $a0, %lo(D_808025E0) ## $a0 = 808025E0 -/* 0003C 80800BCC 3C108016 */ lui $s0, 0x8016 ## $s0 = 80160000 -/* 00040 80800BD0 2610E660 */ addiu $s0, $s0, 0xE660 ## $s0 = 8015E660 +/* 0003C 80800BCC 3C108016 */ lui $s0, %hi(gSaveContext) +/* 00040 80800BD0 2610E660 */ addiu $s0, %lo(gSaveContext) /* 00044 80800BD4 3C048080 */ lui $a0, %hi(D_808025E8) ## $a0 = 80800000 /* 00048 80800BD8 248425E8 */ addiu $a0, $a0, %lo(D_808025E8) ## $a0 = 808025E8 /* 0004C 80800BDC 0C00084C */ jal osSyncPrintf @@ -51,13 +51,13 @@ glabel func_80800BAC /* 000DC 80800C6C A20213E0 */ sb $v0, 0x13E0($s0) ## 8015FA40 /* 000E0 80800C70 A20213E1 */ sb $v0, 0x13E1($s0) ## 8015FA41 /* 000E4 80800C74 A20C13C7 */ sb $t4, 0x13C7($s0) ## 8015FA27 -/* 000E8 80800C78 3C018012 */ lui $at, 0x8012 ## $at = 80120000 +/* 000E8 80800C78 3C018012 */ lui $at, %hi(D_8011FB30) /* 000EC 80800C7C AE0A0000 */ sw $t2, 0x0000($s0) ## 8015E660 -/* 000F0 80800C80 A020FB30 */ sb $zero, -0x04D0($at) ## 8011FB30 -/* 000F4 80800C84 3C0D800C */ lui $t5, 0x800C ## $t5 = 800C0000 +/* 000F0 80800C80 A020FB30 */ sb $zero, %lo(D_8011FB30)($at) +/* 000F4 80800C84 3C0D800C */ lui $t5, %hi(Gameplay_Init) /* 000F8 80800C88 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 /* 000FC 80800C8C 35CE2518 */ ori $t6, $t6, 0x2518 ## $t6 = 00012518 -/* 00100 80800C90 25ADCA64 */ addiu $t5, $t5, 0xCA64 ## $t5 = 800BCA64 +/* 00100 80800C90 25ADCA64 */ addiu $t5, %lo(Gameplay_Init) /* 00104 80800C94 AC600098 */ sw $zero, 0x0098($v1) ## 00000098 /* 00108 80800C98 AC6D000C */ sw $t5, 0x000C($v1) ## 0000000C /* 0010C 80800C9C AC6E0010 */ sw $t6, 0x0010($v1) ## 00000010 diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80800CB4.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80800CB4.s index 6b593cb9c0..96ab5b4ef3 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80800CB4.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80800CB4.s @@ -36,8 +36,8 @@ glabel func_80800CB4 .L80800D38: /* 001A8 80800D38 00416827 */ nor $t5, $v0, $at /* 001AC 80800D3C 15A00010 */ bne $t5, $zero, .L80800D80 -/* 001B0 80800D40 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 001B4 80800D44 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 001B0 80800D40 3C038016 */ lui $v1, %hi(gSaveContext) +/* 001B4 80800D44 2463E660 */ addiu $v1, %lo(gSaveContext) /* 001B8 80800D48 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 /* 001BC 80800D4C 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 /* 001C0 80800D50 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 @@ -56,9 +56,9 @@ glabel func_80800CB4 /* 001EC 80800D7C 9522000C */ lhu $v0, 0x000C($t1) ## 0000000C .L80800D80: /* 001F0 80800D80 2401DFFF */ addiu $at, $zero, 0xDFFF ## $at = FFFFDFFF -/* 001F4 80800D84 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 +/* 001F4 80800D84 3C038016 */ lui $v1, %hi(gSaveContext) /* 001F8 80800D88 00417827 */ nor $t7, $v0, $at -/* 001FC 80800D8C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 001FC 80800D8C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00200 80800D90 15E00042 */ bne $t7, $zero, .L80800E9C /* 00204 80800D94 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 00208 80800D98 8C620008 */ lw $v0, 0x0008($v1) ## 8015E668 @@ -249,29 +249,29 @@ glabel func_80800CB4 /* 00474 80801004 5580001E */ bnel $t4, $zero, .L80801080 /* 00478 80801008 952C0000 */ lhu $t4, 0x0000($t1) ## 00000000 /* 0047C 8080100C 8E0D022C */ lw $t5, 0x022C($s0) ## 0000022C -/* 00480 80801010 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 +/* 00480 80801010 3C188013 */ lui $t8, %hi(D_801333E8) /* 00484 80801014 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 00488 80801018 154D0002 */ bne $t2, $t5, .L80801024 -/* 0048C 8080101C 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 +/* 0048C 8080101C 271833E8 */ addiu $t8, %lo(D_801333E8) /* 00490 80801020 AE000224 */ sw $zero, 0x0224($s0) ## 00000224 .L80801024: /* 00494 80801024 8E0E0224 */ lw $t6, 0x0224($s0) ## 00000224 /* 00498 80801028 55C00015 */ bnel $t6, $zero, .L80801080 /* 0049C 8080102C 952C0000 */ lhu $t4, 0x0000($t1) ## 00000000 -/* 004A0 80801030 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 004A0 80801030 3C078013 */ lui $a3, %hi(D_801333E0) /* 004A4 80801034 AE0F0224 */ sw $t7, 0x0224($s0) ## 00000224 /* 004A8 80801038 AE0A022C */ sw $t2, 0x022C($s0) ## 0000022C -/* 004AC 8080103C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 004B0 80801040 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 004B4 80801044 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 004AC 8080103C 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 004B0 80801040 3C058013 */ lui $a1, %hi(D_801333D4) +/* 004B4 80801044 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 004B8 80801048 AFA70010 */ sw $a3, 0x0010($sp) /* 004BC 8080104C AFA9002C */ sw $t1, 0x002C($sp) /* 004C0 80801050 AFB80014 */ sw $t8, 0x0014($sp) /* 004C4 80801054 24041800 */ addiu $a0, $zero, 0x1800 ## $a0 = 00001800 /* 004C8 80801058 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 004CC 8080105C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 004D0 80801060 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 004D4 80801064 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 004D0 80801060 3C088016 */ lui $t0, %hi(gGameInfo) +/* 004D4 80801064 2508FA90 */ addiu $t0, %lo(gGameInfo) /* 004D8 80801068 8D0B0000 */ lw $t3, 0x0000($t0) ## 8015FA90 /* 004DC 8080106C 8FA9002C */ lw $t1, 0x002C($sp) /* 004E0 80801070 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 @@ -284,22 +284,22 @@ glabel func_80800CB4 /* 004F8 80801088 55A0001A */ bnel $t5, $zero, .L808010F4 /* 004FC 8080108C 952C000C */ lhu $t4, 0x000C($t1) ## 0000000C /* 00500 80801090 8E0E0224 */ lw $t6, 0x0224($s0) ## 00000224 -/* 00504 80801094 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 00508 80801098 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 +/* 00504 80801094 3C0F8013 */ lui $t7, %hi(D_801333E8) +/* 00508 80801098 25EF33E8 */ addiu $t7, %lo(D_801333E8) /* 0050C 8080109C 55C00015 */ bnel $t6, $zero, .L808010F4 /* 00510 808010A0 952C000C */ lhu $t4, 0x000C($t1) ## 0000000C -/* 00514 808010A4 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00518 808010A8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 0051C 808010AC 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00520 808010B0 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00514 808010A4 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00518 808010A8 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 0051C 808010AC 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00520 808010B0 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00524 808010B4 AFA70010 */ sw $a3, 0x0010($sp) /* 00528 808010B8 24041800 */ addiu $a0, $zero, 0x1800 ## $a0 = 00001800 /* 0052C 808010BC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 00530 808010C0 AFAF0014 */ sw $t7, 0x0014($sp) /* 00534 808010C4 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 00538 808010C8 AFA9002C */ sw $t1, 0x002C($sp) -/* 0053C 808010CC 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 00540 808010D0 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 0053C 808010CC 3C088016 */ lui $t0, %hi(gGameInfo) +/* 00540 808010D0 2508FA90 */ addiu $t0, %lo(gGameInfo) /* 00544 808010D4 8D180000 */ lw $t8, 0x0000($t0) ## 8015FA90 /* 00548 808010D8 8FA9002C */ lw $t1, 0x002C($sp) /* 0054C 808010DC 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 @@ -314,29 +314,29 @@ glabel func_80800CB4 /* 0056C 808010FC 55A0001E */ bnel $t5, $zero, .L80801178 /* 00570 80801100 952E0000 */ lhu $t6, 0x0000($t1) ## 00000000 /* 00574 80801104 8E0E0230 */ lw $t6, 0x0230($s0) ## 00000230 -/* 00578 80801108 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 +/* 00578 80801108 3C0B8013 */ lui $t3, %hi(D_801333E8) /* 0057C 8080110C 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 /* 00580 80801110 154E0002 */ bne $t2, $t6, .L8080111C -/* 00584 80801114 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 +/* 00584 80801114 256B33E8 */ addiu $t3, %lo(D_801333E8) /* 00588 80801118 AE000228 */ sw $zero, 0x0228($s0) ## 00000228 .L8080111C: /* 0058C 8080111C 8E0F0228 */ lw $t7, 0x0228($s0) ## 00000228 /* 00590 80801120 55E00015 */ bnel $t7, $zero, .L80801178 /* 00594 80801124 952E0000 */ lhu $t6, 0x0000($t1) ## 00000000 -/* 00598 80801128 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 +/* 00598 80801128 3C078013 */ lui $a3, %hi(D_801333E0) /* 0059C 8080112C AE180228 */ sw $t8, 0x0228($s0) ## 00000228 /* 005A0 80801130 AE0A0230 */ sw $t2, 0x0230($s0) ## 00000230 -/* 005A4 80801134 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 005A8 80801138 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 005AC 8080113C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 005A4 80801134 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 005A8 80801138 3C058013 */ lui $a1, %hi(D_801333D4) +/* 005AC 8080113C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 005B0 80801140 AFA70010 */ sw $a3, 0x0010($sp) /* 005B4 80801144 AFA9002C */ sw $t1, 0x002C($sp) /* 005B8 80801148 AFAB0014 */ sw $t3, 0x0014($sp) /* 005BC 8080114C 24041800 */ addiu $a0, $zero, 0x1800 ## $a0 = 00001800 /* 005C0 80801150 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 005C4 80801154 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 005C8 80801158 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 005CC 8080115C 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 005C8 80801158 3C088016 */ lui $t0, %hi(gGameInfo) +/* 005CC 8080115C 2508FA90 */ addiu $t0, %lo(gGameInfo) /* 005D0 80801160 8D190000 */ lw $t9, 0x0000($t0) ## 8015FA90 /* 005D4 80801164 8FA9002C */ lw $t1, 0x002C($sp) /* 005D8 80801168 872C0110 */ lh $t4, 0x0110($t9) ## 00000110 @@ -349,22 +349,22 @@ glabel func_80800CB4 /* 005F0 80801180 55E0001A */ bnel $t7, $zero, .L808011EC /* 005F4 80801184 9522000C */ lhu $v0, 0x000C($t1) ## 0000000C /* 005F8 80801188 8E180228 */ lw $t8, 0x0228($s0) ## 00000228 -/* 005FC 8080118C 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 -/* 00600 80801190 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 +/* 005FC 8080118C 3C0B8013 */ lui $t3, %hi(D_801333E8) +/* 00600 80801190 256B33E8 */ addiu $t3, %lo(D_801333E8) /* 00604 80801194 57000015 */ bnel $t8, $zero, .L808011EC /* 00608 80801198 9522000C */ lhu $v0, 0x000C($t1) ## 0000000C -/* 0060C 8080119C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00610 808011A0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00614 808011A4 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 00618 808011A8 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 0060C 8080119C 3C078013 */ lui $a3, %hi(D_801333E0) +/* 00610 808011A0 24E733E0 */ addiu $a3, %lo(D_801333E0) +/* 00614 808011A4 3C058013 */ lui $a1, %hi(D_801333D4) +/* 00618 808011A8 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 0061C 808011AC AFA70010 */ sw $a3, 0x0010($sp) /* 00620 808011B0 24041800 */ addiu $a0, $zero, 0x1800 ## $a0 = 00001800 /* 00624 808011B4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 00628 808011B8 AFAB0014 */ sw $t3, 0x0014($sp) /* 0062C 808011BC 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 00630 808011C0 AFA9002C */ sw $t1, 0x002C($sp) -/* 00634 808011C4 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 00638 808011C8 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 00634 808011C4 3C088016 */ lui $t0, %hi(gGameInfo) +/* 00638 808011C8 2508FA90 */ addiu $t0, %lo(gGameInfo) /* 0063C 808011CC 8D190000 */ lw $t9, 0x0000($t0) ## 8015FA90 /* 00640 808011D0 8FA9002C */ lw $t1, 0x002C($sp) /* 00644 808011D4 872C0110 */ lh $t4, 0x0110($t9) ## 00000110 @@ -375,19 +375,19 @@ glabel func_80800CB4 /* 00658 808011E8 9522000C */ lhu $v0, 0x000C($t1) ## 0000000C .L808011EC: /* 0065C 808011EC 2403FDFF */ addiu $v1, $zero, 0xFDFF ## $v1 = FFFFFDFF -/* 00660 808011F0 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 +/* 00660 808011F0 3C0C8013 */ lui $t4, %hi(D_801333E8) /* 00664 808011F4 00437827 */ nor $t7, $v0, $v1 /* 00668 808011F8 11E00005 */ beq $t7, $zero, .L80801210 -/* 0066C 808011FC 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 +/* 0066C 808011FC 258C33E8 */ addiu $t4, %lo(D_801333E8) /* 00670 80801200 95380000 */ lhu $t8, 0x0000($t1) ## 00000000 /* 00674 80801204 03035827 */ nor $t3, $t8, $v1 /* 00678 80801208 55600014 */ bnel $t3, $zero, .L8080125C /* 0067C 8080120C 2403FEFF */ addiu $v1, $zero, 0xFEFF ## $v1 = FFFFFEFF .L80801210: -/* 00680 80801210 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 00684 80801214 273933E0 */ addiu $t9, $t9, 0x33E0 ## $t9 = 801333E0 -/* 00688 80801218 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 0068C 8080121C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 00680 80801210 3C198013 */ lui $t9, %hi(D_801333E0) +/* 00684 80801214 273933E0 */ addiu $t9, %lo(D_801333E0) +/* 00688 80801218 3C058013 */ lui $a1, %hi(D_801333D4) +/* 0068C 8080121C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00690 80801220 03203825 */ or $a3, $t9, $zero ## $a3 = 801333E0 /* 00694 80801224 AFB90010 */ sw $t9, 0x0010($sp) /* 00698 80801228 24041800 */ addiu $a0, $zero, 0x1800 ## $a0 = 00001800 @@ -395,8 +395,8 @@ glabel func_80800CB4 /* 006A0 80801230 AFAC0014 */ sw $t4, 0x0014($sp) /* 006A4 80801234 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 006A8 80801238 AFA9002C */ sw $t1, 0x002C($sp) -/* 006AC 8080123C 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 006B0 80801240 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 006AC 8080123C 3C088016 */ lui $t0, %hi(gGameInfo) +/* 006B0 80801240 2508FA90 */ addiu $t0, %lo(gGameInfo) /* 006B4 80801244 8D0D0000 */ lw $t5, 0x0000($t0) ## 8015FA90 /* 006B8 80801248 8FA9002C */ lw $t1, 0x002C($sp) /* 006BC 8080124C 85AE0110 */ lh $t6, 0x0110($t5) ## 00000110 @@ -406,25 +406,25 @@ glabel func_80800CB4 .L8080125C: /* 006CC 8080125C 00437827 */ nor $t7, $v0, $v1 /* 006D0 80801260 11E00005 */ beq $t7, $zero, .L80801278 -/* 006D4 80801264 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 +/* 006D4 80801264 3C0C8013 */ lui $t4, %hi(D_801333E8) /* 006D8 80801268 95380000 */ lhu $t8, 0x0000($t1) ## 00000000 /* 006DC 8080126C 03035827 */ nor $t3, $t8, $v1 /* 006E0 80801270 55600013 */ bnel $t3, $zero, .L808012C0 /* 006E4 80801274 96180020 */ lhu $t8, 0x0020($s0) ## 00000020 .L80801278: -/* 006E8 80801278 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 -/* 006EC 8080127C 273933E0 */ addiu $t9, $t9, 0x33E0 ## $t9 = 801333E0 -/* 006F0 80801280 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 006F4 80801284 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 +/* 006E8 80801278 3C198013 */ lui $t9, %hi(D_801333E0) +/* 006EC 8080127C 273933E0 */ addiu $t9, %lo(D_801333E0) +/* 006F0 80801280 3C058013 */ lui $a1, %hi(D_801333D4) +/* 006F4 80801284 258C33E8 */ addiu $t4, %lo(D_801333E8) /* 006F8 80801288 AFAC0014 */ sw $t4, 0x0014($sp) -/* 006FC 8080128C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 +/* 006FC 8080128C 24A533D4 */ addiu $a1, %lo(D_801333D4) /* 00700 80801290 03203825 */ or $a3, $t9, $zero ## $a3 = 801333E0 /* 00704 80801294 AFB90010 */ sw $t9, 0x0010($sp) /* 00708 80801298 24041800 */ addiu $a0, $zero, 0x1800 ## $a0 = 00001800 /* 0070C 8080129C 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 00710 808012A0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00714 808012A4 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 00718 808012A8 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 00714 808012A4 3C088016 */ lui $t0, %hi(gGameInfo) +/* 00718 808012A8 2508FA90 */ addiu $t0, %lo(gGameInfo) /* 0071C 808012AC 8D0D0000 */ lw $t5, 0x0000($t0) ## 8015FA90 /* 00720 808012B0 85AE0110 */ lh $t6, 0x0110($t5) ## 00000110 /* 00724 808012B4 000E7823 */ subu $t7, $zero, $t6 @@ -432,10 +432,10 @@ glabel func_80800CB4 /* 0072C 808012BC 96180020 */ lhu $t8, 0x0020($s0) ## 00000020 .L808012C0: /* 00730 808012C0 2401FFDF */ addiu $at, $zero, 0xFFDF ## $at = FFFFFFDF -/* 00734 808012C4 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 +/* 00734 808012C4 3C088016 */ lui $t0, %hi(gGameInfo) /* 00738 808012C8 03015827 */ nor $t3, $t8, $at /* 0073C 808012CC 1560000E */ bne $t3, $zero, .L80801308 -/* 00740 808012D0 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 +/* 00740 808012D0 2508FA90 */ addiu $t0, %lo(gGameInfo) /* 00744 808012D4 8E1901DC */ lw $t9, 0x01DC($s0) ## 000001DC /* 00748 808012D8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 /* 0074C 808012DC 272C0001 */ addiu $t4, $t9, 0x0001 ## $t4 = 00000001 diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_808018F0.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_808018F0.s index 4b6e98d4b7..6c0a5a972e 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_808018F0.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_808018F0.s @@ -39,24 +39,24 @@ glabel func_808018F0 /* 00DF0 80801980 1000003D */ beq $zero, $zero, .L80801A78 /* 00DF4 80801984 00000000 */ nop .L80801988: -/* 00DF8 80801988 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00DFC 8080198C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00DF8 80801988 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00DFC 8080198C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00E00 80801990 27183478 */ addiu $t8, $t8, %lo(D_80803478) ## $t8 = 80803478 /* 00E04 80801994 AFB80024 */ sw $t8, 0x0024($sp) /* 00E08 80801998 10000037 */ beq $zero, $zero, .L80801A78 /* 00E0C 8080199C A440000C */ sh $zero, 0x000C($v0) ## 8015E66C .L808019A0: -/* 00E10 808019A0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00E10 808019A0 3C028016 */ lui $v0, %hi(gSaveContext) /* 00E14 808019A4 3C088080 */ lui $t0, %hi(D_8080348C) ## $t0 = 80800000 -/* 00E18 808019A8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00E18 808019A8 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00E1C 808019AC 2508348C */ addiu $t0, $t0, %lo(D_8080348C) ## $t0 = 8080348C /* 00E20 808019B0 AFA80024 */ sw $t0, 0x0024($sp) /* 00E24 808019B4 10000030 */ beq $zero, $zero, .L80801A78 /* 00E28 808019B8 A459000C */ sh $t9, 0x000C($v0) ## 8015E66C glabel L808019BC -/* 00E2C 808019BC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 +/* 00E2C 808019BC 3C028016 */ lui $v0, %hi(gSaveContext) /* 00E30 808019C0 3C0A8080 */ lui $t2, %hi(D_808034A0) ## $t2 = 80800000 -/* 00E34 808019C4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00E34 808019C4 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00E38 808019C8 254A34A0 */ addiu $t2, $t2, %lo(D_808034A0) ## $t2 = 808034A0 /* 00E3C 808019CC 34098000 */ ori $t1, $zero, 0x8000 ## $t1 = 00008000 /* 00E40 808019D0 A449000C */ sh $t1, 0x000C($v0) ## 8015E66C @@ -112,8 +112,8 @@ glabel L80801A6C /* 00EE0 80801A70 254A3518 */ addiu $t2, $t2, %lo(D_80803518) ## $t2 = 80803518 /* 00EE4 80801A74 AFAA0024 */ sw $t2, 0x0024($sp) .L80801A78: -/* 00EE8 80801A78 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00EEC 80801A7C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 +/* 00EE8 80801A78 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00EEC 80801A7C 2442E660 */ addiu $v0, %lo(gSaveContext) /* 00EF0 80801A80 944B000C */ lhu $t3, 0x000C($v0) ## 8015E66C /* 00EF4 80801A84 3C058080 */ lui $a1, %hi(D_80803524) ## $a1 = 80800000 /* 00EF8 80801A88 24A53524 */ addiu $a1, $a1, %lo(D_80803524) ## $a1 = 80803524 diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s index 235e68d672..fae020143f 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s @@ -50,13 +50,13 @@ glabel func_80801AAC /* 00FDC 80801B6C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00FE0 80801B70 0C200585 */ jal func_80801614 /* 00FE4 80801B74 02002825 */ or $a1, $s0, $zero ## $a1 = FFFFFF70 -/* 00FE8 80801B78 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 00FEC 80801B7C 8CE6E664 */ lw $a2, -0x199C($a3) ## 8015E664 +/* 00FE8 80801B78 3C078016 */ lui $a3, %hi(gSaveContext+4) +/* 00FEC 80801B7C 8CE6E664 */ lw $a2, %lo(gSaveContext+4)($a3) /* 00FF0 80801B80 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00FF4 80801B84 0C20061F */ jal func_8080187C /* 00FF8 80801B88 02002825 */ or $a1, $s0, $zero ## $a1 = FFFFFF70 -/* 00FFC 80801B8C 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 01000 80801B90 8CE7E668 */ lw $a3, -0x1998($a3) ## 8015E668 +/* 00FFC 80801B8C 3C078016 */ lui $a3, %hi(gSaveContext+8) +/* 01000 80801B90 8CE7E668 */ lw $a3, %lo(gSaveContext+8)($a3) /* 01004 80801B94 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01008 80801B98 02002825 */ or $a1, $s0, $zero ## $a1 = FFFFFF70 /* 0100C 80801B9C 0C20063C */ jal func_808018F0 diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E44.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E44.s index d2cfb17fe5..1d16af0afa 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E44.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E44.s @@ -34,9 +34,9 @@ glabel func_80801E44 /* 01334 80801EC4 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 /* 01338 80801EC8 0C02A89E */ jal View_Init /* 0133C 80801ECC 248400A8 */ addiu $a0, $a0, 0x00A8 ## $a0 = 000000A8 -/* 01340 80801ED0 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 +/* 01340 80801ED0 3C048016 */ lui $a0, %hi(gGameInfo) /* 01344 80801ED4 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 01348 80801ED8 2484FA90 */ addiu $a0, $a0, 0xFA90 ## $a0 = 8015FA90 +/* 01348 80801ED8 2484FA90 */ addiu $a0, %lo(gGameInfo) /* 0134C 80801EDC AE0E01C8 */ sw $t6, 0x01C8($s0) ## 000001C8 /* 01350 80801EE0 AE00021C */ sw $zero, 0x021C($s0) ## 0000021C /* 01354 80801EE4 AE000220 */ sw $zero, 0x0220($s0) ## 00000220 @@ -85,8 +85,8 @@ glabel func_80801E44 /* 013FC 80801F8C 0C0006A8 */ jal DmaMgr_SendRequest1 /* 01400 80801F90 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 01404 80801F94 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01408 80801F98 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0140C 80801F9C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 +/* 01408 80801F98 3C038016 */ lui $v1, %hi(gSaveContext) +/* 0140C 80801F9C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 01410 80801FA0 340D8000 */ ori $t5, $zero, 0x8000 ## $t5 = 00008000 /* 01414 80801FA4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 01418 80801FA8 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/data/code_800EC960.data.s b/data/code_800EC960.data.s index defff650e3..9d857d5c95 100644 --- a/data/code_800EC960.data.s +++ b/data/code_800EC960.data.s @@ -35,7 +35,10 @@ glabel D_801305C4 .incbin "baserom.z64", 0xBA7764, 0x8 glabel D_801305CC - .incbin "baserom.z64", 0xBA776C, 0x14 + .incbin "baserom.z64", 0xBA776C, 0x4 + +glabel D_801305D0 + .incbin "baserom.z64", 0xBA7770, 0x10 glabel D_801305E0 .incbin "baserom.z64", 0xBA7780, 0x4 @@ -236,7 +239,10 @@ glabel D_8013170C .incbin "baserom.z64", 0xBA88AC, 0x134 glabel D_80131840 - .incbin "baserom.z64", 0xBA89E0, 0x18 + .incbin "baserom.z64", 0xBA89E0, 0x14 + +glabel D_80131854 + .incbin "baserom.z64", 0xBA89F4, 0x4 glabel D_80131858 .incbin "baserom.z64", 0xBA89F8, 0x4 diff --git a/data/z_player_lib.data.s b/data/z_player_lib.data.s index 6a1159cd2b..d78c3edad0 100644 --- a/data/z_player_lib.data.s +++ b/data/z_player_lib.data.s @@ -35,7 +35,10 @@ glabel D_80125C9C .incbin "baserom.z64", 0xB9CE3C, 0xCC glabel D_80125D68 - .incbin "baserom.z64", 0xB9CF08, 0xA0 + .incbin "baserom.z64", 0xB9CF08, 0x80 + +glabel D_80125DE8 + .incbin "baserom.z64", 0xB9CF88, 0x20 glabel D_80125E08 .incbin "baserom.z64", 0xB9CFA8, 0x10 @@ -44,7 +47,10 @@ glabel D_80125E18 .incbin "baserom.z64", 0xB9CFB8, 0x40 glabel D_80125E58 - .incbin "baserom.z64", 0xB9CFF8, 0xC0 + .incbin "baserom.z64", 0xB9CFF8, 0xA0 + +glabel D_80125EF8 + .incbin "baserom.z64", 0xB9D098, 0x20 glabel D_80125F18 .incbin "baserom.z64", 0xB9D0B8, 0x8 @@ -65,7 +71,10 @@ glabel D_80125F40 .incbin "baserom.z64", 0xB9D0E0, 0x58 glabel D_80125F98 - .incbin "baserom.z64", 0xB9D138, 0x20 + .incbin "baserom.z64", 0xB9D138, 0x10 + +glabel D_80125FA8 + .incbin "baserom.z64", 0xB9D148, 0x10 glabel D_80125FB8 .incbin "baserom.z64", 0xB9D158, 0x1 diff --git a/data/z_skin.bss.s b/data/z_skin.bss.s index 79131aa99a..3d2ddfd701 100644 --- a/data/z_skin.bss.s +++ b/data/z_skin.bss.s @@ -8,4 +8,7 @@ .section .bss glabel D_801600C0 - .space 0xF10 + .space 0x404 + +glabel D_801604C4 + .space 0xB0C diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index dc2aef74e1..7e8f60fd92 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -156,6 +156,8 @@ s32 func_8008F29C(Player* player) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008FCC8.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_80090014.s") + #pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_800902F0.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_80090440.s") diff --git a/undefined_syms.txt b/undefined_syms.txt index fc1ab036fc..ead6e07145 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -4,6 +4,7 @@ D_001579A0 = 0x001579A0; // libultra OS symbols D_80000000 = 0x80000000; +D_80000002 = 0x80000002; D_80000004 = 0x80000004; D_80000008 = 0x80000008; D_8000000C = 0x8000000C;