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 f2a78a1567..7f595cd638 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 @@ -88,8 +88,8 @@ glabel func_80870394 /* 008D4 808704B4 0C00D6DD */ jal Flags_SetEventChkInf /* 008D8 808704B8 240400B0 */ addiu $a0, $zero, 0x00B0 ## $a0 = 000000B0 -/* 008DC 808704BC 3C050201 */ lui $a1, 0x0201 ## $a1 = 02010000 -/* 008E0 808704C0 24A54F80 */ addiu $a1, $a1, 0x4F80 ## $a1 = 02014F80 +/* 008DC 808704BC 3C050201 */ lui $a1, %hi(D_02014F80) ## $a1 = 02010000 +/* 008E0 808704C0 24A54F80 */ addiu $a1, $a1, %lo(D_02014F80) ## $a1 = 02014F80 /* 008E4 808704C4 0C01A4F6 */ jal Cutscene_SetSegment /* 008E8 808704C8 8FA40044 */ lw $a0, 0x0044($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s index 96869dfa03..e3b81d9bcd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s @@ -46,16 +46,16 @@ glabel BgDyYoseizo_Init /* 00084 808728B4 0C00084C */ jal osSyncPrintf /* 00088 808728B8 90451DEA */ lbu $a1, 0x1DEA($v0) ## 00001DEA -/* 0008C 808728BC 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 -/* 00090 808728C0 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 +/* 0008C 808728BC 3C060602 */ lui $a2, %hi(D_0601C450) ## $a2 = 06020000 +/* 00090 808728C0 3C070601 */ lui $a3, %hi(D_06008698) ## $a3 = 06010000 /* 00094 808728C4 26090194 */ addiu $t1, $s0, 0x0194 ## $t1 = 00000194 /* 00098 808728C8 260A023C */ addiu $t2, $s0, 0x023C ## $t2 = 0000023C /* 0009C 808728CC 240B001C */ addiu $t3, $zero, 0x001C ## $t3 = 0000001C /* 000A0 808728D0 AFAB0018 */ sw $t3, 0x0018($sp) /* 000A4 808728D4 AFAA0014 */ sw $t2, 0x0014($sp) /* 000A8 808728D8 AFA90010 */ sw $t1, 0x0010($sp) -/* 000AC 808728DC 24E78698 */ addiu $a3, $a3, 0x8698 ## $a3 = 06008698 -/* 000B0 808728E0 24C6C450 */ addiu $a2, $a2, 0xC450 ## $a2 = 0601C450 +/* 000AC 808728DC 24E78698 */ addiu $a3, $a3, %lo(D_06008698) ## $a3 = 06008698 +/* 000B0 808728E0 24C6C450 */ addiu $a2, $a2, %lo(D_0601C450) ## $a2 = 0601C450 /* 000B4 808728E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000B8 808728E8 0C0291BE */ jal SkelAnime_InitFlex /* 000BC 808728EC 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 @@ -65,16 +65,16 @@ glabel BgDyYoseizo_Init /* 000C8 808728F8 0C00084C */ jal osSyncPrintf /* 000CC 808728FC 90451DEA */ lbu $a1, 0x1DEA($v0) ## 00001DEA -/* 000D0 80872900 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 -/* 000D4 80872904 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 000D0 80872900 3C060602 */ lui $a2, %hi(D_0601C450) ## $a2 = 06020000 +/* 000D4 80872904 3C070600 */ lui $a3, %hi(D_060031C0) ## $a3 = 06000000 /* 000D8 80872908 260C0194 */ addiu $t4, $s0, 0x0194 ## $t4 = 00000194 /* 000DC 8087290C 260D023C */ addiu $t5, $s0, 0x023C ## $t5 = 0000023C /* 000E0 80872910 240E001C */ addiu $t6, $zero, 0x001C ## $t6 = 0000001C /* 000E4 80872914 AFAE0018 */ sw $t6, 0x0018($sp) /* 000E8 80872918 AFAD0014 */ sw $t5, 0x0014($sp) /* 000EC 8087291C AFAC0010 */ sw $t4, 0x0010($sp) -/* 000F0 80872920 24E731C0 */ addiu $a3, $a3, 0x31C0 ## $a3 = 060031C0 -/* 000F4 80872924 24C6C450 */ addiu $a2, $a2, 0xC450 ## $a2 = 0601C450 +/* 000F0 80872920 24E731C0 */ addiu $a3, $a3, %lo(D_060031C0) ## $a3 = 060031C0 +/* 000F4 80872924 24C6C450 */ addiu $a2, $a2, %lo(D_0601C450) ## $a2 = 0601C450 /* 000F8 80872928 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000FC 8087292C 0C0291BE */ jal SkelAnime_InitFlex /* 00100 80872930 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 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 6bf0568f65..130d153bc8 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 @@ -174,8 +174,8 @@ glabel func_80872DE4 /* 007DC 8087300C 10000076 */ beq $zero, $zero, .L808731E8 /* 007E0 80873010 00000000 */ nop .L80873014: -/* 007E4 80873014 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 007E8 80873018 24420160 */ addiu $v0, $v0, 0x0160 ## $v0 = 02000160 +/* 007E4 80873014 3C020200 */ lui $v0, %hi(D_02000160) ## $v0 = 02000000 +/* 007E8 80873018 24420160 */ addiu $v0, $v0, %lo(D_02000160) ## $v0 = 02000160 /* 007EC 8087301C 00025900 */ sll $t3, $v0, 4 /* 007F0 80873020 000B6702 */ srl $t4, $t3, 28 /* 007F4 80873024 000C6880 */ sll $t5, $t4, 2 @@ -193,8 +193,8 @@ glabel func_80872DE4 /* 00824 80873054 10000064 */ beq $zero, $zero, .L808731E8 /* 00828 80873058 A0AA1414 */ sb $t2, 0x1414($a1) ## 8015FA74 .L8087305C: -/* 0082C 8087305C 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 00830 80873060 24421020 */ addiu $v0, $v0, 0x1020 ## $v0 = 02001020 +/* 0082C 8087305C 3C020200 */ lui $v0, %hi(D_02001020) ## $v0 = 02000000 +/* 00830 80873060 24421020 */ addiu $v0, $v0, %lo(D_02001020) ## $v0 = 02001020 /* 00834 80873064 00025900 */ sll $t3, $v0, 4 /* 00838 80873068 000B6702 */ srl $t4, $t3, 28 /* 0083C 8087306C 000C6880 */ sll $t5, $t4, 2 @@ -212,8 +212,8 @@ glabel func_80872DE4 /* 0086C 8087309C 10000052 */ beq $zero, $zero, .L808731E8 /* 00870 808730A0 A0AA1414 */ sb $t2, 0x1414($a1) ## 8015FA74 .L808730A4: -/* 00874 808730A4 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 00878 808730A8 24421F40 */ addiu $v0, $v0, 0x1F40 ## $v0 = 02001F40 +/* 00874 808730A4 3C020200 */ lui $v0, %hi(D_02001F40) ## $v0 = 02000000 +/* 00878 808730A8 24421F40 */ addiu $v0, $v0, %lo(D_02001F40) ## $v0 = 02001F40 /* 0087C 808730AC 00025900 */ sll $t3, $v0, 4 /* 00880 808730B0 000B6702 */ srl $t4, $t3, 28 /* 00884 808730B4 000C6880 */ sll $t5, $t4, 2 @@ -242,8 +242,8 @@ glabel func_80872DE4 /* 008DC 8087310C 10000036 */ beq $zero, $zero, .L808731E8 /* 008E0 80873110 00000000 */ nop .L80873114: -/* 008E4 80873114 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 008E8 80873118 24420130 */ addiu $v0, $v0, 0x0130 ## $v0 = 02000130 +/* 008E4 80873114 3C020200 */ lui $v0, %hi(D_02000130) ## $v0 = 02000000 +/* 008E8 80873118 24420130 */ addiu $v0, $v0, %lo(D_02000130) ## $v0 = 02000130 /* 008EC 8087311C 00025900 */ sll $t3, $v0, 4 /* 008F0 80873120 000B6702 */ srl $t4, $t3, 28 /* 008F4 80873124 000C6880 */ sll $t5, $t4, 2 @@ -261,8 +261,8 @@ glabel func_80872DE4 /* 00924 80873154 10000024 */ beq $zero, $zero, .L808731E8 /* 00928 80873158 A0AA1414 */ sb $t2, 0x1414($a1) ## 8015FA74 .L8087315C: -/* 0092C 8087315C 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 00930 80873160 244213E0 */ addiu $v0, $v0, 0x13E0 ## $v0 = 020013E0 +/* 0092C 8087315C 3C020200 */ lui $v0, %hi(D_020013E0) ## $v0 = 02000000 +/* 00930 80873160 244213E0 */ addiu $v0, $v0, %lo(D_020013E0) ## $v0 = 020013E0 /* 00934 80873164 00025900 */ sll $t3, $v0, 4 /* 00938 80873168 000B6702 */ srl $t4, $t3, 28 /* 0093C 8087316C 000C6880 */ sll $t5, $t4, 2 @@ -280,8 +280,8 @@ glabel func_80872DE4 /* 0096C 8087319C 10000012 */ beq $zero, $zero, .L808731E8 /* 00970 808731A0 A0AA1414 */ sb $t2, 0x1414($a1) ## 8015FA74 .L808731A4: -/* 00974 808731A4 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 00978 808731A8 244225D0 */ addiu $v0, $v0, 0x25D0 ## $v0 = 020025D0 +/* 00974 808731A4 3C020200 */ lui $v0, %hi(D_020025D0) ## $v0 = 02000000 +/* 00978 808731A8 244225D0 */ addiu $v0, $v0, %lo(D_020025D0) ## $v0 = 020025D0 /* 0097C 808731AC 00025900 */ sll $t3, $v0, 4 /* 00980 808731B0 000B6702 */ srl $t4, $t3, 28 /* 00984 808731B4 000C6880 */ sll $t5, $t4, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s index e5101dc187..fb0e03c046 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s @@ -8,17 +8,17 @@ glabel func_8087328C /* 00A74 808732A4 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B /* 00A78 808732A8 15E10015 */ bne $t7, $at, .L80873300 /* 00A7C 808732AC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00A80 808732B0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 00A80 808732B0 3C040601 */ lui $a0, %hi(D_06008698) ## $a0 = 06010000 /* 00A84 808732B4 0C028800 */ jal SkelAnime_GetFrameCount -/* 00A88 808732B8 24848698 */ addiu $a0, $a0, 0x8698 ## $a0 = 06008698 +/* 00A88 808732B8 24848698 */ addiu $a0, $a0, %lo(D_06008698) ## $a0 = 06008698 /* 00A8C 808732BC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00A90 808732C0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00A94 808732C4 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 /* 00A98 808732C8 46802020 */ cvt.s.w $f0, $f4 -/* 00A9C 808732CC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 00A9C 808732CC 3C050601 */ lui $a1, %hi(D_06008698) ## $a1 = 06010000 /* 00AA0 808732D0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00AA4 808732D4 24A58698 */ addiu $a1, $a1, 0x8698 ## $a1 = 06008698 +/* 00AA4 808732D4 24A58698 */ addiu $a1, $a1, %lo(D_06008698) ## $a1 = 06008698 /* 00AA8 808732D8 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00AAC 808732DC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00AB0 808732E0 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C @@ -38,9 +38,9 @@ glabel func_8087328C /* 00ADC 8087330C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00AE0 80873310 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 /* 00AE4 80873314 46804020 */ cvt.s.w $f0, $f8 -/* 00AE8 80873318 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00AE8 80873318 3C050600 */ lui $a1, %hi(D_060031C0) ## $a1 = 06000000 /* 00AEC 8087331C 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00AF0 80873320 24A531C0 */ addiu $a1, $a1, 0x31C0 ## $a1 = 060031C0 +/* 00AF0 80873320 24A531C0 */ addiu $a1, $a1, %lo(D_060031C0) ## $a1 = 060031C0 /* 00AF4 80873324 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00AF8 80873328 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00AFC 8087332C E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s index db837c87ff..a973902d18 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s @@ -14,16 +14,16 @@ glabel func_8087358C /* 00D8C 808735BC 85CF00A4 */ lh $t7, 0x00A4($t6) ## 000000A4 /* 00D90 808735C0 15E10014 */ bne $t7, $at, .L80873614 /* 00D94 808735C4 00000000 */ nop -/* 00D98 808735C8 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 00D98 808735C8 3C040602 */ lui $a0, %hi(D_0601D514) ## $a0 = 06020000 /* 00D9C 808735CC 0C028800 */ jal SkelAnime_GetFrameCount -/* 00DA0 808735D0 2484D514 */ addiu $a0, $a0, 0xD514 ## $a0 = 0601D514 +/* 00DA0 808735D0 2484D514 */ addiu $a0, $a0, %lo(D_0601D514) ## $a0 = 0601D514 /* 00DA4 808735D4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00DA8 808735D8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00DAC 808735DC 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 /* 00DB0 808735E0 46802020 */ cvt.s.w $f0, $f4 -/* 00DB4 808735E4 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 -/* 00DB8 808735E8 24A5D514 */ addiu $a1, $a1, 0xD514 ## $a1 = 0601D514 +/* 00DB4 808735E4 3C050602 */ lui $a1, %hi(D_0601D514) ## $a1 = 06020000 +/* 00DB8 808735E8 24A5D514 */ addiu $a1, $a1, %lo(D_0601D514) ## $a1 = 0601D514 /* 00DBC 808735EC 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00DC0 808735F0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00DC4 808735F4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 @@ -43,8 +43,8 @@ glabel func_8087358C /* 00DF0 80873620 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00DF4 80873624 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 /* 00DF8 80873628 46804020 */ cvt.s.w $f0, $f8 -/* 00DFC 8087362C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00E00 80873630 24A51DF0 */ addiu $a1, $a1, 0x1DF0 ## $a1 = 06001DF0 +/* 00DFC 8087362C 3C050600 */ lui $a1, %hi(D_06001DF0) ## $a1 = 06000000 +/* 00E00 80873630 24A51DF0 */ addiu $a1, $a1, %lo(D_06001DF0) ## $a1 = 06001DF0 /* 00E04 80873634 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00E08 80873638 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00E0C 8087363C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873780.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873780.s index 8671568316..2b02910a34 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873780.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873780.s @@ -7,17 +7,17 @@ glabel func_80873780 /* 00F64 80873794 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B /* 00F68 80873798 15C10015 */ bne $t6, $at, .L808737F0 /* 00F6C 8087379C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00F70 808737A0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00F70 808737A0 3C040600 */ lui $a0, %hi(D_060069E8) ## $a0 = 06000000 /* 00F74 808737A4 0C028800 */ jal SkelAnime_GetFrameCount -/* 00F78 808737A8 248469E8 */ addiu $a0, $a0, 0x69E8 ## $a0 = 060069E8 +/* 00F78 808737A8 248469E8 */ addiu $a0, $a0, %lo(D_060069E8) ## $a0 = 060069E8 /* 00F7C 808737AC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00F80 808737B0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00F84 808737B4 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 /* 00F88 808737B8 46802020 */ cvt.s.w $f0, $f4 -/* 00F8C 808737BC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00F8C 808737BC 3C050600 */ lui $a1, %hi(D_060069E8) ## $a1 = 06000000 /* 00F90 808737C0 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00F94 808737C4 24A569E8 */ addiu $a1, $a1, 0x69E8 ## $a1 = 060069E8 +/* 00F94 808737C4 24A569E8 */ addiu $a1, $a1, %lo(D_060069E8) ## $a1 = 060069E8 /* 00F98 808737C8 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00F9C 808737CC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FA0 808737D0 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C @@ -37,9 +37,9 @@ glabel func_80873780 /* 00FCC 808737FC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00FD0 80873800 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 /* 00FD4 80873804 46804020 */ cvt.s.w $f0, $f8 -/* 00FD8 80873808 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00FD8 80873808 3C050600 */ lui $a1, %hi(D_06005810) ## $a1 = 06000000 /* 00FDC 8087380C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00FE0 80873810 24A55810 */ addiu $a1, $a1, 0x5810 ## $a1 = 06005810 +/* 00FE0 80873810 24A55810 */ addiu $a1, $a1, %lo(D_06005810) ## $a1 = 06005810 /* 00FE4 80873814 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00FE8 80873818 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FEC 8087381C E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C 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 2d11a59a90..756512b852 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 @@ -50,16 +50,16 @@ glabel func_80873868 /* 010DC 8087390C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 010E0 80873910 15410014 */ bne $t2, $at, .L80873964 /* 010E4 80873914 00000000 */ nop -/* 010E8 80873918 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 010E8 80873918 3C040600 */ lui $a0, %hi(D_06007CA8) ## $a0 = 06000000 /* 010EC 8087391C 0C028800 */ jal SkelAnime_GetFrameCount -/* 010F0 80873920 24847CA8 */ addiu $a0, $a0, 0x7CA8 ## $a0 = 06007CA8 +/* 010F0 80873920 24847CA8 */ addiu $a0, $a0, %lo(D_06007CA8) ## $a0 = 06007CA8 /* 010F4 80873924 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 010F8 80873928 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 010FC 8087392C 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 01100 80873930 46808020 */ cvt.s.w $f0, $f16 -/* 01104 80873934 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01108 80873938 24A57CA8 */ addiu $a1, $a1, 0x7CA8 ## $a1 = 06007CA8 +/* 01104 80873934 3C050600 */ lui $a1, %hi(D_06007CA8) ## $a1 = 06000000 +/* 01108 80873938 24A57CA8 */ addiu $a1, $a1, %lo(D_06007CA8) ## $a1 = 06007CA8 /* 0110C 8087393C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01110 80873940 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01114 80873944 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C @@ -79,8 +79,8 @@ glabel func_80873868 /* 01140 80873970 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01144 80873974 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 /* 01148 80873978 46802020 */ cvt.s.w $f0, $f4 -/* 0114C 8087397C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01150 80873980 24A54344 */ addiu $a1, $a1, 0x4344 ## $a1 = 06004344 +/* 0114C 8087397C 3C050600 */ lui $a1, %hi(D_06004344) ## $a1 = 06000000 +/* 01150 80873980 24A54344 */ addiu $a1, $a1, %lo(D_06004344) ## $a1 = 06004344 /* 01154 80873984 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01158 80873988 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 0115C 8087398C E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s index e4b4229f1f..1cc126db63 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s @@ -7,17 +7,17 @@ glabel func_80873C14 /* 013F8 80873C28 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B /* 013FC 80873C2C 15C10015 */ bne $t6, $at, .L80873C84 /* 01400 80873C30 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01404 80873C34 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01404 80873C34 3C040600 */ lui $a0, %hi(D_06005E60) ## $a0 = 06000000 /* 01408 80873C38 0C028800 */ jal SkelAnime_GetFrameCount -/* 0140C 80873C3C 24845E60 */ addiu $a0, $a0, 0x5E60 ## $a0 = 06005E60 +/* 0140C 80873C3C 24845E60 */ addiu $a0, $a0, %lo(D_06005E60) ## $a0 = 06005E60 /* 01410 80873C40 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01414 80873C44 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01418 80873C48 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 /* 0141C 80873C4C 46802020 */ cvt.s.w $f0, $f4 -/* 01420 80873C50 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 01420 80873C50 3C050600 */ lui $a1, %hi(D_06005E60) ## $a1 = 06000000 /* 01424 80873C54 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 01428 80873C58 24A55E60 */ addiu $a1, $a1, 0x5E60 ## $a1 = 06005E60 +/* 01428 80873C58 24A55E60 */ addiu $a1, $a1, %lo(D_06005E60) ## $a1 = 06005E60 /* 0142C 80873C5C 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 01430 80873C60 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01434 80873C64 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C @@ -37,9 +37,9 @@ glabel func_80873C14 /* 01460 80873C90 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01464 80873C94 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 /* 01468 80873C98 46804020 */ cvt.s.w $f0, $f8 -/* 0146C 80873C9C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0146C 80873C9C 3C050600 */ lui $a1, %hi(D_0600092C) ## $a1 = 06000000 /* 01470 80873CA0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01474 80873CA4 24A5092C */ addiu $a1, $a1, 0x092C ## $a1 = 0600092C +/* 01474 80873CA4 24A5092C */ addiu $a1, $a1, %lo(D_0600092C) ## $a1 = 0600092C /* 01478 80873CA8 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 0147C 80873CAC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01480 80873CB0 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s index 99a6882b34..5619428d48 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s @@ -28,17 +28,17 @@ glabel func_80873EA4 /* 016DC 80873F0C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 016E0 80873F10 17210015 */ bne $t9, $at, .L80873F68 /* 016E4 80873F14 00000000 */ nop -/* 016E8 80873F18 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 016E8 80873F18 3C040601 */ lui $a0, %hi(D_06008698) ## $a0 = 06010000 /* 016EC 80873F1C 0C028800 */ jal SkelAnime_GetFrameCount -/* 016F0 80873F20 24848698 */ addiu $a0, $a0, 0x8698 ## $a0 = 06008698 +/* 016F0 80873F20 24848698 */ addiu $a0, $a0, %lo(D_06008698) ## $a0 = 06008698 /* 016F4 80873F24 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 016F8 80873F28 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 016FC 80873F2C 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 /* 01700 80873F30 46802020 */ cvt.s.w $f0, $f4 -/* 01704 80873F34 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 01704 80873F34 3C050601 */ lui $a1, %hi(D_06008698) ## $a1 = 06010000 /* 01708 80873F38 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 0170C 80873F3C 24A58698 */ addiu $a1, $a1, 0x8698 ## $a1 = 06008698 +/* 0170C 80873F3C 24A58698 */ addiu $a1, $a1, %lo(D_06008698) ## $a1 = 06008698 /* 01710 80873F40 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 01714 80873F44 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01718 80873F48 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C @@ -58,9 +58,9 @@ glabel func_80873EA4 /* 01744 80873F74 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01748 80873F78 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 /* 0174C 80873F7C 46804020 */ cvt.s.w $f0, $f8 -/* 01750 80873F80 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 01750 80873F80 3C050600 */ lui $a1, %hi(D_060031C0) ## $a1 = 06000000 /* 01754 80873F84 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 01758 80873F88 24A531C0 */ addiu $a1, $a1, 0x31C0 ## $a1 = 060031C0 +/* 01758 80873F88 24A531C0 */ addiu $a1, $a1, %lo(D_060031C0) ## $a1 = 060031C0 /* 0175C 80873F8C 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 01760 80873F90 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01764 80873F94 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s index f50b1bfe74..5ceb9dc677 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s @@ -109,16 +109,16 @@ glabel func_80873FD8 /* 01918 80874148 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0191C 8087414C 15810014 */ bne $t4, $at, .L808741A0 /* 01920 80874150 00000000 */ nop -/* 01924 80874154 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 01924 80874154 3C040602 */ lui $a0, %hi(D_0601D514) ## $a0 = 06020000 /* 01928 80874158 0C028800 */ jal SkelAnime_GetFrameCount -/* 0192C 8087415C 2484D514 */ addiu $a0, $a0, 0xD514 ## $a0 = 0601D514 +/* 0192C 8087415C 2484D514 */ addiu $a0, $a0, %lo(D_0601D514) ## $a0 = 0601D514 /* 01930 80874160 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 01934 80874164 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01938 80874168 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 /* 0193C 8087416C 46809020 */ cvt.s.w $f0, $f18 -/* 01940 80874170 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 -/* 01944 80874174 24A5D514 */ addiu $a1, $a1, 0xD514 ## $a1 = 0601D514 +/* 01940 80874170 3C050602 */ lui $a1, %hi(D_0601D514) ## $a1 = 06020000 +/* 01944 80874174 24A5D514 */ addiu $a1, $a1, %lo(D_0601D514) ## $a1 = 0601D514 /* 01948 80874178 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0194C 8087417C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01950 80874180 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C @@ -138,8 +138,8 @@ glabel func_80873FD8 /* 0197C 808741AC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01980 808741B0 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 /* 01984 808741B4 46803020 */ cvt.s.w $f0, $f6 -/* 01988 808741B8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0198C 808741BC 24A51DF0 */ addiu $a1, $a1, 0x1DF0 ## $a1 = 06001DF0 +/* 01988 808741B8 3C050600 */ lui $a1, %hi(D_06001DF0) ## $a1 = 06000000 +/* 0198C 808741BC 24A51DF0 */ addiu $a1, $a1, %lo(D_06001DF0) ## $a1 = 06001DF0 /* 01990 808741C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01994 808741C4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01998 808741C8 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C @@ -173,17 +173,17 @@ glabel func_80873FD8 /* 019FC 8087422C 850900A4 */ lh $t1, 0x00A4($t0) ## 000000A4 /* 01A00 80874230 15210015 */ bne $t1, $at, .L80874288 /* 01A04 80874234 00000000 */ nop -/* 01A08 80874238 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01A08 80874238 3C040600 */ lui $a0, %hi(D_060069E8) ## $a0 = 06000000 /* 01A0C 8087423C 0C028800 */ jal SkelAnime_GetFrameCount -/* 01A10 80874240 248469E8 */ addiu $a0, $a0, 0x69E8 ## $a0 = 060069E8 +/* 01A10 80874240 248469E8 */ addiu $a0, $a0, %lo(D_060069E8) ## $a0 = 060069E8 /* 01A14 80874244 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 01A18 80874248 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01A1C 8087424C 44818000 */ mtc1 $at, $f16 ## $f16 = -10.00 /* 01A20 80874250 46805020 */ cvt.s.w $f0, $f10 -/* 01A24 80874254 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 01A24 80874254 3C050600 */ lui $a1, %hi(D_060069E8) ## $a1 = 06000000 /* 01A28 80874258 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 01A2C 8087425C 24A569E8 */ addiu $a1, $a1, 0x69E8 ## $a1 = 060069E8 +/* 01A2C 8087425C 24A569E8 */ addiu $a1, $a1, %lo(D_060069E8) ## $a1 = 060069E8 /* 01A30 80874260 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01A34 80874264 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01A38 80874268 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C @@ -203,9 +203,9 @@ glabel func_80873FD8 /* 01A64 80874294 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01A68 80874298 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 /* 01A6C 8087429C 46809020 */ cvt.s.w $f0, $f18 -/* 01A70 808742A0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 01A70 808742A0 3C050600 */ lui $a1, %hi(D_06005810) ## $a1 = 06000000 /* 01A74 808742A4 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 01A78 808742A8 24A55810 */ addiu $a1, $a1, 0x5810 ## $a1 = 06005810 +/* 01A78 808742A8 24A55810 */ addiu $a1, $a1, %lo(D_06005810) ## $a1 = 06005810 /* 01A7C 808742AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01A80 808742B0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01A84 808742B4 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C 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 01a1f4a8b2..ca50a8cb2a 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 @@ -50,16 +50,16 @@ glabel func_80874304 /* 01B78 808743A8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01B7C 808743AC 17210014 */ bne $t9, $at, .L80874400 /* 01B80 808743B0 00000000 */ nop -/* 01B84 808743B4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01B84 808743B4 3C040600 */ lui $a0, %hi(D_06007CA8) ## $a0 = 06000000 /* 01B88 808743B8 0C028800 */ jal SkelAnime_GetFrameCount -/* 01B8C 808743BC 24847CA8 */ addiu $a0, $a0, 0x7CA8 ## $a0 = 06007CA8 +/* 01B8C 808743BC 24847CA8 */ addiu $a0, $a0, %lo(D_06007CA8) ## $a0 = 06007CA8 /* 01B90 808743C0 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 01B94 808743C4 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01B98 808743C8 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 01B9C 808743CC 46808020 */ cvt.s.w $f0, $f16 -/* 01BA0 808743D0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01BA4 808743D4 24A57CA8 */ addiu $a1, $a1, 0x7CA8 ## $a1 = 06007CA8 +/* 01BA0 808743D0 3C050600 */ lui $a1, %hi(D_06007CA8) ## $a1 = 06000000 +/* 01BA4 808743D4 24A57CA8 */ addiu $a1, $a1, %lo(D_06007CA8) ## $a1 = 06007CA8 /* 01BA8 808743D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01BAC 808743DC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01BB0 808743E0 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C @@ -79,8 +79,8 @@ glabel func_80874304 /* 01BDC 8087440C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01BE0 80874410 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 /* 01BE4 80874414 46802020 */ cvt.s.w $f0, $f4 -/* 01BE8 80874418 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01BEC 8087441C 24A54344 */ addiu $a1, $a1, 0x4344 ## $a1 = 06004344 +/* 01BE8 80874418 3C050600 */ lui $a1, %hi(D_06004344) ## $a1 = 06000000 +/* 01BEC 8087441C 24A54344 */ addiu $a1, $a1, %lo(D_06004344) ## $a1 = 06004344 /* 01BF0 80874420 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01BF4 80874424 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01BF8 80874428 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C 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 5f36030476..e5ff14cdb5 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 @@ -48,10 +48,10 @@ glabel func_808751A0 /* 029EC 8087521C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 029F0 80875220 8FB200A4 */ lw $s2, 0x00A4($sp) /* 029F4 80875224 1701006B */ bne $t8, $at, .L808753D4 -/* 029F8 80875228 3C020600 */ lui $v0, 0x0600 ## $v0 = 06000000 +/* 029F8 80875228 3C020600 */ lui $v0, %hi(D_060058D8) ## $v0 = 06000000 /* 029FC 8087522C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02A00 80875230 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 02A04 80875234 244258D8 */ addiu $v0, $v0, 0x58D8 ## $v0 = 060058D8 +/* 02A04 80875234 244258D8 */ addiu $v0, $v0, %lo(D_060058D8) ## $v0 = 060058D8 /* 02A08 80875238 0002C900 */ sll $t9, $v0, 4 /* 02A0C 8087523C 02419021 */ addu $s2, $s2, $at /* 02A10 80875240 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 @@ -63,8 +63,8 @@ glabel func_808751A0 /* 02A28 80875258 0041B024 */ and $s6, $v0, $at /* 02A2C 8087525C 1660001A */ bne $s3, $zero, .L808752C8 /* 02A30 80875260 012AA821 */ addu $s5, $t1, $t2 -/* 02A34 80875264 3C020600 */ lui $v0, 0x0600 ## $v0 = 06000000 -/* 02A38 80875268 24425860 */ addiu $v0, $v0, 0x5860 ## $v0 = 06005860 +/* 02A34 80875264 3C020600 */ lui $v0, %hi(D_06005860) ## $v0 = 06000000 +/* 02A38 80875268 24425860 */ addiu $v0, $v0, %lo(D_06005860) ## $v0 = 06005860 /* 02A3C 8087526C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 02A40 80875270 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 02A44 80875274 00412824 */ and $a1, $v0, $at diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Draw.s index cb7e45b3d1..c4220bdc42 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Draw.s @@ -42,8 +42,8 @@ glabel BgGndFiremeiro_Draw /* 00494 80879954 0C0346A2 */ jal Matrix_NewMtx /* 00498 80879958 AFA20028 */ sw $v0, 0x0028($sp) /* 0049C 8087995C 8FA30028 */ lw $v1, 0x0028($sp) -/* 004A0 80879960 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 -/* 004A4 80879964 256BE210 */ addiu $t3, $t3, 0xE210 ## $t3 = 0600E210 +/* 004A0 80879960 3C0B0601 */ lui $t3, %hi(D_0600E210) ## $t3 = 06010000 +/* 004A4 80879964 256BE210 */ addiu $t3, $t3, %lo(D_0600E210) ## $t3 = 0600E210 /* 004A8 80879968 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 004AC 8087996C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 004B0 80879970 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Init.s index 1243e153cd..6ae256e0c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Init.s @@ -29,8 +29,8 @@ glabel BgGndFiremeiro_Init /* 00064 80879524 0C010D20 */ jal DynaPolyInfo_SetActorMove /* 00068 80879528 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0006C 8087952C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00070 80879530 2484ECD8 */ addiu $a0, $a0, 0xECD8 ## $a0 = 0600ECD8 +/* 0006C 8087952C 3C040601 */ lui $a0, %hi(D_0600ECD8) ## $a0 = 06010000 +/* 00070 80879530 2484ECD8 */ addiu $a0, $a0, %lo(D_0600ECD8) ## $a0 = 0600ECD8 /* 00074 80879534 0C010620 */ jal DynaPolyInfo_Alloc /* 00078 80879538 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Draw.s index 91787d7419..48be41a8ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Draw.s @@ -3,10 +3,10 @@ glabel BgGndIceblock_Draw /* 00C54 8087A6F4 AFA40018 */ sw $a0, 0x0018($sp) /* 00C58 8087A6F8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00C5C 8087A6FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C60 8087A700 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00C60 8087A700 3C050600 */ lui $a1, %hi(D_06004420) ## $a1 = 06000000 /* 00C64 8087A704 0C00D498 */ jal Gfx_DrawDListOpa -/* 00C68 8087A708 24A54420 */ addiu $a1, $a1, 0x4420 ## $a1 = 06004420 +/* 00C68 8087A708 24A54420 */ addiu $a1, $a1, %lo(D_06004420) ## $a1 = 06004420 /* 00C6C 8087A70C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00C70 8087A710 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C74 8087A714 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Init.s index 71eb3ed87b..34b63a7c8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Init.s @@ -38,8 +38,8 @@ glabel BgGndIceblock_Init /* 00028 80879AC8 0C010D20 */ jal DynaPolyInfo_SetActorMove /* 0002C 80879ACC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00030 80879AD0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00034 80879AD4 24844618 */ addiu $a0, $a0, 0x4618 ## $a0 = 06004618 +/* 00030 80879AD0 3C040600 */ lui $a0, %hi(D_06004618) ## $a0 = 06000000 +/* 00034 80879AD4 24844618 */ addiu $a0, $a0, %lo(D_06004618) ## $a0 = 06004618 /* 00038 80879AD8 0C010620 */ jal DynaPolyInfo_Alloc /* 0003C 80879ADC 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s index 217c650931..51c951fbc7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s @@ -35,10 +35,10 @@ glabel BgHakaGate_Draw /* 00CA0 8087CA90 31F80080 */ andi $t8, $t7, 0x0080 ## $t8 = 00000000 /* 00CA4 8087CA94 17010006 */ bne $t8, $at, .L8087CAB0 /* 00CA8 8087CA98 8FB90094 */ lw $t9, 0x0094($sp) -/* 00CAC 8087CA9C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 00CAC 8087CA9C 3C050601 */ lui $a1, %hi(D_0600F1B0) ## $a1 = 06010000 /* 00CB0 8087CAA0 0C00D4C9 */ jal Gfx_DrawDListXlu -/* 00CB4 8087CAA4 24A5F1B0 */ addiu $a1, $a1, 0xF1B0 ## $a1 = 0600F1B0 +/* 00CB4 8087CAA4 24A5F1B0 */ addiu $a1, $a1, %lo(D_0600F1B0) ## $a1 = 0600F1B0 /* 00CB8 8087CAA8 1000007C */ beq $zero, $zero, .L8087CC9C /* 00CBC 8087CAAC 8FA40090 */ lw $a0, 0x0090($sp) .L8087CAB0: @@ -96,8 +96,8 @@ glabel BgHakaGate_Draw /* 00D8C 8087CB7C 0C0346A2 */ jal Matrix_NewMtx /* 00D90 8087CB80 AFA20034 */ sw $v0, 0x0034($sp) /* 00D94 8087CB84 8FA30034 */ lw $v1, 0x0034($sp) -/* 00D98 8087CB88 3C190601 */ lui $t9, 0x0601 ## $t9 = 06010000 -/* 00D9C 8087CB8C 27390A10 */ addiu $t9, $t9, 0x0A10 ## $t9 = 06010A10 +/* 00D98 8087CB88 3C190601 */ lui $t9, %hi(D_06010A10) ## $t9 = 06010000 +/* 00D9C 8087CB8C 27390A10 */ addiu $t9, $t9, %lo(D_06010A10) ## $t9 = 06010A10 /* 00DA0 8087CB90 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00DA4 8087CB94 8E0202C0 */ lw $v0, 0x02C0($s0) ## 808802C0 /* 00DA8 8087CB98 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 @@ -143,8 +143,8 @@ glabel BgHakaGate_Draw /* 00E48 8087CC38 0C0346A2 */ jal Matrix_NewMtx /* 00E4C 8087CC3C AFA2002C */ sw $v0, 0x002C($sp) /* 00E50 8087CC40 8FA3002C */ lw $v1, 0x002C($sp) -/* 00E54 8087CC44 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 -/* 00E58 8087CC48 27180C10 */ addiu $t8, $t8, 0x0C10 ## $t8 = 06010C10 +/* 00E54 8087CC44 3C180601 */ lui $t8, %hi(D_06010C10) ## $t8 = 06010000 +/* 00E58 8087CC48 27180C10 */ addiu $t8, $t8, %lo(D_06010C10) ## $t8 = 06010C10 /* 00E5C 8087CC4C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00E60 8087CC50 8E0202C0 */ lw $v0, 0x02C0($s0) ## 808802C0 /* 00E64 8087CC54 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Init.s index bbe6c737a3..3796f4c680 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Init.s @@ -117,8 +117,8 @@ glabel BgHakaGate_Init .L8087BF8C: /* 0019C 8087BF8C 14400015 */ bne $v0, $zero, .L8087BFE4 /* 001A0 8087BF90 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 001A4 8087BF94 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 001A8 8087BF98 248431C4 */ addiu $a0, $a0, 0x31C4 ## $a0 = 060131C4 +/* 001A4 8087BF94 3C040601 */ lui $a0, %hi(D_060131C4) ## $a0 = 06010000 +/* 001A8 8087BF98 248431C4 */ addiu $a0, $a0, %lo(D_060131C4) ## $a0 = 060131C4 /* 001AC 8087BF9C 0C010620 */ jal DynaPolyInfo_Alloc /* 001B0 8087BFA0 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 @@ -143,8 +143,8 @@ glabel BgHakaGate_Init .L8087BFE4: /* 001F4 8087BFE4 14410011 */ bne $v0, $at, .L8087C02C /* 001F8 8087BFE8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 001FC 8087BFEC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00200 8087BFF0 24840E10 */ addiu $a0, $a0, 0x0E10 ## $a0 = 06010E10 +/* 001FC 8087BFEC 3C040601 */ lui $a0, %hi(D_06010E10) ## $a0 = 06010000 +/* 00200 8087BFF0 24840E10 */ addiu $a0, $a0, %lo(D_06010E10) ## $a0 = 06010E10 /* 00204 8087BFF4 0C010620 */ jal DynaPolyInfo_Alloc /* 00208 8087BFF8 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s index 7008d8c6a4..9a10504335 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s @@ -133,8 +133,8 @@ glabel func_8087C85C /* 00C24 8087CA14 0C0346A2 */ jal Matrix_NewMtx /* 00C28 8087CA18 AFA2004C */ sw $v0, 0x004C($sp) /* 00C2C 8087CA1C 8FA3004C */ lw $v1, 0x004C($sp) -/* 00C30 8087CA20 3C0C0405 */ lui $t4, 0x0405 ## $t4 = 04050000 -/* 00C34 8087CA24 258CD4E0 */ addiu $t4, $t4, 0xD4E0 ## $t4 = 0404D4E0 +/* 00C30 8087CA20 3C0C0405 */ lui $t4, %hi(D_0404D4E0) ## $t4 = 04050000 +/* 00C34 8087CA24 258CD4E0 */ addiu $t4, $t4, %lo(D_0404D4E0) ## $t4 = 0404D4E0 /* 00C38 8087CA28 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00C3C 8087CA2C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00C40 8087CA30 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Draw.s index 8e426f9acd..801fc4a4f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Draw.s @@ -3,10 +3,10 @@ glabel BgHakaHuta_Draw /* 00934 8087D8F4 AFA40018 */ sw $a0, 0x0018($sp) /* 00938 8087D8F8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0093C 8087D8FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00940 8087D900 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00940 8087D900 3C050600 */ lui $a1, %hi(D_060006B0) ## $a1 = 06000000 /* 00944 8087D904 0C00D498 */ jal Gfx_DrawDListOpa -/* 00948 8087D908 24A506B0 */ addiu $a1, $a1, 0x06B0 ## $a1 = 060006B0 +/* 00948 8087D908 24A506B0 */ addiu $a1, $a1, %lo(D_060006B0) ## $a1 = 060006B0 /* 0094C 8087D90C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00950 8087D910 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00954 8087D914 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Init.s index bf8aef8f99..50f8d4eb44 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Init.s @@ -13,8 +13,8 @@ glabel BgHakaHuta_Init /* 00028 8087CFE8 0C010D20 */ jal DynaPolyInfo_SetActorMove /* 0002C 8087CFEC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00030 8087CFF0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00034 8087CFF4 24840870 */ addiu $a0, $a0, 0x0870 ## $a0 = 06000870 +/* 00030 8087CFF0 3C040600 */ lui $a0, %hi(D_06000870) ## $a0 = 06000000 +/* 00034 8087CFF4 24840870 */ addiu $a0, $a0, %lo(D_06000870) ## $a0 = 06000870 /* 00038 8087CFF8 0C010620 */ jal DynaPolyInfo_Alloc /* 0003C 8087CFFC 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087EDC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087EDC0.s index 3b33feb5e0..77016a89f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087EDC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087EDC0.s @@ -6,10 +6,10 @@ glabel func_8087EDC0 /* 008F0 8087EDD0 51C00008 */ beql $t6, $zero, .L8087EDF4 /* 008F4 8087EDD4 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 008F8 8087EDD8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 008FC 8087EDDC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 008FC 8087EDDC 3C050601 */ lui $a1, %hi(D_0600BF20) ## $a1 = 06010000 /* 00900 8087EDE0 0C00D4C9 */ jal Gfx_DrawDListXlu -/* 00904 8087EDE4 24A5BF20 */ addiu $a1, $a1, 0xBF20 ## $a1 = 0600BF20 +/* 00904 8087EDE4 24A5BF20 */ addiu $a1, $a1, %lo(D_0600BF20) ## $a1 = 0600BF20 /* 00908 8087EDE8 1000000F */ beq $zero, $zero, .L8087EE28 /* 0090C 8087EDEC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00910 8087EDF0 848F001C */ lh $t7, 0x001C($a0) ## 0000001C @@ -18,8 +18,8 @@ glabel func_8087EDC0 /* 00918 8087EDF8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0091C 8087EDFC 15E00007 */ bne $t7, $zero, .L8087EE1C /* 00920 8087EE00 00000000 */ nop -/* 00924 8087EE04 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00928 8087EE08 24A5BF20 */ addiu $a1, $a1, 0xBF20 ## $a1 = 0600BF20 +/* 00924 8087EE04 3C050601 */ lui $a1, %hi(D_0600BF20) ## $a1 = 06010000 +/* 00928 8087EE08 24A5BF20 */ addiu $a1, $a1, %lo(D_0600BF20) ## $a1 = 0600BF20 /* 0092C 8087EE0C 0C00D498 */ jal Gfx_DrawDListOpa /* 00930 8087EE10 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Draw.s index 636e0bcc26..0edca3e8e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Draw.s @@ -67,8 +67,8 @@ glabel BgHakaShip_Draw /* 00730 8087F830 0C0346A2 */ jal Matrix_NewMtx /* 00734 8087F834 AFA20058 */ sw $v0, 0x0058($sp) /* 00738 8087F838 8FA30058 */ lw $v1, 0x0058($sp) -/* 0073C 8087F83C 3C0D0601 */ lui $t5, 0x0601 ## $t5 = 06010000 -/* 00740 8087F840 25ADD330 */ addiu $t5, $t5, 0xD330 ## $t5 = 0600D330 +/* 0073C 8087F83C 3C0D0601 */ lui $t5, %hi(D_0600D330) ## $t5 = 06010000 +/* 00740 8087F840 25ADD330 */ addiu $t5, $t5, %lo(D_0600D330) ## $t5 = 0600D330 /* 00744 8087F844 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00748 8087F848 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0074C 8087F84C 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 @@ -109,11 +109,11 @@ glabel BgHakaShip_Draw /* 007D8 8087F8D8 0C0346A2 */ jal Matrix_NewMtx /* 007DC 8087F8DC AFA20050 */ sw $v0, 0x0050($sp) /* 007E0 8087F8E0 8FA30050 */ lw $v1, 0x0050($sp) -/* 007E4 8087F8E4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 007E4 8087F8E4 3C040600 */ lui $a0, %hi(D_06005A70) ## $a0 = 06000000 /* 007E8 8087F8E8 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 007EC 8087F8EC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 007F0 8087F8F0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 007F4 8087F8F4 24845A70 */ addiu $a0, $a0, 0x5A70 ## $a0 = 06005A70 +/* 007F4 8087F8F4 24845A70 */ addiu $a0, $a0, %lo(D_06005A70) ## $a0 = 06005A70 /* 007F8 8087F8F8 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 /* 007FC 8087F8FC 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 00800 8087F900 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 @@ -167,8 +167,8 @@ glabel BgHakaShip_Draw /* 008BC 8087F9BC 0C0346A2 */ jal Matrix_NewMtx /* 008C0 8087F9C0 AFA20040 */ sw $v0, 0x0040($sp) /* 008C4 8087F9C4 8FA30040 */ lw $v1, 0x0040($sp) -/* 008C8 8087F9C8 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 -/* 008CC 8087F9CC 258CE910 */ addiu $t4, $t4, 0xE910 ## $t4 = 0600E910 +/* 008C8 8087F9C8 3C0C0601 */ lui $t4, %hi(D_0600E910) ## $t4 = 06010000 +/* 008CC 8087F9CC 258CE910 */ addiu $t4, $t4, %lo(D_0600E910) ## $t4 = 0600E910 /* 008D0 8087F9D0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 008D4 8087F9D4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 008D8 8087F9D8 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Init.s index 93775b9d3a..5347310ff7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Init.s @@ -15,16 +15,16 @@ glabel BgHakaShip_Init /* 0002C 8087F12C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00030 8087F130 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 00034 8087F134 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00038 8087F138 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 00038 8087F138 3C040601 */ lui $a0, %hi(D_0600ED7C) ## $a0 = 06010000 /* 0003C 8087F13C 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000000 /* 00040 8087F140 A608001C */ sh $t0, 0x001C($s0) ## 0000001C /* 00044 8087F144 8609001C */ lh $t1, 0x001C($s0) ## 0000001C /* 00048 8087F148 000EC203 */ sra $t8, $t6, 8 /* 0004C 8087F14C A2180169 */ sb $t8, 0x0169($s0) ## 00000169 /* 00050 8087F150 1520000B */ bne $t1, $zero, .L8087F180 -/* 00054 8087F154 2484ED7C */ addiu $a0, $a0, 0xED7C ## $a0 = 0600ED7C -/* 00058 8087F158 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 0005C 8087F15C 2484E408 */ addiu $a0, $a0, 0xE408 ## $a0 = 0600E408 +/* 00054 8087F154 2484ED7C */ addiu $a0, $a0, %lo(D_0600ED7C) ## $a0 = 0600ED7C +/* 00058 8087F158 3C040601 */ lui $a0, %hi(D_0600E408) ## $a0 = 06010000 +/* 0005C 8087F15C 2484E408 */ addiu $a0, $a0, %lo(D_0600E408) ## $a0 = 0600E408 /* 00060 8087F160 0C010620 */ jal DynaPolyInfo_Alloc /* 00064 8087F164 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFF4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882A70.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882A70.s index 407b843cb8..c6f8c3ddfb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882A70.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882A70.s @@ -35,8 +35,8 @@ glabel func_80882A70 /* 00514 80882AD4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00518 80882AD8 AFA00024 */ sw $zero, 0x0024($sp) /* 0051C 80882ADC 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00520 80882AE0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00524 80882AE4 24846F70 */ addiu $a0, $a0, 0x6F70 ## $a0 = 06006F70 +/* 00520 80882AE0 3C040600 */ lui $a0, %hi(D_06006F70) ## $a0 = 06000000 +/* 00524 80882AE4 24846F70 */ addiu $a0, $a0, %lo(D_06006F70) ## $a0 = 06006F70 /* 00528 80882AE8 14400013 */ bne $v0, $zero, .L80882B38 /* 0052C 80882AEC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00530 80882AF0 0C010620 */ jal DynaPolyInfo_Alloc @@ -61,8 +61,8 @@ glabel func_80882A70 .L80882B38: /* 00578 80882B38 14410008 */ bne $v0, $at, .L80882B5C /* 0057C 80882B3C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00580 80882B40 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00584 80882B44 24845E30 */ addiu $a0, $a0, 0x5E30 ## $a0 = 06005E30 +/* 00580 80882B40 3C040600 */ lui $a0, %hi(D_06005E30) ## $a0 = 06000000 +/* 00584 80882B44 24845E30 */ addiu $a0, $a0, %lo(D_06005E30) ## $a0 = 06005E30 /* 00588 80882B48 0C010620 */ jal DynaPolyInfo_Alloc /* 0058C 80882B4C 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFFC diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882E54.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882E54.s index 5f4287e764..bd4a043195 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882E54.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882E54.s @@ -16,9 +16,9 @@ glabel func_80882E54 /* 008CC 80882E8C 4481A000 */ mtc1 $at, $f20 ## $f20 = 10.00 /* 008D0 80882E90 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 008D4 80882E94 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 008D8 80882E98 3C160600 */ lui $s6, 0x0600 ## $s6 = 06000000 +/* 008D8 80882E98 3C160600 */ lui $s6, %hi(D_06000A10) ## $s6 = 06000000 /* 008DC 80882E9C 468021A0 */ cvt.s.w $f6, $f4 -/* 008E0 80882EA0 26D60A10 */ addiu $s6, $s6, 0x0A10 ## $s6 = 06000A10 +/* 008E0 80882EA0 26D60A10 */ addiu $s6, $s6, %lo(D_06000A10) ## $s6 = 06000A10 /* 008E4 80882EA4 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 008E8 80882EA8 27B30074 */ addiu $s3, $sp, 0x0074 ## $s3 = FFFFFFF4 /* 008EC 80882EAC 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Draw.s index ba689bf6a5..53036c80ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Draw.s @@ -54,8 +54,8 @@ glabel BgHidanHamstep_Draw /* 00CC0 80888D00 5560000A */ bnel $t3, $zero, .L80888D2C /* 00CC4 80888D04 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00CC8 80888D08 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00CCC 80888D0C 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 00CD0 80888D10 25CEA668 */ addiu $t6, $t6, 0xA668 ## $t6 = 0600A668 +/* 00CCC 80888D0C 3C0E0601 */ lui $t6, %hi(D_0600A668) ## $t6 = 06010000 +/* 00CD0 80888D10 25CEA668 */ addiu $t6, $t6, %lo(D_0600A668) ## $t6 = 0600A668 /* 00CD4 80888D14 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 00CD8 80888D18 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 00CDC 80888D1C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 @@ -63,8 +63,8 @@ glabel BgHidanHamstep_Draw /* 00CE4 80888D24 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 00CE8 80888D28 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 .L80888D2C: -/* 00CEC 80888D2C 3C190601 */ lui $t9, 0x0601 ## $t9 = 06010000 -/* 00CF0 80888D30 2739A548 */ addiu $t9, $t9, 0xA548 ## $t9 = 0600A548 +/* 00CEC 80888D2C 3C190601 */ lui $t9, %hi(D_0600A548) ## $t9 = 06010000 +/* 00CF0 80888D30 2739A548 */ addiu $t9, $t9, %lo(D_0600A548) ## $t9 = 0600A548 /* 00CF4 80888D34 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 00CF8 80888D38 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 /* 00CFC 80888D3C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Init.s index 8813fa8302..5b53ae4bf9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Init.s @@ -95,8 +95,8 @@ glabel BgHidanHamstep_Init .L808882E4: /* 002A4 808882E4 14400007 */ bne $v0, $zero, .L80888304 /* 002A8 808882E8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 002AC 808882EC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 002B0 808882F0 2484DE44 */ addiu $a0, $a0, 0xDE44 ## $a0 = 0600DE44 +/* 002AC 808882EC 3C040601 */ lui $a0, %hi(D_0600DE44) ## $a0 = 06010000 +/* 002B0 808882F0 2484DE44 */ addiu $a0, $a0, %lo(D_0600DE44) ## $a0 = 0600DE44 /* 002B4 808882F4 0C010620 */ jal DynaPolyInfo_Alloc /* 002B8 808882F8 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFF4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Init.s index a7124e3cf8..12a9621282 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Init.s @@ -194,8 +194,8 @@ glabel BgHidanHrock_Init .L808893E0: /* 002B0 808893E0 14400007 */ bne $v0, $zero, .L80889400 /* 002B4 808893E4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 002B8 808893E8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 002BC 808893EC 2484D054 */ addiu $a0, $a0, 0xD054 ## $a0 = 0600D054 +/* 002B8 808893E8 3C040601 */ lui $a0, %hi(D_0600D054) ## $a0 = 06010000 +/* 002BC 808893EC 2484D054 */ addiu $a0, $a0, %lo(D_0600D054) ## $a0 = 0600D054 /* 002C0 808893F0 0C010620 */ jal DynaPolyInfo_Alloc /* 002C4 808893F4 27A50070 */ addiu $a1, $sp, 0x0070 ## $a1 = FFFFFFC0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A3B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A3B0.s index 73ddbd91e0..db011de5e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A3B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A3B0.s @@ -39,11 +39,11 @@ glabel func_8088A3B0 /* 00408 8088A428 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 0040C 8088A42C 2402FFD0 */ addiu $v0, $zero, 0xFFD0 ## $v0 = FFFFFFD0 /* 00410 8088A430 264E0024 */ addiu $t6, $s2, 0x0024 ## $t6 = 00000024 -/* 00414 8088A434 3C1E0500 */ lui $s8, 0x0500 ## $s8 = 05000000 +/* 00414 8088A434 3C1E0500 */ lui $s8, %hi(D_05000530) ## $s8 = 05000000 /* 00418 8088A438 4481E000 */ mtc1 $at, $f28 ## $f28 = 8.00 /* 0041C 8088A43C 46000686 */ mov.s $f26, $f0 /* 00420 8088A440 E7A800DC */ swc1 $f8, 0x00DC($sp) -/* 00424 8088A444 27DE0530 */ addiu $s8, $s8, 0x0530 ## $s8 = 05000530 +/* 00424 8088A444 27DE0530 */ addiu $s8, $s8, %lo(D_05000530) ## $s8 = 05000530 /* 00428 8088A448 AFAE00A4 */ sw $t6, 0x00A4($sp) /* 0042C 8088A44C AFA200B8 */ sw $v0, 0x00B8($sp) /* 00430 8088A450 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A67C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A67C.s index b15d28b9d7..aed8ed8f03 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A67C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A67C.s @@ -33,10 +33,10 @@ glabel func_8088A67C /* 006BC 8088A6DC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 006C0 8088A6E0 4481F000 */ mtc1 $at, $f30 ## $f30 = 3.00 /* 006C4 8088A6E4 3C014130 */ lui $at, 0x4130 ## $at = 41300000 -/* 006C8 8088A6E8 3C1E0500 */ lui $s8, 0x0500 ## $s8 = 05000000 +/* 006C8 8088A6E8 3C1E0500 */ lui $s8, %hi(D_05000530) ## $s8 = 05000000 /* 006CC 8088A6EC 4481E000 */ mtc1 $at, $f28 ## $f28 = 11.00 /* 006D0 8088A6F0 46000686 */ mov.s $f26, $f0 -/* 006D4 8088A6F4 27DE0530 */ addiu $s8, $s8, 0x0530 ## $s8 = 05000530 +/* 006D4 8088A6F4 27DE0530 */ addiu $s8, $s8, %lo(D_05000530) ## $s8 = 05000530 /* 006D8 8088A6F8 26950024 */ addiu $s5, $s4, 0x0024 ## $s5 = 00000024 /* 006DC 8088A6FC AFA000A8 */ sw $zero, 0x00A8($sp) /* 006E0 8088A700 27B700D4 */ addiu $s7, $sp, 0x00D4 ## $s7 = FFFFFFEC diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A914.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A914.s index 43aabae367..c91554a6bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A914.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A914.s @@ -33,10 +33,10 @@ glabel func_8088A914 /* 00954 8088A974 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 00958 8088A978 4481F000 */ mtc1 $at, $f30 ## $f30 = 14.00 /* 0095C 8088A97C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00960 8088A980 3C1E0500 */ lui $s8, 0x0500 ## $s8 = 05000000 +/* 00960 8088A980 3C1E0500 */ lui $s8, %hi(D_05000530) ## $s8 = 05000000 /* 00964 8088A984 4481E000 */ mtc1 $at, $f28 ## $f28 = 6.00 /* 00968 8088A988 46000686 */ mov.s $f26, $f0 -/* 0096C 8088A98C 27DE0530 */ addiu $s8, $s8, 0x0530 ## $s8 = 05000530 +/* 0096C 8088A98C 27DE0530 */ addiu $s8, $s8, %lo(D_05000530) ## $s8 = 05000530 /* 00970 8088A990 26950024 */ addiu $s5, $s4, 0x0024 ## $s5 = 00000024 /* 00974 8088A994 AFA000A8 */ sw $zero, 0x00A8($sp) /* 00978 8088A998 27B700D4 */ addiu $s7, $sp, 0x00D4 ## $s7 = FFFFFFEC diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Draw.s index 46369f95aa..0abc38d658 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Draw.s @@ -9,17 +9,17 @@ glabel BgHidanRock_Draw /* 00E20 8088BEA0 15C00007 */ bne $t6, $zero, .L8088BEC0 /* 00E24 8088BEA4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E28 8088BEA8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00E2C 8088BEAC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 00E2C 8088BEAC 3C050601 */ lui $a1, %hi(D_0600C100) ## $a1 = 06010000 /* 00E30 8088BEB0 0C00D498 */ jal Gfx_DrawDListOpa -/* 00E34 8088BEB4 24A5C100 */ addiu $a1, $a1, 0xC100 ## $a1 = 0600C100 +/* 00E34 8088BEB4 24A5C100 */ addiu $a1, $a1, %lo(D_0600C100) ## $a1 = 0600C100 /* 00E38 8088BEB8 10000005 */ beq $zero, $zero, .L8088BED0 /* 00E3C 8088BEBC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L8088BEC0: -/* 00E40 8088BEC0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 00E40 8088BEC0 3C050601 */ lui $a1, %hi(D_0600C1F0) ## $a1 = 06010000 /* 00E44 8088BEC4 0C00D498 */ jal Gfx_DrawDListOpa -/* 00E48 8088BEC8 24A5C1F0 */ addiu $a1, $a1, 0xC1F0 ## $a1 = 0600C1F0 +/* 00E48 8088BEC8 24A5C1F0 */ addiu $a1, $a1, %lo(D_0600C1F0) ## $a1 = 0600C1F0 /* 00E4C 8088BECC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L8088BED0: /* 00E50 8088BED0 C606016C */ lwc1 $f6, 0x016C($s0) ## 0000016C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Init.s index 7cd0e84026..18f88de234 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Init.s @@ -34,8 +34,8 @@ glabel BgHidanRock_Init /* 00074 8088B0F4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00078 8088B0F8 92090168 */ lbu $t1, 0x0168($s0) ## 00000168 -/* 0007C 8088B0FC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00080 8088B100 2484DF78 */ addiu $a0, $a0, 0xDF78 ## $a0 = 0600DF78 +/* 0007C 8088B0FC 3C040601 */ lui $a0, %hi(D_0600DF78) ## $a0 = 06010000 +/* 00080 8088B100 2484DF78 */ addiu $a0, $a0, %lo(D_0600DF78) ## $a0 = 0600DF78 /* 00084 8088B104 1520001F */ bne $t1, $zero, .L8088B184 /* 00088 8088B108 00000000 */ nop /* 0008C 8088B10C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 @@ -65,8 +65,8 @@ glabel BgHidanRock_Init /* 000DC 8088B15C AE0C0164 */ sw $t4, 0x0164($s0) ## 00000164 .L8088B160: /* 000E0 8088B160 8E0D0004 */ lw $t5, 0x0004($s0) ## 00000004 -/* 000E4 8088B164 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 000E8 8088B168 2484CB80 */ addiu $a0, $a0, 0xCB80 ## $a0 = 0600CB80 +/* 000E4 8088B164 3C040601 */ lui $a0, %hi(D_0600CB80) ## $a0 = 06010000 +/* 000E8 8088B168 2484CB80 */ addiu $a0, $a0, %lo(D_0600CB80) ## $a0 = 0600CB80 /* 000EC 8088B16C 35AE0030 */ ori $t6, $t5, 0x0030 ## $t6 = 00000030 /* 000F0 8088B170 AE0E0004 */ sw $t6, 0x0004($s0) ## 00000004 /* 000F4 8088B174 0C010620 */ jal DynaPolyInfo_Alloc 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 142b51e992..90a976fac4 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 @@ -139,8 +139,8 @@ glabel func_8088BC40 /* 00DA4 8088BE24 0C0346A2 */ jal Matrix_NewMtx /* 00DA8 8088BE28 AFA20030 */ sw $v0, 0x0030($sp) /* 00DAC 8088BE2C 8FA30030 */ lw $v1, 0x0030($sp) -/* 00DB0 8088BE30 3C0D0601 */ lui $t5, 0x0601 ## $t5 = 06010000 -/* 00DB4 8088BE34 25ADCA10 */ addiu $t5, $t5, 0xCA10 ## $t5 = 0600CA10 +/* 00DB0 8088BE30 3C0D0601 */ lui $t5, %hi(D_0600CA10) ## $t5 = 06010000 +/* 00DB4 8088BE34 25ADCA10 */ addiu $t5, $t5, %lo(D_0600CA10) ## $t5 = 0600CA10 /* 00DB8 8088BE38 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00DBC 8088BE3C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00DC0 8088BE40 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s index 5950eb3759..466d5defd7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s @@ -50,8 +50,8 @@ glabel BgHidanSekizou_Draw /* 010B0 8088DF70 17000009 */ bne $t8, $zero, .L8088DF98 /* 010B4 8088DF74 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 010B8 8088DF78 8E6202C0 */ lw $v0, 0x02C0($s3) ## 000002C0 -/* 010BC 8088DF7C 3C090601 */ lui $t1, 0x0601 ## $t1 = 06010000 -/* 010C0 8088DF80 2529B0F8 */ addiu $t1, $t1, 0xB0F8 ## $t1 = 0600B0F8 +/* 010BC 8088DF7C 3C090601 */ lui $t1, %hi(D_0600B0F8) ## $t1 = 06010000 +/* 010C0 8088DF80 2529B0F8 */ addiu $t1, $t1, %lo(D_0600B0F8) ## $t1 = 0600B0F8 /* 010C4 8088DF84 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 010C8 8088DF88 AE7902C0 */ sw $t9, 0x02C0($s3) ## 000002C0 /* 010CC 8088DF8C AC490004 */ sw $t1, 0x0004($v0) ## 00000004 @@ -59,8 +59,8 @@ glabel BgHidanSekizou_Draw /* 010D4 8088DF94 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 .L8088DF98: /* 010D8 8088DF98 8E6202C0 */ lw $v0, 0x02C0($s3) ## 000002C0 -/* 010DC 8088DF9C 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 -/* 010E0 8088DFA0 258CABC8 */ addiu $t4, $t4, 0xABC8 ## $t4 = 0600ABC8 +/* 010DC 8088DF9C 3C0C0601 */ lui $t4, %hi(D_0600ABC8) ## $t4 = 06010000 +/* 010E0 8088DFA0 258CABC8 */ addiu $t4, $t4, %lo(D_0600ABC8) ## $t4 = 0600ABC8 /* 010E4 8088DFA4 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 010E8 8088DFA8 AE6A02C0 */ sw $t2, 0x02C0($s3) ## 000002C0 /* 010EC 8088DFAC AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Init.s index 871e50b815..992b83dd90 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Init.s @@ -59,8 +59,8 @@ glabel BgHidanSekizou_Init /* 0048C 8088D34C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 00490 8088D350 1612FFF3 */ bne $s0, $s2, .L8088D320 /* 00494 8088D354 00000000 */ nop -/* 00498 8088D358 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 0049C 8088D35C 2484CC90 */ addiu $a0, $a0, 0xCC90 ## $a0 = 0600CC90 +/* 00498 8088D358 3C040601 */ lui $a0, %hi(D_0600CC90) ## $a0 = 06010000 +/* 0049C 8088D35C 2484CC90 */ addiu $a0, $a0, %lo(D_0600CC90) ## $a0 = 0600CC90 /* 004A0 8088D360 0C010620 */ jal DynaPolyInfo_Alloc /* 004A4 8088D364 27A50040 */ addiu $a1, $sp, 0x0040 ## $a1 = FFFFFFF0 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 31f03295a3..7db256358f 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 @@ -157,10 +157,10 @@ glabel func_8088D9F4 /* 00D54 8088DC14 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 00D58 8088DC18 8FA8002C */ lw $t0, 0x002C($sp) /* 00D5C 8088DC1C 8FA30064 */ lw $v1, 0x0064($sp) -/* 00D60 8088DC20 3C0A0601 */ lui $t2, 0x0601 ## $t2 = 06010000 +/* 00D60 8088DC20 3C0A0601 */ lui $t2, %hi(D_0600DC30) ## $t2 = 06010000 /* 00D64 8088DC24 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 /* 00D68 8088DC28 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 00D6C 8088DC2C 254ADC30 */ addiu $t2, $t2, 0xDC30 ## $t2 = 0600DC30 +/* 00D6C 8088DC2C 254ADC30 */ addiu $t2, $t2, %lo(D_0600DC30) ## $t2 = 0600DC30 /* 00D70 8088DC30 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 /* 00D74 8088DC34 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 00D78 8088DC38 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s index 370751955a..20c818c9b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s @@ -50,8 +50,8 @@ glabel BgHidanSima_Draw /* 00CC0 8088F090 5520000A */ bnel $t1, $zero, .L8088F0BC /* 00CC4 8088F094 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00CC8 8088F098 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00CCC 8088F09C 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 -/* 00CD0 8088F0A0 258CC338 */ addiu $t4, $t4, 0xC338 ## $t4 = 0600C338 +/* 00CCC 8088F09C 3C0C0601 */ lui $t4, %hi(D_0600C338) ## $t4 = 06010000 +/* 00CD0 8088F0A0 258CC338 */ addiu $t4, $t4, %lo(D_0600C338) ## $t4 = 0600C338 /* 00CD4 8088F0A4 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 00CD8 8088F0A8 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 /* 00CDC 8088F0AC AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 @@ -59,8 +59,8 @@ glabel BgHidanSima_Draw /* 00CE4 8088F0B4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 00CE8 8088F0B8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 .L8088F0BC: -/* 00CEC 8088F0BC 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 -/* 00CF0 8088F0C0 25EFC470 */ addiu $t7, $t7, 0xC470 ## $t7 = 0600C470 +/* 00CEC 8088F0BC 3C0F0601 */ lui $t7, %hi(D_0600C470) ## $t7 = 06010000 +/* 00CF0 8088F0C0 25EFC470 */ addiu $t7, $t7, %lo(D_0600C470) ## $t7 = 0600C470 /* 00CF4 8088F0C4 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 00CF8 8088F0C8 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 /* 00CFC 8088F0CC AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Init.s index 3ac6f8435a..3881c3d710 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Init.s @@ -14,14 +14,14 @@ glabel BgHidanSima_Init /* 0002C 8088E3FC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00030 8088E400 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00034 8088E404 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 00034 8088E404 3C040601 */ lui $a0, %hi(D_0600FAE8) ## $a0 = 06010000 /* 00038 8088E408 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 /* 0003C 8088E40C 15C00006 */ bne $t6, $zero, .L8088E428 -/* 00040 8088E410 2484FAE8 */ addiu $a0, $a0, 0xFAE8 ## $a0 = 0600FAE8 -/* 00044 8088E414 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 00040 8088E410 2484FAE8 */ addiu $a0, $a0, %lo(D_0600FAE8) ## $a0 = 0600FAE8 +/* 00044 8088E414 3C040601 */ lui $a0, %hi(D_060120E8) ## $a0 = 06010000 /* 00048 8088E418 0C010620 */ jal DynaPolyInfo_Alloc -/* 0004C 8088E41C 248420E8 */ addiu $a0, $a0, 0x20E8 ## $a0 = 060120E8 +/* 0004C 8088E41C 248420E8 */ addiu $a0, $a0, %lo(D_060120E8) ## $a0 = 060120E8 /* 00050 8088E420 10000004 */ beq $zero, $zero, .L8088E434 /* 00054 8088E424 8FA40044 */ lw $a0, 0x0044($sp) .L8088E428: 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 7653cdb77f..f925b54248 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 @@ -92,8 +92,8 @@ glabel func_8088EB54 /* 008A0 8088EC70 0006000D */ break 6 .L8088EC74: /* 008A4 8088EC74 46004282 */ mul.s $f10, $f8, $f0 -/* 008A8 8088EC78 3C190601 */ lui $t9, 0x0601 ## $t9 = 06010000 -/* 008AC 8088EC7C 2739DC30 */ addiu $t9, $t9, 0xDC30 ## $t9 = 0600DC30 +/* 008A8 8088EC78 3C190601 */ lui $t9, %hi(D_0600DC30) ## $t9 = 06010000 +/* 008AC 8088EC7C 2739DC30 */ addiu $t9, $t9, %lo(D_0600DC30) ## $t9 = 0600DC30 /* 008B0 8088EC80 00409825 */ or $s3, $v0, $zero ## $s3 = 00000000 /* 008B4 8088EC84 241E0007 */ addiu $s8, $zero, 0x0007 ## $s8 = 00000007 /* 008B8 8088EC88 3C178089 */ lui $s7, %hi(D_8088F1FC) ## $s7 = 80890000 @@ -239,9 +239,9 @@ glabel func_8088EB54 /* 00ACC 8088EE9C C7A40094 */ lwc1 $f4, 0x0094($sp) /* 00AD0 8088EEA0 C6920024 */ lwc1 $f18, 0x0024($s4) ## 00000024 /* 00AD4 8088EEA4 46804020 */ cvt.s.w $f0, $f8 -/* 00AD8 8088EEA8 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 +/* 00AD8 8088EEA8 3C0E0601 */ lui $t6, %hi(D_0600DC30) ## $t6 = 06010000 /* 00ADC 8088EEAC 3C16DB06 */ lui $s6, 0xDB06 ## $s6 = DB060000 -/* 00AE0 8088EEB0 25CEDC30 */ addiu $t6, $t6, 0xDC30 ## $t6 = 0600DC30 +/* 00AE0 8088EEB0 25CEDC30 */ addiu $t6, $t6, %lo(D_0600DC30) ## $t6 = 0600DC30 /* 00AE4 8088EEB4 36D60024 */ ori $s6, $s6, 0x0024 ## $s6 = DB060024 /* 00AE8 8088EEB8 02201025 */ or $v0, $s1, $zero ## $v0 = 00000018 /* 00AEC 8088EEBC 46040282 */ mul.s $f10, $f0, $f4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Draw.s index 54cfcb0c3c..f57f6c8c30 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Draw.s @@ -3,10 +3,10 @@ glabel BgIceObjects_Draw /* 00C4C 8089045C AFA40018 */ sw $a0, 0x0018($sp) /* 00C50 80890460 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00C54 80890464 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C58 80890468 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00C58 80890468 3C050600 */ lui $a1, %hi(D_06000190) ## $a1 = 06000000 /* 00C5C 8089046C 0C00D498 */ jal Gfx_DrawDListOpa -/* 00C60 80890470 24A50190 */ addiu $a1, $a1, 0x0190 ## $a1 = 06000190 +/* 00C60 80890470 24A50190 */ addiu $a1, $a1, %lo(D_06000190) ## $a1 = 06000190 /* 00C64 80890474 8FBF0014 */ lw $ra, 0x0014($sp) /* 00C68 80890478 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00C6C 8089047C 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Init.s index 6b5f2a7934..3992273292 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Init.s @@ -13,8 +13,8 @@ glabel BgIceObjects_Init /* 00028 8088F838 0C010D20 */ jal DynaPolyInfo_SetActorMove /* 0002C 8088F83C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00030 8088F840 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00034 8088F844 248403F0 */ addiu $a0, $a0, 0x03F0 ## $a0 = 060003F0 +/* 00030 8088F840 3C040600 */ lui $a0, %hi(D_060003F0) ## $a0 = 06000000 +/* 00034 8088F844 248403F0 */ addiu $a0, $a0, %lo(D_060003F0) ## $a0 = 060003F0 /* 00038 8088F848 0C010620 */ jal DynaPolyInfo_Alloc /* 0003C 8088F84C 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s index d5fc5fb1b2..713e5ca07e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s @@ -122,8 +122,8 @@ glabel L808914C8 /* 00DF4 80891534 0C0253D0 */ jal Gfx_TwoTexScroll /* 00DF8 80891538 AFA20060 */ sw $v0, 0x0060($sp) /* 00DFC 8089153C 8FA80060 */ lw $t0, 0x0060($sp) -/* 00E00 80891540 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 00E04 80891544 254A06F0 */ addiu $t2, $t2, 0x06F0 ## $t2 = 060006F0 +/* 00E00 80891540 3C0A0600 */ lui $t2, %hi(D_060006F0) ## $t2 = 06000000 +/* 00E04 80891544 254A06F0 */ addiu $t2, $t2, %lo(D_060006F0) ## $t2 = 060006F0 /* 00E08 80891548 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 /* 00E0C 8089154C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00E10 80891550 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 @@ -193,8 +193,8 @@ glabel L80891568 /* 00F0C 8089164C 0C0253D0 */ jal Gfx_TwoTexScroll /* 00F10 80891650 AFA20054 */ sw $v0, 0x0054($sp) /* 00F14 80891654 8FA80054 */ lw $t0, 0x0054($sp) -/* 00F18 80891658 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 00F1C 8089165C 25AD12A0 */ addiu $t5, $t5, 0x12A0 ## $t5 = 060012A0 +/* 00F18 80891658 3C0D0600 */ lui $t5, %hi(D_060012A0) ## $t5 = 06000000 +/* 00F1C 8089165C 25AD12A0 */ addiu $t5, $t5, %lo(D_060012A0) ## $t5 = 060012A0 /* 00F20 80891660 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 /* 00F24 80891664 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00F28 80891668 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 @@ -205,8 +205,8 @@ glabel L80891568 /* 00F3C 8089167C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 glabel L80891680 /* 00F40 80891680 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00F44 80891684 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 00F48 80891688 27182640 */ addiu $t8, $t8, 0x2640 ## $t8 = 06002640 +/* 00F44 80891684 3C180600 */ lui $t8, %hi(D_06002640) ## $t8 = 06000000 +/* 00F48 80891688 27182640 */ addiu $t8, $t8, %lo(D_06002640) ## $t8 = 06002640 /* 00F4C 8089168C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 00F50 80891690 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 00F54 80891694 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Init.s index a30764573d..6f4daa3a5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Init.s @@ -68,16 +68,16 @@ glabel BgIceShelter_Init /* 00318 80890A58 1000000E */ beq $zero, $zero, .L80890A94 /* 0031C 80890A5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80890A60: -/* 00320 80890A60 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00324 80890A64 24C61C1C */ addiu $a2, $a2, 0x1C1C ## $a2 = 06001C1C +/* 00320 80890A60 3C060600 */ lui $a2, %hi(D_06001C1C) ## $a2 = 06000000 +/* 00324 80890A64 24C61C1C */ addiu $a2, $a2, %lo(D_06001C1C) ## $a2 = 06001C1C /* 00328 80890A68 8FA5002C */ lw $a1, 0x002C($sp) /* 0032C 80890A6C 0C22421D */ jal func_80890874 /* 00330 80890A70 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00334 80890A74 10000007 */ beq $zero, $zero, .L80890A94 /* 00338 80890A78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80890A7C: -/* 0033C 80890A7C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00340 80890A80 24C62920 */ addiu $a2, $a2, 0x2920 ## $a2 = 06002920 +/* 0033C 80890A7C 3C060600 */ lui $a2, %hi(D_06002920) ## $a2 = 06000000 +/* 00340 80890A80 24C62920 */ addiu $a2, $a2, %lo(D_06002920) ## $a2 = 06002920 /* 00344 80890A84 8FA5002C */ lw $a1, 0x002C($sp) /* 00348 80890A88 0C22421D */ jal func_80890874 /* 0034C 80890A8C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Draw.s index 03593a551c..e069a14654 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Draw.s @@ -7,13 +7,13 @@ glabel BgJyaBigmirror_Draw /* 00784 80893E64 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00788 80893E68 304E0010 */ andi $t6, $v0, 0x0010 ## $t6 = 00000000 /* 0078C 80893E6C 11C0000A */ beq $t6, $zero, .L80893E98 -/* 00790 80893E70 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00794 80893E74 24A5E1B0 */ addiu $a1, $a1, 0xE1B0 ## $a1 = 0600E1B0 +/* 00790 80893E70 3C050601 */ lui $a1, %hi(D_0600E1B0) ## $a1 = 06010000 +/* 00794 80893E74 24A5E1B0 */ addiu $a1, $a1, %lo(D_0600E1B0) ## $a1 = 0600E1B0 /* 00798 80893E78 0C00D498 */ jal Gfx_DrawDListOpa /* 0079C 80893E7C AFA60018 */ sw $a2, 0x0018($sp) -/* 007A0 80893E80 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 007A4 80893E84 24A5E2D0 */ addiu $a1, $a1, 0xE2D0 ## $a1 = 0600E2D0 +/* 007A0 80893E80 3C050601 */ lui $a1, %hi(D_0600E2D0) ## $a1 = 06010000 +/* 007A4 80893E84 24A5E2D0 */ addiu $a1, $a1, %lo(D_0600E2D0) ## $a1 = 0600E2D0 /* 007A8 80893E88 0C00D4C9 */ jal Gfx_DrawDListXlu /* 007AC 80893E8C 8FA4001C */ lw $a0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893C68.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893C68.s index 9f87421f79..2a908a8df7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893C68.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893C68.s @@ -95,10 +95,10 @@ glabel func_80893C68 /* 00680 80893D60 AFA80048 */ sw $t0, 0x0048($sp) /* 00684 80893D64 8FA30030 */ lw $v1, 0x0030($sp) /* 00688 80893D68 8FA80048 */ lw $t0, 0x0048($sp) -/* 0068C 80893D6C 3C0D0601 */ lui $t5, 0x0601 ## $t5 = 06010000 +/* 0068C 80893D6C 3C0D0601 */ lui $t5, %hi(D_0600BC70) ## $t5 = 06010000 /* 00690 80893D70 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00694 80893D74 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00698 80893D78 25ADBC70 */ addiu $t5, $t5, 0xBC70 ## $t5 = 0600BC70 +/* 00698 80893D78 25ADBC70 */ addiu $t5, $t5, %lo(D_0600BC70) ## $t5 = 0600BC70 /* 0069C 80893D7C 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 /* 006A0 80893D80 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 006A4 80893D84 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 @@ -131,8 +131,8 @@ glabel func_80893C68 /* 00710 80893DF0 0C0346A2 */ jal Matrix_NewMtx /* 00714 80893DF4 AFA20028 */ sw $v0, 0x0028($sp) /* 00718 80893DF8 8FA30028 */ lw $v1, 0x0028($sp) -/* 0071C 80893DFC 3C0A0601 */ lui $t2, 0x0601 ## $t2 = 06010000 -/* 00720 80893E00 254ABD80 */ addiu $t2, $t2, 0xBD80 ## $t2 = 0600BD80 +/* 0071C 80893DFC 3C0A0601 */ lui $t2, %hi(D_0600BD80) ## $t2 = 06010000 +/* 00720 80893E00 254ABD80 */ addiu $t2, $t2, %lo(D_0600BD80) ## $t2 = 0600BD80 /* 00724 80893E04 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00728 80893E08 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0072C 80893E0C 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Draw.s index 6a8c8a24d7..37cd050882 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Draw.s @@ -7,8 +7,8 @@ glabel BgJyaCobra_Draw /* 018CC 808971BC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 018D0 808971C0 0C225B2D */ jal func_80896CB4 /* 018D4 808971C4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 018D8 808971C8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 018DC 808971CC 24A50790 */ addiu $a1, $a1, 0x0790 ## $a1 = 06010790 +/* 018D8 808971C8 3C050601 */ lui $a1, %hi(D_06010790) ## $a1 = 06010000 +/* 018DC 808971CC 24A50790 */ addiu $a1, $a1, %lo(D_06010790) ## $a1 = 06010790 /* 018E0 808971D0 0C00D498 */ jal Gfx_DrawDListOpa /* 018E4 808971D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Init.s index ff0ff3fcea..9baf301628 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Init.s @@ -8,11 +8,11 @@ glabel BgJyaCobra_Init /* 00EE4 808967D4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00EE8 808967D8 AFBF0024 */ sw $ra, 0x0024($sp) /* 00EEC 808967DC AFB0001C */ sw $s0, 0x001C($sp) -/* 00EF0 808967E0 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 +/* 00EF0 808967E0 3C060601 */ lui $a2, %hi(D_0601167C) ## $a2 = 06010000 /* 00EF4 808967E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00EF8 808967E8 AFB10020 */ sw $s1, 0x0020($sp) /* 00EFC 808967EC AFA5002C */ sw $a1, 0x002C($sp) -/* 00F00 808967F0 24C6167C */ addiu $a2, $a2, 0x167C ## $a2 = 0601167C +/* 00F00 808967F0 24C6167C */ addiu $a2, $a2, %lo(D_0601167C) ## $a2 = 0601167C /* 00F04 808967F4 0C22564F */ jal func_8089593C /* 00F08 808967F8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00F0C 808967FC 3C058089 */ lui $a1, %hi(D_80897528) ## $a1 = 80890000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896CB4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896CB4.s index a4d97b80f4..0105883b8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896CB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896CB4.s @@ -41,8 +41,8 @@ glabel func_80896CB4 /* 01428 80896D18 0C0346A2 */ jal Matrix_NewMtx /* 0142C 80896D1C AFA20028 */ sw $v0, 0x0028($sp) /* 01430 80896D20 8FA30028 */ lw $v1, 0x0028($sp) -/* 01434 80896D24 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 -/* 01438 80896D28 256B0C20 */ addiu $t3, $t3, 0x0C20 ## $t3 = 06010C20 +/* 01434 80896D24 3C0B0601 */ lui $t3, %hi(D_06010C20) ## $t3 = 06010000 +/* 01438 80896D28 256B0C20 */ addiu $t3, $t3, %lo(D_06010C20) ## $t3 = 06010C20 /* 0143C 80896D2C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01440 80896D30 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01444 80896D34 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896D78.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896D78.s index 5824b8a683..25fc3813e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896D78.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896D78.s @@ -81,8 +81,8 @@ glabel func_80896D78 /* 0157C 80896E6C AE3902D0 */ sw $t9, 0x02D0($s1) ## 000002D0 /* 01580 80896E70 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 01584 80896E74 C604018C */ lwc1 $f4, 0x018C($s0) ## 0000018C -/* 01588 80896E78 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 -/* 0158C 80896E7C 25EF17D0 */ addiu $t7, $t7, 0x17D0 ## $t7 = 060117D0 +/* 01588 80896E78 3C0F0601 */ lui $t7, %hi(D_060117D0) ## $t7 = 06010000 +/* 0158C 80896E7C 25EF17D0 */ addiu $t7, $t7, %lo(D_060117D0) ## $t7 = 060117D0 /* 01590 80896E80 46062202 */ mul.s $f8, $f4, $f6 /* 01594 80896E84 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 /* 01598 80896E88 3C068089 */ lui $a2, %hi(D_808976AC) ## $a2 = 80890000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898114.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898114.s index b91b7e2b81..a557b1ed01 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898114.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898114.s @@ -24,7 +24,7 @@ glabel func_80898114 /* 00090 80898150 AFB30074 */ sw $s3, 0x0074($sp) /* 00094 80898154 AFB20070 */ sw $s2, 0x0070($sp) /* 00098 80898158 3C11808A */ lui $s1, %hi(D_80898774) ## $s1 = 808A0000 -/* 0009C 8089815C 3C160600 */ lui $s6, 0x0600 ## $s6 = 06000000 +/* 0009C 8089815C 3C160600 */ lui $s6, %hi(D_06000880) ## $s6 = 06000000 /* 000A0 80898160 3C17808A */ lui $s7, %hi(D_8089877E) ## $s7 = 808A0000 /* 000A4 80898164 4481B000 */ mtc1 $at, $f22 ## $f22 = 10.00 /* 000A8 80898168 00C09825 */ or $s3, $a2, $zero ## $s3 = 00000000 @@ -34,7 +34,7 @@ glabel func_80898114 /* 000B8 80898178 AFB00068 */ sw $s0, 0x0068($sp) /* 000BC 8089817C F7B40048 */ sdc1 $f20, 0x0048($sp) /* 000C0 80898180 26F7877E */ addiu $s7, $s7, %lo(D_8089877E) ## $s7 = 8089877E -/* 000C4 80898184 26D60880 */ addiu $s6, $s6, 0x0880 ## $s6 = 06000880 +/* 000C4 80898184 26D60880 */ addiu $s6, $s6, %lo(D_06000880) ## $s6 = 06000880 /* 000C8 80898188 26318774 */ addiu $s1, $s1, %lo(D_80898774) ## $s1 = 80898774 /* 000CC 8089818C 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 /* 000D0 80898190 27B500B4 */ addiu $s5, $sp, 0x00B4 ## $s5 = FFFFFFF4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898920.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898920.s index b520cb948a..464e380360 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898920.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898920.s @@ -276,8 +276,8 @@ glabel func_80898920 /* 00400 80898CA0 87189500 */ lh $t8, %lo(D_80899500)($t8) /* 00404 80898CA4 856B94F0 */ lh $t3, %lo(D_808994F0)($t3) /* 00408 80898CA8 46165402 */ mul.s $f16, $f10, $f22 -/* 0040C 80898CAC 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 00410 80898CB0 25CE0880 */ addiu $t6, $t6, 0x0880 ## $t6 = 06000880 +/* 0040C 80898CAC 3C0E0600 */ lui $t6, %hi(D_06000880) ## $t6 = 06000000 +/* 00410 80898CB0 25CE0880 */ addiu $t6, $t6, %lo(D_06000880) ## $t6 = 06000880 /* 00414 80898CB4 240FFEA2 */ addiu $t7, $zero, 0xFEA2 ## $t7 = FFFFFEA2 /* 00418 80898CB8 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 /* 0041C 80898CBC 240A0005 */ addiu $t2, $zero, 0x0005 ## $t2 = 00000005 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898DB4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898DB4.s index 7e5931605f..3fdc13729c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898DB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898DB4.s @@ -258,8 +258,8 @@ glabel func_80898DB4 /* 0084C 808990EC 85CE9530 */ lh $t6, %lo(D_80899530)($t6) /* 00850 808990F0 85299520 */ lh $t1, %lo(D_80899520)($t1) /* 00854 808990F4 46165482 */ mul.s $f18, $f10, $f22 -/* 00858 808990F8 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 -/* 0085C 808990FC 258C0880 */ addiu $t4, $t4, 0x0880 ## $t4 = 06000880 +/* 00858 808990F8 3C0C0600 */ lui $t4, %hi(D_06000880) ## $t4 = 06000000 +/* 0085C 808990FC 258C0880 */ addiu $t4, $t4, %lo(D_06000880) ## $t4 = 06000880 /* 00860 80899100 240DFEA2 */ addiu $t5, $zero, 0xFEA2 ## $t5 = FFFFFEA2 /* 00864 80899104 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 00868 80899108 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Draw.s index 72dbb79898..435e440dd0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Draw.s @@ -7,17 +7,17 @@ glabel BgRelayObjects_Draw /* 00654 808A94A4 15C00007 */ bne $t6, $zero, .L808A94C4 /* 00658 808A94A8 00000000 */ nop /* 0065C 808A94AC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00660 808A94B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00660 808A94B0 3C050600 */ lui $a1, %hi(D_06001AB0) ## $a1 = 06000000 /* 00664 808A94B4 0C00D498 */ jal Gfx_DrawDListOpa -/* 00668 808A94B8 24A51AB0 */ addiu $a1, $a1, 0x1AB0 ## $a1 = 06001AB0 +/* 00668 808A94B8 24A51AB0 */ addiu $a1, $a1, %lo(D_06001AB0) ## $a1 = 06001AB0 /* 0066C 808A94BC 10000005 */ beq $zero, $zero, .L808A94D4 /* 00670 808A94C0 8FBF0014 */ lw $ra, 0x0014($sp) .L808A94C4: -/* 00674 808A94C4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00674 808A94C4 3C050600 */ lui $a1, %hi(D_060001A0) ## $a1 = 06000000 /* 00678 808A94C8 0C00D498 */ jal Gfx_DrawDListOpa -/* 0067C 808A94CC 24A501A0 */ addiu $a1, $a1, 0x01A0 ## $a1 = 060001A0 +/* 0067C 808A94CC 24A501A0 */ addiu $a1, $a1, %lo(D_060001A0) ## $a1 = 060001A0 /* 00680 808A94D0 8FBF0014 */ lw $ra, 0x0014($sp) .L808A94D4: /* 00684 808A94D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 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 e8444f843a..c691bd1b96 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 @@ -21,14 +21,14 @@ glabel BgRelayObjects_Init /* 00048 808A8E98 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 0004C 808A8E9C 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -/* 00050 808A8EA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00050 808A8EA0 3C040600 */ lui $a0, %hi(D_060003C4) ## $a0 = 06000000 /* 00054 808A8EA4 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 /* 00058 808A8EA8 15200026 */ bne $t1, $zero, .L808A8F44 -/* 0005C 808A8EAC 248403C4 */ addiu $a0, $a0, 0x03C4 ## $a0 = 060003C4 -/* 00060 808A8EB0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0005C 808A8EAC 248403C4 */ addiu $a0, $a0, %lo(D_060003C4) ## $a0 = 060003C4 +/* 00060 808A8EB0 3C040600 */ lui $a0, %hi(D_060025FC) ## $a0 = 06000000 /* 00064 808A8EB4 0C010620 */ jal DynaPolyInfo_Alloc -/* 00068 808A8EB8 248425FC */ addiu $a0, $a0, 0x25FC ## $a0 = 060025FC +/* 00068 808A8EB8 248425FC */ addiu $a0, $a0, %lo(D_060025FC) ## $a0 = 060025FC /* 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 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 d7d8a573f6..e16b9364fd 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 @@ -59,11 +59,11 @@ glabel BgSpot00Hanebasi_Draw /* 00EB4 808AA634 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00EB8 808AA638 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 00EBC 808AA63C 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 00EC0 808AA640 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 +/* 00EC0 808AA640 3C190600 */ lui $t9, %hi(D_06000430) ## $t9 = 06000000 /* 00EC4 808AA644 15C1003E */ bne $t6, $at, .L808AA740 /* 00EC8 808AA648 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 /* 00ECC 808AA64C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00ED0 808AA650 27390430 */ addiu $t9, $t9, 0x0430 ## $t9 = 06000430 +/* 00ED0 808AA650 27390430 */ addiu $t9, $t9, %lo(D_06000430) ## $t9 = 06000430 /* 00ED4 808AA654 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFF4 /* 00ED8 808AA658 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 00EDC 808AA65C AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 @@ -127,8 +127,8 @@ glabel BgSpot00Hanebasi_Draw /* 00FBC 808AA73C E42AA7B0 */ swc1 $f10, %lo(D_808AA7B0)($at) .L808AA740: /* 00FC0 808AA740 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00FC4 808AA744 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 00FC8 808AA748 25AD00C0 */ addiu $t5, $t5, 0x00C0 ## $t5 = 060000C0 +/* 00FC4 808AA744 3C0D0600 */ lui $t5, %hi(D_060000C0) ## $t5 = 06000000 +/* 00FC8 808AA748 25AD00C0 */ addiu $t5, $t5, %lo(D_060000C0) ## $t5 = 060000C0 /* 00FCC 808AA74C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 00FD0 808AA750 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 /* 00FD4 808AA754 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 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 4ec23b8b70..c367758898 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 @@ -15,11 +15,11 @@ glabel BgSpot00Hanebasi_Init /* 0002C 808A97AC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00030 808A97B0 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 00034 808A97B4 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00038 808A97B8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00038 808A97B8 3C040600 */ lui $a0, %hi(D_06000280) ## $a0 = 06000000 /* 0003C 808A97BC 15C10007 */ bne $t6, $at, .L808A97DC -/* 00040 808A97C0 24840280 */ addiu $a0, $a0, 0x0280 ## $a0 = 06000280 -/* 00044 808A97C4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00048 808A97C8 248405E0 */ addiu $a0, $a0, 0x05E0 ## $a0 = 060005E0 +/* 00040 808A97C0 24840280 */ addiu $a0, $a0, %lo(D_06000280) ## $a0 = 06000280 +/* 00044 808A97C4 3C040600 */ lui $a0, %hi(D_060005E0) ## $a0 = 06000000 +/* 00048 808A97C8 248405E0 */ addiu $a0, $a0, %lo(D_060005E0) ## $a0 = 060005E0 /* 0004C 808A97CC 0C010620 */ jal DynaPolyInfo_Alloc /* 00050 808A97D0 27A50058 */ addiu $a1, $sp, 0x0058 ## $a1 = FFFFFFE8 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 54f9bde4cd..565af2454a 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 @@ -111,14 +111,14 @@ glabel func_808AA2B0 /* 00C74 808AA3F4 3C014300 */ lui $at, 0x4300 ## $at = 43000000 /* 00C78 808AA3F8 4481B000 */ mtc1 $at, $f22 ## $f22 = 128.00 /* 00C7C 808AA3FC 3C014382 */ lui $at, 0x4382 ## $at = 43820000 -/* 00C80 808AA400 3C140405 */ lui $s4, 0x0405 ## $s4 = 04050000 +/* 00C80 808AA400 3C140405 */ lui $s4, %hi(D_0404D4E0) ## $s4 = 04050000 /* 00C84 808AA404 3C1EDA38 */ lui $s8, 0xDA38 ## $s8 = DA380000 /* 00C88 808AA408 3C16DB06 */ lui $s6, 0xDB06 ## $s6 = DB060000 /* 00C8C 808AA40C 4481A000 */ mtc1 $at, $f20 ## $f20 = 260.00 /* 00C90 808AA410 46062702 */ mul.s $f28, $f4, $f6 /* 00C94 808AA414 36D60020 */ ori $s6, $s6, 0x0020 ## $s6 = DB060020 /* 00C98 808AA418 37DE0003 */ ori $s8, $s8, 0x0003 ## $s8 = DA380003 -/* 00C9C 808AA41C 2694D4E0 */ addiu $s4, $s4, 0xD4E0 ## $s4 = 0404D4E0 +/* 00C9C 808AA41C 2694D4E0 */ addiu $s4, $s4, %lo(D_0404D4E0) ## $s4 = 0404D4E0 /* 00CA0 808AA420 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 /* 00CA4 808AA424 2417FFEC */ addiu $s7, $zero, 0xFFEC ## $s7 = FFFFFFEC .L808AA428: 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 e6157f93ea..5544331752 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 @@ -47,7 +47,7 @@ glabel L808AC6BC /* 00084 808AC6E4 9205016B */ lbu $a1, 0x016B($s0) ## 0000016B /* 00088 808AC6E8 1040000A */ beq $v0, $zero, .L808AC714 -/* 0008C 808AC6EC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 0008C 808AC6EC 3C040601 */ lui $a0, %hi(D_06012BA4) ## $a0 = 06010000 /* 00090 808AC6F0 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 00094 808AC6F4 44813000 */ mtc1 $at, $f6 ## $f6 = 255.00 /* 00098 808AC6F8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 @@ -62,7 +62,7 @@ glabel L808AC6BC /* 000B8 808AC718 256BCAFC */ addiu $t3, $t3, %lo(func_808ACAFC) ## $t3 = 808ACAFC /* 000BC 808AC71C AE0B0164 */ sw $t3, 0x0164($s0) ## 00000164 .L808AC720: -/* 000C0 808AC720 24842BA4 */ addiu $a0, $a0, 0x2BA4 ## $a0 = 06012BA4 +/* 000C0 808AC720 24842BA4 */ addiu $a0, $a0, %lo(D_06012BA4) ## $a0 = 06012BA4 /* 000C4 808AC724 0C010620 */ jal DynaPolyInfo_Alloc /* 000C8 808AC728 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 @@ -73,9 +73,9 @@ glabel L808AC6BC /* 000D8 808AC738 8FAF0034 */ lw $t7, 0x0034($sp) /* 000DC 808AC73C 3C0C808B */ lui $t4, %hi(func_808AC8FC) ## $t4 = 808B0000 /* 000E0 808AC740 258CC8FC */ addiu $t4, $t4, %lo(func_808AC8FC) ## $t4 = 808AC8FC -/* 000E4 808AC744 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 000E4 808AC744 3C040601 */ lui $a0, %hi(D_060128D8) ## $a0 = 06010000 /* 000E8 808AC748 AE0C0164 */ sw $t4, 0x0164($s0) ## 00000164 -/* 000EC 808AC74C 248428D8 */ addiu $a0, $a0, 0x28D8 ## $a0 = 060128D8 +/* 000EC 808AC74C 248428D8 */ addiu $a0, $a0, %lo(D_060128D8) ## $a0 = 060128D8 /* 000F0 808AC750 0C010620 */ jal DynaPolyInfo_Alloc /* 000F4 808AC754 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 @@ -87,9 +87,9 @@ glabel L808AC6BC .L808AC76C: /* 0010C 808AC76C 85F800A4 */ lh $t8, 0x00A4($t7) ## 000000A4 /* 00110 808AC770 24010053 */ addiu $at, $zero, 0x0053 ## $at = 00000053 -/* 00114 808AC774 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 00114 808AC774 3C040601 */ lui $a0, %hi(D_060133EC) ## $a0 = 06010000 /* 00118 808AC778 17010005 */ bne $t8, $at, .L808AC790 -/* 0011C 808AC77C 248433EC */ addiu $a0, $a0, 0x33EC ## $a0 = 060133EC +/* 0011C 808AC77C 248433EC */ addiu $a0, $a0, %lo(D_060133EC) ## $a0 = 060133EC /* 00120 808AC780 3C19808B */ lui $t9, %hi(func_808AC908) ## $t9 = 808B0000 /* 00124 808AC784 2739C908 */ addiu $t9, $t9, %lo(func_808AC908) ## $t9 = 808AC908 /* 00128 808AC788 10000004 */ beq $zero, $zero, .L808AC79C 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 be90eb4a73..94138a31aa 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 @@ -18,8 +18,8 @@ glabel func_808ACA08 /* 003E4 808ACA44 14410013 */ bne $v0, $at, .L808ACA94 /* 003E8 808ACA48 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 003EC 808ACA4C AE000134 */ sw $zero, 0x0134($s0) ## 00000134 -/* 003F0 808ACA50 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 -/* 003F4 808ACA54 258C2D30 */ addiu $t4, $t4, 0x2D30 ## $t4 = 06012D30 +/* 003F0 808ACA50 3C0C0601 */ lui $t4, %hi(D_06012D30) ## $t4 = 06010000 +/* 003F4 808ACA54 258C2D30 */ addiu $t4, $t4, %lo(D_06012D30) ## $t4 = 06012D30 /* 003F8 808ACA58 24190019 */ addiu $t9, $zero, 0x0019 ## $t9 = 00000019 /* 003FC 808ACA5C 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 /* 00400 808ACA60 24090028 */ addiu $t1, $zero, 0x0028 ## $t1 = 00000028 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 89639fe4eb..3dccb3c59b 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 @@ -475,8 +475,8 @@ glabel func_808ACCB8 /* 00CFC 808AD35C 01616821 */ addu $t5, $t3, $at /* 00D00 808AD360 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 00D04 808AD364 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00D08 808AD368 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 -/* 00D0C 808AD36C 271826F0 */ addiu $t8, $t8, 0x26F0 ## $t8 = 060126F0 +/* 00D08 808AD368 3C180601 */ lui $t8, %hi(D_060126F0) ## $t8 = 06010000 +/* 00D0C 808AD36C 271826F0 */ addiu $t8, $t8, %lo(D_060126F0) ## $t8 = 060126F0 /* 00D10 808AD370 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 00D14 808AD374 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 00D18 808AD378 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s index b72b5b24ab..310e186b1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s @@ -262,10 +262,10 @@ glabel func_808AD450 /* 01168 808AD7C8 00033040 */ sll $a2, $v1, 1 /* 0116C 808AD7CC 8FA80060 */ lw $t0, 0x0060($sp) /* 01170 808AD7D0 3C04E700 */ lui $a0, 0xE700 ## $a0 = E7000000 -/* 01174 808AD7D4 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 +/* 01174 808AD7D4 3C0E0600 */ lui $t6, %hi(D_060013F0) ## $t6 = 06000000 /* 01178 808AD7D8 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 /* 0117C 808AD7DC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01180 808AD7E0 25CE13F0 */ addiu $t6, $t6, 0x13F0 ## $t6 = 060013F0 +/* 01180 808AD7E0 25CE13F0 */ addiu $t6, $t6, %lo(D_060013F0) ## $t6 = 060013F0 /* 01184 808AD7E4 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 /* 01188 808AD7E8 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 0118C 808AD7EC AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Draw.s index 5ab75361f3..085f95bde1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Draw.s @@ -18,15 +18,15 @@ glabel BgSpot06Objects_Draw /* 00FF8 808AF778 1000001D */ beq $zero, $zero, .L808AF7F0 /* 00FFC 808AF77C 8FBF0014 */ lw $ra, 0x0014($sp) .L808AF780: -/* 01000 808AF780 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 01000 808AF780 3C050600 */ lui $a1, %hi(D_06000E10) ## $a1 = 06000000 /* 01004 808AF784 0C00D498 */ jal Gfx_DrawDListOpa -/* 01008 808AF788 24A50E10 */ addiu $a1, $a1, 0x0E10 ## $a1 = 06000E10 +/* 01008 808AF788 24A50E10 */ addiu $a1, $a1, %lo(D_06000E10) ## $a1 = 06000E10 /* 0100C 808AF78C 10000018 */ beq $zero, $zero, .L808AF7F0 /* 01010 808AF790 8FBF0014 */ lw $ra, 0x0014($sp) .L808AF794: -/* 01014 808AF794 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01018 808AF798 24A52490 */ addiu $a1, $a1, 0x2490 ## $a1 = 06002490 +/* 01014 808AF794 3C050600 */ lui $a1, %hi(D_06002490) ## $a1 = 06000000 +/* 01018 808AF798 24A52490 */ addiu $a1, $a1, %lo(D_06002490) ## $a1 = 06002490 /* 0101C 808AF79C 0C00D498 */ jal Gfx_DrawDListOpa /* 01020 808AF7A0 AFA60018 */ sw $a2, 0x0018($sp) @@ -47,10 +47,10 @@ glabel BgSpot06Objects_Draw /* 01058 808AF7D8 10000005 */ beq $zero, $zero, .L808AF7F0 /* 0105C 808AF7DC 8FBF0014 */ lw $ra, 0x0014($sp) .L808AF7E0: -/* 01060 808AF7E0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 01060 808AF7E0 3C050600 */ lui $a1, %hi(D_06001160) ## $a1 = 06000000 /* 01064 808AF7E4 0C00D498 */ jal Gfx_DrawDListOpa -/* 01068 808AF7E8 24A51160 */ addiu $a1, $a1, 0x1160 ## $a1 = 06001160 +/* 01068 808AF7E8 24A51160 */ addiu $a1, $a1, %lo(D_06001160) ## $a1 = 06001160 /* 0106C 808AF7EC 8FBF0014 */ lw $ra, 0x0014($sp) .L808AF7F0: /* 01070 808AF7F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 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 c1f2f7fc33..0eb9ed47f9 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 @@ -57,8 +57,8 @@ glabel BgSpot06Objects_Init /* 00088 808AE808 0C010D20 */ jal DynaPolyInfo_SetActorMove /* 0008C 808AE80C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00090 808AE810 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00094 808AE814 24840EE8 */ addiu $a0, $a0, 0x0EE8 ## $a0 = 06000EE8 +/* 00090 808AE810 3C040600 */ lui $a0, %hi(D_06000EE8) ## $a0 = 06000000 +/* 00094 808AE814 24840EE8 */ addiu $a0, $a0, %lo(D_06000EE8) ## $a0 = 06000EE8 /* 00098 808AE818 0C010620 */ jal DynaPolyInfo_Alloc /* 0009C 808AE81C 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 @@ -262,8 +262,8 @@ glabel BgSpot06Objects_Init /* 00370 808AEAF0 0C010D20 */ jal DynaPolyInfo_SetActorMove /* 00374 808AEAF4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00378 808AEAF8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0037C 808AEAFC 24841238 */ addiu $a0, $a0, 0x1238 ## $a0 = 06001238 +/* 00378 808AEAF8 3C040600 */ lui $a0, %hi(D_06001238) ## $a0 = 06000000 +/* 0037C 808AEAFC 24841238 */ addiu $a0, $a0, %lo(D_06001238) ## $a0 = 06001238 /* 00380 808AEB00 0C010620 */ jal DynaPolyInfo_Alloc /* 00384 808AEB04 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 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 d6a73db4f5..3e945922b9 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 @@ -124,8 +124,8 @@ glabel func_808AF524 /* 00F54 808AF6D4 5020000A */ beql $at, $zero, .L808AF700 /* 00F58 808AF6D8 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 00F5C 808AF6DC 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00F60 808AF6E0 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 00F64 808AF6E4 27390120 */ addiu $t9, $t9, 0x0120 ## $t9 = 06000120 +/* 00F60 808AF6E0 3C190600 */ lui $t9, %hi(D_06000120) ## $t9 = 06000000 +/* 00F64 808AF6E4 27390120 */ addiu $t9, $t9, %lo(D_06000120) ## $t9 = 06000120 /* 00F68 808AF6E8 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 00F6C 808AF6EC AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 /* 00F70 808AF6F0 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 @@ -133,8 +133,8 @@ glabel func_808AF524 /* 00F78 808AF6F8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 00F7C 808AF6FC 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 .L808AF700: -/* 00F80 808AF700 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 00F84 808AF704 254A0470 */ addiu $t2, $t2, 0x0470 ## $t2 = 06000470 +/* 00F80 808AF700 3C0A0600 */ lui $t2, %hi(D_06000470) ## $t2 = 06000000 +/* 00F84 808AF704 254A0470 */ addiu $t2, $t2, %lo(D_06000470) ## $t2 = 06000470 /* 00F88 808AF708 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 00F8C 808AF70C AE2802D0 */ sw $t0, 0x02D0($s1) ## 000002D0 /* 00F90 808AF710 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 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 82575de83d..8cade5897d 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 @@ -61,8 +61,8 @@ glabel BgSpot07Taki_Draw /* 001AC 808AFDDC 5580000B */ bnel $t4, $zero, .L808AFE0C /* 001B0 808AFDE0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 001B4 808AFDE4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 001B8 808AFDE8 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 001BC 808AFDEC 25EF1CF0 */ addiu $t7, $t7, 0x1CF0 ## $t7 = 06001CF0 +/* 001B8 808AFDE8 3C0F0600 */ lui $t7, %hi(D_06001CF0) ## $t7 = 06000000 +/* 001BC 808AFDEC 25EF1CF0 */ addiu $t7, $t7, %lo(D_06001CF0) ## $t7 = 06001CF0 /* 001C0 808AFDF0 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 001C4 808AFDF4 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 /* 001C8 808AFDF8 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 @@ -71,8 +71,8 @@ glabel BgSpot07Taki_Draw /* 001D4 808AFE04 8FA200A4 */ lw $v0, 0x00A4($sp) /* 001D8 808AFE08 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 .L808AFE0C: -/* 001DC 808AFE0C 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 001E0 808AFE10 25293210 */ addiu $t1, $t1, 0x3210 ## $t1 = 06003210 +/* 001DC 808AFE0C 3C090600 */ lui $t1, %hi(D_06003210) ## $t1 = 06000000 +/* 001E0 808AFE10 25293210 */ addiu $t1, $t1, %lo(D_06003210) ## $t1 = 06003210 /* 001E4 808AFE14 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 001E8 808AFE18 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 001EC 808AFE1C AC490004 */ sw $t1, 0x0004($v0) ## 00000004 @@ -209,8 +209,8 @@ glabel BgSpot07Taki_Draw /* 003F4 808B0024 0C0253D0 */ jal Gfx_TwoTexScroll /* 003F8 808B0028 AFA20064 */ sw $v0, 0x0064($sp) /* 003FC 808B002C 8FA30064 */ lw $v1, 0x0064($sp) -/* 00400 808B0030 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 00404 808B0034 254A0460 */ addiu $t2, $t2, 0x0460 ## $t2 = 06000460 +/* 00400 808B0030 3C0A0600 */ lui $t2, %hi(D_06000460) ## $t2 = 06000000 +/* 00404 808B0034 254A0460 */ addiu $t2, $t2, %lo(D_06000460) ## $t2 = 06000460 /* 00408 808B0038 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0040C 808B003C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00410 808B0040 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 @@ -272,8 +272,8 @@ glabel BgSpot07Taki_Draw /* 004EC 808B011C 0C0253D0 */ jal Gfx_TwoTexScroll /* 004F0 808B0120 AFA20058 */ sw $v0, 0x0058($sp) /* 004F4 808B0124 8FA30058 */ lw $v1, 0x0058($sp) -/* 004F8 808B0128 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 -/* 004FC 808B012C 256B0BE0 */ addiu $t3, $t3, 0x0BE0 ## $t3 = 06000BE0 +/* 004F8 808B0128 3C0B0600 */ lui $t3, %hi(D_06000BE0) ## $t3 = 06000000 +/* 004FC 808B012C 256B0BE0 */ addiu $t3, $t3, %lo(D_06000BE0) ## $t3 = 06000BE0 /* 00500 808B0130 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00504 808B0134 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00508 808B0138 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 @@ -290,8 +290,8 @@ glabel BgSpot07Taki_Draw /* 00530 808B0160 55A0000A */ bnel $t5, $zero, .L808B018C /* 00534 808B0164 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00538 808B0168 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0053C 808B016C 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 00540 808B0170 27181F68 */ addiu $t8, $t8, 0x1F68 ## $t8 = 06001F68 +/* 0053C 808B016C 3C180600 */ lui $t8, %hi(D_06001F68) ## $t8 = 06000000 +/* 00540 808B0170 27181F68 */ addiu $t8, $t8, %lo(D_06001F68) ## $t8 = 06001F68 /* 00544 808B0174 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 00548 808B0178 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 0054C 808B017C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 @@ -299,8 +299,8 @@ glabel BgSpot07Taki_Draw /* 00554 808B0184 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 00558 808B0188 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 .L808B018C: -/* 0055C 808B018C 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 00560 808B0190 254A32D8 */ addiu $t2, $t2, 0x32D8 ## $t2 = 060032D8 +/* 0055C 808B018C 3C0A0600 */ lui $t2, %hi(D_060032D8) ## $t2 = 06000000 +/* 00560 808B0190 254A32D8 */ addiu $t2, $t2, %lo(D_060032D8) ## $t2 = 060032D8 /* 00564 808B0194 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 00568 808B0198 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 0056C 808B019C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 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 969d3672f5..87412789fc 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 @@ -18,14 +18,14 @@ glabel BgSpot07Taki_Init /* 00038 808AFC68 15C00013 */ bne $t6, $zero, .L808AFCB8 /* 0003C 808AFC6C 00000000 */ nop /* 00040 808AFC70 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 00044 808AFC74 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00044 808AFC74 3C040600 */ lui $a0, %hi(D_060038FC) ## $a0 = 06000000 /* 00048 808AFC78 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 /* 0004C 808AFC7C 15E00006 */ bne $t7, $zero, .L808AFC98 -/* 00050 808AFC80 248438FC */ addiu $a0, $a0, 0x38FC ## $a0 = 060038FC -/* 00054 808AFC84 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00050 808AFC80 248438FC */ addiu $a0, $a0, %lo(D_060038FC) ## $a0 = 060038FC +/* 00054 808AFC84 3C040600 */ lui $a0, %hi(D_06002590) ## $a0 = 06000000 /* 00058 808AFC88 0C010620 */ jal DynaPolyInfo_Alloc -/* 0005C 808AFC8C 24842590 */ addiu $a0, $a0, 0x2590 ## $a0 = 06002590 +/* 0005C 808AFC8C 24842590 */ addiu $a0, $a0, %lo(D_06002590) ## $a0 = 06002590 /* 00060 808AFC90 10000004 */ beq $zero, $zero, .L808AFCA4 /* 00064 808AFC94 8FA40034 */ lw $a0, 0x0034($sp) .L808AFC98: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Draw.s index 86eec5d355..1b892644c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Draw.s @@ -3,21 +3,21 @@ glabel BgSpot08Iceblock_Draw /* 00CD0 808B1630 AFBF0014 */ sw $ra, 0x0014($sp) /* 00CD4 808B1634 8482001C */ lh $v0, 0x001C($a0) ## 0000001C /* 00CD8 808B1638 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 00CDC 808B163C 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 +/* 00CDC 808B163C 3C0E0600 */ lui $t6, %hi(D_06002BD0) ## $t6 = 06000000 /* 00CE0 808B1640 30420200 */ andi $v0, $v0, 0x0200 ## $v0 = 00000000 /* 00CE4 808B1644 10400006 */ beq $v0, $zero, .L808B1660 /* 00CE8 808B1648 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 00CEC 808B164C 24010200 */ addiu $at, $zero, 0x0200 ## $at = 00000200 /* 00CF0 808B1650 10410006 */ beq $v0, $at, .L808B166C -/* 00CF4 808B1654 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 +/* 00CF4 808B1654 3C0F0600 */ lui $t7, %hi(D_06000DE0) ## $t7 = 06000000 /* 00CF8 808B1658 10000006 */ beq $zero, $zero, .L808B1674 /* 00CFC 808B165C 00000000 */ nop .L808B1660: -/* 00D00 808B1660 25CE2BD0 */ addiu $t6, $t6, 0x2BD0 ## $t6 = 06002BD0 +/* 00D00 808B1660 25CE2BD0 */ addiu $t6, $t6, %lo(D_06002BD0) ## $t6 = 06002BD0 /* 00D04 808B1664 10000003 */ beq $zero, $zero, .L808B1674 /* 00D08 808B1668 AFAE001C */ sw $t6, 0x001C($sp) .L808B166C: -/* 00D0C 808B166C 25EF0DE0 */ addiu $t7, $t7, 0x0DE0 ## $t7 = 06000DE0 +/* 00D0C 808B166C 25EF0DE0 */ addiu $t7, $t7, %lo(D_06000DE0) ## $t7 = 06000DE0 /* 00D10 808B1670 AFAF001C */ sw $t7, 0x001C($sp) .L808B1674: /* 00D14 808B1674 0C00D498 */ jal Gfx_DrawDListOpa 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 098c28999a..2449d497dd 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 @@ -35,19 +35,19 @@ glabel BgSpot08Iceblock_Init /* 0081C 808B117C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00820 808B1180 8603001C */ lh $v1, 0x001C($s0) ## 0000001C /* 00824 808B1184 24010200 */ addiu $at, $zero, 0x0200 ## $at = 00000200 -/* 00828 808B1188 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 00828 808B1188 3C060600 */ lui $a2, %hi(D_06002FD8) ## $a2 = 06000000 /* 0082C 808B118C 30620200 */ andi $v0, $v1, 0x0200 ## $v0 = 00000000 /* 00830 808B1190 10400005 */ beq $v0, $zero, .L808B11A8 /* 00834 808B1194 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00838 808B1198 10410005 */ beq $v0, $at, .L808B11B0 -/* 0083C 808B119C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 0083C 808B119C 3C060600 */ lui $a2, %hi(D_06001904) ## $a2 = 06000000 /* 00840 808B11A0 10000004 */ beq $zero, $zero, .L808B11B4 /* 00844 808B11A4 8FA60020 */ lw $a2, 0x0020($sp) .L808B11A8: /* 00848 808B11A8 10000002 */ beq $zero, $zero, .L808B11B4 -/* 0084C 808B11AC 24C62FD8 */ addiu $a2, $a2, 0x2FD8 ## $a2 = 06002FD8 +/* 0084C 808B11AC 24C62FD8 */ addiu $a2, $a2, %lo(D_06002FD8) ## $a2 = 06002FD8 .L808B11B0: -/* 00850 808B11B0 24C61904 */ addiu $a2, $a2, 0x1904 ## $a2 = 060048DC +/* 00850 808B11B0 24C61904 */ addiu $a2, $a2, %lo(D_06001904) ## $a2 = 06001904 .L808B11B4: /* 00854 808B11B4 3062000F */ andi $v0, $v1, 0x000F ## $v0 = 00000000 /* 00858 808B11B8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 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 00e0e3b176..33c2ae2525 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 @@ -53,8 +53,8 @@ glabel func_808BA018 /* 0019C 808BA09C 5700000A */ bnel $t8, $zero, .L808BA0C8 /* 001A0 808BA0A0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 001A4 808BA0A4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 001A8 808BA0A8 3C0A0601 */ lui $t2, 0x0601 ## $t2 = 06010000 -/* 001AC 808BA0AC 254A8190 */ addiu $t2, $t2, 0x8190 ## $t2 = 06008190 +/* 001A8 808BA0A8 3C0A0601 */ lui $t2, %hi(D_06008190) ## $t2 = 06010000 +/* 001AC 808BA0AC 254A8190 */ addiu $t2, $t2, %lo(D_06008190) ## $t2 = 06008190 /* 001B0 808BA0B0 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 001B4 808BA0B4 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 001B8 808BA0B8 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 @@ -62,8 +62,8 @@ glabel func_808BA018 /* 001C0 808BA0C0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 001C4 808BA0C4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 .L808BA0C8: -/* 001C8 808BA0C8 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 001CC 808BA0CC 25AD7E20 */ addiu $t5, $t5, 0x7E20 ## $t5 = 06007E20 +/* 001C8 808BA0C8 3C0D0600 */ lui $t5, %hi(D_06007E20) ## $t5 = 06000000 +/* 001CC 808BA0CC 25AD7E20 */ addiu $t5, $t5, %lo(D_06007E20) ## $t5 = 06007E20 /* 001D0 808BA0D0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 001D4 808BA0D4 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 /* 001D8 808BA0D8 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 @@ -121,8 +121,8 @@ glabel func_808BA018 /* 002A8 808BA1A8 0C0346A2 */ jal Matrix_NewMtx /* 002AC 808BA1AC AFA20038 */ sw $v0, 0x0038($sp) /* 002B0 808BA1B0 8FA30038 */ lw $v1, 0x0038($sp) -/* 002B4 808BA1B4 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 002B8 808BA1B8 25EF7EE0 */ addiu $t7, $t7, 0x7EE0 ## $t7 = 06007EE0 +/* 002B4 808BA1B4 3C0F0600 */ lui $t7, %hi(D_06007EE0) ## $t7 = 06000000 +/* 002B8 808BA1B8 25EF7EE0 */ addiu $t7, $t7, %lo(D_06007EE0) ## $t7 = 06007EE0 /* 002BC 808BA1BC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 002C0 808BA1C0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 002C4 808BA1C4 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s index 77bed719e9..0a59a3301c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s @@ -301,8 +301,8 @@ glabel func_808BA2CC /* 007D8 808BA6D8 0C0253D0 */ jal Gfx_TwoTexScroll /* 007DC 808BA6DC AFA20078 */ sw $v0, 0x0078($sp) /* 007E0 808BA6E0 8FA80078 */ lw $t0, 0x0078($sp) -/* 007E4 808BA6E4 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 007E8 808BA6E8 25AD0880 */ addiu $t5, $t5, 0x0880 ## $t5 = 06000880 +/* 007E4 808BA6E4 3C0D0600 */ lui $t5, %hi(D_06000880) ## $t5 = 06000000 +/* 007E8 808BA6E8 25AD0880 */ addiu $t5, $t5, %lo(D_06000880) ## $t5 = 06000880 /* 007EC 808BA6EC AD020004 */ sw $v0, 0x0004($t0) ## 00000004 /* 007F0 808BA6F0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 007F4 808BA6F4 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 @@ -471,8 +471,8 @@ glabel func_808BA2CC /* 00A5C 808BA95C 0C0346A2 */ jal Matrix_NewMtx /* 00A60 808BA960 AFA20064 */ sw $v0, 0x0064($sp) /* 00A64 808BA964 8FA30064 */ lw $v1, 0x0064($sp) -/* 00A68 808BA968 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 00A6C 808BA96C 25EF09C0 */ addiu $t7, $t7, 0x09C0 ## $t7 = 060009C0 +/* 00A68 808BA968 3C0F0600 */ lui $t7, %hi(D_060009C0) ## $t7 = 06000000 +/* 00A6C 808BA96C 25EF09C0 */ addiu $t7, $t7, %lo(D_060009C0) ## $t7 = 060009C0 /* 00A70 808BA970 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00A74 808BA974 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00A78 808BA978 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 @@ -644,8 +644,8 @@ glabel func_808BA2CC /* 00CEC 808BABEC 0C0346A2 */ jal Matrix_NewMtx /* 00CF0 808BABF0 AFA20050 */ sw $v0, 0x0050($sp) /* 00CF4 808BABF4 8FA30050 */ lw $v1, 0x0050($sp) -/* 00CF8 808BABF8 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 00CFC 808BABFC 27390A10 */ addiu $t9, $t9, 0x0A10 ## $t9 = 06000A10 +/* 00CF8 808BABF8 3C190600 */ lui $t9, %hi(D_06000A10) ## $t9 = 06000000 +/* 00CFC 808BABFC 27390A10 */ addiu $t9, $t9, %lo(D_06000A10) ## $t9 = 06000A10 /* 00D00 808BAC00 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00D04 808BAC04 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00D08 808BAC08 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s index d87f7acca9..232c38742c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s @@ -67,8 +67,8 @@ glabel BgYdanSp_Draw /* 01238 808C0648 24060313 */ addiu $a2, $zero, 0x0313 ## $a2 = 00000313 /* 0123C 808C064C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01240 808C0650 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 -/* 01244 808C0654 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 01248 808C0658 25295F40 */ addiu $t1, $t1, 0x5F40 ## $t1 = 06005F40 +/* 01244 808C0654 3C090600 */ lui $t1, %hi(D_06005F40) ## $t1 = 06000000 +/* 01248 808C0658 25295F40 */ addiu $t1, $t1, %lo(D_06005F40) ## $t1 = 06005F40 /* 0124C 808C065C 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 /* 01250 808C0660 AE5902D0 */ sw $t9, 0x02D0($s2) ## 000002D0 /* 01254 808C0664 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 @@ -126,8 +126,8 @@ glabel BgYdanSp_Draw /* 01320 808C0730 24060328 */ addiu $a2, $zero, 0x0328 ## $a2 = 00000328 /* 01324 808C0734 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01328 808C0738 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 -/* 0132C 808C073C 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 01330 808C0740 273961B0 */ addiu $t9, $t9, 0x61B0 ## $t9 = 060061B0 +/* 0132C 808C073C 3C190600 */ lui $t9, %hi(D_060061B0) ## $t9 = 06000000 +/* 01330 808C0740 273961B0 */ addiu $t9, $t9, %lo(D_060061B0) ## $t9 = 060061B0 /* 01334 808C0744 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 /* 01338 808C0748 AE4F02D0 */ sw $t7, 0x02D0($s2) ## 000002D0 /* 0133C 808C074C 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 @@ -135,9 +135,9 @@ glabel BgYdanSp_Draw /* 01344 808C0754 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 01348 808C0758 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 .L808C075C: -/* 0134C 808C075C 3C130600 */ lui $s3, 0x0600 ## $s3 = 06000000 +/* 0134C 808C075C 3C130600 */ lui $s3, %hi(D_06003850) ## $s3 = 06000000 /* 01350 808C0760 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 -/* 01354 808C0764 26733850 */ addiu $s3, $s3, 0x3850 ## $s3 = 06003850 +/* 01354 808C0764 26733850 */ addiu $s3, $s3, %lo(D_06003850) ## $s3 = 06003850 /* 01358 808C0768 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 .L808C076C: /* 0135C 808C076C 0C03423F */ jal Matrix_Put @@ -224,8 +224,8 @@ glabel BgYdanSp_Draw /* 0149C 808C08AC 24060351 */ addiu $a2, $zero, 0x0351 ## $a2 = 00000351 /* 014A0 808C08B0 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 014A4 808C08B4 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 -/* 014A8 808C08B8 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 014AC 808C08BC 271861B0 */ addiu $t8, $t8, 0x61B0 ## $t8 = 060061B0 +/* 014A8 808C08B8 3C180600 */ lui $t8, %hi(D_060061B0) ## $t8 = 06000000 +/* 014AC 808C08BC 271861B0 */ addiu $t8, $t8, %lo(D_060061B0) ## $t8 = 060061B0 /* 014B0 808C08C0 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 /* 014B4 808C08C4 AE4E02D0 */ sw $t6, 0x02D0($s2) ## 000002D0 /* 014B8 808C08C8 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s index 4e81177abb..7b3855e51f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s @@ -37,12 +37,12 @@ glabel BgYdanSp_Init /* 00084 808BF494 0C0172EB */ jal Collider_SetTris /* 00088 808BF498 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0008C 808BF49C 860D001C */ lh $t5, 0x001C($s0) ## 0000001C -/* 00090 808BF4A0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00094 808BF4A4 24846050 */ addiu $a0, $a0, 0x6050 ## $a0 = 06006050 +/* 00090 808BF4A0 3C040600 */ lui $a0, %hi(D_06006050) ## $a0 = 06000000 +/* 00094 808BF4A4 24846050 */ addiu $a0, $a0, %lo(D_06006050) ## $a0 = 06006050 /* 00098 808BF4A8 15A00040 */ bne $t5, $zero, .L808BF5AC /* 0009C 808BF4AC 00000000 */ nop -/* 000A0 808BF4B0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 000A4 808BF4B4 24846460 */ addiu $a0, $a0, 0x6460 ## $a0 = 06006460 +/* 000A0 808BF4B0 3C040600 */ lui $a0, %hi(D_06006460) ## $a0 = 06000000 +/* 000A4 808BF4B4 24846460 */ addiu $a0, $a0, %lo(D_06006460) ## $a0 = 06006460 /* 000A8 808BF4B8 0C010620 */ jal DynaPolyInfo_Alloc /* 000AC 808BF4BC 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFCC 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 88e479dccf..5ecfe09493 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 @@ -1,6 +1,6 @@ glabel func_808BF83C -/* 0042C 808BF83C 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 -/* 00430 808BF840 24636460 */ addiu $v1, $v1, 0x6460 ## $v1 = 06006460 +/* 0042C 808BF83C 3C030600 */ lui $v1, %hi(D_06006460) ## $v1 = 06000000 +/* 00430 808BF840 24636460 */ addiu $v1, $v1, %lo(D_06006460) ## $v1 = 06006460 /* 00434 808BF844 00037100 */ sll $t6, $v1, 4 /* 00438 808BF848 3C078016 */ lui $a3, %hi(gSegments) /* 0043C 808BF84C 000E7F02 */ srl $t7, $t6, 28 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 7533dc5065..82b9f533e1 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 @@ -49,11 +49,11 @@ glabel BossDodongo_Init /* 00840 808C19D0 0C00B58B */ jal Actor_SetScale /* 00844 808C19D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00848 808C19D8 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 -/* 0084C 808C19DC 2652F0D8 */ addiu $s2, $s2, 0xF0D8 ## $s2 = 0600F0D8 +/* 00848 808C19D8 3C120601 */ lui $s2, %hi(D_0600F0D8) ## $s2 = 06010000 +/* 0084C 808C19DC 2652F0D8 */ addiu $s2, $s2, %lo(D_0600F0D8) ## $s2 = 0600F0D8 /* 00850 808C19E0 2611014C */ addiu $s1, $s0, 0x014C ## $s1 = 0000014C -/* 00854 808C19E4 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 -/* 00858 808C19E8 24C6B310 */ addiu $a2, $a2, 0xB310 ## $a2 = 0601B310 +/* 00854 808C19E4 3C060602 */ lui $a2, %hi(D_0601B310) ## $a2 = 06020000 +/* 00858 808C19E8 24C6B310 */ addiu $a2, $a2, %lo(D_0601B310) ## $a2 = 0601B310 /* 0085C 808C19EC 02202825 */ or $a1, $s1, $zero ## $a1 = 0000014C /* 00860 808C19F0 02403825 */ or $a3, $s2, $zero ## $a3 = 0600F0D8 /* 00864 808C19F4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 @@ -107,9 +107,9 @@ glabel BossDodongo_Init /* 0091C 808C1AAC 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00920 808C1AB0 1040005A */ beq $v0, $zero, .L808C1C1C /* 00924 808C1AB4 3C058016 */ lui $a1, %hi(gSegments) -/* 00928 808C1AB8 3C020300 */ lui $v0, 0x0300 ## $v0 = 03000000 +/* 00928 808C1AB8 3C020300 */ lui $v0, %hi(D_030021D8) ## $v0 = 03000000 /* 0092C 808C1ABC 3C03808D */ lui $v1, %hi(D_808C93C8) ## $v1 = 808D0000 -/* 00930 808C1AC0 244221D8 */ addiu $v0, $v0, 0x21D8 ## $v0 = 030021D8 +/* 00930 808C1AC0 244221D8 */ addiu $v0, $v0, %lo(D_030021D8) ## $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 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 0c942c100f..4c35524b4c 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 @@ -848,10 +848,10 @@ glabel BossDodongo_Update /* 03490 808C4620 00000000 */ nop /* 03494 808C4624 8626019E */ lh $a2, 0x019E($s1) ## 0000019E .L808C4628: -/* 03498 808C4628 3C040300 */ lui $a0, 0x0300 ## $a0 = 03000000 +/* 03498 808C4628 3C040300 */ lui $a0, %hi(D_030021D8) ## $a0 = 03000000 /* 0349C 808C462C 3C05808C */ lui $a1, %hi(D_808C73C8) ## $a1 = 808C0000 /* 034A0 808C4630 24A573C8 */ addiu $a1, $a1, %lo(D_808C73C8) ## $a1 = 808C73C8 -/* 034A4 808C4634 248421D8 */ addiu $a0, $a0, 0x21D8 ## $a0 = 030021D8 +/* 034A4 808C4634 248421D8 */ addiu $a0, $a0, %lo(D_030021D8) ## $a0 = 030021D8 /* 034A8 808C4638 0C230555 */ jal func_808C1554 /* 034AC 808C463C 8E270224 */ lw $a3, 0x0224($s1) ## 00000224 /* 034B0 808C4640 862E01C6 */ lh $t6, 0x01C6($s1) ## 000001C6 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 5825be700a..01dd647689 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 @@ -1,7 +1,7 @@ glabel func_808C12C4 -/* 00134 808C12C4 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 +/* 00134 808C12C4 3C020601 */ lui $v0, %hi(D_06015890) ## $v0 = 06010000 /* 00138 808C12C8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0013C 808C12CC 24425890 */ addiu $v0, $v0, 0x5890 ## $v0 = 06015890 +/* 0013C 808C12CC 24425890 */ addiu $v0, $v0, %lo(D_06015890) ## $v0 = 06015890 /* 00140 808C12D0 AFB20020 */ sw $s2, 0x0020($sp) /* 00144 808C12D4 00027100 */ sll $t6, $v0, 4 /* 00148 808C12D8 3C128016 */ lui $s2, %hi(gSegments) @@ -29,8 +29,8 @@ glabel func_808C12C4 /* 001A0 808C1330 00063403 */ sra $a2, $a2, 16 /* 001A4 808C1334 0C230464 */ jal func_808C1190 /* 001A8 808C1338 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 001AC 808C133C 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 -/* 001B0 808C1340 24427210 */ addiu $v0, $v0, 0x7210 ## $v0 = 06017210 +/* 001AC 808C133C 3C020601 */ lui $v0, %hi(D_06017210) ## $v0 = 06010000 +/* 001B0 808C1340 24427210 */ addiu $v0, $v0, %lo(D_06017210) ## $v0 = 06017210 /* 001B4 808C1344 00025900 */ sll $t3, $v0, 4 /* 001B8 808C1348 000B6702 */ srl $t4, $t3, 28 /* 001BC 808C134C 000C6880 */ sll $t5, $t4, 2 @@ -43,8 +43,8 @@ glabel func_808C12C4 /* 001D8 808C1368 00063403 */ sra $a2, $a2, 16 /* 001DC 808C136C 0C230480 */ jal func_808C1200 /* 001E0 808C1370 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 001E4 808C1374 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 -/* 001E8 808C1378 24425D90 */ addiu $v0, $v0, 0x5D90 ## $v0 = 06015D90 +/* 001E4 808C1374 3C020601 */ lui $v0, %hi(D_06015D90) ## $v0 = 06010000 +/* 001E8 808C1378 24425D90 */ addiu $v0, $v0, %lo(D_06015D90) ## $v0 = 06015D90 /* 001EC 808C137C 00024100 */ sll $t0, $v0, 4 /* 001F0 808C1380 00084F02 */ srl $t1, $t0, 28 /* 001F4 808C1384 00095080 */ sll $t2, $t1, 2 @@ -57,8 +57,8 @@ glabel func_808C12C4 /* 00210 808C13A0 00063403 */ sra $a2, $a2, 16 /* 00214 808C13A4 0C230474 */ jal func_808C11D0 /* 00218 808C13A8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0021C 808C13AC 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 -/* 00220 808C13B0 24426390 */ addiu $v0, $v0, 0x6390 ## $v0 = 06016390 +/* 0021C 808C13AC 3C020601 */ lui $v0, %hi(D_06016390) ## $v0 = 06010000 +/* 00220 808C13B0 24426390 */ addiu $v0, $v0, %lo(D_06016390) ## $v0 = 06016390 /* 00224 808C13B4 00027900 */ sll $t7, $v0, 4 /* 00228 808C13B8 000FC702 */ srl $t8, $t7, 28 /* 0022C 808C13BC 0018C880 */ sll $t9, $t8, 2 @@ -71,8 +71,8 @@ glabel func_808C12C4 /* 00248 808C13D8 00063403 */ sra $a2, $a2, 16 /* 0024C 808C13DC 0C230474 */ jal func_808C11D0 /* 00250 808C13E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00254 808C13E4 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 -/* 00258 808C13E8 24426590 */ addiu $v0, $v0, 0x6590 ## $v0 = 06016590 +/* 00254 808C13E4 3C020601 */ lui $v0, %hi(D_06016590) ## $v0 = 06010000 +/* 00258 808C13E8 24426590 */ addiu $v0, $v0, %lo(D_06016590) ## $v0 = 06016590 /* 0025C 808C13EC 00026100 */ sll $t4, $v0, 4 /* 00260 808C13F0 000C6F02 */ srl $t5, $t4, 28 /* 00264 808C13F4 000D7080 */ sll $t6, $t5, 2 @@ -85,8 +85,8 @@ glabel func_808C12C4 /* 00280 808C1410 00063403 */ sra $a2, $a2, 16 /* 00284 808C1414 0C230474 */ jal func_808C11D0 /* 00288 808C1418 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0028C 808C141C 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 -/* 00290 808C1420 24426790 */ addiu $v0, $v0, 0x6790 ## $v0 = 06016790 +/* 0028C 808C141C 3C020601 */ lui $v0, %hi(D_06016790) ## $v0 = 06010000 +/* 00290 808C1420 24426790 */ addiu $v0, $v0, %lo(D_06016790) ## $v0 = 06016790 /* 00294 808C1424 00024900 */ sll $t1, $v0, 4 /* 00298 808C1428 00095702 */ srl $t2, $t1, 28 /* 0029C 808C142C 000A5880 */ sll $t3, $t2, 2 @@ -99,8 +99,8 @@ glabel func_808C12C4 /* 002B8 808C1448 00063403 */ sra $a2, $a2, 16 /* 002BC 808C144C 0C230474 */ jal func_808C11D0 /* 002C0 808C1450 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 002C4 808C1454 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 -/* 002C8 808C1458 24425990 */ addiu $v0, $v0, 0x5990 ## $v0 = 06015990 +/* 002C4 808C1454 3C020601 */ lui $v0, %hi(D_06015990) ## $v0 = 06010000 +/* 002C8 808C1458 24425990 */ addiu $v0, $v0, %lo(D_06015990) ## $v0 = 06015990 /* 002CC 808C145C 0002C100 */ sll $t8, $v0, 4 /* 002D0 808C1460 0018CF02 */ srl $t9, $t8, 28 /* 002D4 808C1464 00194080 */ sll $t0, $t9, 2 @@ -113,8 +113,8 @@ glabel func_808C12C4 /* 002F0 808C1480 00063403 */ sra $a2, $a2, 16 /* 002F4 808C1484 0C23048C */ jal func_808C1230 /* 002F8 808C1488 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 002FC 808C148C 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 -/* 00300 808C1490 24425F90 */ addiu $v0, $v0, 0x5F90 ## $v0 = 06015F90 +/* 002FC 808C148C 3C020601 */ lui $v0, %hi(D_06015F90) ## $v0 = 06010000 +/* 00300 808C1490 24425F90 */ addiu $v0, $v0, %lo(D_06015F90) ## $v0 = 06015F90 /* 00304 808C1494 00026900 */ sll $t5, $v0, 4 /* 00308 808C1498 000D7702 */ srl $t6, $t5, 28 /* 0030C 808C149C 000E7880 */ sll $t7, $t6, 2 @@ -127,8 +127,8 @@ glabel func_808C12C4 /* 00328 808C14B8 00063403 */ sra $a2, $a2, 16 /* 0032C 808C14BC 0C23048C */ jal func_808C1230 /* 00330 808C14C0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00334 808C14C4 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 -/* 00338 808C14C8 24426990 */ addiu $v0, $v0, 0x6990 ## $v0 = 06016990 +/* 00334 808C14C4 3C020601 */ lui $v0, %hi(D_06016990) ## $v0 = 06010000 +/* 00338 808C14C8 24426990 */ addiu $v0, $v0, %lo(D_06016990) ## $v0 = 06016990 /* 0033C 808C14CC 00025100 */ sll $t2, $v0, 4 /* 00340 808C14D0 000A5F02 */ srl $t3, $t2, 28 /* 00344 808C14D4 000B6080 */ sll $t4, $t3, 2 @@ -141,8 +141,8 @@ glabel func_808C12C4 /* 00360 808C14F0 00063403 */ sra $a2, $a2, 16 /* 00364 808C14F4 0C23049E */ jal func_808C1278 /* 00368 808C14F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0036C 808C14FC 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 -/* 00370 808C1500 24426E10 */ addiu $v0, $v0, 0x6E10 ## $v0 = 06016E10 +/* 0036C 808C14FC 3C020601 */ lui $v0, %hi(D_06016E10) ## $v0 = 06010000 +/* 00370 808C1500 24426E10 */ addiu $v0, $v0, %lo(D_06016E10) ## $v0 = 06016E10 /* 00374 808C1504 0002C900 */ sll $t9, $v0, 4 /* 00378 808C1508 00194702 */ srl $t0, $t9, 28 /* 0037C 808C150C 00084880 */ sll $t1, $t0, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1C80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1C80.s index 2f8078de1d..af372ef578 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1C80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1C80.s @@ -2,18 +2,18 @@ glabel func_808C1C80 /* 00AF0 808C1C80 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00AF4 808C1C84 AFA40028 */ sw $a0, 0x0028($sp) /* 00AF8 808C1C88 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00AFC 808C1C8C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 00AFC 808C1C8C 3C040601 */ lui $a0, %hi(D_0600F0D8) ## $a0 = 06010000 /* 00B00 808C1C90 AFA5002C */ sw $a1, 0x002C($sp) /* 00B04 808C1C94 0C028800 */ jal SkelAnime_GetFrameCount -/* 00B08 808C1C98 2484F0D8 */ addiu $a0, $a0, 0xF0D8 ## $a0 = 0600F0D8 +/* 00B08 808C1C98 2484F0D8 */ addiu $a0, $a0, %lo(D_0600F0D8) ## $a0 = 0600F0D8 /* 00B0C 808C1C9C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00B10 808C1CA0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00B14 808C1CA4 8FA30028 */ lw $v1, 0x0028($sp) /* 00B18 808C1CA8 468021A0 */ cvt.s.w $f6, $f4 /* 00B1C 808C1CAC 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00B20 808C1CB0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00B24 808C1CB4 24A5F0D8 */ addiu $a1, $a1, 0xF0D8 ## $a1 = 0600F0D8 +/* 00B20 808C1CB0 3C050601 */ lui $a1, %hi(D_0600F0D8) ## $a1 = 06010000 +/* 00B24 808C1CB4 24A5F0D8 */ addiu $a1, $a1, %lo(D_0600F0D8) ## $a1 = 0600F0D8 /* 00B28 808C1CB8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00B2C 808C1CBC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00B30 808C1CC0 E7A60010 */ swc1 $f6, 0x0010($sp) 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 a476a87337..4874685b01 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 @@ -312,14 +312,14 @@ glabel L808C1E60 /* 00F58 808C20E8 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 /* 00F5C 808C20EC 240B001E */ addiu $t3, $zero, 0x001E ## $t3 = 0000001E /* 00F60 808C20F0 240C0096 */ addiu $t4, $zero, 0x0096 ## $t4 = 00000096 -/* 00F64 808C20F4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 00F64 808C20F4 3C040601 */ lui $a0, %hi(D_06008EEC) ## $a0 = 06010000 /* 00F68 808C20F8 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 /* 00F6C 808C20FC A60001A2 */ sh $zero, 0x01A2($s0) ## 000001A2 /* 00F70 808C2100 A60901A0 */ sh $t1, 0x01A0($s0) ## 000001A0 /* 00F74 808C2104 A60A019C */ sh $t2, 0x019C($s0) ## 0000019C /* 00F78 808C2108 A60B0196 */ sh $t3, 0x0196($s0) ## 00000196 /* 00F7C 808C210C A60C0198 */ sh $t4, 0x0198($s0) ## 00000198 -/* 00F80 808C2110 24848EEC */ addiu $a0, $a0, 0x8EEC ## $a0 = 06008EEC +/* 00F80 808C2110 24848EEC */ addiu $a0, $a0, %lo(D_06008EEC) ## $a0 = 06008EEC /* 00F84 808C2114 E6080204 */ swc1 $f8, 0x0204($s0) ## 00000204 /* 00F88 808C2118 0C028800 */ jal SkelAnime_GetFrameCount @@ -328,10 +328,10 @@ glabel L808C1E60 /* 00F94 808C2124 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00F98 808C2128 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00F9C 808C212C 46805420 */ cvt.s.w $f16, $f10 -/* 00FA0 808C2130 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 00FA0 808C2130 3C050601 */ lui $a1, %hi(D_06008EEC) ## $a1 = 06010000 /* 00FA4 808C2134 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 /* 00FA8 808C2138 AFAD0014 */ sw $t5, 0x0014($sp) -/* 00FAC 808C213C 24A58EEC */ addiu $a1, $a1, 0x8EEC ## $a1 = 06008EEC +/* 00FAC 808C213C 24A58EEC */ addiu $a1, $a1, %lo(D_06008EEC) ## $a1 = 06008EEC /* 00FB0 808C2140 AFA4003C */ sw $a0, 0x003C($sp) /* 00FB4 808C2144 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00FB8 808C2148 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 @@ -464,13 +464,13 @@ glabel L808C2190 /* 01188 808C2318 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 0118C 808C231C C50A0024 */ lwc1 $f10, 0x0024($t0) ## 00000024 /* 01190 808C2320 44819000 */ mtc1 $at, $f18 ## $f18 = 200.00 -/* 01194 808C2324 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 01194 808C2324 3C040601 */ lui $a0, %hi(D_06008EEC) ## $a0 = 06010000 /* 01198 808C2328 46105001 */ sub.s $f0, $f10, $f16 /* 0119C 808C232C 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 /* 011A0 808C2330 240A001E */ addiu $t2, $zero, 0x001E ## $t2 = 0000001E /* 011A4 808C2334 240B0096 */ addiu $t3, $zero, 0x0096 ## $t3 = 00000096 /* 011A8 808C2338 46000005 */ abs.s $f0, $f0 -/* 011AC 808C233C 24848EEC */ addiu $a0, $a0, 0x8EEC ## $a0 = 06008EEC +/* 011AC 808C233C 24848EEC */ addiu $a0, $a0, %lo(D_06008EEC) ## $a0 = 06008EEC /* 011B0 808C2340 4612003C */ c.lt.s $f0, $f18 /* 011B4 808C2344 00000000 */ nop /* 011B8 808C2348 450200F8 */ bc1fl .L808C272C @@ -486,10 +486,10 @@ glabel L808C2190 /* 011DC 808C236C 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 011E0 808C2370 44815000 */ mtc1 $at, $f10 ## $f10 = -5.00 /* 011E4 808C2374 46803220 */ cvt.s.w $f8, $f6 -/* 011E8 808C2378 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 011E8 808C2378 3C050601 */ lui $a1, %hi(D_06008EEC) ## $a1 = 06010000 /* 011EC 808C237C 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 /* 011F0 808C2380 AFAC0014 */ sw $t4, 0x0014($sp) -/* 011F4 808C2384 24A58EEC */ addiu $a1, $a1, 0x8EEC ## $a1 = 06008EEC +/* 011F4 808C2384 24A58EEC */ addiu $a1, $a1, %lo(D_06008EEC) ## $a1 = 06008EEC /* 011F8 808C2388 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 011FC 808C238C E7A80010 */ swc1 $f8, 0x0010($sp) /* 01200 808C2390 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 @@ -663,11 +663,11 @@ glabel L808C23A8 /* 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 +/* 01468 808C25F8 3C020601 */ lui $v0, %hi(D_06017410) ## $v0 = 06010000 /* 0146C 808C25FC 312A0002 */ andi $t2, $t1, 0x0002 ## $t2 = 00000000 /* 01470 808C2600 15400016 */ bne $t2, $zero, .L808C265C /* 01474 808C2604 24851D4C */ addiu $a1, $a0, 0x1D4C ## $a1 = 00001D4C -/* 01478 808C2608 24427410 */ addiu $v0, $v0, 0x7410 ## $v0 = 06017410 +/* 01478 808C2608 24427410 */ addiu $v0, $v0, %lo(D_06017410) ## $v0 = 06017410 /* 0147C 808C260C 00025900 */ sll $t3, $v0, 4 /* 01480 808C2610 000B6702 */ srl $t4, $t3, 28 /* 01484 808C2614 000C6880 */ sll $t5, $t4, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C287C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C287C.s index 56c49f2f36..1d0851c22d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C287C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C287C.s @@ -6,8 +6,8 @@ glabel func_808C287C /* 016FC 808C288C 3C03808C */ lui $v1, %hi(func_808C2BC8) ## $v1 = 808C0000 /* 01700 808C2890 24632BC8 */ addiu $v1, $v1, %lo(func_808C2BC8) ## $v1 = 808C2BC8 /* 01704 808C2894 106F0016 */ beq $v1, $t7, .L808C28F0 -/* 01708 808C2898 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0170C 808C289C 24841074 */ addiu $a0, $a0, 0x1074 ## $a0 = 06001074 +/* 01708 808C2898 3C040600 */ lui $a0, %hi(D_06001074) ## $a0 = 06000000 +/* 0170C 808C289C 24841074 */ addiu $a0, $a0, %lo(D_06001074) ## $a0 = 06001074 /* 01710 808C28A0 0C028800 */ jal SkelAnime_GetFrameCount /* 01714 808C28A4 AFA30028 */ sw $v1, 0x0028($sp) @@ -16,10 +16,10 @@ glabel func_808C287C /* 01720 808C28B0 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 /* 01724 808C28B4 468021A0 */ cvt.s.w $f6, $f4 /* 01728 808C28B8 8FA40030 */ lw $a0, 0x0030($sp) -/* 0172C 808C28BC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0172C 808C28BC 3C050600 */ lui $a1, %hi(D_06001074) ## $a1 = 06000000 /* 01730 808C28C0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 01734 808C28C4 AFB80014 */ sw $t8, 0x0014($sp) -/* 01738 808C28C8 24A51074 */ addiu $a1, $a1, 0x1074 ## $a1 = 06001074 +/* 01738 808C28C8 24A51074 */ addiu $a1, $a1, %lo(D_06001074) ## $a1 = 06001074 /* 0173C 808C28CC E7A60010 */ swc1 $f6, 0x0010($sp) /* 01740 808C28D0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01744 808C28D4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C290C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C290C.s index fcc85e7ba5..e99da35976 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C290C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C290C.s @@ -3,18 +3,18 @@ glabel func_808C290C /* 01780 808C2910 AFB00028 */ sw $s0, 0x0028($sp) /* 01784 808C2914 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01788 808C2918 AFBF002C */ sw $ra, 0x002C($sp) -/* 0178C 808C291C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 0178C 808C291C 3C040601 */ lui $a0, %hi(D_0600E848) ## $a0 = 06010000 /* 01790 808C2920 0C028800 */ jal SkelAnime_GetFrameCount -/* 01794 808C2924 2484E848 */ addiu $a0, $a0, 0xE848 ## $a0 = 0600E848 +/* 01794 808C2924 2484E848 */ addiu $a0, $a0, %lo(D_0600E848) ## $a0 = 0600E848 /* 01798 808C2928 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0179C 808C292C 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 017A0 808C2930 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 /* 017A4 808C2934 468021A0 */ cvt.s.w $f6, $f4 -/* 017A8 808C2938 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 017A8 808C2938 3C050601 */ lui $a1, %hi(D_0600E848) ## $a1 = 06010000 /* 017AC 808C293C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 017B0 808C2940 AFAE0014 */ sw $t6, 0x0014($sp) -/* 017B4 808C2944 24A5E848 */ addiu $a1, $a1, 0xE848 ## $a1 = 0600E848 +/* 017B4 808C2944 24A5E848 */ addiu $a1, $a1, %lo(D_0600E848) ## $a1 = 0600E848 /* 017B8 808C2948 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 017BC 808C294C E7A60010 */ swc1 $f6, 0x0010($sp) /* 017C0 808C2950 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C29B0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C29B0.s index 388e2ef1a9..37a737f900 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C29B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C29B0.s @@ -3,18 +3,18 @@ glabel func_808C29B0 /* 01824 808C29B4 AFB00028 */ sw $s0, 0x0028($sp) /* 01828 808C29B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0182C 808C29BC AFBF002C */ sw $ra, 0x002C($sp) -/* 01830 808C29C0 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 01830 808C29C0 3C040602 */ lui $a0, %hi(D_0601D934) ## $a0 = 06020000 /* 01834 808C29C4 0C028800 */ jal SkelAnime_GetFrameCount -/* 01838 808C29C8 2484D934 */ addiu $a0, $a0, 0xD934 ## $a0 = 0601D934 +/* 01838 808C29C8 2484D934 */ addiu $a0, $a0, %lo(D_0601D934) ## $a0 = 0601D934 /* 0183C 808C29CC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01840 808C29D0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01844 808C29D4 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 /* 01848 808C29D8 468021A0 */ cvt.s.w $f6, $f4 -/* 0184C 808C29DC 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 0184C 808C29DC 3C050602 */ lui $a1, %hi(D_0601D934) ## $a1 = 06020000 /* 01850 808C29E0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 01854 808C29E4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01858 808C29E8 24A5D934 */ addiu $a1, $a1, 0xD934 ## $a1 = 0601D934 +/* 01858 808C29E8 24A5D934 */ addiu $a1, $a1, %lo(D_0601D934) ## $a1 = 0601D934 /* 0185C 808C29EC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01860 808C29F0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01864 808C29F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2A40.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2A40.s index 770c2d13b1..1afe99e7bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2A40.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2A40.s @@ -6,10 +6,10 @@ glabel func_808C2A40 /* 018C0 808C2A50 44813000 */ mtc1 $at, $f6 ## $f6 = -5.00 /* 018C4 808C2A54 AFBF0024 */ sw $ra, 0x0024($sp) /* 018C8 808C2A58 AFA40028 */ sw $a0, 0x0028($sp) -/* 018CC 808C2A5C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 018CC 808C2A5C 3C050601 */ lui $a1, %hi(D_0600DF38) ## $a1 = 06010000 /* 018D0 808C2A60 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 018D4 808C2A64 AFAE0014 */ sw $t6, 0x0014($sp) -/* 018D8 808C2A68 24A5DF38 */ addiu $a1, $a1, 0xDF38 ## $a1 = 0600DF38 +/* 018D8 808C2A68 24A5DF38 */ addiu $a1, $a1, %lo(D_0600DF38) ## $a1 = 0600DF38 /* 018DC 808C2A6C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 018E0 808C2A70 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 018E4 808C2A74 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2AB0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2AB0.s index 7cedab9ee2..44e5eb133d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2AB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2AB0.s @@ -6,18 +6,18 @@ glabel func_808C2AB0 /* 01930 808C2AC0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01934 808C2AC4 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 /* 01938 808C2AC8 E48001E4 */ swc1 $f0, 0x01E4($a0) ## 000001E4 -/* 0193C 808C2ACC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0193C 808C2ACC 3C040600 */ lui $a0, %hi(D_060061D4) ## $a0 = 06000000 /* 01940 808C2AD0 0C028800 */ jal SkelAnime_GetFrameCount -/* 01944 808C2AD4 248461D4 */ addiu $a0, $a0, 0x61D4 ## $a0 = 060061D4 +/* 01944 808C2AD4 248461D4 */ addiu $a0, $a0, %lo(D_060061D4) ## $a0 = 060061D4 /* 01948 808C2AD8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0194C 808C2ADC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01950 808C2AE0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 01950 808C2AE0 3C050600 */ lui $a1, %hi(D_060061D4) ## $a1 = 06000000 /* 01954 808C2AE4 468021A0 */ cvt.s.w $f6, $f4 /* 01958 808C2AE8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 0195C 808C2AEC 44070000 */ mfc1 $a3, $f0 /* 01960 808C2AF0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01964 808C2AF4 24A561D4 */ addiu $a1, $a1, 0x61D4 ## $a1 = 060061D4 +/* 01964 808C2AF4 24A561D4 */ addiu $a1, $a1, %lo(D_060061D4) ## $a1 = 060061D4 /* 01968 808C2AF8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0196C 808C2AFC E7A60010 */ swc1 $f6, 0x0010($sp) /* 01970 808C2B00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2B38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2B38.s index 09a8b7c2ec..d19e4f2822 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2B38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2B38.s @@ -5,18 +5,18 @@ glabel func_808C2B38 /* 019B4 808C2B44 AFBF002C */ sw $ra, 0x002C($sp) /* 019B8 808C2B48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 019BC 808C2B4C E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 019C0 808C2B50 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 019C0 808C2B50 3C040601 */ lui $a0, %hi(D_06008EEC) ## $a0 = 06010000 /* 019C4 808C2B54 0C028800 */ jal SkelAnime_GetFrameCount -/* 019C8 808C2B58 24848EEC */ addiu $a0, $a0, 0x8EEC ## $a0 = 06008EEC +/* 019C8 808C2B58 24848EEC */ addiu $a0, $a0, %lo(D_06008EEC) ## $a0 = 06008EEC /* 019CC 808C2B5C 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 019D0 808C2B60 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 019D4 808C2B64 44815000 */ mtc1 $at, $f10 ## $f10 = -5.00 /* 019D8 808C2B68 46803220 */ cvt.s.w $f8, $f6 -/* 019DC 808C2B6C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 019DC 808C2B6C 3C050601 */ lui $a1, %hi(D_06008EEC) ## $a1 = 06010000 /* 019E0 808C2B70 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 019E4 808C2B74 AFAE0014 */ sw $t6, 0x0014($sp) -/* 019E8 808C2B78 24A58EEC */ addiu $a1, $a1, 0x8EEC ## $a1 = 06008EEC +/* 019E8 808C2B78 24A58EEC */ addiu $a1, $a1, %lo(D_06008EEC) ## $a1 = 06008EEC /* 019EC 808C2B7C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 019F0 808C2B80 E7A80010 */ swc1 $f8, 0x0010($sp) /* 019F4 808C2B84 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2BC8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2BC8.s index 67c7c3dea8..649a5ef973 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2BC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2BC8.s @@ -34,10 +34,10 @@ glabel func_808C2BC8 /* 01A9C 808C2C2C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF /* 01AA0 808C2C30 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01AA4 808C2C34 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01AA4 808C2C34 3C040600 */ lui $a0, %hi(D_06001074) ## $a0 = 06000000 /* 01AA8 808C2C38 0C028800 */ jal SkelAnime_GetFrameCount -/* 01AAC 808C2C3C 24841074 */ addiu $a0, $a0, 0x1074 ## $a0 = 06001074 +/* 01AAC 808C2C3C 24841074 */ addiu $a0, $a0, %lo(D_06001074) ## $a0 = 06001074 /* 01AB0 808C2C40 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 01AB4 808C2C44 8FA40020 */ lw $a0, 0x0020($sp) /* 01AB8 808C2C48 46804220 */ cvt.s.w $f8, $f8 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2C78.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2C78.s index 9faed03dea..f2b260bb7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2C78.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2C78.s @@ -105,8 +105,8 @@ glabel func_808C2C78 /* 01C58 808C2DE8 2A01001E */ slti $at, $s0, 0x001E /* 01C5C 808C2DEC 1420FFD0 */ bne $at, $zero, .L808C2D30 /* 01C60 808C2DF0 00000000 */ nop -/* 01C64 808C2DF4 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 -/* 01C68 808C2DF8 26104E0C */ addiu $s0, $s0, 0x4E0C ## $s0 = 06004E0C +/* 01C64 808C2DF4 3C100600 */ lui $s0, %hi(D_06004E0C) ## $s0 = 06000000 +/* 01C68 808C2DF8 26104E0C */ addiu $s0, $s0, %lo(D_06004E0C) ## $s0 = 06004E0C /* 01C6C 808C2DFC 0C028800 */ jal SkelAnime_GetFrameCount /* 01C70 808C2E00 02002025 */ or $a0, $s0, $zero ## $a0 = 06004E0C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2ECC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2ECC.s index b10dbb821d..e3858855d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2ECC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2ECC.s @@ -26,10 +26,10 @@ glabel func_808C2ECC /* 01D84 808C2F14 0C02927F */ jal SkelAnime_FrameUpdateMatrix /* 01D88 808C2F18 AFA40030 */ sw $a0, 0x0030($sp) -/* 01D8C 808C2F1C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01D8C 808C2F1C 3C040600 */ lui $a0, %hi(D_06004E0C) ## $a0 = 06000000 /* 01D90 808C2F20 0C028800 */ jal SkelAnime_GetFrameCount -/* 01D94 808C2F24 24844E0C */ addiu $a0, $a0, 0x4E0C ## $a0 = 06004E0C +/* 01D94 808C2F24 24844E0C */ addiu $a0, $a0, %lo(D_06004E0C) ## $a0 = 06004E0C /* 01D98 808C2F28 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 01D9C 808C2F2C 8FA40030 */ lw $a0, 0x0030($sp) /* 01DA0 808C2F30 468031A0 */ cvt.s.w $f6, $f6 @@ -37,16 +37,16 @@ glabel func_808C2ECC /* 01DA8 808C2F38 0C0295B2 */ jal func_800A56C8 /* 01DAC 808C2F3C 00000000 */ nop /* 01DB0 808C2F40 10400015 */ beq $v0, $zero, .L808C2F98 -/* 01DB4 808C2F44 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01DB4 808C2F44 3C040600 */ lui $a0, %hi(D_060042A8) ## $a0 = 06000000 /* 01DB8 808C2F48 0C028800 */ jal SkelAnime_GetFrameCount -/* 01DBC 808C2F4C 248442A8 */ addiu $a0, $a0, 0x42A8 ## $a0 = 060042A8 +/* 01DBC 808C2F4C 248442A8 */ addiu $a0, $a0, %lo(D_060042A8) ## $a0 = 060042A8 /* 01DC0 808C2F50 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 01DC4 808C2F54 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 01DC8 808C2F58 44818000 */ mtc1 $at, $f16 ## $f16 = -5.00 /* 01DCC 808C2F5C 468042A0 */ cvt.s.w $f10, $f8 -/* 01DD0 808C2F60 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01DD4 808C2F64 24A542A8 */ addiu $a1, $a1, 0x42A8 ## $a1 = 060042A8 +/* 01DD0 808C2F60 3C050600 */ lui $a1, %hi(D_060042A8) ## $a1 = 06000000 +/* 01DD4 808C2F64 24A542A8 */ addiu $a1, $a1, %lo(D_060042A8) ## $a1 = 060042A8 /* 01DD8 808C2F68 8FA40030 */ lw $a0, 0x0030($sp) /* 01DDC 808C2F6C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01DE0 808C2F70 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2FAC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2FAC.s index 71e3646e6f..0af4827b5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2FAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2FAC.s @@ -39,20 +39,20 @@ glabel func_808C2FAC /* 01E90 808C3020 AFA40030 */ sw $a0, 0x0030($sp) /* 01E94 808C3024 860F01DA */ lh $t7, 0x01DA($s0) ## 000001DA -/* 01E98 808C3028 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 01E98 808C3028 3C040601 */ lui $a0, %hi(D_06009D10) ## $a0 = 06010000 /* 01E9C 808C302C 55E00015 */ bnel $t7, $zero, .L808C3084 /* 01EA0 808C3030 8FBF002C */ lw $ra, 0x002C($sp) /* 01EA4 808C3034 0C028800 */ jal SkelAnime_GetFrameCount -/* 01EA8 808C3038 24849D10 */ addiu $a0, $a0, 0x9D10 ## $a0 = 06009D10 +/* 01EA8 808C3038 24849D10 */ addiu $a0, $a0, %lo(D_06009D10) ## $a0 = 06009D10 /* 01EAC 808C303C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 01EB0 808C3040 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 01EB4 808C3044 44818000 */ mtc1 $at, $f16 ## $f16 = -5.00 /* 01EB8 808C3048 468042A0 */ cvt.s.w $f10, $f8 -/* 01EBC 808C304C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 01EBC 808C304C 3C050601 */ lui $a1, %hi(D_06009D10) ## $a1 = 06010000 /* 01EC0 808C3050 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 01EC4 808C3054 AFB80014 */ sw $t8, 0x0014($sp) -/* 01EC8 808C3058 24A59D10 */ addiu $a1, $a1, 0x9D10 ## $a1 = 06009D10 +/* 01EC8 808C3058 24A59D10 */ addiu $a1, $a1, %lo(D_06009D10) ## $a1 = 06009D10 /* 01ECC 808C305C 8FA40030 */ lw $a0, 0x0030($sp) /* 01ED0 808C3060 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 01ED4 808C3064 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3094.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3094.s index 0758a9ed07..d85da9b01e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3094.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3094.s @@ -7,10 +7,10 @@ glabel func_808C3094 /* 01F18 808C30A8 0C02927F */ jal SkelAnime_FrameUpdateMatrix /* 01F1C 808C30AC AFA40018 */ sw $a0, 0x0018($sp) -/* 01F20 808C30B0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 01F20 808C30B0 3C040601 */ lui $a0, %hi(D_06009D10) ## $a0 = 06010000 /* 01F24 808C30B4 0C028800 */ jal SkelAnime_GetFrameCount -/* 01F28 808C30B8 24849D10 */ addiu $a0, $a0, 0x9D10 ## $a0 = 06009D10 +/* 01F28 808C30B8 24849D10 */ addiu $a0, $a0, %lo(D_06009D10) ## $a0 = 06009D10 /* 01F2C 808C30BC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01F30 808C30C0 8FA40018 */ lw $a0, 0x0018($sp) /* 01F34 808C30C4 46802120 */ cvt.s.w $f4, $f4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s index 7c7736a382..8bae68cb24 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s @@ -20,9 +20,9 @@ glabel func_808C32F4 /* 0218C 808C331C 3C054160 */ lui $a1, 0x4160 ## $a1 = 41600000 /* 02190 808C3320 10400050 */ beq $v0, $zero, .L808C3464 /* 02194 808C3324 8FA4003C */ lw $a0, 0x003C($sp) -/* 02198 808C3328 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 02198 808C3328 3C050602 */ lui $a1, %hi(D_0601CAE0) ## $a1 = 06020000 /* 0219C 808C332C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 021A0 808C3330 24A5CAE0 */ addiu $a1, $a1, 0xCAE0 ## $a1 = 0601CAE0 +/* 021A0 808C3330 24A5CAE0 */ addiu $a1, $a1, %lo(D_0601CAE0) ## $a1 = 0601CAE0 /* 021A4 808C3334 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 021A8 808C3338 1000004A */ beq $zero, $zero, .L808C3464 /* 021AC 808C333C A60301AA */ sh $v1, 0x01AA($s0) ## 000001AA diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C54C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C54C0.s index 974a853c18..1c0075fe37 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C54C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C54C0.s @@ -6,18 +6,18 @@ glabel func_808C54C0 /* 04340 808C54D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 04344 808C54D4 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 /* 04348 808C54D8 E48001E4 */ swc1 $f0, 0x01E4($a0) ## 000001E4 -/* 0434C 808C54DC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0434C 808C54DC 3C040600 */ lui $a0, %hi(D_06002D0C) ## $a0 = 06000000 /* 04350 808C54E0 0C028800 */ jal SkelAnime_GetFrameCount -/* 04354 808C54E4 24842D0C */ addiu $a0, $a0, 0x2D0C ## $a0 = 06002D0C +/* 04354 808C54E4 24842D0C */ addiu $a0, $a0, %lo(D_06002D0C) ## $a0 = 06002D0C /* 04358 808C54E8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0435C 808C54EC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 04360 808C54F0 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 /* 04364 808C54F4 468021A0 */ cvt.s.w $f6, $f4 -/* 04368 808C54F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 04368 808C54F8 3C050600 */ lui $a1, %hi(D_06002D0C) ## $a1 = 06000000 /* 0436C 808C54FC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 04370 808C5500 AFAE0014 */ sw $t6, 0x0014($sp) -/* 04374 808C5504 24A52D0C */ addiu $a1, $a1, 0x2D0C ## $a1 = 06002D0C +/* 04374 808C5504 24A52D0C */ addiu $a1, $a1, %lo(D_06002D0C) ## $a1 = 06002D0C /* 04378 808C5508 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0437C 808C550C E7A60010 */ swc1 $f6, 0x0010($sp) /* 04380 808C5510 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s index 7bdb368701..604d8db159 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s @@ -293,10 +293,10 @@ glabel L808C5670 /* 046DC 808C586C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF /* 046E0 808C5870 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 046E4 808C5874 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 046E4 808C5874 3C040600 */ lui $a0, %hi(D_06002D0C) ## $a0 = 06000000 /* 046E8 808C5878 0C028800 */ jal SkelAnime_GetFrameCount -/* 046EC 808C587C 24842D0C */ addiu $a0, $a0, 0x2D0C ## $a0 = 06002D0C +/* 046EC 808C587C 24842D0C */ addiu $a0, $a0, %lo(D_06002D0C) ## $a0 = 06002D0C /* 046F0 808C5880 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 046F4 808C5884 8FA4004C */ lw $a0, 0x004C($sp) /* 046F8 808C5888 468052A0 */ cvt.s.w $f10, $f10 @@ -304,18 +304,18 @@ glabel L808C5670 /* 04700 808C5890 0C0295B2 */ jal func_800A56C8 /* 04704 808C5894 00000000 */ nop /* 04708 808C5898 104004FA */ beq $v0, $zero, .L808C6C84 -/* 0470C 808C589C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0470C 808C589C 3C040600 */ lui $a0, %hi(D_06003CF8) ## $a0 = 06000000 /* 04710 808C58A0 0C028800 */ jal SkelAnime_GetFrameCount -/* 04714 808C58A4 24843CF8 */ addiu $a0, $a0, 0x3CF8 ## $a0 = 06003CF8 +/* 04714 808C58A4 24843CF8 */ addiu $a0, $a0, %lo(D_06003CF8) ## $a0 = 06003CF8 /* 04718 808C58A8 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 0471C 808C58AC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 04720 808C58B0 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 /* 04724 808C58B4 46809120 */ cvt.s.w $f4, $f18 -/* 04728 808C58B8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 04728 808C58B8 3C050600 */ lui $a1, %hi(D_06003CF8) ## $a1 = 06000000 /* 0472C 808C58BC 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 04730 808C58C0 AFA80014 */ sw $t0, 0x0014($sp) -/* 04734 808C58C4 24A53CF8 */ addiu $a1, $a1, 0x3CF8 ## $a1 = 06003CF8 +/* 04734 808C58C4 24A53CF8 */ addiu $a1, $a1, %lo(D_06003CF8) ## $a1 = 06003CF8 /* 04738 808C58C8 8FA4004C */ lw $a0, 0x004C($sp) /* 0473C 808C58CC E7A40010 */ swc1 $f4, 0x0010($sp) /* 04740 808C58D0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 @@ -383,10 +383,10 @@ glabel L808C5934 /* 04824 808C59B4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF /* 04828 808C59B8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0482C 808C59BC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0482C 808C59BC 3C040600 */ lui $a0, %hi(D_06003CF8) ## $a0 = 06000000 /* 04830 808C59C0 0C028800 */ jal SkelAnime_GetFrameCount -/* 04834 808C59C4 24843CF8 */ addiu $a0, $a0, 0x3CF8 ## $a0 = 06003CF8 +/* 04834 808C59C4 24843CF8 */ addiu $a0, $a0, %lo(D_06003CF8) ## $a0 = 06003CF8 /* 04838 808C59C8 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 0483C 808C59CC 8FA4004C */ lw $a0, 0x004C($sp) /* 04840 808C59D0 46804220 */ cvt.s.w $f8, $f8 @@ -399,10 +399,10 @@ glabel L808C5934 /* 0485C 808C59EC 44815000 */ mtc1 $at, $f10 ## $f10 = 59.00 /* 04860 808C59F0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 04864 808C59F4 44819000 */ mtc1 $at, $f18 ## $f18 = -1.00 -/* 04868 808C59F8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 04868 808C59F8 3C050601 */ lui $a1, %hi(D_0600DF38) ## $a1 = 06010000 /* 0486C 808C59FC 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 /* 04870 808C5A00 AFAC0014 */ sw $t4, 0x0014($sp) -/* 04874 808C5A04 24A5DF38 */ addiu $a1, $a1, 0xDF38 ## $a1 = 0600DF38 +/* 04874 808C5A04 24A5DF38 */ addiu $a1, $a1, %lo(D_0600DF38) ## $a1 = 0600DF38 /* 04878 808C5A08 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0487C 808C5A0C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 04880 808C5A10 E7AA0010 */ swc1 $f10, 0x0010($sp) @@ -809,18 +809,18 @@ glabel L808C5A4C glabel L808C5FE4 /* 04E54 808C5FE4 860301DA */ lh $v1, 0x01DA($s0) ## 000001DA /* 04E58 808C5FE8 24010374 */ addiu $at, $zero, 0x0374 ## $at = 00000374 -/* 04E5C 808C5FEC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 04E5C 808C5FEC 3C040600 */ lui $a0, %hi(D_060042A8) ## $a0 = 06000000 /* 04E60 808C5FF0 54610024 */ bnel $v1, $at, .L808C6084 /* 04E64 808C5FF4 28610356 */ slti $at, $v1, 0x0356 /* 04E68 808C5FF8 0C028800 */ jal SkelAnime_GetFrameCount -/* 04E6C 808C5FFC 248442A8 */ addiu $a0, $a0, 0x42A8 ## $a0 = 060042A8 +/* 04E6C 808C5FFC 248442A8 */ addiu $a0, $a0, %lo(D_060042A8) ## $a0 = 060042A8 /* 04E70 808C6000 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 04E74 808C6004 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000 /* 04E78 808C6008 44812000 */ mtc1 $at, $f4 ## $f4 = -20.00 /* 04E7C 808C600C 468054A0 */ cvt.s.w $f18, $f10 -/* 04E80 808C6010 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04E84 808C6014 24A542A8 */ addiu $a1, $a1, 0x42A8 ## $a1 = 060042A8 +/* 04E80 808C6010 3C050600 */ lui $a1, %hi(D_060042A8) ## $a1 = 06000000 +/* 04E84 808C6014 24A542A8 */ addiu $a1, $a1, %lo(D_060042A8) ## $a1 = 060042A8 /* 04E88 808C6018 8FA4004C */ lw $a0, 0x004C($sp) /* 04E8C 808C601C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04E90 808C6020 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6DE8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6DE8.s index 8e148676bd..2219d07e04 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6DE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6DE8.s @@ -51,17 +51,17 @@ glabel func_808C6DE8 /* 05CE0 808C6E70 17CE0042 */ bne $s8, $t6, .L808C6F7C /* 05CE4 808C6E74 02E19021 */ addu $s2, $s7, $at /* 05CE8 808C6E78 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 05CEC 808C6E7C 3C150601 */ lui $s5, 0x0601 ## $s5 = 06010000 +/* 05CEC 808C6E7C 3C150601 */ lui $s5, %hi(D_06009DD0) ## $s5 = 06010000 /* 05CF0 808C6E80 3C18E700 */ lui $t8, 0xE700 ## $t8 = E7000000 /* 05CF4 808C6E84 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 05CF8 808C6E88 AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 -/* 05CFC 808C6E8C 26B59DD0 */ addiu $s5, $s5, 0x9DD0 ## $s5 = 06009DD0 +/* 05CFC 808C6E8C 26B59DD0 */ addiu $s5, $s5, %lo(D_06009DD0) ## $s5 = 06009DD0 /* 05D00 808C6E90 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 05D04 808C6E94 1660000A */ bne $s3, $zero, .L808C6EC0 /* 05D08 808C6E98 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 05D0C 808C6E9C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 05D10 808C6EA0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 05D14 808C6EA4 24849D50 */ addiu $a0, $a0, 0x9D50 ## $a0 = 06009D50 +/* 05D10 808C6EA0 3C040601 */ lui $a0, %hi(D_06009D50) ## $a0 = 06010000 +/* 05D14 808C6EA4 24849D50 */ addiu $a0, $a0, %lo(D_06009D50) ## $a0 = 06009D50 /* 05D18 808C6EA8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 05D1C 808C6EAC AE3902D0 */ sw $t9, 0x02D0($s1) ## 000002D0 /* 05D20 808C6EB0 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 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 b56f20fd4d..be262c52a7 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 @@ -49,8 +49,8 @@ glabel BossGanon_Draw /* 0A4F8 808E0D68 AE4202C0 */ sw $v0, 0x02C0($s2) ## 000002C0 /* 0A4FC 808E0D6C 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 .L808E0D70: -/* 0A500 808E0D70 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 0A504 808E0D74 24849A20 */ addiu $a0, $a0, 0x9A20 ## $a0 = 06009A20 +/* 0A500 808E0D70 3C040601 */ lui $a0, %hi(D_06009A20) ## $a0 = 06010000 +/* 0A504 808E0D74 24849A20 */ addiu $a0, $a0, %lo(D_06009A20) ## $a0 = 06009A20 /* 0A508 808E0D78 00045100 */ sll $t2, $a0, 4 /* 0A50C 808E0D7C 000A5F02 */ srl $t3, $t2, 28 /* 0A510 808E0D80 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s index f9994290df..0f834c8086 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s @@ -66,8 +66,8 @@ glabel BossGanon_Init /* 009E0 808D7250 0C00B58B */ jal Actor_SetScale /* 009E4 808D7254 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009E8 808D7258 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 009EC 808D725C 24C614E8 */ addiu $a2, $a2, 0x14E8 ## $a2 = 060114E8 +/* 009E8 808D7258 3C060601 */ lui $a2, %hi(D_060114E8) ## $a2 = 06010000 +/* 009EC 808D725C 24C614E8 */ addiu $a2, $a2, %lo(D_060114E8) ## $a2 = 060114E8 /* 009F0 808D7260 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 009F4 808D7264 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 /* 009F8 808D7268 00003825 */ or $a3, $zero, $zero ## $a3 = 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 ca07399398..e8a3e635ae 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 @@ -41,11 +41,11 @@ glabel func_808D779C /* 00FB8 808D7828 01284821 */ addu $t1, $t1, $t0 /* 00FBC 808D782C 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 /* 00FC0 808D7830 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00FC4 808D7834 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00FC4 808D7834 3C050600 */ lui $a1, %hi(D_06005FFC) ## $a1 = 06000000 /* 00FC8 808D7838 01215021 */ addu $t2, $t1, $at /* 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 +/* 00FD4 808D7844 24A55FFC */ addiu $a1, $a1, %lo(D_06005FFC) ## $a1 = 06005FFC /* 00FD8 808D7848 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00FDC 808D784C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00FE0 808D7850 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 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 d482144c8d..c933dde76f 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 @@ -159,8 +159,8 @@ glabel L808D79E8 /* 0123C 808D7AAC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01240 808D7AB0 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 01244 808D7AB4 8FAA0068 */ lw $t2, 0x0068($sp) -/* 01248 808D7AB8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0124C 808D7ABC 24A589F8 */ addiu $a1, $a1, 0x89F8 ## $a1 = 060089F8 +/* 01248 808D7AB8 3C050601 */ lui $a1, %hi(D_060089F8) ## $a1 = 06010000 +/* 0124C 808D7ABC 24A589F8 */ addiu $a1, $a1, %lo(D_060089F8) ## $a1 = 060089F8 /* 01250 808D7AC0 E54A002C */ swc1 $f10, 0x002C($t2) ## 0000002C /* 01254 808D7AC4 A200071A */ sb $zero, 0x071A($s0) ## 0000071A /* 01258 808D7AC8 8FA4004C */ lw $a0, 0x004C($sp) @@ -691,13 +691,13 @@ glabel L808D8220 /* 019D8 808D8248 0C03E803 */ jal Audio_SetBGM /* 019DC 808D824C 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF -/* 019E0 808D8250 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 019E0 808D8250 3C040600 */ lui $a0, %hi(D_06004F64) ## $a0 = 06000000 /* 019E4 808D8254 0C028800 */ jal SkelAnime_GetFrameCount -/* 019E8 808D8258 24844F64 */ addiu $a0, $a0, 0x4F64 ## $a0 = 06004F64 +/* 019E8 808D8258 24844F64 */ addiu $a0, $a0, %lo(D_06004F64) ## $a0 = 06004F64 /* 019EC 808D825C 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 019F0 808D8260 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 019F4 808D8264 24A54F64 */ addiu $a1, $a1, 0x4F64 ## $a1 = 06004F64 +/* 019F0 808D8260 3C050600 */ lui $a1, %hi(D_06004F64) ## $a1 = 06000000 +/* 019F4 808D8264 24A54F64 */ addiu $a1, $a1, %lo(D_06004F64) ## $a1 = 06004F64 /* 019F8 808D8268 46809120 */ cvt.s.w $f4, $f18 /* 019FC 808D826C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01A00 808D8270 E60401CC */ swc1 $f4, 0x01CC($s0) ## 000001CC @@ -712,8 +712,8 @@ glabel L808D8220 /* 01A20 808D8290 8E0501CC */ lw $a1, 0x01CC($s0) ## 000001CC /* 01A24 808D8294 10400009 */ beq $v0, $zero, .L808D82BC /* 01A28 808D8298 8FA4004C */ lw $a0, 0x004C($sp) -/* 01A2C 808D829C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01A30 808D82A0 24A56AF4 */ addiu $a1, $a1, 0x6AF4 ## $a1 = 06006AF4 +/* 01A2C 808D829C 3C050600 */ lui $a1, %hi(D_06006AF4) ## $a1 = 06000000 +/* 01A30 808D82A0 24A56AF4 */ addiu $a1, $a1, %lo(D_06006AF4) ## $a1 = 06006AF4 /* 01A34 808D82A4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01A38 808D82A8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01A3C 808D82AC 3C01447A */ lui $at, 0x447A ## $at = 447A0000 @@ -792,14 +792,14 @@ glabel L808D83A4 /* 01B4C 808D83BC 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 /* 01B50 808D83C0 1461001D */ bne $v1, $at, .L808D8438 /* 01B54 808D83C4 8FA4004C */ lw $a0, 0x004C($sp) -/* 01B58 808D83C8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01B5C 808D83CC 24A54304 */ addiu $a1, $a1, 0x4304 ## $a1 = 06004304 +/* 01B58 808D83C8 3C050600 */ lui $a1, %hi(D_06004304) ## $a1 = 06000000 +/* 01B5C 808D83CC 24A54304 */ addiu $a1, $a1, %lo(D_06004304) ## $a1 = 06004304 /* 01B60 808D83D0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01B64 808D83D4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 01B68 808D83D8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01B68 808D83D8 3C040600 */ lui $a0, %hi(D_06004304) ## $a0 = 06000000 /* 01B6C 808D83DC 0C028800 */ jal SkelAnime_GetFrameCount -/* 01B70 808D83E0 24844304 */ addiu $a0, $a0, 0x4304 ## $a0 = 06004304 +/* 01B70 808D83E0 24844304 */ addiu $a0, $a0, %lo(D_06004304) ## $a0 = 06004304 /* 01B74 808D83E4 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 01B78 808D83E8 00000000 */ nop /* 01B7C 808D83EC 46805420 */ cvt.s.w $f16, $f10 @@ -813,8 +813,8 @@ glabel L808D83A4 /* 01B98 808D8408 240570CA */ addiu $a1, $zero, 0x70CA ## $a1 = 000070CA /* 01B9C 808D840C 0C042DA0 */ jal func_8010B680 /* 01BA0 808D8410 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01BA4 808D8414 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01BA8 808D8418 24A589F8 */ addiu $a1, $a1, 0x89F8 ## $a1 = 060089F8 +/* 01BA4 808D8414 3C050601 */ lui $a1, %hi(D_060089F8) ## $a1 = 06010000 +/* 01BA8 808D8418 24A589F8 */ addiu $a1, $a1, %lo(D_060089F8) ## $a1 = 060089F8 /* 01BAC 808D841C 8FA4004C */ lw $a0, 0x004C($sp) /* 01BB0 808D8420 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01BB4 808D8424 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 @@ -841,15 +841,15 @@ glabel L808D8468 /* 01C00 808D8470 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 /* 01C04 808D8474 1461000D */ bne $v1, $at, .L808D84AC /* 01C08 808D8478 A20D01A0 */ sb $t5, 0x01A0($s0) ## 000001A0 -/* 01C0C 808D847C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01C10 808D8480 24A51F58 */ addiu $a1, $a1, 0x1F58 ## $a1 = 06001F58 +/* 01C0C 808D847C 3C050600 */ lui $a1, %hi(D_06001F58) ## $a1 = 06000000 +/* 01C10 808D8480 24A51F58 */ addiu $a1, $a1, %lo(D_06001F58) ## $a1 = 06001F58 /* 01C14 808D8484 8FA4004C */ lw $a0, 0x004C($sp) /* 01C18 808D8488 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01C1C 808D848C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 01C20 808D8490 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01C20 808D8490 3C040600 */ lui $a0, %hi(D_06001F58) ## $a0 = 06000000 /* 01C24 808D8494 0C028800 */ jal SkelAnime_GetFrameCount -/* 01C28 808D8498 24841F58 */ addiu $a0, $a0, 0x1F58 ## $a0 = 06001F58 +/* 01C28 808D8498 24841F58 */ addiu $a0, $a0, %lo(D_06001F58) ## $a0 = 06001F58 /* 01C2C 808D849C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01C30 808D84A0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01C34 808D84A4 468021A0 */ cvt.s.w $f6, $f4 @@ -946,8 +946,8 @@ glabel L808D8598 /* 01D80 808D85F0 00000000 */ nop /* 01D84 808D85F4 10400009 */ beq $v0, $zero, .L808D861C /* 01D88 808D85F8 8FA4004C */ lw $a0, 0x004C($sp) -/* 01D8C 808D85FC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01D90 808D8600 24A53018 */ addiu $a1, $a1, 0x3018 ## $a1 = 06003018 +/* 01D8C 808D85FC 3C050600 */ lui $a1, %hi(D_06003018) ## $a1 = 06000000 +/* 01D90 808D8600 24A53018 */ addiu $a1, $a1, %lo(D_06003018) ## $a1 = 06003018 /* 01D94 808D8604 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01D98 808D8608 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01D9C 808D860C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 @@ -970,8 +970,8 @@ glabel L808D8598 /* 01DDC 808D864C 240570CC */ addiu $a1, $zero, 0x70CC ## $a1 = 000070CC /* 01DE0 808D8650 0C042DA0 */ jal func_8010B680 /* 01DE4 808D8654 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01DE8 808D8658 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01DEC 808D865C 24A57268 */ addiu $a1, $a1, 0x7268 ## $a1 = 06007268 +/* 01DE8 808D8658 3C050600 */ lui $a1, %hi(D_06007268) ## $a1 = 06000000 +/* 01DEC 808D865C 24A57268 */ addiu $a1, $a1, %lo(D_06007268) ## $a1 = 06007268 /* 01DF0 808D8660 8FA4004C */ lw $a0, 0x004C($sp) /* 01DF4 808D8664 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01DF8 808D8668 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 @@ -1064,8 +1064,8 @@ glabel L808D86B4 /* 01F34 808D87A4 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 /* 01F38 808D87A8 14610006 */ bne $v1, $at, .L808D87C4 /* 01F3C 808D87AC 8FA4004C */ lw $a0, 0x004C($sp) -/* 01F40 808D87B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01F44 808D87B4 24A57A64 */ addiu $a1, $a1, 0x7A64 ## $a1 = 06007A64 +/* 01F40 808D87B0 3C050600 */ lui $a1, %hi(D_06007A64) ## $a1 = 06000000 +/* 01F44 808D87B4 24A57A64 */ addiu $a1, $a1, %lo(D_06007A64) ## $a1 = 06007A64 /* 01F48 808D87B8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01F4C 808D87BC 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01F50 808D87C0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 @@ -1320,8 +1320,8 @@ glabel L808D8A98 /* 022E0 808D8B50 8FA50074 */ lw $a1, 0x0074($sp) /* 022E4 808D8B54 0C235C4B */ jal func_808D712C /* 022E8 808D8B58 2406017C */ addiu $a2, $zero, 0x017C ## $a2 = 0000017C -/* 022EC 808D8B5C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 022F0 808D8B60 24A58A88 */ addiu $a1, $a1, 0x8A88 ## $a1 = 06008A88 +/* 022EC 808D8B5C 3C050601 */ lui $a1, %hi(D_06008A88) ## $a1 = 06010000 +/* 022F0 808D8B60 24A58A88 */ addiu $a1, $a1, %lo(D_06008A88) ## $a1 = 06008A88 /* 022F4 808D8B64 8FA4004C */ lw $a0, 0x004C($sp) /* 022F8 808D8B68 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 022FC 808D8B6C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 @@ -1369,8 +1369,8 @@ glabel L808D8A98 /* 02390 808D8C00 AC6A0018 */ sw $t2, 0x0018($v1) ## 80166FC0 /* 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 +/* 0239C 808D8C0C 3C020601 */ lui $v0, %hi(D_0600CF00) ## $v0 = 06010000 +/* 023A0 808D8C10 2442CF00 */ addiu $v0, $v0, %lo(D_0600CF00) ## $v0 = 0600CF00 /* 023A4 808D8C14 308B0100 */ andi $t3, $a0, 0x0100 ## $t3 = 00000000 /* 023A8 808D8C18 15600017 */ bne $t3, $zero, .L808D8C78 /* 023AC 808D8C1C 00026900 */ sll $t5, $v0, 4 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 b1706606f2..edc3ca3635 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 @@ -36,18 +36,18 @@ glabel func_808D9018 /* 02828 808D9098 01495021 */ addu $t2, $t2, $t1 /* 0282C 808D909C 8D4A17B4 */ lw $t2, 0x17B4($t2) ## 000117B4 /* 02830 808D90A0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02834 808D90A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 02834 808D90A4 3C050601 */ lui $a1, %hi(D_0600EA00) ## $a1 = 06010000 /* 02838 808D90A8 01415821 */ addu $t3, $t2, $at /* 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 +/* 02844 808D90B4 24A5EA00 */ addiu $a1, $a1, %lo(D_0600EA00) ## $a1 = 0600EA00 /* 02848 808D90B8 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 0284C 808D90BC 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 02850 808D90C0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 02854 808D90C4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 02854 808D90C4 3C040601 */ lui $a0, %hi(D_0600EA00) ## $a0 = 06010000 /* 02858 808D90C8 0C028800 */ jal SkelAnime_GetFrameCount -/* 0285C 808D90CC 2484EA00 */ addiu $a0, $a0, 0xEA00 ## $a0 = 0600EA00 +/* 0285C 808D90CC 2484EA00 */ addiu $a0, $a0, %lo(D_0600EA00) ## $a0 = 0600EA00 /* 02860 808D90D0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02864 808D90D4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 02868 808D90D8 468021A0 */ cvt.s.w $f6, $f4 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 43c9f1ac40..44a31a3218 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 @@ -28,18 +28,18 @@ glabel func_808D90F8 /* 028E8 808D9158 0338C821 */ addu $t9, $t9, $t8 /* 028EC 808D915C 8F3917B4 */ lw $t9, 0x17B4($t9) ## 000117B4 /* 028F0 808D9160 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 028F4 808D9164 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 028F4 808D9164 3C050601 */ lui $a1, %hi(D_0600EA00) ## $a1 = 06010000 /* 028F8 808D9168 03214021 */ addu $t0, $t9, $at /* 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 +/* 02904 808D9174 24A5EA00 */ addiu $a1, $a1, %lo(D_0600EA00) ## $a1 = 0600EA00 /* 02908 808D9178 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 0290C 808D917C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 02910 808D9180 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 02914 808D9184 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 02914 808D9184 3C040601 */ lui $a0, %hi(D_0600EA00) ## $a0 = 06010000 /* 02918 808D9188 0C028800 */ jal SkelAnime_GetFrameCount -/* 0291C 808D918C 2484EA00 */ addiu $a0, $a0, 0xEA00 ## $a0 = 0600EA00 +/* 0291C 808D918C 2484EA00 */ addiu $a0, $a0, %lo(D_0600EA00) ## $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, %hi(gSaveContext) 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 ce9de6c066..a405bf6702 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 @@ -5,10 +5,10 @@ glabel D_808F7EEC .text glabel func_808D91F8 /* 02988 808D91F8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0298C 808D91FC 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 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 +/* 0298C 808D91FC 3C020200 */ lui $v0, %hi(D_02006C18) ## $v0 = 02000000 +/* 02990 808D9200 3C030200 */ lui $v1, %hi(D_02007418) ## $v1 = 02000000 +/* 02994 808D9204 24426C18 */ addiu $v0, $v0, %lo(D_02006C18) ## $v0 = 02006C18 +/* 02998 808D9208 24637418 */ addiu $v1, $v1, %lo(D_02007418) ## $v1 = 02007418 /* 0299C 808D920C 3C058016 */ lui $a1, %hi(gSegments) /* 029A0 808D9210 00027100 */ sll $t6, $v0, 4 /* 029A4 808D9214 00035900 */ sll $t3, $v1, 4 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 aca60f832d..be4272993a 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 @@ -263,8 +263,8 @@ glabel L808D94C4 /* 02D08 808D9578 8E0501CC */ lw $a1, 0x01CC($s0) ## 000001CC /* 02D0C 808D957C 10400008 */ beq $v0, $zero, .L808D95A0 /* 02D10 808D9580 8FA40054 */ lw $a0, 0x0054($sp) -/* 02D14 808D9584 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02D18 808D9588 24A5F19C */ addiu $a1, $a1, 0xF19C ## $a1 = 0600F19C +/* 02D14 808D9584 3C050601 */ lui $a1, %hi(D_0600F19C) ## $a1 = 06010000 +/* 02D18 808D9588 24A5F19C */ addiu $a1, $a1, %lo(D_0600F19C) ## $a1 = 0600F19C /* 02D1C 808D958C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 02D20 808D9590 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 02D24 808D9594 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 @@ -377,14 +377,14 @@ glabel L808D9654 /* 02EB0 808D9720 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 /* 02EB4 808D9724 14400010 */ bne $v0, $zero, .L808D9768 /* 02EB8 808D9728 8FA40054 */ lw $a0, 0x0054($sp) -/* 02EBC 808D972C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02EC0 808D9730 24A5B668 */ addiu $a1, $a1, 0xB668 ## $a1 = 0600B668 +/* 02EBC 808D972C 3C050601 */ lui $a1, %hi(D_0600B668) ## $a1 = 06010000 +/* 02EC0 808D9730 24A5B668 */ addiu $a1, $a1, %lo(D_0600B668) ## $a1 = 0600B668 /* 02EC4 808D9734 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 02EC8 808D9738 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 02ECC 808D973C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 02ECC 808D973C 3C040601 */ lui $a0, %hi(D_0600B668) ## $a0 = 06010000 /* 02ED0 808D9740 0C028800 */ jal SkelAnime_GetFrameCount -/* 02ED4 808D9744 2484B668 */ addiu $a0, $a0, 0xB668 ## $a0 = 0600B668 +/* 02ED4 808D9744 2484B668 */ addiu $a0, $a0, %lo(D_0600B668) ## $a0 = 0600B668 /* 02ED8 808D9748 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 02EDC 808D974C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02EE0 808D9750 240539D2 */ addiu $a1, $zero, 0x39D2 ## $a1 = 000039D2 @@ -481,8 +481,8 @@ glabel L808D9654 /* 03028 808D9898 8E0501CC */ lw $a1, 0x01CC($s0) ## 000001CC /* 0302C 808D989C 10400008 */ beq $v0, $zero, .L808D98C0 /* 03030 808D98A0 8FA40054 */ lw $a0, 0x0054($sp) -/* 03034 808D98A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 03038 808D98A8 24A5BE38 */ addiu $a1, $a1, 0xBE38 ## $a1 = 0600BE38 +/* 03034 808D98A4 3C050601 */ lui $a1, %hi(D_0600BE38) ## $a1 = 06010000 +/* 03038 808D98A8 24A5BE38 */ addiu $a1, $a1, %lo(D_0600BE38) ## $a1 = 0600BE38 /* 0303C 808D98AC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 03040 808D98B0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 03044 808D98B4 240C0004 */ addiu $t4, $zero, 0x0004 ## $t4 = 00000004 @@ -520,15 +520,15 @@ glabel L808D9900 /* 030B4 808D9924 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 /* 030B8 808D9928 A6090678 */ sh $t1, 0x0678($s0) ## 00000678 /* 030BC 808D992C AE000674 */ sw $zero, 0x0674($s0) ## 00000674 -/* 030C0 808D9930 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 030C4 808D9934 24A50298 */ addiu $a1, $a1, 0x0298 ## $a1 = 06010298 +/* 030C0 808D9930 3C050601 */ lui $a1, %hi(D_06010298) ## $a1 = 06010000 +/* 030C4 808D9934 24A50298 */ addiu $a1, $a1, %lo(D_06010298) ## $a1 = 06010298 /* 030C8 808D9938 8FA40054 */ lw $a0, 0x0054($sp) /* 030CC 808D993C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 030D0 808D9940 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 030D4 808D9944 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 030D4 808D9944 3C040601 */ lui $a0, %hi(D_06010298) ## $a0 = 06010000 /* 030D8 808D9948 0C028800 */ jal SkelAnime_GetFrameCount -/* 030DC 808D994C 24840298 */ addiu $a0, $a0, 0x0298 ## $a0 = 06010298 +/* 030DC 808D994C 24840298 */ addiu $a0, $a0, %lo(D_06010298) ## $a0 = 06010298 /* 030E0 808D9950 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 030E4 808D9954 C61001FC */ lwc1 $f16, 0x01FC($s0) ## 000001FC /* 030E8 808D9958 C60E0200 */ lwc1 $f14, 0x0200($s0) ## 00000200 @@ -614,8 +614,8 @@ glabel L808D9A54 /* 03218 808D9A88 8E0501CC */ lw $a1, 0x01CC($s0) ## 000001CC /* 0321C 808D9A8C 10400014 */ beq $v0, $zero, .L808D9AE0 /* 03220 808D9A90 8FA40054 */ lw $a0, 0x0054($sp) -/* 03224 808D9A94 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 03228 808D9A98 24A50514 */ addiu $a1, $a1, 0x0514 ## $a1 = 06010514 +/* 03224 808D9A94 3C050601 */ lui $a1, %hi(D_06010514) ## $a1 = 06010000 +/* 03228 808D9A98 24A50514 */ addiu $a1, $a1, %lo(D_06010514) ## $a1 = 06010514 /* 0322C 808D9A9C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 03230 808D9AA0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 03234 808D9AA4 3C01447A */ lui $at, 0x447A ## $at = 447A0000 @@ -914,15 +914,15 @@ glabel L808D9E8C /* 03658 808D9EC8 8605067A */ lh $a1, 0x067A($s0) ## 0000067A /* 0365C 808D9ECC 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 03660 808D9ED0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 03664 808D9ED4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 03668 808D9ED8 24A5ADDC */ addiu $a1, $a1, 0xADDC ## $a1 = 0600ADDC +/* 03664 808D9ED4 3C050601 */ lui $a1, %hi(D_0600ADDC) ## $a1 = 06010000 +/* 03668 808D9ED8 24A5ADDC */ addiu $a1, $a1, %lo(D_0600ADDC) ## $a1 = 0600ADDC /* 0366C 808D9EDC 8FA40054 */ lw $a0, 0x0054($sp) /* 03670 808D9EE0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 03674 808D9EE4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 03678 808D9EE8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 03678 808D9EE8 3C040601 */ lui $a0, %hi(D_0600EA00) ## $a0 = 06010000 /* 0367C 808D9EEC 0C028800 */ jal SkelAnime_GetFrameCount -/* 03680 808D9EF0 2484EA00 */ addiu $a0, $a0, 0xEA00 ## $a0 = 0600EA00 +/* 03680 808D9EF0 2484EA00 */ addiu $a0, $a0, %lo(D_0600EA00) ## $a0 = 0600EA00 /* 03684 808D9EF4 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 03688 808D9EF8 8FA600B4 */ lw $a2, 0x00B4($sp) /* 0368C 808D9EFC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s index feb704a49e..cffcd6dfc0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s @@ -134,15 +134,15 @@ glabel L808DAD6C /* 04648 808DAEB8 00000000 */ nop /* 0464C 808DAEBC 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 /* 04650 808DAEC0 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 04654 808DAEC4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 04654 808DAEC4 3C040600 */ lui $a0, %hi(D_06002D2C) ## $a0 = 06000000 /* 04658 808DAEC8 1441000E */ bne $v0, $at, .L808DAF04 /* 0465C 808DAECC 00000000 */ nop /* 04660 808DAED0 0C028800 */ jal SkelAnime_GetFrameCount -/* 04664 808DAED4 24842D2C */ addiu $a0, $a0, 0x2D2C ## $a0 = 06002D2C +/* 04664 808DAED4 24842D2C */ addiu $a0, $a0, %lo(D_06002D2C) ## $a0 = 06002D2C /* 04668 808DAED8 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 0466C 808DAEDC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04670 808DAEE0 24A52D2C */ addiu $a1, $a1, 0x2D2C ## $a1 = 06002D2C +/* 0466C 808DAEDC 3C050600 */ lui $a1, %hi(D_06002D2C) ## $a1 = 06000000 +/* 04670 808DAEE0 24A52D2C */ addiu $a1, $a1, %lo(D_06002D2C) ## $a1 = 06002D2C /* 04674 808DAEE4 46803220 */ cvt.s.w $f8, $f6 /* 04678 808DAEE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000150 /* 0467C 808DAEEC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 @@ -260,13 +260,13 @@ glabel L808DB080 /* 04814 808DB084 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 04818 808DB088 A23801A0 */ sb $t8, 0x01A0($s1) ## 000001A0 /* 0481C 808DB08C 1720004B */ bne $t9, $zero, .L808DB1BC -/* 04820 808DB090 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 04820 808DB090 3C040600 */ lui $a0, %hi(D_0600343C) ## $a0 = 06000000 /* 04824 808DB094 0C028800 */ jal SkelAnime_GetFrameCount -/* 04828 808DB098 2484343C */ addiu $a0, $a0, 0x343C ## $a0 = 0600343C +/* 04828 808DB098 2484343C */ addiu $a0, $a0, %lo(D_0600343C) ## $a0 = 0600343C /* 0482C 808DB09C 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 04830 808DB0A0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04834 808DB0A4 24A5343C */ addiu $a1, $a1, 0x343C ## $a1 = 0600343C +/* 04830 808DB0A0 3C050600 */ lui $a1, %hi(D_0600343C) ## $a1 = 06000000 +/* 04834 808DB0A4 24A5343C */ addiu $a1, $a1, %lo(D_0600343C) ## $a1 = 0600343C /* 04838 808DB0A8 468082A0 */ cvt.s.w $f10, $f16 /* 0483C 808DB0AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000001 /* 04840 808DB0B0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 @@ -297,13 +297,13 @@ glabel L808DB0D8 /* 04898 808DB108 0C0295B2 */ jal func_800A56C8 /* 0489C 808DB10C 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC /* 048A0 808DB110 1040002A */ beq $v0, $zero, .L808DB1BC -/* 048A4 808DB114 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 048A4 808DB114 3C040601 */ lui $a0, %hi(D_06008A88) ## $a0 = 06010000 /* 048A8 808DB118 0C028800 */ jal SkelAnime_GetFrameCount -/* 048AC 808DB11C 24848A88 */ addiu $a0, $a0, 0x8A88 ## $a0 = 06008A88 +/* 048AC 808DB11C 24848A88 */ addiu $a0, $a0, %lo(D_06008A88) ## $a0 = 06008A88 /* 048B0 808DB120 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 048B4 808DB124 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 048B8 808DB128 24A58A88 */ addiu $a1, $a1, 0x8A88 ## $a1 = 06008A88 +/* 048B4 808DB124 3C050601 */ lui $a1, %hi(D_06008A88) ## $a1 = 06010000 +/* 048B8 808DB128 24A58A88 */ addiu $a1, $a1, %lo(D_06008A88) ## $a1 = 06008A88 /* 048BC 808DB12C 468021A0 */ cvt.s.w $f6, $f4 /* 048C0 808DB130 02002025 */ or $a0, $s0, $zero ## $a0 = 00000001 /* 048C4 808DB134 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 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 eb37d89d58..68e7c4d9fd 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 @@ -93,8 +93,8 @@ glabel func_808DB2E8 /* 04B90 808DB400 00000000 */ nop glabel L808DB404 /* 04B94 808DB404 862F01B6 */ lh $t7, 0x01B6($s1) ## 000001B6 -/* 04B98 808DB408 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 -/* 04B9C 808DB40C 26101B0C */ addiu $s0, $s0, 0x1B0C ## $s0 = 06001B0C +/* 04B98 808DB408 3C100600 */ lui $s0, %hi(D_06001B0C) ## $s0 = 06000000 +/* 04B9C 808DB40C 26101B0C */ addiu $s0, $s0, %lo(D_06001B0C) ## $s0 = 06001B0C /* 04BA0 808DB410 55E001B1 */ bnel $t7, $zero, .L808DBAD8 /* 04BA4 808DB414 8FBF004C */ lw $ra, 0x004C($sp) /* 04BA8 808DB418 0C028800 */ jal SkelAnime_GetFrameCount @@ -115,8 +115,8 @@ glabel L808DB448 /* 04BDC 808DB44C 0C0295B2 */ jal func_800A56C8 /* 04BE0 808DB450 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC /* 04BE4 808DB454 1040019F */ beq $v0, $zero, .L808DBAD4 -/* 04BE8 808DB458 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 -/* 04BEC 808DB45C 26101FF8 */ addiu $s0, $s0, 0x1FF8 ## $s0 = 06001FF8 +/* 04BE8 808DB458 3C100600 */ lui $s0, %hi(D_06001FF8) ## $s0 = 06000000 +/* 04BEC 808DB45C 26101FF8 */ addiu $s0, $s0, %lo(D_06001FF8) ## $s0 = 06001FF8 /* 04BF0 808DB460 0C028800 */ jal SkelAnime_GetFrameCount /* 04BF4 808DB464 02002025 */ or $a0, $s0, $zero ## $a0 = 06001FF8 @@ -192,8 +192,8 @@ glabel L808DB498 .L808DB564: /* 04CF4 808DB564 14400017 */ bne $v0, $zero, .L808DB5C4 /* 04CF8 808DB568 262400B6 */ addiu $a0, $s1, 0x00B6 ## $a0 = 000000B6 -/* 04CFC 808DB56C 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 -/* 04D00 808DB570 26100540 */ addiu $s0, $s0, 0x0540 ## $s0 = 06000540 +/* 04CFC 808DB56C 3C100600 */ lui $s0, %hi(D_06000540) ## $s0 = 06000000 +/* 04D00 808DB570 26100540 */ addiu $s0, $s0, %lo(D_06000540) ## $s0 = 06000540 /* 04D04 808DB574 0C028800 */ jal SkelAnime_GetFrameCount /* 04D08 808DB578 02002025 */ or $a0, $s0, $zero ## $a0 = 06000540 @@ -475,8 +475,8 @@ glabel L808DB864 /* 050D4 808DB944 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 .L808DB948: /* 050D8 808DB948 862C01B8 */ lh $t4, 0x01B8($s1) ## 000001B8 -/* 050DC 808DB94C 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 -/* 050E0 808DB950 26100FE8 */ addiu $s0, $s0, 0x0FE8 ## $s0 = 06000FE8 +/* 050DC 808DB94C 3C100600 */ lui $s0, %hi(D_06000FE8) ## $s0 = 06000000 +/* 050E0 808DB950 26100FE8 */ addiu $s0, $s0, %lo(D_06000FE8) ## $s0 = 06000FE8 /* 050E4 808DB954 55800060 */ bnel $t4, $zero, .L808DBAD8 /* 050E8 808DB958 8FBF004C */ lw $ra, 0x004C($sp) /* 050EC 808DB95C 0C028800 */ jal SkelAnime_GetFrameCount @@ -559,8 +559,8 @@ glabel L808DB99C /* 051FC 808DBA6C 0C0295B2 */ jal func_800A56C8 /* 05200 808DBA70 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC /* 05204 808DBA74 10400017 */ beq $v0, $zero, .L808DBAD4 -/* 05208 808DBA78 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 -/* 0520C 808DBA7C 26101440 */ addiu $s0, $s0, 0x1440 ## $s0 = 06001440 +/* 05208 808DBA78 3C100600 */ lui $s0, %hi(D_06001440) ## $s0 = 06000000 +/* 0520C 808DBA7C 26101440 */ addiu $s0, $s0, %lo(D_06001440) ## $s0 = 06001440 /* 05210 808DBA80 0C028800 */ jal SkelAnime_GetFrameCount /* 05214 808DBA84 02002025 */ or $a0, $s0, $zero ## $a0 = 06001440 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s index f51e2d7ce0..7c5c2d09d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s @@ -5,8 +5,8 @@ glabel func_808DBAF0 /* 0528C 808DBAFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 05290 808DBB00 0C235C4B */ jal func_808D712C /* 05294 808DBB04 2406017C */ addiu $a2, $zero, 0x017C ## $a2 = 0000017C -/* 05298 808DBB08 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0529C 808DBB0C 24A59A14 */ addiu $a1, $a1, 0x9A14 ## $a1 = 06009A14 +/* 05298 808DBB08 3C050601 */ lui $a1, %hi(D_06009A14) ## $a1 = 06010000 +/* 0529C 808DBB0C 24A59A14 */ addiu $a1, $a1, %lo(D_06009A14) ## $a1 = 06009A14 /* 052A0 808DBB10 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 052A4 808DBB14 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 052A8 808DBB18 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBEC4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBEC4.s index 8bf1ab6a91..6b53378991 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBEC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBEC4.s @@ -5,13 +5,13 @@ glabel func_808DBEC4 /* 05660 808DBED0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 05664 808DBED4 0C235C4B */ jal func_808D712C /* 05668 808DBED8 2406017C */ addiu $a2, $zero, 0x017C ## $a2 = 0000017C -/* 0566C 808DBEDC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 0566C 808DBEDC 3C040601 */ lui $a0, %hi(D_0600AA24) ## $a0 = 06010000 /* 05670 808DBEE0 0C028800 */ jal SkelAnime_GetFrameCount -/* 05674 808DBEE4 2484AA24 */ addiu $a0, $a0, 0xAA24 ## $a0 = 0600AA24 +/* 05674 808DBEE4 2484AA24 */ addiu $a0, $a0, %lo(D_0600AA24) ## $a0 = 0600AA24 /* 05678 808DBEE8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0567C 808DBEEC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 05680 808DBEF0 24A5AA24 */ addiu $a1, $a1, 0xAA24 ## $a1 = 0600AA24 +/* 0567C 808DBEEC 3C050601 */ lui $a1, %hi(D_0600AA24) ## $a1 = 06010000 +/* 05680 808DBEF0 24A5AA24 */ addiu $a1, $a1, %lo(D_0600AA24) ## $a1 = 0600AA24 /* 05684 808DBEF4 468021A0 */ cvt.s.w $f6, $f4 /* 05688 808DBEF8 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 0568C 808DBEFC 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC0E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC0E8.s index 3abc19a809..53e0d1260c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC0E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC0E8.s @@ -4,15 +4,15 @@ glabel func_808DC0E8 /* 05880 808DC0F0 AFA40018 */ sw $a0, 0x0018($sp) /* 05884 808DC0F4 0C235C4B */ jal func_808D712C /* 05888 808DC0F8 2406017C */ addiu $a2, $zero, 0x017C ## $a2 = 0000017C -/* 0588C 808DC0FC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0588C 808DC0FC 3C040600 */ lui $a0, %hi(D_0600738C) ## $a0 = 06000000 /* 05890 808DC100 0C028800 */ jal SkelAnime_GetFrameCount -/* 05894 808DC104 2484738C */ addiu $a0, $a0, 0x738C ## $a0 = 0600738C +/* 05894 808DC104 2484738C */ addiu $a0, $a0, %lo(D_0600738C) ## $a0 = 0600738C /* 05898 808DC108 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0589C 808DC10C 8FA30018 */ lw $v1, 0x0018($sp) -/* 058A0 808DC110 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 058A0 808DC110 3C050600 */ lui $a1, %hi(D_0600738C) ## $a1 = 06000000 /* 058A4 808DC114 468021A0 */ cvt.s.w $f6, $f4 -/* 058A8 808DC118 24A5738C */ addiu $a1, $a1, 0x738C ## $a1 = 0600738C +/* 058A8 808DC118 24A5738C */ addiu $a1, $a1, %lo(D_0600738C) ## $a1 = 0600738C /* 058AC 808DC11C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 058B0 808DC120 24640150 */ addiu $a0, $v1, 0x0150 ## $a0 = 00000150 /* 058B4 808DC124 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop 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 496d99dd33..64157248c4 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 @@ -35,8 +35,8 @@ glabel func_808DC14C /* 05940 808DC1B0 10400007 */ beq $v0, $zero, .L808DC1D0 /* 05944 808DC1B4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 05948 808DC1B8 A60F01C2 */ sh $t7, 0x01C2($s0) ## 000001C2 -/* 0594C 808DC1BC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 05950 808DC1C0 24A59A14 */ addiu $a1, $a1, 0x9A14 ## $a1 = 06009A14 +/* 0594C 808DC1BC 3C050601 */ lui $a1, %hi(D_06009A14) ## $a1 = 06010000 +/* 05950 808DC1C0 24A59A14 */ addiu $a1, $a1, %lo(D_06009A14) ## $a1 = 06009A14 /* 05954 808DC1C4 8FA40044 */ lw $a0, 0x0044($sp) /* 05958 808DC1C8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0595C 808DC1CC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC420.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC420.s index 56f395af30..4f2a789498 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC420.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC420.s @@ -14,13 +14,13 @@ glabel func_808DC420 /* 05BDC 808DC44C 2406017C */ addiu $a2, $zero, 0x017C ## $a2 = 0000017C /* 05BE0 808DC450 0C235C4B */ jal func_808D712C /* 05BE4 808DC454 AFA20024 */ sw $v0, 0x0024($sp) -/* 05BE8 808DC458 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 05BE8 808DC458 3C040601 */ lui $a0, %hi(D_06009D5C) ## $a0 = 06010000 /* 05BEC 808DC45C 0C028800 */ jal SkelAnime_GetFrameCount -/* 05BF0 808DC460 24849D5C */ addiu $a0, $a0, 0x9D5C ## $a0 = 06009D5C +/* 05BF0 808DC460 24849D5C */ addiu $a0, $a0, %lo(D_06009D5C) ## $a0 = 06009D5C /* 05BF4 808DC464 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 05BF8 808DC468 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 05BFC 808DC46C 24A59D5C */ addiu $a1, $a1, 0x9D5C ## $a1 = 06009D5C +/* 05BF8 808DC468 3C050601 */ lui $a1, %hi(D_06009D5C) ## $a1 = 06010000 +/* 05BFC 808DC46C 24A59D5C */ addiu $a1, $a1, %lo(D_06009D5C) ## $a1 = 06009D5C /* 05C00 808DC470 468021A0 */ cvt.s.w $f6, $f4 /* 05C04 808DC474 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 05C08 808DC478 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s index 7944d06aa9..61f1b8a638 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s @@ -37,15 +37,15 @@ glabel func_808DC4DC /* 05CF4 808DC564 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 05CF8 808DC568 02202025 */ or $a0, $s1, $zero ## $a0 = 00000150 /* 05CFC 808DC56C 15400022 */ bne $t2, $zero, .L808DC5F8 -/* 05D00 808DC570 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 05D00 808DC570 3C050601 */ lui $a1, %hi(D_0600A598) ## $a1 = 06010000 /* 05D04 808DC574 A60B01C2 */ sh $t3, 0x01C2($s0) ## 000001C2 -/* 05D08 808DC578 24A5A598 */ addiu $a1, $a1, 0xA598 ## $a1 = 0600A598 +/* 05D08 808DC578 24A5A598 */ addiu $a1, $a1, %lo(D_0600A598) ## $a1 = 0600A598 /* 05D0C 808DC57C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 05D10 808DC580 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05D14 808DC584 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 05D14 808DC584 3C040601 */ lui $a0, %hi(D_0600A598) ## $a0 = 06010000 /* 05D18 808DC588 0C028800 */ jal SkelAnime_GetFrameCount -/* 05D1C 808DC58C 2484A598 */ addiu $a0, $a0, 0xA598 ## $a0 = 0600A598 +/* 05D1C 808DC58C 2484A598 */ addiu $a0, $a0, %lo(D_0600A598) ## $a0 = 0600A598 /* 05D20 808DC590 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 05D24 808DC594 02202025 */ or $a0, $s1, $zero ## $a0 = 00000150 /* 05D28 808DC598 468084A0 */ cvt.s.w $f18, $f16 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC66C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC66C.s index 99654abaf2..c9c18fc567 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC66C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC66C.s @@ -5,13 +5,13 @@ glabel func_808DC66C /* 05E08 808DC678 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 05E0C 808DC67C 0C235C4B */ jal func_808D712C /* 05E10 808DC680 2406017C */ addiu $a2, $zero, 0x017C ## $a2 = 0000017C -/* 05E14 808DC684 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 05E14 808DC684 3C040601 */ lui $a0, %hi(D_06008128) ## $a0 = 06010000 /* 05E18 808DC688 0C028800 */ jal SkelAnime_GetFrameCount -/* 05E1C 808DC68C 24848128 */ addiu $a0, $a0, 0x8128 ## $a0 = 06008128 +/* 05E1C 808DC68C 24848128 */ addiu $a0, $a0, %lo(D_06008128) ## $a0 = 06008128 /* 05E20 808DC690 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 05E24 808DC694 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 05E28 808DC698 24A58128 */ addiu $a1, $a1, 0x8128 ## $a1 = 06008128 +/* 05E24 808DC694 3C050601 */ lui $a1, %hi(D_06008128) ## $a1 = 06010000 +/* 05E28 808DC698 24A58128 */ addiu $a1, $a1, %lo(D_06008128) ## $a1 = 06008128 /* 05E2C 808DC69C 468021A0 */ cvt.s.w $f6, $f4 /* 05E30 808DC6A0 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 05E34 808DC6A4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s index 15c8cece2c..f355366aae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s @@ -25,8 +25,8 @@ glabel func_808DC75C /* 05F44 808DC7B4 0C0295B2 */ jal func_800A56C8 /* 05F48 808DC7B8 8E6501CC */ lw $a1, 0x01CC($s3) ## 000001CC /* 05F4C 808DC7BC 10400063 */ beq $v0, $zero, .L808DC94C -/* 05F50 808DC7C0 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 -/* 05F54 808DC7C4 26108F44 */ addiu $s0, $s0, 0x8F44 ## $s0 = 06008F44 +/* 05F50 808DC7C0 3C100601 */ lui $s0, %hi(D_06008F44) ## $s0 = 06010000 +/* 05F54 808DC7C4 26108F44 */ addiu $s0, $s0, %lo(D_06008F44) ## $s0 = 06008F44 /* 05F58 808DC7C8 0C028800 */ jal SkelAnime_GetFrameCount /* 05F5C 808DC7CC 02002025 */ or $a0, $s0, $zero ## $a0 = 06008F44 @@ -48,8 +48,8 @@ glabel func_808DC75C /* 05F98 808DC808 0C235AFC */ jal func_808D6BF0 /* 05F9C 808DC80C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 05FA0 808DC810 866F01B6 */ lh $t7, 0x01B6($s3) ## 000001B6 -/* 05FA4 808DC814 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 -/* 05FA8 808DC818 26108A88 */ addiu $s0, $s0, 0x8A88 ## $s0 = 06008A88 +/* 05FA4 808DC814 3C100601 */ lui $s0, %hi(D_06008A88) ## $s0 = 06010000 +/* 05FA8 808DC818 26108A88 */ addiu $s0, $s0, %lo(D_06008A88) ## $s0 = 06008A88 /* 05FAC 808DC81C 55E0004C */ bnel $t7, $zero, .L808DC950 /* 05FB0 808DC820 866401A2 */ lh $a0, 0x01A2($s3) ## 000001A2 /* 05FB4 808DC824 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s index b028a445d1..5188922b35 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s @@ -17,8 +17,8 @@ glabel func_808DC9B4 /* 06180 808DC9F0 2406017C */ addiu $a2, $zero, 0x017C ## $a2 = 0000017C /* 06184 808DC9F4 0C235C4B */ jal func_808D712C /* 06188 808DC9F8 AFA20060 */ sw $v0, 0x0060($sp) -/* 0618C 808DC9FC 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 -/* 06190 808DCA00 26104884 */ addiu $s0, $s0, 0x4884 ## $s0 = 06004884 +/* 0618C 808DC9FC 3C100600 */ lui $s0, %hi(D_06004884) ## $s0 = 06000000 +/* 06190 808DCA00 26104884 */ addiu $s0, $s0, %lo(D_06004884) ## $s0 = 06004884 /* 06194 808DCA04 0C028800 */ jal SkelAnime_GetFrameCount /* 06198 808DCA08 02002025 */ or $a0, $s0, $zero ## $a0 = 06004884 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s index 96770234ce..bdad316322 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s @@ -96,8 +96,8 @@ glabel L808DCC88 /* 0641C 808DCC8C 0C0295B2 */ jal func_800A56C8 /* 06420 808DCC90 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC /* 06424 808DCC94 1040010E */ beq $v0, $zero, .L808DD0D0 -/* 06428 808DCC98 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 -/* 0642C 808DCC9C 26104DA8 */ addiu $s0, $s0, 0x4DA8 ## $s0 = 06004DA8 +/* 06428 808DCC98 3C100600 */ lui $s0, %hi(D_06004DA8) ## $s0 = 06000000 +/* 0642C 808DCC9C 26104DA8 */ addiu $s0, $s0, %lo(D_06004DA8) ## $s0 = 06004DA8 /* 06430 808DCCA0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 06434 808DCCA4 A62A01C2 */ sh $t2, 0x01C2($s1) ## 000001C2 /* 06438 808DCCA8 0C028800 */ jal SkelAnime_GetFrameCount @@ -117,8 +117,8 @@ glabel L808DCCD4 /* 06468 808DCCD8 0C0295B2 */ jal func_800A56C8 /* 0646C 808DCCDC 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC /* 06470 808DCCE0 104000FB */ beq $v0, $zero, .L808DD0D0 -/* 06474 808DCCE4 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 -/* 06478 808DCCE8 26103D40 */ addiu $s0, $s0, 0x3D40 ## $s0 = 06003D40 +/* 06474 808DCCE4 3C100600 */ lui $s0, %hi(D_06003D40) ## $s0 = 06000000 +/* 06478 808DCCE8 26103D40 */ addiu $s0, $s0, %lo(D_06003D40) ## $s0 = 06003D40 /* 0647C 808DCCEC 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 /* 06480 808DCCF0 A62B01C2 */ sh $t3, 0x01C2($s1) ## 000001C2 /* 06484 808DCCF4 0C028800 */ jal SkelAnime_GetFrameCount @@ -144,9 +144,9 @@ glabel L808DCD20 /* 064CC 808DCD3C 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 /* 064D0 808DCD40 C6260060 */ lwc1 $f6, 0x0060($s1) ## 00000060 /* 064D4 808DCD44 4600803C */ c.lt.s $f16, $f0 -/* 064D8 808DCD48 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 +/* 064D8 808DCD48 3C100600 */ lui $s0, %hi(D_060063CC) ## $s0 = 06000000 /* 064DC 808DCD4C 46083281 */ sub.s $f10, $f6, $f8 -/* 064E0 808DCD50 261063CC */ addiu $s0, $s0, 0x63CC ## $s0 = 060063CC +/* 064E0 808DCD50 261063CC */ addiu $s0, $s0, %lo(D_060063CC) ## $s0 = 060063CC /* 064E4 808DCD54 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 /* 064E8 808DCD58 450000DD */ bc1f .L808DD0D0 /* 064EC 808DCD5C E62A0060 */ swc1 $f10, 0x0060($s1) ## 00000060 @@ -181,8 +181,8 @@ glabel L808DCDA8 /* 06554 808DCDC4 0C0295B2 */ jal func_800A56C8 /* 06558 808DCDC8 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC /* 0655C 808DCDCC 104000C0 */ beq $v0, $zero, .L808DD0D0 -/* 06560 808DCDD0 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 -/* 06564 808DCDD4 261069A0 */ addiu $s0, $s0, 0x69A0 ## $s0 = 060069A0 +/* 06560 808DCDD0 3C100600 */ lui $s0, %hi(D_060069A0) ## $s0 = 06000000 +/* 06564 808DCDD4 261069A0 */ addiu $s0, $s0, %lo(D_060069A0) ## $s0 = 060069A0 /* 06568 808DCDD8 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 /* 0656C 808DCDDC A62901C2 */ sh $t1, 0x01C2($s1) ## 000001C2 /* 06570 808DCDE0 0C028800 */ jal SkelAnime_GetFrameCount @@ -208,8 +208,8 @@ glabel L808DCE0C /* 065B4 808DCE24 240539CE */ addiu $a1, $zero, 0x39CE ## $a1 = 000039CE .L808DCE28: /* 065B8 808DCE28 862A01B6 */ lh $t2, 0x01B6($s1) ## 000001B6 -/* 065BC 808DCE2C 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 -/* 065C0 808DCE30 261058C4 */ addiu $s0, $s0, 0x58C4 ## $s0 = 060058C4 +/* 065BC 808DCE2C 3C100600 */ lui $s0, %hi(D_060058C4) ## $s0 = 06000000 +/* 065C0 808DCE30 261058C4 */ addiu $s0, $s0, %lo(D_060058C4) ## $s0 = 060058C4 /* 065C4 808DCE34 154000A6 */ bne $t2, $zero, .L808DD0D0 /* 065C8 808DCE38 240B0005 */ addiu $t3, $zero, 0x0005 ## $t3 = 00000005 /* 065CC 808DCE3C A62B01C2 */ sh $t3, 0x01C2($s1) ## 000001C2 @@ -259,8 +259,8 @@ glabel L808DCEC8 /* 0666C 808DCEDC 0C0295B2 */ jal func_800A56C8 /* 06670 808DCEE0 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC /* 06674 808DCEE4 1040007A */ beq $v0, $zero, .L808DD0D0 -/* 06678 808DCEE8 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 -/* 0667C 808DCEEC 26106028 */ addiu $s0, $s0, 0x6028 ## $s0 = 06006028 +/* 06678 808DCEE8 3C100600 */ lui $s0, %hi(D_06006028) ## $s0 = 06000000 +/* 0667C 808DCEEC 26106028 */ addiu $s0, $s0, %lo(D_06006028) ## $s0 = 06006028 /* 06680 808DCEF0 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 /* 06684 808DCEF4 A62A01C2 */ sh $t2, 0x01C2($s1) ## 000001C2 /* 06688 808DCEF8 0C028800 */ jal SkelAnime_GetFrameCount @@ -306,8 +306,8 @@ glabel L808DCF74 /* 06718 808DCF88 0C01E107 */ jal Math_SmoothScaleMaxF /* 0671C 808DCF8C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 06720 808DCF90 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 -/* 06724 808DCF94 26108A88 */ addiu $s0, $s0, 0x8A88 ## $s0 = 06008A88 +/* 06720 808DCF90 3C100601 */ lui $s0, %hi(D_06008A88) ## $s0 = 06010000 +/* 06724 808DCF94 26108A88 */ addiu $s0, $s0, %lo(D_06008A88) ## $s0 = 06008A88 /* 06728 808DCF98 0C028800 */ jal SkelAnime_GetFrameCount /* 0672C 808DCF9C 02002025 */ or $a0, $s0, $zero ## $a0 = 06008A88 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD0E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD0E8.s index 57e032c351..106981520d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD0E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD0E8.s @@ -4,15 +4,15 @@ glabel func_808DD0E8 /* 06880 808DD0F0 AFA40018 */ sw $a0, 0x0018($sp) /* 06884 808DD0F4 0C235C4B */ jal func_808D712C /* 06888 808DD0F8 2406017C */ addiu $a2, $zero, 0x017C ## $a2 = 0000017C -/* 0688C 808DD0FC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 0688C 808DD0FC 3C040601 */ lui $a0, %hi(D_060096B0) ## $a0 = 06010000 /* 06890 808DD100 0C028800 */ jal SkelAnime_GetFrameCount -/* 06894 808DD104 248496B0 */ addiu $a0, $a0, 0x96B0 ## $a0 = 060096B0 +/* 06894 808DD104 248496B0 */ addiu $a0, $a0, %lo(D_060096B0) ## $a0 = 060096B0 /* 06898 808DD108 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0689C 808DD10C 8FA30018 */ lw $v1, 0x0018($sp) -/* 068A0 808DD110 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 068A0 808DD110 3C050601 */ lui $a1, %hi(D_060096B0) ## $a1 = 06010000 /* 068A4 808DD114 468021A0 */ cvt.s.w $f6, $f4 -/* 068A8 808DD118 24A596B0 */ addiu $a1, $a1, 0x96B0 ## $a1 = 060096B0 +/* 068A8 808DD118 24A596B0 */ addiu $a1, $a1, %lo(D_060096B0) ## $a1 = 060096B0 /* 068AC 808DD11C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 068B0 808DD120 24640150 */ addiu $a0, $v1, 0x0150 ## $a0 = 00000150 /* 068B4 808DD124 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s index da731ee9e7..a42e8875ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s @@ -32,15 +32,15 @@ glabel func_808DD14C /* 06948 808DD1B8 3C08808E */ lui $t0, %hi(func_808DCB7C) ## $t0 = 808E0000 /* 0694C 808DD1BC 2508CB7C */ addiu $t0, $t0, %lo(func_808DCB7C) ## $t0 = 808DCB7C /* 06950 808DD1C0 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 06954 808DD1C4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 06954 808DD1C4 3C040600 */ lui $a0, %hi(D_060069A0) ## $a0 = 06000000 /* 06958 808DD1C8 AE080194 */ sw $t0, 0x0194($s0) ## 00000194 /* 0695C 808DD1CC A60901C2 */ sh $t1, 0x01C2($s0) ## 000001C2 /* 06960 808DD1D0 0C028800 */ jal SkelAnime_GetFrameCount -/* 06964 808DD1D4 248469A0 */ addiu $a0, $a0, 0x69A0 ## $a0 = 060069A0 +/* 06964 808DD1D4 248469A0 */ addiu $a0, $a0, %lo(D_060069A0) ## $a0 = 060069A0 /* 06968 808DD1D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0696C 808DD1DC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 06970 808DD1E0 24A569A0 */ addiu $a1, $a1, 0x69A0 ## $a1 = 060069A0 +/* 0696C 808DD1DC 3C050600 */ lui $a1, %hi(D_060069A0) ## $a1 = 06000000 +/* 06970 808DD1E0 24A569A0 */ addiu $a1, $a1, %lo(D_060069A0) ## $a1 = 060069A0 /* 06974 808DD1E4 468021A0 */ cvt.s.w $f6, $f4 /* 06978 808DD1E8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 0697C 808DD1EC E60601CC */ swc1 $f6, 0x01CC($s0) ## 000001CC diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE734.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE734.s index 61572990f5..0651daa9ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE734.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE734.s @@ -32,8 +32,8 @@ glabel func_808DE734 /* 07EEC 808DE75C 00000000 */ nop glabel L808DE760 /* 07EF0 808DE760 8FA20014 */ lw $v0, 0x0014($sp) -/* 07EF4 808DE764 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 -/* 07EF8 808DE768 2718C9E8 */ addiu $t8, $t8, 0xC9E8 ## $t8 = 0600C9E8 +/* 07EF4 808DE764 3C180601 */ lui $t8, %hi(D_0600C9E8) ## $t8 = 06010000 +/* 07EF8 808DE768 2718C9E8 */ addiu $t8, $t8, %lo(D_0600C9E8) ## $t8 = 0600C9E8 /* 07EFC 808DE76C 904F071A */ lbu $t7, 0x071A($v0) ## 0000071A /* 07F00 808DE770 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 07F04 808DE774 11E00082 */ beq $t7, $zero, .L808DE980 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 e44ef1af91..51fbcd3193 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 @@ -88,8 +88,8 @@ glabel func_808DE988 /* 0822C 808DEA9C 0C0346A2 */ jal Matrix_NewMtx /* 08230 808DEAA0 AFA20038 */ sw $v0, 0x0038($sp) /* 08234 808DEAA4 8FA30038 */ lw $v1, 0x0038($sp) -/* 08238 808DEAA8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 0823C 808DEAAC 2484BE90 */ addiu $a0, $a0, 0xBE90 ## $a0 = 0600BE90 +/* 08238 808DEAA8 3C040601 */ lui $a0, %hi(D_0600BE90) ## $a0 = 06010000 +/* 0823C 808DEAAC 2484BE90 */ addiu $a0, $a0, %lo(D_0600BE90) ## $a0 = 0600BE90 /* 08240 808DEAB0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 08244 808DEAB4 8FAD004C */ lw $t5, 0x004C($sp) /* 08248 808DEAB8 0004C100 */ sll $t8, $a0, 4 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 85a3ca3a4c..4604b2db6e 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 @@ -52,8 +52,8 @@ glabel BossGanon2_Draw /* 08A38 80905978 0C23F442 */ jal func_808FD108 /* 08A3C 8090597C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 08A40 80905980 8FAE0068 */ lw $t6, 0x0068($sp) -/* 08A44 80905984 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 08A48 80905988 2484A8E0 */ addiu $a0, $a0, 0xA8E0 ## $a0 = 0600A8E0 +/* 08A44 80905984 3C040601 */ lui $a0, %hi(D_0600A8E0) ## $a0 = 06010000 +/* 08A48 80905988 2484A8E0 */ addiu $a0, $a0, %lo(D_0600A8E0) ## $a0 = 0600A8E0 /* 08A4C 8090598C 8DC302D0 */ lw $v1, 0x02D0($t6) ## 000002D0 /* 08A50 80905990 0004C900 */ sll $t9, $a0, 4 /* 08A54 80905994 00194F02 */ srl $t1, $t9, 28 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s index 310814c25c..bf05d7b481 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s @@ -55,8 +55,8 @@ glabel BossGanon2_Init /* 004EC 808FD42C 240600E1 */ addiu $a2, $zero, 0x00E1 ## $a2 = 000000E1 /* 004F0 808FD430 0C23F442 */ jal func_808FD108 /* 004F4 808FD434 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 004F8 808FD438 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 004FC 808FD43C 24C614E8 */ addiu $a2, $a2, 0x14E8 ## $a2 = 060114E8 +/* 004F8 808FD438 3C060601 */ lui $a2, %hi(D_060114E8) ## $a2 = 06010000 +/* 004FC 808FD43C 24C614E8 */ addiu $a2, $a2, %lo(D_060114E8) ## $a2 = 060114E8 /* 00500 808FD440 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00504 808FD444 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00508 808FD448 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 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 5f1bfb3213..6e04adf510 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 @@ -221,8 +221,8 @@ glabel L808FD644 /* 0088C 808FD7CC C426DB40 */ lwc1 $f6, %lo(D_8090DB40)($at) /* 00890 808FD7D0 3C01C33A */ lui $at, 0xC33A ## $at = C33A0000 /* 00894 808FD7D4 44814000 */ mtc1 $at, $f8 ## $f8 = -186.00 -/* 00898 808FD7D8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0089C 808FD7DC 24A52168 */ addiu $a1, $a1, 0x2168 ## $a1 = 06002168 +/* 00898 808FD7D8 3C050600 */ lui $a1, %hi(D_06002168) ## $a1 = 06000000 +/* 0089C 808FD7DC 24A52168 */ addiu $a1, $a1, %lo(D_06002168) ## $a1 = 06002168 /* 008A0 808FD7E0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 008A4 808FD7E4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 008A8 808FD7E8 A52B00B6 */ sh $t3, 0x00B6($t1) ## 000000B6 @@ -837,16 +837,16 @@ glabel L808FDF70 /* 011A4 808FE0E4 2419000C */ addiu $t9, $zero, 0x000C ## $t9 = 0000000C /* 011A8 808FE0E8 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 011AC 808FE0EC A619039C */ sh $t9, 0x039C($s0) ## 0000039C -/* 011B0 808FE0F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 011B4 808FE0F4 24A52168 */ addiu $a1, $a1, 0x2168 ## $a1 = 06002168 +/* 011B0 808FE0F0 3C050600 */ lui $a1, %hi(D_06002168) ## $a1 = 06000000 +/* 011B4 808FE0F4 24A52168 */ addiu $a1, $a1, %lo(D_06002168) ## $a1 = 06002168 /* 011B8 808FE0F8 AFA90088 */ sw $t1, 0x0088($sp) /* 011BC 808FE0FC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 011C0 808FE100 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 011C4 808FE104 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 011C8 808FE108 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 011C8 808FE108 3C040600 */ lui $a0, %hi(D_06002168) ## $a0 = 06000000 /* 011CC 808FE10C 0C028800 */ jal SkelAnime_GetFrameCount -/* 011D0 808FE110 24842168 */ addiu $a0, $a0, 0x2168 ## $a0 = 06002168 +/* 011D0 808FE110 24842168 */ addiu $a0, $a0, %lo(D_06002168) ## $a0 = 06002168 /* 011D4 808FE114 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 011D8 808FE118 3C018091 */ lui $at, %hi(D_8090DB7C) ## $at = 80910000 /* 011DC 808FE11C C420DB7C */ lwc1 $f0, %lo(D_8090DB7C)($at) @@ -947,8 +947,8 @@ glabel L808FE1C0 /* 01340 808FE280 8FA40050 */ lw $a0, 0x0050($sp) /* 01344 808FE284 10400562 */ beq $v0, $zero, .L808FF810 /* 01348 808FE288 8FA90088 */ lw $t1, 0x0088($sp) -/* 0134C 808FE28C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01350 808FE290 24A52E6C */ addiu $a1, $a1, 0x2E6C ## $a1 = 06002E6C +/* 0134C 808FE28C 3C050600 */ lui $a1, %hi(D_06002E6C) ## $a1 = 06000000 +/* 01350 808FE290 24A52E6C */ addiu $a1, $a1, %lo(D_06002E6C) ## $a1 = 06002E6C /* 01354 808FE294 8FA40050 */ lw $a0, 0x0050($sp) /* 01358 808FE298 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 0135C 808FE29C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat @@ -1133,14 +1133,14 @@ glabel L808FE4C0 /* 015F8 808FE538 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 /* 015FC 808FE53C 1461000D */ bne $v1, $at, .L808FE574 /* 01600 808FE540 8FA40050 */ lw $a0, 0x0050($sp) -/* 01604 808FE544 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01608 808FE548 24A50BFC */ addiu $a1, $a1, 0x0BFC ## $a1 = 06000BFC +/* 01604 808FE544 3C050600 */ lui $a1, %hi(D_06000BFC) ## $a1 = 06000000 +/* 01608 808FE548 24A50BFC */ addiu $a1, $a1, %lo(D_06000BFC) ## $a1 = 06000BFC /* 0160C 808FE54C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01610 808FE550 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01614 808FE554 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01614 808FE554 3C040600 */ lui $a0, %hi(D_06000BFC) ## $a0 = 06000000 /* 01618 808FE558 0C028800 */ jal SkelAnime_GetFrameCount -/* 0161C 808FE55C 24840BFC */ addiu $a0, $a0, 0x0BFC ## $a0 = 06000BFC +/* 0161C 808FE55C 24840BFC */ addiu $a0, $a0, %lo(D_06000BFC) ## $a0 = 06000BFC /* 01620 808FE560 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 01624 808FE564 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 /* 01628 808FE568 A20C0314 */ sb $t4, 0x0314($s0) ## 00000314 @@ -1152,8 +1152,8 @@ glabel L808FE4C0 /* 0163C 808FE57C 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 /* 01640 808FE580 10400009 */ beq $v0, $zero, .L808FE5A8 /* 01644 808FE584 8FA40050 */ lw $a0, 0x0050($sp) -/* 01648 808FE588 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0164C 808FE58C 24A53F38 */ addiu $a1, $a1, 0x3F38 ## $a1 = 06003F38 +/* 01648 808FE588 3C050600 */ lui $a1, %hi(D_06003F38) ## $a1 = 06000000 +/* 0164C 808FE58C 24A53F38 */ addiu $a1, $a1, %lo(D_06003F38) ## $a1 = 06003F38 /* 01650 808FE590 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01654 808FE594 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01658 808FE598 3C01447A */ lui $at, 0x447A ## $at = 447A0000 @@ -1179,15 +1179,15 @@ glabel L808FE4C0 /* 0169C 808FE5DC 240D0010 */ addiu $t5, $zero, 0x0010 ## $t5 = 00000010 /* 016A0 808FE5E0 A60D039C */ sh $t5, 0x039C($s0) ## 0000039C /* 016A4 808FE5E4 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 -/* 016A8 808FE5E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 016AC 808FE5EC 24A53754 */ addiu $a1, $a1, 0x3754 ## $a1 = 06003754 +/* 016A8 808FE5E8 3C050600 */ lui $a1, %hi(D_06003754) ## $a1 = 06000000 +/* 016AC 808FE5EC 24A53754 */ addiu $a1, $a1, %lo(D_06003754) ## $a1 = 06003754 /* 016B0 808FE5F0 8FA40050 */ lw $a0, 0x0050($sp) /* 016B4 808FE5F4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 016B8 808FE5F8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 016BC 808FE5FC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 016BC 808FE5FC 3C040600 */ lui $a0, %hi(D_06003754) ## $a0 = 06000000 /* 016C0 808FE600 0C028800 */ jal SkelAnime_GetFrameCount -/* 016C4 808FE604 24843754 */ addiu $a0, $a0, 0x3754 ## $a0 = 06003754 +/* 016C4 808FE604 24843754 */ addiu $a0, $a0, %lo(D_06003754) ## $a0 = 06003754 /* 016C8 808FE608 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 016CC 808FE60C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 016D0 808FE610 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 @@ -1255,8 +1255,8 @@ glabel L808FE63C /* 017A4 808FE6E4 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 /* 017A8 808FE6E8 10400009 */ beq $v0, $zero, .L808FE710 /* 017AC 808FE6EC 8FA40050 */ lw $a0, 0x0050($sp) -/* 017B0 808FE6F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 017B4 808FE6F4 24A528A8 */ addiu $a1, $a1, 0x28A8 ## $a1 = 060028A8 +/* 017B0 808FE6F0 3C050600 */ lui $a1, %hi(D_060028A8) ## $a1 = 06000000 +/* 017B4 808FE6F4 24A528A8 */ addiu $a1, $a1, %lo(D_060028A8) ## $a1 = 060028A8 /* 017B8 808FE6F8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 017BC 808FE6FC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 017C0 808FE700 3C01447A */ lui $at, 0x447A ## $at = 447A0000 @@ -1367,8 +1367,8 @@ glabel L808FE63C /* 01944 808FE884 8FA40050 */ lw $a0, 0x0050($sp) /* 01948 808FE888 0C0295BC */ jal SkelAnime_Free /* 0194C 808FE88C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01950 808FE890 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 -/* 01954 808FE894 24C65970 */ addiu $a2, $a2, 0x5970 ## $a2 = 06025970 +/* 01950 808FE890 3C060602 */ lui $a2, %hi(D_06025970) ## $a2 = 06020000 +/* 01954 808FE894 24C65970 */ addiu $a2, $a2, %lo(D_06025970) ## $a2 = 06025970 /* 01958 808FE898 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0195C 808FE89C 8FA50050 */ lw $a1, 0x0050($sp) /* 01960 808FE8A0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -1411,10 +1411,10 @@ glabel L808FE8E4 /* 019EC 808FE92C E60403A4 */ swc1 $f4, 0x03A4($s0) ## 000003A4 /* 019F0 808FE930 C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 /* 019F4 808FE934 8E190398 */ lw $t9, 0x0398($s0) ## 00000398 -/* 019F8 808FE938 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 019F8 808FE938 3C050601 */ lui $a1, %hi(D_06010380) ## $a1 = 06010000 /* 019FC 808FE93C 460C3200 */ add.s $f8, $f6, $f12 /* 01A00 808FE940 240B0012 */ addiu $t3, $zero, 0x0012 ## $t3 = 00000012 -/* 01A04 808FE944 24A50380 */ addiu $a1, $a1, 0x0380 ## $a1 = 06010380 +/* 01A04 808FE944 24A50380 */ addiu $a1, $a1, %lo(D_06010380) ## $a1 = 06010380 /* 01A08 808FE948 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01A0C 808FE94C E60803A8 */ swc1 $f8, 0x03A8($s0) ## 000003A8 /* 01A10 808FE950 C52A002C */ lwc1 $f10, 0x002C($t1) ## 0000002C @@ -1589,7 +1589,7 @@ glabel L808FEB70 /* 01C8C 808FEBCC 240EC000 */ addiu $t6, $zero, 0xC000 ## $t6 = FFFFC000 /* 01C90 808FEBD0 46080281 */ sub.s $f10, $f0, $f8 /* 01C94 808FEBD4 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 01C98 808FEBD8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 01C98 808FEBD8 3C050601 */ lui $a1, %hi(D_06010380) ## $a1 = 06010000 /* 01C9C 808FEBDC 460C9201 */ sub.s $f8, $f18, $f12 /* 01CA0 808FEBE0 E60A0060 */ swc1 $f10, 0x0060($s0) ## 00000060 /* 01CA4 808FEBE4 E5320024 */ swc1 $f18, 0x0024($t1) ## 00000024 @@ -1606,7 +1606,7 @@ glabel L808FEB70 /* 01CD0 808FEC10 240F0015 */ addiu $t7, $zero, 0x0015 ## $t7 = 00000015 /* 01CD4 808FEC14 E60403A4 */ swc1 $f4, 0x03A4($s0) ## 000003A4 /* 01CD8 808FEC18 C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 -/* 01CDC 808FEC1C 24A50380 */ addiu $a1, $a1, 0x0380 ## $a1 = 06010380 +/* 01CDC 808FEC1C 24A50380 */ addiu $a1, $a1, %lo(D_06010380) ## $a1 = 06010380 /* 01CE0 808FEC20 460C3200 */ add.s $f8, $f6, $f12 /* 01CE4 808FEC24 46104281 */ sub.s $f10, $f8, $f16 /* 01CE8 808FEC28 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 @@ -1736,8 +1736,8 @@ glabel L808FED50 /* 01EAC 808FEDEC 24060153 */ addiu $a2, $zero, 0x0153 ## $a2 = 00000153 /* 01EB0 808FEDF0 0C23F442 */ jal func_808FD108 /* 01EB4 808FEDF4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01EB8 808FEDF8 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 -/* 01EBC 808FEDFC 24421A90 */ addiu $v0, $v0, 0x1A90 ## $v0 = 06021A90 +/* 01EB8 808FEDF8 3C020602 */ lui $v0, %hi(D_06021A90) ## $v0 = 06020000 +/* 01EBC 808FEDFC 24421A90 */ addiu $v0, $v0, %lo(D_06021A90) ## $v0 = 06021A90 /* 01EC0 808FEE00 00027900 */ sll $t7, $v0, 4 /* 01EC4 808FEE04 000FC702 */ srl $t8, $t7, 28 /* 01EC8 808FEE08 0018C880 */ sll $t9, $t8, 2 @@ -2282,17 +2282,17 @@ glabel L808FF51C /* 026C0 808FF600 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 /* 026C4 808FF604 14400082 */ bne $v0, $zero, .L808FF810 /* 026C8 808FF608 240B001D */ addiu $t3, $zero, 0x001D ## $t3 = 0000001D -/* 026CC 808FF60C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 026CC 808FF60C 3C050601 */ lui $a1, %hi(D_060147E0) ## $a1 = 06010000 /* 026D0 808FF610 A60B039C */ sh $t3, 0x039C($s0) ## 0000039C /* 026D4 808FF614 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 -/* 026D8 808FF618 24A547E0 */ addiu $a1, $a1, 0x47E0 ## $a1 = 060147E0 +/* 026D8 808FF618 24A547E0 */ addiu $a1, $a1, %lo(D_060147E0) ## $a1 = 060147E0 /* 026DC 808FF61C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 026E0 808FF620 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 026E4 808FF624 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 026E8 808FF628 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 026E8 808FF628 3C040601 */ lui $a0, %hi(D_060147E0) ## $a0 = 06010000 /* 026EC 808FF62C 0C028800 */ jal SkelAnime_GetFrameCount -/* 026F0 808FF630 248447E0 */ addiu $a0, $a0, 0x47E0 ## $a0 = 060147E0 +/* 026F0 808FF630 248447E0 */ addiu $a0, $a0, %lo(D_060147E0) ## $a0 = 060147E0 /* 026F4 808FF634 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 026F8 808FF638 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 026FC 808FF63C 3C018091 */ lui $at, %hi(D_8090DBA0) ## $at = 80910000 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 4aa6efd0d7..2636a9776d 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 @@ -28,11 +28,11 @@ glabel func_808FFDB0 /* 02ED0 808FFE10 01194021 */ addu $t0, $t0, $t9 /* 02ED4 808FFE14 8D0817B4 */ lw $t0, 0x17B4($t0) ## 000117B4 /* 02ED8 808FFE18 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02EDC 808FFE1C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 02EDC 808FFE1C 3C050601 */ lui $a1, %hi(D_0600FFE4) ## $a1 = 06010000 /* 02EE0 808FFE20 01014821 */ addu $t1, $t0, $at /* 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 +/* 02EEC 808FFE2C 24A5FFE4 */ addiu $a1, $a1, %lo(D_0600FFE4) ## $a1 = 0600FFE4 /* 02EF0 808FFE30 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02EF4 808FFE34 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 02EF8 808FFE38 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s index b08f6d6ad1..0cdfc30946 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s @@ -3,8 +3,8 @@ glabel func_808FFF90 /* 03054 808FFF94 AFA5001C */ sw $a1, 0x001C($sp) /* 03058 808FFF98 AFBF0014 */ sw $ra, 0x0014($sp) /* 0305C 808FFF9C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 03060 808FFFA0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 03064 808FFFA4 24A5FFE4 */ addiu $a1, $a1, 0xFFE4 ## $a1 = 0600FFE4 +/* 03060 808FFFA0 3C050601 */ lui $a1, %hi(D_0600FFE4) ## $a1 = 06010000 +/* 03064 808FFFA4 24A5FFE4 */ addiu $a1, $a1, %lo(D_0600FFE4) ## $a1 = 0600FFE4 /* 03068 808FFFA8 AFA70018 */ sw $a3, 0x0018($sp) /* 0306C 808FFFAC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 03070 808FFFB0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s index 6f3a2af184..25d113ccf5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s @@ -3,16 +3,16 @@ glabel func_809000A0 /* 03164 809000A4 AFA5001C */ sw $a1, 0x001C($sp) /* 03168 809000A8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0316C 809000AC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 03170 809000B0 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 -/* 03174 809000B4 24A56510 */ addiu $a1, $a1, 0x6510 ## $a1 = 06026510 +/* 03170 809000B0 3C050602 */ lui $a1, %hi(D_06026510) ## $a1 = 06020000 +/* 03174 809000B4 24A56510 */ addiu $a1, $a1, %lo(D_06026510) ## $a1 = 06026510 /* 03178 809000B8 AFA70018 */ sw $a3, 0x0018($sp) /* 0317C 809000BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 03180 809000C0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 03184 809000C4 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 -/* 03188 809000C8 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 03188 809000C8 3C040602 */ lui $a0, %hi(D_06026510) ## $a0 = 06020000 /* 0318C 809000CC 0C028800 */ jal SkelAnime_GetFrameCount -/* 03190 809000D0 24846510 */ addiu $a0, $a0, 0x6510 ## $a0 = 06026510 +/* 03190 809000D0 24846510 */ addiu $a0, $a0, %lo(D_06026510) ## $a0 = 06026510 /* 03194 809000D4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03198 809000D8 8FA70018 */ lw $a3, 0x0018($sp) /* 0319C 809000DC 3C0E8090 */ lui $t6, %hi(func_80900104) ## $t6 = 80900000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s index afae1ac55a..6d48822019 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s @@ -32,9 +32,9 @@ glabel func_80900104 /* 03230 80900170 10400022 */ beq $v0, $zero, .L809001FC /* 03234 80900174 8FA70020 */ lw $a3, 0x0020($sp) /* 03238 80900178 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0323C 8090017C 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 0323C 8090017C 3C050602 */ lui $a1, %hi(D_06026AF4) ## $a1 = 06020000 /* 03240 80900180 A60E01AC */ sh $t6, 0x01AC($s0) ## 000001AC -/* 03244 80900184 24A56AF4 */ addiu $a1, $a1, 0x6AF4 ## $a1 = 06026AF4 +/* 03244 80900184 24A56AF4 */ addiu $a1, $a1, %lo(D_06026AF4) ## $a1 = 06026AF4 /* 03248 80900188 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 0324C 8090018C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 03250 80900190 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 @@ -46,15 +46,15 @@ glabel func_80900104 /* 03264 809001A4 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 03268 809001A8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 0326C 809001AC 17000013 */ bne $t8, $zero, .L809001FC -/* 03270 809001B0 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 03270 809001B0 3C050602 */ lui $a1, %hi(D_06027824) ## $a1 = 06020000 /* 03274 809001B4 A61901AC */ sh $t9, 0x01AC($s0) ## 000001AC -/* 03278 809001B8 24A57824 */ addiu $a1, $a1, 0x7824 ## $a1 = 06027824 +/* 03278 809001B8 24A57824 */ addiu $a1, $a1, %lo(D_06027824) ## $a1 = 06027824 /* 0327C 809001BC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 03280 809001C0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 03284 809001C4 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 03284 809001C4 3C040602 */ lui $a0, %hi(D_06027824) ## $a0 = 06020000 /* 03288 809001C8 0C028800 */ jal SkelAnime_GetFrameCount -/* 0328C 809001CC 24847824 */ addiu $a0, $a0, 0x7824 ## $a0 = 06027824 +/* 0328C 809001CC 24847824 */ addiu $a0, $a0, %lo(D_06027824) ## $a0 = 06027824 /* 03290 809001D0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03294 809001D4 00000000 */ nop /* 03298 809001D8 468021A0 */ cvt.s.w $f6, $f4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900210.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900210.s index 2cc058363c..8e33d9cbf9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900210.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900210.s @@ -3,15 +3,15 @@ glabel func_80900210 /* 032D4 80900214 AFA5001C */ sw $a1, 0x001C($sp) /* 032D8 80900218 AFBF0014 */ sw $ra, 0x0014($sp) /* 032DC 8090021C AFA40018 */ sw $a0, 0x0018($sp) -/* 032E0 80900220 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 032E4 80900224 24A5DFF0 */ addiu $a1, $a1, 0xDFF0 ## $a1 = 0600DFF0 +/* 032E0 80900220 3C050601 */ lui $a1, %hi(D_0600DFF0) ## $a1 = 06010000 +/* 032E4 80900224 24A5DFF0 */ addiu $a1, $a1, %lo(D_0600DFF0) ## $a1 = 0600DFF0 /* 032E8 80900228 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 032EC 8090022C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 032F0 80900230 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 032F4 80900234 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 032F4 80900234 3C040601 */ lui $a0, %hi(D_0600DFF0) ## $a0 = 06010000 /* 032F8 80900238 0C028800 */ jal SkelAnime_GetFrameCount -/* 032FC 8090023C 2484DFF0 */ addiu $a0, $a0, 0xDFF0 ## $a0 = 0600DFF0 +/* 032FC 8090023C 2484DFF0 */ addiu $a0, $a0, %lo(D_0600DFF0) ## $a0 = 0600DFF0 /* 03300 80900240 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03304 80900244 8FA30018 */ lw $v1, 0x0018($sp) /* 03308 80900248 3C0E8090 */ lui $t6, %hi(func_8090026C) ## $t6 = 80900000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s index c0e9a61e6f..e19b9b0e87 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s @@ -3,8 +3,8 @@ glabel func_809002CC /* 03390 809002D0 AFA5001C */ sw $a1, 0x001C($sp) /* 03394 809002D4 AFBF0014 */ sw $ra, 0x0014($sp) /* 03398 809002D8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0339C 809002DC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 033A0 809002E0 24A5E8EC */ addiu $a1, $a1, 0xE8EC ## $a1 = 0600E8EC +/* 0339C 809002DC 3C050601 */ lui $a1, %hi(D_0600E8EC) ## $a1 = 06010000 +/* 033A0 809002E0 24A5E8EC */ addiu $a1, $a1, %lo(D_0600E8EC) ## $a1 = 0600E8EC /* 033A4 809002E4 AFA70018 */ sw $a3, 0x0018($sp) /* 033A8 809002E8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 033AC 809002EC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s index 0d3c8d3fd5..b525accdb2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s @@ -63,8 +63,8 @@ glabel func_80900344 .L8090040C: /* 034CC 8090040C 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 /* 034D0 80900410 C6020090 */ lwc1 $f2, 0x0090($s0) ## 00000090 -/* 034D4 80900414 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 034D8 80900418 24A5E8EC */ addiu $a1, $a1, 0xE8EC ## $a1 = 0600E8EC +/* 034D4 80900414 3C050601 */ lui $a1, %hi(D_0600E8EC) ## $a1 = 06010000 +/* 034D8 80900418 24A5E8EC */ addiu $a1, $a1, %lo(D_0600E8EC) ## $a1 = 0600E8EC /* 034DC 8090041C 4606103C */ c.lt.s $f2, $f6 /* 034E0 80900420 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 034E4 80900424 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 @@ -113,10 +113,10 @@ glabel func_80900344 /* 03580 809004C0 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 03584 809004C4 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 /* 03588 809004C8 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 0358C 809004CC 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 +/* 0358C 809004CC 3C050603 */ lui $a1, %hi(D_060353C0) ## $a1 = 06030000 /* 03590 809004D0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 03594 809004D4 4604303E */ c.le.s $f6, $f4 -/* 03598 809004D8 24A553C0 */ addiu $a1, $a1, 0x53C0 ## $a1 = 060353C0 +/* 03598 809004D8 24A553C0 */ addiu $a1, $a1, %lo(D_060353C0) ## $a1 = 060353C0 /* 0359C 809004DC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 035A0 809004E0 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 035A4 809004E4 45020006 */ bc1fl .L80900500 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900580.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900580.s index fab2262abc..198001e4cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900580.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900580.s @@ -4,19 +4,19 @@ glabel func_80900580 /* 03648 80900588 AFB00018 */ sw $s0, 0x0018($sp) /* 0364C 8090058C AFA50024 */ sw $a1, 0x0024($sp) /* 03650 80900590 908E0311 */ lbu $t6, 0x0311($a0) ## 00000311 -/* 03654 80900594 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 03654 80900594 3C050601 */ lui $a1, %hi(D_0600CAF8) ## $a1 = 06010000 /* 03658 80900598 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0365C 8090059C 15C00014 */ bne $t6, $zero, .L809005F0 -/* 03660 809005A0 24A5CAF8 */ addiu $a1, $a1, 0xCAF8 ## $a1 = 0600CAF8 -/* 03664 809005A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 03668 809005A8 24A5ADD0 */ addiu $a1, $a1, 0xADD0 ## $a1 = 0600ADD0 +/* 03660 809005A0 24A5CAF8 */ addiu $a1, $a1, %lo(D_0600CAF8) ## $a1 = 0600CAF8 +/* 03664 809005A4 3C050601 */ lui $a1, %hi(D_0600ADD0) ## $a1 = 06010000 +/* 03668 809005A8 24A5ADD0 */ addiu $a1, $a1, %lo(D_0600ADD0) ## $a1 = 0600ADD0 /* 0366C 809005AC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 03670 809005B0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 03674 809005B4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 03678 809005B8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 03678 809005B8 3C040601 */ lui $a0, %hi(D_0600ADD0) ## $a0 = 06010000 /* 0367C 809005BC 0C028800 */ jal SkelAnime_GetFrameCount -/* 03680 809005C0 2484ADD0 */ addiu $a0, $a0, 0xADD0 ## $a0 = 0600ADD0 +/* 03680 809005C0 2484ADD0 */ addiu $a0, $a0, %lo(D_0600ADD0) ## $a0 = 0600ADD0 /* 03684 809005C4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03688 809005C8 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 0368C 809005CC 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 @@ -32,10 +32,10 @@ glabel func_80900580 /* 036B0 809005F0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 036B4 809005F4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 036B8 809005F8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 036BC 809005FC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 036BC 809005FC 3C040601 */ lui $a0, %hi(D_0600CAF8) ## $a0 = 06010000 /* 036C0 80900600 0C028800 */ jal SkelAnime_GetFrameCount -/* 036C4 80900604 2484CAF8 */ addiu $a0, $a0, 0xCAF8 ## $a0 = 0600CAF8 +/* 036C4 80900604 2484CAF8 */ addiu $a0, $a0, %lo(D_0600CAF8) ## $a0 = 0600CAF8 /* 036C8 80900608 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 036CC 8090060C 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 036D0 80900610 44812000 */ mtc1 $at, $f4 ## $f4 = 15.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900818.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900818.s index bf22eed9a2..d03fdd8290 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900818.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900818.s @@ -4,15 +4,15 @@ glabel func_80900818 /* 038E0 80900820 AFA50024 */ sw $a1, 0x0024($sp) /* 038E4 80900824 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 038E8 80900828 AFBF001C */ sw $ra, 0x001C($sp) -/* 038EC 8090082C 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 -/* 038F0 80900830 24A5A848 */ addiu $a1, $a1, 0xA848 ## $a1 = 0602A848 +/* 038EC 8090082C 3C050603 */ lui $a1, %hi(D_0602A848) ## $a1 = 06030000 +/* 038F0 80900830 24A5A848 */ addiu $a1, $a1, %lo(D_0602A848) ## $a1 = 0602A848 /* 038F4 80900834 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 038F8 80900838 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 038FC 8090083C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 03900 80900840 3C040603 */ lui $a0, 0x0603 ## $a0 = 06030000 +/* 03900 80900840 3C040603 */ lui $a0, %hi(D_0602A848) ## $a0 = 06030000 /* 03904 80900844 0C028800 */ jal SkelAnime_GetFrameCount -/* 03908 80900848 2484A848 */ addiu $a0, $a0, 0xA848 ## $a0 = 0602A848 +/* 03908 80900848 2484A848 */ addiu $a0, $a0, %lo(D_0602A848) ## $a0 = 0602A848 /* 0390C 8090084C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03910 80900850 3C0E8090 */ lui $t6, %hi(func_80900890) ## $t6 = 80900000 /* 03914 80900854 25CE0890 */ addiu $t6, $t6, %lo(func_80900890) ## $t6 = 80900890 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s index 53b2324ce1..94d5badfad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s @@ -431,8 +431,8 @@ glabel L80900E4C /* 03F5C 80900E9C 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 /* 03F60 80900EA0 10400056 */ beq $v0, $zero, .L80900FFC /* 03F64 80900EA4 8FA4002C */ lw $a0, 0x002C($sp) -/* 03F68 80900EA8 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 -/* 03F6C 80900EAC 24A54278 */ addiu $a1, $a1, 0x4278 ## $a1 = 06034278 +/* 03F68 80900EA8 3C050603 */ lui $a1, %hi(D_06034278) ## $a1 = 06030000 +/* 03F6C 80900EAC 24A54278 */ addiu $a1, $a1, %lo(D_06034278) ## $a1 = 06034278 /* 03F70 80900EB0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 03F74 80900EB4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 03F78 80900EB8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 @@ -464,10 +464,10 @@ glabel L80900E4C /* 03FD0 80900F10 3C014444 */ lui $at, 0x4444 ## $at = 44440000 /* 03FD4 80900F14 46127081 */ sub.s $f2, $f14, $f18 /* 03FD8 80900F18 44815000 */ mtc1 $at, $f10 ## $f10 = 784.00 -/* 03FDC 80900F1C 3C110603 */ lui $s1, 0x0603 ## $s1 = 06030000 +/* 03FDC 80900F1C 3C110603 */ lui $s1, %hi(D_060334F8) ## $s1 = 06030000 /* 03FE0 80900F20 46047301 */ sub.s $f12, $f14, $f4 /* 03FE4 80900F24 46021182 */ mul.s $f6, $f2, $f2 -/* 03FE8 80900F28 263134F8 */ addiu $s1, $s1, 0x34F8 ## $s1 = 060334F8 +/* 03FE8 80900F28 263134F8 */ addiu $s1, $s1, %lo(D_060334F8) ## $s1 = 060334F8 /* 03FEC 80900F2C 02202825 */ or $a1, $s1, $zero ## $a1 = 060334F8 /* 03FF0 80900F30 460C6202 */ mul.s $f8, $f12, $f12 /* 03FF4 80900F34 8FA4002C */ lw $a0, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80901020.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80901020.s index 040024c911..6493201a49 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80901020.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80901020.s @@ -4,15 +4,15 @@ glabel func_80901020 /* 040E8 80901028 AFA50024 */ sw $a1, 0x0024($sp) /* 040EC 8090102C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 040F0 80901030 AFBF001C */ sw $ra, 0x001C($sp) -/* 040F4 80901034 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 -/* 040F8 80901038 24A5A848 */ addiu $a1, $a1, 0xA848 ## $a1 = 0602A848 +/* 040F4 80901034 3C050603 */ lui $a1, %hi(D_0602A848) ## $a1 = 06030000 +/* 040F8 80901038 24A5A848 */ addiu $a1, $a1, %lo(D_0602A848) ## $a1 = 0602A848 /* 040FC 8090103C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 04100 80901040 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 04104 80901044 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 04108 80901048 3C040603 */ lui $a0, 0x0603 ## $a0 = 06030000 +/* 04108 80901048 3C040603 */ lui $a0, %hi(D_0602A848) ## $a0 = 06030000 /* 0410C 8090104C 0C028800 */ jal SkelAnime_GetFrameCount -/* 04110 80901050 2484A848 */ addiu $a0, $a0, 0xA848 ## $a0 = 0602A848 +/* 04110 80901050 2484A848 */ addiu $a0, $a0, %lo(D_0602A848) ## $a0 = 0602A848 /* 04114 80901054 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04118 80901058 3C0E8090 */ lui $t6, %hi(func_8090120C) ## $t6 = 80900000 /* 0411C 8090105C 25CE120C */ addiu $t6, $t6, %lo(func_8090120C) ## $t6 = 8090120C 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 0075aaa32a..147f0a4bbb 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 @@ -613,15 +613,15 @@ glabel L80901968 /* 04B0C 80901A4C 24090007 */ addiu $t1, $zero, 0x0007 ## $t1 = 00000007 /* 04B10 80901A50 A609039C */ sh $t1, 0x039C($s0) ## 0000039C /* 04B14 80901A54 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 -/* 04B18 80901A58 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04B1C 80901A5C 24A53B1C */ addiu $a1, $a1, 0x3B1C ## $a1 = 06003B1C +/* 04B18 80901A58 3C050600 */ lui $a1, %hi(D_06003B1C) ## $a1 = 06000000 +/* 04B1C 80901A5C 24A53B1C */ addiu $a1, $a1, %lo(D_06003B1C) ## $a1 = 06003B1C /* 04B20 80901A60 8FA40028 */ lw $a0, 0x0028($sp) /* 04B24 80901A64 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 04B28 80901A68 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 04B2C 80901A6C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 04B2C 80901A6C 3C040600 */ lui $a0, %hi(D_06003B1C) ## $a0 = 06000000 /* 04B30 80901A70 0C028800 */ jal SkelAnime_GetFrameCount -/* 04B34 80901A74 24843B1C */ addiu $a0, $a0, 0x3B1C ## $a0 = 06003B1C +/* 04B34 80901A74 24843B1C */ addiu $a0, $a0, %lo(D_06003B1C) ## $a0 = 06003B1C /* 04B38 80901A78 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 04B3C 80901A7C 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 /* 04B40 80901A80 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 @@ -843,15 +843,15 @@ glabel L80901AB0 /* 04E64 80901DA4 24010037 */ addiu $at, $zero, 0x0037 ## $at = 00000037 /* 04E68 80901DA8 17210139 */ bne $t9, $at, .L80902290 /* 04E6C 80901DAC A20A0339 */ sb $t2, 0x0339($s0) ## 00000339 -/* 04E70 80901DB0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04E74 80901DB4 24A57288 */ addiu $a1, $a1, 0x7288 ## $a1 = 06007288 +/* 04E70 80901DB0 3C050600 */ lui $a1, %hi(D_06007288) ## $a1 = 06000000 +/* 04E74 80901DB4 24A57288 */ addiu $a1, $a1, %lo(D_06007288) ## $a1 = 06007288 /* 04E78 80901DB8 8FA40028 */ lw $a0, 0x0028($sp) /* 04E7C 80901DBC 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 04E80 80901DC0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 04E84 80901DC4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 04E84 80901DC4 3C040600 */ lui $a0, %hi(D_06007288) ## $a0 = 06000000 /* 04E88 80901DC8 0C028800 */ jal SkelAnime_GetFrameCount -/* 04E8C 80901DCC 24847288 */ addiu $a0, $a0, 0x7288 ## $a0 = 06007288 +/* 04E8C 80901DCC 24847288 */ addiu $a0, $a0, %lo(D_06007288) ## $a0 = 06007288 /* 04E90 80901DD0 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 04E94 80901DD4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 04E98 80901DD8 24060062 */ addiu $a2, $zero, 0x0062 ## $a2 = 00000062 @@ -918,8 +918,8 @@ glabel L80901E00 /* 04F70 80901EB0 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 /* 04F74 80901EB4 10400009 */ beq $v0, $zero, .L80901EDC /* 04F78 80901EB8 8FA40028 */ lw $a0, 0x0028($sp) -/* 04F7C 80901EBC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 04F80 80901EC0 24A58EB8 */ addiu $a1, $a1, 0x8EB8 ## $a1 = 06008EB8 +/* 04F7C 80901EBC 3C050601 */ lui $a1, %hi(D_06008EB8) ## $a1 = 06010000 +/* 04F80 80901EC0 24A58EB8 */ addiu $a1, $a1, %lo(D_06008EB8) ## $a1 = 06008EB8 /* 04F84 80901EC4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 04F88 80901EC8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 04F8C 80901ECC 3C01447A */ lui $at, 0x447A ## $at = 447A0000 @@ -1213,8 +1213,8 @@ glabel L80902290 /* 05398 809022D8 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 /* 0539C 809022DC 10400015 */ beq $v0, $zero, .L80902334 /* 053A0 809022E0 8FA40028 */ lw $a0, 0x0028($sp) -/* 053A4 809022E4 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 -/* 053A8 809022E8 24A54278 */ addiu $a1, $a1, 0x4278 ## $a1 = 06034278 +/* 053A4 809022E4 3C050603 */ lui $a1, %hi(D_06034278) ## $a1 = 06030000 +/* 053A8 809022E8 24A54278 */ addiu $a1, $a1, %lo(D_06034278) ## $a1 = 06034278 /* 053AC 809022EC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 053B0 809022F0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 053B4 809022F4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 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 f4f7c7f4a3..6db74eee95 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 @@ -64,10 +64,10 @@ glabel func_80905508 /* 08684 809055C4 AFA20020 */ sw $v0, 0x0020($sp) /* 08688 809055C8 8FA30020 */ lw $v1, 0x0020($sp) /* 0868C 809055CC 8FA80034 */ lw $t0, 0x0034($sp) -/* 08690 809055D0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 08690 809055D0 3C040601 */ lui $a0, %hi(D_0600BE90) ## $a0 = 06010000 /* 08694 809055D4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 08698 809055D8 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 0869C 809055DC 2484BE90 */ addiu $a0, $a0, 0xBE90 ## $a0 = 0600BE90 +/* 0869C 809055DC 2484BE90 */ addiu $a0, $a0, %lo(D_0600BE90) ## $a0 = 0600BE90 /* 086A0 809055E0 00047900 */ sll $t7, $a0, 4 /* 086A4 809055E4 000FC702 */ srl $t8, $t7, 28 /* 086A8 809055E8 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s index 9b75d2d505..1eb7330eaa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s @@ -242,9 +242,9 @@ glabel func_809060E8 /* 094C0 80906400 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 094C4 80906404 93AE00CD */ lbu $t6, 0x00CD($sp) /* 094C8 80906408 15A10030 */ bne $t5, $at, .L809064CC -/* 094CC 8090640C 3C130600 */ lui $s3, 0x0600 ## $s3 = 06000000 +/* 094CC 8090640C 3C130600 */ lui $s3, %hi(D_06000EA0) ## $s3 = 06000000 /* 094D0 80906410 15C00009 */ bne $t6, $zero, .L80906438 -/* 094D4 80906414 26730EA0 */ addiu $s3, $s3, 0x0EA0 ## $s3 = 06000EA0 +/* 094D4 80906414 26730EA0 */ addiu $s3, $s3, %lo(D_06000EA0) ## $s3 = 06000EA0 /* 094D8 80906418 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 094DC 8090641C 02A02825 */ or $a1, $s5, $zero ## $a1 = 00000000 /* 094E0 80906420 24060186 */ addiu $a2, $zero, 0x0186 ## $a2 = 00000186 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 4b548aa1ec..7bccf26414 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 @@ -273,10 +273,10 @@ glabel BossTw_Init /* 00DC4 80939A94 240E0033 */ addiu $t6, $zero, 0x0033 ## $t6 = 00000033 /* 00DC8 80939A98 A20E0117 */ sb $t6, 0x0117($s0) ## 00000117 /* 00DCC 80939A9C 26050568 */ addiu $a1, $s0, 0x0568 ## $a1 = 00000568 -/* 00DD0 80939AA0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00DD4 80939AA4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00DD8 80939AA8 24E76F28 */ addiu $a3, $a3, 0x6F28 ## $a3 = 06006F28 -/* 00DDC 80939AAC 24C670E0 */ addiu $a2, $a2, 0x70E0 ## $a2 = 060070E0 +/* 00DD0 80939AA0 3C060600 */ lui $a2, %hi(D_060070E0) ## $a2 = 06000000 +/* 00DD4 80939AA4 3C070600 */ lui $a3, %hi(D_06006F28) ## $a3 = 06000000 +/* 00DD8 80939AA8 24E76F28 */ addiu $a3, $a3, %lo(D_06006F28) ## $a3 = 06006F28 +/* 00DDC 80939AAC 24C670E0 */ addiu $a2, $a2, %lo(D_060070E0) ## $a2 = 060070E0 /* 00DE0 80939AB0 AFA50048 */ sw $a1, 0x0048($sp) /* 00DE4 80939AB4 AFA00018 */ sw $zero, 0x0018($sp) /* 00DE8 80939AB8 AFA00014 */ sw $zero, 0x0014($sp) @@ -309,8 +309,8 @@ glabel BossTw_Init /* 00E4C 80939B1C 0C24F553 */ jal func_8093D54C /* 00E50 80939B20 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L80939B24: -/* 00E54 80939B24 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00E58 80939B28 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 +/* 00E54 80939B24 3C050600 */ lui $a1, %hi(D_06006F28) ## $a1 = 06000000 +/* 00E58 80939B28 24A56F28 */ addiu $a1, $a1, %lo(D_06006F28) ## $a1 = 06006F28 /* 00E5C 80939B2C 8FA40048 */ lw $a0, 0x0048($sp) /* 00E60 80939B30 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00E64 80939B34 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 @@ -329,10 +329,10 @@ glabel BossTw_Init /* 00E90 80939B60 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 /* 00E94 80939B64 A20E0117 */ sb $t6, 0x0117($s0) ## 00000117 /* 00E98 80939B68 26050568 */ addiu $a1, $s0, 0x0568 ## $a1 = 00000568 -/* 00E9C 80939B6C 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 -/* 00EA0 80939B70 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00EA4 80939B74 24E76F28 */ addiu $a3, $a3, 0x6F28 ## $a3 = 06006F28 -/* 00EA8 80939B78 24C6F888 */ addiu $a2, $a2, 0xF888 ## $a2 = 0601F888 +/* 00E9C 80939B6C 3C060602 */ lui $a2, %hi(D_0601F888) ## $a2 = 06020000 +/* 00EA0 80939B70 3C070600 */ lui $a3, %hi(D_06006F28) ## $a3 = 06000000 +/* 00EA4 80939B74 24E76F28 */ addiu $a3, $a3, %lo(D_06006F28) ## $a3 = 06006F28 +/* 00EA8 80939B78 24C6F888 */ addiu $a2, $a2, %lo(D_0601F888) ## $a2 = 0601F888 /* 00EAC 80939B7C AFA50048 */ sw $a1, 0x0048($sp) /* 00EB0 80939B80 AFA00018 */ sw $zero, 0x0018($sp) /* 00EB4 80939B84 AFA00014 */ sw $zero, 0x0014($sp) @@ -361,8 +361,8 @@ glabel BossTw_Init /* 00F0C 80939BDC 0C24F553 */ jal func_8093D54C /* 00F10 80939BE0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L80939BE4: -/* 00F14 80939BE4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00F18 80939BE8 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 +/* 00F14 80939BE4 3C050600 */ lui $a1, %hi(D_06006F28) ## $a1 = 06000000 +/* 00F18 80939BE8 24A56F28 */ addiu $a1, $a1, %lo(D_06006F28) ## $a1 = 06006F28 /* 00F1C 80939BEC 8FA40048 */ lw $a0, 0x0048($sp) /* 00F20 80939BF0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00F24 80939BF4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 @@ -386,18 +386,18 @@ glabel BossTw_Init /* 00F64 80939C34 AE180130 */ sw $t8, 0x0130($s0) ## 00000130 /* 00F68 80939C38 AE190134 */ sw $t9, 0x0134($s0) ## 00000134 /* 00F6C 80939C3C 26050568 */ addiu $a1, $s0, 0x0568 ## $a1 = 00000568 -/* 00F70 80939C40 3C060603 */ lui $a2, 0x0603 ## $a2 = 06030000 -/* 00F74 80939C44 3C070602 */ lui $a3, 0x0602 ## $a3 = 06020000 -/* 00F78 80939C48 24E744B4 */ addiu $a3, $a3, 0x44B4 ## $a3 = 060244B4 -/* 00F7C 80939C4C 24C62020 */ addiu $a2, $a2, 0x2020 ## $a2 = 06032020 +/* 00F70 80939C40 3C060603 */ lui $a2, %hi(D_06032020) ## $a2 = 06030000 +/* 00F74 80939C44 3C070602 */ lui $a3, %hi(D_060244B4) ## $a3 = 06020000 +/* 00F78 80939C48 24E744B4 */ addiu $a3, $a3, %lo(D_060244B4) ## $a3 = 060244B4 +/* 00F7C 80939C4C 24C62020 */ addiu $a2, $a2, %lo(D_06032020) ## $a2 = 06032020 /* 00F80 80939C50 AFA50048 */ sw $a1, 0x0048($sp) /* 00F84 80939C54 AFA00018 */ sw $zero, 0x0018($sp) /* 00F88 80939C58 AFA00014 */ sw $zero, 0x0014($sp) /* 00F8C 80939C5C AFA00010 */ sw $zero, 0x0010($sp) /* 00F90 80939C60 0C0291BE */ jal SkelAnime_InitFlex /* 00F94 80939C64 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00F98 80939C68 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 -/* 00F9C 80939C6C 24A544B4 */ addiu $a1, $a1, 0x44B4 ## $a1 = 060244B4 +/* 00F98 80939C68 3C050602 */ lui $a1, %hi(D_060244B4) ## $a1 = 06020000 +/* 00F9C 80939C6C 24A544B4 */ addiu $a1, $a1, %lo(D_060244B4) ## $a1 = 060244B4 /* 00FA0 80939C70 8FA40048 */ lw $a0, 0x0048($sp) /* 00FA4 80939C74 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00FA8 80939C78 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s index 49f95741bb..c7951e9e0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s @@ -16,12 +16,12 @@ glabel func_8093A0A8 /* 013FC 8093A0CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01400 8093A0D0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 01404 8093A0D4 2508A2AC */ addiu $t0, $t0, %lo(func_8093A2AC) ## $t0 = 8093A2AC -/* 01408 8093A0D8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 01408 8093A0D8 3C050600 */ lui $a1, %hi(D_06006F28) ## $a1 = 06000000 /* 0140C 8093A0DC 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 /* 01410 8093A0E0 A08F05F8 */ sb $t7, 0x05F8($a0) ## 000005F8 /* 01414 8093A0E4 AC990004 */ sw $t9, 0x0004($a0) ## 00000004 /* 01418 8093A0E8 AC88014C */ sw $t0, 0x014C($a0) ## 0000014C -/* 0141C 8093A0EC 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 +/* 0141C 8093A0EC 24A56F28 */ addiu $a1, $a1, %lo(D_06006F28) ## $a1 = 06006F28 /* 01420 8093A0F0 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 01424 8093A0F4 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 01428 8093A0F8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A4DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A4DC.s index 3e1cbbe848..04fa04897a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A4DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A4DC.s @@ -13,16 +13,16 @@ glabel func_8093A4DC /* 01824 8093A4F4 AFAF001C */ sw $t7, 0x001C($sp) /* 01828 8093A4F8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0182C 8093A4FC AC98014C */ sw $t8, 0x014C($a0) ## 0000014C -/* 01830 8093A500 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01834 8093A504 24A57688 */ addiu $a1, $a1, 0x7688 ## $a1 = 06007688 +/* 01830 8093A500 3C050600 */ lui $a1, %hi(D_06007688) ## $a1 = 06000000 +/* 01834 8093A504 24A57688 */ addiu $a1, $a1, %lo(D_06007688) ## $a1 = 06007688 /* 01838 8093A508 AFA70020 */ sw $a3, 0x0020($sp) /* 0183C 8093A50C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 01840 8093A510 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01844 8093A514 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 01848 8093A518 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01848 8093A518 3C040600 */ lui $a0, %hi(D_06007688) ## $a0 = 06000000 /* 0184C 8093A51C 0C028800 */ jal SkelAnime_GetFrameCount -/* 01850 8093A520 24847688 */ addiu $a0, $a0, 0x7688 ## $a0 = 06007688 +/* 01850 8093A520 24847688 */ addiu $a0, $a0, %lo(D_06007688) ## $a0 = 06007688 /* 01854 8093A524 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01858 8093A528 8FA70020 */ lw $a3, 0x0020($sp) /* 0185C 8093A52C 24190046 */ addiu $t9, $zero, 0x0046 ## $t9 = 00000046 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 99b8f2ffb4..9c04090116 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 @@ -330,19 +330,19 @@ glabel func_8093B1AC /* 02924 8093B5F4 8EA501A4 */ lw $a1, 0x01A4($s5) ## 000001A4 /* 02928 8093B5F8 10400008 */ beq $v0, $zero, .L8093B61C /* 0292C 8093B5FC 8FA40074 */ lw $a0, 0x0074($sp) -/* 02930 8093B600 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 02930 8093B600 3C050601 */ lui $a1, %hi(D_06009398) ## $a1 = 06010000 /* 02934 8093B604 4406B000 */ mfc1 $a2, $f22 /* 02938 8093B608 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 0293C 8093B60C 24A59398 */ addiu $a1, $a1, 0x9398 ## $a1 = 06009398 +/* 0293C 8093B60C 24A59398 */ addiu $a1, $a1, %lo(D_06009398) ## $a1 = 06009398 /* 02940 8093B610 3C018095 */ lui $at, %hi(D_8094AF00) ## $at = 80950000 /* 02944 8093B614 C42AAF00 */ lwc1 $f10, %lo(D_8094AF00)($at) /* 02948 8093B618 E6AA01A4 */ swc1 $f10, 0x01A4($s5) ## 000001A4 .L8093B61C: /* 0294C 8093B61C 86A8017A */ lh $t0, 0x017A($s5) ## 0000017A /* 02950 8093B620 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02954 8093B624 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 +/* 02954 8093B624 3C100600 */ lui $s0, %hi(D_06003614) ## $s0 = 06000000 /* 02958 8093B628 1501000F */ bne $t0, $at, .L8093B668 -/* 0295C 8093B62C 26103614 */ addiu $s0, $s0, 0x3614 ## $s0 = 06003614 +/* 0295C 8093B62C 26103614 */ addiu $s0, $s0, %lo(D_06003614) ## $s0 = 06003614 /* 02960 8093B630 4406B000 */ mfc1 $a2, $f22 /* 02964 8093B634 8FA40074 */ lw $a0, 0x0074($sp) /* 02968 8093B638 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop @@ -368,8 +368,8 @@ glabel func_8093B1AC /* 029AC 8093B67C 5040000B */ beql $v0, $zero, .L8093B6AC /* 029B0 8093B680 C6A801A4 */ lwc1 $f8, 0x01A4($s5) ## 000001A4 /* 029B4 8093B684 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 -/* 029B8 8093B688 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 029BC 8093B68C 24A53E34 */ addiu $a1, $a1, 0x3E34 ## $a1 = 06003E34 +/* 029B8 8093B688 3C050600 */ lui $a1, %hi(D_06003E34) ## $a1 = 06000000 +/* 029BC 8093B68C 24A53E34 */ addiu $a1, $a1, %lo(D_06003E34) ## $a1 = 06003E34 /* 029C0 8093B690 4406B000 */ mfc1 $a2, $f22 /* 029C4 8093B694 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 029C8 8093B698 8FA40074 */ lw $a0, 0x0074($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C164.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C164.s index 5e6b986005..8d60352292 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C164.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C164.s @@ -6,16 +6,16 @@ glabel func_8093C164 /* 034A4 8093C174 25CEC1C4 */ addiu $t6, $t6, %lo(func_8093C1C4) ## $t6 = 8093C1C4 /* 034A8 8093C178 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 034AC 8093C17C AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 034B0 8093C180 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 034B4 8093C184 24A54548 */ addiu $a1, $a1, 0x4548 ## $a1 = 06004548 +/* 034B0 8093C180 3C050600 */ lui $a1, %hi(D_06004548) ## $a1 = 06000000 +/* 034B4 8093C184 24A54548 */ addiu $a1, $a1, %lo(D_06004548) ## $a1 = 06004548 /* 034B8 8093C188 AFA70018 */ sw $a3, 0x0018($sp) /* 034BC 8093C18C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 034C0 8093C190 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 034C4 8093C194 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 034C8 8093C198 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 034C8 8093C198 3C040600 */ lui $a0, %hi(D_06004548) ## $a0 = 06000000 /* 034CC 8093C19C 0C028800 */ jal SkelAnime_GetFrameCount -/* 034D0 8093C1A0 24844548 */ addiu $a0, $a0, 0x4548 ## $a0 = 06004548 +/* 034D0 8093C1A0 24844548 */ addiu $a0, $a0, %lo(D_06004548) ## $a0 = 06004548 /* 034D4 8093C1A4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 034D8 8093C1A8 8FAF0018 */ lw $t7, 0x0018($sp) /* 034DC 8093C1AC 468021A0 */ cvt.s.w $f6, $f4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C25C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C25C.s index a8e24bd063..628db086e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C25C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C25C.s @@ -6,8 +6,8 @@ glabel func_8093C25C /* 0359C 8093C26C 25CEC2C4 */ addiu $t6, $t6, %lo(func_8093C2C4) ## $t6 = 8093C2C4 /* 035A0 8093C270 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 035A4 8093C274 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 035A8 8093C278 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 035AC 8093C27C 24A5578C */ addiu $a1, $a1, 0x578C ## $a1 = 0600578C +/* 035A8 8093C278 3C050600 */ lui $a1, %hi(D_0600578C) ## $a1 = 06000000 +/* 035AC 8093C27C 24A5578C */ addiu $a1, $a1, %lo(D_0600578C) ## $a1 = 0600578C /* 035B0 8093C280 AFA70018 */ sw $a3, 0x0018($sp) /* 035B4 8093C284 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 035B8 8093C288 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s index c53bc8b2f0..b6871778b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s @@ -161,10 +161,10 @@ glabel func_8093C2C4 /* 03820 8093C4F0 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 /* 03824 8093C4F4 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 03828 8093C4F8 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 -/* 0382C 8093C4FC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0382C 8093C4FC 3C050600 */ lui $a1, %hi(D_06006530) ## $a1 = 06000000 /* 03830 8093C500 46062200 */ add.s $f8, $f4, $f6 /* 03834 8093C504 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 03838 8093C508 24A56530 */ addiu $a1, $a1, 0x6530 ## $a1 = 06006530 +/* 03838 8093C508 24A56530 */ addiu $a1, $a1, %lo(D_06006530) ## $a1 = 06006530 /* 0383C 8093C50C 11600004 */ beq $t3, $zero, .L8093C520 /* 03840 8093C510 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 03844 8093C514 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 @@ -178,10 +178,10 @@ glabel func_8093C2C4 /* 03860 8093C530 00000000 */ nop /* 03864 8093C534 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 03868 8093C538 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 0386C 8093C53C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0386C 8093C53C 3C040600 */ lui $a0, %hi(D_06006530) ## $a0 = 06000000 /* 03870 8093C540 0C028800 */ jal SkelAnime_GetFrameCount -/* 03874 8093C544 24846530 */ addiu $a0, $a0, 0x6530 ## $a0 = 06006530 +/* 03874 8093C544 24846530 */ addiu $a0, $a0, %lo(D_06006530) ## $a0 = 06006530 /* 03878 8093C548 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 0387C 8093C54C 86030178 */ lh $v1, 0x0178($s0) ## 00000178 /* 03880 8093C550 468084A0 */ cvt.s.w $f18, $f16 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C58C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C58C.s index 0faa59c147..269a8cacd2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C58C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C58C.s @@ -6,16 +6,16 @@ glabel func_8093C58C /* 038CC 8093C59C 25CEC5F4 */ addiu $t6, $t6, %lo(func_8093C5F4) ## $t6 = 8093C5F4 /* 038D0 8093C5A0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 038D4 8093C5A4 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 038D8 8093C5A8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 038DC 8093C5AC 24A588C8 */ addiu $a1, $a1, 0x88C8 ## $a1 = 060088C8 +/* 038D8 8093C5A8 3C050601 */ lui $a1, %hi(D_060088C8) ## $a1 = 06010000 +/* 038DC 8093C5AC 24A588C8 */ addiu $a1, $a1, %lo(D_060088C8) ## $a1 = 060088C8 /* 038E0 8093C5B0 AFA70018 */ sw $a3, 0x0018($sp) /* 038E4 8093C5B4 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 038E8 8093C5B8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 038EC 8093C5BC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 038F0 8093C5C0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 038F0 8093C5C0 3C040601 */ lui $a0, %hi(D_060088C8) ## $a0 = 06010000 /* 038F4 8093C5C4 0C028800 */ jal SkelAnime_GetFrameCount -/* 038F8 8093C5C8 248488C8 */ addiu $a0, $a0, 0x88C8 ## $a0 = 060088C8 +/* 038F8 8093C5C8 248488C8 */ addiu $a0, $a0, %lo(D_060088C8) ## $a0 = 060088C8 /* 038FC 8093C5CC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03900 8093C5D0 8FA70018 */ lw $a3, 0x0018($sp) /* 03904 8093C5D4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C684.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C684.s index e04a814669..f0bd59d394 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C684.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C684.s @@ -8,15 +8,15 @@ glabel func_8093C684 /* 039CC 8093C69C 25CEC700 */ addiu $t6, $t6, %lo(func_8093C700) ## $t6 = 8093C700 /* 039D0 8093C6A0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 039D4 8093C6A4 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 039D8 8093C6A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 039DC 8093C6AC 24A57CA8 */ addiu $a1, $a1, 0x7CA8 ## $a1 = 06007CA8 +/* 039D8 8093C6A8 3C050600 */ lui $a1, %hi(D_06007CA8) ## $a1 = 06000000 +/* 039DC 8093C6AC 24A57CA8 */ addiu $a1, $a1, %lo(D_06007CA8) ## $a1 = 06007CA8 /* 039E0 8093C6B0 AFA40024 */ sw $a0, 0x0024($sp) /* 039E4 8093C6B4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 039E8 8093C6B8 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 039EC 8093C6BC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 039EC 8093C6BC 3C040600 */ lui $a0, %hi(D_06007CA8) ## $a0 = 06000000 /* 039F0 8093C6C0 0C028800 */ jal SkelAnime_GetFrameCount -/* 039F4 8093C6C4 24847CA8 */ addiu $a0, $a0, 0x7CA8 ## $a0 = 06007CA8 +/* 039F4 8093C6C4 24847CA8 */ addiu $a0, $a0, %lo(D_06007CA8) ## $a0 = 06007CA8 /* 039F8 8093C6C8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 039FC 8093C6CC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 03A00 8093C6D0 468021A0 */ cvt.s.w $f6, $f4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s index aba6447a50..1199850996 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s @@ -5,9 +5,9 @@ glabel func_8093C79C /* 03AD8 8093C7A8 AFA5001C */ sw $a1, 0x001C($sp) /* 03ADC 8093C7AC 3C0E8094 */ lui $t6, %hi(func_8093C7E4) ## $t6 = 80940000 /* 03AE0 8093C7B0 25CEC7E4 */ addiu $t6, $t6, %lo(func_8093C7E4) ## $t6 = 8093C7E4 -/* 03AE4 8093C7B4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 03AE4 8093C7B4 3C050600 */ lui $a1, %hi(D_06006F28) ## $a1 = 06000000 /* 03AE8 8093C7B8 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 03AEC 8093C7BC 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 +/* 03AEC 8093C7BC 24A56F28 */ addiu $a1, $a1, %lo(D_06006F28) ## $a1 = 06006F28 /* 03AF0 8093C7C0 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 03AF4 8093C7C4 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 03AF8 8093C7C8 E480FF60 */ swc1 $f0, -0x00A0($a0) ## 000004C8 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s index fc8986d7c4..2ab01f1a20 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s @@ -518,8 +518,8 @@ glabel func_8093C910 /* 0436C 8093D03C 0C00B58B */ jal Actor_SetScale /* 04370 8093D040 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 04374 8093D044 3C100604 */ lui $s0, 0x0604 ## $s0 = 06040000 -/* 04378 8093D048 26108E2C */ addiu $s0, $s0, 0x8E2C ## $s0 = 06038E2C +/* 04374 8093D044 3C100604 */ lui $s0, %hi(D_06038E2C) ## $s0 = 06040000 +/* 04378 8093D048 26108E2C */ addiu $s0, $s0, %lo(D_06038E2C) ## $s0 = 06038E2C /* 0437C 8093D04C 4406B000 */ mfc1 $a2, $f22 /* 04380 8093D050 02002825 */ or $a1, $s0, $zero ## $a1 = 06038E2C /* 04384 8093D054 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop @@ -567,8 +567,8 @@ glabel func_8093C910 /* 04418 8093D0E8 8E2501A4 */ lw $a1, 0x01A4($s1) ## 000001A4 /* 0441C 8093D0EC 10400005 */ beq $v0, $zero, .L8093D104 /* 04420 8093D0F0 02002025 */ or $a0, $s0, $zero ## $a0 = 06038E2C -/* 04424 8093D0F4 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 -/* 04428 8093D0F8 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 +/* 04424 8093D0F4 3C050603 */ lui $a1, %hi(D_06032BF8) ## $a1 = 06030000 +/* 04428 8093D0F8 24A52BF8 */ addiu $a1, $a1, %lo(D_06032BF8) ## $a1 = 06032BF8 /* 0442C 8093D0FC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 04430 8093D100 3C06C170 */ lui $a2, 0xC170 ## $a2 = C1700000 .L8093D104: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s index f0bf1827c2..ba680ef82c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s @@ -6,8 +6,8 @@ glabel func_8093D3D8 /* 04718 8093D3E8 25CED444 */ addiu $t6, $t6, %lo(func_8093D444) ## $t6 = 8093D444 /* 0471C 8093D3EC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 04720 8093D3F0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 04724 8093D3F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04728 8093D3F8 24A504A4 */ addiu $a1, $a1, 0x04A4 ## $a1 = 060004A4 +/* 04724 8093D3F4 3C050600 */ lui $a1, %hi(D_060004A4) ## $a1 = 06000000 +/* 04728 8093D3F8 24A504A4 */ addiu $a1, $a1, %lo(D_060004A4) ## $a1 = 060004A4 /* 0472C 8093D3FC AFA70018 */ sw $a3, 0x0018($sp) /* 04730 8093D400 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 04734 8093D404 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat 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 a3579c4ecc..675bfa61de 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 @@ -283,8 +283,8 @@ glabel L8093D7EC /* 04BF4 8093D8C4 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 /* 04BF8 8093D8C8 A62D05FA */ sh $t5, 0x05FA($s1) ## 000005FA /* 04BFC 8093D8CC 8E4E0000 */ lw $t6, 0x0000($s2) ## 8094C848 -/* 04C00 8093D8D0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04C04 8093D8D4 24A504A4 */ addiu $a1, $a1, 0x04A4 ## $a1 = 060004A4 +/* 04C00 8093D8D0 3C050600 */ lui $a1, %hi(D_060004A4) ## $a1 = 06000000 +/* 04C04 8093D8D4 24A504A4 */ addiu $a1, $a1, %lo(D_060004A4) ## $a1 = 060004A4 /* 04C08 8093D8D8 A1D00564 */ sb $s0, 0x0564($t6) ## 00000564 /* 04C0C 8093D8DC 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 04C10 8093D8E0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 @@ -462,10 +462,10 @@ glabel L8093DAB8 /* 04E9C 8093DB6C 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 /* 04EA0 8093DB70 C5EA0024 */ lwc1 $f10, 0x0024($t7) ## 00000024 /* 04EA4 8093DB74 3C018095 */ lui $at, %hi(D_8094AFA0) ## $at = 80950000 -/* 04EA8 8093DB78 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 +/* 04EA8 8093DB78 3C100600 */ lui $s0, %hi(D_06000AAC) ## $s0 = 06000000 /* 04EAC 8093DB7C E62A0684 */ swc1 $f10, 0x0684($s1) ## 00000684 /* 04EB0 8093DB80 8E580000 */ lw $t8, 0x0000($s2) ## 8094C848 -/* 04EB4 8093DB84 26100AAC */ addiu $s0, $s0, 0x0AAC ## $s0 = 06000AAC +/* 04EB4 8093DB84 26100AAC */ addiu $s0, $s0, %lo(D_06000AAC) ## $s0 = 06000AAC /* 04EB8 8093DB88 02002825 */ or $a1, $s0, $zero ## $a1 = 06000AAC /* 04EBC 8093DB8C C7040028 */ lwc1 $f4, 0x0028($t8) ## 00000028 /* 04EC0 8093DB90 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 @@ -701,9 +701,9 @@ glabel L8093DC4C .L8093DED4: /* 05204 8093DED4 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 /* 05208 8093DED8 1461000D */ bne $v1, $at, .L8093DF10 -/* 0520C 8093DEDC 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 +/* 0520C 8093DEDC 3C100601 */ lui $s0, %hi(D_060088C8) ## $s0 = 06010000 /* 05210 8093DEE0 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 -/* 05214 8093DEE4 261088C8 */ addiu $s0, $s0, 0x88C8 ## $s0 = 060088C8 +/* 05214 8093DEE4 261088C8 */ addiu $s0, $s0, %lo(D_060088C8) ## $s0 = 060088C8 /* 05218 8093DEE8 02002825 */ or $a1, $s0, $zero ## $a1 = 060088C8 /* 0521C 8093DEEC 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 05220 8093DEF0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop @@ -728,9 +728,9 @@ glabel L8093DC4C /* 0525C 8093DF2C 0C0295B2 */ jal func_800A56C8 /* 05260 8093DF30 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05264 8093DF34 1040000A */ beq $v0, $zero, .L8093DF60 -/* 05268 8093DF38 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 05268 8093DF38 3C050600 */ lui $a1, %hi(D_06006F28) ## $a1 = 06000000 /* 0526C 8093DF3C 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 -/* 05270 8093DF40 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 +/* 05270 8093DF40 24A56F28 */ addiu $a1, $a1, %lo(D_06006F28) ## $a1 = 06006F28 /* 05274 8093DF44 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 05278 8093DF48 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0527C 8093DF4C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 @@ -773,8 +773,8 @@ glabel L8093DC4C /* 05300 8093DFD0 A6200150 */ sh $zero, 0x0150($s1) ## 00000150 /* 05304 8093DFD4 E62A06B0 */ swc1 $f10, 0x06B0($s1) ## 000006B0 /* 05308 8093DFD8 8E6E0000 */ lw $t6, 0x0000($s3) ## 8094C844 -/* 0530C 8093DFDC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 05310 8093DFE0 24A504A4 */ addiu $a1, $a1, 0x04A4 ## $a1 = 060004A4 +/* 0530C 8093DFDC 3C050600 */ lui $a1, %hi(D_060004A4) ## $a1 = 06000000 +/* 05310 8093DFE0 24A504A4 */ addiu $a1, $a1, %lo(D_060004A4) ## $a1 = 060004A4 /* 05314 8093DFE4 A1D00564 */ sb $s0, 0x0564($t6) ## 00000564 /* 05318 8093DFE8 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 0531C 8093DFEC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 @@ -854,9 +854,9 @@ glabel L8093DC4C /* 0542C 8093E0FC 0C0295B2 */ jal func_800A56C8 /* 05430 8093E100 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05434 8093E104 104002F9 */ beq $v0, $zero, .L8093ECEC -/* 05438 8093E108 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 05438 8093E108 3C050600 */ lui $a1, %hi(D_06006F28) ## $a1 = 06000000 /* 0543C 8093E10C 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 -/* 05440 8093E110 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 +/* 05440 8093E110 24A56F28 */ addiu $a1, $a1, %lo(D_06006F28) ## $a1 = 06006F28 /* 05444 8093E114 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 05448 8093E118 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0544C 8093E11C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 @@ -994,10 +994,10 @@ glabel L8093E258 /* 0563C 8093E30C 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 05640 8093E310 C5060024 */ lwc1 $f6, 0x0024($t0) ## 00000024 /* 05644 8093E314 3C018095 */ lui $at, %hi(D_8094AFBC) ## $at = 80950000 -/* 05648 8093E318 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 +/* 05648 8093E318 3C100600 */ lui $s0, %hi(D_06000AAC) ## $s0 = 06000000 /* 0564C 8093E31C E6260684 */ swc1 $f6, 0x0684($s1) ## 00000684 /* 05650 8093E320 8E690000 */ lw $t1, 0x0000($s3) ## 8094C844 -/* 05654 8093E324 26100AAC */ addiu $s0, $s0, 0x0AAC ## $s0 = 06000AAC +/* 05654 8093E324 26100AAC */ addiu $s0, $s0, %lo(D_06000AAC) ## $s0 = 06000AAC /* 05658 8093E328 44068000 */ mfc1 $a2, $f16 /* 0565C 8093E32C C5280028 */ lwc1 $f8, 0x0028($t1) ## 00000028 /* 05660 8093E330 02002825 */ or $a1, $s0, $zero ## $a1 = 06000AAC @@ -1229,9 +1229,9 @@ glabel L8093E3E8 .L8093E664: /* 05994 8093E664 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 /* 05998 8093E668 1461000D */ bne $v1, $at, .L8093E6A0 -/* 0599C 8093E66C 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 +/* 0599C 8093E66C 3C100601 */ lui $s0, %hi(D_060088C8) ## $s0 = 06010000 /* 059A0 8093E670 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 -/* 059A4 8093E674 261088C8 */ addiu $s0, $s0, 0x88C8 ## $s0 = 060088C8 +/* 059A4 8093E674 261088C8 */ addiu $s0, $s0, %lo(D_060088C8) ## $s0 = 060088C8 /* 059A8 8093E678 02002825 */ or $a1, $s0, $zero ## $a1 = 060088C8 /* 059AC 8093E67C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 059B0 8093E680 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop @@ -1256,9 +1256,9 @@ glabel L8093E3E8 /* 059EC 8093E6BC 0C0295B2 */ jal func_800A56C8 /* 059F0 8093E6C0 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 059F4 8093E6C4 1040000A */ beq $v0, $zero, .L8093E6F0 -/* 059F8 8093E6C8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 059F8 8093E6C8 3C050600 */ lui $a1, %hi(D_06006F28) ## $a1 = 06000000 /* 059FC 8093E6CC 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 -/* 05A00 8093E6D0 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 +/* 05A00 8093E6D0 24A56F28 */ addiu $a1, $a1, %lo(D_06006F28) ## $a1 = 06006F28 /* 05A04 8093E6D4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 05A08 8093E6D8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 05A0C 8093E6DC 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 @@ -1354,9 +1354,9 @@ glabel L8093E3E8 /* 05B50 8093E820 0C0295B2 */ jal func_800A56C8 /* 05B54 8093E824 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05B58 8093E828 10400130 */ beq $v0, $zero, .L8093ECEC -/* 05B5C 8093E82C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 05B5C 8093E82C 3C050600 */ lui $a1, %hi(D_06006F28) ## $a1 = 06000000 /* 05B60 8093E830 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 -/* 05B64 8093E834 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 +/* 05B64 8093E834 24A56F28 */ addiu $a1, $a1, %lo(D_06006F28) ## $a1 = 06006F28 /* 05B68 8093E838 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 05B6C 8093E83C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 05B70 8093E840 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 @@ -1400,7 +1400,7 @@ glabel L8093E854 .L8093E8C8: /* 05BF8 8093E8C8 24010078 */ addiu $at, $zero, 0x0078 ## $at = 00000078 /* 05BFC 8093E8CC 1461002F */ bne $v1, $at, .L8093E98C -/* 05C00 8093E8D0 3C020603 */ lui $v0, 0x0603 ## $v0 = 06030000 +/* 05C00 8093E8D0 3C020603 */ lui $v0, %hi(D_0602E170) ## $v0 = 06030000 /* 05C04 8093E8D4 8FA800A4 */ lw $t0, 0x00A4($sp) /* 05C08 8093E8D8 3C018095 */ lui $at, %hi(D_8094C840) ## $at = 80950000 /* 05C0C 8093E8DC A020C840 */ sb $zero, %lo(D_8094C840)($at) @@ -1413,7 +1413,7 @@ glabel L8093E854 /* 05C28 8093E8F8 00290821 */ addu $at, $at, $t1 /* 05C2C 8093E8FC A0300AE1 */ sb $s0, 0x0AE1($at) ## 00010AE1 /* 05C30 8093E900 8FAB00A4 */ lw $t3, 0x00A4($sp) -/* 05C34 8093E904 2442E170 */ addiu $v0, $v0, 0xE170 ## $v0 = 0602E170 +/* 05C34 8093E904 2442E170 */ addiu $v0, $v0, %lo(D_0602E170) ## $v0 = 0602E170 /* 05C38 8093E908 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 05C3C 8093E90C 00026900 */ sll $t5, $v0, 4 /* 05C40 8093E910 000D7702 */ srl $t6, $t5, 28 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s index 5bcb2b7940..c1f9d86e5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s @@ -6,9 +6,9 @@ glabel func_8093F108 /* 06448 8093F118 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0644C 8093F11C AFBF001C */ sw $ra, 0x001C($sp) /* 06450 8093F120 25CEF9E4 */ addiu $t6, $t6, %lo(func_8093F9E4) ## $t6 = 8093F9E4 -/* 06454 8093F124 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 06454 8093F124 3C050602 */ lui $a1, %hi(D_06024374) ## $a1 = 06020000 /* 06458 8093F128 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 0645C 8093F12C 24A54374 */ addiu $a1, $a1, 0x4374 ## $a1 = 06024374 +/* 0645C 8093F12C 24A54374 */ addiu $a1, $a1, %lo(D_06024374) ## $a1 = 06024374 /* 06460 8093F130 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 06464 8093F134 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 06468 8093F138 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s index 617e157090..ddf935b879 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s @@ -303,7 +303,7 @@ glabel func_8093F1C4 /* 068CC 8093F59C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 068D0 8093F5A0 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 /* 068D4 8093F5A4 1041000C */ beq $v0, $at, .L8093F5D8 -/* 068D8 8093F5A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 068D8 8093F5A8 3C050600 */ lui $a1, %hi(D_0600230C) ## $a1 = 06000000 /* 068DC 8093F5AC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 068E0 8093F5B0 10410010 */ beq $v0, $at, .L8093F5F4 /* 068E4 8093F5B4 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 @@ -317,7 +317,7 @@ glabel func_8093F1C4 /* 06904 8093F5D4 93A20036 */ lbu $v0, 0x0036($sp) .L8093F5D8: /* 06908 8093F5D8 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) -/* 0690C 8093F5DC 24A5230C */ addiu $a1, $a1, 0x230C ## $a1 = 0600230C +/* 0690C 8093F5DC 24A5230C */ addiu $a1, $a1, %lo(D_0600230C) ## $a1 = 0600230C /* 06910 8093F5E0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 06914 8093F5E4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 06918 8093F5E8 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 80950568 @@ -325,8 +325,8 @@ glabel func_8093F1C4 /* 06920 8093F5F0 93A20036 */ lbu $v0, 0x0036($sp) .L8093F5F4: /* 06924 8093F5F4 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) -/* 06928 8093F5F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0692C 8093F5FC 24A51D10 */ addiu $a1, $a1, 0x1D10 ## $a1 = 06001D10 +/* 06928 8093F5F8 3C050600 */ lui $a1, %hi(D_06001D10) ## $a1 = 06000000 +/* 0692C 8093F5FC 24A51D10 */ addiu $a1, $a1, %lo(D_06001D10) ## $a1 = 06001D10 /* 06930 8093F600 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 06934 8093F604 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 06938 8093F608 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 @@ -334,8 +334,8 @@ glabel func_8093F1C4 /* 06940 8093F610 93A20036 */ lbu $v0, 0x0036($sp) .L8093F614: /* 06944 8093F614 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) -/* 06948 8093F618 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0694C 8093F61C 24A517E0 */ addiu $a1, $a1, 0x17E0 ## $a1 = 060017E0 +/* 06948 8093F618 3C050600 */ lui $a1, %hi(D_060017E0) ## $a1 = 06000000 +/* 0694C 8093F61C 24A517E0 */ addiu $a1, $a1, %lo(D_060017E0) ## $a1 = 060017E0 /* 06950 8093F620 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 06954 8093F624 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 06958 8093F628 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 @@ -343,8 +343,8 @@ glabel func_8093F1C4 /* 06960 8093F630 93A20036 */ lbu $v0, 0x0036($sp) .L8093F634: /* 06964 8093F634 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) -/* 06968 8093F638 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0696C 8093F63C 24A512A4 */ addiu $a1, $a1, 0x12A4 ## $a1 = 060012A4 +/* 06968 8093F638 3C050600 */ lui $a1, %hi(D_060012A4) ## $a1 = 06000000 +/* 0696C 8093F63C 24A512A4 */ addiu $a1, $a1, %lo(D_060012A4) ## $a1 = 060012A4 /* 06970 8093F640 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 06974 8093F644 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 06978 8093F648 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 @@ -353,7 +353,7 @@ glabel func_8093F1C4 /* 06980 8093F650 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 06984 8093F654 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 /* 06988 8093F658 1041000C */ beq $v0, $at, .L8093F68C -/* 0698C 8093F65C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0698C 8093F65C 3C050600 */ lui $a1, %hi(D_0600230C) ## $a1 = 06000000 /* 06990 8093F660 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 06994 8093F664 10410010 */ beq $v0, $at, .L8093F6A8 /* 06998 8093F668 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 @@ -367,7 +367,7 @@ glabel func_8093F1C4 /* 069B8 8093F688 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F68C: /* 069BC 8093F68C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) -/* 069C0 8093F690 24A5230C */ addiu $a1, $a1, 0x230C ## $a1 = 0600230C +/* 069C0 8093F690 24A5230C */ addiu $a1, $a1, %lo(D_0600230C) ## $a1 = 0600230C /* 069C4 8093F694 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 069C8 8093F698 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 069CC 8093F69C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 80950568 @@ -375,8 +375,8 @@ glabel func_8093F1C4 /* 069D4 8093F6A4 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F6A8: /* 069D8 8093F6A8 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) -/* 069DC 8093F6AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 069E0 8093F6B0 24A51D10 */ addiu $a1, $a1, 0x1D10 ## $a1 = 06001D10 +/* 069DC 8093F6AC 3C050600 */ lui $a1, %hi(D_06001D10) ## $a1 = 06000000 +/* 069E0 8093F6B0 24A51D10 */ addiu $a1, $a1, %lo(D_06001D10) ## $a1 = 06001D10 /* 069E4 8093F6B4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 069E8 8093F6B8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 069EC 8093F6BC 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 @@ -384,8 +384,8 @@ glabel func_8093F1C4 /* 069F4 8093F6C4 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F6C8: /* 069F8 8093F6C8 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) -/* 069FC 8093F6CC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 06A00 8093F6D0 24A517E0 */ addiu $a1, $a1, 0x17E0 ## $a1 = 060017E0 +/* 069FC 8093F6CC 3C050600 */ lui $a1, %hi(D_060017E0) ## $a1 = 06000000 +/* 06A00 8093F6D0 24A517E0 */ addiu $a1, $a1, %lo(D_060017E0) ## $a1 = 060017E0 /* 06A04 8093F6D4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 06A08 8093F6D8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 06A0C 8093F6DC 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 @@ -393,8 +393,8 @@ glabel func_8093F1C4 /* 06A14 8093F6E4 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F6E8: /* 06A18 8093F6E8 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) -/* 06A1C 8093F6EC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 06A20 8093F6F0 24A512A4 */ addiu $a1, $a1, 0x12A4 ## $a1 = 060012A4 +/* 06A1C 8093F6EC 3C050600 */ lui $a1, %hi(D_060012A4) ## $a1 = 06000000 +/* 06A20 8093F6F0 24A512A4 */ addiu $a1, $a1, %lo(D_060012A4) ## $a1 = 060012A4 /* 06A24 8093F6F4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 06A28 8093F6F8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 06A2C 8093F6FC 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s index 7708ad06c2..302480a5f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s @@ -62,8 +62,8 @@ glabel func_8093F9E4 /* 06DBC 8093FA8C 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 06DC0 8093FA90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000568 /* 06DC4 8093FA94 14410005 */ bne $v0, $at, .L8093FAAC -/* 06DC8 8093FA98 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 -/* 06DCC 8093FA9C 24A516DC */ addiu $a1, $a1, 0x16DC ## $a1 = 060216DC +/* 06DC8 8093FA98 3C050602 */ lui $a1, %hi(D_060216DC) ## $a1 = 06020000 +/* 06DCC 8093FA9C 24A516DC */ addiu $a1, $a1, %lo(D_060216DC) ## $a1 = 060216DC /* 06DD0 8093FAA0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 06DD4 8093FAA4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 06DD8 8093FAA8 86420150 */ lh $v0, 0x0150($s2) ## 00000150 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809416D0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809416D0.s index cad89ef899..e95cd149c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809416D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809416D0.s @@ -8,11 +8,11 @@ glabel func_809416D0 /* 08A18 809416E8 55C0000B */ bnel $t6, $zero, .L80941718 /* 08A1C 809416EC 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E /* 08A20 809416F0 844F001C */ lh $t7, 0x001C($v0) ## 0000001C -/* 08A24 809416F4 3C190601 */ lui $t9, 0x0601 ## $t9 = 06010000 -/* 08A28 809416F8 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 +/* 08A24 809416F4 3C190601 */ lui $t9, %hi(D_060134B8) ## $t9 = 06010000 +/* 08A28 809416F8 3C180601 */ lui $t8, %hi(D_06012CE0) ## $t8 = 06010000 /* 08A2C 809416FC 15E00004 */ bne $t7, $zero, .L80941710 -/* 08A30 80941700 273934B8 */ addiu $t9, $t9, 0x34B8 ## $t9 = 060134B8 -/* 08A34 80941704 27182CE0 */ addiu $t8, $t8, 0x2CE0 ## $t8 = 06012CE0 +/* 08A30 80941700 273934B8 */ addiu $t9, $t9, %lo(D_060134B8) ## $t9 = 060134B8 +/* 08A34 80941704 27182CE0 */ addiu $t8, $t8, %lo(D_06012CE0) ## $t8 = 06012CE0 /* 08A38 80941708 10000002 */ beq $zero, $zero, .L80941714 /* 08A3C 8094170C ACD80000 */ sw $t8, 0x0000($a2) ## 00000000 .L80941710: @@ -39,11 +39,11 @@ glabel func_809416D0 /* 08A80 80941750 4500000B */ bc1f .L80941780 /* 08A84 80941754 00000000 */ nop /* 08A88 80941758 844A001C */ lh $t2, 0x001C($v0) ## 0000001C -/* 08A8C 8094175C 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 -/* 08A90 80941760 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 +/* 08A8C 8094175C 3C0C0601 */ lui $t4, %hi(D_06013310) ## $t4 = 06010000 +/* 08A90 80941760 3C0B0601 */ lui $t3, %hi(D_06012B38) ## $t3 = 06010000 /* 08A94 80941764 15400005 */ bne $t2, $zero, .L8094177C -/* 08A98 80941768 258C3310 */ addiu $t4, $t4, 0x3310 ## $t4 = 06013310 -/* 08A9C 8094176C 256B2B38 */ addiu $t3, $t3, 0x2B38 ## $t3 = 06012B38 +/* 08A98 80941768 258C3310 */ addiu $t4, $t4, %lo(D_06013310) ## $t4 = 06013310 +/* 08A9C 8094176C 256B2B38 */ addiu $t3, $t3, %lo(D_06012B38) ## $t3 = 06012B38 /* 08AA0 80941770 ACCB0000 */ sw $t3, 0x0000($a2) ## 00000000 /* 08AA4 80941774 03E00008 */ jr $ra /* 08AA8 80941778 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 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 4829b55693..aa9f01b915 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 @@ -72,8 +72,8 @@ glabel func_80941788 /* 08B88 80941858 15600017 */ bne $t3, $zero, .L809418B8 /* 08B8C 8094185C 3C05DE00 */ lui $a1, 0xDE00 ## $a1 = DE000000 /* 08B90 80941860 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 08B94 80941864 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 08B98 80941868 24843AE8 */ addiu $a0, $a0, 0x3AE8 ## $a0 = 06013AE8 +/* 08B94 80941864 3C040601 */ lui $a0, %hi(D_06013AE8) ## $a0 = 06010000 +/* 08B98 80941868 24843AE8 */ addiu $a0, $a0, %lo(D_06013AE8) ## $a0 = 06013AE8 /* 08B9C 8094186C 00046900 */ sll $t5, $a0, 4 /* 08BA0 80941870 000D7702 */ srl $t6, $t5, 28 /* 08BA4 80941874 3C068016 */ lui $a2, %hi(gSegments) @@ -95,8 +95,8 @@ glabel func_80941788 /* 08BE4 809418B4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 .L809418B8: /* 08BE8 809418B8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 08BEC 809418BC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 08BF0 809418C0 24843D68 */ addiu $a0, $a0, 0x3D68 ## $a0 = 06013D68 +/* 08BEC 809418BC 3C040601 */ lui $a0, %hi(D_06013D68) ## $a0 = 06010000 +/* 08BF0 809418C0 24843D68 */ addiu $a0, $a0, %lo(D_06013D68) ## $a0 = 06013D68 /* 08BF4 809418C4 00047100 */ sll $t6, $a0, 4 /* 08BF8 809418C8 000E7F02 */ srl $t7, $t6, 28 /* 08BFC 809418CC 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 @@ -168,9 +168,9 @@ glabel func_80941788 /* 08D00 809419D0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 08D04 809419D4 C62804D0 */ lwc1 $f8, 0x04D0($s1) ## 000004D0 /* 08D08 809419D8 3421FF00 */ ori $at, $at, 0xFF00 ## $at = FFE1FF00 -/* 08D0C 809419DC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 08D0C 809419DC 3C040601 */ lui $a0, %hi(D_06013E98) ## $a0 = 06010000 /* 08D10 809419E0 4600428D */ trunc.w.s $f10, $f8 -/* 08D14 809419E4 24843E98 */ addiu $a0, $a0, 0x3E98 ## $a0 = 06013E98 +/* 08D14 809419E4 24843E98 */ addiu $a0, $a0, %lo(D_06013E98) ## $a0 = 06013E98 /* 08D18 809419E8 00045100 */ sll $t2, $a0, 4 /* 08D1C 809419EC 000A5F02 */ srl $t3, $t2, 28 /* 08D20 809419F0 440E5000 */ mfc1 $t6, $f10 @@ -198,8 +198,8 @@ glabel func_80941788 /* 08D78 80941A48 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 08D7C 80941A4C AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 08D80 80941A50 C63004D0 */ lwc1 $f16, 0x04D0($s1) ## 000004D0 -/* 08D84 80941A54 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 08D88 80941A58 24843F98 */ addiu $a0, $a0, 0x3F98 ## $a0 = 06013F98 +/* 08D84 80941A54 3C040601 */ lui $a0, %hi(D_06013F98) ## $a0 = 06010000 +/* 08D88 80941A58 24843F98 */ addiu $a0, $a0, %lo(D_06013F98) ## $a0 = 06013F98 /* 08D8C 80941A5C 4600848D */ trunc.w.s $f18, $f16 /* 08D90 80941A60 00045100 */ sll $t2, $a0, 4 /* 08D94 80941A64 000A5F02 */ srl $t3, $t2, 28 @@ -221,8 +221,8 @@ glabel func_80941788 /* 08DD4 80941AA4 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 .L80941AA8: /* 08DD8 80941AA8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 08DDC 80941AAC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 08DE0 80941AB0 24844070 */ addiu $a0, $a0, 0x4070 ## $a0 = 06014070 +/* 08DDC 80941AAC 3C040601 */ lui $a0, %hi(D_06014070) ## $a0 = 06010000 +/* 08DE0 80941AB0 24844070 */ addiu $a0, $a0, %lo(D_06014070) ## $a0 = 06014070 /* 08DE4 80941AB4 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 08DE8 80941AB8 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 08DEC 80941ABC AC490000 */ sw $t1, 0x0000($v0) ## 00000000 @@ -253,12 +253,12 @@ glabel func_80941788 /* 08E50 80941B20 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 08E54 80941B24 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 08E58 80941B28 3C01FF46 */ lui $at, 0xFF46 ## $at = FF460000 -/* 08E5C 80941B2C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 08E5C 80941B2C 3C040601 */ lui $a0, %hi(D_06014158) ## $a0 = 06010000 /* 08E60 80941B30 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 08E64 80941B34 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 08E68 80941B38 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 08E6C 80941B3C C62804D0 */ lwc1 $f8, 0x04D0($s1) ## 000004D0 -/* 08E70 80941B40 24844158 */ addiu $a0, $a0, 0x4158 ## $a0 = 06014158 +/* 08E70 80941B40 24844158 */ addiu $a0, $a0, %lo(D_06014158) ## $a0 = 06014158 /* 08E74 80941B44 00045100 */ sll $t2, $a0, 4 /* 08E78 80941B48 4600428D */ trunc.w.s $f10, $f8 /* 08E7C 80941B4C 000A5F02 */ srl $t3, $t2, 28 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 eeba95bcce..2c0a28b069 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 @@ -77,8 +77,8 @@ glabel func_80941BC0 /* 08FC4 80941C94 35CE1E50 */ ori $t6, $t6, 0x1E50 ## $t6 = 00281E50 /* 08FC8 80941C98 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 /* 08FCC 80941C9C 4600218D */ trunc.w.s $f6, $f4 -/* 08FD0 80941CA0 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 08FD4 80941CA4 2484BC00 */ addiu $a0, $a0, 0xBC00 ## $a0 = 0601BC00 +/* 08FD0 80941CA0 3C040602 */ lui $a0, %hi(D_0601BC00) ## $a0 = 06020000 +/* 08FD4 80941CA4 2484BC00 */ addiu $a0, $a0, %lo(D_0601BC00) ## $a0 = 0601BC00 /* 08FD8 80941CA8 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 /* 08FDC 80941CAC 44193000 */ mfc1 $t9, $f6 /* 08FE0 80941CB0 00000000 */ nop @@ -252,8 +252,8 @@ glabel func_80941BC0 /* 09268 80941F38 0C0346A2 */ jal Matrix_NewMtx /* 0926C 80941F3C AFA20068 */ sw $v0, 0x0068($sp) /* 09270 80941F40 8FA30068 */ lw $v1, 0x0068($sp) -/* 09274 80941F44 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 09278 80941F48 2484C1C0 */ addiu $a0, $a0, 0xC1C0 ## $a0 = 0601C1C0 +/* 09274 80941F44 3C040602 */ lui $a0, %hi(D_0601C1C0) ## $a0 = 06020000 +/* 09278 80941F48 2484C1C0 */ addiu $a0, $a0, %lo(D_0601C1C0) ## $a0 = 0601C1C0 /* 0927C 80941F4C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 09280 80941F50 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 09284 80941F54 00046900 */ sll $t5, $a0, 4 @@ -332,9 +332,9 @@ glabel func_80941BC0 /* 093A8 80942078 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 093AC 8094207C 8FB800A0 */ lw $t8, 0x00A0($sp) /* 093B0 80942080 240BFF80 */ addiu $t3, $zero, 0xFF80 ## $t3 = FFFFFF80 -/* 093B4 80942084 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 093B4 80942084 3C040602 */ lui $a0, %hi(D_0601A790) ## $a0 = 06020000 /* 093B8 80942088 C70801A8 */ lwc1 $f8, 0x01A8($t8) ## 000001A8 -/* 093BC 8094208C 2484A790 */ addiu $a0, $a0, 0xA790 ## $a0 = 0601A790 +/* 093BC 8094208C 2484A790 */ addiu $a0, $a0, %lo(D_0601A790) ## $a0 = 0601A790 /* 093C0 80942090 4600410D */ trunc.w.s $f4, $f8 /* 093C4 80942094 440D2000 */ mfc1 $t5, $f4 /* 093C8 80942098 00000000 */ nop 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 a27a4f4f18..23c51b2573 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 @@ -113,8 +113,8 @@ glabel func_80942180 /* 09604 809422D4 3C0EE700 */ lui $t6, 0xE700 ## $t6 = E7000000 /* 09608 809422D8 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 /* 0960C 809422DC C5E401B0 */ lwc1 $f4, 0x01B0($t7) ## 000001B0 -/* 09610 809422E0 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 09614 809422E4 24849D40 */ addiu $a0, $a0, 0x9D40 ## $a0 = 06019D40 +/* 09610 809422E0 3C040602 */ lui $a0, %hi(D_06019D40) ## $a0 = 06020000 +/* 09614 809422E4 24849D40 */ addiu $a0, $a0, %lo(D_06019D40) ## $a0 = 06019D40 /* 09618 809422E8 4600218D */ trunc.w.s $f6, $f4 /* 0961C 809422EC 440A3000 */ mfc1 $t2, $f6 /* 09620 809422F0 00000000 */ nop @@ -215,9 +215,9 @@ glabel func_80942180 /* 0979C 8094246C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 097A0 80942470 8FB800A8 */ lw $t8, 0x00A8($sp) /* 097A4 80942474 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 -/* 097A8 80942478 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 097A8 80942478 3C040602 */ lui $a0, %hi(D_06018FC0) ## $a0 = 06020000 /* 097AC 8094247C C70801AC */ lwc1 $f8, 0x01AC($t8) ## 000001AC -/* 097B0 80942480 24848FC0 */ addiu $a0, $a0, 0x8FC0 ## $a0 = 06018FC0 +/* 097B0 80942480 24848FC0 */ addiu $a0, $a0, %lo(D_06018FC0) ## $a0 = 06018FC0 /* 097B4 80942484 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 097B8 80942488 4600428D */ trunc.w.s $f10, $f8 /* 097BC 8094248C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -339,8 +339,8 @@ glabel func_80942180 /* 0998C 8094265C 0C0346A2 */ jal Matrix_NewMtx /* 09990 80942660 AFA2004C */ sw $v0, 0x004C($sp) /* 09994 80942664 8FA3004C */ lw $v1, 0x004C($sp) -/* 09998 80942668 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 0999C 8094266C 24849938 */ addiu $a0, $a0, 0x9938 ## $a0 = 06019938 +/* 09998 80942668 3C040602 */ lui $a0, %hi(D_06019938) ## $a0 = 06020000 +/* 0999C 8094266C 24849938 */ addiu $a0, $a0, %lo(D_06019938) ## $a0 = 06019938 /* 099A0 80942670 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 099A4 80942674 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 099A8 80942678 00047100 */ sll $t6, $a0, 4 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 a1dacc54de..14507e0a89 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 @@ -110,8 +110,8 @@ glabel func_809426F0 /* 09B6C 8094283C 15A00021 */ bne $t5, $zero, .L809428C4 /* 09B70 80942840 3C10FA00 */ lui $s0, 0xFA00 ## $s0 = FA000000 /* 09B74 80942844 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 09B78 80942848 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 09B7C 8094284C 2484CEE0 */ addiu $a0, $a0, 0xCEE0 ## $a0 = 0601CEE0 +/* 09B78 80942848 3C040602 */ lui $a0, %hi(D_0601CEE0) ## $a0 = 06020000 +/* 09B7C 8094284C 2484CEE0 */ addiu $a0, $a0, %lo(D_0601CEE0) ## $a0 = 0601CEE0 /* 09B80 80942850 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 09B84 80942854 AE4E02D0 */ sw $t6, 0x02D0($s2) ## 000002D0 /* 09B88 80942858 AC500000 */ sw $s0, 0x0000($v0) ## 00000000 @@ -149,8 +149,8 @@ glabel func_809426F0 /* 09C04 809428D4 AE4B02D0 */ sw $t3, 0x02D0($s2) ## 000002D0 /* 09C08 809428D8 AC500000 */ sw $s0, 0x0000($v0) ## 00000000 /* 09C0C 809428DC C67004D8 */ lwc1 $f16, 0x04D8($s3) ## 000004D8 -/* 09C10 809428E0 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 09C14 809428E4 2484DBE8 */ addiu $a0, $a0, 0xDBE8 ## $a0 = 0601DBE8 +/* 09C10 809428E0 3C040602 */ lui $a0, %hi(D_0601DBE8) ## $a0 = 06020000 +/* 09C14 809428E4 2484DBE8 */ addiu $a0, $a0, %lo(D_0601DBE8) ## $a0 = 0601DBE8 /* 09C18 809428E8 4600848D */ trunc.w.s $f18, $f16 /* 09C1C 809428EC 00045100 */ sll $t2, $a0, 4 /* 09C20 809428F0 000A5F02 */ srl $t3, $t2, 28 @@ -188,8 +188,8 @@ glabel func_809426F0 /* 09C9C 8094296C AE4902D0 */ sw $t1, 0x02D0($s2) ## 000002D0 /* 09CA0 80942970 AC500000 */ sw $s0, 0x0000($v0) ## 00000000 /* 09CA4 80942974 C66404D4 */ lwc1 $f4, 0x04D4($s3) ## 000004D4 -/* 09CA8 80942978 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 09CAC 8094297C 2484A998 */ addiu $a0, $a0, 0xA998 ## $a0 = 0601A998 +/* 09CA8 80942978 3C040602 */ lui $a0, %hi(D_0601A998) ## $a0 = 06020000 +/* 09CAC 8094297C 2484A998 */ addiu $a0, $a0, %lo(D_0601A998) ## $a0 = 0601A998 /* 09CB0 80942980 4600218D */ trunc.w.s $f6, $f4 /* 09CB4 80942984 00044100 */ sll $t0, $a0, 4 /* 09CB8 80942988 00084F02 */ srl $t1, $t0, 28 @@ -237,8 +237,8 @@ glabel func_809426F0 .L80942A2C: /* 09D5C 80942A2C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 09D60 80942A30 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 09D64 80942A34 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 -/* 09D68 80942A38 2442A430 */ addiu $v0, $v0, 0xA430 ## $v0 = 0601A430 +/* 09D64 80942A34 3C020602 */ lui $v0, %hi(D_0601A430) ## $v0 = 06020000 +/* 09D68 80942A38 2442A430 */ addiu $v0, $v0, %lo(D_0601A430) ## $v0 = 0601A430 /* 09D6C 80942A3C 0281C021 */ addu $t8, $s4, $at /* 09D70 80942A40 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 09D74 80942A44 0002C900 */ sll $t9, $v0, 4 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 a7a7c8af8f..7f52bd33c7 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 @@ -168,8 +168,8 @@ glabel func_80942C70 /* 0A1B8 80942E88 0C0346A2 */ jal Matrix_NewMtx /* 0A1BC 80942E8C AFA20044 */ sw $v0, 0x0044($sp) /* 0A1C0 80942E90 8FA30044 */ lw $v1, 0x0044($sp) -/* 0A1C4 80942E94 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 0A1C8 80942E98 2484DDF0 */ addiu $a0, $a0, 0xDDF0 ## $a0 = 0601DDF0 +/* 0A1C4 80942E94 3C040602 */ lui $a0, %hi(D_0601DDF0) ## $a0 = 06020000 +/* 0A1C8 80942E98 2484DDF0 */ addiu $a0, $a0, %lo(D_0601DDF0) ## $a0 = 0601DDF0 /* 0A1CC 80942E9C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0A1D0 80942EA0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0A1D4 80942EA4 00046900 */ sll $t5, $a0, 4 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 d335ec10d4..50252f60aa 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 @@ -66,8 +66,8 @@ glabel func_80943028 /* 0A410 809430E0 0C0346A2 */ jal Matrix_NewMtx /* 0A414 809430E4 AFA20038 */ sw $v0, 0x0038($sp) /* 0A418 809430E8 8FA30038 */ lw $v1, 0x0038($sp) -/* 0A41C 809430EC 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 0A420 809430F0 2484F608 */ addiu $a0, $a0, 0xF608 ## $a0 = 0601F608 +/* 0A41C 809430EC 3C040602 */ lui $a0, %hi(D_0601F608) ## $a0 = 06020000 +/* 0A420 809430F0 2484F608 */ addiu $a0, $a0, %lo(D_0601F608) ## $a0 = 0601F608 /* 0A424 809430F4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0A428 809430F8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0A42C 809430FC 00046900 */ sll $t5, $a0, 4 @@ -130,8 +130,8 @@ glabel func_80943028 /* 0A510 809431E0 0C0346A2 */ jal Matrix_NewMtx /* 0A514 809431E4 AFA2002C */ sw $v0, 0x002C($sp) /* 0A518 809431E8 8FA3002C */ lw $v1, 0x002C($sp) -/* 0A51C 809431EC 3C040405 */ lui $a0, 0x0405 ## $a0 = 04050000 -/* 0A520 809431F0 24849210 */ addiu $a0, $a0, 0x9210 ## $a0 = 04049210 +/* 0A51C 809431EC 3C040405 */ lui $a0, %hi(D_04049210) ## $a0 = 04050000 +/* 0A520 809431F0 24849210 */ addiu $a0, $a0, %lo(D_04049210) ## $a0 = 04049210 /* 0A524 809431F4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0A528 809431F8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0A52C 809431FC 00044900 */ sll $t1, $a0, 4 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 d46811b1cd..83c7629071 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 @@ -282,8 +282,8 @@ glabel L80943CA8 /* 0B028 80943CF8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 glabel L80943CFC /* 0B02C 80943CFC 8FAC008C */ lw $t4, 0x008C($sp) -/* 0B030 80943D00 3C0F0603 */ lui $t7, 0x0603 ## $t7 = 06030000 -/* 0B034 80943D04 25EFD940 */ addiu $t7, $t7, 0xD940 ## $t7 = 0602D940 +/* 0B030 80943D00 3C0F0603 */ lui $t7, %hi(D_0602D940) ## $t7 = 06030000 +/* 0B034 80943D04 25EFD940 */ addiu $t7, $t7, %lo(D_0602D940) ## $t7 = 0602D940 /* 0B038 80943D08 918E05F8 */ lbu $t6, 0x05F8($t4) ## 000005F8 /* 0B03C 80943D0C 51C0000B */ beql $t6, $zero, .L80943D3C /* 0B040 80943D10 8FAB008C */ lw $t3, 0x008C($sp) @@ -291,8 +291,8 @@ glabel L80943CFC /* 0B048 80943D18 AD4F0000 */ sw $t7, 0x0000($t2) ## 00000000 glabel L80943D1C /* 0B04C 80943D1C 8FB9008C */ lw $t9, 0x008C($sp) -/* 0B050 80943D20 3C0D0603 */ lui $t5, 0x0603 ## $t5 = 06030000 -/* 0B054 80943D24 25ADD890 */ addiu $t5, $t5, 0xD890 ## $t5 = 0602D890 +/* 0B050 80943D20 3C0D0603 */ lui $t5, %hi(D_0602D890) ## $t5 = 06030000 +/* 0B054 80943D24 25ADD890 */ addiu $t5, $t5, %lo(D_0602D890) ## $t5 = 0602D890 /* 0B058 80943D28 933805F8 */ lbu $t8, 0x05F8($t9) ## 000005F8 /* 0B05C 80943D2C 53000003 */ beql $t8, $zero, .L80943D3C /* 0B060 80943D30 8FAB008C */ lw $t3, 0x008C($sp) 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 d763c8dff1..794a645685 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 @@ -202,8 +202,8 @@ glabel func_80943F08 /* 0B4C0 80944190 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 0B4C4 80944194 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 0B4C8 80944198 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0B4CC 8094419C 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 0B4D0 809441A0 2484E0E0 */ addiu $a0, $a0, 0xE0E0 ## $a0 = 0601E0E0 +/* 0B4CC 8094419C 3C040602 */ lui $a0, %hi(D_0601E0E0) ## $a0 = 06020000 +/* 0B4D0 809441A0 2484E0E0 */ addiu $a0, $a0, %lo(D_0601E0E0) ## $a0 = 0601E0E0 /* 0B4D4 809441A4 0004C100 */ sll $t8, $a0, 4 /* 0B4D8 809441A8 0018CF02 */ srl $t9, $t8, 28 /* 0B4DC 809441AC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 @@ -259,8 +259,8 @@ glabel func_80943F08 /* 0B5A4 80944274 3C018095 */ lui $at, %hi(D_8094C854) ## $at = 80950000 /* 0B5A8 80944278 AD220004 */ sw $v0, 0x0004($t1) ## 00000004 /* 0B5AC 8094427C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0B5B0 80944280 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 0B5B4 80944284 2484E020 */ addiu $a0, $a0, 0xE020 ## $a0 = 0601E020 +/* 0B5B0 80944280 3C040602 */ lui $a0, %hi(D_0601E020) ## $a0 = 06020000 +/* 0B5B4 80944284 2484E020 */ addiu $a0, $a0, %lo(D_0601E020) ## $a0 = 0601E020 /* 0B5B8 80944288 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 0B5BC 8094428C AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 0B5C0 80944290 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 @@ -300,8 +300,8 @@ glabel func_80943F08 /* 0B644 80944314 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 0B648 80944318 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 0B64C 8094431C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0B650 80944320 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 0B654 80944324 2484E3A0 */ addiu $a0, $a0, 0xE3A0 ## $a0 = 0601E3A0 +/* 0B650 80944320 3C040602 */ lui $a0, %hi(D_0601E3A0) ## $a0 = 06020000 +/* 0B654 80944324 2484E3A0 */ addiu $a0, $a0, %lo(D_0601E3A0) ## $a0 = 0601E3A0 /* 0B658 80944328 00045900 */ sll $t3, $a0, 4 /* 0B65C 8094432C 000B6702 */ srl $t4, $t3, 28 /* 0B660 80944330 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 @@ -358,8 +358,8 @@ glabel func_80943F08 /* 0B72C 809443FC 3C018095 */ lui $at, %hi(D_8094C854) ## $at = 80950000 /* 0B730 80944400 AD220004 */ sw $v0, 0x0004($t1) ## 00000004 /* 0B734 80944404 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0B738 80944408 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 0B73C 8094440C 2484E2C0 */ addiu $a0, $a0, 0xE2C0 ## $a0 = 0601E2C0 +/* 0B738 80944408 3C040602 */ lui $a0, %hi(D_0601E2C0) ## $a0 = 06020000 +/* 0B73C 8094440C 2484E2C0 */ addiu $a0, $a0, %lo(D_0601E2C0) ## $a0 = 0601E2C0 /* 0B740 80944410 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 0B744 80944414 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 0B748 80944418 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 @@ -573,8 +573,8 @@ glabel func_80943F08 /* 0BA54 80944724 0C0253D0 */ jal Gfx_TwoTexScroll /* 0BA58 80944728 AFA20048 */ sw $v0, 0x0048($sp) /* 0BA5C 8094472C 8FA30048 */ lw $v1, 0x0048($sp) -/* 0BA60 80944730 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 0BA64 80944734 2484E9F0 */ addiu $a0, $a0, 0xE9F0 ## $a0 = 0601E9F0 +/* 0BA60 80944730 3C040602 */ lui $a0, %hi(D_0601E9F0) ## $a0 = 06020000 +/* 0BA64 80944734 2484E9F0 */ addiu $a0, $a0, %lo(D_0601E9F0) ## $a0 = 0601E9F0 /* 0BA68 80944738 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0BA6C 8094473C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0BA70 80944740 00045900 */ sll $t3, $a0, 4 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 92f919ded1..9b37695c2c 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 @@ -118,8 +118,8 @@ glabel func_809447BC /* 0BC38 80944908 0C0346A2 */ jal Matrix_NewMtx /* 0BC3C 8094490C AFA20074 */ sw $v0, 0x0074($sp) /* 0BC40 80944910 8FA30074 */ lw $v1, 0x0074($sp) -/* 0BC44 80944914 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 0BC48 80944918 2484EC68 */ addiu $a0, $a0, 0xEC68 ## $a0 = 0601EC68 +/* 0BC44 80944914 3C040602 */ lui $a0, %hi(D_0601EC68) ## $a0 = 06020000 +/* 0BC48 80944918 2484EC68 */ addiu $a0, $a0, %lo(D_0601EC68) ## $a0 = 0601EC68 /* 0BC4C 8094491C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0BC50 80944920 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0BC54 80944924 00046100 */ sll $t4, $a0, 4 @@ -181,8 +181,8 @@ glabel func_809447BC /* 0BD34 80944A04 0C0346A2 */ jal Matrix_NewMtx /* 0BD38 80944A08 AFA20068 */ sw $v0, 0x0068($sp) /* 0BD3C 80944A0C 8FA30068 */ lw $v1, 0x0068($sp) -/* 0BD40 80944A10 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 0BD44 80944A14 2484CEE0 */ addiu $a0, $a0, 0xCEE0 ## $a0 = 0601CEE0 +/* 0BD40 80944A10 3C040602 */ lui $a0, %hi(D_0601CEE0) ## $a0 = 06020000 +/* 0BD44 80944A14 2484CEE0 */ addiu $a0, $a0, %lo(D_0601CEE0) ## $a0 = 0601CEE0 /* 0BD48 80944A18 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0BD4C 80944A1C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0BD50 80944A20 00047900 */ sll $t7, $a0, 4 @@ -291,8 +291,8 @@ glabel func_809447BC /* 0BEEC 80944BBC 0C0346A2 */ jal Matrix_NewMtx /* 0BEF0 80944BC0 AFA20050 */ sw $v0, 0x0050($sp) /* 0BEF4 80944BC4 8FA30050 */ lw $v1, 0x0050($sp) -/* 0BEF8 80944BC8 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 0BEFC 80944BCC 2484DBE8 */ addiu $a0, $a0, 0xDBE8 ## $a0 = 0601DBE8 +/* 0BEF8 80944BC8 3C040602 */ lui $a0, %hi(D_0601DBE8) ## $a0 = 06020000 +/* 0BEFC 80944BCC 2484DBE8 */ addiu $a0, $a0, %lo(D_0601DBE8) ## $a0 = 0601DBE8 /* 0BF00 80944BD0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0BF04 80944BD4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0BF08 80944BD8 00045100 */ sll $t2, $a0, 4 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 cb36a7dd7a..c523bac8d9 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 @@ -77,8 +77,8 @@ glabel func_80944C50 /* 0C034 80944D04 0C0346A2 */ jal Matrix_NewMtx /* 0C038 80944D08 AFA20068 */ sw $v0, 0x0068($sp) /* 0C03C 80944D0C 8FA30068 */ lw $v1, 0x0068($sp) -/* 0C040 80944D10 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 0C044 80944D14 2484F390 */ addiu $a0, $a0, 0xF390 ## $a0 = 0601F390 +/* 0C040 80944D10 3C040602 */ lui $a0, %hi(D_0601F390) ## $a0 = 06020000 +/* 0C044 80944D14 2484F390 */ addiu $a0, $a0, %lo(D_0601F390) ## $a0 = 0601F390 /* 0C048 80944D18 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0C04C 80944D1C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0C050 80944D20 00046100 */ sll $t4, $a0, 4 @@ -166,8 +166,8 @@ glabel func_80944C50 /* 0C194 80944E64 0C0346A2 */ jal Matrix_NewMtx /* 0C198 80944E68 AFA20058 */ sw $v0, 0x0058($sp) /* 0C19C 80944E6C 8FA30058 */ lw $v1, 0x0058($sp) -/* 0C1A0 80944E70 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 0C1A4 80944E74 2484F238 */ addiu $a0, $a0, 0xF238 ## $a0 = 0601F238 +/* 0C1A0 80944E70 3C040602 */ lui $a0, %hi(D_0601F238) ## $a0 = 06020000 +/* 0C1A4 80944E74 2484F238 */ addiu $a0, $a0, %lo(D_0601F238) ## $a0 = 0601F238 /* 0C1A8 80944E78 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0C1AC 80944E7C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0C1B0 80944E80 0004C100 */ sll $t8, $a0, 4 @@ -266,8 +266,8 @@ glabel func_80944C50 /* 0C320 80944FF0 0C0346A2 */ jal Matrix_NewMtx /* 0C324 80944FF4 AFA20048 */ sw $v0, 0x0048($sp) /* 0C328 80944FF8 8FA30048 */ lw $v1, 0x0048($sp) -/* 0C32C 80944FFC 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 0C330 80945000 2484EEB0 */ addiu $a0, $a0, 0xEEB0 ## $a0 = 0601EEB0 +/* 0C32C 80944FFC 3C040602 */ lui $a0, %hi(D_0601EEB0) ## $a0 = 06020000 +/* 0C330 80945000 2484EEB0 */ addiu $a0, $a0, %lo(D_0601EEB0) ## $a0 = 0601EEB0 /* 0C334 80945004 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0C338 80945008 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0C33C 8094500C 00045900 */ sll $t3, $a0, 4 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 eb12aaf40e..c3fdd3bf76 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 @@ -89,8 +89,8 @@ glabel func_80946C7C /* 0E0A4 80946D74 AE4C02D0 */ sw $t4, 0x02D0($s2) ## 000002D0 /* 0E0A8 80946D78 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 0E0AC 80946D7C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 0E0B0 80946D80 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 -/* 0E0B4 80946D84 2442A430 */ addiu $v0, $v0, 0xA430 ## $v0 = 0601A430 +/* 0E0B0 80946D80 3C020602 */ lui $v0, %hi(D_0601A430) ## $v0 = 06020000 +/* 0E0B4 80946D84 2442A430 */ addiu $v0, $v0, %lo(D_0601A430) ## $v0 = 0601A430 /* 0E0B8 80946D88 00415024 */ and $t2, $v0, $at /* 0E0BC 80946D8C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0E0C0 80946D90 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 @@ -221,8 +221,8 @@ glabel func_80946C7C /* 0E2AC 80946F7C AE4E02D0 */ sw $t6, 0x02D0($s2) ## 000002D0 /* 0E2B0 80946F80 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 0E2B4 80946F84 C66A01AC */ lwc1 $f10, 0x01AC($s3) ## 000001AC -/* 0E2B8 80946F88 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 0E2BC 80946F8C 2484A998 */ addiu $a0, $a0, 0xA998 ## $a0 = 0601A998 +/* 0E2B8 80946F88 3C040602 */ lui $a0, %hi(D_0601A998) ## $a0 = 06020000 +/* 0E2BC 80946F8C 2484A998 */ addiu $a0, $a0, %lo(D_0601A998) ## $a0 = 0601A998 /* 0E2C0 80946F90 4600540D */ trunc.w.s $f16, $f10 /* 0E2C4 80946F94 00047100 */ sll $t6, $a0, 4 /* 0E2C8 80946F98 000E7F02 */ srl $t7, $t6, 28 @@ -246,10 +246,10 @@ glabel func_80946C7C /* 0E310 80946FE0 03284821 */ addu $t1, $t9, $t0 /* 0E314 80946FE4 01215021 */ addu $t2, $t1, $at /* 0E318 80946FE8 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 0E31C 80946FEC 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 +/* 0E31C 80946FEC 3C020602 */ lui $v0, %hi(D_0601AB00) ## $v0 = 06020000 /* 0E320 80946FF0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0E324 80946FF4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0E328 80946FF8 2442AB00 */ addiu $v0, $v0, 0xAB00 ## $v0 = 0601AB00 +/* 0E328 80946FF8 2442AB00 */ addiu $v0, $v0, %lo(D_0601AB00) ## $v0 = 0601AB00 /* 0E32C 80946FFC 0041C024 */ and $t8, $v0, $at /* 0E330 80947000 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0E334 80947004 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 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 43b7dad784..c7d9486395 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 @@ -78,8 +78,8 @@ glabel func_80947240 /* 0E640 80947310 AE4D02D0 */ sw $t5, 0x02D0($s2) ## 000002D0 /* 0E644 80947314 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 0E648 80947318 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 0E64C 8094731C 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 -/* 0E650 80947320 2442A430 */ addiu $v0, $v0, 0xA430 ## $v0 = 0601A430 +/* 0E64C 8094731C 3C020602 */ lui $v0, %hi(D_0601A430) ## $v0 = 06020000 +/* 0E650 80947320 2442A430 */ addiu $v0, $v0, %lo(D_0601A430) ## $v0 = 0601A430 /* 0E654 80947324 00415824 */ and $t3, $v0, $at /* 0E658 80947328 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0E65C 8094732C 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 @@ -236,10 +236,10 @@ glabel func_80947240 /* 0E8B0 80947580 01095021 */ addu $t2, $t0, $t1 /* 0E8B4 80947584 01415821 */ addu $t3, $t2, $at /* 0E8B8 80947588 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 0E8BC 8094758C 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 +/* 0E8BC 8094758C 3C020602 */ lui $v0, %hi(D_0601AB00) ## $v0 = 06020000 /* 0E8C0 80947590 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0E8C4 80947594 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0E8C8 80947598 2442AB00 */ addiu $v0, $v0, 0xAB00 ## $v0 = 0601AB00 +/* 0E8C8 80947598 2442AB00 */ addiu $v0, $v0, %lo(D_0601AB00) ## $v0 = 0601AB00 /* 0E8CC 8094759C 0041C824 */ and $t9, $v0, $at /* 0E8D0 809475A0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0E8D4 809475A4 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 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 4ff70d6630..a72bad7a3e 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 @@ -89,13 +89,13 @@ glabel func_80948668 /* 0FA4C 8094871C 8FB40190 */ lw $s4, 0x0190($sp) /* 0FA50 80948720 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0FA54 80948724 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 0FA58 80948728 3C110602 */ lui $s1, 0x0602 ## $s1 = 06020000 -/* 0FA5C 8094872C 2631A5A8 */ addiu $s1, $s1, 0xA5A8 ## $s1 = 0601A5A8 +/* 0FA58 80948728 3C110602 */ lui $s1, %hi(D_0601A5A8) ## $s1 = 06020000 +/* 0FA5C 8094872C 2631A5A8 */ addiu $s1, $s1, %lo(D_0601A5A8) ## $s1 = 0601A5A8 /* 0FA60 80948730 14A0000B */ bne $a1, $zero, .L80948760 /* 0FA64 80948734 0281A021 */ addu $s4, $s4, $at /* 0FA68 80948738 8E6302D0 */ lw $v1, 0x02D0($s3) ## 000002D0 -/* 0FA6C 8094873C 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 0FA70 80948740 2484A528 */ addiu $a0, $a0, 0xA528 ## $a0 = 0601A528 +/* 0FA6C 8094873C 3C040602 */ lui $a0, %hi(D_0601A528) ## $a0 = 06020000 +/* 0FA70 80948740 2484A528 */ addiu $a0, $a0, %lo(D_0601A528) ## $a0 = 0601A528 /* 0FA74 80948744 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 /* 0FA78 80948748 AE7902D0 */ sw $t9, 0x02D0($s3) ## 000002D0 /* 0FA7C 8094874C 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 @@ -170,10 +170,10 @@ glabel func_80948668 /* 0FB84 80948854 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 0FB88 80948858 8FB40190 */ lw $s4, 0x0190($sp) /* 0FB8C 8094885C 15810072 */ bne $t4, $at, .L80948A28 -/* 0FB90 80948860 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 +/* 0FB90 80948860 3C020602 */ lui $v0, %hi(D_0601AB00) ## $v0 = 06020000 /* 0FB94 80948864 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0FB98 80948868 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 0FB9C 8094886C 2442AB00 */ addiu $v0, $v0, 0xAB00 ## $v0 = 0601AB00 +/* 0FB9C 8094886C 2442AB00 */ addiu $v0, $v0, %lo(D_0601AB00) ## $v0 = 0601AB00 /* 0FBA0 80948870 00027900 */ sll $t7, $v0, 4 /* 0FBA4 80948874 0281A021 */ addu $s4, $s4, $at /* 0FBA8 80948878 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 @@ -186,8 +186,8 @@ glabel func_80948668 /* 0FBC4 80948894 14E00016 */ bne $a3, $zero, .L809488F0 /* 0FBC8 80948898 030EB021 */ addu $s6, $t8, $t6 /* 0FBCC 8094889C 8E6302D0 */ lw $v1, 0x02D0($s3) ## 000002D0 -/* 0FBD0 809488A0 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 -/* 0FBD4 809488A4 2442A998 */ addiu $v0, $v0, 0xA998 ## $v0 = 0601A998 +/* 0FBD0 809488A0 3C020602 */ lui $v0, %hi(D_0601A998) ## $v0 = 06020000 +/* 0FBD4 809488A4 2442A998 */ addiu $v0, $v0, %lo(D_0601A998) ## $v0 = 0601A998 /* 0FBD8 809488A8 0002C900 */ sll $t9, $v0, 4 /* 0FBDC 809488AC 00195702 */ srl $t2, $t9, 28 /* 0FBE0 809488B0 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 @@ -304,8 +304,8 @@ glabel func_80948668 /* 0FD90 80948A60 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 /* 0FD94 80948A64 16CB006B */ bne $s6, $t3, .L80948C14 /* 0FD98 80948A68 8FB40190 */ lw $s4, 0x0190($sp) -/* 0FD9C 80948A6C 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 -/* 0FDA0 80948A70 2442A430 */ addiu $v0, $v0, 0xA430 ## $v0 = 0601A430 +/* 0FD9C 80948A6C 3C020602 */ lui $v0, %hi(D_0601A430) ## $v0 = 06020000 +/* 0FDA0 80948A70 2442A430 */ addiu $v0, $v0, %lo(D_0601A430) ## $v0 = 0601A430 /* 0FDA4 80948A74 93AD018F */ lbu $t5, 0x018F($sp) /* 0FDA8 80948A78 00027100 */ sll $t6, $v0, 4 /* 0FDAC 80948A7C 0281A021 */ addu $s4, $s4, $at @@ -436,8 +436,8 @@ glabel func_80948668 /* 0FF94 80948C64 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 /* 0FF98 80948C68 16D800A7 */ bne $s6, $t8, .L80948F08 /* 0FF9C 80948C6C 8FB40190 */ lw $s4, 0x0190($sp) -/* 0FFA0 80948C70 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 -/* 0FFA4 80948C74 2442A790 */ addiu $v0, $v0, 0xA790 ## $v0 = 0601A790 +/* 0FFA0 80948C70 3C020602 */ lui $v0, %hi(D_0601A790) ## $v0 = 06020000 +/* 0FFA4 80948C74 2442A790 */ addiu $v0, $v0, %lo(D_0601A790) ## $v0 = 0601A790 /* 0FFA8 80948C78 0002C900 */ sll $t9, $v0, 4 /* 0FFAC 80948C7C 0281A021 */ addu $s4, $s4, $at /* 0FFB0 80948C80 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 @@ -634,8 +634,8 @@ glabel func_80948668 /* 10290 80948F60 1540003E */ bne $t2, $zero, .L8094905C /* 10294 80948F64 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 /* 10298 80948F68 8E6302D0 */ lw $v1, 0x02D0($s3) ## 000002D0 -/* 1029C 80948F6C 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 -/* 102A0 80948F70 2442AA50 */ addiu $v0, $v0, 0xAA50 ## $v0 = 0601AA50 +/* 1029C 80948F6C 3C020602 */ lui $v0, %hi(D_0601AA50) ## $v0 = 06020000 +/* 102A0 80948F70 2442AA50 */ addiu $v0, $v0, %lo(D_0601AA50) ## $v0 = 0601AA50 /* 102A4 80948F74 00025900 */ sll $t3, $v0, 4 /* 102A8 80948F78 000B7702 */ srl $t6, $t3, 28 /* 102AC 80948F7C 3C0C8016 */ lui $t4, %hi(gSegments) @@ -696,10 +696,10 @@ glabel func_80948668 /* 10388 80949058 2406263A */ addiu $a2, $zero, 0x263A ## $a2 = 0000263A .L8094905C: /* 1038C 8094905C 8EB10044 */ lw $s1, 0x0044($s5) ## 00010164 -/* 10390 80949060 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 +/* 10390 80949060 3C020602 */ lui $v0, %hi(D_0601AB00) ## $v0 = 06020000 /* 10394 80949064 24140014 */ addiu $s4, $zero, 0x0014 ## $s4 = 00000014 /* 10398 80949068 16200003 */ bne $s1, $zero, .L80949078 -/* 1039C 8094906C 2442AB00 */ addiu $v0, $v0, 0xAB00 ## $v0 = 0601AB00 +/* 1039C 8094906C 2442AB00 */ addiu $v0, $v0, %lo(D_0601AB00) ## $v0 = 0601AB00 /* 103A0 80949070 10000001 */ beq $zero, $zero, .L80949078 /* 103A4 80949074 24140046 */ addiu $s4, $zero, 0x0046 ## $s4 = 00000046 .L80949078: @@ -824,14 +824,14 @@ glabel func_80948668 /* 10568 80949238 0281A021 */ addu $s4, $s4, $at /* 1056C 8094923C 8E6302D0 */ lw $v1, 0x02D0($s3) ## 000002D0 /* 10570 80949240 3C0AFA00 */ lui $t2, 0xFA00 ## $t2 = FA000000 -/* 10574 80949244 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 +/* 10574 80949244 3C020602 */ lui $v0, %hi(D_0601A998) ## $v0 = 06020000 /* 10578 80949248 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 /* 1057C 8094924C AE7902D0 */ sw $t9, 0x02D0($s3) ## 000002D0 /* 10580 80949250 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 10584 80949254 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 10588 80949258 86AB002C */ lh $t3, 0x002C($s5) ## 00010194 /* 1058C 8094925C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 10590 80949260 2442A998 */ addiu $v0, $v0, 0xA998 ## $v0 = 0601A998 +/* 10590 80949260 2442A998 */ addiu $v0, $v0, %lo(D_0601A998) ## $v0 = 0601A998 /* 10594 80949264 00412824 */ and $a1, $v0, $at /* 10598 80949268 3C01C3E1 */ lui $at, 0xC3E1 ## $at = C3E10000 /* 1059C 8094926C 3421EB00 */ ori $at, $at, 0xEB00 ## $at = C3E1EB00 @@ -937,13 +937,13 @@ glabel func_80948668 /* 10724 809493F4 AE0B0000 */ sw $t3, 0x0000($s0) ## 00000000 /* 10728 809493F8 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 1072C 809493FC 86AE002E */ lh $t6, 0x002E($s5) ## 00010196 -/* 10730 80949400 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 -/* 10734 80949404 2442A430 */ addiu $v0, $v0, 0xA430 ## $v0 = 0601A430 +/* 10730 80949400 3C020602 */ lui $v0, %hi(D_0601A430) ## $v0 = 06020000 +/* 10734 80949404 2442A430 */ addiu $v0, $v0, %lo(D_0601A430) ## $v0 = 0601A430 /* 10738 80949408 15C00017 */ bne $t6, $zero, .L80949468 /* 1073C 8094940C 00024900 */ sll $t1, $v0, 4 /* 10740 80949410 8E6302D0 */ lw $v1, 0x02D0($s3) ## 000002D0 -/* 10744 80949414 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 -/* 10748 80949418 2442AB00 */ addiu $v0, $v0, 0xAB00 ## $v0 = 0601AB00 +/* 10744 80949414 3C020602 */ lui $v0, %hi(D_0601AB00) ## $v0 = 06020000 +/* 10748 80949418 2442AB00 */ addiu $v0, $v0, %lo(D_0601AB00) ## $v0 = 0601AB00 /* 1074C 8094941C 00024900 */ sll $t1, $v0, 4 /* 10750 80949420 00096702 */ srl $t4, $t1, 28 /* 10754 80949424 3C0D8016 */ lui $t5, %hi(gSegments) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s index 0a8bc767f3..e5907157b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s @@ -6,8 +6,8 @@ glabel func_80949530 /* 10870 80949540 25CE95A4 */ addiu $t6, $t6, %lo(func_809495A4) ## $t6 = 809495A4 /* 10874 80949544 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 10878 80949548 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 1087C 8094954C 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 -/* 10880 80949550 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 +/* 1087C 8094954C 3C050603 */ lui $a1, %hi(D_06032BF8) ## $a1 = 06030000 +/* 10880 80949550 24A52BF8 */ addiu $a1, $a1, %lo(D_06032BF8) ## $a1 = 06032BF8 /* 10884 80949554 AFA70018 */ sw $a3, 0x0018($sp) /* 10888 80949558 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 1088C 8094955C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809496D0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809496D0.s index b969c60f24..40f729ba9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809496D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809496D0.s @@ -6,16 +6,16 @@ glabel func_809496D0 /* 10A10 809496E0 25CE9734 */ addiu $t6, $t6, %lo(func_80949734) ## $t6 = 80949734 /* 10A14 809496E4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 10A18 809496E8 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 10A1C 809496EC 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 -/* 10A20 809496F0 24A56FBC */ addiu $a1, $a1, 0x6FBC ## $a1 = 06036FBC +/* 10A1C 809496EC 3C050603 */ lui $a1, %hi(D_06036FBC) ## $a1 = 06030000 +/* 10A20 809496F0 24A56FBC */ addiu $a1, $a1, %lo(D_06036FBC) ## $a1 = 06036FBC /* 10A24 809496F4 AFA70018 */ sw $a3, 0x0018($sp) /* 10A28 809496F8 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 10A2C 809496FC 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 10A30 80949700 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 10A34 80949704 3C040603 */ lui $a0, 0x0603 ## $a0 = 06030000 +/* 10A34 80949704 3C040603 */ lui $a0, %hi(D_06036FBC) ## $a0 = 06030000 /* 10A38 80949708 0C028800 */ jal SkelAnime_GetFrameCount -/* 10A3C 8094970C 24846FBC */ addiu $a0, $a0, 0x6FBC ## $a0 = 06036FBC +/* 10A3C 8094970C 24846FBC */ addiu $a0, $a0, %lo(D_06036FBC) ## $a0 = 06036FBC /* 10A40 80949710 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 10A44 80949714 8FA70018 */ lw $a3, 0x0018($sp) /* 10A48 80949718 468021A0 */ cvt.s.w $f6, $f4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949920.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949920.s index da8d0e1477..3f7bd6e649 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949920.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949920.s @@ -7,12 +7,12 @@ glabel func_80949920 /* 10C64 80949934 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 10C68 80949938 3C0F8095 */ lui $t7, %hi(D_8094C85C) ## $t7 = 80950000 /* 10C6C 8094993C 91EFC85C */ lbu $t7, %lo(D_8094C85C)($t7) -/* 10C70 80949940 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 10C70 80949940 3C050602 */ lui $a1, %hi(D_06023750) ## $a1 = 06020000 /* 10C74 80949944 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 10C78 80949948 15E00009 */ bne $t7, $zero, .L80949970 -/* 10C7C 8094994C 24A53750 */ addiu $a1, $a1, 0x3750 ## $a1 = 06023750 -/* 10C80 80949950 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 -/* 10C84 80949954 24A52700 */ addiu $a1, $a1, 0x2700 ## $a1 = 06022700 +/* 10C7C 8094994C 24A53750 */ addiu $a1, $a1, %lo(D_06023750) ## $a1 = 06023750 +/* 10C80 80949950 3C050602 */ lui $a1, %hi(D_06022700) ## $a1 = 06020000 +/* 10C84 80949954 24A52700 */ addiu $a1, $a1, %lo(D_06022700) ## $a1 = 06022700 /* 10C88 80949958 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 10C8C 8094995C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 10C90 80949960 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop @@ -25,10 +25,10 @@ glabel func_80949920 /* 10CA8 80949978 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 10CAC 8094997C AFA70018 */ sw $a3, 0x0018($sp) .L80949980: -/* 10CB0 80949980 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 10CB0 80949980 3C040602 */ lui $a0, %hi(D_06023750) ## $a0 = 06020000 /* 10CB4 80949984 0C028800 */ jal SkelAnime_GetFrameCount -/* 10CB8 80949988 24843750 */ addiu $a0, $a0, 0x3750 ## $a0 = 06023750 +/* 10CB8 80949988 24843750 */ addiu $a0, $a0, %lo(D_06023750) ## $a0 = 06023750 /* 10CBC 8094998C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 10CC0 80949990 8FB80018 */ lw $t8, 0x0018($sp) /* 10CC4 80949994 468021A0 */ cvt.s.w $f6, $f4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s index edc82656bf..5291fec172 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s @@ -6,8 +6,8 @@ glabel func_80949BFC /* 10F3C 80949C0C 25CE9C4C */ addiu $t6, $t6, %lo(func_80949C4C) ## $t6 = 80949C4C /* 10F40 80949C10 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 10F44 80949C14 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 10F48 80949C18 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 -/* 10F4C 80949C1C 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 +/* 10F48 80949C18 3C050603 */ lui $a1, %hi(D_06032BF8) ## $a1 = 06030000 +/* 10F4C 80949C1C 24A52BF8 */ addiu $a1, $a1, %lo(D_06032BF8) ## $a1 = 06032BF8 /* 10F50 80949C20 AFA70018 */ sw $a3, 0x0018($sp) /* 10F54 80949C24 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 10F58 80949C28 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949CE4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949CE4.s index 8143310f03..ef8a104388 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949CE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949CE4.s @@ -12,8 +12,8 @@ glabel func_80949CE4 /* 1103C 80949D0C 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A /* 11040 80949D10 11CF000E */ beq $t6, $t7, .L80949D4C /* 11044 80949D14 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 -/* 11048 80949D18 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 -/* 1104C 80949D1C 24A538F0 */ addiu $a1, $a1, 0x38F0 ## $a1 = 060338F0 +/* 11048 80949D18 3C050603 */ lui $a1, %hi(D_060338F0) ## $a1 = 06030000 +/* 1104C 80949D1C 24A538F0 */ addiu $a1, $a1, %lo(D_060338F0) ## $a1 = 060338F0 /* 11050 80949D20 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 11054 80949D24 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 11058 80949D28 3C06C170 */ lui $a2, 0xC170 ## $a2 = C1700000 @@ -26,17 +26,17 @@ glabel func_80949CE4 /* 11074 80949D44 1000002B */ beq $zero, $zero, .L80949DF4 /* 11078 80949D48 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 .L80949D4C: -/* 1107C 80949D4C 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 1107C 80949D4C 3C050602 */ lui $a1, %hi(D_06024374) ## $a1 = 06020000 /* 11080 80949D50 A608015C */ sh $t0, 0x015C($s0) ## 0000015C /* 11084 80949D54 A609015A */ sh $t1, 0x015A($s0) ## 0000015A -/* 11088 80949D58 24A54374 */ addiu $a1, $a1, 0x4374 ## $a1 = 06024374 +/* 11088 80949D58 24A54374 */ addiu $a1, $a1, %lo(D_06024374) ## $a1 = 06024374 /* 1108C 80949D5C 26040568 */ addiu $a0, $s0, 0x0568 ## $a0 = 00000568 /* 11090 80949D60 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 11094 80949D64 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 11098 80949D68 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 11098 80949D68 3C040602 */ lui $a0, %hi(D_06024374) ## $a0 = 06020000 /* 1109C 80949D6C 0C028800 */ jal SkelAnime_GetFrameCount -/* 110A0 80949D70 24844374 */ addiu $a0, $a0, 0x4374 ## $a0 = 06024374 +/* 110A0 80949D70 24844374 */ addiu $a0, $a0, %lo(D_06024374) ## $a0 = 06024374 /* 110A4 80949D74 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 110A8 80949D78 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 110AC 80949D7C A60A0440 */ sh $t2, 0x0440($s0) ## 00000440 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s index e3282462ca..2f6a436fc8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s @@ -136,20 +136,20 @@ glabel func_80949E10 /* 11318 80949FE8 15200018 */ bne $t1, $zero, .L8094A04C /* 1131C 80949FEC E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 11320 80949FF0 860A017A */ lh $t2, 0x017A($s0) ## 0000017A -/* 11324 80949FF4 3C040603 */ lui $a0, 0x0603 ## $a0 = 06030000 +/* 11324 80949FF4 3C040603 */ lui $a0, %hi(D_060343B4) ## $a0 = 06030000 /* 11328 80949FF8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 1132C 80949FFC 1540001F */ bne $t2, $zero, .L8094A07C -/* 11330 8094A000 248443B4 */ addiu $a0, $a0, 0x43B4 ## $a0 = 060343B4 +/* 11330 8094A000 248443B4 */ addiu $a0, $a0, %lo(D_060343B4) ## $a0 = 060343B4 /* 11334 8094A004 0C028800 */ jal SkelAnime_GetFrameCount /* 11338 8094A008 A60B0440 */ sh $t3, 0x0440($s0) ## 00000440 /* 1133C 8094A00C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 11340 8094A010 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 11344 8094A014 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 +/* 11344 8094A014 3C050603 */ lui $a1, %hi(D_060343B4) ## $a1 = 06030000 /* 11348 8094A018 46805020 */ cvt.s.w $f0, $f10 /* 1134C 8094A01C 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 /* 11350 8094A020 44071000 */ mfc1 $a3, $f2 -/* 11354 8094A024 24A543B4 */ addiu $a1, $a1, 0x43B4 ## $a1 = 060343B4 +/* 11354 8094A024 24A543B4 */ addiu $a1, $a1, %lo(D_060343B4) ## $a1 = 060343B4 /* 11358 8094A028 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 1135C 8094A02C E60001A4 */ swc1 $f0, 0x01A4($s0) ## 000001A4 /* 11360 8094A030 AFAC0014 */ sw $t4, 0x0014($sp) @@ -167,8 +167,8 @@ glabel func_80949E10 /* 11388 8094A058 10400008 */ beq $v0, $zero, .L8094A07C /* 1138C 8094A05C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 11390 8094A060 44818000 */ mtc1 $at, $f16 ## $f16 = 1000.00 -/* 11394 8094A064 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 -/* 11398 8094A068 24A55030 */ addiu $a1, $a1, 0x5030 ## $a1 = 06035030 +/* 11394 8094A064 3C050603 */ lui $a1, %hi(D_06035030) ## $a1 = 06030000 +/* 11398 8094A068 24A55030 */ addiu $a1, $a1, %lo(D_06035030) ## $a1 = 06035030 /* 1139C 8094A06C E61001A4 */ swc1 $f16, 0x01A4($s0) ## 000001A4 /* 113A0 8094A070 8FA40038 */ lw $a0, 0x0038($sp) /* 113A4 8094A074 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A0C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A0C4.s index 326f845fe0..c5de53cbd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A0C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A0C4.s @@ -3,16 +3,16 @@ glabel func_8094A0C4 /* 113F8 8094A0C8 AFA5001C */ sw $a1, 0x001C($sp) /* 113FC 8094A0CC AFBF0014 */ sw $ra, 0x0014($sp) /* 11400 8094A0D0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 11404 8094A0D4 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 -/* 11408 8094A0D8 24A55988 */ addiu $a1, $a1, 0x5988 ## $a1 = 06035988 +/* 11404 8094A0D4 3C050603 */ lui $a1, %hi(D_06035988) ## $a1 = 06030000 +/* 11408 8094A0D8 24A55988 */ addiu $a1, $a1, %lo(D_06035988) ## $a1 = 06035988 /* 1140C 8094A0DC AFA70018 */ sw $a3, 0x0018($sp) /* 11410 8094A0E0 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 11414 8094A0E4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 11418 8094A0E8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 1141C 8094A0EC 3C040603 */ lui $a0, 0x0603 ## $a0 = 06030000 +/* 1141C 8094A0EC 3C040603 */ lui $a0, %hi(D_06035988) ## $a0 = 06030000 /* 11420 8094A0F0 0C028800 */ jal SkelAnime_GetFrameCount -/* 11424 8094A0F4 24845988 */ addiu $a0, $a0, 0x5988 ## $a0 = 06035988 +/* 11424 8094A0F4 24845988 */ addiu $a0, $a0, %lo(D_06035988) ## $a0 = 06035988 /* 11428 8094A0F8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 1142C 8094A0FC 8FA70018 */ lw $a3, 0x0018($sp) /* 11430 8094A100 3C0E8095 */ lui $t6, %hi(func_8094A12C) ## $t6 = 80950000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s index 06c1f6f91d..9e7a46b424 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s @@ -21,8 +21,8 @@ glabel func_8094A12C /* 114A0 8094A170 10400008 */ beq $v0, $zero, .L8094A194 /* 114A4 8094A174 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 114A8 8094A178 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 -/* 114AC 8094A17C 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 -/* 114B0 8094A180 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 +/* 114AC 8094A17C 3C050603 */ lui $a1, %hi(D_06032BF8) ## $a1 = 06030000 +/* 114B0 8094A180 24A52BF8 */ addiu $a1, $a1, %lo(D_06032BF8) ## $a1 = 06032BF8 /* 114B4 8094A184 E60401A4 */ swc1 $f4, 0x01A4($s0) ## 000001A4 /* 114B8 8094A188 8FA40024 */ lw $a0, 0x0024($sp) /* 114BC 8094A18C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s index a8d412ceb7..e99672b112 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s @@ -109,8 +109,8 @@ glabel func_8094A1C0 /* 1166C 8094A33C 0C03F494 */ jal Math_atan2f /* 11670 8094A340 A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 /* 11674 8094A344 461A0182 */ mul.s $f6, $f0, $f26 -/* 11678 8094A348 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 -/* 1167C 8094A34C 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 +/* 11678 8094A348 3C050603 */ lui $a1, %hi(D_06032BF8) ## $a1 = 06030000 +/* 1167C 8094A34C 24A52BF8 */ addiu $a1, $a1, %lo(D_06032BF8) ## $a1 = 06032BF8 /* 11680 8094A350 26040568 */ addiu $a0, $s0, 0x0568 ## $a0 = 00000568 /* 11684 8094A354 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 11688 8094A358 4600320D */ trunc.w.s $f8, $f6 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s index 44c1b4edd6..178be10019 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s @@ -6,8 +6,8 @@ glabel func_8094A608 /* 11948 8094A618 25CEA660 */ addiu $t6, $t6, %lo(func_8094A660) ## $t6 = 8094A660 /* 1194C 8094A61C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 11950 8094A620 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 11954 8094A624 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 -/* 11958 8094A628 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 +/* 11954 8094A624 3C050603 */ lui $a1, %hi(D_06032BF8) ## $a1 = 06030000 +/* 11958 8094A628 24A52BF8 */ addiu $a1, $a1, %lo(D_06032BF8) ## $a1 = 06032BF8 /* 1195C 8094A62C AFA70018 */ sw $a3, 0x0018($sp) /* 11960 8094A630 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 11964 8094A634 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A6D8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A6D8.s index 01433f40b6..dbe2155c4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A6D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A6D8.s @@ -6,16 +6,16 @@ glabel func_8094A6D8 /* 11A18 8094A6E8 25CEA740 */ addiu $t6, $t6, %lo(func_8094A740) ## $t6 = 8094A740 /* 11A1C 8094A6EC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 11A20 8094A6F0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 11A24 8094A6F4 3C050604 */ lui $a1, 0x0604 ## $a1 = 06040000 -/* 11A28 8094A6F8 24A5A2D0 */ addiu $a1, $a1, 0xA2D0 ## $a1 = 0603A2D0 +/* 11A24 8094A6F4 3C050604 */ lui $a1, %hi(D_0603A2D0) ## $a1 = 06040000 +/* 11A28 8094A6F8 24A5A2D0 */ addiu $a1, $a1, %lo(D_0603A2D0) ## $a1 = 0603A2D0 /* 11A2C 8094A6FC AFA70018 */ sw $a3, 0x0018($sp) /* 11A30 8094A700 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 11A34 8094A704 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 11A38 8094A708 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 11A3C 8094A70C 3C040604 */ lui $a0, 0x0604 ## $a0 = 06040000 +/* 11A3C 8094A70C 3C040604 */ lui $a0, %hi(D_0603A2D0) ## $a0 = 06040000 /* 11A40 8094A710 0C028800 */ jal SkelAnime_GetFrameCount -/* 11A44 8094A714 2484A2D0 */ addiu $a0, $a0, 0xA2D0 ## $a0 = 0603A2D0 +/* 11A44 8094A714 2484A2D0 */ addiu $a0, $a0, %lo(D_0603A2D0) ## $a0 = 0603A2D0 /* 11A48 8094A718 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 11A4C 8094A71C 8FA70018 */ lw $a3, 0x0018($sp) /* 11A50 8094A720 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 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 f67cb22a0b..351cadafa5 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 @@ -74,10 +74,10 @@ glabel BossVa_Init /* 00BFC 8094FEBC 03200008 */ jr $t9 /* 00C00 8094FEC0 00000000 */ nop glabel L8094FEC4 -/* 00C04 8094FEC4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 00C08 8094FEC8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00C0C 8094FECC 24E75184 */ addiu $a3, $a3, 0x5184 ## $a3 = 06005184 -/* 00C10 8094FED0 24C65B18 */ addiu $a2, $a2, 0x5B18 ## $a2 = 06015B18 +/* 00C04 8094FEC4 3C060601 */ lui $a2, %hi(D_06015B18) ## $a2 = 06010000 +/* 00C08 8094FEC8 3C070600 */ lui $a3, %hi(D_06005184) ## $a3 = 06000000 +/* 00C0C 8094FECC 24E75184 */ addiu $a3, $a3, %lo(D_06005184) ## $a3 = 06005184 +/* 00C10 8094FED0 24C65B18 */ addiu $a2, $a2, %lo(D_06015B18) ## $a2 = 06015B18 /* 00C14 8094FED4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00C18 8094FED8 2665014C */ addiu $a1, $s3, 0x014C ## $a1 = 0000014C /* 00C1C 8094FEDC AFA00010 */ sw $zero, 0x0010($sp) @@ -91,10 +91,10 @@ glabel L8094FEC4 /* 00C38 8094FEF8 10000037 */ beq $zero, $zero, .L8094FFD8 /* 00C3C 8094FEFC AE6A0004 */ sw $t2, 0x0004($s3) ## 00000004 glabel L8094FF00 -/* 00C40 8094FF00 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 00C44 8094FF04 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 -/* 00C48 8094FF08 24E766A8 */ addiu $a3, $a3, 0x66A8 ## $a3 = 060166A8 -/* 00C4C 8094FF0C 24C67498 */ addiu $a2, $a2, 0x7498 ## $a2 = 06017498 +/* 00C40 8094FF00 3C060601 */ lui $a2, %hi(D_06017498) ## $a2 = 06010000 +/* 00C44 8094FF04 3C070601 */ lui $a3, %hi(D_060166A8) ## $a3 = 06010000 +/* 00C48 8094FF08 24E766A8 */ addiu $a3, $a3, %lo(D_060166A8) ## $a3 = 060166A8 +/* 00C4C 8094FF0C 24C67498 */ addiu $a2, $a2, %lo(D_06017498) ## $a2 = 06017498 /* 00C50 8094FF10 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00C54 8094FF14 2665014C */ addiu $a1, $s3, 0x014C ## $a1 = 0000014C /* 00C58 8094FF18 AFA00010 */ sw $zero, 0x0010($sp) @@ -104,10 +104,10 @@ glabel L8094FF00 /* 00C68 8094FF28 1000002C */ beq $zero, $zero, .L8094FFDC /* 00C6C 8094FF2C 8E6E0024 */ lw $t6, 0x0024($s3) ## 00000024 glabel L8094FF30 -/* 00C70 8094FF30 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 -/* 00C74 8094FF34 3C070602 */ lui $a3, 0x0602 ## $a3 = 06020000 -/* 00C78 8094FF38 24E78D18 */ addiu $a3, $a3, 0x8D18 ## $a3 = 06018D18 -/* 00C7C 8094FF3C 24C699A0 */ addiu $a2, $a2, 0x99A0 ## $a2 = 060199A0 +/* 00C70 8094FF30 3C060602 */ lui $a2, %hi(D_060199A0) ## $a2 = 06020000 +/* 00C74 8094FF34 3C070602 */ lui $a3, %hi(D_06018D18) ## $a3 = 06020000 +/* 00C78 8094FF38 24E78D18 */ addiu $a3, $a3, %lo(D_06018D18) ## $a3 = 06018D18 +/* 00C7C 8094FF3C 24C699A0 */ addiu $a2, $a2, %lo(D_060199A0) ## $a2 = 060199A0 /* 00C80 8094FF40 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00C84 8094FF44 2665014C */ addiu $a1, $s3, 0x014C ## $a1 = 0000014C /* 00C88 8094FF48 AFA00010 */ sw $zero, 0x0010($sp) @@ -117,10 +117,10 @@ glabel L8094FF30 /* 00C98 8094FF58 10000020 */ beq $zero, $zero, .L8094FFDC /* 00C9C 8094FF5C 8E6E0024 */ lw $t6, 0x0024($s3) ## 00000024 glabel L8094FF60 -/* 00CA0 8094FF60 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 -/* 00CA4 8094FF64 3C070602 */ lui $a3, 0x0602 ## $a3 = 06020000 -/* 00CA8 8094FF68 24E78150 */ addiu $a3, $a3, 0x8150 ## $a3 = 06018150 -/* 00CAC 8094FF6C 24C68870 */ addiu $a2, $a2, 0x8870 ## $a2 = 06018870 +/* 00CA0 8094FF60 3C060602 */ lui $a2, %hi(D_06018870) ## $a2 = 06020000 +/* 00CA4 8094FF64 3C070602 */ lui $a3, %hi(D_06018150) ## $a3 = 06020000 +/* 00CA8 8094FF68 24E78150 */ addiu $a3, $a3, %lo(D_06018150) ## $a3 = 06018150 +/* 00CAC 8094FF6C 24C68870 */ addiu $a2, $a2, %lo(D_06018870) ## $a2 = 06018870 /* 00CB0 8094FF70 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00CB4 8094FF74 2665014C */ addiu $a1, $s3, 0x014C ## $a1 = 0000014C /* 00CB8 8094FF78 AFA00010 */ sw $zero, 0x0010($sp) @@ -133,15 +133,15 @@ glabel L8094FF90 .L8094FF90: /* 00CD0 8094FF90 8E6B0004 */ lw $t3, 0x0004($s3) ## 00000004 /* 00CD4 8094FF94 3C010100 */ lui $at, 0x0100 ## $at = 01000000 -/* 00CD8 8094FF98 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 00CD8 8094FF98 3C060600 */ lui $a2, %hi(D_06004E70) ## $a2 = 06000000 /* 00CDC 8094FF9C 01616025 */ or $t4, $t3, $at ## $t4 = 01000000 /* 00CE0 8094FFA0 AE6C0004 */ sw $t4, 0x0004($s3) ## 00000004 -/* 00CE4 8094FFA4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00CE8 8094FFA8 24E70024 */ addiu $a3, $a3, 0x0024 ## $a3 = 06000024 +/* 00CE4 8094FFA4 3C070600 */ lui $a3, %hi(D_06000024) ## $a3 = 06000000 +/* 00CE8 8094FFA8 24E70024 */ addiu $a3, $a3, %lo(D_06000024) ## $a3 = 06000024 /* 00CEC 8094FFAC AFA00018 */ sw $zero, 0x0018($sp) /* 00CF0 8094FFB0 AFA00014 */ sw $zero, 0x0014($sp) /* 00CF4 8094FFB4 AFA00010 */ sw $zero, 0x0010($sp) -/* 00CF8 8094FFB8 24C64E70 */ addiu $a2, $a2, 0x4E70 ## $a2 = 06004E70 +/* 00CF8 8094FFB8 24C64E70 */ addiu $a2, $a2, %lo(D_06004E70) ## $a2 = 06004E70 /* 00CFC 8094FFBC 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00D00 8094FFC0 0C02915F */ jal SkelAnime_Init diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809506F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809506F0.s index 0da79b5ef6..06f5c8c22d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809506F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809506F0.s @@ -3,17 +3,17 @@ glabel func_809506F0 /* 01434 809506F4 AFB00028 */ sw $s0, 0x0028($sp) /* 01438 809506F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0143C 809506FC AFBF002C */ sw $ra, 0x002C($sp) -/* 01440 80950700 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01440 80950700 3C040600 */ lui $a0, %hi(D_06005184) ## $a0 = 06000000 /* 01444 80950704 0C028800 */ jal SkelAnime_GetFrameCount -/* 01448 80950708 24845184 */ addiu $a0, $a0, 0x5184 ## $a0 = 06005184 +/* 01448 80950708 24845184 */ addiu $a0, $a0, %lo(D_06005184) ## $a0 = 06005184 /* 0144C 8095070C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01450 80950710 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01454 80950714 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 01454 80950714 3C050600 */ lui $a1, %hi(D_06005184) ## $a1 = 06000000 /* 01458 80950718 46802020 */ cvt.s.w $f0, $f4 /* 0145C 8095071C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 01460 80950720 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01464 80950724 24A55184 */ addiu $a1, $a1, 0x5184 ## $a1 = 06005184 +/* 01464 80950724 24A55184 */ addiu $a1, $a1, %lo(D_06005184) ## $a1 = 06005184 /* 01468 80950728 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0146C 8095072C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01470 80950730 44070000 */ mfc1 $a3, $f0 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 a4b0dd54b4..89223e5999 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 @@ -836,8 +836,8 @@ glabel L809510AC /* 02024 809512E4 E46A0004 */ swc1 $f10, 0x0004($v1) ## 8096690C /* 02028 809512E8 15A00019 */ bne $t5, $zero, .L80951350 /* 0202C 809512EC E4700008 */ swc1 $f16, 0x0008($v1) ## 80966910 -/* 02030 809512F0 3C020600 */ lui $v0, 0x0600 ## $v0 = 06000000 -/* 02034 809512F4 24421230 */ addiu $v0, $v0, 0x1230 ## $v0 = 06001230 +/* 02030 809512F0 3C020600 */ lui $v0, %hi(D_06001230) ## $v0 = 06000000 +/* 02034 809512F4 24421230 */ addiu $v0, $v0, %lo(D_06001230) ## $v0 = 06001230 /* 02038 809512F8 00027100 */ sll $t6, $v0, 4 /* 0203C 809512FC 000E7F02 */ srl $t7, $t6, 28 /* 02040 80951300 000FC080 */ sll $t8, $t7, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809517A0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809517A0.s index e6eec70ad6..a30146caf7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809517A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809517A0.s @@ -3,17 +3,17 @@ glabel func_809517A0 /* 024E4 809517A4 AFB00028 */ sw $s0, 0x0028($sp) /* 024E8 809517A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 024EC 809517AC AFBF002C */ sw $ra, 0x002C($sp) -/* 024F0 809517B0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 024F0 809517B0 3C040600 */ lui $a0, %hi(D_06005184) ## $a0 = 06000000 /* 024F4 809517B4 0C028800 */ jal SkelAnime_GetFrameCount -/* 024F8 809517B8 24845184 */ addiu $a0, $a0, 0x5184 ## $a0 = 06005184 +/* 024F8 809517B8 24845184 */ addiu $a0, $a0, %lo(D_06005184) ## $a0 = 06005184 /* 024FC 809517BC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02500 809517C0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 02504 809517C4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 02504 809517C4 3C050600 */ lui $a1, %hi(D_06005184) ## $a1 = 06000000 /* 02508 809517C8 46802020 */ cvt.s.w $f0, $f4 /* 0250C 809517CC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 02510 809517D0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 02514 809517D4 24A55184 */ addiu $a1, $a1, 0x5184 ## $a1 = 06005184 +/* 02514 809517D4 24A55184 */ addiu $a1, $a1, %lo(D_06005184) ## $a1 = 06005184 /* 02518 809517D8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0251C 809517DC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02520 809517E0 44070000 */ mfc1 $a3, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953F4C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953F4C.s index feca584138..45b7546f3d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953F4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953F4C.s @@ -2,21 +2,21 @@ glabel func_80953F4C /* 04C8C 80953F4C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 04C90 80953F50 AFA40028 */ sw $a0, 0x0028($sp) /* 04C94 80953F54 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04C98 80953F58 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 04C98 80953F58 3C040601 */ lui $a0, %hi(D_060166A8) ## $a0 = 06010000 /* 04C9C 80953F5C AFA5002C */ sw $a1, 0x002C($sp) /* 04CA0 80953F60 0C028800 */ jal SkelAnime_GetFrameCount -/* 04CA4 80953F64 248466A8 */ addiu $a0, $a0, 0x66A8 ## $a0 = 060166A8 +/* 04CA4 80953F64 248466A8 */ addiu $a0, $a0, %lo(D_060166A8) ## $a0 = 060166A8 /* 04CA8 80953F68 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04CAC 80953F6C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04CB0 80953F70 8FA40028 */ lw $a0, 0x0028($sp) /* 04CB4 80953F74 468021A0 */ cvt.s.w $f6, $f4 -/* 04CB8 80953F78 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 04CB8 80953F78 3C050601 */ lui $a1, %hi(D_060166A8) ## $a1 = 06010000 /* 04CBC 80953F7C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 04CC0 80953F80 44060000 */ mfc1 $a2, $f0 /* 04CC4 80953F84 44070000 */ mfc1 $a3, $f0 /* 04CC8 80953F88 AFAE0014 */ sw $t6, 0x0014($sp) -/* 04CCC 80953F8C 24A566A8 */ addiu $a1, $a1, 0x66A8 ## $a1 = 060166A8 +/* 04CCC 80953F8C 24A566A8 */ addiu $a1, $a1, %lo(D_060166A8) ## $a1 = 060166A8 /* 04CD0 80953F90 E7A60010 */ swc1 $f6, 0x0010($sp) /* 04CD4 80953F94 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 04CD8 80953F98 0C029468 */ jal SkelAnime_ChangeAnim diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809540E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809540E4.s index 572d65393b..3b12b3f708 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809540E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809540E4.s @@ -2,18 +2,18 @@ glabel func_809540E4 /* 04E24 809540E4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 04E28 809540E8 AFA40028 */ sw $a0, 0x0028($sp) /* 04E2C 809540EC AFBF0024 */ sw $ra, 0x0024($sp) -/* 04E30 809540F0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 04E30 809540F0 3C040601 */ lui $a0, %hi(D_060166A8) ## $a0 = 06010000 /* 04E34 809540F4 AFA5002C */ sw $a1, 0x002C($sp) /* 04E38 809540F8 0C028800 */ jal SkelAnime_GetFrameCount -/* 04E3C 809540FC 248466A8 */ addiu $a0, $a0, 0x66A8 ## $a0 = 060166A8 +/* 04E3C 809540FC 248466A8 */ addiu $a0, $a0, %lo(D_060166A8) ## $a0 = 060166A8 /* 04E40 80954100 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04E44 80954104 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04E48 80954108 8FA40028 */ lw $a0, 0x0028($sp) /* 04E4C 8095410C 468021A0 */ cvt.s.w $f6, $f4 -/* 04E50 80954110 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 04E50 80954110 3C050601 */ lui $a1, %hi(D_060166A8) ## $a1 = 06010000 /* 04E54 80954114 44070000 */ mfc1 $a3, $f0 -/* 04E58 80954118 24A566A8 */ addiu $a1, $a1, 0x66A8 ## $a1 = 060166A8 +/* 04E58 80954118 24A566A8 */ addiu $a1, $a1, %lo(D_060166A8) ## $a1 = 060166A8 /* 04E5C 8095411C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04E60 80954120 AFA00014 */ sw $zero, 0x0014($sp) /* 04E64 80954124 E7A60010 */ swc1 $f6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s index 861fb3429e..610f82e0cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s @@ -32,18 +32,18 @@ glabel func_80954168 /* 04F08 809541C8 00000000 */ nop /* 04F0C 809541CC 45000013 */ bc1f .L8095421C /* 04F10 809541D0 00000000 */ nop -/* 04F14 809541D4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 04F14 809541D4 3C040601 */ lui $a0, %hi(D_060162AC) ## $a0 = 06010000 /* 04F18 809541D8 0C028800 */ jal SkelAnime_GetFrameCount -/* 04F1C 809541DC 248462AC */ addiu $a0, $a0, 0x62AC ## $a0 = 060162AC +/* 04F1C 809541DC 248462AC */ addiu $a0, $a0, %lo(D_060162AC) ## $a0 = 060162AC /* 04F20 809541E0 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 04F24 809541E4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04F28 809541E8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 04F28 809541E8 3C050601 */ lui $a1, %hi(D_060162AC) ## $a1 = 06010000 /* 04F2C 809541EC 46803220 */ cvt.s.w $f8, $f6 /* 04F30 809541F0 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 04F34 809541F4 44070000 */ mfc1 $a3, $f0 /* 04F38 809541F8 AFA90014 */ sw $t1, 0x0014($sp) -/* 04F3C 809541FC 24A562AC */ addiu $a1, $a1, 0x62AC ## $a1 = 060162AC +/* 04F3C 809541FC 24A562AC */ addiu $a1, $a1, %lo(D_060162AC) ## $a1 = 060162AC /* 04F40 80954200 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 04F44 80954204 E7A80010 */ swc1 $f8, 0x0010($sp) /* 04F48 80954208 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 @@ -58,11 +58,11 @@ glabel func_80954168 /* 04F60 80954220 248464B0 */ addiu $a0, $a0, 0x64B0 ## $a0 = 000065FC /* 04F64 80954224 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 04F68 80954228 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 04F6C 8095422C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 04F6C 8095422C 3C050601 */ lui $a1, %hi(D_060164B0) ## $a1 = 06010000 /* 04F70 80954230 46805420 */ cvt.s.w $f16, $f10 /* 04F74 80954234 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 /* 04F78 80954238 AFAA0014 */ sw $t2, 0x0014($sp) -/* 04F7C 8095423C 24A564B0 */ addiu $a1, $a1, 0x64B0 ## $a1 = 060164B0 +/* 04F7C 8095423C 24A564B0 */ addiu $a1, $a1, %lo(D_060164B0) ## $a1 = 060164B0 /* 04F80 80954240 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 04F84 80954244 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04F88 80954248 E7B00010 */ swc1 $f16, 0x0010($sp) @@ -77,16 +77,16 @@ glabel func_80954168 /* 04FA0 80954260 AFA40038 */ sw $a0, 0x0038($sp) /* 04FA4 80954264 1040000F */ beq $v0, $zero, .L809542A4 -/* 04FA8 80954268 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 04FA8 80954268 3C040601 */ lui $a0, %hi(D_060166A8) ## $a0 = 06010000 /* 04FAC 8095426C 0C028800 */ jal SkelAnime_GetFrameCount -/* 04FB0 80954270 248466A8 */ addiu $a0, $a0, 0x66A8 ## $a0 = 060166A8 +/* 04FB0 80954270 248466A8 */ addiu $a0, $a0, %lo(D_060166A8) ## $a0 = 060166A8 /* 04FB4 80954274 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04FB8 80954278 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04FBC 8095427C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 04FBC 8095427C 3C050601 */ lui $a1, %hi(D_060166A8) ## $a1 = 06010000 /* 04FC0 80954280 468021A0 */ cvt.s.w $f6, $f4 /* 04FC4 80954284 44070000 */ mfc1 $a3, $f0 -/* 04FC8 80954288 24A566A8 */ addiu $a1, $a1, 0x66A8 ## $a1 = 060166A8 +/* 04FC8 80954288 24A566A8 */ addiu $a1, $a1, %lo(D_060166A8) ## $a1 = 060166A8 /* 04FCC 8095428C 8FA40038 */ lw $a0, 0x0038($sp) /* 04FD0 80954290 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04FD4 80954294 AFA00014 */ sw $zero, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s index 61f3f3a513..f6c311d586 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s @@ -8,12 +8,12 @@ glabel func_80954454 /* 051AC 8095446C 0C253CB2 */ jal func_8094F2C8 /* 051B0 80954470 AFAE004C */ sw $t6, 0x004C($sp) /* 051B4 80954474 920F0194 */ lbu $t7, 0x0194($s0) ## 00000194 -/* 051B8 80954478 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 051B8 80954478 3C040601 */ lui $a0, %hi(D_06017694) ## $a0 = 06010000 /* 051BC 8095447C 51E00054 */ beql $t7, $zero, .L809545D0 /* 051C0 80954480 8FAA004C */ lw $t2, 0x004C($sp) /* 051C4 80954484 0C028800 */ jal SkelAnime_GetFrameCount -/* 051C8 80954488 24847694 */ addiu $a0, $a0, 0x7694 ## $a0 = 06017694 +/* 051C8 80954488 24847694 */ addiu $a0, $a0, %lo(D_06017694) ## $a0 = 06017694 /* 051CC 8095448C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 051D0 80954490 00000000 */ nop /* 051D4 80954494 468021A0 */ cvt.s.w $f6, $f4 @@ -33,10 +33,10 @@ glabel func_80954454 /* 05208 809544C8 AFA4003C */ sw $a0, 0x003C($sp) /* 0520C 809544CC 0C0295BC */ jal SkelAnime_Free /* 05210 809544D0 8FA50054 */ lw $a1, 0x0054($sp) -/* 05214 809544D4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 05218 809544D8 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 -/* 0521C 809544DC 24E77694 */ addiu $a3, $a3, 0x7694 ## $a3 = 06017694 -/* 05220 809544E0 24C67FC8 */ addiu $a2, $a2, 0x7FC8 ## $a2 = 06017FC8 +/* 05214 809544D4 3C060601 */ lui $a2, %hi(D_06017FC8) ## $a2 = 06010000 +/* 05218 809544D8 3C070601 */ lui $a3, %hi(D_06017694) ## $a3 = 06010000 +/* 0521C 809544DC 24E77694 */ addiu $a3, $a3, %lo(D_06017694) ## $a3 = 06017694 +/* 05220 809544E0 24C67FC8 */ addiu $a2, $a2, %lo(D_06017FC8) ## $a2 = 06017FC8 /* 05224 809544E4 8FA40054 */ lw $a0, 0x0054($sp) /* 05228 809544E8 8FA5003C */ lw $a1, 0x003C($sp) /* 0522C 809544EC AFA00010 */ sw $zero, 0x0010($sp) @@ -45,11 +45,11 @@ glabel func_80954454 /* 05238 809544F8 AFA00018 */ sw $zero, 0x0018($sp) /* 0523C 809544FC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 05240 80954500 C7B20048 */ lwc1 $f18, 0x0048($sp) -/* 05244 80954504 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 05244 80954504 3C050601 */ lui $a1, %hi(D_06017694) ## $a1 = 06010000 /* 05248 80954508 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 0524C 8095450C 44070000 */ mfc1 $a3, $f0 /* 05250 80954510 AFA90014 */ sw $t1, 0x0014($sp) -/* 05254 80954514 24A57694 */ addiu $a1, $a1, 0x7694 ## $a1 = 06017694 +/* 05254 80954514 24A57694 */ addiu $a1, $a1, %lo(D_06017694) ## $a1 = 06017694 /* 05258 80954518 8FA4003C */ lw $a0, 0x003C($sp) /* 0525C 8095451C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05260 80954520 E7B20010 */ swc1 $f18, 0x0010($sp) @@ -120,18 +120,18 @@ glabel func_80954454 /* 05348 80954608 8FA4003C */ lw $a0, 0x003C($sp) /* 0534C 8095460C 10400014 */ beq $v0, $zero, .L80954660 -/* 05350 80954610 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 05350 80954610 3C040601 */ lui $a0, %hi(D_060177F4) ## $a0 = 06010000 /* 05354 80954614 0C028800 */ jal SkelAnime_GetFrameCount -/* 05358 80954618 248477F4 */ addiu $a0, $a0, 0x77F4 ## $a0 = 060177F4 +/* 05358 80954618 248477F4 */ addiu $a0, $a0, %lo(D_060177F4) ## $a0 = 060177F4 /* 0535C 8095461C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 05360 80954620 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 05364 80954624 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 05364 80954624 3C050601 */ lui $a1, %hi(D_060177F4) ## $a1 = 06010000 /* 05368 80954628 46805420 */ cvt.s.w $f16, $f10 /* 0536C 8095462C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 05370 80954630 44070000 */ mfc1 $a3, $f0 /* 05374 80954634 AFAC0014 */ sw $t4, 0x0014($sp) -/* 05378 80954638 24A577F4 */ addiu $a1, $a1, 0x77F4 ## $a1 = 060177F4 +/* 05378 80954638 24A577F4 */ addiu $a1, $a1, %lo(D_060177F4) ## $a1 = 060177F4 /* 0537C 8095463C 8FA4003C */ lw $a0, 0x003C($sp) /* 05380 80954640 E7B00010 */ swc1 $f16, 0x0010($sp) /* 05384 80954644 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954924.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954924.s index 5562195301..335b394005 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954924.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954924.s @@ -2,20 +2,20 @@ glabel func_80954924 /* 05664 80954924 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 05668 80954928 AFA40028 */ sw $a0, 0x0028($sp) /* 0566C 8095492C AFBF0024 */ sw $ra, 0x0024($sp) -/* 05670 80954930 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 05670 80954930 3C040602 */ lui $a0, %hi(D_06018150) ## $a0 = 06020000 /* 05674 80954934 AFA5002C */ sw $a1, 0x002C($sp) /* 05678 80954938 0C028800 */ jal SkelAnime_GetFrameCount -/* 0567C 8095493C 24848150 */ addiu $a0, $a0, 0x8150 ## $a0 = 06018150 +/* 0567C 8095493C 24848150 */ addiu $a0, $a0, %lo(D_06018150) ## $a0 = 06018150 /* 05680 80954940 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 05684 80954944 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 05688 80954948 8FA40028 */ lw $a0, 0x0028($sp) /* 0568C 8095494C 468021A0 */ cvt.s.w $f6, $f4 -/* 05690 80954950 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 05690 80954950 3C050602 */ lui $a1, %hi(D_06018150) ## $a1 = 06020000 /* 05694 80954954 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 05698 80954958 44070000 */ mfc1 $a3, $f0 /* 0569C 8095495C AFAE0014 */ sw $t6, 0x0014($sp) -/* 056A0 80954960 24A58150 */ addiu $a1, $a1, 0x8150 ## $a1 = 06018150 +/* 056A0 80954960 24A58150 */ addiu $a1, $a1, %lo(D_06018150) ## $a1 = 06018150 /* 056A4 80954964 E7A60010 */ swc1 $f6, 0x0010($sp) /* 056A8 80954968 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 056AC 8095496C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954A3C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954A3C.s index cd9bc526ac..849f8d65f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954A3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954A3C.s @@ -2,11 +2,11 @@ glabel func_80954A3C /* 0577C 80954A3C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 05780 80954A40 AFA40028 */ sw $a0, 0x0028($sp) /* 05784 80954A44 AFBF0024 */ sw $ra, 0x0024($sp) -/* 05788 80954A48 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 05788 80954A48 3C040602 */ lui $a0, %hi(D_06018D18) ## $a0 = 06020000 /* 0578C 80954A4C AFA5002C */ sw $a1, 0x002C($sp) /* 05790 80954A50 0C028800 */ jal SkelAnime_GetFrameCount -/* 05794 80954A54 24848D18 */ addiu $a0, $a0, 0x8D18 ## $a0 = 06018D18 +/* 05794 80954A54 24848D18 */ addiu $a0, $a0, %lo(D_06018D18) ## $a0 = 06018D18 /* 05798 80954A58 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0579C 80954A5C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 057A0 80954A60 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 @@ -14,12 +14,12 @@ glabel func_80954A3C /* 057A8 80954A68 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 057AC 80954A6C 44814000 */ mtc1 $at, $f8 ## $f8 = -6.00 /* 057B0 80954A70 8FA40028 */ lw $a0, 0x0028($sp) -/* 057B4 80954A74 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 057B4 80954A74 3C050602 */ lui $a1, %hi(D_06018D18) ## $a1 = 06020000 /* 057B8 80954A78 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 057BC 80954A7C 46020181 */ sub.s $f6, $f0, $f2 /* 057C0 80954A80 44061000 */ mfc1 $a2, $f2 /* 057C4 80954A84 AFAE0014 */ sw $t6, 0x0014($sp) -/* 057C8 80954A88 24A58D18 */ addiu $a1, $a1, 0x8D18 ## $a1 = 06018D18 +/* 057C8 80954A88 24A58D18 */ addiu $a1, $a1, %lo(D_06018D18) ## $a1 = 06018D18 /* 057CC 80954A8C 44073000 */ mfc1 $a3, $f6 /* 057D0 80954A90 E7A00010 */ swc1 $f0, 0x0010($sp) /* 057D4 80954A94 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954B8C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954B8C.s index 3376409774..102b9d7328 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954B8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954B8C.s @@ -2,11 +2,11 @@ glabel func_80954B8C /* 058CC 80954B8C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 058D0 80954B90 AFA40028 */ sw $a0, 0x0028($sp) /* 058D4 80954B94 AFBF0024 */ sw $ra, 0x0024($sp) -/* 058D8 80954B98 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 058D8 80954B98 3C040602 */ lui $a0, %hi(D_06018D18) ## $a0 = 06020000 /* 058DC 80954B9C AFA5002C */ sw $a1, 0x002C($sp) /* 058E0 80954BA0 0C028800 */ jal SkelAnime_GetFrameCount -/* 058E4 80954BA4 24848D18 */ addiu $a0, $a0, 0x8D18 ## $a0 = 06018D18 +/* 058E4 80954BA4 24848D18 */ addiu $a0, $a0, %lo(D_06018D18) ## $a0 = 06018D18 /* 058E8 80954BA8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 058EC 80954BAC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 058F0 80954BB0 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 @@ -14,12 +14,12 @@ glabel func_80954B8C /* 058F8 80954BB8 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 058FC 80954BBC 44814000 */ mtc1 $at, $f8 ## $f8 = -6.00 /* 05900 80954BC0 8FA40028 */ lw $a0, 0x0028($sp) -/* 05904 80954BC4 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 05904 80954BC4 3C050602 */ lui $a1, %hi(D_06018D18) ## $a1 = 06020000 /* 05908 80954BC8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 0590C 80954BCC 46020181 */ sub.s $f6, $f0, $f2 /* 05910 80954BD0 44061000 */ mfc1 $a2, $f2 /* 05914 80954BD4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 05918 80954BD8 24A58D18 */ addiu $a1, $a1, 0x8D18 ## $a1 = 06018D18 +/* 05918 80954BD8 24A58D18 */ addiu $a1, $a1, %lo(D_06018D18) ## $a1 = 06018D18 /* 0591C 80954BDC 44073000 */ mfc1 $a3, $f6 /* 05920 80954BE0 E7A00010 */ swc1 $f0, 0x0010($sp) /* 05924 80954BE4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955658.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955658.s index 93e82ef068..d66bd3dfb4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955658.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955658.s @@ -13,18 +13,18 @@ glabel func_80955658 /* 063C0 80955680 00000000 */ nop /* 063C4 80955684 45000014 */ bc1f .L809556D8 /* 063C8 80955688 00000000 */ nop -/* 063CC 8095568C 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 063CC 8095568C 3C040602 */ lui $a0, %hi(D_06018A68) ## $a0 = 06020000 /* 063D0 80955690 0C028800 */ jal SkelAnime_GetFrameCount -/* 063D4 80955694 24848A68 */ addiu $a0, $a0, 0x8A68 ## $a0 = 06018A68 +/* 063D4 80955694 24848A68 */ addiu $a0, $a0, %lo(D_06018A68) ## $a0 = 06018A68 /* 063D8 80955698 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 063DC 8095569C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 063E0 809556A0 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 /* 063E4 809556A4 46803220 */ cvt.s.w $f8, $f6 -/* 063E8 809556A8 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 063E8 809556A8 3C050602 */ lui $a1, %hi(D_06018A68) ## $a1 = 06020000 /* 063EC 809556AC 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 063F0 809556B0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 063F4 809556B4 24A58A68 */ addiu $a1, $a1, 0x8A68 ## $a1 = 06018A68 +/* 063F4 809556B4 24A58A68 */ addiu $a1, $a1, %lo(D_06018A68) ## $a1 = 06018A68 /* 063F8 809556B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 063FC 809556BC E7A80010 */ swc1 $f8, 0x0010($sp) /* 06400 809556C0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 @@ -42,10 +42,10 @@ glabel func_80955658 /* 06424 809556E4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 06428 809556E8 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 /* 0642C 809556EC 468084A0 */ cvt.s.w $f18, $f16 -/* 06430 809556F0 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 06430 809556F0 3C050602 */ lui $a1, %hi(D_06018B90) ## $a1 = 06020000 /* 06434 809556F4 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 06438 809556F8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0643C 809556FC 24A58B90 */ addiu $a1, $a1, 0x8B90 ## $a1 = 06018B90 +/* 0643C 809556FC 24A58B90 */ addiu $a1, $a1, %lo(D_06018B90) ## $a1 = 06018B90 /* 06440 80955700 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 06444 80955704 E7B20010 */ swc1 $f18, 0x0010($sp) /* 06448 80955708 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095586C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095586C.s index d2eafdad24..9e6b18975a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095586C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095586C.s @@ -3,11 +3,11 @@ glabel func_8095586C /* 065B0 80955870 AFB00028 */ sw $s0, 0x0028($sp) /* 065B4 80955874 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 065B8 80955878 AFBF002C */ sw $ra, 0x002C($sp) -/* 065BC 8095587C 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 065BC 8095587C 3C040602 */ lui $a0, %hi(D_06018D18) ## $a0 = 06020000 /* 065C0 80955880 AFA50044 */ sw $a1, 0x0044($sp) /* 065C4 80955884 0C028800 */ jal SkelAnime_GetFrameCount -/* 065C8 80955888 24848D18 */ addiu $a0, $a0, 0x8D18 ## $a0 = 06018D18 +/* 065C8 80955888 24848D18 */ addiu $a0, $a0, %lo(D_06018D18) ## $a0 = 06018D18 /* 065CC 8095588C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 065D0 80955890 00000000 */ nop /* 065D4 80955894 468021A0 */ cvt.s.w $f6, $f4 @@ -27,12 +27,12 @@ glabel func_8095586C /* 06604 809558C4 460A4400 */ add.s $f16, $f8, $f10 /* 06608 809558C8 44814000 */ mtc1 $at, $f8 ## $f8 = -6.00 /* 0660C 809558CC C7A6003C */ lwc1 $f6, 0x003C($sp) -/* 06610 809558D0 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 06610 809558D0 3C050602 */ lui $a1, %hi(D_06018D18) ## $a1 = 06020000 /* 06614 809558D4 44068000 */ mfc1 $a2, $f16 /* 06618 809558D8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 0661C 809558DC 44072000 */ mfc1 $a3, $f4 /* 06620 809558E0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 06624 809558E4 24A58D18 */ addiu $a1, $a1, 0x8D18 ## $a1 = 06018D18 +/* 06624 809558E4 24A58D18 */ addiu $a1, $a1, %lo(D_06018D18) ## $a1 = 06018D18 /* 06628 809558E8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0662C 809558EC E7A60010 */ swc1 $f6, 0x0010($sp) /* 06630 809558F0 0C029468 */ jal SkelAnime_ChangeAnim diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955E64.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955E64.s index 012d8bbaad..ea87d1fbde 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955E64.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955E64.s @@ -2,11 +2,11 @@ glabel func_80955E64 /* 06BA4 80955E64 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 06BA8 80955E68 AFA40028 */ sw $a0, 0x0028($sp) /* 06BAC 80955E6C AFBF0024 */ sw $ra, 0x0024($sp) -/* 06BB0 80955E70 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 06BB0 80955E70 3C040602 */ lui $a0, %hi(D_06018D18) ## $a0 = 06020000 /* 06BB4 80955E74 AFA5002C */ sw $a1, 0x002C($sp) /* 06BB8 80955E78 0C028800 */ jal SkelAnime_GetFrameCount -/* 06BBC 80955E7C 24848D18 */ addiu $a0, $a0, 0x8D18 ## $a0 = 06018D18 +/* 06BBC 80955E7C 24848D18 */ addiu $a0, $a0, %lo(D_06018D18) ## $a0 = 06018D18 /* 06BC0 80955E80 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 06BC4 80955E84 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 06BC8 80955E88 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 @@ -14,12 +14,12 @@ glabel func_80955E64 /* 06BD0 80955E90 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 06BD4 80955E94 44814000 */ mtc1 $at, $f8 ## $f8 = -6.00 /* 06BD8 80955E98 8FA40028 */ lw $a0, 0x0028($sp) -/* 06BDC 80955E9C 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 06BDC 80955E9C 3C050602 */ lui $a1, %hi(D_06018D18) ## $a1 = 06020000 /* 06BE0 80955EA0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 06BE4 80955EA4 46020181 */ sub.s $f6, $f0, $f2 /* 06BE8 80955EA8 44061000 */ mfc1 $a2, $f2 /* 06BEC 80955EAC AFAE0014 */ sw $t6, 0x0014($sp) -/* 06BF0 80955EB0 24A58D18 */ addiu $a1, $a1, 0x8D18 ## $a1 = 06018D18 +/* 06BF0 80955EB0 24A58D18 */ addiu $a1, $a1, %lo(D_06018D18) ## $a1 = 06018D18 /* 06BF4 80955EB4 44073000 */ mfc1 $a3, $f6 /* 06BF8 80955EB8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 06BFC 80955EBC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956644.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956644.s index 2a69a415c7..138fe3a627 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956644.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956644.s @@ -2,23 +2,23 @@ glabel func_80956644 /* 07384 80956644 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 07388 80956648 AFA40028 */ sw $a0, 0x0028($sp) /* 0738C 8095664C AFBF0024 */ sw $ra, 0x0024($sp) -/* 07390 80956650 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 07390 80956650 3C040602 */ lui $a0, %hi(D_06018B90) ## $a0 = 06020000 /* 07394 80956654 AFA5002C */ sw $a1, 0x002C($sp) /* 07398 80956658 0C028800 */ jal SkelAnime_GetFrameCount -/* 0739C 8095665C 24848B90 */ addiu $a0, $a0, 0x8B90 ## $a0 = 06018B90 +/* 0739C 8095665C 24848B90 */ addiu $a0, $a0, %lo(D_06018B90) ## $a0 = 06018B90 /* 073A0 80956660 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 073A4 80956664 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 073A8 80956668 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 073AC 8095666C 468021A0 */ cvt.s.w $f6, $f4 /* 073B0 80956670 44814000 */ mtc1 $at, $f8 ## $f8 = -6.00 /* 073B4 80956674 8FA40028 */ lw $a0, 0x0028($sp) -/* 073B8 80956678 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 073B8 80956678 3C050602 */ lui $a1, %hi(D_06018B90) ## $a1 = 06020000 /* 073BC 8095667C 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 073C0 80956680 44060000 */ mfc1 $a2, $f0 /* 073C4 80956684 44070000 */ mfc1 $a3, $f0 /* 073C8 80956688 AFAE0014 */ sw $t6, 0x0014($sp) -/* 073CC 8095668C 24A58B90 */ addiu $a1, $a1, 0x8B90 ## $a1 = 06018B90 +/* 073CC 8095668C 24A58B90 */ addiu $a1, $a1, %lo(D_06018B90) ## $a1 = 06018B90 /* 073D0 80956690 E7A60010 */ swc1 $f6, 0x0010($sp) /* 073D4 80956694 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 073D8 80956698 0C029468 */ jal SkelAnime_ChangeAnim diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809567D0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809567D0.s index f3ddf03922..33b9e20e8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809567D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809567D0.s @@ -3,17 +3,17 @@ glabel func_809567D0 /* 07514 809567D4 AFB00028 */ sw $s0, 0x0028($sp) /* 07518 809567D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0751C 809567DC AFBF002C */ sw $ra, 0x002C($sp) -/* 07520 809567E0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 07520 809567E0 3C040600 */ lui $a0, %hi(D_06000024) ## $a0 = 06000000 /* 07524 809567E4 AFA50034 */ sw $a1, 0x0034($sp) /* 07528 809567E8 0C028800 */ jal SkelAnime_GetFrameCount -/* 0752C 809567EC 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 06000024 +/* 0752C 809567EC 24840024 */ addiu $a0, $a0, %lo(D_06000024) ## $a0 = 06000024 /* 07530 809567F0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 07534 809567F4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 07538 809567F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 07538 809567F8 3C050600 */ lui $a1, %hi(D_06000024) ## $a1 = 06000000 /* 0753C 809567FC 468021A0 */ cvt.s.w $f6, $f4 /* 07540 80956800 44070000 */ mfc1 $a3, $f0 -/* 07544 80956804 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 06000024 +/* 07544 80956804 24A50024 */ addiu $a1, $a1, %lo(D_06000024) ## $a1 = 06000024 /* 07548 80956808 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0754C 8095680C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 07550 80956810 AFA00014 */ sw $zero, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956E38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956E38.s index 20ee6b75e3..ba2ae3a10a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956E38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956E38.s @@ -3,17 +3,17 @@ glabel func_80956E38 /* 07B7C 80956E3C AFB00028 */ sw $s0, 0x0028($sp) /* 07B80 80956E40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 07B84 80956E44 AFBF002C */ sw $ra, 0x002C($sp) -/* 07B88 80956E48 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 07B88 80956E48 3C040600 */ lui $a0, %hi(D_06000024) ## $a0 = 06000000 /* 07B8C 80956E4C AFA50034 */ sw $a1, 0x0034($sp) /* 07B90 80956E50 0C028800 */ jal SkelAnime_GetFrameCount -/* 07B94 80956E54 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 06000024 +/* 07B94 80956E54 24840024 */ addiu $a0, $a0, %lo(D_06000024) ## $a0 = 06000024 /* 07B98 80956E58 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 07B9C 80956E5C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 07BA0 80956E60 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 07BA0 80956E60 3C050600 */ lui $a1, %hi(D_06000024) ## $a1 = 06000000 /* 07BA4 80956E64 468021A0 */ cvt.s.w $f6, $f4 /* 07BA8 80956E68 44070000 */ mfc1 $a3, $f0 -/* 07BAC 80956E6C 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 06000024 +/* 07BAC 80956E6C 24A50024 */ addiu $a1, $a1, %lo(D_06000024) ## $a1 = 06000024 /* 07BB0 80956E70 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 07BB4 80956E74 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 07BB8 80956E78 AFA00014 */ sw $zero, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809572DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809572DC.s index 6e6bde64c0..d76dc37845 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809572DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809572DC.s @@ -3,17 +3,17 @@ glabel func_809572DC /* 08020 809572E0 AFB00028 */ sw $s0, 0x0028($sp) /* 08024 809572E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 08028 809572E8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0802C 809572EC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0802C 809572EC 3C040600 */ lui $a0, %hi(D_06000024) ## $a0 = 06000000 /* 08030 809572F0 AFA50034 */ sw $a1, 0x0034($sp) /* 08034 809572F4 0C028800 */ jal SkelAnime_GetFrameCount -/* 08038 809572F8 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 06000024 +/* 08038 809572F8 24840024 */ addiu $a0, $a0, %lo(D_06000024) ## $a0 = 06000024 /* 0803C 809572FC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 08040 80957300 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 08044 80957304 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 08044 80957304 3C050600 */ lui $a1, %hi(D_06000024) ## $a1 = 06000000 /* 08048 80957308 468021A0 */ cvt.s.w $f6, $f4 /* 0804C 8095730C 44070000 */ mfc1 $a3, $f0 -/* 08050 80957310 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 06000024 +/* 08050 80957310 24A50024 */ addiu $a1, $a1, %lo(D_06000024) ## $a1 = 06000024 /* 08054 80957314 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 08058 80957318 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0805C 8095731C AFA00014 */ sw $zero, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s index 3a969bb892..090a54cacb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s @@ -115,10 +115,10 @@ glabel func_80958150 /* 08FC4 80958284 AFA2005C */ sw $v0, 0x005C($sp) /* 08FC8 80958288 8FA3005C */ lw $v1, 0x005C($sp) /* 08FCC 8095828C 8FA80070 */ lw $t0, 0x0070($sp) -/* 08FD0 80958290 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 +/* 08FD0 80958290 3C0F0601 */ lui $t7, %hi(D_06008BB8) ## $t7 = 06010000 /* 08FD4 80958294 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 08FD8 80958298 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 08FDC 8095829C 25EF8BB8 */ addiu $t7, $t7, 0x8BB8 ## $t7 = 06008BB8 +/* 08FDC 8095829C 25EF8BB8 */ addiu $t7, $t7, %lo(D_06008BB8) ## $t7 = 06008BB8 /* 08FE0 809582A0 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 /* 08FE4 809582A4 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 08FE8 809582A8 AD0D02D0 */ sw $t5, 0x02D0($t0) ## 000002D0 @@ -150,10 +150,10 @@ glabel func_80958150 /* 0904C 8095830C AFA20054 */ sw $v0, 0x0054($sp) /* 09050 80958310 8FA30054 */ lw $v1, 0x0054($sp) /* 09054 80958314 8FA80070 */ lw $t0, 0x0070($sp) -/* 09058 80958318 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 +/* 09058 80958318 3C180601 */ lui $t8, %hi(D_06008BB8) ## $t8 = 06010000 /* 0905C 8095831C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 09060 80958320 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 09064 80958324 27188BB8 */ addiu $t8, $t8, 0x8BB8 ## $t8 = 06008BB8 +/* 09064 80958324 27188BB8 */ addiu $t8, $t8, %lo(D_06008BB8) ## $t8 = 06008BB8 /* 09068 80958328 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 /* 0906C 8095832C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 09070 80958330 AD0E02D0 */ sw $t6, 0x02D0($t0) ## 000002D0 @@ -249,10 +249,10 @@ glabel func_80958150 /* 091C0 80958480 AFA20048 */ sw $v0, 0x0048($sp) /* 091C4 80958484 8FA30048 */ lw $v1, 0x0048($sp) /* 091C8 80958488 8FA80070 */ lw $t0, 0x0070($sp) -/* 091CC 8095848C 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 +/* 091CC 8095848C 3C180601 */ lui $t8, %hi(D_06008D70) ## $t8 = 06010000 /* 091D0 80958490 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 091D4 80958494 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 091D8 80958498 27188D70 */ addiu $t8, $t8, 0x8D70 ## $t8 = 06008D70 +/* 091D8 80958498 27188D70 */ addiu $t8, $t8, %lo(D_06008D70) ## $t8 = 06008D70 /* 091DC 8095849C 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 /* 091E0 809584A0 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 091E4 809584A4 AD0E02D0 */ sw $t6, 0x02D0($t0) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s index 802fb06d59..372a00d308 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s @@ -84,8 +84,8 @@ glabel func_80958FFC /* 09E3C 809590FC 0C0346A2 */ jal Matrix_NewMtx /* 09E40 80959100 AFA20050 */ sw $v0, 0x0050($sp) /* 09E44 80959104 8FA30050 */ lw $v1, 0x0050($sp) -/* 09E48 80959108 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 09E4C 8095910C 25290FA0 */ addiu $t1, $t1, 0x0FA0 ## $t1 = 06000FA0 +/* 09E48 80959108 3C090600 */ lui $t1, %hi(D_06000FA0) ## $t1 = 06000000 +/* 09E4C 8095910C 25290FA0 */ addiu $t1, $t1, %lo(D_06000FA0) ## $t1 = 06000FA0 /* 09E50 80959110 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 09E54 80959114 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 09E58 80959118 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 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 eeb9079905..3f98d5a960 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 @@ -113,16 +113,16 @@ glabel func_8095A188 .L8095A214: /* 0AF54 8095A214 920E0024 */ lbu $t6, 0x0024($s0) ## 00000024 /* 0AF58 8095A218 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0AF5C 8095A21C 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 +/* 0AF5C 8095A21C 3C0F0601 */ lui $t7, %hi(D_06015710) ## $t7 = 06010000 /* 0AF60 8095A220 15C10053 */ bne $t6, $at, .L8095A370 -/* 0AF64 8095A224 25EF5710 */ addiu $t7, $t7, 0x5710 ## $t7 = 06015710 +/* 0AF64 8095A224 25EF5710 */ addiu $t7, $t7, %lo(D_06015710) ## $t7 = 06015710 /* 0AF68 8095A228 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0AF6C 8095A22C 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 /* 0AF70 8095A230 02C19021 */ addu $s2, $s6, $at /* 0AF74 8095A234 16800015 */ bne $s4, $zero, .L8095A28C /* 0AF78 8095A238 AFAF0050 */ sw $t7, 0x0050($sp) -/* 0AF7C 8095A23C 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 -/* 0AF80 8095A240 271856A0 */ addiu $t8, $t8, 0x56A0 ## $t8 = 060156A0 +/* 0AF7C 8095A23C 3C180601 */ lui $t8, %hi(D_060156A0) ## $t8 = 06010000 +/* 0AF80 8095A240 271856A0 */ addiu $t8, $t8, %lo(D_060156A0) ## $t8 = 060156A0 /* 0AF84 8095A244 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 /* 0AF88 8095A248 0C024F61 */ jal func_80093D84 /* 0AF8C 8095A24C AFB80058 */ sw $t8, 0x0058($sp) @@ -213,16 +213,16 @@ glabel func_8095A188 .L8095A398: /* 0B0D8 8095A398 920B0024 */ lbu $t3, 0x0024($s0) ## 0000007C /* 0B0DC 8095A39C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0B0E0 8095A3A0 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 +/* 0B0E0 8095A3A0 3C0C0601 */ lui $t4, %hi(D_06011768) ## $t4 = 06010000 /* 0B0E4 8095A3A4 15610086 */ bne $t3, $at, .L8095A5C0 -/* 0B0E8 8095A3A8 258C1768 */ addiu $t4, $t4, 0x1768 ## $t4 = 06011768 +/* 0B0E8 8095A3A8 258C1768 */ addiu $t4, $t4, %lo(D_06011768) ## $t4 = 06011768 /* 0B0EC 8095A3AC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0B0F0 8095A3B0 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 /* 0B0F4 8095A3B4 02C19021 */ addu $s2, $s6, $at /* 0B0F8 8095A3B8 1680000E */ bne $s4, $zero, .L8095A3F4 /* 0B0FC 8095A3BC AFAC0050 */ sw $t4, 0x0050($sp) -/* 0B100 8095A3C0 3C0D0601 */ lui $t5, 0x0601 ## $t5 = 06010000 -/* 0B104 8095A3C4 25AD1738 */ addiu $t5, $t5, 0x1738 ## $t5 = 06011738 +/* 0B100 8095A3C0 3C0D0601 */ lui $t5, %hi(D_06011738) ## $t5 = 06010000 +/* 0B104 8095A3C4 25AD1738 */ addiu $t5, $t5, %lo(D_06011738) ## $t5 = 06011738 /* 0B108 8095A3C8 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 /* 0B10C 8095A3CC 0C024F61 */ jal func_80093D84 /* 0B110 8095A3D0 AFAD0058 */ sw $t5, 0x0058($sp) @@ -363,13 +363,13 @@ glabel func_8095A188 .L8095A5E4: /* 0B324 8095A5E4 920F0024 */ lbu $t7, 0x0024($s0) ## 000000D4 /* 0B328 8095A5E8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0B32C 8095A5EC 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 +/* 0B32C 8095A5EC 3C120601 */ lui $s2, %hi(D_06009468) ## $s2 = 06010000 /* 0B330 8095A5F0 55E10072 */ bnel $t7, $at, .L8095A7BC /* 0B334 8095A5F4 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 /* 0B338 8095A5F8 16800028 */ bne $s4, $zero, .L8095A69C -/* 0B33C 8095A5FC 26529468 */ addiu $s2, $s2, 0x9468 ## $s2 = 06009468 -/* 0B340 8095A600 3C020405 */ lui $v0, 0x0405 ## $v0 = 04050000 -/* 0B344 8095A604 24425DB0 */ addiu $v0, $v0, 0x5DB0 ## $v0 = 04055DB0 +/* 0B33C 8095A5FC 26529468 */ addiu $s2, $s2, %lo(D_06009468) ## $s2 = 06009468 +/* 0B340 8095A600 3C020405 */ lui $v0, %hi(D_04055DB0) ## $v0 = 04050000 +/* 0B344 8095A604 24425DB0 */ addiu $v0, $v0, %lo(D_04055DB0) ## $v0 = 04055DB0 /* 0B348 8095A608 00027100 */ sll $t6, $v0, 4 /* 0B34C 8095A60C 000E5702 */ srl $t2, $t6, 28 /* 0B350 8095A610 3C098016 */ lui $t1, %hi(gSegments) @@ -378,8 +378,8 @@ glabel func_8095A188 /* 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 -/* 0B36C 8095A62C 258C9430 */ addiu $t4, $t4, 0x9430 ## $t4 = 06009430 +/* 0B368 8095A628 3C0C0601 */ lui $t4, %hi(D_06009430) ## $t4 = 06010000 +/* 0B36C 8095A62C 258C9430 */ addiu $t4, $t4, %lo(D_06009430) ## $t4 = 06009430 /* 0B370 8095A630 01696821 */ addu $t5, $t3, $t1 /* 0B374 8095A634 00414024 */ and $t0, $v0, $at /* 0B378 8095A638 AFA8004C */ sw $t0, 0x004C($sp) @@ -498,8 +498,8 @@ glabel func_8095A188 /* 0B528 8095A7E8 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 /* 0B52C 8095A7EC 16800015 */ bne $s4, $zero, .L8095A844 /* 0B530 8095A7F0 8E120054 */ lw $s2, 0x0054($s0) ## 0000015C -/* 0B534 8095A7F4 3C0A0601 */ lui $t2, 0x0601 ## $t2 = 06010000 -/* 0B538 8095A7F8 254A28B8 */ addiu $t2, $t2, 0x28B8 ## $t2 = 060128B8 +/* 0B534 8095A7F4 3C0A0601 */ lui $t2, %hi(D_060128B8) ## $t2 = 06010000 +/* 0B538 8095A7F8 254A28B8 */ addiu $t2, $t2, %lo(D_060128B8) ## $t2 = 060128B8 /* 0B53C 8095A7FC 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 /* 0B540 8095A800 0C024F46 */ jal func_80093D18 /* 0B544 8095A804 AFAA0058 */ sw $t2, 0x0058($sp) @@ -541,8 +541,8 @@ glabel func_8095A188 /* 0B5C8 8095A888 00000000 */ nop /* 0B5CC 8095A88C 4500001F */ bc1f .L8095A90C .L8095A890: -/* 0B5D0 8095A890 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 -/* 0B5D4 8095A894 26522948 */ addiu $s2, $s2, 0x2948 ## $s2 = 06012948 +/* 0B5D0 8095A890 3C120601 */ lui $s2, %hi(D_06012948) ## $s2 = 06010000 +/* 0B5D4 8095A894 26522948 */ addiu $s2, $s2, %lo(D_06012948) ## $s2 = 06012948 /* 0B5D8 8095A898 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000108 /* 0B5DC 8095A89C C60E0004 */ lwc1 $f14, 0x0004($s0) ## 0000010C /* 0B5E0 8095A8A0 8E060008 */ lw $a2, 0x0008($s0) ## 00000110 @@ -586,13 +586,13 @@ glabel func_8095A188 .L8095A930: /* 0B670 8095A930 920A0024 */ lbu $t2, 0x0024($s0) ## 00000184 /* 0B674 8095A934 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 0B678 8095A938 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 +/* 0B678 8095A938 3C120601 */ lui $s2, %hi(D_06012C50) ## $s2 = 06010000 /* 0B67C 8095A93C 55410085 */ bnel $t2, $at, .L8095AB54 /* 0B680 8095A940 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 /* 0B684 8095A944 1680000E */ bne $s4, $zero, .L8095A980 -/* 0B688 8095A948 26522C50 */ addiu $s2, $s2, 0x2C50 ## $s2 = 06012C50 -/* 0B68C 8095A94C 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 -/* 0B690 8095A950 256B2BA0 */ addiu $t3, $t3, 0x2BA0 ## $t3 = 06012BA0 +/* 0B688 8095A948 26522C50 */ addiu $s2, $s2, %lo(D_06012C50) ## $s2 = 06012C50 +/* 0B68C 8095A94C 3C0B0601 */ lui $t3, %hi(D_06012BA0) ## $t3 = 06010000 +/* 0B690 8095A950 256B2BA0 */ addiu $t3, $t3, %lo(D_06012BA0) ## $t3 = 06012BA0 /* 0B694 8095A954 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 /* 0B698 8095A958 0C024F46 */ jal func_80093D18 /* 0B69C 8095A95C AFAB0058 */ sw $t3, 0x0058($sp) @@ -734,13 +734,13 @@ glabel func_8095A188 .L8095AB74: /* 0B8B4 8095AB74 92190024 */ lbu $t9, 0x0024($s0) ## 000001DC /* 0B8B8 8095AB78 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0B8BC 8095AB7C 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 +/* 0B8BC 8095AB7C 3C120601 */ lui $s2, %hi(D_06013638) ## $s2 = 06010000 /* 0B8C0 8095AB80 5721004C */ bnel $t9, $at, .L8095ACB4 /* 0B8C4 8095AB84 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 /* 0B8C8 8095AB88 1680000E */ bne $s4, $zero, .L8095ABC4 -/* 0B8CC 8095AB8C 26523638 */ addiu $s2, $s2, 0x3638 ## $s2 = 06013638 -/* 0B8D0 8095AB90 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 0B8D4 8095AB94 25CE35B0 */ addiu $t6, $t6, 0x35B0 ## $t6 = 060135B0 +/* 0B8CC 8095AB8C 26523638 */ addiu $s2, $s2, %lo(D_06013638) ## $s2 = 06013638 +/* 0B8D0 8095AB90 3C0E0601 */ lui $t6, %hi(D_060135B0) ## $t6 = 06010000 +/* 0B8D4 8095AB94 25CE35B0 */ addiu $t6, $t6, %lo(D_060135B0) ## $t6 = 060135B0 /* 0B8D8 8095AB98 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 /* 0B8DC 8095AB9C 0C024F61 */ jal func_80093D84 /* 0B8E0 8095ABA0 AFAE0058 */ sw $t6, 0x0058($sp) @@ -827,16 +827,16 @@ glabel func_8095A188 .L8095ACDC: /* 0BA1C 8095ACDC 92180024 */ lbu $t8, 0x0024($s0) ## 00000234 /* 0BA20 8095ACE0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0BA24 8095ACE4 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 +/* 0BA24 8095ACE4 3C0F0601 */ lui $t7, %hi(D_06015710) ## $t7 = 06010000 /* 0BA28 8095ACE8 17010053 */ bne $t8, $at, .L8095AE38 -/* 0BA2C 8095ACEC 25EF5710 */ addiu $t7, $t7, 0x5710 ## $t7 = 06015710 +/* 0BA2C 8095ACEC 25EF5710 */ addiu $t7, $t7, %lo(D_06015710) ## $t7 = 06015710 /* 0BA30 8095ACF0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0BA34 8095ACF4 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 /* 0BA38 8095ACF8 02C19021 */ addu $s2, $s6, $at /* 0BA3C 8095ACFC 16800015 */ bne $s4, $zero, .L8095AD54 /* 0BA40 8095AD00 AFAF0050 */ sw $t7, 0x0050($sp) -/* 0BA44 8095AD04 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 -/* 0BA48 8095AD08 258C56A0 */ addiu $t4, $t4, 0x56A0 ## $t4 = 060156A0 +/* 0BA44 8095AD04 3C0C0601 */ lui $t4, %hi(D_060156A0) ## $t4 = 06010000 +/* 0BA48 8095AD08 258C56A0 */ addiu $t4, $t4, %lo(D_060156A0) ## $t4 = 060156A0 /* 0BA4C 8095AD0C 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 /* 0BA50 8095AD10 0C024F05 */ jal func_80093C14 /* 0BA54 8095AD14 AFAC0058 */ sw $t4, 0x0058($sp) @@ -926,13 +926,13 @@ glabel func_8095A188 /* 0BB9C 8095AE5C 24170003 */ addiu $s7, $zero, 0x0003 ## $s7 = 00000003 .L8095AE60: /* 0BBA0 8095AE60 920A0024 */ lbu $t2, 0x0024($s0) ## 0000028C -/* 0BBA4 8095AE64 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 +/* 0BBA4 8095AE64 3C120601 */ lui $s2, %hi(D_06008F70) ## $s2 = 06010000 /* 0BBA8 8095AE68 56EA0057 */ bnel $s7, $t2, .L8095AFC8 /* 0BBAC 8095AE6C 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 /* 0BBB0 8095AE70 16800015 */ bne $s4, $zero, .L8095AEC8 -/* 0BBB4 8095AE74 26528F70 */ addiu $s2, $s2, 0x8F70 ## $s2 = 06008F70 -/* 0BBB8 8095AE78 3C080601 */ lui $t0, 0x0601 ## $t0 = 06010000 -/* 0BBBC 8095AE7C 25088F08 */ addiu $t0, $t0, 0x8F08 ## $t0 = 06008F08 +/* 0BBB4 8095AE74 26528F70 */ addiu $s2, $s2, %lo(D_06008F70) ## $s2 = 06008F70 +/* 0BBB8 8095AE78 3C080601 */ lui $t0, %hi(D_06008F08) ## $t0 = 06010000 +/* 0BBBC 8095AE7C 25088F08 */ addiu $t0, $t0, %lo(D_06008F08) ## $t0 = 06008F08 /* 0BBC0 8095AE80 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 /* 0BBC4 8095AE84 0C024F61 */ jal func_80093D84 /* 0BBC8 8095AE88 AFA80058 */ sw $t0, 0x0058($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s index cbf8663263..d864b66413 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s @@ -95,8 +95,8 @@ glabel func_80967FFC /* 017C8 80968118 4600A306 */ mov.s $f12, $f20 /* 017CC 8096811C 0C0343B5 */ jal Matrix_RotateZ /* 017D0 80968120 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 017D4 80968124 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 -/* 017D8 80968128 258C22B0 */ addiu $t4, $t4, 0x22B0 ## $t4 = 060022B0 +/* 017D4 80968124 3C0C0600 */ lui $t4, %hi(D_060022B0) ## $t4 = 06000000 +/* 017D8 80968128 258C22B0 */ addiu $t4, $t4, %lo(D_060022B0) ## $t4 = 060022B0 /* 017DC 8096812C 3C018097 */ lui $at, %hi(D_80969640) ## $at = 80970000 /* 017E0 80968130 3C17FA00 */ lui $s7, 0xFA00 ## $s7 = FA000000 /* 017E4 80968134 3C158097 */ lui $s5, %hi(D_80969458) ## $s5 = 80970000 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 9071ffdfd9..4ae939bf32 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 @@ -27,8 +27,8 @@ glabel func_80968298 /* 01954 809682A4 AFA400B0 */ sw $a0, 0x00B0($sp) /* 01958 809682A8 AFA500B4 */ sw $a1, 0x00B4($sp) /* 0195C 809682AC 948F028E */ lhu $t7, 0x028E($a0) ## 0000028E -/* 01960 809682B0 3C020600 */ lui $v0, 0x0600 ## $v0 = 06000000 -/* 01964 809682B4 244235E0 */ addiu $v0, $v0, 0x35E0 ## $v0 = 060035E0 +/* 01960 809682B0 3C020600 */ lui $v0, %hi(D_060035E0) ## $v0 = 06000000 +/* 01964 809682B4 244235E0 */ addiu $v0, $v0, %lo(D_060035E0) ## $v0 = 060035E0 /* 01968 809682B8 AFAF00A4 */ sw $t7, 0x00A4($sp) /* 0196C 809682BC C4860168 */ lwc1 $f6, 0x0168($a0) ## 00000168 /* 01970 809682C0 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 @@ -197,8 +197,8 @@ glabel func_80968298 /* 01BF4 80968544 0C0253D0 */ jal Gfx_TwoTexScroll /* 01BF8 80968548 AFA2005C */ sw $v0, 0x005C($sp) /* 01BFC 8096854C 8FA3005C */ lw $v1, 0x005C($sp) -/* 01C00 80968550 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 01C04 80968554 252939D0 */ addiu $t1, $t1, 0x39D0 ## $t1 = 060039D0 +/* 01C00 80968550 3C090600 */ lui $t1, %hi(D_060039D0) ## $t1 = 06000000 +/* 01C04 80968554 252939D0 */ addiu $t1, $t1, %lo(D_060039D0) ## $t1 = 060039D0 /* 01C08 80968558 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01C0C 8096855C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01C10 80968560 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 @@ -245,8 +245,8 @@ glabel func_80968298 /* 01CB4 80968604 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 01CB8 80968608 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 01CBC 8096860C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01CC0 80968610 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 -/* 01CC4 80968614 258C1040 */ addiu $t4, $t4, 0x1040 ## $t4 = 06001040 +/* 01CC0 80968610 3C0C0600 */ lui $t4, %hi(D_06001040) ## $t4 = 06000000 +/* 01CC4 80968614 258C1040 */ addiu $t4, $t4, %lo(D_06001040) ## $t4 = 06001040 /* 01CC8 80968618 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 01CCC 8096861C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 01CD0 80968620 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s index 80ff0d1115..97342bd591 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s @@ -42,12 +42,12 @@ glabel func_8096865C /* 01D48 80968698 5700007F */ bnel $t8, $zero, .L80968898 /* 01D4C 8096869C 8FAA0064 */ lw $t2, 0x0064($sp) /* 01D50 809686A0 8459001C */ lh $t9, 0x001C($v0) ## 0000001C -/* 01D54 809686A4 3C090401 */ lui $t1, 0x0401 ## $t1 = 04010000 -/* 01D58 809686A8 3C080401 */ lui $t0, 0x0401 ## $t0 = 04010000 +/* 01D54 809686A4 3C090401 */ lui $t1, %hi(D_040101A8) ## $t1 = 04010000 +/* 01D58 809686A8 3C080401 */ lui $t0, %hi(D_04010130) ## $t0 = 04010000 /* 01D5C 809686AC 2B210009 */ slti $at, $t9, 0x0009 /* 01D60 809686B0 14200004 */ bne $at, $zero, .L809686C4 -/* 01D64 809686B4 252901A8 */ addiu $t1, $t1, 0x01A8 ## $t1 = 040101A8 -/* 01D68 809686B8 25080130 */ addiu $t0, $t0, 0x0130 ## $t0 = 04010130 +/* 01D64 809686B4 252901A8 */ addiu $t1, $t1, %lo(D_040101A8) ## $t1 = 040101A8 +/* 01D68 809686B8 25080130 */ addiu $t0, $t0, %lo(D_04010130) ## $t0 = 04010130 /* 01D6C 809686BC 10000002 */ beq $zero, $zero, .L809686C8 /* 01D70 809686C0 AFA80054 */ sw $t0, 0x0054($sp) .L809686C4: diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s index ca1bbe1ad7..c159586136 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s @@ -79,10 +79,10 @@ glabel func_809688C4 /* 0205C 809689AC 46083302 */ mul.s $f12, $f6, $f8 /* 02060 809689B0 0C034348 */ jal Matrix_RotateY /* 02064 809689B4 00000000 */ nop -/* 02068 809689B8 3C0F0401 */ lui $t7, 0x0401 ## $t7 = 04010000 +/* 02068 809689B8 3C0F0401 */ lui $t7, %hi(D_04010130) ## $t7 = 04010000 /* 0206C 809689BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02070 809689C0 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 02074 809689C4 25EF0130 */ addiu $t7, $t7, 0x0130 ## $t7 = 04010130 +/* 02074 809689C4 25EF0130 */ addiu $t7, $t7, %lo(D_04010130) ## $t7 = 04010130 /* 02078 809689C8 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 /* 0207C 809689CC AFAF0058 */ sw $t7, 0x0058($sp) /* 02080 809689D0 02E1F021 */ addu $s8, $s7, $at diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s index f0bf8b83f6..95ff75d41e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s @@ -284,8 +284,8 @@ glabel func_80968B70 /* 02614 80968F64 35390080 */ ori $t9, $t1, 0x0080 ## $t9 = 000000FF /* 02618 80968F68 AC590004 */ sw $t9, 0x0004($v0) ## FFFFFF0A /* 0261C 80968F6C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 02620 80968F70 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 02624 80968F74 27181190 */ addiu $t8, $t8, 0x1190 ## $t8 = 06001190 +/* 02620 80968F70 3C180600 */ lui $t8, %hi(D_06001190) ## $t8 = 06000000 +/* 02624 80968F74 27181190 */ addiu $t8, $t8, %lo(D_06001190) ## $t8 = 06001190 /* 02628 80968F78 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = FFFFFF0E /* 0262C 80968F7C AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 02630 80968F80 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968FB0.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968FB0.s index 148ebeaf7f..df70409bd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968FB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968FB0.s @@ -130,8 +130,8 @@ glabel func_80968FB0 /* 02814 80969164 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000010 /* 02818 80969168 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000014 /* 0281C 8096916C 8D2202D0 */ lw $v0, 0x02D0($t1) ## 000002D0 -/* 02820 80969170 3C180401 */ lui $t8, 0x0401 ## $t8 = 04010000 -/* 02824 80969174 27185780 */ addiu $t8, $t8, 0x5780 ## $t8 = 04015780 +/* 02820 80969170 3C180401 */ lui $t8, %hi(D_04015780) ## $t8 = 04010000 +/* 02824 80969174 27185780 */ addiu $t8, $t8, %lo(D_04015780) ## $t8 = 04015780 /* 02828 80969178 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000018 /* 0282C 8096917C AD2E02D0 */ sw $t6, 0x02D0($t1) ## 000002D0 /* 02830 80969180 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s index 7b74c165d1..5db61ecadf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s @@ -10,10 +10,10 @@ glabel func_80969E6C /* 003A8 80969E78 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 003AC 80969E7C 8FA50028 */ lw $a1, 0x0028($sp) /* 003B0 80969E80 AFBF0024 */ sw $ra, 0x0024($sp) -/* 003B4 80969E84 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 003B8 80969E88 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 003BC 80969E8C 24E76EB0 */ addiu $a3, $a3, 0x6EB0 ## $a3 = 06006EB0 -/* 003C0 80969E90 24C61CA8 */ addiu $a2, $a2, 0x1CA8 ## $a2 = 06011CA8 +/* 003B4 80969E84 3C060601 */ lui $a2, %hi(D_06011CA8) ## $a2 = 06010000 +/* 003B8 80969E88 3C070600 */ lui $a3, %hi(D_06006EB0) ## $a3 = 06000000 +/* 003BC 80969E8C 24E76EB0 */ addiu $a3, $a3, %lo(D_06006EB0) ## $a3 = 06006EB0 +/* 003C0 80969E90 24C61CA8 */ addiu $a2, $a2, %lo(D_06011CA8) ## $a2 = 06011CA8 /* 003C4 80969E94 AFA00010 */ sw $zero, 0x0010($sp) /* 003C8 80969E98 AFA00014 */ sw $zero, 0x0014($sp) /* 003CC 80969E9C AFA00018 */ sw $zero, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0D8.s index 7460ca49b2..6fe3a6625d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0D8.s @@ -10,21 +10,21 @@ glabel func_8096A0D8 /* 00628 8096A0F8 8FBF0024 */ lw $ra, 0x0024($sp) /* 0062C 8096A0FC 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 00630 8096A100 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00634 8096A104 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00634 8096A104 3C040600 */ lui $a0, %hi(D_06000800) ## $a0 = 06000000 /* 00638 8096A108 51E10015 */ beql $t7, $at, .L8096A160 /* 0063C 8096A10C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00640 8096A110 0C028800 */ jal SkelAnime_GetFrameCount -/* 00644 8096A114 24840800 */ addiu $a0, $a0, 0x0800 ## $a0 = 06000800 +/* 00644 8096A114 24840800 */ addiu $a0, $a0, %lo(D_06000800) ## $a0 = 06000800 /* 00648 8096A118 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0064C 8096A11C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00650 8096A120 8FA40028 */ lw $a0, 0x0028($sp) /* 00654 8096A124 468021A0 */ cvt.s.w $f6, $f4 -/* 00658 8096A128 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00658 8096A128 3C050600 */ lui $a1, %hi(D_06000800) ## $a1 = 06000000 /* 0065C 8096A12C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 00660 8096A130 44070000 */ mfc1 $a3, $f0 /* 00664 8096A134 AFB80014 */ sw $t8, 0x0014($sp) -/* 00668 8096A138 24A50800 */ addiu $a1, $a1, 0x0800 ## $a1 = 06000800 +/* 00668 8096A138 24A50800 */ addiu $a1, $a1, %lo(D_06000800) ## $a1 = 06000800 /* 0066C 8096A13C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00670 8096A140 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00674 8096A144 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A16C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A16C.s index 6aaeae05ca..0525a506ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A16C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A16C.s @@ -3,17 +3,17 @@ glabel func_8096A16C /* 006A0 8096A170 AFBF0024 */ sw $ra, 0x0024($sp) /* 006A4 8096A174 10A00014 */ beq $a1, $zero, .L8096A1C8 /* 006A8 8096A178 AFA40028 */ sw $a0, 0x0028($sp) -/* 006AC 8096A17C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 006AC 8096A17C 3C040600 */ lui $a0, %hi(D_06000D00) ## $a0 = 06000000 /* 006B0 8096A180 0C028800 */ jal SkelAnime_GetFrameCount -/* 006B4 8096A184 24840D00 */ addiu $a0, $a0, 0x0D00 ## $a0 = 06000D00 +/* 006B4 8096A184 24840D00 */ addiu $a0, $a0, %lo(D_06000D00) ## $a0 = 06000D00 /* 006B8 8096A188 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 006BC 8096A18C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 006C0 8096A190 8FA40028 */ lw $a0, 0x0028($sp) /* 006C4 8096A194 468021A0 */ cvt.s.w $f6, $f4 -/* 006C8 8096A198 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 006C8 8096A198 3C050600 */ lui $a1, %hi(D_06000D00) ## $a1 = 06000000 /* 006CC 8096A19C 44070000 */ mfc1 $a3, $f0 -/* 006D0 8096A1A0 24A50D00 */ addiu $a1, $a1, 0x0D00 ## $a1 = 06000D00 +/* 006D0 8096A1A0 24A50D00 */ addiu $a1, $a1, %lo(D_06000D00) ## $a1 = 06000D00 /* 006D4 8096A1A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 006D8 8096A1A8 AFA00014 */ sw $zero, 0x0014($sp) /* 006DC 8096A1AC E7A60010 */ swc1 $f6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s index ba0370d68a..a87752bee6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s @@ -5,8 +5,8 @@ glabel func_8096A360 /* 0089C 8096A36C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 008A0 8096A370 8FA50028 */ lw $a1, 0x0028($sp) /* 008A4 8096A374 AFBF0024 */ sw $ra, 0x0024($sp) -/* 008A8 8096A378 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 008AC 8096A37C 24C61CA8 */ addiu $a2, $a2, 0x1CA8 ## $a2 = 06011CA8 +/* 008A8 8096A378 3C060601 */ lui $a2, %hi(D_06011CA8) ## $a2 = 06010000 +/* 008AC 8096A37C 24C61CA8 */ addiu $a2, $a2, %lo(D_06011CA8) ## $a2 = 06011CA8 /* 008B0 8096A380 AFA00010 */ sw $zero, 0x0010($sp) /* 008B4 8096A384 AFA00014 */ sw $zero, 0x0014($sp) /* 008B8 8096A388 AFA00018 */ sw $zero, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA5C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA5C.s index 33bf118af9..ef9e1ef94b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA5C.s @@ -10,9 +10,9 @@ glabel func_8096AA5C /* 00FAC 8096AA7C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00FB0 8096AA80 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 00FB4 8096AA84 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00FB8 8096AA88 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00FB8 8096AA88 3C040600 */ lui $a0, %hi(D_0600288C) ## $a0 = 06000000 /* 00FBC 8096AA8C 11E10018 */ beq $t7, $at, .L8096AAF0 -/* 00FC0 8096AA90 2484288C */ addiu $a0, $a0, 0x288C ## $a0 = 0600288C +/* 00FC0 8096AA90 2484288C */ addiu $a0, $a0, %lo(D_0600288C) ## $a0 = 0600288C /* 00FC4 8096AA94 0C028800 */ jal SkelAnime_GetFrameCount /* 00FC8 8096AA98 AFA5002C */ sw $a1, 0x002C($sp) @@ -20,11 +20,11 @@ glabel func_8096AA5C /* 00FD0 8096AAA0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00FD4 8096AAA4 8FA40028 */ lw $a0, 0x0028($sp) /* 00FD8 8096AAA8 468021A0 */ cvt.s.w $f6, $f4 -/* 00FDC 8096AAAC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00FDC 8096AAAC 3C050600 */ lui $a1, %hi(D_0600288C) ## $a1 = 06000000 /* 00FE0 8096AAB0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 00FE4 8096AAB4 44070000 */ mfc1 $a3, $f0 /* 00FE8 8096AAB8 AFB80014 */ sw $t8, 0x0014($sp) -/* 00FEC 8096AABC 24A5288C */ addiu $a1, $a1, 0x288C ## $a1 = 0600288C +/* 00FEC 8096AABC 24A5288C */ addiu $a1, $a1, %lo(D_0600288C) ## $a1 = 0600288C /* 00FF0 8096AAC0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00FF4 8096AAC4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FF8 8096AAC8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB8C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB8C.s index b177caae4b..ba800b6e3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB8C.s @@ -3,17 +3,17 @@ glabel func_8096AB8C /* 010C0 8096AB90 AFBF0024 */ sw $ra, 0x0024($sp) /* 010C4 8096AB94 10A00014 */ beq $a1, $zero, .L8096ABE8 /* 010C8 8096AB98 AFA40028 */ sw $a0, 0x0028($sp) -/* 010CC 8096AB9C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 010CC 8096AB9C 3C040600 */ lui $a0, %hi(D_06006EB0) ## $a0 = 06000000 /* 010D0 8096ABA0 0C028800 */ jal SkelAnime_GetFrameCount -/* 010D4 8096ABA4 24846EB0 */ addiu $a0, $a0, 0x6EB0 ## $a0 = 06006EB0 +/* 010D4 8096ABA4 24846EB0 */ addiu $a0, $a0, %lo(D_06006EB0) ## $a0 = 06006EB0 /* 010D8 8096ABA8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 010DC 8096ABAC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 010E0 8096ABB0 8FA40028 */ lw $a0, 0x0028($sp) /* 010E4 8096ABB4 468021A0 */ cvt.s.w $f6, $f4 -/* 010E8 8096ABB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 010E8 8096ABB8 3C050600 */ lui $a1, %hi(D_06006EB0) ## $a1 = 06000000 /* 010EC 8096ABBC 44070000 */ mfc1 $a3, $f0 -/* 010F0 8096ABC0 24A56EB0 */ addiu $a1, $a1, 0x6EB0 ## $a1 = 06006EB0 +/* 010F0 8096ABC0 24A56EB0 */ addiu $a1, $a1, %lo(D_06006EB0) ## $a1 = 06006EB0 /* 010F4 8096ABC4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 010F8 8096ABC8 AFA00014 */ sw $zero, 0x0014($sp) /* 010FC 8096ABCC E7A60010 */ swc1 $f6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ABF8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ABF8.s index c909371660..226df4d43d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ABF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ABF8.s @@ -10,21 +10,21 @@ glabel func_8096ABF8 /* 01148 8096AC18 8FBF0024 */ lw $ra, 0x0024($sp) /* 0114C 8096AC1C 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 01150 8096AC20 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01154 8096AC24 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01154 8096AC24 3C040600 */ lui $a0, %hi(D_06002374) ## $a0 = 06000000 /* 01158 8096AC28 51E10016 */ beql $t7, $at, .L8096AC84 /* 0115C 8096AC2C 8FBF0024 */ lw $ra, 0x0024($sp) /* 01160 8096AC30 0C028800 */ jal SkelAnime_GetFrameCount -/* 01164 8096AC34 24842374 */ addiu $a0, $a0, 0x2374 ## $a0 = 06002374 +/* 01164 8096AC34 24842374 */ addiu $a0, $a0, %lo(D_06002374) ## $a0 = 06002374 /* 01168 8096AC38 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0116C 8096AC3C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 01170 8096AC40 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 01174 8096AC44 468021A0 */ cvt.s.w $f6, $f4 /* 01178 8096AC48 8FA40028 */ lw $a0, 0x0028($sp) -/* 0117C 8096AC4C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0117C 8096AC4C 3C050600 */ lui $a1, %hi(D_06002374) ## $a1 = 06000000 /* 01180 8096AC50 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 01184 8096AC54 AFB80014 */ sw $t8, 0x0014($sp) -/* 01188 8096AC58 24A52374 */ addiu $a1, $a1, 0x2374 ## $a1 = 06002374 +/* 01188 8096AC58 24A52374 */ addiu $a1, $a1, %lo(D_06002374) ## $a1 = 06002374 /* 0118C 8096AC5C E7A60010 */ swc1 $f6, 0x0010($sp) /* 01190 8096AC60 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01194 8096AC64 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AC90.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AC90.s index 35526b2d6f..38161426c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AC90.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AC90.s @@ -3,17 +3,17 @@ glabel func_8096AC90 /* 011C4 8096AC94 AFBF0024 */ sw $ra, 0x0024($sp) /* 011C8 8096AC98 10A00014 */ beq $a1, $zero, .L8096ACEC /* 011CC 8096AC9C AFA40028 */ sw $a0, 0x0028($sp) -/* 011D0 8096ACA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 011D0 8096ACA0 3C040600 */ lui $a0, %hi(D_06006EB0) ## $a0 = 06000000 /* 011D4 8096ACA4 0C028800 */ jal SkelAnime_GetFrameCount -/* 011D8 8096ACA8 24846EB0 */ addiu $a0, $a0, 0x6EB0 ## $a0 = 06006EB0 +/* 011D8 8096ACA8 24846EB0 */ addiu $a0, $a0, %lo(D_06006EB0) ## $a0 = 06006EB0 /* 011DC 8096ACAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 011E0 8096ACB0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 011E4 8096ACB4 8FA40028 */ lw $a0, 0x0028($sp) /* 011E8 8096ACB8 468021A0 */ cvt.s.w $f6, $f4 -/* 011EC 8096ACBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 011EC 8096ACBC 3C050600 */ lui $a1, %hi(D_06006EB0) ## $a1 = 06000000 /* 011F0 8096ACC0 44070000 */ mfc1 $a3, $f0 -/* 011F4 8096ACC4 24A56EB0 */ addiu $a1, $a1, 0x6EB0 ## $a1 = 06006EB0 +/* 011F4 8096ACC4 24A56EB0 */ addiu $a1, $a1, %lo(D_06006EB0) ## $a1 = 06006EB0 /* 011F8 8096ACC8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 011FC 8096ACCC AFA00014 */ sw $zero, 0x0014($sp) /* 01200 8096ACD0 E7A60010 */ swc1 $f6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ACFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ACFC.s index 1654f9363e..4fa89580f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ACFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ACFC.s @@ -10,21 +10,21 @@ glabel func_8096ACFC /* 0124C 8096AD1C 8FBF0024 */ lw $ra, 0x0024($sp) /* 01250 8096AD20 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 01254 8096AD24 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01258 8096AD28 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01258 8096AD28 3C040600 */ lui $a0, %hi(D_06001D70) ## $a0 = 06000000 /* 0125C 8096AD2C 51E10015 */ beql $t7, $at, .L8096AD84 /* 01260 8096AD30 8FBF0024 */ lw $ra, 0x0024($sp) /* 01264 8096AD34 0C028800 */ jal SkelAnime_GetFrameCount -/* 01268 8096AD38 24841D70 */ addiu $a0, $a0, 0x1D70 ## $a0 = 06001D70 +/* 01268 8096AD38 24841D70 */ addiu $a0, $a0, %lo(D_06001D70) ## $a0 = 06001D70 /* 0126C 8096AD3C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01270 8096AD40 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01274 8096AD44 8FA40028 */ lw $a0, 0x0028($sp) /* 01278 8096AD48 468021A0 */ cvt.s.w $f6, $f4 -/* 0127C 8096AD4C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0127C 8096AD4C 3C050600 */ lui $a1, %hi(D_06001D70) ## $a1 = 06000000 /* 01280 8096AD50 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 01284 8096AD54 44070000 */ mfc1 $a3, $f0 /* 01288 8096AD58 AFB80014 */ sw $t8, 0x0014($sp) -/* 0128C 8096AD5C 24A51D70 */ addiu $a1, $a1, 0x1D70 ## $a1 = 06001D70 +/* 0128C 8096AD5C 24A51D70 */ addiu $a1, $a1, %lo(D_06001D70) ## $a1 = 06001D70 /* 01290 8096AD60 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01294 8096AD64 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01298 8096AD68 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AD90.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AD90.s index 265bcea3f1..c5211015a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AD90.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AD90.s @@ -3,19 +3,19 @@ glabel func_8096AD90 /* 012C4 8096AD94 AFBF0024 */ sw $ra, 0x0024($sp) /* 012C8 8096AD98 10A00015 */ beq $a1, $zero, .L8096ADF0 /* 012CC 8096AD9C AFA40028 */ sw $a0, 0x0028($sp) -/* 012D0 8096ADA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 012D0 8096ADA0 3C040600 */ lui $a0, %hi(D_06002374) ## $a0 = 06000000 /* 012D4 8096ADA4 0C028800 */ jal SkelAnime_GetFrameCount -/* 012D8 8096ADA8 24842374 */ addiu $a0, $a0, 0x2374 ## $a0 = 06002374 +/* 012D8 8096ADA8 24842374 */ addiu $a0, $a0, %lo(D_06002374) ## $a0 = 06002374 /* 012DC 8096ADAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 012E0 8096ADB0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 012E4 8096ADB4 8FA40028 */ lw $a0, 0x0028($sp) /* 012E8 8096ADB8 468021A0 */ cvt.s.w $f6, $f4 -/* 012EC 8096ADBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 012EC 8096ADBC 3C050600 */ lui $a1, %hi(D_06002374) ## $a1 = 06000000 /* 012F0 8096ADC0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 012F4 8096ADC4 44070000 */ mfc1 $a3, $f0 /* 012F8 8096ADC8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 012FC 8096ADCC 24A52374 */ addiu $a1, $a1, 0x2374 ## $a1 = 06002374 +/* 012FC 8096ADCC 24A52374 */ addiu $a1, $a1, %lo(D_06002374) ## $a1 = 06002374 /* 01300 8096ADD0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01304 8096ADD4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01308 8096ADD8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE00.s index ac8b4ca97e..8fbf1fb1bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE00.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE00.s @@ -3,17 +3,17 @@ glabel func_8096AE00 /* 01334 8096AE04 AFBF0024 */ sw $ra, 0x0024($sp) /* 01338 8096AE08 10A00014 */ beq $a1, $zero, .L8096AE5C /* 0133C 8096AE0C AFA40028 */ sw $a0, 0x0028($sp) -/* 01340 8096AE10 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01340 8096AE10 3C040600 */ lui $a0, %hi(D_06006EB0) ## $a0 = 06000000 /* 01344 8096AE14 0C028800 */ jal SkelAnime_GetFrameCount -/* 01348 8096AE18 24846EB0 */ addiu $a0, $a0, 0x6EB0 ## $a0 = 06006EB0 +/* 01348 8096AE18 24846EB0 */ addiu $a0, $a0, %lo(D_06006EB0) ## $a0 = 06006EB0 /* 0134C 8096AE1C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01350 8096AE20 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01354 8096AE24 8FA40028 */ lw $a0, 0x0028($sp) /* 01358 8096AE28 468021A0 */ cvt.s.w $f6, $f4 -/* 0135C 8096AE2C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0135C 8096AE2C 3C050600 */ lui $a1, %hi(D_06006EB0) ## $a1 = 06000000 /* 01360 8096AE30 44070000 */ mfc1 $a3, $f0 -/* 01364 8096AE34 24A56EB0 */ addiu $a1, $a1, 0x6EB0 ## $a1 = 06006EB0 +/* 01364 8096AE34 24A56EB0 */ addiu $a1, $a1, %lo(D_06006EB0) ## $a1 = 06006EB0 /* 01368 8096AE38 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0136C 8096AE3C AFA00014 */ sw $zero, 0x0014($sp) /* 01370 8096AE40 E7A60010 */ swc1 $f6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE6C.s index 37b3ebfa8d..91be135d62 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE6C.s @@ -10,21 +10,21 @@ glabel func_8096AE6C /* 013BC 8096AE8C 8FBF0024 */ lw $ra, 0x0024($sp) /* 013C0 8096AE90 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 013C4 8096AE94 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 013C8 8096AE98 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 013C8 8096AE98 3C040600 */ lui $a0, %hi(D_06000800) ## $a0 = 06000000 /* 013CC 8096AE9C 51E10015 */ beql $t7, $at, .L8096AEF4 /* 013D0 8096AEA0 8FBF0024 */ lw $ra, 0x0024($sp) /* 013D4 8096AEA4 0C028800 */ jal SkelAnime_GetFrameCount -/* 013D8 8096AEA8 24840800 */ addiu $a0, $a0, 0x0800 ## $a0 = 06000800 +/* 013D8 8096AEA8 24840800 */ addiu $a0, $a0, %lo(D_06000800) ## $a0 = 06000800 /* 013DC 8096AEAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 013E0 8096AEB0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 013E4 8096AEB4 8FA40028 */ lw $a0, 0x0028($sp) /* 013E8 8096AEB8 468021A0 */ cvt.s.w $f6, $f4 -/* 013EC 8096AEBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 013EC 8096AEBC 3C050600 */ lui $a1, %hi(D_06000800) ## $a1 = 06000000 /* 013F0 8096AEC0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 013F4 8096AEC4 44070000 */ mfc1 $a3, $f0 /* 013F8 8096AEC8 AFB80014 */ sw $t8, 0x0014($sp) -/* 013FC 8096AECC 24A50800 */ addiu $a1, $a1, 0x0800 ## $a1 = 06000800 +/* 013FC 8096AECC 24A50800 */ addiu $a1, $a1, %lo(D_06000800) ## $a1 = 06000800 /* 01400 8096AED0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01404 8096AED4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01408 8096AED8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF00.s index 429d961147..808d3057fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF00.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF00.s @@ -3,17 +3,17 @@ glabel func_8096AF00 /* 01434 8096AF04 AFBF0024 */ sw $ra, 0x0024($sp) /* 01438 8096AF08 10A00014 */ beq $a1, $zero, .L8096AF5C /* 0143C 8096AF0C AFA40028 */ sw $a0, 0x0028($sp) -/* 01440 8096AF10 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01440 8096AF10 3C040600 */ lui $a0, %hi(D_06000D00) ## $a0 = 06000000 /* 01444 8096AF14 0C028800 */ jal SkelAnime_GetFrameCount -/* 01448 8096AF18 24840D00 */ addiu $a0, $a0, 0x0D00 ## $a0 = 06000D00 +/* 01448 8096AF18 24840D00 */ addiu $a0, $a0, %lo(D_06000D00) ## $a0 = 06000D00 /* 0144C 8096AF1C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01450 8096AF20 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01454 8096AF24 8FA40028 */ lw $a0, 0x0028($sp) /* 01458 8096AF28 468021A0 */ cvt.s.w $f6, $f4 -/* 0145C 8096AF2C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0145C 8096AF2C 3C050600 */ lui $a1, %hi(D_06000D00) ## $a1 = 06000000 /* 01460 8096AF30 44070000 */ mfc1 $a3, $f0 -/* 01464 8096AF34 24A50D00 */ addiu $a1, $a1, 0x0D00 ## $a1 = 06000D00 +/* 01464 8096AF34 24A50D00 */ addiu $a1, $a1, %lo(D_06000D00) ## $a1 = 06000D00 /* 01468 8096AF38 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0146C 8096AF3C AFA00014 */ sw $zero, 0x0014($sp) /* 01470 8096AF40 E7A60010 */ swc1 $f6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF6C.s index e84c912a38..6631215086 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF6C.s @@ -10,19 +10,19 @@ glabel func_8096AF6C /* 014BC 8096AF8C 8FBF0024 */ lw $ra, 0x0024($sp) /* 014C0 8096AF90 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 014C4 8096AF94 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 014C8 8096AF98 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 014C8 8096AF98 3C040600 */ lui $a0, %hi(D_06006EB0) ## $a0 = 06000000 /* 014CC 8096AF9C 51E10014 */ beql $t7, $at, .L8096AFF0 /* 014D0 8096AFA0 8FBF0024 */ lw $ra, 0x0024($sp) /* 014D4 8096AFA4 0C028800 */ jal SkelAnime_GetFrameCount -/* 014D8 8096AFA8 24846EB0 */ addiu $a0, $a0, 0x6EB0 ## $a0 = 06006EB0 +/* 014D8 8096AFA8 24846EB0 */ addiu $a0, $a0, %lo(D_06006EB0) ## $a0 = 06006EB0 /* 014DC 8096AFAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 014E0 8096AFB0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 014E4 8096AFB4 8FA40028 */ lw $a0, 0x0028($sp) /* 014E8 8096AFB8 468021A0 */ cvt.s.w $f6, $f4 -/* 014EC 8096AFBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 014EC 8096AFBC 3C050600 */ lui $a1, %hi(D_06006EB0) ## $a1 = 06000000 /* 014F0 8096AFC0 44070000 */ mfc1 $a3, $f0 -/* 014F4 8096AFC4 24A56EB0 */ addiu $a1, $a1, 0x6EB0 ## $a1 = 06006EB0 +/* 014F4 8096AFC4 24A56EB0 */ addiu $a1, $a1, %lo(D_06006EB0) ## $a1 = 06006EB0 /* 014F8 8096AFC8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 014FC 8096AFCC AFA00014 */ sw $zero, 0x0014($sp) /* 01500 8096AFD0 E7A60010 */ swc1 $f6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s index 32dccd95ee..0fdc9b3e3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s @@ -2,18 +2,18 @@ glabel func_8096B3E4 /* 01914 8096B3E4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 01918 8096B3E8 AFA40040 */ sw $a0, 0x0040($sp) /* 0191C 8096B3EC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01920 8096B3F0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 01920 8096B3F0 3C040601 */ lui $a0, %hi(D_06012014) ## $a0 = 06010000 /* 01924 8096B3F4 AFA50044 */ sw $a1, 0x0044($sp) /* 01928 8096B3F8 0C028800 */ jal SkelAnime_GetFrameCount -/* 0192C 8096B3FC 24842014 */ addiu $a0, $a0, 0x2014 ## $a0 = 06012014 +/* 0192C 8096B3FC 24842014 */ addiu $a0, $a0, %lo(D_06012014) ## $a0 = 06012014 /* 01930 8096B400 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01934 8096B404 8FA50040 */ lw $a1, 0x0040($sp) -/* 01938 8096B408 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 +/* 01938 8096B408 3C060601 */ lui $a2, %hi(D_06011CA8) ## $a2 = 06010000 /* 0193C 8096B40C 468021A0 */ cvt.s.w $f6, $f4 /* 01940 8096B410 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C /* 01944 8096B414 AFA5002C */ sw $a1, 0x002C($sp) -/* 01948 8096B418 24C61CA8 */ addiu $a2, $a2, 0x1CA8 ## $a2 = 06011CA8 +/* 01948 8096B418 24C61CA8 */ addiu $a2, $a2, %lo(D_06011CA8) ## $a2 = 06011CA8 /* 0194C 8096B41C 8FA40044 */ lw $a0, 0x0044($sp) /* 01950 8096B420 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01954 8096B424 E7A60030 */ swc1 $f6, 0x0030($sp) @@ -23,11 +23,11 @@ glabel func_8096B3E4 /* 01964 8096B434 AFA00018 */ sw $zero, 0x0018($sp) /* 01968 8096B438 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0196C 8096B43C C7A80030 */ lwc1 $f8, 0x0030($sp) -/* 01970 8096B440 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 01970 8096B440 3C050601 */ lui $a1, %hi(D_06012014) ## $a1 = 06010000 /* 01974 8096B444 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 01978 8096B448 44070000 */ mfc1 $a3, $f0 /* 0197C 8096B44C AFAE0014 */ sw $t6, 0x0014($sp) -/* 01980 8096B450 24A52014 */ addiu $a1, $a1, 0x2014 ## $a1 = 06012014 +/* 01980 8096B450 24A52014 */ addiu $a1, $a1, %lo(D_06012014) ## $a1 = 06012014 /* 01984 8096B454 8FA4002C */ lw $a0, 0x002C($sp) /* 01988 8096B458 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0198C 8096B45C E7A80010 */ swc1 $f8, 0x0010($sp) 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 2c0035b369..07260ed892 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 @@ -70,12 +70,12 @@ glabel func_8096B840 /* 01E58 8096B928 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 01E5C 8096B92C 8D2A0000 */ lw $t2, 0x0000($t1) ## 00000000 /* 01E60 8096B930 00865824 */ and $t3, $a0, $a2 -/* 01E64 8096B934 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01E64 8096B934 3C040600 */ lui $a0, %hi(D_06007FC0) ## $a0 = 06000000 /* 01E68 8096B938 014B6021 */ addu $t4, $t2, $t3 /* 01E6C 8096B93C 01876821 */ addu $t5, $t4, $a3 /* 01E70 8096B940 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 01E74 8096B944 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01E78 8096B948 24847FC0 */ addiu $a0, $a0, 0x7FC0 ## $a0 = 06007FC0 +/* 01E78 8096B948 24847FC0 */ addiu $a0, $a0, %lo(D_06007FC0) ## $a0 = 06007FC0 /* 01E7C 8096B94C 00047100 */ sll $t6, $a0, 4 /* 01E80 8096B950 000ECF02 */ srl $t9, $t6, 28 /* 01E84 8096B954 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s index 71c5267ae0..ae89ed5665 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s @@ -5,10 +5,10 @@ glabel func_8096BA2C /* 01F68 8096BA38 AFBF002C */ sw $ra, 0x002C($sp) /* 01F6C 8096BA3C AFA50034 */ sw $a1, 0x0034($sp) /* 01F70 8096BA40 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01F74 8096BA44 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 01F78 8096BA48 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 01F7C 8096BA4C 24E767CC */ addiu $a3, $a3, 0x67CC ## $a3 = 060067CC -/* 01F80 8096BA50 24C61CA8 */ addiu $a2, $a2, 0x1CA8 ## $a2 = 06011CA8 +/* 01F74 8096BA44 3C060601 */ lui $a2, %hi(D_06011CA8) ## $a2 = 06010000 +/* 01F78 8096BA48 3C070600 */ lui $a3, %hi(D_060067CC) ## $a3 = 06000000 +/* 01F7C 8096BA4C 24E767CC */ addiu $a3, $a3, %lo(D_060067CC) ## $a3 = 060067CC +/* 01F80 8096BA50 24C61CA8 */ addiu $a2, $a2, %lo(D_06011CA8) ## $a2 = 06011CA8 /* 01F84 8096BA54 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 01F88 8096BA58 AFA00010 */ sw $zero, 0x0010($sp) /* 01F8C 8096BA5C AFA00014 */ sw $zero, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBA8.s index 4eff79d5fe..781d04eed6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBA8.s @@ -1,9 +1,9 @@ glabel func_8096BBA8 /* 020D8 8096BBA8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 020DC 8096BBAC AFBF001C */ sw $ra, 0x001C($sp) -/* 020E0 8096BBB0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 020E0 8096BBB0 3C050600 */ lui $a1, %hi(D_06005458) ## $a1 = 06000000 /* 020E4 8096BBB4 AFA40020 */ sw $a0, 0x0020($sp) -/* 020E8 8096BBB8 24A55458 */ addiu $a1, $a1, 0x5458 ## $a1 = 06005458 +/* 020E8 8096BBB8 24A55458 */ addiu $a1, $a1, %lo(D_06005458) ## $a1 = 06005458 /* 020EC 8096BBBC AFA00010 */ sw $zero, 0x0010($sp) /* 020F0 8096BBC0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 020F4 8096BBC4 0C25A777 */ jal func_80969DDC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBE8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBE8.s index 0fde27e636..cc797a6c31 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBE8.s @@ -1,9 +1,9 @@ glabel func_8096BBE8 /* 02118 8096BBE8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0211C 8096BBEC AFBF001C */ sw $ra, 0x001C($sp) -/* 02120 8096BBF0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 02120 8096BBF0 3C050600 */ lui $a1, %hi(D_06006104) ## $a1 = 06000000 /* 02124 8096BBF4 AFA40020 */ sw $a0, 0x0020($sp) -/* 02128 8096BBF8 24A56104 */ addiu $a1, $a1, 0x6104 ## $a1 = 06006104 +/* 02128 8096BBF8 24A56104 */ addiu $a1, $a1, %lo(D_06006104) ## $a1 = 06006104 /* 0212C 8096BBFC AFA00010 */ sw $zero, 0x0010($sp) /* 02130 8096BC00 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 02134 8096BC04 0C25A777 */ jal func_80969DDC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC28.s index 8e4effff06..ac906f17bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC28.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC28.s @@ -3,8 +3,8 @@ glabel func_8096BC28 /* 0215C 8096BC2C AFBF001C */ sw $ra, 0x001C($sp) /* 02160 8096BC30 10A0000A */ beq $a1, $zero, .L8096BC5C /* 02164 8096BC34 AFA40020 */ sw $a0, 0x0020($sp) -/* 02168 8096BC38 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0216C 8096BC3C 24A567CC */ addiu $a1, $a1, 0x67CC ## $a1 = 060067CC +/* 02168 8096BC38 3C050600 */ lui $a1, %hi(D_060067CC) ## $a1 = 06000000 +/* 0216C 8096BC3C 24A567CC */ addiu $a1, $a1, %lo(D_060067CC) ## $a1 = 060067CC /* 02170 8096BC40 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 02174 8096BC44 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 02178 8096BC48 0C25A777 */ jal func_80969DDC 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 982b3bfa75..4adab1391a 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 @@ -70,12 +70,12 @@ glabel func_8096BF60 /* 02578 8096C048 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 0257C 8096C04C 8D2A0000 */ lw $t2, 0x0000($t1) ## 00000000 /* 02580 8096C050 00865824 */ and $t3, $a0, $a2 -/* 02584 8096C054 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 02584 8096C054 3C040600 */ lui $a0, %hi(D_06007FC0) ## $a0 = 06000000 /* 02588 8096C058 014B6021 */ addu $t4, $t2, $t3 /* 0258C 8096C05C 01876821 */ addu $t5, $t4, $a3 /* 02590 8096C060 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 02594 8096C064 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02598 8096C068 24847FC0 */ addiu $a0, $a0, 0x7FC0 ## $a0 = 06007FC0 +/* 02598 8096C068 24847FC0 */ addiu $a0, $a0, %lo(D_06007FC0) ## $a0 = 06007FC0 /* 0259C 8096C06C 00047100 */ sll $t6, $a0, 4 /* 025A0 8096C070 000ECF02 */ srl $t9, $t6, 28 /* 025A4 8096C074 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 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 7c0fd36e91..39186cb7f1 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 @@ -158,8 +158,8 @@ glabel func_80977950 /* 007F4 80977B84 37180002 */ ori $t8, $t8, 0x0002 ## $t8 = DA380002 /* 007F8 80977B88 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 /* 007FC 80977B8C 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 00800 80977B90 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 -/* 00804 80977B94 258CFAA0 */ addiu $t4, $t4, 0xFAA0 ## $t4 = 0600FAA0 +/* 00800 80977B90 3C0C0601 */ lui $t4, %hi(D_0600FAA0) ## $t4 = 06010000 +/* 00804 80977B94 258CFAA0 */ addiu $t4, $t4, %lo(D_0600FAA0) ## $t4 = 0600FAA0 /* 00808 80977B98 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 /* 0080C 80977B9C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 00810 80977BA0 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978C20.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978C20.s index f4804a9e37..67d3252ba1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978C20.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978C20.s @@ -33,7 +33,7 @@ glabel func_80978C20 /* 00340 80978C70 AFB30084 */ sw $s3, 0x0084($sp) /* 00344 80978C74 AFB20080 */ sw $s2, 0x0080($sp) /* 00348 80978C78 AFB1007C */ sw $s1, 0x007C($sp) -/* 0034C 80978C7C 3C1E0600 */ lui $s8, 0x0600 ## $s8 = 06000000 +/* 0034C 80978C7C 3C1E0600 */ lui $s8, %hi(D_06000EA0) ## $s8 = 06000000 /* 00350 80978C80 4481B000 */ mtc1 $at, $f22 ## $f22 = 16.00 /* 00354 80978C84 00C09025 */ or $s2, $a2, $zero ## $s2 = 00000000 /* 00358 80978C88 00E0A025 */ or $s4, $a3, $zero ## $s4 = 00000000 @@ -43,7 +43,7 @@ glabel func_80978C20 /* 00368 80978C98 F7B40048 */ sdc1 $f20, 0x0048($sp) /* 0036C 80978C9C AFA400D0 */ sw $a0, 0x00D0($sp) /* 00370 80978CA0 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 00374 80978CA4 27DE0EA0 */ addiu $s8, $s8, 0x0EA0 ## $s8 = 06000EA0 +/* 00374 80978CA4 27DE0EA0 */ addiu $s8, $s8, %lo(D_06000EA0) ## $s8 = 06000EA0 /* 00378 80978CA8 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 /* 0037C 80978CAC 27B600C4 */ addiu $s6, $sp, 0x00C4 ## $s6 = FFFFFFF4 /* 00380 80978CB0 27B700B8 */ addiu $s7, $sp, 0x00B8 ## $s7 = FFFFFFE8 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979FD0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979FD0.s index a852f02f1b..b480d16b7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979FD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979FD0.s @@ -1,8 +1,8 @@ glabel func_80979FD0 /* 016A0 80979FD0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 016A4 80979FD4 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 +/* 016A4 80979FD4 3C0E0600 */ lui $t6, %hi(D_06001F70) ## $t6 = 06000000 /* 016A8 80979FD8 AFBF001C */ sw $ra, 0x001C($sp) -/* 016AC 80979FDC 25CE1F70 */ addiu $t6, $t6, 0x1F70 ## $t6 = 06001F70 +/* 016AC 80979FDC 25CE1F70 */ addiu $t6, $t6, %lo(D_06001F70) ## $t6 = 06001F70 /* 016B0 80979FE0 AFAE0010 */ sw $t6, 0x0010($sp) /* 016B4 80979FE4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 016B8 80979FE8 0C25E3F3 */ jal func_80978FCC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1C0.s index ce70f4d6b5..9305e37aed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1C0.s @@ -1,9 +1,9 @@ glabel func_8097A1C0 /* 01890 8097A1C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01894 8097A1C4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01898 8097A1C8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 01898 8097A1C8 3C060600 */ lui $a2, %hi(D_06001D20) ## $a2 = 06000000 /* 0189C 8097A1CC 0C25E40C */ jal func_80979030 -/* 018A0 8097A1D0 24C61D20 */ addiu $a2, $a2, 0x1D20 ## $a2 = 06001D20 +/* 018A0 8097A1D0 24C61D20 */ addiu $a2, $a2, %lo(D_06001D20) ## $a2 = 06001D20 /* 018A4 8097A1D4 8FBF0014 */ lw $ra, 0x0014($sp) /* 018A8 8097A1D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018AC 8097A1DC 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1E4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1E4.s index da20290884..6f273f546f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1E4.s @@ -1,9 +1,9 @@ glabel func_8097A1E4 /* 018B4 8097A1E4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 018B8 8097A1E8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 018BC 8097A1EC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 018BC 8097A1EC 3C060600 */ lui $a2, %hi(D_06001D20) ## $a2 = 06000000 /* 018C0 8097A1F0 0C25E447 */ jal func_8097911C -/* 018C4 8097A1F4 24C61D20 */ addiu $a2, $a2, 0x1D20 ## $a2 = 06001D20 +/* 018C4 8097A1F4 24C61D20 */ addiu $a2, $a2, %lo(D_06001D20) ## $a2 = 06001D20 /* 018C8 8097A1F8 8FBF0014 */ lw $ra, 0x0014($sp) /* 018CC 8097A1FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 018D0 8097A200 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A208.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A208.s index 787ec42230..b60071851c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A208.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A208.s @@ -1,8 +1,8 @@ glabel func_8097A208 /* 018D8 8097A208 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 018DC 8097A20C 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 +/* 018DC 8097A20C 3C0E0600 */ lui $t6, %hi(D_06002448) ## $t6 = 06000000 /* 018E0 8097A210 AFBF001C */ sw $ra, 0x001C($sp) -/* 018E4 8097A214 25CE2448 */ addiu $t6, $t6, 0x2448 ## $t6 = 06002448 +/* 018E4 8097A214 25CE2448 */ addiu $t6, $t6, %lo(D_06002448) ## $t6 = 06002448 /* 018E8 8097A218 AFAE0010 */ sw $t6, 0x0010($sp) /* 018EC 8097A21C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 018F0 8097A220 0C25E3F3 */ jal func_80978FCC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3FC.s index 0ef1f5832d..0b8bfe002f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3FC.s @@ -1,9 +1,9 @@ glabel func_8097A3FC /* 01ACC 8097A3FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01AD0 8097A400 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01AD4 8097A404 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 01AD4 8097A404 3C060600 */ lui $a2, %hi(D_06002160) ## $a2 = 06000000 /* 01AD8 8097A408 0C25E40C */ jal func_80979030 -/* 01ADC 8097A40C 24C62160 */ addiu $a2, $a2, 0x2160 ## $a2 = 06002160 +/* 01ADC 8097A40C 24C62160 */ addiu $a2, $a2, %lo(D_06002160) ## $a2 = 06002160 /* 01AE0 8097A410 8FBF0014 */ lw $ra, 0x0014($sp) /* 01AE4 8097A414 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01AE8 8097A418 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A420.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A420.s index a28de33db7..b87dba36d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A420.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A420.s @@ -1,9 +1,9 @@ glabel func_8097A420 /* 01AF0 8097A420 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01AF4 8097A424 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01AF8 8097A428 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 01AF8 8097A428 3C060600 */ lui $a2, %hi(D_06002160) ## $a2 = 06000000 /* 01AFC 8097A42C 0C25E447 */ jal func_8097911C -/* 01B00 8097A430 24C62160 */ addiu $a2, $a2, 0x2160 ## $a2 = 06002160 +/* 01B00 8097A430 24C62160 */ addiu $a2, $a2, %lo(D_06002160) ## $a2 = 06002160 /* 01B04 8097A434 8FBF0014 */ lw $ra, 0x0014($sp) /* 01B08 8097A438 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01B0C 8097A43C 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A444.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A444.s index 29ebb72a42..c71e8c20c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A444.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A444.s @@ -1,8 +1,8 @@ glabel func_8097A444 /* 01B14 8097A444 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01B18 8097A448 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 +/* 01B18 8097A448 3C0E0600 */ lui $t6, %hi(D_06002850) ## $t6 = 06000000 /* 01B1C 8097A44C AFBF001C */ sw $ra, 0x001C($sp) -/* 01B20 8097A450 25CE2850 */ addiu $t6, $t6, 0x2850 ## $t6 = 06002850 +/* 01B20 8097A450 25CE2850 */ addiu $t6, $t6, %lo(D_06002850) ## $t6 = 06002850 /* 01B24 8097A454 AFAE0010 */ sw $t6, 0x0010($sp) /* 01B28 8097A458 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 01B2C 8097A45C 0C25E3F3 */ jal func_80978FCC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5CC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5CC.s index 56c103be38..7dac85f11e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5CC.s @@ -1,9 +1,9 @@ glabel func_8097A5CC /* 01C9C 8097A5CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01CA0 8097A5D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01CA4 8097A5D4 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 01CA4 8097A5D4 3C060600 */ lui $a2, %hi(D_06002600) ## $a2 = 06000000 /* 01CA8 8097A5D8 0C25E40C */ jal func_80979030 -/* 01CAC 8097A5DC 24C62600 */ addiu $a2, $a2, 0x2600 ## $a2 = 06002600 +/* 01CAC 8097A5DC 24C62600 */ addiu $a2, $a2, %lo(D_06002600) ## $a2 = 06002600 /* 01CB0 8097A5E0 8FBF0014 */ lw $ra, 0x0014($sp) /* 01CB4 8097A5E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01CB8 8097A5E8 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5F0.s index c211eaf4d5..e303713b56 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5F0.s @@ -1,9 +1,9 @@ glabel func_8097A5F0 /* 01CC0 8097A5F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01CC4 8097A5F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01CC8 8097A5F8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 01CC8 8097A5F8 3C060600 */ lui $a2, %hi(D_06002600) ## $a2 = 06000000 /* 01CCC 8097A5FC 0C25E447 */ jal func_8097911C -/* 01CD0 8097A600 24C62600 */ addiu $a2, $a2, 0x2600 ## $a2 = 06002600 +/* 01CD0 8097A600 24C62600 */ addiu $a2, $a2, %lo(D_06002600) ## $a2 = 06002600 /* 01CD4 8097A604 8FBF0014 */ lw $ra, 0x0014($sp) /* 01CD8 8097A608 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01CDC 8097A60C 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A614.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A614.s index fbdcbbcc9c..aff5ea12a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A614.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A614.s @@ -1,8 +1,8 @@ glabel func_8097A614 /* 01CE4 8097A614 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01CE8 8097A618 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 +/* 01CE8 8097A618 3C0E0600 */ lui $t6, %hi(D_06002D28) ## $t6 = 06000000 /* 01CEC 8097A61C AFBF001C */ sw $ra, 0x001C($sp) -/* 01CF0 8097A620 25CE2D28 */ addiu $t6, $t6, 0x2D28 ## $t6 = 06002D28 +/* 01CF0 8097A620 25CE2D28 */ addiu $t6, $t6, %lo(D_06002D28) ## $t6 = 06002D28 /* 01CF4 8097A624 AFAE0010 */ sw $t6, 0x0010($sp) /* 01CF8 8097A628 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 01CFC 8097A62C 0C25E3F3 */ jal func_80978FCC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A79C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A79C.s index 26878fee2e..a847e67d2e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A79C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A79C.s @@ -1,9 +1,9 @@ glabel func_8097A79C /* 01E6C 8097A79C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01E70 8097A7A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01E74 8097A7A4 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 01E74 8097A7A4 3C060600 */ lui $a2, %hi(D_06002A40) ## $a2 = 06000000 /* 01E78 8097A7A8 0C25E40C */ jal func_80979030 -/* 01E7C 8097A7AC 24C62A40 */ addiu $a2, $a2, 0x2A40 ## $a2 = 06002A40 +/* 01E7C 8097A7AC 24C62A40 */ addiu $a2, $a2, %lo(D_06002A40) ## $a2 = 06002A40 /* 01E80 8097A7B0 8FBF0014 */ lw $ra, 0x0014($sp) /* 01E84 8097A7B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01E88 8097A7B8 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7C0.s index de1c3eab71..8b2a63892f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7C0.s @@ -1,9 +1,9 @@ glabel func_8097A7C0 /* 01E90 8097A7C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01E94 8097A7C4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01E98 8097A7C8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 01E98 8097A7C8 3C060600 */ lui $a2, %hi(D_06002A40) ## $a2 = 06000000 /* 01E9C 8097A7CC 0C25E447 */ jal func_8097911C -/* 01EA0 8097A7D0 24C62A40 */ addiu $a2, $a2, 0x2A40 ## $a2 = 06002A40 +/* 01EA0 8097A7D0 24C62A40 */ addiu $a2, $a2, %lo(D_06002A40) ## $a2 = 06002A40 /* 01EA4 8097A7D4 8FBF0014 */ lw $ra, 0x0014($sp) /* 01EA8 8097A7D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 01EAC 8097A7DC 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7E4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7E4.s index 7d4dc7593b..412e0009e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7E4.s @@ -1,8 +1,8 @@ glabel func_8097A7E4 /* 01EB4 8097A7E4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01EB8 8097A7E8 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 +/* 01EB8 8097A7E8 3C0E0600 */ lui $t6, %hi(D_06002FE4) ## $t6 = 06000000 /* 01EBC 8097A7EC AFBF001C */ sw $ra, 0x001C($sp) -/* 01EC0 8097A7F0 25CE2FE4 */ addiu $t6, $t6, 0x2FE4 ## $t6 = 06002FE4 +/* 01EC0 8097A7F0 25CE2FE4 */ addiu $t6, $t6, %lo(D_06002FE4) ## $t6 = 06002FE4 /* 01EC4 8097A7F4 AFAE0010 */ sw $t6, 0x0010($sp) /* 01EC8 8097A7F8 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 01ECC 8097A7FC 0C25E3F3 */ jal func_80978FCC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A96C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A96C.s index 354a0772d2..9ed94f294a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A96C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A96C.s @@ -1,9 +1,9 @@ glabel func_8097A96C /* 0203C 8097A96C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02040 8097A970 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02044 8097A974 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 02044 8097A974 3C060600 */ lui $a2, %hi(D_06002E80) ## $a2 = 06000000 /* 02048 8097A978 0C25E40C */ jal func_80979030 -/* 0204C 8097A97C 24C62E80 */ addiu $a2, $a2, 0x2E80 ## $a2 = 06002E80 +/* 0204C 8097A97C 24C62E80 */ addiu $a2, $a2, %lo(D_06002E80) ## $a2 = 06002E80 /* 02050 8097A980 8FBF0014 */ lw $ra, 0x0014($sp) /* 02054 8097A984 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02058 8097A988 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A990.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A990.s index 91d43794e3..abf38b71e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A990.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A990.s @@ -1,9 +1,9 @@ glabel func_8097A990 /* 02060 8097A990 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02064 8097A994 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02068 8097A998 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 02068 8097A998 3C060600 */ lui $a2, %hi(D_06002E80) ## $a2 = 06000000 /* 0206C 8097A99C 0C25E447 */ jal func_8097911C -/* 02070 8097A9A0 24C62E80 */ addiu $a2, $a2, 0x2E80 ## $a2 = 06002E80 +/* 02070 8097A9A0 24C62E80 */ addiu $a2, $a2, %lo(D_06002E80) ## $a2 = 06002E80 /* 02074 8097A9A4 8FBF0014 */ lw $ra, 0x0014($sp) /* 02078 8097A9A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0207C 8097A9AC 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9B4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9B4.s index 05b551ac1f..fda5e1b623 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9B4.s @@ -1,8 +1,8 @@ glabel func_8097A9B4 /* 02084 8097A9B4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02088 8097A9B8 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 +/* 02088 8097A9B8 3C0E0600 */ lui $t6, %hi(D_060033E0) ## $t6 = 06000000 /* 0208C 8097A9BC AFBF001C */ sw $ra, 0x001C($sp) -/* 02090 8097A9C0 25CE33E0 */ addiu $t6, $t6, 0x33E0 ## $t6 = 060033E0 +/* 02090 8097A9C0 25CE33E0 */ addiu $t6, $t6, %lo(D_060033E0) ## $t6 = 060033E0 /* 02094 8097A9C4 AFAE0010 */ sw $t6, 0x0010($sp) /* 02098 8097A9C8 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 /* 0209C 8097A9CC 0C25E3F3 */ jal func_80978FCC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB3C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB3C.s index 5bc86abb56..c93d52c5b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB3C.s @@ -1,9 +1,9 @@ glabel func_8097AB3C /* 0220C 8097AB3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02210 8097AB40 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02214 8097AB44 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 02214 8097AB44 3C060600 */ lui $a2, %hi(D_06003190) ## $a2 = 06000000 /* 02218 8097AB48 0C25E40C */ jal func_80979030 -/* 0221C 8097AB4C 24C63190 */ addiu $a2, $a2, 0x3190 ## $a2 = 06003190 +/* 0221C 8097AB4C 24C63190 */ addiu $a2, $a2, %lo(D_06003190) ## $a2 = 06003190 /* 02220 8097AB50 8FBF0014 */ lw $ra, 0x0014($sp) /* 02224 8097AB54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02228 8097AB58 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB60.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB60.s index d00f353439..85aab1eb4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB60.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB60.s @@ -1,9 +1,9 @@ glabel func_8097AB60 /* 02230 8097AB60 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02234 8097AB64 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02238 8097AB68 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 02238 8097AB68 3C060600 */ lui $a2, %hi(D_06003190) ## $a2 = 06000000 /* 0223C 8097AB6C 0C25E447 */ jal func_8097911C -/* 02240 8097AB70 24C63190 */ addiu $a2, $a2, 0x3190 ## $a2 = 06003190 +/* 02240 8097AB70 24C63190 */ addiu $a2, $a2, %lo(D_06003190) ## $a2 = 06003190 /* 02244 8097AB74 8FBF0014 */ lw $ra, 0x0014($sp) /* 02248 8097AB78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0224C 8097AB7C 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB84.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB84.s index a34955c3ec..dac2869cae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB84.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB84.s @@ -1,8 +1,8 @@ glabel func_8097AB84 /* 02254 8097AB84 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02258 8097AB88 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 +/* 02258 8097AB88 3C0E0600 */ lui $t6, %hi(D_06003AF0) ## $t6 = 06000000 /* 0225C 8097AB8C AFBF001C */ sw $ra, 0x001C($sp) -/* 02260 8097AB90 25CE3AF0 */ addiu $t6, $t6, 0x3AF0 ## $t6 = 06003AF0 +/* 02260 8097AB90 25CE3AF0 */ addiu $t6, $t6, %lo(D_06003AF0) ## $t6 = 06003AF0 /* 02264 8097AB94 AFAE0010 */ sw $t6, 0x0010($sp) /* 02268 8097AB98 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 0226C 8097AB9C 0C25E3F3 */ jal func_80978FCC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD78.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD78.s index 4a7a199f73..2c02d32406 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD78.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD78.s @@ -1,9 +1,9 @@ glabel func_8097AD78 /* 02448 8097AD78 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0244C 8097AD7C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02450 8097AD80 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 02450 8097AD80 3C060600 */ lui $a2, %hi(D_06003710) ## $a2 = 06000000 /* 02454 8097AD84 0C25E40C */ jal func_80979030 -/* 02458 8097AD88 24C63710 */ addiu $a2, $a2, 0x3710 ## $a2 = 06003710 +/* 02458 8097AD88 24C63710 */ addiu $a2, $a2, %lo(D_06003710) ## $a2 = 06003710 /* 0245C 8097AD8C 8FBF0014 */ lw $ra, 0x0014($sp) /* 02460 8097AD90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02464 8097AD94 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD9C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD9C.s index ccd01c7810..f96dcefa97 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD9C.s @@ -1,9 +1,9 @@ glabel func_8097AD9C /* 0246C 8097AD9C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02470 8097ADA0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02474 8097ADA4 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 02474 8097ADA4 3C060600 */ lui $a2, %hi(D_06003710) ## $a2 = 06000000 /* 02478 8097ADA8 0C25E447 */ jal func_8097911C -/* 0247C 8097ADAC 24C63710 */ addiu $a2, $a2, 0x3710 ## $a2 = 06003710 +/* 0247C 8097ADAC 24C63710 */ addiu $a2, $a2, %lo(D_06003710) ## $a2 = 06003710 /* 02480 8097ADB0 8FBF0014 */ lw $ra, 0x0014($sp) /* 02484 8097ADB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02488 8097ADB8 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADC0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADC0.s index 73957e0c08..f4906c3feb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADC0.s @@ -1,8 +1,8 @@ glabel func_8097ADC0 /* 02490 8097ADC0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02494 8097ADC4 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 +/* 02494 8097ADC4 3C0E0600 */ lui $t6, %hi(D_06001B70) ## $t6 = 06000000 /* 02498 8097ADC8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0249C 8097ADCC 25CE1B70 */ addiu $t6, $t6, 0x1B70 ## $t6 = 06001B70 +/* 0249C 8097ADCC 25CE1B70 */ addiu $t6, $t6, %lo(D_06001B70) ## $t6 = 06001B70 /* 024A0 8097ADD0 AFAE0010 */ sw $t6, 0x0010($sp) /* 024A4 8097ADD4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 024A8 8097ADD8 0C25E3F3 */ jal func_80978FCC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AE38.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AE38.s index 6a462e7904..3e329e0e1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AE38.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AE38.s @@ -1,9 +1,9 @@ glabel func_8097AE38 /* 02508 8097AE38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0250C 8097AE3C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02510 8097AE40 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 02510 8097AE40 3C060600 */ lui $a2, %hi(D_06000DC0) ## $a2 = 06000000 /* 02514 8097AE44 0C25E40C */ jal func_80979030 -/* 02518 8097AE48 24C60DC0 */ addiu $a2, $a2, 0x0DC0 ## $a2 = 06000DC0 +/* 02518 8097AE48 24C60DC0 */ addiu $a2, $a2, %lo(D_06000DC0) ## $a2 = 06000DC0 /* 0251C 8097AE4C 8FBF0014 */ lw $ra, 0x0014($sp) /* 02520 8097AE50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02524 8097AE54 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B128.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B128.s index a8aa671bf6..673c3224ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B128.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B128.s @@ -11,8 +11,8 @@ glabel func_8097B128 /* 02808 8097B138 AFA40018 */ sw $a0, 0x0018($sp) /* 0280C 8097B13C 10400019 */ beq $v0, $zero, .L8097B1A4 /* 02810 8097B140 8FA40018 */ lw $a0, 0x0018($sp) -/* 02814 8097B144 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 02818 8097B148 24C61F70 */ addiu $a2, $a2, 0x1F70 ## $a2 = 06001F70 +/* 02814 8097B144 3C060600 */ lui $a2, %hi(D_06001F70) ## $a2 = 06000000 +/* 02818 8097B148 24C61F70 */ addiu $a2, $a2, %lo(D_06001F70) ## $a2 = 06001F70 /* 0281C 8097B14C 8FA5001C */ lw $a1, 0x001C($sp) /* 02820 8097B150 0C25E3D8 */ jal func_80978F60 /* 02824 8097B154 AFA40018 */ sw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B3A0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B3A0.s index 4c660b4ba4..14578c1811 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B3A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B3A0.s @@ -1,9 +1,9 @@ glabel func_8097B3A0 /* 02A70 8097B3A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02A74 8097B3A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02A78 8097B3A8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 02A78 8097B3A8 3C060600 */ lui $a2, %hi(D_06001D20) ## $a2 = 06000000 /* 02A7C 8097B3AC 0C25E40C */ jal func_80979030 -/* 02A80 8097B3B0 24C61D20 */ addiu $a2, $a2, 0x1D20 ## $a2 = 06001D20 +/* 02A80 8097B3B0 24C61D20 */ addiu $a2, $a2, %lo(D_06001D20) ## $a2 = 06001D20 /* 02A84 8097B3B4 8FBF0014 */ lw $ra, 0x0014($sp) /* 02A88 8097B3B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02A8C 8097B3BC 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B6C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B6C4.s index 8fc0de9237..ddb66af9e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B6C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B6C4.s @@ -11,8 +11,8 @@ glabel func_8097B6C4 /* 02DA4 8097B6D4 AFA40018 */ sw $a0, 0x0018($sp) /* 02DA8 8097B6D8 10400019 */ beq $v0, $zero, .L8097B740 /* 02DAC 8097B6DC 8FA40018 */ lw $a0, 0x0018($sp) -/* 02DB0 8097B6E0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 02DB4 8097B6E4 24C62448 */ addiu $a2, $a2, 0x2448 ## $a2 = 06002448 +/* 02DB0 8097B6E0 3C060600 */ lui $a2, %hi(D_06002448) ## $a2 = 06000000 +/* 02DB4 8097B6E4 24C62448 */ addiu $a2, $a2, %lo(D_06002448) ## $a2 = 06002448 /* 02DB8 8097B6E8 8FA5001C */ lw $a1, 0x001C($sp) /* 02DBC 8097B6EC 0C25E3D8 */ jal func_80978F60 /* 02DC0 8097B6F0 AFA40018 */ sw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B8C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B8C4.s index 0ed7b33f31..6191d26fae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B8C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B8C4.s @@ -1,9 +1,9 @@ glabel func_8097B8C4 /* 02F94 8097B8C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02F98 8097B8C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02F9C 8097B8CC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 02F9C 8097B8CC 3C060600 */ lui $a2, %hi(D_06002160) ## $a2 = 06000000 /* 02FA0 8097B8D0 0C25E40C */ jal func_80979030 -/* 02FA4 8097B8D4 24C62160 */ addiu $a2, $a2, 0x2160 ## $a2 = 06002160 +/* 02FA4 8097B8D4 24C62160 */ addiu $a2, $a2, %lo(D_06002160) ## $a2 = 06002160 /* 02FA8 8097B8D8 8FBF0014 */ lw $ra, 0x0014($sp) /* 02FAC 8097B8DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02FB0 8097B8E0 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B9BC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B9BC.s index fff3817fdd..b24c4746a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B9BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B9BC.s @@ -11,8 +11,8 @@ glabel func_8097B9BC /* 0309C 8097B9CC AFA40018 */ sw $a0, 0x0018($sp) /* 030A0 8097B9D0 10400019 */ beq $v0, $zero, .L8097BA38 /* 030A4 8097B9D4 8FA40018 */ lw $a0, 0x0018($sp) -/* 030A8 8097B9D8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 030AC 8097B9DC 24C63AF0 */ addiu $a2, $a2, 0x3AF0 ## $a2 = 06003AF0 +/* 030A8 8097B9D8 3C060600 */ lui $a2, %hi(D_06003AF0) ## $a2 = 06000000 +/* 030AC 8097B9DC 24C63AF0 */ addiu $a2, $a2, %lo(D_06003AF0) ## $a2 = 06003AF0 /* 030B0 8097B9E0 8FA5001C */ lw $a1, 0x001C($sp) /* 030B4 8097B9E4 0C25E3D8 */ jal func_80978F60 /* 030B8 8097B9E8 AFA40018 */ sw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBD8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBD8.s index 73b8ce64a0..6fbbbce114 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBD8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBD8.s @@ -1,9 +1,9 @@ glabel func_8097BBD8 /* 032A8 8097BBD8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 032AC 8097BBDC AFBF0014 */ sw $ra, 0x0014($sp) -/* 032B0 8097BBE0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 032B0 8097BBE0 3C060600 */ lui $a2, %hi(D_06003710) ## $a2 = 06000000 /* 032B4 8097BBE4 0C25E40C */ jal func_80979030 -/* 032B8 8097BBE8 24C63710 */ addiu $a2, $a2, 0x3710 ## $a2 = 06003710 +/* 032B8 8097BBE8 24C63710 */ addiu $a2, $a2, %lo(D_06003710) ## $a2 = 06003710 /* 032BC 8097BBEC 8FBF0014 */ lw $ra, 0x0014($sp) /* 032C0 8097BBF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 032C4 8097BBF4 03E00008 */ jr $ra 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 1fdf633ccd..8d74cb269f 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 @@ -11,33 +11,33 @@ glabel func_80983820 /* 00544 80983844 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00548 80983848 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0054C 8098384C 1041000B */ beq $v0, $at, .L8098387C -/* 00550 80983850 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 +/* 00550 80983850 3C0F0600 */ lui $t7, %hi(D_06000660) ## $t7 = 06000000 /* 00554 80983854 10000010 */ beq $zero, $zero, .L80983898 -/* 00558 80983858 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 +/* 00558 80983858 3C180600 */ lui $t8, %hi(D_06000380) ## $t8 = 06000000 .L8098385C: -/* 0055C 8098385C 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 +/* 0055C 8098385C 3C0E0600 */ lui $t6, %hi(D_06000C90) ## $t6 = 06000000 /* 00560 80983860 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00564 80983864 25CE0C90 */ addiu $t6, $t6, 0x0C90 ## $t6 = 06000C90 -/* 00568 80983868 3C110600 */ lui $s1, 0x0600 ## $s1 = 06000000 +/* 00564 80983864 25CE0C90 */ addiu $t6, $t6, %lo(D_06000C90) ## $t6 = 06000C90 +/* 00568 80983868 3C110600 */ lui $s1, %hi(D_06000C6C) ## $s1 = 06000000 /* 0056C 8098386C 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 /* 00570 80983870 AFAE0048 */ sw $t6, 0x0048($sp) /* 00574 80983874 1000000E */ beq $zero, $zero, .L809838B0 -/* 00578 80983878 26310C6C */ addiu $s1, $s1, 0x0C6C ## $s1 = 06000C6C +/* 00578 80983878 26310C6C */ addiu $s1, $s1, %lo(D_06000C6C) ## $s1 = 06000C6C .L8098387C: /* 0057C 8098387C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00580 80983880 25EF0660 */ addiu $t7, $t7, 0x0660 ## $t7 = 06000660 -/* 00584 80983884 3C110600 */ lui $s1, 0x0600 ## $s1 = 06000000 +/* 00580 80983880 25EF0660 */ addiu $t7, $t7, %lo(D_06000660) ## $t7 = 06000660 +/* 00584 80983884 3C110600 */ lui $s1, %hi(D_06000634) ## $s1 = 06000000 /* 00588 80983888 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 /* 0058C 8098388C AFAF0048 */ sw $t7, 0x0048($sp) /* 00590 80983890 10000007 */ beq $zero, $zero, .L809838B0 -/* 00594 80983894 26310634 */ addiu $s1, $s1, 0x0634 ## $s1 = 06000634 +/* 00594 80983894 26310634 */ addiu $s1, $s1, %lo(D_06000634) ## $s1 = 06000634 .L80983898: /* 00598 80983898 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 0059C 8098389C 27180380 */ addiu $t8, $t8, 0x0380 ## $t8 = 06000380 -/* 005A0 809838A0 3C110600 */ lui $s1, 0x0600 ## $s1 = 06000000 +/* 0059C 8098389C 27180380 */ addiu $t8, $t8, %lo(D_06000380) ## $t8 = 06000380 +/* 005A0 809838A0 3C110600 */ lui $s1, %hi(D_0600035C) ## $s1 = 06000000 /* 005A4 809838A4 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 /* 005A8 809838A8 AFB80048 */ sw $t8, 0x0048($sp) -/* 005AC 809838AC 2631035C */ addiu $s1, $s1, 0x035C ## $s1 = 0600035C +/* 005AC 809838AC 2631035C */ addiu $s1, $s1, %lo(D_0600035C) ## $s1 = 0600035C .L809838B0: /* 005B0 809838B0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 005B4 809838B4 44070000 */ mfc1 $a3, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s index fc97129a04..b4b8d4757a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s @@ -57,8 +57,8 @@ glabel func_80983B58 /* 008E8 80983BE8 0C0346A2 */ jal Matrix_NewMtx /* 008EC 80983BEC AFA20038 */ sw $v0, 0x0038($sp) /* 008F0 80983BF0 8FA30038 */ lw $v1, 0x0038($sp) -/* 008F4 80983BF4 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 -/* 008F8 80983BF8 256B6BE0 */ addiu $t3, $t3, 0x6BE0 ## $t3 = 06016BE0 +/* 008F4 80983BF4 3C0B0601 */ lui $t3, %hi(D_06016BE0) ## $t3 = 06010000 +/* 008F8 80983BF8 256B6BE0 */ addiu $t3, $t3, %lo(D_06016BE0) ## $t3 = 06016BE0 /* 008FC 80983BFC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00900 80983C00 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00904 80983C04 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 @@ -80,8 +80,8 @@ glabel func_80983B58 /* 00940 80983C40 0C0346A2 */ jal Matrix_NewMtx /* 00944 80983C44 AFA20030 */ sw $v0, 0x0030($sp) /* 00948 80983C48 8FA30030 */ lw $v1, 0x0030($sp) -/* 0094C 80983C4C 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 -/* 00950 80983C50 27186F88 */ addiu $t8, $t8, 0x6F88 ## $t8 = 06016F88 +/* 0094C 80983C4C 3C180601 */ lui $t8, %hi(D_06016F88) ## $t8 = 06010000 +/* 00950 80983C50 27186F88 */ addiu $t8, $t8, %lo(D_06016F88) ## $t8 = 06016F88 /* 00954 80983C54 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00958 80983C58 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0095C 80983C5C 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s index a02372a1a8..d8507009de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s @@ -11,32 +11,32 @@ glabel func_80983E28 /* 00B4C 80983E4C 8FA40054 */ lw $a0, 0x0054($sp) /* 00B50 80983E50 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 00B54 80983E54 1041000B */ beq $v0, $at, .L80983E84 -/* 00B58 80983E58 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 +/* 00B58 80983E58 3C060602 */ lui $a2, %hi(D_0601EE60) ## $a2 = 06020000 /* 00B5C 80983E5C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00B60 80983E60 1041000C */ beq $v0, $at, .L80983E94 -/* 00B64 80983E64 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 00B64 80983E64 3C060600 */ lui $a2, %hi(D_06000F30) ## $a2 = 06000000 /* 00B68 80983E68 1000000E */ beq $zero, $zero, .L80983EA4 -/* 00B6C 80983E6C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 00B6C 80983E6C 3C060600 */ lui $a2, %hi(D_06000900) ## $a2 = 06000000 .L80983E70: -/* 00B70 80983E70 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 -/* 00B74 80983E74 3C100602 */ lui $s0, 0x0602 ## $s0 = 06020000 -/* 00B78 80983E78 24C6EB40 */ addiu $a2, $a2, 0xEB40 ## $a2 = 0601EB40 +/* 00B70 80983E70 3C060602 */ lui $a2, %hi(D_0601EB40) ## $a2 = 06020000 +/* 00B74 80983E74 3C100602 */ lui $s0, %hi(D_0601EB14) ## $s0 = 06020000 +/* 00B78 80983E78 24C6EB40 */ addiu $a2, $a2, %lo(D_0601EB40) ## $a2 = 0601EB40 /* 00B7C 80983E7C 1000000C */ beq $zero, $zero, .L80983EB0 -/* 00B80 80983E80 2610EB14 */ addiu $s0, $s0, 0xEB14 ## $s0 = 0601EB14 +/* 00B80 80983E80 2610EB14 */ addiu $s0, $s0, %lo(D_0601EB14) ## $s0 = 0601EB14 .L80983E84: -/* 00B84 80983E84 3C100602 */ lui $s0, 0x0602 ## $s0 = 06020000 -/* 00B88 80983E88 24C6EE60 */ addiu $a2, $a2, 0xEE60 ## $a2 = 0601D9A0 +/* 00B84 80983E84 3C100602 */ lui $s0, %hi(D_0601EE34) ## $s0 = 06020000 +/* 00B88 80983E88 24C6EE60 */ addiu $a2, $a2, %lo(D_0601EE60) ## $a2 = 0601D9A0 /* 00B8C 80983E8C 10000008 */ beq $zero, $zero, .L80983EB0 -/* 00B90 80983E90 2610EE34 */ addiu $s0, $s0, 0xEE34 ## $s0 = 0601EE34 +/* 00B90 80983E90 2610EE34 */ addiu $s0, $s0, %lo(D_0601EE34) ## $s0 = 0601EE34 .L80983E94: -/* 00B94 80983E94 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 -/* 00B98 80983E98 24C60F30 */ addiu $a2, $a2, 0x0F30 ## $a2 = 0601E8D0 +/* 00B94 80983E94 3C100600 */ lui $s0, %hi(D_06000F0C) ## $s0 = 06000000 +/* 00B98 80983E98 24C60F30 */ addiu $a2, $a2, %lo(D_06000F30) ## $a2 = 0601E8D0 /* 00B9C 80983E9C 10000004 */ beq $zero, $zero, .L80983EB0 -/* 00BA0 80983EA0 26100F0C */ addiu $s0, $s0, 0x0F0C ## $s0 = 06000F0C +/* 00BA0 80983EA0 26100F0C */ addiu $s0, $s0, %lo(D_06000F0C) ## $s0 = 06000F0C .L80983EA4: -/* 00BA4 80983EA4 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 -/* 00BA8 80983EA8 24C60900 */ addiu $a2, $a2, 0x0900 ## $a2 = 0601F1D0 -/* 00BAC 80983EAC 261008DC */ addiu $s0, $s0, 0x08DC ## $s0 = 060008DC +/* 00BA4 80983EA4 3C100600 */ lui $s0, %hi(D_060008DC) ## $s0 = 06000000 +/* 00BA8 80983EA8 24C60900 */ addiu $a2, $a2, %lo(D_06000900) ## $a2 = 0601F1D0 +/* 00BAC 80983EAC 261008DC */ addiu $s0, $s0, %lo(D_060008DC) ## $s0 = 060008DC .L80983EB0: /* 00BB0 80983EB0 2625014C */ addiu $a1, $s1, 0x014C ## $a1 = 0000014C /* 00BB4 80983EB4 262E0190 */ addiu $t6, $s1, 0x0190 ## $t6 = 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s index 5bc7486a42..3df31b17f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s @@ -78,8 +78,8 @@ glabel func_809841F4 /* 00FB8 809842B8 0C0346A2 */ jal Matrix_NewMtx /* 00FBC 809842BC AFA20044 */ sw $v0, 0x0044($sp) /* 00FC0 809842C0 8FA30044 */ lw $v1, 0x0044($sp) -/* 00FC4 809842C4 3C0A0601 */ lui $t2, 0x0601 ## $t2 = 06010000 -/* 00FC8 809842C8 254A7028 */ addiu $t2, $t2, 0x7028 ## $t2 = 06017028 +/* 00FC4 809842C4 3C0A0601 */ lui $t2, %hi(D_06017028) ## $t2 = 06010000 +/* 00FC8 809842C8 254A7028 */ addiu $t2, $t2, %lo(D_06017028) ## $t2 = 06017028 /* 00FCC 809842CC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00FD0 809842D0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00FD4 809842D4 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 @@ -101,8 +101,8 @@ glabel func_809841F4 /* 01010 80984310 0C0346A2 */ jal Matrix_NewMtx /* 01014 80984314 AFA2003C */ sw $v0, 0x003C($sp) /* 01018 80984318 8FA3003C */ lw $v1, 0x003C($sp) -/* 0101C 8098431C 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 -/* 01020 80984320 25EF7170 */ addiu $t7, $t7, 0x7170 ## $t7 = 06017170 +/* 0101C 8098431C 3C0F0601 */ lui $t7, %hi(D_06017170) ## $t7 = 06010000 +/* 01020 80984320 25EF7170 */ addiu $t7, $t7, %lo(D_06017170) ## $t7 = 06017170 /* 01024 80984324 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01028 80984328 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0102C 8098432C 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 @@ -124,8 +124,8 @@ glabel func_809841F4 /* 01068 80984368 0C0346A2 */ jal Matrix_NewMtx /* 0106C 8098436C AFA20034 */ sw $v0, 0x0034($sp) /* 01070 80984370 8FA30034 */ lw $v1, 0x0034($sp) -/* 01074 80984374 3C0A0601 */ lui $t2, 0x0601 ## $t2 = 06010000 -/* 01078 80984378 254A6BE0 */ addiu $t2, $t2, 0x6BE0 ## $t2 = 06016BE0 +/* 01074 80984374 3C0A0601 */ lui $t2, %hi(D_06016BE0) ## $t2 = 06010000 +/* 01078 80984378 254A6BE0 */ addiu $t2, $t2, %lo(D_06016BE0) ## $t2 = 06016BE0 /* 0107C 8098437C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01080 80984380 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01084 80984384 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 @@ -147,8 +147,8 @@ glabel func_809841F4 /* 010C0 809843C0 0C0346A2 */ jal Matrix_NewMtx /* 010C4 809843C4 AFA2002C */ sw $v0, 0x002C($sp) /* 010C8 809843C8 8FA3002C */ lw $v1, 0x002C($sp) -/* 010CC 809843CC 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 -/* 010D0 809843D0 25EF6CD8 */ addiu $t7, $t7, 0x6CD8 ## $t7 = 06016CD8 +/* 010CC 809843CC 3C0F0601 */ lui $t7, %hi(D_06016CD8) ## $t7 = 06010000 +/* 010D0 809843D0 25EF6CD8 */ addiu $t7, $t7, %lo(D_06016CD8) ## $t7 = 06016CD8 /* 010D4 809843D4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 010D8 809843D8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 010DC 809843DC 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 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 575f78d9e8..3ee26d48a3 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 @@ -57,8 +57,8 @@ glabel func_80989D24 /* 00F20 80989DA0 4481D000 */ mtc1 $at, $f26 ## $f26 = 10.00 /* 00F24 80989DA4 3C01457A */ lui $at, 0x457A ## $at = 457A0000 /* 00F28 80989DA8 4481C000 */ mtc1 $at, $f24 ## $f24 = 4000.00 -/* 00F2C 80989DAC 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 00F30 80989DB0 25CE0080 */ addiu $t6, $t6, 0x0080 ## $t6 = 06000080 +/* 00F2C 80989DAC 3C0E0600 */ lui $t6, %hi(D_06000080) ## $t6 = 06000000 +/* 00F30 80989DB0 25CE0080 */ addiu $t6, $t6, %lo(D_06000080) ## $t6 = 06000080 /* 00F34 80989DB4 3C018099 */ lui $at, %hi(D_8098CB2C) ## $at = 80990000 /* 00F38 80989DB8 3C1E8099 */ lui $s8, %hi(D_8098C8AC) ## $s8 = 80990000 /* 00F3C 80989DBC 3C17DA38 */ lui $s7, 0xDA38 ## $s7 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s index 8a5aba9d62..34a48e02ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s @@ -99,8 +99,8 @@ glabel func_8098A36C /* 01618 8098A498 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 /* 0161C 8098A49C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01620 8098A4A0 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 01624 8098A4A4 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 01628 8098A4A8 27390DE0 */ addiu $t9, $t9, 0x0DE0 ## $t9 = 06000DE0 +/* 01624 8098A4A4 3C190600 */ lui $t9, %hi(D_06000DE0) ## $t9 = 06000000 +/* 01628 8098A4A8 27390DE0 */ addiu $t9, $t9, %lo(D_06000DE0) ## $t9 = 06000DE0 /* 0162C 8098A4AC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01630 8098A4B0 AE2F02C0 */ sw $t7, 0x02C0($s1) ## 000002C0 /* 01634 8098A4B4 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 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 07d49b8efc..56c7ab8b1e 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 @@ -39,10 +39,10 @@ glabel func_8098A4F0 /* 016CC 8098A54C 24070591 */ addiu $a3, $zero, 0x0591 ## $a3 = 00000591 /* 016D0 8098A550 0C031AB1 */ jal Graph_OpenDisps /* 016D4 8098A554 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 016D8 8098A558 3C020405 */ lui $v0, 0x0405 ## $v0 = 04050000 +/* 016D8 8098A558 3C020405 */ lui $v0, %hi(D_04052DB0) ## $v0 = 04050000 /* 016DC 8098A55C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 016E0 8098A560 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 016E4 8098A564 24422DB0 */ addiu $v0, $v0, 0x2DB0 ## $v0 = 04052DB0 +/* 016E4 8098A564 24422DB0 */ addiu $v0, $v0, %lo(D_04052DB0) ## $v0 = 04052DB0 /* 016E8 8098A568 0041B824 */ and $s7, $v0, $at /* 016EC 8098A56C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 016F0 8098A570 4481F000 */ mtc1 $at, $f30 ## $f30 = 30.00 @@ -50,15 +50,15 @@ glabel func_8098A4F0 /* 016F8 8098A578 000E7F02 */ srl $t7, $t6, 28 /* 016FC 8098A57C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 01700 8098A580 3C198016 */ lui $t9, %hi(gSegments) -/* 01704 8098A584 3C080401 */ lui $t0, 0x0401 ## $t0 = 04010000 -/* 01708 8098A588 25080050 */ addiu $t0, $t0, 0x0050 ## $t0 = 04010050 +/* 01704 8098A584 3C080401 */ lui $t0, %hi(D_04010050) ## $t0 = 04010000 +/* 01708 8098A588 25080050 */ addiu $t0, $t0, %lo(D_04010050) ## $t0 = 04010050 /* 0170C 8098A58C 27396FA8 */ addiu $t9, %lo(gSegments) /* 01710 8098A590 000FC080 */ sll $t8, $t7, 2 -/* 01714 8098A594 3C1E0100 */ lui $s8, 0x0100 ## $s8 = 01000000 +/* 01714 8098A594 3C1E0100 */ lui $s8, %hi(D_01000000) ## $s8 = 01000000 /* 01718 8098A598 3C15E300 */ lui $s5, 0xE300 ## $s5 = E3000000 /* 0171C 8098A59C 4481E000 */ mtc1 $at, $f28 ## $f28 = 120.00 /* 01720 8098A5A0 36B51801 */ ori $s5, $s5, 0x1801 ## $s5 = E3001801 -/* 01724 8098A5A4 27DE0000 */ addiu $s8, $s8, 0x0000 ## $s8 = 01000000 +/* 01724 8098A5A4 27DE0000 */ addiu $s8, $s8, %lo(D_01000000) ## $s8 = 01000000 /* 01728 8098A5A8 0319B021 */ addu $s6, $t8, $t9 /* 0172C 8098A5AC AFA80078 */ sw $t0, 0x0078($sp) /* 01730 8098A5B0 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s index 90ef4573bc..e472c9b0c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s @@ -52,8 +52,8 @@ glabel func_8098A854 /* 01A54 8098A8D4 0C0346A2 */ jal Matrix_NewMtx /* 01A58 8098A8D8 AFA20030 */ sw $v0, 0x0030($sp) /* 01A5C 8098A8DC 8FA30030 */ lw $v1, 0x0030($sp) -/* 01A60 8098A8E0 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 01A64 8098A8E4 25297440 */ addiu $t1, $t1, 0x7440 ## $t1 = 06007440 +/* 01A60 8098A8E0 3C090600 */ lui $t1, %hi(D_06007440) ## $t1 = 06000000 +/* 01A64 8098A8E4 25297440 */ addiu $t1, $t1, %lo(D_06007440) ## $t1 = 06007440 /* 01A68 8098A8E8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01A6C 8098A8EC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 01A70 8098A8F0 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 @@ -81,8 +81,8 @@ glabel func_8098A854 /* 01AC8 8098A948 0C0346A2 */ jal Matrix_NewMtx /* 01ACC 8098A94C AFA20028 */ sw $v0, 0x0028($sp) /* 01AD0 8098A950 8FA30028 */ lw $v1, 0x0028($sp) -/* 01AD4 8098A954 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 01AD8 8098A958 25EF7578 */ addiu $t7, $t7, 0x7578 ## $t7 = 06007578 +/* 01AD4 8098A954 3C0F0600 */ lui $t7, %hi(D_06007578) ## $t7 = 06000000 +/* 01AD8 8098A958 25EF7578 */ addiu $t7, $t7, %lo(D_06007578) ## $t7 = 06007578 /* 01ADC 8098A95C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01AE0 8098A960 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 01AE4 8098A964 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 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 0e4c14694b..b43dd87e4a 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 @@ -67,8 +67,8 @@ glabel func_8098A9A4 /* 01BEC 8098AA6C 0C0346A2 */ jal Matrix_NewMtx /* 01BF0 8098AA70 AFA20034 */ sw $v0, 0x0034($sp) /* 01BF4 8098AA74 8FA30034 */ lw $v1, 0x0034($sp) -/* 01BF8 8098AA78 3C0D0601 */ lui $t5, 0x0601 ## $t5 = 06010000 -/* 01BFC 8098AA7C 25AD8390 */ addiu $t5, $t5, 0x8390 ## $t5 = 06008390 +/* 01BF8 8098AA78 3C0D0601 */ lui $t5, %hi(D_06008390) ## $t5 = 06010000 +/* 01BFC 8098AA7C 25AD8390 */ addiu $t5, $t5, %lo(D_06008390) ## $t5 = 06008390 /* 01C00 8098AA80 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01C04 8098AA84 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01C08 8098AA88 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 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 08352e1b03..4baac2b68a 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 @@ -390,8 +390,8 @@ glabel func_8098ABC0 /* 02274 8098B0F4 93AF00B7 */ lbu $t7, 0x00B7($sp) /* 02278 8098B0F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0227C 8098B0FC 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 02280 8098B100 3C0D0401 */ lui $t5, 0x0401 ## $t5 = 04010000 -/* 02284 8098B104 25AD0130 */ addiu $t5, $t5, 0x0130 ## $t5 = 04010130 +/* 02280 8098B100 3C0D0401 */ lui $t5, %hi(D_04010130) ## $t5 = 04010000 +/* 02284 8098B104 25AD0130 */ addiu $t5, $t5, %lo(D_04010130) ## $t5 = 04010130 /* 02288 8098B108 02417021 */ addu $t6, $s2, $at /* 0228C 8098B10C AFAE0078 */ sw $t6, 0x0078($sp) /* 02290 8098B110 11E00007 */ beq $t7, $zero, .L8098B130 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s index d8f62623d1..44206c11f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s @@ -309,8 +309,8 @@ glabel func_8098B354 /* 028E4 8098B764 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 028E8 8098B768 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 /* 028EC 8098B76C 44060000 */ mfc1 $a2, $f0 -/* 028F0 8098B770 3C150401 */ lui $s5, 0x0401 ## $s5 = 04010000 -/* 028F4 8098B774 26B50130 */ addiu $s5, $s5, 0x0130 ## $s5 = 04010130 +/* 028F0 8098B770 3C150401 */ lui $s5, %hi(D_04010130) ## $s5 = 04010000 +/* 028F4 8098B774 26B50130 */ addiu $s5, $s5, %lo(D_04010130) ## $s5 = 04010130 /* 028F8 8098B778 02C19021 */ addu $s2, $s6, $at /* 028FC 8098B77C 0C034261 */ jal Matrix_Translate /* 02900 8098B780 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s index cda4292ef7..c7f0015106 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s @@ -84,8 +84,8 @@ glabel DemoKekkai_Draw /* 01060 8098E030 0C0253D0 */ jal Gfx_TwoTexScroll /* 01064 8098E034 AFA2004C */ sw $v0, 0x004C($sp) /* 01068 8098E038 8FA3004C */ lw $v1, 0x004C($sp) -/* 0106C 8098E03C 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 01070 8098E040 25CE4930 */ addiu $t6, $t6, 0x4930 ## $t6 = 06004930 +/* 0106C 8098E03C 3C0E0600 */ lui $t6, %hi(D_06004930) ## $t6 = 06000000 +/* 01070 8098E040 25CE4930 */ addiu $t6, $t6, %lo(D_06004930) ## $t6 = 06004930 /* 01074 8098E044 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01078 8098E048 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0107C 8098E04C 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 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 0979aaf0e6..6eaa3f5f15 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 @@ -42,8 +42,8 @@ glabel func_8098D9C0 /* 00A44 8098DA14 152CFFF8 */ bne $t1, $t4, .L8098D9F8 /* 00A48 8098DA18 AF2BFFFC */ sw $t3, -0x0004($t9) ## FFFFFF98 /* 00A4C 8098DA1C 8D2B0000 */ lw $t3, 0x0000($t1) ## 8098E174 -/* 00A50 8098DA20 3C020600 */ lui $v0, 0x0600 ## $v0 = 06000000 -/* 00A54 8098DA24 24424FD0 */ addiu $v0, $v0, 0x4FD0 ## $v0 = 06004FD0 +/* 00A50 8098DA20 3C020600 */ lui $v0, %hi(D_06004FD0) ## $v0 = 06000000 +/* 00A54 8098DA24 24424FD0 */ addiu $v0, $v0, %lo(D_06004FD0) ## $v0 = 06004FD0 /* 00A58 8098DA28 AF2B0000 */ sw $t3, 0x0000($t9) ## FFFFFF9C /* 00A5C 8098DA2C 952B0004 */ lhu $t3, 0x0004($t1) ## 8098E178 /* 00A60 8098DA30 00026900 */ sll $t5, $v0, 4 @@ -199,8 +199,8 @@ glabel func_8098D9C0 /* 00CB4 8098DC84 0C0253D0 */ jal Gfx_TwoTexScroll /* 00CB8 8098DC88 AFA20080 */ sw $v0, 0x0080($sp) /* 00CBC 8098DC8C 8FA30080 */ lw $v1, 0x0080($sp) -/* 00CC0 8098DC90 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 -/* 00CC4 8098DC94 258C5CB0 */ addiu $t4, $t4, 0x5CB0 ## $t4 = 06005CB0 +/* 00CC0 8098DC90 3C0C0600 */ lui $t4, %hi(D_06005CB0) ## $t4 = 06000000 +/* 00CC4 8098DC94 258C5CB0 */ addiu $t4, $t4, %lo(D_06005CB0) ## $t4 = 06005CB0 /* 00CC8 8098DC98 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00CCC 8098DC9C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002C6 /* 00CD0 8098DCA0 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 @@ -266,8 +266,8 @@ glabel func_8098D9C0 /* 00DC0 8098DD90 0C0253D0 */ jal Gfx_TwoTexScroll /* 00DC4 8098DD94 AFAE001C */ sw $t6, 0x001C($sp) /* 00DC8 8098DD98 8FA3006C */ lw $v1, 0x006C($sp) -/* 00DCC 8098DD9C 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 00DD0 8098DDA0 254A4F00 */ addiu $t2, $t2, 0x4F00 ## $t2 = 06004F00 +/* 00DCC 8098DD9C 3C0A0600 */ lui $t2, %hi(D_06004F00) ## $t2 = 06000000 +/* 00DD0 8098DDA0 254A4F00 */ addiu $t2, $t2, %lo(D_06004F00) ## $t2 = 06004F00 /* 00DD4 8098DDA4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00DD8 8098DDA8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002C6 /* 00DDC 8098DDAC 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 @@ -342,8 +342,8 @@ glabel func_8098D9C0 /* 00EF0 8098DEC0 0C0253D0 */ jal Gfx_TwoTexScroll /* 00EF4 8098DEC4 AFA6001C */ sw $a2, 0x001C($sp) /* 00EF8 8098DEC8 8FA30058 */ lw $v1, 0x0058($sp) -/* 00EFC 8098DECC 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 00F00 8098DED0 27185A30 */ addiu $t8, $t8, 0x5A30 ## $t8 = 06005A30 +/* 00EFC 8098DECC 3C180600 */ lui $t8, %hi(D_06005A30) ## $t8 = 06000000 +/* 00F00 8098DED0 27185A30 */ addiu $t8, $t8, %lo(D_06005A30) ## $t8 = 06005A30 /* 00F04 8098DED4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00F08 8098DED8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002C6 /* 00F0C 8098DEDC 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s index 730556b295..be58c48303 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s @@ -89,13 +89,13 @@ glabel DoorKiller_Init /* 000F4 80994D44 01200008 */ jr $t1 /* 000F8 80994D48 00000000 */ nop glabel L80994D4C -/* 000FC 80994D4C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 000FC 80994D4C 3C060600 */ lui $a2, %hi(D_06001BC8) ## $a2 = 06000000 /* 00100 80994D50 26420192 */ addiu $v0, $s2, 0x0192 ## $v0 = 00000192 /* 00104 80994D54 240A0009 */ addiu $t2, $zero, 0x0009 ## $t2 = 00000009 /* 00108 80994D58 AFAA0018 */ sw $t2, 0x0018($sp) /* 0010C 80994D5C AFA20010 */ sw $v0, 0x0010($sp) /* 00110 80994D60 AFA20014 */ sw $v0, 0x0014($sp) -/* 00114 80994D64 24C61BC8 */ addiu $a2, $a2, 0x1BC8 ## $a2 = 06001BC8 +/* 00114 80994D64 24C61BC8 */ addiu $a2, $a2, %lo(D_06001BC8) ## $a2 = 06001BC8 /* 00118 80994D68 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 0011C 80994D6C 2645014C */ addiu $a1, $s2, 0x014C ## $a1 = 0000014C /* 00120 80994D70 0C0291BE */ jal SkelAnime_InitFlex diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998C90.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998C90.s index e1a46290e3..a4ce9f67d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998C90.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998C90.s @@ -11,10 +11,10 @@ glabel func_80998C90 /* 00520 80998CA0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00524 80998CA4 AFBF002C */ sw $ra, 0x002C($sp) /* 00528 80998CA8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0052C 80998CAC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00530 80998CB0 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00534 80998CB4 24E71374 */ addiu $a3, $a3, 0x1374 ## $a3 = 06001374 -/* 00538 80998CB8 24C62CA8 */ addiu $a2, $a2, 0x2CA8 ## $a2 = 06002CA8 +/* 0052C 80998CAC 3C060600 */ lui $a2, %hi(D_06002CA8) ## $a2 = 06000000 +/* 00530 80998CB0 3C070600 */ lui $a3, %hi(D_06001374) ## $a3 = 06000000 +/* 00534 80998CB4 24E71374 */ addiu $a3, $a3, %lo(D_06001374) ## $a3 = 06001374 +/* 00538 80998CB8 24C62CA8 */ addiu $a2, $a2, %lo(D_06002CA8) ## $a2 = 06002CA8 /* 0053C 80998CBC AFA50034 */ sw $a1, 0x0034($sp) /* 00540 80998CC0 AFA00010 */ sw $zero, 0x0010($sp) /* 00544 80998CC4 AFA00014 */ sw $zero, 0x0014($sp) @@ -25,14 +25,14 @@ glabel func_80998C90 /* 00554 80998CD4 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 00558 80998CD8 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0055C 80998CDC 44812000 */ mtc1 $at, $f4 ## $f4 = 40.00 -/* 00560 80998CE0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00560 80998CE0 3C050600 */ lui $a1, %hi(D_06001374) ## $a1 = 06000000 /* 00564 80998CE4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00568 80998CE8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 0056C 80998CEC 44061000 */ mfc1 $a2, $f2 /* 00570 80998CF0 44071000 */ mfc1 $a3, $f2 /* 00574 80998CF4 AFAF001C */ sw $t7, 0x001C($sp) /* 00578 80998CF8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0057C 80998CFC 24A51374 */ addiu $a1, $a1, 0x1374 ## $a1 = 06001374 +/* 0057C 80998CFC 24A51374 */ addiu $a1, $a1, %lo(D_06001374) ## $a1 = 06001374 /* 00580 80998D00 8FA40034 */ lw $a0, 0x0034($sp) /* 00584 80998D04 E7A20010 */ swc1 $f2, 0x0010($sp) /* 00588 80998D08 0C0293F9 */ jal SkelAnime_ChangeAnimImpl diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998E5C.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998E5C.s index 16e128a794..11c6ebd1a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998E5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998E5C.s @@ -12,22 +12,22 @@ glabel func_80998E5C /* 006F0 80998E70 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 006F4 80998E74 AFBF002C */ sw $ra, 0x002C($sp) /* 006F8 80998E78 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 006FC 80998E7C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00700 80998E80 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00704 80998E84 24E71374 */ addiu $a3, $a3, 0x1374 ## $a3 = 06001374 -/* 00708 80998E88 24C62CA8 */ addiu $a2, $a2, 0x2CA8 ## $a2 = 06002CA8 +/* 006FC 80998E7C 3C060600 */ lui $a2, %hi(D_06002CA8) ## $a2 = 06000000 +/* 00700 80998E80 3C070600 */ lui $a3, %hi(D_06001374) ## $a3 = 06000000 +/* 00704 80998E84 24E71374 */ addiu $a3, $a3, %lo(D_06001374) ## $a3 = 06001374 +/* 00708 80998E88 24C62CA8 */ addiu $a2, $a2, %lo(D_06002CA8) ## $a2 = 06002CA8 /* 0070C 80998E8C AFA50034 */ sw $a1, 0x0034($sp) /* 00710 80998E90 AFA00010 */ sw $zero, 0x0010($sp) /* 00714 80998E94 AFA00014 */ sw $zero, 0x0014($sp) /* 00718 80998E98 0C02915F */ jal SkelAnime_Init /* 0071C 80998E9C AFA00018 */ sw $zero, 0x0018($sp) -/* 00720 80998EA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00720 80998EA0 3C040600 */ lui $a0, %hi(D_06001374) ## $a0 = 06000000 /* 00724 80998EA4 0C028800 */ jal SkelAnime_GetFrameCount -/* 00728 80998EA8 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 -/* 0072C 80998EAC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00730 80998EB0 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 +/* 00728 80998EA8 24841374 */ addiu $a0, $a0, %lo(D_06001374) ## $a0 = 06001374 +/* 0072C 80998EAC 3C040600 */ lui $a0, %hi(D_06001374) ## $a0 = 06000000 +/* 00730 80998EB0 24841374 */ addiu $a0, $a0, %lo(D_06001374) ## $a0 = 06001374 /* 00734 80998EB4 0C028800 */ jal SkelAnime_GetFrameCount /* 00738 80998EB8 A7A2003A */ sh $v0, 0x003A($sp) @@ -36,23 +36,23 @@ glabel func_80998E5C /* 00744 80998EC4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00748 80998EC8 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 0074C 80998ECC 46803220 */ cvt.s.w $f8, $f6 -/* 00750 80998ED0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00750 80998ED0 3C050600 */ lui $a1, %hi(D_06001374) ## $a1 = 06000000 /* 00754 80998ED4 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 00758 80998ED8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 0075C 80998EDC AFB8001C */ sw $t8, 0x001C($sp) /* 00760 80998EE0 46802120 */ cvt.s.w $f4, $f4 /* 00764 80998EE4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00768 80998EE8 24A51374 */ addiu $a1, $a1, 0x1374 ## $a1 = 06001374 +/* 00768 80998EE8 24A51374 */ addiu $a1, $a1, %lo(D_06001374) ## $a1 = 06001374 /* 0076C 80998EEC E7A80010 */ swc1 $f8, 0x0010($sp) /* 00770 80998EF0 8FA40034 */ lw $a0, 0x0034($sp) /* 00774 80998EF4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00778 80998EF8 44072000 */ mfc1 $a3, $f4 /* 0077C 80998EFC 0C0293F9 */ jal SkelAnime_ChangeAnimImpl /* 00780 80998F00 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00784 80998F04 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00784 80998F04 3C040600 */ lui $a0, %hi(D_06001374) ## $a0 = 06000000 /* 00788 80998F08 0C028800 */ jal SkelAnime_GetFrameCount -/* 0078C 80998F0C 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 +/* 0078C 80998F0C 24841374 */ addiu $a0, $a0, %lo(D_06001374) ## $a0 = 06001374 /* 00790 80998F10 3C01809A */ lui $at, %hi(D_8099C728) ## $at = 809A0000 /* 00794 80998F14 C422C728 */ lwc1 $f2, %lo(D_8099C728)($at) /* 00798 80998F18 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 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 08d99a9782..897f8965b7 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 @@ -20,22 +20,22 @@ glabel func_80998FF4 /* 00884 80999004 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00888 80999008 AFBF002C */ sw $ra, 0x002C($sp) /* 0088C 8099900C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00890 80999010 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00894 80999014 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00898 80999018 24E71374 */ addiu $a3, $a3, 0x1374 ## $a3 = 06001374 -/* 0089C 8099901C 24C62CA8 */ addiu $a2, $a2, 0x2CA8 ## $a2 = 06002CA8 +/* 00890 80999010 3C060600 */ lui $a2, %hi(D_06002CA8) ## $a2 = 06000000 +/* 00894 80999014 3C070600 */ lui $a3, %hi(D_06001374) ## $a3 = 06000000 +/* 00898 80999018 24E71374 */ addiu $a3, $a3, %lo(D_06001374) ## $a3 = 06001374 +/* 0089C 8099901C 24C62CA8 */ addiu $a2, $a2, %lo(D_06002CA8) ## $a2 = 06002CA8 /* 008A0 80999020 AFA50034 */ sw $a1, 0x0034($sp) /* 008A4 80999024 AFA00010 */ sw $zero, 0x0010($sp) /* 008A8 80999028 AFA00014 */ sw $zero, 0x0014($sp) /* 008AC 8099902C 0C02915F */ jal SkelAnime_Init /* 008B0 80999030 AFA00018 */ sw $zero, 0x0018($sp) -/* 008B4 80999034 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 008B4 80999034 3C040600 */ lui $a0, %hi(D_06001374) ## $a0 = 06000000 /* 008B8 80999038 0C028800 */ jal SkelAnime_GetFrameCount -/* 008BC 8099903C 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 -/* 008C0 80999040 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 008C4 80999044 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 +/* 008BC 8099903C 24841374 */ addiu $a0, $a0, %lo(D_06001374) ## $a0 = 06001374 +/* 008C0 80999040 3C040600 */ lui $a0, %hi(D_06001374) ## $a0 = 06000000 +/* 008C4 80999044 24841374 */ addiu $a0, $a0, %lo(D_06001374) ## $a0 = 06001374 /* 008C8 80999048 0C028800 */ jal SkelAnime_GetFrameCount /* 008CC 8099904C A7A2003C */ sh $v0, 0x003C($sp) @@ -44,23 +44,23 @@ glabel func_80998FF4 /* 008D8 80999058 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 008DC 8099905C 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 008E0 80999060 46803220 */ cvt.s.w $f8, $f6 -/* 008E4 80999064 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 008E4 80999064 3C050600 */ lui $a1, %hi(D_06001374) ## $a1 = 06000000 /* 008E8 80999068 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 008EC 8099906C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 008F0 80999070 AFB8001C */ sw $t8, 0x001C($sp) /* 008F4 80999074 46802120 */ cvt.s.w $f4, $f4 /* 008F8 80999078 AFAF0014 */ sw $t7, 0x0014($sp) -/* 008FC 8099907C 24A51374 */ addiu $a1, $a1, 0x1374 ## $a1 = 06001374 +/* 008FC 8099907C 24A51374 */ addiu $a1, $a1, %lo(D_06001374) ## $a1 = 06001374 /* 00900 80999080 E7A80010 */ swc1 $f8, 0x0010($sp) /* 00904 80999084 8FA40034 */ lw $a0, 0x0034($sp) /* 00908 80999088 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 0090C 8099908C 44072000 */ mfc1 $a3, $f4 /* 00910 80999090 0C0293F9 */ jal SkelAnime_ChangeAnimImpl /* 00914 80999094 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00918 80999098 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00918 80999098 3C040600 */ lui $a0, %hi(D_06001374) ## $a0 = 06000000 /* 0091C 8099909C 0C028800 */ jal SkelAnime_GetFrameCount -/* 00920 809990A0 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 +/* 00920 809990A0 24841374 */ addiu $a0, $a0, %lo(D_06001374) ## $a0 = 06001374 /* 00924 809990A4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00928 809990A8 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 0092C 809990AC 3C01809A */ lui $at, %hi(D_8099C72C) ## $at = 809A0000 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 f4bb283108..33895936b7 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 @@ -21,12 +21,12 @@ glabel func_8099A508 /* 01DD0 8099A550 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 01DD4 8099A554 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01DD8 8099A558 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01DD8 8099A558 3C040600 */ lui $a0, %hi(D_06001374) ## $a0 = 06000000 /* 01DDC 8099A55C 0C028800 */ jal SkelAnime_GetFrameCount -/* 01DE0 8099A560 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 -/* 01DE4 8099A564 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01DE8 8099A568 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 +/* 01DE0 8099A560 24841374 */ addiu $a0, $a0, %lo(D_06001374) ## $a0 = 06001374 +/* 01DE4 8099A564 3C040600 */ lui $a0, %hi(D_06001374) ## $a0 = 06000000 +/* 01DE8 8099A568 24841374 */ addiu $a0, $a0, %lo(D_06001374) ## $a0 = 06001374 /* 01DEC 8099A56C 0C028800 */ jal SkelAnime_GetFrameCount /* 01DF0 8099A570 A7A20030 */ sh $v0, 0x0030($sp) @@ -36,13 +36,13 @@ glabel func_8099A508 /* 01E00 8099A580 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 01E04 8099A584 46803220 */ cvt.s.w $f8, $f6 /* 01E08 8099A588 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 01E0C 8099A58C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 01E0C 8099A58C 3C050600 */ lui $a1, %hi(D_06001374) ## $a1 = 06000000 /* 01E10 8099A590 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 01E14 8099A594 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 01E18 8099A598 46802120 */ cvt.s.w $f4, $f4 /* 01E1C 8099A59C AFA8001C */ sw $t0, 0x001C($sp) /* 01E20 8099A5A0 AFB90014 */ sw $t9, 0x0014($sp) -/* 01E24 8099A5A4 24A51374 */ addiu $a1, $a1, 0x1374 ## $a1 = 06001374 +/* 01E24 8099A5A4 24A51374 */ addiu $a1, $a1, %lo(D_06001374) ## $a1 = 06001374 /* 01E28 8099A5A8 E7A80010 */ swc1 $f8, 0x0010($sp) /* 01E2C 8099A5AC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01E30 8099A5B0 44072000 */ mfc1 $a3, $f4 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s index a419aaadc7..f6fa9eacd1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s @@ -585,10 +585,10 @@ glabel func_8099B5EC /* 036A8 8099BE28 AFA2008C */ sw $v0, 0x008C($sp) /* 036AC 8099BE2C 8FA3008C */ lw $v1, 0x008C($sp) /* 036B0 8099BE30 8FA800D8 */ lw $t0, 0x00D8($sp) -/* 036B4 8099BE34 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 036B4 8099BE34 3C040600 */ lui $a0, %hi(D_060001A0) ## $a0 = 06000000 /* 036B8 8099BE38 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 036BC 8099BE3C 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 036C0 8099BE40 248401A0 */ addiu $a0, $a0, 0x01A0 ## $a0 = 060001A0 +/* 036C0 8099BE40 248401A0 */ addiu $a0, $a0, %lo(D_060001A0) ## $a0 = 060001A0 /* 036C4 8099BE44 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 /* 036C8 8099BE48 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 036CC 8099BE4C AD0D02D0 */ sw $t5, 0x02D0($t0) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s index 7eb12639f4..5ce1f3d274 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s @@ -170,8 +170,8 @@ glabel EfcErupc_Draw /* 0053C 8099D1EC 17010008 */ bne $t8, $at, .L8099D210 /* 00540 8099D1F0 00000000 */ nop /* 00544 8099D1F4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00548 8099D1F8 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 -/* 0054C 8099D1FC 258C2570 */ addiu $t4, $t4, 0x2570 ## $t4 = 06002570 +/* 00548 8099D1F8 3C0C0600 */ lui $t4, %hi(D_06002570) ## $t4 = 06000000 +/* 0054C 8099D1FC 258C2570 */ addiu $t4, $t4, %lo(D_06002570) ## $t4 = 06002570 /* 00550 8099D200 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 00554 8099D204 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 00558 8099D208 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 @@ -233,8 +233,8 @@ glabel EfcErupc_Draw /* 00630 8099D2E0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 00634 8099D2E4 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 00638 8099D2E8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0063C 8099D2EC 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 00640 8099D2F0 27391720 */ addiu $t9, $t9, 0x1720 ## $t9 = 06001720 +/* 0063C 8099D2EC 3C190600 */ lui $t9, %hi(D_06001720) ## $t9 = 06000000 +/* 00640 8099D2F0 27391720 */ addiu $t9, $t9, %lo(D_06001720) ## $t9 = 06001720 /* 00644 8099D2F4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 00648 8099D2F8 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 0064C 8099D2FC 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D334.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D334.s index bd7ca9f752..02d634aeb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D334.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D334.s @@ -41,13 +41,13 @@ glabel func_8099D334 /* 006E8 8099D398 3C17DE00 */ lui $s7, 0xDE00 ## $s7 = DE000000 .L8099D39C: /* 006EC 8099D39C 922E0024 */ lbu $t6, 0x0024($s1) ## 00000024 -/* 006F0 8099D3A0 3C120600 */ lui $s2, 0x0600 ## $s2 = 06000000 -/* 006F4 8099D3A4 26522760 */ addiu $s2, $s2, 0x2760 ## $s2 = 06002760 +/* 006F0 8099D3A0 3C120600 */ lui $s2, %hi(D_06002760) ## $s2 = 06000000 +/* 006F4 8099D3A4 26522760 */ addiu $s2, $s2, %lo(D_06002760) ## $s2 = 06002760 /* 006F8 8099D3A8 11C00047 */ beq $t6, $zero, .L8099D4C8 /* 006FC 8099D3AC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00700 8099D3B0 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 00704 8099D3B4 3C150600 */ lui $s5, 0x0600 ## $s5 = 06000000 -/* 00708 8099D3B8 26B527D8 */ addiu $s5, $s5, 0x27D8 ## $s5 = 060027D8 +/* 00704 8099D3B4 3C150600 */ lui $s5, %hi(D_060027D8) ## $s5 = 06000000 +/* 00708 8099D3B8 26B527D8 */ addiu $s5, $s5, %lo(D_060027D8) ## $s5 = 060027D8 /* 0070C 8099D3BC 02C1A021 */ addu $s4, $s6, $at /* 00710 8099D3C0 0C024F61 */ jal func_80093D84 /* 00714 8099D3C4 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 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 2cc1705a0b..c6fbe55348 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 @@ -83,9 +83,9 @@ glabel func_8099E4F4 /* 00D2C 8099E5FC C6220550 */ lwc1 $f2, 0x0550($s1) ## 00000550 /* 00D30 8099E600 C6300554 */ lwc1 $f16, 0x0554($s1) ## 00000554 /* 00D34 8099E604 C6320558 */ lwc1 $f18, 0x0558($s1) ## 00000558 -/* 00D38 8099E608 3C020403 */ lui $v0, 0x0403 ## $v0 = 04030000 +/* 00D38 8099E608 3C020403 */ lui $v0, %hi(D_04037880) ## $v0 = 04030000 /* 00D3C 8099E60C 4602B201 */ sub.s $f8, $f22, $f2 -/* 00D40 8099E610 24427880 */ addiu $v0, $v0, 0x7880 ## $v0 = 04037880 +/* 00D40 8099E610 24427880 */ addiu $v0, $v0, %lo(D_04037880) ## $v0 = 04037880 /* 00D44 8099E614 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00D48 8099E618 4604B001 */ sub.s $f0, $f22, $f4 /* 00D4C 8099E61C C6440000 */ lwc1 $f4, 0x0000($s2) ## 0000024C 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 52b0c969fd..3251ff524a 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 @@ -116,9 +116,9 @@ glabel func_8099E784 /* 01028 8099E8F8 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 /* 0102C 8099E8FC C62A0000 */ lwc1 $f10, 0x0000($s1) ## 0000014C /* 01030 8099E900 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01034 8099E904 3C020403 */ lui $v0, 0x0403 ## $v0 = 04030000 +/* 01034 8099E904 3C020403 */ lui $v0, %hi(D_04037880) ## $v0 = 04030000 /* 01038 8099E908 46185402 */ mul.s $f16, $f10, $f24 -/* 0103C 8099E90C 24427880 */ addiu $v0, $v0, 0x7880 ## $v0 = 04037880 +/* 0103C 8099E90C 24427880 */ addiu $v0, $v0, %lo(D_04037880) ## $v0 = 04037880 /* 01040 8099E910 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01044 8099E914 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 01048 8099E918 0041B024 */ and $s6, $v0, $at 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 22c77b798c..b4f572a84a 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 @@ -17,16 +17,16 @@ glabel EnAm_Init /* 00168 809AE088 0C00AC78 */ jal ActorShape_Init /* 0016C 809AE08C 3C074240 */ lui $a3, 0x4240 ## $a3 = 42400000 -/* 00170 809AE090 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00174 809AE094 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00170 809AE090 3C060600 */ lui $a2, %hi(D_06005948) ## $a2 = 06000000 +/* 00174 809AE094 3C070600 */ lui $a3, %hi(D_0600033C) ## $a3 = 06000000 /* 00178 809AE098 260E01AC */ addiu $t6, $s0, 0x01AC ## $t6 = 000001AC /* 0017C 809AE09C 260F0200 */ addiu $t7, $s0, 0x0200 ## $t7 = 00000200 /* 00180 809AE0A0 2418000E */ addiu $t8, $zero, 0x000E ## $t8 = 0000000E /* 00184 809AE0A4 AFB80018 */ sw $t8, 0x0018($sp) /* 00188 809AE0A8 AFAF0014 */ sw $t7, 0x0014($sp) /* 0018C 809AE0AC AFAE0010 */ sw $t6, 0x0010($sp) -/* 00190 809AE0B0 24E7033C */ addiu $a3, $a3, 0x033C ## $a3 = 0600033C -/* 00194 809AE0B4 24C65948 */ addiu $a2, $a2, 0x5948 ## $a2 = 06005948 +/* 00190 809AE0B0 24E7033C */ addiu $a3, $a3, %lo(D_0600033C) ## $a3 = 0600033C +/* 00194 809AE0B4 24C65948 */ addiu $a2, $a2, %lo(D_06005948) ## $a2 = 06005948 /* 00198 809AE0B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0019C 809AE0BC 0C02915F */ jal SkelAnime_Init @@ -73,10 +73,10 @@ glabel EnAm_Init /* 00228 809AE148 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0022C 809AE14C 24090035 */ addiu $t1, $zero, 0x0035 ## $t1 = 00000035 /* 00230 809AE150 240A000D */ addiu $t2, $zero, 0x000D ## $t2 = 0000000D -/* 00234 809AE154 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00234 809AE154 3C040600 */ lui $a0, %hi(D_06000118) ## $a0 = 06000000 /* 00238 809AE158 A2090286 */ sb $t1, 0x0286($s0) ## 00000286 /* 0023C 809AE15C A20A02D2 */ sb $t2, 0x02D2($s0) ## 000002D2 -/* 00240 809AE160 24840118 */ addiu $a0, $a0, 0x0118 ## $a0 = 06000118 +/* 00240 809AE160 24840118 */ addiu $a0, $a0, %lo(D_06000118) ## $a0 = 06000118 /* 00244 809AE164 0C010620 */ jal DynaPolyInfo_Alloc /* 00248 809AE168 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFFC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE40C.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE40C.s index 2e3d9012c2..825805d8c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE40C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE40C.s @@ -3,16 +3,16 @@ glabel func_809AE40C /* 004F0 809AE410 AFB00028 */ sw $s0, 0x0028($sp) /* 004F4 809AE414 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 004F8 809AE418 AFBF002C */ sw $ra, 0x002C($sp) -/* 004FC 809AE41C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 004FC 809AE41C 3C040600 */ lui $a0, %hi(D_0600033C) ## $a0 = 06000000 /* 00500 809AE420 0C028800 */ jal SkelAnime_GetFrameCount -/* 00504 809AE424 2484033C */ addiu $a0, $a0, 0x033C ## $a0 = 0600033C +/* 00504 809AE424 2484033C */ addiu $a0, $a0, %lo(D_0600033C) ## $a0 = 0600033C /* 00508 809AE428 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0050C 809AE42C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00510 809AE430 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00510 809AE430 3C050600 */ lui $a1, %hi(D_0600033C) ## $a1 = 06000000 /* 00514 809AE434 46802020 */ cvt.s.w $f0, $f4 /* 00518 809AE438 44061000 */ mfc1 $a2, $f2 -/* 0051C 809AE43C 24A5033C */ addiu $a1, $a1, 0x033C ## $a1 = 0600033C +/* 0051C 809AE43C 24A5033C */ addiu $a1, $a1, %lo(D_0600033C) ## $a1 = 0600033C /* 00520 809AE440 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 00524 809AE444 AFA00014 */ sw $zero, 0x0014($sp) /* 00528 809AE448 E7A20018 */ swc1 $f2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE4A8.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE4A8.s index ba905869c0..a6f23a88d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE4A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE4A8.s @@ -3,16 +3,16 @@ glabel func_809AE4A8 /* 0058C 809AE4AC AFB00028 */ sw $s0, 0x0028($sp) /* 00590 809AE4B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00594 809AE4B4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00598 809AE4B8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00598 809AE4B8 3C040600 */ lui $a0, %hi(D_0600033C) ## $a0 = 06000000 /* 0059C 809AE4BC 0C028800 */ jal SkelAnime_GetFrameCount -/* 005A0 809AE4C0 2484033C */ addiu $a0, $a0, 0x033C ## $a0 = 0600033C +/* 005A0 809AE4C0 2484033C */ addiu $a0, $a0, %lo(D_0600033C) ## $a0 = 0600033C /* 005A4 809AE4C4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 005A8 809AE4C8 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 005AC 809AE4CC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 005AC 809AE4CC 3C050600 */ lui $a1, %hi(D_0600033C) ## $a1 = 06000000 /* 005B0 809AE4D0 46802020 */ cvt.s.w $f0, $f4 /* 005B4 809AE4D4 44061000 */ mfc1 $a2, $f2 -/* 005B8 809AE4D8 24A5033C */ addiu $a1, $a1, 0x033C ## $a1 = 0600033C +/* 005B8 809AE4D8 24A5033C */ addiu $a1, $a1, %lo(D_0600033C) ## $a1 = 0600033C /* 005BC 809AE4DC 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 005C0 809AE4E0 AFA00014 */ sw $zero, 0x0014($sp) /* 005C4 809AE4E4 E7A20018 */ swc1 $f2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s index 3d24a9e9fa..e94cea5dd1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s @@ -2,8 +2,8 @@ glabel func_809AE538 /* 00618 809AE538 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0061C 809AE53C AFBF0014 */ sw $ra, 0x0014($sp) /* 00620 809AE540 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00624 809AE544 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00628 809AE548 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 +/* 00624 809AE544 3C050600 */ lui $a1, %hi(D_06000238) ## $a1 = 06000000 +/* 00628 809AE548 24A50238 */ addiu $a1, $a1, %lo(D_06000238) ## $a1 = 06000238 /* 0062C 809AE54C AFA70018 */ sw $a3, 0x0018($sp) /* 00630 809AE550 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 /* 00634 809AE554 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s index 0ab2a87dab..7ecf77b75a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s @@ -2,8 +2,8 @@ glabel func_809AE59C /* 0067C 809AE59C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00680 809AE5A0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00684 809AE5A4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00688 809AE5A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0068C 809AE5AC 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 +/* 00688 809AE5A8 3C050600 */ lui $a1, %hi(D_06000238) ## $a1 = 06000000 +/* 0068C 809AE5AC 24A50238 */ addiu $a1, $a1, %lo(D_06000238) ## $a1 = 06000238 /* 00690 809AE5B0 AFA70018 */ sw $a3, 0x0018($sp) /* 00694 809AE5B4 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 /* 00698 809AE5B8 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s index ead41652fe..cfdb60a8c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s @@ -2,8 +2,8 @@ glabel func_809AE608 /* 006E8 809AE608 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 006EC 809AE60C AFBF0014 */ sw $ra, 0x0014($sp) /* 006F0 809AE610 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 006F4 809AE614 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 006F8 809AE618 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 +/* 006F4 809AE614 3C050600 */ lui $a1, %hi(D_06000238) ## $a1 = 06000000 +/* 006F8 809AE618 24A50238 */ addiu $a1, $a1, %lo(D_06000238) ## $a1 = 06000238 /* 006FC 809AE61C AFA70018 */ sw $a3, 0x0018($sp) /* 00700 809AE620 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 /* 00704 809AE624 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s index 0fd4e54312..968b29ae29 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s @@ -2,8 +2,8 @@ glabel func_809AE664 /* 00744 809AE664 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00748 809AE668 AFBF0014 */ sw $ra, 0x0014($sp) /* 0074C 809AE66C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00750 809AE670 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00754 809AE674 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 +/* 00750 809AE670 3C050600 */ lui $a1, %hi(D_06000238) ## $a1 = 06000000 +/* 00754 809AE674 24A50238 */ addiu $a1, $a1, %lo(D_06000238) ## $a1 = 06000238 /* 00758 809AE678 AFA70018 */ sw $a3, 0x0018($sp) /* 0075C 809AE67C 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 /* 00760 809AE680 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s index 1d29016730..dba08bdb6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s @@ -2,8 +2,8 @@ glabel func_809AE6C0 /* 007A0 809AE6C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 007A4 809AE6C4 AFBF0014 */ sw $ra, 0x0014($sp) /* 007A8 809AE6C8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 007AC 809AE6CC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 007B0 809AE6D0 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 +/* 007AC 809AE6CC 3C050600 */ lui $a1, %hi(D_06000238) ## $a1 = 06000000 +/* 007B0 809AE6D0 24A50238 */ addiu $a1, $a1, %lo(D_06000238) ## $a1 = 06000238 /* 007B4 809AE6D4 AFA70018 */ sw $a3, 0x0018($sp) /* 007B8 809AE6D8 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 /* 007BC 809AE6DC 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE71C.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE71C.s index 9dae26ae79..52190e66c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE71C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE71C.s @@ -3,20 +3,20 @@ glabel func_809AE71C /* 00800 809AE720 AFB00028 */ sw $s0, 0x0028($sp) /* 00804 809AE724 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00808 809AE728 AFBF002C */ sw $ra, 0x002C($sp) -/* 0080C 809AE72C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0080C 809AE72C 3C040600 */ lui $a0, %hi(D_06005B3C) ## $a0 = 06000000 /* 00810 809AE730 AFA50034 */ sw $a1, 0x0034($sp) /* 00814 809AE734 0C028800 */ jal SkelAnime_GetFrameCount -/* 00818 809AE738 24845B3C */ addiu $a0, $a0, 0x5B3C ## $a0 = 06005B3C +/* 00818 809AE738 24845B3C */ addiu $a0, $a0, %lo(D_06005B3C) ## $a0 = 06005B3C /* 0081C 809AE73C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00820 809AE740 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 00824 809AE744 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 /* 00828 809AE748 468021A0 */ cvt.s.w $f6, $f4 /* 0082C 809AE74C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 00830 809AE750 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00830 809AE750 3C050600 */ lui $a1, %hi(D_06005B3C) ## $a1 = 06000000 /* 00834 809AE754 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00838 809AE758 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0083C 809AE75C 24A55B3C */ addiu $a1, $a1, 0x5B3C ## $a1 = 06005B3C +/* 0083C 809AE75C 24A55B3C */ addiu $a1, $a1, %lo(D_06005B3C) ## $a1 = 06005B3C /* 00840 809AE760 46083281 */ sub.s $f10, $f6, $f8 /* 00844 809AE764 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 00848 809AE768 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE7F4.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE7F4.s index 6c2c2a97ac..735d663993 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE7F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE7F4.s @@ -7,11 +7,11 @@ glabel func_809AE7F4 /* 008E8 809AE808 AFA50034 */ sw $a1, 0x0034($sp) /* 008EC 809AE80C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 008F0 809AE810 AFBF002C */ sw $ra, 0x002C($sp) -/* 008F4 809AE814 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 008F4 809AE814 3C050600 */ lui $a1, %hi(D_0600033C) ## $a1 = 06000000 /* 008F8 809AE818 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 008FC 809AE81C 44070000 */ mfc1 $a3, $f0 /* 00900 809AE820 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00904 809AE824 24A5033C */ addiu $a1, $a1, 0x033C ## $a1 = 0600033C +/* 00904 809AE824 24A5033C */ addiu $a1, $a1, %lo(D_0600033C) ## $a1 = 0600033C /* 00908 809AE828 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 /* 0090C 809AE82C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00910 809AE830 E7A00018 */ swc1 $f0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF558.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF558.s index 5a9ee4cb2c..e2164c14a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF558.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF558.s @@ -3,19 +3,19 @@ glabel func_809AF558 /* 0163C 809AF55C AFB00028 */ sw $s0, 0x0028($sp) /* 01640 809AF560 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01644 809AF564 AFBF002C */ sw $ra, 0x002C($sp) -/* 01648 809AF568 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01648 809AF568 3C040600 */ lui $a0, %hi(D_06005B3C) ## $a0 = 06000000 /* 0164C 809AF56C AFA50034 */ sw $a1, 0x0034($sp) /* 01650 809AF570 0C028800 */ jal SkelAnime_GetFrameCount -/* 01654 809AF574 24845B3C */ addiu $a0, $a0, 0x5B3C ## $a0 = 06005B3C +/* 01654 809AF574 24845B3C */ addiu $a0, $a0, %lo(D_06005B3C) ## $a0 = 06005B3C /* 01658 809AF578 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0165C 809AF57C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01660 809AF580 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 01660 809AF580 3C050600 */ lui $a1, %hi(D_06005B3C) ## $a1 = 06000000 /* 01664 809AF584 468021A0 */ cvt.s.w $f6, $f4 /* 01668 809AF588 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 0166C 809AF58C 44070000 */ mfc1 $a3, $f0 /* 01670 809AF590 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01674 809AF594 24A55B3C */ addiu $a1, $a1, 0x5B3C ## $a1 = 06005B3C +/* 01674 809AF594 24A55B3C */ addiu $a1, $a1, %lo(D_06005B3C) ## $a1 = 06005B3C /* 01678 809AF598 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 0167C 809AF59C E7A60010 */ swc1 $f6, 0x0010($sp) /* 01680 809AF5A0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 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 b04990ba11..3534e8669a 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 @@ -25,16 +25,16 @@ glabel EnAnubice_Init /* 001A8 809B12C8 0C00AC78 */ jal ActorShape_Init /* 001AC 809B12CC 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 001B0 809B12D0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 001B4 809B12D4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 001B0 809B12D0 3C060600 */ lui $a2, %hi(D_06003990) ## $a2 = 06000000 +/* 001B4 809B12D4 3C070600 */ lui $a3, %hi(D_06000F74) ## $a3 = 06000000 /* 001B8 809B12D8 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 001BC 809B12DC 260F01F0 */ addiu $t7, $s0, 0x01F0 ## $t7 = 000001F0 /* 001C0 809B12E0 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 /* 001C4 809B12E4 AFB80018 */ sw $t8, 0x0018($sp) /* 001C8 809B12E8 AFAF0014 */ sw $t7, 0x0014($sp) /* 001CC 809B12EC AFAE0010 */ sw $t6, 0x0010($sp) -/* 001D0 809B12F0 24E70F74 */ addiu $a3, $a3, 0x0F74 ## $a3 = 06000F74 -/* 001D4 809B12F4 24C63990 */ addiu $a2, $a2, 0x3990 ## $a2 = 06003990 +/* 001D0 809B12F0 24E70F74 */ addiu $a3, $a3, %lo(D_06000F74) ## $a3 = 06000F74 +/* 001D4 809B12F4 24C63990 */ addiu $a2, $a2, %lo(D_06003990) ## $a2 = 06003990 /* 001D8 809B12F8 8FA4003C */ lw $a0, 0x003C($sp) /* 001DC 809B12FC 0C02915F */ jal SkelAnime_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1524.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1524.s index a6a494f8bb..7aa497084f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1524.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1524.s @@ -3,19 +3,19 @@ glabel func_809B1524 /* 00408 809B1528 AFB00028 */ sw $s0, 0x0028($sp) /* 0040C 809B152C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00410 809B1530 AFBF002C */ sw $ra, 0x002C($sp) -/* 00414 809B1534 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00414 809B1534 3C040600 */ lui $a0, %hi(D_06000F74) ## $a0 = 06000000 /* 00418 809B1538 AFA50034 */ sw $a1, 0x0034($sp) /* 0041C 809B153C 0C028800 */ jal SkelAnime_GetFrameCount -/* 00420 809B1540 24840F74 */ addiu $a0, $a0, 0x0F74 ## $a0 = 06000F74 +/* 00420 809B1540 24840F74 */ addiu $a0, $a0, %lo(D_06000F74) ## $a0 = 06000F74 /* 00424 809B1544 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00428 809B1548 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0042C 809B154C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00430 809B1550 468021A0 */ cvt.s.w $f6, $f4 /* 00434 809B1554 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00438 809B1558 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00438 809B1558 3C050600 */ lui $a1, %hi(D_06000F74) ## $a1 = 06000000 /* 0043C 809B155C 44070000 */ mfc1 $a3, $f0 -/* 00440 809B1560 24A50F74 */ addiu $a1, $a1, 0x0F74 ## $a1 = 06000F74 +/* 00440 809B1560 24A50F74 */ addiu $a1, $a1, %lo(D_06000F74) ## $a1 = 06000F74 /* 00444 809B1564 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00448 809B1568 4600320D */ trunc.w.s $f8, $f6 /* 0044C 809B156C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B17FC.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B17FC.s index cee3ce2ad7..63631a1f25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B17FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B17FC.s @@ -3,18 +3,18 @@ glabel func_809B17FC /* 006E0 809B1800 AFB00028 */ sw $s0, 0x0028($sp) /* 006E4 809B1804 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 006E8 809B1808 AFBF002C */ sw $ra, 0x002C($sp) -/* 006EC 809B180C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 006EC 809B180C 3C040600 */ lui $a0, %hi(D_0600078C) ## $a0 = 06000000 /* 006F0 809B1810 AFA50034 */ sw $a1, 0x0034($sp) /* 006F4 809B1814 0C028800 */ jal SkelAnime_GetFrameCount -/* 006F8 809B1818 2484078C */ addiu $a0, $a0, 0x078C ## $a0 = 0600078C +/* 006F8 809B1818 2484078C */ addiu $a0, $a0, %lo(D_0600078C) ## $a0 = 0600078C /* 006FC 809B181C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00700 809B1820 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00704 809B1824 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 /* 00708 809B1828 46802020 */ cvt.s.w $f0, $f4 -/* 0070C 809B182C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0070C 809B182C 3C050600 */ lui $a1, %hi(D_0600078C) ## $a1 = 06000000 /* 00710 809B1830 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00714 809B1834 24A5078C */ addiu $a1, $a1, 0x078C ## $a1 = 0600078C +/* 00714 809B1834 24A5078C */ addiu $a1, $a1, %lo(D_0600078C) ## $a1 = 0600078C /* 00718 809B1838 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0071C 809B183C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00720 809B1840 E600026C */ swc1 $f0, 0x026C($s0) ## 0000026C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1984.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1984.s index 35ff6ab2ec..21ee942dd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1984.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1984.s @@ -3,18 +3,18 @@ glabel func_809B1984 /* 00868 809B1988 AFB00028 */ sw $s0, 0x0028($sp) /* 0086C 809B198C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00870 809B1990 AFBF002C */ sw $ra, 0x002C($sp) -/* 00874 809B1994 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00874 809B1994 3C040600 */ lui $a0, %hi(D_06000348) ## $a0 = 06000000 /* 00878 809B1998 AFA50034 */ sw $a1, 0x0034($sp) /* 0087C 809B199C 0C028800 */ jal SkelAnime_GetFrameCount -/* 00880 809B19A0 24840348 */ addiu $a0, $a0, 0x0348 ## $a0 = 06000348 +/* 00880 809B19A0 24840348 */ addiu $a0, $a0, %lo(D_06000348) ## $a0 = 06000348 /* 00884 809B19A4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00888 809B19A8 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000 /* 0088C 809B19AC 44813000 */ mtc1 $at, $f6 ## $f6 = -20.00 /* 00890 809B19B0 46802020 */ cvt.s.w $f0, $f4 -/* 00894 809B19B4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00894 809B19B4 3C050600 */ lui $a1, %hi(D_06000348) ## $a1 = 06000000 /* 00898 809B19B8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0089C 809B19BC 24A50348 */ addiu $a1, $a1, 0x0348 ## $a1 = 06000348 +/* 0089C 809B19BC 24A50348 */ addiu $a1, $a1, %lo(D_06000348) ## $a1 = 06000348 /* 008A0 809B19C0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 008A4 809B19C4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 008A8 809B19C8 E600026C */ swc1 $f0, 0x026C($s0) ## 0000026C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2150.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2150.s index 954e4e455f..69d1b91b69 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2150.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2150.s @@ -54,10 +54,10 @@ glabel func_809B2150 /* 010C8 809B21E8 AFA20020 */ sw $v0, 0x0020($sp) /* 010CC 809B21EC 8FA30020 */ lw $v1, 0x0020($sp) /* 010D0 809B21F0 8FA80034 */ lw $t0, 0x0034($sp) -/* 010D4 809B21F4 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 +/* 010D4 809B21F4 3C0F0600 */ lui $t7, %hi(D_06003468) ## $t7 = 06000000 /* 010D8 809B21F8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 010DC 809B21FC 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 010E0 809B2200 25EF3468 */ addiu $t7, $t7, 0x3468 ## $t7 = 06003468 +/* 010E0 809B2200 25EF3468 */ addiu $t7, $t7, %lo(D_06003468) ## $t7 = 06003468 /* 010E4 809B2204 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 /* 010E8 809B2208 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 010EC 809B220C AD0D02D0 */ sw $t5, 0x02D0($t0) ## 000002D0 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 31a777ef73..171e8394e2 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 @@ -124,8 +124,8 @@ glabel EnAnubiceFire_Draw /* 00ADC 809B307C 02360019 */ multu $s1, $s6 /* 00AE0 809B3080 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00AE4 809B3084 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 00AE8 809B3088 3C120600 */ lui $s2, 0x0600 ## $s2 = 06000000 -/* 00AEC 809B308C 26523510 */ addiu $s2, $s2, 0x3510 ## $s2 = 06003510 +/* 00AE8 809B3088 3C120600 */ lui $s2, %hi(D_06003510) ## $s2 = 06000000 +/* 00AEC 809B308C 26523510 */ addiu $s2, $s2, %lo(D_06003510) ## $s2 = 06003510 /* 00AF0 809B3090 02A18021 */ addu $s0, $s5, $at /* 00AF4 809B3094 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00AF8 809B3098 00005812 */ mflo $t3 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 4ad9cf0ebd..b6a0cd73f9 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 @@ -238,10 +238,10 @@ glabel EnArrow_Draw /* 0137C 809B4C9C AFA20040 */ sw $v0, 0x0040($sp) /* 01380 809B4CA0 8FA30040 */ lw $v1, 0x0040($sp) /* 01384 809B4CA4 8FA80064 */ lw $t0, 0x0064($sp) -/* 01388 809B4CA8 3C0C0403 */ lui $t4, 0x0403 ## $t4 = 04030000 +/* 01388 809B4CA8 3C0C0403 */ lui $t4, %hi(D_04037880) ## $t4 = 04030000 /* 0138C 809B4CAC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01390 809B4CB0 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 01394 809B4CB4 258C7880 */ addiu $t4, $t4, 0x7880 ## $t4 = 04037880 +/* 01394 809B4CB4 258C7880 */ addiu $t4, $t4, %lo(D_04037880) ## $t4 = 04037880 /* 01398 809B4CB8 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 /* 0139C 809B4CBC 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 013A0 809B4CC0 AD0A02D0 */ sw $t2, 0x02D0($t0) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Init.s index 24cd374c69..8bb3bb24ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Init.s @@ -32,10 +32,10 @@ glabel EnArrow_Init /* 00050 809B3970 28410009 */ slti $at, $v0, 0x0009 /* 00054 809B3974 1020000B */ beq $at, $zero, .L809B39A4 /* 00058 809B3978 8FA4003C */ lw $a0, 0x003C($sp) -/* 0005C 809B397C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 00060 809B3980 3C070400 */ lui $a3, 0x0400 ## $a3 = 04000000 -/* 00064 809B3984 24E7436C */ addiu $a3, $a3, 0x436C ## $a3 = 0400436C -/* 00068 809B3988 24C66010 */ addiu $a2, $a2, 0x6010 ## $a2 = 04006010 +/* 0005C 809B397C 3C060400 */ lui $a2, %hi(D_04006010) ## $a2 = 04000000 +/* 00060 809B3980 3C070400 */ lui $a3, %hi(D_0400436C) ## $a3 = 04000000 +/* 00064 809B3984 24E7436C */ addiu $a3, $a3, %lo(D_0400436C) ## $a3 = 0400436C +/* 00068 809B3988 24C66010 */ addiu $a2, $a2, %lo(D_04006010) ## $a2 = 04006010 /* 0006C 809B398C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00070 809B3990 AFA00010 */ sw $zero, 0x0010($sp) /* 00074 809B3994 AFA00014 */ sw $zero, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s index 79989a0ad1..b63ff2bdb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s @@ -17,8 +17,8 @@ glabel func_809B3CEC /* 003E4 809B3D04 3C05809B */ lui $a1, %hi(func_809B4640) ## $a1 = 809B0000 /* 003E8 809B3D08 0C26CE48 */ jal func_809B3920 /* 003EC 809B3D0C 24A54640 */ addiu $a1, $a1, %lo(func_809B4640) ## $a1 = 809B4640 -/* 003F0 809B3D10 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 -/* 003F4 809B3D14 24A54310 */ addiu $a1, $a1, 0x4310 ## $a1 = 04004310 +/* 003F0 809B3D10 3C050400 */ lui $a1, %hi(D_04004310) ## $a1 = 04000000 +/* 003F4 809B3D14 24A54310 */ addiu $a1, $a1, %lo(D_04004310) ## $a1 = 04004310 /* 003F8 809B3D18 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 003FC 809B3D1C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00400 809B3D20 0C03F66B */ jal Math_Rand_ZeroOne 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 7773bd278e..32d5d6503d 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 @@ -226,8 +226,8 @@ glabel func_809B3FDC /* 009D4 809B42F4 8E02024C */ lw $v0, 0x024C($s0) ## 0000024C /* 009D8 809B42F8 0C26CE48 */ jal func_809B3920 /* 009DC 809B42FC 24A545E0 */ addiu $a1, $a1, %lo(func_809B45E0) ## $a1 = 809B45E0 -/* 009E0 809B4300 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 -/* 009E4 809B4304 24A5436C */ addiu $a1, $a1, 0x436C ## $a1 = 0400436C +/* 009E0 809B4300 3C050400 */ lui $a1, %hi(D_0400436C) ## $a1 = 04000000 +/* 009E4 809B4304 24A5436C */ addiu $a1, $a1, %lo(D_0400436C) ## $a1 = 0400436C /* 009E8 809B4308 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 009EC 809B430C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 009F0 809B4310 8609001C */ lh $t1, 0x001C($s0) ## 0000001C 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 66a1378edd..f8ec9eeb7b 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 @@ -209,8 +209,8 @@ glabel EnBa_Draw /* 01BA8 809B7EF8 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 /* 01BAC 809B7EFC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01BB0 809B7F00 8EC202C0 */ lw $v0, 0x02C0($s6) ## 000002C0 -/* 01BB4 809B7F04 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 01BB8 809B7F08 27180890 */ addiu $t8, $t8, 0x0890 ## $t8 = 06000890 +/* 01BB4 809B7F04 3C180600 */ lui $t8, %hi(D_06000890) ## $t8 = 06000000 +/* 01BB8 809B7F08 27180890 */ addiu $t8, $t8, %lo(D_06000890) ## $t8 = 06000890 /* 01BBC 809B7F0C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 01BC0 809B7F10 AECE02C0 */ sw $t6, 0x02C0($s6) ## 000002C0 /* 01BC4 809B7F14 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 @@ -272,8 +272,8 @@ glabel EnBa_Draw /* 01CA0 809B7FF0 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 01CA4 809B7FF4 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01CA8 809B7FF8 8EC202C0 */ lw $v0, 0x02C0($s6) ## 000002C0 -/* 01CAC 809B7FFC 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 01CB0 809B8000 25EF1D80 */ addiu $t7, $t7, 0x1D80 ## $t7 = 06001D80 +/* 01CAC 809B7FFC 3C0F0600 */ lui $t7, %hi(D_06001D80) ## $t7 = 06000000 +/* 01CB0 809B8000 25EF1D80 */ addiu $t7, $t7, %lo(D_06001D80) ## $t7 = 06001D80 /* 01CB4 809B8004 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 01CB8 809B8008 AECA02C0 */ sw $t2, 0x02C0($s6) ## 000002C0 /* 01CBC 809B800C 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s index 4e0e4839c7..2f5ba5c134 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s @@ -298,8 +298,8 @@ glabel EnBb_Draw /* 03694 809BB974 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 /* 03698 809BB978 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 0369C 809BB97C 8FAE008C */ lw $t6, 0x008C($sp) -/* 036A0 809BB980 3C180405 */ lui $t8, 0x0405 ## $t8 = 04050000 -/* 036A4 809BB984 2718D4E0 */ addiu $t8, $t8, 0xD4E0 ## $t8 = 0404D4E0 +/* 036A0 809BB980 3C180405 */ lui $t8, %hi(D_0404D4E0) ## $t8 = 04050000 +/* 036A4 809BB984 2718D4E0 */ addiu $t8, $t8, %lo(D_0404D4E0) ## $t8 = 0404D4E0 /* 036A8 809BB988 8DC202D0 */ lw $v0, 0x02D0($t6) ## 000002D0 /* 036AC 809BB98C 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 /* 036B0 809BB990 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 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 dba14bc969..f31802a5eb 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 @@ -17,16 +17,16 @@ glabel EnBb_Init /* 00298 809B8578 0C01E037 */ jal Actor_ProcessInitChain /* 0029C 809B857C 24A5BB34 */ addiu $a1, $a1, %lo(D_809BBB34) ## $a1 = 809BBB34 -/* 002A0 809B8580 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 002A4 809B8584 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 002A0 809B8580 3C060600 */ lui $a2, %hi(D_06001A30) ## $a2 = 06000000 +/* 002A4 809B8584 3C070600 */ lui $a3, %hi(D_06000444) ## $a3 = 06000000 /* 002A8 809B8588 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 002AC 809B858C 260F01F0 */ addiu $t7, $s0, 0x01F0 ## $t7 = 000001F0 /* 002B0 809B8590 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 /* 002B4 809B8594 AFB80018 */ sw $t8, 0x0018($sp) /* 002B8 809B8598 AFAF0014 */ sw $t7, 0x0014($sp) /* 002BC 809B859C AFAE0010 */ sw $t6, 0x0010($sp) -/* 002C0 809B85A0 24E70444 */ addiu $a3, $a3, 0x0444 ## $a3 = 06000444 -/* 002C4 809B85A4 24C61A30 */ addiu $a2, $a2, 0x1A30 ## $a2 = 06001A30 +/* 002C0 809B85A0 24E70444 */ addiu $a3, $a3, %lo(D_06000444) ## $a3 = 06000444 +/* 002C4 809B85A4 24C61A30 */ addiu $a2, $a2, %lo(D_06001A30) ## $a2 = 06001A30 /* 002C8 809B85A8 8FA401EC */ lw $a0, 0x01EC($sp) /* 002CC 809B85AC 0C02915F */ jal SkelAnime_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s index f3247f06af..913d792973 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s @@ -3,8 +3,8 @@ glabel func_809B8E34 /* 00B58 809B8E38 AFB00018 */ sw $s0, 0x0018($sp) /* 00B5C 809B8E3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00B60 809B8E40 AFBF001C */ sw $ra, 0x001C($sp) -/* 00B64 809B8E44 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00B68 809B8E48 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 +/* 00B64 809B8E44 3C050600 */ lui $a1, %hi(D_06000444) ## $a1 = 06000000 +/* 00B68 809B8E48 24A50444 */ addiu $a1, $a1, %lo(D_06000444) ## $a1 = 06000444 /* 00B6C 809B8E4C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00B70 809B8E50 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00B74 809B8E54 0C03F66B */ jal Math_Rand_ZeroOne diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s index a19351857f..a9ad725a5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s @@ -146,8 +146,8 @@ glabel func_809B8EF4 /* 00DF8 809B90D8 8618026A */ lh $t8, 0x026A($s0) ## 0000026A /* 00DFC 809B90DC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 00E00 809B90E0 46100482 */ mul.s $f18, $f0, $f16 -/* 00E04 809B90E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00E08 809B90E8 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 +/* 00E04 809B90E4 3C050600 */ lui $a1, %hi(D_06000444) ## $a1 = 06000000 +/* 00E08 809B90E8 24A50444 */ addiu $a1, $a1, %lo(D_06000444) ## $a1 = 06000444 /* 00E0C 809B90EC E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 00E10 809B90F0 4600918D */ trunc.w.s $f6, $f18 /* 00E14 809B90F4 440D3000 */ mfc1 $t5, $f6 @@ -166,14 +166,14 @@ glabel func_809B8EF4 /* 00E48 809B9128 C6100090 */ lwc1 $f16, 0x0090($s0) ## 00000090 /* 00E4C 809B912C 44819000 */ mtc1 $at, $f18 ## $f18 = 200.00 /* 00E50 809B9130 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 -/* 00E54 809B9134 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00E54 809B9134 3C050600 */ lui $a1, %hi(D_06000184) ## $a1 = 06000000 /* 00E58 809B9138 4612803C */ c.lt.s $f16, $f18 /* 00E5C 809B913C A60A026E */ sh $t2, 0x026E($s0) ## 0000026E /* 00E60 809B9140 8FA40034 */ lw $a0, 0x0034($sp) /* 00E64 809B9144 45000005 */ bc1f .L809B915C /* 00E68 809B9148 00000000 */ nop /* 00E6C 809B914C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 00E70 809B9150 24A50184 */ addiu $a1, $a1, 0x0184 ## $a1 = 06000184 +/* 00E70 809B9150 24A50184 */ addiu $a1, $a1, %lo(D_06000184) ## $a1 = 06000184 /* 00E74 809B9154 860B008A */ lh $t3, 0x008A($s0) ## 0000008A /* 00E78 809B9158 A60B026E */ sh $t3, 0x026E($s0) ## 0000026E .L809B915C: @@ -247,11 +247,11 @@ glabel func_809B8EF4 /* 00F70 809B9250 44814000 */ mtc1 $at, $f8 ## $f8 = 200.00 /* 00F74 809B9254 860B026A */ lh $t3, 0x026A($s0) ## 0000026A /* 00F78 809B9258 8FA40034 */ lw $a0, 0x0034($sp) -/* 00F7C 809B925C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00F7C 809B925C 3C050600 */ lui $a1, %hi(D_06000184) ## $a1 = 06000000 /* 00F80 809B9260 55600026 */ bnel $t3, $zero, .L809B92FC /* 00F84 809B9264 8E020324 */ lw $v0, 0x0324($s0) ## 00000324 /* 00F88 809B9268 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 00F8C 809B926C 24A50184 */ addiu $a1, $a1, 0x0184 ## $a1 = 06000184 +/* 00F8C 809B926C 24A50184 */ addiu $a1, $a1, %lo(D_06000184) ## $a1 = 06000184 /* 00F90 809B9270 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00F94 809B9274 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s index 9285edd197..dc73a521b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s @@ -2,8 +2,8 @@ glabel func_809B96EC /* 0140C 809B96EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01410 809B96F0 AFBF0014 */ sw $ra, 0x0014($sp) /* 01414 809B96F4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01418 809B96F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0141C 809B96FC 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 +/* 01418 809B96F8 3C050600 */ lui $a1, %hi(D_06000444) ## $a1 = 06000000 +/* 0141C 809B96FC 24A50444 */ addiu $a1, $a1, %lo(D_06000444) ## $a1 = 06000444 /* 01420 809B9700 AFA60018 */ sw $a2, 0x0018($sp) /* 01424 809B9704 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 01428 809B9708 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s index 6728d92480..bf1d7dc6f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s @@ -4,8 +4,8 @@ glabel func_809B9A54 /* 0177C 809B9A5C 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 /* 01780 809B9A60 24A4014C */ addiu $a0, $a1, 0x014C ## $a0 = 0000014C /* 01784 809B9A64 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01788 809B9A68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0178C 809B9A6C 24A50184 */ addiu $a1, $a1, 0x0184 ## $a1 = 06000184 +/* 01788 809B9A68 3C050600 */ lui $a1, %hi(D_06000184) ## $a1 = 06000000 +/* 0178C 809B9A6C 24A50184 */ addiu $a1, $a1, %lo(D_06000184) ## $a1 = 06000184 /* 01790 809B9A70 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 01794 809B9A74 AFA6001C */ sw $a2, 0x001C($sp) /* 01798 809B9A78 8FA6001C */ lw $a2, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s index 830599c35a..fe529c368b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s @@ -4,8 +4,8 @@ glabel func_809BA028 /* 01D50 809BA030 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 /* 01D54 809BA034 24A4014C */ addiu $a0, $a1, 0x014C ## $a0 = 0000014C /* 01D58 809BA038 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01D5C 809BA03C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01D60 809BA040 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 +/* 01D5C 809BA03C 3C050600 */ lui $a1, %hi(D_06000444) ## $a1 = 06000000 +/* 01D60 809BA040 24A50444 */ addiu $a1, $a1, %lo(D_06000444) ## $a1 = 06000444 /* 01D64 809BA044 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 01D68 809BA048 AFA6001C */ sw $a2, 0x001C($sp) /* 01D6C 809BA04C 8FA6001C */ lw $a2, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s index 374b71ea1f..d78ded7614 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s @@ -137,8 +137,8 @@ glabel func_809BA0D8 /* 01FC0 809BA2A0 8FA50054 */ lw $a1, 0x0054($sp) /* 01FC4 809BA2A4 0C26E7CA */ jal func_809B9F28 /* 01FC8 809BA2A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FCC 809BA2AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01FD0 809BA2B0 24A50184 */ addiu $a1, $a1, 0x0184 ## $a1 = 06000184 +/* 01FCC 809BA2AC 3C050600 */ lui $a1, %hi(D_06000184) ## $a1 = 06000000 +/* 01FD0 809BA2B0 24A50184 */ addiu $a1, $a1, %lo(D_06000184) ## $a1 = 06000184 /* 01FD4 809BA2B4 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 01FD8 809BA2B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01FDC 809BA2BC 0C03F66B */ jal Math_Rand_ZeroOne @@ -157,11 +157,11 @@ glabel func_809BA0D8 .L809BA2EC: /* 0200C 809BA2EC 8E09025C */ lw $t1, 0x025C($s0) ## 0000025C /* 02010 809BA2F0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 02014 809BA2F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 02014 809BA2F4 3C050600 */ lui $a1, %hi(D_06000444) ## $a1 = 06000000 /* 02018 809BA2F8 51200004 */ beql $t1, $zero, .L809BA30C /* 0201C 809BA2FC 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 /* 02020 809BA300 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 02024 809BA304 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 +/* 02024 809BA304 24A50444 */ addiu $a1, $a1, %lo(D_06000444) ## $a1 = 06000444 /* 02028 809BA308 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 .L809BA30C: /* 0202C 809BA30C 254B1F40 */ addiu $t3, $t2, 0x1F40 ## $t3 = 00001F40 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s index 739c874a98..f114966024 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s @@ -11,8 +11,8 @@ glabel func_809BA458 /* 0219C 809BA47C ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 /* 021A0 809BA480 8DF90008 */ lw $t9, 0x0008($t7) ## 809BBB58 /* 021A4 809BA484 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 021A8 809BA488 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 021AC 809BA48C 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 +/* 021A8 809BA488 3C050600 */ lui $a1, %hi(D_06000444) ## $a1 = 06000000 +/* 021AC 809BA48C 24A50444 */ addiu $a1, $a1, %lo(D_06000444) ## $a1 = 06000444 /* 021B0 809BA490 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 021B4 809BA494 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 /* 021B8 809BA498 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s index cb7434bf9c..47007ed707 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s @@ -2,8 +2,8 @@ glabel func_809BA590 /* 022B0 809BA590 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 022B4 809BA594 AFBF0014 */ sw $ra, 0x0014($sp) /* 022B8 809BA598 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 022BC 809BA59C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 022C0 809BA5A0 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 +/* 022BC 809BA59C 3C050600 */ lui $a1, %hi(D_06000444) ## $a1 = 06000000 +/* 022C0 809BA5A0 24A50444 */ addiu $a1, $a1, %lo(D_06000444) ## $a1 = 06000444 /* 022C4 809BA5A4 AFA60018 */ sw $a2, 0x0018($sp) /* 022C8 809BA5A8 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 022CC 809BA5AC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C 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 3a86a0de59..be6f2331b9 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 @@ -119,8 +119,8 @@ glabel func_809BC8C8 /* 00A34 809BCA64 0C0346A2 */ jal Matrix_NewMtx /* 00A38 809BCA68 AFA2002C */ sw $v0, 0x002C($sp) /* 00A3C 809BCA6C 8FA3002C */ lw $v1, 0x002C($sp) -/* 00A40 809BCA70 3C0D0602 */ lui $t5, 0x0602 ## $t5 = 06020000 -/* 00A44 809BCA74 25ADD950 */ addiu $t5, $t5, 0xD950 ## $t5 = 0601D950 +/* 00A40 809BCA70 3C0D0602 */ lui $t5, %hi(D_0601D950) ## $t5 = 06020000 +/* 00A44 809BCA74 25ADD950 */ addiu $t5, $t5, %lo(D_0601D950) ## $t5 = 0601D950 /* 00A48 809BCA78 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00A4C 809BCA7C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00A50 809BCA80 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s index b22bd0bfea..a747f63b6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s @@ -17,16 +17,16 @@ glabel EnBigokuta_Init /* 00028 809BCC88 0C01E037 */ jal Actor_ProcessInitChain /* 0002C 809BCC8C 24A5F488 */ addiu $a1, $a1, %lo(D_809BF488) ## $a1 = 809BF488 -/* 00030 809BCC90 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00034 809BCC94 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00030 809BCC90 3C060600 */ lui $a2, %hi(D_06006BC0) ## $a2 = 06000000 +/* 00034 809BCC94 3C070600 */ lui $a3, %hi(D_060014B8) ## $a3 = 06000000 /* 00038 809BCC98 264E019C */ addiu $t6, $s2, 0x019C ## $t6 = 0000019C /* 0003C 809BCC9C 264F0214 */ addiu $t7, $s2, 0x0214 ## $t7 = 00000214 /* 00040 809BCCA0 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 /* 00044 809BCCA4 AFB80018 */ sw $t8, 0x0018($sp) /* 00048 809BCCA8 AFAF0014 */ sw $t7, 0x0014($sp) /* 0004C 809BCCAC AFAE0010 */ sw $t6, 0x0010($sp) -/* 00050 809BCCB0 24E714B8 */ addiu $a3, $a3, 0x14B8 ## $a3 = 060014B8 -/* 00054 809BCCB4 24C66BC0 */ addiu $a2, $a2, 0x6BC0 ## $a2 = 06006BC0 +/* 00050 809BCCB0 24E714B8 */ addiu $a3, $a3, %lo(D_060014B8) ## $a3 = 060014B8 +/* 00054 809BCCB4 24C66BC0 */ addiu $a2, $a2, %lo(D_06006BC0) ## $a2 = 06006BC0 /* 00058 809BCCB8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 0005C 809BCCBC 0C0291BE */ jal SkelAnime_InitFlex /* 00060 809BCCC0 2645014C */ addiu $a1, $s2, 0x014C ## $a1 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s index feea8a0c1f..2ee9fa024c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s @@ -7,8 +7,8 @@ glabel func_809BD318 /* 006B8 809BD318 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 006BC 809BD31C AFBF0014 */ sw $ra, 0x0014($sp) /* 006C0 809BD320 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 006C4 809BD324 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 006C8 809BD328 24A514B8 */ addiu $a1, $a1, 0x14B8 ## $a1 = 060014B8 +/* 006C4 809BD324 3C050600 */ lui $a1, %hi(D_060014B8) ## $a1 = 06000000 +/* 006C8 809BD328 24A514B8 */ addiu $a1, $a1, %lo(D_060014B8) ## $a1 = 060014B8 /* 006CC 809BD32C AFA60018 */ sw $a2, 0x0018($sp) /* 006D0 809BD330 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 006D4 809BD334 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s index 92cb213894..9294257ce2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s @@ -2,8 +2,8 @@ glabel func_809BD3F8 /* 00798 809BD3F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0079C 809BD3FC AFBF0014 */ sw $ra, 0x0014($sp) /* 007A0 809BD400 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 007A4 809BD404 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 007A8 809BD408 24A51CA4 */ addiu $a1, $a1, 0x1CA4 ## $a1 = 06001CA4 +/* 007A4 809BD404 3C050600 */ lui $a1, %hi(D_06001CA4) ## $a1 = 06000000 +/* 007A8 809BD408 24A51CA4 */ addiu $a1, $a1, %lo(D_06001CA4) ## $a1 = 06001CA4 /* 007AC 809BD40C AFA70018 */ sw $a3, 0x0018($sp) /* 007B0 809BD410 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 007B4 809BD414 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s index bcf0105b67..11cb5efb00 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s @@ -2,8 +2,8 @@ glabel func_809BD4A4 /* 00844 809BD4A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00848 809BD4A8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0084C 809BD4AC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00850 809BD4B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00854 809BD4B4 24A514B8 */ addiu $a1, $a1, 0x14B8 ## $a1 = 060014B8 +/* 00850 809BD4B0 3C050600 */ lui $a1, %hi(D_060014B8) ## $a1 = 06000000 +/* 00854 809BD4B4 24A514B8 */ addiu $a1, $a1, %lo(D_060014B8) ## $a1 = 060014B8 /* 00858 809BD4B8 AFA70018 */ sw $a3, 0x0018($sp) /* 0085C 809BD4BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00860 809BD4C0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s index 3553bd0a26..f05b8a349c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s @@ -3,8 +3,8 @@ glabel func_809BD524 /* 008C8 809BD528 AFB00020 */ sw $s0, 0x0020($sp) /* 008CC 809BD52C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 008D0 809BD530 AFBF0024 */ sw $ra, 0x0024($sp) -/* 008D4 809BD534 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 008D8 809BD538 24A50D1C */ addiu $a1, $a1, 0x0D1C ## $a1 = 06000D1C +/* 008D4 809BD534 3C050600 */ lui $a1, %hi(D_06000D1C) ## $a1 = 06000000 +/* 008D8 809BD538 24A50D1C */ addiu $a1, $a1, %lo(D_06000D1C) ## $a1 = 06000D1C /* 008DC 809BD53C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 008E0 809BD540 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 008E4 809BD544 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s index bd2474aa51..0cd95323e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s @@ -3,8 +3,8 @@ glabel func_809BD5E0 /* 00984 809BD5E4 AFB00020 */ sw $s0, 0x0020($sp) /* 00988 809BD5E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0098C 809BD5EC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00990 809BD5F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00994 809BD5F4 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 +/* 00990 809BD5F0 3C050600 */ lui $a1, %hi(D_06000444) ## $a1 = 06000000 +/* 00994 809BD5F4 24A50444 */ addiu $a1, $a1, %lo(D_06000444) ## $a1 = 06000444 /* 00998 809BD5F8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0099C 809BD5FC 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 009A0 809BD600 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s index 25acddd21a..a457d715b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s @@ -2,8 +2,8 @@ glabel func_809BD658 /* 009F8 809BD658 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 009FC 809BD65C AFBF0014 */ sw $ra, 0x0014($sp) /* 00A00 809BD660 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00A04 809BD664 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00A08 809BD668 24A50A74 */ addiu $a1, $a1, 0x0A74 ## $a1 = 06000A74 +/* 00A04 809BD664 3C050600 */ lui $a1, %hi(D_06000A74) ## $a1 = 06000000 +/* 00A08 809BD668 24A50A74 */ addiu $a1, $a1, %lo(D_06000A74) ## $a1 = 06000A74 /* 00A0C 809BD66C AFA70018 */ sw $a3, 0x0018($sp) /* 00A10 809BD670 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00A14 809BD674 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop 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 3a0edc075e..b16da98f67 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 @@ -17,16 +17,16 @@ glabel EnBili_Init /* 00034 809BF8D4 3C074188 */ lui $a3, 0x4188 ## $a3 = 41880000 /* 00038 809BF8D8 240E009B */ addiu $t6, $zero, 0x009B ## $t6 = 0000009B /* 0003C 809BF8DC A20E00C8 */ sb $t6, 0x00C8($s0) ## 000000C8 -/* 00040 809BF8E0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00044 809BF8E4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00040 809BF8E0 3C060600 */ lui $a2, %hi(D_06005848) ## $a2 = 06000000 +/* 00044 809BF8E4 3C070600 */ lui $a3, %hi(D_060000A4) ## $a3 = 06000000 /* 00048 809BF8E8 260F0198 */ addiu $t7, $s0, 0x0198 ## $t7 = 00000198 /* 0004C 809BF8EC 261801B6 */ addiu $t8, $s0, 0x01B6 ## $t8 = 000001B6 /* 00050 809BF8F0 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 /* 00054 809BF8F4 AFB90018 */ sw $t9, 0x0018($sp) /* 00058 809BF8F8 AFB80014 */ sw $t8, 0x0014($sp) /* 0005C 809BF8FC AFAF0010 */ sw $t7, 0x0010($sp) -/* 00060 809BF900 24E700A4 */ addiu $a3, $a3, 0x00A4 ## $a3 = 060000A4 -/* 00064 809BF904 24C65848 */ addiu $a2, $a2, 0x5848 ## $a2 = 06005848 +/* 00060 809BF900 24E700A4 */ addiu $a3, $a3, %lo(D_060000A4) ## $a3 = 060000A4 +/* 00064 809BF904 24C65848 */ addiu $a2, $a2, %lo(D_06005848) ## $a2 = 06005848 /* 00068 809BF908 8FA4003C */ lw $a0, 0x003C($sp) /* 0006C 809BF90C 0C02915F */ jal SkelAnime_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s index 8dbea8408a..eca5fda376 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s @@ -7,8 +7,8 @@ glabel func_809BFA14 /* 00174 809BFA14 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00178 809BFA18 AFBF0014 */ sw $ra, 0x0014($sp) /* 0017C 809BFA1C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00180 809BFA20 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00184 809BFA24 24A500A4 */ addiu $a1, $a1, 0x00A4 ## $a1 = 060000A4 +/* 00180 809BFA20 3C050600 */ lui $a1, %hi(D_060000A4) ## $a1 = 06000000 +/* 00184 809BFA24 24A500A4 */ addiu $a1, $a1, %lo(D_060000A4) ## $a1 = 060000A4 /* 00188 809BFA28 AFA60018 */ sw $a2, 0x0018($sp) /* 0018C 809BFA2C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00190 809BFA30 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s index 2243de8b52..62bb2fa589 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s @@ -2,8 +2,8 @@ glabel func_809BFA8C /* 001EC 809BFA8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 001F0 809BFA90 AFBF0014 */ sw $ra, 0x0014($sp) /* 001F4 809BFA94 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 001F8 809BFA98 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 001FC 809BFA9C 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 06000024 +/* 001F8 809BFA98 3C050600 */ lui $a1, %hi(D_06000024) ## $a1 = 06000000 +/* 001FC 809BFA9C 24A50024 */ addiu $a1, $a1, %lo(D_06000024) ## $a1 = 06000024 /* 00200 809BFAA0 AFA60018 */ sw $a2, 0x0018($sp) /* 00204 809BFAA4 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00208 809BFAA8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFAE8.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFAE8.s index e05eecff22..f45fc95ed9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFAE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFAE8.s @@ -2,8 +2,8 @@ glabel func_809BFAE8 /* 00248 809BFAE8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0024C 809BFAEC AFBF0014 */ sw $ra, 0x0014($sp) /* 00250 809BFAF0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00254 809BFAF4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00258 809BFAF8 24A50064 */ addiu $a1, $a1, 0x0064 ## $a1 = 06000064 +/* 00254 809BFAF4 3C050600 */ lui $a1, %hi(D_06000064) ## $a1 = 06000000 +/* 00258 809BFAF8 24A50064 */ addiu $a1, $a1, %lo(D_06000064) ## $a1 = 06000064 /* 0025C 809BFAFC AFA60018 */ sw $a2, 0x0018($sp) /* 00260 809BFB00 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00264 809BFB04 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s index 71a53114aa..f3067ff7b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s @@ -7,8 +7,8 @@ glabel func_809BFB5C /* 002BC 809BFB5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 002C0 809BFB60 AFBF0014 */ sw $ra, 0x0014($sp) /* 002C4 809BFB64 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 002C8 809BFB68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 002CC 809BFB6C 24A500A4 */ addiu $a1, $a1, 0x00A4 ## $a1 = 060000A4 +/* 002C8 809BFB68 3C050600 */ lui $a1, %hi(D_060000A4) ## $a1 = 06000000 +/* 002CC 809BFB6C 24A500A4 */ addiu $a1, $a1, %lo(D_060000A4) ## $a1 = 060000A4 /* 002D0 809BFB70 AFA60018 */ sw $a2, 0x0018($sp) /* 002D4 809BFB74 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 002D8 809BFB78 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s index ae8ddab242..c6b17a7e77 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s @@ -3,8 +3,8 @@ glabel func_809BFBC4 /* 00328 809BFBC8 AFBF001C */ sw $ra, 0x001C($sp) /* 0032C 809BFBCC AFB00018 */ sw $s0, 0x0018($sp) /* 00330 809BFBD0 8C8E0154 */ lw $t6, 0x0154($a0) ## 00000154 -/* 00334 809BFBD4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00338 809BFBD8 24A500A4 */ addiu $a1, $a1, 0x00A4 ## $a1 = 060000A4 +/* 00334 809BFBD4 3C050600 */ lui $a1, %hi(D_060000A4) ## $a1 = 06000000 +/* 00338 809BFBD8 24A500A4 */ addiu $a1, $a1, %lo(D_060000A4) ## $a1 = 060000A4 /* 0033C 809BFBDC 10AE0003 */ beq $a1, $t6, .L809BFBEC /* 00340 809BFBE0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00344 809BFBE4 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s index c00974ea40..0379ca6aec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s @@ -7,8 +7,8 @@ glabel func_809BFC48 /* 003BC 809BFC5C 25CE04B4 */ addiu $t6, $t6, %lo(func_809C04B4) ## $t6 = 809C04B4 /* 003C0 809BFC60 15CF0005 */ bne $t6, $t7, .L809BFC78 /* 003C4 809BFC64 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003C8 809BFC68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 003CC 809BFC6C 24A500A4 */ addiu $a1, $a1, 0x00A4 ## $a1 = 060000A4 +/* 003C8 809BFC68 3C050600 */ lui $a1, %hi(D_060000A4) ## $a1 = 06000000 +/* 003CC 809BFC6C 24A500A4 */ addiu $a1, $a1, %lo(D_060000A4) ## $a1 = 060000A4 /* 003D0 809BFC70 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 003D4 809BFC74 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C .L809BFC78: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Draw.s index 6760fcc1f5..c155c64989 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Draw.s @@ -227,8 +227,8 @@ glabel EnBomChu_Draw /* 0147C 809C6CAC 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 01480 809C6CB0 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01484 809C6CB4 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 01488 809C6CB8 3C0A0400 */ lui $t2, 0x0400 ## $t2 = 04000000 -/* 0148C 809C6CBC 254A7E10 */ addiu $t2, $t2, 0x7E10 ## $t2 = 04007E10 +/* 01488 809C6CB8 3C0A0400 */ lui $t2, %hi(D_04007E10) ## $t2 = 04000000 +/* 0148C 809C6CBC 254A7E10 */ addiu $t2, $t2, %lo(D_04007E10) ## $t2 = 04007E10 /* 01490 809C6CC0 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 01494 809C6CC4 AE2802C0 */ sw $t0, 0x02C0($s1) ## 000002C0 /* 01498 809C6CC8 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s index befeacb25f..4388863074 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s @@ -17,13 +17,13 @@ glabel EnBrob_Init /* 00018 809CAB28 260E01B0 */ addiu $t6, $s0, 0x01B0 ## $t6 = 000001B0 /* 0001C 809CAB2C 260F01EC */ addiu $t7, $s0, 0x01EC ## $t7 = 000001EC /* 00020 809CAB30 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00024 809CAB34 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00028 809CAB38 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00024 809CAB34 3C060600 */ lui $a2, %hi(D_060015D8) ## $a2 = 06000000 +/* 00028 809CAB38 3C070600 */ lui $a3, %hi(D_06001750) ## $a3 = 06000000 /* 0002C 809CAB3C 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A /* 00030 809CAB40 AFA00034 */ sw $zero, 0x0034($sp) /* 00034 809CAB44 AFB80018 */ sw $t8, 0x0018($sp) -/* 00038 809CAB48 24E71750 */ addiu $a3, $a3, 0x1750 ## $a3 = 06001750 -/* 0003C 809CAB4C 24C615D8 */ addiu $a2, $a2, 0x15D8 ## $a2 = 060015D8 +/* 00038 809CAB48 24E71750 */ addiu $a3, $a3, %lo(D_06001750) ## $a3 = 06001750 +/* 0003C 809CAB4C 24C615D8 */ addiu $a2, $a2, %lo(D_060015D8) ## $a2 = 060015D8 /* 00040 809CAB50 26050164 */ addiu $a1, $s0, 0x0164 ## $a1 = 00000164 /* 00044 809CAB54 AFAF0014 */ sw $t7, 0x0014($sp) /* 00048 809CAB58 0C0291BE */ jal SkelAnime_InitFlex @@ -32,8 +32,8 @@ glabel EnBrob_Init /* 00054 809CAB64 0C010D20 */ jal DynaPolyInfo_SetActorMove /* 00058 809CAB68 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0005C 809CAB6C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00060 809CAB70 24841A70 */ addiu $a0, $a0, 0x1A70 ## $a0 = 06001A70 +/* 0005C 809CAB6C 3C040600 */ lui $a0, %hi(D_06001A70) ## $a0 = 06000000 +/* 00060 809CAB70 24841A70 */ addiu $a0, $a0, %lo(D_06001A70) ## $a0 = 06001A70 /* 00064 809CAB74 0C010620 */ jal DynaPolyInfo_Alloc /* 00068 809CAB78 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAE44.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAE44.s index f791ad43bb..8674f832e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAE44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAE44.s @@ -3,8 +3,8 @@ glabel func_809CAE44 /* 00338 809CAE48 AFA5001C */ sw $a1, 0x001C($sp) /* 0033C 809CAE4C AFBF0014 */ sw $ra, 0x0014($sp) /* 00340 809CAE50 AFA40018 */ sw $a0, 0x0018($sp) -/* 00344 809CAE54 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00348 809CAE58 24A51750 */ addiu $a1, $a1, 0x1750 ## $a1 = 06001750 +/* 00344 809CAE54 3C050600 */ lui $a1, %hi(D_06001750) ## $a1 = 06000000 +/* 00348 809CAE58 24A51750 */ addiu $a1, $a1, %lo(D_06001750) ## $a1 = 06001750 /* 0034C 809CAE5C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00350 809CAE60 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 /* 00354 809CAE64 8FA4001C */ lw $a0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s index ca2ea83b36..3a5659394d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s @@ -2,8 +2,8 @@ glabel func_809CAEA0 /* 00390 809CAEA0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00394 809CAEA4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00398 809CAEA8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0039C 809CAEAC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 003A0 809CAEB0 24A51958 */ addiu $a1, $a1, 0x1958 ## $a1 = 06001958 +/* 0039C 809CAEAC 3C050600 */ lui $a1, %hi(D_06001958) ## $a1 = 06000000 +/* 003A0 809CAEB0 24A51958 */ addiu $a1, $a1, %lo(D_06001958) ## $a1 = 06001958 /* 003A4 809CAEB4 AFA70018 */ sw $a3, 0x0018($sp) /* 003A8 809CAEB8 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 /* 003AC 809CAEBC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEF4.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEF4.s index 1ea64c8af9..ec433fa6ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEF4.s @@ -3,8 +3,8 @@ glabel func_809CAEF4 /* 003E8 809CAEF8 AFB00020 */ sw $s0, 0x0020($sp) /* 003EC 809CAEFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 003F0 809CAF00 AFBF0024 */ sw $ra, 0x0024($sp) -/* 003F4 809CAF04 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 003F8 809CAF08 24A50290 */ addiu $a1, $a1, 0x0290 ## $a1 = 06000290 +/* 003F4 809CAF04 3C050600 */ lui $a1, %hi(D_06000290) ## $a1 = 06000000 +/* 003F8 809CAF08 24A50290 */ addiu $a1, $a1, %lo(D_06000290) ## $a1 = 06000290 /* 003FC 809CAF0C 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 /* 00400 809CAF10 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00404 809CAF14 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAF88.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAF88.s index 1f94ff0a8a..fc0f5371d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAF88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAF88.s @@ -2,21 +2,21 @@ glabel func_809CAF88 /* 00478 809CAF88 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0047C 809CAF8C AFA40028 */ sw $a0, 0x0028($sp) /* 00480 809CAF90 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00484 809CAF94 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00484 809CAF94 3C040600 */ lui $a0, %hi(D_06001750) ## $a0 = 06000000 /* 00488 809CAF98 0C028800 */ jal SkelAnime_GetFrameCount -/* 0048C 809CAF9C 24841750 */ addiu $a0, $a0, 0x1750 ## $a0 = 06001750 +/* 0048C 809CAF9C 24841750 */ addiu $a0, $a0, %lo(D_06001750) ## $a0 = 06001750 /* 00490 809CAFA0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00494 809CAFA4 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 00498 809CAFA8 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 /* 0049C 809CAFAC 46802120 */ cvt.s.w $f4, $f4 /* 004A0 809CAFB0 8FA40028 */ lw $a0, 0x0028($sp) /* 004A4 809CAFB4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 004A8 809CAFB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 004A8 809CAFB8 3C050600 */ lui $a1, %hi(D_06001750) ## $a1 = 06000000 /* 004AC 809CAFBC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 004B0 809CAFC0 AFAE0014 */ sw $t6, 0x0014($sp) /* 004B4 809CAFC4 44072000 */ mfc1 $a3, $f4 -/* 004B8 809CAFC8 24A51750 */ addiu $a1, $a1, 0x1750 ## $a1 = 06001750 +/* 004B8 809CAFC8 24A51750 */ addiu $a1, $a1, %lo(D_06001750) ## $a1 = 06001750 /* 004BC 809CAFCC 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 004C0 809CAFD0 E7A80018 */ swc1 $f8, 0x0018($sp) /* 004C4 809CAFD4 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s index 2a54cf998c..1f41230e89 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s @@ -2,8 +2,8 @@ glabel func_809CB008 /* 004F8 809CB008 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 004FC 809CB00C AFBF0014 */ sw $ra, 0x0014($sp) /* 00500 809CB010 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00504 809CB014 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00508 809CB018 24A51678 */ addiu $a1, $a1, 0x1678 ## $a1 = 06001678 +/* 00504 809CB014 3C050600 */ lui $a1, %hi(D_06001678) ## $a1 = 06000000 +/* 00508 809CB018 24A51678 */ addiu $a1, $a1, %lo(D_06001678) ## $a1 = 06001678 /* 0050C 809CB01C AFA70018 */ sw $a3, 0x0018($sp) /* 00510 809CB020 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 /* 00514 809CB024 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s index 8677d880b3..6a218a393a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s @@ -131,8 +131,8 @@ glabel EnBubble_Draw /* 0116C 809CCD6C 0C0346A2 */ jal Matrix_NewMtx /* 01170 809CCD70 AFA20038 */ sw $v0, 0x0038($sp) /* 01174 809CCD74 8FA30038 */ lw $v1, 0x0038($sp) -/* 01178 809CCD78 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 0117C 809CCD7C 25AD1000 */ addiu $t5, $t5, 0x1000 ## $t5 = 06001000 +/* 01178 809CCD78 3C0D0600 */ lui $t5, %hi(D_06001000) ## $t5 = 06000000 +/* 0117C 809CCD7C 25AD1000 */ addiu $t5, $t5, %lo(D_06001000) ## $t5 = 06001000 /* 01180 809CCD80 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01184 809CCD84 8FAA004C */ lw $t2, 0x004C($sp) /* 01188 809CCD88 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 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 cb5056d47b..2a6f2b9886 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 @@ -277,8 +277,8 @@ glabel EnBw_Draw /* 02C24 809D1304 0C0346A2 */ jal Matrix_NewMtx /* 02C28 809D1308 AFA20058 */ sw $v0, 0x0058($sp) /* 02C2C 809D130C 8FA30058 */ lw $v1, 0x0058($sp) -/* 02C30 809D1310 3C090405 */ lui $t1, 0x0405 ## $t1 = 04050000 -/* 02C34 809D1314 2529D4E0 */ addiu $t1, $t1, 0xD4E0 ## $t1 = 0404D4E0 +/* 02C30 809D1310 3C090405 */ lui $t1, %hi(D_0404D4E0) ## $t1 = 04050000 +/* 02C34 809D1314 2529D4E0 */ addiu $t1, $t1, %lo(D_0404D4E0) ## $t1 = 0404D4E0 /* 02C38 809D1318 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 02C3C 809D131C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 02C40 809D1320 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 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 2ac19419cd..e54e03e51d 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 @@ -18,16 +18,16 @@ glabel EnBw_Init /* 00030 809CE710 240E0023 */ addiu $t6, $zero, 0x0023 ## $t6 = 00000023 /* 00034 809CE714 A20E0117 */ sb $t6, 0x0117($s0) ## 00000117 /* 00038 809CE718 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 0003C 809CE71C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00040 809CE720 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 0003C 809CE71C 3C060600 */ lui $a2, %hi(D_060020F0) ## $a2 = 06000000 +/* 00040 809CE720 3C070600 */ lui $a3, %hi(D_06000228) ## $a3 = 06000000 /* 00044 809CE724 260F0190 */ addiu $t7, $s0, 0x0190 ## $t7 = 00000190 /* 00048 809CE728 261801D8 */ addiu $t8, $s0, 0x01D8 ## $t8 = 000001D8 /* 0004C 809CE72C 2419000C */ addiu $t9, $zero, 0x000C ## $t9 = 0000000C /* 00050 809CE730 AFB90018 */ sw $t9, 0x0018($sp) /* 00054 809CE734 AFB80014 */ sw $t8, 0x0014($sp) /* 00058 809CE738 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0005C 809CE73C 24E70228 */ addiu $a3, $a3, 0x0228 ## $a3 = 06000228 -/* 00060 809CE740 24C620F0 */ addiu $a2, $a2, 0x20F0 ## $a2 = 060020F0 +/* 0005C 809CE73C 24E70228 */ addiu $a3, $a3, %lo(D_06000228) ## $a3 = 06000228 +/* 00060 809CE740 24C620F0 */ addiu $a2, $a2, %lo(D_060020F0) ## $a2 = 060020F0 /* 00064 809CE744 8FA4003C */ lw $a0, 0x003C($sp) /* 00068 809CE748 0C02915F */ jal SkelAnime_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s index d897ab8b82..5d6a581189 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s @@ -2,8 +2,8 @@ glabel func_809CE9A8 /* 002C8 809CE9A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 002CC 809CE9AC AFBF0014 */ sw $ra, 0x0014($sp) /* 002D0 809CE9B0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 002D4 809CE9B4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 002D8 809CE9B8 24A50228 */ addiu $a1, $a1, 0x0228 ## $a1 = 06000228 +/* 002D4 809CE9B4 3C050600 */ lui $a1, %hi(D_06000228) ## $a1 = 06000000 +/* 002D8 809CE9B8 24A50228 */ addiu $a1, $a1, %lo(D_06000228) ## $a1 = 06000228 /* 002DC 809CE9BC AFA70018 */ sw $a3, 0x0018($sp) /* 002E0 809CE9C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 002E4 809CE9C4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF72C.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF72C.s index 171e315aaa..f51dc077cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF72C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF72C.s @@ -7,8 +7,8 @@ glabel func_809CF72C /* 0104C 809CF72C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01050 809CF730 AFBF0014 */ sw $ra, 0x0014($sp) /* 01054 809CF734 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01058 809CF738 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0105C 809CF73C 24A521A0 */ addiu $a1, $a1, 0x21A0 ## $a1 = 060021A0 +/* 01058 809CF738 3C050600 */ lui $a1, %hi(D_060021A0) ## $a1 = 06000000 +/* 0105C 809CF73C 24A521A0 */ addiu $a1, $a1, %lo(D_060021A0) ## $a1 = 060021A0 /* 01060 809CF740 AFA70018 */ sw $a3, 0x0018($sp) /* 01064 809CF744 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01068 809CF748 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF8F0.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF8F0.s index d184ed0b99..94ec795e65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF8F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF8F0.s @@ -2,8 +2,8 @@ glabel func_809CF8F0 /* 01210 809CF8F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01214 809CF8F4 AFBF0014 */ sw $ra, 0x0014($sp) /* 01218 809CF8F8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0121C 809CF8FC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01220 809CF900 24A52250 */ addiu $a1, $a1, 0x2250 ## $a1 = 06002250 +/* 0121C 809CF8FC 3C050600 */ lui $a1, %hi(D_06002250) ## $a1 = 06000000 +/* 01220 809CF900 24A52250 */ addiu $a1, $a1, %lo(D_06002250) ## $a1 = 06002250 /* 01224 809CF904 AFA70018 */ sw $a3, 0x0018($sp) /* 01228 809CF908 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0122C 809CF90C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s index 51ade3ef20..ce76210ccd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s @@ -3,8 +3,8 @@ glabel func_809CFBA8 /* 014CC 809CFBAC AFB00018 */ sw $s0, 0x0018($sp) /* 014D0 809CFBB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 014D4 809CFBB4 AFBF001C */ sw $ra, 0x001C($sp) -/* 014D8 809CFBB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 014DC 809CFBBC 24A52250 */ addiu $a1, $a1, 0x2250 ## $a1 = 06002250 +/* 014D8 809CFBB8 3C050600 */ lui $a1, %hi(D_06002250) ## $a1 = 06000000 +/* 014DC 809CFBBC 24A52250 */ addiu $a1, $a1, %lo(D_06002250) ## $a1 = 06002250 /* 014E0 809CFBC0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 014E4 809CFBC4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 014E8 809CFBC8 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s index c7f5bc45a8..8b0a3d1a40 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s @@ -2,8 +2,8 @@ glabel func_809CFF10 /* 01830 809CFF10 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01834 809CFF14 AFBF0014 */ sw $ra, 0x0014($sp) /* 01838 809CFF18 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0183C 809CFF1C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01840 809CFF20 24A52250 */ addiu $a1, $a1, 0x2250 ## $a1 = 06002250 +/* 0183C 809CFF1C 3C050600 */ lui $a1, %hi(D_06002250) ## $a1 = 06000000 +/* 01840 809CFF20 24A52250 */ addiu $a1, $a1, %lo(D_06002250) ## $a1 = 06002250 /* 01844 809CFF24 AFA70018 */ sw $a3, 0x0018($sp) /* 01848 809CFF28 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0184C 809CFF2C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat 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 0acb6ee74a..a7c81f4c4f 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 @@ -97,8 +97,8 @@ glabel EnCs_Draw /* 00E24 809E26D4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 00E28 809E26D8 37180034 */ ori $t8, $t8, 0x0034 ## $t8 = DB060034 /* 00E2C 809E26DC 2459FE40 */ addiu $t9, $v0, 0xFE40 ## $t9 = FFFFFE40 -/* 00E30 809E26E0 3C0B0603 */ lui $t3, 0x0603 ## $t3 = 06030000 -/* 00E34 809E26E4 256BAF70 */ addiu $t3, $t3, 0xAF70 ## $t3 = 0602AF70 +/* 00E30 809E26E0 3C0B0603 */ lui $t3, %hi(D_0602AF70) ## $t3 = 06030000 +/* 00E34 809E26E4 256BAF70 */ addiu $t3, $t3, %lo(D_0602AF70) ## $t3 = 0602AF70 /* 00E38 809E26E8 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 /* 00E3C 809E26EC 00004012 */ mflo $t0 /* 00E40 809E26F0 02286021 */ addu $t4, $s1, $t0 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 3c7cab414e..b8f288ae79 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 @@ -21,14 +21,14 @@ glabel EnCs_Init /* 00164 809E1A14 3C074198 */ lui $a3, 0x4198 ## $a3 = 41980000 /* 00168 809E1A18 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0016C 809E1A1C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 +/* 0016C 809E1A1C 3C060601 */ lui $a2, %hi(D_06008540) ## $a2 = 06010000 /* 00170 809E1A20 260F0284 */ addiu $t7, $s0, 0x0284 ## $t7 = 00000284 /* 00174 809E1A24 261802E4 */ addiu $t8, $s0, 0x02E4 ## $t8 = 000002E4 /* 00178 809E1A28 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 /* 0017C 809E1A2C AFB90018 */ sw $t9, 0x0018($sp) /* 00180 809E1A30 AFB80014 */ sw $t8, 0x0014($sp) /* 00184 809E1A34 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00188 809E1A38 24C68540 */ addiu $a2, $a2, 0x8540 ## $a2 = 06008540 +/* 00188 809E1A38 24C68540 */ addiu $a2, $a2, %lo(D_06008540) ## $a2 = 06008540 /* 0018C 809E1A3C AFA50038 */ sw $a1, 0x0038($sp) /* 00190 809E1A40 8FA4004C */ lw $a0, 0x004C($sp) /* 00194 809E1A44 0C0291BE */ jal SkelAnime_InitFlex 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 56225c2377..4d5305f63b 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 @@ -80,14 +80,14 @@ glabel EnDaikuKakariko_Init /* 001C4 809E44E4 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 001C8 809E44E8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 001CC 809E44EC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 001CC 809E44EC 3C060600 */ lui $a2, %hi(D_06007958) ## $a2 = 06000000 /* 001D0 809E44F0 260F022C */ addiu $t7, $s0, 0x022C ## $t7 = 0000022C /* 001D4 809E44F4 26180292 */ addiu $t8, $s0, 0x0292 ## $t8 = 00000292 /* 001D8 809E44F8 24190011 */ addiu $t9, $zero, 0x0011 ## $t9 = 00000011 /* 001DC 809E44FC AFB90018 */ sw $t9, 0x0018($sp) /* 001E0 809E4500 AFB80014 */ sw $t8, 0x0014($sp) /* 001E4 809E4504 AFAF0010 */ sw $t7, 0x0010($sp) -/* 001E8 809E4508 24C67958 */ addiu $a2, $a2, 0x7958 ## $a2 = 06007958 +/* 001E8 809E4508 24C67958 */ addiu $a2, $a2, %lo(D_06007958) ## $a2 = 06007958 /* 001EC 809E450C AFA50034 */ sw $a1, 0x0034($sp) /* 001F0 809E4510 8FA4004C */ lw $a0, 0x004C($sp) /* 001F4 809E4514 0C0291BE */ jal SkelAnime_InitFlex diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Draw.s index 68bc007537..b692b19cfa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Draw.s @@ -105,8 +105,8 @@ glabel EnDekubaba_Draw /* 035A4 809E8D74 0C0346A2 */ jal Matrix_NewMtx /* 035A8 809E8D78 AFA20038 */ sw $v0, 0x0038($sp) /* 035AC 809E8D7C 8FA30038 */ lw $v1, 0x0038($sp) -/* 035B0 809E8D80 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 035B4 809E8D84 25CE10F0 */ addiu $t6, $t6, 0x10F0 ## $t6 = 060010F0 +/* 035B0 809E8D80 3C0E0600 */ lui $t6, %hi(D_060010F0) ## $t6 = 06000000 +/* 035B4 809E8D84 25CE10F0 */ addiu $t6, $t6, %lo(D_060010F0) ## $t6 = 060010F0 /* 035B8 809E8D88 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 035BC 809E8D8C 8FA4004C */ lw $a0, 0x004C($sp) /* 035C0 809E8D90 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 @@ -160,8 +160,8 @@ glabel EnDekubaba_Draw /* 03674 809E8E44 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 03678 809E8E48 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 0367C 809E8E4C 8FAB004C */ lw $t3, 0x004C($sp) -/* 03680 809E8E50 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 03684 809E8E54 25CE3070 */ addiu $t6, $t6, 0x3070 ## $t6 = 06003070 +/* 03680 809E8E50 3C0E0600 */ lui $t6, %hi(D_06003070) ## $t6 = 06000000 +/* 03684 809E8E54 25CE3070 */ addiu $t6, $t6, %lo(D_06003070) ## $t6 = 06003070 /* 03688 809E8E58 8D6202C0 */ lw $v0, 0x02C0($t3) ## 000002C0 /* 0368C 809E8E5C 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 /* 03690 809E8E60 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 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 40cacfcd88..069f239b7e 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 @@ -15,16 +15,16 @@ glabel EnDekubaba_Init /* 00030 809E5800 0C00AC78 */ jal ActorShape_Init /* 00034 809E5804 3C0741B0 */ lui $a3, 0x41B0 ## $a3 = 41B00000 -/* 00038 809E5808 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 0003C 809E580C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00038 809E5808 3C060600 */ lui $a2, %hi(D_06002A40) ## $a2 = 06000000 +/* 0003C 809E580C 3C070600 */ lui $a3, %hi(D_060002B8) ## $a3 = 06000000 /* 00040 809E5810 260E01D0 */ addiu $t6, $s0, 0x01D0 ## $t6 = 000001D0 /* 00044 809E5814 260F0200 */ addiu $t7, $s0, 0x0200 ## $t7 = 00000200 /* 00048 809E5818 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 /* 0004C 809E581C AFB80018 */ sw $t8, 0x0018($sp) /* 00050 809E5820 AFAF0014 */ sw $t7, 0x0014($sp) /* 00054 809E5824 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00058 809E5828 24E702B8 */ addiu $a3, $a3, 0x02B8 ## $a3 = 060002B8 -/* 0005C 809E582C 24C62A40 */ addiu $a2, $a2, 0x2A40 ## $a2 = 06002A40 +/* 00058 809E5828 24E702B8 */ addiu $a3, $a3, %lo(D_060002B8) ## $a3 = 060002B8 +/* 0005C 809E582C 24C62A40 */ addiu $a2, $a2, %lo(D_06002A40) ## $a2 = 06002A40 /* 00060 809E5830 8FA40044 */ lw $a0, 0x0044($sp) /* 00064 809E5834 0C02915F */ jal SkelAnime_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5D28.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5D28.s index b668c9832d..5831d598fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5D28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5D28.s @@ -8,12 +8,12 @@ glabel func_809E5D28 /* 0055C 809E5D2C AFB00028 */ sw $s0, 0x0028($sp) /* 00560 809E5D30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00564 809E5D34 AFBF002C */ sw $ra, 0x002C($sp) -/* 00568 809E5D38 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00568 809E5D38 3C040600 */ lui $a0, %hi(D_060002B8) ## $a0 = 06000000 /* 0056C 809E5D3C 0C028800 */ jal SkelAnime_GetFrameCount -/* 00570 809E5D40 248402B8 */ addiu $a0, $a0, 0x02B8 ## $a0 = 060002B8 -/* 00574 809E5D44 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00578 809E5D48 248402B8 */ addiu $a0, $a0, 0x02B8 ## $a0 = 060002B8 +/* 00570 809E5D40 248402B8 */ addiu $a0, $a0, %lo(D_060002B8) ## $a0 = 060002B8 +/* 00574 809E5D44 3C040600 */ lui $a0, %hi(D_060002B8) ## $a0 = 06000000 +/* 00578 809E5D48 248402B8 */ addiu $a0, $a0, %lo(D_060002B8) ## $a0 = 060002B8 /* 0057C 809E5D4C 0C028800 */ jal SkelAnime_GetFrameCount /* 00580 809E5D50 A7A20030 */ sh $v0, 0x0030($sp) @@ -24,13 +24,13 @@ glabel func_809E5D28 /* 00594 809E5D64 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 00598 809E5D68 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0059C 809E5D6C 468021A0 */ cvt.s.w $f6, $f4 -/* 005A0 809E5D70 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 005A0 809E5D70 3C050600 */ lui $a1, %hi(D_060002B8) ## $a1 = 06000000 /* 005A4 809E5D74 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 005A8 809E5D78 44070000 */ mfc1 $a3, $f0 /* 005AC 809E5D7C AFAF0014 */ sw $t7, 0x0014($sp) /* 005B0 809E5D80 468084A0 */ cvt.s.w $f18, $f16 /* 005B4 809E5D84 46083282 */ mul.s $f10, $f6, $f8 -/* 005B8 809E5D88 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 +/* 005B8 809E5D88 24A502B8 */ addiu $a1, $a1, %lo(D_060002B8) ## $a1 = 060002B8 /* 005BC 809E5D8C 2604017C */ addiu $a0, $s0, 0x017C ## $a0 = 0000017C /* 005C0 809E5D90 E7A00018 */ swc1 $f0, 0x0018($sp) /* 005C4 809E5D94 E7B20010 */ swc1 $f18, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5E58.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5E58.s index 5a397c55b2..3df9c71474 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5E58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5E58.s @@ -3,19 +3,19 @@ glabel func_809E5E58 /* 0068C 809E5E5C AFB00028 */ sw $s0, 0x0028($sp) /* 00690 809E5E60 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00694 809E5E64 AFBF002C */ sw $ra, 0x002C($sp) -/* 00698 809E5E68 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00698 809E5E68 3C040600 */ lui $a0, %hi(D_060002B8) ## $a0 = 06000000 /* 0069C 809E5E6C 0C028800 */ jal SkelAnime_GetFrameCount -/* 006A0 809E5E70 248402B8 */ addiu $a0, $a0, 0x02B8 ## $a0 = 060002B8 +/* 006A0 809E5E70 248402B8 */ addiu $a0, $a0, %lo(D_060002B8) ## $a0 = 060002B8 /* 006A4 809E5E74 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 006A8 809E5E78 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 006AC 809E5E7C 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 006B0 809E5E80 46802120 */ cvt.s.w $f4, $f4 /* 006B4 809E5E84 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 006B8 809E5E88 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 006B8 809E5E88 3C050600 */ lui $a1, %hi(D_060002B8) ## $a1 = 06000000 /* 006BC 809E5E8C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 006C0 809E5E90 AFAE0014 */ sw $t6, 0x0014($sp) -/* 006C4 809E5E94 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 +/* 006C4 809E5E94 24A502B8 */ addiu $a1, $a1, %lo(D_060002B8) ## $a1 = 060002B8 /* 006C8 809E5E98 44072000 */ mfc1 $a3, $f4 /* 006CC 809E5E9C 2604017C */ addiu $a0, $s0, 0x017C ## $a0 = 0000017C /* 006D0 809E5EA0 3C06BFC0 */ lui $a2, 0xBFC0 ## $a2 = BFC00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s index 7d9c17e4b6..bc8b7fd41b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s @@ -2,14 +2,14 @@ glabel func_809E5F44 /* 00774 809E5F44 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00778 809E5F48 AFA40018 */ sw $a0, 0x0018($sp) /* 0077C 809E5F4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00780 809E5F50 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00780 809E5F50 3C040600 */ lui $a0, %hi(D_060002B8) ## $a0 = 06000000 /* 00784 809E5F54 0C028800 */ jal SkelAnime_GetFrameCount -/* 00788 809E5F58 248402B8 */ addiu $a0, $a0, 0x02B8 ## $a0 = 060002B8 +/* 00788 809E5F58 248402B8 */ addiu $a0, $a0, %lo(D_060002B8) ## $a0 = 060002B8 /* 0078C 809E5F5C 8FA30018 */ lw $v1, 0x0018($sp) /* 00790 809E5F60 00027040 */ sll $t6, $v0, 1 -/* 00794 809E5F64 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00798 809E5F68 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 +/* 00794 809E5F64 3C050600 */ lui $a1, %hi(D_060002B8) ## $a1 = 06000000 +/* 00798 809E5F68 24A502B8 */ addiu $a1, $a1, %lo(D_060002B8) ## $a1 = 060002B8 /* 0079C 809E5F6C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 007A0 809E5F70 A46E01C6 */ sh $t6, 0x01C6($v1) ## 000001C6 /* 007A4 809E5F74 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5FBC.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5FBC.s index 74e86345f8..7f5b366ef0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5FBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5FBC.s @@ -2,8 +2,8 @@ glabel func_809E5FBC /* 007EC 809E5FBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 007F0 809E5FC0 AFBF0014 */ sw $ra, 0x0014($sp) /* 007F4 809E5FC4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 007F8 809E5FC8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 007FC 809E5FCC 24A50208 */ addiu $a1, $a1, 0x0208 ## $a1 = 06000208 +/* 007F8 809E5FC8 3C050600 */ lui $a1, %hi(D_06000208) ## $a1 = 06000000 +/* 007FC 809E5FCC 24A50208 */ addiu $a1, $a1, %lo(D_06000208) ## $a1 = 06000208 /* 00800 809E5FD0 AFA60018 */ sw $a2, 0x0018($sp) /* 00804 809E5FD4 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00808 809E5FD8 2484017C */ addiu $a0, $a0, 0x017C ## $a0 = 0000017C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6000.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6000.s index 42a3e77fb0..300756c7dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6000.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6000.s @@ -2,19 +2,19 @@ glabel func_809E6000 /* 00830 809E6000 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00834 809E6004 AFA40028 */ sw $a0, 0x0028($sp) /* 00838 809E6008 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0083C 809E600C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0083C 809E600C 3C040600 */ lui $a0, %hi(D_06000208) ## $a0 = 06000000 /* 00840 809E6010 0C028800 */ jal SkelAnime_GetFrameCount -/* 00844 809E6014 24840208 */ addiu $a0, $a0, 0x0208 ## $a0 = 06000208 +/* 00844 809E6014 24840208 */ addiu $a0, $a0, %lo(D_06000208) ## $a0 = 06000208 /* 00848 809E6018 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0084C 809E601C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00850 809E6020 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 00854 809E6024 468021A0 */ cvt.s.w $f6, $f4 /* 00858 809E6028 8FA40028 */ lw $a0, 0x0028($sp) -/* 0085C 809E602C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0085C 809E602C 3C050600 */ lui $a1, %hi(D_06000208) ## $a1 = 06000000 /* 00860 809E6030 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00864 809E6034 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00868 809E6038 24A50208 */ addiu $a1, $a1, 0x0208 ## $a1 = 06000208 +/* 00868 809E6038 24A50208 */ addiu $a1, $a1, %lo(D_06000208) ## $a1 = 06000208 /* 0086C 809E603C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00870 809E6040 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00874 809E6044 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E60A8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E60A8.s index b5260504eb..79834c59d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E60A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E60A8.s @@ -9,8 +9,8 @@ glabel func_809E60A8 /* 008E0 809E60B0 AFA5002C */ sw $a1, 0x002C($sp) /* 008E4 809E60B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 008E8 809E60B8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 008EC 809E60BC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 008F0 809E60C0 24A50208 */ addiu $a1, $a1, 0x0208 ## $a1 = 06000208 +/* 008EC 809E60BC 3C050600 */ lui $a1, %hi(D_06000208) ## $a1 = 06000000 +/* 008F0 809E60C0 24A50208 */ addiu $a1, $a1, %lo(D_06000208) ## $a1 = 06000208 /* 008F4 809E60C4 2484017C */ addiu $a0, $a0, 0x017C ## $a0 = 0000017C /* 008F8 809E60C8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 008FC 809E60CC 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E61E0.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E61E0.s index 606b155db3..78ada67cd0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E61E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E61E0.s @@ -2,21 +2,21 @@ glabel func_809E61E0 /* 00A10 809E61E0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00A14 809E61E4 AFA40028 */ sw $a0, 0x0028($sp) /* 00A18 809E61E8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A1C 809E61EC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00A1C 809E61EC 3C040600 */ lui $a0, %hi(D_060002B8) ## $a0 = 06000000 /* 00A20 809E61F0 0C028800 */ jal SkelAnime_GetFrameCount -/* 00A24 809E61F4 248402B8 */ addiu $a0, $a0, 0x02B8 ## $a0 = 060002B8 +/* 00A24 809E61F4 248402B8 */ addiu $a0, $a0, %lo(D_060002B8) ## $a0 = 060002B8 /* 00A28 809E61F8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00A2C 809E61FC 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00A30 809E6200 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 00A34 809E6204 46802120 */ cvt.s.w $f4, $f4 /* 00A38 809E6208 8FA30028 */ lw $v1, 0x0028($sp) /* 00A3C 809E620C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00A40 809E6210 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00A40 809E6210 3C050600 */ lui $a1, %hi(D_060002B8) ## $a1 = 06000000 /* 00A44 809E6214 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00A48 809E6218 AFAE0014 */ sw $t6, 0x0014($sp) /* 00A4C 809E621C 44072000 */ mfc1 $a3, $f4 -/* 00A50 809E6220 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 +/* 00A50 809E6220 24A502B8 */ addiu $a1, $a1, %lo(D_060002B8) ## $a1 = 060002B8 /* 00A54 809E6224 3C06BFC0 */ lui $a2, 0xBFC0 ## $a2 = BFC00000 /* 00A58 809E6228 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00A5C 809E622C 2464017C */ addiu $a0, $v1, 0x017C ## $a0 = 0000017C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6264.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6264.s index 4a0bb4374b..412532b391 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6264.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6264.s @@ -40,18 +40,18 @@ glabel func_809E6264 /* 00B2C 809E62FC 860A01C6 */ lh $t2, 0x01C6($s0) ## 000001C6 /* 00B30 809E6300 15410015 */ bne $t2, $at, .L809E6358 /* 00B34 809E6304 00000000 */ nop -/* 00B38 809E6308 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00B38 809E6308 3C040600 */ lui $a0, %hi(D_060002B8) ## $a0 = 06000000 /* 00B3C 809E630C 0C028800 */ jal SkelAnime_GetFrameCount -/* 00B40 809E6310 248402B8 */ addiu $a0, $a0, 0x02B8 ## $a0 = 060002B8 +/* 00B40 809E6310 248402B8 */ addiu $a0, $a0, %lo(D_060002B8) ## $a0 = 060002B8 /* 00B44 809E6314 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00B48 809E6318 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00B4C 809E631C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00B50 809E6320 468021A0 */ cvt.s.w $f6, $f4 /* 00B54 809E6324 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 00B58 809E6328 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00B58 809E6328 3C050600 */ lui $a1, %hi(D_060002B8) ## $a1 = 06000000 /* 00B5C 809E632C 44070000 */ mfc1 $a3, $f0 -/* 00B60 809E6330 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 +/* 00B60 809E6330 24A502B8 */ addiu $a1, $a1, %lo(D_060002B8) ## $a1 = 060002B8 /* 00B64 809E6334 2604017C */ addiu $a0, $s0, 0x017C ## $a0 = 0000017C /* 00B68 809E6338 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00B6C 809E633C 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 @@ -71,10 +71,10 @@ glabel func_809E6264 /* 00B98 809E6368 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00B9C 809E636C 46805420 */ cvt.s.w $f16, $f10 /* 00BA0 809E6370 44819000 */ mtc1 $at, $f18 ## $f18 = -3.00 -/* 00BA4 809E6374 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00BA4 809E6374 3C050600 */ lui $a1, %hi(D_060002B8) ## $a1 = 06000000 /* 00BA8 809E6378 44060000 */ mfc1 $a2, $f0 /* 00BAC 809E637C 44070000 */ mfc1 $a3, $f0 -/* 00BB0 809E6380 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 +/* 00BB0 809E6380 24A502B8 */ addiu $a1, $a1, %lo(D_060002B8) ## $a1 = 060002B8 /* 00BB4 809E6384 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00BB8 809E6388 2604017C */ addiu $a0, $s0, 0x017C ## $a0 = 0000017C /* 00BBC 809E638C AFA00014 */ sw $zero, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s index 8b9b54e354..b29757ffcf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s @@ -75,8 +75,8 @@ glabel func_809E7104 /* 01A38 809E7208 2405F1C8 */ addiu $a1, $zero, 0xF1C8 ## $a1 = FFFFF1C8 /* 01A3C 809E720C 8FA3004C */ lw $v1, 0x004C($sp) -/* 01A40 809E7210 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01A44 809E7214 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 +/* 01A40 809E7210 3C050600 */ lui $a1, %hi(D_060002B8) ## $a1 = 06000000 +/* 01A44 809E7214 24A502B8 */ addiu $a1, $a1, %lo(D_060002B8) ## $a1 = 060002B8 /* 01A48 809E7218 00621824 */ and $v1, $v1, $v0 /* 01A4C 809E721C 10600054 */ beq $v1, $zero, .L809E7370 /* 01A50 809E7220 8FA40034 */ lw $a0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s index 1db686618a..46a3529b8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s @@ -68,8 +68,8 @@ glabel func_809E858C /* 02E7C 809E864C 0C0346A2 */ jal Matrix_NewMtx /* 02E80 809E8650 AFA2002C */ sw $v0, 0x002C($sp) /* 02E84 809E8654 8FA3002C */ lw $v1, 0x002C($sp) -/* 02E88 809E8658 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 02E8C 809E865C 254A1330 */ addiu $t2, $t2, 0x1330 ## $t2 = 06001330 +/* 02E88 809E8658 3C0A0600 */ lui $t2, %hi(D_06001330) ## $t2 = 06000000 +/* 02E8C 809E865C 254A1330 */ addiu $t2, $t2, %lo(D_06001330) ## $t2 = 06001330 /* 02E90 809E8660 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 02E94 809E8664 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 02E98 809E8668 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s index e5081d1ca7..cefec32a76 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s @@ -45,8 +45,8 @@ glabel func_809E89E4 /* 03288 809E8A58 0C0346A2 */ jal Matrix_NewMtx /* 0328C 809E8A5C AFA20028 */ sw $v0, 0x0028($sp) /* 03290 809E8A60 8FA30028 */ lw $v1, 0x0028($sp) -/* 03294 809E8A64 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 03298 809E8A68 254A1828 */ addiu $t2, $t2, 0x1828 ## $t2 = 06001828 +/* 03294 809E8A64 3C0A0600 */ lui $t2, %hi(D_06001828) ## $t2 = 06000000 +/* 03298 809E8A68 254A1828 */ addiu $t2, $t2, %lo(D_06001828) ## $t2 = 06001828 /* 0329C 809E8A6C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 032A0 809E8A70 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 032A4 809E8A74 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8AD8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8AD8.s index 25511cc79a..4ca9e14274 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8AD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8AD8.s @@ -75,8 +75,8 @@ glabel func_809E8AD8 /* 033E4 809E8BB4 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 /* 033E8 809E8BB8 AE220004 */ sw $v0, 0x0004($s1) ## 00000004 /* 033EC 809E8BBC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 033F0 809E8BC0 3C0F0405 */ lui $t7, 0x0405 ## $t7 = 04050000 -/* 033F4 809E8BC4 25EF9210 */ addiu $t7, $t7, 0x9210 ## $t7 = 04049210 +/* 033F0 809E8BC0 3C0F0405 */ lui $t7, %hi(D_04049210) ## $t7 = 04050000 +/* 033F4 809E8BC4 25EF9210 */ addiu $t7, $t7, %lo(D_04049210) ## $t7 = 04049210 /* 033F8 809E8BC8 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 033FC 809E8BCC AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 03400 809E8BD0 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Draw.s index b8677200f2..5c09dbc5cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Draw.s @@ -9,10 +9,10 @@ glabel EnDekunuts_Draw /* 01580 809EAAE0 15E10007 */ bne $t7, $at, .L809EAB00 /* 01584 809EAAE4 8FB80020 */ lw $t8, 0x0020($sp) /* 01588 809EAAE8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0158C 809EAAEC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0158C 809EAAEC 3C050600 */ lui $a1, %hi(D_06002298) ## $a1 = 06000000 /* 01590 809EAAF0 0C00D498 */ jal Gfx_DrawDListOpa -/* 01594 809EAAF4 24A52298 */ addiu $a1, $a1, 0x2298 ## $a1 = 06002298 +/* 01594 809EAAF4 24A52298 */ addiu $a1, $a1, %lo(D_06002298) ## $a1 = 06002298 /* 01598 809EAAF8 10000009 */ beq $zero, $zero, .L809EAB20 /* 0159C 809EAAFC 8FBF001C */ lw $ra, 0x001C($sp) .L809EAB00: 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 2f5456432e..e8de6a162c 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 @@ -25,16 +25,16 @@ glabel EnDekunuts_Init /* 00054 809E95B4 0C00AC78 */ jal ActorShape_Init /* 00058 809E95B8 3C07420C */ lui $a3, 0x420C ## $a3 = 420C0000 -/* 0005C 809E95BC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00060 809E95C0 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 0005C 809E95BC 3C060600 */ lui $a2, %hi(D_06003268) ## $a2 = 06000000 +/* 00060 809E95C0 3C070600 */ lui $a3, %hi(D_06000E6C) ## $a3 = 06000000 /* 00064 809E95C4 2619019C */ addiu $t9, $s0, 0x019C ## $t9 = 0000019C /* 00068 809E95C8 26080232 */ addiu $t0, $s0, 0x0232 ## $t0 = 00000232 /* 0006C 809E95CC 24090019 */ addiu $t1, $zero, 0x0019 ## $t1 = 00000019 /* 00070 809E95D0 AFA90018 */ sw $t1, 0x0018($sp) /* 00074 809E95D4 AFA80014 */ sw $t0, 0x0014($sp) /* 00078 809E95D8 AFB90010 */ sw $t9, 0x0010($sp) -/* 0007C 809E95DC 24E70E6C */ addiu $a3, $a3, 0x0E6C ## $a3 = 06000E6C -/* 00080 809E95E0 24C63268 */ addiu $a2, $a2, 0x3268 ## $a2 = 06003268 +/* 0007C 809E95DC 24E70E6C */ addiu $a3, $a3, %lo(D_06000E6C) ## $a3 = 06000E6C +/* 00080 809E95E0 24C63268 */ addiu $a2, $a2, %lo(D_06003268) ## $a2 = 06003268 /* 00084 809E95E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00088 809E95E8 0C02915F */ jal SkelAnime_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Update.s index e42cc6c5b3..67ed04cb05 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Update.s @@ -70,10 +70,10 @@ glabel EnDekunuts_Update /* 013C0 809EA920 258CA0C4 */ addiu $t4, $t4, %lo(func_809EA0C4) ## $t4 = FFFFA0C4 /* 013C4 809EA924 15830012 */ bne $t4, $v1, .L809EA970 /* 013C8 809EA928 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013CC 809EA92C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 013CC 809EA92C 3C040600 */ lui $a0, %hi(D_060004D8) ## $a0 = 06000000 /* 013D0 809EA930 0C028800 */ jal SkelAnime_GetFrameCount -/* 013D4 809EA934 248404D8 */ addiu $a0, $a0, 0x04D8 ## $a0 = 060004D8 +/* 013D4 809EA934 248404D8 */ addiu $a0, $a0, %lo(D_060004D8) ## $a0 = 060004D8 /* 013D8 809EA938 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 013DC 809EA93C 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 /* 013E0 809EA940 C60A0164 */ lwc1 $f10, 0x0164($s0) ## 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s index bf240428a5..2df23afd42 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s @@ -3,8 +3,8 @@ glabel func_809E96FC /* 001A0 809E9700 AFB00018 */ sw $s0, 0x0018($sp) /* 001A4 809E9704 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 001A8 809E9708 AFBF001C */ sw $ra, 0x001C($sp) -/* 001AC 809E970C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 001B0 809E9710 24A50D1C */ addiu $a1, $a1, 0x0D1C ## $a1 = 06000D1C +/* 001AC 809E970C 3C050600 */ lui $a1, %hi(D_06000D1C) ## $a1 = 06000000 +/* 001B0 809E9710 24A50D1C */ addiu $a1, $a1, %lo(D_06000D1C) ## $a1 = 06000D1C /* 001B4 809E9714 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 001B8 809E9718 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 001BC 809E971C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s index 1ae7fa1b98..403f541a66 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s @@ -2,8 +2,8 @@ glabel func_809E9770 /* 00210 809E9770 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00214 809E9774 AFBF0014 */ sw $ra, 0x0014($sp) /* 00218 809E9778 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0021C 809E977C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00220 809E9780 24A50AF0 */ addiu $a1, $a1, 0x0AF0 ## $a1 = 06000AF0 +/* 0021C 809E977C 3C050600 */ lui $a1, %hi(D_06000AF0) ## $a1 = 06000000 +/* 00220 809E9780 24A50AF0 */ addiu $a1, $a1, %lo(D_06000AF0) ## $a1 = 06000AF0 /* 00224 809E9784 AFA60018 */ sw $a2, 0x0018($sp) /* 00228 809E9788 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 0022C 809E978C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E97B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E97B8.s index 7a9ce53e26..cac63b014a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E97B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E97B8.s @@ -2,8 +2,8 @@ glabel func_809E97B8 /* 00258 809E97B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0025C 809E97BC AFBF0014 */ sw $ra, 0x0014($sp) /* 00260 809E97C0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00264 809E97C4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00268 809E97C8 24A501C4 */ addiu $a1, $a1, 0x01C4 ## $a1 = 060001C4 +/* 00264 809E97C4 3C050600 */ lui $a1, %hi(D_060001C4) ## $a1 = 06000000 +/* 00268 809E97C8 24A501C4 */ addiu $a1, $a1, %lo(D_060001C4) ## $a1 = 060001C4 /* 0026C 809E97CC AFA60018 */ sw $a2, 0x0018($sp) /* 00270 809E97D0 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00274 809E97D4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s index 53cb3548b6..7d3a9061b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s @@ -2,8 +2,8 @@ glabel func_809E9800 /* 002A0 809E9800 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 002A4 809E9804 AFBF0014 */ sw $ra, 0x0014($sp) /* 002A8 809E9808 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 002AC 809E980C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 002B0 809E9810 24A50E6C */ addiu $a1, $a1, 0x0E6C ## $a1 = 06000E6C +/* 002AC 809E980C 3C050600 */ lui $a1, %hi(D_06000E6C) ## $a1 = 06000000 +/* 002B0 809E9810 24A50E6C */ addiu $a1, $a1, %lo(D_06000E6C) ## $a1 = 06000E6C /* 002B4 809E9814 AFA70018 */ sw $a3, 0x0018($sp) /* 002B8 809E9818 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 002BC 809E981C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9868.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9868.s index 0edfac8c86..b05f12d6bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9868.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9868.s @@ -2,8 +2,8 @@ glabel func_809E9868 /* 00308 809E9868 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0030C 809E986C AFBF0014 */ sw $ra, 0x0014($sp) /* 00310 809E9870 AFA40018 */ sw $a0, 0x0018($sp) -/* 00314 809E9874 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00318 809E9878 24A504D8 */ addiu $a1, $a1, 0x04D8 ## $a1 = 060004D8 +/* 00314 809E9874 3C050600 */ lui $a1, %hi(D_060004D8) ## $a1 = 06000000 +/* 00318 809E9878 24A504D8 */ addiu $a1, $a1, %lo(D_060004D8) ## $a1 = 060004D8 /* 0031C 809E987C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00320 809E9880 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00324 809E9884 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E98B4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E98B4.s index d950059518..3ee590ee4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E98B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E98B4.s @@ -2,8 +2,8 @@ glabel func_809E98B4 /* 00354 809E98B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00358 809E98B8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0035C 809E98BC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00360 809E98C0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00364 809E98C4 24A508C4 */ addiu $a1, $a1, 0x08C4 ## $a1 = 060008C4 +/* 00360 809E98C0 3C050600 */ lui $a1, %hi(D_060008C4) ## $a1 = 06000000 +/* 00364 809E98C4 24A508C4 */ addiu $a1, $a1, %lo(D_060008C4) ## $a1 = 060008C4 /* 00368 809E98C8 AFA70018 */ sw $a3, 0x0018($sp) /* 0036C 809E98CC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00370 809E98D0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s index f71d10e830..81a80b2fda 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s @@ -2,8 +2,8 @@ glabel func_809E9920 /* 003C0 809E9920 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 003C4 809E9924 AFBF0014 */ sw $ra, 0x0014($sp) /* 003C8 809E9928 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 003CC 809E992C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 003D0 809E9930 24A53650 */ addiu $a1, $a1, 0x3650 ## $a1 = 06003650 +/* 003CC 809E992C 3C050600 */ lui $a1, %hi(D_06003650) ## $a1 = 06000000 +/* 003D0 809E9930 24A53650 */ addiu $a1, $a1, %lo(D_06003650) ## $a1 = 06003650 /* 003D4 809E9934 AFA60018 */ sw $a2, 0x0018($sp) /* 003D8 809E9938 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 003DC 809E993C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s index d35cfc0023..955d2cf4eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s @@ -2,8 +2,8 @@ glabel func_809E9978 /* 00418 809E9978 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0041C 809E997C AFBF0014 */ sw $ra, 0x0014($sp) /* 00420 809E9980 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00424 809E9984 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00428 809E9988 24A51024 */ addiu $a1, $a1, 0x1024 ## $a1 = 06001024 +/* 00424 809E9984 3C050600 */ lui $a1, %hi(D_06001024) ## $a1 = 06000000 +/* 00428 809E9988 24A51024 */ addiu $a1, $a1, %lo(D_06001024) ## $a1 = 06001024 /* 0042C 809E998C AFA60018 */ sw $a2, 0x0018($sp) /* 00430 809E9990 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00434 809E9994 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E99D8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E99D8.s index 1c001e530c..55361e01ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E99D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E99D8.s @@ -3,8 +3,8 @@ glabel func_809E99D8 /* 0047C 809E99DC AFB00020 */ sw $s0, 0x0020($sp) /* 00480 809E99E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00484 809E99E4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00488 809E99E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0048C 809E99EC 24A50368 */ addiu $a1, $a1, 0x0368 ## $a1 = 06000368 +/* 00488 809E99E8 3C050600 */ lui $a1, %hi(D_06000368) ## $a1 = 06000000 +/* 0048C 809E99EC 24A50368 */ addiu $a1, $a1, %lo(D_06000368) ## $a1 = 06000368 /* 00490 809E99F0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00494 809E99F4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00498 809E99F8 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 @@ -44,10 +44,10 @@ glabel func_809E99D8 /* 00514 809E9A74 0C00BE0A */ jal Audio_PlayActorSound2 /* 00518 809E9A78 2405393B */ addiu $a1, $zero, 0x393B ## $a1 = 0000393B -/* 0051C 809E9A7C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0051C 809E9A7C 3C040600 */ lui $a0, %hi(D_06000368) ## $a0 = 06000000 /* 00520 809E9A80 0C028800 */ jal SkelAnime_GetFrameCount -/* 00524 809E9A84 24840368 */ addiu $a0, $a0, 0x0368 ## $a0 = 06000368 +/* 00524 809E9A84 24840368 */ addiu $a0, $a0, %lo(D_06000368) ## $a0 = 06000368 /* 00528 809E9A88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0052C 809E9A8C 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 00530 809E9A90 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s index 24a9c09cf5..de140ed9cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s @@ -3,8 +3,8 @@ glabel func_809E9AB4 /* 00558 809E9AB8 AFB00020 */ sw $s0, 0x0020($sp) /* 0055C 809E9ABC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00560 809E9AC0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00564 809E9AC4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00568 809E9AC8 24A50368 */ addiu $a1, $a1, 0x0368 ## $a1 = 06000368 +/* 00564 809E9AC4 3C050600 */ lui $a1, %hi(D_06000368) ## $a1 = 06000000 +/* 00568 809E9AC8 24A50368 */ addiu $a1, $a1, %lo(D_06000368) ## $a1 = 06000368 /* 0056C 809E9ACC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00570 809E9AD0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00574 809E9AD4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 @@ -19,10 +19,10 @@ glabel func_809E9AB4 /* 00598 809E9AF8 0C00BE0A */ jal Audio_PlayActorSound2 /* 0059C 809E9AFC E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 005A0 809E9B00 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 005A0 809E9B00 3C040600 */ lui $a0, %hi(D_06000368) ## $a0 = 06000000 /* 005A4 809E9B04 0C028800 */ jal SkelAnime_GetFrameCount -/* 005A8 809E9B08 24840368 */ addiu $a0, $a0, 0x0368 ## $a0 = 06000368 +/* 005A8 809E9B08 24840368 */ addiu $a0, $a0, %lo(D_06000368) ## $a0 = 06000368 /* 005AC 809E9B0C 86180196 */ lh $t8, 0x0196($s0) ## 00000196 /* 005B0 809E9B10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 005B4 809E9B14 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B48.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B48.s index 39f1f9f8f9..f76fb732aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B48.s @@ -2,8 +2,8 @@ glabel func_809E9B48 /* 005E8 809E9B48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 005EC 809E9B4C AFBF0014 */ sw $ra, 0x0014($sp) /* 005F0 809E9B50 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 005F4 809E9B54 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 005F8 809E9B58 24A506B0 */ addiu $a1, $a1, 0x06B0 ## $a1 = 060006B0 +/* 005F4 809E9B54 3C050600 */ lui $a1, %hi(D_060006B0) ## $a1 = 06000000 +/* 005F8 809E9B58 24A506B0 */ addiu $a1, $a1, %lo(D_060006B0) ## $a1 = 060006B0 /* 005FC 809E9B5C AFA60018 */ sw $a2, 0x0018($sp) /* 00600 809E9B60 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00604 809E9B64 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s index 37b672f7f3..50e73d30e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s @@ -80,8 +80,8 @@ glabel func_809E9F6C /* 00B24 809EA084 3C054140 */ lui $a1, 0x4140 ## $a1 = 41400000 /* 00B28 809EA088 10400009 */ beq $v0, $zero, .L809EA0B0 /* 00B2C 809EA08C 8FA40038 */ lw $a0, 0x0038($sp) -/* 00B30 809EA090 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00B34 809EA094 24A501C4 */ addiu $a1, $a1, 0x01C4 ## $a1 = 060001C4 +/* 00B30 809EA090 3C050600 */ lui $a1, %hi(D_060001C4) ## $a1 = 06000000 +/* 00B34 809EA094 24A501C4 */ addiu $a1, $a1, %lo(D_060001C4) ## $a1 = 060001C4 /* 00B38 809EA098 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00B3C 809EA09C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00B40 809EA0A0 86020196 */ lh $v0, 0x0196($s0) ## 00000196 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 119bcf98d2..03b7295e32 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 @@ -37,16 +37,16 @@ glabel EnDivingGame_Init /* 00030 809ED8A0 0C00AC78 */ jal ActorShape_Init /* 00034 809ED8A4 E484FFB8 */ swc1 $f4, -0x0048($a0) ## 0000006C -/* 00038 809ED8A8 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 0003C 809ED8AC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00038 809ED8A8 3C060601 */ lui $a2, %hi(D_0600BFA8) ## $a2 = 06010000 +/* 0003C 809ED8AC 3C070600 */ lui $a3, %hi(D_06002FE8) ## $a3 = 06000000 /* 00040 809ED8B0 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 00044 809ED8B4 260F0208 */ addiu $t7, $s0, 0x0208 ## $t7 = 00000208 /* 00048 809ED8B8 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 /* 0004C 809ED8BC AFB80018 */ sw $t8, 0x0018($sp) /* 00050 809ED8C0 AFAF0014 */ sw $t7, 0x0014($sp) /* 00054 809ED8C4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00058 809ED8C8 24E72FE8 */ addiu $a3, $a3, 0x2FE8 ## $a3 = 06002FE8 -/* 0005C 809ED8CC 24C6BFA8 */ addiu $a2, $a2, 0xBFA8 ## $a2 = 0600BFA8 +/* 00058 809ED8C8 24E72FE8 */ addiu $a3, $a3, %lo(D_06002FE8) ## $a3 = 06002FE8 +/* 0005C 809ED8CC 24C6BFA8 */ addiu $a2, $a2, %lo(D_0600BFA8) ## $a2 = 0600BFA8 /* 00060 809ED8D0 8FA4003C */ lw $a0, 0x003C($sp) /* 00064 809ED8D4 0C0291BE */ jal SkelAnime_InitFlex /* 00068 809ED8D8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDCB0.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDCB0.s index 9bca983535..94d5d1f0a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDCB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDCB0.s @@ -2,18 +2,18 @@ glabel func_809EDCB0 /* 00440 809EDCB0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00444 809EDCB4 AFA40028 */ sw $a0, 0x0028($sp) /* 00448 809EDCB8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0044C 809EDCBC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0044C 809EDCBC 3C040600 */ lui $a0, %hi(D_06002FE8) ## $a0 = 06000000 /* 00450 809EDCC0 AFA5002C */ sw $a1, 0x002C($sp) /* 00454 809EDCC4 0C028800 */ jal SkelAnime_GetFrameCount -/* 00458 809EDCC8 24842FE8 */ addiu $a0, $a0, 0x2FE8 ## $a0 = 06002FE8 +/* 00458 809EDCC8 24842FE8 */ addiu $a0, $a0, %lo(D_06002FE8) ## $a0 = 06002FE8 /* 0045C 809EDCCC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00460 809EDCD0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00464 809EDCD4 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 00468 809EDCD8 468021A0 */ cvt.s.w $f6, $f4 /* 0046C 809EDCDC 8FA40028 */ lw $a0, 0x0028($sp) -/* 00470 809EDCE0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00474 809EDCE4 24A52FE8 */ addiu $a1, $a1, 0x2FE8 ## $a1 = 06002FE8 +/* 00470 809EDCE0 3C050600 */ lui $a1, %hi(D_06002FE8) ## $a1 = 06000000 +/* 00474 809EDCE4 24A52FE8 */ addiu $a1, $a1, %lo(D_06002FE8) ## $a1 = 06002FE8 /* 00478 809EDCE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0047C 809EDCEC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00480 809EDCF0 4600320D */ trunc.w.s $f8, $f6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE0FC.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE0FC.s index 5457a5a2e6..0b32c7e3c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE0FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE0FC.s @@ -2,20 +2,20 @@ glabel func_809EE0FC /* 0088C 809EE0FC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00890 809EE100 AFA40028 */ sw $a0, 0x0028($sp) /* 00894 809EE104 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00898 809EE108 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00898 809EE108 3C040600 */ lui $a0, %hi(D_0600219C) ## $a0 = 06000000 /* 0089C 809EE10C AFA5002C */ sw $a1, 0x002C($sp) /* 008A0 809EE110 0C028800 */ jal SkelAnime_GetFrameCount -/* 008A4 809EE114 2484219C */ addiu $a0, $a0, 0x219C ## $a0 = 0600219C +/* 008A4 809EE114 2484219C */ addiu $a0, $a0, %lo(D_0600219C) ## $a0 = 0600219C /* 008A8 809EE118 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 008AC 809EE11C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 008B0 809EE120 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 008B4 809EE124 468021A0 */ cvt.s.w $f6, $f4 /* 008B8 809EE128 8FA40028 */ lw $a0, 0x0028($sp) -/* 008BC 809EE12C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 008BC 809EE12C 3C050600 */ lui $a1, %hi(D_0600219C) ## $a1 = 06000000 /* 008C0 809EE130 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 008C4 809EE134 AFA80014 */ sw $t0, 0x0014($sp) -/* 008C8 809EE138 24A5219C */ addiu $a1, $a1, 0x219C ## $a1 = 0600219C +/* 008C8 809EE138 24A5219C */ addiu $a1, $a1, %lo(D_0600219C) ## $a1 = 0600219C /* 008CC 809EE13C 4600320D */ trunc.w.s $f8, $f6 /* 008D0 809EE140 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 008D4 809EE144 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 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 566e862bd5..9a883295a1 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 @@ -93,8 +93,8 @@ glabel EnDntJiji_Draw /* 01444 809F2F24 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 01448 809F2F28 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 0144C 809F2F2C 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 01450 809F2F30 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 01454 809F2F34 254A2310 */ addiu $t2, $t2, 0x2310 ## $t2 = 06002310 +/* 01450 809F2F30 3C0A0600 */ lui $t2, %hi(D_06002310) ## $t2 = 06000000 +/* 01454 809F2F34 254A2310 */ addiu $t2, $t2, %lo(D_06002310) ## $t2 = 06002310 /* 01458 809F2F38 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 0145C 809F2F3C AE3902C0 */ sw $t9, 0x02C0($s1) ## 000002C0 /* 01460 809F2F40 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 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 a1513f5329..ab11f08aa4 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 @@ -22,16 +22,16 @@ glabel EnDntJiji_Init /* 00028 809F1B08 0C00AC78 */ jal ActorShape_Init /* 0002C 809F1B0C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 00030 809F1B10 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00034 809F1B14 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00030 809F1B10 3C060600 */ lui $a2, %hi(D_060033E0) ## $a2 = 06000000 +/* 00034 809F1B14 3C070600 */ lui $a3, %hi(D_06000560) ## $a3 = 06000000 /* 00038 809F1B18 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 0003C 809F1B1C 260F01DE */ addiu $t7, $s0, 0x01DE ## $t7 = 000001DE /* 00040 809F1B20 2418000D */ addiu $t8, $zero, 0x000D ## $t8 = 0000000D /* 00044 809F1B24 AFB80018 */ sw $t8, 0x0018($sp) /* 00048 809F1B28 AFAF0014 */ sw $t7, 0x0014($sp) /* 0004C 809F1B2C AFAE0010 */ sw $t6, 0x0010($sp) -/* 00050 809F1B30 24E70560 */ addiu $a3, $a3, 0x0560 ## $a3 = 06000560 -/* 00054 809F1B34 24C633E0 */ addiu $a2, $a2, 0x33E0 ## $a2 = 060033E0 +/* 00050 809F1B30 24E70560 */ addiu $a3, $a3, %lo(D_06000560) ## $a3 = 06000560 +/* 00054 809F1B34 24C633E0 */ addiu $a2, $a2, %lo(D_060033E0) ## $a2 = 060033E0 /* 00058 809F1B38 8FA4003C */ lw $a0, 0x003C($sp) /* 0005C 809F1B3C 0C02915F */ jal SkelAnime_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C44.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C44.s index 72453d98dd..b00a9196bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C44.s @@ -3,20 +3,20 @@ glabel func_809F1C44 /* 00168 809F1C48 AFB00028 */ sw $s0, 0x0028($sp) /* 0016C 809F1C4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00170 809F1C50 AFBF002C */ sw $ra, 0x002C($sp) -/* 00174 809F1C54 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00174 809F1C54 3C040600 */ lui $a0, %hi(D_06000560) ## $a0 = 06000000 /* 00178 809F1C58 AFA50034 */ sw $a1, 0x0034($sp) /* 0017C 809F1C5C 0C028800 */ jal SkelAnime_GetFrameCount -/* 00180 809F1C60 24840560 */ addiu $a0, $a0, 0x0560 ## $a0 = 06000560 +/* 00180 809F1C60 24840560 */ addiu $a0, $a0, %lo(D_06000560) ## $a0 = 06000560 /* 00184 809F1C64 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00188 809F1C68 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0018C 809F1C6C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00190 809F1C70 468021A0 */ cvt.s.w $f6, $f4 /* 00194 809F1C74 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00198 809F1C78 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00198 809F1C78 3C050600 */ lui $a1, %hi(D_06000560) ## $a1 = 06000000 /* 0019C 809F1C7C 44060000 */ mfc1 $a2, $f0 /* 001A0 809F1C80 44070000 */ mfc1 $a3, $f0 -/* 001A4 809F1C84 24A50560 */ addiu $a1, $a1, 0x0560 ## $a1 = 06000560 +/* 001A4 809F1C84 24A50560 */ addiu $a1, $a1, %lo(D_06000560) ## $a1 = 06000560 /* 001A8 809F1C88 4600320D */ trunc.w.s $f8, $f6 /* 001AC 809F1C8C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 001B0 809F1C90 440F4000 */ mfc1 $t7, $f8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s index 823562068a..26b16baf4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s @@ -3,18 +3,18 @@ glabel func_809F1DA8 /* 002CC 809F1DAC AFB00030 */ sw $s0, 0x0030($sp) /* 002D0 809F1DB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 002D4 809F1DB4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 002D8 809F1DB8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 002D8 809F1DB8 3C040600 */ lui $a0, %hi(D_060012B0) ## $a0 = 06000000 /* 002DC 809F1DBC AFA5003C */ sw $a1, 0x003C($sp) /* 002E0 809F1DC0 0C028800 */ jal SkelAnime_GetFrameCount -/* 002E4 809F1DC4 248412B0 */ addiu $a0, $a0, 0x12B0 ## $a0 = 060012B0 +/* 002E4 809F1DC4 248412B0 */ addiu $a0, $a0, %lo(D_060012B0) ## $a0 = 060012B0 /* 002E8 809F1DC8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 002EC 809F1DCC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 002F0 809F1DD0 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 002F4 809F1DD4 468021A0 */ cvt.s.w $f6, $f4 -/* 002F8 809F1DD8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 002F8 809F1DD8 3C050600 */ lui $a1, %hi(D_060012B0) ## $a1 = 06000000 /* 002FC 809F1DDC 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00300 809F1DE0 24A512B0 */ addiu $a1, $a1, 0x12B0 ## $a1 = 060012B0 +/* 00300 809F1DE0 24A512B0 */ addiu $a1, $a1, %lo(D_060012B0) ## $a1 = 060012B0 /* 00304 809F1DE4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00308 809F1DE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0030C 809F1DEC 4600320D */ trunc.w.s $f8, $f6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s index 722c9e22ed..6f645488db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s @@ -3,18 +3,18 @@ glabel func_809F1EFC /* 00420 809F1F00 AFB00030 */ sw $s0, 0x0030($sp) /* 00424 809F1F04 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00428 809F1F08 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0042C 809F1F0C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0042C 809F1F0C 3C040600 */ lui $a0, %hi(D_06000DF8) ## $a0 = 06000000 /* 00430 809F1F10 AFA5003C */ sw $a1, 0x003C($sp) /* 00434 809F1F14 0C028800 */ jal SkelAnime_GetFrameCount -/* 00438 809F1F18 24840DF8 */ addiu $a0, $a0, 0x0DF8 ## $a0 = 06000DF8 +/* 00438 809F1F18 24840DF8 */ addiu $a0, $a0, %lo(D_06000DF8) ## $a0 = 06000DF8 /* 0043C 809F1F1C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00440 809F1F20 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00444 809F1F24 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 00448 809F1F28 468021A0 */ cvt.s.w $f6, $f4 -/* 0044C 809F1F2C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0044C 809F1F2C 3C050600 */ lui $a1, %hi(D_06000DF8) ## $a1 = 06000000 /* 00450 809F1F30 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00454 809F1F34 24A50DF8 */ addiu $a1, $a1, 0x0DF8 ## $a1 = 06000DF8 +/* 00454 809F1F34 24A50DF8 */ addiu $a1, $a1, %lo(D_06000DF8) ## $a1 = 06000DF8 /* 00458 809F1F38 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0045C 809F1F3C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00460 809F1F40 4600320D */ trunc.w.s $f8, $f6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2068.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2068.s index 883c16c360..caccbece49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2068.s @@ -3,17 +3,17 @@ glabel func_809F2068 /* 0058C 809F206C AFB00028 */ sw $s0, 0x0028($sp) /* 00590 809F2070 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00594 809F2074 AFBF002C */ sw $ra, 0x002C($sp) -/* 00598 809F2078 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00598 809F2078 3C040600 */ lui $a0, %hi(D_060037C0) ## $a0 = 06000000 /* 0059C 809F207C AFA50034 */ sw $a1, 0x0034($sp) /* 005A0 809F2080 0C028800 */ jal SkelAnime_GetFrameCount -/* 005A4 809F2084 248437C0 */ addiu $a0, $a0, 0x37C0 ## $a0 = 060037C0 +/* 005A4 809F2084 248437C0 */ addiu $a0, $a0, %lo(D_060037C0) ## $a0 = 060037C0 /* 005A8 809F2088 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 005AC 809F208C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 005B0 809F2090 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 005B4 809F2094 468021A0 */ cvt.s.w $f6, $f4 -/* 005B8 809F2098 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 005BC 809F209C 24A537C0 */ addiu $a1, $a1, 0x37C0 ## $a1 = 060037C0 +/* 005B8 809F2098 3C050600 */ lui $a1, %hi(D_060037C0) ## $a1 = 06000000 +/* 005BC 809F209C 24A537C0 */ addiu $a1, $a1, %lo(D_060037C0) ## $a1 = 060037C0 /* 005C0 809F20A0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 005C4 809F20A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 005C8 809F20A8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s index fa5fdfbf19..d71d42f4ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s @@ -3,18 +3,18 @@ glabel func_809F2254 /* 00778 809F2258 AFB00030 */ sw $s0, 0x0030($sp) /* 0077C 809F225C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00780 809F2260 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00784 809F2264 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00784 809F2264 3C040600 */ lui $a0, %hi(D_06000560) ## $a0 = 06000000 /* 00788 809F2268 AFA5003C */ sw $a1, 0x003C($sp) /* 0078C 809F226C 0C028800 */ jal SkelAnime_GetFrameCount -/* 00790 809F2270 24840560 */ addiu $a0, $a0, 0x0560 ## $a0 = 06000560 +/* 00790 809F2270 24840560 */ addiu $a0, $a0, %lo(D_06000560) ## $a0 = 06000560 /* 00794 809F2274 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00798 809F2278 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 0079C 809F227C 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 007A0 809F2280 468021A0 */ cvt.s.w $f6, $f4 -/* 007A4 809F2284 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 007A4 809F2284 3C050600 */ lui $a1, %hi(D_06000560) ## $a1 = 06000000 /* 007A8 809F2288 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 007AC 809F228C 24A50560 */ addiu $a1, $a1, 0x0560 ## $a1 = 06000560 +/* 007AC 809F228C 24A50560 */ addiu $a1, $a1, %lo(D_06000560) ## $a1 = 06000560 /* 007B0 809F2290 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 007B4 809F2294 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 007B8 809F2298 4600320D */ trunc.w.s $f8, $f6 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 ad2439cecc..28c6302927 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 @@ -3,18 +3,18 @@ glabel func_809F236C /* 00890 809F2370 AFB00030 */ sw $s0, 0x0030($sp) /* 00894 809F2374 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00898 809F2378 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0089C 809F237C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0089C 809F237C 3C040600 */ lui $a0, %hi(D_06000944) ## $a0 = 06000000 /* 008A0 809F2380 AFA5003C */ sw $a1, 0x003C($sp) /* 008A4 809F2384 0C028800 */ jal SkelAnime_GetFrameCount -/* 008A8 809F2388 24840944 */ addiu $a0, $a0, 0x0944 ## $a0 = 06000944 +/* 008A8 809F2388 24840944 */ addiu $a0, $a0, %lo(D_06000944) ## $a0 = 06000944 /* 008AC 809F238C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 008B0 809F2390 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 008B4 809F2394 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 008B8 809F2398 468021A0 */ cvt.s.w $f6, $f4 -/* 008BC 809F239C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 008BC 809F239C 3C050600 */ lui $a1, %hi(D_06000944) ## $a1 = 06000000 /* 008C0 809F23A0 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 008C4 809F23A4 24A50944 */ addiu $a1, $a1, 0x0944 ## $a1 = 06000944 +/* 008C4 809F23A4 24A50944 */ addiu $a1, $a1, %lo(D_06000944) ## $a1 = 06000944 /* 008C8 809F23A8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 008CC 809F23AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 008D0 809F23B0 4600320D */ trunc.w.s $f8, $f6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2550.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2550.s index cb973bea76..cea0f98150 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2550.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2550.s @@ -2,18 +2,18 @@ glabel func_809F2550 /* 00A70 809F2550 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00A74 809F2554 AFA40028 */ sw $a0, 0x0028($sp) /* 00A78 809F2558 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A7C 809F255C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00A7C 809F255C 3C040600 */ lui $a0, %hi(D_06000BD0) ## $a0 = 06000000 /* 00A80 809F2560 AFA5002C */ sw $a1, 0x002C($sp) /* 00A84 809F2564 0C028800 */ jal SkelAnime_GetFrameCount -/* 00A88 809F2568 24840BD0 */ addiu $a0, $a0, 0x0BD0 ## $a0 = 06000BD0 +/* 00A88 809F2568 24840BD0 */ addiu $a0, $a0, %lo(D_06000BD0) ## $a0 = 06000BD0 /* 00A8C 809F256C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00A90 809F2570 8FA30028 */ lw $v1, 0x0028($sp) /* 00A94 809F2574 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00A98 809F2578 468021A0 */ cvt.s.w $f6, $f4 /* 00A9C 809F257C 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00AA0 809F2580 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00AA4 809F2584 24A50BD0 */ addiu $a1, $a1, 0x0BD0 ## $a1 = 06000BD0 +/* 00AA0 809F2580 3C050600 */ lui $a1, %hi(D_06000BD0) ## $a1 = 06000000 +/* 00AA4 809F2584 24A50BD0 */ addiu $a1, $a1, %lo(D_06000BD0) ## $a1 = 06000BD0 /* 00AA8 809F2588 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00AAC 809F258C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00AB0 809F2590 4600320D */ trunc.w.s $f8, $f6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F28DC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F28DC.s index ed1d300695..2d5fae9a96 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F28DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F28DC.s @@ -2,19 +2,19 @@ glabel func_809F28DC /* 00DFC 809F28DC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00E00 809F28E0 AFA40028 */ sw $a0, 0x0028($sp) /* 00E04 809F28E4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00E08 809F28E8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00E08 809F28E8 3C040600 */ lui $a0, %hi(D_06000A70) ## $a0 = 06000000 /* 00E0C 809F28EC AFA5002C */ sw $a1, 0x002C($sp) /* 00E10 809F28F0 0C028800 */ jal SkelAnime_GetFrameCount -/* 00E14 809F28F4 24840A70 */ addiu $a0, $a0, 0x0A70 ## $a0 = 06000A70 +/* 00E14 809F28F4 24840A70 */ addiu $a0, $a0, %lo(D_06000A70) ## $a0 = 06000A70 /* 00E18 809F28F8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00E1C 809F28FC 8FA30028 */ lw $v1, 0x0028($sp) /* 00E20 809F2900 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00E24 809F2904 468021A0 */ cvt.s.w $f6, $f4 /* 00E28 809F2908 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00E2C 809F290C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00E2C 809F290C 3C050600 */ lui $a1, %hi(D_06000A70) ## $a1 = 06000000 /* 00E30 809F2910 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00E34 809F2914 24A50A70 */ addiu $a1, $a1, 0x0A70 ## $a1 = 06000A70 +/* 00E34 809F2914 24A50A70 */ addiu $a1, $a1, %lo(D_06000A70) ## $a1 = 06000A70 /* 00E38 809F2918 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00E3C 809F291C 4600320D */ trunc.w.s $f8, $f6 /* 00E40 809F2920 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F29E0.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F29E0.s index 388c89dadf..26878dbe99 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F29E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F29E0.s @@ -3,17 +3,17 @@ glabel func_809F29E0 /* 00F04 809F29E4 AFB00028 */ sw $s0, 0x0028($sp) /* 00F08 809F29E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00F0C 809F29EC AFBF002C */ sw $ra, 0x002C($sp) -/* 00F10 809F29F0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00F10 809F29F0 3C040600 */ lui $a0, %hi(D_060037C0) ## $a0 = 06000000 /* 00F14 809F29F4 AFA50034 */ sw $a1, 0x0034($sp) /* 00F18 809F29F8 0C028800 */ jal SkelAnime_GetFrameCount -/* 00F1C 809F29FC 248437C0 */ addiu $a0, $a0, 0x37C0 ## $a0 = 060037C0 +/* 00F1C 809F29FC 248437C0 */ addiu $a0, $a0, %lo(D_060037C0) ## $a0 = 060037C0 /* 00F20 809F2A00 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00F24 809F2A04 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00F28 809F2A08 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 00F2C 809F2A0C 468021A0 */ cvt.s.w $f6, $f4 -/* 00F30 809F2A10 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00F34 809F2A14 24A537C0 */ addiu $a1, $a1, 0x37C0 ## $a1 = 060037C0 +/* 00F30 809F2A10 3C050600 */ lui $a1, %hi(D_060037C0) ## $a1 = 06000000 +/* 00F34 809F2A14 24A537C0 */ addiu $a1, $a1, %lo(D_060037C0) ## $a1 = 060037C0 /* 00F38 809F2A18 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00F3C 809F2A1C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00F40 809F2A20 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 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 3ba341b6e4..971097550c 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 @@ -47,16 +47,16 @@ glabel func_809F3480 /* 00268 809F3528 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0026C 809F352C 15600012 */ bne $t3, $zero, .L809F3578 /* 00270 809F3530 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00274 809F3534 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00278 809F3538 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00274 809F3534 3C060600 */ lui $a2, %hi(D_060023B8) ## $a2 = 06000000 +/* 00278 809F3538 3C070600 */ lui $a3, %hi(D_060024CC) ## $a3 = 06000000 /* 0027C 809F353C 260C0190 */ addiu $t4, $s0, 0x0190 ## $t4 = 00000190 /* 00280 809F3540 260D01D2 */ addiu $t5, $s0, 0x01D2 ## $t5 = 000001D2 /* 00284 809F3544 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A /* 00288 809F3548 AFAF0018 */ sw $t7, 0x0018($sp) /* 0028C 809F354C AFAD0014 */ sw $t5, 0x0014($sp) /* 00290 809F3550 AFAC0010 */ sw $t4, 0x0010($sp) -/* 00294 809F3554 24E724CC */ addiu $a3, $a3, 0x24CC ## $a3 = 060024CC -/* 00298 809F3558 24C623B8 */ addiu $a2, $a2, 0x23B8 ## $a2 = 060023B8 +/* 00294 809F3554 24E724CC */ addiu $a3, $a3, %lo(D_060024CC) ## $a3 = 060024CC +/* 00298 809F3558 24C623B8 */ addiu $a2, $a2, %lo(D_060023B8) ## $a2 = 060023B8 /* 0029C 809F355C 8FA40034 */ lw $a0, 0x0034($sp) /* 002A0 809F3560 0C02915F */ jal SkelAnime_Init @@ -66,14 +66,14 @@ glabel func_809F3480 /* 002B0 809F3570 1000000E */ beq $zero, $zero, .L809F35AC /* 002B4 809F3574 AE0E0134 */ sw $t6, 0x0134($s0) ## 00000134 .L809F3578: -/* 002B8 809F3578 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 002B8 809F3578 3C070600 */ lui $a3, %hi(D_06000430) ## $a3 = 06000000 /* 002BC 809F357C 26180190 */ addiu $t8, $s0, 0x0190 ## $t8 = 00000190 /* 002C0 809F3580 261901D2 */ addiu $t9, $s0, 0x01D2 ## $t9 = 000001D2 /* 002C4 809F3584 2408000B */ addiu $t0, $zero, 0x000B ## $t0 = 0000000B /* 002C8 809F3588 AFA80018 */ sw $t0, 0x0018($sp) /* 002CC 809F358C AFB90014 */ sw $t9, 0x0014($sp) /* 002D0 809F3590 AFB80010 */ sw $t8, 0x0010($sp) -/* 002D4 809F3594 24E70430 */ addiu $a3, $a3, 0x0430 ## $a3 = 06000430 +/* 002D4 809F3594 24E70430 */ addiu $a3, $a3, %lo(D_06000430) ## $a3 = 06000430 /* 002D8 809F3598 0C02915F */ jal SkelAnime_Init /* 002DC 809F359C 24C62AF0 */ addiu $a2, $a2, 0x2AF0 ## $a2 = 00002AF0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3624.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3624.s index 82e3861757..99a40691a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3624.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3624.s @@ -3,22 +3,22 @@ glabel func_809F3624 /* 00368 809F3628 AFB00028 */ sw $s0, 0x0028($sp) /* 0036C 809F362C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00370 809F3630 AFBF002C */ sw $ra, 0x002C($sp) -/* 00374 809F3634 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00374 809F3634 3C040600 */ lui $a0, %hi(D_060024CC) ## $a0 = 06000000 /* 00378 809F3638 AFA50034 */ sw $a1, 0x0034($sp) /* 0037C 809F363C 0C028800 */ jal SkelAnime_GetFrameCount -/* 00380 809F3640 248424CC */ addiu $a0, $a0, 0x24CC ## $a0 = 060024CC +/* 00380 809F3640 248424CC */ addiu $a0, $a0, %lo(D_060024CC) ## $a0 = 060024CC /* 00384 809F3644 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00388 809F3648 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0038C 809F364C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00390 809F3650 468021A0 */ cvt.s.w $f6, $f4 /* 00394 809F3654 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00398 809F3658 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00398 809F3658 3C050600 */ lui $a1, %hi(D_060024CC) ## $a1 = 06000000 /* 0039C 809F365C 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 003A0 809F3660 44060000 */ mfc1 $a2, $f0 /* 003A4 809F3664 44070000 */ mfc1 $a3, $f0 /* 003A8 809F3668 4600320D */ trunc.w.s $f8, $f6 -/* 003AC 809F366C 24A524CC */ addiu $a1, $a1, 0x24CC ## $a1 = 060024CC +/* 003AC 809F366C 24A524CC */ addiu $a1, $a1, %lo(D_060024CC) ## $a1 = 060024CC /* 003B0 809F3670 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 003B4 809F3674 440F4000 */ mfc1 $t7, $f8 /* 003B8 809F3678 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s index 7eef6d7f99..a24d08228f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s @@ -5,19 +5,19 @@ glabel func_809F39B8 /* 00704 809F39C4 AFA5004C */ sw $a1, 0x004C($sp) /* 00708 809F39C8 848E025C */ lh $t6, 0x025C($a0) ## 0000025C /* 0070C 809F39CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00710 809F39D0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00710 809F39D0 3C040600 */ lui $a0, %hi(D_060026C4) ## $a0 = 06000000 /* 00714 809F39D4 55C0003B */ bnel $t6, $zero, .L809F3AC4 /* 00718 809F39D8 8FBF0034 */ lw $ra, 0x0034($sp) /* 0071C 809F39DC 0C028800 */ jal SkelAnime_GetFrameCount -/* 00720 809F39E0 248426C4 */ addiu $a0, $a0, 0x26C4 ## $a0 = 060026C4 +/* 00720 809F39E0 248426C4 */ addiu $a0, $a0, %lo(D_060026C4) ## $a0 = 060026C4 /* 00724 809F39E4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00728 809F39E8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 0072C 809F39EC 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 00730 809F39F0 468021A0 */ cvt.s.w $f6, $f4 -/* 00734 809F39F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00734 809F39F4 3C050600 */ lui $a1, %hi(D_060026C4) ## $a1 = 06000000 /* 00738 809F39F8 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 0073C 809F39FC 24A526C4 */ addiu $a1, $a1, 0x26C4 ## $a1 = 060026C4 +/* 0073C 809F39FC 24A526C4 */ addiu $a1, $a1, %lo(D_060026C4) ## $a1 = 060026C4 /* 00740 809F3A00 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00744 809F3A04 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00748 809F3A08 4600320D */ trunc.w.s $f8, $f6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3B40.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3B40.s index 07ae28c471..36c42679df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3B40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3B40.s @@ -3,17 +3,17 @@ glabel func_809F3B40 /* 00884 809F3B44 AFB00028 */ sw $s0, 0x0028($sp) /* 00888 809F3B48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0088C 809F3B4C AFBF002C */ sw $ra, 0x002C($sp) -/* 00890 809F3B50 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00890 809F3B50 3C040600 */ lui $a0, %hi(D_06003128) ## $a0 = 06000000 /* 00894 809F3B54 AFA50034 */ sw $a1, 0x0034($sp) /* 00898 809F3B58 0C028800 */ jal SkelAnime_GetFrameCount -/* 0089C 809F3B5C 24843128 */ addiu $a0, $a0, 0x3128 ## $a0 = 06003128 +/* 0089C 809F3B5C 24843128 */ addiu $a0, $a0, %lo(D_06003128) ## $a0 = 06003128 /* 008A0 809F3B60 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 008A4 809F3B64 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 008A8 809F3B68 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 008AC 809F3B6C 468021A0 */ cvt.s.w $f6, $f4 -/* 008B0 809F3B70 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 008B4 809F3B74 24A53128 */ addiu $a1, $a1, 0x3128 ## $a1 = 06003128 +/* 008B0 809F3B70 3C050600 */ lui $a1, %hi(D_06003128) ## $a1 = 06000000 +/* 008B4 809F3B74 24A53128 */ addiu $a1, $a1, %lo(D_06003128) ## $a1 = 06003128 /* 008B8 809F3B78 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 008BC 809F3B7C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 008C0 809F3B80 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3D84.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3D84.s index c4e51c5d24..dcd4faafd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3D84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3D84.s @@ -3,17 +3,17 @@ glabel func_809F3D84 /* 00AC8 809F3D88 AFB00028 */ sw $s0, 0x0028($sp) /* 00ACC 809F3D8C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00AD0 809F3D90 AFBF002C */ sw $ra, 0x002C($sp) -/* 00AD4 809F3D94 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00AD4 809F3D94 3C040600 */ lui $a0, %hi(D_06002E84) ## $a0 = 06000000 /* 00AD8 809F3D98 AFA50034 */ sw $a1, 0x0034($sp) /* 00ADC 809F3D9C 0C028800 */ jal SkelAnime_GetFrameCount -/* 00AE0 809F3DA0 24842E84 */ addiu $a0, $a0, 0x2E84 ## $a0 = 06002E84 +/* 00AE0 809F3DA0 24842E84 */ addiu $a0, $a0, %lo(D_06002E84) ## $a0 = 06002E84 /* 00AE4 809F3DA4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00AE8 809F3DA8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00AEC 809F3DAC 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 00AF0 809F3DB0 468021A0 */ cvt.s.w $f6, $f4 -/* 00AF4 809F3DB4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00AF8 809F3DB8 24A52E84 */ addiu $a1, $a1, 0x2E84 ## $a1 = 06002E84 +/* 00AF4 809F3DB4 3C050600 */ lui $a1, %hi(D_06002E84) ## $a1 = 06000000 +/* 00AF8 809F3DB8 24A52E84 */ addiu $a1, $a1, %lo(D_06002E84) ## $a1 = 06002E84 /* 00AFC 809F3DBC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00B00 809F3DC0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00B04 809F3DC4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3ED4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3ED4.s index c22e292269..b27714803c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3ED4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3ED4.s @@ -2,19 +2,19 @@ glabel func_809F3ED4 /* 00C14 809F3ED4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00C18 809F3ED8 AFA40028 */ sw $a0, 0x0028($sp) /* 00C1C 809F3EDC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00C20 809F3EE0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00C20 809F3EE0 3C040600 */ lui $a0, %hi(D_06000168) ## $a0 = 06000000 /* 00C24 809F3EE4 AFA5002C */ sw $a1, 0x002C($sp) /* 00C28 809F3EE8 0C028800 */ jal SkelAnime_GetFrameCount -/* 00C2C 809F3EEC 24840168 */ addiu $a0, $a0, 0x0168 ## $a0 = 06000168 +/* 00C2C 809F3EEC 24840168 */ addiu $a0, $a0, %lo(D_06000168) ## $a0 = 06000168 /* 00C30 809F3EF0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00C34 809F3EF4 8FA30028 */ lw $v1, 0x0028($sp) /* 00C38 809F3EF8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00C3C 809F3EFC 468021A0 */ cvt.s.w $f6, $f4 /* 00C40 809F3F00 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00C44 809F3F04 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00C44 809F3F04 3C050600 */ lui $a1, %hi(D_06000168) ## $a1 = 06000000 /* 00C48 809F3F08 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00C4C 809F3F0C 24A50168 */ addiu $a1, $a1, 0x0168 ## $a1 = 06000168 +/* 00C4C 809F3F0C 24A50168 */ addiu $a1, $a1, %lo(D_06000168) ## $a1 = 06000168 /* 00C50 809F3F10 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00C54 809F3F14 4600320D */ trunc.w.s $f8, $f6 /* 00C58 809F3F18 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s index ac8b556024..4ecb1c7846 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s @@ -58,7 +58,7 @@ glabel func_809F3F6C /* 00D74 809F4034 8619026E */ lh $t9, 0x026E($s0) ## 0000026E .L809F4038: /* 00D78 809F4038 C7B20054 */ lwc1 $f18, 0x0054($sp) -/* 00D7C 809F403C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00D7C 809F403C 3C040600 */ lui $a0, %hi(D_06003128) ## $a0 = 06000000 /* 00D80 809F4040 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 /* 00D84 809F4044 00000000 */ nop /* 00D88 809F4048 468021A0 */ cvt.s.w $f6, $f4 @@ -68,13 +68,13 @@ glabel func_809F3F6C /* 00D98 809F4058 8FBF003C */ lw $ra, 0x003C($sp) /* 00D9C 809F405C 0C028800 */ jal SkelAnime_GetFrameCount -/* 00DA0 809F4060 24843128 */ addiu $a0, $a0, 0x3128 ## $a0 = 06003128 +/* 00DA0 809F4060 24843128 */ addiu $a0, $a0, %lo(D_06003128) ## $a0 = 06003128 /* 00DA4 809F4064 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 00DA8 809F4068 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00DAC 809F406C 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 /* 00DB0 809F4070 468042A0 */ cvt.s.w $f10, $f8 -/* 00DB4 809F4074 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00DB8 809F4078 24A53128 */ addiu $a1, $a1, 0x3128 ## $a1 = 06003128 +/* 00DB4 809F4074 3C050600 */ lui $a1, %hi(D_06003128) ## $a1 = 06000000 +/* 00DB8 809F4078 24A53128 */ addiu $a1, $a1, %lo(D_06003128) ## $a1 = 06003128 /* 00DBC 809F407C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00DC0 809F4080 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00DC4 809F4084 4600540D */ trunc.w.s $f16, $f10 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s index 5d17e6c8a2..aea1ecc123 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s @@ -86,21 +86,21 @@ glabel func_809F40D4 /* 00F30 809F41F0 44814000 */ mtc1 $at, $f8 ## $f8 = -172.00 /* 00F34 809F41F4 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C /* 00F38 809F41F8 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 -/* 00F3C 809F41FC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00F3C 809F41FC 3C040600 */ lui $a0, %hi(D_060024CC) ## $a0 = 06000000 /* 00F40 809F4200 4608303C */ c.lt.s $f6, $f8 /* 00F44 809F4204 A60B0032 */ sh $t3, 0x0032($s0) ## 00000032 /* 00F48 809F4208 45020022 */ bc1fl .L809F4294 /* 00F4C 809F420C 8FBF002C */ lw $ra, 0x002C($sp) /* 00F50 809F4210 0C028800 */ jal SkelAnime_GetFrameCount -/* 00F54 809F4214 248424CC */ addiu $a0, $a0, 0x24CC ## $a0 = 060024CC +/* 00F54 809F4214 248424CC */ addiu $a0, $a0, %lo(D_060024CC) ## $a0 = 060024CC /* 00F58 809F4218 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00F5C 809F421C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00F60 809F4220 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 /* 00F64 809F4224 46805420 */ cvt.s.w $f16, $f10 -/* 00F68 809F4228 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00F68 809F4228 3C050600 */ lui $a1, %hi(D_060024CC) ## $a1 = 06000000 /* 00F6C 809F422C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00F70 809F4230 24A524CC */ addiu $a1, $a1, 0x24CC ## $a1 = 060024CC +/* 00F70 809F4230 24A524CC */ addiu $a1, $a1, %lo(D_060024CC) ## $a1 = 060024CC /* 00F74 809F4234 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 00F78 809F4238 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00F7C 809F423C 4600848D */ trunc.w.s $f18, $f16 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4310.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4310.s index 14ce004162..653768078d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4310.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4310.s @@ -5,23 +5,23 @@ glabel func_809F4310 /* 0105C 809F431C AFA50034 */ sw $a1, 0x0034($sp) /* 01060 809F4320 848E0264 */ lh $t6, 0x0264($a0) ## 00000264 /* 01064 809F4324 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01068 809F4328 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01068 809F4328 3C040600 */ lui $a0, %hi(D_06000430) ## $a0 = 06000000 /* 0106C 809F432C 55C00022 */ bnel $t6, $zero, .L809F43B8 /* 01070 809F4330 8FBF002C */ lw $ra, 0x002C($sp) /* 01074 809F4334 0C028800 */ jal SkelAnime_GetFrameCount -/* 01078 809F4338 24840430 */ addiu $a0, $a0, 0x0430 ## $a0 = 06000430 +/* 01078 809F4338 24840430 */ addiu $a0, $a0, %lo(D_06000430) ## $a0 = 06000430 /* 0107C 809F433C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01080 809F4340 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01084 809F4344 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01088 809F4348 468021A0 */ cvt.s.w $f6, $f4 /* 0108C 809F434C 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01090 809F4350 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 01090 809F4350 3C050600 */ lui $a1, %hi(D_06000430) ## $a1 = 06000000 /* 01094 809F4354 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 01098 809F4358 44060000 */ mfc1 $a2, $f0 /* 0109C 809F435C 44070000 */ mfc1 $a3, $f0 /* 010A0 809F4360 4600320D */ trunc.w.s $f8, $f6 -/* 010A4 809F4364 24A50430 */ addiu $a1, $a1, 0x0430 ## $a1 = 06000430 +/* 010A4 809F4364 24A50430 */ addiu $a1, $a1, %lo(D_06000430) ## $a1 = 06000430 /* 010A8 809F4368 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 010AC 809F436C 44184000 */ mfc1 $t8, $f8 /* 010B0 809F4370 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s index f92e2655f8..7d77c2b66b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s @@ -5,19 +5,19 @@ glabel func_809F43F0 /* 0113C 809F43FC AFA5003C */ sw $a1, 0x003C($sp) /* 01140 809F4400 848E0264 */ lh $t6, 0x0264($a0) ## 00000264 /* 01144 809F4404 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01148 809F4408 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01148 809F4408 3C040600 */ lui $a0, %hi(D_06000B70) ## $a0 = 06000000 /* 0114C 809F440C 55C00037 */ bnel $t6, $zero, .L809F44EC /* 01150 809F4410 8FBF0034 */ lw $ra, 0x0034($sp) /* 01154 809F4414 0C028800 */ jal SkelAnime_GetFrameCount -/* 01158 809F4418 24840B70 */ addiu $a0, $a0, 0x0B70 ## $a0 = 06000B70 +/* 01158 809F4418 24840B70 */ addiu $a0, $a0, %lo(D_06000B70) ## $a0 = 06000B70 /* 0115C 809F441C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01160 809F4420 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01164 809F4424 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 01168 809F4428 468021A0 */ cvt.s.w $f6, $f4 -/* 0116C 809F442C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0116C 809F442C 3C050600 */ lui $a1, %hi(D_06000B70) ## $a1 = 06000000 /* 01170 809F4430 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 01174 809F4434 24A50B70 */ addiu $a1, $a1, 0x0B70 ## $a1 = 06000B70 +/* 01174 809F4434 24A50B70 */ addiu $a1, $a1, %lo(D_06000B70) ## $a1 = 06000B70 /* 01178 809F4438 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0117C 809F443C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01180 809F4440 4600320D */ trunc.w.s $f8, $f6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s index 68d09d8186..d21382e13d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s @@ -5,19 +5,19 @@ glabel func_809F4730 /* 0147C 809F473C AFA5003C */ sw $a1, 0x003C($sp) /* 01480 809F4740 848E0264 */ lh $t6, 0x0264($a0) ## 00000264 /* 01484 809F4744 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01488 809F4748 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01488 809F4748 3C040600 */ lui $a0, %hi(D_06000894) ## $a0 = 06000000 /* 0148C 809F474C 55C00031 */ bnel $t6, $zero, .L809F4814 /* 01490 809F4750 8FBF0034 */ lw $ra, 0x0034($sp) /* 01494 809F4754 0C028800 */ jal SkelAnime_GetFrameCount -/* 01498 809F4758 24840894 */ addiu $a0, $a0, 0x0894 ## $a0 = 06000894 +/* 01498 809F4758 24840894 */ addiu $a0, $a0, %lo(D_06000894) ## $a0 = 06000894 /* 0149C 809F475C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 014A0 809F4760 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 014A4 809F4764 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 014A8 809F4768 468021A0 */ cvt.s.w $f6, $f4 -/* 014AC 809F476C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 014AC 809F476C 3C050600 */ lui $a1, %hi(D_06000894) ## $a1 = 06000000 /* 014B0 809F4770 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 014B4 809F4774 24A50894 */ addiu $a1, $a1, 0x0894 ## $a1 = 06000894 +/* 014B4 809F4774 24A50894 */ addiu $a1, $a1, %lo(D_06000894) ## $a1 = 06000894 /* 014B8 809F4778 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 014BC 809F477C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 014C0 809F4780 4600320D */ trunc.w.s $f8, $f6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F48FC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F48FC.s index 96d953e350..481383b0b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F48FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F48FC.s @@ -3,17 +3,17 @@ glabel func_809F48FC /* 01640 809F4900 AFB00028 */ sw $s0, 0x0028($sp) /* 01644 809F4904 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01648 809F4908 AFBF002C */ sw $ra, 0x002C($sp) -/* 0164C 809F490C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0164C 809F490C 3C040600 */ lui $a0, %hi(D_06002E1C) ## $a0 = 06000000 /* 01650 809F4910 AFA50034 */ sw $a1, 0x0034($sp) /* 01654 809F4914 0C028800 */ jal SkelAnime_GetFrameCount -/* 01658 809F4918 24842E1C */ addiu $a0, $a0, 0x2E1C ## $a0 = 06002E1C +/* 01658 809F4918 24842E1C */ addiu $a0, $a0, %lo(D_06002E1C) ## $a0 = 06002E1C /* 0165C 809F491C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01660 809F4920 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01664 809F4924 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 01668 809F4928 468021A0 */ cvt.s.w $f6, $f4 -/* 0166C 809F492C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01670 809F4930 24A52E1C */ addiu $a1, $a1, 0x2E1C ## $a1 = 06002E1C +/* 0166C 809F492C 3C050600 */ lui $a1, %hi(D_06002E1C) ## $a1 = 06000000 +/* 01670 809F4930 24A52E1C */ addiu $a1, $a1, %lo(D_06002E1C) ## $a1 = 06002E1C /* 01674 809F4934 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01678 809F4938 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0167C 809F493C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s index 179a9ebb6c..6fbbfcbfdf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s @@ -8,17 +8,17 @@ glabel func_809F4BA4 /* 018E8 809F4BA8 AFB00028 */ sw $s0, 0x0028($sp) /* 018EC 809F4BAC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 018F0 809F4BB0 AFBF002C */ sw $ra, 0x002C($sp) -/* 018F4 809F4BB4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 018F4 809F4BB4 3C040600 */ lui $a0, %hi(D_060006CC) ## $a0 = 06000000 /* 018F8 809F4BB8 AFA50034 */ sw $a1, 0x0034($sp) /* 018FC 809F4BBC 0C028800 */ jal SkelAnime_GetFrameCount -/* 01900 809F4BC0 248406CC */ addiu $a0, $a0, 0x06CC ## $a0 = 060006CC +/* 01900 809F4BC0 248406CC */ addiu $a0, $a0, %lo(D_060006CC) ## $a0 = 060006CC /* 01904 809F4BC4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01908 809F4BC8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 0190C 809F4BCC 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 01910 809F4BD0 468021A0 */ cvt.s.w $f6, $f4 -/* 01914 809F4BD4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01918 809F4BD8 24A506CC */ addiu $a1, $a1, 0x06CC ## $a1 = 060006CC +/* 01914 809F4BD4 3C050600 */ lui $a1, %hi(D_060006CC) ## $a1 = 06000000 +/* 01918 809F4BD8 24A506CC */ addiu $a1, $a1, %lo(D_060006CC) ## $a1 = 060006CC /* 0191C 809F4BDC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01920 809F4BE0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01924 809F4BE4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4E18.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4E18.s index 109a6fe9ca..2cd12613eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4E18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4E18.s @@ -18,17 +18,17 @@ glabel func_809F4E18 /* 01B98 809F4E58 10000022 */ beq $zero, $zero, .L809F4EE4 /* 01B9C 809F4E5C 8FBF002C */ lw $ra, 0x002C($sp) .L809F4E60: -/* 01BA0 809F4E60 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01BA0 809F4E60 3C040600 */ lui $a0, %hi(D_06000430) ## $a0 = 06000000 /* 01BA4 809F4E64 0C028800 */ jal SkelAnime_GetFrameCount -/* 01BA8 809F4E68 24840430 */ addiu $a0, $a0, 0x0430 ## $a0 = 06000430 +/* 01BA8 809F4E68 24840430 */ addiu $a0, $a0, %lo(D_06000430) ## $a0 = 06000430 /* 01BAC 809F4E6C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01BB0 809F4E70 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01BB4 809F4E74 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 01BB8 809F4E78 468021A0 */ cvt.s.w $f6, $f4 -/* 01BBC 809F4E7C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 01BBC 809F4E7C 3C050600 */ lui $a1, %hi(D_06000430) ## $a1 = 06000000 /* 01BC0 809F4E80 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 01BC4 809F4E84 24A50430 */ addiu $a1, $a1, 0x0430 ## $a1 = 06000430 +/* 01BC4 809F4E84 24A50430 */ addiu $a1, $a1, %lo(D_06000430) ## $a1 = 06000430 /* 01BC8 809F4E88 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01BCC 809F4E8C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01BD0 809F4E90 4600320D */ trunc.w.s $f8, $f6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50EC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50EC.s index bacba0bb85..571841f578 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50EC.s @@ -5,19 +5,19 @@ glabel func_809F50EC /* 01E38 809F50F8 AFA50034 */ sw $a1, 0x0034($sp) /* 01E3C 809F50FC 848E0264 */ lh $t6, 0x0264($a0) ## 00000264 /* 01E40 809F5100 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01E44 809F5104 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01E44 809F5104 3C040600 */ lui $a0, %hi(D_0600031C) ## $a0 = 06000000 /* 01E48 809F5108 55C00027 */ bnel $t6, $zero, .L809F51A8 /* 01E4C 809F510C 8FBF002C */ lw $ra, 0x002C($sp) /* 01E50 809F5110 0C028800 */ jal SkelAnime_GetFrameCount -/* 01E54 809F5114 2484031C */ addiu $a0, $a0, 0x031C ## $a0 = 0600031C +/* 01E54 809F5114 2484031C */ addiu $a0, $a0, %lo(D_0600031C) ## $a0 = 0600031C /* 01E58 809F5118 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01E5C 809F511C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01E60 809F5120 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 01E64 809F5124 468021A0 */ cvt.s.w $f6, $f4 -/* 01E68 809F5128 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 01E68 809F5128 3C050600 */ lui $a1, %hi(D_0600031C) ## $a1 = 06000000 /* 01E6C 809F512C 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 01E70 809F5130 24A5031C */ addiu $a1, $a1, 0x031C ## $a1 = 0600031C +/* 01E70 809F5130 24A5031C */ addiu $a1, $a1, %lo(D_0600031C) ## $a1 = 0600031C /* 01E74 809F5134 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01E78 809F5138 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01E7C 809F513C 4600320D */ trunc.w.s $f8, $f6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5478.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5478.s index 332d806da9..734a67fde8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5478.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5478.s @@ -3,17 +3,17 @@ glabel func_809F5478 /* 021BC 809F547C AFB00028 */ sw $s0, 0x0028($sp) /* 021C0 809F5480 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 021C4 809F5484 AFBF002C */ sw $ra, 0x002C($sp) -/* 021C8 809F5488 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 021C8 809F5488 3C040600 */ lui $a0, %hi(D_06002E1C) ## $a0 = 06000000 /* 021CC 809F548C AFA50034 */ sw $a1, 0x0034($sp) /* 021D0 809F5490 0C028800 */ jal SkelAnime_GetFrameCount -/* 021D4 809F5494 24842E1C */ addiu $a0, $a0, 0x2E1C ## $a0 = 06002E1C +/* 021D4 809F5494 24842E1C */ addiu $a0, $a0, %lo(D_06002E1C) ## $a0 = 06002E1C /* 021D8 809F5498 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 021DC 809F549C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 021E0 809F54A0 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 021E4 809F54A4 468021A0 */ cvt.s.w $f6, $f4 -/* 021E8 809F54A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 021EC 809F54AC 24A52E1C */ addiu $a1, $a1, 0x2E1C ## $a1 = 06002E1C +/* 021E8 809F54A8 3C050600 */ lui $a1, %hi(D_06002E1C) ## $a1 = 06000000 +/* 021EC 809F54AC 24A52E1C */ addiu $a1, $a1, %lo(D_06002E1C) ## $a1 = 06002E1C /* 021F0 809F54B0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 021F4 809F54B4 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 021F8 809F54B8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 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 44c4c0cd9e..8ca042d0b5 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 @@ -127,8 +127,8 @@ glabel func_809F5A6C /* 02954 809F5C14 0C0346A2 */ jal Matrix_NewMtx /* 02958 809F5C18 AFA20038 */ sw $v0, 0x0038($sp) /* 0295C 809F5C1C 8FA30038 */ lw $v1, 0x0038($sp) -/* 02960 809F5C20 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 02964 809F5C24 25EF1B00 */ addiu $t7, $t7, 0x1B00 ## $t7 = 06001B00 +/* 02960 809F5C20 3C0F0600 */ lui $t7, %hi(D_06001B00) ## $t7 = 06000000 +/* 02964 809F5C24 25EF1B00 */ addiu $t7, $t7, %lo(D_06001B00) ## $t7 = 06001B00 /* 02968 809F5C28 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0296C 809F5C2C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 02970 809F5C30 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s index 0af7425663..05021ab6e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s @@ -68,8 +68,8 @@ glabel func_809F5C98 /* 02A94 809F5D54 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 02A98 809F5D58 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 02A9C 809F5D5C 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 02AA0 809F5D60 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 02AA4 809F5D64 252914E0 */ addiu $t1, $t1, 0x14E0 ## $t1 = 060014E0 +/* 02AA0 809F5D60 3C090600 */ lui $t1, %hi(D_060014E0) ## $t1 = 06000000 +/* 02AA4 809F5D64 252914E0 */ addiu $t1, $t1, %lo(D_060014E0) ## $t1 = 060014E0 /* 02AA8 809F5D68 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 02AAC 809F5D6C AE3902C0 */ sw $t9, 0x02C0($s1) ## 000002C0 /* 02AB0 809F5D70 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s index 4552ed4c85..e453b72c09 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s @@ -10,16 +10,16 @@ glabel EnDodojr_Init /* 00020 809F63E0 0C00AC78 */ jal ActorShape_Init /* 00024 809F63E4 3C074190 */ lui $a3, 0x4190 ## $a3 = 41900000 -/* 00028 809F63E8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 0002C 809F63EC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00028 809F63E8 3C060600 */ lui $a2, %hi(D_060020E0) ## $a2 = 06000000 +/* 0002C 809F63EC 3C070600 */ lui $a3, %hi(D_060009D4) ## $a3 = 06000000 /* 00030 809F63F0 260E020C */ addiu $t6, $s0, 0x020C ## $t6 = 0000020C /* 00034 809F63F4 260F0266 */ addiu $t7, $s0, 0x0266 ## $t7 = 00000266 /* 00038 809F63F8 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F /* 0003C 809F63FC AFB80018 */ sw $t8, 0x0018($sp) /* 00040 809F6400 AFAF0014 */ sw $t7, 0x0014($sp) /* 00044 809F6404 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00048 809F6408 24E709D4 */ addiu $a3, $a3, 0x09D4 ## $a3 = 060009D4 -/* 0004C 809F640C 24C620E0 */ addiu $a2, $a2, 0x20E0 ## $a2 = 060020E0 +/* 00048 809F6408 24E709D4 */ addiu $a3, $a3, %lo(D_060009D4) ## $a3 = 060009D4 +/* 0004C 809F640C 24C620E0 */ addiu $a2, $a2, %lo(D_060020E0) ## $a2 = 060020E0 /* 00050 809F6410 8FA40044 */ lw $a0, 0x0044($sp) /* 00054 809F6414 0C02915F */ jal SkelAnime_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s index e64d0c5624..279f6ac75c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s @@ -9,21 +9,21 @@ glabel func_809F6994 /* 005D4 809F6994 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 005D8 809F6998 AFA40028 */ sw $a0, 0x0028($sp) /* 005DC 809F699C AFBF0024 */ sw $ra, 0x0024($sp) -/* 005E0 809F69A0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 005E0 809F69A0 3C040600 */ lui $a0, %hi(D_06000860) ## $a0 = 06000000 /* 005E4 809F69A4 0C028800 */ jal SkelAnime_GetFrameCount -/* 005E8 809F69A8 24840860 */ addiu $a0, $a0, 0x0860 ## $a0 = 06000860 +/* 005E8 809F69A8 24840860 */ addiu $a0, $a0, %lo(D_06000860) ## $a0 = 06000860 /* 005EC 809F69AC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 005F0 809F69B0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 005F4 809F69B4 8FA30028 */ lw $v1, 0x0028($sp) /* 005F8 809F69B8 468021A0 */ cvt.s.w $f6, $f4 /* 005FC 809F69BC 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00600 809F69C0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00600 809F69C0 3C050600 */ lui $a1, %hi(D_06000860) ## $a1 = 06000000 /* 00604 809F69C4 3C063FE6 */ lui $a2, 0x3FE6 ## $a2 = 3FE60000 /* 00608 809F69C8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 0060C 809F69CC AFAE0014 */ sw $t6, 0x0014($sp) /* 00610 809F69D0 34C66666 */ ori $a2, $a2, 0x6666 ## $a2 = 3FE66666 -/* 00614 809F69D4 24A50860 */ addiu $a1, $a1, 0x0860 ## $a1 = 06000860 +/* 00614 809F69D4 24A50860 */ addiu $a1, $a1, %lo(D_06000860) ## $a1 = 06000860 /* 00618 809F69D8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0061C 809F69DC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00620 809F69E0 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s index c83c08bd12..c88f796161 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s @@ -8,20 +8,20 @@ glabel func_809F6A20 /* 00664 809F6A24 AFB00028 */ sw $s0, 0x0028($sp) /* 00668 809F6A28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0066C 809F6A2C AFBF002C */ sw $ra, 0x002C($sp) -/* 00670 809F6A30 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00670 809F6A30 3C040600 */ lui $a0, %hi(D_060004A0) ## $a0 = 06000000 /* 00674 809F6A34 0C028800 */ jal SkelAnime_GetFrameCount -/* 00678 809F6A38 248404A0 */ addiu $a0, $a0, 0x04A0 ## $a0 = 060004A0 +/* 00678 809F6A38 248404A0 */ addiu $a0, $a0, %lo(D_060004A0) ## $a0 = 060004A0 /* 0067C 809F6A3C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00680 809F6A40 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00684 809F6A44 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00688 809F6A48 468021A0 */ cvt.s.w $f6, $f4 /* 0068C 809F6A4C 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00690 809F6A50 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00690 809F6A50 3C050600 */ lui $a1, %hi(D_060004A0) ## $a1 = 06000000 /* 00694 809F6A54 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00698 809F6A58 44070000 */ mfc1 $a3, $f0 /* 0069C 809F6A5C AFAE0014 */ sw $t6, 0x0014($sp) -/* 006A0 809F6A60 24A504A0 */ addiu $a1, $a1, 0x04A0 ## $a1 = 060004A0 +/* 006A0 809F6A60 24A504A0 */ addiu $a1, $a1, %lo(D_060004A0) ## $a1 = 060004A0 /* 006A4 809F6A64 E7A60010 */ swc1 $f6, 0x0010($sp) /* 006A8 809F6A68 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 006AC 809F6A6C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s index 6bddd3bc99..340ecbfad5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s @@ -7,17 +7,17 @@ glabel func_809F6AC4 /* 00704 809F6AC4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00708 809F6AC8 AFA40028 */ sw $a0, 0x0028($sp) /* 0070C 809F6ACC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00710 809F6AD0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00710 809F6AD0 3C040600 */ lui $a0, %hi(D_060005F0) ## $a0 = 06000000 /* 00714 809F6AD4 0C028800 */ jal SkelAnime_GetFrameCount -/* 00718 809F6AD8 248405F0 */ addiu $a0, $a0, 0x05F0 ## $a0 = 060005F0 +/* 00718 809F6AD8 248405F0 */ addiu $a0, $a0, %lo(D_060005F0) ## $a0 = 060005F0 /* 0071C 809F6ADC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00720 809F6AE0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00724 809F6AE4 8FA40028 */ lw $a0, 0x0028($sp) /* 00728 809F6AE8 468021A0 */ cvt.s.w $f6, $f4 -/* 0072C 809F6AEC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0072C 809F6AEC 3C050600 */ lui $a1, %hi(D_060005F0) ## $a1 = 06000000 /* 00730 809F6AF0 44070000 */ mfc1 $a3, $f0 -/* 00734 809F6AF4 24A505F0 */ addiu $a1, $a1, 0x05F0 ## $a1 = 060005F0 +/* 00734 809F6AF4 24A505F0 */ addiu $a1, $a1, %lo(D_060005F0) ## $a1 = 060005F0 /* 00738 809F6AF8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0073C 809F6AFC AFA00014 */ sw $zero, 0x0014($sp) /* 00740 809F6B00 E7A60010 */ swc1 $f6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s index 91e7cb51b8..a29857e0e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s @@ -7,17 +7,17 @@ glabel func_809F6B38 /* 00778 809F6B38 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 0077C 809F6B3C AFA40028 */ sw $a0, 0x0028($sp) /* 00780 809F6B40 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00784 809F6B44 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00784 809F6B44 3C040600 */ lui $a0, %hi(D_06000724) ## $a0 = 06000000 /* 00788 809F6B48 0C028800 */ jal SkelAnime_GetFrameCount -/* 0078C 809F6B4C 24840724 */ addiu $a0, $a0, 0x0724 ## $a0 = 06000724 +/* 0078C 809F6B4C 24840724 */ addiu $a0, $a0, %lo(D_06000724) ## $a0 = 06000724 /* 00790 809F6B50 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00794 809F6B54 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00798 809F6B58 8FA30028 */ lw $v1, 0x0028($sp) /* 0079C 809F6B5C 468021A0 */ cvt.s.w $f6, $f4 /* 007A0 809F6B60 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 007A4 809F6B64 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 007A8 809F6B68 24A50724 */ addiu $a1, $a1, 0x0724 ## $a1 = 06000724 +/* 007A4 809F6B64 3C050600 */ lui $a1, %hi(D_06000724) ## $a1 = 06000000 +/* 007A8 809F6B68 24A50724 */ addiu $a1, $a1, %lo(D_06000724) ## $a1 = 06000724 /* 007AC 809F6B6C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 007B0 809F6B70 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 007B4 809F6B74 E7A60010 */ swc1 $f6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s index db789f418c..8050370af3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s @@ -11,10 +11,10 @@ glabel func_809F6C24 /* 00874 809F6C34 AFB00028 */ sw $s0, 0x0028($sp) /* 00878 809F6C38 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0087C 809F6C3C AFBF002C */ sw $ra, 0x002C($sp) -/* 00880 809F6C40 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00880 809F6C40 3C050600 */ lui $a1, %hi(D_06000724) ## $a1 = 06000000 /* 00884 809F6C44 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00888 809F6C48 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0088C 809F6C4C 24A50724 */ addiu $a1, $a1, 0x0724 ## $a1 = 06000724 +/* 0088C 809F6C4C 24A50724 */ addiu $a1, $a1, %lo(D_06000724) ## $a1 = 06000724 /* 00890 809F6C50 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00894 809F6C54 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00898 809F6C58 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s index 86a6030b1c..995c2b8317 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s @@ -3,11 +3,11 @@ glabel func_809F73AC /* 00FF0 809F73B0 AFB00028 */ sw $s0, 0x0028($sp) /* 00FF4 809F73B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00FF8 809F73B8 AFBF002C */ sw $ra, 0x002C($sp) -/* 00FFC 809F73BC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00FFC 809F73BC 3C040600 */ lui $a0, %hi(D_06000860) ## $a0 = 06000000 /* 01000 809F73C0 AFA50034 */ sw $a1, 0x0034($sp) /* 01004 809F73C4 0C028800 */ jal SkelAnime_GetFrameCount -/* 01008 809F73C8 24840860 */ addiu $a0, $a0, 0x0860 ## $a0 = 06000860 +/* 01008 809F73C8 24840860 */ addiu $a0, $a0, %lo(D_06000860) ## $a0 = 06000860 /* 0100C 809F73CC 3C0143A0 */ lui $at, 0x43A0 ## $at = 43A00000 /* 01010 809F73D0 44814000 */ mtc1 $at, $f8 ## $f8 = 320.00 /* 01014 809F73D4 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 @@ -23,11 +23,11 @@ glabel func_809F73AC /* 0103C 809F73FC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 01040 809F7400 44819000 */ mtc1 $at, $f18 ## $f18 = 40.00 /* 01044 809F7404 46105001 */ sub.s $f0, $f10, $f16 -/* 01048 809F7408 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 01048 809F7408 3C050600 */ lui $a1, %hi(D_06000860) ## $a1 = 06000000 /* 0104C 809F740C 3C063FE6 */ lui $a2, 0x3FE6 ## $a2 = 3FE60000 /* 01050 809F7410 34C66666 */ ori $a2, $a2, 0x6666 ## $a2 = 3FE66666 /* 01054 809F7414 4600903E */ c.le.s $f18, $f0 -/* 01058 809F7418 24A50860 */ addiu $a1, $a1, 0x0860 ## $a1 = 06000860 +/* 01058 809F7418 24A50860 */ addiu $a1, $a1, %lo(D_06000860) ## $a1 = 06000860 /* 0105C 809F741C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01060 809F7420 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01064 809F7424 45010022 */ bc1t .L809F74B0 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 e6e41e7860..75e923afa8 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 @@ -12,8 +12,8 @@ glabel EnDu_Init /* 005A4 809FE1D4 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 005A8 809FE1D8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 005AC 809FE1DC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 005B0 809FE1E0 24C61CA8 */ addiu $a2, $a2, 0x1CA8 ## $a2 = 06011CA8 +/* 005AC 809FE1DC 3C060601 */ lui $a2, %hi(D_06011CA8) ## $a2 = 06010000 +/* 005B0 809FE1E0 24C61CA8 */ addiu $a2, $a2, %lo(D_06011CA8) ## $a2 = 06011CA8 /* 005B4 809FE1E4 AFA50038 */ sw $a1, 0x0038($sp) /* 005B8 809FE1E8 8FA4004C */ lw $a0, 0x004C($sp) /* 005BC 809FE1EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -68,11 +68,11 @@ glabel EnDu_Init /* 00668 809FE298 A60001F4 */ sh $zero, 0x01F4($s0) ## 000001F4 /* 0066C 809FE29C 8C6F0008 */ lw $t7, 0x0008($v1) ## 8015E668 /* 00670 809FE2A0 3401FFF0 */ ori $at, $zero, 0xFFF0 ## $at = 0000FFF0 -/* 00674 809FE2A4 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 +/* 00674 809FE2A4 3C020200 */ lui $v0, %hi(D_02006930) ## $v0 = 02000000 /* 00678 809FE2A8 01E1082A */ slt $at, $t7, $at /* 0067C 809FE2AC 14200018 */ bne $at, $zero, .L809FE310 /* 00680 809FE2B0 8FAF004C */ lw $t7, 0x004C($sp) -/* 00684 809FE2B4 24426930 */ addiu $v0, $v0, 0x6930 ## $v0 = 02006930 +/* 00684 809FE2B4 24426930 */ addiu $v0, $v0, %lo(D_02006930) ## $v0 = 02006930 /* 00688 809FE2B8 0002C100 */ sll $t8, $v0, 4 /* 0068C 809FE2BC 0018CF02 */ srl $t9, $t8, 28 /* 00690 809FE2C0 00194080 */ sll $t0, $t9, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Update.s index 2a1c24a9a5..30859e2a38 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Update.s @@ -18,8 +18,8 @@ glabel EnDu_Update ## CollisionCheck_setOT /* 01128 809FED58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0112C 809FED5C 8E0F0154 */ lw $t7, 0x0154($s0) ## 00000154 -/* 01130 809FED60 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 01134 809FED64 25CE41F4 */ addiu $t6, $t6, 0x41F4 ## $t6 = 060041F4 +/* 01130 809FED60 3C0E0600 */ lui $t6, %hi(D_060041F4) ## $t6 = 06000000 +/* 01134 809FED64 25CE41F4 */ addiu $t6, $t6, %lo(D_060041F4) ## $t6 = 060041F4 /* 01138 809FED68 15CF000A */ bne $t6, $t7, .L809FED94 /* 0113C 809FED6C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01140 809FED70 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C 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 9530ca05bf..5813b80c83 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 @@ -23,8 +23,8 @@ glabel func_809FE4A4 /* 008C4 809FE4F4 28410006 */ slti $at, $v0, 0x0006 /* 008C8 809FE4F8 1420001D */ bne $at, $zero, .L809FE570 /* 008CC 809FE4FC 3C198016 */ lui $t9, %hi(gSegments) -/* 008D0 809FE500 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 008D4 809FE504 24427DE0 */ addiu $v0, $v0, 0x7DE0 ## $v0 = 02007DE0 +/* 008D0 809FE500 3C020200 */ lui $v0, %hi(D_02007DE0) ## $v0 = 02000000 +/* 008D4 809FE504 24427DE0 */ addiu $v0, $v0, %lo(D_02007DE0) ## $v0 = 02007DE0 /* 008D8 809FE508 00027100 */ sll $t6, $v0, 4 /* 008DC 809FE50C 000E7F02 */ srl $t7, $t6, 28 /* 008E0 809FE510 000FC080 */ sll $t8, $t7, 2 @@ -66,8 +66,8 @@ glabel func_809FE4A4 /* 0096C 809FE59C 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 00970 809FE5A0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00974 809FE5A4 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 00978 809FE5A8 244259E0 */ addiu $v0, $v0, 0x59E0 ## $v0 = 020059E0 +/* 00974 809FE5A4 3C020200 */ lui $v0, %hi(D_020059E0) ## $v0 = 02000000 +/* 00978 809FE5A8 244259E0 */ addiu $v0, $v0, %lo(D_020059E0) ## $v0 = 020059E0 /* 0097C 809FE5AC 00027900 */ sll $t7, $v0, 4 /* 00980 809FE5B0 000FC702 */ srl $t8, $t7, 28 /* 00984 809FE5B4 0018C880 */ sll $t9, $t8, 2 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 cc01a18802..5ff4a06462 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 @@ -16,16 +16,16 @@ glabel EnEiyer_Init /* 00034 809FFFD4 0C00AC78 */ jal ActorShape_Init /* 00038 809FFFD8 3C074282 */ lui $a3, 0x4282 ## $a3 = 42820000 -/* 0003C 809FFFDC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00040 809FFFE0 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 0003C 809FFFDC 3C060600 */ lui $a2, %hi(D_06003410) ## $a2 = 06000000 +/* 00040 809FFFE0 3C070600 */ lui $a3, %hi(D_060012AC) ## $a3 = 06000000 /* 00044 809FFFE4 262E0198 */ addiu $t6, $s1, 0x0198 ## $t6 = 00000198 /* 00048 809FFFE8 262F020A */ addiu $t7, $s1, 0x020A ## $t7 = 0000020A /* 0004C 809FFFEC 24180013 */ addiu $t8, $zero, 0x0013 ## $t8 = 00000013 /* 00050 809FFFF0 AFB80018 */ sw $t8, 0x0018($sp) /* 00054 809FFFF4 AFAF0014 */ sw $t7, 0x0014($sp) /* 00058 809FFFF8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0005C 809FFFFC 24E712AC */ addiu $a3, $a3, 0x12AC ## $a3 = 060012AC -/* 00060 80A00000 24C63410 */ addiu $a2, $a2, 0x3410 ## $a2 = 06003410 +/* 0005C 809FFFFC 24E712AC */ addiu $a3, $a3, %lo(D_060012AC) ## $a3 = 060012AC +/* 00060 80A00000 24C63410 */ addiu $a2, $a2, %lo(D_06003410) ## $a2 = 06003410 /* 00064 80A00004 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00068 80A00008 0C02915F */ jal SkelAnime_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s index b826d03ad9..d483471876 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s @@ -4,9 +4,9 @@ glabel func_80A00218 /* 00280 80A00220 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00284 80A00224 AFBF001C */ sw $ra, 0x001C($sp) /* 00288 80A00228 240E0019 */ addiu $t6, $zero, 0x0019 ## $t6 = 00000019 -/* 0028C 80A0022C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0028C 80A0022C 3C050600 */ lui $a1, %hi(D_060012AC) ## $a1 = 06000000 /* 00290 80A00230 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 00294 80A00234 24A512AC */ addiu $a1, $a1, 0x12AC ## $a1 = 060012AC +/* 00294 80A00234 24A512AC */ addiu $a1, $a1, %lo(D_060012AC) ## $a1 = 060012AC /* 00298 80A00238 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 0029C 80A0023C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 002A0 80A00240 3C014220 */ lui $at, 0x4220 ## $at = 42200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s index eee91e3810..244f14d328 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s @@ -5,8 +5,8 @@ glabel func_80A003DC /* 00448 80A003E8 AFA50034 */ sw $a1, 0x0034($sp) /* 0044C 80A003EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00450 80A003F0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00454 80A003F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00458 80A003F8 24A50704 */ addiu $a1, $a1, 0x0704 ## $a1 = 06000704 +/* 00454 80A003F4 3C050600 */ lui $a1, %hi(D_06000704) ## $a1 = 06000000 +/* 00458 80A003F8 24A50704 */ addiu $a1, $a1, %lo(D_06000704) ## $a1 = 06000704 /* 0045C 80A003FC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00460 80A00400 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00464 80A00404 E484FF1C */ swc1 $f4, -0x00E4($a0) ## 00000068 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s index 644719f19a..a090ae68d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s @@ -16,10 +16,10 @@ glabel func_80A004BC /* 0053C 80A004DC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00540 80A004E0 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 00544 80A004E4 8FA70018 */ lw $a3, 0x0018($sp) -/* 00548 80A004E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00548 80A004E8 3C050600 */ lui $a1, %hi(D_06000FC0) ## $a1 = 06000000 /* 0054C 80A004EC 46040182 */ mul.s $f6, $f0, $f4 /* 00550 80A004F0 C4E80028 */ lwc1 $f8, 0x0028($a3) ## 00000028 -/* 00554 80A004F4 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 +/* 00554 80A004F4 24A50FC0 */ addiu $a1, $a1, %lo(D_06000FC0) ## $a1 = 06000FC0 /* 00558 80A004F8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0055C 80A004FC 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C /* 00560 80A00500 46083280 */ add.s $f10, $f6, $f8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00588.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00588.s index f92b2ca4f7..ba4e4a3e83 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00588.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00588.s @@ -2,8 +2,8 @@ glabel func_80A00588 /* 005E8 80A00588 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 005EC 80A0058C AFBF0014 */ sw $ra, 0x0014($sp) /* 005F0 80A00590 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 005F4 80A00594 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 005F8 80A00598 24A504C4 */ addiu $a1, $a1, 0x04C4 ## $a1 = 060004C4 +/* 005F4 80A00594 3C050600 */ lui $a1, %hi(D_060004C4) ## $a1 = 06000000 +/* 005F8 80A00598 24A504C4 */ addiu $a1, $a1, %lo(D_060004C4) ## $a1 = 060004C4 /* 005FC 80A0059C AFA70018 */ sw $a3, 0x0018($sp) /* 00600 80A005A0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00604 80A005A4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00600.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00600.s index 6a0a2f62b0..27bdc6496c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00600.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00600.s @@ -8,9 +8,9 @@ glabel func_80A00600 /* 00678 80A00618 44813000 */ mtc1 $at, $f6 ## $f6 = -3.00 /* 0067C 80A0061C E4840280 */ swc1 $f4, 0x0280($a0) ## 00000280 /* 00680 80A00620 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00684 80A00624 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00684 80A00624 3C050600 */ lui $a1, %hi(D_06000FC0) ## $a1 = 06000000 /* 00688 80A00628 44070000 */ mfc1 $a3, $f0 -/* 0068C 80A0062C 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 +/* 0068C 80A0062C 24A50FC0 */ addiu $a1, $a1, %lo(D_06000FC0) ## $a1 = 06000FC0 /* 00690 80A00630 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00694 80A00634 AFA00014 */ sw $zero, 0x0014($sp) /* 00698 80A00638 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s index e62f17c76f..db8c5ec298 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s @@ -15,10 +15,10 @@ glabel func_80A006B0 /* 00744 80A006E4 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 /* 00748 80A006E8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0074C 80A006EC 13010009 */ beq $t8, $at, .L80A00714 -/* 00750 80A006F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00750 80A006F0 3C050600 */ lui $a1, %hi(D_06000FC0) ## $a1 = 06000000 /* 00754 80A006F4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 00758 80A006F8 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 0075C 80A006FC 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 +/* 0075C 80A006FC 24A50FC0 */ addiu $a1, $a1, %lo(D_06000FC0) ## $a1 = 06000FC0 /* 00760 80A00700 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00764 80A00704 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00768 80A00708 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00794.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00794.s index c78c015114..af3a78f39a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00794.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00794.s @@ -6,9 +6,9 @@ glabel func_80A00794 /* 00804 80A007A4 AFB00028 */ sw $s0, 0x0028($sp) /* 00808 80A007A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0080C 80A007AC AFBF002C */ sw $ra, 0x002C($sp) -/* 00810 80A007B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00810 80A007B0 3C050600 */ lui $a1, %hi(D_06000288) ## $a1 = 06000000 /* 00814 80A007B4 44070000 */ mfc1 $a3, $f0 -/* 00818 80A007B8 24A50288 */ addiu $a1, $a1, 0x0288 ## $a1 = 06000288 +/* 00818 80A007B8 24A50288 */ addiu $a1, $a1, %lo(D_06000288) ## $a1 = 06000288 /* 0081C 80A007BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00820 80A007C0 AFA00014 */ sw $zero, 0x0014($sp) /* 00824 80A007C4 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A0891C.s b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A0891C.s index 012b6640e8..4112365234 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A0891C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A0891C.s @@ -78,8 +78,8 @@ glabel func_80A0891C /* 01070 80A08A00 3C15FA00 */ lui $s5, 0xFA00 ## $s5 = FA000000 .L80A08A04: /* 01074 80A08A04 922D0010 */ lbu $t5, 0x0010($s1) ## 00000198 -/* 01078 80A08A08 3C140600 */ lui $s4, 0x0600 ## $s4 = 06000000 -/* 0107C 80A08A0C 26940DE0 */ addiu $s4, $s4, 0x0DE0 ## $s4 = 06000DE0 +/* 01078 80A08A08 3C140600 */ lui $s4, %hi(D_06000DE0) ## $s4 = 06000000 +/* 0107C 80A08A0C 26940DE0 */ addiu $s4, $s4, %lo(D_06000DE0) ## $s4 = 06000DE0 /* 01080 80A08A10 11A00036 */ beq $t5, $zero, .L80A08AEC /* 01084 80A08A14 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01088 80A08A18 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000188 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 689b73f56d..27936336a2 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 @@ -58,8 +58,8 @@ glabel func_80A09C40 /* 00E48 80A09CE8 000B6080 */ sll $t4, $t3, 2 /* 00E4C 80A09CEC 008C2021 */ addu $a0, $a0, $t4 /* 00E50 80A09CF0 8C849E08 */ lw $a0, %lo(D_80A09E08)($a0) -/* 00E54 80A09CF4 3C0C0404 */ lui $t4, 0x0404 ## $t4 = 04040000 -/* 00E58 80A09CF8 258CF070 */ addiu $t4, $t4, 0xF070 ## $t4 = 0403F070 +/* 00E54 80A09CF4 3C0C0404 */ lui $t4, %hi(D_0403F070) ## $t4 = 04040000 +/* 00E58 80A09CF8 258CF070 */ addiu $t4, $t4, %lo(D_0403F070) ## $t4 = 0403F070 /* 00E5C 80A09CFC 00047100 */ sll $t6, $a0, 4 /* 00E60 80A09D00 000E7F02 */ srl $t7, $t6, 28 /* 00E64 80A09D04 000FC080 */ sll $t8, $t7, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Draw.s index 1575b463da..75bc8d6be5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Draw.s @@ -107,8 +107,8 @@ glabel EnFireRock_Draw /* 00FFC 80A12C1C 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 /* 01000 80A12C20 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01004 80A12C24 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 01008 80A12C28 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 0100C 80A12C2C 27390DE0 */ addiu $t9, $t9, 0x0DE0 ## $t9 = 06000DE0 +/* 01008 80A12C28 3C190600 */ lui $t9, %hi(D_06000DE0) ## $t9 = 06000000 +/* 0100C 80A12C2C 27390DE0 */ addiu $t9, $t9, %lo(D_06000DE0) ## $t9 = 06000DE0 /* 01010 80A12C30 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01014 80A12C34 AE2F02C0 */ sw $t7, 0x02C0($s1) ## 000002C0 /* 01018 80A12C38 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 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 a14477d561..265cae7a9a 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 @@ -17,16 +17,16 @@ glabel EnFish_Init /* 00208 80A15488 0C01E037 */ jal Actor_ProcessInitChain /* 0020C 80A1548C A7AE003A */ sh $t6, 0x003A($sp) -/* 00210 80A15490 3C060402 */ lui $a2, 0x0402 ## $a2 = 04020000 -/* 00214 80A15494 3C070402 */ lui $a3, 0x0402 ## $a3 = 04020000 +/* 00210 80A15490 3C060402 */ lui $a2, %hi(D_04018FE0) ## $a2 = 04020000 +/* 00214 80A15494 3C070402 */ lui $a3, %hi(D_0401909C) ## $a3 = 04020000 /* 00218 80A15498 260F01F0 */ addiu $t7, $s0, 0x01F0 ## $t7 = 000001F0 /* 0021C 80A1549C 2618021A */ addiu $t8, $s0, 0x021A ## $t8 = 0000021A /* 00220 80A154A0 24190007 */ addiu $t9, $zero, 0x0007 ## $t9 = 00000007 /* 00224 80A154A4 AFB90018 */ sw $t9, 0x0018($sp) /* 00228 80A154A8 AFB80014 */ sw $t8, 0x0014($sp) /* 0022C 80A154AC AFAF0010 */ sw $t7, 0x0010($sp) -/* 00230 80A154B0 24E7909C */ addiu $a3, $a3, 0x909C ## $a3 = 0401909C -/* 00234 80A154B4 24C68FE0 */ addiu $a2, $a2, 0x8FE0 ## $a2 = 04018FE0 +/* 00230 80A154B0 24E7909C */ addiu $a3, $a3, %lo(D_0401909C) ## $a3 = 0401909C +/* 00234 80A154B4 24C68FE0 */ addiu $a2, $a2, %lo(D_04018FE0) ## $a2 = 04018FE0 /* 00238 80A154B8 8FA40044 */ lw $a0, 0x0044($sp) /* 0023C 80A154BC 0C0291BE */ jal SkelAnime_InitFlex /* 00240 80A154C0 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A152AC.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A152AC.s index 380a8b4f74..ba2c15a596 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A152AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A152AC.s @@ -2,19 +2,19 @@ glabel func_80A152AC /* 0002C 80A152AC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00030 80A152B0 AFA40028 */ sw $a0, 0x0028($sp) /* 00034 80A152B4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00038 80A152B8 3C040402 */ lui $a0, 0x0402 ## $a0 = 04020000 +/* 00038 80A152B8 3C040402 */ lui $a0, %hi(D_0401909C) ## $a0 = 04020000 /* 0003C 80A152BC 0C028800 */ jal SkelAnime_GetFrameCount -/* 00040 80A152C0 2484909C */ addiu $a0, $a0, 0x909C ## $a0 = 0401909C +/* 00040 80A152C0 2484909C */ addiu $a0, $a0, %lo(D_0401909C) ## $a0 = 0401909C /* 00044 80A152C4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00048 80A152C8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 0004C 80A152CC 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 /* 00050 80A152D0 468021A0 */ cvt.s.w $f6, $f4 /* 00054 80A152D4 8FA40028 */ lw $a0, 0x0028($sp) -/* 00058 80A152D8 3C050402 */ lui $a1, 0x0402 ## $a1 = 04020000 +/* 00058 80A152D8 3C050402 */ lui $a1, %hi(D_0401909C) ## $a1 = 04020000 /* 0005C 80A152DC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00060 80A152E0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00064 80A152E4 24A5909C */ addiu $a1, $a1, 0x909C ## $a1 = 0401909C +/* 00064 80A152E4 24A5909C */ addiu $a1, $a1, %lo(D_0401909C) ## $a1 = 0401909C /* 00068 80A152E8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0006C 80A152EC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00070 80A152F0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15310.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15310.s index 175e0a97f9..02760ec7fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15310.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15310.s @@ -2,19 +2,19 @@ glabel func_80A15310 /* 00090 80A15310 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00094 80A15314 AFA40028 */ sw $a0, 0x0028($sp) /* 00098 80A15318 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0009C 80A1531C 3C040402 */ lui $a0, 0x0402 ## $a0 = 04020000 +/* 0009C 80A1531C 3C040402 */ lui $a0, %hi(D_040185FC) ## $a0 = 04020000 /* 000A0 80A15320 0C028800 */ jal SkelAnime_GetFrameCount -/* 000A4 80A15324 248485FC */ addiu $a0, $a0, 0x85FC ## $a0 = 040185FC +/* 000A4 80A15324 248485FC */ addiu $a0, $a0, %lo(D_040185FC) ## $a0 = 040185FC /* 000A8 80A15328 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 000AC 80A1532C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 000B0 80A15330 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 /* 000B4 80A15334 468021A0 */ cvt.s.w $f6, $f4 /* 000B8 80A15338 8FA40028 */ lw $a0, 0x0028($sp) -/* 000BC 80A1533C 3C050402 */ lui $a1, 0x0402 ## $a1 = 04020000 +/* 000BC 80A1533C 3C050402 */ lui $a1, %hi(D_040185FC) ## $a1 = 04020000 /* 000C0 80A15340 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 000C4 80A15344 AFAE0014 */ sw $t6, 0x0014($sp) -/* 000C8 80A15348 24A585FC */ addiu $a1, $a1, 0x85FC ## $a1 = 040185FC +/* 000C8 80A15348 24A585FC */ addiu $a1, $a1, %lo(D_040185FC) ## $a1 = 040185FC /* 000CC 80A1534C E7A60010 */ swc1 $f6, 0x0010($sp) /* 000D0 80A15350 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 000D4 80A15354 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 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 5c792deb86..5f6da4aea2 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 @@ -27,8 +27,8 @@ glabel EnGb_Init /* 0007C 80A2F1FC 0C010D20 */ jal DynaPolyInfo_SetActorMove /* 00080 80A2F200 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00084 80A2F204 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00088 80A2F208 2484C2D0 */ addiu $a0, $a0, 0xC2D0 ## $a0 = 0600C2D0 +/* 00084 80A2F204 3C040601 */ lui $a0, %hi(D_0600C2D0) ## $a0 = 06010000 +/* 00088 80A2F208 2484C2D0 */ addiu $a0, $a0, %lo(D_0600C2D0) ## $a0 = 0600C2D0 /* 0008C 80A2F20C 0C010620 */ jal DynaPolyInfo_Alloc /* 00090 80A2F210 27A50084 */ addiu $a1, $sp, 0x0084 ## $a1 = FFFFFFF4 @@ -39,16 +39,16 @@ glabel EnGb_Init ## DynaPolyInfo_setActor /* 000A4 80A2F224 8FA70084 */ lw $a3, 0x0084($sp) /* 000A8 80A2F228 AE42014C */ sw $v0, 0x014C($s2) ## 0000014C -/* 000AC 80A2F22C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 000B0 80A2F230 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 000AC 80A2F22C 3C060601 */ lui $a2, %hi(D_0600C220) ## $a2 = 06010000 +/* 000B0 80A2F230 3C070600 */ lui $a3, %hi(D_0600049C) ## $a3 = 06000000 /* 000B4 80A2F234 264E01A8 */ addiu $t6, $s2, 0x01A8 ## $t6 = 000001A8 /* 000B8 80A2F238 264F01F0 */ addiu $t7, $s2, 0x01F0 ## $t7 = 000001F0 /* 000BC 80A2F23C 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C /* 000C0 80A2F240 AFB80018 */ sw $t8, 0x0018($sp) /* 000C4 80A2F244 AFAF0014 */ sw $t7, 0x0014($sp) /* 000C8 80A2F248 AFAE0010 */ sw $t6, 0x0010($sp) -/* 000CC 80A2F24C 24E7049C */ addiu $a3, $a3, 0x049C ## $a3 = 0600049C -/* 000D0 80A2F250 24C6C220 */ addiu $a2, $a2, 0xC220 ## $a2 = 0600C220 +/* 000CC 80A2F24C 24E7049C */ addiu $a3, $a3, %lo(D_0600049C) ## $a3 = 0600049C +/* 000D0 80A2F250 24C6C220 */ addiu $a2, $a2, %lo(D_0600C220) ## $a2 = 0600C220 /* 000D4 80A2F254 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 000D8 80A2F258 0C0291BE */ jal SkelAnime_InitFlex /* 000DC 80A2F25C 26450164 */ addiu $a1, $s2, 0x0164 ## $a1 = 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F7C0.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F7C0.s index 6c609dd8c6..e0e1e1b9f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F7C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F7C0.s @@ -2,19 +2,19 @@ glabel func_80A2F7C0 /* 00640 80A2F7C0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00644 80A2F7C4 AFA40028 */ sw $a0, 0x0028($sp) /* 00648 80A2F7C8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0064C 80A2F7CC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 0064C 80A2F7CC 3C040601 */ lui $a0, %hi(D_0600C8EC) ## $a0 = 06010000 /* 00650 80A2F7D0 0C028800 */ jal SkelAnime_GetFrameCount -/* 00654 80A2F7D4 2484C8EC */ addiu $a0, $a0, 0xC8EC ## $a0 = 0600C8EC +/* 00654 80A2F7D4 2484C8EC */ addiu $a0, $a0, %lo(D_0600C8EC) ## $a0 = 0600C8EC /* 00658 80A2F7D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0065C 80A2F7DC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00660 80A2F7E0 8FA40028 */ lw $a0, 0x0028($sp) /* 00664 80A2F7E4 468021A0 */ cvt.s.w $f6, $f4 -/* 00668 80A2F7E8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 00668 80A2F7E8 3C050601 */ lui $a1, %hi(D_0600C8EC) ## $a1 = 06010000 /* 0066C 80A2F7EC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00670 80A2F7F0 44070000 */ mfc1 $a3, $f0 /* 00674 80A2F7F4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00678 80A2F7F8 24A5C8EC */ addiu $a1, $a1, 0xC8EC ## $a1 = 0600C8EC +/* 00678 80A2F7F8 24A5C8EC */ addiu $a1, $a1, %lo(D_0600C8EC) ## $a1 = 0600C8EC /* 0067C 80A2F7FC E7A60010 */ swc1 $f6, 0x0010($sp) /* 00680 80A2F800 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00684 80A2F804 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC70.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC70.s index 982ada0e25..35759874ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC70.s @@ -3,14 +3,14 @@ glabel func_80A2FC70 /* 00AF4 80A2FC74 AFB00028 */ sw $s0, 0x0028($sp) /* 00AF8 80A2FC78 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00AFC 80A2FC7C AFBF002C */ sw $ra, 0x002C($sp) -/* 00B00 80A2FC80 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 00B00 80A2FC80 3C040601 */ lui $a0, %hi(D_0600C8EC) ## $a0 = 06010000 /* 00B04 80A2FC84 AFA50034 */ sw $a1, 0x0034($sp) /* 00B08 80A2FC88 0C028800 */ jal SkelAnime_GetFrameCount -/* 00B0C 80A2FC8C 2484C8EC */ addiu $a0, $a0, 0xC8EC ## $a0 = 0600C8EC +/* 00B0C 80A2FC8C 2484C8EC */ addiu $a0, $a0, %lo(D_0600C8EC) ## $a0 = 0600C8EC /* 00B10 80A2FC90 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00B14 80A2FC94 C600017C */ lwc1 $f0, 0x017C($s0) ## 0000017C -/* 00B18 80A2FC98 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00B18 80A2FC98 3C040600 */ lui $a0, %hi(D_0600049C) ## $a0 = 06000000 /* 00B1C 80A2FC9C 468021A0 */ cvt.s.w $f6, $f4 /* 00B20 80A2FCA0 3C014190 */ lui $at, 0x4190 ## $at = 41900000 /* 00B24 80A2FCA4 46060032 */ c.eq.s $f0, $f6 @@ -19,13 +19,13 @@ glabel func_80A2FC70 /* 00B30 80A2FCB0 44818000 */ mtc1 $at, $f16 ## $f16 = 18.00 /* 00B34 80A2FCB4 0C028800 */ jal SkelAnime_GetFrameCount -/* 00B38 80A2FCB8 2484049C */ addiu $a0, $a0, 0x049C ## $a0 = 0600049C +/* 00B38 80A2FCB8 2484049C */ addiu $a0, $a0, %lo(D_0600049C) ## $a0 = 0600049C /* 00B3C 80A2FCBC 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 00B40 80A2FCC0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00B44 80A2FCC4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00B44 80A2FCC4 3C050600 */ lui $a1, %hi(D_0600049C) ## $a1 = 06000000 /* 00B48 80A2FCC8 468042A0 */ cvt.s.w $f10, $f8 /* 00B4C 80A2FCCC 44070000 */ mfc1 $a3, $f0 -/* 00B50 80A2FCD0 24A5049C */ addiu $a1, $a1, 0x049C ## $a1 = 0600049C +/* 00B50 80A2FCD0 24A5049C */ addiu $a1, $a1, %lo(D_0600049C) ## $a1 = 0600049C /* 00B54 80A2FCD4 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 00B58 80A2FCD8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00B5C 80A2FCDC AFA00014 */ sw $zero, 0x0014($sp) 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 fabea30405..2e5d13bfec 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 @@ -47,11 +47,11 @@ glabel func_80A30350 /* 0123C 80A303BC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01240 80A303C0 4481B000 */ mtc1 $at, $f22 ## $f22 = 1.00 /* 01244 80A303C4 3C0180A3 */ lui $at, %hi(D_80A30800) ## $at = 80A30000 -/* 01248 80A303C8 3C170601 */ lui $s7, 0x0601 ## $s7 = 06010000 +/* 01248 80A303C8 3C170601 */ lui $s7, %hi(D_0600C0B0) ## $s7 = 06010000 /* 0124C 80A303CC 3C1EDB06 */ lui $s8, 0xDB06 ## $s8 = DB060000 /* 01250 80A303D0 8FB300C0 */ lw $s3, 0x00C0($sp) /* 01254 80A303D4 37DE0020 */ ori $s8, $s8, 0x0020 ## $s8 = DB060020 -/* 01258 80A303D8 26F7C0B0 */ addiu $s7, $s7, 0xC0B0 ## $s7 = 0600C0B0 +/* 01258 80A303D8 26F7C0B0 */ addiu $s7, $s7, %lo(D_0600C0B0) ## $s7 = 0600C0B0 /* 0125C 80A303DC C4340800 */ lwc1 $f20, %lo(D_80A30800)($at) /* 01260 80A303E0 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 .L80A303E4: 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 e8bf64f474..5cb6a57d94 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 @@ -22,21 +22,21 @@ glabel EnGe1_Init /* 00028 80A30998 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 0002C 80A3099C 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 -/* 00030 80A309A0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00034 80A309A4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00030 80A309A0 3C060600 */ lui $a2, %hi(D_06000330) ## $a2 = 06000000 +/* 00034 80A309A4 3C070600 */ lui $a3, %hi(D_06000228) ## $a3 = 06000000 /* 00038 80A309A8 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 0003C 80A309AC 260F023C */ addiu $t7, $s0, 0x023C ## $t7 = 0000023C /* 00040 80A309B0 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 /* 00044 80A309B4 AFB80018 */ sw $t8, 0x0018($sp) /* 00048 80A309B8 AFAF0014 */ sw $t7, 0x0014($sp) /* 0004C 80A309BC AFAE0010 */ sw $t6, 0x0010($sp) -/* 00050 80A309C0 24E70228 */ addiu $a3, $a3, 0x0228 ## $a3 = 06000228 -/* 00054 80A309C4 24C60330 */ addiu $a2, $a2, 0x0330 ## $a2 = 06000330 +/* 00050 80A309C0 24E70228 */ addiu $a3, $a3, %lo(D_06000228) ## $a3 = 06000228 +/* 00054 80A309C4 24C60330 */ addiu $a2, $a2, %lo(D_06000330) ## $a2 = 06000330 /* 00058 80A309C8 AFA50030 */ sw $a1, 0x0030($sp) /* 0005C 80A309CC 0C0291BE */ jal SkelAnime_InitFlex /* 00060 80A309D0 8FA40044 */ lw $a0, 0x0044($sp) -/* 00064 80A309D4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00068 80A309D8 24A50228 */ addiu $a1, $a1, 0x0228 ## $a1 = 06000228 +/* 00064 80A309D4 3C050600 */ lui $a1, %hi(D_06000228) ## $a1 = 06000000 +/* 00068 80A309D8 24A50228 */ addiu $a1, $a1, %lo(D_06000228) ## $a1 = 06000228 /* 0006C 80A309DC 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00070 80A309E0 8FA40030 */ lw $a0, 0x0030($sp) /* 00074 80A309E4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C @@ -51,10 +51,10 @@ glabel EnGe1_Init /* 00094 80A30A04 0C01712B */ jal Collider_SetCylinder /* 00098 80A30A08 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0009C 80A30A0C 3C080600 */ lui $t0, 0x0600 ## $t0 = 06000000 +/* 0009C 80A30A0C 3C080600 */ lui $t0, %hi(D_06000228) ## $t0 = 06000000 /* 000A0 80A30A10 3C0980A3 */ lui $t1, %hi(func_80A323B0) ## $t1 = 80A30000 /* 000A4 80A30A14 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 000A8 80A30A18 25080228 */ addiu $t0, $t0, 0x0228 ## $t0 = 06000228 +/* 000A8 80A30A18 25080228 */ addiu $t0, $t0, %lo(D_06000228) ## $t0 = 06000228 /* 000AC 80A30A1C 252923B0 */ addiu $t1, $t1, %lo(func_80A323B0) ## $t1 = 80A323B0 /* 000B0 80A30A20 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 /* 000B4 80A30A24 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30C70.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30C70.s index 964b900c24..5e0a1260d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30C70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30C70.s @@ -11,9 +11,9 @@ glabel func_80A30C70 /* 00324 80A30C94 C7A0003C */ lwc1 $f0, 0x003C($sp) /* 00328 80A30C98 961802AC */ lhu $t8, 0x02AC($s0) ## 000002AC /* 0032C 80A30C9C 8FAE0040 */ lw $t6, 0x0040($sp) -/* 00330 80A30CA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00330 80A30CA0 3C040600 */ lui $a0, %hi(D_06000228) ## $a0 = 06000000 /* 00334 80A30CA4 3C0F80A3 */ lui $t7, %hi(func_80A323EC) ## $t7 = 80A30000 -/* 00338 80A30CA8 24840228 */ addiu $a0, $a0, 0x0228 ## $a0 = 06000228 +/* 00338 80A30CA8 24840228 */ addiu $a0, $a0, %lo(D_06000228) ## $a0 = 06000228 /* 0033C 80A30CAC 25EF23EC */ addiu $t7, $t7, %lo(func_80A323EC) ## $t7 = 80A323EC /* 00340 80A30CB0 3319FFFB */ andi $t9, $t8, 0xFFFB ## $t9 = 00000000 /* 00344 80A30CB4 AE0F02B8 */ sw $t7, 0x02B8($s0) ## 000002B8 @@ -26,10 +26,10 @@ glabel func_80A30C70 /* 0035C 80A30CCC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 00360 80A30CD0 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 /* 00364 80A30CD4 468021A0 */ cvt.s.w $f6, $f4 -/* 00368 80A30CD8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00368 80A30CD8 3C050600 */ lui $a1, %hi(D_06000228) ## $a1 = 06000000 /* 0036C 80A30CDC 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 00370 80A30CE0 AFA80014 */ sw $t0, 0x0014($sp) -/* 00374 80A30CE4 24A50228 */ addiu $a1, $a1, 0x0228 ## $a1 = 06000228 +/* 00374 80A30CE4 24A50228 */ addiu $a1, $a1, %lo(D_06000228) ## $a1 = 06000228 /* 00378 80A30CE8 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 0037C 80A30CEC E7A60010 */ swc1 $f6, 0x0010($sp) /* 00380 80A30CF0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30D48.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30D48.s index 78d6963786..f97e0d86cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30D48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30D48.s @@ -2,21 +2,21 @@ glabel func_80A30D48 /* 003D8 80A30D48 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 003DC 80A30D4C AFA40028 */ sw $a0, 0x0028($sp) /* 003E0 80A30D50 AFBF0024 */ sw $ra, 0x0024($sp) -/* 003E4 80A30D54 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 003E4 80A30D54 3C040600 */ lui $a0, %hi(D_06000228) ## $a0 = 06000000 /* 003E8 80A30D58 0C028800 */ jal SkelAnime_GetFrameCount -/* 003EC 80A30D5C 24840228 */ addiu $a0, $a0, 0x0228 ## $a0 = 06000228 +/* 003EC 80A30D5C 24840228 */ addiu $a0, $a0, %lo(D_06000228) ## $a0 = 06000228 /* 003F0 80A30D60 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 003F4 80A30D64 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 003F8 80A30D68 44814000 */ mtc1 $at, $f8 ## $f8 = 8.00 /* 003FC 80A30D6C 46802120 */ cvt.s.w $f4, $f4 /* 00400 80A30D70 8FA40028 */ lw $a0, 0x0028($sp) /* 00404 80A30D74 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00408 80A30D78 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00408 80A30D78 3C050600 */ lui $a1, %hi(D_06000228) ## $a1 = 06000000 /* 0040C 80A30D7C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00410 80A30D80 AFAE0014 */ sw $t6, 0x0014($sp) /* 00414 80A30D84 44072000 */ mfc1 $a3, $f4 -/* 00418 80A30D88 24A50228 */ addiu $a1, $a1, 0x0228 ## $a1 = 06000228 +/* 00418 80A30D88 24A50228 */ addiu $a1, $a1, %lo(D_06000228) ## $a1 = 06000228 /* 0041C 80A30D8C 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 00420 80A30D90 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00424 80A30D94 24840198 */ addiu $a0, $a0, 0x0198 ## $a0 = 00000198 @@ -24,9 +24,9 @@ glabel func_80A30D48 /* 0042C 80A30D9C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00430 80A30DA0 8FA20028 */ lw $v0, 0x0028($sp) -/* 00434 80A30DA4 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 +/* 00434 80A30DA4 3C0F0600 */ lui $t7, %hi(D_06000228) ## $t7 = 06000000 /* 00438 80A30DA8 3C1880A3 */ lui $t8, %hi(func_80A323B0) ## $t8 = 80A30000 -/* 0043C 80A30DAC 25EF0228 */ addiu $t7, $t7, 0x0228 ## $t7 = 06000228 +/* 0043C 80A30DAC 25EF0228 */ addiu $t7, $t7, %lo(D_06000228) ## $t7 = 06000228 /* 00440 80A30DB0 271823B0 */ addiu $t8, $t8, %lo(func_80A323B0) ## $t8 = 80A323B0 /* 00444 80A30DB4 AC4F02B0 */ sw $t7, 0x02B0($v0) ## 000002B0 /* 00448 80A30DB8 AC5802B8 */ sw $t8, 0x02B8($v0) ## 000002B8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A312E4.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A312E4.s index 301b2c10cb..b1af15cf5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A312E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A312E4.s @@ -14,19 +14,19 @@ glabel func_80A312E4 /* 009A4 80A31314 1040001D */ beq $v0, $zero, .L80A3138C /* 009A8 80A31318 3C0E80A3 */ lui $t6, %hi(func_80A31234) ## $t6 = 80A30000 /* 009AC 80A3131C 25CE1234 */ addiu $t6, $t6, %lo(func_80A31234) ## $t6 = 80A31234 -/* 009B0 80A31320 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 009B0 80A31320 3C040601 */ lui $a0, %hi(D_0600A048) ## $a0 = 06010000 /* 009B4 80A31324 AE0E02B4 */ sw $t6, 0x02B4($s0) ## 000002B4 /* 009B8 80A31328 0C028800 */ jal SkelAnime_GetFrameCount -/* 009BC 80A3132C 2484A048 */ addiu $a0, $a0, 0xA048 ## $a0 = 0600A048 +/* 009BC 80A3132C 2484A048 */ addiu $a0, $a0, %lo(D_0600A048) ## $a0 = 0600A048 /* 009C0 80A31330 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 009C4 80A31334 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 009C8 80A31338 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 009CC 80A3133C 468021A0 */ cvt.s.w $f6, $f4 -/* 009D0 80A31340 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 009D0 80A31340 3C050601 */ lui $a1, %hi(D_0600A048) ## $a1 = 06010000 /* 009D4 80A31344 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 009D8 80A31348 AFAF0014 */ sw $t7, 0x0014($sp) -/* 009DC 80A3134C 24A5A048 */ addiu $a1, $a1, 0xA048 ## $a1 = 0600A048 +/* 009DC 80A3134C 24A5A048 */ addiu $a1, $a1, %lo(D_0600A048) ## $a1 = 0600A048 /* 009E0 80A31350 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 009E4 80A31354 E7A60010 */ swc1 $f6, 0x0010($sp) /* 009E8 80A31358 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 @@ -35,9 +35,9 @@ glabel func_80A312E4 /* 009F4 80A31364 E7A80018 */ swc1 $f8, 0x0018($sp) /* 009F8 80A31368 960802AC */ lhu $t0, 0x02AC($s0) ## 000002AC -/* 009FC 80A3136C 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 +/* 009FC 80A3136C 3C180601 */ lui $t8, %hi(D_0600A048) ## $t8 = 06010000 /* 00A00 80A31370 3C1980A3 */ lui $t9, %hi(func_80A323EC) ## $t9 = 80A30000 -/* 00A04 80A31374 2718A048 */ addiu $t8, $t8, 0xA048 ## $t8 = 0600A048 +/* 00A04 80A31374 2718A048 */ addiu $t8, $t8, %lo(D_0600A048) ## $t8 = 0600A048 /* 00A08 80A31378 273923EC */ addiu $t9, $t9, %lo(func_80A323EC) ## $t9 = 80A323EC /* 00A0C 80A3137C 3109FFFB */ andi $t1, $t0, 0xFFFB ## $t1 = 00000000 /* 00A10 80A31380 AE1802B0 */ sw $t8, 0x02B0($s0) ## 000002B0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A316F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A316F4.s index d5c55da283..1d0ab9d980 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A316F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A316F4.s @@ -18,19 +18,19 @@ glabel func_80A316F4 /* 00DC4 80A31734 1040001D */ beq $v0, $zero, .L80A317AC /* 00DC8 80A31738 3C1880A3 */ lui $t8, %hi(func_80A31644) ## $t8 = 80A30000 /* 00DCC 80A3173C 27181644 */ addiu $t8, $t8, %lo(func_80A31644) ## $t8 = 80A31644 -/* 00DD0 80A31740 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 00DD0 80A31740 3C040601 */ lui $a0, %hi(D_0600A048) ## $a0 = 06010000 /* 00DD4 80A31744 AE1802B4 */ sw $t8, 0x02B4($s0) ## 000002B4 /* 00DD8 80A31748 0C028800 */ jal SkelAnime_GetFrameCount -/* 00DDC 80A3174C 2484A048 */ addiu $a0, $a0, 0xA048 ## $a0 = 0600A048 +/* 00DDC 80A3174C 2484A048 */ addiu $a0, $a0, %lo(D_0600A048) ## $a0 = 0600A048 /* 00DE0 80A31750 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00DE4 80A31754 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00DE8 80A31758 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 00DEC 80A3175C 468021A0 */ cvt.s.w $f6, $f4 -/* 00DF0 80A31760 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 00DF0 80A31760 3C050601 */ lui $a1, %hi(D_0600A048) ## $a1 = 06010000 /* 00DF4 80A31764 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 00DF8 80A31768 AFB90014 */ sw $t9, 0x0014($sp) -/* 00DFC 80A3176C 24A5A048 */ addiu $a1, $a1, 0xA048 ## $a1 = 0600A048 +/* 00DFC 80A3176C 24A5A048 */ addiu $a1, $a1, %lo(D_0600A048) ## $a1 = 0600A048 /* 00E00 80A31770 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 00E04 80A31774 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00E08 80A31778 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 @@ -39,9 +39,9 @@ glabel func_80A316F4 /* 00E14 80A31784 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00E18 80A31788 960A02AC */ lhu $t2, 0x02AC($s0) ## 000002AC -/* 00E1C 80A3178C 3C080601 */ lui $t0, 0x0601 ## $t0 = 06010000 +/* 00E1C 80A3178C 3C080601 */ lui $t0, %hi(D_0600A048) ## $t0 = 06010000 /* 00E20 80A31790 3C0980A3 */ lui $t1, %hi(func_80A323EC) ## $t1 = 80A30000 -/* 00E24 80A31794 2508A048 */ addiu $t0, $t0, 0xA048 ## $t0 = 0600A048 +/* 00E24 80A31794 2508A048 */ addiu $t0, $t0, %lo(D_0600A048) ## $t0 = 0600A048 /* 00E28 80A31798 252923EC */ addiu $t1, $t1, %lo(func_80A323EC) ## $t1 = 80A323EC /* 00E2C 80A3179C 314BFFFB */ andi $t3, $t2, 0xFFFB ## $t3 = 00000000 /* 00E30 80A317A0 AE0802B0 */ sw $t0, 0x02B0($s0) ## 000002B0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31880.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31880.s index cc4f7b22e7..afb1cfdaf0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31880.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31880.s @@ -18,10 +18,10 @@ glabel func_80A31880 /* 00F4C 80A318BC 0C28C31C */ jal func_80A30C70 /* 00F50 80A318C0 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 00F54 80A318C4 10400017 */ beq $v0, $zero, .L80A31924 -/* 00F58 80A318C8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 00F58 80A318C8 3C040601 */ lui $a0, %hi(D_0600A498) ## $a0 = 06010000 /* 00F5C 80A318CC 8FA20028 */ lw $v0, 0x0028($sp) /* 00F60 80A318D0 3C0F80A3 */ lui $t7, %hi(func_80A323B0) ## $t7 = 80A30000 -/* 00F64 80A318D4 2484A498 */ addiu $a0, $a0, 0xA498 ## $a0 = 0600A498 +/* 00F64 80A318D4 2484A498 */ addiu $a0, $a0, %lo(D_0600A498) ## $a0 = 0600A498 /* 00F68 80A318D8 25EF23B0 */ addiu $t7, $t7, %lo(func_80A323B0) ## $t7 = 80A323B0 /* 00F6C 80A318DC AC4F02B8 */ sw $t7, 0x02B8($v0) ## 000002B8 /* 00F70 80A318E0 0C028800 */ jal SkelAnime_GetFrameCount @@ -32,10 +32,10 @@ glabel func_80A31880 /* 00F80 80A318F0 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 /* 00F84 80A318F4 468021A0 */ cvt.s.w $f6, $f4 /* 00F88 80A318F8 8FA40028 */ lw $a0, 0x0028($sp) -/* 00F8C 80A318FC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 00F8C 80A318FC 3C050601 */ lui $a1, %hi(D_0600A498) ## $a1 = 06010000 /* 00F90 80A31900 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 00F94 80A31904 AFB80014 */ sw $t8, 0x0014($sp) -/* 00F98 80A31908 24A5A498 */ addiu $a1, $a1, 0xA498 ## $a1 = 0600A498 +/* 00F98 80A31908 24A5A498 */ addiu $a1, $a1, %lo(D_0600A498) ## $a1 = 0600A498 /* 00F9C 80A3190C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00FA0 80A31910 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FA4 80A31914 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 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 be1fcf2b47..2501a80de1 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 @@ -22,20 +22,20 @@ glabel EnGe2_Init /* 000CC 80A32C9C 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 000D0 80A32CA0 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 -/* 000D4 80A32CA4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 +/* 000D4 80A32CA4 3C060601 */ lui $a2, %hi(D_06008968) ## $a2 = 06010000 /* 000D8 80A32CA8 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 000DC 80A32CAC 260F0260 */ addiu $t7, $s0, 0x0260 ## $t7 = 00000260 /* 000E0 80A32CB0 24180016 */ addiu $t8, $zero, 0x0016 ## $t8 = 00000016 /* 000E4 80A32CB4 AFB80018 */ sw $t8, 0x0018($sp) /* 000E8 80A32CB8 AFAF0014 */ sw $t7, 0x0014($sp) /* 000EC 80A32CBC AFAE0010 */ sw $t6, 0x0010($sp) -/* 000F0 80A32CC0 24C68968 */ addiu $a2, $a2, 0x8968 ## $a2 = 06008968 +/* 000F0 80A32CC0 24C68968 */ addiu $a2, $a2, %lo(D_06008968) ## $a2 = 06008968 /* 000F4 80A32CC4 AFA50030 */ sw $a1, 0x0030($sp) /* 000F8 80A32CC8 8FA40044 */ lw $a0, 0x0044($sp) /* 000FC 80A32CCC 0C0291BE */ jal SkelAnime_InitFlex /* 00100 80A32CD0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00104 80A32CD4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00108 80A32CD8 24A59ED4 */ addiu $a1, $a1, 0x9ED4 ## $a1 = 06009ED4 +/* 00104 80A32CD4 3C050601 */ lui $a1, %hi(D_06009ED4) ## $a1 = 06010000 +/* 00108 80A32CD8 24A59ED4 */ addiu $a1, $a1, %lo(D_06009ED4) ## $a1 = 06009ED4 /* 0010C 80A32CDC 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00110 80A32CE0 8FA40030 */ lw $a0, 0x0030($sp) /* 00114 80A32CE4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C 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 76e493bced..6ea835f675 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 @@ -12,20 +12,20 @@ glabel EnGe3_Init /* 000CC 80A346EC 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 000D0 80A346F0 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 -/* 000D4 80A346F4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 +/* 000D4 80A346F4 3C060601 */ lui $a2, %hi(D_0600A458) ## $a2 = 06010000 /* 000D8 80A346F8 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 000DC 80A346FC 260F026C */ addiu $t7, $s0, 0x026C ## $t7 = 0000026C /* 000E0 80A34700 24180018 */ addiu $t8, $zero, 0x0018 ## $t8 = 00000018 /* 000E4 80A34704 AFB80018 */ sw $t8, 0x0018($sp) /* 000E8 80A34708 AFAF0014 */ sw $t7, 0x0014($sp) /* 000EC 80A3470C AFAE0010 */ sw $t6, 0x0010($sp) -/* 000F0 80A34710 24C6A458 */ addiu $a2, $a2, 0xA458 ## $a2 = 0600A458 +/* 000F0 80A34710 24C6A458 */ addiu $a2, $a2, %lo(D_0600A458) ## $a2 = 0600A458 /* 000F4 80A34714 AFA50034 */ sw $a1, 0x0034($sp) /* 000F8 80A34718 8FA40044 */ lw $a0, 0x0044($sp) /* 000FC 80A3471C 0C0291BE */ jal SkelAnime_InitFlex /* 00100 80A34720 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00104 80A34724 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00108 80A34728 24A5B07C */ addiu $a1, $a1, 0xB07C ## $a1 = 0600B07C +/* 00104 80A34724 3C050601 */ lui $a1, %hi(D_0600B07C) ## $a1 = 06010000 +/* 00108 80A34728 24A5B07C */ addiu $a1, $a1, %lo(D_0600B07C) ## $a1 = 0600B07C /* 0010C 80A3472C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00110 80A34730 8FA40034 */ lw $a0, 0x0034($sp) /* 00114 80A34734 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C 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 27d219c8f3..93b312939f 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 @@ -53,8 +53,8 @@ glabel EnGo_Draw /* 02F84 80A414F4 0C0250F2 */ jal func_800943C8 /* 02F88 80A414F8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 02F8C 80A414FC 8FA50050 */ lw $a1, 0x0050($sp) -/* 02F90 80A41500 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 02F94 80A41504 2484CE80 */ addiu $a0, $a0, 0xCE80 ## $a0 = 0600CE80 +/* 02F90 80A41500 3C040601 */ lui $a0, %hi(D_0600CE80) ## $a0 = 06010000 +/* 02F94 80A41504 2484CE80 */ addiu $a0, $a0, %lo(D_0600CE80) ## $a0 = 0600CE80 /* 02F98 80A41508 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 02F9C 80A4150C 00045100 */ sll $t2, $a0, 4 /* 02FA0 80A41510 000A5F02 */ srl $t3, $t2, 28 @@ -76,8 +76,8 @@ glabel EnGo_Draw /* 02FE0 80A41550 0308C821 */ addu $t9, $t8, $t0 /* 02FE4 80A41554 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 02FE8 80A41558 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 -/* 02FEC 80A4155C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 02FF0 80A41560 2484DE80 */ addiu $a0, $a0, 0xDE80 ## $a0 = 0600DE80 +/* 02FEC 80A4155C 3C040601 */ lui $a0, %hi(D_0600DE80) ## $a0 = 06010000 +/* 02FF0 80A41560 2484DE80 */ addiu $a0, $a0, %lo(D_0600DE80) ## $a0 = 0600DE80 /* 02FF4 80A41564 00045900 */ sll $t3, $a0, 4 /* 02FF8 80A41568 000B6702 */ srl $t4, $t3, 28 /* 02FFC 80A4156C 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 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 d38ff1af34..2b3c8bd855 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 @@ -29,8 +29,8 @@ glabel EnGo_Init /* 01628 80A3FB98 0C00AC78 */ jal ActorShape_Init /* 0162C 80A3FB9C AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFE8 -/* 01630 80A3FBA0 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 01634 80A3FBA4 24C6FEF0 */ addiu $a2, $a2, 0xFEF0 ## $a2 = 0600FEF0 +/* 01630 80A3FBA0 3C060601 */ lui $a2, %hi(D_0600FEF0) ## $a2 = 06010000 +/* 01634 80A3FBA4 24C6FEF0 */ addiu $a2, $a2, %lo(D_0600FEF0) ## $a2 = 0600FEF0 /* 01638 80A3FBA8 8FA4005C */ lw $a0, 0x005C($sp) /* 0163C 80A3FBAC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 01640 80A3FBB0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -148,10 +148,10 @@ glabel L80A3FCC8 /* 017D8 80A3FD48 10000048 */ beq $zero, $zero, .L80A3FE6C /* 017DC 80A3FD4C 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A3FD50 -/* 017E0 80A3FD50 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 017E0 80A3FD50 3C040600 */ lui $a0, %hi(D_06004930) ## $a0 = 06000000 /* 017E4 80A3FD54 0C028800 */ jal SkelAnime_GetFrameCount -/* 017E8 80A3FD58 24844930 */ addiu $a0, $a0, 0x4930 ## $a0 = 06004930 +/* 017E8 80A3FD58 24844930 */ addiu $a0, $a0, %lo(D_06004930) ## $a0 = 06004930 /* 017EC 80A3FD5C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 017F0 80A3FD60 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 017F4 80A3FD64 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F274.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F274.s index a612058edb..05a812f662 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F274.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F274.s @@ -3,8 +3,8 @@ glabel func_80A3F274 /* 00D08 80A3F278 AFBF001C */ sw $ra, 0x001C($sp) /* 00D0C 80A3F27C AFA40030 */ sw $a0, 0x0030($sp) /* 00D10 80A3F280 8C820154 */ lw $v0, 0x0154($a0) ## 00000154 -/* 00D14 80A3F284 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 -/* 00D18 80A3F288 24634930 */ addiu $v1, $v1, 0x4930 ## $v1 = 06004930 +/* 00D14 80A3F284 3C030600 */ lui $v1, %hi(D_06004930) ## $v1 = 06000000 +/* 00D18 80A3F288 24634930 */ addiu $v1, $v1, %lo(D_06004930) ## $v1 = 06004930 /* 00D1C 80A3F28C 14620008 */ bne $v1, $v0, .L80A3F2B0 /* 00D20 80A3F290 C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 /* 00D24 80A3F294 3C014200 */ lui $at, 0x4200 ## $at = 42000000 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 bfc9e6ce82..5657fe1c50 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 @@ -3,11 +3,11 @@ glabel func_80A405CC /* 02060 80A405D0 AFB00020 */ sw $s0, 0x0020($sp) /* 02064 80A405D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02068 80A405D8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0206C 80A405DC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0206C 80A405DC 3C040600 */ lui $a0, %hi(D_06004930) ## $a0 = 06000000 /* 02070 80A405E0 AFA50034 */ sw $a1, 0x0034($sp) /* 02074 80A405E4 0C028800 */ jal SkelAnime_GetFrameCount -/* 02078 80A405E8 24844930 */ addiu $a0, $a0, 0x4930 ## $a0 = 06004930 +/* 02078 80A405E8 24844930 */ addiu $a0, $a0, %lo(D_06004930) ## $a0 = 06004930 /* 0207C 80A405EC 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 02080 80A405F0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02084 80A405F4 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40A54.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40A54.s index e3986d1607..3063324796 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40A54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40A54.s @@ -3,11 +3,11 @@ glabel func_80A40A54 /* 024E8 80A40A58 AFB00018 */ sw $s0, 0x0018($sp) /* 024EC 80A40A5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 024F0 80A40A60 AFBF001C */ sw $ra, 0x001C($sp) -/* 024F4 80A40A64 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 024F4 80A40A64 3C040601 */ lui $a0, %hi(D_06010590) ## $a0 = 06010000 /* 024F8 80A40A68 AFA50024 */ sw $a1, 0x0024($sp) /* 024FC 80A40A6C 0C028800 */ jal SkelAnime_GetFrameCount -/* 02500 80A40A70 24840590 */ addiu $a0, $a0, 0x0590 ## $a0 = 06010590 +/* 02500 80A40A70 24840590 */ addiu $a0, $a0, %lo(D_06010590) ## $a0 = 06010590 /* 02504 80A40A74 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 02508 80A40A78 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0250C 80A40A7C 44812000 */ mtc1 $at, $f4 ## $f4 = 32768.00 @@ -34,10 +34,10 @@ glabel func_80A40A54 /* 0255C 80A40ACC 8FBF001C */ lw $ra, 0x001C($sp) /* 02560 80A40AD0 0C28FB78 */ jal func_80A3EDE0 /* 02564 80A40AD4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02568 80A40AD8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 02568 80A40AD8 3C040600 */ lui $a0, %hi(D_06004930) ## $a0 = 06000000 /* 0256C 80A40ADC 0C028800 */ jal SkelAnime_GetFrameCount -/* 02570 80A40AE0 24844930 */ addiu $a0, $a0, 0x4930 ## $a0 = 06004930 +/* 02570 80A40AE0 24844930 */ addiu $a0, $a0, %lo(D_06004930) ## $a0 = 06004930 /* 02574 80A40AE4 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 02578 80A40AE8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 0257C 80A40AEC 3C0580A4 */ lui $a1, %hi(func_80A406E0) ## $a1 = 80A40000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40DCC.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40DCC.s index b18790a6d0..fcf4bbc7d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40DCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40DCC.s @@ -10,10 +10,10 @@ glabel func_80A40DCC /* 0287C 80A40DEC 8FBF001C */ lw $ra, 0x001C($sp) /* 02880 80A40DF0 0C28FB78 */ jal func_80A3EDE0 /* 02884 80A40DF4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02888 80A40DF8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 02888 80A40DF8 3C040600 */ lui $a0, %hi(D_06004930) ## $a0 = 06000000 /* 0288C 80A40DFC 0C028800 */ jal SkelAnime_GetFrameCount -/* 02890 80A40E00 24844930 */ addiu $a0, $a0, 0x4930 ## $a0 = 06004930 +/* 02890 80A40E00 24844930 */ addiu $a0, $a0, %lo(D_06004930) ## $a0 = 06004930 /* 02894 80A40E04 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02898 80A40E08 00000000 */ nop /* 0289C 80A40E0C 468021A0 */ cvt.s.w $f6, $f4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s index 3b65f27240..32508e7614 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s @@ -40,8 +40,8 @@ glabel func_80A40F58 /* 02A80 80A40FF0 0C0346A2 */ jal Matrix_NewMtx /* 02A84 80A40FF4 AFA2002C */ sw $v0, 0x002C($sp) /* 02A88 80A40FF8 8FA3002C */ lw $v1, 0x002C($sp) -/* 02A8C 80A40FFC 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 -/* 02A90 80A41000 25EFBD80 */ addiu $t7, $t7, 0xBD80 ## $t7 = 0600BD80 +/* 02A8C 80A40FFC 3C0F0601 */ lui $t7, %hi(D_0600BD80) ## $t7 = 06010000 +/* 02A90 80A41000 25EFBD80 */ addiu $t7, $t7, %lo(D_0600BD80) ## $t7 = 0600BD80 /* 02A94 80A41004 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 02A98 80A41008 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 02A9C 80A4100C 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s index f7c43d7463..e133d4523b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s @@ -61,8 +61,8 @@ glabel func_80A41068 /* 02BE4 80A41154 0C0346A2 */ jal Matrix_NewMtx /* 02BE8 80A41158 AFA2002C */ sw $v0, 0x002C($sp) /* 02BEC 80A4115C 8FA3002C */ lw $v1, 0x002C($sp) -/* 02BF0 80A41160 3C090601 */ lui $t1, 0x0601 ## $t1 = 06010000 -/* 02BF4 80A41164 2529C140 */ addiu $t1, $t1, 0xC140 ## $t1 = 0600C140 +/* 02BF0 80A41160 3C090601 */ lui $t1, %hi(D_0600C140) ## $t1 = 06010000 +/* 02BF4 80A41164 2529C140 */ addiu $t1, $t1, %lo(D_0600C140) ## $t1 = 0600C140 /* 02BF8 80A41168 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 02BFC 80A4116C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 02C00 80A41170 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 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 d887bdd678..f27c77009a 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 @@ -39,11 +39,11 @@ glabel func_80A417B4 /* 032D4 80A41844 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 /* 032D8 80A41848 11C0008A */ beq $t6, $zero, .L80A41A74 /* 032DC 80A4184C 03C19821 */ addu $s3, $s8, $at -/* 032E0 80A41850 3C150601 */ lui $s5, 0x0601 ## $s5 = 06010000 +/* 032E0 80A41850 3C150601 */ lui $s5, %hi(D_0600FD50) ## $s5 = 06010000 /* 032E4 80A41854 16E00014 */ bne $s7, $zero, .L80A418A8 -/* 032E8 80A41858 26B5FD50 */ addiu $s5, $s5, 0xFD50 ## $s5 = 0600FD50 -/* 032EC 80A4185C 3C110601 */ lui $s1, 0x0601 ## $s1 = 06010000 -/* 032F0 80A41860 2631FD40 */ addiu $s1, $s1, 0xFD40 ## $s1 = 0600FD40 +/* 032E8 80A41858 26B5FD50 */ addiu $s5, $s5, %lo(D_0600FD50) ## $s5 = 0600FD50 +/* 032EC 80A4185C 3C110601 */ lui $s1, %hi(D_0600FD40) ## $s1 = 06010000 +/* 032F0 80A41860 2631FD40 */ addiu $s1, $s1, %lo(D_0600FD40) ## $s1 = 0600FD40 /* 032F4 80A41864 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 032F8 80A41868 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 032FC 80A4186C 0C024DDD */ jal Gfx_CallSetupDL 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 91f64c12fd..ab306a6b51 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 @@ -49,14 +49,14 @@ glabel EnGo2_Init /* 037C4 80A464F4 3C0741E0 */ lui $a3, 0x41E0 ## $a3 = 41E00000 /* 037C8 80A464F8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 037CC 80A464FC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 +/* 037CC 80A464FC 3C060601 */ lui $a2, %hi(D_0600FEF0) ## $a2 = 06010000 /* 037D0 80A46500 260E04B8 */ addiu $t6, $s0, 0x04B8 ## $t6 = 000004B8 /* 037D4 80A46504 260F0524 */ addiu $t7, $s0, 0x0524 ## $t7 = 00000524 /* 037D8 80A46508 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 /* 037DC 80A4650C AFB80018 */ sw $t8, 0x0018($sp) /* 037E0 80A46510 AFAF0014 */ sw $t7, 0x0014($sp) /* 037E4 80A46514 AFAE0010 */ sw $t6, 0x0010($sp) -/* 037E8 80A46518 24C6FEF0 */ addiu $a2, $a2, 0xFEF0 ## $a2 = 0600FEF0 +/* 037E8 80A46518 24C6FEF0 */ addiu $a2, $a2, %lo(D_0600FEF0) ## $a2 = 0600FEF0 /* 037EC 80A4651C AFA50034 */ sw $a1, 0x0034($sp) /* 037F0 80A46520 8FA40044 */ lw $a0, 0x0044($sp) /* 037F4 80A46524 0C0291BE */ jal SkelAnime_InitFlex 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 0fb025c24e..9d0f3fbc09 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 @@ -53,11 +53,11 @@ glabel func_80A42EE0 /* 00240 80A42F70 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 /* 00244 80A42F74 11C0008A */ beq $t6, $zero, .L80A431A0 /* 00248 80A42F78 03C19821 */ addu $s3, $s8, $at -/* 0024C 80A42F7C 3C150601 */ lui $s5, 0x0601 ## $s5 = 06010000 +/* 0024C 80A42F7C 3C150601 */ lui $s5, %hi(D_0600FD50) ## $s5 = 06010000 /* 00250 80A42F80 16E00014 */ bne $s7, $zero, .L80A42FD4 -/* 00254 80A42F84 26B5FD50 */ addiu $s5, $s5, 0xFD50 ## $s5 = 0600FD50 -/* 00258 80A42F88 3C110601 */ lui $s1, 0x0601 ## $s1 = 06010000 -/* 0025C 80A42F8C 2631FD40 */ addiu $s1, $s1, 0xFD40 ## $s1 = 0600FD40 +/* 00254 80A42F84 26B5FD50 */ addiu $s5, $s5, %lo(D_0600FD50) ## $s5 = 0600FD50 +/* 00258 80A42F88 3C110601 */ lui $s1, %hi(D_0600FD40) ## $s1 = 06010000 +/* 0025C 80A42F8C 2631FD40 */ addiu $s1, $s1, %lo(D_0600FD40) ## $s1 = 0600FD40 /* 00260 80A42F90 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 00264 80A42F94 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00268 80A42F98 0C024DDD */ jal Gfx_CallSetupDL diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45360.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45360.s index b1d544c384..d8165830d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45360.s @@ -4,8 +4,8 @@ glabel func_80A45360 /* 02638 80A45368 AFA40018 */ sw $a0, 0x0018($sp) /* 0263C 80A4536C AFA5001C */ sw $a1, 0x001C($sp) /* 02640 80A45370 8C980154 */ lw $t8, 0x0154($a0) ## 00000154 -/* 02644 80A45374 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 02648 80A45378 25CE4930 */ addiu $t6, $t6, 0x4930 ## $t6 = 06004930 +/* 02644 80A45374 3C0E0600 */ lui $t6, %hi(D_06004930) ## $t6 = 06000000 +/* 02648 80A45378 25CE4930 */ addiu $t6, $t6, %lo(D_06004930) ## $t6 = 06004930 /* 0264C 80A4537C 15D8000B */ bne $t6, $t8, .L80A453AC /* 02650 80A45380 3C063ECC */ lui $a2, 0x3ECC ## $a2 = 3ECC0000 /* 02654 80A45384 3C014200 */ lui $at, 0x4200 ## $at = 42000000 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 c45eea974a..e85563c5d2 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 @@ -10,8 +10,8 @@ glabel func_80A45A00 /* 02CF0 80A45A20 45030038 */ bc1tl .L80A45B04 /* 02CF4 80A45A24 8FBF001C */ lw $ra, 0x001C($sp) /* 02CF8 80A45A28 8C8F0154 */ lw $t7, 0x0154($a0) ## 00000154 -/* 02CFC 80A45A2C 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 02D00 80A45A30 25CE4930 */ addiu $t6, $t6, 0x4930 ## $t6 = 06004930 +/* 02CFC 80A45A2C 3C0E0600 */ lui $t6, %hi(D_06004930) ## $t6 = 06000000 +/* 02D00 80A45A30 25CE4930 */ addiu $t6, $t6, %lo(D_06004930) ## $t6 = 06004930 /* 02D04 80A45A34 55CF0033 */ bnel $t6, $t7, .L80A45B04 /* 02D08 80A45A38 8FBF001C */ lw $ra, 0x001C($sp) /* 02D0C 80A45A3C 4600103C */ c.lt.s $f2, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A461A8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A461A8.s index 80133f7597..6345d5652e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A461A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A461A8.s @@ -10,9 +10,9 @@ glabel func_80A461A8 /* 03498 80A461C8 2406000D */ addiu $a2, $zero, 0x000D ## $a2 = 0000000D /* 0349C 80A461CC 94E2010E */ lhu $v0, 0x010E($a3) ## 0000010E /* 034A0 80A461D0 24043035 */ addiu $a0, $zero, 0x3035 ## $a0 = 00003035 -/* 034A4 80A461D4 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 +/* 034A4 80A461D4 3C0E0600 */ lui $t6, %hi(D_06000750) ## $t6 = 06000000 /* 034A8 80A461D8 14820003 */ bne $a0, $v0, .L80A461E8 -/* 034AC 80A461DC 25CE0750 */ addiu $t6, $t6, 0x0750 ## $t6 = 06000750 +/* 034AC 80A461DC 25CE0750 */ addiu $t6, $t6, %lo(D_06000750) ## $t6 = 06000750 /* 034B0 80A461E0 90F8020C */ lbu $t8, 0x020C($a3) ## 0000020C /* 034B4 80A461E4 13000006 */ beq $t8, $zero, .L80A46200 .L80A461E8: @@ -24,8 +24,8 @@ glabel func_80A461A8 /* 034CC 80A461FC 24013032 */ addiu $at, $zero, 0x3032 ## $at = 00003032 .L80A46200: /* 034D0 80A46200 8CE90154 */ lw $t1, 0x0154($a3) ## 00000154 -/* 034D4 80A46204 3C080600 */ lui $t0, 0x0600 ## $t0 = 06000000 -/* 034D8 80A46208 25080D5C */ addiu $t0, $t0, 0x0D5C ## $t0 = 06000D5C +/* 034D4 80A46204 3C080600 */ lui $t0, %hi(D_06000D5C) ## $t0 = 06000000 +/* 034D8 80A46208 25080D5C */ addiu $t0, $t0, %lo(D_06000D5C) ## $t0 = 06000D5C /* 034DC 80A4620C 51090005 */ beql $t0, $t1, .L80A46224 /* 034E0 80A46210 24013032 */ addiu $at, $zero, 0x3032 ## $at = 00003032 /* 034E4 80A46214 2406000C */ addiu $a2, $zero, 0x000C ## $a2 = 0000000C @@ -48,8 +48,8 @@ glabel func_80A461A8 /* 03520 80A46250 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 03524 80A46254 15610007 */ bne $t3, $at, .L80A46274 .L80A46258: -/* 03528 80A46258 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 -/* 0352C 80A4625C 258C0750 */ addiu $t4, $t4, 0x0750 ## $t4 = 06000750 +/* 03528 80A46258 3C0C0600 */ lui $t4, %hi(D_06000750) ## $t4 = 06000000 +/* 0352C 80A4625C 258C0750 */ addiu $t4, $t4, %lo(D_06000750) ## $t4 = 06000750 /* 03530 80A46260 11830004 */ beq $t4, $v1, .L80A46274 /* 03534 80A46264 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 03538 80A46268 2406000B */ addiu $a2, $zero, 0x000B ## $a2 = 0000000B diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s index a634ca0991..34be9393d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s @@ -52,8 +52,8 @@ glabel func_80A479B0 /* 04D10 80A47A40 0C0346A2 */ jal Matrix_NewMtx /* 04D14 80A47A44 AFA2002C */ sw $v0, 0x002C($sp) /* 04D18 80A47A48 8FA3002C */ lw $v1, 0x002C($sp) -/* 04D1C 80A47A4C 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 -/* 04D20 80A47A50 25EFBD80 */ addiu $t7, $t7, 0xBD80 ## $t7 = 0600BD80 +/* 04D1C 80A47A4C 3C0F0601 */ lui $t7, %hi(D_0600BD80) ## $t7 = 06010000 +/* 04D20 80A47A50 25EFBD80 */ addiu $t7, $t7, %lo(D_0600BD80) ## $t7 = 0600BD80 /* 04D24 80A47A54 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 04D28 80A47A58 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 04D2C 80A47A5C 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s index b9d47598e3..545fd36e18 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s @@ -82,8 +82,8 @@ glabel func_80A47AB0 /* 04E80 80A47BB0 0C0346A2 */ jal Matrix_NewMtx /* 04E84 80A47BB4 AFA2002C */ sw $v0, 0x002C($sp) /* 04E88 80A47BB8 8FA3002C */ lw $v1, 0x002C($sp) -/* 04E8C 80A47BBC 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 -/* 04E90 80A47BC0 256BC140 */ addiu $t3, $t3, 0xC140 ## $t3 = 0600C140 +/* 04E8C 80A47BBC 3C0B0601 */ lui $t3, %hi(D_0600C140) ## $t3 = 06010000 +/* 04E90 80A47BC0 256BC140 */ addiu $t3, $t3, %lo(D_0600C140) ## $t3 = 0600C140 /* 04E94 80A47BC4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 04E98 80A47BC8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 04E9C 80A47BCC 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Draw.s index 3bd0afa56c..bc0c86b69a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Draw.s @@ -289,8 +289,8 @@ glabel EnGoma_Draw /* 0239C 80A4B25C 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 /* 023A0 80A4B260 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 023A4 80A4B264 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 023A8 80A4B268 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 023AC 80A4B26C 25CE2A70 */ addiu $t6, $t6, 0x2A70 ## $t6 = 06002A70 +/* 023A8 80A4B268 3C0E0600 */ lui $t6, %hi(D_06002A70) ## $t6 = 06000000 +/* 023AC 80A4B26C 25CE2A70 */ addiu $t6, $t6, %lo(D_06002A70) ## $t6 = 06002A70 /* 023B0 80A4B270 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 023B4 80A4B274 AE2C02C0 */ sw $t4, 0x02C0($s1) ## 000002C0 /* 023B8 80A4B278 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 @@ -314,8 +314,8 @@ glabel EnGoma_Draw /* 023FC 80A4B2BC 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 02400 80A4B2C0 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 02404 80A4B2C4 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 02408 80A4B2C8 3C0A0500 */ lui $t2, 0x0500 ## $t2 = 05000000 -/* 0240C 80A4B2CC 254A0530 */ addiu $t2, $t2, 0x0530 ## $t2 = 05000530 +/* 02408 80A4B2C8 3C0A0500 */ lui $t2, %hi(D_05000530) ## $t2 = 05000000 +/* 0240C 80A4B2CC 254A0530 */ addiu $t2, $t2, %lo(D_05000530) ## $t2 = 05000530 /* 02410 80A4B2D0 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 02414 80A4B2D4 AE2802C0 */ sw $t0, 0x02C0($s1) ## 000002C0 /* 02418 80A4B2D8 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 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 f26b516030..c704d1642c 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 @@ -167,22 +167,22 @@ glabel EnGoma_Init /* 001E8 80A490A8 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 001EC 80A490AC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 001F0 80A490B0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 001F4 80A490B4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 001F0 80A490B0 3C060600 */ lui $a2, %hi(D_06003B40) ## $a2 = 06000000 +/* 001F4 80A490B4 3C070600 */ lui $a3, %hi(D_06001548) ## $a3 = 06000000 /* 001F8 80A490B8 26080190 */ addiu $t0, $s0, 0x0190 ## $t0 = 00000190 /* 001FC 80A490BC 26090220 */ addiu $t1, $s0, 0x0220 ## $t1 = 00000220 /* 00200 80A490C0 240A0018 */ addiu $t2, $zero, 0x0018 ## $t2 = 00000018 /* 00204 80A490C4 AFAA0018 */ sw $t2, 0x0018($sp) /* 00208 80A490C8 AFA90014 */ sw $t1, 0x0014($sp) /* 0020C 80A490CC AFA80010 */ sw $t0, 0x0010($sp) -/* 00210 80A490D0 24E71548 */ addiu $a3, $a3, 0x1548 ## $a3 = 06001548 -/* 00214 80A490D4 24C63B40 */ addiu $a2, $a2, 0x3B40 ## $a2 = 06003B40 +/* 00210 80A490D0 24E71548 */ addiu $a3, $a3, %lo(D_06001548) ## $a3 = 06001548 +/* 00214 80A490D4 24C63B40 */ addiu $a2, $a2, %lo(D_06003B40) ## $a2 = 06003B40 /* 00218 80A490D8 AFA50034 */ sw $a1, 0x0034($sp) /* 0021C 80A490DC 0C02915F */ jal SkelAnime_Init /* 00220 80A490E0 8FA40044 */ lw $a0, 0x0044($sp) -/* 00224 80A490E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00228 80A490E8 24A51548 */ addiu $a1, $a1, 0x1548 ## $a1 = 06001548 +/* 00224 80A490E4 3C050600 */ lui $a1, %hi(D_06001548) ## $a1 = 06000000 +/* 00228 80A490E8 24A51548 */ addiu $a1, $a1, %lo(D_06001548) ## $a1 = 06001548 /* 0022C 80A490EC 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00230 80A490F0 8FA40034 */ lw $a0, 0x0034($sp) /* 00234 80A490F4 8602001C */ lh $v0, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49294.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49294.s index cdc403d3fd..ac52fa9ddc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49294.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49294.s @@ -3,16 +3,16 @@ glabel func_80A49294 /* 003D8 80A49298 AFB00028 */ sw $s0, 0x0028($sp) /* 003DC 80A4929C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 003E0 80A492A0 AFBF002C */ sw $ra, 0x002C($sp) -/* 003E4 80A492A4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 003E4 80A492A4 3C040600 */ lui $a0, %hi(D_06003D78) ## $a0 = 06000000 /* 003E8 80A492A8 0C028800 */ jal SkelAnime_GetFrameCount -/* 003EC 80A492AC 24843D78 */ addiu $a0, $a0, 0x3D78 ## $a0 = 06003D78 +/* 003EC 80A492AC 24843D78 */ addiu $a0, $a0, %lo(D_06003D78) ## $a0 = 06003D78 /* 003F0 80A492B0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 003F4 80A492B4 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 003F8 80A492B8 44814000 */ mtc1 $at, $f8 ## $f8 = -2.00 /* 003FC 80A492BC 468021A0 */ cvt.s.w $f6, $f4 -/* 00400 80A492C0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00404 80A492C4 24A53D78 */ addiu $a1, $a1, 0x3D78 ## $a1 = 06003D78 +/* 00400 80A492C0 3C050600 */ lui $a1, %hi(D_06003D78) ## $a1 = 06000000 +/* 00404 80A492C4 24A53D78 */ addiu $a1, $a1, %lo(D_06003D78) ## $a1 = 06003D78 /* 00408 80A492C8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0040C 80A492CC 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 00410 80A492D0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A498A8.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A498A8.s index b7a4678609..31310f6e6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A498A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A498A8.s @@ -3,19 +3,19 @@ glabel func_80A498A8 /* 009EC 80A498AC AFB00028 */ sw $s0, 0x0028($sp) /* 009F0 80A498B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 009F4 80A498B4 AFBF002C */ sw $ra, 0x002C($sp) -/* 009F8 80A498B8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 009F8 80A498B8 3C040600 */ lui $a0, %hi(D_06000544) ## $a0 = 06000000 /* 009FC 80A498BC AFA50034 */ sw $a1, 0x0034($sp) /* 00A00 80A498C0 0C028800 */ jal SkelAnime_GetFrameCount -/* 00A04 80A498C4 24840544 */ addiu $a0, $a0, 0x0544 ## $a0 = 06000544 +/* 00A04 80A498C4 24840544 */ addiu $a0, $a0, %lo(D_06000544) ## $a0 = 06000544 /* 00A08 80A498C8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00A0C 80A498CC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00A10 80A498D0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00A10 80A498D0 3C050600 */ lui $a1, %hi(D_06000544) ## $a1 = 06000000 /* 00A14 80A498D4 468021A0 */ cvt.s.w $f6, $f4 /* 00A18 80A498D8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00A1C 80A498DC 44070000 */ mfc1 $a3, $f0 /* 00A20 80A498E0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00A24 80A498E4 24A50544 */ addiu $a1, $a1, 0x0544 ## $a1 = 06000544 +/* 00A24 80A498E4 24A50544 */ addiu $a1, $a1, %lo(D_06000544) ## $a1 = 06000544 /* 00A28 80A498E8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00A2C 80A498EC E7A60010 */ swc1 $f6, 0x0010($sp) /* 00A30 80A498F0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A499BC.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A499BC.s index 7da4ed0781..ba465c60a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A499BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A499BC.s @@ -3,19 +3,19 @@ glabel func_80A499BC /* 00B00 80A499C0 AFB00028 */ sw $s0, 0x0028($sp) /* 00B04 80A499C4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00B08 80A499C8 AFBF002C */ sw $ra, 0x002C($sp) -/* 00B0C 80A499CC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00B0C 80A499CC 3C040600 */ lui $a0, %hi(D_06000838) ## $a0 = 06000000 /* 00B10 80A499D0 AFA50034 */ sw $a1, 0x0034($sp) /* 00B14 80A499D4 0C028800 */ jal SkelAnime_GetFrameCount -/* 00B18 80A499D8 24840838 */ addiu $a0, $a0, 0x0838 ## $a0 = 06000838 +/* 00B18 80A499D8 24840838 */ addiu $a0, $a0, %lo(D_06000838) ## $a0 = 06000838 /* 00B1C 80A499DC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00B20 80A499E0 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 00B24 80A499E4 44814000 */ mtc1 $at, $f8 ## $f8 = -2.00 /* 00B28 80A499E8 468021A0 */ cvt.s.w $f6, $f4 -/* 00B2C 80A499EC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00B2C 80A499EC 3C050600 */ lui $a1, %hi(D_06000838) ## $a1 = 06000000 /* 00B30 80A499F0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00B34 80A499F4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00B38 80A499F8 24A50838 */ addiu $a1, $a1, 0x0838 ## $a1 = 06000838 +/* 00B38 80A499F8 24A50838 */ addiu $a1, $a1, %lo(D_06000838) ## $a1 = 06000838 /* 00B3C 80A499FC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00B40 80A49A00 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00B44 80A49A04 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49B30.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49B30.s index efe97f7573..ab7d25dd01 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49B30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49B30.s @@ -3,18 +3,18 @@ glabel func_80A49B30 /* 00C74 80A49B34 AFB00028 */ sw $s0, 0x0028($sp) /* 00C78 80A49B38 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00C7C 80A49B3C AFBF002C */ sw $ra, 0x002C($sp) -/* 00C80 80A49B40 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00C80 80A49B40 3C040600 */ lui $a0, %hi(D_06000B78) ## $a0 = 06000000 /* 00C84 80A49B44 0C028800 */ jal SkelAnime_GetFrameCount -/* 00C88 80A49B48 24840B78 */ addiu $a0, $a0, 0x0B78 ## $a0 = 06000B78 +/* 00C88 80A49B48 24840B78 */ addiu $a0, $a0, %lo(D_06000B78) ## $a0 = 06000B78 /* 00C8C 80A49B4C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00C90 80A49B50 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 00C94 80A49B54 44814000 */ mtc1 $at, $f8 ## $f8 = -2.00 /* 00C98 80A49B58 468021A0 */ cvt.s.w $f6, $f4 -/* 00C9C 80A49B5C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00C9C 80A49B5C 3C050600 */ lui $a1, %hi(D_06000B78) ## $a1 = 06000000 /* 00CA0 80A49B60 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00CA4 80A49B64 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00CA8 80A49B68 24A50B78 */ addiu $a1, $a1, 0x0B78 ## $a1 = 06000B78 +/* 00CA8 80A49B68 24A50B78 */ addiu $a1, $a1, %lo(D_06000B78) ## $a1 = 06000B78 /* 00CAC 80A49B6C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00CB0 80A49B70 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00CB4 80A49B74 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49C94.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49C94.s index 4fac9f2628..e5b925104c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49C94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49C94.s @@ -2,17 +2,17 @@ glabel func_80A49C94 /* 00DD4 80A49C94 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00DD8 80A49C98 AFA40028 */ sw $a0, 0x0028($sp) /* 00DDC 80A49C9C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00DE0 80A49CA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00DE0 80A49CA0 3C040600 */ lui $a0, %hi(D_06000334) ## $a0 = 06000000 /* 00DE4 80A49CA4 0C028800 */ jal SkelAnime_GetFrameCount -/* 00DE8 80A49CA8 24840334 */ addiu $a0, $a0, 0x0334 ## $a0 = 06000334 +/* 00DE8 80A49CA8 24840334 */ addiu $a0, $a0, %lo(D_06000334) ## $a0 = 06000334 /* 00DEC 80A49CAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00DF0 80A49CB0 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 00DF4 80A49CB4 44814000 */ mtc1 $at, $f8 ## $f8 = -2.00 /* 00DF8 80A49CB8 468021A0 */ cvt.s.w $f6, $f4 /* 00DFC 80A49CBC 8FA40028 */ lw $a0, 0x0028($sp) -/* 00E00 80A49CC0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00E04 80A49CC4 24A50334 */ addiu $a1, $a1, 0x0334 ## $a1 = 06000334 +/* 00E00 80A49CC0 3C050600 */ lui $a1, %hi(D_06000334) ## $a1 = 06000000 +/* 00E04 80A49CC4 24A50334 */ addiu $a1, $a1, %lo(D_06000334) ## $a1 = 06000334 /* 00E08 80A49CC8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00E0C 80A49CCC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00E10 80A49CD0 E7A60010 */ swc1 $f6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49E80.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49E80.s index e7e8bf4090..24ae3a3410 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49E80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49E80.s @@ -2,10 +2,10 @@ glabel func_80A49E80 /* 00FC0 80A49E80 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00FC4 80A49E84 AFA40030 */ sw $a0, 0x0030($sp) /* 00FC8 80A49E88 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00FCC 80A49E8C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00FCC 80A49E8C 3C040600 */ lui $a0, %hi(D_06001548) ## $a0 = 06000000 /* 00FD0 80A49E90 0C028800 */ jal SkelAnime_GetFrameCount -/* 00FD4 80A49E94 24841548 */ addiu $a0, $a0, 0x1548 ## $a0 = 06001548 +/* 00FD4 80A49E94 24841548 */ addiu $a0, $a0, %lo(D_06001548) ## $a0 = 06001548 /* 00FD8 80A49E98 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00FDC 80A49E9C 2404000A */ addiu $a0, $zero, 0x000A ## $a0 = 0000000A /* 00FE0 80A49EA0 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E @@ -18,8 +18,8 @@ glabel func_80A49E80 /* 00FF8 80A49EB8 44815000 */ mtc1 $at, $f10 ## $f10 = -5.00 /* 00FFC 80A49EBC A46202CC */ sh $v0, 0x02CC($v1) ## 000002CC /* 01000 80A49EC0 C7A8002C */ lwc1 $f8, 0x002C($sp) -/* 01004 80A49EC4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01008 80A49EC8 24A51548 */ addiu $a1, $a1, 0x1548 ## $a1 = 06001548 +/* 01004 80A49EC4 3C050600 */ lui $a1, %hi(D_06001548) ## $a1 = 06000000 +/* 01008 80A49EC8 24A51548 */ addiu $a1, $a1, %lo(D_06001548) ## $a1 = 06001548 /* 0100C 80A49ECC AFA00014 */ sw $zero, 0x0014($sp) /* 01010 80A49ED0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01014 80A49ED4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F10.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F10.s index 94af787958..8847368226 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F10.s @@ -2,17 +2,17 @@ glabel func_80A49F10 /* 01050 80A49F10 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01054 80A49F14 AFA40028 */ sw $a0, 0x0028($sp) /* 01058 80A49F18 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0105C 80A49F1C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0105C 80A49F1C 3C040600 */ lui $a0, %hi(D_06003D78) ## $a0 = 06000000 /* 01060 80A49F20 0C028800 */ jal SkelAnime_GetFrameCount -/* 01064 80A49F24 24843D78 */ addiu $a0, $a0, 0x3D78 ## $a0 = 06003D78 +/* 01064 80A49F24 24843D78 */ addiu $a0, $a0, %lo(D_06003D78) ## $a0 = 06003D78 /* 01068 80A49F28 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0106C 80A49F2C 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 01070 80A49F30 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 /* 01074 80A49F34 468021A0 */ cvt.s.w $f6, $f4 /* 01078 80A49F38 8FA40028 */ lw $a0, 0x0028($sp) -/* 0107C 80A49F3C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01080 80A49F40 24A53D78 */ addiu $a1, $a1, 0x3D78 ## $a1 = 06003D78 +/* 0107C 80A49F3C 3C050600 */ lui $a1, %hi(D_06003D78) ## $a1 = 06000000 +/* 01080 80A49F40 24A53D78 */ addiu $a1, $a1, %lo(D_06003D78) ## $a1 = 06003D78 /* 01084 80A49F44 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01088 80A49F48 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 0108C 80A49F4C E7A60010 */ swc1 $f6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F94.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F94.s index 41df193669..d1115b919c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F94.s @@ -2,19 +2,19 @@ glabel func_80A49F94 /* 010D4 80A49F94 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 010D8 80A49F98 AFA40028 */ sw $a0, 0x0028($sp) /* 010DC 80A49F9C AFBF0024 */ sw $ra, 0x0024($sp) -/* 010E0 80A49FA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 010E0 80A49FA0 3C040600 */ lui $a0, %hi(D_06000E4C) ## $a0 = 06000000 /* 010E4 80A49FA4 0C028800 */ jal SkelAnime_GetFrameCount -/* 010E8 80A49FA8 24840E4C */ addiu $a0, $a0, 0x0E4C ## $a0 = 06000E4C +/* 010E8 80A49FA8 24840E4C */ addiu $a0, $a0, %lo(D_06000E4C) ## $a0 = 06000E4C /* 010EC 80A49FAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 010F0 80A49FB0 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 010F4 80A49FB4 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 /* 010F8 80A49FB8 468021A0 */ cvt.s.w $f6, $f4 /* 010FC 80A49FBC 8FA40028 */ lw $a0, 0x0028($sp) -/* 01100 80A49FC0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 01100 80A49FC0 3C050600 */ lui $a1, %hi(D_06000E4C) ## $a1 = 06000000 /* 01104 80A49FC4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 01108 80A49FC8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0110C 80A49FCC 24A50E4C */ addiu $a1, $a1, 0x0E4C ## $a1 = 06000E4C +/* 0110C 80A49FCC 24A50E4C */ addiu $a1, $a1, %lo(D_06000E4C) ## $a1 = 06000E4C /* 01110 80A49FD0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01114 80A49FD4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01118 80A49FD8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A0A8.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A0A8.s index 36795556b3..9aa00b9a77 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A0A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A0A8.s @@ -2,19 +2,19 @@ glabel func_80A4A0A8 /* 011E8 80A4A0A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 011EC 80A4A0AC AFA40028 */ sw $a0, 0x0028($sp) /* 011F0 80A4A0B0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 011F4 80A4A0B4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 011F4 80A4A0B4 3C040600 */ lui $a0, %hi(D_0600017C) ## $a0 = 06000000 /* 011F8 80A4A0B8 0C028800 */ jal SkelAnime_GetFrameCount -/* 011FC 80A4A0BC 2484017C */ addiu $a0, $a0, 0x017C ## $a0 = 0600017C +/* 011FC 80A4A0BC 2484017C */ addiu $a0, $a0, %lo(D_0600017C) ## $a0 = 0600017C /* 01200 80A4A0C0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01204 80A4A0C4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01208 80A4A0C8 8FA40028 */ lw $a0, 0x0028($sp) /* 0120C 80A4A0CC 468021A0 */ cvt.s.w $f6, $f4 -/* 01210 80A4A0D0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 01210 80A4A0D0 3C050600 */ lui $a1, %hi(D_0600017C) ## $a1 = 06000000 /* 01214 80A4A0D4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 01218 80A4A0D8 44070000 */ mfc1 $a3, $f0 /* 0121C 80A4A0DC AFAE0014 */ sw $t6, 0x0014($sp) -/* 01220 80A4A0E0 24A5017C */ addiu $a1, $a1, 0x017C ## $a1 = 0600017C +/* 01220 80A4A0E0 24A5017C */ addiu $a1, $a1, %lo(D_0600017C) ## $a1 = 0600017C /* 01224 80A4A0E4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01228 80A4A0E8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0122C 80A4A0EC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A18C.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A18C.s index 5d7bdffcd9..013400ca86 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A18C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A18C.s @@ -3,18 +3,18 @@ glabel func_80A4A18C /* 012D0 80A4A190 AFB00028 */ sw $s0, 0x0028($sp) /* 012D4 80A4A194 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 012D8 80A4A198 AFBF002C */ sw $ra, 0x002C($sp) -/* 012DC 80A4A19C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 012DC 80A4A19C 3C040600 */ lui $a0, %hi(D_06000544) ## $a0 = 06000000 /* 012E0 80A4A1A0 0C028800 */ jal SkelAnime_GetFrameCount -/* 012E4 80A4A1A4 24840544 */ addiu $a0, $a0, 0x0544 ## $a0 = 06000544 +/* 012E4 80A4A1A4 24840544 */ addiu $a0, $a0, %lo(D_06000544) ## $a0 = 06000544 /* 012E8 80A4A1A8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 012EC 80A4A1AC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 012F0 80A4A1B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 012F0 80A4A1B0 3C050600 */ lui $a1, %hi(D_06000544) ## $a1 = 06000000 /* 012F4 80A4A1B4 468021A0 */ cvt.s.w $f6, $f4 /* 012F8 80A4A1B8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 012FC 80A4A1BC 44070000 */ mfc1 $a3, $f0 /* 01300 80A4A1C0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01304 80A4A1C4 24A50544 */ addiu $a1, $a1, 0x0544 ## $a1 = 06000544 +/* 01304 80A4A1C4 24A50544 */ addiu $a1, $a1, %lo(D_06000544) ## $a1 = 06000544 /* 01308 80A4A1C8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0130C 80A4A1CC E7A60010 */ swc1 $f6, 0x0010($sp) /* 01310 80A4A1D0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s index e5aa5cdd5b..bff07f09e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s @@ -8,8 +8,8 @@ glabel func_80A4A470 /* 015C8 80A4A488 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 015CC 80A4A48C AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 /* 015D0 80A4A490 A48F02F8 */ sh $t7, 0x02F8($a0) ## 000002F8 -/* 015D4 80A4A494 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 015D8 80A4A498 24A51548 */ addiu $a1, $a1, 0x1548 ## $a1 = 06001548 +/* 015D4 80A4A494 3C050600 */ lui $a1, %hi(D_06001548) ## $a1 = 06000000 +/* 015D8 80A4A498 24A51548 */ addiu $a1, $a1, %lo(D_06001548) ## $a1 = 06001548 /* 015DC 80A4A49C AFA70018 */ sw $a3, 0x0018($sp) /* 015E0 80A4A4A0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 015E4 80A4A4A4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat 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 32e2f2059d..4ac1c11f54 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 @@ -67,8 +67,8 @@ glabel func_80A5ABFC /* 01098 80A5ACC8 0C0346A2 */ jal Matrix_NewMtx /* 0109C 80A5ACCC AFA20028 */ sw $v0, 0x0028($sp) /* 010A0 80A5ACD0 8FA30028 */ lw $v1, 0x0028($sp) -/* 010A4 80A5ACD4 3C0E0500 */ lui $t6, 0x0500 ## $t6 = 05000000 -/* 010A8 80A5ACD8 25CE6810 */ addiu $t6, $t6, 0x6810 ## $t6 = 05006810 +/* 010A4 80A5ACD4 3C0E0500 */ lui $t6, %hi(D_05006810) ## $t6 = 05000000 +/* 010A8 80A5ACD8 25CE6810 */ addiu $t6, $t6, %lo(D_05006810) ## $t6 = 05006810 /* 010AC 80A5ACDC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 010B0 80A5ACE0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 010B4 80A5ACE4 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s index e698fabf7f..1d2664966e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s @@ -115,8 +115,8 @@ glabel func_80A5AD28 /* 01274 80A5AEA4 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 /* 01278 80A5AEA8 AE220004 */ sw $v0, 0x0004($s1) ## 00000004 /* 0127C 80A5AEAC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01280 80A5AEB0 3C0E0405 */ lui $t6, 0x0405 ## $t6 = 04050000 -/* 01284 80A5AEB4 25CED4E0 */ addiu $t6, $t6, 0xD4E0 ## $t6 = 0404D4E0 +/* 01280 80A5AEB0 3C0E0405 */ lui $t6, %hi(D_0404D4E0) ## $t6 = 04050000 +/* 01284 80A5AEB4 25CED4E0 */ addiu $t6, $t6, %lo(D_0404D4E0) ## $t6 = 0404D4E0 /* 01288 80A5AEB8 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 0128C 80A5AEBC AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 01290 80A5AEC0 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 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 8a0e873971..1d974caeee 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 @@ -4,8 +4,8 @@ glabel func_80A624AC /* 071C4 80A624B4 25CE2278 */ addiu $t6, $t6, %lo(func_80A62278) ## $t6 = 80A62278 /* 071C8 80A624B8 15E00014 */ bne $t7, $zero, .L80A6250C /* 071CC 80A624BC AC8E0244 */ sw $t6, 0x0244($a0) ## 00000244 -/* 071D0 80A624C0 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 071D4 80A624C4 24422AC0 */ addiu $v0, $v0, 0x2AC0 ## $v0 = 02002AC0 +/* 071D0 80A624C0 3C020200 */ lui $v0, %hi(D_02002AC0) ## $v0 = 02000000 +/* 071D4 80A624C4 24422AC0 */ addiu $v0, $v0, %lo(D_02002AC0) ## $v0 = 02002AC0 /* 071D8 80A624C8 0002C100 */ sll $t8, $v0, 4 /* 071DC 80A624CC 0018CF02 */ srl $t9, $t8, 28 /* 071E0 80A624D0 00194080 */ sll $t0, $t9, 2 @@ -24,8 +24,8 @@ glabel func_80A624AC /* 07214 80A62504 03E00008 */ jr $ra /* 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 +/* 0721C 80A6250C 3C020200 */ lui $v0, %hi(D_02000230) ## $v0 = 02000000 +/* 07220 80A62510 24420230 */ addiu $v0, $v0, %lo(D_02000230) ## $v0 = 02000230 /* 07224 80A62514 00027100 */ sll $t6, $v0, 4 /* 07228 80A62518 000E7F02 */ srl $t7, $t6, 28 /* 0722C 80A6251C 000FC080 */ sll $t8, $t7, 2 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 5af34a1b64..4b77a5d013 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 @@ -74,8 +74,8 @@ glabel func_80A65C00 /* 0AA00 80A65CF0 14C10008 */ bne $a2, $at, .L80A65D14 /* 0AA04 80A65CF4 8FAE0054 */ lw $t6, 0x0054($sp) /* 0AA08 80A65CF8 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 0AA0C 80A65CFC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 0AA10 80A65D00 24E76530 */ addiu $a3, $a3, 0x6530 ## $a3 = 06006530 +/* 0AA0C 80A65CFC 3C070600 */ lui $a3, %hi(D_06006530) ## $a3 = 06000000 +/* 0AA10 80A65D00 24E76530 */ addiu $a3, $a3, %lo(D_06006530) ## $a3 = 06006530 /* 0AA14 80A65D04 AFA00010 */ sw $zero, 0x0010($sp) /* 0AA18 80A65D08 0C0297D8 */ jal func_800A5F60 /* 0AA1C 80A65D0C 26050160 */ addiu $a1, $s0, 0x0160 ## $a1 = 00000160 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 0ef3539c61..3816961847 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 @@ -135,8 +135,8 @@ glabel L80A700D8 .L80A7017C: /* 00BCC 80A7017C 8C680154 */ lw $t0, 0x0154($v1) ## 00000154 .L80A70180: -/* 00BD0 80A70180 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 00BD4 80A70184 273933B4 */ addiu $t9, $t9, 0x33B4 ## $t9 = 060033B4 +/* 00BD0 80A70180 3C190600 */ lui $t9, %hi(D_060033B4) ## $t9 = 06000000 +/* 00BD4 80A70184 273933B4 */ addiu $t9, $t9, %lo(D_060033B4) ## $t9 = 060033B4 /* 00BD8 80A70188 13280007 */ beq $t9, $t0, .L80A701A8 /* 00BDC 80A7018C 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C /* 00BE0 80A70190 3C0580A7 */ lui $a1, %hi(D_80A72050) ## $a1 = 80A70000 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 39537b55f6..5d33305bb1 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 @@ -8,8 +8,8 @@ glabel func_80A710F8 /* 01B60 80A71110 11C0000C */ beq $t6, $zero, .L80A71144 /* 01B64 80A71114 00000000 */ nop /* 01B68 80A71118 8C980154 */ lw $t8, 0x0154($a0) ## 00000154 -/* 01B6C 80A7111C 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 01B70 80A71120 25EF0BFC */ addiu $t7, $t7, 0x0BFC ## $t7 = 06000BFC +/* 01B6C 80A7111C 3C0F0600 */ lui $t7, %hi(D_06000BFC) ## $t7 = 06000000 +/* 01B70 80A71120 25EF0BFC */ addiu $t7, $t7, %lo(D_06000BFC) ## $t7 = 06000BFC /* 01B74 80A71124 11F8001F */ beq $t7, $t8, .L80A711A4 /* 01B78 80A71128 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01B7C 80A7112C 3C0580A7 */ lui $a1, %hi(D_80A72050) ## $a1 = 80A70000 @@ -24,8 +24,8 @@ glabel func_80A710F8 /* 01B9C 80A7114C 5100000D */ beql $t0, $zero, .L80A71184 /* 01BA0 80A71150 8CEC0154 */ lw $t4, 0x0154($a3) ## 00000154 /* 01BA4 80A71154 8CEA0154 */ lw $t2, 0x0154($a3) ## 00000154 -/* 01BA8 80A71158 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 01BAC 80A7115C 25290FE4 */ addiu $t1, $t1, 0x0FE4 ## $t1 = 06000FE4 +/* 01BA8 80A71158 3C090600 */ lui $t1, %hi(D_06000FE4) ## $t1 = 06000000 +/* 01BAC 80A7115C 25290FE4 */ addiu $t1, $t1, %lo(D_06000FE4) ## $t1 = 06000FE4 /* 01BB0 80A71160 112A0010 */ beq $t1, $t2, .L80A711A4 /* 01BB4 80A71164 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C /* 01BB8 80A71168 3C0580A7 */ lui $a1, %hi(D_80A72050) ## $a1 = 80A70000 @@ -36,8 +36,8 @@ glabel func_80A710F8 /* 01BCC 80A7117C 8FBF0014 */ lw $ra, 0x0014($sp) /* 01BD0 80A71180 8CEC0154 */ lw $t4, 0x0154($a3) ## 00000154 .L80A71184: -/* 01BD4 80A71184 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 -/* 01BD8 80A71188 256B12E8 */ addiu $t3, $t3, 0x12E8 ## $t3 = 060012E8 +/* 01BD4 80A71184 3C0B0600 */ lui $t3, %hi(D_060012E8) ## $t3 = 06000000 +/* 01BD8 80A71188 256B12E8 */ addiu $t3, $t3, %lo(D_060012E8) ## $t3 = 060012E8 /* 01BDC 80A7118C 116C0005 */ beq $t3, $t4, .L80A711A4 /* 01BE0 80A71190 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C /* 01BE4 80A71194 3C0580A7 */ lui $a1, %hi(D_80A72050) ## $a1 = 80A70000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s index c44e495c8d..6eacedc4df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s @@ -9,8 +9,8 @@ glabel func_80A7134C /* 01DA4 80A71354 AFB00020 */ sw $s0, 0x0020($sp) /* 01DA8 80A71358 AFA5003C */ sw $a1, 0x003C($sp) /* 01DAC 80A7135C 8C820154 */ lw $v0, 0x0154($a0) ## 00000154 -/* 01DB0 80A71360 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 01DB4 80A71364 25CE2160 */ addiu $t6, $t6, 0x2160 ## $t6 = 06002160 +/* 01DB0 80A71360 3C0E0600 */ lui $t6, %hi(D_06002160) ## $t6 = 06000000 +/* 01DB4 80A71364 25CE2160 */ addiu $t6, $t6, %lo(D_06002160) ## $t6 = 06002160 /* 01DB8 80A71368 15C20009 */ bne $t6, $v0, .L80A71390 /* 01DBC 80A7136C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01DC0 80A71370 848F01E8 */ lh $t7, 0x01E8($a0) ## 000001E8 @@ -22,8 +22,8 @@ glabel func_80A7134C /* 01DD8 80A71388 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 /* 01DDC 80A7138C 8E020154 */ lw $v0, 0x0154($s0) ## 00000154 .L80A71390: -/* 01DE0 80A71390 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 01DE4 80A71394 2718265C */ addiu $t8, $t8, 0x265C ## $t8 = 0600265C +/* 01DE0 80A71390 3C180600 */ lui $t8, %hi(D_0600265C) ## $t8 = 06000000 +/* 01DE4 80A71394 2718265C */ addiu $t8, $t8, %lo(D_0600265C) ## $t8 = 0600265C /* 01DE8 80A71398 17020008 */ bne $t8, $v0, .L80A713BC /* 01DEC 80A7139C 00000000 */ nop /* 01DF0 80A713A0 861901E8 */ lh $t9, 0x01E8($s0) ## 000001E8 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 8a61bf781a..e482fc4e70 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 @@ -74,8 +74,8 @@ glabel func_80A71A64 /* 025A8 80A71B58 14810008 */ bne $a0, $at, .L80A71B7C /* 025AC 80A71B5C 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 /* 025B0 80A71B60 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 025B4 80A71B64 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 -/* 025B8 80A71B68 258C5BC8 */ addiu $t4, $t4, 0x5BC8 ## $t4 = 06005BC8 +/* 025B4 80A71B64 3C0C0600 */ lui $t4, %hi(D_06005BC8) ## $t4 = 06000000 +/* 025B8 80A71B68 258C5BC8 */ addiu $t4, $t4, %lo(D_06005BC8) ## $t4 = 06005BC8 /* 025BC 80A71B6C 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 /* 025C0 80A71B70 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 /* 025C4 80A71B74 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 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 f71c20cf86..52311c3db9 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 @@ -53,12 +53,12 @@ glabel EnIn_Draw /* 027A8 80A7B758 00D8C821 */ addu $t9, $a2, $t8 /* 027AC 80A7B75C 8F290000 */ lw $t1, 0x0000($t9) ## 00000000 /* 027B0 80A7B760 00856824 */ and $t5, $a0, $a1 -/* 027B4 80A7B764 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 027B4 80A7B764 3C040600 */ lui $a0, %hi(D_060034D0) ## $a0 = 06000000 /* 027B8 80A7B768 01A95021 */ addu $t2, $t5, $t1 /* 027BC 80A7B76C 01475821 */ addu $t3, $t2, $a3 /* 027C0 80A7B770 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 /* 027C4 80A7B774 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 027C8 80A7B778 248434D0 */ addiu $a0, $a0, 0x34D0 ## $a0 = 060034D0 +/* 027C8 80A7B778 248434D0 */ addiu $a0, $a0, %lo(D_060034D0) ## $a0 = 060034D0 /* 027CC 80A7B77C 00047900 */ sll $t7, $a0, 4 /* 027D0 80A7B780 000FC702 */ srl $t8, $t7, 28 /* 027D4 80A7B784 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 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 c53d33acac..3b59d6f58f 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 @@ -38,8 +38,8 @@ glabel EnIn_Update /* 021E4 80A7B194 AFA4002C */ sw $a0, 0x002C($sp) /* 021E8 80A7B198 8E080154 */ lw $t0, 0x0154($s0) ## 00000154 -/* 021EC 80A7B19C 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 021F0 80A7B1A0 27391BE0 */ addiu $t9, $t9, 0x1BE0 ## $t9 = 06001BE0 +/* 021EC 80A7B19C 3C190600 */ lui $t9, %hi(D_06001BE0) ## $t9 = 06000000 +/* 021F0 80A7B1A0 27391BE0 */ addiu $t9, $t9, %lo(D_06001BE0) ## $t9 = 06001BE0 /* 021F4 80A7B1A4 1728000A */ bne $t9, $t0, .L80A7B1D0 /* 021F8 80A7B1A8 8FA4002C */ lw $a0, 0x002C($sp) /* 021FC 80A7B1AC 3C098016 */ lui $t1, %hi(gSaveContext+0x13fa) diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A795C8.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A795C8.s index 01236a00ad..53b67866a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A795C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A795C8.s @@ -2,15 +2,15 @@ glabel func_80A795C8 /* 00618 80A795C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0061C 80A795CC AFBF0014 */ sw $ra, 0x0014($sp) /* 00620 80A795D0 8C820154 */ lw $v0, 0x0154($a0) ## 00000154 -/* 00624 80A795D4 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 00628 80A795D8 25CE03B4 */ addiu $t6, $t6, 0x03B4 ## $t6 = 060003B4 +/* 00624 80A795D4 3C0E0600 */ lui $t6, %hi(D_060003B4) ## $t6 = 06000000 +/* 00628 80A795D8 25CE03B4 */ addiu $t6, $t6, %lo(D_060003B4) ## $t6 = 060003B4 /* 0062C 80A795DC 11C20008 */ beq $t6, $v0, .L80A79600 /* 00630 80A795E0 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 00634 80A795E4 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 00638 80A795E8 25EF1BE0 */ addiu $t7, $t7, 0x1BE0 ## $t7 = 06001BE0 +/* 00634 80A795E4 3C0F0600 */ lui $t7, %hi(D_06001BE0) ## $t7 = 06000000 +/* 00638 80A795E8 25EF1BE0 */ addiu $t7, $t7, %lo(D_06001BE0) ## $t7 = 06001BE0 /* 0063C 80A795EC 11E20004 */ beq $t7, $v0, .L80A79600 -/* 00640 80A795F0 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 -/* 00644 80A795F4 27183D60 */ addiu $t8, $t8, 0x3D60 ## $t8 = 06013D60 +/* 00640 80A795F0 3C180601 */ lui $t8, %hi(D_06013D60) ## $t8 = 06010000 +/* 00644 80A795F4 27183D60 */ addiu $t8, $t8, %lo(D_06013D60) ## $t8 = 06013D60 /* 00648 80A795F8 17020003 */ bne $t8, $v0, .L80A79608 /* 0064C 80A795FC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 .L80A79600: diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79AB4.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79AB4.s index c3e9969c4b..9d6049e5c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79AB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79AB4.s @@ -1,7 +1,7 @@ glabel func_80A79AB4 /* 00B04 80A79AB4 8C8F0154 */ lw $t7, 0x0154($a0) ## 00000154 -/* 00B08 80A79AB8 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 00B0C 80A79ABC 25CE4CA8 */ addiu $t6, $t6, 0x4CA8 ## $t6 = 06014CA8 +/* 00B08 80A79AB8 3C0E0601 */ lui $t6, %hi(D_06014CA8) ## $t6 = 06010000 +/* 00B0C 80A79ABC 25CE4CA8 */ addiu $t6, $t6, %lo(D_06014CA8) ## $t6 = 06014CA8 /* 00B10 80A79AC0 11CF0004 */ beq $t6, $t7, .L80A79AD4 /* 00B14 80A79AC4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00B18 80A79AC8 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 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 97a342c362..44f2762a59 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 @@ -44,14 +44,14 @@ glabel func_80A79FB0 /* 0104C 80A79FFC 0C00AC78 */ jal ActorShape_Init /* 01050 80A7A000 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 -/* 01054 80A7A004 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 +/* 01054 80A7A004 3C060601 */ lui $a2, %hi(D_06013B88) ## $a2 = 06010000 /* 01058 80A7A008 260F01FE */ addiu $t7, $s0, 0x01FE ## $t7 = 000001FE /* 0105C 80A7A00C 26180276 */ addiu $t8, $s0, 0x0276 ## $t8 = 00000276 /* 01060 80A7A010 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 /* 01064 80A7A014 AFB90018 */ sw $t9, 0x0018($sp) /* 01068 80A7A018 AFB80014 */ sw $t8, 0x0014($sp) /* 0106C 80A7A01C AFAF0010 */ sw $t7, 0x0010($sp) -/* 01070 80A7A020 24C63B88 */ addiu $a2, $a2, 0x3B88 ## $a2 = 06013B88 +/* 01070 80A7A020 24C63B88 */ addiu $a2, $a2, %lo(D_06013B88) ## $a2 = 06013B88 /* 01074 80A7A024 8FA40044 */ lw $a0, 0x0044($sp) /* 01078 80A7A028 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0107C 80A7A02C 0C0291BE */ jal SkelAnime_InitFlex 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 e117f50327..3c69584c23 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 @@ -9,12 +9,12 @@ glabel func_80A7A304 /* 0135C 80A7A30C AFB00028 */ sw $s0, 0x0028($sp) /* 01360 80A7A310 AFA50044 */ sw $a1, 0x0044($sp) /* 01364 80A7A314 8C820154 */ lw $v0, 0x0154($a0) ## 00000154 -/* 01368 80A7A318 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 0136C 80A7A31C 25CE5814 */ addiu $t6, $t6, 0x5814 ## $t6 = 06015814 +/* 01368 80A7A318 3C0E0601 */ lui $t6, %hi(D_06015814) ## $t6 = 06010000 +/* 0136C 80A7A31C 25CE5814 */ addiu $t6, $t6, %lo(D_06015814) ## $t6 = 06015814 /* 01370 80A7A320 11C20004 */ beq $t6, $v0, .L80A7A334 /* 01374 80A7A324 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01378 80A7A328 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 -/* 0137C 80A7A32C 25EF646C */ addiu $t7, $t7, 0x646C ## $t7 = 0601646C +/* 01378 80A7A328 3C0F0601 */ lui $t7, %hi(D_0601646C) ## $t7 = 06010000 +/* 0137C 80A7A32C 25EF646C */ addiu $t7, $t7, %lo(D_0601646C) ## $t7 = 0601646C /* 01380 80A7A330 15E2000C */ bne $t7, $v0, .L80A7A364 .L80A7A334: /* 01384 80A7A334 3C014100 */ lui $at, 0x4100 ## $at = 41000000 @@ -30,8 +30,8 @@ glabel func_80A7A304 /* 013AC 80A7A35C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 013B0 80A7A360 8E020154 */ lw $v0, 0x0154($s0) ## 00000154 .L80A7A364: -/* 013B4 80A7A364 3C180602 */ lui $t8, 0x0602 ## $t8 = 06020000 -/* 013B8 80A7A368 27188C38 */ addiu $t8, $t8, 0x8C38 ## $t8 = 06018C38 +/* 013B4 80A7A364 3C180602 */ lui $t8, %hi(D_06018C38) ## $t8 = 06020000 +/* 013B8 80A7A368 27188C38 */ addiu $t8, $t8, %lo(D_06018C38) ## $t8 = 06018C38 /* 013BC 80A7A36C 1702000A */ bne $t8, $v0, .L80A7A398 /* 013C0 80A7A370 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 013C4 80A7A374 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B570.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B570.s index 8093e74e31..8764e487d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B570.s @@ -55,13 +55,13 @@ glabel func_80A7B570 /* 02668 80A7B618 14E1000D */ bne $a3, $at, .L80A7B650 /* 0266C 80A7B61C 8FA60058 */ lw $a2, 0x0058($sp) /* 02670 80A7B620 8CCD0154 */ lw $t5, 0x0154($a2) ## 00000154 -/* 02674 80A7B624 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 -/* 02678 80A7B628 258C4CA8 */ addiu $t4, $t4, 0x4CA8 ## $t4 = 06014CA8 +/* 02674 80A7B624 3C0C0601 */ lui $t4, %hi(D_06014CA8) ## $t4 = 06010000 +/* 02678 80A7B628 258C4CA8 */ addiu $t4, $t4, %lo(D_06014CA8) ## $t4 = 06014CA8 /* 0267C 80A7B62C 158D0008 */ bne $t4, $t5, .L80A7B650 /* 02680 80A7B630 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 /* 02684 80A7B634 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 02688 80A7B638 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 0268C 80A7B63C 27187A20 */ addiu $t8, $t8, 0x7A20 ## $t8 = 06007A20 +/* 02688 80A7B638 3C180600 */ lui $t8, %hi(D_06007A20) ## $t8 = 06000000 +/* 0268C 80A7B63C 27187A20 */ addiu $t8, $t8, %lo(D_06007A20) ## $t8 = 06007A20 /* 02690 80A7B640 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 /* 02694 80A7B644 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 02698 80A7B648 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 @@ -71,13 +71,13 @@ glabel func_80A7B570 /* 026A4 80A7B654 14E1000D */ bne $a3, $at, .L80A7B68C /* 026A8 80A7B658 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC /* 026AC 80A7B65C 8CC90154 */ lw $t1, 0x0154($a2) ## 00000154 -/* 026B0 80A7B660 3C190601 */ lui $t9, 0x0601 ## $t9 = 06010000 -/* 026B4 80A7B664 27394CA8 */ addiu $t9, $t9, 0x4CA8 ## $t9 = 06014CA8 +/* 026B0 80A7B660 3C190601 */ lui $t9, %hi(D_06014CA8) ## $t9 = 06010000 +/* 026B4 80A7B664 27394CA8 */ addiu $t9, $t9, %lo(D_06014CA8) ## $t9 = 06014CA8 /* 026B8 80A7B668 17290008 */ bne $t9, $t1, .L80A7B68C /* 026BC 80A7B66C 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 /* 026C0 80A7B670 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 026C4 80A7B674 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 -/* 026C8 80A7B678 258C7BF8 */ addiu $t4, $t4, 0x7BF8 ## $t4 = 06007BF8 +/* 026C4 80A7B674 3C0C0600 */ lui $t4, %hi(D_06007BF8) ## $t4 = 06000000 +/* 026C8 80A7B678 258C7BF8 */ addiu $t4, $t4, %lo(D_06007BF8) ## $t4 = 06007BF8 /* 026CC 80A7B67C 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 /* 026D0 80A7B680 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 /* 026D4 80A7B684 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 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 604137a609..f5412126c5 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 @@ -31,20 +31,20 @@ glabel EnJj_Init /* 00074 80A87874 10000083 */ beq $zero, $zero, .L80A87A84 /* 00078 80A87878 8FBF003C */ lw $ra, 0x003C($sp) .L80A8787C: -/* 0007C 80A8787C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 00080 80A87880 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 0007C 80A8787C 3C060601 */ lui $a2, %hi(D_0600B9A8) ## $a2 = 06010000 +/* 00080 80A87880 3C070600 */ lui $a3, %hi(D_06001F4C) ## $a3 = 06000000 /* 00084 80A87884 260E01A8 */ addiu $t6, $s0, 0x01A8 ## $t6 = 000001A8 /* 00088 80A87888 260F022C */ addiu $t7, $s0, 0x022C ## $t7 = 0000022C /* 0008C 80A8788C 24180016 */ addiu $t8, $zero, 0x0016 ## $t8 = 00000016 /* 00090 80A87890 AFB80018 */ sw $t8, 0x0018($sp) /* 00094 80A87894 AFAF0014 */ sw $t7, 0x0014($sp) /* 00098 80A87898 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0009C 80A8789C 24E71F4C */ addiu $a3, $a3, 0x1F4C ## $a3 = 06001F4C -/* 000A0 80A878A0 24C6B9A8 */ addiu $a2, $a2, 0xB9A8 ## $a2 = 0600B9A8 +/* 0009C 80A8789C 24E71F4C */ addiu $a3, $a3, %lo(D_06001F4C) ## $a3 = 06001F4C +/* 000A0 80A878A0 24C6B9A8 */ addiu $a2, $a2, %lo(D_0600B9A8) ## $a2 = 0600B9A8 /* 000A4 80A878A4 0C0291BE */ jal SkelAnime_InitFlex /* 000A8 80A878A8 AFA50044 */ sw $a1, 0x0044($sp) -/* 000AC 80A878AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 000B0 80A878B0 24A51F4C */ addiu $a1, $a1, 0x1F4C ## $a1 = 06001F4C +/* 000AC 80A878AC 3C050600 */ lui $a1, %hi(D_06001F4C) ## $a1 = 06000000 +/* 000B0 80A878B0 24A51F4C */ addiu $a1, $a1, %lo(D_06001F4C) ## $a1 = 06001F4C /* 000B4 80A878B4 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 000B8 80A878B8 8FA40044 */ lw $a0, 0x0044($sp) /* 000BC 80A878BC A600030A */ sh $zero, 0x030A($s0) ## 0000030A @@ -94,8 +94,8 @@ glabel EnJj_Init /* 00160 80A87960 0C010D20 */ jal DynaPolyInfo_SetActorMove /* 00164 80A87964 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00168 80A87968 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0016C 80A8796C 24840A1C */ addiu $a0, $a0, 0x0A1C ## $a0 = 06000A1C +/* 00168 80A87968 3C040600 */ lui $a0, %hi(D_06000A1C) ## $a0 = 06000000 +/* 0016C 80A8796C 24840A1C */ addiu $a0, $a0, %lo(D_06000A1C) ## $a0 = 06000A1C /* 00170 80A87970 0C010620 */ jal DynaPolyInfo_Alloc /* 00174 80A87974 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFF4 @@ -125,8 +125,8 @@ glabel EnJj_Init /* 001C4 80A879C4 0C010D20 */ jal DynaPolyInfo_SetActorMove /* 001C8 80A879C8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 001CC 80A879CC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 001D0 80A879D0 24841830 */ addiu $a0, $a0, 0x1830 ## $a0 = 06001830 +/* 001CC 80A879CC 3C040600 */ lui $a0, %hi(D_06001830) ## $a0 = 06000000 +/* 001D0 80A879D0 24841830 */ addiu $a0, $a0, %lo(D_06001830) ## $a0 = 06001830 /* 001D4 80A879D4 0C010620 */ jal DynaPolyInfo_Alloc /* 001D8 80A879D8 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFF4 @@ -157,8 +157,8 @@ glabel EnJj_Init /* 00230 80A87A30 0C010D20 */ jal DynaPolyInfo_SetActorMove /* 00234 80A87A34 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00238 80A87A38 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 0023C 80A87A3C 2484BA8C */ addiu $a0, $a0, 0xBA8C ## $a0 = 0600BA8C +/* 00238 80A87A38 3C040601 */ lui $a0, %hi(D_0600BA8C) ## $a0 = 06010000 +/* 0023C 80A87A3C 2484BA8C */ addiu $a0, $a0, %lo(D_0600BA8C) ## $a0 = 0600BA8C /* 00240 80A87A40 0C010620 */ jal DynaPolyInfo_Alloc /* 00244 80A87A44 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFF4 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 1441441d68..8fc0f18d55 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 @@ -87,8 +87,8 @@ glabel EnKanban_Draw /* 01C40 80A93BE0 0C024F61 */ jal func_80093D84 /* 01C44 80A93BE4 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 01C48 80A93BE8 8E2702C0 */ lw $a3, 0x02C0($s1) ## 000002C0 -/* 01C4C 80A93BEC 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 -/* 01C50 80A93BF0 256B0C30 */ addiu $t3, $t3, 0x0C30 ## $t3 = 06000C30 +/* 01C4C 80A93BEC 3C0B0600 */ lui $t3, %hi(D_06000C30) ## $t3 = 06000000 +/* 01C50 80A93BF0 256B0C30 */ addiu $t3, $t3, %lo(D_06000C30) ## $t3 = 06000C30 /* 01C54 80A93BF4 24E90008 */ addiu $t1, $a3, 0x0008 ## $t1 = 00000008 /* 01C58 80A93BF8 AE2902C0 */ sw $t1, 0x02C0($s1) ## 000002C0 /* 01C5C 80A93BFC 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 @@ -283,8 +283,8 @@ glabel EnKanban_Draw /* 01F38 80A93ED8 15E1000A */ bne $t7, $at, .L80A93F04 /* 01F3C 80A93EDC 3C06DE00 */ lui $a2, 0xDE00 ## $a2 = DE000000 /* 01F40 80A93EE0 8E2702C0 */ lw $a3, 0x02C0($s1) ## 000002C0 -/* 01F44 80A93EE4 3C090404 */ lui $t1, 0x0404 ## $t1 = 04040000 -/* 01F48 80A93EE8 2529C050 */ addiu $t1, $t1, 0xC050 ## $t1 = 0403C050 +/* 01F44 80A93EE4 3C090404 */ lui $t1, %hi(D_0403C050) ## $t1 = 04040000 +/* 01F48 80A93EE8 2529C050 */ addiu $t1, $t1, %lo(D_0403C050) ## $t1 = 0403C050 /* 01F4C 80A93EEC 24F80008 */ addiu $t8, $a3, 0x0008 ## $t8 = 00000008 /* 01F50 80A93EF0 AE3802C0 */ sw $t8, 0x02C0($s1) ## 000002C0 /* 01F54 80A93EF4 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 @@ -389,8 +389,8 @@ glabel EnKanban_Draw /* 020C8 80A94068 0C0346A2 */ jal Matrix_NewMtx /* 020CC 80A9406C AFA2004C */ sw $v0, 0x004C($sp) /* 020D0 80A94070 8FA3004C */ lw $v1, 0x004C($sp) -/* 020D4 80A94074 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 -/* 020D8 80A94078 256B1630 */ addiu $t3, $t3, 0x1630 ## $t3 = 06001630 +/* 020D4 80A94074 3C0B0600 */ lui $t3, %hi(D_06001630) ## $t3 = 06000000 +/* 020D8 80A94078 256B1630 */ addiu $t3, $t3, %lo(D_06001630) ## $t3 = 06001630 /* 020DC 80A9407C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 020E0 80A94080 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 020E4 80A94084 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97D68.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97D68.s index 1f21fdd5bf..528b2412d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97D68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97D68.s @@ -8,8 +8,8 @@ glabel func_80A97D68 /* 00FD0 80A97D80 51C0000F */ beql $t6, $zero, .L80A97DC0 /* 00FD4 80A97D84 8E080154 */ lw $t0, 0x0154($s0) ## 00000154 /* 00FD8 80A97D88 8C8F0154 */ lw $t7, 0x0154($a0) ## 00000154 -/* 00FDC 80A97D8C 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 00FE0 80A97D90 27186A60 */ addiu $t8, $t8, 0x6A60 ## $t8 = 06006A60 +/* 00FDC 80A97D8C 3C180600 */ lui $t8, %hi(D_06006A60) ## $t8 = 06000000 +/* 00FE0 80A97D90 27186A60 */ addiu $t8, $t8, %lo(D_06006A60) ## $t8 = 06006A60 /* 00FE4 80A97D94 030FC826 */ xor $t9, $t8, $t7 /* 00FE8 80A97D98 2F390001 */ sltiu $t9, $t9, 0x0001 /* 00FEC 80A97D9C 17200005 */ bne $t9, $zero, .L80A97DB4 @@ -23,8 +23,8 @@ glabel func_80A97D68 /* 01008 80A97DB8 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 /* 0100C 80A97DBC 8E080154 */ lw $t0, 0x0154($s0) ## 00000154 .L80A97DC0: -/* 01010 80A97DC0 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 01014 80A97DC4 25297830 */ addiu $t1, $t1, 0x7830 ## $t1 = 06007830 +/* 01010 80A97DC0 3C090600 */ lui $t1, %hi(D_06007830) ## $t1 = 06000000 +/* 01014 80A97DC4 25297830 */ addiu $t1, $t1, %lo(D_06007830) ## $t1 = 06007830 /* 01018 80A97DC8 01285026 */ xor $t2, $t1, $t0 /* 0101C 80A97DCC 2D4A0001 */ sltiu $t2, $t2, 0x0001 /* 01020 80A97DD0 15400005 */ bne $t2, $zero, .L80A97DE8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97F70.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97F70.s index b843a237a8..4bf95e97ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97F70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97F70.s @@ -8,8 +8,8 @@ glabel func_80A97F70 /* 011D8 80A97F88 51C00014 */ beql $t6, $zero, .L80A97FDC /* 011DC 80A97F8C 8E080154 */ lw $t0, 0x0154($s0) ## 00000154 /* 011E0 80A97F90 8C8F0154 */ lw $t7, 0x0154($a0) ## 00000154 -/* 011E4 80A97F94 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 -/* 011E8 80A97F98 27188F6C */ addiu $t8, $t8, 0x8F6C ## $t8 = 06008F6C +/* 011E4 80A97F94 3C180601 */ lui $t8, %hi(D_06008F6C) ## $t8 = 06010000 +/* 011E8 80A97F98 27188F6C */ addiu $t8, $t8, %lo(D_06008F6C) ## $t8 = 06008F6C /* 011EC 80A97F9C 030FC826 */ xor $t9, $t8, $t7 /* 011F0 80A97FA0 2F390001 */ sltiu $t9, $t9, 0x0001 /* 011F4 80A97FA4 17200005 */ bne $t9, $zero, .L80A97FBC @@ -28,8 +28,8 @@ glabel func_80A97F70 /* 01224 80A97FD4 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 /* 01228 80A97FD8 8E080154 */ lw $t0, 0x0154($s0) ## 00000154 .L80A97FDC: -/* 0122C 80A97FDC 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 01230 80A97FE0 25297D94 */ addiu $t1, $t1, 0x7D94 ## $t1 = 06007D94 +/* 0122C 80A97FDC 3C090600 */ lui $t1, %hi(D_06007D94) ## $t1 = 06000000 +/* 01230 80A97FE0 25297D94 */ addiu $t1, $t1, %lo(D_06007D94) ## $t1 = 06007D94 /* 01234 80A97FE4 01285026 */ xor $t2, $t1, $t0 /* 01238 80A97FE8 2D4A0001 */ sltiu $t2, $t2, 0x0001 /* 0123C 80A97FEC 15400005 */ bne $t2, $zero, .L80A98004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98034.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98034.s index da65d06cbf..24cc182877 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98034.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98034.s @@ -8,8 +8,8 @@ glabel func_80A98034 /* 0129C 80A9804C 51C0001B */ beql $t6, $zero, .L80A980BC /* 012A0 80A98050 8E080154 */ lw $t0, 0x0154($s0) ## 00000154 /* 012A4 80A98054 8C8F0154 */ lw $t7, 0x0154($a0) ## 00000154 -/* 012A8 80A98058 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 -/* 012AC 80A9805C 27188F6C */ addiu $t8, $t8, 0x8F6C ## $t8 = 06008F6C +/* 012A8 80A98058 3C180601 */ lui $t8, %hi(D_06008F6C) ## $t8 = 06010000 +/* 012AC 80A9805C 27188F6C */ addiu $t8, $t8, %lo(D_06008F6C) ## $t8 = 06008F6C /* 012B0 80A98060 030FC826 */ xor $t9, $t8, $t7 /* 012B4 80A98064 2F390001 */ sltiu $t9, $t9, 0x0001 /* 012B8 80A98068 17200005 */ bne $t9, $zero, .L80A98080 @@ -36,8 +36,8 @@ glabel func_80A98034 /* 01304 80A980B4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01308 80A980B8 8E080154 */ lw $t0, 0x0154($s0) ## 00000154 .L80A980BC: -/* 0130C 80A980BC 3C090601 */ lui $t1, 0x0601 ## $t1 = 06010000 -/* 01310 80A980C0 2529879C */ addiu $t1, $t1, 0x879C ## $t1 = 0600879C +/* 0130C 80A980BC 3C090601 */ lui $t1, %hi(D_0600879C) ## $t1 = 06010000 +/* 01310 80A980C0 2529879C */ addiu $t1, $t1, %lo(D_0600879C) ## $t1 = 0600879C /* 01314 80A980C4 01285026 */ xor $t2, $t1, $t0 /* 01318 80A980C8 2D4A0001 */ sltiu $t2, $t2, 0x0001 /* 0131C 80A980CC 15400005 */ bne $t2, $zero, .L80A980E4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s index 5f092fbb71..01a93929e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s @@ -184,16 +184,16 @@ glabel EnMThunder_Draw /* 00F38 80A9FF18 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 /* 00F3C 80A9FF1C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00F40 80A9FF20 44D8F800 */ ctc1 $t8, $31 -/* 00F44 80A9FF24 3C190401 */ lui $t9, 0x0401 ## $t9 = 04010000 +/* 00F44 80A9FF24 3C190401 */ lui $t9, %hi(D_04012AF0) ## $t9 = 04010000 /* 00F48 80A9FF28 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 00F4C 80A9FF2C AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 00F50 80A9FF30 27392AF0 */ addiu $t9, $t9, 0x2AF0 ## $t9 = 04012AF0 +/* 00F50 80A9FF30 27392AF0 */ addiu $t9, $t9, %lo(D_04012AF0) ## $t9 = 04012AF0 /* 00F54 80A9FF34 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 /* 00F58 80A9FF38 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 00F5C 80A9FF3C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 00F60 80A9FF40 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00F64 80A9FF44 3C0F0401 */ lui $t7, 0x0401 ## $t7 = 04010000 -/* 00F68 80A9FF48 25EF2C10 */ addiu $t7, $t7, 0x2C10 ## $t7 = 04012C10 +/* 00F64 80A9FF44 3C0F0401 */ lui $t7, %hi(D_04012C10) ## $t7 = 04010000 +/* 00F68 80A9FF48 25EF2C10 */ addiu $t7, $t7, %lo(D_04012C10) ## $t7 = 04012C10 /* 00F6C 80A9FF4C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 00F70 80A9FF50 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 00F74 80A9FF54 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 @@ -253,16 +253,16 @@ glabel EnMThunder_Draw /* 0103C 80AA001C AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 01040 80AA0020 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01044 80AA0024 44D9F800 */ ctc1 $t9, $31 -/* 01048 80AA0028 3C0C0401 */ lui $t4, 0x0401 ## $t4 = 04010000 +/* 01048 80AA0028 3C0C0401 */ lui $t4, %hi(D_04012570) ## $t4 = 04010000 /* 0104C 80AA002C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 01050 80AA0030 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 01054 80AA0034 258C2570 */ addiu $t4, $t4, 0x2570 ## $t4 = 04012570 +/* 01054 80AA0034 258C2570 */ addiu $t4, $t4, %lo(D_04012570) ## $t4 = 04012570 /* 01058 80AA0038 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 /* 0105C 80AA003C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 01060 80AA0040 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 01064 80AA0044 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01068 80AA0048 3C0E0401 */ lui $t6, 0x0401 ## $t6 = 04010000 -/* 0106C 80AA004C 25CE2690 */ addiu $t6, $t6, 0x2690 ## $t6 = 04012690 +/* 01068 80AA0048 3C0E0401 */ lui $t6, %hi(D_04012690) ## $t6 = 04010000 +/* 0106C 80AA004C 25CE2690 */ addiu $t6, $t6, %lo(D_04012690) ## $t6 = 04012690 /* 01070 80AA0050 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 01074 80AA0054 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 01078 80AA0058 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 @@ -485,8 +485,8 @@ glabel EnMThunder_Draw /* 013BC 80AA039C 0C0253D0 */ jal Gfx_TwoTexScroll /* 013C0 80AA03A0 AFA20050 */ sw $v0, 0x0050($sp) /* 013C4 80AA03A4 8FA80050 */ lw $t0, 0x0050($sp) -/* 013C8 80AA03A8 3C0C0401 */ lui $t4, 0x0401 ## $t4 = 04010000 -/* 013CC 80AA03AC 258C3610 */ addiu $t4, $t4, 0x3610 ## $t4 = 04013610 +/* 013C8 80AA03A8 3C0C0401 */ lui $t4, %hi(D_04013610) ## $t4 = 04010000 +/* 013CC 80AA03AC 258C3610 */ addiu $t4, $t4, %lo(D_04013610) ## $t4 = 04013610 /* 013D0 80AA03B0 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 /* 013D4 80AA03B4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 013D8 80AA03B8 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 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 ddde48830d..7a9eaaa471 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 @@ -18,21 +18,21 @@ glabel EnMk_Init /* 00040 80AAC940 E486FFB8 */ swc1 $f6, -0x0048($a0) ## 0000006C /* 00044 80AAC944 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 -/* 00048 80AAC948 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 0004C 80AAC94C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00048 80AAC948 3C060600 */ lui $a2, %hi(D_06005DF0) ## $a2 = 06000000 +/* 0004C 80AAC94C 3C070600 */ lui $a3, %hi(D_06000D88) ## $a3 = 06000000 /* 00050 80AAC950 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 00054 80AAC954 260F022A */ addiu $t7, $s0, 0x022A ## $t7 = 0000022A /* 00058 80AAC958 2418000D */ addiu $t8, $zero, 0x000D ## $t8 = 0000000D /* 0005C 80AAC95C AFB80018 */ sw $t8, 0x0018($sp) /* 00060 80AAC960 AFAF0014 */ sw $t7, 0x0014($sp) /* 00064 80AAC964 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00068 80AAC968 24E70D88 */ addiu $a3, $a3, 0x0D88 ## $a3 = 06000D88 -/* 0006C 80AAC96C 24C65DF0 */ addiu $a2, $a2, 0x5DF0 ## $a2 = 06005DF0 +/* 00068 80AAC968 24E70D88 */ addiu $a3, $a3, %lo(D_06000D88) ## $a3 = 06000D88 +/* 0006C 80AAC96C 24C65DF0 */ addiu $a2, $a2, %lo(D_06005DF0) ## $a2 = 06005DF0 /* 00070 80AAC970 AFA50034 */ sw $a1, 0x0034($sp) /* 00074 80AAC974 0C0291BE */ jal SkelAnime_InitFlex /* 00078 80AAC978 8FA40044 */ lw $a0, 0x0044($sp) -/* 0007C 80AAC97C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00080 80AAC980 24A50D88 */ addiu $a1, $a1, 0x0D88 ## $a1 = 06000D88 +/* 0007C 80AAC97C 3C050600 */ lui $a1, %hi(D_06000D88) ## $a1 = 06000000 +/* 00080 80AAC980 24A50D88 */ addiu $a1, $a1, %lo(D_06000D88) ## $a1 = 06000D88 /* 00084 80AAC984 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00088 80AAC988 8FA40034 */ lw $a0, 0x0034($sp) /* 0008C 80AAC98C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACC04.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACC04.s index d678cca487..252ad121e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACC04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACC04.s @@ -13,18 +13,18 @@ glabel func_80AACC04 /* 00330 80AACC30 A48E0282 */ sh $t6, 0x0282($a0) ## 00000282 .L80AACC34: /* 00334 80AACC34 2718CBAC */ addiu $t8, $t8, %lo(func_80AACBAC) ## $t8 = 80AACBAC -/* 00338 80AACC38 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00338 80AACC38 3C040600 */ lui $a0, %hi(D_06000D88) ## $a0 = 06000000 /* 0033C 80AACC3C A60F0282 */ sh $t7, 0x0282($s0) ## 00000282 /* 00340 80AACC40 AE180284 */ sw $t8, 0x0284($s0) ## 00000284 /* 00344 80AACC44 0C028800 */ jal SkelAnime_GetFrameCount -/* 00348 80AACC48 24840D88 */ addiu $a0, $a0, 0x0D88 ## $a0 = 06000D88 +/* 00348 80AACC48 24840D88 */ addiu $a0, $a0, %lo(D_06000D88) ## $a0 = 06000D88 /* 0034C 80AACC4C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00350 80AACC50 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00354 80AACC54 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 00358 80AACC58 468021A0 */ cvt.s.w $f6, $f4 -/* 0035C 80AACC5C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00360 80AACC60 24A50D88 */ addiu $a1, $a1, 0x0D88 ## $a1 = 06000D88 +/* 0035C 80AACC5C 3C050600 */ lui $a1, %hi(D_06000D88) ## $a1 = 06000000 +/* 00360 80AACC60 24A50D88 */ addiu $a1, $a1, %lo(D_06000D88) ## $a1 = 06000D88 /* 00364 80AACC64 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 00368 80AACC68 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0036C 80AACC6C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACCA0.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACCA0.s index e0da6672ac..5d2392cabe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACCA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACCA0.s @@ -16,18 +16,18 @@ glabel func_80AACCA0 /* 003D8 80AACCD8 A49800B6 */ sh $t8, 0x00B6($a0) ## 000000B6 .L80AACCDC: /* 003DC 80AACCDC 2508CC04 */ addiu $t0, $t0, %lo(func_80AACC04) ## $t0 = 80AACC04 -/* 003E0 80AACCE0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 003E0 80AACCE0 3C040600 */ lui $a0, %hi(D_06000724) ## $a0 = 06000000 /* 003E4 80AACCE4 A6190282 */ sh $t9, 0x0282($s0) ## 00000282 /* 003E8 80AACCE8 AE080284 */ sw $t0, 0x0284($s0) ## 00000284 /* 003EC 80AACCEC 0C028800 */ jal SkelAnime_GetFrameCount -/* 003F0 80AACCF0 24840724 */ addiu $a0, $a0, 0x0724 ## $a0 = 06000724 +/* 003F0 80AACCF0 24840724 */ addiu $a0, $a0, %lo(D_06000724) ## $a0 = 06000724 /* 003F4 80AACCF4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 003F8 80AACCF8 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 003FC 80AACCFC 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 00400 80AACD00 468021A0 */ cvt.s.w $f6, $f4 -/* 00404 80AACD04 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00408 80AACD08 24A50724 */ addiu $a1, $a1, 0x0724 ## $a1 = 06000724 +/* 00404 80AACD04 3C050600 */ lui $a1, %hi(D_06000724) ## $a1 = 06000000 +/* 00408 80AACD08 24A50724 */ addiu $a1, $a1, %lo(D_06000724) ## $a1 = 06000724 /* 0040C 80AACD0C 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 00410 80AACD10 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00414 80AACD14 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACD48.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACD48.s index e08496e4c3..9e675b2a80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACD48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACD48.s @@ -27,18 +27,18 @@ glabel func_80AACD48 /* 004AC 80AACDAC A03803DC */ sb $t8, 0x03DC($at) ## 000103DC /* 004B0 80AACDB0 8FB90034 */ lw $t9, 0x0034($sp) /* 004B4 80AACDB4 24080010 */ addiu $t0, $zero, 0x0010 ## $t0 = 00000010 -/* 004B8 80AACDB8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 004B8 80AACDB8 3C040600 */ lui $a0, %hi(D_06000D88) ## $a0 = 06000000 /* 004BC 80AACDBC A3200693 */ sb $zero, 0x0693($t9) ## 00000693 /* 004C0 80AACDC0 A6080282 */ sh $t0, 0x0282($s0) ## 00000282 /* 004C4 80AACDC4 0C028800 */ jal SkelAnime_GetFrameCount -/* 004C8 80AACDC8 24840D88 */ addiu $a0, $a0, 0x0D88 ## $a0 = 06000D88 +/* 004C8 80AACDC8 24840D88 */ addiu $a0, $a0, %lo(D_06000D88) ## $a0 = 06000D88 /* 004CC 80AACDCC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 004D0 80AACDD0 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 004D4 80AACDD4 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 004D8 80AACDD8 468021A0 */ cvt.s.w $f6, $f4 -/* 004DC 80AACDDC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 004E0 80AACDE0 24A50D88 */ addiu $a1, $a1, 0x0D88 ## $a1 = 06000D88 +/* 004DC 80AACDDC 3C050600 */ lui $a1, %hi(D_06000D88) ## $a1 = 06000000 +/* 004E0 80AACDE0 24A50D88 */ addiu $a1, $a1, %lo(D_06000D88) ## $a1 = 06000D88 /* 004E4 80AACDE4 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 004E8 80AACDE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 004EC 80AACDEC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACE2C.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACE2C.s index 24538efba5..d26874e0a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACE2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACE2C.s @@ -15,18 +15,18 @@ glabel func_80AACE2C /* 00560 80AACE60 8FA40034 */ lw $a0, 0x0034($sp) /* 00564 80AACE64 0C042DC8 */ jal func_8010B720 /* 00568 80AACE68 24054001 */ addiu $a1, $zero, 0x4001 ## $a1 = 00004001 -/* 0056C 80AACE6C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0056C 80AACE6C 3C040600 */ lui $a0, %hi(D_06000AC0) ## $a0 = 06000000 /* 00570 80AACE70 0C028800 */ jal SkelAnime_GetFrameCount -/* 00574 80AACE74 24840AC0 */ addiu $a0, $a0, 0x0AC0 ## $a0 = 06000AC0 +/* 00574 80AACE74 24840AC0 */ addiu $a0, $a0, %lo(D_06000AC0) ## $a0 = 06000AC0 /* 00578 80AACE78 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0057C 80AACE7C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00580 80AACE80 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 00584 80AACE84 468021A0 */ cvt.s.w $f6, $f4 -/* 00588 80AACE88 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00588 80AACE88 3C050600 */ lui $a1, %hi(D_06000AC0) ## $a1 = 06000000 /* 0058C 80AACE8C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00590 80AACE90 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00594 80AACE94 24A50AC0 */ addiu $a1, $a1, 0x0AC0 ## $a1 = 06000AC0 +/* 00594 80AACE94 24A50AC0 */ addiu $a1, $a1, %lo(D_06000AC0) ## $a1 = 06000AC0 /* 00598 80AACE98 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 0059C 80AACE9C E7A60010 */ swc1 $f6, 0x0010($sp) /* 005A0 80AACEA0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACEE8.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACEE8.s index 824bb59957..48e74c7c31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACEE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACEE8.s @@ -15,16 +15,16 @@ glabel func_80AACEE8 /* 0061C 80AACF1C 8FA40034 */ lw $a0, 0x0034($sp) /* 00620 80AACF20 0C042DC8 */ jal func_8010B720 /* 00624 80AACF24 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 00628 80AACF28 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00628 80AACF28 3C040600 */ lui $a0, %hi(D_06000AC0) ## $a0 = 06000000 /* 0062C 80AACF2C 0C028800 */ jal SkelAnime_GetFrameCount -/* 00630 80AACF30 24840AC0 */ addiu $a0, $a0, 0x0AC0 ## $a0 = 06000AC0 +/* 00630 80AACF30 24840AC0 */ addiu $a0, $a0, %lo(D_06000AC0) ## $a0 = 06000AC0 /* 00634 80AACF34 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00638 80AACF38 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 0063C 80AACF3C 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 00640 80AACF40 468021A0 */ cvt.s.w $f6, $f4 -/* 00644 80AACF44 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00648 80AACF48 24A50AC0 */ addiu $a1, $a1, 0x0AC0 ## $a1 = 06000AC0 +/* 00644 80AACF44 3C050600 */ lui $a1, %hi(D_06000AC0) ## $a1 = 06000000 +/* 00648 80AACF48 24A50AC0 */ addiu $a1, $a1, %lo(D_06000AC0) ## $a1 = 06000AC0 /* 0064C 80AACF4C 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 00650 80AACF50 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00654 80AACF54 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 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 669dad04b8..c15d43fe2c 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 @@ -88,19 +88,19 @@ glabel func_80AAD080 /* 008BC 80AAD1BC 3C0D80AB */ lui $t5, %hi(func_80AACEE8) ## $t5 = 80AB0000 /* 008C0 80AAD1C0 A46C010E */ sh $t4, 0x010E($v1) ## 0000010E /* 008C4 80AAD1C4 25ADCEE8 */ addiu $t5, $t5, %lo(func_80AACEE8) ## $t5 = 80AACEE8 -/* 008C8 80AAD1C8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 008C8 80AAD1C8 3C040600 */ lui $a0, %hi(D_06000368) ## $a0 = 06000000 /* 008CC 80AAD1CC AE0D0284 */ sw $t5, 0x0284($s0) ## 00000284 /* 008D0 80AAD1D0 0C028800 */ jal SkelAnime_GetFrameCount -/* 008D4 80AAD1D4 24840368 */ addiu $a0, $a0, 0x0368 ## $a0 = 06000368 +/* 008D4 80AAD1D4 24840368 */ addiu $a0, $a0, %lo(D_06000368) ## $a0 = 06000368 /* 008D8 80AAD1D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 008DC 80AAD1DC 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 008E0 80AAD1E0 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 008E4 80AAD1E4 468021A0 */ cvt.s.w $f6, $f4 -/* 008E8 80AAD1E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 008E8 80AAD1E8 3C050600 */ lui $a1, %hi(D_06000368) ## $a1 = 06000000 /* 008EC 80AAD1EC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 008F0 80AAD1F0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 008F4 80AAD1F4 24A50368 */ addiu $a1, $a1, 0x0368 ## $a1 = 06000368 +/* 008F4 80AAD1F4 24A50368 */ addiu $a1, $a1, %lo(D_06000368) ## $a1 = 06000368 /* 008F8 80AAD1F8 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 008FC 80AAD1FC E7A60010 */ swc1 $f6, 0x0010($sp) /* 00900 80AAD200 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 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 0924af0c93..b9e450745a 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 @@ -175,8 +175,8 @@ glabel EnMm_Draw /* 01178 80AAE8E8 0C034695 */ jal Matrix_ToMtx /* 0117C 80AAE8EC 2406046B */ addiu $a2, $zero, 0x046B ## $a2 = 0000046B /* 01180 80AAE8F0 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 01184 80AAE8F4 3C0D0603 */ lui $t5, 0x0603 ## $t5 = 06030000 -/* 01188 80AAE8F8 25ADCA38 */ addiu $t5, $t5, 0xCA38 ## $t5 = 0602CA38 +/* 01184 80AAE8F4 3C0D0603 */ lui $t5, %hi(D_0602CA38) ## $t5 = 06030000 +/* 01188 80AAE8F8 25ADCA38 */ addiu $t5, $t5, %lo(D_0602CA38) ## $t5 = 0602CA38 /* 0118C 80AAE8FC 246C0008 */ addiu $t4, $v1, 0x0008 ## $t4 = 00000008 /* 01190 80AAE900 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 01194 80AAE904 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 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 ddd464cd95..62ff65a474 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 @@ -16,14 +16,14 @@ glabel EnMm_Init /* 00154 80AAD8C4 3C0741A8 */ lui $a3, 0x41A8 ## $a3 = 41A80000 /* 00158 80AAD8C8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0015C 80AAD8CC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 0015C 80AAD8CC 3C060600 */ lui $a2, %hi(D_06005E18) ## $a2 = 06000000 /* 00160 80AAD8D0 260E0260 */ addiu $t6, $s0, 0x0260 ## $t6 = 00000260 /* 00164 80AAD8D4 260F02C0 */ addiu $t7, $s0, 0x02C0 ## $t7 = 000002C0 /* 00168 80AAD8D8 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 /* 0016C 80AAD8DC AFB80018 */ sw $t8, 0x0018($sp) /* 00170 80AAD8E0 AFAF0014 */ sw $t7, 0x0014($sp) /* 00174 80AAD8E4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00178 80AAD8E8 24C65E18 */ addiu $a2, $a2, 0x5E18 ## $a2 = 06005E18 +/* 00178 80AAD8E8 24C65E18 */ addiu $a2, $a2, %lo(D_06005E18) ## $a2 = 06005E18 /* 0017C 80AAD8EC AFA50038 */ sw $a1, 0x0038($sp) /* 00180 80AAD8F0 8FA4004C */ lw $a0, 0x004C($sp) /* 00184 80AAD8F4 0C0291BE */ jal SkelAnime_InitFlex 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 180bb22422..ebfb7a8158 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 @@ -22,14 +22,14 @@ glabel EnMm2_Init /* 00220 80AAF070 3C0741A8 */ lui $a3, 0x41A8 ## $a3 = 41A80000 /* 00224 80AAF074 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00228 80AAF078 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 00228 80AAF078 3C060600 */ lui $a2, %hi(D_06005E18) ## $a2 = 06000000 /* 0022C 80AAF07C 260E01FC */ addiu $t6, $s0, 0x01FC ## $t6 = 000001FC /* 00230 80AAF080 260F025C */ addiu $t7, $s0, 0x025C ## $t7 = 0000025C /* 00234 80AAF084 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 /* 00238 80AAF088 AFB80018 */ sw $t8, 0x0018($sp) /* 0023C 80AAF08C AFAF0014 */ sw $t7, 0x0014($sp) /* 00240 80AAF090 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00244 80AAF094 24C65E18 */ addiu $a2, $a2, 0x5E18 ## $a2 = 06005E18 +/* 00244 80AAF094 24C65E18 */ addiu $a2, $a2, %lo(D_06005E18) ## $a2 = 06005E18 /* 00248 80AAF098 AFA50030 */ sw $a1, 0x0030($sp) /* 0024C 80AAF09C 8FA40044 */ lw $a0, 0x0044($sp) /* 00250 80AAF0A0 0C0291BE */ jal SkelAnime_InitFlex 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 b2ac4a1410..1a2893b20e 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 @@ -11,10 +11,10 @@ glabel EnMu_Init /* 00230 80AB0650 0C00AC78 */ jal ActorShape_Init /* 00234 80AB0654 3C074320 */ lui $a3, 0x4320 ## $a3 = 43200000 -/* 00238 80AB0658 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 0023C 80AB065C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00240 80AB0660 24E703F4 */ addiu $a3, $a3, 0x03F4 ## $a3 = 060003F4 -/* 00244 80AB0664 24C64F70 */ addiu $a2, $a2, 0x4F70 ## $a2 = 06004F70 +/* 00238 80AB0658 3C060600 */ lui $a2, %hi(D_06004F70) ## $a2 = 06000000 +/* 0023C 80AB065C 3C070600 */ lui $a3, %hi(D_060003F4) ## $a3 = 06000000 +/* 00240 80AB0660 24E703F4 */ addiu $a3, $a3, %lo(D_060003F4) ## $a3 = 060003F4 +/* 00244 80AB0664 24C64F70 */ addiu $a2, $a2, %lo(D_06004F70) ## $a2 = 06004F70 /* 00248 80AB0668 8FA40044 */ lw $a0, 0x0044($sp) /* 0024C 80AB066C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00250 80AB0670 AFA00010 */ sw $zero, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s index 2753a3a0d1..318cc37272 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s @@ -72,8 +72,8 @@ glabel EnNy_Draw /* 01244 80ABDDF4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 01248 80ABDDF8 AC450000 */ sw $a1, 0x0000($v0) ## 00000000 /* 0124C 80ABDDFC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01250 80ABDE00 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 01254 80ABDE04 27391EA8 */ addiu $t9, $t9, 0x1EA8 ## $t9 = 06001EA8 +/* 01250 80ABDE00 3C190600 */ lui $t9, %hi(D_06001EA8) ## $t9 = 06000000 +/* 01254 80ABDE04 27391EA8 */ addiu $t9, $t9, %lo(D_06001EA8) ## $t9 = 06001EA8 /* 01258 80ABDE08 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 0125C 80ABDE0C AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 01260 80ABDE10 AC460000 */ sw $a2, 0x0000($v0) ## 00000000 @@ -90,8 +90,8 @@ glabel EnNy_Draw /* 0128C 80ABDE3C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 01290 80ABDE40 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 01294 80ABDE44 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01298 80ABDE48 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 0129C 80ABDE4C 27181DD0 */ addiu $t8, $t8, 0x1DD0 ## $t8 = 06001DD0 +/* 01298 80ABDE48 3C180600 */ lui $t8, %hi(D_06001DD0) ## $t8 = 06000000 +/* 0129C 80ABDE4C 27181DD0 */ addiu $t8, $t8, %lo(D_06001DD0) ## $t8 = 06001DD0 /* 012A0 80ABDE50 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 012A4 80ABDE54 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 /* 012A8 80ABDE58 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 @@ -144,8 +144,8 @@ glabel EnNy_Draw /* 01364 80ABDF14 0C0346A2 */ jal Matrix_NewMtx /* 01368 80ABDF18 AFA2004C */ sw $v0, 0x004C($sp) /* 0136C 80ABDF1C 8FA3004C */ lw $v1, 0x004C($sp) -/* 01370 80ABDF20 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 01374 80ABDF24 25CE1FC8 */ addiu $t6, $t6, 0x1FC8 ## $t6 = 06001FC8 +/* 01370 80ABDF20 3C0E0600 */ lui $t6, %hi(D_06001FC8) ## $t6 = 06000000 +/* 01374 80ABDF24 25CE1FC8 */ addiu $t6, $t6, %lo(D_06001FC8) ## $t6 = 06001FC8 /* 01378 80ABDF28 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0137C 80ABDF2C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 01380 80ABDF30 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s index 0684e49c4d..73db6b18b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s @@ -90,8 +90,8 @@ glabel func_80ABE040 /* 01598 80ABE148 0310C023 */ subu $t8, $t8, $s0 /* 0159C 80ABE14C 0018C080 */ sll $t8, $t8, 2 /* 015A0 80ABE150 02981021 */ addu $v0, $s4, $t8 -/* 015A4 80ABE154 3C130600 */ lui $s3, 0x0600 ## $s3 = 06000000 -/* 015A8 80ABE158 26731DD0 */ addiu $s3, $s3, 0x1DD0 ## $s3 = 06001DD0 +/* 015A4 80ABE154 3C130600 */ lui $s3, %hi(D_06001DD0) ## $s3 = 06000000 +/* 015A8 80ABE158 26731DD0 */ addiu $s3, $s3, %lo(D_06001DD0) ## $s3 = 06001DD0 /* 015AC 80ABE15C C44C01F8 */ lwc1 $f12, 0x01F8($v0) ## 000001F8 /* 015B0 80ABE160 C44E01FC */ lwc1 $f14, 0x01FC($v0) ## 000001FC /* 015B4 80ABE164 8C460200 */ lw $a2, 0x0200($v0) ## 00000200 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s index 059aaa4824..8d2292b0d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s @@ -5,10 +5,10 @@ glabel func_80AC6ADC /* 03E48 80AC6AE8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 03E4C 80AC6AEC 8FA50028 */ lw $a1, 0x0028($sp) /* 03E50 80AC6AF0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03E54 80AC6AF4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 03E58 80AC6AF8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 03E5C 80AC6AFC 24E70338 */ addiu $a3, $a3, 0x0338 ## $a3 = 06000338 -/* 03E60 80AC6B00 24C69B38 */ addiu $a2, $a2, 0x9B38 ## $a2 = 06009B38 +/* 03E54 80AC6AF4 3C060601 */ lui $a2, %hi(D_06009B38) ## $a2 = 06010000 +/* 03E58 80AC6AF8 3C070600 */ lui $a3, %hi(D_06000338) ## $a3 = 06000000 +/* 03E5C 80AC6AFC 24E70338 */ addiu $a3, $a3, %lo(D_06000338) ## $a3 = 06000338 +/* 03E60 80AC6B00 24C69B38 */ addiu $a2, $a2, %lo(D_06009B38) ## $a2 = 06009B38 /* 03E64 80AC6B04 AFA00010 */ sw $zero, 0x0010($sp) /* 03E68 80AC6B08 AFA00014 */ sw $zero, 0x0014($sp) /* 03E6C 80AC6B0C AFA00018 */ sw $zero, 0x0018($sp) 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 4b23fe8afb..1b9092cd33 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 @@ -6,8 +6,8 @@ glabel func_80AC6B3C /* 03EAC 80AC6B4C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 03EB0 80AC6B50 AFBF003C */ sw $ra, 0x003C($sp) /* 03EB4 80AC6B54 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 03EB8 80AC6B58 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 03EBC 80AC6B5C 24C600F0 */ addiu $a2, $a2, 0x00F0 ## $a2 = 060000F0 +/* 03EB8 80AC6B58 3C060600 */ lui $a2, %hi(D_060000F0) ## $a2 = 06000000 +/* 03EBC 80AC6B5C 24C600F0 */ addiu $a2, $a2, %lo(D_060000F0) ## $a2 = 060000F0 /* 03EC0 80AC6B60 AFA50040 */ sw $a1, 0x0040($sp) /* 03EC4 80AC6B64 AFA00010 */ sw $zero, 0x0010($sp) /* 03EC8 80AC6B68 AFA00014 */ sw $zero, 0x0014($sp) @@ -24,19 +24,19 @@ glabel func_80AC6B3C /* 03EF4 80AC6B94 01194021 */ addu $t0, $t0, $t9 /* 03EF8 80AC6B98 8D0817B4 */ lw $t0, 0x17B4($t0) ## 000117B4 /* 03EFC 80AC6B9C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03F00 80AC6BA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 03F00 80AC6BA0 3C040600 */ lui $a0, %hi(D_060004A8) ## $a0 = 06000000 /* 03F04 80AC6BA4 01014821 */ addu $t1, $t0, $at /* 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 +/* 03F14 80AC6BB4 248404A8 */ addiu $a0, $a0, %lo(D_060004A8) ## $a0 = 060004A8 /* 03F18 80AC6BB8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03F1C 80AC6BBC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03F20 80AC6BC0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 03F20 80AC6BC0 3C050600 */ lui $a1, %hi(D_060004A8) ## $a1 = 06000000 /* 03F24 80AC6BC4 468021A0 */ cvt.s.w $f6, $f4 /* 03F28 80AC6BC8 44070000 */ mfc1 $a3, $f0 -/* 03F2C 80AC6BCC 24A504A8 */ addiu $a1, $a1, 0x04A8 ## $a1 = 060004A8 +/* 03F2C 80AC6BCC 24A504A8 */ addiu $a1, $a1, %lo(D_060004A8) ## $a1 = 060004A8 /* 03F30 80AC6BD0 8FA40040 */ lw $a0, 0x0040($sp) /* 03F34 80AC6BD4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03F38 80AC6BD8 AFA00014 */ sw $zero, 0x0014($sp) 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 bd2469f123..dc9e1c49ab 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 @@ -5,10 +5,10 @@ glabel func_80AC6C54 /* 03FC0 80AC6C60 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 03FC4 80AC6C64 8FA50030 */ lw $a1, 0x0030($sp) /* 03FC8 80AC6C68 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03FCC 80AC6C6C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 +/* 03FCC 80AC6C6C 3C060601 */ lui $a2, %hi(D_0600FEF0) ## $a2 = 06010000 /* 03FD0 80AC6C70 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C /* 03FD4 80AC6C74 AFA50028 */ sw $a1, 0x0028($sp) -/* 03FD8 80AC6C78 24C6FEF0 */ addiu $a2, $a2, 0xFEF0 ## $a2 = 0600FEF0 +/* 03FD8 80AC6C78 24C6FEF0 */ addiu $a2, $a2, %lo(D_0600FEF0) ## $a2 = 0600FEF0 /* 03FDC 80AC6C7C AFA00010 */ sw $zero, 0x0010($sp) /* 03FE0 80AC6C80 AFA00014 */ sw $zero, 0x0014($sp) /* 03FE4 80AC6C84 AFA00018 */ sw $zero, 0x0018($sp) @@ -19,14 +19,14 @@ glabel func_80AC6C54 /* 03FF8 80AC6C98 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 /* 03FFC 80AC6C9C 81F801EA */ lb $t8, 0x01EA($t7) ## 000001EA /* 04000 80AC6CA0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 04004 80AC6CA4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 04004 80AC6CA4 3C040600 */ lui $a0, %hi(D_060000FC) ## $a0 = 06000000 /* 04008 80AC6CA8 0018C900 */ sll $t9, $t8, 4 /* 0400C 80AC6CAC 0338C821 */ addu $t9, $t9, $t8 /* 04010 80AC6CB0 0019C880 */ sll $t9, $t9, 2 /* 04014 80AC6CB4 01D94021 */ addu $t0, $t6, $t9 /* 04018 80AC6CB8 01284821 */ addu $t1, $t1, $t0 /* 0401C 80AC6CBC 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 -/* 04020 80AC6CC0 248400FC */ addiu $a0, $a0, 0x00FC ## $a0 = 060000FC +/* 04020 80AC6CC0 248400FC */ addiu $a0, $a0, %lo(D_060000FC) ## $a0 = 060000FC /* 04024 80AC6CC4 01215021 */ addu $t2, $t1, $at /* 04028 80AC6CC8 3C018016 */ lui $at, %hi(gSegments+0x18) /* 0402C 80AC6CCC 0C028800 */ jal SkelAnime_GetFrameCount @@ -34,10 +34,10 @@ glabel func_80AC6C54 /* 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 +/* 0403C 80AC6CDC 3C050600 */ lui $a1, %hi(D_060000FC) ## $a1 = 06000000 /* 04040 80AC6CE0 468021A0 */ cvt.s.w $f6, $f4 /* 04044 80AC6CE4 44070000 */ mfc1 $a3, $f0 -/* 04048 80AC6CE8 24A500FC */ addiu $a1, $a1, 0x00FC ## $a1 = 060000FC +/* 04048 80AC6CE8 24A500FC */ addiu $a1, $a1, %lo(D_060000FC) ## $a1 = 060000FC /* 0404C 80AC6CEC 8FA40028 */ lw $a0, 0x0028($sp) /* 04050 80AC6CF0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04054 80AC6CF4 AFA00014 */ sw $zero, 0x0014($sp) 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 869ab4ad20..2ade278378 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 @@ -5,10 +5,10 @@ glabel func_80AC6D30 /* 0409C 80AC6D3C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 040A0 80AC6D40 8FA50030 */ lw $a1, 0x0030($sp) /* 040A4 80AC6D44 AFBF0024 */ sw $ra, 0x0024($sp) -/* 040A8 80AC6D48 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 +/* 040A8 80AC6D48 3C060601 */ lui $a2, %hi(D_0600BFA8) ## $a2 = 06010000 /* 040AC 80AC6D4C 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C /* 040B0 80AC6D50 AFA50028 */ sw $a1, 0x0028($sp) -/* 040B4 80AC6D54 24C6BFA8 */ addiu $a2, $a2, 0xBFA8 ## $a2 = 0600BFA8 +/* 040B4 80AC6D54 24C6BFA8 */ addiu $a2, $a2, %lo(D_0600BFA8) ## $a2 = 0600BFA8 /* 040B8 80AC6D58 AFA00010 */ sw $zero, 0x0010($sp) /* 040BC 80AC6D5C AFA00014 */ sw $zero, 0x0014($sp) /* 040C0 80AC6D60 AFA00018 */ sw $zero, 0x0018($sp) @@ -19,14 +19,14 @@ glabel func_80AC6D30 /* 040D4 80AC6D74 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 /* 040D8 80AC6D78 81F801EA */ lb $t8, 0x01EA($t7) ## 000001EA /* 040DC 80AC6D7C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 040E0 80AC6D80 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 040E0 80AC6D80 3C040600 */ lui $a0, %hi(D_0600078C) ## $a0 = 06000000 /* 040E4 80AC6D84 0018C900 */ sll $t9, $t8, 4 /* 040E8 80AC6D88 0338C821 */ addu $t9, $t9, $t8 /* 040EC 80AC6D8C 0019C880 */ sll $t9, $t9, 2 /* 040F0 80AC6D90 01D94021 */ addu $t0, $t6, $t9 /* 040F4 80AC6D94 01284821 */ addu $t1, $t1, $t0 /* 040F8 80AC6D98 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 -/* 040FC 80AC6D9C 2484078C */ addiu $a0, $a0, 0x078C ## $a0 = 0600078C +/* 040FC 80AC6D9C 2484078C */ addiu $a0, $a0, %lo(D_0600078C) ## $a0 = 0600078C /* 04100 80AC6DA0 01215021 */ addu $t2, $t1, $at /* 04104 80AC6DA4 3C018016 */ lui $at, %hi(gSegments+0x18) /* 04108 80AC6DA8 0C028800 */ jal SkelAnime_GetFrameCount @@ -34,10 +34,10 @@ glabel func_80AC6D30 /* 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 +/* 04118 80AC6DB8 3C050600 */ lui $a1, %hi(D_0600078C) ## $a1 = 06000000 /* 0411C 80AC6DBC 468021A0 */ cvt.s.w $f6, $f4 /* 04120 80AC6DC0 44070000 */ mfc1 $a3, $f0 -/* 04124 80AC6DC4 24A5078C */ addiu $a1, $a1, 0x078C ## $a1 = 0600078C +/* 04124 80AC6DC4 24A5078C */ addiu $a1, $a1, %lo(D_0600078C) ## $a1 = 0600078C /* 04128 80AC6DC8 8FA40028 */ lw $a0, 0x0028($sp) /* 0412C 80AC6DCC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04130 80AC6DD0 AFA00014 */ sw $zero, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s index 66b7b5b8db..ecc6e2e07e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s @@ -5,10 +5,10 @@ glabel func_80AC6E0C /* 04178 80AC6E18 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0417C 80AC6E1C 8FA50028 */ lw $a1, 0x0028($sp) /* 04180 80AC6E20 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04184 80AC6E24 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 04188 80AC6E28 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 0418C 80AC6E2C 24E702E4 */ addiu $a3, $a3, 0x02E4 ## $a3 = 060002E4 -/* 04190 80AC6E30 24C64258 */ addiu $a2, $a2, 0x4258 ## $a2 = 06004258 +/* 04184 80AC6E24 3C060600 */ lui $a2, %hi(D_06004258) ## $a2 = 06000000 +/* 04188 80AC6E28 3C070600 */ lui $a3, %hi(D_060002E4) ## $a3 = 06000000 +/* 0418C 80AC6E2C 24E702E4 */ addiu $a3, $a3, %lo(D_060002E4) ## $a3 = 060002E4 +/* 04190 80AC6E30 24C64258 */ addiu $a2, $a2, %lo(D_06004258) ## $a2 = 06004258 /* 04194 80AC6E34 AFA00010 */ sw $zero, 0x0010($sp) /* 04198 80AC6E38 AFA00014 */ sw $zero, 0x0014($sp) /* 0419C 80AC6E3C AFA00018 */ sw $zero, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s index 99311497b0..906ae26cdf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s @@ -5,10 +5,10 @@ glabel func_80AC6E6C /* 041D8 80AC6E78 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 041DC 80AC6E7C 8FA50028 */ lw $a1, 0x0028($sp) /* 041E0 80AC6E80 AFBF0024 */ sw $ra, 0x0024($sp) -/* 041E4 80AC6E84 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 041E8 80AC6E88 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 041EC 80AC6E8C 24E702E4 */ addiu $a3, $a3, 0x02E4 ## $a3 = 060002E4 -/* 041F0 80AC6E90 24C64658 */ addiu $a2, $a2, 0x4658 ## $a2 = 06004658 +/* 041E4 80AC6E84 3C060600 */ lui $a2, %hi(D_06004658) ## $a2 = 06000000 +/* 041E8 80AC6E88 3C070600 */ lui $a3, %hi(D_060002E4) ## $a3 = 06000000 +/* 041EC 80AC6E8C 24E702E4 */ addiu $a3, $a3, %lo(D_060002E4) ## $a3 = 060002E4 +/* 041F0 80AC6E90 24C64658 */ addiu $a2, $a2, %lo(D_06004658) ## $a2 = 06004658 /* 041F4 80AC6E94 AFA00010 */ sw $zero, 0x0010($sp) /* 041F8 80AC6E98 AFA00014 */ sw $zero, 0x0014($sp) /* 041FC 80AC6E9C AFA00018 */ sw $zero, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s index ba66069411..bdba2cfb4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s @@ -5,10 +5,10 @@ glabel func_80AC6ECC /* 04238 80AC6ED8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0423C 80AC6EDC 8FA50028 */ lw $a1, 0x0028($sp) /* 04240 80AC6EE0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04244 80AC6EE4 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 04248 80AC6EE8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 0424C 80AC6EEC 24E7065C */ addiu $a3, $a3, 0x065C ## $a3 = 0600065C -/* 04250 80AC6EF0 24C64868 */ addiu $a2, $a2, 0x4868 ## $a2 = 06004868 +/* 04244 80AC6EE4 3C060600 */ lui $a2, %hi(D_06004868) ## $a2 = 06000000 +/* 04248 80AC6EE8 3C070600 */ lui $a3, %hi(D_0600065C) ## $a3 = 06000000 +/* 0424C 80AC6EEC 24E7065C */ addiu $a3, $a3, %lo(D_0600065C) ## $a3 = 0600065C +/* 04250 80AC6EF0 24C64868 */ addiu $a2, $a2, %lo(D_06004868) ## $a2 = 06004868 /* 04254 80AC6EF4 AFA00010 */ sw $zero, 0x0010($sp) /* 04258 80AC6EF8 AFA00014 */ sw $zero, 0x0014($sp) /* 0425C 80AC6EFC AFA00018 */ sw $zero, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s index 3c3e7a6b4f..73a25c3f17 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s @@ -54,8 +54,8 @@ glabel func_80AC7528 /* 04930 80AC75D0 016E6025 */ or $t4, $t3, $t6 ## $t4 = 00000000 /* 04934 80AC75D4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 04938 80AC75D8 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 0493C 80AC75DC 3C090401 */ lui $t1, 0x0401 ## $t1 = 04010000 -/* 04940 80AC75E0 2529CDC0 */ addiu $t1, $t1, 0xCDC0 ## $t1 = 0400CDC0 +/* 0493C 80AC75DC 3C090401 */ lui $t1, %hi(D_0400CDC0) ## $t1 = 04010000 +/* 04940 80AC75E0 2529CDC0 */ addiu $t1, $t1, %lo(D_0400CDC0) ## $t1 = 0400CDC0 /* 04944 80AC75E4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 04948 80AC75E8 AD0F02B0 */ sw $t7, 0x02B0($t0) ## 000002B0 /* 0494C 80AC75EC 3C19FD70 */ lui $t9, 0xFD70 ## $t9 = FD700000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s index 8d3dc2fa1e..7a77ce1503 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s @@ -47,8 +47,8 @@ glabel func_80AC79C8 /* 04DB0 80AC7A50 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 04DB4 80AC7A54 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 04DB8 80AC7A58 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04DBC 80AC7A5C 3C180401 */ lui $t8, 0x0401 ## $t8 = 04010000 -/* 04DC0 80AC7A60 2718CF40 */ addiu $t8, $t8, 0xCF40 ## $t8 = 0400CF40 +/* 04DBC 80AC7A5C 3C180401 */ lui $t8, %hi(D_0400CF40) ## $t8 = 04010000 +/* 04DC0 80AC7A60 2718CF40 */ addiu $t8, $t8, %lo(D_0400CF40) ## $t8 = 0400CF40 /* 04DC4 80AC7A64 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 04DC8 80AC7A68 AD0E02B0 */ sw $t6, 0x02B0($t0) ## 000002B0 /* 04DCC 80AC7A6C 3C0FFD70 */ lui $t7, 0xFD70 ## $t7 = FD700000 @@ -151,8 +151,8 @@ glabel func_80AC79C8 /* 04F4C 80AC7BEC 8FA80094 */ lw $t0, 0x0094($sp) /* 04F50 80AC7BF0 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 .L80AC7BF4: -/* 04F54 80AC7BF4 3C0C0401 */ lui $t4, 0x0401 ## $t4 = 04010000 -/* 04F58 80AC7BF8 258CCE40 */ addiu $t4, $t4, 0xCE40 ## $t4 = 0400CE40 +/* 04F54 80AC7BF4 3C0C0401 */ lui $t4, %hi(D_0400CE40) ## $t4 = 04010000 +/* 04F58 80AC7BF8 258CCE40 */ addiu $t4, $t4, %lo(D_0400CE40) ## $t4 = 0400CE40 /* 04F5C 80AC7BFC 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 04F60 80AC7C00 AD0A02B0 */ sw $t2, 0x02B0($t0) ## 000002B0 /* 04F64 80AC7C04 3C0BFD70 */ lui $t3, 0xFD70 ## $t3 = FD700000 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 f9370461a2..f4f65756a7 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 @@ -43,8 +43,8 @@ glabel func_80AC7ED0 /* 052AC 80AC7F4C 012B6021 */ addu $t4, $t1, $t3 /* 052B0 80AC7F50 01866821 */ addu $t5, $t4, $a2 /* 052B4 80AC7F54 8DAE17B4 */ lw $t6, 0x17B4($t5) ## 000017B4 -/* 052B8 80AC7F58 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 052BC 80AC7F5C 25AD2820 */ addiu $t5, $t5, 0x2820 ## $t5 = 06002820 +/* 052B8 80AC7F58 3C0D0600 */ lui $t5, %hi(D_06002820) ## $t5 = 06000000 +/* 052BC 80AC7F5C 25AD2820 */ addiu $t5, $t5, %lo(D_06002820) ## $t5 = 06002820 /* 052C0 80AC7F60 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 052C4 80AC7F64 80AF01E9 */ lb $t7, 0x01E9($a1) ## 000001E9 /* 052C8 80AC7F68 8FAE0048 */ lw $t6, 0x0048($sp) 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 aeacc25be9..bbd177e691 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 @@ -47,12 +47,12 @@ glabel func_80AC8244 /* 05630 80AC82D0 00CC6821 */ addu $t5, $a2, $t4 /* 05634 80AC82D4 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000 /* 05638 80AC82D8 00854824 */ and $t1, $a0, $a1 -/* 0563C 80AC82DC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 0563C 80AC82DC 3C040601 */ lui $a0, %hi(D_0600DE80) ## $a0 = 06010000 /* 05640 80AC82E0 012E7821 */ addu $t7, $t1, $t6 /* 05644 80AC82E4 01E7C021 */ addu $t8, $t7, $a3 /* 05648 80AC82E8 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 0564C 80AC82EC 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 05650 80AC82F0 2484DE80 */ addiu $a0, $a0, 0xDE80 ## $a0 = 0600DE80 +/* 05650 80AC82F0 2484DE80 */ addiu $a0, $a0, %lo(D_0600DE80) ## $a0 = 0600DE80 /* 05654 80AC82F4 00045900 */ sll $t3, $a0, 4 /* 05658 80AC82F8 000B6702 */ srl $t4, $t3, 28 /* 0565C 80AC82FC 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 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 17620c226a..53543e9161 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 @@ -77,30 +77,30 @@ glabel EnOwl_Init /* 00030 80AC9F50 0C00AC78 */ jal ActorShape_Init /* 00034 80AC9F54 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 -/* 00038 80AC9F58 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 0003C 80AC9F5C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00038 80AC9F58 3C060601 */ lui $a2, %hi(D_0600C0E8) ## $a2 = 06010000 +/* 0003C 80AC9F5C 3C070600 */ lui $a3, %hi(D_060015CC) ## $a3 = 06000000 /* 00040 80AC9F60 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 00044 80AC9F64 260F025A */ addiu $t7, $s0, 0x025A ## $t7 = 0000025A /* 00048 80AC9F68 24180015 */ addiu $t8, $zero, 0x0015 ## $t8 = 00000015 /* 0004C 80AC9F6C AFB80018 */ sw $t8, 0x0018($sp) /* 00050 80AC9F70 AFAF0014 */ sw $t7, 0x0014($sp) /* 00054 80AC9F74 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00058 80AC9F78 24E715CC */ addiu $a3, $a3, 0x15CC ## $a3 = 060015CC -/* 0005C 80AC9F7C 24C6C0E8 */ addiu $a2, $a2, 0xC0E8 ## $a2 = 0600C0E8 +/* 00058 80AC9F78 24E715CC */ addiu $a3, $a3, %lo(D_060015CC) ## $a3 = 060015CC +/* 0005C 80AC9F7C 24C6C0E8 */ addiu $a2, $a2, %lo(D_0600C0E8) ## $a2 = 0600C0E8 /* 00060 80AC9F80 8FA40054 */ lw $a0, 0x0054($sp) /* 00064 80AC9F84 0C0291BE */ jal SkelAnime_InitFlex /* 00068 80AC9F88 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 0006C 80AC9F8C 260502D8 */ addiu $a1, $s0, 0x02D8 ## $a1 = 000002D8 -/* 00070 80AC9F90 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 00074 80AC9F94 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 +/* 00070 80AC9F90 3C060601 */ lui $a2, %hi(D_060100B0) ## $a2 = 06010000 +/* 00074 80AC9F94 3C070601 */ lui $a3, %hi(D_0600C8A0) ## $a3 = 06010000 /* 00078 80AC9F98 2619031C */ addiu $t9, $s0, 0x031C ## $t9 = 0000031C /* 0007C 80AC9F9C 2608037C */ addiu $t0, $s0, 0x037C ## $t0 = 0000037C /* 00080 80AC9FA0 24090010 */ addiu $t1, $zero, 0x0010 ## $t1 = 00000010 /* 00084 80AC9FA4 AFA90018 */ sw $t1, 0x0018($sp) /* 00088 80AC9FA8 AFA80014 */ sw $t0, 0x0014($sp) /* 0008C 80AC9FAC AFB90010 */ sw $t9, 0x0010($sp) -/* 00090 80AC9FB0 24E7C8A0 */ addiu $a3, $a3, 0xC8A0 ## $a3 = 0600C8A0 -/* 00094 80AC9FB4 24C600B0 */ addiu $a2, $a2, 0x00B0 ## $a2 = 060100B0 +/* 00090 80AC9FB0 24E7C8A0 */ addiu $a3, $a3, %lo(D_0600C8A0) ## $a3 = 0600C8A0 +/* 00094 80AC9FB4 24C600B0 */ addiu $a2, $a2, %lo(D_060100B0) ## $a2 = 060100B0 /* 00098 80AC9FB8 AFA50034 */ sw $a1, 0x0034($sp) /* 0009C 80AC9FBC 0C0291BE */ jal SkelAnime_InitFlex /* 000A0 80AC9FC0 8FA40054 */ lw $a0, 0x0054($sp) @@ -126,8 +126,8 @@ glabel EnOwl_Init /* 000E8 80ACA008 E606004C */ swc1 $f6, 0x004C($s0) ## 0000004C /* 000EC 80ACA00C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 000F0 80ACA010 3C0580AD */ lui $a1, %hi(func_80ACBA24) ## $a1 = 80AD0000 -/* 000F4 80ACA014 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 -/* 000F8 80ACA018 256BC8A0 */ addiu $t3, $t3, 0xC8A0 ## $t3 = 0600C8A0 +/* 000F4 80ACA014 3C0B0601 */ lui $t3, %hi(D_0600C8A0) ## $t3 = 06010000 +/* 000F8 80ACA018 256BC8A0 */ addiu $t3, $t3, %lo(D_0600C8A0) ## $t3 = 0600C8A0 /* 000FC 80ACA01C 24A5BA24 */ addiu $a1, $a1, %lo(func_80ACBA24) ## $a1 = 80ACBA24 /* 00100 80ACA020 3C0680AD */ lui $a2, %hi(func_80ACC540) ## $a2 = 80AD0000 /* 00104 80ACA024 24C6C540 */ addiu $a2, $a2, %lo(func_80ACC540) ## $a2 = 80ACC540 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s index 819a0402a3..bd011c74c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s @@ -76,8 +76,8 @@ glabel EnOwl_Update /* 0284C 80ACC76C 50400031 */ beql $v0, $zero, .L80ACC834 /* 02850 80ACC770 8E0D0134 */ lw $t5, 0x0134($s0) ## 00000134 /* 02854 80ACC774 8E0201A0 */ lw $v0, 0x01A0($s0) ## 000001A0 -/* 02858 80ACC778 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 -/* 0285C 80ACC77C 256B1168 */ addiu $t3, $t3, 0x1168 ## $t3 = 06001168 +/* 02858 80ACC778 3C0B0600 */ lui $t3, %hi(D_06001168) ## $t3 = 06000000 +/* 0285C 80ACC77C 256B1168 */ addiu $t3, $t3, %lo(D_06001168) ## $t3 = 06001168 /* 02860 80ACC780 1562001F */ bne $t3, $v0, .L80ACC800 /* 02864 80ACC784 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 02868 80ACC788 C60001B0 */ lwc1 $f0, 0x01B0($s0) ## 000001B0 @@ -111,8 +111,8 @@ glabel EnOwl_Update /* 028D8 80ACC7F8 00000000 */ nop /* 028DC 80ACC7FC 45010009 */ bc1t .L80ACC824 .L80ACC800: -/* 028E0 80ACC800 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 -/* 028E4 80ACC804 258C15CC */ addiu $t4, $t4, 0x15CC ## $t4 = 060015CC +/* 028E0 80ACC800 3C0C0600 */ lui $t4, %hi(D_060015CC) ## $t4 = 06000000 +/* 028E4 80ACC804 258C15CC */ addiu $t4, $t4, %lo(D_060015CC) ## $t4 = 060015CC /* 028E8 80ACC808 15820009 */ bne $t4, $v0, .L80ACC830 /* 028EC 80ACC80C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 028F0 80ACC810 44819000 */ mtc1 $at, $f18 ## $f18 = 4.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA5C8.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA5C8.s index b09751954c..77f2a49219 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA5C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA5C8.s @@ -1,9 +1,9 @@ glabel func_80ACA5C8 /* 006A8 80ACA5C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 006AC 80ACA5CC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 006B0 80ACA5D0 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 +/* 006B0 80ACA5D0 3C0E0601 */ lui $t6, %hi(D_0600C684) ## $t6 = 06010000 /* 006B4 80ACA5D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 006B8 80ACA5D8 25CEC684 */ addiu $t6, $t6, 0xC684 ## $t6 = 0600C684 +/* 006B8 80ACA5D8 25CEC684 */ addiu $t6, $t6, %lo(D_0600C684) ## $t6 = 0600C684 /* 006BC 80ACA5DC 3C0580AD */ lui $a1, %hi(func_80ACBEA0) ## $a1 = 80AD0000 /* 006C0 80ACA5E0 3C0680AD */ lui $a2, %hi(func_80ACC540) ## $a2 = 80AD0000 /* 006C4 80ACA5E4 24C6C540 */ addiu $a2, $a2, %lo(func_80ACC540) ## $a2 = 80ACC540 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBAB8.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBAB8.s index 50b53da426..90c1eda0b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBAB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBAB8.s @@ -27,8 +27,8 @@ glabel func_80ACBAB8 /* 01BD8 80ACBAF8 00000000 */ nop glabel L80ACBAFC /* 01BDC 80ACBAFC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01BE0 80ACBB00 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 01BE4 80ACBB04 271815CC */ addiu $t8, $t8, 0x15CC ## $t8 = 060015CC +/* 01BE0 80ACBB00 3C180600 */ lui $t8, %hi(D_060015CC) ## $t8 = 06000000 +/* 01BE4 80ACBB04 271815CC */ addiu $t8, $t8, %lo(D_060015CC) ## $t8 = 060015CC /* 01BE8 80ACBB08 3C0580AD */ lui $a1, %hi(func_80ACB904) ## $a1 = 80AD0000 /* 01BEC 80ACBB0C 3C0680AD */ lui $a2, %hi(func_80ACC540) ## $a2 = 80AD0000 /* 01BF0 80ACBB10 24C6C540 */ addiu $a2, $a2, %lo(func_80ACC540) ## $a2 = 80ACC540 @@ -45,9 +45,9 @@ glabel L80ACBB38 /* 01C18 80ACBB38 3C0880AD */ lui $t0, %hi(EnOwl_Draw) ## $t0 = 80AD0000 /* 01C1C 80ACBB3C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01C20 80ACBB40 2508CFB8 */ addiu $t0, $t0, %lo(EnOwl_Draw) ## $t0 = 80ACCFB8 -/* 01C24 80ACBB44 3C090601 */ lui $t1, 0x0601 ## $t1 = 06010000 +/* 01C24 80ACBB44 3C090601 */ lui $t1, %hi(D_0600C8A0) ## $t1 = 06010000 /* 01C28 80ACBB48 AE080134 */ sw $t0, 0x0134($s0) ## 00000134 -/* 01C2C 80ACBB4C 2529C8A0 */ addiu $t1, $t1, 0xC8A0 ## $t1 = 0600C8A0 +/* 01C2C 80ACBB4C 2529C8A0 */ addiu $t1, $t1, %lo(D_0600C8A0) ## $t1 = 0600C8A0 /* 01C30 80ACBB50 3C0580AD */ lui $a1, %hi(func_80ACBA24) ## $a1 = 80AD0000 /* 01C34 80ACBB54 3C0680AD */ lui $a2, %hi(func_80ACC540) ## $a2 = 80AD0000 /* 01C38 80ACBB58 24C6C540 */ addiu $a2, $a2, %lo(func_80ACC540) ## $a2 = 80ACC540 @@ -64,9 +64,9 @@ glabel L80ACBB80 /* 01C60 80ACBB80 3C0B80AD */ lui $t3, %hi(EnOwl_Draw) ## $t3 = 80AD0000 /* 01C64 80ACBB84 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 01C68 80ACBB88 256BCFB8 */ addiu $t3, $t3, %lo(EnOwl_Draw) ## $t3 = 80ACCFB8 -/* 01C6C 80ACBB8C 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 +/* 01C6C 80ACBB8C 3C0C0600 */ lui $t4, %hi(D_060015CC) ## $t4 = 06000000 /* 01C70 80ACBB90 AE0B0134 */ sw $t3, 0x0134($s0) ## 00000134 -/* 01C74 80ACBB94 258C15CC */ addiu $t4, $t4, 0x15CC ## $t4 = 060015CC +/* 01C74 80ACBB94 258C15CC */ addiu $t4, $t4, %lo(D_060015CC) ## $t4 = 060015CC /* 01C78 80ACBB98 3C0580AD */ lui $a1, %hi(func_80ACB994) ## $a1 = 80AD0000 /* 01C7C 80ACBB9C 3C0680AD */ lui $a2, %hi(func_80ACC540) ## $a2 = 80AD0000 /* 01C80 80ACBBA0 24C6C540 */ addiu $a2, $a2, %lo(func_80ACC540) ## $a2 = 80ACC540 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBD4C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBD4C.s index c33648b605..2936262098 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBD4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBD4C.s @@ -58,8 +58,8 @@ glabel func_80ACBD4C .L80ACBE20: /* 01F00 80ACBE20 960203FC */ lhu $v0, 0x03FC($s0) ## 000003FC .L80ACBE24: -/* 01F04 80ACBE24 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 01F08 80ACBE28 273915CC */ addiu $t9, $t9, 0x15CC ## $t9 = 060015CC +/* 01F04 80ACBE24 3C190600 */ lui $t9, %hi(D_060015CC) ## $t9 = 06000000 +/* 01F08 80ACBE28 273915CC */ addiu $t9, $t9, %lo(D_060015CC) ## $t9 = 060015CC /* 01F0C 80ACBE2C 30580001 */ andi $t8, $v0, 0x0001 ## $t8 = 00000000 /* 01F10 80ACBE30 13000014 */ beq $t8, $zero, .L80ACBE84 /* 01F14 80ACBE34 26070198 */ addiu $a3, $s0, 0x0198 ## $a3 = 00000198 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBEA0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBEA0.s index 2d43b3422e..d96b4fea10 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBEA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBEA0.s @@ -10,8 +10,8 @@ glabel func_80ACBEA0 /* 01FA0 80ACBEC0 24A5BD4C */ addiu $a1, $a1, %lo(func_80ACBD4C) ## $a1 = 80ACBD4C /* 01FA4 80ACBEC4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 01FA8 80ACBEC8 A48F03FE */ sh $t7, 0x03FE($a0) ## 000003FE -/* 01FAC 80ACBECC 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 01FB0 80ACBED0 27181168 */ addiu $t8, $t8, 0x1168 ## $t8 = 06001168 +/* 01FAC 80ACBECC 3C180600 */ lui $t8, %hi(D_06001168) ## $t8 = 06000000 +/* 01FB0 80ACBED0 27181168 */ addiu $t8, $t8, %lo(D_06001168) ## $t8 = 06001168 /* 01FB4 80ACBED4 3C0680AD */ lui $a2, %hi(func_80ACC540) ## $a2 = 80AD0000 /* 01FB8 80ACBED8 24C6C540 */ addiu $a2, $a2, %lo(func_80ACC540) ## $a2 = 80ACC540 /* 01FBC 80ACBEDC AFB80010 */ sw $t8, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBF50.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBF50.s index 6f4f8344fa..4d584889aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBF50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBF50.s @@ -19,8 +19,8 @@ glabel func_80ACBF50 /* 02070 80ACBF90 13000017 */ beq $t8, $zero, .L80ACBFF0 /* 02074 80ACBF94 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 /* 02078 80ACBF98 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0207C 80ACBF9C 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 02080 80ACBFA0 273915CC */ addiu $t9, $t9, 0x15CC ## $t9 = 060015CC +/* 0207C 80ACBF9C 3C190600 */ lui $t9, %hi(D_060015CC) ## $t9 = 06000000 +/* 02080 80ACBFA0 273915CC */ addiu $t9, $t9, %lo(D_060015CC) ## $t9 = 060015CC /* 02084 80ACBFA4 3C0580AD */ lui $a1, %hi(func_80ACBC0C) ## $a1 = 80AD0000 /* 02088 80ACBFA8 3C0680AD */ lui $a2, %hi(func_80ACC460) ## $a2 = 80AD0000 /* 0208C 80ACBFAC 24C6C460 */ addiu $a2, $a2, %lo(func_80ACC460) ## $a2 = 80ACC460 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 d10095bad8..42ce654527 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 @@ -99,8 +99,8 @@ glabel func_80ACC00C /* 021CC 80ACC0EC 0C00084C */ jal osSyncPrintf /* 021D0 80ACC0F0 2484D794 */ addiu $a0, $a0, %lo(D_80ACD794) ## $a0 = 80ACD794 -/* 021D4 80ACC0F4 3C020202 */ lui $v0, 0x0202 ## $v0 = 02020000 -/* 021D8 80ACC0F8 2442B0C0 */ addiu $v0, $v0, 0xB0C0 ## $v0 = 0201B0C0 +/* 021D4 80ACC0F4 3C020202 */ lui $v0, %hi(D_0201B0C0) ## $v0 = 02020000 +/* 021D8 80ACC0F8 2442B0C0 */ addiu $v0, $v0, %lo(D_0201B0C0) ## $v0 = 0201B0C0 /* 021DC 80ACC0FC 00024900 */ sll $t1, $v0, 4 /* 021E0 80ACC100 00095702 */ srl $t2, $t1, 28 /* 021E4 80ACC104 000A5880 */ sll $t3, $t2, 2 @@ -118,8 +118,8 @@ glabel func_80ACC00C /* 02214 80ACC134 10000016 */ beq $zero, $zero, .L80ACC190 /* 02218 80ACC138 AE000134 */ sw $zero, 0x0134($s0) ## 00000134 .L80ACC13C: -/* 0221C 80ACC13C 3C020202 */ lui $v0, 0x0202 ## $v0 = 02020000 -/* 02220 80ACC140 2442E6A0 */ addiu $v0, $v0, 0xE6A0 ## $v0 = 0201E6A0 +/* 0221C 80ACC13C 3C020202 */ lui $v0, %hi(D_0201E6A0) ## $v0 = 02020000 +/* 02220 80ACC140 2442E6A0 */ addiu $v0, $v0, %lo(D_0201E6A0) ## $v0 = 0201E6A0 /* 02224 80ACC144 0002C900 */ sll $t9, $v0, 4 /* 02228 80ACC148 00194702 */ srl $t0, $t9, 28 /* 0222C 80ACC14C 00084880 */ sll $t1, $t0, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC30C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC30C.s index 0abc28ef5b..1041f84d31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC30C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC30C.s @@ -15,8 +15,8 @@ glabel func_80ACC30C /* 0240C 80ACC32C 24A5C23C */ addiu $a1, $a1, %lo(func_80ACC23C) ## $a1 = 80ACC23C /* 02410 80ACC330 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 02414 80ACC334 A48F03FE */ sh $t7, 0x03FE($a0) ## 000003FE -/* 02418 80ACC338 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 0241C 80ACC33C 27181168 */ addiu $t8, $t8, 0x1168 ## $t8 = 06001168 +/* 02418 80ACC338 3C180600 */ lui $t8, %hi(D_06001168) ## $t8 = 06000000 +/* 0241C 80ACC33C 27181168 */ addiu $t8, $t8, %lo(D_06001168) ## $t8 = 06001168 /* 02420 80ACC340 3C0680AD */ lui $a2, %hi(func_80ACC540) ## $a2 = 80AD0000 /* 02424 80ACC344 24C6C540 */ addiu $a2, $a2, %lo(func_80ACC540) ## $a2 = 80ACC540 /* 02428 80ACC348 AFB80010 */ sw $t8, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s index ea8ad5a5e7..42146b6cb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s @@ -30,21 +30,21 @@ glabel func_80ACC390 /* 024D8 80ACC3F8 10000014 */ beq $zero, $zero, .L80ACC44C /* 024DC 80ACC3FC A61800B8 */ sh $t8, 0x00B8($s0) ## 000000B8 .L80ACC400: -/* 024E0 80ACC400 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 024E0 80ACC400 3C040600 */ lui $a0, %hi(D_060015CC) ## $a0 = 06000000 /* 024E4 80ACC404 AE190410 */ sw $t9, 0x0410($s0) ## 00000410 /* 024E8 80ACC408 A60803FE */ sh $t0, 0x03FE($s0) ## 000003FE /* 024EC 80ACC40C 0C028800 */ jal SkelAnime_GetFrameCount -/* 024F0 80ACC410 248415CC */ addiu $a0, $a0, 0x15CC ## $a0 = 060015CC +/* 024F0 80ACC410 248415CC */ addiu $a0, $a0, %lo(D_060015CC) ## $a0 = 060015CC /* 024F4 80ACC414 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 024F8 80ACC418 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 024FC 80ACC41C 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 /* 02500 80ACC420 46805420 */ cvt.s.w $f16, $f10 /* 02504 80ACC424 8E0403DC */ lw $a0, 0x03DC($s0) ## 000003DC -/* 02508 80ACC428 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 02508 80ACC428 3C050600 */ lui $a1, %hi(D_060015CC) ## $a1 = 06000000 /* 0250C 80ACC42C 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 02510 80ACC430 AFA90014 */ sw $t1, 0x0014($sp) -/* 02514 80ACC434 24A515CC */ addiu $a1, $a1, 0x15CC ## $a1 = 060015CC +/* 02514 80ACC434 24A515CC */ addiu $a1, $a1, %lo(D_060015CC) ## $a1 = 060015CC /* 02518 80ACC438 E7B00010 */ swc1 $f16, 0x0010($sp) /* 0251C 80ACC43C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02520 80ACC440 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC460.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC460.s index a878e951c5..a5fdbc0913 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC460.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC460.s @@ -35,21 +35,21 @@ glabel func_80ACC460 /* 025B8 80ACC4D8 10000015 */ beq $zero, $zero, .L80ACC530 /* 025BC 80ACC4DC 8FBF002C */ lw $ra, 0x002C($sp) .L80ACC4E0: -/* 025C0 80ACC4E0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 025C0 80ACC4E0 3C040601 */ lui $a0, %hi(D_0600C1C4) ## $a0 = 06010000 /* 025C4 80ACC4E4 A61903FE */ sh $t9, 0x03FE($s0) ## 000003FE /* 025C8 80ACC4E8 AE080410 */ sw $t0, 0x0410($s0) ## 00000410 /* 025CC 80ACC4EC 0C028800 */ jal SkelAnime_GetFrameCount -/* 025D0 80ACC4F0 2484C1C4 */ addiu $a0, $a0, 0xC1C4 ## $a0 = 0600C1C4 +/* 025D0 80ACC4F0 2484C1C4 */ addiu $a0, $a0, %lo(D_0600C1C4) ## $a0 = 0600C1C4 /* 025D4 80ACC4F4 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 025D8 80ACC4F8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 025DC 80ACC4FC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 025E0 80ACC500 468042A0 */ cvt.s.w $f10, $f8 /* 025E4 80ACC504 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 /* 025E8 80ACC508 8E0403DC */ lw $a0, 0x03DC($s0) ## 000003DC -/* 025EC 80ACC50C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 025EC 80ACC50C 3C050601 */ lui $a1, %hi(D_0600C1C4) ## $a1 = 06010000 /* 025F0 80ACC510 44070000 */ mfc1 $a3, $f0 -/* 025F4 80ACC514 24A5C1C4 */ addiu $a1, $a1, 0xC1C4 ## $a1 = 0600C1C4 +/* 025F4 80ACC514 24A5C1C4 */ addiu $a1, $a1, %lo(D_0600C1C4) ## $a1 = 0600C1C4 /* 025F8 80ACC518 AFA00014 */ sw $zero, 0x0014($sp) /* 025FC 80ACC51C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 02600 80ACC520 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 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 63a8f71f3d..dfbf270492 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 @@ -23,16 +23,16 @@ glabel EnPeehat_Init /* 00034 80ACF4D4 0C00B58B */ jal Actor_SetScale /* 00038 80ACF4D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0003C 80ACF4DC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00040 80ACF4E0 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 0003C 80ACF4DC 3C060600 */ lui $a2, %hi(D_06001C80) ## $a2 = 06000000 +/* 00040 80ACF4E0 3C070600 */ lui $a3, %hi(D_060009C4) ## $a3 = 06000000 /* 00044 80ACF4E4 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 00048 80ACF4E8 260F0220 */ addiu $t7, $s0, 0x0220 ## $t7 = 00000220 /* 0004C 80ACF4EC 24180018 */ addiu $t8, $zero, 0x0018 ## $t8 = 00000018 /* 00050 80ACF4F0 AFB80018 */ sw $t8, 0x0018($sp) /* 00054 80ACF4F4 AFAF0014 */ sw $t7, 0x0014($sp) /* 00058 80ACF4F8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0005C 80ACF4FC 24E709C4 */ addiu $a3, $a3, 0x09C4 ## $a3 = 060009C4 -/* 00060 80ACF500 24C61C80 */ addiu $a2, $a2, 0x1C80 ## $a2 = 06001C80 +/* 0005C 80ACF4FC 24E709C4 */ addiu $a3, $a3, %lo(D_060009C4) ## $a3 = 060009C4 +/* 00060 80ACF500 24C61C80 */ addiu $a2, $a2, %lo(D_06001C80) ## $a2 = 06001C80 /* 00064 80ACF504 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00068 80ACF508 0C02915F */ jal SkelAnime_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFB34.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFB34.s index bc4dac6acb..cba3ad303f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFB34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFB34.s @@ -3,18 +3,18 @@ glabel func_80ACFB34 /* 00698 80ACFB38 AFB00028 */ sw $s0, 0x0028($sp) /* 0069C 80ACFB3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 006A0 80ACFB40 AFBF002C */ sw $ra, 0x002C($sp) -/* 006A4 80ACFB44 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 006A4 80ACFB44 3C040600 */ lui $a0, %hi(D_060009C4) ## $a0 = 06000000 /* 006A8 80ACFB48 0C028800 */ jal SkelAnime_GetFrameCount -/* 006AC 80ACFB4C 248409C4 */ addiu $a0, $a0, 0x09C4 ## $a0 = 060009C4 +/* 006AC 80ACFB4C 248409C4 */ addiu $a0, $a0, %lo(D_060009C4) ## $a0 = 060009C4 /* 006B0 80ACFB50 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 006B4 80ACFB54 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 006B8 80ACFB58 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 006B8 80ACFB58 3C050600 */ lui $a1, %hi(D_060009C4) ## $a1 = 06000000 /* 006BC 80ACFB5C 468021A0 */ cvt.s.w $f6, $f4 /* 006C0 80ACFB60 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 006C4 80ACFB64 44060000 */ mfc1 $a2, $f0 /* 006C8 80ACFB68 AFAE0014 */ sw $t6, 0x0014($sp) -/* 006CC 80ACFB6C 24A509C4 */ addiu $a1, $a1, 0x09C4 ## $a1 = 060009C4 +/* 006CC 80ACFB6C 24A509C4 */ addiu $a1, $a1, %lo(D_060009C4) ## $a1 = 060009C4 /* 006D0 80ACFB70 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 006D4 80ACFB74 E7A60010 */ swc1 $f6, 0x0010($sp) /* 006D8 80ACFB78 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFD20.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFD20.s index 1255350972..fcf34f84fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFD20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFD20.s @@ -3,18 +3,18 @@ glabel func_80ACFD20 /* 00884 80ACFD24 AFB00028 */ sw $s0, 0x0028($sp) /* 00888 80ACFD28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0088C 80ACFD2C AFBF002C */ sw $ra, 0x002C($sp) -/* 00890 80ACFD30 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00890 80ACFD30 3C040600 */ lui $a0, %hi(D_060009C4) ## $a0 = 06000000 /* 00894 80ACFD34 0C028800 */ jal SkelAnime_GetFrameCount -/* 00898 80ACFD38 248409C4 */ addiu $a0, $a0, 0x09C4 ## $a0 = 060009C4 +/* 00898 80ACFD38 248409C4 */ addiu $a0, $a0, %lo(D_060009C4) ## $a0 = 060009C4 /* 0089C 80ACFD3C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 008A0 80ACFD40 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 008A4 80ACFD44 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 008A4 80ACFD44 3C050600 */ lui $a1, %hi(D_060009C4) ## $a1 = 06000000 /* 008A8 80ACFD48 468021A0 */ cvt.s.w $f6, $f4 /* 008AC 80ACFD4C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 008B0 80ACFD50 44060000 */ mfc1 $a2, $f0 /* 008B4 80ACFD54 AFAE0014 */ sw $t6, 0x0014($sp) -/* 008B8 80ACFD58 24A509C4 */ addiu $a1, $a1, 0x09C4 ## $a1 = 060009C4 +/* 008B8 80ACFD58 24A509C4 */ addiu $a1, $a1, %lo(D_060009C4) ## $a1 = 060009C4 /* 008BC 80ACFD5C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 008C0 80ACFD60 E7A60010 */ swc1 $f6, 0x0010($sp) /* 008C4 80ACFD64 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s index 2aa1285148..044b6e692b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s @@ -2,8 +2,8 @@ glabel func_80ACFEB0 /* 00A10 80ACFEB0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00A14 80ACFEB4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00A18 80ACFEB8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00A1C 80ACFEBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00A20 80ACFEC0 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 +/* 00A1C 80ACFEBC 3C050600 */ lui $a1, %hi(D_060005C4) ## $a1 = 06000000 +/* 00A20 80ACFEC0 24A505C4 */ addiu $a1, $a1, %lo(D_060005C4) ## $a1 = 060005C4 /* 00A24 80ACFEC4 AFA60018 */ sw $a2, 0x0018($sp) /* 00A28 80ACFEC8 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00A2C 80ACFECC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0070.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0070.s index 4ce3a4d073..d998489e51 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0070.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0070.s @@ -3,21 +3,21 @@ glabel func_80AD0070 /* 00BD4 80AD0074 AFB00028 */ sw $s0, 0x0028($sp) /* 00BD8 80AD0078 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00BDC 80AD007C AFBF002C */ sw $ra, 0x002C($sp) -/* 00BE0 80AD0080 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00BE0 80AD0080 3C040600 */ lui $a0, %hi(D_060009C4) ## $a0 = 06000000 /* 00BE4 80AD0084 0C028800 */ jal SkelAnime_GetFrameCount -/* 00BE8 80AD0088 248409C4 */ addiu $a0, $a0, 0x09C4 ## $a0 = 060009C4 +/* 00BE8 80AD0088 248409C4 */ addiu $a0, $a0, %lo(D_060009C4) ## $a0 = 060009C4 /* 00BEC 80AD008C 8E0E02B0 */ lw $t6, 0x02B0($s0) ## 000002B0 /* 00BF0 80AD0090 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00BF4 80AD0094 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D /* 00BF8 80AD0098 11C1000E */ beq $t6, $at, .L80AD00D4 /* 00BFC 80AD009C 46802020 */ cvt.s.w $f0, $f4 /* 00C00 80AD00A0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00C04 80AD00A4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00C04 80AD00A4 3C050600 */ lui $a1, %hi(D_060009C4) ## $a1 = 06000000 /* 00C08 80AD00A8 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 00C0C 80AD00AC 44061000 */ mfc1 $a2, $f2 /* 00C10 80AD00B0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00C14 80AD00B4 24A509C4 */ addiu $a1, $a1, 0x09C4 ## $a1 = 060009C4 +/* 00C14 80AD00B4 24A509C4 */ addiu $a1, $a1, %lo(D_060009C4) ## $a1 = 060009C4 /* 00C18 80AD00B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00C1C 80AD00BC 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 00C20 80AD00C0 E7A00010 */ swc1 $f0, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD02E4.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD02E4.s index d835d18243..9f481361df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD02E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD02E4.s @@ -3,21 +3,21 @@ glabel func_80AD02E4 /* 00E48 80AD02E8 AFB00028 */ sw $s0, 0x0028($sp) /* 00E4C 80AD02EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00E50 80AD02F0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00E54 80AD02F4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00E54 80AD02F4 3C040600 */ lui $a0, %hi(D_060009C4) ## $a0 = 06000000 /* 00E58 80AD02F8 0C028800 */ jal SkelAnime_GetFrameCount -/* 00E5C 80AD02FC 248409C4 */ addiu $a0, $a0, 0x09C4 ## $a0 = 060009C4 +/* 00E5C 80AD02FC 248409C4 */ addiu $a0, $a0, %lo(D_060009C4) ## $a0 = 060009C4 /* 00E60 80AD0300 8E0E02B0 */ lw $t6, 0x02B0($s0) ## 000002B0 /* 00E64 80AD0304 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00E68 80AD0308 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D /* 00E6C 80AD030C 11C1000E */ beq $t6, $at, .L80AD0348 /* 00E70 80AD0310 46802020 */ cvt.s.w $f0, $f4 /* 00E74 80AD0314 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00E78 80AD0318 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00E78 80AD0318 3C050600 */ lui $a1, %hi(D_060009C4) ## $a1 = 06000000 /* 00E7C 80AD031C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 00E80 80AD0320 44061000 */ mfc1 $a2, $f2 /* 00E84 80AD0324 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00E88 80AD0328 24A509C4 */ addiu $a1, $a1, 0x09C4 ## $a1 = 060009C4 +/* 00E88 80AD0328 24A509C4 */ addiu $a1, $a1, %lo(D_060009C4) ## $a1 = 060009C4 /* 00E8C 80AD032C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00E90 80AD0330 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 00E94 80AD0334 E7A00010 */ swc1 $f0, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s index db63ee2e58..690299cb5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s @@ -2,8 +2,8 @@ glabel func_80AD0558 /* 010B8 80AD0558 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 010BC 80AD055C AFBF0014 */ sw $ra, 0x0014($sp) /* 010C0 80AD0560 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 010C4 80AD0564 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 010C8 80AD0568 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 +/* 010C4 80AD0564 3C050600 */ lui $a1, %hi(D_060005C4) ## $a1 = 06000000 +/* 010C8 80AD0568 24A505C4 */ addiu $a1, $a1, %lo(D_060005C4) ## $a1 = 060005C4 /* 010CC 80AD056C AFA60018 */ sw $a2, 0x0018($sp) /* 010D0 80AD0570 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 010D4 80AD0574 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s index b4be4e8075..201a0eb09a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s @@ -2,8 +2,8 @@ glabel func_80AD0720 /* 01280 80AD0720 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01284 80AD0724 AFBF0014 */ sw $ra, 0x0014($sp) /* 01288 80AD0728 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0128C 80AD072C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01290 80AD0730 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 +/* 0128C 80AD072C 3C050600 */ lui $a1, %hi(D_060005C4) ## $a1 = 06000000 +/* 01290 80AD0730 24A505C4 */ addiu $a1, $a1, %lo(D_060005C4) ## $a1 = 060005C4 /* 01294 80AD0734 AFA60018 */ sw $a2, 0x0018($sp) /* 01298 80AD0738 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 0129C 80AD073C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s index 77659cde32..a5b943e8f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s @@ -4,8 +4,8 @@ glabel func_80AD0B3C /* 016A4 80AD0B44 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 016A8 80AD0B48 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 016AC 80AD0B4C AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -/* 016B0 80AD0B50 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 016B4 80AD0B54 24A50350 */ addiu $a1, $a1, 0x0350 ## $a1 = 06000350 +/* 016B0 80AD0B50 3C050600 */ lui $a1, %hi(D_06000350) ## $a1 = 06000000 +/* 016B4 80AD0B54 24A50350 */ addiu $a1, $a1, %lo(D_06000350) ## $a1 = 06000350 /* 016B8 80AD0B58 AFA60018 */ sw $a2, 0x0018($sp) /* 016BC 80AD0B5C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 016C0 80AD0B60 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s index 2b68664a50..e2b57e38fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s @@ -2,8 +2,8 @@ glabel func_80AD0D3C /* 0189C 80AD0D3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 018A0 80AD0D40 AFBF0014 */ sw $ra, 0x0014($sp) /* 018A4 80AD0D44 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 018A8 80AD0D48 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 018AC 80AD0D4C 24A50350 */ addiu $a1, $a1, 0x0350 ## $a1 = 06000350 +/* 018A8 80AD0D48 3C050600 */ lui $a1, %hi(D_06000350) ## $a1 = 06000000 +/* 018AC 80AD0D4C 24A50350 */ addiu $a1, $a1, %lo(D_06000350) ## $a1 = 06000350 /* 018B0 80AD0D50 AFA60018 */ sw $a2, 0x0018($sp) /* 018B4 80AD0D54 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 018B8 80AD0D58 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s index 75ee6c88fe..841d42c72b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s @@ -3,8 +3,8 @@ glabel func_80AD0F38 /* 01A9C 80AD0F3C AFB00018 */ sw $s0, 0x0018($sp) /* 01AA0 80AD0F40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01AA4 80AD0F44 AFBF001C */ sw $ra, 0x001C($sp) -/* 01AA8 80AD0F48 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01AAC 80AD0F4C 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 +/* 01AA8 80AD0F48 3C050600 */ lui $a1, %hi(D_060005C4) ## $a1 = 06000000 +/* 01AAC 80AD0F4C 24A505C4 */ addiu $a1, $a1, %lo(D_060005C4) ## $a1 = 060005C4 /* 01AB0 80AD0F50 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 01AB4 80AD0F54 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01AB8 80AD0F58 0C03F66B */ jal Math_Rand_ZeroOne diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s index 6f7a8cad5b..9f770a3ed8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s @@ -2,8 +2,8 @@ glabel func_80AD1440 /* 01FA0 80AD1440 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01FA4 80AD1444 AFBF0014 */ sw $ra, 0x0014($sp) /* 01FA8 80AD1448 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01FAC 80AD144C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01FB0 80AD1450 24A50844 */ addiu $a1, $a1, 0x0844 ## $a1 = 06000844 +/* 01FAC 80AD144C 3C050600 */ lui $a1, %hi(D_06000844) ## $a1 = 06000000 +/* 01FB0 80AD1450 24A50844 */ addiu $a1, $a1, %lo(D_06000844) ## $a1 = 06000844 /* 01FB4 80AD1454 AFA70018 */ sw $a3, 0x0018($sp) /* 01FB8 80AD1458 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01FBC 80AD145C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s index 67b45f75fc..9814d76ac3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s @@ -16,8 +16,8 @@ glabel func_80AD17E8 /* 02360 80AD1800 11C00032 */ beq $t6, $zero, .L80AD18CC /* 02364 80AD1804 00000000 */ nop /* 02368 80AD1808 8C8F02D4 */ lw $t7, 0x02D4($a0) ## 000002D4 -/* 0236C 80AD180C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02370 80AD1810 24A50844 */ addiu $a1, $a1, 0x0844 ## $a1 = 06000844 +/* 0236C 80AD180C 3C050600 */ lui $a1, %hi(D_06000844) ## $a1 = 06000000 +/* 02370 80AD1810 24A50844 */ addiu $a1, $a1, %lo(D_06000844) ## $a1 = 06000844 /* 02374 80AD1814 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF /* 02378 80AD1818 1B000003 */ blez $t8, .L80AD1828 /* 0237C 80AD181C AC9802D4 */ sw $t8, 0x02D4($a0) ## 000002D4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s index 46c8bf0441..530eff8ba6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s @@ -2,8 +2,8 @@ glabel func_80AD1AA8 /* 02608 80AD1AA8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0260C 80AD1AAC AFBF0014 */ sw $ra, 0x0014($sp) /* 02610 80AD1AB0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02614 80AD1AB4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02618 80AD1AB8 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 +/* 02614 80AD1AB4 3C050600 */ lui $a1, %hi(D_060005C4) ## $a1 = 06000000 +/* 02618 80AD1AB8 24A505C4 */ addiu $a1, $a1, %lo(D_060005C4) ## $a1 = 060005C4 /* 0261C 80AD1ABC AFA60018 */ sw $a2, 0x0018($sp) /* 02620 80AD1AC0 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 02624 80AD1AC4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C 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 8a894255fe..db556ec351 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 @@ -23,14 +23,14 @@ glabel EnSa_Init /* 00C7C 80AF61DC 0C00AC78 */ jal ActorShape_Init /* 00C80 80AF61E0 3C074140 */ lui $a3, 0x4140 ## $a3 = 41400000 -/* 00C84 80AF61E4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 +/* 00C84 80AF61E4 3C060601 */ lui $a2, %hi(D_0600B1A0) ## $a2 = 06010000 /* 00C88 80AF61E8 260E0220 */ addiu $t6, $s0, 0x0220 ## $t6 = 00000220 /* 00C8C 80AF61EC 260F0286 */ addiu $t7, $s0, 0x0286 ## $t7 = 00000286 /* 00C90 80AF61F0 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 /* 00C94 80AF61F4 AFB80018 */ sw $t8, 0x0018($sp) /* 00C98 80AF61F8 AFAF0014 */ sw $t7, 0x0014($sp) /* 00C9C 80AF61FC AFAE0010 */ sw $t6, 0x0010($sp) -/* 00CA0 80AF6200 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 +/* 00CA0 80AF6200 24C6B1A0 */ addiu $a2, $a2, %lo(D_0600B1A0) ## $a2 = 0600B1A0 /* 00CA4 80AF6204 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00CA8 80AF6208 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00CAC 80AF620C 0C0291BE */ jal SkelAnime_InitFlex @@ -91,9 +91,9 @@ glabel L80AF62B4 /* 00D74 80AF62D4 1000002D */ beq $zero, $zero, .L80AF638C /* 00D78 80AF62D8 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 glabel L80AF62DC -/* 00D7C 80AF62DC 3C020201 */ lui $v0, 0x0201 ## $v0 = 02010000 +/* 00D7C 80AF62DC 3C020201 */ lui $v0, %hi(D_02010E20) ## $v0 = 02010000 /* 00D80 80AF62E0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00D84 80AF62E4 24420E20 */ addiu $v0, $v0, 0x0E20 ## $v0 = 02010E20 +/* 00D84 80AF62E4 24420E20 */ addiu $v0, $v0, %lo(D_02010E20) ## $v0 = 02010E20 /* 00D88 80AF62E8 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 /* 00D8C 80AF62EC 00025900 */ sll $t3, $v0, 4 /* 00D90 80AF62F0 000B6702 */ srl $t4, $t3, 28 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Update.s index 4c919088b9..e7ecf03f9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Update.s @@ -21,8 +21,8 @@ glabel EnSa_Update /* 016C4 80AF6C24 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 016C8 80AF6C28 8E0E0154 */ lw $t6, 0x0154($s0) ## 00000154 -/* 016CC 80AF6C2C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 016D0 80AF6C30 24841D50 */ addiu $a0, $a0, 0x1D50 ## $a0 = 06001D50 +/* 016CC 80AF6C2C 3C040600 */ lui $a0, %hi(D_06001D50) ## $a0 = 06000000 +/* 016D0 80AF6C30 24841D50 */ addiu $a0, $a0, %lo(D_06001D50) ## $a0 = 06001D50 /* 016D4 80AF6C34 548E000E */ bnel $a0, $t6, .L80AF6C70 /* 016D8 80AF6C38 8E0F0190 */ lw $t7, 0x0190($s0) ## 00000190 /* 016DC 80AF6C3C 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5F34.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5F34.s index 998f87bdd1..5d3a6160f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5F34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5F34.s @@ -18,8 +18,8 @@ glabel func_80AF5F34 /* 00A10 80AF5F70 14620008 */ bne $v1, $v0, .L80AF5F94 /* 00A14 80AF5F74 00000000 */ nop /* 00A18 80AF5F78 8C990154 */ lw $t9, 0x0154($a0) ## 00000154 -/* 00A1C 80AF5F7C 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 -/* 00A20 80AF5F80 2718BAEC */ addiu $t8, $t8, 0xBAEC ## $t8 = 0600BAEC +/* 00A1C 80AF5F7C 3C180601 */ lui $t8, %hi(D_0600BAEC) ## $t8 = 06010000 +/* 00A20 80AF5F80 2718BAEC */ addiu $t8, $t8, %lo(D_0600BAEC) ## $t8 = 0600BAEC /* 00A24 80AF5F84 17190003 */ bne $t8, $t9, .L80AF5F94 /* 00A28 80AF5F88 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 /* 00A2C 80AF5F8C 10000001 */ beq $zero, $zero, .L80AF5F94 @@ -33,8 +33,8 @@ glabel func_80AF5F34 /* 00A48 80AF5FA8 152A0007 */ bne $t1, $t2, .L80AF5FC8 /* 00A4C 80AF5FAC 00000000 */ nop /* 00A50 80AF5FB0 8C8C0154 */ lw $t4, 0x0154($a0) ## 00000154 -/* 00A54 80AF5FB4 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 -/* 00A58 80AF5FB8 256BC500 */ addiu $t3, $t3, 0xC500 ## $t3 = 0600C500 +/* 00A54 80AF5FB4 3C0B0601 */ lui $t3, %hi(D_0600C500) ## $t3 = 06010000 +/* 00A58 80AF5FB8 256BC500 */ addiu $t3, $t3, %lo(D_0600C500) ## $t3 = 0600C500 /* 00A5C 80AF5FBC 156C0002 */ bne $t3, $t4, .L80AF5FC8 /* 00A60 80AF5FC0 00000000 */ nop /* 00A64 80AF5FC4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 @@ -47,8 +47,8 @@ glabel func_80AF5F34 /* 00A7C 80AF5FDC 55AE0008 */ bnel $t5, $t6, .L80AF6000 /* 00A80 80AF5FE0 8D090024 */ lw $t1, 0x0024($t0) ## 00000024 /* 00A84 80AF5FE4 8C980154 */ lw $t8, 0x0154($a0) ## 00000154 -/* 00A88 80AF5FE8 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 00A8C 80AF5FEC 25EF1D50 */ addiu $t7, $t7, 0x1D50 ## $t7 = 06001D50 +/* 00A88 80AF5FE8 3C0F0600 */ lui $t7, %hi(D_06001D50) ## $t7 = 06000000 +/* 00A8C 80AF5FEC 25EF1D50 */ addiu $t7, $t7, %lo(D_06001D50) ## $t7 = 06001D50 /* 00A90 80AF5FF0 55F80003 */ bnel $t7, $t8, .L80AF6000 /* 00A94 80AF5FF4 8D090024 */ lw $t1, 0x0024($t0) ## 00000024 /* 00A98 80AF5FF8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF603C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF603C.s index 56f2e4abd6..0383d0dd6b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF603C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF603C.s @@ -1,10 +1,10 @@ glabel func_80AF603C /* 00ADC 80AF603C 8C820154 */ lw $v0, 0x0154($a0) ## 00000154 -/* 00AE0 80AF6040 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 00AE4 80AF6044 25CEBAEC */ addiu $t6, $t6, 0xBAEC ## $t6 = 0600BAEC +/* 00AE0 80AF6040 3C0E0601 */ lui $t6, %hi(D_0600BAEC) ## $t6 = 06010000 +/* 00AE4 80AF6044 25CEBAEC */ addiu $t6, $t6, %lo(D_0600BAEC) ## $t6 = 0600BAEC /* 00AE8 80AF6048 11C20006 */ beq $t6, $v0, .L80AF6064 -/* 00AEC 80AF604C 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 00AF0 80AF6050 25EF1D50 */ addiu $t7, $t7, 0x1D50 ## $t7 = 06001D50 +/* 00AEC 80AF604C 3C0F0600 */ lui $t7, %hi(D_06001D50) ## $t7 = 06000000 +/* 00AF0 80AF6050 25EF1D50 */ addiu $t7, $t7, %lo(D_06001D50) ## $t7 = 06001D50 /* 00AF4 80AF6054 51E20004 */ beql $t7, $v0, .L80AF6068 /* 00AF8 80AF6058 849801E0 */ lh $t8, 0x01E0($a0) ## 000001E0 /* 00AFC 80AF605C 03E00008 */ jr $ra 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 94d1e836fd..e8c650fa68 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 @@ -84,8 +84,8 @@ glabel func_80AF6448 /* 0101C 80AF657C 51A1000C */ beql $t5, $at, .L80AF65B0 /* 01020 80AF6580 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 /* 01024 80AF6584 8E0F0154 */ lw $t7, 0x0154($s0) ## 00000154 -/* 01028 80AF6588 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 0102C 80AF658C 25CE2100 */ addiu $t6, $t6, 0x2100 ## $t6 = 06012100 +/* 01028 80AF6588 3C0E0601 */ lui $t6, %hi(D_06012100) ## $t6 = 06010000 +/* 0102C 80AF658C 25CE2100 */ addiu $t6, $t6, %lo(D_06012100) ## $t6 = 06012100 /* 01030 80AF6590 15CF0006 */ bne $t6, $t7, .L80AF65AC /* 01034 80AF6594 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01038 80AF6598 0C2BD735 */ jal func_80AF5CD4 @@ -130,8 +130,8 @@ glabel func_80AF6448 /* 010C4 80AF6624 1141003A */ beq $t2, $at, .L80AF6710 /* 010C8 80AF6628 00000000 */ nop /* 010CC 80AF662C 8E0C0154 */ lw $t4, 0x0154($s0) ## 00000154 -/* 010D0 80AF6630 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 -/* 010D4 80AF6634 256B2100 */ addiu $t3, $t3, 0x2100 ## $t3 = 06012100 +/* 010D0 80AF6630 3C0B0601 */ lui $t3, %hi(D_06012100) ## $t3 = 06010000 +/* 010D4 80AF6634 256B2100 */ addiu $t3, $t3, %lo(D_06012100) ## $t3 = 06012100 /* 010D8 80AF6638 156C0035 */ bne $t3, $t4, .L80AF6710 /* 010DC 80AF663C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 010E0 80AF6640 0C2BD735 */ jal func_80AF5CD4 @@ -196,8 +196,8 @@ glabel func_80AF6448 /* 011B4 80AF6714 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 011B8 80AF6718 8E0E0154 */ lw $t6, 0x0154($s0) ## 00000154 .L80AF671C: -/* 011BC 80AF671C 3C0D0601 */ lui $t5, 0x0601 ## $t5 = 06010000 -/* 011C0 80AF6720 25ADC500 */ addiu $t5, $t5, 0xC500 ## $t5 = 0600C500 +/* 011BC 80AF671C 3C0D0601 */ lui $t5, %hi(D_0600C500) ## $t5 = 06010000 +/* 011C0 80AF6720 25ADC500 */ addiu $t5, $t5, %lo(D_0600C500) ## $t5 = 0600C500 /* 011C4 80AF6724 55AE000E */ bnel $t5, $t6, .L80AF6760 /* 011C8 80AF6728 861901E0 */ lh $t9, 0x01E0($s0) ## 000001E0 /* 011CC 80AF672C C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 @@ -221,14 +221,14 @@ glabel func_80AF6448 /* 01210 80AF6770 24010056 */ addiu $at, $zero, 0x0056 ## $at = 00000056 /* 01214 80AF6774 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01218 80AF6778 15210010 */ bne $t1, $at, .L80AF67BC -/* 0121C 80AF677C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 0121C 80AF677C 3C050601 */ lui $a1, %hi(D_0600C500) ## $a1 = 06010000 /* 01220 80AF6780 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01224 80AF6784 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 01228 80AF6788 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 0122C 80AF678C 44818000 */ mtc1 $at, $f16 ## $f16 = -10.00 /* 01230 80AF6790 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 /* 01234 80AF6794 AFAA0014 */ sw $t2, 0x0014($sp) -/* 01238 80AF6798 24A5C500 */ addiu $a1, $a1, 0xC500 ## $a1 = 0600C500 +/* 01238 80AF6798 24A5C500 */ addiu $a1, $a1, %lo(D_0600C500) ## $a1 = 0600C500 /* 0123C 80AF679C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01240 80AF67A0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01244 80AF67A4 E7AA0010 */ swc1 $f10, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF67D0.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF67D0.s index fa260f8a59..b346bcd82f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF67D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF67D0.s @@ -4,8 +4,8 @@ glabel func_80AF67D0 /* 01278 80AF67D8 AFA40028 */ sw $a0, 0x0028($sp) /* 0127C 80AF67DC AFA5002C */ sw $a1, 0x002C($sp) /* 01280 80AF67E0 848F01E0 */ lh $t7, 0x01E0($a0) ## 000001E0 -/* 01284 80AF67E4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01288 80AF67E8 24A5C500 */ addiu $a1, $a1, 0xC500 ## $a1 = 0600C500 +/* 01284 80AF67E4 3C050601 */ lui $a1, %hi(D_0600C500) ## $a1 = 06010000 +/* 01288 80AF67E8 24A5C500 */ addiu $a1, $a1, %lo(D_0600C500) ## $a1 = 0600C500 /* 0128C 80AF67EC 15E0000F */ bne $t7, $zero, .L80AF682C /* 01290 80AF67F0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01294 80AF67F4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 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 792ba756c0..69ab2c0233 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 @@ -20,8 +20,8 @@ glabel func_80AF683C /* 01310 80AF6870 AFA5001C */ sw $a1, 0x001C($sp) /* 01314 80AF6874 14400017 */ bne $v0, $zero, .L80AF68D4 /* 01318 80AF6878 8FA5001C */ lw $a1, 0x001C($sp) -/* 0131C 80AF687C 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 01320 80AF6880 24425730 */ addiu $v0, $v0, 0x5730 ## $v0 = 02005730 +/* 0131C 80AF687C 3C020200 */ lui $v0, %hi(D_02005730) ## $v0 = 02000000 +/* 01320 80AF6880 24425730 */ addiu $v0, $v0, %lo(D_02005730) ## $v0 = 02005730 /* 01324 80AF6884 00027100 */ sll $t6, $v0, 4 /* 01328 80AF6888 000E7F02 */ srl $t7, $t6, 28 /* 0132C 80AF688C 000FC080 */ sll $t8, $t7, 2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6D6C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6D6C.s index c608fc399f..f51051bdbe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6D6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6D6C.s @@ -111,8 +111,8 @@ glabel func_80AF6D6C /* 01980 80AF6EE0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 01984 80AF6EE4 15410004 */ bne $t2, $at, .L80AF6EF8 /* 01988 80AF6EE8 8FAC0030 */ lw $t4, 0x0030($sp) -/* 0198C 80AF6EEC 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 -/* 01990 80AF6EF0 256B7B80 */ addiu $t3, $t3, 0x7B80 ## $t3 = 06007B80 +/* 0198C 80AF6EEC 3C0B0600 */ lui $t3, %hi(D_06007B80) ## $t3 = 06000000 +/* 01990 80AF6EF0 256B7B80 */ addiu $t3, $t3, %lo(D_06007B80) ## $t3 = 06007B80 /* 01994 80AF6EF4 AD8B0000 */ sw $t3, 0x0000($t4) ## 00000000 .L80AF6EF8: /* 01998 80AF6EF8 8FBF0014 */ lw $ra, 0x0014($sp) 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 af04e2a391..a11b285215 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 @@ -15,16 +15,16 @@ glabel EnShopnuts_Init /* 00030 80AFA750 0C00AC78 */ jal ActorShape_Init /* 00034 80AFA754 3C07420C */ lui $a3, 0x420C ## $a3 = 420C0000 -/* 00038 80AFA758 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 0003C 80AFA75C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00038 80AFA758 3C060600 */ lui $a2, %hi(D_060041A8) ## $a2 = 06000000 +/* 0003C 80AFA75C 3C070600 */ lui $a3, %hi(D_06004574) ## $a3 = 06000000 /* 00040 80AFA760 260E0196 */ addiu $t6, $s0, 0x0196 ## $t6 = 00000196 /* 00044 80AFA764 260F0202 */ addiu $t7, $s0, 0x0202 ## $t7 = 00000202 /* 00048 80AFA768 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 /* 0004C 80AFA76C AFB80018 */ sw $t8, 0x0018($sp) /* 00050 80AFA770 AFAF0014 */ sw $t7, 0x0014($sp) /* 00054 80AFA774 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00058 80AFA778 24E74574 */ addiu $a3, $a3, 0x4574 ## $a3 = 06004574 -/* 0005C 80AFA77C 24C641A8 */ addiu $a2, $a2, 0x41A8 ## $a2 = 060041A8 +/* 00058 80AFA778 24E74574 */ addiu $a3, $a3, %lo(D_06004574) ## $a3 = 06004574 +/* 0005C 80AFA77C 24C641A8 */ addiu $a2, $a2, %lo(D_060041A8) ## $a2 = 060041A8 /* 00060 80AFA780 8FA4003C */ lw $a0, 0x003C($sp) /* 00064 80AFA784 0C0291BE */ jal SkelAnime_InitFlex /* 00068 80AFA788 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Update.s index 1941a5c903..21ac41d684 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Update.s @@ -58,10 +58,10 @@ glabel EnShopnuts_Update /* 00AD0 80AFB1F0 256BAF64 */ addiu $t3, $t3, %lo(func_80AFAF64) ## $t3 = FFFFAF64 /* 00AD4 80AFB1F4 15630012 */ bne $t3, $v1, .L80AFB240 /* 00AD8 80AFB1F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ADC 80AFB1FC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00ADC 80AFB1FC 3C040600 */ lui $a0, %hi(D_0600039C) ## $a0 = 06000000 /* 00AE0 80AFB200 0C028800 */ jal SkelAnime_GetFrameCount -/* 00AE4 80AFB204 2484039C */ addiu $a0, $a0, 0x039C ## $a0 = 0600039C +/* 00AE4 80AFB204 2484039C */ addiu $a0, $a0, %lo(D_0600039C) ## $a0 = 0600039C /* 00AE8 80AFB208 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00AEC 80AFB20C 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 /* 00AF0 80AFB210 C60A0164 */ lwc1 $f10, 0x0164($s0) ## 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s index 45b34d0cb3..a721322dc7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s @@ -2,8 +2,8 @@ glabel func_80AFA880 /* 00160 80AFA880 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00164 80AFA884 AFBF0014 */ sw $ra, 0x0014($sp) /* 00168 80AFA888 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0016C 80AFA88C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00170 80AFA890 24A5139C */ addiu $a1, $a1, 0x139C ## $a1 = 0600139C +/* 0016C 80AFA88C 3C050600 */ lui $a1, %hi(D_0600139C) ## $a1 = 06000000 +/* 00170 80AFA890 24A5139C */ addiu $a1, $a1, %lo(D_0600139C) ## $a1 = 0600139C /* 00174 80AFA894 AFA70018 */ sw $a3, 0x0018($sp) /* 00178 80AFA898 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0017C 80AFA89C 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s index 9a54135906..e02a9ee5ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s @@ -2,8 +2,8 @@ glabel func_80AFA8E8 /* 001C8 80AFA8E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 001CC 80AFA8EC AFBF0014 */ sw $ra, 0x0014($sp) /* 001D0 80AFA8F0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 001D4 80AFA8F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 001D8 80AFA8F8 24A50BA0 */ addiu $a1, $a1, 0x0BA0 ## $a1 = 06000BA0 +/* 001D4 80AFA8F4 3C050600 */ lui $a1, %hi(D_06000BA0) ## $a1 = 06000000 +/* 001D8 80AFA8F8 24A50BA0 */ addiu $a1, $a1, %lo(D_06000BA0) ## $a1 = 06000BA0 /* 001DC 80AFA8FC AFA60018 */ sw $a2, 0x0018($sp) /* 001E0 80AFA900 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 001E4 80AFA904 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA930.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA930.s index 2ddcf92c93..e5ffbf47aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA930.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA930.s @@ -2,8 +2,8 @@ glabel func_80AFA930 /* 00210 80AFA930 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00214 80AFA934 AFBF0014 */ sw $ra, 0x0014($sp) /* 00218 80AFA938 AFA40018 */ sw $a0, 0x0018($sp) -/* 0021C 80AFA93C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00220 80AFA940 24A501EC */ addiu $a1, $a1, 0x01EC ## $a1 = 060001EC +/* 0021C 80AFA93C 3C050600 */ lui $a1, %hi(D_060001EC) ## $a1 = 06000000 +/* 00220 80AFA940 24A501EC */ addiu $a1, $a1, %lo(D_060001EC) ## $a1 = 060001EC /* 00224 80AFA944 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00228 80AFA948 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0022C 80AFA94C 8FAF0018 */ lw $t7, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s index 4e6a3d46f9..7db897312f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s @@ -2,8 +2,8 @@ glabel func_80AFA96C /* 0024C 80AFA96C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00250 80AFA970 AFBF0014 */ sw $ra, 0x0014($sp) /* 00254 80AFA974 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00258 80AFA978 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0025C 80AFA97C 24A54574 */ addiu $a1, $a1, 0x4574 ## $a1 = 06004574 +/* 00258 80AFA978 3C050600 */ lui $a1, %hi(D_06004574) ## $a1 = 06000000 +/* 0025C 80AFA97C 24A54574 */ addiu $a1, $a1, %lo(D_06004574) ## $a1 = 06004574 /* 00260 80AFA980 AFA70018 */ sw $a3, 0x0018($sp) /* 00264 80AFA984 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00268 80AFA988 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA9D4.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA9D4.s index 8c1dc1e6a7..fb2c66b2c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA9D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA9D4.s @@ -2,8 +2,8 @@ glabel func_80AFA9D4 /* 002B4 80AFA9D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 002B8 80AFA9D8 AFBF0014 */ sw $ra, 0x0014($sp) /* 002BC 80AFA9DC AFA40018 */ sw $a0, 0x0018($sp) -/* 002C0 80AFA9E0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 002C4 80AFA9E4 24A5039C */ addiu $a1, $a1, 0x039C ## $a1 = 0600039C +/* 002C0 80AFA9E0 3C050600 */ lui $a1, %hi(D_0600039C) ## $a1 = 06000000 +/* 002C4 80AFA9E4 24A5039C */ addiu $a1, $a1, %lo(D_0600039C) ## $a1 = 0600039C /* 002C8 80AFA9E8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 002CC 80AFA9EC 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 002D0 80AFA9F0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA20.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA20.s index 728eff05bb..53ea442e80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA20.s @@ -2,8 +2,8 @@ glabel func_80AFAA20 /* 00300 80AFAA20 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00304 80AFAA24 AFBF0014 */ sw $ra, 0x0014($sp) /* 00308 80AFAA28 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0030C 80AFAA2C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00310 80AFAA30 24A50764 */ addiu $a1, $a1, 0x0764 ## $a1 = 06000764 +/* 0030C 80AFAA2C 3C050600 */ lui $a1, %hi(D_06000764) ## $a1 = 06000000 +/* 00310 80AFAA30 24A50764 */ addiu $a1, $a1, %lo(D_06000764) ## $a1 = 06000764 /* 00314 80AFAA34 AFA70018 */ sw $a3, 0x0018($sp) /* 00318 80AFAA38 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0031C 80AFAA3C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB290.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB290.s index 76b32bfdca..13b1088394 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB290.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB290.s @@ -129,8 +129,8 @@ glabel func_80AFB290 /* 00CEC 80AFB40C 0C0346A2 */ jal Matrix_NewMtx /* 00CF0 80AFB410 AFA20024 */ sw $v0, 0x0024($sp) /* 00CF4 80AFB414 8FA30024 */ lw $v1, 0x0024($sp) -/* 00CF8 80AFB418 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 00CFC 80AFB41C 25CE3B68 */ addiu $t6, $t6, 0x3B68 ## $t6 = 06003B68 +/* 00CF8 80AFB418 3C0E0600 */ lui $t6, %hi(D_06003B68) ## $t6 = 06000000 +/* 00CFC 80AFB41C 25CE3B68 */ addiu $t6, $t6, %lo(D_06003B68) ## $t6 = 06003B68 /* 00D00 80AFB420 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00D04 80AFB424 8FAC0038 */ lw $t4, 0x0038($sp) /* 00D08 80AFB428 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 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 4d39dd39d2..c887128ac3 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 @@ -41,16 +41,16 @@ glabel EnSkb_Init /* 0022C 80AFCBCC A20800AF */ sb $t0, 0x00AF($s0) ## 000000AF /* 00230 80AFCBD0 E60400BC */ swc1 $f4, 0x00BC($s0) ## 000000BC /* 00234 80AFCBD4 AE180040 */ sw $t8, 0x0040($s0) ## 00000040 -/* 00238 80AFCBD8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 0023C 80AFCBDC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00238 80AFCBD8 3C060600 */ lui $a2, %hi(D_060041F8) ## $a2 = 06000000 +/* 0023C 80AFCBDC 3C070600 */ lui $a3, %hi(D_06001854) ## $a3 = 06000000 /* 00240 80AFCBE0 26090190 */ addiu $t1, $s0, 0x0190 ## $t1 = 00000190 /* 00244 80AFCBE4 260A0208 */ addiu $t2, $s0, 0x0208 ## $t2 = 00000208 /* 00248 80AFCBE8 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 /* 0024C 80AFCBEC AFAB0018 */ sw $t3, 0x0018($sp) /* 00250 80AFCBF0 AFAA0014 */ sw $t2, 0x0014($sp) /* 00254 80AFCBF4 AFA90010 */ sw $t1, 0x0010($sp) -/* 00258 80AFCBF8 24E71854 */ addiu $a3, $a3, 0x1854 ## $a3 = 06001854 -/* 0025C 80AFCBFC 24C641F8 */ addiu $a2, $a2, 0x41F8 ## $a2 = 060041F8 +/* 00258 80AFCBF8 24E71854 */ addiu $a3, $a3, %lo(D_06001854) ## $a3 = 06001854 +/* 0025C 80AFCBFC 24C641F8 */ addiu $a2, $a2, %lo(D_060041F8) ## $a2 = 060041F8 /* 00260 80AFCC00 AFA20034 */ sw $v0, 0x0034($sp) /* 00264 80AFCC04 8FA40044 */ lw $a0, 0x0044($sp) /* 00268 80AFCC08 0C02915F */ jal SkelAnime_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s index 274e878593..d9de0b748f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s @@ -2,8 +2,8 @@ glabel func_80AFCDF8 /* 00458 80AFCDF8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0045C 80AFCDFC AFBF0014 */ sw $ra, 0x0014($sp) /* 00460 80AFCE00 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00464 80AFCE04 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00468 80AFCE08 24A51854 */ addiu $a1, $a1, 0x1854 ## $a1 = 06001854 +/* 00464 80AFCE04 3C050600 */ lui $a1, %hi(D_06001854) ## $a1 = 06000000 +/* 00468 80AFCE08 24A51854 */ addiu $a1, $a1, %lo(D_06001854) ## $a1 = 06001854 /* 0046C 80AFCE0C AFA70018 */ sw $a3, 0x0018($sp) /* 00470 80AFCE10 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00474 80AFCE14 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCF48.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCF48.s index 8c3f507723..bb3facf573 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCF48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCF48.s @@ -3,19 +3,19 @@ glabel func_80AFCF48 /* 005AC 80AFCF4C AFB00028 */ sw $s0, 0x0028($sp) /* 005B0 80AFCF50 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 005B4 80AFCF54 AFBF002C */ sw $ra, 0x002C($sp) -/* 005B8 80AFCF58 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 005B8 80AFCF58 3C040600 */ lui $a0, %hi(D_06001854) ## $a0 = 06000000 /* 005BC 80AFCF5C 0C028800 */ jal SkelAnime_GetFrameCount -/* 005C0 80AFCF60 24841854 */ addiu $a0, $a0, 0x1854 ## $a0 = 06001854 +/* 005C0 80AFCF60 24841854 */ addiu $a0, $a0, %lo(D_06001854) ## $a0 = 06001854 /* 005C4 80AFCF64 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 005C8 80AFCF68 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 005CC 80AFCF6C 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 005D0 80AFCF70 46802120 */ cvt.s.w $f4, $f4 /* 005D4 80AFCF74 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 005D8 80AFCF78 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 005D8 80AFCF78 3C050600 */ lui $a1, %hi(D_06001854) ## $a1 = 06000000 /* 005DC 80AFCF7C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 005E0 80AFCF80 AFAE0014 */ sw $t6, 0x0014($sp) -/* 005E4 80AFCF84 24A51854 */ addiu $a1, $a1, 0x1854 ## $a1 = 06001854 +/* 005E4 80AFCF84 24A51854 */ addiu $a1, $a1, %lo(D_06001854) ## $a1 = 06001854 /* 005E8 80AFCF88 44072000 */ mfc1 $a3, $f4 /* 005EC 80AFCF8C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 005F0 80AFCF90 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD0A4.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD0A4.s index 69f56b6bec..5f3482e969 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD0A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD0A4.s @@ -3,18 +3,18 @@ glabel func_80AFD0A4 /* 00708 80AFD0A8 AFB00028 */ sw $s0, 0x0028($sp) /* 0070C 80AFD0AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00710 80AFD0B0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00714 80AFD0B4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00714 80AFD0B4 3C040600 */ lui $a0, %hi(D_060047E0) ## $a0 = 06000000 /* 00718 80AFD0B8 0C028800 */ jal SkelAnime_GetFrameCount -/* 0071C 80AFD0BC 248447E0 */ addiu $a0, $a0, 0x47E0 ## $a0 = 060047E0 +/* 0071C 80AFD0BC 248447E0 */ addiu $a0, $a0, %lo(D_060047E0) ## $a0 = 060047E0 /* 00720 80AFD0C0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00724 80AFD0C4 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00728 80AFD0C8 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 0072C 80AFD0CC 468021A0 */ cvt.s.w $f6, $f4 -/* 00730 80AFD0D0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00730 80AFD0D0 3C050600 */ lui $a1, %hi(D_060047E0) ## $a1 = 06000000 /* 00734 80AFD0D4 3C063F75 */ lui $a2, 0x3F75 ## $a2 = 3F750000 /* 00738 80AFD0D8 34C6C290 */ ori $a2, $a2, 0xC290 ## $a2 = 3F75C290 -/* 0073C 80AFD0DC 24A547E0 */ addiu $a1, $a1, 0x47E0 ## $a1 = 060047E0 +/* 0073C 80AFD0DC 24A547E0 */ addiu $a1, $a1, %lo(D_060047E0) ## $a1 = 060047E0 /* 00740 80AFD0E0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00744 80AFD0E4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00748 80AFD0E8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD33C.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD33C.s index 55d040bb26..4187a959e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD33C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD33C.s @@ -3,20 +3,20 @@ glabel func_80AFD33C /* 009A0 80AFD340 AFB00028 */ sw $s0, 0x0028($sp) /* 009A4 80AFD344 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 009A8 80AFD348 AFBF002C */ sw $ra, 0x002C($sp) -/* 009AC 80AFD34C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 009AC 80AFD34C 3C040600 */ lui $a0, %hi(D_06000460) ## $a0 = 06000000 /* 009B0 80AFD350 0C028800 */ jal SkelAnime_GetFrameCount -/* 009B4 80AFD354 24840460 */ addiu $a0, $a0, 0x0460 ## $a0 = 06000460 +/* 009B4 80AFD354 24840460 */ addiu $a0, $a0, %lo(D_06000460) ## $a0 = 06000460 /* 009B8 80AFD358 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 009BC 80AFD35C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 009C0 80AFD360 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 /* 009C4 80AFD364 468021A0 */ cvt.s.w $f6, $f4 -/* 009C8 80AFD368 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 009C8 80AFD368 3C050600 */ lui $a1, %hi(D_06000460) ## $a1 = 06000000 /* 009CC 80AFD36C 3C063F19 */ lui $a2, 0x3F19 ## $a2 = 3F190000 /* 009D0 80AFD370 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 009D4 80AFD374 AFAE0014 */ sw $t6, 0x0014($sp) /* 009D8 80AFD378 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3F19999A -/* 009DC 80AFD37C 24A50460 */ addiu $a1, $a1, 0x0460 ## $a1 = 06000460 +/* 009DC 80AFD37C 24A50460 */ addiu $a1, $a1, %lo(D_06000460) ## $a1 = 06000460 /* 009E0 80AFD380 E7A60010 */ swc1 $f6, 0x0010($sp) /* 009E4 80AFD384 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 009E8 80AFD388 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD47C.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD47C.s index df586cbb0c..9b3c6beadb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD47C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD47C.s @@ -7,14 +7,14 @@ glabel func_80AFD47C /* 00AF0 80AFD490 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 /* 00AF4 80AFD494 C6040164 */ lwc1 $f4, 0x0164($s0) ## 00000164 /* 00AF8 80AFD498 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00AFC 80AFD49C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00AFC 80AFD49C 3C050600 */ lui $a1, %hi(D_06000460) ## $a1 = 06000000 /* 00B00 80AFD4A0 46062201 */ sub.s $f8, $f4, $f6 /* 00B04 80AFD4A4 3C06BECC */ lui $a2, 0xBECC ## $a2 = BECC0000 /* 00B08 80AFD4A8 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 00B0C 80AFD4AC AFAE0014 */ sw $t6, 0x0014($sp) /* 00B10 80AFD4B0 44074000 */ mfc1 $a3, $f8 /* 00B14 80AFD4B4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = BECCCCCD -/* 00B18 80AFD4B8 24A50460 */ addiu $a1, $a1, 0x0460 ## $a1 = 06000460 +/* 00B18 80AFD4B8 24A50460 */ addiu $a1, $a1, %lo(D_06000460) ## $a1 = 06000460 /* 00B1C 80AFD4BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00B20 80AFD4C0 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00B24 80AFD4C4 0C029468 */ jal SkelAnime_ChangeAnim diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s index e529d96d8a..03c60bb554 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s @@ -2,8 +2,8 @@ glabel func_80AFD644 /* 00CA4 80AFD644 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00CA8 80AFD648 AFBF0014 */ sw $ra, 0x0014($sp) /* 00CAC 80AFD64C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00CB0 80AFD650 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00CB4 80AFD654 24A50D98 */ addiu $a1, $a1, 0x0D98 ## $a1 = 06000D98 +/* 00CB0 80AFD650 3C050600 */ lui $a1, %hi(D_06000D98) ## $a1 = 06000000 +/* 00CB4 80AFD654 24A50D98 */ addiu $a1, $a1, %lo(D_06000D98) ## $a1 = 06000D98 /* 00CB8 80AFD658 AFA70018 */ sw $a3, 0x0018($sp) /* 00CBC 80AFD65C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00CC0 80AFD660 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s index ae7efb45e3..c86f75624b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s @@ -4,8 +4,8 @@ glabel func_80AFD7B4 /* 00E1C 80AFD7BC AFA5002C */ sw $a1, 0x002C($sp) /* 00E20 80AFD7C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00E24 80AFD7C4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00E28 80AFD7C8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00E2C 80AFD7CC 24A509DC */ addiu $a1, $a1, 0x09DC ## $a1 = 060009DC +/* 00E28 80AFD7C8 3C050600 */ lui $a1, %hi(D_060009DC) ## $a1 = 06000000 +/* 00E2C 80AFD7CC 24A509DC */ addiu $a1, $a1, %lo(D_060009DC) ## $a1 = 060009DC /* 00E30 80AFD7D0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00E34 80AFD7D4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00E38 80AFD7D8 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 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 8b8862d439..0bd9ea7273 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 @@ -105,16 +105,16 @@ glabel EnSkj_Init .L80AFE62C: /* 0037C 80AFE62C 0C2BF90A */ jal func_80AFE428 /* 00380 80AFE630 A7A3004E */ sh $v1, 0x004E($sp) -/* 00384 80AFE634 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00388 80AFE638 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00384 80AFE634 3C060600 */ lui $a2, %hi(D_06005F40) ## $a2 = 06000000 +/* 00388 80AFE638 3C070600 */ lui $a3, %hi(D_06000E10) ## $a3 = 06000000 /* 0038C 80AFE63C 26090190 */ addiu $t1, $s0, 0x0190 ## $t1 = 00000190 /* 00390 80AFE640 260A0202 */ addiu $t2, $s0, 0x0202 ## $t2 = 00000202 /* 00394 80AFE644 240B0013 */ addiu $t3, $zero, 0x0013 ## $t3 = 00000013 /* 00398 80AFE648 AFAB0018 */ sw $t3, 0x0018($sp) /* 0039C 80AFE64C AFAA0014 */ sw $t2, 0x0014($sp) /* 003A0 80AFE650 AFA90010 */ sw $t1, 0x0010($sp) -/* 003A4 80AFE654 24E70E10 */ addiu $a3, $a3, 0x0E10 ## $a3 = 06000E10 -/* 003A8 80AFE658 24C65F40 */ addiu $a2, $a2, 0x5F40 ## $a2 = 06005F40 +/* 003A4 80AFE654 24E70E10 */ addiu $a3, $a3, %lo(D_06000E10) ## $a3 = 06000E10 +/* 003A8 80AFE658 24C65F40 */ addiu $a2, $a2, %lo(D_06005F40) ## $a2 = 06005F40 /* 003AC 80AFE65C 8FA40054 */ lw $a0, 0x0054($sp) /* 003B0 80AFE660 0C0291BE */ jal SkelAnime_InitFlex /* 003B4 80AFE664 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEF98.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEF98.s index 97cd52cc8f..dd9b3d81dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEF98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEF98.s @@ -2,9 +2,9 @@ glabel func_80AFEF98 /* 00CE8 80AFEF98 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00CEC 80AFEF9C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00CF0 80AFEFA0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00CF4 80AFEFA4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00CF4 80AFEFA4 3C040600 */ lui $a0, %hi(D_060007A4) ## $a0 = 06000000 /* 00CF8 80AFEFA8 AFA50024 */ sw $a1, 0x0024($sp) -/* 00CFC 80AFEFAC 248407A4 */ addiu $a0, $a0, 0x07A4 ## $a0 = 060007A4 +/* 00CFC 80AFEFAC 248407A4 */ addiu $a0, $a0, %lo(D_060007A4) ## $a0 = 060007A4 /* 00D00 80AFEFB0 0C028800 */ jal SkelAnime_GetFrameCount /* 00D04 80AFEFB4 AFA60020 */ sw $a2, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF19C.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF19C.s index e881accdf6..1dd75fc695 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF19C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF19C.s @@ -2,11 +2,11 @@ glabel func_80AFF19C /* 00EEC 80AFF19C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00EF0 80AFF1A0 AFA40018 */ sw $a0, 0x0018($sp) /* 00EF4 80AFF1A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00EF8 80AFF1A8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00EF8 80AFF1A8 3C040600 */ lui $a0, %hi(D_06006A98) ## $a0 = 06000000 /* 00EFC 80AFF1AC AFA5001C */ sw $a1, 0x001C($sp) /* 00F00 80AFF1B0 0C028800 */ jal SkelAnime_GetFrameCount -/* 00F04 80AFF1B4 24846A98 */ addiu $a0, $a0, 0x6A98 ## $a0 = 06006A98 +/* 00F04 80AFF1B4 24846A98 */ addiu $a0, $a0, %lo(D_06006A98) ## $a0 = 06006A98 /* 00F08 80AFF1B8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00F0C 80AFF1BC 8FA40018 */ lw $a0, 0x0018($sp) /* 00F10 80AFF1C0 468021A0 */ cvt.s.w $f6, $f4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF220.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF220.s index eb8ef92fee..8ce18013f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF220.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF220.s @@ -4,8 +4,8 @@ glabel func_80AFF220 /* 00F78 80AFF228 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 00F7C 80AFF22C AFA40018 */ sw $a0, 0x0018($sp) /* 00F80 80AFF230 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F84 80AFF234 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00F88 80AFF238 24846D84 */ addiu $a0, $a0, 0x6D84 ## $a0 = 06006D84 +/* 00F84 80AFF234 3C040600 */ lui $a0, %hi(D_06006D84) ## $a0 = 06000000 +/* 00F88 80AFF238 24846D84 */ addiu $a0, $a0, %lo(D_06006D84) ## $a0 = 06006D84 /* 00F8C 80AFF23C 0C028800 */ jal SkelAnime_GetFrameCount /* 00F90 80AFF240 AFA50018 */ sw $a1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF2E0.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF2E0.s index 7fce449070..e8dc8514be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF2E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF2E0.s @@ -2,11 +2,11 @@ glabel func_80AFF2E0 /* 01030 80AFF2E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01034 80AFF2E4 AFA40018 */ sw $a0, 0x0018($sp) /* 01038 80AFF2E8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0103C 80AFF2EC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0103C 80AFF2EC 3C040600 */ lui $a0, %hi(D_06007128) ## $a0 = 06000000 /* 01040 80AFF2F0 AFA5001C */ sw $a1, 0x001C($sp) /* 01044 80AFF2F4 0C028800 */ jal SkelAnime_GetFrameCount -/* 01048 80AFF2F8 24847128 */ addiu $a0, $a0, 0x7128 ## $a0 = 06007128 +/* 01048 80AFF2F8 24847128 */ addiu $a0, $a0, %lo(D_06007128) ## $a0 = 06007128 /* 0104C 80AFF2FC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01050 80AFF300 8FA40018 */ lw $a0, 0x0018($sp) /* 01054 80AFF304 468021A0 */ cvt.s.w $f6, $f4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00098.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00098.s index 74644cfe60..854f2963e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00098.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00098.s @@ -2,11 +2,11 @@ glabel func_80B00098 /* 01DE8 80B00098 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01DEC 80B0009C AFA40018 */ sw $a0, 0x0018($sp) /* 01DF0 80B000A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01DF4 80B000A4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01DF4 80B000A4 3C040600 */ lui $a0, %hi(D_06007128) ## $a0 = 06000000 /* 01DF8 80B000A8 AFA5001C */ sw $a1, 0x001C($sp) /* 01DFC 80B000AC 0C028800 */ jal SkelAnime_GetFrameCount -/* 01E00 80B000B0 24847128 */ addiu $a0, $a0, 0x7128 ## $a0 = 06007128 +/* 01E00 80B000B0 24847128 */ addiu $a0, $a0, %lo(D_06007128) ## $a0 = 06007128 /* 01E04 80B000B4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01E08 80B000B8 8FA40018 */ lw $a0, 0x0018($sp) /* 01E0C 80B000BC 468021A0 */ cvt.s.w $f6, $f4 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 4695695483..3e90b96ec1 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 @@ -46,8 +46,8 @@ glabel func_80B01360 /* 03160 80B01410 0C0346A2 */ jal Matrix_NewMtx /* 03164 80B01414 AFA20028 */ sw $v0, 0x0028($sp) /* 03168 80B01418 8FA30028 */ lw $v1, 0x0028($sp) -/* 0316C 80B0141C 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 03170 80B01420 25CE14C8 */ addiu $t6, $t6, 0x14C8 ## $t6 = 060014C8 +/* 0316C 80B0141C 3C0E0600 */ lui $t6, %hi(D_060014C8) ## $t6 = 06000000 +/* 03170 80B01420 25CE14C8 */ addiu $t6, $t6, %lo(D_060014C8) ## $t6 = 060014C8 /* 03174 80B01424 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 03178 80B01428 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0317C 80B0142C 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 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 7f708d9c77..c29d25d8c5 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 @@ -72,14 +72,14 @@ glabel EnSw_Init /* 00848 80B0C5F8 100000EF */ beq $zero, $zero, .L80B0C9B8 /* 0084C 80B0C5FC 8FBF002C */ lw $ra, 0x002C($sp) .L80B0C600: -/* 00850 80B0C600 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 00850 80B0C600 3C060600 */ lui $a2, %hi(D_06005298) ## $a2 = 06000000 /* 00854 80B0C604 261801F8 */ addiu $t8, $s0, 0x01F8 ## $t8 = 000001F8 /* 00858 80B0C608 261902AC */ addiu $t9, $s0, 0x02AC ## $t9 = 000002AC /* 0085C 80B0C60C 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E /* 00860 80B0C610 AFA80018 */ sw $t0, 0x0018($sp) /* 00864 80B0C614 AFB90014 */ sw $t9, 0x0014($sp) /* 00868 80B0C618 AFB80010 */ sw $t8, 0x0010($sp) -/* 0086C 80B0C61C 24C65298 */ addiu $a2, $a2, 0x5298 ## $a2 = 06005298 +/* 0086C 80B0C61C 24C65298 */ addiu $a2, $a2, %lo(D_06005298) ## $a2 = 06005298 /* 00870 80B0C620 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00874 80B0C624 0C02915F */ jal SkelAnime_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E430.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E430.s index 127ff18d60..541b3f7c0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E430.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E430.s @@ -11,13 +11,13 @@ glabel func_80B0E430 /* 02684 80B0E434 AFB00020 */ sw $s0, 0x0020($sp) /* 02688 80B0E438 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0268C 80B0E43C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02690 80B0E440 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 02690 80B0E440 3C040600 */ lui $a0, %hi(D_06000304) ## $a0 = 06000000 /* 02694 80B0E444 AFA50034 */ sw $a1, 0x0034($sp) /* 02698 80B0E448 AFA60038 */ sw $a2, 0x0038($sp) /* 0269C 80B0E44C AFA7003C */ sw $a3, 0x003C($sp) /* 026A0 80B0E450 0C028800 */ jal SkelAnime_GetFrameCount -/* 026A4 80B0E454 24840304 */ addiu $a0, $a0, 0x0304 ## $a0 = 06000304 +/* 026A4 80B0E454 24840304 */ addiu $a0, $a0, %lo(D_06000304) ## $a0 = 06000304 /* 026A8 80B0E458 86030388 */ lh $v1, 0x0388($s0) ## 00000388 /* 026AC 80B0E45C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 026B0 80B0E460 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s index dc9b342dbb..8d1d8dbc56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s @@ -125,53 +125,53 @@ glabel func_80B0EAC4 /* 02E64 80B0EC14 01800008 */ jr $t4 /* 02E68 80B0EC18 00000000 */ nop glabel L80B0EC1C -/* 02E6C 80B0EC1C 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 02E70 80B0EC20 25AD4788 */ addiu $t5, $t5, 0x4788 ## $t5 = 06004788 +/* 02E6C 80B0EC1C 3C0D0600 */ lui $t5, %hi(D_06004788) ## $t5 = 06000000 +/* 02E70 80B0EC20 25AD4788 */ addiu $t5, $t5, %lo(D_06004788) ## $t5 = 06004788 /* 02E74 80B0EC24 10000024 */ beq $zero, $zero, .L80B0ECB8 /* 02E78 80B0EC28 AE0D0000 */ sw $t5, 0x0000($s0) ## 00000000 glabel L80B0EC2C -/* 02E7C 80B0EC2C 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 02E80 80B0EC30 25CE46F0 */ addiu $t6, $t6, 0x46F0 ## $t6 = 060046F0 +/* 02E7C 80B0EC2C 3C0E0600 */ lui $t6, %hi(D_060046F0) ## $t6 = 06000000 +/* 02E80 80B0EC30 25CE46F0 */ addiu $t6, $t6, %lo(D_060046F0) ## $t6 = 060046F0 /* 02E84 80B0EC34 10000020 */ beq $zero, $zero, .L80B0ECB8 /* 02E88 80B0EC38 AE0E0000 */ sw $t6, 0x0000($s0) ## 00000000 glabel L80B0EC3C -/* 02E8C 80B0EC3C 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 02E90 80B0EC40 25EF4658 */ addiu $t7, $t7, 0x4658 ## $t7 = 06004658 +/* 02E8C 80B0EC3C 3C0F0600 */ lui $t7, %hi(D_06004658) ## $t7 = 06000000 +/* 02E90 80B0EC40 25EF4658 */ addiu $t7, $t7, %lo(D_06004658) ## $t7 = 06004658 /* 02E94 80B0EC44 1000001C */ beq $zero, $zero, .L80B0ECB8 /* 02E98 80B0EC48 AE0F0000 */ sw $t7, 0x0000($s0) ## 00000000 glabel L80B0EC4C -/* 02E9C 80B0EC4C 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 02EA0 80B0EC50 271845C0 */ addiu $t8, $t8, 0x45C0 ## $t8 = 060045C0 +/* 02E9C 80B0EC4C 3C180600 */ lui $t8, %hi(D_060045C0) ## $t8 = 06000000 +/* 02EA0 80B0EC50 271845C0 */ addiu $t8, $t8, %lo(D_060045C0) ## $t8 = 060045C0 /* 02EA4 80B0EC54 10000018 */ beq $zero, $zero, .L80B0ECB8 /* 02EA8 80B0EC58 AE180000 */ sw $t8, 0x0000($s0) ## 00000000 glabel L80B0EC5C -/* 02EAC 80B0EC5C 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 02EB0 80B0EC60 27394820 */ addiu $t9, $t9, 0x4820 ## $t9 = 06004820 +/* 02EAC 80B0EC5C 3C190600 */ lui $t9, %hi(D_06004820) ## $t9 = 06000000 +/* 02EB0 80B0EC60 27394820 */ addiu $t9, $t9, %lo(D_06004820) ## $t9 = 06004820 /* 02EB4 80B0EC64 10000014 */ beq $zero, $zero, .L80B0ECB8 /* 02EB8 80B0EC68 AE190000 */ sw $t9, 0x0000($s0) ## 00000000 glabel L80B0EC6C -/* 02EBC 80B0EC6C 3C080600 */ lui $t0, 0x0600 ## $t0 = 06000000 -/* 02EC0 80B0EC70 250848B8 */ addiu $t0, $t0, 0x48B8 ## $t0 = 060048B8 +/* 02EBC 80B0EC6C 3C080600 */ lui $t0, %hi(D_060048B8) ## $t0 = 06000000 +/* 02EC0 80B0EC70 250848B8 */ addiu $t0, $t0, %lo(D_060048B8) ## $t0 = 060048B8 /* 02EC4 80B0EC74 10000010 */ beq $zero, $zero, .L80B0ECB8 /* 02EC8 80B0EC78 AE080000 */ sw $t0, 0x0000($s0) ## 00000000 glabel L80B0EC7C -/* 02ECC 80B0EC7C 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 02ED0 80B0EC80 25294950 */ addiu $t1, $t1, 0x4950 ## $t1 = 06004950 +/* 02ECC 80B0EC7C 3C090600 */ lui $t1, %hi(D_06004950) ## $t1 = 06000000 +/* 02ED0 80B0EC80 25294950 */ addiu $t1, $t1, %lo(D_06004950) ## $t1 = 06004950 /* 02ED4 80B0EC84 1000000C */ beq $zero, $zero, .L80B0ECB8 /* 02ED8 80B0EC88 AE090000 */ sw $t1, 0x0000($s0) ## 00000000 glabel L80B0EC8C -/* 02EDC 80B0EC8C 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 02EE0 80B0EC90 254A49E8 */ addiu $t2, $t2, 0x49E8 ## $t2 = 060049E8 +/* 02EDC 80B0EC8C 3C0A0600 */ lui $t2, %hi(D_060049E8) ## $t2 = 06000000 +/* 02EE0 80B0EC90 254A49E8 */ addiu $t2, $t2, %lo(D_060049E8) ## $t2 = 060049E8 /* 02EE4 80B0EC94 10000008 */ beq $zero, $zero, .L80B0ECB8 /* 02EE8 80B0EC98 AE0A0000 */ sw $t2, 0x0000($s0) ## 00000000 glabel L80B0EC9C -/* 02EEC 80B0EC9C 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 -/* 02EF0 80B0ECA0 256B3FB0 */ addiu $t3, $t3, 0x3FB0 ## $t3 = 06003FB0 +/* 02EEC 80B0EC9C 3C0B0600 */ lui $t3, %hi(D_06003FB0) ## $t3 = 06000000 +/* 02EF0 80B0ECA0 256B3FB0 */ addiu $t3, $t3, %lo(D_06003FB0) ## $t3 = 06003FB0 /* 02EF4 80B0ECA4 10000004 */ beq $zero, $zero, .L80B0ECB8 /* 02EF8 80B0ECA8 AE0B0000 */ sw $t3, 0x0000($s0) ## 00000000 glabel L80B0ECAC -/* 02EFC 80B0ECAC 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 -/* 02F00 80B0ECB0 258C43D8 */ addiu $t4, $t4, 0x43D8 ## $t4 = 060043D8 +/* 02EFC 80B0ECAC 3C0C0600 */ lui $t4, %hi(D_060043D8) ## $t4 = 06000000 +/* 02F00 80B0ECB0 258C43D8 */ addiu $t4, $t4, %lo(D_060043D8) ## $t4 = 060043D8 /* 02F04 80B0ECB4 AE0C0000 */ sw $t4, 0x0000($s0) ## 00000000 glabel L80B0ECB8 .L80B0ECB8: 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 e6f6e1a36f..4a22ea6e0b 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 @@ -9,30 +9,30 @@ glabel EnTest_Init /* 00024 8085F674 0C01E037 */ jal Actor_ProcessInitChain /* 00028 8085F678 24A54638 */ addiu $a1, $a1, %lo(D_80864638) ## $a1 = 80864638 -/* 0002C 8085F67C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00030 8085F680 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 0002C 8085F67C 3C060600 */ lui $a2, %hi(D_06007C28) ## $a2 = 06000000 +/* 00030 8085F680 3C070600 */ lui $a3, %hi(D_0600316C) ## $a3 = 06000000 /* 00034 8085F684 260E01CC */ addiu $t6, $s0, 0x01CC ## $t6 = 000001CC /* 00038 8085F688 260F033A */ addiu $t7, $s0, 0x033A ## $t7 = 0000033A /* 0003C 8085F68C 2418003D */ addiu $t8, $zero, 0x003D ## $t8 = 0000003D /* 00040 8085F690 AFB80018 */ sw $t8, 0x0018($sp) /* 00044 8085F694 AFAF0014 */ sw $t7, 0x0014($sp) /* 00048 8085F698 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0004C 8085F69C 24E7316C */ addiu $a3, $a3, 0x316C ## $a3 = 0600316C -/* 00050 8085F6A0 24C67C28 */ addiu $a2, $a2, 0x7C28 ## $a2 = 06007C28 +/* 0004C 8085F69C 24E7316C */ addiu $a3, $a3, %lo(D_0600316C) ## $a3 = 0600316C +/* 00050 8085F6A0 24C67C28 */ addiu $a2, $a2, %lo(D_06007C28) ## $a2 = 06007C28 /* 00054 8085F6A4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00058 8085F6A8 0C02915F */ jal SkelAnime_Init /* 0005C 8085F6AC 26050188 */ addiu $a1, $s0, 0x0188 ## $a1 = 00000188 -/* 00060 8085F6B0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00064 8085F6B4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00060 8085F6B0 3C060600 */ lui $a2, %hi(D_06007C28) ## $a2 = 06000000 +/* 00064 8085F6B4 3C070600 */ lui $a3, %hi(D_0600316C) ## $a3 = 06000000 /* 00068 8085F6B8 261904EC */ addiu $t9, $s0, 0x04EC ## $t9 = 000004EC /* 0006C 8085F6BC 2608065A */ addiu $t0, $s0, 0x065A ## $t0 = 0000065A /* 00070 8085F6C0 2409003D */ addiu $t1, $zero, 0x003D ## $t1 = 0000003D /* 00074 8085F6C4 AFA90018 */ sw $t1, 0x0018($sp) /* 00078 8085F6C8 AFA80014 */ sw $t0, 0x0014($sp) /* 0007C 8085F6CC AFB90010 */ sw $t9, 0x0010($sp) -/* 00080 8085F6D0 24E7316C */ addiu $a3, $a3, 0x316C ## $a3 = 0600316C -/* 00084 8085F6D4 24C67C28 */ addiu $a2, $a2, 0x7C28 ## $a2 = 06007C28 +/* 00080 8085F6D0 24E7316C */ addiu $a3, $a3, %lo(D_0600316C) ## $a3 = 0600316C +/* 00084 8085F6D4 24C67C28 */ addiu $a2, $a2, %lo(D_06007C28) ## $a2 = 06007C28 /* 00088 8085F6D8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0008C 8085F6DC 0C02915F */ jal SkelAnime_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 148bfa177b..254831d9cb 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 @@ -96,19 +96,19 @@ glabel EnTest_Update /* 0417C 808637CC 100000B6 */ beq $zero, $zero, .L80863AA8 /* 04180 808637D0 8FBF002C */ lw $ra, 0x002C($sp) glabel L808637D4 -/* 04184 808637D4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 04184 808637D4 3C040600 */ lui $a0, %hi(D_06001C20) ## $a0 = 06000000 /* 04188 808637D8 0C028800 */ jal SkelAnime_GetFrameCount -/* 0418C 808637DC 24841C20 */ addiu $a0, $a0, 0x1C20 ## $a0 = 06001C20 +/* 0418C 808637DC 24841C20 */ addiu $a0, $a0, %lo(D_06001C20) ## $a0 = 06001C20 /* 04190 808637E0 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 04194 808637E4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 04198 808637E8 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 /* 0419C 808637EC 46805420 */ cvt.s.w $f16, $f10 -/* 041A0 808637F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 041A0 808637F0 3C050600 */ lui $a1, %hi(D_06001C20) ## $a1 = 06000000 /* 041A4 808637F4 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 /* 041A8 808637F8 44060000 */ mfc1 $a2, $f0 /* 041AC 808637FC AFAB0014 */ sw $t3, 0x0014($sp) -/* 041B0 80863800 24A51C20 */ addiu $a1, $a1, 0x1C20 ## $a1 = 06001C20 +/* 041B0 80863800 24A51C20 */ addiu $a1, $a1, %lo(D_06001C20) ## $a1 = 06001C20 /* 041B4 80863804 E7B00010 */ swc1 $f16, 0x0010($sp) /* 041B8 80863808 260404A8 */ addiu $a0, $s0, 0x04A8 ## $a0 = 000004A8 /* 041BC 8086380C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s index 3698c67b08..b037d3c7c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s @@ -2,8 +2,8 @@ glabel func_8085FDD0 /* 00780 8085FDD0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00784 8085FDD4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00788 8085FDD8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0078C 8085FDDC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00790 8085FDE0 24A5316C */ addiu $a1, $a1, 0x316C ## $a1 = 0600316C +/* 0078C 8085FDDC 3C050600 */ lui $a1, %hi(D_0600316C) ## $a1 = 06000000 +/* 00790 8085FDE0 24A5316C */ addiu $a1, $a1, %lo(D_0600316C) ## $a1 = 0600316C /* 00794 8085FDE4 AFA60018 */ sw $a2, 0x0018($sp) /* 00798 8085FDE8 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 0079C 8085FDEC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s index cf76c9fe6a..7500d4354e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s @@ -2,8 +2,8 @@ glabel func_8085FF28 /* 008D8 8085FF28 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 008DC 8085FF2C AFBF0014 */ sw $ra, 0x0014($sp) /* 008E0 8085FF30 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 008E4 8085FF34 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 008E8 8085FF38 24A5316C */ addiu $a1, $a1, 0x316C ## $a1 = 0600316C +/* 008E4 8085FF34 3C050600 */ lui $a1, %hi(D_0600316C) ## $a1 = 06000000 +/* 008E8 8085FF38 24A5316C */ addiu $a1, $a1, %lo(D_0600316C) ## $a1 = 0600316C /* 008EC 8085FF3C AFA60018 */ sw $a2, 0x0018($sp) /* 008F0 8085FF40 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 008F4 8085FF44 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s index f4eaaaf643..db96192248 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s @@ -2,8 +2,8 @@ glabel func_80860068 /* 00A18 80860068 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00A1C 8086006C AFBF0014 */ sw $ra, 0x0014($sp) /* 00A20 80860070 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00A24 80860074 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00A28 80860078 24A5316C */ addiu $a1, $a1, 0x316C ## $a1 = 0600316C +/* 00A24 80860074 3C050600 */ lui $a1, %hi(D_0600316C) ## $a1 = 06000000 +/* 00A28 80860078 24A5316C */ addiu $a1, $a1, %lo(D_0600316C) ## $a1 = 0600316C /* 00A2C 8086007C AFA60018 */ sw $a2, 0x0018($sp) /* 00A30 80860080 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00A34 80860084 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s index 7330ce80b4..ba495d2a91 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s @@ -9,10 +9,10 @@ glabel func_80860318 /* 00CD0 80860320 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00CD4 80860324 AFA5002C */ sw $a1, 0x002C($sp) /* 00CD8 80860328 AFBF001C */ sw $ra, 0x001C($sp) -/* 00CDC 8086032C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 00CDC 8086032C 3C050601 */ lui $a1, %hi(D_0600C438) ## $a1 = 06010000 /* 00CE0 80860330 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 00CE4 80860334 AFA40024 */ sw $a0, 0x0024($sp) -/* 00CE8 80860338 24A5C438 */ addiu $a1, $a1, 0xC438 ## $a1 = 0600C438 +/* 00CE8 80860338 24A5C438 */ addiu $a1, $a1, %lo(D_0600C438) ## $a1 = 0600C438 /* 00CEC 8086033C 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 00CF0 80860340 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00CF4 80860344 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s index c7b382900c..20a8870335 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s @@ -3,27 +3,27 @@ glabel func_80860438 /* 00DEC 8086043C AFB00028 */ sw $s0, 0x0028($sp) /* 00DF0 80860440 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00DF4 80860444 AFBF002C */ sw $ra, 0x002C($sp) -/* 00DF8 80860448 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00DF8 80860448 3C040600 */ lui $a0, %hi(D_06001C20) ## $a0 = 06000000 /* 00DFC 8086044C 0C028800 */ jal SkelAnime_GetFrameCount -/* 00E00 80860450 24841C20 */ addiu $a0, $a0, 0x1C20 ## $a0 = 06001C20 +/* 00E00 80860450 24841C20 */ addiu $a0, $a0, %lo(D_06001C20) ## $a0 = 06001C20 /* 00E04 80860454 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00E08 80860458 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 00E0C 8086045C 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 /* 00E10 80860460 468021A0 */ cvt.s.w $f6, $f4 -/* 00E14 80860464 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00E14 80860464 3C050600 */ lui $a1, %hi(D_06001C20) ## $a1 = 06000000 /* 00E18 80860468 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00E1C 8086046C 44060000 */ mfc1 $a2, $f0 /* 00E20 80860470 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00E24 80860474 24A51C20 */ addiu $a1, $a1, 0x1C20 ## $a1 = 06001C20 +/* 00E24 80860474 24A51C20 */ addiu $a1, $a1, %lo(D_06001C20) ## $a1 = 06001C20 /* 00E28 80860478 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00E2C 8086047C 260404A8 */ addiu $a0, $s0, 0x04A8 ## $a0 = 000004A8 /* 00E30 80860480 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00E34 80860484 0C029468 */ jal SkelAnime_ChangeAnim /* 00E38 80860488 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00E3C 8086048C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00E40 80860490 24A581B4 */ addiu $a1, $a1, 0x81B4 ## $a1 = 060081B4 +/* 00E3C 8086048C 3C050601 */ lui $a1, %hi(D_060081B4) ## $a1 = 06010000 +/* 00E40 80860490 24A581B4 */ addiu $a1, $a1, %lo(D_060081B4) ## $a1 = 060081B4 /* 00E44 80860494 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00E48 80860498 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 00E4C 8086049C 0C03F66B */ jal Math_Rand_ZeroOne diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s index c150914940..21284636fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s @@ -136,18 +136,18 @@ glabel func_808604FC /* 0105C 808606AC 00000000 */ nop /* 01060 808606B0 45000019 */ bc1f .L80860718 /* 01064 808606B4 00000000 */ nop -/* 01068 808606B8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 01068 808606B8 3C040601 */ lui $a0, %hi(D_060081B4) ## $a0 = 06010000 /* 0106C 808606BC 0C028800 */ jal SkelAnime_GetFrameCount -/* 01070 808606C0 248481B4 */ addiu $a0, $a0, 0x81B4 ## $a0 = 060081B4 +/* 01070 808606C0 248481B4 */ addiu $a0, $a0, %lo(D_060081B4) ## $a0 = 060081B4 /* 01074 808606C4 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 01078 808606C8 8E0701A0 */ lw $a3, 0x01A0($s0) ## 000001A0 /* 0107C 808606CC 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 01080 808606D0 46805420 */ cvt.s.w $f16, $f10 /* 01084 808606D4 44819000 */ mtc1 $at, $f18 ## $f18 = -6.00 /* 01088 808606D8 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 0108C 808606DC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01090 808606E0 24A581B4 */ addiu $a1, $a1, 0x81B4 ## $a1 = 060081B4 +/* 0108C 808606DC 3C050601 */ lui $a1, %hi(D_060081B4) ## $a1 = 06010000 +/* 01090 808606E0 24A581B4 */ addiu $a1, $a1, %lo(D_060081B4) ## $a1 = 060081B4 /* 01094 808606E4 AFA40034 */ sw $a0, 0x0034($sp) /* 01098 808606E8 E7B00010 */ swc1 $f16, 0x0010($sp) /* 0109C 808606EC AFA00014 */ sw $zero, 0x0014($sp) @@ -172,8 +172,8 @@ glabel func_808604FC /* 010DC 8086072C 46803220 */ cvt.s.w $f8, $f6 /* 010E0 80860730 44815000 */ mtc1 $at, $f10 ## $f10 = -4.00 /* 010E4 80860734 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 010E8 80860738 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 010EC 8086073C 24A526D4 */ addiu $a1, $a1, 0x26D4 ## $a1 = 060026D4 +/* 010E8 80860738 3C050600 */ lui $a1, %hi(D_060026D4) ## $a1 = 06000000 +/* 010EC 8086073C 24A526D4 */ addiu $a1, $a1, %lo(D_060026D4) ## $a1 = 060026D4 /* 010F0 80860740 AFA40034 */ sw $a0, 0x0034($sp) /* 010F4 80860744 E7A80010 */ swc1 $f8, 0x0010($sp) /* 010F8 80860748 AFA00014 */ sw $zero, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s index 9c06014204..81989af1c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s @@ -2,8 +2,8 @@ glabel func_80860BDC /* 0158C 80860BDC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01590 80860BE0 AFBF0014 */ sw $ra, 0x0014($sp) /* 01594 80860BE4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01598 80860BE8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0159C 80860BEC 24A5E2B0 */ addiu $a1, $a1, 0xE2B0 ## $a1 = 0600E2B0 +/* 01598 80860BE8 3C050601 */ lui $a1, %hi(D_0600E2B0) ## $a1 = 06010000 +/* 0159C 80860BEC 24A5E2B0 */ addiu $a1, $a1, %lo(D_0600E2B0) ## $a1 = 0600E2B0 /* 015A0 80860BF0 AFA60018 */ sw $a2, 0x0018($sp) /* 015A4 80860BF4 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 015A8 80860BF8 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s index 1033f9d8cd..927309aebd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s @@ -3,8 +3,8 @@ glabel func_80860EC0 /* 01874 80860EC4 AFB00018 */ sw $s0, 0x0018($sp) /* 01878 80860EC8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0187C 80860ECC AFBF001C */ sw $ra, 0x001C($sp) -/* 01880 80860ED0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01884 80860ED4 24A5E2B0 */ addiu $a1, $a1, 0xE2B0 ## $a1 = 0600E2B0 +/* 01880 80860ED0 3C050601 */ lui $a1, %hi(D_0600E2B0) ## $a1 = 06010000 +/* 01884 80860ED4 24A5E2B0 */ addiu $a1, $a1, %lo(D_0600E2B0) ## $a1 = 0600E2B0 /* 01888 80860ED8 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 0188C 80860EDC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 01890 80860EE0 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s index 5e1015ca8d..21d10b2894 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s @@ -3,8 +3,8 @@ glabel func_80861418 /* 01DCC 8086141C AFB00018 */ sw $s0, 0x0018($sp) /* 01DD0 80861420 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01DD4 80861424 AFBF001C */ sw $ra, 0x001C($sp) -/* 01DD8 80861428 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01DDC 8086142C 24A5B00C */ addiu $a1, $a1, 0xB00C ## $a1 = 0600B00C +/* 01DD8 80861428 3C050601 */ lui $a1, %hi(D_0600B00C) ## $a1 = 06010000 +/* 01DDC 8086142C 24A5B00C */ addiu $a1, $a1, %lo(D_0600B00C) ## $a1 = 0600B00C /* 01DE0 80861430 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 01DE4 80861434 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 01DE8 80861438 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s index 9f9a826dd4..1ab96f0582 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s @@ -2,8 +2,8 @@ glabel func_808615A4 /* 01F54 808615A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01F58 808615A8 AFBF0014 */ sw $ra, 0x0014($sp) /* 01F5C 808615AC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01F60 808615B0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01F64 808615B4 24A5B4E4 */ addiu $a1, $a1, 0xB4E4 ## $a1 = 0600B4E4 +/* 01F60 808615B0 3C050601 */ lui $a1, %hi(D_0600B4E4) ## $a1 = 06010000 +/* 01F64 808615B4 24A5B4E4 */ addiu $a1, $a1, %lo(D_0600B4E4) ## $a1 = 0600B4E4 /* 01F68 808615B8 AFA60018 */ sw $a2, 0x0018($sp) /* 01F6C 808615BC 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 01F70 808615C0 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s index 7358e94253..b73f5d8923 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s @@ -2,8 +2,8 @@ glabel func_8086181C /* 021CC 8086181C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 021D0 80861820 AFBF0014 */ sw $ra, 0x0014($sp) /* 021D4 80861824 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 021D8 80861828 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 021DC 8086182C 24A5BE4C */ addiu $a1, $a1, 0xBE4C ## $a1 = 0600BE4C +/* 021D8 80861828 3C050601 */ lui $a1, %hi(D_0600BE4C) ## $a1 = 06010000 +/* 021DC 8086182C 24A5BE4C */ addiu $a1, $a1, %lo(D_0600BE4C) ## $a1 = 0600BE4C /* 021E0 80861830 AFA60018 */ sw $a2, 0x0018($sp) /* 021E4 80861834 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 021E8 80861838 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s index 7f1e8743b6..c26937589b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s @@ -3,8 +3,8 @@ glabel func_8086194C /* 02300 80861950 AFB00018 */ sw $s0, 0x0018($sp) /* 02304 80861954 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02308 80861958 AFBF001C */ sw $ra, 0x001C($sp) -/* 0230C 8086195C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02310 80861960 24A51978 */ addiu $a1, $a1, 0x1978 ## $a1 = 06001978 +/* 0230C 8086195C 3C050600 */ lui $a1, %hi(D_06001978) ## $a1 = 06000000 +/* 02310 80861960 24A51978 */ addiu $a1, $a1, %lo(D_06001978) ## $a1 = 06001978 /* 02314 80861964 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 02318 80861968 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 0231C 8086196C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s index feb22c05f2..972ff6b358 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s @@ -3,8 +3,8 @@ glabel func_80861B94 /* 02548 80861B98 AFB00018 */ sw $s0, 0x0018($sp) /* 0254C 80861B9C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02550 80861BA0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02554 80861BA4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02558 80861BA8 24A5A324 */ addiu $a1, $a1, 0xA324 ## $a1 = 0600A324 +/* 02554 80861BA4 3C050601 */ lui $a1, %hi(D_0600A324) ## $a1 = 06010000 +/* 02558 80861BA8 24A5A324 */ addiu $a1, $a1, %lo(D_0600A324) ## $a1 = 0600A324 /* 0255C 80861BAC 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 02560 80861BB0 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 02564 80861BB4 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s index 007b1867ba..cea17d4acc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s @@ -11,11 +11,11 @@ glabel func_80861C40 /* 02610 80861C60 10400016 */ beq $v0, $zero, .L80861CBC /* 02614 80861C64 8FA40024 */ lw $a0, 0x0024($sp) /* 02618 80861C68 8E0E07E8 */ lw $t6, 0x07E8($s0) ## 000007E8 -/* 0261C 80861C6C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 0261C 80861C6C 3C050601 */ lui $a1, %hi(D_0600A99C) ## $a1 = 06010000 /* 02620 80861C70 55C0000F */ bnel $t6, $zero, .L80861CB0 /* 02624 80861C74 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 02628 80861C78 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 0262C 80861C7C 24A5A99C */ addiu $a1, $a1, 0xA99C ## $a1 = 0600A99C +/* 0262C 80861C7C 24A5A99C */ addiu $a1, $a1, %lo(D_0600A99C) ## $a1 = 0600A99C /* 02630 80861C80 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 02634 80861C84 AE0207E8 */ sw $v0, 0x07E8($s0) ## 000007E8 /* 02638 80861C88 A2020808 */ sb $v0, 0x0808($s0) ## 00000808 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s index 482dfee48d..821df19cf3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s @@ -2,8 +2,8 @@ glabel func_80861D50 /* 02700 80861D50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02704 80861D54 AFBF0014 */ sw $ra, 0x0014($sp) /* 02708 80861D58 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0270C 80861D5C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02710 80861D60 24A5A324 */ addiu $a1, $a1, 0xA324 ## $a1 = 0600A324 +/* 0270C 80861D5C 3C050601 */ lui $a1, %hi(D_0600A324) ## $a1 = 06010000 +/* 02710 80861D60 24A5A324 */ addiu $a1, $a1, %lo(D_0600A324) ## $a1 = 0600A324 /* 02714 80861D64 AFA60018 */ sw $a2, 0x0018($sp) /* 02718 80861D68 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 0271C 80861D6C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s index bd8236e156..f4055b17d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s @@ -46,12 +46,12 @@ glabel func_80861DC8 /* 02818 80861E68 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 0281C 80861E6C A20807C8 */ sb $t0, 0x07C8($s0) ## 000007C8 /* 02820 80861E70 AE0907E8 */ sw $t1, 0x07E8($s0) ## 000007E8 -/* 02824 80861E74 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 02824 80861E74 3C050601 */ lui $a1, %hi(D_0600C438) ## $a1 = 06010000 /* 02828 80861E78 44060000 */ mfc1 $a2, $f0 /* 0282C 80861E7C 44070000 */ mfc1 $a3, $f0 /* 02830 80861E80 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 /* 02834 80861E84 AFAA0014 */ sw $t2, 0x0014($sp) -/* 02838 80861E88 24A5C438 */ addiu $a1, $a1, 0xC438 ## $a1 = 0600C438 +/* 02838 80861E88 24A5C438 */ addiu $a1, $a1, %lo(D_0600C438) ## $a1 = 0600C438 /* 0283C 80861E8C E7A00018 */ swc1 $f0, 0x0018($sp) /* 02840 80861E90 E7A00010 */ swc1 $f0, 0x0010($sp) /* 02844 80861E94 0C029468 */ jal SkelAnime_ChangeAnim diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s index 23191ef8ce..cc98b9655c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s @@ -3,19 +3,19 @@ glabel func_80861EC0 /* 02874 80861EC4 AFB00028 */ sw $s0, 0x0028($sp) /* 02878 80861EC8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0287C 80861ECC AFBF002C */ sw $ra, 0x002C($sp) -/* 02880 80861ED0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 02880 80861ED0 3C040600 */ lui $a0, %hi(D_06001C20) ## $a0 = 06000000 /* 02884 80861ED4 0C028800 */ jal SkelAnime_GetFrameCount -/* 02888 80861ED8 24841C20 */ addiu $a0, $a0, 0x1C20 ## $a0 = 06001C20 +/* 02888 80861ED8 24841C20 */ addiu $a0, $a0, %lo(D_06001C20) ## $a0 = 06001C20 /* 0288C 80861EDC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02890 80861EE0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 02894 80861EE4 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 /* 02898 80861EE8 468021A0 */ cvt.s.w $f6, $f4 -/* 0289C 80861EEC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0289C 80861EEC 3C050600 */ lui $a1, %hi(D_06001C20) ## $a1 = 06000000 /* 028A0 80861EF0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 028A4 80861EF4 44060000 */ mfc1 $a2, $f0 /* 028A8 80861EF8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 028AC 80861EFC 24A51C20 */ addiu $a1, $a1, 0x1C20 ## $a1 = 06001C20 +/* 028AC 80861EFC 24A51C20 */ addiu $a1, $a1, %lo(D_06001C20) ## $a1 = 06001C20 /* 028B0 80861F00 E7A60010 */ swc1 $f6, 0x0010($sp) /* 028B4 80861F04 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 028B8 80861F08 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s index 7a299b9acd..58f2507899 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s @@ -2,8 +2,8 @@ glabel func_80862050 /* 02A00 80862050 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02A04 80862054 AFBF0014 */ sw $ra, 0x0014($sp) /* 02A08 80862058 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 02A0C 8086205C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02A10 80862060 24A5316C */ addiu $a1, $a1, 0x316C ## $a1 = 0600316C +/* 02A0C 8086205C 3C050600 */ lui $a1, %hi(D_0600316C) ## $a1 = 06000000 +/* 02A10 80862060 24A5316C */ addiu $a1, $a1, %lo(D_0600316C) ## $a1 = 0600316C /* 02A14 80862064 AFA70018 */ sw $a3, 0x0018($sp) /* 02A18 80862068 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 02A1C 8086206C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s index d3191a5ca5..a815eddd8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s @@ -3,8 +3,8 @@ glabel func_80862154 /* 02B08 80862158 AFB00020 */ sw $s0, 0x0020($sp) /* 02B0C 8086215C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02B10 80862160 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02B14 80862164 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02B18 80862168 24A58604 */ addiu $a1, $a1, 0x8604 ## $a1 = 06008604 +/* 02B14 80862164 3C050601 */ lui $a1, %hi(D_06008604) ## $a1 = 06010000 +/* 02B18 80862168 24A58604 */ addiu $a1, $a1, %lo(D_06008604) ## $a1 = 06008604 /* 02B1C 8086216C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 02B20 80862170 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 02B24 80862174 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s index 51d87f992a..30e58bcd79 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s @@ -3,8 +3,8 @@ glabel func_80862398 /* 02D4C 8086239C AFB00020 */ sw $s0, 0x0020($sp) /* 02D50 808623A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02D54 808623A4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02D58 808623A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02D5C 808623AC 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 +/* 02D58 808623A8 3C050600 */ lui $a1, %hi(D_06000444) ## $a1 = 06000000 +/* 02D5C 808623AC 24A50444 */ addiu $a1, $a1, %lo(D_06000444) ## $a1 = 06000444 /* 02D60 808623B0 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 02D64 808623B4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 02D68 808623B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s index b4721e76d3..60187aa438 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s @@ -35,12 +35,12 @@ glabel func_80862578 /* 02FA8 808625F8 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 02FAC 808625FC 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 02FB0 80862600 15010004 */ bne $t0, $at, .L80862614 -/* 02FB4 80862604 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 02FB4 80862604 3C050601 */ lui $a1, %hi(D_06008604) ## $a1 = 06010000 /* 02FB8 80862608 24090024 */ addiu $t1, $zero, 0x0024 ## $t1 = 00000024 /* 02FBC 8086260C 10000004 */ beq $zero, $zero, .L80862620 /* 02FC0 80862610 A60907E0 */ sh $t1, 0x07E0($s0) ## 000007E0 .L80862614: -/* 02FC4 80862614 24A58604 */ addiu $a1, $a1, 0x8604 ## $a1 = 06008604 +/* 02FC4 80862614 24A58604 */ addiu $a1, $a1, %lo(D_06008604) ## $a1 = 06008604 /* 02FC8 80862618 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 02FCC 8086261C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L80862620: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s index 0bd9c1ebcd..f26d1a4a8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s @@ -14,8 +14,8 @@ glabel func_808627C4 /* 031A4 808627F4 10000030 */ beq $zero, $zero, .L808628B8 /* 031A8 808627F8 8FBF0024 */ lw $ra, 0x0024($sp) .L808627FC: -/* 031AC 808627FC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 031B0 80862800 24A5E2B0 */ addiu $a1, $a1, 0xE2B0 ## $a1 = 0600E2B0 +/* 031AC 808627FC 3C050601 */ lui $a1, %hi(D_0600E2B0) ## $a1 = 06010000 +/* 031B0 80862800 24A5E2B0 */ addiu $a1, $a1, %lo(D_0600E2B0) ## $a1 = 0600E2B0 /* 031B4 80862804 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 031B8 80862808 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 031BC 8086280C 8605008A */ lh $a1, 0x008A($s0) ## 0000008A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s index 4466f58c9a..e26038cd7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s @@ -3,8 +3,8 @@ glabel func_80862FA8 /* 0395C 80862FAC AFA5001C */ sw $a1, 0x001C($sp) /* 03960 80862FB0 AFBF0014 */ sw $ra, 0x0014($sp) /* 03964 80862FB4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 03968 80862FB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0396C 80862FBC 24A51420 */ addiu $a1, $a1, 0x1420 ## $a1 = 06001420 +/* 03968 80862FB8 3C050600 */ lui $a1, %hi(D_06001420) ## $a1 = 06000000 +/* 0396C 80862FBC 24A51420 */ addiu $a1, $a1, %lo(D_06001420) ## $a1 = 06001420 /* 03970 80862FC0 AFA60018 */ sw $a2, 0x0018($sp) /* 03974 80862FC4 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 03978 80862FC8 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s index d11e6c037e..aec303d82c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s @@ -3,8 +3,8 @@ glabel func_808630F0 /* 03AA4 808630F4 AFA5001C */ sw $a1, 0x001C($sp) /* 03AA8 808630F8 AFBF0014 */ sw $ra, 0x0014($sp) /* 03AAC 808630FC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 03AB0 80863100 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 03AB4 80863104 24A59A90 */ addiu $a1, $a1, 0x9A90 ## $a1 = 06009A90 +/* 03AB0 80863100 3C050601 */ lui $a1, %hi(D_06009A90) ## $a1 = 06010000 +/* 03AB4 80863104 24A59A90 */ addiu $a1, $a1, %lo(D_06009A90) ## $a1 = 06009A90 /* 03AB8 80863108 AFA60018 */ sw $a2, 0x0018($sp) /* 03ABC 8086310C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 03AC0 80863110 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s index 421ae7f7d2..8c00ac5eb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s @@ -3,8 +3,8 @@ glabel func_80864158 /* 04B0C 8086415C AFA5001C */ sw $a1, 0x001C($sp) /* 04B10 80864160 AFBF0014 */ sw $ra, 0x0014($sp) /* 04B14 80864164 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 04B18 80864168 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 04B1C 8086416C 24A5E2B0 */ addiu $a1, $a1, 0xE2B0 ## $a1 = 0600E2B0 +/* 04B18 80864168 3C050601 */ lui $a1, %hi(D_0600E2B0) ## $a1 = 06010000 +/* 04B1C 8086416C 24A5E2B0 */ addiu $a1, $a1, %lo(D_0600E2B0) ## $a1 = 0600E2B0 /* 04B20 80864170 AFA70018 */ sw $a3, 0x0018($sp) /* 04B24 80864174 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 04B28 80864178 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat 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 bb01933746..12dfb646d9 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 @@ -11,10 +11,10 @@ glabel EnTg_Init /* 00174 80B184D4 0C00AC78 */ jal ActorShape_Init /* 00178 80B184D8 3C0741E0 */ lui $a3, 0x41E0 ## $a3 = 41E00000 -/* 0017C 80B184DC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 00180 80B184E0 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00184 80B184E4 24E75040 */ addiu $a3, $a3, 0x5040 ## $a3 = 06005040 -/* 00188 80B184E8 24C6AE40 */ addiu $a2, $a2, 0xAE40 ## $a2 = 0600AE40 +/* 0017C 80B184DC 3C060601 */ lui $a2, %hi(D_0600AE40) ## $a2 = 06010000 +/* 00180 80B184E0 3C070600 */ lui $a3, %hi(D_06005040) ## $a3 = 06000000 +/* 00184 80B184E4 24E75040 */ addiu $a3, $a3, %lo(D_06005040) ## $a3 = 06005040 +/* 00188 80B184E8 24C6AE40 */ addiu $a2, $a2, %lo(D_0600AE40) ## $a2 = 0600AE40 /* 0018C 80B184EC 8FA4003C */ lw $a0, 0x003C($sp) /* 00190 80B184F0 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00194 80B184F4 AFA00010 */ sw $zero, 0x0010($sp) 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 2323acbbae..7965c0d6ec 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 @@ -33,8 +33,8 @@ glabel EnTite_Draw /* 0283C 80B1B2BC 1701003A */ bne $t8, $at, .L80B1B3A8 /* 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 +/* 02848 80B1B2C8 3C040600 */ lui $a0, %hi(D_06001300) ## $a0 = 06000000 +/* 0284C 80B1B2CC 24841300 */ addiu $a0, $a0, %lo(D_06001300) ## $a0 = 06001300 /* 02850 80B1B2D0 00045100 */ sll $t2, $a0, 4 /* 02854 80B1B2D4 000A5F02 */ srl $t3, $t2, 28 /* 02858 80B1B2D8 3C058016 */ lui $a1, %hi(gSegments) @@ -55,8 +55,8 @@ glabel EnTite_Draw /* 02894 80B1B314 0307C821 */ addu $t9, $t8, $a3 /* 02898 80B1B318 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 0289C 80B1B31C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 028A0 80B1B320 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 028A4 80B1B324 24841700 */ addiu $a0, $a0, 0x1700 ## $a0 = 06001700 +/* 028A0 80B1B320 3C040600 */ lui $a0, %hi(D_06001700) ## $a0 = 06000000 +/* 028A4 80B1B324 24841700 */ addiu $a0, $a0, %lo(D_06001700) ## $a0 = 06001700 /* 028A8 80B1B328 00045900 */ sll $t3, $a0, 4 /* 028AC 80B1B32C 000B6702 */ srl $t4, $t3, 28 /* 028B0 80B1B330 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 @@ -68,12 +68,12 @@ glabel EnTite_Draw /* 028C8 80B1B348 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 028CC 80B1B34C 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 /* 028D0 80B1B350 0086C024 */ and $t8, $a0, $a2 -/* 028D4 80B1B354 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 028D4 80B1B354 3C040600 */ lui $a0, %hi(D_06001900) ## $a0 = 06000000 /* 028D8 80B1B358 01F8C821 */ addu $t9, $t7, $t8 /* 028DC 80B1B35C 03274821 */ addu $t1, $t9, $a3 /* 028E0 80B1B360 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 028E4 80B1B364 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 028E8 80B1B368 24841900 */ addiu $a0, $a0, 0x1900 ## $a0 = 06001900 +/* 028E8 80B1B368 24841900 */ addiu $a0, $a0, %lo(D_06001900) ## $a0 = 06001900 /* 028EC 80B1B36C 00046100 */ sll $t4, $a0, 4 /* 028F0 80B1B370 000C6F02 */ srl $t5, $t4, 28 /* 028F4 80B1B374 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -91,8 +91,8 @@ glabel EnTite_Draw /* 02924 80B1B3A4 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 .L80B1B3A8: /* 02928 80B1B3A8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 0292C 80B1B3AC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 02930 80B1B3B0 24841B00 */ addiu $a0, $a0, 0x1B00 ## $a0 = 06001B00 +/* 0292C 80B1B3AC 3C040600 */ lui $a0, %hi(D_06001B00) ## $a0 = 06000000 +/* 02930 80B1B3B0 24841B00 */ addiu $a0, $a0, %lo(D_06001B00) ## $a0 = 06001B00 /* 02934 80B1B3B4 00046900 */ sll $t5, $a0, 4 /* 02938 80B1B3B8 000D7702 */ srl $t6, $t5, 28 /* 0293C 80B1B3BC 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 @@ -112,8 +112,8 @@ glabel EnTite_Draw /* 02974 80B1B3F4 01475821 */ addu $t3, $t2, $a3 /* 02978 80B1B3F8 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 0297C 80B1B3FC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02980 80B1B400 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 02984 80B1B404 24841F00 */ addiu $a0, $a0, 0x1F00 ## $a0 = 06001F00 +/* 02980 80B1B400 3C040600 */ lui $a0, %hi(D_06001F00) ## $a0 = 06000000 +/* 02984 80B1B404 24841F00 */ addiu $a0, $a0, %lo(D_06001F00) ## $a0 = 06001F00 /* 02988 80B1B408 00047100 */ sll $t6, $a0, 4 /* 0298C 80B1B40C 000E7F02 */ srl $t7, $t6, 28 /* 02990 80B1B410 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -125,12 +125,12 @@ glabel EnTite_Draw /* 029A8 80B1B428 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 029AC 80B1B42C 8F290000 */ lw $t1, 0x0000($t9) ## 00000008 /* 029B0 80B1B430 00865024 */ and $t2, $a0, $a2 -/* 029B4 80B1B434 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 029B4 80B1B434 3C040600 */ lui $a0, %hi(D_06002100) ## $a0 = 06000000 /* 029B8 80B1B438 012A5821 */ addu $t3, $t1, $t2 /* 029BC 80B1B43C 01676021 */ addu $t4, $t3, $a3 /* 029C0 80B1B440 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 029C4 80B1B444 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 029C8 80B1B448 24842100 */ addiu $a0, $a0, 0x2100 ## $a0 = 06002100 +/* 029C8 80B1B448 24842100 */ addiu $a0, $a0, %lo(D_06002100) ## $a0 = 06002100 /* 029CC 80B1B44C 00047900 */ sll $t7, $a0, 4 /* 029D0 80B1B450 000FC702 */ srl $t8, $t7, 28 /* 029D4 80B1B454 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 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 c7252c9367..e1809766b6 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 @@ -15,16 +15,16 @@ glabel EnTite_Init /* 00038 80B18AB8 0C00B58B */ jal Actor_SetScale /* 0003C 80B18ABC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00040 80B18AC0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00044 80B18AC4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00040 80B18AC0 3C060600 */ lui $a2, %hi(D_06003A20) ## $a2 = 06000000 +/* 00044 80B18AC4 3C070600 */ lui $a3, %hi(D_060012E4) ## $a3 = 06000000 /* 00048 80B18AC8 260F0190 */ addiu $t7, $s0, 0x0190 ## $t7 = 00000190 /* 0004C 80B18ACC 26180226 */ addiu $t8, $s0, 0x0226 ## $t8 = 00000226 /* 00050 80B18AD0 24190019 */ addiu $t9, $zero, 0x0019 ## $t9 = 00000019 /* 00054 80B18AD4 AFB90018 */ sw $t9, 0x0018($sp) /* 00058 80B18AD8 AFB80014 */ sw $t8, 0x0014($sp) /* 0005C 80B18ADC AFAF0010 */ sw $t7, 0x0010($sp) -/* 00060 80B18AE0 24E712E4 */ addiu $a3, $a3, 0x12E4 ## $a3 = 060012E4 -/* 00064 80B18AE4 24C63A20 */ addiu $a2, $a2, 0x3A20 ## $a2 = 06003A20 +/* 00060 80B18AE0 24E712E4 */ addiu $a3, $a3, %lo(D_060012E4) ## $a3 = 060012E4 +/* 00064 80B18AE4 24C63A20 */ addiu $a2, $a2, %lo(D_06003A20) ## $a2 = 06003A20 /* 00068 80B18AE8 8FA4003C */ lw $a0, 0x003C($sp) /* 0006C 80B18AEC 0C02915F */ jal SkelAnime_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s index d4ad63779d..79c3227b1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s @@ -2,8 +2,8 @@ glabel func_80B18C5C /* 001DC 80B18C5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 001E0 80B18C60 AFBF0014 */ sw $ra, 0x0014($sp) /* 001E4 80B18C64 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 001E8 80B18C68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 001EC 80B18C6C 24A512E4 */ addiu $a1, $a1, 0x12E4 ## $a1 = 060012E4 +/* 001E8 80B18C68 3C050600 */ lui $a1, %hi(D_060012E4) ## $a1 = 06000000 +/* 001EC 80B18C6C 24A512E4 */ addiu $a1, $a1, %lo(D_060012E4) ## $a1 = 060012E4 /* 001F0 80B18C70 AFA70018 */ sw $a3, 0x0018($sp) /* 001F4 80B18C74 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 001F8 80B18C78 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s index dfc9570b3d..f5bfbcb27f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s @@ -2,8 +2,8 @@ glabel func_80B18E08 /* 00388 80B18E08 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0038C 80B18E0C AFBF0014 */ sw $ra, 0x0014($sp) /* 00390 80B18E10 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00394 80B18E14 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00398 80B18E18 24A5083C */ addiu $a1, $a1, 0x083C ## $a1 = 0600083C +/* 00394 80B18E14 3C050600 */ lui $a1, %hi(D_0600083C) ## $a1 = 06000000 +/* 00398 80B18E18 24A5083C */ addiu $a1, $a1, %lo(D_0600083C) ## $a1 = 0600083C /* 0039C 80B18E1C AFA60018 */ sw $a2, 0x0018($sp) /* 003A0 80B18E20 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 003A4 80B18E24 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s index ab68108d5b..d99b5e7280 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s @@ -2,8 +2,8 @@ glabel func_80B19524 /* 00AA4 80B19524 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00AA8 80B19528 AFBF0014 */ sw $ra, 0x0014($sp) /* 00AAC 80B1952C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00AB0 80B19530 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00AB4 80B19534 24A50A14 */ addiu $a1, $a1, 0x0A14 ## $a1 = 06000A14 +/* 00AB0 80B19530 3C050600 */ lui $a1, %hi(D_06000A14) ## $a1 = 06000000 +/* 00AB4 80B19534 24A50A14 */ addiu $a1, $a1, %lo(D_06000A14) ## $a1 = 06000A14 /* 00AB8 80B19538 AFA60018 */ sw $a2, 0x0018($sp) /* 00ABC 80B1953C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00AC0 80B19540 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s index 003ff180bc..eaaf484215 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s @@ -3,8 +3,8 @@ glabel func_80B1985C /* 00DE0 80B19860 AFB00018 */ sw $s0, 0x0018($sp) /* 00DE4 80B19864 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00DE8 80B19868 AFBF001C */ sw $ra, 0x001C($sp) -/* 00DEC 80B1986C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00DF0 80B19870 24A50C70 */ addiu $a1, $a1, 0x0C70 ## $a1 = 06000C70 +/* 00DEC 80B1986C 3C050600 */ lui $a1, %hi(D_06000C70) ## $a1 = 06000000 +/* 00DF0 80B19870 24A50C70 */ addiu $a1, $a1, %lo(D_06000C70) ## $a1 = 06000C70 /* 00DF4 80B19874 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00DF8 80B19878 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00DFC 80B1987C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s index c2571ecd9a..506c9734c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s @@ -4,8 +4,8 @@ glabel func_80B19E28 /* 013B0 80B19E30 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 013B4 80B19E34 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 013B8 80B19E38 A08E02BC */ sb $t6, 0x02BC($a0) ## 000002BC -/* 013BC 80B19E3C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 013C0 80B19E40 24A512E4 */ addiu $a1, $a1, 0x12E4 ## $a1 = 060012E4 +/* 013BC 80B19E3C 3C050600 */ lui $a1, %hi(D_060012E4) ## $a1 = 06000000 +/* 013C0 80B19E40 24A512E4 */ addiu $a1, $a1, %lo(D_060012E4) ## $a1 = 060012E4 /* 013C4 80B19E44 AFA70018 */ sw $a3, 0x0018($sp) /* 013C8 80B19E48 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 013CC 80B19E4C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A1EC.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A1EC.s index 6b7f303f63..e235a8da64 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A1EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A1EC.s @@ -3,19 +3,19 @@ glabel func_80B1A1EC /* 01770 80B1A1F0 AFB00028 */ sw $s0, 0x0028($sp) /* 01774 80B1A1F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01778 80B1A1F8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0177C 80B1A1FC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0177C 80B1A1FC 3C040600 */ lui $a0, %hi(D_060012E4) ## $a0 = 06000000 /* 01780 80B1A200 0C028800 */ jal SkelAnime_GetFrameCount -/* 01784 80B1A204 248412E4 */ addiu $a0, $a0, 0x12E4 ## $a0 = 060012E4 +/* 01784 80B1A204 248412E4 */ addiu $a0, $a0, %lo(D_060012E4) ## $a0 = 060012E4 /* 01788 80B1A208 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0178C 80B1A20C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01790 80B1A210 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 01794 80B1A214 468021A0 */ cvt.s.w $f6, $f4 /* 01798 80B1A218 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 -/* 0179C 80B1A21C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0179C 80B1A21C 3C050600 */ lui $a1, %hi(D_060012E4) ## $a1 = 06000000 /* 017A0 80B1A220 44060000 */ mfc1 $a2, $f0 /* 017A4 80B1A224 44070000 */ mfc1 $a3, $f0 -/* 017A8 80B1A228 24A512E4 */ addiu $a1, $a1, 0x12E4 ## $a1 = 060012E4 +/* 017A8 80B1A228 24A512E4 */ addiu $a1, $a1, %lo(D_060012E4) ## $a1 = 060012E4 /* 017AC 80B1A22C E7A60010 */ swc1 $f6, 0x0010($sp) /* 017B0 80B1A230 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 017B4 80B1A234 AFA00014 */ sw $zero, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s index 4a693238a8..c9849761b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s @@ -3,8 +3,8 @@ glabel func_80B1A76C /* 01CF0 80B1A770 AFB00018 */ sw $s0, 0x0018($sp) /* 01CF4 80B1A774 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01CF8 80B1A778 AFBF001C */ sw $ra, 0x001C($sp) -/* 01CFC 80B1A77C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01D00 80B1A780 24A50A14 */ addiu $a1, $a1, 0x0A14 ## $a1 = 06000A14 +/* 01CFC 80B1A77C 3C050600 */ lui $a1, %hi(D_06000A14) ## $a1 = 06000000 +/* 01D00 80B1A780 24A50A14 */ addiu $a1, $a1, %lo(D_06000A14) ## $a1 = 06000A14 /* 01D04 80B1A784 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01D08 80B1A788 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 01D0C 80B1A78C 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 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 a4340182ab..e17e482ff4 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 @@ -85,14 +85,14 @@ glabel EnToryo_Init /* 00128 80B20298 3C074228 */ lui $a3, 0x4228 ## $a3 = 42280000 /* 0012C 80B2029C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00130 80B202A0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 00130 80B202A0 3C060600 */ lui $a2, %hi(D_06007150) ## $a2 = 06000000 /* 00134 80B202A4 26080214 */ addiu $t0, $s0, 0x0214 ## $t0 = 00000214 /* 00138 80B202A8 2609027A */ addiu $t1, $s0, 0x027A ## $t1 = 0000027A /* 0013C 80B202AC 240A0011 */ addiu $t2, $zero, 0x0011 ## $t2 = 00000011 /* 00140 80B202B0 AFAA0018 */ sw $t2, 0x0018($sp) /* 00144 80B202B4 AFA90014 */ sw $t1, 0x0014($sp) /* 00148 80B202B8 AFA80010 */ sw $t0, 0x0010($sp) -/* 0014C 80B202BC 24C67150 */ addiu $a2, $a2, 0x7150 ## $a2 = 06007150 +/* 0014C 80B202BC 24C67150 */ addiu $a2, $a2, %lo(D_06007150) ## $a2 = 06007150 /* 00150 80B202C0 AFA50038 */ sw $a1, 0x0038($sp) /* 00154 80B202C4 8FA40054 */ lw $a0, 0x0054($sp) /* 00158 80B202C8 0C0291BE */ jal SkelAnime_InitFlex 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 a2a4c3b70a..9053c030e7 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 @@ -65,8 +65,8 @@ glabel EnTp_Draw /* 01A7C 80B2285C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 01A80 80B22860 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01A84 80B22864 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01A88 80B22868 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 01A8C 80B2286C 25CE08D0 */ addiu $t6, $t6, 0x08D0 ## $t6 = 060008D0 +/* 01A88 80B22868 3C0E0600 */ lui $t6, %hi(D_060008D0) ## $t6 = 06000000 +/* 01A8C 80B2286C 25CE08D0 */ addiu $t6, $t6, %lo(D_060008D0) ## $t6 = 060008D0 /* 01A90 80B22870 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 01A94 80B22874 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 /* 01A98 80B22878 AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 @@ -91,8 +91,8 @@ glabel EnTp_Draw /* 01AE0 80B228C0 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 /* 01AE4 80B228C4 3C05E700 */ lui $a1, 0xE700 ## $a1 = E7000000 /* 01AE8 80B228C8 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 01AEC 80B228CC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01AF0 80B228D0 24840C68 */ addiu $a0, $a0, 0x0C68 ## $a0 = 06000C68 +/* 01AEC 80B228CC 3C040600 */ lui $a0, %hi(D_06000C68) ## $a0 = 06000000 +/* 01AF0 80B228D0 24840C68 */ addiu $a0, $a0, %lo(D_06000C68) ## $a0 = 06000C68 /* 01AF4 80B228D4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01AF8 80B228D8 AD0F02D0 */ sw $t7, 0x02D0($t0) ## 000002D0 /* 01AFC 80B228DC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 @@ -163,10 +163,10 @@ glabel EnTp_Draw /* 01C00 80B229E0 AFA20020 */ sw $v0, 0x0020($sp) /* 01C04 80B229E4 8FA30020 */ lw $v1, 0x0020($sp) /* 01C08 80B229E8 8FA80054 */ lw $t0, 0x0054($sp) -/* 01C0C 80B229EC 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 +/* 01C0C 80B229EC 3C0B0600 */ lui $t3, %hi(D_06000000) ## $t3 = 06000000 /* 01C10 80B229F0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01C14 80B229F4 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 01C18 80B229F8 256B0000 */ addiu $t3, $t3, 0x0000 ## $t3 = 06000000 +/* 01C18 80B229F8 256B0000 */ addiu $t3, $t3, %lo(D_06000000) ## $t3 = 06000000 /* 01C1C 80B229FC 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 /* 01C20 80B22A00 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01C24 80B22A04 AD1902D0 */ sw $t9, 0x02D0($t0) ## 000002D0 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 209ee52a71..bcbca80901 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 @@ -44,19 +44,19 @@ glabel EnTr_Init /* 00080 80B22D70 10000031 */ beq $zero, $zero, .L80B22E38 /* 00084 80B22D74 3C0480B2 */ lui $a0, %hi(D_80B24400) ## $a0 = 80B20000 .L80B22D78: -/* 00088 80B22D78 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 0008C 80B22D7C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00088 80B22D78 3C060601 */ lui $a2, %hi(D_06011688) ## $a2 = 06010000 +/* 0008C 80B22D7C 3C070600 */ lui $a3, %hi(D_06003FC8) ## $a3 = 06000000 /* 00090 80B22D80 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 00094 80B22D84 260F0232 */ addiu $t7, $s0, 0x0232 ## $t7 = 00000232 /* 00098 80B22D88 2418001B */ addiu $t8, $zero, 0x001B ## $t8 = 0000001B /* 0009C 80B22D8C AFB80018 */ sw $t8, 0x0018($sp) /* 000A0 80B22D90 AFAF0014 */ sw $t7, 0x0014($sp) /* 000A4 80B22D94 AFAE0010 */ sw $t6, 0x0010($sp) -/* 000A8 80B22D98 24E73FC8 */ addiu $a3, $a3, 0x3FC8 ## $a3 = 06003FC8 +/* 000A8 80B22D98 24E73FC8 */ addiu $a3, $a3, %lo(D_06003FC8) ## $a3 = 06003FC8 /* 000AC 80B22D9C 0C0291BE */ jal SkelAnime_InitFlex -/* 000B0 80B22DA0 24C61688 */ addiu $a2, $a2, 0x1688 ## $a2 = 06011688 -/* 000B4 80B22DA4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 000B8 80B22DA8 24A53FC8 */ addiu $a1, $a1, 0x3FC8 ## $a1 = 06003FC8 +/* 000B0 80B22DA0 24C61688 */ addiu $a2, $a2, %lo(D_06011688) ## $a2 = 06011688 +/* 000B4 80B22DA4 3C050600 */ lui $a1, %hi(D_06003FC8) ## $a1 = 06000000 +/* 000B8 80B22DA8 24A53FC8 */ addiu $a1, $a1, %lo(D_06003FC8) ## $a1 = 06003FC8 /* 000BC 80B22DAC 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 000C0 80B22DB0 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 000C4 80B22DB4 3C0580B2 */ lui $a1, %hi(func_80B23A88) ## $a1 = 80B20000 @@ -69,20 +69,20 @@ glabel EnTr_Init /* 000E0 80B22DD0 A61902D8 */ sh $t9, 0x02D8($s0) ## 000002D8 .L80B22DD4: /* 000E4 80B22DD4 2611014C */ addiu $s1, $s0, 0x014C ## $s1 = 0000014C -/* 000E8 80B22DD8 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 000EC 80B22DDC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 000E8 80B22DD8 3C060601 */ lui $a2, %hi(D_0600C530) ## $a2 = 06010000 +/* 000EC 80B22DDC 3C070600 */ lui $a3, %hi(D_06001CDC) ## $a3 = 06000000 /* 000F0 80B22DE0 26080190 */ addiu $t0, $s0, 0x0190 ## $t0 = 00000190 /* 000F4 80B22DE4 26090232 */ addiu $t1, $s0, 0x0232 ## $t1 = 00000232 /* 000F8 80B22DE8 240A001B */ addiu $t2, $zero, 0x001B ## $t2 = 0000001B /* 000FC 80B22DEC AFAA0018 */ sw $t2, 0x0018($sp) /* 00100 80B22DF0 AFA90014 */ sw $t1, 0x0014($sp) /* 00104 80B22DF4 AFA80010 */ sw $t0, 0x0010($sp) -/* 00108 80B22DF8 24E71CDC */ addiu $a3, $a3, 0x1CDC ## $a3 = 06001CDC -/* 0010C 80B22DFC 24C6C530 */ addiu $a2, $a2, 0xC530 ## $a2 = 0600C530 +/* 00108 80B22DF8 24E71CDC */ addiu $a3, $a3, %lo(D_06001CDC) ## $a3 = 06001CDC +/* 0010C 80B22DFC 24C6C530 */ addiu $a2, $a2, %lo(D_0600C530) ## $a2 = 0600C530 /* 00110 80B22E00 0C0291BE */ jal SkelAnime_InitFlex /* 00114 80B22E04 02202825 */ or $a1, $s1, $zero ## $a1 = 0000014C -/* 00118 80B22E08 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0011C 80B22E0C 24A51CDC */ addiu $a1, $a1, 0x1CDC ## $a1 = 06001CDC +/* 00118 80B22E08 3C050600 */ lui $a1, %hi(D_06001CDC) ## $a1 = 06000000 +/* 0011C 80B22E0C 24A51CDC */ addiu $a1, $a1, %lo(D_06001CDC) ## $a1 = 06001CDC /* 00120 80B22E10 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00124 80B22E14 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 00128 80B22E18 3C0580B2 */ lui $a1, %hi(func_80B23A88) ## $a1 = 80B20000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s index 987637ca1c..d37989a2ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s @@ -25,13 +25,13 @@ glabel EnTr_Update /* 00F24 80B23C14 5040003B */ beql $v0, $zero, .L80B23D04 /* 00F28 80B23C18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00F2C 80B23C1C 8E0502E4 */ lw $a1, 0x02E4($s0) ## 000002E4 -/* 00F30 80B23C20 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 00F34 80B23C24 25EF35CC */ addiu $t7, $t7, 0x35CC ## $t7 = 060035CC +/* 00F30 80B23C20 3C0F0600 */ lui $t7, %hi(D_060035CC) ## $t7 = 06000000 +/* 00F34 80B23C24 25EF35CC */ addiu $t7, $t7, %lo(D_060035CC) ## $t7 = 060035CC /* 00F38 80B23C28 50A00033 */ beql $a1, $zero, .L80B23CF8 /* 00F3C 80B23C2C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 00F40 80B23C30 11E50004 */ beq $t7, $a1, .L80B23C44 -/* 00F44 80B23C34 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 00F48 80B23C38 271813CC */ addiu $t8, $t8, 0x13CC ## $t8 = 060013CC +/* 00F44 80B23C34 3C180600 */ lui $t8, %hi(D_060013CC) ## $t8 = 06000000 +/* 00F48 80B23C38 271813CC */ addiu $t8, $t8, %lo(D_060013CC) ## $t8 = 060013CC /* 00F4C 80B23C3C 17050011 */ bne $t8, $a1, .L80B23C84 /* 00F50 80B23C40 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 .L80B23C44: @@ -62,16 +62,16 @@ glabel EnTr_Update /* 00FA0 80B23C90 3C0580B2 */ lui $a1, %hi(func_80B22F28) ## $a1 = 80B20000 /* 00FA4 80B23C94 0C2C8B3C */ jal func_80B22CF0 /* 00FA8 80B23C98 24A52F28 */ addiu $a1, $a1, %lo(func_80B22F28) ## $a1 = 80B22F28 -/* 00FAC 80B23C9C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00FAC 80B23C9C 3C040600 */ lui $a0, %hi(D_060049C8) ## $a0 = 06000000 /* 00FB0 80B23CA0 0C028800 */ jal SkelAnime_GetFrameCount -/* 00FB4 80B23CA4 248449C8 */ addiu $a0, $a0, 0x49C8 ## $a0 = 060049C8 +/* 00FB4 80B23CA4 248449C8 */ addiu $a0, $a0, %lo(D_060049C8) ## $a0 = 060049C8 /* 00FB8 80B23CA8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00FBC 80B23CAC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 00FC0 80B23CB0 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 /* 00FC4 80B23CB4 468021A0 */ cvt.s.w $f6, $f4 -/* 00FC8 80B23CB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00FCC 80B23CBC 24A549C8 */ addiu $a1, $a1, 0x49C8 ## $a1 = 060049C8 +/* 00FC8 80B23CB8 3C050600 */ lui $a1, %hi(D_060049C8) ## $a1 = 06000000 +/* 00FCC 80B23CBC 24A549C8 */ addiu $a1, $a1, %lo(D_060049C8) ## $a1 = 060049C8 /* 00FD0 80B23CC0 8FA40034 */ lw $a0, 0x0034($sp) /* 00FD4 80B23CC4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FD8 80B23CC8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s index c681f04fc7..6697073946 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s @@ -35,8 +35,8 @@ glabel func_80B23820 /* 00BAC 80B2389C 24A53690 */ addiu $a1, $a1, %lo(func_80B23690) ## $a1 = 80B23690 /* 00BB0 80B238A0 0C2C8B3C */ jal func_80B22CF0 /* 00BB4 80B238A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BB8 80B238A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00BBC 80B238AC 24A549C8 */ addiu $a1, $a1, 0x49C8 ## $a1 = 060049C8 +/* 00BB8 80B238A8 3C050600 */ lui $a1, %hi(D_060049C8) ## $a1 = 06000000 +/* 00BBC 80B238AC 24A549C8 */ addiu $a1, $a1, %lo(D_060049C8) ## $a1 = 060049C8 /* 00BC0 80B238B0 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00BC4 80B238B4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00BC8 80B238B8 3C053B44 */ lui $a1, 0x3B44 ## $a1 = 3B440000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s index 7d680b5aa9..72e9a35c62 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s @@ -43,8 +43,8 @@ glabel func_80B23A88 /* 00E34 80B23B24 24A52F28 */ addiu $a1, $a1, %lo(func_80B22F28) ## $a1 = 80B22F28 /* 00E38 80B23B28 0C2C8B3C */ jal func_80B22CF0 /* 00E3C 80B23B2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E40 80B23B30 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00E44 80B23B34 24A549C8 */ addiu $a1, $a1, 0x49C8 ## $a1 = 060049C8 +/* 00E40 80B23B30 3C050600 */ lui $a1, %hi(D_060049C8) ## $a1 = 06000000 +/* 00E44 80B23B34 24A549C8 */ addiu $a1, $a1, %lo(D_060049C8) ## $a1 = 060049C8 /* 00E48 80B23B38 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00E4C 80B23B3C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00E50 80B23B40 10000019 */ beq $zero, $zero, .L80B23BA8 @@ -60,8 +60,8 @@ glabel func_80B23A88 /* 00E70 80B23B60 24A530D8 */ addiu $a1, $a1, %lo(func_80B230D8) ## $a1 = 80B230D8 /* 00E74 80B23B64 0C2C8B3C */ jal func_80B22CF0 /* 00E78 80B23B68 AFA70024 */ sw $a3, 0x0024($sp) -/* 00E7C 80B23B6C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00E80 80B23B70 24A549C8 */ addiu $a1, $a1, 0x49C8 ## $a1 = 060049C8 +/* 00E7C 80B23B6C 3C050600 */ lui $a1, %hi(D_060049C8) ## $a1 = 06000000 +/* 00E80 80B23B70 24A549C8 */ addiu $a1, $a1, %lo(D_060049C8) ## $a1 = 060049C8 /* 00E84 80B23B74 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00E88 80B23B78 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00E8C 80B23B7C 8619001C */ lh $t9, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Draw.s index 4aaaf30f62..1695def12f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Draw.s @@ -4,8 +4,8 @@ glabel EnTrap_Draw /* 01178 80B257D8 AFA5001C */ sw $a1, 0x001C($sp) /* 0117C 80B257DC 0C00BAF3 */ jal func_8002EBCC /* 01180 80B257E0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01184 80B257E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01188 80B257E8 24A51400 */ addiu $a1, $a1, 0x1400 ## $a1 = 06001400 +/* 01184 80B257E4 3C050600 */ lui $a1, %hi(D_06001400) ## $a1 = 06000000 +/* 01188 80B257E8 24A51400 */ addiu $a1, $a1, %lo(D_06001400) ## $a1 = 06001400 /* 0118C 80B257EC 0C00D498 */ jal Gfx_DrawDListOpa /* 01190 80B257F0 8FA4001C */ lw $a0, 0x001C($sp) 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 a8dbce8b80..8c12e1d08e 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 @@ -18,16 +18,16 @@ glabel EnVali_Init /* 00038 80B266E8 3C0741D8 */ lui $a3, 0x41D8 ## $a3 = 41D80000 /* 0003C 80B266EC 240E009B */ addiu $t6, $zero, 0x009B ## $t6 = 0000009B /* 00040 80B266F0 A20E00C8 */ sb $t6, 0x00C8($s0) ## 000000C8 -/* 00044 80B266F4 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00048 80B266F8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00044 80B266F4 3C060600 */ lui $a2, %hi(D_06004848) ## $a2 = 06000000 +/* 00048 80B266F8 3C070600 */ lui $a3, %hi(D_060014AC) ## $a3 = 06000000 /* 0004C 80B266FC 260F0198 */ addiu $t7, $s0, 0x0198 ## $t7 = 00000198 /* 00050 80B26700 26180246 */ addiu $t8, $s0, 0x0246 ## $t8 = 00000246 /* 00054 80B26704 2419001D */ addiu $t9, $zero, 0x001D ## $t9 = 0000001D /* 00058 80B26708 AFB90018 */ sw $t9, 0x0018($sp) /* 0005C 80B2670C AFB80014 */ sw $t8, 0x0014($sp) /* 00060 80B26710 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00064 80B26714 24E714AC */ addiu $a3, $a3, 0x14AC ## $a3 = 060014AC -/* 00068 80B26718 24C64848 */ addiu $a2, $a2, 0x4848 ## $a2 = 06004848 +/* 00064 80B26714 24E714AC */ addiu $a3, $a3, %lo(D_060014AC) ## $a3 = 060014AC +/* 00068 80B26718 24C64848 */ addiu $a2, $a2, %lo(D_06004848) ## $a2 = 06004848 /* 0006C 80B2671C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00070 80B26720 0C02915F */ jal SkelAnime_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s index 5b242cd9b1..69cc19d956 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s @@ -2,8 +2,8 @@ glabel func_80B26878 /* 001C8 80B26878 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 001CC 80B2687C AFBF0014 */ sw $ra, 0x0014($sp) /* 001D0 80B26880 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 001D4 80B26884 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 001D8 80B26888 24A514AC */ addiu $a1, $a1, 0x14AC ## $a1 = 060014AC +/* 001D4 80B26884 3C050600 */ lui $a1, %hi(D_060014AC) ## $a1 = 06000000 +/* 001D8 80B26888 24A514AC */ addiu $a1, $a1, %lo(D_060014AC) ## $a1 = 060014AC /* 001DC 80B2688C AFA60018 */ sw $a2, 0x0018($sp) /* 001E0 80B26890 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 001E4 80B26894 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s index ee6cfd6d43..f8c6c683fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s @@ -2,8 +2,8 @@ glabel func_80B268FC /* 0024C 80B268FC 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 00250 80B26900 AFBF0014 */ sw $ra, 0x0014($sp) /* 00254 80B26904 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00258 80B26908 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0025C 80B2690C 24A50710 */ addiu $a1, $a1, 0x0710 ## $a1 = 06000710 +/* 00258 80B26908 3C050600 */ lui $a1, %hi(D_06000710) ## $a1 = 06000000 +/* 0025C 80B2690C 24A50710 */ addiu $a1, $a1, %lo(D_06000710) ## $a1 = 06000710 /* 00260 80B26910 AFA70090 */ sw $a3, 0x0090($sp) /* 00264 80B26914 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00268 80B26918 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B4C.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B4C.s index 55fd9311e0..5ad801d725 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B4C.s @@ -3,8 +3,8 @@ glabel func_80B26B4C /* 004A0 80B26B50 AFB00020 */ sw $s0, 0x0020($sp) /* 004A4 80B26B54 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 004A8 80B26B58 AFBF0024 */ sw $ra, 0x0024($sp) -/* 004AC 80B26B5C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 004B0 80B26B60 24A50854 */ addiu $a1, $a1, 0x0854 ## $a1 = 06000854 +/* 004AC 80B26B5C 3C050600 */ lui $a1, %hi(D_06000854) ## $a1 = 06000000 +/* 004B0 80B26B60 24A50854 */ addiu $a1, $a1, %lo(D_06000854) ## $a1 = 06000854 /* 004B4 80B26B64 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 004B8 80B26B68 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 004BC 80B26B6C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BBC.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BBC.s index 61679a6834..0cb2eb3458 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BBC.s @@ -2,8 +2,8 @@ glabel func_80B26BBC /* 0050C 80B26BBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00510 80B26BC0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00514 80B26BC4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00518 80B26BC8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0051C 80B26BCC 24A50B34 */ addiu $a1, $a1, 0x0B34 ## $a1 = 06000B34 +/* 00518 80B26BC8 3C050600 */ lui $a1, %hi(D_06000B34) ## $a1 = 06000000 +/* 0051C 80B26BCC 24A50B34 */ addiu $a1, $a1, %lo(D_06000B34) ## $a1 = 06000B34 /* 00520 80B26BD0 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00524 80B26BD4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00528 80B26BD8 8FAF0018 */ lw $t7, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26D54.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26D54.s index 795d5daae1..d4ce29da58 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26D54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26D54.s @@ -3,8 +3,8 @@ glabel func_80B26D54 /* 006A8 80B26D58 AFB00020 */ sw $s0, 0x0020($sp) /* 006AC 80B26D5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 006B0 80B26D60 AFBF0024 */ sw $ra, 0x0024($sp) -/* 006B4 80B26D64 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 006B8 80B26D68 24A50710 */ addiu $a1, $a1, 0x0710 ## $a1 = 06000710 +/* 006B4 80B26D64 3C050600 */ lui $a1, %hi(D_06000710) ## $a1 = 06000000 +/* 006B8 80B26D68 24A50710 */ addiu $a1, $a1, %lo(D_06000710) ## $a1 = 06000710 /* 006BC 80B26D6C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 006C0 80B26D70 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 006C4 80B26D74 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E40.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E40.s index e2b195e245..975e288426 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E40.s @@ -2,8 +2,8 @@ glabel func_80B26E40 /* 00790 80B26E40 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00794 80B26E44 AFBF0014 */ sw $ra, 0x0014($sp) /* 00798 80B26E48 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0079C 80B26E4C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 007A0 80B26E50 24A514AC */ addiu $a1, $a1, 0x14AC ## $a1 = 060014AC +/* 0079C 80B26E4C 3C050600 */ lui $a1, %hi(D_060014AC) ## $a1 = 06000000 +/* 007A0 80B26E50 24A514AC */ addiu $a1, $a1, %lo(D_060014AC) ## $a1 = 060014AC /* 007A4 80B26E54 AFA70018 */ sw $a3, 0x0018($sp) /* 007A8 80B26E58 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 007AC 80B26E5C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s index 03b84f1ea4..c80f0f608c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s @@ -85,8 +85,8 @@ glabel func_80B28344 /* 01D4C 80B283FC 0C0346A2 */ jal Matrix_NewMtx /* 01D50 80B28400 AFA20050 */ sw $v0, 0x0050($sp) /* 01D54 80B28404 8FA30050 */ lw $v1, 0x0050($sp) -/* 01D58 80B28408 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 01D5C 80B2840C 25CE2610 */ addiu $t6, $t6, 0x2610 ## $t6 = 06002610 +/* 01D58 80B28408 3C0E0600 */ lui $t6, %hi(D_06002610) ## $t6 = 06000000 +/* 01D5C 80B2840C 25CE2610 */ addiu $t6, $t6, %lo(D_06002610) ## $t6 = 06002610 /* 01D60 80B28410 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01D64 80B28414 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01D68 80B28418 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 @@ -133,10 +133,10 @@ glabel func_80B28344 /* 01E04 80B284B4 AFA20048 */ sw $v0, 0x0048($sp) /* 01E08 80B284B8 8FA30048 */ lw $v1, 0x0048($sp) /* 01E0C 80B284BC C7A20078 */ lwc1 $f2, 0x0078($sp) -/* 01E10 80B284C0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01E10 80B284C0 3C040600 */ lui $a0, %hi(D_06002740) ## $a0 = 06000000 /* 01E14 80B284C4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01E18 80B284C8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01E1C 80B284CC 24842740 */ addiu $a0, $a0, 0x2740 ## $a0 = 06002740 +/* 01E1C 80B284CC 24842740 */ addiu $a0, $a0, %lo(D_06002740) ## $a0 = 06002740 /* 01E20 80B284D0 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 /* 01E24 80B284D4 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 01E28 80B284D8 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 @@ -260,8 +260,8 @@ glabel func_80B28344 /* 02000 80B286B0 0C0346A2 */ jal Matrix_NewMtx /* 02004 80B286B4 AFA20030 */ sw $v0, 0x0030($sp) /* 02008 80B286B8 8FA30030 */ lw $v1, 0x0030($sp) -/* 0200C 80B286BC 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 -/* 02010 80B286C0 258C27D8 */ addiu $t4, $t4, 0x27D8 ## $t4 = 060027D8 +/* 0200C 80B286BC 3C0C0600 */ lui $t4, %hi(D_060027D8) ## $t4 = 06000000 +/* 02010 80B286C0 258C27D8 */ addiu $t4, $t4, %lo(D_060027D8) ## $t4 = 060027D8 /* 02014 80B286C4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 02018 80B286C8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0201C 80B286CC 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 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 7da93ce2a0..aaadf7c279 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 @@ -212,13 +212,13 @@ glabel func_80B2A75C /* 007F8 80B2A9F8 00000000 */ nop /* 007FC 80B2A9FC C60A01B0 */ lwc1 $f10, 0x01B0($s0) ## 000001B0 /* 00800 80B2AA00 8E0201A0 */ lw $v0, 0x01A0($s0) ## 000001A0 -/* 00804 80B2AA04 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 +/* 00804 80B2AA04 3C0D0600 */ lui $t5, %hi(D_06003858) ## $t5 = 06000000 /* 00808 80B2AA08 4600540D */ trunc.w.s $f16, $f10 -/* 0080C 80B2AA0C 25AD3858 */ addiu $t5, $t5, 0x3858 ## $t5 = 06003858 -/* 00810 80B2AA10 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 +/* 0080C 80B2AA0C 25AD3858 */ addiu $t5, $t5, %lo(D_06003858) ## $t5 = 06003858 +/* 00810 80B2AA10 3C0E0600 */ lui $t6, %hi(D_06004AA4) ## $t6 = 06000000 /* 00814 80B2AA14 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 /* 00818 80B2AA18 44038000 */ mfc1 $v1, $f16 -/* 0081C 80B2AA1C 25CE4AA4 */ addiu $t6, $t6, 0x4AA4 ## $t6 = 06004AA4 +/* 0081C 80B2AA1C 25CE4AA4 */ addiu $t6, $t6, %lo(D_06004AA4) ## $t6 = 06004AA4 /* 00820 80B2AA20 00031C00 */ sll $v1, $v1, 16 /* 00824 80B2AA24 15A2000E */ bne $t5, $v0, .L80B2AA60 /* 00828 80B2AA28 00031C03 */ sra $v1, $v1, 16 @@ -302,8 +302,8 @@ glabel func_80B2A75C /* 00930 80B2AB30 54EC000B */ bnel $a3, $t4, .L80B2AB60 /* 00934 80B2AB34 8E0E01A0 */ lw $t6, 0x01A0($s0) ## 000001A0 /* 00938 80B2AB38 8E0D01A0 */ lw $t5, 0x01A0($s0) ## 000001A0 -/* 0093C 80B2AB3C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00940 80B2AB40 24A52928 */ addiu $a1, $a1, 0x2928 ## $a1 = 06002928 +/* 0093C 80B2AB3C 3C050600 */ lui $a1, %hi(D_06002928) ## $a1 = 06000000 +/* 00940 80B2AB40 24A52928 */ addiu $a1, $a1, %lo(D_06002928) ## $a1 = 06002928 /* 00944 80B2AB44 10AD01D1 */ beq $a1, $t5, .L80B2B28C /* 00948 80B2AB48 8FA40040 */ lw $a0, 0x0040($sp) /* 0094C 80B2AB4C 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat @@ -312,8 +312,8 @@ glabel func_80B2A75C /* 00958 80B2AB58 8FBF003C */ lw $ra, 0x003C($sp) /* 0095C 80B2AB5C 8E0E01A0 */ lw $t6, 0x01A0($s0) ## 000001A0 .L80B2AB60: -/* 00960 80B2AB60 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00964 80B2AB64 24A54AA4 */ addiu $a1, $a1, 0x4AA4 ## $a1 = 06004AA4 +/* 00960 80B2AB60 3C050600 */ lui $a1, %hi(D_06004AA4) ## $a1 = 06000000 +/* 00964 80B2AB64 24A54AA4 */ addiu $a1, $a1, %lo(D_06004AA4) ## $a1 = 06004AA4 /* 00968 80B2AB68 10AE01C8 */ beq $a1, $t6, .L80B2B28C /* 0096C 80B2AB6C 8FA40040 */ lw $a0, 0x0040($sp) /* 00970 80B2AB70 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat @@ -329,8 +329,8 @@ glabel func_80B2A75C /* 00994 80B2AB94 14F8000A */ bne $a3, $t8, .L80B2ABC0 /* 00998 80B2AB98 A42FCFCC */ sh $t7, %lo(D_80B2CFCC)($at) /* 0099C 80B2AB9C 8E1901A0 */ lw $t9, 0x01A0($s0) ## 000001A0 -/* 009A0 80B2ABA0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 009A4 80B2ABA4 24A51D28 */ addiu $a1, $a1, 0x1D28 ## $a1 = 06001D28 +/* 009A0 80B2ABA0 3C050600 */ lui $a1, %hi(D_06001D28) ## $a1 = 06000000 +/* 009A4 80B2ABA4 24A51D28 */ addiu $a1, $a1, %lo(D_06001D28) ## $a1 = 06001D28 /* 009A8 80B2ABA8 10B901B8 */ beq $a1, $t9, .L80B2B28C /* 009AC 80B2ABAC 8FA40040 */ lw $a0, 0x0040($sp) /* 009B0 80B2ABB0 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat @@ -339,8 +339,8 @@ glabel func_80B2A75C /* 009BC 80B2ABBC 8FBF003C */ lw $ra, 0x003C($sp) .L80B2ABC0: /* 009C0 80B2ABC0 8E0A01A0 */ lw $t2, 0x01A0($s0) ## 000001A0 -/* 009C4 80B2ABC4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 009C8 80B2ABC8 24A53858 */ addiu $a1, $a1, 0x3858 ## $a1 = 06003858 +/* 009C4 80B2ABC4 3C050600 */ lui $a1, %hi(D_06003858) ## $a1 = 06000000 +/* 009C8 80B2ABC8 24A53858 */ addiu $a1, $a1, %lo(D_06003858) ## $a1 = 06003858 /* 009CC 80B2ABCC 10AA01AF */ beq $a1, $t2, .L80B2B28C /* 009D0 80B2ABD0 8FA40040 */ lw $a0, 0x0040($sp) /* 009D4 80B2ABD4 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat @@ -361,9 +361,9 @@ glabel func_80B2A75C /* 00A0C 80B2AC0C 00000000 */ nop glabel L80B2AC10 /* 00A10 80B2AC10 1524019E */ bne $t1, $a0, .L80B2B28C -/* 00A14 80B2AC14 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00A14 80B2AC14 3C050600 */ lui $a1, %hi(D_06000F54) ## $a1 = 06000000 /* 00A18 80B2AC18 8FA40040 */ lw $a0, 0x0040($sp) -/* 00A1C 80B2AC1C 24A50F54 */ addiu $a1, $a1, 0x0F54 ## $a1 = 06000F54 +/* 00A1C 80B2AC1C 24A50F54 */ addiu $a1, $a1, %lo(D_06000F54) ## $a1 = 06000F54 /* 00A20 80B2AC20 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00A24 80B2AC24 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00A28 80B2AC28 920D01E5 */ lbu $t5, 0x01E5($s0) ## 000001E5 @@ -373,8 +373,8 @@ glabel L80B2AC10 glabel L80B2AC38 /* 00A38 80B2AC38 10400194 */ beq $v0, $zero, .L80B2B28C /* 00A3C 80B2AC3C 8FA40040 */ lw $a0, 0x0040($sp) -/* 00A40 80B2AC40 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00A44 80B2AC44 24A514F4 */ addiu $a1, $a1, 0x14F4 ## $a1 = 060014F4 +/* 00A40 80B2AC40 3C050600 */ lui $a1, %hi(D_060014F4) ## $a1 = 06000000 +/* 00A44 80B2AC44 24A514F4 */ addiu $a1, $a1, %lo(D_060014F4) ## $a1 = 060014F4 /* 00A48 80B2AC48 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00A4C 80B2AC4C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00A50 80B2AC50 920F01E5 */ lbu $t7, 0x01E5($s0) ## 000001E5 @@ -384,9 +384,9 @@ glabel L80B2AC38 glabel L80B2AC60 /* 00A60 80B2AC60 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00A64 80B2AC64 14810189 */ bne $a0, $at, .L80B2B28C -/* 00A68 80B2AC68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00A68 80B2AC68 3C050600 */ lui $a1, %hi(D_060008A0) ## $a1 = 06000000 /* 00A6C 80B2AC6C 8FA40040 */ lw $a0, 0x0040($sp) -/* 00A70 80B2AC70 24A508A0 */ addiu $a1, $a1, 0x08A0 ## $a1 = 060008A0 +/* 00A70 80B2AC70 24A508A0 */ addiu $a1, $a1, %lo(D_060008A0) ## $a1 = 060008A0 /* 00A74 80B2AC74 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00A78 80B2AC78 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00A7C 80B2AC7C 921901E5 */ lbu $t9, 0x01E5($s0) ## 000001E5 @@ -396,8 +396,8 @@ glabel L80B2AC60 glabel L80B2AC8C /* 00A8C 80B2AC8C 1040017F */ beq $v0, $zero, .L80B2B28C /* 00A90 80B2AC90 8FA40040 */ lw $a0, 0x0040($sp) -/* 00A94 80B2AC94 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00A98 80B2AC98 24A50BC8 */ addiu $a1, $a1, 0x0BC8 ## $a1 = 06000BC8 +/* 00A94 80B2AC94 3C050600 */ lui $a1, %hi(D_06000BC8) ## $a1 = 06000000 +/* 00A98 80B2AC98 24A50BC8 */ addiu $a1, $a1, %lo(D_06000BC8) ## $a1 = 06000BC8 /* 00A9C 80B2AC9C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00AA0 80B2ACA0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00AA4 80B2ACA4 920B01E5 */ lbu $t3, 0x01E5($s0) ## 000001E5 @@ -407,9 +407,9 @@ glabel L80B2AC8C glabel L80B2ACB4 /* 00AB4 80B2ACB4 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B /* 00AB8 80B2ACB8 14810174 */ bne $a0, $at, .L80B2B28C -/* 00ABC 80B2ACBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00ABC 80B2ACBC 3C050600 */ lui $a1, %hi(D_060014F4) ## $a1 = 06000000 /* 00AC0 80B2ACC0 8FA40040 */ lw $a0, 0x0040($sp) -/* 00AC4 80B2ACC4 24A514F4 */ addiu $a1, $a1, 0x14F4 ## $a1 = 060014F4 +/* 00AC4 80B2ACC4 24A514F4 */ addiu $a1, $a1, %lo(D_060014F4) ## $a1 = 060014F4 /* 00AC8 80B2ACC8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00ACC 80B2ACCC 3C06C1A0 */ lui $a2, 0xC1A0 ## $a2 = C1A00000 /* 00AD0 80B2ACD0 920D01E5 */ lbu $t5, 0x01E5($s0) ## 000001E5 @@ -419,8 +419,8 @@ glabel L80B2ACB4 glabel L80B2ACE0 /* 00AE0 80B2ACE0 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 /* 00AE4 80B2ACE4 14810169 */ bne $a0, $at, .L80B2B28C -/* 00AE8 80B2ACE8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00AEC 80B2ACEC 24A52928 */ addiu $a1, $a1, 0x2928 ## $a1 = 06002928 +/* 00AE8 80B2ACE8 3C050600 */ lui $a1, %hi(D_06002928) ## $a1 = 06000000 +/* 00AEC 80B2ACEC 24A52928 */ addiu $a1, $a1, %lo(D_06002928) ## $a1 = 06002928 /* 00AF0 80B2ACF0 8FA40040 */ lw $a0, 0x0040($sp) /* 00AF4 80B2ACF4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00AF8 80B2ACF8 3C06C170 */ lui $a2, 0xC170 ## $a2 = C1700000 @@ -435,8 +435,8 @@ glabel L80B2AD0C /* 00B18 80B2AD18 0C00BE0A */ jal Audio_PlayActorSound2 /* 00B1C 80B2AD1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B20 80B2AD20 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00B24 80B2AD24 24A505B4 */ addiu $a1, $a1, 0x05B4 ## $a1 = 060005B4 +/* 00B20 80B2AD20 3C050600 */ lui $a1, %hi(D_060005B4) ## $a1 = 06000000 +/* 00B24 80B2AD24 24A505B4 */ addiu $a1, $a1, %lo(D_060005B4) ## $a1 = 060005B4 /* 00B28 80B2AD28 8FA40040 */ lw $a0, 0x0040($sp) /* 00B2C 80B2AD2C 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 00B30 80B2AD30 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 @@ -449,8 +449,8 @@ glabel L80B2AD44 /* 00B48 80B2AD48 A20001E5 */ sb $zero, 0x01E5($s0) ## 000001E5 /* 00B4C 80B2AD4C 8E0B01A0 */ lw $t3, 0x01A0($s0) ## 000001A0 .L80B2AD50: -/* 00B50 80B2AD50 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00B54 80B2AD54 24A52650 */ addiu $a1, $a1, 0x2650 ## $a1 = 06002650 +/* 00B50 80B2AD50 3C050600 */ lui $a1, %hi(D_06002650) ## $a1 = 06000000 +/* 00B54 80B2AD54 24A52650 */ addiu $a1, $a1, %lo(D_06002650) ## $a1 = 06002650 /* 00B58 80B2AD58 10AB014C */ beq $a1, $t3, .L80B2B28C /* 00B5C 80B2AD5C 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 00B60 80B2AD60 1481014A */ bne $a0, $at, .L80B2B28C @@ -538,8 +538,8 @@ glabel L80B2AD44 /* 00C90 80B2AE90 572100FF */ bnel $t9, $at, .L80B2B290 /* 00C94 80B2AE94 8FBF003C */ lw $ra, 0x003C($sp) /* 00C98 80B2AE98 8E0A01A0 */ lw $t2, 0x01A0($s0) ## 000001A0 -/* 00C9C 80B2AE9C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00CA0 80B2AEA0 24A52574 */ addiu $a1, $a1, 0x2574 ## $a1 = 06002574 +/* 00C9C 80B2AE9C 3C050600 */ lui $a1, %hi(D_06002574) ## $a1 = 06000000 +/* 00CA0 80B2AEA0 24A52574 */ addiu $a1, $a1, %lo(D_06002574) ## $a1 = 06002574 /* 00CA4 80B2AEA4 10AA00F9 */ beq $a1, $t2, .L80B2B28C /* 00CA8 80B2AEA8 8FA40040 */ lw $a0, 0x0040($sp) /* 00CAC 80B2AEAC 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat @@ -560,8 +560,8 @@ glabel L80B2AD44 /* 00CE4 80B2AEE4 55C100EA */ bnel $t6, $at, .L80B2B290 /* 00CE8 80B2AEE8 8FBF003C */ lw $ra, 0x003C($sp) /* 00CEC 80B2AEEC 8E0F01A0 */ lw $t7, 0x01A0($s0) ## 000001A0 -/* 00CF0 80B2AEF0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00CF4 80B2AEF4 24A529CC */ addiu $a1, $a1, 0x29CC ## $a1 = 060029CC +/* 00CF0 80B2AEF0 3C050600 */ lui $a1, %hi(D_060029CC) ## $a1 = 06000000 +/* 00CF4 80B2AEF4 24A529CC */ addiu $a1, $a1, %lo(D_060029CC) ## $a1 = 060029CC /* 00CF8 80B2AEF8 10AF00E4 */ beq $a1, $t7, .L80B2B28C /* 00CFC 80B2AEFC 8FA40040 */ lw $a0, 0x0040($sp) /* 00D00 80B2AF00 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat @@ -597,8 +597,8 @@ glabel L80B2AD44 /* 00D70 80B2AF70 55A100C7 */ bnel $t5, $at, .L80B2B290 /* 00D74 80B2AF74 8FBF003C */ lw $ra, 0x003C($sp) /* 00D78 80B2AF78 8E0E01A0 */ lw $t6, 0x01A0($s0) ## 000001A0 -/* 00D7C 80B2AF7C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00D80 80B2AF80 24A51410 */ addiu $a1, $a1, 0x1410 ## $a1 = 06001410 +/* 00D7C 80B2AF7C 3C050600 */ lui $a1, %hi(D_06001410) ## $a1 = 06000000 +/* 00D80 80B2AF80 24A51410 */ addiu $a1, $a1, %lo(D_06001410) ## $a1 = 06001410 /* 00D84 80B2AF84 10AE00C1 */ beq $a1, $t6, .L80B2B28C /* 00D88 80B2AF88 8FA40040 */ lw $a0, 0x0040($sp) /* 00D8C 80B2AF8C 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat @@ -619,8 +619,8 @@ glabel L80B2AD44 /* 00DC4 80B2AFC4 554100B2 */ bnel $t2, $at, .L80B2B290 /* 00DC8 80B2AFC8 8FBF003C */ lw $ra, 0x003C($sp) /* 00DCC 80B2AFCC 8E0B01A0 */ lw $t3, 0x01A0($s0) ## 000001A0 -/* 00DD0 80B2AFD0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00DD4 80B2AFD4 24A50450 */ addiu $a1, $a1, 0x0450 ## $a1 = 06000450 +/* 00DD0 80B2AFD0 3C050600 */ lui $a1, %hi(D_06000450) ## $a1 = 06000000 +/* 00DD4 80B2AFD4 24A50450 */ addiu $a1, $a1, %lo(D_06000450) ## $a1 = 06000450 /* 00DD8 80B2AFD8 10AB00AC */ beq $a1, $t3, .L80B2B28C /* 00DDC 80B2AFDC 8FA40040 */ lw $a0, 0x0040($sp) /* 00DE0 80B2AFE0 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat @@ -646,8 +646,8 @@ glabel L80B2AD44 /* 00E2C 80B2B02C 10000098 */ beq $zero, $zero, .L80B2B290 /* 00E30 80B2B030 8FBF003C */ lw $ra, 0x003C($sp) .L80B2B034: -/* 00E34 80B2B034 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00E38 80B2B038 24A5504C */ addiu $a1, $a1, 0x504C ## $a1 = 0600504C +/* 00E34 80B2B034 3C050600 */ lui $a1, %hi(D_0600504C) ## $a1 = 06000000 +/* 00E38 80B2B038 24A5504C */ addiu $a1, $a1, %lo(D_0600504C) ## $a1 = 0600504C /* 00E3C 80B2B03C 8FA40040 */ lw $a0, 0x0040($sp) /* 00E40 80B2B040 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 00E44 80B2B044 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 @@ -658,9 +658,9 @@ glabel L80B2AD44 .L80B2B058: /* 00E58 80B2B058 8CD81D8C */ lw $t8, 0x1D8C($a2) ## 00001D8C /* 00E5C 80B2B05C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00E60 80B2B060 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00E60 80B2B060 3C050600 */ lui $a1, %hi(D_0600420C) ## $a1 = 06000000 /* 00E64 80B2B064 97190000 */ lhu $t9, 0x0000($t8) ## 00000000 -/* 00E68 80B2B068 24A5420C */ addiu $a1, $a1, 0x420C ## $a1 = 0600420C +/* 00E68 80B2B068 24A5420C */ addiu $a1, $a1, %lo(D_0600420C) ## $a1 = 0600420C /* 00E6C 80B2B06C 8FA40040 */ lw $a0, 0x0040($sp) /* 00E70 80B2B070 57210087 */ bnel $t9, $at, .L80B2B290 /* 00E74 80B2B074 8FBF003C */ lw $ra, 0x003C($sp) @@ -673,8 +673,8 @@ glabel L80B2AD44 .L80B2B090: /* 00E90 80B2B090 10A0007E */ beq $a1, $zero, .L80B2B28C /* 00E94 80B2B094 8FA40040 */ lw $a0, 0x0040($sp) -/* 00E98 80B2B098 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00E9C 80B2B09C 24A548FC */ addiu $a1, $a1, 0x48FC ## $a1 = 060048FC +/* 00E98 80B2B098 3C050600 */ lui $a1, %hi(D_060048FC) ## $a1 = 06000000 +/* 00E9C 80B2B09C 24A548FC */ addiu $a1, $a1, %lo(D_060048FC) ## $a1 = 060048FC /* 00EA0 80B2B0A0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00EA4 80B2B0A4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00EA8 80B2B0A8 920C01E5 */ lbu $t4, 0x01E5($s0) ## 000001E5 @@ -713,8 +713,8 @@ glabel L80B2AD44 /* 00F24 80B2B124 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 00F28 80B2B128 AFA70010 */ sw $a3, 0x0010($sp) -/* 00F2C 80B2B12C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00F30 80B2B130 24A54534 */ addiu $a1, $a1, 0x4534 ## $a1 = 06004534 +/* 00F2C 80B2B12C 3C050600 */ lui $a1, %hi(D_06004534) ## $a1 = 06000000 +/* 00F30 80B2B130 24A54534 */ addiu $a1, $a1, %lo(D_06004534) ## $a1 = 06004534 /* 00F34 80B2B134 8FA40040 */ lw $a0, 0x0040($sp) /* 00F38 80B2B138 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00F3C 80B2B13C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 @@ -725,8 +725,8 @@ glabel L80B2AD44 .L80B2B150: /* 00F50 80B2B150 1040004E */ beq $v0, $zero, .L80B2B28C /* 00F54 80B2B154 8FA40040 */ lw $a0, 0x0040($sp) -/* 00F58 80B2B158 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00F5C 80B2B15C 24A548B0 */ addiu $a1, $a1, 0x48B0 ## $a1 = 060048B0 +/* 00F58 80B2B158 3C050600 */ lui $a1, %hi(D_060048B0) ## $a1 = 06000000 +/* 00F5C 80B2B15C 24A548B0 */ addiu $a1, $a1, %lo(D_060048B0) ## $a1 = 060048B0 /* 00F60 80B2B160 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00F64 80B2B164 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00F68 80B2B168 920C01E5 */ lbu $t4, 0x01E5($s0) ## 000001E5 @@ -760,8 +760,8 @@ glabel L80B2AD44 /* 00FD0 80B2B1D0 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 /* 00FD4 80B2B1D4 8FA40040 */ lw $a0, 0x0040($sp) /* 00FD8 80B2B1D8 1701002C */ bne $t8, $at, .L80B2B28C -/* 00FDC 80B2B1DC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00FE0 80B2B1E0 24A550A8 */ addiu $a1, $a1, 0x50A8 ## $a1 = 060050A8 +/* 00FDC 80B2B1DC 3C050600 */ lui $a1, %hi(D_060050A8) ## $a1 = 06000000 +/* 00FE0 80B2B1E0 24A550A8 */ addiu $a1, $a1, %lo(D_060050A8) ## $a1 = 060050A8 /* 00FE4 80B2B1E4 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 00FE8 80B2B1E8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FEC 80B2B1EC 921901E5 */ lbu $t9, 0x01E5($s0) ## 000001E5 @@ -771,9 +771,9 @@ glabel L80B2AD44 .L80B2B1FC: /* 00FFC 80B2B1FC 8CCB1D90 */ lw $t3, 0x1D90($a2) ## 00001D90 /* 01000 80B2B200 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01004 80B2B204 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 01004 80B2B204 3C050600 */ lui $a1, %hi(D_06003284) ## $a1 = 06000000 /* 01008 80B2B208 956C0000 */ lhu $t4, 0x0000($t3) ## 00000000 -/* 0100C 80B2B20C 24A53284 */ addiu $a1, $a1, 0x3284 ## $a1 = 06003284 +/* 0100C 80B2B20C 24A53284 */ addiu $a1, $a1, %lo(D_06003284) ## $a1 = 06003284 /* 01010 80B2B210 8FA40040 */ lw $a0, 0x0040($sp) /* 01014 80B2B214 5581001E */ bnel $t4, $at, .L80B2B290 /* 01018 80B2B218 8FBF003C */ lw $ra, 0x003C($sp) @@ -786,8 +786,8 @@ glabel L80B2AD44 .L80B2B234: /* 01034 80B2B234 10400015 */ beq $v0, $zero, .L80B2B28C /* 01038 80B2B238 8FA40040 */ lw $a0, 0x0040($sp) -/* 0103C 80B2B23C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01040 80B2B240 24A53D84 */ addiu $a1, $a1, 0x3D84 ## $a1 = 06003D84 +/* 0103C 80B2B23C 3C050600 */ lui $a1, %hi(D_06003D84) ## $a1 = 06000000 +/* 01040 80B2B240 24A53D84 */ addiu $a1, $a1, %lo(D_06003D84) ## $a1 = 06003D84 /* 01044 80B2B244 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01048 80B2B248 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0104C 80B2B24C 920F01E5 */ lbu $t7, 0x01E5($s0) ## 000001E5 @@ -796,8 +796,8 @@ glabel L80B2AD44 /* 01058 80B2B258 A21801E5 */ sb $t8, 0x01E5($s0) ## 000001E5 /* 0105C 80B2B25C 8CD91D90 */ lw $t9, 0x1D90($a2) ## 00001D90 .L80B2B260: -/* 01060 80B2B260 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01064 80B2B264 24A53428 */ addiu $a1, $a1, 0x3428 ## $a1 = 06003428 +/* 01060 80B2B260 3C050600 */ lui $a1, %hi(D_06003428) ## $a1 = 06000000 +/* 01064 80B2B264 24A53428 */ addiu $a1, $a1, %lo(D_06003428) ## $a1 = 06003428 /* 01068 80B2B268 972A0000 */ lhu $t2, 0x0000($t9) ## 00000000 /* 0106C 80B2B26C 8FA40040 */ lw $a0, 0x0040($sp) /* 01070 80B2B270 552A0007 */ bnel $t1, $t2, .L80B2B290 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 3aad458549..01455ae078 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 @@ -10,8 +10,8 @@ glabel func_80B2B2F4 /* 01114 80B2B314 14200011 */ bne $at, $zero, .L80B2B35C /* 01118 80B2B318 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 0111C 80B2B31C 14A1000F */ bne $a1, $at, .L80B2B35C -/* 01120 80B2B320 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 -/* 01124 80B2B324 2718E1A8 */ addiu $t8, $t8, 0xE1A8 ## $t8 = 0600E1A8 +/* 01120 80B2B320 3C180601 */ lui $t8, %hi(D_0600E1A8) ## $t8 = 06010000 +/* 01124 80B2B324 2718E1A8 */ addiu $t8, $t8, %lo(D_0600E1A8) ## $t8 = 0600E1A8 /* 01128 80B2B328 ACD80000 */ sw $t8, 0x0000($a2) ## 00000000 /* 0112C 80B2B32C 03E00008 */ jr $ra /* 01130 80B2B330 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 @@ -24,8 +24,8 @@ glabel func_80B2B2F4 /* 01144 80B2B344 10200005 */ beq $at, $zero, .L80B2B35C /* 01148 80B2B348 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 0114C 80B2B34C 14A10003 */ bne $a1, $at, .L80B2B35C -/* 01150 80B2B350 3C190601 */ lui $t9, 0x0601 ## $t9 = 06010000 -/* 01154 80B2B354 2739E1A8 */ addiu $t9, $t9, 0xE1A8 ## $t9 = 0600E1A8 +/* 01150 80B2B350 3C190601 */ lui $t9, %hi(D_0600E1A8) ## $t9 = 06010000 +/* 01154 80B2B354 2739E1A8 */ addiu $t9, $t9, %lo(D_0600E1A8) ## $t9 = 0600E1A8 /* 01158 80B2B358 ACD90000 */ sw $t9, 0x0000($a2) ## 00000000 .L80B2B35C: /* 0115C 80B2B35C 03E00008 */ jr $ra 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 1c0e7ce5c9..dc450c43c6 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 @@ -45,8 +45,8 @@ glabel func_80B2B364 /* 011D8 80B2B3D8 0C0346A2 */ jal Matrix_NewMtx /* 011DC 80B2B3DC AFA20028 */ sw $v0, 0x0028($sp) /* 011E0 80B2B3E0 8FA30028 */ lw $v1, 0x0028($sp) -/* 011E4 80B2B3E4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 011E8 80B2B3E8 2484BE90 */ addiu $a0, $a0, 0xBE90 ## $a0 = 0600BE90 +/* 011E4 80B2B3E4 3C040601 */ lui $a0, %hi(D_0600BE90) ## $a0 = 06010000 +/* 011E8 80B2B3E8 2484BE90 */ addiu $a0, $a0, %lo(D_0600BE90) ## $a0 = 0600BE90 /* 011EC 80B2B3EC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 011F0 80B2B3F0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 011F4 80B2B3F4 00045900 */ sll $t3, $a0, 4 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 490dd11873..820e77ff80 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 @@ -52,8 +52,8 @@ glabel func_80B2B4A8 /* 01340 80B2B540 14200020 */ bne $at, $zero, .L80B2B5C4 /* 01344 80B2B544 246B0468 */ addiu $t3, $v1, 0x0468 ## $t3 = 000004FD /* 01348 80B2B548 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 0134C 80B2B54C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01350 80B2B550 2484F178 */ addiu $a0, $a0, 0xF178 ## $a0 = 0600F178 +/* 0134C 80B2B54C 3C040601 */ lui $a0, %hi(D_0600F178) ## $a0 = 06010000 +/* 01350 80B2B550 2484F178 */ addiu $a0, $a0, %lo(D_0600F178) ## $a0 = 0600F178 /* 01354 80B2B554 00046900 */ sll $t5, $a0, 4 /* 01358 80B2B558 000D7702 */ srl $t6, $t5, 28 /* 0135C 80B2B55C 3C188016 */ lui $t8, %hi(gSegments) @@ -87,8 +87,8 @@ glabel func_80B2B4A8 /* 013C8 80B2B5C8 14200022 */ bne $at, $zero, .L80B2B654 /* 013CC 80B2B5CC 246C0469 */ addiu $t4, $v1, 0x0469 ## $t4 = 000004FE /* 013D0 80B2B5D0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 013D4 80B2B5D4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 013D8 80B2B5D8 2484F378 */ addiu $a0, $a0, 0xF378 ## $a0 = 0600F378 +/* 013D4 80B2B5D4 3C040601 */ lui $a0, %hi(D_0600F378) ## $a0 = 06010000 +/* 013D8 80B2B5D8 2484F378 */ addiu $a0, $a0, %lo(D_0600F378) ## $a0 = 0600F378 /* 013DC 80B2B5DC 00047100 */ sll $t6, $a0, 4 /* 013E0 80B2B5E0 000E7F02 */ srl $t7, $t6, 28 /* 013E4 80B2B5E4 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -124,8 +124,8 @@ glabel func_80B2B4A8 /* 01458 80B2B658 14200022 */ bne $at, $zero, .L80B2B6E4 /* 0145C 80B2B65C 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 /* 01460 80B2B660 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01464 80B2B664 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01468 80B2B668 2484F578 */ addiu $a0, $a0, 0xF578 ## $a0 = 0600F578 +/* 01464 80B2B664 3C040601 */ lui $a0, %hi(D_0600F578) ## $a0 = 06010000 +/* 01468 80B2B668 2484F578 */ addiu $a0, $a0, %lo(D_0600F578) ## $a0 = 0600F578 /* 0146C 80B2B66C 00047900 */ sll $t7, $a0, 4 /* 01470 80B2B670 000FC702 */ srl $t8, $t7, 28 /* 01474 80B2B674 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -158,8 +158,8 @@ glabel func_80B2B4A8 /* 014E0 80B2B6E0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 .L80B2B6E4: /* 014E4 80B2B6E4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 014E8 80B2B6E8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 014EC 80B2B6EC 2484F778 */ addiu $a0, $a0, 0xF778 ## $a0 = 0600F778 +/* 014E8 80B2B6E8 3C040601 */ lui $a0, %hi(D_0600F778) ## $a0 = 06010000 +/* 014EC 80B2B6EC 2484F778 */ addiu $a0, $a0, %lo(D_0600F778) ## $a0 = 0600F778 /* 014F0 80B2B6F0 00047900 */ sll $t7, $a0, 4 /* 014F4 80B2B6F4 000FC702 */ srl $t8, $t7, 28 /* 014F8 80B2B6F8 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -194,8 +194,8 @@ glabel func_80B2B4A8 /* 01568 80B2B768 14E10015 */ bne $a3, $at, .L80B2B7C0 /* 0156C 80B2B76C 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 /* 01570 80B2B770 8D0302D0 */ lw $v1, 0x02D0($t0) ## 000002D0 -/* 01574 80B2B774 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01578 80B2B778 2484A4E0 */ addiu $a0, $a0, 0xA4E0 ## $a0 = 0600A4E0 +/* 01574 80B2B774 3C040601 */ lui $a0, %hi(D_0600A4E0) ## $a0 = 06010000 +/* 01578 80B2B778 2484A4E0 */ addiu $a0, $a0, %lo(D_0600A4E0) ## $a0 = 0600A4E0 /* 0157C 80B2B77C 00047900 */ sll $t7, $a0, 4 /* 01580 80B2B780 000FC702 */ srl $t8, $t7, 28 /* 01584 80B2B784 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B928.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B928.s index f010cbc00d..591a9ef2eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B928.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B928.s @@ -5,8 +5,8 @@ glabel func_80B2B928 /* 01734 80B2B934 15C10019 */ bne $t6, $at, .L80B2B99C /* 01738 80B2B938 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 0173C 80B2B93C 14A10003 */ bne $a1, $at, .L80B2B94C -/* 01740 80B2B940 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 -/* 01744 80B2B944 25EFC410 */ addiu $t7, $t7, 0xC410 ## $t7 = 0600C410 +/* 01740 80B2B940 3C0F0601 */ lui $t7, %hi(D_0600C410) ## $t7 = 06010000 +/* 01744 80B2B944 25EFC410 */ addiu $t7, $t7, %lo(D_0600C410) ## $t7 = 0600C410 /* 01748 80B2B948 ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 .L80B2B94C: /* 0174C 80B2B94C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B9A4.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B9A4.s index 8c14c5eb8a..308a49ad51 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B9A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B9A4.s @@ -27,8 +27,8 @@ glabel func_80B2B9A4 /* 017E0 80B2B9E0 0C031AB1 */ jal Graph_OpenDisps /* 017E4 80B2B9E4 AFA50030 */ sw $a1, 0x0030($sp) /* 017E8 80B2B9E8 8FA80030 */ lw $t0, 0x0030($sp) -/* 017EC 80B2B9EC 3C090601 */ lui $t1, 0x0601 ## $t1 = 06010000 -/* 017F0 80B2B9F0 2529DE08 */ addiu $t1, $t1, 0xDE08 ## $t1 = 0600DE08 +/* 017EC 80B2B9EC 3C090601 */ lui $t1, %hi(D_0600DE08) ## $t1 = 06010000 +/* 017F0 80B2B9F0 2529DE08 */ addiu $t1, $t1, %lo(D_0600DE08) ## $t1 = 0600DE08 /* 017F4 80B2B9F4 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 017F8 80B2B9F8 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 /* 017FC 80B2B9FC 3C0680B3 */ lui $a2, %hi(D_80B2D0BC) ## $a2 = 80B30000 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 04f245d8be..f016840746 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 @@ -35,8 +35,8 @@ glabel func_80B2BA38 /* 01894 80B2BA94 10200026 */ beq $at, $zero, .L80B2BB30 /* 01898 80B2BA98 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 /* 0189C 80B2BA9C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 018A0 80B2BAA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 018A4 80B2BAA4 248442F0 */ addiu $a0, $a0, 0x42F0 ## $a0 = 060042F0 +/* 018A0 80B2BAA0 3C040600 */ lui $a0, %hi(D_060042F0) ## $a0 = 06000000 +/* 018A4 80B2BAA4 248442F0 */ addiu $a0, $a0, %lo(D_060042F0) ## $a0 = 060042F0 /* 018A8 80B2BAA8 00046900 */ sll $t5, $a0, 4 /* 018AC 80B2BAAC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 018B0 80B2BAB0 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 @@ -54,8 +54,8 @@ glabel func_80B2BA38 /* 018E0 80B2BAE0 01C77821 */ addu $t7, $t6, $a3 /* 018E4 80B2BAE4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 018E8 80B2BAE8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 018EC 80B2BAEC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 018F0 80B2BAF0 24843EF0 */ addiu $a0, $a0, 0x3EF0 ## $a0 = 06003EF0 +/* 018EC 80B2BAEC 3C040600 */ lui $a0, %hi(D_06003EF0) ## $a0 = 06000000 +/* 018F0 80B2BAF0 24843EF0 */ addiu $a0, $a0, %lo(D_06003EF0) ## $a0 = 06003EF0 /* 018F4 80B2BAF4 00046900 */ sll $t5, $a0, 4 /* 018F8 80B2BAF8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 018FC 80B2BAFC AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 @@ -76,8 +76,8 @@ glabel func_80B2BA38 /* 01934 80B2BB34 50200023 */ beql $at, $zero, .L80B2BBC4 /* 01938 80B2BB38 28410305 */ slti $at, $v0, 0x0305 /* 0193C 80B2BB3C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01940 80B2BB40 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01944 80B2BB44 24842EF0 */ addiu $a0, $a0, 0x2EF0 ## $a0 = 06002EF0 +/* 01940 80B2BB40 3C040600 */ lui $a0, %hi(D_06002EF0) ## $a0 = 06000000 +/* 01944 80B2BB44 24842EF0 */ addiu $a0, $a0, %lo(D_06002EF0) ## $a0 = 06002EF0 /* 01948 80B2BB48 00046900 */ sll $t5, $a0, 4 /* 0194C 80B2BB4C 000D7702 */ srl $t6, $t5, 28 /* 01950 80B2BB50 3C098016 */ lui $t1, %hi(gSegments) @@ -113,8 +113,8 @@ glabel func_80B2BA38 /* 019C4 80B2BBC4 50200023 */ beql $at, $zero, .L80B2BC54 /* 019C8 80B2BBC8 28410317 */ slti $at, $v0, 0x0317 /* 019CC 80B2BBCC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 019D0 80B2BBD0 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 -/* 019D4 80B2BBD4 246332F0 */ addiu $v1, $v1, 0x32F0 ## $v1 = 060032F0 +/* 019D0 80B2BBD0 3C030600 */ lui $v1, %hi(D_060032F0) ## $v1 = 06000000 +/* 019D4 80B2BBD4 246332F0 */ addiu $v1, $v1, %lo(D_060032F0) ## $v1 = 060032F0 /* 019D8 80B2BBD8 0003C100 */ sll $t8, $v1, 4 /* 019DC 80B2BBDC 0018CF02 */ srl $t9, $t8, 28 /* 019E0 80B2BBE0 3C098016 */ lui $t1, %hi(gSegments) @@ -150,8 +150,8 @@ glabel func_80B2BA38 /* 01A54 80B2BC54 50200024 */ beql $at, $zero, .L80B2BCE8 /* 01A58 80B2BC58 28410318 */ slti $at, $v0, 0x0318 /* 01A5C 80B2BC5C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01A60 80B2BC60 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01A64 80B2BC64 248436F0 */ addiu $a0, $a0, 0x36F0 ## $a0 = 060036F0 +/* 01A60 80B2BC60 3C040600 */ lui $a0, %hi(D_060036F0) ## $a0 = 06000000 +/* 01A64 80B2BC64 248436F0 */ addiu $a0, $a0, %lo(D_060036F0) ## $a0 = 060036F0 /* 01A68 80B2BC68 00047100 */ sll $t6, $a0, 4 /* 01A6C 80B2BC6C 000E7F02 */ srl $t7, $t6, 28 /* 01A70 80B2BC70 3C098016 */ lui $t1, %hi(gSegments) @@ -188,8 +188,8 @@ glabel func_80B2BA38 /* 01AE8 80B2BCE8 50200024 */ beql $at, $zero, .L80B2BD7C /* 01AEC 80B2BCEC 28410319 */ slti $at, $v0, 0x0319 /* 01AF0 80B2BCF0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01AF4 80B2BCF4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01AF8 80B2BCF8 24842EF0 */ addiu $a0, $a0, 0x2EF0 ## $a0 = 06002EF0 +/* 01AF4 80B2BCF4 3C040600 */ lui $a0, %hi(D_06002EF0) ## $a0 = 06000000 +/* 01AF8 80B2BCF8 24842EF0 */ addiu $a0, $a0, %lo(D_06002EF0) ## $a0 = 06002EF0 /* 01AFC 80B2BCFC 0004C900 */ sll $t9, $a0, 4 /* 01B00 80B2BD00 00196F02 */ srl $t5, $t9, 28 /* 01B04 80B2BD04 3C098016 */ lui $t1, %hi(gSegments) @@ -226,8 +226,8 @@ glabel func_80B2BA38 /* 01B7C 80B2BD7C 50200024 */ beql $at, $zero, .L80B2BE10 /* 01B80 80B2BD80 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01B84 80B2BD84 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01B88 80B2BD88 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 -/* 01B8C 80B2BD8C 246332F0 */ addiu $v1, $v1, 0x32F0 ## $v1 = 060032F0 +/* 01B88 80B2BD88 3C030600 */ lui $v1, %hi(D_060032F0) ## $v1 = 06000000 +/* 01B8C 80B2BD8C 246332F0 */ addiu $v1, $v1, %lo(D_060032F0) ## $v1 = 060032F0 /* 01B90 80B2BD90 00037900 */ sll $t7, $v1, 4 /* 01B94 80B2BD94 000FC702 */ srl $t8, $t7, 28 /* 01B98 80B2BD98 3C098016 */ lui $t1, %hi(gSegments) @@ -261,8 +261,8 @@ glabel func_80B2BA38 /* 01C08 80B2BE08 8FAC00A4 */ lw $t4, 0x00A4($sp) /* 01C0C 80B2BE0C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 .L80B2BE10: -/* 01C10 80B2BE10 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01C14 80B2BE14 248442F0 */ addiu $a0, $a0, 0x42F0 ## $a0 = 060042F0 +/* 01C10 80B2BE10 3C040600 */ lui $a0, %hi(D_060042F0) ## $a0 = 06000000 +/* 01C14 80B2BE14 248442F0 */ addiu $a0, $a0, %lo(D_060042F0) ## $a0 = 060042F0 /* 01C18 80B2BE18 00046900 */ sll $t5, $a0, 4 /* 01C1C 80B2BE1C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 01C20 80B2BE20 3C098016 */ lui $t1, %hi(gSegments) @@ -283,8 +283,8 @@ glabel func_80B2BA38 /* 01C5C 80B2BE5C 01C77821 */ addu $t7, $t6, $a3 /* 01C60 80B2BE60 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 01C64 80B2BE64 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01C68 80B2BE68 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01C6C 80B2BE6C 24843EF0 */ addiu $a0, $a0, 0x3EF0 ## $a0 = 06003EF0 +/* 01C68 80B2BE68 3C040600 */ lui $a0, %hi(D_06003EF0) ## $a0 = 06000000 +/* 01C6C 80B2BE6C 24843EF0 */ addiu $a0, $a0, %lo(D_06003EF0) ## $a0 = 06003EF0 /* 01C70 80B2BE70 00046900 */ sll $t5, $a0, 4 /* 01C74 80B2BE74 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 01C78 80B2BE78 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 @@ -307,8 +307,8 @@ glabel func_80B2BA38 /* 01CB8 80B2BEB8 57010014 */ bnel $t8, $at, .L80B2BF0C /* 01CBC 80B2BEBC 95821D74 */ lhu $v0, 0x1D74($t4) ## 00001D74 /* 01CC0 80B2BEC0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01CC4 80B2BEC4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01CC8 80B2BEC8 248452F0 */ addiu $a0, $a0, 0x52F0 ## $a0 = 060052F0 +/* 01CC4 80B2BEC4 3C040600 */ lui $a0, %hi(D_060052F0) ## $a0 = 06000000 +/* 01CC8 80B2BEC8 248452F0 */ addiu $a0, $a0, %lo(D_060052F0) ## $a0 = 060052F0 /* 01CCC 80B2BECC 00047100 */ sll $t6, $a0, 4 /* 01CD0 80B2BED0 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01CD4 80B2BED4 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 @@ -330,9 +330,9 @@ glabel func_80B2BA38 /* 01D10 80B2BF10 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 /* 01D14 80B2BF14 284102F6 */ slti $at, $v0, 0x02F6 /* 01D18 80B2BF18 10200010 */ beq $at, $zero, .L80B2BF5C -/* 01D1C 80B2BF1C 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 +/* 01D1C 80B2BF1C 3C030600 */ lui $v1, %hi(D_06004EF0) ## $v1 = 06000000 /* 01D20 80B2BF20 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01D24 80B2BF24 24634EF0 */ addiu $v1, $v1, 0x4EF0 ## $v1 = 06004EF0 +/* 01D24 80B2BF24 24634EF0 */ addiu $v1, $v1, %lo(D_06004EF0) ## $v1 = 06004EF0 /* 01D28 80B2BF28 00037100 */ sll $t6, $v1, 4 /* 01D2C 80B2BF2C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01D30 80B2BF30 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 @@ -351,8 +351,8 @@ glabel func_80B2BA38 /* 01D60 80B2BF60 10200013 */ beq $at, $zero, .L80B2BFB0 /* 01D64 80B2BF64 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 01D68 80B2BF68 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01D6C 80B2BF6C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01D70 80B2BF70 248452F0 */ addiu $a0, $a0, 0x52F0 ## $a0 = 060052F0 +/* 01D6C 80B2BF6C 3C040600 */ lui $a0, %hi(D_060052F0) ## $a0 = 06000000 +/* 01D70 80B2BF70 248452F0 */ addiu $a0, $a0, %lo(D_060052F0) ## $a0 = 060052F0 /* 01D74 80B2BF74 00047100 */ sll $t6, $a0, 4 /* 01D78 80B2BF78 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01D7C 80B2BF7C AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 @@ -370,8 +370,8 @@ glabel func_80B2BA38 /* 01DAC 80B2BFAC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 .L80B2BFB0: /* 01DB0 80B2BFB0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01DB4 80B2BFB4 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 -/* 01DB8 80B2BFB8 24634EF0 */ addiu $v1, $v1, 0x4EF0 ## $v1 = 06004EF0 +/* 01DB4 80B2BFB4 3C030600 */ lui $v1, %hi(D_06004EF0) ## $v1 = 06000000 +/* 01DB8 80B2BFB8 24634EF0 */ addiu $v1, $v1, %lo(D_06004EF0) ## $v1 = 06004EF0 /* 01DBC 80B2BFBC 00037100 */ sll $t6, $v1, 4 /* 01DC0 80B2BFC0 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01DC4 80B2BFC4 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 @@ -388,8 +388,8 @@ glabel func_80B2BA38 /* 01DF0 80B2BFF0 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 .L80B2BFF4: /* 01DF4 80B2BFF4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01DF8 80B2BFF8 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 -/* 01DFC 80B2BFFC 246332F0 */ addiu $v1, $v1, 0x32F0 ## $v1 = 060032F0 +/* 01DF8 80B2BFF8 3C030600 */ lui $v1, %hi(D_060032F0) ## $v1 = 06000000 +/* 01DFC 80B2BFFC 246332F0 */ addiu $v1, $v1, %lo(D_060032F0) ## $v1 = 060032F0 /* 01E00 80B2C000 00037100 */ sll $t6, $v1, 4 /* 01E04 80B2C004 000E7F02 */ srl $t7, $t6, 28 /* 01E08 80B2C008 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -414,8 +414,8 @@ glabel func_80B2BA38 /* 01E54 80B2C054 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 01E58 80B2C058 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 01E5C 80B2C05C 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 -/* 01E60 80B2C060 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 -/* 01E64 80B2C064 24634EF0 */ addiu $v1, $v1, 0x4EF0 ## $v1 = 06004EF0 +/* 01E60 80B2C060 3C030600 */ lui $v1, %hi(D_06004EF0) ## $v1 = 06000000 +/* 01E64 80B2C064 24634EF0 */ addiu $v1, $v1, %lo(D_06004EF0) ## $v1 = 06004EF0 /* 01E68 80B2C068 03266821 */ addu $t5, $t9, $a2 /* 01E6C 80B2C06C 01A77021 */ addu $t6, $t5, $a3 /* 01E70 80B2C070 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C10C.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C10C.s index 12e5b81cfd..da27a884f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C10C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C10C.s @@ -3,8 +3,8 @@ glabel func_80B2C10C /* 01F10 80B2C110 AFA40000 */ sw $a0, 0x0000($sp) /* 01F14 80B2C114 14A10004 */ bne $a1, $at, .L80B2C128 /* 01F18 80B2C118 AFA7000C */ sw $a3, 0x000C($sp) -/* 01F1C 80B2C11C 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 01F20 80B2C120 25CED0D8 */ addiu $t6, $t6, 0xD0D8 ## $t6 = 0600D0D8 +/* 01F1C 80B2C11C 3C0E0601 */ lui $t6, %hi(D_0600D0D8) ## $t6 = 06010000 +/* 01F20 80B2C120 25CED0D8 */ addiu $t6, $t6, %lo(D_0600D0D8) ## $t6 = 0600D0D8 /* 01F24 80B2C124 ACCE0000 */ sw $t6, 0x0000($a2) ## 00000000 .L80B2C128: /* 01F28 80B2C128 03E00008 */ jr $ra 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 aee005246d..e1506c9b98 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 @@ -21,8 +21,8 @@ glabel func_80B2C130 /* 01F54 80B2C154 0C031AB1 */ jal Graph_OpenDisps /* 01F58 80B2C158 AFA50054 */ sw $a1, 0x0054($sp) /* 01F5C 80B2C15C 8FA30054 */ lw $v1, 0x0054($sp) -/* 01F60 80B2C160 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01F64 80B2C164 24A57210 */ addiu $a1, $a1, 0x7210 ## $a1 = 06007210 +/* 01F60 80B2C160 3C050600 */ lui $a1, %hi(D_06007210) ## $a1 = 06000000 +/* 01F64 80B2C164 24A57210 */ addiu $a1, $a1, %lo(D_06007210) ## $a1 = 06007210 /* 01F68 80B2C168 8C6202C0 */ lw $v0, 0x02C0($v1) ## 000002C0 /* 01F6C 80B2C16C 0005C900 */ sll $t9, $a1, 4 /* 01F70 80B2C170 8FA80058 */ lw $t0, 0x0058($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s index 5bc6c26e9e..b52bf0d578 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s @@ -49,12 +49,12 @@ glabel func_80B2C8AC /* 02714 80B2C914 3C0180B3 */ lui $at, %hi(D_80B2D1C0) ## $at = 80B30000 /* 02718 80B2C918 C436D1C0 */ lwc1 $f22, %lo(D_80B2D1C0)($at) /* 0271C 80B2C91C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02720 80B2C920 3C150100 */ lui $s5, 0x0100 ## $s5 = 01000000 -/* 02724 80B2C924 3C160405 */ lui $s6, 0x0405 ## $s6 = 04050000 +/* 02720 80B2C920 3C150100 */ lui $s5, %hi(D_01000000) ## $s5 = 01000000 +/* 02724 80B2C924 3C160405 */ lui $s6, %hi(D_0404D4E0) ## $s6 = 04050000 /* 02728 80B2C928 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 /* 0272C 80B2C92C 4480C000 */ mtc1 $zero, $f24 ## $f24 = 0.00 -/* 02730 80B2C930 26D6D4E0 */ addiu $s6, $s6, 0xD4E0 ## $s6 = 0404D4E0 -/* 02734 80B2C934 26B50000 */ addiu $s5, $s5, 0x0000 ## $s5 = 01000000 +/* 02730 80B2C930 26D6D4E0 */ addiu $s6, $s6, %lo(D_0404D4E0) ## $s6 = 0404D4E0 +/* 02734 80B2C934 26B50000 */ addiu $s5, $s5, %lo(D_01000000) ## $s5 = 01000000 /* 02738 80B2C938 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 /* 0273C 80B2C93C 241E0001 */ addiu $s8, $zero, 0x0001 ## $s8 = 00000001 /* 02740 80B2C940 24170034 */ addiu $s7, $zero, 0x0034 ## $s7 = 00000034 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 bfb9c67e24..bcc7b6a506 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 @@ -15,16 +15,16 @@ glabel EnWeiyer_Init /* 00030 80B322C0 0C00AC78 */ jal ActorShape_Init /* 00034 80B322C4 3C074282 */ lui $a3, 0x4282 ## $a3 = 42820000 -/* 00038 80B322C8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 0003C 80B322CC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 00038 80B322C8 3C060600 */ lui $a2, %hi(D_06003410) ## $a2 = 06000000 +/* 0003C 80B322CC 3C070600 */ lui $a3, %hi(D_060012AC) ## $a3 = 06000000 /* 00040 80B322D0 260E0198 */ addiu $t6, $s0, 0x0198 ## $t6 = 00000198 /* 00044 80B322D4 260F020A */ addiu $t7, $s0, 0x020A ## $t7 = 0000020A /* 00048 80B322D8 24180013 */ addiu $t8, $zero, 0x0013 ## $t8 = 00000013 /* 0004C 80B322DC AFB80018 */ sw $t8, 0x0018($sp) /* 00050 80B322E0 AFAF0014 */ sw $t7, 0x0014($sp) /* 00054 80B322E4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00058 80B322E8 24E712AC */ addiu $a3, $a3, 0x12AC ## $a3 = 060012AC -/* 0005C 80B322EC 24C63410 */ addiu $a2, $a2, 0x3410 ## $a2 = 06003410 +/* 00058 80B322E8 24E712AC */ addiu $a3, $a3, %lo(D_060012AC) ## $a3 = 060012AC +/* 0005C 80B322EC 24C63410 */ addiu $a2, $a2, %lo(D_06003410) ## $a2 = 06003410 /* 00060 80B322F0 8FA4003C */ lw $a0, 0x003C($sp) /* 00064 80B322F4 0C02915F */ jal SkelAnime_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s index badec88fd8..b7a56763f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s @@ -16,10 +16,10 @@ glabel func_80B32384 /* 00114 80B323A4 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 00118 80B323A8 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 /* 0011C 80B323AC 8FA70018 */ lw $a3, 0x0018($sp) -/* 00120 80B323B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00120 80B323B0 3C050600 */ lui $a1, %hi(D_06000FC0) ## $a1 = 06000000 /* 00124 80B323B4 46040182 */ mul.s $f6, $f0, $f4 /* 00128 80B323B8 C4E80028 */ lwc1 $f8, 0x0028($a3) ## 00000028 -/* 0012C 80B323BC 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 +/* 0012C 80B323BC 24A50FC0 */ addiu $a1, $a1, %lo(D_06000FC0) ## $a1 = 06000FC0 /* 00130 80B323C0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00134 80B323C4 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C /* 00138 80B323C8 46083280 */ add.s $f10, $f6, $f8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s index 663e2bf58b..d14cb86762 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s @@ -2,8 +2,8 @@ glabel func_80B32434 /* 001A4 80B32434 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 001A8 80B32438 AFBF0014 */ sw $ra, 0x0014($sp) /* 001AC 80B3243C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 001B0 80B32440 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 001B4 80B32444 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 +/* 001B0 80B32440 3C050600 */ lui $a1, %hi(D_06000FC0) ## $a1 = 06000000 +/* 001B4 80B32444 24A50FC0 */ addiu $a1, $a1, %lo(D_06000FC0) ## $a1 = 06000FC0 /* 001B8 80B32448 AFA70018 */ sw $a3, 0x0018($sp) /* 001BC 80B3244C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 001C0 80B32450 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32494.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32494.s index 1a8cb9199e..ba9cbdd8c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32494.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32494.s @@ -6,9 +6,9 @@ glabel func_80B32494 /* 00214 80B324A4 AFB00028 */ sw $s0, 0x0028($sp) /* 00218 80B324A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0021C 80B324AC AFBF002C */ sw $ra, 0x002C($sp) -/* 00220 80B324B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00220 80B324B0 3C050600 */ lui $a1, %hi(D_06000288) ## $a1 = 06000000 /* 00224 80B324B4 44070000 */ mfc1 $a3, $f0 -/* 00228 80B324B8 24A50288 */ addiu $a1, $a1, 0x0288 ## $a1 = 06000288 +/* 00228 80B324B8 24A50288 */ addiu $a1, $a1, %lo(D_06000288) ## $a1 = 06000288 /* 0022C 80B324BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00230 80B324C0 AFA00014 */ sw $zero, 0x0014($sp) /* 00234 80B324C4 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B325A0.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B325A0.s index 6a0047599b..147ca16d48 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B325A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B325A0.s @@ -6,9 +6,9 @@ glabel func_80B325A0 /* 00320 80B325B0 AFB00028 */ sw $s0, 0x0028($sp) /* 00324 80B325B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00328 80B325B8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0032C 80B325BC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0032C 80B325BC 3C050600 */ lui $a1, %hi(D_06000FC0) ## $a1 = 06000000 /* 00330 80B325C0 44070000 */ mfc1 $a3, $f0 -/* 00334 80B325C4 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 +/* 00334 80B325C4 24A50FC0 */ addiu $a1, $a1, %lo(D_06000FC0) ## $a1 = 06000FC0 /* 00338 80B325C8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0033C 80B325CC AFA00014 */ sw $zero, 0x0014($sp) /* 00340 80B325D0 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32660.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32660.s index db71f361dd..1937394f44 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32660.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32660.s @@ -6,9 +6,9 @@ glabel func_80B32660 /* 003E0 80B32670 AFB00028 */ sw $s0, 0x0028($sp) /* 003E4 80B32674 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 003E8 80B32678 AFBF002C */ sw $ra, 0x002C($sp) -/* 003EC 80B3267C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 003EC 80B3267C 3C050600 */ lui $a1, %hi(D_06000288) ## $a1 = 06000000 /* 003F0 80B32680 44070000 */ mfc1 $a3, $f0 -/* 003F4 80B32684 24A50288 */ addiu $a1, $a1, 0x0288 ## $a1 = 06000288 +/* 003F4 80B32684 24A50288 */ addiu $a1, $a1, %lo(D_06000288) ## $a1 = 06000288 /* 003F8 80B32688 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 003FC 80B3268C AFA00014 */ sw $zero, 0x0014($sp) /* 00400 80B32690 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s index d6ce864c3f..6bdac6ec60 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s @@ -3,8 +3,8 @@ glabel func_80B32724 /* 00498 80B32728 AFB00020 */ sw $s0, 0x0020($sp) /* 0049C 80B3272C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 004A0 80B32730 AFBF0024 */ sw $ra, 0x0024($sp) -/* 004A4 80B32734 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 004A8 80B32738 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 +/* 004A4 80B32734 3C050600 */ lui $a1, %hi(D_06000FC0) ## $a1 = 06000000 +/* 004A8 80B32738 24A50FC0 */ addiu $a1, $a1, %lo(D_06000FC0) ## $a1 = 06000FC0 /* 004AC 80B3273C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 004B0 80B32740 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 004B4 80B32744 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 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 a59a9e1245..94fc7497fa 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 @@ -86,16 +86,16 @@ glabel EnWf_Init /* 00140 80B33DF0 26050188 */ addiu $a1, $s0, 0x0188 ## $a1 = 00000188 /* 00144 80B33DF4 17200015 */ bne $t9, $zero, .L80B33E4C /* 00148 80B33DF8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 0014C 80B33DFC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 00150 80B33E00 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 +/* 0014C 80B33DFC 3C060601 */ lui $a2, %hi(D_06009690) ## $a2 = 06010000 +/* 00150 80B33E00 3C070601 */ lui $a3, %hi(D_0600A4AC) ## $a3 = 06010000 /* 00154 80B33E04 260801CC */ addiu $t0, $s0, 0x01CC ## $t0 = 000001CC /* 00158 80B33E08 26090250 */ addiu $t1, $s0, 0x0250 ## $t1 = 00000250 /* 0015C 80B33E0C 240A0016 */ addiu $t2, $zero, 0x0016 ## $t2 = 00000016 /* 00160 80B33E10 AFAA0018 */ sw $t2, 0x0018($sp) /* 00164 80B33E14 AFA90014 */ sw $t1, 0x0014($sp) /* 00168 80B33E18 AFA80010 */ sw $t0, 0x0010($sp) -/* 0016C 80B33E1C 24E7A4AC */ addiu $a3, $a3, 0xA4AC ## $a3 = 0600A4AC -/* 00170 80B33E20 24C69690 */ addiu $a2, $a2, 0x9690 ## $a2 = 06009690 +/* 0016C 80B33E1C 24E7A4AC */ addiu $a3, $a3, %lo(D_0600A4AC) ## $a3 = 0600A4AC +/* 00170 80B33E20 24C69690 */ addiu $a2, $a2, %lo(D_06009690) ## $a2 = 06009690 /* 00174 80B33E24 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00178 80B33E28 0C0291BE */ jal SkelAnime_InitFlex /* 0017C 80B33E2C 26050188 */ addiu $a1, $s0, 0x0188 ## $a1 = 00000188 @@ -108,14 +108,14 @@ glabel EnWf_Init /* 00194 80B33E44 10000017 */ beq $zero, $zero, .L80B33EA4 /* 00198 80B33E48 A20B0117 */ sb $t3, 0x0117($s0) ## 00000117 .L80B33E4C: -/* 0019C 80B33E4C 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 +/* 0019C 80B33E4C 3C070601 */ lui $a3, %hi(D_0600A4AC) ## $a3 = 06010000 /* 001A0 80B33E50 260C01CC */ addiu $t4, $s0, 0x01CC ## $t4 = 000001CC /* 001A4 80B33E54 260D0250 */ addiu $t5, $s0, 0x0250 ## $t5 = 00000250 /* 001A8 80B33E58 240E0016 */ addiu $t6, $zero, 0x0016 ## $t6 = 00000016 /* 001AC 80B33E5C AFAE0018 */ sw $t6, 0x0018($sp) /* 001B0 80B33E60 AFAD0014 */ sw $t5, 0x0014($sp) /* 001B4 80B33E64 AFAC0010 */ sw $t4, 0x0010($sp) -/* 001B8 80B33E68 24E7A4AC */ addiu $a3, $a3, 0xA4AC ## $a3 = 0600A4AC +/* 001B8 80B33E68 24E7A4AC */ addiu $a3, $a3, %lo(D_0600A4AC) ## $a3 = 0600A4AC /* 001BC 80B33E6C 0C0291BE */ jal SkelAnime_InitFlex /* 001C0 80B33E70 24C63BC0 */ addiu $a2, $a2, 0x3BC0 ## $a2 = 00003BC0 /* 001C4 80B33E74 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34380.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34380.s index e0e951ea2c..29df1b4d02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34380.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34380.s @@ -6,11 +6,11 @@ glabel func_80B34380 /* 006E0 80B34390 AFB00028 */ sw $s0, 0x0028($sp) /* 006E4 80B34394 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 006E8 80B34398 AFBF002C */ sw $ra, 0x002C($sp) -/* 006EC 80B3439C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 006EC 80B3439C 3C050600 */ lui $a1, %hi(D_06005430) ## $a1 = 06000000 /* 006F0 80B343A0 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 006F4 80B343A4 44070000 */ mfc1 $a3, $f0 /* 006F8 80B343A8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 006FC 80B343AC 24A55430 */ addiu $a1, $a1, 0x5430 ## $a1 = 06005430 +/* 006FC 80B343AC 24A55430 */ addiu $a1, $a1, %lo(D_06005430) ## $a1 = 06005430 /* 00700 80B343B0 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 00704 80B343B4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 00708 80B343B8 E7A00018 */ swc1 $f0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s index cdfcca93c4..3319e286ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s @@ -2,8 +2,8 @@ glabel func_80B3455C /* 008AC 80B3455C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 008B0 80B34560 AFBF0014 */ sw $ra, 0x0014($sp) /* 008B4 80B34564 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 008B8 80B34568 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 008BC 80B3456C 24A5A4AC */ addiu $a1, $a1, 0xA4AC ## $a1 = 0600A4AC +/* 008B8 80B34568 3C050601 */ lui $a1, %hi(D_0600A4AC) ## $a1 = 06010000 +/* 008BC 80B3456C 24A5A4AC */ addiu $a1, $a1, %lo(D_0600A4AC) ## $a1 = 0600A4AC /* 008C0 80B34570 AFA70018 */ sw $a3, 0x0018($sp) /* 008C4 80B34574 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 008C8 80B34578 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B347FC.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B347FC.s index af5b3f89d8..b8909bd0a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B347FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B347FC.s @@ -2,20 +2,20 @@ glabel func_80B347FC /* 00B4C 80B347FC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00B50 80B34800 AFA40028 */ sw $a0, 0x0028($sp) /* 00B54 80B34804 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00B58 80B34808 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 00B58 80B34808 3C040600 */ lui $a0, %hi(D_060057A0) ## $a0 = 06000000 /* 00B5C 80B3480C AFA5002C */ sw $a1, 0x002C($sp) /* 00B60 80B34810 0C028800 */ jal SkelAnime_GetFrameCount -/* 00B64 80B34814 248457A0 */ addiu $a0, $a0, 0x57A0 ## $a0 = 060057A0 +/* 00B64 80B34814 248457A0 */ addiu $a0, $a0, %lo(D_060057A0) ## $a0 = 060057A0 /* 00B68 80B34818 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00B6C 80B3481C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00B70 80B34820 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 00B74 80B34824 468021A0 */ cvt.s.w $f6, $f4 /* 00B78 80B34828 8FA40028 */ lw $a0, 0x0028($sp) -/* 00B7C 80B3482C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00B7C 80B3482C 3C050600 */ lui $a1, %hi(D_060057A0) ## $a1 = 06000000 /* 00B80 80B34830 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00B84 80B34834 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00B88 80B34838 24A557A0 */ addiu $a1, $a1, 0x57A0 ## $a1 = 060057A0 +/* 00B88 80B34838 24A557A0 */ addiu $a1, $a1, %lo(D_060057A0) ## $a1 = 060057A0 /* 00B8C 80B3483C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00B90 80B34840 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00B94 80B34844 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s index fad04ff6f7..5576218acc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s @@ -2,8 +2,8 @@ glabel func_80B34CFC /* 0104C 80B34CFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01050 80B34D00 AFBF0014 */ sw $ra, 0x0014($sp) /* 01054 80B34D04 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01058 80B34D08 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0105C 80B34D0C 24A598C8 */ addiu $a1, $a1, 0x98C8 ## $a1 = 060098C8 +/* 01058 80B34D08 3C050601 */ lui $a1, %hi(D_060098C8) ## $a1 = 06010000 +/* 0105C 80B34D0C 24A598C8 */ addiu $a1, $a1, %lo(D_060098C8) ## $a1 = 060098C8 /* 01060 80B34D10 AFA70018 */ sw $a3, 0x0018($sp) /* 01064 80B34D14 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 01068 80B34D18 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34F28.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34F28.s index e240f91709..688ebf7abd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34F28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34F28.s @@ -8,18 +8,18 @@ glabel func_80B34F28 /* 0127C 80B34F2C AFB00028 */ sw $s0, 0x0028($sp) /* 01280 80B34F30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01284 80B34F34 AFBF002C */ sw $ra, 0x002C($sp) -/* 01288 80B34F38 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01288 80B34F38 3C040600 */ lui $a0, %hi(D_060057A0) ## $a0 = 06000000 /* 0128C 80B34F3C 0C028800 */ jal SkelAnime_GetFrameCount -/* 01290 80B34F40 248457A0 */ addiu $a0, $a0, 0x57A0 ## $a0 = 060057A0 +/* 01290 80B34F40 248457A0 */ addiu $a0, $a0, %lo(D_060057A0) ## $a0 = 060057A0 /* 01294 80B34F44 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01298 80B34F48 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 0129C 80B34F4C 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 012A0 80B34F50 468021A0 */ cvt.s.w $f6, $f4 -/* 012A4 80B34F54 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 012A4 80B34F54 3C050600 */ lui $a1, %hi(D_060057A0) ## $a1 = 06000000 /* 012A8 80B34F58 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 012AC 80B34F5C AFAE0014 */ sw $t6, 0x0014($sp) -/* 012B0 80B34F60 24A557A0 */ addiu $a1, $a1, 0x57A0 ## $a1 = 060057A0 +/* 012B0 80B34F60 24A557A0 */ addiu $a1, $a1, %lo(D_060057A0) ## $a1 = 060057A0 /* 012B4 80B34F64 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 012B8 80B34F68 E7A60010 */ swc1 $f6, 0x0010($sp) /* 012BC 80B34F6C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35540.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35540.s index 1fa3841be9..4d53e94598 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35540.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35540.s @@ -2,8 +2,8 @@ glabel func_80B35540 /* 01890 80B35540 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01894 80B35544 AFBF0014 */ sw $ra, 0x0014($sp) /* 01898 80B35548 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0189C 80B3554C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 018A0 80B35550 24A54638 */ addiu $a1, $a1, 0x4638 ## $a1 = 06004638 +/* 0189C 80B3554C 3C050600 */ lui $a1, %hi(D_06004638) ## $a1 = 06000000 +/* 018A0 80B35550 24A54638 */ addiu $a1, $a1, %lo(D_06004638) ## $a1 = 06004638 /* 018A4 80B35554 AFA60018 */ sw $a2, 0x0018($sp) /* 018A8 80B35558 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 018AC 80B3555C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3590C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3590C.s index 426640de2e..7b1812c9ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3590C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3590C.s @@ -7,8 +7,8 @@ glabel func_80B3590C /* 01C70 80B35920 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 /* 01C74 80B35924 4600110D */ trunc.w.s $f4, $f2 /* 01C78 80B35928 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01C7C 80B3592C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01C80 80B35930 24A54638 */ addiu $a1, $a1, 0x4638 ## $a1 = 06004638 +/* 01C7C 80B3592C 3C050600 */ lui $a1, %hi(D_06004638) ## $a1 = 06000000 +/* 01C80 80B35930 24A54638 */ addiu $a1, $a1, %lo(D_06004638) ## $a1 = 06004638 /* 01C84 80B35934 440F2000 */ mfc1 $t7, $f4 /* 01C88 80B35938 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 01C8C 80B3593C 3C06BF00 */ lui $a2, 0xBF00 ## $a2 = BF000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35B94.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35B94.s index 11cf40e437..87f331adea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35B94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35B94.s @@ -2,8 +2,8 @@ glabel func_80B35B94 /* 01EE4 80B35B94 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01EE8 80B35B98 AFBF0014 */ sw $ra, 0x0014($sp) /* 01EEC 80B35B9C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01EF0 80B35BA0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01EF4 80B35BA4 24A54AD0 */ addiu $a1, $a1, 0x4AD0 ## $a1 = 06004AD0 +/* 01EF0 80B35BA0 3C050600 */ lui $a1, %hi(D_06004AD0) ## $a1 = 06000000 +/* 01EF4 80B35BA4 24A54AD0 */ addiu $a1, $a1, %lo(D_06004AD0) ## $a1 = 06004AD0 /* 01EF8 80B35BA8 AFA70018 */ sw $a3, 0x0018($sp) /* 01EFC 80B35BAC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 01F00 80B35BB0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D18.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D18.s index d64f34596d..87f2151d00 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D18.s @@ -16,8 +16,8 @@ glabel func_80B35D18 /* 0209C 80B35D4C AFA70018 */ sw $a3, 0x0018($sp) /* 020A0 80B35D50 8FA70018 */ lw $a3, 0x0018($sp) -/* 020A4 80B35D54 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 020A8 80B35D58 24A59B20 */ addiu $a1, $a1, 0x9B20 ## $a1 = 06009B20 +/* 020A4 80B35D54 3C050601 */ lui $a1, %hi(D_06009B20) ## $a1 = 06010000 +/* 020A8 80B35D58 24A59B20 */ addiu $a1, $a1, %lo(D_06009B20) ## $a1 = 06009B20 /* 020AC 80B35D5C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 020B0 80B35D60 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 020B4 80B35D64 24E40188 */ addiu $a0, $a3, 0x0188 ## $a0 = 00000188 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35E4C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35E4C.s index 5b5640a7a3..abce88f882 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35E4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35E4C.s @@ -2,8 +2,8 @@ glabel func_80B35E4C /* 0219C 80B35E4C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 021A0 80B35E50 AFBF0014 */ sw $ra, 0x0014($sp) /* 021A4 80B35E54 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 021A8 80B35E58 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 021AC 80B35E5C 24A59B20 */ addiu $a1, $a1, 0x9B20 ## $a1 = 06009B20 +/* 021A8 80B35E58 3C050601 */ lui $a1, %hi(D_06009B20) ## $a1 = 06010000 +/* 021AC 80B35E5C 24A59B20 */ addiu $a1, $a1, %lo(D_06009B20) ## $a1 = 06009B20 /* 021B0 80B35E60 AFA70018 */ sw $a3, 0x0018($sp) /* 021B4 80B35E64 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 021B8 80B35E68 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B360E8.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B360E8.s index f0cf87161b..8881399d70 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B360E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B360E8.s @@ -3,19 +3,19 @@ glabel func_80B360E8 /* 0243C 80B360EC AFB00028 */ sw $s0, 0x0028($sp) /* 02440 80B360F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02444 80B360F4 AFBF002C */ sw $ra, 0x002C($sp) -/* 02448 80B360F8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 02448 80B360F8 3C040600 */ lui $a0, %hi(D_06004AD0) ## $a0 = 06000000 /* 0244C 80B360FC 0C028800 */ jal SkelAnime_GetFrameCount -/* 02450 80B36100 24844AD0 */ addiu $a0, $a0, 0x4AD0 ## $a0 = 06004AD0 +/* 02450 80B36100 24844AD0 */ addiu $a0, $a0, %lo(D_06004AD0) ## $a0 = 06004AD0 /* 02454 80B36104 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02458 80B36108 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 0245C 80B3610C 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 02460 80B36110 46802120 */ cvt.s.w $f4, $f4 /* 02464 80B36114 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 02468 80B36118 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 02468 80B36118 3C050600 */ lui $a1, %hi(D_06004AD0) ## $a1 = 06000000 /* 0246C 80B3611C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 02470 80B36120 AFAE0014 */ sw $t6, 0x0014($sp) -/* 02474 80B36124 24A54AD0 */ addiu $a1, $a1, 0x4AD0 ## $a1 = 06004AD0 +/* 02474 80B36124 24A54AD0 */ addiu $a1, $a1, %lo(D_06004AD0) ## $a1 = 06004AD0 /* 02478 80B36128 44072000 */ mfc1 $a3, $f4 /* 0247C 80B3612C 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 02480 80B36130 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36288.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36288.s index 6c92afcaf4..528a22805c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36288.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36288.s @@ -3,10 +3,10 @@ glabel func_80B36288 /* 025DC 80B3628C AFB00028 */ sw $s0, 0x0028($sp) /* 025E0 80B36290 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 025E4 80B36294 AFBF002C */ sw $ra, 0x002C($sp) -/* 025E8 80B36298 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 025E8 80B36298 3C040600 */ lui $a0, %hi(D_06004CA4) ## $a0 = 06000000 /* 025EC 80B3629C 0C028800 */ jal SkelAnime_GetFrameCount -/* 025F0 80B362A0 24844CA4 */ addiu $a0, $a0, 0x4CA4 ## $a0 = 06004CA4 +/* 025F0 80B362A0 24844CA4 */ addiu $a0, $a0, %lo(D_06004CA4) ## $a0 = 06004CA4 /* 025F4 80B362A4 860E02F8 */ lh $t6, 0x02F8($s0) ## 000002F8 /* 025F8 80B362A8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 025FC 80B362AC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -22,12 +22,12 @@ glabel func_80B36288 /* 02620 80B362D0 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 02624 80B362D4 AE1802D4 */ sw $t8, 0x02D4($s0) ## 000002D4 /* 02628 80B362D8 AE1902E8 */ sw $t9, 0x02E8($s0) ## 000002E8 -/* 0262C 80B362DC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0262C 80B362DC 3C050600 */ lui $a1, %hi(D_06004CA4) ## $a1 = 06000000 /* 02630 80B362E0 44060000 */ mfc1 $a2, $f0 /* 02634 80B362E4 44070000 */ mfc1 $a3, $f0 /* 02638 80B362E8 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 /* 0263C 80B362EC AFA80014 */ sw $t0, 0x0014($sp) -/* 02640 80B362F0 24A54CA4 */ addiu $a1, $a1, 0x4CA4 ## $a1 = 06004CA4 +/* 02640 80B362F0 24A54CA4 */ addiu $a1, $a1, %lo(D_06004CA4) ## $a1 = 06004CA4 /* 02644 80B362F4 E7A20010 */ swc1 $f2, 0x0010($sp) /* 02648 80B362F8 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 0264C 80B362FC 0C029468 */ jal SkelAnime_ChangeAnim diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B365A8.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B365A8.s index 6d117bfb83..197c1d6b5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B365A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B365A8.s @@ -8,19 +8,19 @@ glabel func_80B365A8 /* 028FC 80B365AC AFB00028 */ sw $s0, 0x0028($sp) /* 02900 80B365B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02904 80B365B4 AFBF002C */ sw $ra, 0x002C($sp) -/* 02908 80B365B8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 02908 80B365B8 3C040600 */ lui $a0, %hi(D_060057A0) ## $a0 = 06000000 /* 0290C 80B365BC AFA5003C */ sw $a1, 0x003C($sp) /* 02910 80B365C0 0C028800 */ jal SkelAnime_GetFrameCount -/* 02914 80B365C4 248457A0 */ addiu $a0, $a0, 0x57A0 ## $a0 = 060057A0 +/* 02914 80B365C4 248457A0 */ addiu $a0, $a0, %lo(D_060057A0) ## $a0 = 060057A0 /* 02918 80B365C8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0291C 80B365CC 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 02920 80B365D0 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 02924 80B365D4 468021A0 */ cvt.s.w $f6, $f4 -/* 02928 80B365D8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 02928 80B365D8 3C050600 */ lui $a1, %hi(D_060057A0) ## $a1 = 06000000 /* 0292C 80B365DC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 02930 80B365E0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 02934 80B365E4 24A557A0 */ addiu $a1, $a1, 0x57A0 ## $a1 = 060057A0 +/* 02934 80B365E4 24A557A0 */ addiu $a1, $a1, %lo(D_060057A0) ## $a1 = 060057A0 /* 02938 80B365E8 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 0293C 80B365EC E7A60010 */ swc1 $f6, 0x0010($sp) /* 02940 80B365F0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36C8C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36C8C.s index 5e906b6f84..d0e84274c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36C8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36C8C.s @@ -2,8 +2,8 @@ glabel func_80B36C8C /* 02FDC 80B36C8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02FE0 80B36C90 AFBF0014 */ sw $ra, 0x0014($sp) /* 02FE4 80B36C94 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 02FE8 80B36C98 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02FEC 80B36C9C 24A55430 */ addiu $a1, $a1, 0x5430 ## $a1 = 06005430 +/* 02FE8 80B36C98 3C050600 */ lui $a1, %hi(D_06005430) ## $a1 = 06000000 +/* 02FEC 80B36C9C 24A55430 */ addiu $a1, $a1, %lo(D_06005430) ## $a1 = 06005430 /* 02FF0 80B36CA0 AFA70018 */ sw $a3, 0x0018($sp) /* 02FF4 80B36CA4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 02FF8 80B36CA8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s index e445307b9f..425fc681b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s @@ -97,12 +97,12 @@ glabel EnWood02_Draw /* 00DC0 80B3BD30 01AFC025 */ or $t8, $t5, $t7 ## $t8 = 00000000 /* 00DC4 80B3BD34 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 /* 00DC8 80B3BD38 3719007F */ ori $t9, $t8, 0x007F ## $t9 = 0000007F -/* 00DCC 80B3BD3C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00DCC 80B3BD3C 3C050600 */ lui $a1, %hi(D_06000700) ## $a1 = 06000000 /* 00DD0 80B3BD40 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 00DD4 80B3BD44 8FA40064 */ lw $a0, 0x0064($sp) /* 00DD8 80B3BD48 0C00D498 */ jal Gfx_DrawDListOpa -/* 00DDC 80B3BD4C 24A50700 */ addiu $a1, $a1, 0x0700 ## $a1 = 06000700 +/* 00DDC 80B3BD4C 24A50700 */ addiu $a1, $a1, %lo(D_06000700) ## $a1 = 06000700 /* 00DE0 80B3BD50 10000058 */ beq $zero, $zero, .L80B3BEB4 /* 00DE4 80B3BD54 00000000 */ nop /* 00DE8 80B3BD58 90620154 */ lbu $v0, 0x0154($v1) ## 00000154 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 304c156f83..3177e4aa48 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 @@ -32,16 +32,16 @@ glabel EnXc_Init /* 05748 80B41928 0C00AC78 */ jal ActorShape_Init /* 0574C 80B4192C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 05750 80B41930 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 05754 80B41934 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 +/* 05750 80B41930 3C060601 */ lui $a2, %hi(D_06012AF0) ## $a2 = 06010000 +/* 05754 80B41934 3C070600 */ lui $a3, %hi(D_06004828) ## $a3 = 06000000 /* 05758 80B41938 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 0575C 80B4193C 260F01F6 */ addiu $t7, $s0, 0x01F6 ## $t7 = 000001F6 /* 05760 80B41940 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 /* 05764 80B41944 AFB80018 */ sw $t8, 0x0018($sp) /* 05768 80B41948 AFAF0014 */ sw $t7, 0x0014($sp) /* 0576C 80B4194C AFAE0010 */ sw $t6, 0x0010($sp) -/* 05770 80B41950 24E74828 */ addiu $a3, $a3, 0x4828 ## $a3 = 06004828 -/* 05774 80B41954 24C62AF0 */ addiu $a2, $a2, 0x2AF0 ## $a2 = 06012AF0 +/* 05770 80B41950 24E74828 */ addiu $a3, $a3, %lo(D_06004828) ## $a3 = 06004828 +/* 05774 80B41954 24C62AF0 */ addiu $a2, $a2, %lo(D_06012AF0) ## $a2 = 06012AF0 /* 05778 80B41958 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0577C 80B4195C 0C0291BE */ jal SkelAnime_InitFlex /* 05780 80B41960 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C820.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C820.s index 17f63a4822..32f6761b8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C820.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C820.s @@ -2,17 +2,17 @@ glabel func_80B3C820 /* 00640 80B3C820 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00644 80B3C824 AFA40028 */ sw $a0, 0x0028($sp) /* 00648 80B3C828 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0064C 80B3C82C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0064C 80B3C82C 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 /* 00650 80B3C830 0C028800 */ jal SkelAnime_GetFrameCount -/* 00654 80B3C834 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 +/* 00654 80B3C834 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 /* 00658 80B3C838 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0065C 80B3C83C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00660 80B3C840 8FA40028 */ lw $a0, 0x0028($sp) /* 00664 80B3C844 468021A0 */ cvt.s.w $f6, $f4 -/* 00668 80B3C848 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 00668 80B3C848 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 /* 0066C 80B3C84C 44070000 */ mfc1 $a3, $f0 -/* 00670 80B3C850 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 +/* 00670 80B3C850 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 /* 00674 80B3C854 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00678 80B3C858 AFA00014 */ sw $zero, 0x0014($sp) /* 0067C 80B3C85C E7A60010 */ swc1 $f6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9EC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9EC.s index d7527c21da..64d0a1bd0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9EC.s @@ -1,8 +1,8 @@ glabel func_80B3C9EC /* 0080C 80B3C9EC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00810 80B3C9F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00814 80B3C9F4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00818 80B3C9F8 24A53AA4 */ addiu $a1, $a1, 0x3AA4 ## $a1 = 06013AA4 +/* 00814 80B3C9F4 3C050601 */ lui $a1, %hi(D_06013AA4) ## $a1 = 06010000 +/* 00818 80B3C9F8 24A53AA4 */ addiu $a1, $a1, %lo(D_06013AA4) ## $a1 = 06013AA4 /* 0081C 80B3C9FC AFA00010 */ sw $zero, 0x0010($sp) /* 00820 80B3CA00 AFA40020 */ sw $a0, 0x0020($sp) /* 00824 80B3CA04 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 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 274e405e0d..6e8f55b7c8 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 @@ -24,8 +24,8 @@ glabel func_80B3CA84 /* 008E8 80B3CAC8 AFA5001C */ sw $a1, 0x001C($sp) /* 008EC 80B3CACC 1440001C */ bne $v0, $zero, .L80B3CB40 /* 008F0 80B3CAD0 8FA6001C */ lw $a2, 0x001C($sp) -/* 008F4 80B3CAD4 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 008F8 80B3CAD8 24423F80 */ addiu $v0, $v0, 0x3F80 ## $v0 = 02003F80 +/* 008F4 80B3CAD4 3C020200 */ lui $v0, %hi(D_02003F80) ## $v0 = 02000000 +/* 008F8 80B3CAD8 24423F80 */ addiu $v0, $v0, %lo(D_02003F80) ## $v0 = 02003F80 /* 008FC 80B3CADC 00027900 */ sll $t7, $v0, 4 /* 00900 80B3CAE0 000FC702 */ srl $t8, $t7, 28 /* 00904 80B3CAE4 0018C880 */ sll $t9, $t8, 2 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 8935eb10b1..d295de6b2a 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 @@ -60,8 +60,8 @@ glabel func_80B3CBA4 /* 00A90 80B3CC70 AFA5001C */ sw $a1, 0x001C($sp) /* 00A94 80B3CC74 1440001C */ bne $v0, $zero, .L80B3CCE8 /* 00A98 80B3CC78 8FA6001C */ lw $a2, 0x001C($sp) -/* 00A9C 80B3CC7C 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 00AA0 80B3CC80 244245D0 */ addiu $v0, $v0, 0x45D0 ## $v0 = 020045D0 +/* 00A9C 80B3CC7C 3C020200 */ lui $v0, %hi(D_020045D0) ## $v0 = 02000000 +/* 00AA0 80B3CC80 244245D0 */ addiu $v0, $v0, %lo(D_020045D0) ## $v0 = 020045D0 /* 00AA4 80B3CC84 00027900 */ sll $t7, $v0, 4 /* 00AA8 80B3CC88 000FC702 */ srl $t8, $t7, 28 /* 00AAC 80B3CC8C 0018C880 */ sll $t9, $t8, 2 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 9ba84288e3..924d617cf6 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 @@ -37,10 +37,10 @@ glabel func_80B3CD98 /* 00C20 80B3CE00 AFA5001C */ sw $a1, 0x001C($sp) /* 00C24 80B3CE04 14400013 */ bne $v0, $zero, .L80B3CE54 /* 00C28 80B3CE08 8FA4001C */ lw $a0, 0x001C($sp) -/* 00C2C 80B3CE0C 3C050200 */ lui $a1, 0x0200 ## $a1 = 02000000 +/* 00C2C 80B3CE0C 3C050200 */ lui $a1, %hi(D_02000330) ## $a1 = 02000000 /* 00C30 80B3CE10 0C01A4F6 */ jal Cutscene_SetSegment -/* 00C34 80B3CE14 24A50330 */ addiu $a1, $a1, 0x0330 ## $a1 = 02000330 +/* 00C34 80B3CE14 24A50330 */ addiu $a1, $a1, %lo(D_02000330) ## $a1 = 02000330 /* 00C38 80B3CE18 3C038016 */ lui $v1, %hi(gSaveContext) /* 00C3C 80B3CE1C 2463E660 */ addiu $v1, %lo(gSaveContext) /* 00C40 80B3CE20 946E0EDE */ lhu $t6, 0x0EDE($v1) ## 8015F53E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D4D8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D4D8.s index a971366d63..f238666554 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D4D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D4D8.s @@ -1,8 +1,8 @@ glabel func_80B3D4D8 /* 012F8 80B3D4D8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 012FC 80B3D4DC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 +/* 012FC 80B3D4DC 3C060601 */ lui $a2, %hi(D_060177F8) ## $a2 = 06010000 /* 01300 80B3D4E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01304 80B3D4E4 24C677F8 */ addiu $a2, $a2, 0x77F8 ## $a2 = 060177F8 +/* 01304 80B3D4E4 24C677F8 */ addiu $a2, $a2, %lo(D_060177F8) ## $a2 = 060177F8 /* 01308 80B3D4E8 0C2CF134 */ jal func_80B3C4D0 /* 0130C 80B3D4EC AFA6001C */ sw $a2, 0x001C($sp) /* 01310 80B3D4F0 10400019 */ beq $v0, $zero, .L80B3D558 @@ -11,29 +11,29 @@ glabel func_80B3D4D8 /* 0131C 80B3D4FC 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B /* 01320 80B3D500 54610005 */ bnel $v1, $at, .L80B3D518 /* 01324 80B3D504 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 01328 80B3D508 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 01328 80B3D508 3C060600 */ lui $a2, %hi(D_060035C8) ## $a2 = 06000000 /* 0132C 80B3D50C 10000012 */ beq $zero, $zero, .L80B3D558 -/* 01330 80B3D510 24C635C8 */ addiu $a2, $a2, 0x35C8 ## $a2 = 060035C8 +/* 01330 80B3D510 24C635C8 */ addiu $a2, $a2, %lo(D_060035C8) ## $a2 = 060035C8 /* 01334 80B3D514 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C .L80B3D518: /* 01338 80B3D518 54610005 */ bnel $v1, $at, .L80B3D530 /* 0133C 80B3D51C 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 01340 80B3D520 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 01340 80B3D520 3C060600 */ lui $a2, %hi(D_0600289C) ## $a2 = 06000000 /* 01344 80B3D524 1000000C */ beq $zero, $zero, .L80B3D558 -/* 01348 80B3D528 24C6289C */ addiu $a2, $a2, 0x289C ## $a2 = 0600289C +/* 01348 80B3D528 24C6289C */ addiu $a2, $a2, %lo(D_0600289C) ## $a2 = 0600289C /* 0134C 80B3D52C 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D .L80B3D530: /* 01350 80B3D530 54610005 */ bnel $v1, $at, .L80B3D548 /* 01354 80B3D534 24010017 */ addiu $at, $zero, 0x0017 ## $at = 00000017 -/* 01358 80B3D538 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 01358 80B3D538 3C060600 */ lui $a2, %hi(D_06004570) ## $a2 = 06000000 /* 0135C 80B3D53C 10000006 */ beq $zero, $zero, .L80B3D558 -/* 01360 80B3D540 24C64570 */ addiu $a2, $a2, 0x4570 ## $a2 = 06004570 +/* 01360 80B3D540 24C64570 */ addiu $a2, $a2, %lo(D_06004570) ## $a2 = 06004570 /* 01364 80B3D544 24010017 */ addiu $at, $zero, 0x0017 ## $at = 00000017 .L80B3D548: /* 01368 80B3D548 54610004 */ bnel $v1, $at, .L80B3D55C /* 0136C 80B3D54C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01370 80B3D550 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 01374 80B3D554 24C60B6C */ addiu $a2, $a2, 0x0B6C ## $a2 = 06000B6C +/* 01370 80B3D550 3C060600 */ lui $a2, %hi(D_06000B6C) ## $a2 = 06000000 +/* 01374 80B3D554 24C60B6C */ addiu $a2, $a2, %lo(D_06000B6C) ## $a2 = 06000B6C .L80B3D558: /* 01378 80B3D558 8FBF0014 */ lw $ra, 0x0014($sp) .L80B3D55C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D794.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D794.s index b65081fd10..adf4e8b815 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D794.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D794.s @@ -13,9 +13,9 @@ glabel func_80B3D794 /* 015E0 80B3D7C0 8FBF002C */ lw $ra, 0x002C($sp) /* 015E4 80B3D7C4 94CF0000 */ lhu $t7, 0x0000($a2) ## 00000000 /* 015E8 80B3D7C8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 015EC 80B3D7CC 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 015EC 80B3D7CC 3C040602 */ lui $a0, %hi(D_0601C0E8) ## $a0 = 06020000 /* 015F0 80B3D7D0 15E1002F */ bne $t7, $at, .L80B3D890 -/* 015F4 80B3D7D4 2484C0E8 */ addiu $a0, $a0, 0xC0E8 ## $a0 = 0601C0E8 +/* 015F4 80B3D7D4 2484C0E8 */ addiu $a0, $a0, %lo(D_0601C0E8) ## $a0 = 0601C0E8 /* 015F8 80B3D7D8 0C028800 */ jal SkelAnime_GetFrameCount /* 015FC 80B3D7DC AFA60044 */ sw $a2, 0x0044($sp) @@ -51,11 +51,11 @@ glabel func_80B3D794 /* 01674 80B3D854 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01678 80B3D858 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0167C 80B3D85C C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 01680 80B3D860 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 01680 80B3D860 3C050602 */ lui $a1, %hi(D_0601C0E8) ## $a1 = 06020000 /* 01684 80B3D864 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 /* 01688 80B3D868 44070000 */ mfc1 $a3, $f0 /* 0168C 80B3D86C AFAB0014 */ sw $t3, 0x0014($sp) -/* 01690 80B3D870 24A5C0E8 */ addiu $a1, $a1, 0xC0E8 ## $a1 = 0601C0E8 +/* 01690 80B3D870 24A5C0E8 */ addiu $a1, $a1, %lo(D_0601C0E8) ## $a1 = 0601C0E8 /* 01694 80B3D874 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01698 80B3D878 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0169C 80B3D87C E7A80010 */ swc1 $f8, 0x0010($sp) 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 788ae566b0..611f439615 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 @@ -9,16 +9,16 @@ glabel func_80B3D8A4 /* 016CC 80B3D8AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 016D0 80B3D8B0 10C00030 */ beq $a2, $zero, .L80B3D974 /* 016D4 80B3D8B4 AFBF002C */ sw $ra, 0x002C($sp) -/* 016D8 80B3D8B8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 016D8 80B3D8B8 3C040601 */ lui $a0, %hi(D_06012FD0) ## $a0 = 06010000 /* 016DC 80B3D8BC 0C028800 */ jal SkelAnime_GetFrameCount -/* 016E0 80B3D8C0 24842FD0 */ addiu $a0, $a0, 0x2FD0 ## $a0 = 06012FD0 +/* 016E0 80B3D8C0 24842FD0 */ addiu $a0, $a0, %lo(D_06012FD0) ## $a0 = 06012FD0 /* 016E4 80B3D8C4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 016E8 80B3D8C8 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 016EC 80B3D8CC 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 /* 016F0 80B3D8D0 468021A0 */ cvt.s.w $f6, $f4 -/* 016F4 80B3D8D4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 016F8 80B3D8D8 24A52FD0 */ addiu $a1, $a1, 0x2FD0 ## $a1 = 06012FD0 +/* 016F4 80B3D8D4 3C050601 */ lui $a1, %hi(D_06012FD0) ## $a1 = 06010000 +/* 016F8 80B3D8D8 24A52FD0 */ addiu $a1, $a1, %lo(D_06012FD0) ## $a1 = 06012FD0 /* 016FC 80B3D8DC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01700 80B3D8E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01704 80B3D8E4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 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 6f484dea19..107f5a2f96 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 @@ -9,7 +9,7 @@ glabel func_80B3DA00 /* 0183C 80B3DA1C 44814000 */ mtc1 $at, $f8 ## $f8 = 95.00 /* 01840 80B3DA20 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 01844 80B3DA24 C4800090 */ lwc1 $f0, 0x0090($a0) ## 00000090 -/* 01848 80B3DA28 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01848 80B3DA28 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 /* 0184C 80B3DA2C 468021A0 */ cvt.s.w $f6, $f4 /* 01850 80B3DA30 46083280 */ add.s $f10, $f6, $f8 /* 01854 80B3DA34 460A003E */ c.le.s $f0, $f10 @@ -18,14 +18,14 @@ glabel func_80B3DA00 /* 01860 80B3DA40 8FBF0024 */ lw $ra, 0x0024($sp) /* 01864 80B3DA44 0C028800 */ jal SkelAnime_GetFrameCount -/* 01868 80B3DA48 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 +/* 01868 80B3DA48 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 /* 0186C 80B3DA4C 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 01870 80B3DA50 3C01C140 */ lui $at, 0xC140 ## $at = C1400000 /* 01874 80B3DA54 44812000 */ mtc1 $at, $f4 ## $f4 = -12.00 /* 01878 80B3DA58 468084A0 */ cvt.s.w $f18, $f16 /* 0187C 80B3DA5C 8FA40028 */ lw $a0, 0x0028($sp) -/* 01880 80B3DA60 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01884 80B3DA64 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 +/* 01880 80B3DA60 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 +/* 01884 80B3DA64 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 /* 01888 80B3DA68 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0188C 80B3DA6C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01890 80B3DA70 E7B20010 */ swc1 $f18, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAF0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAF0.s index 192fff30ac..1aa7f62362 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAF0.s @@ -19,19 +19,19 @@ glabel func_80B3DAF0 /* 01954 80B3DB34 24010017 */ addiu $at, $zero, 0x0017 ## $at = 00000017 /* 01958 80B3DB38 14810018 */ bne $a0, $at, .L80B3DB9C .L80B3DB3C: -/* 0195C 80B3DB3C 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 0195C 80B3DB3C 3C040602 */ lui $a0, %hi(D_0601B19C) ## $a0 = 06020000 /* 01960 80B3DB40 0C028800 */ jal SkelAnime_GetFrameCount -/* 01964 80B3DB44 2484B19C */ addiu $a0, $a0, 0xB19C ## $a0 = 0601B19C +/* 01964 80B3DB44 2484B19C */ addiu $a0, $a0, %lo(D_0601B19C) ## $a0 = 0601B19C /* 01968 80B3DB48 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0196C 80B3DB4C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 01970 80B3DB50 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 01974 80B3DB54 468021A0 */ cvt.s.w $f6, $f4 /* 01978 80B3DB58 8FA40028 */ lw $a0, 0x0028($sp) -/* 0197C 80B3DB5C 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 0197C 80B3DB5C 3C050602 */ lui $a1, %hi(D_0601B19C) ## $a1 = 06020000 /* 01980 80B3DB60 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 01984 80B3DB64 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01988 80B3DB68 24A5B19C */ addiu $a1, $a1, 0xB19C ## $a1 = 0601B19C +/* 01988 80B3DB68 24A5B19C */ addiu $a1, $a1, %lo(D_0601B19C) ## $a1 = 0601B19C /* 0198C 80B3DB6C E7A60010 */ swc1 $f6, 0x0010($sp) /* 01990 80B3DB70 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01994 80B3DB74 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DBAC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DBAC.s index 706c5342d9..c5f0ff4b2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DBAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DBAC.s @@ -3,19 +3,19 @@ glabel func_80B3DBAC /* 019D0 80B3DBB0 AFBF0024 */ sw $ra, 0x0024($sp) /* 019D4 80B3DBB4 10A00017 */ beq $a1, $zero, .L80B3DC14 /* 019D8 80B3DBB8 AFA40028 */ sw $a0, 0x0028($sp) -/* 019DC 80B3DBBC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 019DC 80B3DBBC 3C040601 */ lui $a0, %hi(D_06017C54) ## $a0 = 06010000 /* 019E0 80B3DBC0 0C028800 */ jal SkelAnime_GetFrameCount -/* 019E4 80B3DBC4 24847C54 */ addiu $a0, $a0, 0x7C54 ## $a0 = 06017C54 +/* 019E4 80B3DBC4 24847C54 */ addiu $a0, $a0, %lo(D_06017C54) ## $a0 = 06017C54 /* 019E8 80B3DBC8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 019EC 80B3DBCC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 019F0 80B3DBD0 8FA40028 */ lw $a0, 0x0028($sp) /* 019F4 80B3DBD4 468021A0 */ cvt.s.w $f6, $f4 -/* 019F8 80B3DBD8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 019F8 80B3DBD8 3C050601 */ lui $a1, %hi(D_06017C54) ## $a1 = 06010000 /* 019FC 80B3DBDC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 01A00 80B3DBE0 44070000 */ mfc1 $a3, $f0 /* 01A04 80B3DBE4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01A08 80B3DBE8 24A57C54 */ addiu $a1, $a1, 0x7C54 ## $a1 = 06017C54 +/* 01A08 80B3DBE8 24A57C54 */ addiu $a1, $a1, %lo(D_06017C54) ## $a1 = 06017C54 /* 01A0C 80B3DBEC E7A60010 */ swc1 $f6, 0x0010($sp) /* 01A10 80B3DBF0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01A14 80B3DBF4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DCA8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DCA8.s index d4eb7cd33a..9e8d290ae1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DCA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DCA8.s @@ -10,19 +10,19 @@ glabel func_80B3DCA8 /* 01AE8 80B3DCC8 8FBF0024 */ lw $ra, 0x0024($sp) /* 01AEC 80B3DCCC 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 01AF0 80B3DCD0 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01AF4 80B3DCD4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 01AF4 80B3DCD4 3C040601 */ lui $a0, %hi(D_06017C54) ## $a0 = 06010000 /* 01AF8 80B3DCD8 55E10015 */ bnel $t7, $at, .L80B3DD30 /* 01AFC 80B3DCDC 8FBF0024 */ lw $ra, 0x0024($sp) /* 01B00 80B3DCE0 0C028800 */ jal SkelAnime_GetFrameCount -/* 01B04 80B3DCE4 24847C54 */ addiu $a0, $a0, 0x7C54 ## $a0 = 06017C54 +/* 01B04 80B3DCE4 24847C54 */ addiu $a0, $a0, %lo(D_06017C54) ## $a0 = 06017C54 /* 01B08 80B3DCE8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01B0C 80B3DCEC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 01B10 80B3DCF0 44813000 */ mtc1 $at, $f6 ## $f6 = -8.00 /* 01B14 80B3DCF4 46802020 */ cvt.s.w $f0, $f4 /* 01B18 80B3DCF8 8FA40028 */ lw $a0, 0x0028($sp) -/* 01B1C 80B3DCFC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01B20 80B3DD00 24A57C54 */ addiu $a1, $a1, 0x7C54 ## $a1 = 06017C54 +/* 01B1C 80B3DCFC 3C050601 */ lui $a1, %hi(D_06017C54) ## $a1 = 06010000 +/* 01B20 80B3DD00 24A57C54 */ addiu $a1, $a1, %lo(D_06017C54) ## $a1 = 06017C54 /* 01B24 80B3DD04 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01B28 80B3DD08 AFA00014 */ sw $zero, 0x0014($sp) /* 01B2C 80B3DD0C 44070000 */ mfc1 $a3, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DD3C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DD3C.s index da2bc78834..c66c35c155 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DD3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DD3C.s @@ -11,21 +11,21 @@ glabel func_80B3DD3C /* 01B80 80B3DD60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01B84 80B3DD64 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 /* 01B88 80B3DD68 C602015C */ lwc1 $f2, 0x015C($s0) ## 0000015C -/* 01B8C 80B3DD6C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 01B8C 80B3DD6C 3C040601 */ lui $a0, %hi(D_06017C54) ## $a0 = 06010000 /* 01B90 80B3DD70 4600103E */ c.le.s $f2, $f0 /* 01B94 80B3DD74 00000000 */ nop /* 01B98 80B3DD78 4502001D */ bc1fl .L80B3DDF0 /* 01B9C 80B3DD7C 8FBF002C */ lw $ra, 0x002C($sp) /* 01BA0 80B3DD80 0C028800 */ jal SkelAnime_GetFrameCount -/* 01BA4 80B3DD84 24847C54 */ addiu $a0, $a0, 0x7C54 ## $a0 = 06017C54 +/* 01BA4 80B3DD84 24847C54 */ addiu $a0, $a0, %lo(D_06017C54) ## $a0 = 06017C54 /* 01BA8 80B3DD88 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01BAC 80B3DD8C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01BB0 80B3DD90 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 01BB0 80B3DD90 3C050601 */ lui $a1, %hi(D_06017C54) ## $a1 = 06010000 /* 01BB4 80B3DD94 46802120 */ cvt.s.w $f4, $f4 /* 01BB8 80B3DD98 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 01BBC 80B3DD9C AFAE0014 */ sw $t6, 0x0014($sp) -/* 01BC0 80B3DDA0 24A57C54 */ addiu $a1, $a1, 0x7C54 ## $a1 = 06017C54 +/* 01BC0 80B3DDA0 24A57C54 */ addiu $a1, $a1, %lo(D_06017C54) ## $a1 = 06017C54 /* 01BC4 80B3DDA4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01BC8 80B3DDA8 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 01BCC 80B3DDAC 44072000 */ mfc1 $a3, $f4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE00.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE00.s index 54ad5a800f..c6ec873fb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE00.s @@ -3,18 +3,18 @@ glabel func_80B3DE00 /* 01C24 80B3DE04 AFBF0024 */ sw $ra, 0x0024($sp) /* 01C28 80B3DE08 10A00017 */ beq $a1, $zero, .L80B3DE68 /* 01C2C 80B3DE0C AFA40028 */ sw $a0, 0x0028($sp) -/* 01C30 80B3DE10 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 01C30 80B3DE10 3C040602 */ lui $a0, %hi(D_0601B19C) ## $a0 = 06020000 /* 01C34 80B3DE14 0C028800 */ jal SkelAnime_GetFrameCount -/* 01C38 80B3DE18 2484B19C */ addiu $a0, $a0, 0xB19C ## $a0 = 0601B19C +/* 01C38 80B3DE18 2484B19C */ addiu $a0, $a0, %lo(D_0601B19C) ## $a0 = 0601B19C /* 01C3C 80B3DE1C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01C40 80B3DE20 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01C44 80B3DE24 8FA40028 */ lw $a0, 0x0028($sp) /* 01C48 80B3DE28 46802120 */ cvt.s.w $f4, $f4 -/* 01C4C 80B3DE2C 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 01C4C 80B3DE2C 3C050602 */ lui $a1, %hi(D_0601B19C) ## $a1 = 06020000 /* 01C50 80B3DE30 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 01C54 80B3DE34 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01C58 80B3DE38 24A5B19C */ addiu $a1, $a1, 0xB19C ## $a1 = 0601B19C +/* 01C58 80B3DE38 24A5B19C */ addiu $a1, $a1, %lo(D_0601B19C) ## $a1 = 0601B19C /* 01C5C 80B3DE3C 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 01C60 80B3DE40 44072000 */ mfc1 $a3, $f4 /* 01C64 80B3DE44 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE78.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE78.s index c8f919b7d4..1cb45595a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE78.s @@ -3,17 +3,17 @@ glabel func_80B3DE78 /* 01C9C 80B3DE7C AFBF0024 */ sw $ra, 0x0024($sp) /* 01CA0 80B3DE80 10A00018 */ beq $a1, $zero, .L80B3DEE4 /* 01CA4 80B3DE84 AFA40028 */ sw $a0, 0x0028($sp) -/* 01CA8 80B3DE88 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01CA8 80B3DE88 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 /* 01CAC 80B3DE8C 0C028800 */ jal SkelAnime_GetFrameCount -/* 01CB0 80B3DE90 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 +/* 01CB0 80B3DE90 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 /* 01CB4 80B3DE94 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01CB8 80B3DE98 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01CBC 80B3DE9C 8FA30028 */ lw $v1, 0x0028($sp) /* 01CC0 80B3DEA0 468021A0 */ cvt.s.w $f6, $f4 -/* 01CC4 80B3DEA4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 01CC4 80B3DEA4 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 /* 01CC8 80B3DEA8 44070000 */ mfc1 $a3, $f0 -/* 01CCC 80B3DEAC 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 +/* 01CCC 80B3DEAC 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 /* 01CD0 80B3DEB0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01CD4 80B3DEB4 AFA00014 */ sw $zero, 0x0014($sp) /* 01CD8 80B3DEB8 E7A60010 */ swc1 $f6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DEF4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DEF4.s index 84197b1d6f..090a66b73c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DEF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DEF4.s @@ -11,19 +11,19 @@ glabel func_80B3DEF4 /* 01D38 80B3DF18 8FBF002C */ lw $ra, 0x002C($sp) /* 01D3C 80B3DF1C 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 01D40 80B3DF20 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01D44 80B3DF24 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 01D44 80B3DF24 3C040601 */ lui $a0, %hi(D_06012FD0) ## $a0 = 06010000 /* 01D48 80B3DF28 55E1001A */ bnel $t7, $at, .L80B3DF94 /* 01D4C 80B3DF2C 8FBF002C */ lw $ra, 0x002C($sp) /* 01D50 80B3DF30 0C028800 */ jal SkelAnime_GetFrameCount -/* 01D54 80B3DF34 24842FD0 */ addiu $a0, $a0, 0x2FD0 ## $a0 = 06012FD0 +/* 01D54 80B3DF34 24842FD0 */ addiu $a0, $a0, %lo(D_06012FD0) ## $a0 = 06012FD0 /* 01D58 80B3DF38 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01D5C 80B3DF3C 3C01C140 */ lui $at, 0xC140 ## $at = C1400000 /* 01D60 80B3DF40 44814000 */ mtc1 $at, $f8 ## $f8 = -12.00 /* 01D64 80B3DF44 46802120 */ cvt.s.w $f4, $f4 /* 01D68 80B3DF48 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01D6C 80B3DF4C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01D70 80B3DF50 24A52FD0 */ addiu $a1, $a1, 0x2FD0 ## $a1 = 06012FD0 +/* 01D6C 80B3DF4C 3C050601 */ lui $a1, %hi(D_06012FD0) ## $a1 = 06010000 +/* 01D70 80B3DF50 24A52FD0 */ addiu $a1, $a1, %lo(D_06012FD0) ## $a1 = 06012FD0 /* 01D74 80B3DF54 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01D78 80B3DF58 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 01D7C 80B3DF5C 44072000 */ mfc1 $a3, $f4 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 8736685529..0bed4a84c7 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 @@ -9,7 +9,7 @@ glabel func_80B3E014 /* 01E50 80B3E030 44814000 */ mtc1 $at, $f8 ## $f8 = 140.00 /* 01E54 80B3E034 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 01E58 80B3E038 C4800090 */ lwc1 $f0, 0x0090($a0) ## 00000090 -/* 01E5C 80B3E03C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 01E5C 80B3E03C 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 /* 01E60 80B3E040 468021A0 */ cvt.s.w $f6, $f4 /* 01E64 80B3E044 46083280 */ add.s $f10, $f6, $f8 /* 01E68 80B3E048 4600503E */ c.le.s $f10, $f0 @@ -18,14 +18,14 @@ glabel func_80B3E014 /* 01E74 80B3E054 8FBF0024 */ lw $ra, 0x0024($sp) /* 01E78 80B3E058 0C028800 */ jal SkelAnime_GetFrameCount -/* 01E7C 80B3E05C 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 +/* 01E7C 80B3E05C 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 /* 01E80 80B3E060 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 01E84 80B3E064 3C01C140 */ lui $at, 0xC140 ## $at = C1400000 /* 01E88 80B3E068 44812000 */ mtc1 $at, $f4 ## $f4 = -12.00 /* 01E8C 80B3E06C 468084A0 */ cvt.s.w $f18, $f16 /* 01E90 80B3E070 8FA40028 */ lw $a0, 0x0028($sp) -/* 01E94 80B3E074 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01E98 80B3E078 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 +/* 01E94 80B3E074 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 +/* 01E98 80B3E078 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 /* 01E9C 80B3E07C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01EA0 80B3E080 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01EA4 80B3E084 E7B20010 */ swc1 $f18, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E0BC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E0BC.s index 734e1ecdd5..6efb000c4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E0BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E0BC.s @@ -11,22 +11,22 @@ glabel func_80B3E0BC /* 01F00 80B3E0E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01F04 80B3E0E4 E4880268 */ swc1 $f8, 0x0268($a0) ## 00000268 /* 01F08 80B3E0E8 C48A0268 */ lwc1 $f10, 0x0268($a0) ## 00000268 -/* 01F0C 80B3E0EC 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 01F0C 80B3E0EC 3C040602 */ lui $a0, %hi(D_06019598) ## $a0 = 06020000 /* 01F10 80B3E0F0 460A803E */ c.le.s $f16, $f10 /* 01F14 80B3E0F4 00000000 */ nop /* 01F18 80B3E0F8 45020016 */ bc1fl .L80B3E154 /* 01F1C 80B3E0FC 8FBF002C */ lw $ra, 0x002C($sp) /* 01F20 80B3E100 0C028800 */ jal SkelAnime_GetFrameCount -/* 01F24 80B3E104 24849598 */ addiu $a0, $a0, 0x9598 ## $a0 = 06019598 +/* 01F24 80B3E104 24849598 */ addiu $a0, $a0, %lo(D_06019598) ## $a0 = 06019598 /* 01F28 80B3E108 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 01F2C 80B3E10C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01F30 80B3E110 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 01F30 80B3E110 3C050602 */ lui $a1, %hi(D_06019598) ## $a1 = 06020000 /* 01F34 80B3E114 46809120 */ cvt.s.w $f4, $f18 /* 01F38 80B3E118 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 01F3C 80B3E11C 44070000 */ mfc1 $a3, $f0 /* 01F40 80B3E120 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01F44 80B3E124 24A59598 */ addiu $a1, $a1, 0x9598 ## $a1 = 06019598 +/* 01F44 80B3E124 24A59598 */ addiu $a1, $a1, %lo(D_06019598) ## $a1 = 06019598 /* 01F48 80B3E128 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01F4C 80B3E12C E7A40010 */ swc1 $f4, 0x0010($sp) /* 01F50 80B3E130 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E87C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E87C.s index 9525be6d03..c263db1243 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E87C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E87C.s @@ -2,8 +2,8 @@ glabel func_80B3E87C /* 0269C 80B3E87C 3C014208 */ lui $at, 0x4208 ## $at = 42080000 /* 026A0 80B3E880 C4A00164 */ lwc1 $f0, 0x0164($a1) ## 00000164 /* 026A4 80B3E884 44812000 */ mtc1 $at, $f4 ## $f4 = 34.00 -/* 026A8 80B3E888 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 026AC 80B3E88C 25CE1150 */ addiu $t6, $t6, 0x1150 ## $t6 = 06011150 +/* 026A8 80B3E888 3C0E0601 */ lui $t6, %hi(D_06011150) ## $t6 = 06010000 +/* 026AC 80B3E88C 25CE1150 */ addiu $t6, $t6, %lo(D_06011150) ## $t6 = 06011150 /* 026B0 80B3E890 4600203E */ c.le.s $f4, $f0 /* 026B4 80B3E894 00000000 */ nop /* 026B8 80B3E898 45000002 */ bc1f .L80B3E8A4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8E4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8E4.s index 8477e5b712..f979859946 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8E4.s @@ -3,8 +3,8 @@ glabel func_80B3E8E4 /* 02708 80B3E8E8 AFA40000 */ sw $a0, 0x0000($sp) /* 0270C 80B3E8EC 14A10004 */ bne $a1, $at, .L80B3E900 /* 02710 80B3E8F0 AFA7000C */ sw $a3, 0x000C($sp) -/* 02714 80B3E8F4 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 02718 80B3E8F8 25CE1150 */ addiu $t6, $t6, 0x1150 ## $t6 = 06011150 +/* 02714 80B3E8F4 3C0E0601 */ lui $t6, %hi(D_06011150) ## $t6 = 06010000 +/* 02718 80B3E8F8 25CE1150 */ addiu $t6, $t6, %lo(D_06011150) ## $t6 = 06011150 /* 0271C 80B3E8FC ACCE0000 */ sw $t6, 0x0000($a2) ## 00000000 .L80B3E900: /* 02720 80B3E900 03E00008 */ jr $ra 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 2258730af4..fd79924e5d 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 @@ -9,7 +9,7 @@ glabel func_80B3F010 /* 02E4C 80B3F02C 44814000 */ mtc1 $at, $f8 ## $f8 = 140.00 /* 02E50 80B3F030 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 02E54 80B3F034 C4800090 */ lwc1 $f0, 0x0090($a0) ## 00000090 -/* 02E58 80B3F038 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 02E58 80B3F038 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 /* 02E5C 80B3F03C 468021A0 */ cvt.s.w $f6, $f4 /* 02E60 80B3F040 46083280 */ add.s $f10, $f6, $f8 /* 02E64 80B3F044 4600503E */ c.le.s $f10, $f0 @@ -18,14 +18,14 @@ glabel func_80B3F010 /* 02E70 80B3F050 8FBF0024 */ lw $ra, 0x0024($sp) /* 02E74 80B3F054 0C028800 */ jal SkelAnime_GetFrameCount -/* 02E78 80B3F058 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 +/* 02E78 80B3F058 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 /* 02E7C 80B3F05C 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 02E80 80B3F060 3C01C140 */ lui $at, 0xC140 ## $at = C1400000 /* 02E84 80B3F064 44812000 */ mtc1 $at, $f4 ## $f4 = -12.00 /* 02E88 80B3F068 468084A0 */ cvt.s.w $f18, $f16 /* 02E8C 80B3F06C 8FA40028 */ lw $a0, 0x0028($sp) -/* 02E90 80B3F070 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02E94 80B3F074 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 +/* 02E90 80B3F070 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 +/* 02E94 80B3F074 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 /* 02E98 80B3F078 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02E9C 80B3F07C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 02EA0 80B3F080 E7B20010 */ swc1 $f18, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F668.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F668.s index 25ab2f5eb2..d506a6ff1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F668.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F668.s @@ -7,10 +7,10 @@ glabel func_80B3F668 /* 0349C 80B3F67C 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 /* 034A0 80B3F680 10400012 */ beq $v0, $zero, .L80B3F6CC /* 034A4 80B3F684 8FA40020 */ lw $a0, 0x0020($sp) -/* 034A8 80B3F688 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 034A8 80B3F688 3C050601 */ lui $a1, %hi(D_06012FD0) ## $a1 = 06010000 /* 034AC 80B3F68C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 034B0 80B3F690 AFAE0010 */ sw $t6, 0x0010($sp) -/* 034B4 80B3F694 24A52FD0 */ addiu $a1, $a1, 0x2FD0 ## $a1 = 06012FD0 +/* 034B4 80B3F694 24A52FD0 */ addiu $a1, $a1, %lo(D_06012FD0) ## $a1 = 06012FD0 /* 034B8 80B3F698 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 034BC 80B3F69C 3C07C140 */ lui $a3, 0xC140 ## $a3 = C1400000 /* 034C0 80B3F6A0 0C2CF1C0 */ jal func_80B3C700 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F700.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F700.s index 4245a29bae..d9d1f93060 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F700.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F700.s @@ -7,8 +7,8 @@ glabel func_80B3F700 /* 03534 80B3F714 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 /* 03538 80B3F718 1040000A */ beq $v0, $zero, .L80B3F744 /* 0353C 80B3F71C 8FA40020 */ lw $a0, 0x0020($sp) -/* 03540 80B3F720 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 -/* 03544 80B3F724 24A59C30 */ addiu $a1, $a1, 0x9C30 ## $a1 = 06019C30 +/* 03540 80B3F720 3C050602 */ lui $a1, %hi(D_06019C30) ## $a1 = 06020000 +/* 03544 80B3F724 24A59C30 */ addiu $a1, $a1, %lo(D_06019C30) ## $a1 = 06019C30 /* 03548 80B3F728 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0354C 80B3F72C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 03550 80B3F730 0C2CF1C0 */ jal func_80B3C700 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F754.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F754.s index 5cad9488c6..1609bd9425 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F754.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F754.s @@ -8,8 +8,8 @@ glabel func_80B3F754 /* 0358C 80B3F76C 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 /* 03590 80B3F770 1040000E */ beq $v0, $zero, .L80B3F7AC /* 03594 80B3F774 8FA40020 */ lw $a0, 0x0020($sp) -/* 03598 80B3F778 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 -/* 0359C 80B3F77C 24A5A048 */ addiu $a1, $a1, 0xA048 ## $a1 = 0601A048 +/* 03598 80B3F778 3C050602 */ lui $a1, %hi(D_0601A048) ## $a1 = 06020000 +/* 0359C 80B3F77C 24A5A048 */ addiu $a1, $a1, %lo(D_0601A048) ## $a1 = 0601A048 /* 035A0 80B3F780 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 035A4 80B3F784 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 035A8 80B3F788 0C2CF1C0 */ jal func_80B3C700 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FFB4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FFB4.s index b6909c9ae8..775c7108dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FFB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FFB4.s @@ -6,19 +6,19 @@ glabel func_80B3FFB4 /* 03DE4 80B3FFC4 0C2CF13C */ jal func_80B3C4F0 /* 03DE8 80B3FFC8 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 /* 03DEC 80B3FFCC 10400018 */ beq $v0, $zero, .L80B40030 -/* 03DF0 80B3FFD0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 03DF0 80B3FFD0 3C040600 */ lui $a0, %hi(D_06001A08) ## $a0 = 06000000 /* 03DF4 80B3FFD4 0C028800 */ jal SkelAnime_GetFrameCount -/* 03DF8 80B3FFD8 24841A08 */ addiu $a0, $a0, 0x1A08 ## $a0 = 06001A08 +/* 03DF8 80B3FFD8 24841A08 */ addiu $a0, $a0, %lo(D_06001A08) ## $a0 = 06001A08 /* 03DFC 80B3FFDC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03E00 80B3FFE0 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 03E04 80B3FFE4 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 /* 03E08 80B3FFE8 468021A0 */ cvt.s.w $f6, $f4 /* 03E0C 80B3FFEC 8FA40028 */ lw $a0, 0x0028($sp) -/* 03E10 80B3FFF0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 03E10 80B3FFF0 3C050600 */ lui $a1, %hi(D_06001A08) ## $a1 = 06000000 /* 03E14 80B3FFF4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 03E18 80B3FFF8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 03E1C 80B3FFFC 24A51A08 */ addiu $a1, $a1, 0x1A08 ## $a1 = 06001A08 +/* 03E1C 80B3FFFC 24A51A08 */ addiu $a1, $a1, %lo(D_06001A08) ## $a1 = 06001A08 /* 03E20 80B40000 E7A60010 */ swc1 $f6, 0x0010($sp) /* 03E24 80B40004 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03E28 80B40008 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40040.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40040.s index ef6dc905da..7a722f6242 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40040.s @@ -3,17 +3,17 @@ glabel func_80B40040 /* 03E64 80B40044 AFBF0024 */ sw $ra, 0x0024($sp) /* 03E68 80B40048 10A00014 */ beq $a1, $zero, .L80B4009C /* 03E6C 80B4004C AFA40028 */ sw $a0, 0x0028($sp) -/* 03E70 80B40050 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 03E70 80B40050 3C040600 */ lui $a0, %hi(D_06001D14) ## $a0 = 06000000 /* 03E74 80B40054 0C028800 */ jal SkelAnime_GetFrameCount -/* 03E78 80B40058 24841D14 */ addiu $a0, $a0, 0x1D14 ## $a0 = 06001D14 +/* 03E78 80B40058 24841D14 */ addiu $a0, $a0, %lo(D_06001D14) ## $a0 = 06001D14 /* 03E7C 80B4005C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03E80 80B40060 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 03E84 80B40064 8FA40028 */ lw $a0, 0x0028($sp) /* 03E88 80B40068 468021A0 */ cvt.s.w $f6, $f4 -/* 03E8C 80B4006C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 03E8C 80B4006C 3C050600 */ lui $a1, %hi(D_06001D14) ## $a1 = 06000000 /* 03E90 80B40070 44070000 */ mfc1 $a3, $f0 -/* 03E94 80B40074 24A51D14 */ addiu $a1, $a1, 0x1D14 ## $a1 = 06001D14 +/* 03E94 80B40074 24A51D14 */ addiu $a1, $a1, %lo(D_06001D14) ## $a1 = 06001D14 /* 03E98 80B40078 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03E9C 80B4007C AFA00014 */ sw $zero, 0x0014($sp) /* 03EA0 80B40080 E7A60010 */ swc1 $f6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40224.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40224.s index 70ca448d8c..b79e65a193 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40224.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40224.s @@ -3,8 +3,8 @@ glabel func_80B40224 /* 04048 80B40228 AFA40000 */ sw $a0, 0x0000($sp) /* 0404C 80B4022C 14A10004 */ bne $a1, $at, .L80B40240 /* 04050 80B40230 AFA7000C */ sw $a3, 0x000C($sp) -/* 04054 80B40234 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 04058 80B40238 25CE1620 */ addiu $t6, $t6, 0x1620 ## $t6 = 06011620 +/* 04054 80B40234 3C0E0601 */ lui $t6, %hi(D_06011620) ## $t6 = 06010000 +/* 04058 80B40238 25CE1620 */ addiu $t6, $t6, %lo(D_06011620) ## $t6 = 06011620 /* 0405C 80B4023C ACCE0000 */ sw $t6, 0x0000($a2) ## 00000000 .L80B40240: /* 04060 80B40240 03E00008 */ jr $ra 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 ba14f91af3..4fc4bf88a6 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 @@ -124,8 +124,8 @@ glabel func_80B402C4 /* 04278 80B40458 37190080 */ ori $t9, $t8, 0x0080 ## $t9 = FF000080 /* 0427C 80B4045C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 04280 80B40460 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04284 80B40464 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 -/* 04288 80B40468 258C2970 */ addiu $t4, $t4, 0x2970 ## $t4 = 06012970 +/* 04284 80B40464 3C0C0601 */ lui $t4, %hi(D_06012970) ## $t4 = 06010000 +/* 04288 80B40468 258C2970 */ addiu $t4, $t4, %lo(D_06012970) ## $t4 = 06012970 /* 0428C 80B4046C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 04290 80B40470 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 04294 80B40474 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4070C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4070C.s index 32adf73405..b037d4b98c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4070C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4070C.s @@ -3,11 +3,11 @@ glabel func_80B4070C /* 04530 80B40710 AFB00028 */ sw $s0, 0x0028($sp) /* 04534 80B40714 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 04538 80B40718 AFBF002C */ sw $ra, 0x002C($sp) -/* 0453C 80B4071C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0453C 80B4071C 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 /* 04540 80B40720 AFA50044 */ sw $a1, 0x0044($sp) /* 04544 80B40724 0C028800 */ jal SkelAnime_GetFrameCount -/* 04548 80B40728 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 +/* 04548 80B40728 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 /* 0454C 80B4072C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04550 80B40730 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04554 80B40734 468021A0 */ cvt.s.w $f6, $f4 @@ -19,9 +19,9 @@ glabel func_80B4070C /* 0456C 80B4074C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 04570 80B40750 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04574 80B40754 C7A80030 */ lwc1 $f8, 0x0030($sp) -/* 04578 80B40758 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 04578 80B40758 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 /* 0457C 80B4075C 44070000 */ mfc1 $a3, $f0 -/* 04580 80B40760 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 +/* 04580 80B40760 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 /* 04584 80B40764 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 04588 80B40768 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0458C 80B4076C AFA00014 */ sw $zero, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B407A8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B407A8.s index 514c532d94..a9d681f7e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B407A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B407A8.s @@ -2,19 +2,19 @@ glabel func_80B407A8 /* 045C8 80B407A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 045CC 80B407AC AFA40028 */ sw $a0, 0x0028($sp) /* 045D0 80B407B0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 045D4 80B407B4 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 045D4 80B407B4 3C040602 */ lui $a0, %hi(D_06018B00) ## $a0 = 06020000 /* 045D8 80B407B8 0C028800 */ jal SkelAnime_GetFrameCount -/* 045DC 80B407BC 24848B00 */ addiu $a0, $a0, 0x8B00 ## $a0 = 06018B00 +/* 045DC 80B407BC 24848B00 */ addiu $a0, $a0, %lo(D_06018B00) ## $a0 = 06018B00 /* 045E0 80B407C0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 045E4 80B407C4 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 045E8 80B407C8 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 /* 045EC 80B407CC 468021A0 */ cvt.s.w $f6, $f4 /* 045F0 80B407D0 8FA40028 */ lw $a0, 0x0028($sp) -/* 045F4 80B407D4 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 045F4 80B407D4 3C050602 */ lui $a1, %hi(D_06018B00) ## $a1 = 06020000 /* 045F8 80B407D8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 045FC 80B407DC AFAE0014 */ sw $t6, 0x0014($sp) -/* 04600 80B407E0 24A58B00 */ addiu $a1, $a1, 0x8B00 ## $a1 = 06018B00 +/* 04600 80B407E0 24A58B00 */ addiu $a1, $a1, %lo(D_06018B00) ## $a1 = 06018B00 /* 04604 80B407E4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 04608 80B407E8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0460C 80B407EC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40820.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40820.s index 735835edad..84d2723fa2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40820.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40820.s @@ -3,18 +3,18 @@ glabel func_80B40820 /* 04644 80B40824 AFB00028 */ sw $s0, 0x0028($sp) /* 04648 80B40828 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0464C 80B4082C AFBF002C */ sw $ra, 0x002C($sp) -/* 04650 80B40830 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 04650 80B40830 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 /* 04654 80B40834 AFA5004C */ sw $a1, 0x004C($sp) /* 04658 80B40838 0C028800 */ jal SkelAnime_GetFrameCount -/* 0465C 80B4083C 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 +/* 0465C 80B4083C 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 /* 04660 80B40840 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04664 80B40844 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04668 80B40848 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0466C 80B4084C 468021A0 */ cvt.s.w $f6, $f4 -/* 04670 80B40850 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 04670 80B40850 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 /* 04674 80B40854 44070000 */ mfc1 $a3, $f0 -/* 04678 80B40858 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 +/* 04678 80B40858 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 /* 0467C 80B4085C AFA40034 */ sw $a0, 0x0034($sp) /* 04680 80B40860 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04684 80B40864 E7A60010 */ swc1 $f6, 0x0010($sp) @@ -29,18 +29,18 @@ glabel func_80B40820 /* 046A4 80B40884 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 046A8 80B40888 0C2CF259 */ jal func_80B3C964 /* 046AC 80B4088C 8FA5004C */ lw $a1, 0x004C($sp) -/* 046B0 80B40890 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 046B0 80B40890 3C040601 */ lui $a0, %hi(D_060169E8) ## $a0 = 06010000 /* 046B4 80B40894 0C028800 */ jal SkelAnime_GetFrameCount -/* 046B8 80B40898 248469E8 */ addiu $a0, $a0, 0x69E8 ## $a0 = 060169E8 +/* 046B8 80B40898 248469E8 */ addiu $a0, $a0, %lo(D_060169E8) ## $a0 = 060169E8 /* 046BC 80B4089C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 046C0 80B408A0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 046C4 80B408A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 046C4 80B408A4 3C050601 */ lui $a1, %hi(D_060169E8) ## $a1 = 06010000 /* 046C8 80B408A8 468042A0 */ cvt.s.w $f10, $f8 /* 046CC 80B408AC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 046D0 80B408B0 44070000 */ mfc1 $a3, $f0 /* 046D4 80B408B4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 046D8 80B408B8 24A569E8 */ addiu $a1, $a1, 0x69E8 ## $a1 = 060169E8 +/* 046D8 80B408B8 24A569E8 */ addiu $a1, $a1, %lo(D_060169E8) ## $a1 = 060169E8 /* 046DC 80B408BC 8FA40034 */ lw $a0, 0x0034($sp) /* 046E0 80B408C0 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 046E4 80B408C4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B408FC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B408FC.s index 7ee8329a0d..1ad73780ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B408FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B408FC.s @@ -3,18 +3,18 @@ glabel func_80B408FC /* 04720 80B40900 AFB00028 */ sw $s0, 0x0028($sp) /* 04724 80B40904 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 04728 80B40908 AFBF002C */ sw $ra, 0x002C($sp) -/* 0472C 80B4090C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 0472C 80B4090C 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 /* 04730 80B40910 AFA5004C */ sw $a1, 0x004C($sp) /* 04734 80B40914 0C028800 */ jal SkelAnime_GetFrameCount -/* 04738 80B40918 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 +/* 04738 80B40918 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 /* 0473C 80B4091C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04740 80B40920 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04744 80B40924 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 04748 80B40928 468021A0 */ cvt.s.w $f6, $f4 -/* 0474C 80B4092C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 0474C 80B4092C 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 /* 04750 80B40930 44070000 */ mfc1 $a3, $f0 -/* 04754 80B40934 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 +/* 04754 80B40934 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 /* 04758 80B40938 AFA40034 */ sw $a0, 0x0034($sp) /* 0475C 80B4093C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04760 80B40940 E7A60010 */ swc1 $f6, 0x0010($sp) @@ -29,18 +29,18 @@ glabel func_80B408FC /* 04780 80B40960 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04784 80B40964 0C2CF259 */ jal func_80B3C964 /* 04788 80B40968 8FA5004C */ lw $a1, 0x004C($sp) -/* 0478C 80B4096C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 0478C 80B4096C 3C040601 */ lui $a0, %hi(D_060149E4) ## $a0 = 06010000 /* 04790 80B40970 0C028800 */ jal SkelAnime_GetFrameCount -/* 04794 80B40974 248449E4 */ addiu $a0, $a0, 0x49E4 ## $a0 = 060149E4 +/* 04794 80B40974 248449E4 */ addiu $a0, $a0, %lo(D_060149E4) ## $a0 = 060149E4 /* 04798 80B40978 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 0479C 80B4097C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 047A0 80B40980 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 047A0 80B40980 3C050601 */ lui $a1, %hi(D_060149E4) ## $a1 = 06010000 /* 047A4 80B40984 468042A0 */ cvt.s.w $f10, $f8 /* 047A8 80B40988 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 047AC 80B4098C 44070000 */ mfc1 $a3, $f0 /* 047B0 80B40990 AFAE0014 */ sw $t6, 0x0014($sp) -/* 047B4 80B40994 24A549E4 */ addiu $a1, $a1, 0x49E4 ## $a1 = 060149E4 +/* 047B4 80B40994 24A549E4 */ addiu $a1, $a1, %lo(D_060149E4) ## $a1 = 060149E4 /* 047B8 80B40998 8FA40034 */ lw $a0, 0x0034($sp) /* 047BC 80B4099C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 047C0 80B409A0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B409D8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B409D8.s index 781f85cc65..98978adc84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B409D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B409D8.s @@ -3,11 +3,11 @@ glabel func_80B409D8 /* 047FC 80B409DC AFB00028 */ sw $s0, 0x0028($sp) /* 04800 80B409E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 04804 80B409E4 AFBF002C */ sw $ra, 0x002C($sp) -/* 04808 80B409E8 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 04808 80B409E8 3C040602 */ lui $a0, %hi(D_06019F78) ## $a0 = 06020000 /* 0480C 80B409EC AFA50044 */ sw $a1, 0x0044($sp) /* 04810 80B409F0 0C028800 */ jal SkelAnime_GetFrameCount -/* 04814 80B409F4 24849F78 */ addiu $a0, $a0, 0x9F78 ## $a0 = 06019F78 +/* 04814 80B409F4 24849F78 */ addiu $a0, $a0, %lo(D_06019F78) ## $a0 = 06019F78 /* 04818 80B409F8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0481C 80B409FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04820 80B40A00 468021A0 */ cvt.s.w $f6, $f4 @@ -19,11 +19,11 @@ glabel func_80B409D8 /* 04838 80B40A18 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 0483C 80B40A1C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04840 80B40A20 C7A80030 */ lwc1 $f8, 0x0030($sp) -/* 04844 80B40A24 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 04844 80B40A24 3C050602 */ lui $a1, %hi(D_06019F78) ## $a1 = 06020000 /* 04848 80B40A28 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 0484C 80B40A2C 44070000 */ mfc1 $a3, $f0 /* 04850 80B40A30 AFAE0014 */ sw $t6, 0x0014($sp) -/* 04854 80B40A34 24A59F78 */ addiu $a1, $a1, 0x9F78 ## $a1 = 06019F78 +/* 04854 80B40A34 24A59F78 */ addiu $a1, $a1, %lo(D_06019F78) ## $a1 = 06019F78 /* 04858 80B40A38 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0485C 80B40A3C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04860 80B40A40 E7A80010 */ swc1 $f8, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40A78.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40A78.s index 9742760aa4..5166ca151c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40A78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40A78.s @@ -3,11 +3,11 @@ glabel func_80B40A78 /* 0489C 80B40A7C AFB00028 */ sw $s0, 0x0028($sp) /* 048A0 80B40A80 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 048A4 80B40A84 AFBF002C */ sw $ra, 0x002C($sp) -/* 048A8 80B40A88 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 048A8 80B40A88 3C040602 */ lui $a0, %hi(D_06019F78) ## $a0 = 06020000 /* 048AC 80B40A8C AFA50044 */ sw $a1, 0x0044($sp) /* 048B0 80B40A90 0C028800 */ jal SkelAnime_GetFrameCount -/* 048B4 80B40A94 24849F78 */ addiu $a0, $a0, 0x9F78 ## $a0 = 06019F78 +/* 048B4 80B40A94 24849F78 */ addiu $a0, $a0, %lo(D_06019F78) ## $a0 = 06019F78 /* 048B8 80B40A98 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 048BC 80B40A9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 048C0 80B40AA0 468021A0 */ cvt.s.w $f6, $f4 @@ -19,11 +19,11 @@ glabel func_80B40A78 /* 048D8 80B40AB8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 048DC 80B40ABC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 048E0 80B40AC0 C7A80030 */ lwc1 $f8, 0x0030($sp) -/* 048E4 80B40AC4 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 048E4 80B40AC4 3C050602 */ lui $a1, %hi(D_06019F78) ## $a1 = 06020000 /* 048E8 80B40AC8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 048EC 80B40ACC 44070000 */ mfc1 $a3, $f0 /* 048F0 80B40AD0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 048F4 80B40AD4 24A59F78 */ addiu $a1, $a1, 0x9F78 ## $a1 = 06019F78 +/* 048F4 80B40AD4 24A59F78 */ addiu $a1, $a1, %lo(D_06019F78) ## $a1 = 06019F78 /* 048F8 80B40AD8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 048FC 80B40ADC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04900 80B40AE0 E7A80010 */ swc1 $f8, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40B18.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40B18.s index 71ab7e58a4..ed9be7c336 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40B18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40B18.s @@ -3,11 +3,11 @@ glabel func_80B40B18 /* 0493C 80B40B1C AFB00028 */ sw $s0, 0x0028($sp) /* 04940 80B40B20 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 04944 80B40B24 AFBF002C */ sw $ra, 0x002C($sp) -/* 04948 80B40B28 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 +/* 04948 80B40B28 3C040602 */ lui $a0, %hi(D_06019C30) ## $a0 = 06020000 /* 0494C 80B40B2C AFA50044 */ sw $a1, 0x0044($sp) /* 04950 80B40B30 0C028800 */ jal SkelAnime_GetFrameCount -/* 04954 80B40B34 24849C30 */ addiu $a0, $a0, 0x9C30 ## $a0 = 06019C30 +/* 04954 80B40B34 24849C30 */ addiu $a0, $a0, %lo(D_06019C30) ## $a0 = 06019C30 /* 04958 80B40B38 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0495C 80B40B3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04960 80B40B40 468021A0 */ cvt.s.w $f6, $f4 @@ -19,9 +19,9 @@ glabel func_80B40B18 /* 04978 80B40B58 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 0497C 80B40B5C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04980 80B40B60 C7A80030 */ lwc1 $f8, 0x0030($sp) -/* 04984 80B40B64 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 +/* 04984 80B40B64 3C050602 */ lui $a1, %hi(D_06019C30) ## $a1 = 06020000 /* 04988 80B40B68 44070000 */ mfc1 $a3, $f0 -/* 0498C 80B40B6C 24A59C30 */ addiu $a1, $a1, 0x9C30 ## $a1 = 06019C30 +/* 0498C 80B40B6C 24A59C30 */ addiu $a1, $a1, %lo(D_06019C30) ## $a1 = 06019C30 /* 04990 80B40B70 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 04994 80B40B74 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04998 80B40B78 AFA00014 */ sw $zero, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40BB4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40BB4.s index 3504099c78..d3676bfcf2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40BB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40BB4.s @@ -3,11 +3,11 @@ glabel func_80B40BB4 /* 049D8 80B40BB8 AFB00028 */ sw $s0, 0x0028($sp) /* 049DC 80B40BBC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 049E0 80B40BC0 AFBF002C */ sw $ra, 0x002C($sp) -/* 049E4 80B40BC4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 049E4 80B40BC4 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 /* 049E8 80B40BC8 AFA50044 */ sw $a1, 0x0044($sp) /* 049EC 80B40BCC 0C028800 */ jal SkelAnime_GetFrameCount -/* 049F0 80B40BD0 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 +/* 049F0 80B40BD0 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 /* 049F4 80B40BD4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 049F8 80B40BD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 049FC 80B40BDC 468021A0 */ cvt.s.w $f6, $f4 @@ -19,9 +19,9 @@ glabel func_80B40BB4 /* 04A14 80B40BF4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 04A18 80B40BF8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04A1C 80B40BFC C7A80030 */ lwc1 $f8, 0x0030($sp) -/* 04A20 80B40C00 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 04A20 80B40C00 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 /* 04A24 80B40C04 44070000 */ mfc1 $a3, $f0 -/* 04A28 80B40C08 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 +/* 04A28 80B40C08 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 /* 04A2C 80B40C0C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 04A30 80B40C10 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04A34 80B40C14 AFA00014 */ sw $zero, 0x0014($sp) 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 4183a9ba71..78a8dc3197 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 @@ -9,7 +9,7 @@ glabel func_80B40D98 /* 04BD4 80B40DB4 44814000 */ mtc1 $at, $f8 ## $f8 = 140.00 /* 04BD8 80B40DB8 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 04BDC 80B40DBC C4800090 */ lwc1 $f0, 0x0090($a0) ## 00000090 -/* 04BE0 80B40DC0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 +/* 04BE0 80B40DC0 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 /* 04BE4 80B40DC4 468021A0 */ cvt.s.w $f6, $f4 /* 04BE8 80B40DC8 46083280 */ add.s $f10, $f6, $f8 /* 04BEC 80B40DCC 4600503E */ c.le.s $f10, $f0 @@ -18,14 +18,14 @@ glabel func_80B40D98 /* 04BF8 80B40DD8 8FBF0024 */ lw $ra, 0x0024($sp) /* 04BFC 80B40DDC 0C028800 */ jal SkelAnime_GetFrameCount -/* 04C00 80B40DE0 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 +/* 04C00 80B40DE0 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 /* 04C04 80B40DE4 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 04C08 80B40DE8 3C01C140 */ lui $at, 0xC140 ## $at = C1400000 /* 04C0C 80B40DEC 44812000 */ mtc1 $at, $f4 ## $f4 = -12.00 /* 04C10 80B40DF0 468084A0 */ cvt.s.w $f18, $f16 /* 04C14 80B40DF4 8FA40028 */ lw $a0, 0x0028($sp) -/* 04C18 80B40DF8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04C1C 80B40DFC 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 +/* 04C18 80B40DF8 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 +/* 04C1C 80B40DFC 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 /* 04C20 80B40E00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04C24 80B40E04 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 04C28 80B40E08 E7B20010 */ swc1 $f18, 0x0010($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 169eb38a59..34535b1dc0 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 @@ -24,8 +24,8 @@ glabel func_80B414AC /* 052FC 80B414DC 0C024F46 */ jal func_80093D18 /* 05300 80B414E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 05304 80B414E4 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 -/* 05308 80B414E8 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 -/* 0530C 80B414EC 246358C0 */ addiu $v1, $v1, 0x58C0 ## $v1 = 060058C0 +/* 05308 80B414E8 3C030600 */ lui $v1, %hi(D_060058C0) ## $v1 = 06000000 +/* 0530C 80B414EC 246358C0 */ addiu $v1, $v1, %lo(D_060058C0) ## $v1 = 060058C0 /* 05310 80B414F0 0003C900 */ sll $t9, $v1, 4 /* 05314 80B414F4 00194702 */ srl $t0, $t9, 28 /* 05318 80B414F8 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 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 ca4a95542d..c4b9edd865 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 @@ -9,8 +9,8 @@ glabel func_80B415B8 /* 053F4 80B415D4 15C00049 */ bne $t6, $zero, .L80B416FC /* 053F8 80B415D8 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 /* 053FC 80B415DC 94660EEC */ lhu $a2, 0x0EEC($v1) ## 8015F54C -/* 05400 80B415E0 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 05404 80B415E4 244246F0 */ addiu $v0, $v0, 0x46F0 ## $v0 = 020046F0 +/* 05400 80B415E0 3C020200 */ lui $v0, %hi(D_020046F0) ## $v0 = 02000000 +/* 05404 80B415E4 244246F0 */ addiu $v0, $v0, %lo(D_020046F0) ## $v0 = 020046F0 /* 05408 80B415E8 30CF0020 */ andi $t7, $a2, 0x0020 ## $t7 = 00000000 /* 0540C 80B415EC 15E00014 */ bne $t7, $zero, .L80B41640 /* 05410 80B415F0 34D80020 */ ori $t8, $a2, 0x0020 ## $t8 = 00000020 @@ -48,8 +48,8 @@ glabel func_80B415B8 /* 0548C 80B4166C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 05490 80B41670 0C021344 */ jal Item_Give /* 05494 80B41674 AFA70024 */ sw $a3, 0x0024($sp) -/* 05498 80B41678 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 0549C 80B4167C 24426D20 */ addiu $v0, $v0, 0x6D20 ## $v0 = 02006D20 +/* 05498 80B41678 3C020200 */ lui $v0, %hi(D_02006D20) ## $v0 = 02000000 +/* 0549C 80B4167C 24426D20 */ addiu $v0, $v0, %lo(D_02006D20) ## $v0 = 02006D20 /* 054A0 80B41680 00024100 */ sll $t0, $v0, 4 /* 054A4 80B41684 00084F02 */ srl $t1, $t0, 28 /* 054A8 80B41688 00095080 */ sll $t2, $t1, 2 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 ecc0be3c9e..8bdca72844 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 @@ -119,16 +119,16 @@ glabel EnZf_Init /* 0045C 80B444AC 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 /* 00460 80B444B0 A20F00AF */ sb $t7, 0x00AF($s0) ## 000000AF /* 00464 80B444B4 A2180117 */ sb $t8, 0x0117($s0) ## 00000117 -/* 00468 80B444B8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 0046C 80B444BC 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 +/* 00468 80B444B8 3C060600 */ lui $a2, %hi(D_06006690) ## $a2 = 06000000 +/* 0046C 80B444BC 3C070601 */ lui $a3, %hi(D_0600B10C) ## $a3 = 06010000 /* 00470 80B444C0 26190190 */ addiu $t9, $s0, 0x0190 ## $t9 = 00000190 /* 00474 80B444C4 260802B6 */ addiu $t0, $s0, 0x02B6 ## $t0 = 000002B6 /* 00478 80B444C8 24090031 */ addiu $t1, $zero, 0x0031 ## $t1 = 00000031 /* 0047C 80B444CC AFA90018 */ sw $t1, 0x0018($sp) /* 00480 80B444D0 AFA80014 */ sw $t0, 0x0014($sp) /* 00484 80B444D4 AFB90010 */ sw $t9, 0x0010($sp) -/* 00488 80B444D8 24E7B10C */ addiu $a3, $a3, 0xB10C ## $a3 = 0600B10C -/* 0048C 80B444DC 24C66690 */ addiu $a2, $a2, 0x6690 ## $a2 = 06006690 +/* 00488 80B444D8 24E7B10C */ addiu $a3, $a3, %lo(D_0600B10C) ## $a3 = 0600B10C +/* 0048C 80B444DC 24C66690 */ addiu $a2, $a2, %lo(D_06006690) ## $a2 = 06006690 /* 00490 80B444E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00494 80B444E4 0C02915F */ jal SkelAnime_Init @@ -138,16 +138,16 @@ glabel EnZf_Init .L80B444F4: /* 004A4 80B444F4 A20A00AF */ sb $t2, 0x00AF($s0) ## 000000AF /* 004A8 80B444F8 A20B0117 */ sb $t3, 0x0117($s0) ## 00000117 -/* 004AC 80B444FC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 004B0 80B44500 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 +/* 004AC 80B444FC 3C060601 */ lui $a2, %hi(D_060104B8) ## $a2 = 06010000 +/* 004B0 80B44500 3C070601 */ lui $a3, %hi(D_0600B10C) ## $a3 = 06010000 /* 004B4 80B44504 260C0190 */ addiu $t4, $s0, 0x0190 ## $t4 = 00000190 /* 004B8 80B44508 260D02B6 */ addiu $t5, $s0, 0x02B6 ## $t5 = 000002B6 /* 004BC 80B4450C 240E0031 */ addiu $t6, $zero, 0x0031 ## $t6 = 00000031 /* 004C0 80B44510 AFAE0018 */ sw $t6, 0x0018($sp) /* 004C4 80B44514 AFAD0014 */ sw $t5, 0x0014($sp) /* 004C8 80B44518 AFAC0010 */ sw $t4, 0x0010($sp) -/* 004CC 80B4451C 24E7B10C */ addiu $a3, $a3, 0xB10C ## $a3 = 0600B10C -/* 004D0 80B44520 24C604B8 */ addiu $a2, $a2, 0x04B8 ## $a2 = 060104B8 +/* 004CC 80B4451C 24E7B10C */ addiu $a3, $a3, %lo(D_0600B10C) ## $a3 = 0600B10C +/* 004D0 80B44520 24C604B8 */ addiu $a2, $a2, %lo(D_060104B8) ## $a2 = 060104B8 /* 004D4 80B44524 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 004D8 80B44528 0C02915F */ jal SkelAnime_Init diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B450AC.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B450AC.s index 148f4651c9..6d98b3cd10 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B450AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B450AC.s @@ -3,16 +3,16 @@ glabel func_80B450AC /* 01060 80B450B0 AFB00028 */ sw $s0, 0x0028($sp) /* 01064 80B450B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01068 80B450B8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0106C 80B450BC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 0106C 80B450BC 3C040601 */ lui $a0, %hi(D_06009530) ## $a0 = 06010000 /* 01070 80B450C0 0C028800 */ jal SkelAnime_GetFrameCount -/* 01074 80B450C4 24849530 */ addiu $a0, $a0, 0x9530 ## $a0 = 06009530 +/* 01074 80B450C4 24849530 */ addiu $a0, $a0, %lo(D_06009530) ## $a0 = 06009530 /* 01078 80B450C8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0107C 80B450CC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01080 80B450D0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 01080 80B450D0 3C050601 */ lui $a1, %hi(D_06009530) ## $a1 = 06010000 /* 01084 80B450D4 468021A0 */ cvt.s.w $f6, $f4 /* 01088 80B450D8 44060000 */ mfc1 $a2, $f0 -/* 0108C 80B450DC 24A59530 */ addiu $a1, $a1, 0x9530 ## $a1 = 06009530 +/* 0108C 80B450DC 24A59530 */ addiu $a1, $a1, %lo(D_06009530) ## $a1 = 06009530 /* 01090 80B450E0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01094 80B450E4 3C074110 */ lui $a3, 0x4110 ## $a3 = 41100000 /* 01098 80B450E8 AFA00014 */ sw $zero, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45174.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45174.s index eee20de911..5c707daa5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45174.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45174.s @@ -75,11 +75,11 @@ glabel func_80B45174 /* 01220 80B45270 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01224 80B45274 3C014188 */ lui $at, 0x4188 ## $at = 41880000 /* 01228 80B45278 44819000 */ mtc1 $at, $f18 ## $f18 = 17.00 -/* 0122C 80B4527C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 0122C 80B4527C 3C050601 */ lui $a1, %hi(D_06008C6C) ## $a1 = 06010000 /* 01230 80B45280 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 01234 80B45284 44070000 */ mfc1 $a3, $f0 /* 01238 80B45288 AFB80014 */ sw $t8, 0x0014($sp) -/* 0123C 80B4528C 24A58C6C */ addiu $a1, $a1, 0x8C6C ## $a1 = 06008C6C +/* 0123C 80B4528C 24A58C6C */ addiu $a1, $a1, %lo(D_06008C6C) ## $a1 = 06008C6C /* 01240 80B45290 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01244 80B45294 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01248 80B45298 E7A00018 */ swc1 $f0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45384.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45384.s index 9a36452afc..f96d0265e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45384.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45384.s @@ -3,18 +3,18 @@ glabel func_80B45384 /* 01338 80B45388 AFB00028 */ sw $s0, 0x0028($sp) /* 0133C 80B4538C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01340 80B45390 AFBF002C */ sw $ra, 0x002C($sp) -/* 01344 80B45394 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 01344 80B45394 3C040601 */ lui $a0, %hi(D_0600B10C) ## $a0 = 06010000 /* 01348 80B45398 0C028800 */ jal SkelAnime_GetFrameCount -/* 0134C 80B4539C 2484B10C */ addiu $a0, $a0, 0xB10C ## $a0 = 0600B10C +/* 0134C 80B4539C 2484B10C */ addiu $a0, $a0, %lo(D_0600B10C) ## $a0 = 0600B10C /* 01350 80B453A0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01354 80B453A4 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 01358 80B453A8 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 0135C 80B453AC 468021A0 */ cvt.s.w $f6, $f4 -/* 01360 80B453B0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 01360 80B453B0 3C050601 */ lui $a1, %hi(D_0600B10C) ## $a1 = 06010000 /* 01364 80B453B4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 01368 80B453B8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0136C 80B453BC 24A5B10C */ addiu $a1, $a1, 0xB10C ## $a1 = 0600B10C +/* 0136C 80B453BC 24A5B10C */ addiu $a1, $a1, %lo(D_0600B10C) ## $a1 = 0600B10C /* 01370 80B453C0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01374 80B453C4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01378 80B453C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s index 736ae60112..80123e8726 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s @@ -4,8 +4,8 @@ glabel func_80B456B4 /* 0166C 80B456BC AFA5002C */ sw $a1, 0x002C($sp) /* 01670 80B456C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01674 80B456C4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01678 80B456C8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0167C 80B456CC 24A58138 */ addiu $a1, $a1, 0x8138 ## $a1 = 06008138 +/* 01678 80B456C8 3C050601 */ lui $a1, %hi(D_06008138) ## $a1 = 06010000 +/* 0167C 80B456CC 24A58138 */ addiu $a1, $a1, %lo(D_06008138) ## $a1 = 06008138 /* 01680 80B456D0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01684 80B456D4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01688 80B456D8 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45E30.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45E30.s index ed8ee9cf0d..b333034d03 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45E30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45E30.s @@ -7,10 +7,10 @@ glabel func_80B45E30 /* 01DF4 80B45E44 AFB00028 */ sw $s0, 0x0028($sp) /* 01DF8 80B45E48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01DFC 80B45E4C AFBF002C */ sw $ra, 0x002C($sp) -/* 01E00 80B45E50 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 01E00 80B45E50 3C050601 */ lui $a1, %hi(D_06009530) ## $a1 = 06010000 /* 01E04 80B45E54 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 01E08 80B45E58 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01E0C 80B45E5C 24A59530 */ addiu $a1, $a1, 0x9530 ## $a1 = 06009530 +/* 01E0C 80B45E5C 24A59530 */ addiu $a1, $a1, %lo(D_06009530) ## $a1 = 06009530 /* 01E10 80B45E60 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01E14 80B45E64 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01E18 80B45E68 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45EF0.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45EF0.s index 1adc038467..b9bc8b7764 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45EF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45EF0.s @@ -28,8 +28,8 @@ glabel func_80B45EF0 /* 01F00 80B45F50 1040001C */ beq $v0, $zero, .L80B45FC4 /* 01F04 80B45F54 8FA40034 */ lw $a0, 0x0034($sp) /* 01F08 80B45F58 8E0F03F0 */ lw $t7, 0x03F0($s0) ## 000003F0 -/* 01F0C 80B45F5C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01F10 80B45F60 24A58C6C */ addiu $a1, $a1, 0x8C6C ## $a1 = 06008C6C +/* 01F0C 80B45F5C 3C050601 */ lui $a1, %hi(D_06008C6C) ## $a1 = 06010000 +/* 01F10 80B45F60 24A58C6C */ addiu $a1, $a1, %lo(D_06008C6C) ## $a1 = 06008C6C /* 01F14 80B45F64 15E00012 */ bne $t7, $zero, .L80B45FB0 /* 01F18 80B45F68 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 01F1C 80B45F6C 3C014188 */ lui $at, 0x4188 ## $at = 41880000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s index c71e478714..f45459f9bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s @@ -2,8 +2,8 @@ glabel func_80B4604C /* 01FFC 80B4604C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 02000 80B46050 AFBF0014 */ sw $ra, 0x0014($sp) /* 02004 80B46054 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 02008 80B46058 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0200C 80B4605C 24A58138 */ addiu $a1, $a1, 0x8138 ## $a1 = 06008138 +/* 02008 80B46058 3C050601 */ lui $a1, %hi(D_06008138) ## $a1 = 06010000 +/* 0200C 80B4605C 24A58138 */ addiu $a1, $a1, %lo(D_06008138) ## $a1 = 06008138 /* 02010 80B46060 AFA70018 */ sw $a3, 0x0018($sp) /* 02014 80B46064 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 02018 80B46068 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s index c3bc43b3af..22fa89f9a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s @@ -25,8 +25,8 @@ glabel func_80B462E4 /* 022F0 80B46340 10400021 */ beq $v0, $zero, .L80B463C8 /* 022F4 80B46344 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B46348: -/* 022F8 80B46348 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 022FC 80B4634C 24A56388 */ addiu $a1, $a1, 0x6388 ## $a1 = 06016388 +/* 022F8 80B46348 3C050601 */ lui $a1, %hi(D_06016388) ## $a1 = 06010000 +/* 022FC 80B4634C 24A56388 */ addiu $a1, $a1, %lo(D_06016388) ## $a1 = 06016388 /* 02300 80B46350 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 02304 80B46354 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02308 80B46358 3C014140 */ lui $at, 0x4140 ## $at = 41400000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46A24.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46A24.s index c0c331f3a2..c9081d2725 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46A24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46A24.s @@ -3,18 +3,18 @@ glabel func_80B46A24 /* 029D8 80B46A28 AFB00028 */ sw $s0, 0x0028($sp) /* 029DC 80B46A2C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 029E0 80B46A30 AFBF002C */ sw $ra, 0x002C($sp) -/* 029E4 80B46A34 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 029E4 80B46A34 3C040601 */ lui $a0, %hi(D_0600A3D4) ## $a0 = 06010000 /* 029E8 80B46A38 0C028800 */ jal SkelAnime_GetFrameCount -/* 029EC 80B46A3C 2484A3D4 */ addiu $a0, $a0, 0xA3D4 ## $a0 = 0600A3D4 +/* 029EC 80B46A3C 2484A3D4 */ addiu $a0, $a0, %lo(D_0600A3D4) ## $a0 = 0600A3D4 /* 029F0 80B46A40 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 029F4 80B46A44 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 029F8 80B46A48 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 029FC 80B46A4C 468021A0 */ cvt.s.w $f6, $f4 -/* 02A00 80B46A50 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 02A00 80B46A50 3C050601 */ lui $a1, %hi(D_0600A3D4) ## $a1 = 06010000 /* 02A04 80B46A54 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 02A08 80B46A58 AFAE0014 */ sw $t6, 0x0014($sp) -/* 02A0C 80B46A5C 24A5A3D4 */ addiu $a1, $a1, 0xA3D4 ## $a1 = 0600A3D4 +/* 02A0C 80B46A5C 24A5A3D4 */ addiu $a1, $a1, %lo(D_0600A3D4) ## $a1 = 0600A3D4 /* 02A10 80B46A60 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02A14 80B46A64 E7A60010 */ swc1 $f6, 0x0010($sp) /* 02A18 80B46A68 3C063FA0 */ lui $a2, 0x3FA0 ## $a2 = 3FA00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46D64.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46D64.s index a36bbe2624..9ddd91386e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46D64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46D64.s @@ -6,11 +6,11 @@ glabel func_80B46D64 /* 02D24 80B46D74 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 /* 02D28 80B46D78 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 /* 02D2C 80B46D7C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 02D30 80B46D80 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 02D30 80B46D80 3C050601 */ lui $a1, %hi(D_0600A3D4) ## $a1 = 06010000 /* 02D34 80B46D84 46062001 */ sub.s $f0, $f4, $f6 /* 02D38 80B46D88 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 02D3C 80B46D8C AFAF0014 */ sw $t7, 0x0014($sp) -/* 02D40 80B46D90 24A5A3D4 */ addiu $a1, $a1, 0xA3D4 ## $a1 = 0600A3D4 +/* 02D40 80B46D90 24A5A3D4 */ addiu $a1, $a1, %lo(D_0600A3D4) ## $a1 = 0600A3D4 /* 02D44 80B46D94 44070000 */ mfc1 $a3, $f0 /* 02D48 80B46D98 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 02D4C 80B46D9C 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46E8C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46E8C.s index e428ba887d..0e53b3b7c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46E8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46E8C.s @@ -6,10 +6,10 @@ glabel func_80B46E8C /* 02E4C 80B46E9C AFB00028 */ sw $s0, 0x0028($sp) /* 02E50 80B46EA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02E54 80B46EA4 AFBF002C */ sw $ra, 0x002C($sp) -/* 02E58 80B46EA8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 02E58 80B46EA8 3C050601 */ lui $a1, %hi(D_06009530) ## $a1 = 06010000 /* 02E5C 80B46EAC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 02E60 80B46EB0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 02E64 80B46EB4 24A59530 */ addiu $a1, $a1, 0x9530 ## $a1 = 06009530 +/* 02E64 80B46EB4 24A59530 */ addiu $a1, $a1, %lo(D_06009530) ## $a1 = 06009530 /* 02E68 80B46EB8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 02E6C 80B46EBC 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 02E70 80B46EC0 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46F2C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46F2C.s index f513ca5a24..3dd237f241 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46F2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46F2C.s @@ -35,10 +35,10 @@ glabel func_80B46F2C /* 02F58 80B46FA8 44815000 */ mtc1 $at, $f10 ## $f10 = 17.00 /* 02F5C 80B46FAC 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 02F60 80B46FB0 44818000 */ mtc1 $at, $f16 ## $f16 = -3.00 -/* 02F64 80B46FB4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 02F64 80B46FB4 3C050601 */ lui $a1, %hi(D_06008C6C) ## $a1 = 06010000 /* 02F68 80B46FB8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 02F6C 80B46FBC AFB80014 */ sw $t8, 0x0014($sp) -/* 02F70 80B46FC0 24A58C6C */ addiu $a1, $a1, 0x8C6C ## $a1 = 06008C6C +/* 02F70 80B46FC0 24A58C6C */ addiu $a1, $a1, %lo(D_06008C6C) ## $a1 = 06008C6C /* 02F74 80B46FC4 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 02F78 80B46FC8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 02F7C 80B46FCC E7AA0010 */ swc1 $f10, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47050.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47050.s index 70a829d8b6..8f0b6e4d2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47050.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47050.s @@ -6,7 +6,7 @@ glabel func_80B47050 /* 03010 80B47060 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 03014 80B47064 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 /* 03018 80B47068 11E00011 */ beq $t7, $zero, .L80B470B0 -/* 0301C 80B4706C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 0301C 80B4706C 3C050601 */ lui $a1, %hi(D_060157F8) ## $a1 = 06010000 /* 03020 80B47070 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 03024 80B47074 C4800060 */ lwc1 $f0, 0x0060($a0) ## 00000060 /* 03028 80B47078 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 @@ -33,7 +33,7 @@ glabel func_80B47050 /* 0306C 80B470BC 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 03070 80B470C0 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C /* 03074 80B470C4 17210004 */ bne $t9, $at, .L80B470D8 -/* 03078 80B470C8 24A557F8 */ addiu $a1, $a1, 0x57F8 ## $a1 = 060157F8 +/* 03078 80B470C8 24A557F8 */ addiu $a1, $a1, %lo(D_060157F8) ## $a1 = 060157F8 /* 0307C 80B470CC 24080024 */ addiu $t0, $zero, 0x0024 ## $t0 = 00000024 /* 03080 80B470D0 10000005 */ beq $zero, $zero, .L80B470E8 /* 03084 80B470D4 A4E803F6 */ sh $t0, 0x03F6($a3) ## 000003F6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47360.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47360.s index 9516ca2b06..fa4e3e93ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47360.s @@ -4,9 +4,9 @@ glabel func_80B47360 /* 03318 80B47368 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0331C 80B4736C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 03320 80B47370 AFBF002C */ sw $ra, 0x002C($sp) -/* 03324 80B47374 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 03324 80B47374 3C040601 */ lui $a0, %hi(D_060119F4) ## $a0 = 06010000 /* 03328 80B47378 AFA50044 */ sw $a1, 0x0044($sp) -/* 0332C 80B4737C 248419F4 */ addiu $a0, $a0, 0x19F4 ## $a0 = 060119F4 +/* 0332C 80B4737C 248419F4 */ addiu $a0, $a0, %lo(D_060119F4) ## $a0 = 060119F4 /* 03330 80B47380 0C028800 */ jal SkelAnime_GetFrameCount /* 03334 80B47384 E7A0003C */ swc1 $f0, 0x003C($sp) @@ -20,10 +20,10 @@ glabel func_80B47360 /* 03354 80B473A4 44810000 */ mtc1 $at, $f0 ## $f0 = -4.00 /* 03358 80B473A8 00000000 */ nop .L80B473AC: -/* 0335C 80B473AC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 0335C 80B473AC 3C050601 */ lui $a1, %hi(D_060119F4) ## $a1 = 06010000 /* 03360 80B473B0 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 03364 80B473B4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 03368 80B473B8 24A519F4 */ addiu $a1, $a1, 0x19F4 ## $a1 = 060119F4 +/* 03368 80B473B8 24A519F4 */ addiu $a1, $a1, %lo(D_060119F4) ## $a1 = 060119F4 /* 0336C 80B473BC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 03370 80B473C0 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 03374 80B473C4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47C64.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47C64.s index b287f9b979..c5a5083f46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47C64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47C64.s @@ -4,8 +4,8 @@ glabel func_80B47C64 /* 03C1C 80B47C6C AFA5002C */ sw $a1, 0x002C($sp) /* 03C20 80B47C70 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 03C24 80B47C74 AFBF001C */ sw $ra, 0x001C($sp) -/* 03C28 80B47C78 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 03C2C 80B47C7C 24A5366C */ addiu $a1, $a1, 0x366C ## $a1 = 0601366C +/* 03C28 80B47C78 3C050601 */ lui $a1, %hi(D_0601366C) ## $a1 = 06010000 +/* 03C2C 80B47C7C 24A5366C */ addiu $a1, $a1, %lo(D_0601366C) ## $a1 = 0601366C /* 03C30 80B47C80 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 03C34 80B47C84 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 03C38 80B47C88 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47DA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47DA8.s index 2d8ebda34f..3d1b8e7e4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47DA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47DA8.s @@ -3,18 +3,18 @@ glabel func_80B47DA8 /* 03D5C 80B47DAC AFB00028 */ sw $s0, 0x0028($sp) /* 03D60 80B47DB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 03D64 80B47DB4 AFBF002C */ sw $ra, 0x002C($sp) -/* 03D68 80B47DB8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 03D68 80B47DB8 3C040601 */ lui $a0, %hi(D_060157F8) ## $a0 = 06010000 /* 03D6C 80B47DBC 0C028800 */ jal SkelAnime_GetFrameCount -/* 03D70 80B47DC0 248457F8 */ addiu $a0, $a0, 0x57F8 ## $a0 = 060157F8 +/* 03D70 80B47DC0 248457F8 */ addiu $a0, $a0, %lo(D_060157F8) ## $a0 = 060157F8 /* 03D74 80B47DC4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03D78 80B47DC8 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 03D7C 80B47DCC 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 03D80 80B47DD0 468021A0 */ cvt.s.w $f6, $f4 -/* 03D84 80B47DD4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 03D84 80B47DD4 3C050601 */ lui $a1, %hi(D_060157F8) ## $a1 = 06010000 /* 03D88 80B47DD8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 03D8C 80B47DDC AFAE0014 */ sw $t6, 0x0014($sp) -/* 03D90 80B47DE0 24A557F8 */ addiu $a1, $a1, 0x57F8 ## $a1 = 060157F8 +/* 03D90 80B47DE0 24A557F8 */ addiu $a1, $a1, %lo(D_060157F8) ## $a1 = 060157F8 /* 03D94 80B47DE4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 03D98 80B47DE8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 03D9C 80B47DEC 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48210.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48210.s index 2f614c7f5c..8b7ae9a2cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48210.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48210.s @@ -6,11 +6,11 @@ glabel func_80B48210 /* 041D0 80B48220 AFB00028 */ sw $s0, 0x0028($sp) /* 041D4 80B48224 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 041D8 80B48228 AFBF002C */ sw $ra, 0x002C($sp) -/* 041DC 80B4822C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 041DC 80B4822C 3C050601 */ lui $a1, %hi(D_06009530) ## $a1 = 06010000 /* 041E0 80B48230 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 041E4 80B48234 44070000 */ mfc1 $a3, $f0 /* 041E8 80B48238 AFAE0014 */ sw $t6, 0x0014($sp) -/* 041EC 80B4823C 24A59530 */ addiu $a1, $a1, 0x9530 ## $a1 = 06009530 +/* 041EC 80B4823C 24A59530 */ addiu $a1, $a1, %lo(D_06009530) ## $a1 = 06009530 /* 041F0 80B48240 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 041F4 80B48244 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 041F8 80B48248 E7A00018 */ swc1 $f0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B482B8.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B482B8.s index 04ed89f060..c6cdbd2164 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B482B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B482B8.s @@ -33,8 +33,8 @@ glabel func_80B482B8 /* 042D8 80B48328 10400029 */ beq $v0, $zero, .L80B483D0 /* 042DC 80B4832C 8FA40030 */ lw $a0, 0x0030($sp) /* 042E0 80B48330 8E0F03F0 */ lw $t7, 0x03F0($s0) ## 000003F0 -/* 042E4 80B48334 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 042E8 80B48338 24A5A3D4 */ addiu $a1, $a1, 0xA3D4 ## $a1 = 0600A3D4 +/* 042E4 80B48334 3C050601 */ lui $a1, %hi(D_0600A3D4) ## $a1 = 06010000 +/* 042E8 80B48338 24A5A3D4 */ addiu $a1, $a1, %lo(D_0600A3D4) ## $a1 = 0600A3D4 /* 042EC 80B4833C 15E0000F */ bne $t7, $zero, .L80B4837C /* 042F0 80B48340 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 042F4 80B48344 3C014150 */ lui $at, 0x4150 ## $at = 41500000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s index 28b32de079..aa88566c09 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s @@ -25,8 +25,8 @@ glabel func_80B483E4 /* 043F0 80B48440 10400046 */ beq $v0, $zero, .L80B4855C /* 043F4 80B48444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B48448: -/* 043F8 80B48448 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 043FC 80B4844C 24A56388 */ addiu $a1, $a1, 0x6388 ## $a1 = 06016388 +/* 043F8 80B48448 3C050601 */ lui $a1, %hi(D_06016388) ## $a1 = 06010000 +/* 043FC 80B4844C 24A56388 */ addiu $a1, $a1, %lo(D_06016388) ## $a1 = 06016388 /* 04400 80B48450 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 04404 80B48454 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 04408 80B48458 8FAF0034 */ lw $t7, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48CEC.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48CEC.s index 3caa1453d0..c77e1ce1fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48CEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48CEC.s @@ -3,18 +3,18 @@ glabel func_80B48CEC /* 04CA0 80B48CF0 AFB00028 */ sw $s0, 0x0028($sp) /* 04CA4 80B48CF4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 04CA8 80B48CF8 AFBF002C */ sw $ra, 0x002C($sp) -/* 04CAC 80B48CFC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 04CAC 80B48CFC 3C040601 */ lui $a0, %hi(D_06014E60) ## $a0 = 06010000 /* 04CB0 80B48D00 0C028800 */ jal SkelAnime_GetFrameCount -/* 04CB4 80B48D04 24844E60 */ addiu $a0, $a0, 0x4E60 ## $a0 = 06014E60 +/* 04CB4 80B48D04 24844E60 */ addiu $a0, $a0, %lo(D_06014E60) ## $a0 = 06014E60 /* 04CB8 80B48D08 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04CBC 80B48D0C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 04CC0 80B48D10 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 04CC4 80B48D14 468021A0 */ cvt.s.w $f6, $f4 -/* 04CC8 80B48D18 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 +/* 04CC8 80B48D18 3C050601 */ lui $a1, %hi(D_06014E60) ## $a1 = 06010000 /* 04CCC 80B48D1C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 04CD0 80B48D20 AFAE0014 */ sw $t6, 0x0014($sp) -/* 04CD4 80B48D24 24A54E60 */ addiu $a1, $a1, 0x4E60 ## $a1 = 06014E60 +/* 04CD4 80B48D24 24A54E60 */ addiu $a1, $a1, %lo(D_06014E60) ## $a1 = 06014E60 /* 04CD8 80B48D28 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 04CDC 80B48D2C E7A60010 */ swc1 $f6, 0x0010($sp) /* 04CE0 80B48D30 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B495FC.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B495FC.s index 83d0bf5276..8f3f6c553d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B495FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B495FC.s @@ -22,16 +22,16 @@ glabel func_80B495FC /* 055F8 80B49648 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80B4964C: /* 055FC 80B4964C 850903FA */ lh $t1, 0x03FA($t0) ## 000003FA -/* 05600 80B49650 3C0A0601 */ lui $t2, 0x0601 ## $t2 = 06010000 -/* 05604 80B49654 254AE198 */ addiu $t2, $t2, 0xE198 ## $t2 = 0600E198 +/* 05600 80B49650 3C0A0601 */ lui $t2, %hi(D_0600E198) ## $t2 = 06010000 +/* 05604 80B49654 254AE198 */ addiu $t2, $t2, %lo(D_0600E198) ## $t2 = 0600E198 /* 05608 80B49658 11200009 */ beq $t1, $zero, .L80B49680 /* 0560C 80B4965C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 05610 80B49660 03E00008 */ jr $ra /* 05614 80B49664 ACCA0000 */ sw $t2, 0x0000($a2) ## 00000000 .L80B49668: /* 05618 80B49668 856C03FA */ lh $t4, 0x03FA($t3) ## 000003FA -/* 0561C 80B4966C 3C0D0601 */ lui $t5, 0x0601 ## $t5 = 06010000 -/* 05620 80B49670 25AD0060 */ addiu $t5, $t5, 0x0060 ## $t5 = 06010060 +/* 0561C 80B4966C 3C0D0601 */ lui $t5, %hi(D_06010060) ## $t5 = 06010000 +/* 05620 80B49670 25AD0060 */ addiu $t5, $t5, %lo(D_06010060) ## $t5 = 06010060 /* 05624 80B49674 11800002 */ beq $t4, $zero, .L80B49680 /* 05628 80B49678 00000000 */ nop /* 0562C 80B4967C ACCD0000 */ sw $t5, 0x0000($a2) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s index 66fa71bd50..4bd0a3afed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s @@ -3,8 +3,8 @@ glabel func_80B49B60 /* 05B14 80B49B64 AFA5001C */ sw $a1, 0x001C($sp) /* 05B18 80B49B68 AFBF0014 */ sw $ra, 0x0014($sp) /* 05B1C 80B49B6C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 05B20 80B49B70 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 05B24 80B49B74 24A56388 */ addiu $a1, $a1, 0x6388 ## $a1 = 06016388 +/* 05B20 80B49B70 3C050601 */ lui $a1, %hi(D_06016388) ## $a1 = 06010000 +/* 05B24 80B49B74 24A56388 */ addiu $a1, $a1, %lo(D_06016388) ## $a1 = 06016388 /* 05B28 80B49B78 AFA70018 */ sw $a3, 0x0018($sp) /* 05B2C 80B49B7C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 05B30 80B49B80 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat 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 d9718f9a88..7875223ca8 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 @@ -9,10 +9,10 @@ glabel EnZl4_Init /* 00618 80B5BDC8 260E0218 */ addiu $t6, $s0, 0x0218 ## $t6 = 00000218 /* 0061C 80B5BDCC 260F0284 */ addiu $t7, $s0, 0x0284 ## $t7 = 00000284 /* 00620 80B5BDD0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00624 80B5BDD4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 +/* 00624 80B5BDD4 3C060601 */ lui $a2, %hi(D_0600E038) ## $a2 = 06010000 /* 00628 80B5BDD8 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 /* 0062C 80B5BDDC AFB80018 */ sw $t8, 0x0018($sp) -/* 00630 80B5BDE0 24C6E038 */ addiu $a2, $a2, 0xE038 ## $a2 = 0600E038 +/* 00630 80B5BDE0 24C6E038 */ addiu $a2, $a2, %lo(D_0600E038) ## $a2 = 0600E038 /* 00634 80B5BDE4 02202825 */ or $a1, $s1, $zero ## $a1 = 0000014C /* 00638 80B5BDE8 AFAF0014 */ sw $t7, 0x0014($sp) /* 0063C 80B5BDEC AFAE0010 */ sw $t6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BCDC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BCDC.s index 1335a01903..d7f37ce8b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BCDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BCDC.s @@ -1,49 +1,49 @@ glabel func_80B5BCDC /* 0052C 80B5BCDC 8C820154 */ lw $v0, 0x0154($a0) ## 00000154 -/* 00530 80B5BCE0 3C0E0602 */ lui $t6, 0x0602 ## $t6 = 06020000 -/* 00534 80B5BCE4 25CEB874 */ addiu $t6, $t6, 0xB874 ## $t6 = 0601B874 +/* 00530 80B5BCE0 3C0E0602 */ lui $t6, %hi(D_0601B874) ## $t6 = 06020000 +/* 00534 80B5BCE4 25CEB874 */ addiu $t6, $t6, %lo(D_0601B874) ## $t6 = 0601B874 /* 00538 80B5BCE8 11C2002B */ beq $t6, $v0, .L80B5BD98 -/* 0053C 80B5BCEC 3C0F0602 */ lui $t7, 0x0602 ## $t7 = 06020000 -/* 00540 80B5BCF0 25EFBCF0 */ addiu $t7, $t7, 0xBCF0 ## $t7 = 0601BCF0 +/* 0053C 80B5BCEC 3C0F0602 */ lui $t7, %hi(D_0601BCF0) ## $t7 = 06020000 +/* 00540 80B5BCF0 25EFBCF0 */ addiu $t7, $t7, %lo(D_0601BCF0) ## $t7 = 0601BCF0 /* 00544 80B5BCF4 11E20028 */ beq $t7, $v0, .L80B5BD98 -/* 00548 80B5BCF8 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 -/* 0054C 80B5BCFC 271825E4 */ addiu $t8, $t8, 0x25E4 ## $t8 = 060125E4 +/* 00548 80B5BCF8 3C180601 */ lui $t8, %hi(D_060125E4) ## $t8 = 06010000 +/* 0054C 80B5BCFC 271825E4 */ addiu $t8, $t8, %lo(D_060125E4) ## $t8 = 060125E4 /* 00550 80B5BD00 13020025 */ beq $t8, $v0, .L80B5BD98 -/* 00554 80B5BD04 3C190601 */ lui $t9, 0x0601 ## $t9 = 06010000 -/* 00558 80B5BD08 27392E58 */ addiu $t9, $t9, 0x2E58 ## $t9 = 06012E58 +/* 00554 80B5BD04 3C190601 */ lui $t9, %hi(D_06012E58) ## $t9 = 06010000 +/* 00558 80B5BD08 27392E58 */ addiu $t9, $t9, %lo(D_06012E58) ## $t9 = 06012E58 /* 0055C 80B5BD0C 13220022 */ beq $t9, $v0, .L80B5BD98 -/* 00560 80B5BD10 3C080601 */ lui $t0, 0x0601 ## $t0 = 06010000 -/* 00564 80B5BD14 25085F14 */ addiu $t0, $t0, 0x5F14 ## $t0 = 06015F14 +/* 00560 80B5BD10 3C080601 */ lui $t0, %hi(D_06015F14) ## $t0 = 06010000 +/* 00564 80B5BD14 25085F14 */ addiu $t0, $t0, %lo(D_06015F14) ## $t0 = 06015F14 /* 00568 80B5BD18 1102001F */ beq $t0, $v0, .L80B5BD98 -/* 0056C 80B5BD1C 3C090601 */ lui $t1, 0x0601 ## $t1 = 06010000 -/* 00570 80B5BD20 252969B4 */ addiu $t1, $t1, 0x69B4 ## $t1 = 060169B4 +/* 0056C 80B5BD1C 3C090601 */ lui $t1, %hi(D_060169B4) ## $t1 = 06010000 +/* 00570 80B5BD20 252969B4 */ addiu $t1, $t1, %lo(D_060169B4) ## $t1 = 060169B4 /* 00574 80B5BD24 1122001C */ beq $t1, $v0, .L80B5BD98 -/* 00578 80B5BD28 3C0A0601 */ lui $t2, 0x0601 ## $t2 = 06010000 -/* 0057C 80B5BD2C 254A6D08 */ addiu $t2, $t2, 0x6D08 ## $t2 = 06016D08 +/* 00578 80B5BD28 3C0A0601 */ lui $t2, %hi(D_06016D08) ## $t2 = 06010000 +/* 0057C 80B5BD2C 254A6D08 */ addiu $t2, $t2, %lo(D_06016D08) ## $t2 = 06016D08 /* 00580 80B5BD30 11420019 */ beq $t2, $v0, .L80B5BD98 -/* 00584 80B5BD34 3C0B0602 */ lui $t3, 0x0602 ## $t3 = 06020000 -/* 00588 80B5BD38 256B805C */ addiu $t3, $t3, 0x805C ## $t3 = 0601805C +/* 00584 80B5BD34 3C0B0602 */ lui $t3, %hi(D_0601805C) ## $t3 = 06020000 +/* 00588 80B5BD38 256B805C */ addiu $t3, $t3, %lo(D_0601805C) ## $t3 = 0601805C /* 0058C 80B5BD3C 11620016 */ beq $t3, $v0, .L80B5BD98 -/* 00590 80B5BD40 3C0C0602 */ lui $t4, 0x0602 ## $t4 = 06020000 -/* 00594 80B5BD44 258CA2FC */ addiu $t4, $t4, 0xA2FC ## $t4 = 0601A2FC +/* 00590 80B5BD40 3C0C0602 */ lui $t4, %hi(D_0601A2FC) ## $t4 = 06020000 +/* 00594 80B5BD44 258CA2FC */ addiu $t4, $t4, %lo(D_0601A2FC) ## $t4 = 0601A2FC /* 00598 80B5BD48 11820013 */ beq $t4, $v0, .L80B5BD98 -/* 0059C 80B5BD4C 3C0D0602 */ lui $t5, 0x0602 ## $t5 = 06020000 -/* 005A0 80B5BD50 25ADAAE0 */ addiu $t5, $t5, 0xAAE0 ## $t5 = 0601AAE0 +/* 0059C 80B5BD4C 3C0D0602 */ lui $t5, %hi(D_0601AAE0) ## $t5 = 06020000 +/* 005A0 80B5BD50 25ADAAE0 */ addiu $t5, $t5, %lo(D_0601AAE0) ## $t5 = 0601AAE0 /* 005A4 80B5BD54 11A20010 */ beq $t5, $v0, .L80B5BD98 -/* 005A8 80B5BD58 3C0E0602 */ lui $t6, 0x0602 ## $t6 = 06020000 -/* 005AC 80B5BD5C 25CECE08 */ addiu $t6, $t6, 0xCE08 ## $t6 = 0601CE08 +/* 005A8 80B5BD58 3C0E0602 */ lui $t6, %hi(D_0601CE08) ## $t6 = 06020000 +/* 005AC 80B5BD5C 25CECE08 */ addiu $t6, $t6, %lo(D_0601CE08) ## $t6 = 0601CE08 /* 005B0 80B5BD60 11C2000D */ beq $t6, $v0, .L80B5BD98 -/* 005B4 80B5BD64 3C0F0602 */ lui $t7, 0x0602 ## $t7 = 06020000 -/* 005B8 80B5BD68 25EF8898 */ addiu $t7, $t7, 0x8898 ## $t7 = 06018898 +/* 005B4 80B5BD64 3C0F0602 */ lui $t7, %hi(D_06018898) ## $t7 = 06020000 +/* 005B8 80B5BD68 25EF8898 */ addiu $t7, $t7, %lo(D_06018898) ## $t7 = 06018898 /* 005BC 80B5BD6C 11E2000A */ beq $t7, $v0, .L80B5BD98 -/* 005C0 80B5BD70 3C180602 */ lui $t8, 0x0602 ## $t8 = 06020000 -/* 005C4 80B5BD74 2718910C */ addiu $t8, $t8, 0x910C ## $t8 = 0601910C +/* 005C0 80B5BD70 3C180602 */ lui $t8, %hi(D_0601910C) ## $t8 = 06020000 +/* 005C4 80B5BD74 2718910C */ addiu $t8, $t8, %lo(D_0601910C) ## $t8 = 0601910C /* 005C8 80B5BD78 13020007 */ beq $t8, $v0, .L80B5BD98 -/* 005CC 80B5BD7C 3C190601 */ lui $t9, 0x0601 ## $t9 = 06010000 -/* 005D0 80B5BD80 2739F0A4 */ addiu $t9, $t9, 0xF0A4 ## $t9 = 0600F0A4 +/* 005CC 80B5BD7C 3C190601 */ lui $t9, %hi(D_0600F0A4) ## $t9 = 06010000 +/* 005D0 80B5BD80 2739F0A4 */ addiu $t9, $t9, %lo(D_0600F0A4) ## $t9 = 0600F0A4 /* 005D4 80B5BD84 13220004 */ beq $t9, $v0, .L80B5BD98 -/* 005D8 80B5BD88 3C080601 */ lui $t0, 0x0601 ## $t0 = 06010000 -/* 005DC 80B5BD8C 2508F894 */ addiu $t0, $t0, 0xF894 ## $t0 = 0600F894 +/* 005D8 80B5BD88 3C080601 */ lui $t0, %hi(D_0600F894) ## $t0 = 06010000 +/* 005DC 80B5BD8C 2508F894 */ addiu $t0, $t0, %lo(D_0600F894) ## $t0 = 0600F894 /* 005E0 80B5BD90 55020004 */ bnel $t0, $v0, .L80B5BDA4 /* 005E4 80B5BD94 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80B5BD98: 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 8da9aea39b..11ab62eddb 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 @@ -87,8 +87,8 @@ glabel L80B5C254 /* 00ABC 80B5C26C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00AC0 80B5C270 1040001D */ beq $v0, $zero, .L80B5C2E8 /* 00AC4 80B5C274 3C0C8016 */ lui $t4, %hi(gSegments) -/* 00AC8 80B5C278 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 00ACC 80B5C27C 24423994 */ addiu $v0, $v0, 0x3994 ## $v0 = 02003994 +/* 00AC8 80B5C278 3C020200 */ lui $v0, %hi(D_02003994) ## $v0 = 02000000 +/* 00ACC 80B5C27C 24423994 */ addiu $v0, $v0, %lo(D_02003994) ## $v0 = 02003994 /* 00AD0 80B5C280 00024900 */ sll $t1, $v0, 4 /* 00AD4 80B5C284 00095702 */ srl $t2, $t1, 28 /* 00AD8 80B5C288 000A5880 */ sll $t3, $t2, 2 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 f4e8f60674..dff341b0c3 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 @@ -21,8 +21,8 @@ glabel func_80B5D3CC /* 01C64 80B5D414 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01C68 80B5D418 0C2D6E22 */ jal func_80B5B888 /* 01C6C 80B5D41C 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 01C70 80B5D420 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 01C74 80B5D424 24420444 */ addiu $v0, $v0, 0x0444 ## $v0 = 02000444 +/* 01C70 80B5D420 3C020200 */ lui $v0, %hi(D_02000444) ## $v0 = 02000000 +/* 01C74 80B5D424 24420444 */ addiu $v0, $v0, %lo(D_02000444) ## $v0 = 02000444 /* 01C78 80B5D428 00027100 */ sll $t6, $v0, 4 /* 01C7C 80B5D42C 000E7F02 */ srl $t7, $t6, 28 /* 01C80 80B5D430 000FC080 */ sll $t8, $t7, 2 @@ -46,8 +46,8 @@ glabel func_80B5D3CC /* 01CC8 80B5D478 31A600FF */ andi $a2, $t5, 0x00FF ## $a2 = 00000001 .L80B5D47C: /* 01CCC 80B5D47C 920E1D6C */ lbu $t6, 0x1D6C($s0) ## 00001D6C -/* 01CD0 80B5D480 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 01CD4 80B5D484 24420104 */ addiu $v0, $v0, 0x0104 ## $v0 = 02000104 +/* 01CD0 80B5D480 3C020200 */ lui $v0, %hi(D_02000104) ## $v0 = 02000000 +/* 01CD4 80B5D484 24420104 */ addiu $v0, $v0, %lo(D_02000104) ## $v0 = 02000104 /* 01CD8 80B5D488 11C00009 */ beq $t6, $zero, .L80B5D4B0 /* 01CDC 80B5D48C 0002C900 */ sll $t9, $v0, 4 /* 01CE0 80B5D490 960F1D74 */ lhu $t7, 0x1D74($s0) ## 00001D74 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E108.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E108.s index 9f6ece6abc..681ed276c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E108.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5E108.s @@ -27,8 +27,8 @@ glabel func_80B5E108 /* 029B4 80B5E164 1040000A */ beq $v0, $zero, .L80B5E190 /* 029B8 80B5E168 00000000 */ nop /* 029BC 80B5E16C 8E0A0154 */ lw $t2, 0x0154($s0) ## 00000154 -/* 029C0 80B5E170 3C090601 */ lui $t1, 0x0601 ## $t1 = 06010000 -/* 029C4 80B5E174 25290DF8 */ addiu $t1, $t1, 0x0DF8 ## $t1 = 06010DF8 +/* 029C0 80B5E170 3C090601 */ lui $t1, %hi(D_06010DF8) ## $t1 = 06010000 +/* 029C4 80B5E174 25290DF8 */ addiu $t1, $t1, %lo(D_06010DF8) ## $t1 = 06010DF8 /* 029C8 80B5E178 152A0005 */ bne $t1, $t2, .L80B5E190 /* 029CC 80B5E17C 8FA40028 */ lw $a0, 0x0028($sp) /* 029D0 80B5E180 3C0580B6 */ lui $a1, %hi(D_80B5E7B8) ## $a1 = 80B60000 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 cf25429c7b..8833adc0a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s @@ -89,18 +89,18 @@ glabel Fishing_Init /* 00C84 80B6A624 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 00C88 80B6A628 A649001C */ sh $t1, 0x001C($s2) ## 0000001C /* 00C8C 80B6A62C 265001D8 */ addiu $s0, $s2, 0x01D8 ## $s0 = 000001D8 -/* 00C90 80B6A630 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 00C94 80B6A634 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00C98 80B6A638 24E7453C */ addiu $a3, $a3, 0x453C ## $a3 = 0600453C -/* 00C9C 80B6A63C 24C685F8 */ addiu $a2, $a2, 0x85F8 ## $a2 = 060085F8 +/* 00C90 80B6A630 3C060601 */ lui $a2, %hi(D_060085F8) ## $a2 = 06010000 +/* 00C94 80B6A634 3C070600 */ lui $a3, %hi(D_0600453C) ## $a3 = 06000000 +/* 00C98 80B6A638 24E7453C */ addiu $a3, $a3, %lo(D_0600453C) ## $a3 = 0600453C +/* 00C9C 80B6A63C 24C685F8 */ addiu $a2, $a2, %lo(D_060085F8) ## $a2 = 060085F8 /* 00CA0 80B6A640 02002825 */ or $a1, $s0, $zero ## $a1 = 000001D8 /* 00CA4 80B6A644 AFA00018 */ sw $zero, 0x0018($sp) /* 00CA8 80B6A648 AFA00014 */ sw $zero, 0x0014($sp) /* 00CAC 80B6A64C AFA00010 */ sw $zero, 0x0010($sp) /* 00CB0 80B6A650 0C0291BE */ jal SkelAnime_InitFlex /* 00CB4 80B6A654 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00CB8 80B6A658 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00CBC 80B6A65C 24A5453C */ addiu $a1, $a1, 0x453C ## $a1 = 0600453C +/* 00CB8 80B6A658 3C050600 */ lui $a1, %hi(D_0600453C) ## $a1 = 06000000 +/* 00CBC 80B6A65C 24A5453C */ addiu $a1, $a1, %lo(D_0600453C) ## $a1 = 0600453C /* 00CC0 80B6A660 02002025 */ or $a0, $s0, $zero ## $a0 = 000001D8 /* 00CC4 80B6A664 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00CC8 80B6A668 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 @@ -535,15 +535,15 @@ glabel Fishing_Init .L80B6AC7C: /* 012DC 80B6AC7C 28410073 */ slti $at, $v0, 0x0073 /* 012E0 80B6AC80 14200004 */ bne $at, $zero, .L80B6AC94 -/* 012E4 80B6AC84 3C110600 */ lui $s1, 0x0600 ## $s1 = 06000000 +/* 012E4 80B6AC84 3C110600 */ lui $s1, %hi(D_0600007C) ## $s1 = 06000000 /* 012E8 80B6AC88 240100C8 */ addiu $at, $zero, 0x00C8 ## $at = 000000C8 /* 012EC 80B6AC8C 14410012 */ bne $v0, $at, .L80B6ACD8 /* 012F0 80B6AC90 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 .L80B6AC94: -/* 012F4 80B6AC94 2631007C */ addiu $s1, $s1, 0x007C ## $s1 = 0600007C +/* 012F4 80B6AC94 2631007C */ addiu $s1, $s1, %lo(D_0600007C) ## $s1 = 0600007C /* 012F8 80B6AC98 265001D8 */ addiu $s0, $s2, 0x01D8 ## $s0 = 000001D8 -/* 012FC 80B6AC9C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 01300 80B6ACA0 24C629C0 */ addiu $a2, $a2, 0x29C0 ## $a2 = 060029C0 +/* 012FC 80B6AC9C 3C060600 */ lui $a2, %hi(D_060029C0) ## $a2 = 06000000 +/* 01300 80B6ACA0 24C629C0 */ addiu $a2, $a2, %lo(D_060029C0) ## $a2 = 060029C0 /* 01304 80B6ACA4 02002825 */ or $a1, $s0, $zero ## $a1 = 000001D8 /* 01308 80B6ACA8 02203825 */ or $a3, $s1, $zero ## $a3 = 0600007C /* 0130C 80B6ACAC 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 @@ -558,11 +558,11 @@ glabel Fishing_Init /* 01330 80B6ACD0 10000010 */ beq $zero, $zero, .L80B6AD14 /* 01334 80B6ACD4 00000000 */ nop .L80B6ACD8: -/* 01338 80B6ACD8 3C110601 */ lui $s1, 0x0601 ## $s1 = 06010000 -/* 0133C 80B6ACDC 2631CFE0 */ addiu $s1, $s1, 0xCFE0 ## $s1 = 0600CFE0 +/* 01338 80B6ACD8 3C110601 */ lui $s1, %hi(D_0600CFE0) ## $s1 = 06010000 +/* 0133C 80B6ACDC 2631CFE0 */ addiu $s1, $s1, %lo(D_0600CFE0) ## $s1 = 0600CFE0 /* 01340 80B6ACE0 265001D8 */ addiu $s0, $s2, 0x01D8 ## $s0 = 000001D8 -/* 01344 80B6ACE4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 01348 80B6ACE8 24C61058 */ addiu $a2, $a2, 0x1058 ## $a2 = 06011058 +/* 01344 80B6ACE4 3C060601 */ lui $a2, %hi(D_06011058) ## $a2 = 06010000 +/* 01348 80B6ACE8 24C61058 */ addiu $a2, $a2, %lo(D_06011058) ## $a2 = 06011058 /* 0134C 80B6ACEC 02002825 */ or $a1, $s0, $zero ## $a1 = 000001D8 /* 01350 80B6ACF0 02203825 */ or $a3, $s1, $zero ## $a3 = 0600CFE0 /* 01354 80B6ACF4 AFA00010 */ sw $zero, 0x0010($sp) 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 7888799bd4..120581151c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s @@ -4389,36 +4389,36 @@ glabel L80B748A0 /* 0B57C 80B74F1C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0B580 80B74F20 920D0150 */ lbu $t5, 0x0150($s0) ## 00000150 /* 0B584 80B74F24 15A00011 */ bne $t5, $zero, .L80B74F6C -/* 0B588 80B74F28 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 0B58C 80B74F2C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 0B590 80B74F30 24E7007C */ addiu $a3, $a3, 0x007C ## $a3 = 0600007C -/* 0B594 80B74F34 24C629C0 */ addiu $a2, $a2, 0x29C0 ## $a2 = 060029C0 +/* 0B588 80B74F28 3C060600 */ lui $a2, %hi(D_060029C0) ## $a2 = 06000000 +/* 0B58C 80B74F2C 3C070600 */ lui $a3, %hi(D_0600007C) ## $a3 = 06000000 +/* 0B590 80B74F30 24E7007C */ addiu $a3, $a3, %lo(D_0600007C) ## $a3 = 0600007C +/* 0B594 80B74F34 24C629C0 */ addiu $a2, $a2, %lo(D_060029C0) ## $a2 = 060029C0 /* 0B598 80B74F38 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B59C 80B74F3C 8FA5004C */ lw $a1, 0x004C($sp) /* 0B5A0 80B74F40 AFA00010 */ sw $zero, 0x0010($sp) /* 0B5A4 80B74F44 AFA00014 */ sw $zero, 0x0014($sp) /* 0B5A8 80B74F48 0C0291BE */ jal SkelAnime_InitFlex /* 0B5AC 80B74F4C AFA00018 */ sw $zero, 0x0018($sp) -/* 0B5B0 80B74F50 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0B5B4 80B74F54 24A5007C */ addiu $a1, $a1, 0x007C ## $a1 = 0600007C +/* 0B5B0 80B74F50 3C050600 */ lui $a1, %hi(D_0600007C) ## $a1 = 06000000 +/* 0B5B4 80B74F54 24A5007C */ addiu $a1, $a1, %lo(D_0600007C) ## $a1 = 0600007C /* 0B5B8 80B74F58 8FA4004C */ lw $a0, 0x004C($sp) /* 0B5BC 80B74F5C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0B5C0 80B74F60 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 0B5C4 80B74F64 10000011 */ beq $zero, $zero, .L80B74FAC /* 0B5C8 80B74F68 3C014402 */ lui $at, 0x4402 ## $at = 44020000 .L80B74F6C: -/* 0B5CC 80B74F6C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 0B5D0 80B74F70 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 -/* 0B5D4 80B74F74 24E7CFE0 */ addiu $a3, $a3, 0xCFE0 ## $a3 = 0600CFE0 -/* 0B5D8 80B74F78 24C61058 */ addiu $a2, $a2, 0x1058 ## $a2 = 06011058 +/* 0B5CC 80B74F6C 3C060601 */ lui $a2, %hi(D_06011058) ## $a2 = 06010000 +/* 0B5D0 80B74F70 3C070601 */ lui $a3, %hi(D_0600CFE0) ## $a3 = 06010000 +/* 0B5D4 80B74F74 24E7CFE0 */ addiu $a3, $a3, %lo(D_0600CFE0) ## $a3 = 0600CFE0 +/* 0B5D8 80B74F78 24C61058 */ addiu $a2, $a2, %lo(D_06011058) ## $a2 = 06011058 /* 0B5DC 80B74F7C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B5E0 80B74F80 8FA5004C */ lw $a1, 0x004C($sp) /* 0B5E4 80B74F84 AFA00010 */ sw $zero, 0x0010($sp) /* 0B5E8 80B74F88 AFA00014 */ sw $zero, 0x0014($sp) /* 0B5EC 80B74F8C 0C0291BE */ jal SkelAnime_InitFlex /* 0B5F0 80B74F90 AFA00018 */ sw $zero, 0x0018($sp) -/* 0B5F4 80B74F94 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0B5F8 80B74F98 24A5CFE0 */ addiu $a1, $a1, 0xCFE0 ## $a1 = 0600CFE0 +/* 0B5F4 80B74F94 3C050601 */ lui $a1, %hi(D_0600CFE0) ## $a1 = 06010000 +/* 0B5F8 80B74F98 24A5CFE0 */ addiu $a1, $a1, %lo(D_0600CFE0) ## $a1 = 0600CFE0 /* 0B5FC 80B74F9C 8FA4004C */ lw $a0, 0x004C($sp) /* 0B600 80B74FA0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0B604 80B74FA4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 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 6c125ddf5e..da8caf9335 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s @@ -104,14 +104,14 @@ glabel func_80B6B674 .L80B6B70C: /* 01D6C 80B6B70C 92380024 */ lbu $t8, 0x0024($s1) ## 00000024 /* 01D70 80B6B710 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01D74 80B6B714 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 +/* 01D74 80B6B714 3C120601 */ lui $s2, %hi(D_06008678) ## $s2 = 06010000 /* 01D78 80B6B718 5701003A */ bnel $t8, $at, .L80B6B804 /* 01D7C 80B6B71C 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 /* 01D80 80B6B720 16800012 */ bne $s4, $zero, .L80B6B76C -/* 01D84 80B6B724 26528678 */ addiu $s2, $s2, 0x8678 ## $s2 = 06008678 +/* 01D84 80B6B724 26528678 */ addiu $s2, $s2, %lo(D_06008678) ## $s2 = 06008678 /* 01D88 80B6B728 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01D8C 80B6B72C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01D90 80B6B730 24848610 */ addiu $a0, $a0, 0x8610 ## $a0 = 06008610 +/* 01D8C 80B6B72C 3C040601 */ lui $a0, %hi(D_06008610) ## $a0 = 06010000 +/* 01D90 80B6B730 24848610 */ addiu $a0, $a0, %lo(D_06008610) ## $a0 = 06008610 /* 01D94 80B6B734 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01D98 80B6B738 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 01D9C 80B6B73C AC440004 */ sw $a0, 0x0004($v0) ## 00000004 @@ -177,17 +177,17 @@ glabel func_80B6B674 .L80B6B824: /* 01E84 80B6B824 92290024 */ lbu $t1, 0x0024($s1) ## 00000064 /* 01E88 80B6B828 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01E8C 80B6B82C 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 +/* 01E8C 80B6B82C 3C0A0600 */ lui $t2, %hi(D_06003680) ## $t2 = 06000000 /* 01E90 80B6B830 1521003F */ bne $t1, $at, .L80B6B930 -/* 01E94 80B6B834 254A3680 */ addiu $t2, $t2, 0x3680 ## $t2 = 06003680 +/* 01E94 80B6B834 254A3680 */ addiu $t2, $t2, %lo(D_06003680) ## $t2 = 06003680 /* 01E98 80B6B838 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01E9C 80B6B83C 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 /* 01EA0 80B6B840 02C19021 */ addu $s2, $s6, $at /* 01EA4 80B6B844 16800012 */ bne $s4, $zero, .L80B6B890 /* 01EA8 80B6B848 AFAA0070 */ sw $t2, 0x0070($sp) /* 01EAC 80B6B84C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01EB0 80B6B850 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01EB4 80B6B854 24843610 */ addiu $a0, $a0, 0x3610 ## $a0 = 06003610 +/* 01EB0 80B6B850 3C040600 */ lui $a0, %hi(D_06003610) ## $a0 = 06000000 +/* 01EB4 80B6B854 24843610 */ addiu $a0, $a0, %lo(D_06003610) ## $a0 = 06003610 /* 01EB8 80B6B858 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 01EBC 80B6B85C AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 01EC0 80B6B860 AC440004 */ sw $a0, 0x0004($v0) ## 00000004 @@ -256,17 +256,17 @@ glabel func_80B6B674 .L80B6B954: /* 01FB4 80B6B954 922D0024 */ lbu $t5, 0x0024($s1) ## 000000A4 /* 01FB8 80B6B958 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01FBC 80B6B95C 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 +/* 01FBC 80B6B95C 3C0E0601 */ lui $t6, %hi(D_06008970) ## $t6 = 06010000 /* 01FC0 80B6B960 15A1005E */ bne $t5, $at, .L80B6BADC -/* 01FC4 80B6B964 25CE8970 */ addiu $t6, $t6, 0x8970 ## $t6 = 06008970 +/* 01FC4 80B6B964 25CE8970 */ addiu $t6, $t6, %lo(D_06008970) ## $t6 = 06008970 /* 01FC8 80B6B968 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01FCC 80B6B96C 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 /* 01FD0 80B6B970 02C19021 */ addu $s2, $s6, $at /* 01FD4 80B6B974 16800012 */ bne $s4, $zero, .L80B6B9C0 /* 01FD8 80B6B978 AFAE0070 */ sw $t6, 0x0070($sp) /* 01FDC 80B6B97C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01FE0 80B6B980 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01FE4 80B6B984 248488C0 */ addiu $a0, $a0, 0x88C0 ## $a0 = 060088C0 +/* 01FE0 80B6B980 3C040601 */ lui $a0, %hi(D_060088C0) ## $a0 = 06010000 +/* 01FE4 80B6B984 248488C0 */ addiu $a0, $a0, %lo(D_060088C0) ## $a0 = 060088C0 /* 01FE8 80B6B988 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01FEC 80B6B98C AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 /* 01FF0 80B6B990 AC440004 */ sw $a0, 0x0004($v0) ## 00000004 @@ -366,17 +366,17 @@ glabel func_80B6B674 .L80B6BB00: /* 02160 80B6BB00 92390024 */ lbu $t9, 0x0024($s1) ## 000000E4 /* 02164 80B6BB04 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02168 80B6BB08 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 +/* 02168 80B6BB08 3C090600 */ lui $t1, %hi(D_060034C0) ## $t1 = 06000000 /* 0216C 80B6BB0C 1721003B */ bne $t9, $at, .L80B6BBFC -/* 02170 80B6BB10 252934C0 */ addiu $t1, $t1, 0x34C0 ## $t1 = 060034C0 +/* 02170 80B6BB10 252934C0 */ addiu $t1, $t1, %lo(D_060034C0) ## $t1 = 060034C0 /* 02174 80B6BB14 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02178 80B6BB18 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 /* 0217C 80B6BB1C 02C19021 */ addu $s2, $s6, $at /* 02180 80B6BB20 16800018 */ bne $s4, $zero, .L80B6BB84 /* 02184 80B6BB24 AFA90070 */ sw $t1, 0x0070($sp) /* 02188 80B6BB28 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0218C 80B6BB2C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 02190 80B6BB30 24843460 */ addiu $a0, $a0, 0x3460 ## $a0 = 06003460 +/* 0218C 80B6BB2C 3C040600 */ lui $a0, %hi(D_06003460) ## $a0 = 06000000 +/* 02190 80B6BB30 24843460 */ addiu $a0, $a0, %lo(D_06003460) ## $a0 = 06003460 /* 02194 80B6BB34 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 02198 80B6BB38 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 0219C 80B6BB3C AC440004 */ sw $a0, 0x0004($v0) ## 00000004 @@ -443,11 +443,11 @@ glabel func_80B6B674 .L80B6BC28: /* 02288 80B6BC28 922C0024 */ lbu $t4, 0x0024($s1) ## 000007A4 /* 0228C 80B6BC2C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 02290 80B6BC30 3C120600 */ lui $s2, 0x0600 ## $s2 = 06000000 +/* 02290 80B6BC30 3C120600 */ lui $s2, %hi(D_06003760) ## $s2 = 06000000 /* 02294 80B6BC34 5581003F */ bnel $t4, $at, .L80B6BD34 /* 02298 80B6BC38 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 0000001F /* 0229C 80B6BC3C 16800016 */ bne $s4, $zero, .L80B6BC98 -/* 022A0 80B6BC40 26523760 */ addiu $s2, $s2, 0x3760 ## $s2 = 06003760 +/* 022A0 80B6BC40 26523760 */ addiu $s2, $s2, %lo(D_06003760) ## $s2 = 06003760 /* 022A4 80B6BC44 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 022A8 80B6BC48 0C024DDD */ jal Gfx_CallSetupDL /* 022AC 80B6BC4C 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 @@ -523,14 +523,14 @@ glabel func_80B6B674 .L80B6BD5C: /* 023BC 80B6BD5C 922B0024 */ lbu $t3, 0x0024($s1) ## 000007E4 /* 023C0 80B6BD60 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 023C4 80B6BD64 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 +/* 023C4 80B6BD64 3C120601 */ lui $s2, %hi(D_06008678) ## $s2 = 06010000 /* 023C8 80B6BD68 15610035 */ bne $t3, $at, .L80B6BE40 /* 023CC 80B6BD6C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 023D0 80B6BD70 16800018 */ bne $s4, $zero, .L80B6BDD4 -/* 023D4 80B6BD74 26528678 */ addiu $s2, $s2, 0x8678 ## $s2 = 06008678 +/* 023D4 80B6BD74 26528678 */ addiu $s2, $s2, %lo(D_06008678) ## $s2 = 06008678 /* 023D8 80B6BD78 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 023DC 80B6BD7C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 023E0 80B6BD80 24848610 */ addiu $a0, $a0, 0x8610 ## $a0 = 06008610 +/* 023DC 80B6BD7C 3C040601 */ lui $a0, %hi(D_06008610) ## $a0 = 06010000 +/* 023E0 80B6BD80 24848610 */ addiu $a0, $a0, %lo(D_06008610) ## $a0 = 06008610 /* 023E4 80B6BD84 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 023E8 80B6BD88 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 023EC 80B6BD8C AC440004 */ sw $a0, 0x0004($v0) ## 00000004 @@ -592,17 +592,17 @@ glabel func_80B6B674 .L80B6BE64: /* 024C4 80B6BE64 922B0024 */ lbu $t3, 0x0024($s1) ## 00000824 /* 024C8 80B6BE68 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 024CC 80B6BE6C 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 +/* 024CC 80B6BE6C 3C0C0600 */ lui $t4, %hi(D_06003A18) ## $t4 = 06000000 /* 024D0 80B6BE70 1561004A */ bne $t3, $at, .L80B6BF9C -/* 024D4 80B6BE74 258C3A18 */ addiu $t4, $t4, 0x3A18 ## $t4 = 06003A18 +/* 024D4 80B6BE74 258C3A18 */ addiu $t4, $t4, %lo(D_06003A18) ## $t4 = 06003A18 /* 024D8 80B6BE78 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 024DC 80B6BE7C 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 /* 024E0 80B6BE80 02C19021 */ addu $s2, $s6, $at /* 024E4 80B6BE84 16800016 */ bne $s4, $zero, .L80B6BEE0 /* 024E8 80B6BE88 AFAC0070 */ sw $t4, 0x0070($sp) /* 024EC 80B6BE8C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 024F0 80B6BE90 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 024F4 80B6BE94 248439A8 */ addiu $a0, $a0, 0x39A8 ## $a0 = 060039A8 +/* 024F0 80B6BE90 3C040600 */ lui $a0, %hi(D_060039A8) ## $a0 = 06000000 +/* 024F4 80B6BE94 248439A8 */ addiu $a0, $a0, %lo(D_060039A8) ## $a0 = 060039A8 /* 024F8 80B6BE98 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 024FC 80B6BE9C AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 02500 80B6BEA0 AC440004 */ sw $a0, 0x0004($v0) ## 00000004 @@ -748,8 +748,8 @@ glabel func_80B6B674 /* 0271C 80B6C0BC 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 /* 02720 80B6C0C0 AE220004 */ sw $v0, 0x0004($s1) ## 00000004 /* 02724 80B6C0C4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02728 80B6C0C8 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 0272C 80B6C0CC 25AD74C8 */ addiu $t5, $t5, 0x74C8 ## $t5 = 060074C8 +/* 02728 80B6C0C8 3C0D0600 */ lui $t5, %hi(D_060074C8) ## $t5 = 06000000 +/* 0272C 80B6C0CC 25AD74C8 */ addiu $t5, $t5, %lo(D_060074C8) ## $t5 = 060074C8 /* 02730 80B6C0D0 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 02734 80B6C0D4 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 02738 80B6C0D8 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 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 da863a4b7c..cbd5c98a6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s @@ -98,8 +98,8 @@ glabel func_80B6C134 /* 028C0 80B6C260 0C0346A2 */ jal Matrix_NewMtx /* 028C4 80B6C264 AFA2004C */ sw $v0, 0x004C($sp) /* 028C8 80B6C268 8FA3004C */ lw $v1, 0x004C($sp) -/* 028CC 80B6C26C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 028D0 80B6C270 24843230 */ addiu $a0, $a0, 0x3230 ## $a0 = 06003230 +/* 028CC 80B6C26C 3C040600 */ lui $a0, %hi(D_06003230) ## $a0 = 06000000 +/* 028D0 80B6C270 24843230 */ addiu $a0, $a0, %lo(D_06003230) ## $a0 = 06003230 /* 028D4 80B6C274 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 028D8 80B6C278 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 028DC 80B6C27C 00046100 */ sll $t4, $a0, 4 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s index 89ffb8a2cf..de4b83f4bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s @@ -237,8 +237,8 @@ glabel func_80B6CAF8 /* 03444 80B6CDE4 0C0346A2 */ jal Matrix_NewMtx /* 03448 80B6CDE8 AFA20078 */ sw $v0, 0x0078($sp) /* 0344C 80B6CDEC 8FA30078 */ lw $v1, 0x0078($sp) -/* 03450 80B6CDF0 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 -/* 03454 80B6CDF4 24E72160 */ addiu $a3, $a3, 0x2160 ## $a3 = 06012160 +/* 03450 80B6CDF0 3C070601 */ lui $a3, %hi(D_06012160) ## $a3 = 06010000 +/* 03454 80B6CDF4 24E72160 */ addiu $a3, $a3, %lo(D_06012160) ## $a3 = 06012160 /* 03458 80B6CDF8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0345C 80B6CDFC 8FA4008C */ lw $a0, 0x008C($sp) /* 03460 80B6CE00 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 @@ -368,8 +368,8 @@ glabel func_80B6CAF8 /* 0364C 80B6CFEC 0C0346A2 */ jal Matrix_NewMtx /* 03650 80B6CFF0 AFA20024 */ sw $v0, 0x0024($sp) /* 03654 80B6CFF4 8FA30024 */ lw $v1, 0x0024($sp) -/* 03658 80B6CFF8 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 0365C 80B6CFFC 252974C8 */ addiu $t1, $t1, 0x74C8 ## $t1 = 060074C8 +/* 03658 80B6CFF8 3C090600 */ lui $t1, %hi(D_060074C8) ## $t1 = 06000000 +/* 0365C 80B6CFFC 252974C8 */ addiu $t1, $t1, %lo(D_060074C8) ## $t1 = 060074C8 /* 03660 80B6D000 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 03664 80B6D004 8FB8008C */ lw $t8, 0x008C($sp) /* 03668 80B6D008 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D354.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D354.s index 8196a664eb..1f6f4c323a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D354.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D354.s @@ -63,8 +63,8 @@ glabel func_80B6D354 /* 03A3C 80B6D3DC 0C024F46 */ jal func_80093D18 /* 03A40 80B6D3E0 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 /* 03A44 80B6D3E4 8E4202C0 */ lw $v0, 0x02C0($s2) ## 000002C0 -/* 03A48 80B6D3E8 3C090601 */ lui $t1, 0x0601 ## $t1 = 06010000 -/* 03A4C 80B6D3EC 2529B950 */ addiu $t1, $t1, 0xB950 ## $t1 = 0600B950 +/* 03A48 80B6D3E8 3C090601 */ lui $t1, %hi(D_0600B950) ## $t1 = 06010000 +/* 03A4C 80B6D3EC 2529B950 */ addiu $t1, $t1, %lo(D_0600B950) ## $t1 = 0600B950 /* 03A50 80B6D3F0 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 03A54 80B6D3F4 AE5902C0 */ sw $t9, 0x02C0($s2) ## 000002C0 /* 03A58 80B6D3F8 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 @@ -89,8 +89,8 @@ glabel func_80B6D354 /* 03AA0 80B6D440 02170019 */ multu $s0, $s7 /* 03AA4 80B6D444 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 03AA8 80B6D448 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 03AAC 80B6D44C 3C130601 */ lui $s3, 0x0601 ## $s3 = 06010000 -/* 03AB0 80B6D450 2673B9C0 */ addiu $s3, $s3, 0xB9C0 ## $s3 = 0600B9C0 +/* 03AAC 80B6D44C 3C130601 */ lui $s3, %hi(D_0600B9C0) ## $s3 = 06010000 +/* 03AB0 80B6D450 2673B9C0 */ addiu $s3, $s3, %lo(D_0600B9C0) ## $s3 = 0600B9C0 /* 03AB4 80B6D454 02A18821 */ addu $s1, $s5, $at /* 03AB8 80B6D458 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 03ABC 80B6D45C 00006012 */ mflo $t4 @@ -143,8 +143,8 @@ glabel func_80B6D354 /* 03B70 80B6D510 0C024F61 */ jal func_80093D84 /* 03B74 80B6D514 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 /* 03B78 80B6D518 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 03B7C 80B6D51C 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 -/* 03B80 80B6D520 25EFB950 */ addiu $t7, $t7, 0xB950 ## $t7 = 0600B950 +/* 03B7C 80B6D51C 3C0F0601 */ lui $t7, %hi(D_0600B950) ## $t7 = 06010000 +/* 03B80 80B6D520 25EFB950 */ addiu $t7, $t7, %lo(D_0600B950) ## $t7 = 0600B950 /* 03B84 80B6D524 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 03B88 80B6D528 AE4C02D0 */ sw $t4, 0x02D0($s2) ## 000002D0 /* 03B8C 80B6D52C 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 @@ -169,8 +169,8 @@ glabel func_80B6D354 /* 03BD4 80B6D574 02170019 */ multu $s0, $s7 /* 03BD8 80B6D578 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 03BDC 80B6D57C 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 03BE0 80B6D580 3C130601 */ lui $s3, 0x0601 ## $s3 = 06010000 -/* 03BE4 80B6D584 2673B9C0 */ addiu $s3, $s3, 0xB9C0 ## $s3 = 0600B9C0 +/* 03BE0 80B6D580 3C130601 */ lui $s3, %hi(D_0600B9C0) ## $s3 = 06010000 +/* 03BE4 80B6D584 2673B9C0 */ addiu $s3, $s3, %lo(D_0600B9C0) ## $s3 = 0600B9C0 /* 03BE8 80B6D588 02A18821 */ addu $s1, $s5, $at /* 03BEC 80B6D58C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 03BF0 80B6D590 0000C812 */ mflo $t9 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s index 31b2d0d46a..daaf57594d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s @@ -280,8 +280,8 @@ glabel func_80B6D688 /* 04028 80B6D9C8 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 /* 0402C 80B6D9CC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 04030 80B6D9D0 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 04034 80B6D9D4 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 04038 80B6D9D8 25CE21F0 */ addiu $t6, $t6, 0x21F0 ## $t6 = 060121F0 +/* 04034 80B6D9D4 3C0E0601 */ lui $t6, %hi(D_060121F0) ## $t6 = 06010000 +/* 04038 80B6D9D8 25CE21F0 */ addiu $t6, $t6, %lo(D_060121F0) ## $t6 = 060121F0 /* 0403C 80B6D9DC 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 04040 80B6D9E0 AE2C02C0 */ sw $t4, 0x02C0($s1) ## 000002C0 /* 04044 80B6D9E4 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 @@ -438,8 +438,8 @@ glabel func_80B6D688 /* 04298 80B6DC38 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 0429C 80B6DC3C AE020004 */ sw $v0, 0x0004($s0) ## 80B7E15C /* 042A0 80B6DC40 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 042A4 80B6DC44 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 042A8 80B6DC48 25293710 */ addiu $t1, $t1, 0x3710 ## $t1 = 06003710 +/* 042A4 80B6DC44 3C090600 */ lui $t1, %hi(D_06003710) ## $t1 = 06000000 +/* 042A8 80B6DC48 25293710 */ addiu $t1, $t1, %lo(D_06003710) ## $t1 = 06003710 /* 042AC 80B6DC4C 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 /* 042B0 80B6DC50 AE3902D0 */ sw $t9, 0x02D0($s1) ## 000002D0 /* 042B4 80B6DC54 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 @@ -451,8 +451,8 @@ glabel func_80B6D688 /* 042C8 80B6DC68 284100C7 */ slti $at, $v0, 0x00C7 /* 042CC 80B6DC6C 1020009F */ beq $at, $zero, .L80B6DEEC /* 042D0 80B6DC70 00108403 */ sra $s0, $s0, 16 -/* 042D4 80B6DC74 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 042D8 80B6DC78 254A3710 */ addiu $t2, $t2, 0x3710 ## $t2 = 06003710 +/* 042D4 80B6DC74 3C0A0600 */ lui $t2, %hi(D_06003710) ## $t2 = 06000000 +/* 042D8 80B6DC78 254A3710 */ addiu $t2, $t2, %lo(D_06003710) ## $t2 = 06003710 /* 042DC 80B6DC7C AFAA0030 */ sw $t2, 0x0030($sp) .L80B6DC80: /* 042E0 80B6DC80 3C0480B8 */ lui $a0, %hi(D_80B7E0B6) ## $a0 = 80B80000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s index c273e17726..4c8d58ea9d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s @@ -422,8 +422,8 @@ glabel func_80B6DF30 /* 04A70 80B6E410 0C024F46 */ jal func_80093D18 /* 04A74 80B6E414 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 04A78 80B6E418 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 04A7C 80B6E41C 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 -/* 04A80 80B6E420 271813D0 */ addiu $t8, $t8, 0x13D0 ## $t8 = 060113D0 +/* 04A7C 80B6E41C 3C180601 */ lui $t8, %hi(D_060113D0) ## $t8 = 06010000 +/* 04A80 80B6E420 271813D0 */ addiu $t8, $t8, %lo(D_060113D0) ## $t8 = 060113D0 /* 04A84 80B6E424 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 04A88 80B6E428 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 04A8C 80B6E42C 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 @@ -539,8 +539,8 @@ glabel func_80B6DF30 /* 04C34 80B6E5D4 46124100 */ add.s $f4, $f8, $f18 /* 04C38 80B6E5D8 0C034261 */ jal Matrix_Translate /* 04C3C 80B6E5DC E7A400C0 */ swc1 $f4, 0x00C0($sp) -/* 04C40 80B6E5E0 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 04C44 80B6E5E4 25CE1410 */ addiu $t6, $t6, 0x1410 ## $t6 = 06011410 +/* 04C40 80B6E5E0 3C0E0601 */ lui $t6, %hi(D_06011410) ## $t6 = 06010000 +/* 04C44 80B6E5E4 25CE1410 */ addiu $t6, $t6, %lo(D_06011410) ## $t6 = 06011410 /* 04C48 80B6E5E8 AFAE0028 */ sw $t6, 0x0028($sp) /* 04C4C 80B6E5EC 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 .L80B6E5F0: @@ -600,8 +600,8 @@ glabel func_80B6DF30 /* 04D24 80B6E6C4 10200035 */ beq $at, $zero, .L80B6E79C /* 04D28 80B6E6C8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 04D2C 80B6E6CC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 04D30 80B6E6D0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 04D34 80B6E6D4 24841170 */ addiu $a0, $a0, 0x1170 ## $a0 = 06011170 +/* 04D30 80B6E6D0 3C040601 */ lui $a0, %hi(D_06011170) ## $a0 = 06010000 +/* 04D34 80B6E6D4 24841170 */ addiu $a0, $a0, %lo(D_06011170) ## $a0 = 06011170 /* 04D38 80B6E6D8 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 04D3C 80B6E6DC AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 /* 04D40 80B6E6E0 3C0BFD10 */ lui $t3, 0xFD10 ## $t3 = FD100000 @@ -656,11 +656,11 @@ glabel func_80B6DF30 /* 04E00 80B6E7A0 14200003 */ bne $at, $zero, .L80B6E7B0 /* 04E04 80B6E7A4 32280001 */ andi $t0, $s1, 0x0001 ## $t0 = 00000000 /* 04E08 80B6E7A8 15000035 */ bne $t0, $zero, .L80B6E880 -/* 04E0C 80B6E7AC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 04E0C 80B6E7AC 3C040601 */ lui $a0, %hi(D_06011070) ## $a0 = 06010000 .L80B6E7B0: /* 04E10 80B6E7B0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 04E14 80B6E7B4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 04E18 80B6E7B8 24841270 */ addiu $a0, $a0, 0x1270 ## $a0 = 06011270 +/* 04E14 80B6E7B4 3C040601 */ lui $a0, %hi(D_06011270) ## $a0 = 06010000 +/* 04E18 80B6E7B8 24841270 */ addiu $a0, $a0, %lo(D_06011270) ## $a0 = 06011270 /* 04E1C 80B6E7BC 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 04E20 80B6E7C0 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 04E24 80B6E7C4 3C0AFD10 */ lui $t2, 0xFD10 ## $t2 = FD100000 @@ -712,7 +712,7 @@ glabel func_80B6DF30 /* 04EDC 80B6E87C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 .L80B6E880: /* 04EE0 80B6E880 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 04EE4 80B6E884 24841070 */ addiu $a0, $a0, 0x1070 ## $a0 = 060122E0 +/* 04EE4 80B6E884 24841070 */ addiu $a0, $a0, %lo(D_06011070) ## $a0 = 060122E0 /* 04EE8 80B6E888 3C08FD10 */ lui $t0, 0xFD10 ## $t0 = FD100000 /* 04EEC 80B6E88C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 04EF0 80B6E890 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76474.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76474.s index 5c18f3797a..153d19ed89 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76474.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76474.s @@ -63,9 +63,9 @@ glabel func_80B76474 /* 0CB4C 80B764EC 55C10033 */ bnel $t6, $at, .L80B765BC /* 0CB50 80B764F0 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 /* 0CB54 80B764F4 16A00009 */ bne $s5, $zero, .L80B7651C -/* 0CB58 80B764F8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 0CB58 80B764F8 3C040601 */ lui $a0, %hi(D_06014030) ## $a0 = 06010000 /* 0CB5C 80B764FC 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 0CB60 80B76500 24844030 */ addiu $a0, $a0, 0x4030 ## $a0 = 06014030 +/* 0CB60 80B76500 24844030 */ addiu $a0, $a0, %lo(D_06014030) ## $a0 = 06014030 /* 0CB64 80B76504 26B50001 */ addiu $s5, $s5, 0x0001 ## $s5 = 00000001 /* 0CB68 80B76508 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0CB6C 80B7650C AE4F02D0 */ sw $t7, 0x02D0($s2) ## 000002D0 @@ -74,8 +74,8 @@ glabel func_80B76474 /* 0CB78 80B76518 AC560000 */ sw $s6, 0x0000($v0) ## 00000000 .L80B7651C: /* 0CB7C 80B7651C 92180034 */ lbu $t8, 0x0034($s0) ## 80B7FF2C -/* 0CB80 80B76520 3C140601 */ lui $s4, 0x0601 ## $s4 = 06010000 -/* 0CB84 80B76524 269440B0 */ addiu $s4, $s4, 0x40B0 ## $s4 = 060140B0 +/* 0CB80 80B76520 3C140601 */ lui $s4, %hi(D_060140B0) ## $s4 = 06010000 +/* 0CB84 80B76524 269440B0 */ addiu $s4, $s4, %lo(D_060140B0) ## $s4 = 060140B0 /* 0CB88 80B76528 13000023 */ beq $t8, $zero, .L80B765B8 /* 0CB8C 80B7652C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0CB90 80B76530 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 80B7FEF8 @@ -130,9 +130,9 @@ glabel func_80B76474 /* 0CC48 80B765E8 5521002A */ bnel $t1, $at, .L80B76694 /* 0CC4C 80B765EC 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 /* 0CC50 80B765F0 16A00009 */ bne $s5, $zero, .L80B76618 -/* 0CC54 80B765F4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 0CC54 80B765F4 3C040601 */ lui $a0, %hi(D_06013F50) ## $a0 = 06010000 /* 0CC58 80B765F8 8E4202C0 */ lw $v0, 0x02C0($s2) ## 000002C0 -/* 0CC5C 80B765FC 24843F50 */ addiu $a0, $a0, 0x3F50 ## $a0 = 06013F50 +/* 0CC5C 80B765FC 24843F50 */ addiu $a0, $a0, %lo(D_06013F50) ## $a0 = 06013F50 /* 0CC60 80B76600 26B50001 */ addiu $s5, $s5, 0x0001 ## $s5 = 00000001 /* 0CC64 80B76604 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 0CC68 80B76608 AE4A02C0 */ sw $t2, 0x02C0($s2) ## 000002C0 @@ -141,8 +141,8 @@ glabel func_80B76474 /* 0CC74 80B76614 AC560000 */ sw $s6, 0x0000($v0) ## 00000000 .L80B76618: /* 0CC78 80B76618 920B0034 */ lbu $t3, 0x0034($s0) ## 80B7FF2C -/* 0CC7C 80B7661C 3C140601 */ lui $s4, 0x0601 ## $s4 = 06010000 -/* 0CC80 80B76620 26943FD0 */ addiu $s4, $s4, 0x3FD0 ## $s4 = 06013FD0 +/* 0CC7C 80B7661C 3C140601 */ lui $s4, %hi(D_06013FD0) ## $s4 = 06010000 +/* 0CC80 80B76620 26943FD0 */ addiu $s4, $s4, %lo(D_06013FD0) ## $s4 = 06013FD0 /* 0CC84 80B76624 1160001A */ beq $t3, $zero, .L80B76690 /* 0CC88 80B76628 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0CC8C 80B7662C C60C0000 */ lwc1 $f12, 0x0000($s0) ## 80B7FEF8 @@ -188,9 +188,9 @@ glabel func_80B76474 /* 0CD20 80B766C0 55C1003C */ bnel $t6, $at, .L80B767B4 /* 0CD24 80B766C4 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 /* 0CD28 80B766C8 16A00009 */ bne $s5, $zero, .L80B766F0 -/* 0CD2C 80B766CC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 0CD2C 80B766CC 3C040601 */ lui $a0, %hi(D_06013330) ## $a0 = 06010000 /* 0CD30 80B766D0 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 0CD34 80B766D4 24843330 */ addiu $a0, $a0, 0x3330 ## $a0 = 06013330 +/* 0CD34 80B766D4 24843330 */ addiu $a0, $a0, %lo(D_06013330) ## $a0 = 06013330 /* 0CD38 80B766D8 26B50001 */ addiu $s5, $s5, 0x0001 ## $s5 = 00000001 /* 0CD3C 80B766DC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0CD40 80B766E0 AE4F02D0 */ sw $t7, 0x02D0($s2) ## 000002D0 @@ -199,8 +199,8 @@ glabel func_80B76474 /* 0CD4C 80B766EC AC560000 */ sw $s6, 0x0000($v0) ## 00000000 .L80B766F0: /* 0CD50 80B766F0 92180034 */ lbu $t8, 0x0034($s0) ## 80B7FF2C -/* 0CD54 80B766F4 3C140601 */ lui $s4, 0x0601 ## $s4 = 06010000 -/* 0CD58 80B766F8 269433B0 */ addiu $s4, $s4, 0x33B0 ## $s4 = 060133B0 +/* 0CD54 80B766F4 3C140601 */ lui $s4, %hi(D_060133B0) ## $s4 = 06010000 +/* 0CD58 80B766F8 269433B0 */ addiu $s4, $s4, %lo(D_060133B0) ## $s4 = 060133B0 /* 0CD5C 80B766FC 1300002C */ beq $t8, $zero, .L80B767B0 /* 0CD60 80B76700 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0CD64 80B76704 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 80B7FEF8 @@ -264,9 +264,9 @@ glabel func_80B76474 /* 0CE40 80B767E0 5541002D */ bnel $t2, $at, .L80B76898 /* 0CE44 80B767E4 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 /* 0CE48 80B767E8 16A00009 */ bne $s5, $zero, .L80B76810 -/* 0CE4C 80B767EC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 +/* 0CE4C 80B767EC 3C040601 */ lui $a0, %hi(D_06013590) ## $a0 = 06010000 /* 0CE50 80B767F0 8E4202C0 */ lw $v0, 0x02C0($s2) ## 000002C0 -/* 0CE54 80B767F4 24843590 */ addiu $a0, $a0, 0x3590 ## $a0 = 06013590 +/* 0CE54 80B767F4 24843590 */ addiu $a0, $a0, %lo(D_06013590) ## $a0 = 06013590 /* 0CE58 80B767F8 26B50001 */ addiu $s5, $s5, 0x0001 ## $s5 = 00000001 /* 0CE5C 80B767FC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 0CE60 80B76800 AE4B02C0 */ sw $t3, 0x02C0($s2) ## 000002C0 @@ -275,8 +275,8 @@ glabel func_80B76474 /* 0CE6C 80B7680C AC560000 */ sw $s6, 0x0000($v0) ## 00000000 .L80B76810: /* 0CE70 80B76810 920C0034 */ lbu $t4, 0x0034($s0) ## 80B7FF2C -/* 0CE74 80B76814 3C140601 */ lui $s4, 0x0601 ## $s4 = 06010000 -/* 0CE78 80B76818 26943610 */ addiu $s4, $s4, 0x3610 ## $s4 = 06013610 +/* 0CE74 80B76814 3C140601 */ lui $s4, %hi(D_06013610) ## $s4 = 06010000 +/* 0CE78 80B76818 26943610 */ addiu $s4, $s4, %lo(D_06013610) ## $s4 = 06013610 /* 0CE7C 80B7681C 1180001D */ beq $t4, $zero, .L80B76894 /* 0CE80 80B76820 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0CE84 80B76824 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 80B7FEF8 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B771CC.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B771CC.s index f34ebbb046..eff1c0a2d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B771CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B771CC.s @@ -96,8 +96,8 @@ glabel func_80B771CC /* 0D8E8 80B77288 16A0000F */ bne $s5, $zero, .L80B772C8 /* 0D8EC 80B7728C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0D8F0 80B77290 8E4202C0 */ lw $v0, 0x02C0($s2) ## 000002C0 -/* 0D8F4 80B77294 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 0D8F8 80B77298 2484C220 */ addiu $a0, $a0, 0xC220 ## $a0 = 0600C220 +/* 0D8F4 80B77294 3C040601 */ lui $a0, %hi(D_0600C220) ## $a0 = 06010000 +/* 0D8F8 80B77298 2484C220 */ addiu $a0, $a0, %lo(D_0600C220) ## $a0 = 0600C220 /* 0D8FC 80B7729C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 0D900 80B772A0 AE5902C0 */ sw $t9, 0x02C0($s2) ## 000002C0 /* 0D904 80B772A4 AC440004 */ sw $a0, 0x0004($v0) ## 00000004 @@ -111,8 +111,8 @@ glabel func_80B771CC /* 0D924 80B772C4 AC570000 */ sw $s7, 0x0000($v0) ## 00000000 .L80B772C8: /* 0D928 80B772C8 92290044 */ lbu $t1, 0x0044($s1) ## 80B8200C -/* 0D92C 80B772CC 3C130601 */ lui $s3, 0x0601 ## $s3 = 06010000 -/* 0D930 80B772D0 2673C298 */ addiu $s3, $s3, 0xC298 ## $s3 = 0600C298 +/* 0D92C 80B772CC 3C130601 */ lui $s3, %hi(D_0600C298) ## $s3 = 06010000 +/* 0D930 80B772D0 2673C298 */ addiu $s3, $s3, %lo(D_0600C298) ## $s3 = 0600C298 /* 0D934 80B772D4 51200030 */ beql $t1, $zero, .L80B77398 /* 0D938 80B772D8 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000002 /* 0D93C 80B772DC C62C0004 */ lwc1 $f12, 0x0004($s1) ## 80B81FCC 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 54a4108297..60ee98916f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A140.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A140.s @@ -35,8 +35,8 @@ glabel func_80B7A140 /* 107FC 80B7A19C 14410016 */ bne $v0, $at, .L80B7A1F8 /* 10800 80B7A1A0 3C0680B8 */ lui $a2, %hi(D_80B7B2F4) ## $a2 = 80B80000 /* 10804 80B7A1A4 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 10808 80B7A1A8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 1080C 80B7A1AC 248474C8 */ addiu $a0, $a0, 0x74C8 ## $a0 = 060074C8 +/* 10808 80B7A1A8 3C040600 */ lui $a0, %hi(D_060074C8) ## $a0 = 06000000 +/* 1080C 80B7A1AC 248474C8 */ addiu $a0, $a0, %lo(D_060074C8) ## $a0 = 060074C8 /* 10810 80B7A1B0 0004C900 */ sll $t9, $a0, 4 /* 10814 80B7A1B4 00194F02 */ srl $t1, $t9, 28 /* 10818 80B7A1B8 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 @@ -60,8 +60,8 @@ glabel func_80B7A140 /* 1085C 80B7A1FC 14410014 */ bne $v0, $at, .L80B7A250 /* 10860 80B7A200 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 /* 10864 80B7A204 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 10868 80B7A208 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 1086C 80B7A20C 24847350 */ addiu $a0, $a0, 0x7350 ## $a0 = 06007350 +/* 10868 80B7A208 3C040600 */ lui $a0, %hi(D_06007350) ## $a0 = 06000000 +/* 1086C 80B7A20C 24847350 */ addiu $a0, $a0, %lo(D_06007350) ## $a0 = 06007350 /* 10870 80B7A210 0004C900 */ sll $t9, $a0, 4 /* 10874 80B7A214 00194F02 */ srl $t1, $t9, 28 /* 10878 80B7A218 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 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 bb2dc666b3..148cdbf71e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s @@ -233,14 +233,14 @@ glabel func_80B7A278 /* 10BDC 80B7A57C 0C0346A2 */ jal Matrix_NewMtx /* 10BE0 80B7A580 AFA2003C */ sw $v0, 0x003C($sp) /* 10BE4 80B7A584 8FA3003C */ lw $v1, 0x003C($sp) -/* 10BE8 80B7A588 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 -/* 10BEC 80B7A58C 258C53D0 */ addiu $t4, $t4, 0x53D0 ## $t4 = 060153D0 +/* 10BE8 80B7A588 3C0C0601 */ lui $t4, %hi(D_060153D0) ## $t4 = 06010000 +/* 10BEC 80B7A58C 258C53D0 */ addiu $t4, $t4, %lo(D_060153D0) ## $t4 = 060153D0 /* 10BF0 80B7A590 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 10BF4 80B7A594 8FB90058 */ lw $t9, 0x0058($sp) /* 10BF8 80B7A598 3C04DE00 */ lui $a0, 0xDE00 ## $a0 = DE000000 -/* 10BFC 80B7A59C 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 +/* 10BFC 80B7A59C 3C0E0601 */ lui $t6, %hi(D_06015470) ## $t6 = 06010000 /* 10C00 80B7A5A0 8F2202C0 */ lw $v0, 0x02C0($t9) ## 000002C0 -/* 10C04 80B7A5A4 25CE5470 */ addiu $t6, $t6, 0x5470 ## $t6 = 06015470 +/* 10C04 80B7A5A4 25CE5470 */ addiu $t6, $t6, %lo(D_06015470) ## $t6 = 06015470 /* 10C08 80B7A5A8 3C0F80B8 */ lui $t7, %hi(D_80B7E0AC) ## $t7 = 80B80000 /* 10C0C 80B7A5AC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 10C10 80B7A5B0 AF2B02C0 */ sw $t3, 0x02C0($t9) ## 000002C0 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 6eaeb68dc4..0f0407a202 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 @@ -44,8 +44,8 @@ glabel ItemShield_Draw /* 007E8 80B87108 0C0346A2 */ jal Matrix_NewMtx /* 007EC 80B8710C AFA2002C */ sw $v0, 0x002C($sp) /* 007F0 80B87110 8FA3002C */ lw $v1, 0x002C($sp) -/* 007F4 80B87114 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 007F8 80B87118 248424F8 */ addiu $a0, $a0, 0x24F8 ## $a0 = 060224F8 +/* 007F4 80B87114 3C040602 */ lui $a0, %hi(D_060224F8) ## $a0 = 06020000 +/* 007F8 80B87118 248424F8 */ addiu $a0, $a0, %lo(D_060224F8) ## $a0 = 060224F8 /* 007FC 80B8711C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00800 80B87120 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00804 80B87124 00046900 */ sll $t5, $a0, 4 diff --git a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s index 58da11b6ca..882334e6ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s @@ -96,9 +96,9 @@ glabel MirRay_Draw /* 011B4 80B8E204 C630022C */ lwc1 $f16, 0x022C($s1) ## 0000022C /* 011B8 80B8E208 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 /* 011BC 80B8E20C 24019600 */ addiu $at, $zero, 0x9600 ## $at = FFFF9600 -/* 011C0 80B8E210 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 +/* 011C0 80B8E210 3C190600 */ lui $t9, %hi(D_06000C50) ## $t9 = 06000000 /* 011C4 80B8E214 46128102 */ mul.s $f4, $f16, $f18 -/* 011C8 80B8E218 27390C50 */ addiu $t9, $t9, 0x0C50 ## $t9 = 06000C50 +/* 011C8 80B8E218 27390C50 */ addiu $t9, $t9, %lo(D_06000C50) ## $t9 = 06000C50 /* 011CC 80B8E21C 27B0007C */ addiu $s0, $sp, 0x007C ## $s0 = FFFFFDFC /* 011D0 80B8E220 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 /* 011D4 80B8E224 02003025 */ or $a2, $s0, $zero ## $a2 = FFFFFDFC @@ -152,12 +152,12 @@ glabel MirRay_Draw /* 01284 80B8E2D4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01288 80B8E2D8 2611000C */ addiu $s1, $s0, 0x000C ## $s1 = FFFFFE08 /* 0128C 80B8E2DC 11600033 */ beq $t3, $zero, .L80B8E3AC -/* 01290 80B8E2E0 3C130600 */ lui $s3, 0x0600 ## $s3 = 06000000 +/* 01290 80B8E2E0 3C130600 */ lui $s3, %hi(D_060000B0) ## $s3 = 06000000 /* 01294 80B8E2E4 C60C0000 */ lwc1 $f12, 0x0000($s0) ## FFFFFDFC /* 01298 80B8E2E8 C60E0004 */ lwc1 $f14, 0x0004($s0) ## FFFFFE00 /* 0129C 80B8E2EC 8E060008 */ lw $a2, 0x0008($s0) ## FFFFFE04 /* 012A0 80B8E2F0 0C034261 */ jal Matrix_Translate -/* 012A4 80B8E2F4 267300B0 */ addiu $s3, $s3, 0x00B0 ## $s3 = 060000B0 +/* 012A4 80B8E2F4 267300B0 */ addiu $s3, $s3, %lo(D_060000B0) ## $s3 = 060000B0 /* 012A8 80B8E2F8 4406A000 */ mfc1 $a2, $f20 /* 012AC 80B8E2FC 4600A306 */ mov.s $f12, $f20 /* 012B0 80B8E300 4600A386 */ mov.s $f14, $f20 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s index ad4444d032..f088c82afc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s @@ -7,8 +7,8 @@ glabel ObjBean_Draw /* 02324 80B90DA4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 02328 80B90DA8 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 /* 0232C 80B90DAC 11C00006 */ beq $t6, $zero, .L80B90DC8 -/* 02330 80B90DB0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02334 80B90DB4 24A50090 */ addiu $a1, $a1, 0x0090 ## $a1 = 06000090 +/* 02330 80B90DB0 3C050600 */ lui $a1, %hi(D_06000090) ## $a1 = 06000000 +/* 02334 80B90DB4 24A50090 */ addiu $a1, $a1, %lo(D_06000090) ## $a1 = 06000090 /* 02338 80B90DB8 0C00D498 */ jal Gfx_DrawDListOpa /* 0233C 80B90DBC AFA60018 */ sw $a2, 0x0018($sp) @@ -18,8 +18,8 @@ glabel ObjBean_Draw /* 02348 80B90DC8 304F0004 */ andi $t7, $v0, 0x0004 ## $t7 = 00000000 /* 0234C 80B90DCC 11E00007 */ beq $t7, $zero, .L80B90DEC /* 02350 80B90DD0 8FA4001C */ lw $a0, 0x001C($sp) -/* 02354 80B90DD4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02358 80B90DD8 24A503F0 */ addiu $a1, $a1, 0x03F0 ## $a1 = 060003F0 +/* 02354 80B90DD4 3C050600 */ lui $a1, %hi(D_060003F0) ## $a1 = 06000000 +/* 02358 80B90DD8 24A503F0 */ addiu $a1, $a1, %lo(D_060003F0) ## $a1 = 060003F0 /* 0235C 80B90DDC 0C00D498 */ jal Gfx_DrawDListOpa /* 02360 80B90DE0 AFA60018 */ sw $a2, 0x0018($sp) 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 85917055e1..528975ca39 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 @@ -138,8 +138,8 @@ glabel ObjBean_Init /* 0114C 80B8FBCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01150 80B8FBD0 0C2E419E */ jal func_80B90678 /* 01154 80B8FBD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01158 80B8FBD8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 0115C 80B8FBDC 24C605DC */ addiu $a2, $a2, 0x05DC ## $a2 = 060005DC +/* 01158 80B8FBD8 3C060600 */ lui $a2, %hi(D_060005DC) ## $a2 = 06000000 +/* 0115C 80B8FBDC 24C605DC */ addiu $a2, $a2, %lo(D_060005DC) ## $a2 = 060005DC /* 01160 80B8FBE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01164 80B8FBE4 8FA50024 */ lw $a1, 0x0024($sp) /* 01168 80B8FBE8 0C2E3AB6 */ jal func_80B8EAD8 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s index 4b73fdb472..77362e61b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s @@ -33,8 +33,8 @@ glabel func_80B90C7C /* 02258 80B90CD8 44066000 */ mfc1 $a2, $f12 /* 0225C 80B90CDC 0C0342A3 */ jal Matrix_Scale /* 02260 80B90CE0 46006386 */ mov.s $f14, $f12 -/* 02264 80B90CE4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02268 80B90CE8 24A50650 */ addiu $a1, $a1, 0x0650 ## $a1 = 06000650 +/* 02264 80B90CE4 3C050600 */ lui $a1, %hi(D_06000650) ## $a1 = 06000000 +/* 02268 80B90CE8 24A50650 */ addiu $a1, $a1, %lo(D_06000650) ## $a1 = 06000650 /* 0226C 80B90CEC 0C00D498 */ jal Gfx_DrawDListOpa /* 02270 80B90CF0 8FA4001C */ lw $a0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s index e1d5e0e243..ac2b7009b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s @@ -34,8 +34,8 @@ glabel func_80B90D04 /* 022E4 80B90D64 44066000 */ mfc1 $a2, $f12 /* 022E8 80B90D68 0C0342A3 */ jal Matrix_Scale /* 022EC 80B90D6C C48E01D4 */ lwc1 $f14, 0x01D4($a0) ## 000001D4 -/* 022F0 80B90D70 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 022F4 80B90D74 24A501B0 */ addiu $a1, $a1, 0x01B0 ## $a1 = 060001B0 +/* 022F0 80B90D70 3C050600 */ lui $a1, %hi(D_060001B0) ## $a1 = 06000000 +/* 022F4 80B90D74 24A501B0 */ addiu $a1, $a1, %lo(D_060001B0) ## $a1 = 060001B0 /* 022F8 80B90D78 0C00D498 */ jal Gfx_DrawDListOpa /* 022FC 80B90D7C 8FA4001C */ lw $a0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Draw.s index c3f253a1ea..dc22e2b7d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Draw.s @@ -47,13 +47,13 @@ glabel ObjHamishi_Draw /* 00734 80B936C4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00738 80B936C8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0073C 80B936CC 3C0AFA00 */ lui $t2, 0xFA00 ## $t2 = FA000000 -/* 00740 80B936D0 3C0E0501 */ lui $t6, 0x0501 ## $t6 = 05010000 +/* 00740 80B936D0 3C0E0501 */ lui $t6, %hi(D_0500A3B8) ## $t6 = 05010000 /* 00744 80B936D4 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 00748 80B936D8 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 0074C 80B936DC AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 00750 80B936E0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 00754 80B936E4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00758 80B936E8 25CEA3B8 */ addiu $t6, $t6, 0xA3B8 ## $t6 = 0500A3B8 +/* 00758 80B936E8 25CEA3B8 */ addiu $t6, $t6, %lo(D_0500A3B8) ## $t6 = 0500A3B8 /* 0075C 80B936EC 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 /* 00760 80B936F0 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 00764 80B936F4 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B93164.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B93164.s index 80080dcef6..3dba504817 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B93164.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B93164.s @@ -21,7 +21,7 @@ glabel func_80B93164 /* 00220 80B931B0 AFB1007C */ sw $s1, 0x007C($sp) /* 00224 80B931B4 AFB00078 */ sw $s0, 0x0078($sp) /* 00228 80B931B8 3C1380B9 */ lui $s3, %hi(D_80B93784) ## $s3 = 80B90000 -/* 0022C 80B931BC 3C1E0501 */ lui $s8, 0x0501 ## $s8 = 05010000 +/* 0022C 80B931BC 3C1E0501 */ lui $s8, %hi(D_0500A5E8) ## $s8 = 05010000 /* 00230 80B931C0 4481C000 */ mtc1 $at, $f24 ## $f24 = 10.00 /* 00234 80B931C4 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 00238 80B931C8 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 @@ -29,7 +29,7 @@ glabel func_80B93164 /* 00240 80B931D0 F7B60050 */ sdc1 $f22, 0x0050($sp) /* 00244 80B931D4 F7B40048 */ sdc1 $f20, 0x0048($sp) /* 00248 80B931D8 241003E8 */ addiu $s0, $zero, 0x03E8 ## $s0 = 000003E8 -/* 0024C 80B931DC 27DEA5E8 */ addiu $s8, $s8, 0xA5E8 ## $s8 = 0500A5E8 +/* 0024C 80B931DC 27DEA5E8 */ addiu $s8, $s8, %lo(D_0500A5E8) ## $s8 = 0500A5E8 /* 00250 80B931E0 26733784 */ addiu $s3, $s3, %lo(D_80B93784) ## $s3 = 80B93784 /* 00254 80B931E4 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 /* 00258 80B931E8 24940024 */ addiu $s4, $a0, 0x0024 ## $s4 = 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Draw.s index 7f7b7656d1..f615bffa4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Draw.s @@ -3,10 +3,10 @@ glabel ObjKibako2_Draw /* 005B0 80B95F80 AFA40018 */ sw $a0, 0x0018($sp) /* 005B4 80B95F84 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 005B8 80B95F88 AFBF0014 */ sw $ra, 0x0014($sp) -/* 005BC 80B95F8C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 005BC 80B95F8C 3C050600 */ lui $a1, %hi(D_06000960) ## $a1 = 06000000 /* 005C0 80B95F90 0C00D498 */ jal Gfx_DrawDListOpa -/* 005C4 80B95F94 24A50960 */ addiu $a1, $a1, 0x0960 ## $a1 = 06000960 +/* 005C4 80B95F94 24A50960 */ addiu $a1, $a1, %lo(D_06000960) ## $a1 = 06000960 /* 005C8 80B95F98 8FBF0014 */ lw $ra, 0x0014($sp) /* 005CC 80B95F9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 005D0 80B95FA0 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Init.s index dcf0fb6871..6bf81d4a92 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Init.s @@ -22,8 +22,8 @@ glabel ObjKibako2_Init /* 00354 80B95D24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00358 80B95D28 0C2E5674 */ jal func_80B959D0 /* 0035C 80B95D2C 8FA5003C */ lw $a1, 0x003C($sp) -/* 00360 80B95D30 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00364 80B95D34 24840B70 */ addiu $a0, $a0, 0x0B70 ## $a0 = 06000B70 +/* 00360 80B95D30 3C040600 */ lui $a0, %hi(D_06000B70) ## $a0 = 06000000 +/* 00364 80B95D34 24840B70 */ addiu $a0, $a0, %lo(D_06000B70) ## $a0 = 06000B70 /* 00368 80B95D38 0C010620 */ jal DynaPolyInfo_Alloc /* 0036C 80B95D3C 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95A28.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95A28.s index 5f8834b20c..6d8c42fb8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95A28.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95A28.s @@ -29,7 +29,7 @@ glabel func_80B95A28 /* 00090 80B95A60 AFB30084 */ sw $s3, 0x0084($sp) /* 00094 80B95A64 AFB20080 */ sw $s2, 0x0080($sp) /* 00098 80B95A68 AFB1007C */ sw $s1, 0x007C($sp) -/* 0009C 80B95A6C 3C170600 */ lui $s7, 0x0600 ## $s7 = 06000000 +/* 0009C 80B95A6C 3C170600 */ lui $s7, %hi(D_06001000) ## $s7 = 06000000 /* 000A0 80B95A70 4481D000 */ mtc1 $at, $f26 ## $f26 = 30.00 /* 000A4 80B95A74 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 /* 000A8 80B95A78 AFBF009C */ sw $ra, 0x009C($sp) @@ -37,7 +37,7 @@ glabel func_80B95A28 /* 000B0 80B95A80 F7B80058 */ sdc1 $f24, 0x0058($sp) /* 000B4 80B95A84 F7B60050 */ sdc1 $f22, 0x0050($sp) /* 000B8 80B95A88 F7B40048 */ sdc1 $f20, 0x0048($sp) -/* 000BC 80B95A8C 26F71000 */ addiu $s7, $s7, 0x1000 ## $s7 = 06001000 +/* 000BC 80B95A8C 26F71000 */ addiu $s7, $s7, %lo(D_06001000) ## $s7 = 06001000 /* 000C0 80B95A90 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 /* 000C4 80B95A94 24920024 */ addiu $s2, $a0, 0x0024 ## $s2 = 00000024 /* 000C8 80B95A98 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s index 8b73407d2f..d833490ca8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s @@ -3,10 +3,10 @@ glabel ObjLift_Draw /* 008A8 80B96978 AFA40018 */ sw $a0, 0x0018($sp) /* 008AC 80B9697C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 008B0 80B96980 AFBF0014 */ sw $ra, 0x0014($sp) -/* 008B4 80B96984 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 +/* 008B4 80B96984 3C050600 */ lui $a1, %hi(D_06000140) ## $a1 = 06000000 /* 008B8 80B96988 0C00D498 */ jal Gfx_DrawDListOpa -/* 008BC 80B9698C 24A50140 */ addiu $a1, $a1, 0x0140 ## $a1 = 06000140 +/* 008BC 80B9698C 24A50140 */ addiu $a1, $a1, %lo(D_06000140) ## $a1 = 06000140 /* 008C0 80B96990 8FBF0014 */ lw $ra, 0x0014($sp) /* 008C4 80B96994 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008C8 80B96998 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Init.s index df49a795b6..5a985ee21b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Init.s @@ -16,10 +16,10 @@ glabel ObjLift_Init /* 00314 80B963E4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00318 80B963E8 AFBF001C */ sw $ra, 0x001C($sp) /* 0031C 80B963EC AFB00018 */ sw $s0, 0x0018($sp) -/* 00320 80B963F0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 +/* 00320 80B963F0 3C060600 */ lui $a2, %hi(D_060003D0) ## $a2 = 06000000 /* 00324 80B963F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00328 80B963F8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0032C 80B963FC 24C603D0 */ addiu $a2, $a2, 0x03D0 ## $a2 = 060003D0 +/* 0032C 80B963FC 24C603D0 */ addiu $a2, $a2, %lo(D_060003D0) ## $a2 = 060003D0 /* 00330 80B96400 0C2E5836 */ jal func_80B960D8 /* 00334 80B96404 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00338 80B96408 8605001C */ lh $a1, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s index 866f9015f9..4bf0a99d4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s @@ -28,14 +28,14 @@ glabel func_80B96160 /* 000E4 80B961B4 F7B40048 */ sdc1 $f20, 0x0048($sp) /* 000E8 80B961B8 3C0180B9 */ lui $at, %hi(D_80B96A94) ## $at = 80B90000 /* 000EC 80B961BC 3C1080B9 */ lui $s0, %hi(D_80B969D0) ## $s0 = 80B90000 -/* 000F0 80B961C0 3C160600 */ lui $s6, 0x0600 ## $s6 = 06000000 +/* 000F0 80B961C0 3C160600 */ lui $s6, %hi(D_06000140) ## $s6 = 06000000 /* 000F4 80B961C4 3C1780B9 */ lui $s7, %hi(D_80B969F4) ## $s7 = 80B90000 /* 000F8 80B961C8 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 000FC 80B961CC 00A0F025 */ or $s8, $a1, $zero ## $s8 = 00000000 /* 00100 80B961D0 AFBF0094 */ sw $ra, 0x0094($sp) /* 00104 80B961D4 AFB10074 */ sw $s1, 0x0074($sp) /* 00108 80B961D8 26F769F4 */ addiu $s7, $s7, %lo(D_80B969F4) ## $s7 = 80B969F4 -/* 0010C 80B961DC 26D60140 */ addiu $s6, $s6, 0x0140 ## $s6 = 06000140 +/* 0010C 80B961DC 26D60140 */ addiu $s6, $s6, %lo(D_06000140) ## $s6 = 06000140 /* 00110 80B961E0 261069D0 */ addiu $s0, $s0, %lo(D_80B969D0) ## $s0 = 80B969D0 /* 00114 80B961E4 C4346A94 */ lwc1 $f20, %lo(D_80B96A94)($at) /* 00118 80B961E8 24930024 */ addiu $s3, $a0, 0x0024 ## $s3 = 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Draw.s index 5779ab9b3c..74ba73aeb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Draw.s @@ -70,8 +70,8 @@ glabel ObjWarp2block_Draw /* 009DC 80BA27CC 372800FF */ ori $t0, $t9, 0x00FF ## $t0 = FA0000FF /* 009E0 80BA27D0 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 /* 009E4 80BA27D4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 009E8 80BA27D8 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 009EC 80BA27DC 25290980 */ addiu $t1, $t1, 0x0980 ## $t1 = 06000980 +/* 009E8 80BA27D8 3C090600 */ lui $t1, %hi(D_06000980) ## $t1 = 06000000 +/* 009EC 80BA27DC 25290980 */ addiu $t1, $t1, %lo(D_06000980) ## $t1 = 06000980 /* 009F0 80BA27E0 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 009F4 80BA27E4 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 /* 009F8 80BA27E8 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Init.s index f3028a39fd..af35d80ad7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Init.s @@ -64,8 +64,8 @@ glabel ObjWarp2block_Init /* 00624 80BA2414 0C010D20 */ jal DynaPolyInfo_SetActorMove /* 00628 80BA2418 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0062C 80BA241C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00630 80BA2420 24840B30 */ addiu $a0, $a0, 0x0B30 ## $a0 = 06000B30 +/* 0062C 80BA241C 3C040600 */ lui $a0, %hi(D_06000B30) ## $a0 = 06000000 +/* 00630 80BA2420 24840B30 */ addiu $a0, $a0, %lo(D_06000B30) ## $a0 = 06000B30 /* 00634 80BA2424 0C010620 */ jal DynaPolyInfo_Alloc /* 00638 80BA2428 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 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 f6db0c44e4..c648ae22eb 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 @@ -66,8 +66,8 @@ glabel func_80BA3C94 /* 012A0 80BA3D40 8E4402D0 */ lw $a0, 0x02D0($s2) ## 000002D0 /* 012A4 80BA3D44 0C024DDD */ jal Gfx_CallSetupDL /* 012A8 80BA3D48 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 -/* 012AC 80BA3D4C 3C040405 */ lui $a0, 0x0405 ## $a0 = 04050000 -/* 012B0 80BA3D50 2484C160 */ addiu $a0, $a0, 0xC160 ## $a0 = 0404C160 +/* 012AC 80BA3D4C 3C040405 */ lui $a0, %hi(D_0404C160) ## $a0 = 04050000 +/* 012B0 80BA3D50 2484C160 */ addiu $a0, $a0, %lo(D_0404C160) ## $a0 = 0404C160 /* 012B4 80BA3D54 0004C900 */ sll $t9, $a0, 4 /* 012B8 80BA3D58 AE4202D0 */ sw $v0, 0x02D0($s2) ## 000002D0 /* 012BC 80BA3D5C 00194702 */ srl $t0, $t9, 28 @@ -88,8 +88,8 @@ glabel func_80BA3C94 /* 012F8 80BA3D98 01816821 */ addu $t5, $t4, $at /* 012FC 80BA3D9C AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 01300 80BA3DA0 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 01304 80BA3DA4 3C180405 */ lui $t8, 0x0405 ## $t8 = 04050000 -/* 01308 80BA3DA8 2718D160 */ addiu $t8, $t8, 0xD160 ## $t8 = 0404D160 +/* 01304 80BA3DA4 3C180405 */ lui $t8, %hi(D_0404D160) ## $t8 = 04050000 +/* 01308 80BA3DA8 2718D160 */ addiu $t8, $t8, %lo(D_0404D160) ## $t8 = 0404D160 /* 0130C 80BA3DAC 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 01310 80BA3DB0 AE4E02D0 */ sw $t6, 0x02D0($s2) ## 000002D0 /* 01314 80BA3DB4 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 @@ -105,8 +105,8 @@ glabel func_80BA3C94 /* 0133C 80BA3DDC 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 /* 01340 80BA3DE0 02815021 */ addu $t2, $s4, $at /* 01344 80BA3DE4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01348 80BA3DE8 3C090405 */ lui $t1, 0x0405 ## $t1 = 04050000 -/* 0134C 80BA3DEC 2529D1A8 */ addiu $t1, $t1, 0xD1A8 ## $t1 = 0404D1A8 +/* 01348 80BA3DE8 3C090405 */ lui $t1, %hi(D_0404D1A8) ## $t1 = 04050000 +/* 0134C 80BA3DEC 2529D1A8 */ addiu $t1, $t1, %lo(D_0404D1A8) ## $t1 = 0404D1A8 /* 01350 80BA3DF0 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 /* 01354 80BA3DF4 AFA90048 */ sw $t1, 0x0048($sp) /* 01358 80BA3DF8 AFAA0040 */ sw $t2, 0x0040($sp) 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 9218f350cb..12a2515fa6 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 @@ -104,8 +104,8 @@ glabel func_80BA414C /* 017D0 80BA4270 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 /* 017D4 80BA4274 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 017D8 80BA4278 02015821 */ addu $t3, $s0, $at -/* 017DC 80BA427C 3C020405 */ lui $v0, 0x0405 ## $v0 = 04050000 -/* 017E0 80BA4280 24422DB0 */ addiu $v0, $v0, 0x2DB0 ## $v0 = 04052DB0 +/* 017DC 80BA427C 3C020405 */ lui $v0, %hi(D_04052DB0) ## $v0 = 04050000 +/* 017E0 80BA4280 24422DB0 */ addiu $v0, $v0, %lo(D_04052DB0) ## $v0 = 04052DB0 /* 017E4 80BA4284 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 017E8 80BA4288 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 017EC 80BA428C 0041C824 */ and $t9, $v0, $at @@ -115,10 +115,10 @@ glabel func_80BA414C /* 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 -/* 01810 80BA42B0 25290050 */ addiu $t1, $t1, 0x0050 ## $t1 = 04010050 -/* 01814 80BA42B4 25080000 */ addiu $t0, $t0, 0x0000 ## $t0 = 01000000 +/* 01808 80BA42A8 3C080100 */ lui $t0, %hi(D_01000000) ## $t0 = 01000000 +/* 0180C 80BA42AC 3C090401 */ lui $t1, %hi(D_04010050) ## $t1 = 04010000 +/* 01810 80BA42B0 25290050 */ addiu $t1, $t1, %lo(D_04010050) ## $t1 = 04010050 +/* 01814 80BA42B4 25080000 */ addiu $t0, $t0, %lo(D_01000000) ## $t0 = 01000000 /* 01818 80BA42B8 01CFC021 */ addu $t8, $t6, $t7 /* 0181C 80BA42BC 4481F000 */ mtc1 $at, $f30 ## $f30 = 80.00 /* 01820 80BA42C0 4481E000 */ mtc1 $at, $f28 ## $f28 = 80.00 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 a1369cd398..9f84e13526 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 @@ -126,22 +126,22 @@ glabel func_80BA49BC /* 020B8 80BA4B58 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 /* 020BC 80BA4B5C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 020C0 80BA4B60 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 -/* 020C4 80BA4B64 3C180100 */ lui $t8, 0x0100 ## $t8 = 01000000 +/* 020C4 80BA4B64 3C180100 */ lui $t8, %hi(D_01000000) ## $t8 = 01000000 /* 020C8 80BA4B68 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 020CC 80BA4B6C AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 020D0 80BA4B70 27180000 */ addiu $t8, $t8, 0x0000 ## $t8 = 01000000 +/* 020D0 80BA4B70 27180000 */ addiu $t8, $t8, %lo(D_01000000) ## $t8 = 01000000 /* 020D4 80BA4B74 35CE0001 */ ori $t6, $t6, 0x0001 ## $t6 = DA380001 /* 020D8 80BA4B78 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 020DC 80BA4B7C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 020E0 80BA4B80 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 020E4 80BA4B84 3C04E700 */ lui $a0, 0xE700 ## $a0 = E7000000 -/* 020E8 80BA4B88 3C090403 */ lui $t1, 0x0403 ## $t1 = 04030000 +/* 020E8 80BA4B88 3C090403 */ lui $t1, %hi(D_0402CF30) ## $t1 = 04030000 /* 020EC 80BA4B8C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 020F0 80BA4B90 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 020F4 80BA4B94 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 020F8 80BA4B98 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 /* 020FC 80BA4B9C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 02100 80BA4BA0 2529CF30 */ addiu $t1, $t1, 0xCF30 ## $t1 = 0402CF30 +/* 02100 80BA4BA0 2529CF30 */ addiu $t1, $t1, %lo(D_0402CF30) ## $t1 = 0402CF30 /* 02104 80BA4BA4 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 /* 02108 80BA4BA8 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 0210C 80BA4BAC AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 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 cc28231f4b..6449d1db45 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 @@ -362,13 +362,13 @@ glabel func_80BA4D7C /* 027E8 80BA5288 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 027EC 80BA528C 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 /* 027F0 80BA5290 3C04E700 */ lui $a0, 0xE700 ## $a0 = E7000000 -/* 027F4 80BA5294 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 +/* 027F4 80BA5294 3C0F0601 */ lui $t7, %hi(D_06009620) ## $t7 = 06010000 /* 027F8 80BA5298 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 027FC 80BA529C AD0D02D0 */ sw $t5, 0x02D0($t0) ## 000002D0 /* 02800 80BA52A0 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 02804 80BA52A4 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 /* 02808 80BA52A8 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 0280C 80BA52AC 25EF9620 */ addiu $t7, $t7, 0x9620 ## $t7 = 06009620 +/* 0280C 80BA52AC 25EF9620 */ addiu $t7, $t7, %lo(D_06009620) ## $t7 = 06009620 /* 02810 80BA52B0 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 /* 02814 80BA52B4 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 02818 80BA52B8 AD0E02D0 */ sw $t6, 0x02D0($t0) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s index 36d3d254b2..fe609ccf85 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s @@ -135,8 +135,8 @@ glabel func_80BA54AC .L80BA5660: /* 02BC0 80BA5660 02770019 */ multu $s3, $s7 /* 02BC4 80BA5664 00138080 */ sll $s0, $s3, 2 -/* 02BC8 80BA5668 3C150600 */ lui $s5, 0x0600 ## $s5 = 06000000 -/* 02BCC 80BA566C 26B55FF0 */ addiu $s5, $s5, 0x5FF0 ## $s5 = 06005FF0 +/* 02BC8 80BA5668 3C150600 */ lui $s5, %hi(D_06005FF0) ## $s5 = 06000000 +/* 02BCC 80BA566C 26B55FF0 */ addiu $s5, $s5, %lo(D_06005FF0) ## $s5 = 06005FF0 /* 02BD0 80BA5670 03B0C021 */ addu $t8, $sp, $s0 /* 02BD4 80BA5674 03B0C821 */ addu $t9, $sp, $s0 /* 02BD8 80BA5678 03B04021 */ addu $t0, $sp, $s0 diff --git a/src/code/z_debug.c b/src/code/z_debug.c index e585edc73f..91137e190e 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -151,16 +151,19 @@ void func_8006390C(Input* input) { gGameInfo->dpadLast = dpad; } - increment = (CHECK_BTN_ANY(dpad, BTN_DRIGHT)) ? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B) ? 1000 - : CHECK_BTN_ALL(input->cur.button, BTN_A) ? 100 - : CHECK_BTN_ALL(input->cur.button, BTN_B) ? 10 - : 1) - : (CHECK_BTN_ANY(dpad, BTN_DLEFT)) - ? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B) ? -1000 - : CHECK_BTN_ALL(input->cur.button, BTN_A) ? -100 - : CHECK_BTN_ALL(input->cur.button, BTN_B) ? -10 - : -1) - : 0; + increment = (CHECK_BTN_ANY(dpad, BTN_DRIGHT)) + ? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B) + ? 1000 + : CHECK_BTN_ALL(input->cur.button, BTN_A) + ? 100 + : CHECK_BTN_ALL(input->cur.button, BTN_B) ? 10 : 1) + : (CHECK_BTN_ANY(dpad, BTN_DLEFT)) + ? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B) + ? -1000 + : CHECK_BTN_ALL(input->cur.button, BTN_A) + ? -100 + : CHECK_BTN_ALL(input->cur.button, BTN_B) ? -10 : -1) + : 0; gGameInfo->data[gGameInfo->regCur + regGroup] += increment; if (CHECK_BTN_ANY(dpad, BTN_DUP)) { diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c index 8c14f3ca54..737531d1f1 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c @@ -12,7 +12,7 @@ void BgSpot08Iceblock_Draw(Actor* thisx, GlobalContext* globalCtx); extern UNK_TYPE D_06000DE0; extern UNK_TYPE D_06002BD0; extern UNK_TYPE D_06002FD8; -extern UNK_TYPE D_060048DC; +extern UNK_TYPE D_06001904; /* const ActorInit Bg_Spot08_Iceblock_InitVars = { diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c index bdaad8ba33..1aea5a3b2f 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c @@ -22,12 +22,12 @@ extern UNK_TYPE D_06016CD8; extern UNK_TYPE D_06016F88; extern UNK_TYPE D_06017028; extern UNK_TYPE D_06017170; -extern UNK_TYPE D_0601D9A0; -extern UNK_TYPE D_0601E8D0; +extern UNK_TYPE D_0601EE60; +extern UNK_TYPE D_06000F30; extern UNK_TYPE D_0601EB14; extern UNK_TYPE D_0601EB40; extern UNK_TYPE D_0601EE34; -extern UNK_TYPE D_0601F1D0; +extern UNK_TYPE D_06000900; /* const ActorInit Demo_Ik_InitVars = { diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index 158ad30973..725a25ca2f 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -57,7 +57,9 @@ Vec3f D_80B16E7C = { }; UNK_TYPE D_80B16E88[] = { - 0x06007F80, 0x06006EC0, 0x060072C0, + 0x06007F80, + 0x06006EC0, + 0x060072C0, }; extern AnimationHeader D_060017E8; diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 0c26f8bc83..ac92bbc417 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -46,7 +46,7 @@ extern UNK_TYPE D_060113D0; extern UNK_TYPE D_06011410; extern UNK_TYPE D_06012160; extern UNK_TYPE D_060121F0; -extern UNK_TYPE D_060122E0; +extern UNK_TYPE D_06011070; extern UNK_TYPE D_06013330; extern UNK_TYPE D_060133B0; extern UNK_TYPE D_06013590; diff --git a/undefined_syms.txt b/undefined_syms.txt index 74fc8c4683..1c86509372 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -1972,7 +1972,7 @@ D_060038FC = 0x060038FC; D_06000DE0 = 0x06000DE0; D_06002BD0 = 0x06002BD0; D_06002FD8 = 0x06002FD8; -D_060048DC = 0x060048DC; +D_06001904 = 0x06001904; // z_bg_toki_hikari D_06000880 = 0x06000880; @@ -2271,12 +2271,12 @@ D_06016CD8 = 0x06016CD8; D_06016F88 = 0x06016F88; D_06017028 = 0x06017028; D_06017170 = 0x06017170; -D_0601D9A0 = 0x0601D9A0; -D_0601E8D0 = 0x0601E8D0; +D_0601EE60 = 0x0601EE60; +D_06000F30 = 0x06000F30; D_0601EB14 = 0x0601EB14; D_0601EB40 = 0x0601EB40; D_0601EE34 = 0x0601EE34; -D_0601F1D0 = 0x0601F1D0; +D_06000900 = 0x06000900; // z_demo_kankyo D_01000000 = 0x01000000; @@ -2988,7 +2988,7 @@ D_060113D0 = 0x060113D0; D_06011410 = 0x06011410; D_06012160 = 0x06012160; D_060121F0 = 0x060121F0; -D_060122E0 = 0x060122E0; +D_06011070 = 0x06011070; D_06013330 = 0x06013330; D_060133B0 = 0x060133B0; D_06013590 = 0x06013590;