diff --git a/asm/data/code_1000_len_60.data.s b/asm/data/code_1000_len_60.data.s index 6d2e4d2ac4..162a1e7f54 100644 --- a/asm/data/code_1000_len_60.data.s +++ b/asm/data/code_1000_len_60.data.s @@ -41,10 +41,10 @@ glabel D_800741A2 glabel D_800741A8 .word 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 -glabel D_800741F0 +glabel gMatrixListPos .short 0x0000, 0x0000 -glabel D_800741F4 +glabel gCurrentDisplayContextIndex .word 0x00000000 glabel D_800741F8 diff --git a/asm/nonmatchings/battle/area_hos/47F0D0/func_802184C0_47F570.s b/asm/nonmatchings/battle/area_hos/47F0D0/func_802184C0_47F570.s index aad414df96..25aaa3b774 100644 --- a/asm/nonmatchings/battle/area_hos/47F0D0/func_802184C0_47F570.s +++ b/asm/nonmatchings/battle/area_hos/47F0D0/func_802184C0_47F570.s @@ -104,8 +104,8 @@ glabel func_802184C0_47F570 /* 47F6F0 80218640 1440FFB9 */ bnez $v0, .L80218528 /* 47F6F4 80218644 02140018 */ mult $s0, $s4 .L80218648: -/* 47F6F8 80218648 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 47F6FC 8021864C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 47F6F8 80218648 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 47F6FC 8021864C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 47F700 80218650 8C620000 */ lw $v0, ($v1) /* 47F704 80218654 0260202D */ daddu $a0, $s3, $zero /* 47F708 80218658 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/battle/area_hos/47F0D0/func_802186B8_47F768.s b/asm/nonmatchings/battle/area_hos/47F0D0/func_802186B8_47F768.s index 58b6fc1d11..28cbea0b9f 100644 --- a/asm/nonmatchings/battle/area_hos/47F0D0/func_802186B8_47F768.s +++ b/asm/nonmatchings/battle/area_hos/47F0D0/func_802186B8_47F768.s @@ -71,11 +71,11 @@ glabel func_802186B8_47F768 /* 47F868 802187B8 3C018022 */ lui $at, %hi(D_80225FB0) /* 47F86C 802187BC D4225FB0 */ ldc1 $f2, %lo(D_80225FB0)($at) /* 47F870 802187C0 44820000 */ mtc1 $v0, $f0 -/* 47F874 802187C4 00000000 */ nop +/* 47F874 802187C4 00000000 */ nop /* 47F878 802187C8 46800021 */ cvt.d.w $f0, $f0 /* 47F87C 802187CC 46220000 */ add.d $f0, $f0, $f2 /* 47F880 802187D0 4620A03E */ c.le.d $f20, $f0 -/* 47F884 802187D4 00000000 */ nop +/* 47F884 802187D4 00000000 */ nop /* 47F888 802187D8 45030005 */ bc1tl .L802187F0 /* 47F88C 802187DC 46340001 */ sub.d $f0, $f0, $f20 /* 47F890 802187E0 4620010D */ trunc.w.d $f4, $f0 @@ -85,7 +85,7 @@ glabel func_802186B8_47F768 .L802187F0: /* 47F8A0 802187F0 4620010D */ trunc.w.d $f4, $f0 /* 47F8A4 802187F4 44022000 */ mfc1 $v0, $f4 -/* 47F8A8 802187F8 00000000 */ nop +/* 47F8A8 802187F8 00000000 */ nop /* 47F8AC 802187FC 00551025 */ or $v0, $v0, $s5 /* 47F8B0 80218800 A2220000 */ sb $v0, ($s1) .L80218804: @@ -103,11 +103,11 @@ glabel func_802186B8_47F768 /* 47F8DC 8021882C 3C018022 */ lui $at, %hi(D_80225FB8) /* 47F8E0 80218830 D4225FB8 */ ldc1 $f2, %lo(D_80225FB8)($at) /* 47F8E4 80218834 44820000 */ mtc1 $v0, $f0 -/* 47F8E8 80218838 00000000 */ nop +/* 47F8E8 80218838 00000000 */ nop /* 47F8EC 8021883C 46800021 */ cvt.d.w $f0, $f0 /* 47F8F0 80218840 46220000 */ add.d $f0, $f0, $f2 /* 47F8F4 80218844 4620A03E */ c.le.d $f20, $f0 -/* 47F8F8 80218848 00000000 */ nop +/* 47F8F8 80218848 00000000 */ nop /* 47F8FC 8021884C 45030005 */ bc1tl .L80218864 /* 47F900 80218850 46340001 */ sub.d $f0, $f0, $f20 /* 47F904 80218854 4620010D */ trunc.w.d $f4, $f0 @@ -117,7 +117,7 @@ glabel func_802186B8_47F768 .L80218864: /* 47F914 80218864 4620010D */ trunc.w.d $f4, $f0 /* 47F918 80218868 44022000 */ mfc1 $v0, $f4 -/* 47F91C 8021886C 00000000 */ nop +/* 47F91C 8021886C 00000000 */ nop /* 47F920 80218870 00551025 */ or $v0, $v0, $s5 /* 47F924 80218874 A0620000 */ sb $v0, ($v1) .L80218878: @@ -158,11 +158,11 @@ glabel func_802186B8_47F768 /* 47F9AC 802188FC 3C018022 */ lui $at, %hi(D_80225FC0) /* 47F9B0 80218900 D4225FC0 */ ldc1 $f2, %lo(D_80225FC0)($at) /* 47F9B4 80218904 44820000 */ mtc1 $v0, $f0 -/* 47F9B8 80218908 00000000 */ nop +/* 47F9B8 80218908 00000000 */ nop /* 47F9BC 8021890C 46800021 */ cvt.d.w $f0, $f0 /* 47F9C0 80218910 46220000 */ add.d $f0, $f0, $f2 /* 47F9C4 80218914 4620A03E */ c.le.d $f20, $f0 -/* 47F9C8 80218918 00000000 */ nop +/* 47F9C8 80218918 00000000 */ nop /* 47F9CC 8021891C 45030005 */ bc1tl .L80218934 /* 47F9D0 80218920 46340001 */ sub.d $f0, $f0, $f20 /* 47F9D4 80218924 4620010D */ trunc.w.d $f4, $f0 @@ -172,7 +172,7 @@ glabel func_802186B8_47F768 .L80218934: /* 47F9E4 80218934 4620010D */ trunc.w.d $f4, $f0 /* 47F9E8 80218938 44022000 */ mfc1 $v0, $f4 -/* 47F9EC 8021893C 00000000 */ nop +/* 47F9EC 8021893C 00000000 */ nop /* 47F9F0 80218940 00551025 */ or $v0, $v0, $s5 /* 47F9F4 80218944 A0820000 */ sb $v0, ($a0) .L80218948: @@ -182,8 +182,8 @@ glabel func_802186B8_47F768 /* 47FA04 80218954 1440FF77 */ bnez $v0, .L80218734 /* 47FA08 80218958 02130018 */ mult $s0, $s3 .L8021895C: -/* 47FA0C 8021895C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 47FA10 80218960 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 47FA0C 8021895C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 47FA10 80218960 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 47FA14 80218964 8C620000 */ lw $v0, ($v1) /* 47FA18 80218968 0240202D */ daddu $a0, $s2, $zero /* 47FA1C 8021896C 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/battle/area_hos/47F0D0/func_802189D0_47FA80.s b/asm/nonmatchings/battle/area_hos/47F0D0/func_802189D0_47FA80.s index 81a2af2e06..c0ca188e0c 100644 --- a/asm/nonmatchings/battle/area_hos/47F0D0/func_802189D0_47FA80.s +++ b/asm/nonmatchings/battle/area_hos/47F0D0/func_802189D0_47FA80.s @@ -71,11 +71,11 @@ glabel func_802189D0_47FA80 /* 47FB80 80218AD0 3C018022 */ lui $at, %hi(D_80225FC8) /* 47FB84 80218AD4 D4225FC8 */ ldc1 $f2, %lo(D_80225FC8)($at) /* 47FB88 80218AD8 44820000 */ mtc1 $v0, $f0 -/* 47FB8C 80218ADC 00000000 */ nop +/* 47FB8C 80218ADC 00000000 */ nop /* 47FB90 80218AE0 46800021 */ cvt.d.w $f0, $f0 /* 47FB94 80218AE4 46220000 */ add.d $f0, $f0, $f2 /* 47FB98 80218AE8 4620A03E */ c.le.d $f20, $f0 -/* 47FB9C 80218AEC 00000000 */ nop +/* 47FB9C 80218AEC 00000000 */ nop /* 47FBA0 80218AF0 45030005 */ bc1tl .L80218B08 /* 47FBA4 80218AF4 46340001 */ sub.d $f0, $f0, $f20 /* 47FBA8 80218AF8 4620010D */ trunc.w.d $f4, $f0 @@ -85,7 +85,7 @@ glabel func_802189D0_47FA80 .L80218B08: /* 47FBB8 80218B08 4620010D */ trunc.w.d $f4, $f0 /* 47FBBC 80218B0C 44022000 */ mfc1 $v0, $f4 -/* 47FBC0 80218B10 00000000 */ nop +/* 47FBC0 80218B10 00000000 */ nop /* 47FBC4 80218B14 00551025 */ or $v0, $v0, $s5 /* 47FBC8 80218B18 A2220000 */ sb $v0, ($s1) .L80218B1C: @@ -104,11 +104,11 @@ glabel func_802189D0_47FA80 /* 47FBF8 80218B48 44811800 */ mtc1 $at, $f3 /* 47FBFC 80218B4C 44801000 */ mtc1 $zero, $f2 /* 47FC00 80218B50 44820000 */ mtc1 $v0, $f0 -/* 47FC04 80218B54 00000000 */ nop +/* 47FC04 80218B54 00000000 */ nop /* 47FC08 80218B58 46800021 */ cvt.d.w $f0, $f0 /* 47FC0C 80218B5C 46220000 */ add.d $f0, $f0, $f2 /* 47FC10 80218B60 4620A03E */ c.le.d $f20, $f0 -/* 47FC14 80218B64 00000000 */ nop +/* 47FC14 80218B64 00000000 */ nop /* 47FC18 80218B68 45030005 */ bc1tl .L80218B80 /* 47FC1C 80218B6C 46340001 */ sub.d $f0, $f0, $f20 /* 47FC20 80218B70 4620010D */ trunc.w.d $f4, $f0 @@ -118,7 +118,7 @@ glabel func_802189D0_47FA80 .L80218B80: /* 47FC30 80218B80 4620010D */ trunc.w.d $f4, $f0 /* 47FC34 80218B84 44022000 */ mfc1 $v0, $f4 -/* 47FC38 80218B88 00000000 */ nop +/* 47FC38 80218B88 00000000 */ nop /* 47FC3C 80218B8C 00551025 */ or $v0, $v0, $s5 /* 47FC40 80218B90 A0620000 */ sb $v0, ($v1) .L80218B94: @@ -159,11 +159,11 @@ glabel func_802189D0_47FA80 /* 47FCC8 80218C18 3C018022 */ lui $at, %hi(D_80225FD0) /* 47FCCC 80218C1C D4225FD0 */ ldc1 $f2, %lo(D_80225FD0)($at) /* 47FCD0 80218C20 44820000 */ mtc1 $v0, $f0 -/* 47FCD4 80218C24 00000000 */ nop +/* 47FCD4 80218C24 00000000 */ nop /* 47FCD8 80218C28 46800021 */ cvt.d.w $f0, $f0 /* 47FCDC 80218C2C 46220000 */ add.d $f0, $f0, $f2 /* 47FCE0 80218C30 4620A03E */ c.le.d $f20, $f0 -/* 47FCE4 80218C34 00000000 */ nop +/* 47FCE4 80218C34 00000000 */ nop /* 47FCE8 80218C38 45030005 */ bc1tl .L80218C50 /* 47FCEC 80218C3C 46340001 */ sub.d $f0, $f0, $f20 /* 47FCF0 80218C40 4620010D */ trunc.w.d $f4, $f0 @@ -173,7 +173,7 @@ glabel func_802189D0_47FA80 .L80218C50: /* 47FD00 80218C50 4620010D */ trunc.w.d $f4, $f0 /* 47FD04 80218C54 44022000 */ mfc1 $v0, $f4 -/* 47FD08 80218C58 00000000 */ nop +/* 47FD08 80218C58 00000000 */ nop /* 47FD0C 80218C5C 00551025 */ or $v0, $v0, $s5 /* 47FD10 80218C60 A0820000 */ sb $v0, ($a0) .L80218C64: @@ -183,8 +183,8 @@ glabel func_802189D0_47FA80 /* 47FD20 80218C70 1440FF76 */ bnez $v0, .L80218A4C /* 47FD24 80218C74 02130018 */ mult $s0, $s3 .L80218C78: -/* 47FD28 80218C78 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 47FD2C 80218C7C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 47FD28 80218C78 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 47FD2C 80218C7C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 47FD30 80218C80 8C620000 */ lw $v0, ($v1) /* 47FD34 80218C84 0240202D */ daddu $a0, $s2, $zero /* 47FD38 80218C88 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/battle/area_hos/47F0D0/func_80218CEC_47FD9C.s b/asm/nonmatchings/battle/area_hos/47F0D0/func_80218CEC_47FD9C.s index 9ea06480ec..177fa1d8bb 100644 --- a/asm/nonmatchings/battle/area_hos/47F0D0/func_80218CEC_47FD9C.s +++ b/asm/nonmatchings/battle/area_hos/47F0D0/func_80218CEC_47FD9C.s @@ -72,11 +72,11 @@ glabel func_80218CEC_47FD9C /* 47FEA0 80218DF0 44811800 */ mtc1 $at, $f3 /* 47FEA4 80218DF4 44801000 */ mtc1 $zero, $f2 /* 47FEA8 80218DF8 44820000 */ mtc1 $v0, $f0 -/* 47FEAC 80218DFC 00000000 */ nop +/* 47FEAC 80218DFC 00000000 */ nop /* 47FEB0 80218E00 46800021 */ cvt.d.w $f0, $f0 /* 47FEB4 80218E04 46220000 */ add.d $f0, $f0, $f2 /* 47FEB8 80218E08 4620A03E */ c.le.d $f20, $f0 -/* 47FEBC 80218E0C 00000000 */ nop +/* 47FEBC 80218E0C 00000000 */ nop /* 47FEC0 80218E10 45030005 */ bc1tl .L80218E28 /* 47FEC4 80218E14 46340001 */ sub.d $f0, $f0, $f20 /* 47FEC8 80218E18 4620010D */ trunc.w.d $f4, $f0 @@ -86,7 +86,7 @@ glabel func_80218CEC_47FD9C .L80218E28: /* 47FED8 80218E28 4620010D */ trunc.w.d $f4, $f0 /* 47FEDC 80218E2C 44022000 */ mfc1 $v0, $f4 -/* 47FEE0 80218E30 00000000 */ nop +/* 47FEE0 80218E30 00000000 */ nop /* 47FEE4 80218E34 00551025 */ or $v0, $v0, $s5 /* 47FEE8 80218E38 A2220000 */ sb $v0, ($s1) .L80218E3C: @@ -104,11 +104,11 @@ glabel func_80218CEC_47FD9C /* 47FF14 80218E64 3C018022 */ lui $at, %hi(D_80225FD8) /* 47FF18 80218E68 D4225FD8 */ ldc1 $f2, %lo(D_80225FD8)($at) /* 47FF1C 80218E6C 44820000 */ mtc1 $v0, $f0 -/* 47FF20 80218E70 00000000 */ nop +/* 47FF20 80218E70 00000000 */ nop /* 47FF24 80218E74 46800021 */ cvt.d.w $f0, $f0 /* 47FF28 80218E78 46220000 */ add.d $f0, $f0, $f2 /* 47FF2C 80218E7C 4620A03E */ c.le.d $f20, $f0 -/* 47FF30 80218E80 00000000 */ nop +/* 47FF30 80218E80 00000000 */ nop /* 47FF34 80218E84 45030005 */ bc1tl .L80218E9C /* 47FF38 80218E88 46340001 */ sub.d $f0, $f0, $f20 /* 47FF3C 80218E8C 4620010D */ trunc.w.d $f4, $f0 @@ -118,7 +118,7 @@ glabel func_80218CEC_47FD9C .L80218E9C: /* 47FF4C 80218E9C 4620010D */ trunc.w.d $f4, $f0 /* 47FF50 80218EA0 44022000 */ mfc1 $v0, $f4 -/* 47FF54 80218EA4 00000000 */ nop +/* 47FF54 80218EA4 00000000 */ nop /* 47FF58 80218EA8 00551025 */ or $v0, $v0, $s5 /* 47FF5C 80218EAC A0620000 */ sb $v0, ($v1) .L80218EB0: @@ -159,11 +159,11 @@ glabel func_80218CEC_47FD9C /* 47FFE4 80218F34 3C018022 */ lui $at, %hi(D_80225FE0) /* 47FFE8 80218F38 D4225FE0 */ ldc1 $f2, %lo(D_80225FE0)($at) /* 47FFEC 80218F3C 44820000 */ mtc1 $v0, $f0 -/* 47FFF0 80218F40 00000000 */ nop +/* 47FFF0 80218F40 00000000 */ nop /* 47FFF4 80218F44 46800021 */ cvt.d.w $f0, $f0 /* 47FFF8 80218F48 46220000 */ add.d $f0, $f0, $f2 /* 47FFFC 80218F4C 4620A03E */ c.le.d $f20, $f0 -/* 480000 80218F50 00000000 */ nop +/* 480000 80218F50 00000000 */ nop /* 480004 80218F54 45030005 */ bc1tl .L80218F6C /* 480008 80218F58 46340001 */ sub.d $f0, $f0, $f20 /* 48000C 80218F5C 4620010D */ trunc.w.d $f4, $f0 @@ -173,7 +173,7 @@ glabel func_80218CEC_47FD9C .L80218F6C: /* 48001C 80218F6C 4620010D */ trunc.w.d $f4, $f0 /* 480020 80218F70 44022000 */ mfc1 $v0, $f4 -/* 480024 80218F74 00000000 */ nop +/* 480024 80218F74 00000000 */ nop /* 480028 80218F78 00551025 */ or $v0, $v0, $s5 /* 48002C 80218F7C A0820000 */ sb $v0, ($a0) .L80218F80: @@ -183,8 +183,8 @@ glabel func_80218CEC_47FD9C /* 48003C 80218F8C 1440FF76 */ bnez $v0, .L80218D68 /* 480040 80218F90 02130018 */ mult $s0, $s3 .L80218F94: -/* 480044 80218F94 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 480048 80218F98 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 480044 80218F94 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 480048 80218F98 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 48004C 80218F9C 8C620000 */ lw $v0, ($v1) /* 480050 80218FA0 0240202D */ daddu $a0, $s2, $zero /* 480054 80218FA4 0040802D */ daddu $s0, $v0, $zero @@ -212,5 +212,5 @@ glabel func_80218CEC_47FD9C /* 4800AC 80218FFC D7B40040 */ ldc1 $f20, 0x40($sp) /* 4800B0 80219000 03E00008 */ jr $ra /* 4800B4 80219004 27BD0048 */ addiu $sp, $sp, 0x48 -/* 4800B8 80219008 00000000 */ nop -/* 4800BC 8021900C 00000000 */ nop +/* 4800B8 80219008 00000000 */ nop +/* 4800BC 8021900C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219A40_448E80.s b/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219A40_448E80.s index aaa43715e4..270f9a293c 100644 --- a/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219A40_448E80.s +++ b/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219A40_448E80.s @@ -104,8 +104,8 @@ glabel func_80219A40_448E80 /* 449000 80219BC0 1440FFB8 */ bnez $v0, .L80219AA4 /* 449004 80219BC4 02130018 */ mult $s0, $s3 .L80219BC8: -/* 449008 80219BC8 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 44900C 80219BCC 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 449008 80219BC8 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 44900C 80219BCC 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 449010 80219BD0 8C620000 */ lw $v0, ($v1) /* 449014 80219BD4 02C0202D */ daddu $a0, $s6, $zero /* 449018 80219BD8 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/battle/area_kzn2/59E6E0/func_8021835C_59EA3C.s b/asm/nonmatchings/battle/area_kzn2/59E6E0/func_8021835C_59EA3C.s index 7a10d87b03..b47070d4af 100644 --- a/asm/nonmatchings/battle/area_kzn2/59E6E0/func_8021835C_59EA3C.s +++ b/asm/nonmatchings/battle/area_kzn2/59E6E0/func_8021835C_59EA3C.s @@ -42,16 +42,16 @@ glabel func_8021835C_59EA3C /* 59EACC 802183EC 50400005 */ beql $v0, $zero, .L80218404 /* 59EAD0 802183F0 24020002 */ addiu $v0, $zero, 2 /* 59EAD4 802183F4 10E00009 */ beqz $a3, .L8021841C -/* 59EAD8 802183F8 00000000 */ nop +/* 59EAD8 802183F8 00000000 */ nop /* 59EADC 802183FC 0808621A */ j .L80218868 -/* 59EAE0 80218400 00000000 */ nop +/* 59EAE0 80218400 00000000 */ nop .L80218404: /* 59EAE4 80218404 10E2000B */ beq $a3, $v0, .L80218434 /* 59EAE8 80218408 24020003 */ addiu $v0, $zero, 3 /* 59EAEC 8021840C 10E2000A */ beq $a3, $v0, .L80218438 /* 59EAF0 80218410 24140005 */ addiu $s4, $zero, 5 /* 59EAF4 80218414 0808621A */ j .L80218868 -/* 59EAF8 80218418 00000000 */ nop +/* 59EAF8 80218418 00000000 */ nop .L8021841C: /* 59EAFC 8021841C 3C014120 */ lui $at, 0x4120 /* 59EB00 80218420 4481C000 */ mtc1 $at, $f24 @@ -89,21 +89,21 @@ glabel func_8021835C_59EA3C /* 59EB68 80218488 C444006C */ lwc1 $f4, 0x6c($v0) /* 59EB6C 8021848C 46002081 */ sub.s $f2, $f4, $f0 /* 59EB70 80218490 4602D03C */ c.lt.s $f26, $f2 -/* 59EB74 80218494 00000000 */ nop +/* 59EB74 80218494 00000000 */ nop /* 59EB78 80218498 45000003 */ bc1f .L802184A8 -/* 59EB7C 8021849C 00000000 */ nop +/* 59EB7C 8021849C 00000000 */ nop /* 59EB80 802184A0 0808612E */ j .L802184B8 /* 59EB84 802184A4 46140000 */ add.s $f0, $f0, $f20 .L802184A8: /* 59EB88 802184A8 4616103C */ c.lt.s $f2, $f22 -/* 59EB8C 802184AC 00000000 */ nop +/* 59EB8C 802184AC 00000000 */ nop /* 59EB90 802184B0 45030001 */ bc1tl .L802184B8 /* 59EB94 802184B4 46142100 */ add.s $f4, $f4, $f20 .L802184B8: /* 59EB98 802184B8 46040000 */ add.s $f0, $f0, $f4 /* 59EB9C 802184BC 46000021 */ cvt.d.s $f0, $f0 /* 59EBA0 802184C0 46280002 */ mul.d $f0, $f0, $f8 -/* 59EBA4 802184C4 00000000 */ nop +/* 59EBA4 802184C4 00000000 */ nop /* 59EBA8 802184C8 46260000 */ add.d $f0, $f0, $f6 /* 59EBAC 802184CC 46200020 */ cvt.s.d $f0, $f0 .L802184D0: @@ -127,8 +127,8 @@ glabel func_8021835C_59EA3C /* 59EBF0 80218510 AC22B550 */ sw $v0, %lo(D_8022B550)($at) /* 59EBF4 80218514 0000382D */ daddu $a3, $zero, $zero .L80218518: -/* 59EBF8 80218518 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 59EBFC 8021851C 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 59EBF8 80218518 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 59EBFC 8021851C 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 59EC00 80218520 0040402D */ daddu $t0, $v0, $zero /* 59EC04 80218524 3C090100 */ lui $t1, 0x100 /* 59EC08 80218528 35294008 */ ori $t1, $t1, 0x4008 @@ -182,15 +182,15 @@ glabel func_8021835C_59EA3C /* 59ECC4 802185E4 24900016 */ addiu $s0, $a0, 0x16 .L802185E8: /* 59ECC8 802185E8 44911000 */ mtc1 $s1, $f2 -/* 59ECCC 802185EC 00000000 */ nop +/* 59ECCC 802185EC 00000000 */ nop /* 59ECD0 802185F0 468010A0 */ cvt.s.w $f2, $f2 /* 59ECD4 802185F4 44940000 */ mtc1 $s4, $f0 -/* 59ECD8 802185F8 00000000 */ nop +/* 59ECD8 802185F8 00000000 */ nop /* 59ECDC 802185FC 46800020 */ cvt.s.w $f0, $f0 /* 59ECE0 80218600 46001082 */ mul.s $f2, $f2, $f0 -/* 59ECE4 80218604 00000000 */ nop +/* 59ECE4 80218604 00000000 */ nop /* 59ECE8 80218608 44860000 */ mtc1 $a2, $f0 -/* 59ECEC 8021860C 00000000 */ nop +/* 59ECEC 8021860C 00000000 */ nop /* 59ECF0 80218610 46800020 */ cvt.s.w $f0, $f0 /* 59ECF4 80218614 C65A0098 */ lwc1 $f26, 0x98($s2) /* 59ECF8 80218618 C65C009C */ lwc1 $f28, 0x9c($s2) @@ -198,9 +198,9 @@ glabel func_8021835C_59EA3C /* 59ED00 80218620 46001083 */ div.s $f2, $f2, $f0 /* 59ED04 80218624 4600128D */ trunc.w.s $f10, $f2 /* 59ED08 80218628 44045000 */ mfc1 $a0, $f10 -/* 59ED0C 8021862C 00000000 */ nop +/* 59ED0C 8021862C 00000000 */ nop /* 59ED10 80218630 44840000 */ mtc1 $a0, $f0 -/* 59ED14 80218634 00000000 */ nop +/* 59ED14 80218634 00000000 */ nop /* 59ED18 80218638 46800020 */ cvt.s.w $f0, $f0 /* 59ED1C 8021863C 24830001 */ addiu $v1, $a0, 1 /* 59ED20 80218640 0074102A */ slt $v0, $v1, $s4 @@ -220,32 +220,32 @@ glabel func_8021835C_59EA3C /* 59ED54 80218674 460C2081 */ sub.s $f2, $f4, $f12 /* 59ED58 80218678 3C014334 */ lui $at, 0x4334 /* 59ED5C 8021867C 44810000 */ mtc1 $at, $f0 -/* 59ED60 80218680 00000000 */ nop +/* 59ED60 80218680 00000000 */ nop /* 59ED64 80218684 4602003C */ c.lt.s $f0, $f2 -/* 59ED68 80218688 00000000 */ nop +/* 59ED68 80218688 00000000 */ nop /* 59ED6C 8021868C 45000006 */ bc1f .L802186A8 -/* 59ED70 80218690 00000000 */ nop +/* 59ED70 80218690 00000000 */ nop /* 59ED74 80218694 3C0143B4 */ lui $at, 0x43b4 /* 59ED78 80218698 44815000 */ mtc1 $at, $f10 -/* 59ED7C 8021869C 00000000 */ nop +/* 59ED7C 8021869C 00000000 */ nop /* 59ED80 802186A0 460A2101 */ sub.s $f4, $f4, $f10 /* 59ED84 802186A4 460C2081 */ sub.s $f2, $f4, $f12 .L802186A8: /* 59ED88 802186A8 3C01C334 */ lui $at, 0xc334 /* 59ED8C 802186AC 44810000 */ mtc1 $at, $f0 -/* 59ED90 802186B0 00000000 */ nop +/* 59ED90 802186B0 00000000 */ nop /* 59ED94 802186B4 4600103C */ c.lt.s $f2, $f0 -/* 59ED98 802186B8 00000000 */ nop +/* 59ED98 802186B8 00000000 */ nop /* 59ED9C 802186BC 45020006 */ bc1fl .L802186D8 /* 59EDA0 802186C0 460C2001 */ sub.s $f0, $f4, $f12 /* 59EDA4 802186C4 3C0143B4 */ lui $at, 0x43b4 /* 59EDA8 802186C8 44815000 */ mtc1 $at, $f10 -/* 59EDAC 802186CC 00000000 */ nop +/* 59EDAC 802186CC 00000000 */ nop /* 59EDB0 802186D0 460A2100 */ add.s $f4, $f4, $f10 /* 59EDB4 802186D4 460C2001 */ sub.s $f0, $f4, $f12 .L802186D8: /* 59EDB8 802186D8 46060002 */ mul.s $f0, $f0, $f6 -/* 59EDBC 802186DC 00000000 */ nop +/* 59EDBC 802186DC 00000000 */ nop /* 59EDC0 802186E0 460C0580 */ add.s $f22, $f0, $f12 /* 59EDC4 802186E4 4600B306 */ mov.s $f12, $f22 .L802186E8: @@ -255,12 +255,12 @@ glabel func_8021835C_59EA3C /* 59EDD4 802186F4 0C00A8BB */ jal sin_deg /* 59EDD8 802186F8 AFA8002C */ sw $t0, 0x2c($sp) /* 59EDDC 802186FC 46180502 */ mul.s $f20, $f0, $f24 -/* 59EDE0 80218700 00000000 */ nop +/* 59EDE0 80218700 00000000 */ nop /* 59EDE4 80218704 0C00A8D4 */ jal cos_deg /* 59EDE8 80218708 4600B306 */ mov.s $f12, $f22 /* 59EDEC 8021870C 46000007 */ neg.s $f0, $f0 /* 59EDF0 80218710 46180002 */ mul.s $f0, $f0, $f24 -/* 59EDF4 80218714 00000000 */ nop +/* 59EDF4 80218714 00000000 */ nop /* 59EDF8 80218718 4614D100 */ add.s $f4, $f26, $f20 /* 59EDFC 8021871C 4600E080 */ add.s $f2, $f28, $f0 /* 59EE00 80218720 4614D501 */ sub.s $f20, $f26, $f20 @@ -269,7 +269,7 @@ glabel func_8021835C_59EA3C /* 59EE0C 8021872C 4600E001 */ sub.s $f0, $f28, $f0 /* 59EE10 80218730 4600228D */ trunc.w.s $f10, $f4 /* 59EE14 80218734 44025000 */ mfc1 $v0, $f10 -/* 59EE18 80218738 00000000 */ nop +/* 59EE18 80218738 00000000 */ nop /* 59EE1C 8021873C A6620000 */ sh $v0, ($s3) /* 59EE20 80218740 4600128D */ trunc.w.s $f10, $f2 /* 59EE24 80218744 44025000 */ mfc1 $v0, $f10 @@ -290,7 +290,7 @@ glabel func_8021835C_59EA3C /* 59EE60 80218780 A6620000 */ sh $v0, ($s3) /* 59EE64 80218784 4600028D */ trunc.w.s $f10, $f0 /* 59EE68 80218788 44025000 */ mfc1 $v0, $f10 -/* 59EE6C 8021878C 00000000 */ nop +/* 59EE6C 8021878C 00000000 */ nop /* 59EE70 80218790 A602FFF4 */ sh $v0, -0xc($s0) /* 59EE74 80218794 24020400 */ addiu $v0, $zero, 0x400 /* 59EE78 80218798 A603FFF6 */ sh $v1, -0xa($s0) @@ -339,8 +339,8 @@ glabel func_8021835C_59EA3C /* 59EF18 80218838 28E20004 */ slti $v0, $a3, 4 /* 59EF1C 8021883C 1440FF4F */ bnez $v0, .L8021857C /* 59EF20 80218840 26B501E0 */ addiu $s5, $s5, 0x1e0 -/* 59EF24 80218844 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 59EF28 80218848 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 59EF24 80218844 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 59EF28 80218848 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 59EF2C 8021884C 8C620000 */ lw $v0, ($v1) /* 59EF30 80218850 0040202D */ daddu $a0, $v0, $zero /* 59EF34 80218854 24420008 */ addiu $v0, $v0, 8 diff --git a/asm/nonmatchings/battle/area_pra2/660750/func_802186C0_660E10.s b/asm/nonmatchings/battle/area_pra2/660750/func_802186C0_660E10.s index b31aea44c1..fbace2d487 100644 --- a/asm/nonmatchings/battle/area_pra2/660750/func_802186C0_660E10.s +++ b/asm/nonmatchings/battle/area_pra2/660750/func_802186C0_660E10.s @@ -104,8 +104,8 @@ glabel func_802186C0_660E10 /* 660F90 80218840 1440FFB8 */ bnez $v0, .L80218724 /* 660F94 80218844 02130018 */ mult $s0, $s3 .L80218848: -/* 660F98 80218848 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 660F9C 8021884C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 660F98 80218848 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 660F9C 8021884C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 660FA0 80218850 8C620000 */ lw $v0, ($v1) /* 660FA4 80218854 02C0202D */ daddu $a0, $s6, $zero /* 660FA8 80218858 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_80219BB0_625750.s b/asm/nonmatchings/battle/area_sam/6253E0/func_80219BB0_625750.s index 45c28091f0..bc9eb80c03 100644 --- a/asm/nonmatchings/battle/area_sam/6253E0/func_80219BB0_625750.s +++ b/asm/nonmatchings/battle/area_sam/6253E0/func_80219BB0_625750.s @@ -104,8 +104,8 @@ glabel func_80219BB0_625750 /* 6258D0 80219D30 1440FFB8 */ bnez $v0, .L80219C14 /* 6258D4 80219D34 02130018 */ mult $s0, $s3 .L80219D38: -/* 6258D8 80219D38 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 6258DC 80219D3C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 6258D8 80219D38 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 6258DC 80219D3C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 6258E0 80219D40 8C620000 */ lw $v0, ($v1) /* 6258E4 80219D44 02C0202D */ daddu $a0, $s6, $zero /* 6258E8 80219D48 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_80219ED0_625A70.s b/asm/nonmatchings/battle/area_sam/6253E0/func_80219ED0_625A70.s index c215f2e12c..c192177778 100644 --- a/asm/nonmatchings/battle/area_sam/6253E0/func_80219ED0_625A70.s +++ b/asm/nonmatchings/battle/area_sam/6253E0/func_80219ED0_625A70.s @@ -104,8 +104,8 @@ glabel func_80219ED0_625A70 /* 625BF0 8021A050 1440FFB8 */ bnez $v0, .L80219F34 /* 625BF4 8021A054 02130018 */ mult $s0, $s3 .L8021A058: -/* 625BF8 8021A058 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 625BFC 8021A05C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 625BF8 8021A058 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 625BFC 8021A05C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 625C00 8021A060 8C620000 */ lw $v0, ($v1) /* 625C04 8021A064 02C0202D */ daddu $a0, $s6, $zero /* 625C08 8021A068 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A1F0_625D90.s b/asm/nonmatchings/battle/area_sam/6253E0/func_8021A1F0_625D90.s index 3d0c135204..d7dc78e9b4 100644 --- a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A1F0_625D90.s +++ b/asm/nonmatchings/battle/area_sam/6253E0/func_8021A1F0_625D90.s @@ -104,8 +104,8 @@ glabel func_8021A1F0_625D90 /* 625F10 8021A370 1440FFB8 */ bnez $v0, .L8021A254 /* 625F14 8021A374 02130018 */ mult $s0, $s3 .L8021A378: -/* 625F18 8021A378 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 625F1C 8021A37C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 625F18 8021A378 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 625F1C 8021A37C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 625F20 8021A380 8C620000 */ lw $v0, ($v1) /* 625F24 8021A384 02C0202D */ daddu $a0, $s6, $zero /* 625F28 8021A388 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A510_6260B0.s b/asm/nonmatchings/battle/area_sam/6253E0/func_8021A510_6260B0.s index 0bf2b5ff94..6f3c4bf53f 100644 --- a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A510_6260B0.s +++ b/asm/nonmatchings/battle/area_sam/6253E0/func_8021A510_6260B0.s @@ -104,8 +104,8 @@ glabel func_8021A510_6260B0 /* 626230 8021A690 1440FFB8 */ bnez $v0, .L8021A574 /* 626234 8021A694 02130018 */ mult $s0, $s3 .L8021A698: -/* 626238 8021A698 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 62623C 8021A69C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 626238 8021A698 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 62623C 8021A69C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 626240 8021A6A0 8C620000 */ lw $v0, ($v1) /* 626244 8021A6A4 02C0202D */ daddu $a0, $s6, $zero /* 626248 8021A6A8 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A830_6263D0.s b/asm/nonmatchings/battle/area_sam/6253E0/func_8021A830_6263D0.s index b48615f91b..6a94a09951 100644 --- a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A830_6263D0.s +++ b/asm/nonmatchings/battle/area_sam/6253E0/func_8021A830_6263D0.s @@ -104,8 +104,8 @@ glabel func_8021A830_6263D0 /* 626550 8021A9B0 1440FFB8 */ bnez $v0, .L8021A894 /* 626554 8021A9B4 02130018 */ mult $s0, $s3 .L8021A9B8: -/* 626558 8021A9B8 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 62655C 8021A9BC 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 626558 8021A9B8 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 62655C 8021A9BC 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 626560 8021A9C0 8C620000 */ lw $v0, ($v1) /* 626564 8021A9C4 02C0202D */ daddu $a0, $s6, $zero /* 626568 8021A9C8 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021AB50_6266F0.s b/asm/nonmatchings/battle/area_sam/6253E0/func_8021AB50_6266F0.s index ef3867e8d5..5c479a562a 100644 --- a/asm/nonmatchings/battle/area_sam/6253E0/func_8021AB50_6266F0.s +++ b/asm/nonmatchings/battle/area_sam/6253E0/func_8021AB50_6266F0.s @@ -104,8 +104,8 @@ glabel func_8021AB50_6266F0 /* 626870 8021ACD0 1440FFB8 */ bnez $v0, .L8021ABB4 /* 626874 8021ACD4 02130018 */ mult $s0, $s3 .L8021ACD8: -/* 626878 8021ACD8 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 62687C 8021ACDC 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 626878 8021ACD8 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 62687C 8021ACDC 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 626880 8021ACE0 8C620000 */ lw $v0, ($v1) /* 626884 8021ACE4 02C0202D */ daddu $a0, $s6, $zero /* 626888 8021ACE8 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218B80_63DD60.s b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218B80_63DD60.s index e1c6d41912..3312ce8da6 100644 --- a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218B80_63DD60.s +++ b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218B80_63DD60.s @@ -104,8 +104,8 @@ glabel func_80218B80_63DD60 /* 63DEE0 80218D00 1440FFB8 */ bnez $v0, .L80218BE4 /* 63DEE4 80218D04 02130018 */ mult $s0, $s3 .L80218D08: -/* 63DEE8 80218D08 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 63DEEC 80218D0C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 63DEE8 80218D08 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 63DEEC 80218D0C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 63DEF0 80218D10 8C620000 */ lw $v0, ($v1) /* 63DEF4 80218D14 02C0202D */ daddu $a0, $s6, $zero /* 63DEF8 80218D18 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218EA0_63E080.s b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218EA0_63E080.s index b4d45537bf..18a41e09da 100644 --- a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218EA0_63E080.s +++ b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218EA0_63E080.s @@ -104,8 +104,8 @@ glabel func_80218EA0_63E080 /* 63E200 80219020 1440FFB8 */ bnez $v0, .L80218F04 /* 63E204 80219024 02130018 */ mult $s0, $s3 .L80219028: -/* 63E208 80219028 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 63E20C 8021902C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 63E208 80219028 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 63E20C 8021902C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 63E210 80219030 8C620000 */ lw $v0, ($v1) /* 63E214 80219034 02C0202D */ daddu $a0, $s6, $zero /* 63E218 80219038 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_802191C0_63E3A0.s b/asm/nonmatchings/battle/area_sam2/63D9F0/func_802191C0_63E3A0.s index 2b1c5948a9..73bbffff92 100644 --- a/asm/nonmatchings/battle/area_sam2/63D9F0/func_802191C0_63E3A0.s +++ b/asm/nonmatchings/battle/area_sam2/63D9F0/func_802191C0_63E3A0.s @@ -104,8 +104,8 @@ glabel func_802191C0_63E3A0 /* 63E520 80219340 1440FFB8 */ bnez $v0, .L80219224 /* 63E524 80219344 02130018 */ mult $s0, $s3 .L80219348: -/* 63E528 80219348 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 63E52C 8021934C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 63E528 80219348 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 63E52C 8021934C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 63E530 80219350 8C620000 */ lw $v0, ($v1) /* 63E534 80219354 02C0202D */ daddu $a0, $s6, $zero /* 63E538 80219358 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_802194E0_63E6C0.s b/asm/nonmatchings/battle/area_sam2/63D9F0/func_802194E0_63E6C0.s index 9da3ad145e..a69f7621da 100644 --- a/asm/nonmatchings/battle/area_sam2/63D9F0/func_802194E0_63E6C0.s +++ b/asm/nonmatchings/battle/area_sam2/63D9F0/func_802194E0_63E6C0.s @@ -104,8 +104,8 @@ glabel func_802194E0_63E6C0 /* 63E840 80219660 1440FFB8 */ bnez $v0, .L80219544 /* 63E844 80219664 02130018 */ mult $s0, $s3 .L80219668: -/* 63E848 80219668 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 63E84C 8021966C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 63E848 80219668 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 63E84C 8021966C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 63E850 80219670 8C620000 */ lw $v0, ($v1) /* 63E854 80219674 02C0202D */ daddu $a0, $s6, $zero /* 63E858 80219678 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219800_63E9E0.s b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219800_63E9E0.s index 8b5b47b186..17ecc359ad 100644 --- a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219800_63E9E0.s +++ b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219800_63E9E0.s @@ -104,8 +104,8 @@ glabel func_80219800_63E9E0 /* 63EB60 80219980 1440FFB8 */ bnez $v0, .L80219864 /* 63EB64 80219984 02130018 */ mult $s0, $s3 .L80219988: -/* 63EB68 80219988 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 63EB6C 8021998C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 63EB68 80219988 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 63EB6C 8021998C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 63EB70 80219990 8C620000 */ lw $v0, ($v1) /* 63EB74 80219994 02C0202D */ daddu $a0, $s6, $zero /* 63EB78 80219998 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219B20_63ED00.s b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219B20_63ED00.s index 0abe59bec3..39e16ca0f7 100644 --- a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219B20_63ED00.s +++ b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219B20_63ED00.s @@ -104,8 +104,8 @@ glabel func_80219B20_63ED00 /* 63EE80 80219CA0 1440FFB8 */ bnez $v0, .L80219B84 /* 63EE84 80219CA4 02130018 */ mult $s0, $s3 .L80219CA8: -/* 63EE88 80219CA8 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 63EE8C 80219CAC 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 63EE88 80219CA8 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 63EE8C 80219CAC 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 63EE90 80219CB0 8C620000 */ lw $v0, ($v1) /* 63EE94 80219CB4 02C0202D */ daddu $a0, $s6, $zero /* 63EE98 80219CB8 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s b/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s index 60b7e1455f..2060e46a0a 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s @@ -4,8 +4,8 @@ glabel func_802E0DE0 /* 102660 802E0DE0 27BDFF28 */ addiu $sp, $sp, -0xd8 /* 102664 802E0DE4 AFB000A8 */ sw $s0, 0xa8($sp) -/* 102668 802E0DE8 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 10266C 802E0DEC 8E10A66C */ lw $s0, %lo(D_8009A66C)($s0) +/* 102668 802E0DE8 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 10266C 802E0DEC 8E10A66C */ lw $s0, %lo(gMasterGfxPos)($s0) /* 102670 802E0DF0 AFBF00CC */ sw $ra, 0xcc($sp) /* 102674 802E0DF4 AFBE00C8 */ sw $fp, 0xc8($sp) /* 102678 802E0DF8 AFB700C4 */ sw $s7, 0xc4($sp) @@ -53,7 +53,7 @@ glabel func_802E0DE0 /* 102720 802E0EA0 86420004 */ lh $v0, 4($s2) /* 102724 802E0EA4 44061000 */ mfc1 $a2, $f2 /* 102728 802E0EA8 44822000 */ mtc1 $v0, $f4 -/* 10272C 802E0EAC 00000000 */ nop +/* 10272C 802E0EAC 00000000 */ nop /* 102730 802E0EB0 46802120 */ cvt.s.w $f4, $f4 /* 102734 802E0EB4 44052000 */ mfc1 $a1, $f4 /* 102738 802E0EB8 0220202D */ daddu $a0, $s1, $zero @@ -64,10 +64,10 @@ glabel func_802E0DE0 /* 10274C 802E0ECC 0C019D80 */ jal guMtxCatF /* 102750 802E0ED0 0220302D */ daddu $a2, $s1, $zero /* 102754 802E0ED4 0220202D */ daddu $a0, $s1, $zero -/* 102758 802E0ED8 3C138007 */ lui $s3, %hi(D_800741F0) -/* 10275C 802E0EDC 267341F0 */ addiu $s3, $s3, %lo(D_800741F0) -/* 102760 802E0EE0 3C15800A */ lui $s5, %hi(D_8009A674) -/* 102764 802E0EE4 26B5A674 */ addiu $s5, $s5, %lo(D_8009A674) +/* 102758 802E0ED8 3C138007 */ lui $s3, %hi(gMatrixListPos) +/* 10275C 802E0EDC 267341F0 */ addiu $s3, $s3, %lo(gMatrixListPos) +/* 102760 802E0EE0 3C15800A */ lui $s5, %hi(gDisplayContext) +/* 102764 802E0EE4 26B5A674 */ addiu $s5, $s5, %lo(gDisplayContext) /* 102768 802E0EE8 96650000 */ lhu $a1, ($s3) /* 10276C 802E0EEC 8EA20000 */ lw $v0, ($s5) /* 102770 802E0EF0 00052980 */ sll $a1, $a1, 6 @@ -158,8 +158,8 @@ glabel func_802E0DE0 /* 1028C4 802E1044 96620000 */ lhu $v0, ($s3) /* 1028C8 802E1048 3C0DDA38 */ lui $t5, 0xda38 /* 1028CC 802E104C AD0D0000 */ sw $t5, ($t0) -/* 1028D0 802E1050 3C01800A */ lui $at, %hi(D_8009A66C) -/* 1028D4 802E1054 AC30A66C */ sw $s0, %lo(D_8009A66C)($at) +/* 1028D0 802E1050 3C01800A */ lui $at, %hi(gMasterGfxPos) +/* 1028D4 802E1054 AC30A66C */ sw $s0, %lo(gMasterGfxPos)($at) /* 1028D8 802E1058 24430001 */ addiu $v1, $v0, 1 /* 1028DC 802E105C 3042FFFF */ andi $v0, $v0, 0xffff /* 1028E0 802E1060 00021180 */ sll $v0, $v0, 6 diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E2BA4.s b/asm/nonmatchings/code_102610_len_2330/func_802E2BA4.s index d7fe10e3ab..f55f1b92fb 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E2BA4.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E2BA4.s @@ -4,8 +4,8 @@ glabel func_802E2BA4 /* 104424 802E2BA4 27BDFE80 */ addiu $sp, $sp, -0x180 /* 104428 802E2BA8 AFB20130 */ sw $s2, 0x130($sp) -/* 10442C 802E2BAC 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 104430 802E2BB0 8E52A66C */ lw $s2, %lo(D_8009A66C)($s2) +/* 10442C 802E2BAC 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 104430 802E2BB0 8E52A66C */ lw $s2, %lo(gMasterGfxPos)($s2) /* 104434 802E2BB4 F7BA0168 */ sdc1 $f26, 0x168($sp) /* 104438 802E2BB8 3C0143B4 */ lui $at, 0x43b4 /* 10443C 802E2BBC 4481D000 */ mtc1 $at, $f26 @@ -90,12 +90,12 @@ glabel func_802E2BA4 /* 10456C 802E2CEC 02978021 */ addu $s0, $s4, $s7 /* 104570 802E2CF0 9202008B */ lbu $v0, 0x8b($s0) /* 104574 802E2CF4 44820000 */ mtc1 $v0, $f0 -/* 104578 802E2CF8 00000000 */ nop +/* 104578 802E2CF8 00000000 */ nop /* 10457C 802E2CFC 46800020 */ cvt.s.w $f0, $f0 /* 104580 802E2D00 461A0002 */ mul.s $f0, $f0, $f26 -/* 104584 802E2D04 00000000 */ nop +/* 104584 802E2D04 00000000 */ nop /* 104588 802E2D08 46180002 */ mul.s $f0, $f0, $f24 -/* 10458C 802E2D0C 00000000 */ nop +/* 10458C 802E2D0C 00000000 */ nop /* 104590 802E2D10 4406B000 */ mfc1 $a2, $f22 /* 104594 802E2D14 4407A000 */ mfc1 $a3, $f20 /* 104598 802E2D18 8FA40120 */ lw $a0, 0x120($sp) @@ -104,13 +104,13 @@ glabel func_802E2BA4 /* 1045A4 802E2D24 E7B40010 */ swc1 $f20, 0x10($sp) /* 1045A8 802E2D28 920200A4 */ lbu $v0, 0xa4($s0) /* 1045AC 802E2D2C 44820000 */ mtc1 $v0, $f0 -/* 1045B0 802E2D30 00000000 */ nop +/* 1045B0 802E2D30 00000000 */ nop /* 1045B4 802E2D34 46800020 */ cvt.s.w $f0, $f0 /* 1045B8 802E2D38 461A0002 */ mul.s $f0, $f0, $f26 -/* 1045BC 802E2D3C 00000000 */ nop +/* 1045BC 802E2D3C 00000000 */ nop /* 1045C0 802E2D40 26310008 */ addiu $s1, $s1, 8 /* 1045C4 802E2D44 46180002 */ mul.s $f0, $f0, $f24 -/* 1045C8 802E2D48 00000000 */ nop +/* 1045C8 802E2D48 00000000 */ nop /* 1045CC 802E2D4C 26520018 */ addiu $s2, $s2, 0x18 /* 1045D0 802E2D50 26F70001 */ addiu $s7, $s7, 1 /* 1045D4 802E2D54 4406A000 */ mfc1 $a2, $f20 @@ -138,10 +138,10 @@ glabel func_802E2BA4 /* 10462C 802E2DAC 0C019D80 */ jal guMtxCatF /* 104630 802E2DB0 02A0302D */ daddu $a2, $s5, $zero /* 104634 802E2DB4 02A0202D */ daddu $a0, $s5, $zero -/* 104638 802E2DB8 3C058007 */ lui $a1, %hi(D_800741F0) -/* 10463C 802E2DBC 94A541F0 */ lhu $a1, %lo(D_800741F0)($a1) -/* 104640 802E2DC0 3C02800A */ lui $v0, %hi(D_8009A674) -/* 104644 802E2DC4 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 104638 802E2DB8 3C058007 */ lui $a1, %hi(gMatrixListPos) +/* 10463C 802E2DBC 94A541F0 */ lhu $a1, %lo(gMatrixListPos)($a1) +/* 104640 802E2DC0 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 104644 802E2DC4 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 104648 802E2DC8 8FA80124 */ lw $t0, 0x124($sp) /* 10464C 802E2DCC 00052980 */ sll $a1, $a1, 6 /* 104650 802E2DD0 00A82821 */ addu $a1, $a1, $t0 @@ -149,18 +149,18 @@ glabel func_802E2BA4 /* 104658 802E2DD8 00452821 */ addu $a1, $v0, $a1 /* 10465C 802E2DDC 3C05D838 */ lui $a1, 0xd838 /* 104660 802E2DE0 34A50002 */ ori $a1, $a1, 2 -/* 104664 802E2DE4 3C028007 */ lui $v0, %hi(D_800741F0) -/* 104668 802E2DE8 944241F0 */ lhu $v0, %lo(D_800741F0)($v0) +/* 104664 802E2DE4 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* 104668 802E2DE8 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) /* 10466C 802E2DEC 3C03DA38 */ lui $v1, 0xda38 /* 104670 802E2DF0 AE23FFFC */ sw $v1, -4($s1) /* 104674 802E2DF4 8FA80124 */ lw $t0, 0x124($sp) /* 104678 802E2DF8 24430001 */ addiu $v1, $v0, 1 /* 10467C 802E2DFC 3042FFFF */ andi $v0, $v0, 0xffff /* 104680 802E2E00 00021180 */ sll $v0, $v0, 6 -/* 104684 802E2E04 3C018007 */ lui $at, %hi(D_800741F0) -/* 104688 802E2E08 A42341F0 */ sh $v1, %lo(D_800741F0)($at) -/* 10468C 802E2E0C 3C03800A */ lui $v1, %hi(D_8009A674) -/* 104690 802E2E10 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 104684 802E2E04 3C018007 */ lui $at, %hi(gMatrixListPos) +/* 104688 802E2E08 A42341F0 */ sh $v1, %lo(gMatrixListPos)($at) +/* 10468C 802E2E0C 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 104690 802E2E10 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 104694 802E2E14 00481021 */ addu $v0, $v0, $t0 /* 104698 802E2E18 00621821 */ addu $v1, $v1, $v0 /* 10469C 802E2E1C AE230000 */ sw $v1, ($s1) @@ -186,8 +186,8 @@ glabel func_802E2BA4 /* 1046EC 802E2E6C 8FB5013C */ lw $s5, 0x13c($sp) /* 1046F0 802E2E70 8FB40138 */ lw $s4, 0x138($sp) /* 1046F4 802E2E74 8FB30134 */ lw $s3, 0x134($sp) -/* 1046F8 802E2E78 3C01800A */ lui $at, %hi(D_8009A66C) -/* 1046FC 802E2E7C AC32A66C */ sw $s2, %lo(D_8009A66C)($at) +/* 1046F8 802E2E78 3C01800A */ lui $at, %hi(gMasterGfxPos) +/* 1046FC 802E2E7C AC32A66C */ sw $s2, %lo(gMasterGfxPos)($at) /* 104700 802E2E80 8FB20130 */ lw $s2, 0x130($sp) /* 104704 802E2E84 8FB1012C */ lw $s1, 0x12c($sp) /* 104708 802E2E88 8FB00128 */ lw $s0, 0x128($sp) @@ -199,4 +199,4 @@ glabel func_802E2BA4 /* 104720 802E2EA0 D7B40150 */ ldc1 $f20, 0x150($sp) /* 104724 802E2EA4 03E00008 */ jr $ra /* 104728 802E2EA8 27BD0180 */ addiu $sp, $sp, 0x180 -/* 10472C 802E2EAC 00000000 */ nop +/* 10472C 802E2EAC 00000000 */ nop diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E30C0.s b/asm/nonmatchings/code_104940_len_dc0/func_802E30C0.s index 5aa5446a44..b278b9f0b3 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E30C0.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E30C0.s @@ -4,11 +4,11 @@ glabel func_802E30C0 /* 104940 802E30C0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 104944 802E30C4 AFB00010 */ sw $s0, 0x10($sp) -/* 104948 802E30C8 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 10494C 802E30CC 8E10A66C */ lw $s0, %lo(D_8009A66C)($s0) +/* 104948 802E30C8 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 10494C 802E30CC 8E10A66C */ lw $s0, %lo(gMasterGfxPos)($s0) /* 104950 802E30D0 AFBF0014 */ sw $ra, 0x14($sp) /* 104954 802E30D4 0C04417A */ jal get_entity_by_index -/* 104958 802E30D8 00000000 */ nop +/* 104958 802E30D8 00000000 */ nop /* 10495C 802E30DC 3C04E300 */ lui $a0, 0xe300 /* 104960 802E30E0 34841001 */ ori $a0, $a0, 0x1001 /* 104964 802E30E4 3C05D700 */ lui $a1, 0xd700 @@ -59,8 +59,8 @@ glabel func_802E30C0 .L802E3194: /* 104A14 802E3194 AC620004 */ sw $v0, 4($v1) /* 104A18 802E3198 8FBF0014 */ lw $ra, 0x14($sp) -/* 104A1C 802E319C 3C01800A */ lui $at, %hi(D_8009A66C) -/* 104A20 802E31A0 AC30A66C */ sw $s0, %lo(D_8009A66C)($at) +/* 104A1C 802E319C 3C01800A */ lui $at, %hi(gMasterGfxPos) +/* 104A20 802E31A0 AC30A66C */ sw $s0, %lo(gMasterGfxPos)($at) /* 104A24 802E31A4 8FB00010 */ lw $s0, 0x10($sp) /* 104A28 802E31A8 03E00008 */ jr $ra /* 104A2C 802E31AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E455C.s b/asm/nonmatchings/code_105700_len_2130/func_802E455C.s index 7adcfd4a9e..cfc43b3f29 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E455C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E455C.s @@ -4,11 +4,11 @@ glabel func_802E455C /* 105DDC 802E455C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 105DE0 802E4560 AFB00010 */ sw $s0, 0x10($sp) -/* 105DE4 802E4564 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 105DE8 802E4568 8E10A66C */ lw $s0, %lo(D_8009A66C)($s0) +/* 105DE4 802E4564 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 105DE8 802E4568 8E10A66C */ lw $s0, %lo(gMasterGfxPos)($s0) /* 105DEC 802E456C AFBF0014 */ sw $ra, 0x14($sp) /* 105DF0 802E4570 0C04417A */ jal get_entity_by_index -/* 105DF4 802E4574 00000000 */ nop +/* 105DF4 802E4574 00000000 */ nop /* 105DF8 802E4578 3C04E300 */ lui $a0, 0xe300 /* 105DFC 802E457C 34841001 */ ori $a0, $a0, 0x1001 /* 105E00 802E4580 3C05D700 */ lui $a1, 0xd700 @@ -59,8 +59,8 @@ glabel func_802E455C .L802E4630: /* 105EB0 802E4630 AC620004 */ sw $v0, 4($v1) /* 105EB4 802E4634 8FBF0014 */ lw $ra, 0x14($sp) -/* 105EB8 802E4638 3C01800A */ lui $at, %hi(D_8009A66C) -/* 105EBC 802E463C AC30A66C */ sw $s0, %lo(D_8009A66C)($at) +/* 105EB8 802E4638 3C01800A */ lui $at, %hi(gMasterGfxPos) +/* 105EBC 802E463C AC30A66C */ sw $s0, %lo(gMasterGfxPos)($at) /* 105EC0 802E4640 8FB00010 */ lw $s0, 0x10($sp) /* 105EC4 802E4644 03E00008 */ jr $ra /* 105EC8 802E4648 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4730.s b/asm/nonmatchings/code_105700_len_2130/func_802E4730.s index afb2ebf153..35f4e66b3a 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E4730.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E4730.s @@ -22,8 +22,8 @@ glabel func_802E4730 /* 105FF4 802E4774 2415005C */ addiu $s5, $zero, 0x5c /* 105FF8 802E4778 0040882D */ daddu $s1, $v0, $zero /* 105FFC 802E477C 3210FFFF */ andi $s0, $s0, 0xffff -/* 106000 802E4780 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 106004 802E4784 8E52A66C */ lw $s2, %lo(D_8009A66C)($s2) +/* 106000 802E4780 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 106004 802E4784 8E52A66C */ lw $s2, %lo(gMasterGfxPos)($s2) /* 106008 802E4788 8E330040 */ lw $s3, 0x40($s1) /* 10600C 802E478C 8E250044 */ lw $a1, 0x44($s1) /* 106010 802E4790 0240102D */ daddu $v0, $s2, $zero @@ -59,10 +59,10 @@ glabel func_802E4730 /* 106084 802E4804 3C040001 */ lui $a0, 1 /* 106088 802E4808 34841630 */ ori $a0, $a0, 0x1630 /* 10608C 802E480C 26650098 */ addiu $a1, $s3, 0x98 -/* 106090 802E4810 3C028007 */ lui $v0, %hi(D_800741F0) -/* 106094 802E4814 944241F0 */ lhu $v0, %lo(D_800741F0)($v0) -/* 106098 802E4818 3C03800A */ lui $v1, %hi(D_8009A674) -/* 10609C 802E481C 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 106090 802E4810 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* 106094 802E4814 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) +/* 106098 802E4818 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 10609C 802E481C 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 1060A0 802E4820 00021180 */ sll $v0, $v0, 6 /* 1060A4 802E4824 00621821 */ addu $v1, $v1, $v0 /* 1060A8 802E4828 00641821 */ addu $v1, $v1, $a0 @@ -103,8 +103,8 @@ glabel func_802E4730 /* 106130 802E48B0 0240282D */ daddu $a1, $s2, $zero /* 106134 802E48B4 3C0BD838 */ lui $t3, 0xd838 /* 106138 802E48B8 356B0002 */ ori $t3, $t3, 2 -/* 10613C 802E48BC 3C148007 */ lui $s4, %hi(D_800741F0) -/* 106140 802E48C0 269441F0 */ addiu $s4, $s4, %lo(D_800741F0) +/* 10613C 802E48BC 3C148007 */ lui $s4, %hi(gMatrixListPos) +/* 106140 802E48C0 269441F0 */ addiu $s4, $s4, %lo(gMatrixListPos) /* 106144 802E48C4 AFB60058 */ sw $s6, 0x58($sp) /* 106148 802E48C8 96820000 */ lhu $v0, ($s4) /* 10614C 802E48CC 3C03DA38 */ lui $v1, 0xda38 @@ -113,8 +113,8 @@ glabel func_802E4730 /* 106158 802E48D8 3042FFFF */ andi $v0, $v0, 0xffff /* 10615C 802E48DC 00021180 */ sll $v0, $v0, 6 /* 106160 802E48E0 A6830000 */ sh $v1, ($s4) -/* 106164 802E48E4 3C03800A */ lui $v1, %hi(D_8009A674) -/* 106168 802E48E8 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 106164 802E48E4 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 106168 802E48E8 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 10616C 802E48EC 00561021 */ addu $v0, $v0, $s6 /* 106170 802E48F0 00621821 */ addu $v1, $v1, $v0 /* 106174 802E48F4 3C02DE00 */ lui $v0, 0xde00 @@ -157,8 +157,8 @@ glabel func_802E4730 /* 106204 802E4984 0200282D */ daddu $a1, $s0, $zero /* 106208 802E4988 266400D8 */ addiu $a0, $s3, 0xd8 /* 10620C 802E498C 96820000 */ lhu $v0, ($s4) -/* 106210 802E4990 3C03800A */ lui $v1, %hi(D_8009A674) -/* 106214 802E4994 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 106210 802E4990 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 106214 802E4994 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 106218 802E4998 8FB70058 */ lw $s7, 0x58($sp) /* 10621C 802E499C 00021180 */ sll $v0, $v0, 6 /* 106220 802E49A0 00621821 */ addu $v1, $v1, $v0 @@ -201,19 +201,19 @@ glabel func_802E4730 /* 1062B0 802E4A30 26520008 */ addiu $s2, $s2, 8 /* 1062B4 802E4A34 3C0CD838 */ lui $t4, 0xd838 /* 1062B8 802E4A38 358C0002 */ ori $t4, $t4, 2 -/* 1062BC 802E4A3C 3C048007 */ lui $a0, %hi(D_800741F0) -/* 1062C0 802E4A40 248441F0 */ addiu $a0, $a0, %lo(D_800741F0) +/* 1062BC 802E4A3C 3C048007 */ lui $a0, %hi(gMatrixListPos) +/* 1062C0 802E4A40 248441F0 */ addiu $a0, $a0, %lo(gMatrixListPos) /* 1062C4 802E4A44 94820000 */ lhu $v0, ($a0) /* 1062C8 802E4A48 3C03DA38 */ lui $v1, 0xda38 /* 1062CC 802E4A4C AD630000 */ sw $v1, ($t3) -/* 1062D0 802E4A50 3C01800A */ lui $at, %hi(D_8009A66C) -/* 1062D4 802E4A54 AC32A66C */ sw $s2, %lo(D_8009A66C)($at) +/* 1062D0 802E4A50 3C01800A */ lui $at, %hi(gMasterGfxPos) +/* 1062D4 802E4A54 AC32A66C */ sw $s2, %lo(gMasterGfxPos)($at) /* 1062D8 802E4A58 24430001 */ addiu $v1, $v0, 1 /* 1062DC 802E4A5C 3042FFFF */ andi $v0, $v0, 0xffff /* 1062E0 802E4A60 00021180 */ sll $v0, $v0, 6 /* 1062E4 802E4A64 A4830000 */ sh $v1, ($a0) -/* 1062E8 802E4A68 3C03800A */ lui $v1, %hi(D_8009A674) -/* 1062EC 802E4A6C 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 1062E8 802E4A68 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 1062EC 802E4A6C 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 1062F0 802E4A70 00511021 */ addu $v0, $v0, $s1 /* 1062F4 802E4A74 00621821 */ addu $v1, $v1, $v0 /* 1062F8 802E4A78 3C02DE00 */ lui $v0, 0xde00 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E586C.s b/asm/nonmatchings/code_105700_len_2130/func_802E586C.s index 81187cac9f..b9bc573540 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E586C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E586C.s @@ -4,8 +4,8 @@ glabel func_802E586C /* 1070EC 802E586C 27BDFF68 */ addiu $sp, $sp, -0x98 /* 1070F0 802E5870 AFB60088 */ sw $s6, 0x88($sp) -/* 1070F4 802E5874 3C16800A */ lui $s6, %hi(D_8009A66C) -/* 1070F8 802E5878 8ED6A66C */ lw $s6, %lo(D_8009A66C)($s6) +/* 1070F4 802E5874 3C16800A */ lui $s6, %hi(gMasterGfxPos) +/* 1070F8 802E5878 8ED6A66C */ lw $s6, %lo(gMasterGfxPos)($s6) /* 1070FC 802E587C AFBF0094 */ sw $ra, 0x94($sp) /* 107100 802E5880 AFBE0090 */ sw $fp, 0x90($sp) /* 107104 802E5884 AFB7008C */ sw $s7, 0x8c($sp) @@ -77,10 +77,10 @@ glabel func_802E586C /* 107200 802E5980 3C040001 */ lui $a0, 1 /* 107204 802E5984 34841630 */ ori $a0, $a0, 0x1630 /* 107208 802E5988 26E50050 */ addiu $a1, $s7, 0x50 -/* 10720C 802E598C 3C028007 */ lui $v0, %hi(D_800741F0) -/* 107210 802E5990 944241F0 */ lhu $v0, %lo(D_800741F0)($v0) -/* 107214 802E5994 3C03800A */ lui $v1, %hi(D_8009A674) -/* 107218 802E5998 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 10720C 802E598C 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* 107210 802E5990 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) +/* 107214 802E5994 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 107218 802E5998 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 10721C 802E599C 00021180 */ sll $v0, $v0, 6 /* 107220 802E59A0 00621821 */ addu $v1, $v1, $v0 /* 107224 802E59A4 00641821 */ addu $v1, $v1, $a0 @@ -133,8 +133,8 @@ glabel func_802E586C /* 1072DC 802E5A5C 02C0602D */ daddu $t4, $s6, $zero /* 1072E0 802E5A60 3C11D838 */ lui $s1, 0xd838 /* 1072E4 802E5A64 36310002 */ ori $s1, $s1, 2 -/* 1072E8 802E5A68 3C1E8007 */ lui $fp, %hi(D_800741F0) -/* 1072EC 802E5A6C 27DE41F0 */ addiu $fp, $fp, %lo(D_800741F0) +/* 1072E8 802E5A68 3C1E8007 */ lui $fp, %hi(gMatrixListPos) +/* 1072EC 802E5A6C 27DE41F0 */ addiu $fp, $fp, %lo(gMatrixListPos) /* 1072F0 802E5A70 AFB80064 */ sw $t8, 0x64($sp) /* 1072F4 802E5A74 97C20000 */ lhu $v0, ($fp) /* 1072F8 802E5A78 3C03DA38 */ lui $v1, 0xda38 @@ -143,8 +143,8 @@ glabel func_802E586C /* 107304 802E5A84 3042FFFF */ andi $v0, $v0, 0xffff /* 107308 802E5A88 00021180 */ sll $v0, $v0, 6 /* 10730C 802E5A8C A7C30000 */ sh $v1, ($fp) -/* 107310 802E5A90 3C03800A */ lui $v1, %hi(D_8009A674) -/* 107314 802E5A94 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 107310 802E5A90 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 107314 802E5A94 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 107318 802E5A98 00581021 */ addu $v0, $v0, $t8 /* 10731C 802E5A9C 00621821 */ addu $v1, $v1, $v0 /* 107320 802E5AA0 3C02FD10 */ lui $v0, 0xfd10 @@ -206,8 +206,8 @@ glabel func_802E586C /* 1073FC 802E5B7C 0200282D */ daddu $a1, $s0, $zero /* 107400 802E5B80 26E40090 */ addiu $a0, $s7, 0x90 /* 107404 802E5B84 97C20000 */ lhu $v0, ($fp) -/* 107408 802E5B88 3C03800A */ lui $v1, %hi(D_8009A674) -/* 10740C 802E5B8C 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 107408 802E5B88 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 10740C 802E5B8C 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 107410 802E5B90 8FAF0064 */ lw $t7, 0x64($sp) /* 107414 802E5B94 00021180 */ sll $v0, $v0, 6 /* 107418 802E5B98 00621821 */ addu $v1, $v1, $v0 @@ -247,12 +247,12 @@ glabel func_802E586C /* 10749C 802E5C1C 02C0302D */ daddu $a2, $s6, $zero /* 1074A0 802E5C20 3C0AD838 */ lui $t2, 0xd838 /* 1074A4 802E5C24 354A0002 */ ori $t2, $t2, 2 -/* 1074A8 802E5C28 3C128007 */ lui $s2, %hi(D_800741F0) -/* 1074AC 802E5C2C 265241F0 */ addiu $s2, $s2, %lo(D_800741F0) +/* 1074A8 802E5C28 3C128007 */ lui $s2, %hi(gMatrixListPos) +/* 1074AC 802E5C2C 265241F0 */ addiu $s2, $s2, %lo(gMatrixListPos) /* 1074B0 802E5C30 3C03DA38 */ lui $v1, 0xda38 /* 1074B4 802E5C34 96420000 */ lhu $v0, ($s2) -/* 1074B8 802E5C38 3C14800A */ lui $s4, %hi(D_8009A674) -/* 1074BC 802E5C3C 2694A674 */ addiu $s4, $s4, %lo(D_8009A674) +/* 1074B8 802E5C38 3C14800A */ lui $s4, %hi(gDisplayContext) +/* 1074BC 802E5C3C 2694A674 */ addiu $s4, $s4, %lo(gDisplayContext) /* 1074C0 802E5C40 AD230000 */ sw $v1, ($t1) /* 1074C4 802E5C44 24430001 */ addiu $v1, $v0, 1 /* 1074C8 802E5C48 3042FFFF */ andi $v0, $v0, 0xffff @@ -345,19 +345,19 @@ glabel func_802E586C /* 10761C 802E5D9C 26D60008 */ addiu $s6, $s6, 8 /* 107620 802E5DA0 3C0BD838 */ lui $t3, 0xd838 /* 107624 802E5DA4 356B0002 */ ori $t3, $t3, 2 -/* 107628 802E5DA8 3C048007 */ lui $a0, %hi(D_800741F0) -/* 10762C 802E5DAC 248441F0 */ addiu $a0, $a0, %lo(D_800741F0) +/* 107628 802E5DA8 3C048007 */ lui $a0, %hi(gMatrixListPos) +/* 10762C 802E5DAC 248441F0 */ addiu $a0, $a0, %lo(gMatrixListPos) /* 107630 802E5DB0 94820000 */ lhu $v0, ($a0) /* 107634 802E5DB4 3C03DA38 */ lui $v1, 0xda38 /* 107638 802E5DB8 AD430000 */ sw $v1, ($t2) -/* 10763C 802E5DBC 3C01800A */ lui $at, %hi(D_8009A66C) -/* 107640 802E5DC0 AC36A66C */ sw $s6, %lo(D_8009A66C)($at) +/* 10763C 802E5DBC 3C01800A */ lui $at, %hi(gMasterGfxPos) +/* 107640 802E5DC0 AC36A66C */ sw $s6, %lo(gMasterGfxPos)($at) /* 107644 802E5DC4 24430001 */ addiu $v1, $v0, 1 /* 107648 802E5DC8 3042FFFF */ andi $v0, $v0, 0xffff /* 10764C 802E5DCC 00021180 */ sll $v0, $v0, 6 /* 107650 802E5DD0 A4830000 */ sh $v1, ($a0) -/* 107654 802E5DD4 3C03800A */ lui $v1, %hi(D_8009A674) -/* 107658 802E5DD8 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 107654 802E5DD4 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 107658 802E5DD8 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 10765C 802E5DDC 00501021 */ addu $v0, $v0, $s0 /* 107660 802E5DE0 00621821 */ addu $v1, $v1, $v0 /* 107664 802E5DE4 3C02FA00 */ lui $v0, 0xfa00 diff --git a/asm/nonmatchings/code_107830_len_e70/func_802E61B0.s b/asm/nonmatchings/code_107830_len_e70/func_802E61B0.s index 861aa0f265..eacbfc76dd 100644 --- a/asm/nonmatchings/code_107830_len_e70/func_802E61B0.s +++ b/asm/nonmatchings/code_107830_len_e70/func_802E61B0.s @@ -15,9 +15,9 @@ glabel func_802E61B0 /* 107A58 802E61D8 C662004C */ lwc1 $f2, 0x4c($s3) /* 107A5C 802E61DC C6800024 */ lwc1 $f0, 0x24($s4) /* 107A60 802E61E0 46001032 */ c.eq.s $f2, $f0 -/* 107A64 802E61E4 00000000 */ nop +/* 107A64 802E61E4 00000000 */ nop /* 107A68 802E61E8 45010041 */ bc1t .L802E62F0 -/* 107A6C 802E61EC 00000000 */ nop +/* 107A6C 802E61EC 00000000 */ nop /* 107A70 802E61F0 0C019D28 */ jal guMtxIdentF /* 107A74 802E61F4 27A40010 */ addiu $a0, $sp, 0x10 /* 107A78 802E61F8 27B00050 */ addiu $s0, $sp, 0x50 @@ -37,10 +37,10 @@ glabel func_802E61B0 /* 107AB0 802E6230 0C019D80 */ jal guMtxCatF /* 107AB4 802E6234 0200302D */ daddu $a2, $s0, $zero /* 107AB8 802E6238 0200202D */ daddu $a0, $s0, $zero -/* 107ABC 802E623C 3C108007 */ lui $s0, %hi(D_800741F0) -/* 107AC0 802E6240 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 107AC4 802E6244 3C11800A */ lui $s1, %hi(D_8009A674) -/* 107AC8 802E6248 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 107ABC 802E623C 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 107AC0 802E6240 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 107AC4 802E6244 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 107AC8 802E6248 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 107ACC 802E624C 96050000 */ lhu $a1, ($s0) /* 107AD0 802E6250 8E220000 */ lw $v0, ($s1) /* 107AD4 802E6254 00052980 */ sll $a1, $a1, 6 @@ -50,8 +50,8 @@ glabel func_802E61B0 /* 107AE4 802E6264 3C03DA38 */ lui $v1, 0xda38 /* 107AE8 802E6268 34630002 */ ori $v1, $v1, 2 /* 107AEC 802E626C 3C07D838 */ lui $a3, 0xd838 -/* 107AF0 802E6270 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 107AF4 802E6274 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 107AF0 802E6270 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 107AF4 802E6274 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 107AF8 802E6278 34E70002 */ ori $a3, $a3, 2 /* 107AFC 802E627C 8CA40000 */ lw $a0, ($a1) /* 107B00 802E6280 96020000 */ lhu $v0, ($s0) @@ -89,10 +89,10 @@ glabel func_802E61B0 /* 107B7C 802E62FC 0C0470CB */ jal func_8011C32C /* 107B80 802E6300 26860034 */ addiu $a2, $s4, 0x34 /* 107B84 802E6304 96850074 */ lhu $a1, 0x74($s4) -/* 107B88 802E6308 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 107B8C 802E630C 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 107B88 802E6308 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 107B8C 802E630C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 107B90 802E6310 0C0475CB */ jal func_8011D72C -/* 107B94 802E6314 00000000 */ nop +/* 107B94 802E6314 00000000 */ nop /* 107B98 802E6318 8FBF00A4 */ lw $ra, 0xa4($sp) /* 107B9C 802E631C 8FB400A0 */ lw $s4, 0xa0($sp) /* 107BA0 802E6320 8FB3009C */ lw $s3, 0x9c($sp) diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s index 34a55a5dba..602c0e3700 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s @@ -4,8 +4,8 @@ glabel func_802E6ED8 /* 108758 802E6ED8 27BDFF48 */ addiu $sp, $sp, -0xb8 /* 10875C 802E6EDC AFB500AC */ sw $s5, 0xac($sp) -/* 108760 802E6EE0 3C15800A */ lui $s5, %hi(D_8009A66C) -/* 108764 802E6EE4 26B5A66C */ addiu $s5, $s5, %lo(D_8009A66C) +/* 108760 802E6EE0 3C15800A */ lui $s5, %hi(gMasterGfxPos) +/* 108764 802E6EE4 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) /* 108768 802E6EE8 AFBF00B0 */ sw $ra, 0xb0($sp) /* 10876C 802E6EEC AFB400A8 */ sw $s4, 0xa8($sp) /* 108770 802E6EF0 AFB300A4 */ sw $s3, 0xa4($sp) @@ -21,7 +21,7 @@ glabel func_802E6ED8 /* 108798 802E6F18 3C063F80 */ lui $a2, 0x3f80 /* 10879C 802E6F1C 8E420040 */ lw $v0, 0x40($s2) /* 1087A0 802E6F20 44800000 */ mtc1 $zero, $f0 -/* 1087A4 802E6F24 00000000 */ nop +/* 1087A4 802E6F24 00000000 */ nop /* 1087A8 802E6F28 E7A00010 */ swc1 $f0, 0x10($sp) /* 1087AC 802E6F2C 8C450008 */ lw $a1, 8($v0) /* 1087B0 802E6F30 44070000 */ mfc1 $a3, $f0 @@ -39,10 +39,10 @@ glabel func_802E6ED8 /* 1087E0 802E6F60 0C019D80 */ jal guMtxCatF /* 1087E4 802E6F64 00A0302D */ daddu $a2, $a1, $zero /* 1087E8 802E6F68 27A40018 */ addiu $a0, $sp, 0x18 -/* 1087EC 802E6F6C 3C118007 */ lui $s1, %hi(D_800741F0) -/* 1087F0 802E6F70 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 1087F4 802E6F74 3C13800A */ lui $s3, %hi(D_8009A674) -/* 1087F8 802E6F78 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* 1087EC 802E6F6C 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 1087F0 802E6F70 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 1087F4 802E6F74 3C13800A */ lui $s3, %hi(gDisplayContext) +/* 1087F8 802E6F78 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* 1087FC 802E6F7C 96250000 */ lhu $a1, ($s1) /* 108800 802E6F80 8E620000 */ lw $v0, ($s3) /* 108804 802E6F84 00052980 */ sll $a1, $a1, 6 diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E854C.s b/asm/nonmatchings/code_109660_len_1270/func_802E854C.s index 9caf143a00..8319a5a00d 100644 --- a/asm/nonmatchings/code_109660_len_1270/func_802E854C.s +++ b/asm/nonmatchings/code_109660_len_1270/func_802E854C.s @@ -13,8 +13,8 @@ glabel func_802E854C /* 109DEC 802E856C AFA8011C */ sw $t0, 0x11c($sp) /* 109DF0 802E8570 3C080001 */ lui $t0, 1 /* 109DF4 802E8574 AFB1012C */ sw $s1, 0x12c($sp) -/* 109DF8 802E8578 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 109DFC 802E857C 8E31A66C */ lw $s1, %lo(D_8009A66C)($s1) +/* 109DF8 802E8578 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 109DFC 802E857C 8E31A66C */ lw $s1, %lo(gMasterGfxPos)($s1) /* 109E00 802E8580 35081630 */ ori $t0, $t0, 0x1630 /* 109E04 802E8584 AFBF014C */ sw $ra, 0x14c($sp) /* 109E08 802E8588 AFB70144 */ sw $s7, 0x144($sp) @@ -91,12 +91,12 @@ glabel func_802E854C /* 109F18 802E8698 27A40018 */ addiu $a0, $sp, 0x18 /* 109F1C 802E869C 92420058 */ lbu $v0, 0x58($s2) /* 109F20 802E86A0 44820000 */ mtc1 $v0, $f0 -/* 109F24 802E86A4 00000000 */ nop +/* 109F24 802E86A4 00000000 */ nop /* 109F28 802E86A8 46800020 */ cvt.s.w $f0, $f0 /* 109F2C 802E86AC 461A0002 */ mul.s $f0, $f0, $f26 -/* 109F30 802E86B0 00000000 */ nop +/* 109F30 802E86B0 00000000 */ nop /* 109F34 802E86B4 46180002 */ mul.s $f0, $f0, $f24 -/* 109F38 802E86B8 00000000 */ nop +/* 109F38 802E86B8 00000000 */ nop /* 109F3C 802E86BC 4406B000 */ mfc1 $a2, $f22 /* 109F40 802E86C0 4407A000 */ mfc1 $a3, $f20 /* 109F44 802E86C4 8FA4011C */ lw $a0, 0x11c($sp) @@ -105,14 +105,14 @@ glabel func_802E854C /* 109F50 802E86D0 E7B40010 */ swc1 $f20, 0x10($sp) /* 109F54 802E86D4 9242007C */ lbu $v0, 0x7c($s2) /* 109F58 802E86D8 44820000 */ mtc1 $v0, $f0 -/* 109F5C 802E86DC 00000000 */ nop +/* 109F5C 802E86DC 00000000 */ nop /* 109F60 802E86E0 46800020 */ cvt.s.w $f0, $f0 /* 109F64 802E86E4 461A0002 */ mul.s $f0, $f0, $f26 -/* 109F68 802E86E8 00000000 */ nop +/* 109F68 802E86E8 00000000 */ nop /* 109F6C 802E86EC 26100008 */ addiu $s0, $s0, 8 /* 109F70 802E86F0 26310018 */ addiu $s1, $s1, 0x18 /* 109F74 802E86F4 46180002 */ mul.s $f0, $f0, $f24 -/* 109F78 802E86F8 00000000 */ nop +/* 109F78 802E86F8 00000000 */ nop /* 109F7C 802E86FC 27DE0001 */ addiu $fp, $fp, 1 /* 109F80 802E8700 02A0202D */ daddu $a0, $s5, $zero /* 109F84 802E8704 4406A000 */ mfc1 $a2, $f20 @@ -140,10 +140,10 @@ glabel func_802E854C /* 109FDC 802E875C 0C019D80 */ jal guMtxCatF /* 109FE0 802E8760 0280302D */ daddu $a2, $s4, $zero /* 109FE4 802E8764 0280202D */ daddu $a0, $s4, $zero -/* 109FE8 802E8768 3C058007 */ lui $a1, %hi(D_800741F0) -/* 109FEC 802E876C 94A541F0 */ lhu $a1, %lo(D_800741F0)($a1) -/* 109FF0 802E8770 3C02800A */ lui $v0, %hi(D_8009A674) -/* 109FF4 802E8774 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 109FE8 802E8768 3C058007 */ lui $a1, %hi(gMatrixListPos) +/* 109FEC 802E876C 94A541F0 */ lhu $a1, %lo(gMatrixListPos)($a1) +/* 109FF0 802E8770 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 109FF4 802E8774 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 109FF8 802E8778 8FA80120 */ lw $t0, 0x120($sp) /* 109FFC 802E877C 00052980 */ sll $a1, $a1, 6 /* 10A000 802E8780 00A82821 */ addu $a1, $a1, $t0 @@ -151,18 +151,18 @@ glabel func_802E854C /* 10A008 802E8788 00452821 */ addu $a1, $v0, $a1 /* 10A00C 802E878C 3C05D838 */ lui $a1, 0xd838 /* 10A010 802E8790 34A50002 */ ori $a1, $a1, 2 -/* 10A014 802E8794 3C028007 */ lui $v0, %hi(D_800741F0) -/* 10A018 802E8798 944241F0 */ lhu $v0, %lo(D_800741F0)($v0) +/* 10A014 802E8794 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* 10A018 802E8798 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) /* 10A01C 802E879C 3C03DA38 */ lui $v1, 0xda38 /* 10A020 802E87A0 AE03FFFC */ sw $v1, -4($s0) /* 10A024 802E87A4 8FA80120 */ lw $t0, 0x120($sp) /* 10A028 802E87A8 24430001 */ addiu $v1, $v0, 1 /* 10A02C 802E87AC 3042FFFF */ andi $v0, $v0, 0xffff /* 10A030 802E87B0 00021180 */ sll $v0, $v0, 6 -/* 10A034 802E87B4 3C018007 */ lui $at, %hi(D_800741F0) -/* 10A038 802E87B8 A42341F0 */ sh $v1, %lo(D_800741F0)($at) -/* 10A03C 802E87BC 3C03800A */ lui $v1, %hi(D_8009A674) -/* 10A040 802E87C0 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 10A034 802E87B4 3C018007 */ lui $at, %hi(gMatrixListPos) +/* 10A038 802E87B8 A42341F0 */ sh $v1, %lo(gMatrixListPos)($at) +/* 10A03C 802E87BC 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 10A040 802E87C0 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 10A044 802E87C4 00481021 */ addu $v0, $v0, $t0 /* 10A048 802E87C8 00621821 */ addu $v1, $v1, $v0 /* 10A04C 802E87CC AE030000 */ sw $v1, ($s0) @@ -188,8 +188,8 @@ glabel func_802E854C /* 10A09C 802E881C 8FB40138 */ lw $s4, 0x138($sp) /* 10A0A0 802E8820 8FB30134 */ lw $s3, 0x134($sp) /* 10A0A4 802E8824 8FB20130 */ lw $s2, 0x130($sp) -/* 10A0A8 802E8828 3C01800A */ lui $at, %hi(D_8009A66C) -/* 10A0AC 802E882C AC31A66C */ sw $s1, %lo(D_8009A66C)($at) +/* 10A0A8 802E8828 3C01800A */ lui $at, %hi(gMasterGfxPos) +/* 10A0AC 802E882C AC31A66C */ sw $s1, %lo(gMasterGfxPos)($at) /* 10A0B0 802E8830 8FB1012C */ lw $s1, 0x12c($sp) /* 10A0B4 802E8834 8FB00128 */ lw $s0, 0x128($sp) /* 10A0B8 802E8838 D7BE0178 */ ldc1 $f30, 0x178($sp) diff --git a/asm/nonmatchings/code_109660_len_1270/push_entity_matrix.s b/asm/nonmatchings/code_109660_len_1270/push_entity_matrix.s index e2962b7bf4..add393216a 100644 --- a/asm/nonmatchings/code_109660_len_1270/push_entity_matrix.s +++ b/asm/nonmatchings/code_109660_len_1270/push_entity_matrix.s @@ -4,8 +4,8 @@ glabel push_entity_matrix /* 10A6CC 802E8E4C 27BDFF58 */ addiu $sp, $sp, -0xa8 /* 10A6D0 802E8E50 AFB3009C */ sw $s3, 0x9c($sp) -/* 10A6D4 802E8E54 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 10A6D8 802E8E58 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 10A6D4 802E8E54 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 10A6D8 802E8E58 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 10A6DC 802E8E5C AFBF00A4 */ sw $ra, 0xa4($sp) /* 10A6E0 802E8E60 AFB400A0 */ sw $s4, 0xa0($sp) /* 10A6E4 802E8E64 AFB20098 */ sw $s2, 0x98($sp) @@ -37,10 +37,10 @@ glabel push_entity_matrix /* 10A74C 802E8ECC 0C019D80 */ jal guMtxCatF /* 10A750 802E8ED0 0200302D */ daddu $a2, $s0, $zero /* 10A754 802E8ED4 0200202D */ daddu $a0, $s0, $zero -/* 10A758 802E8ED8 3C108007 */ lui $s0, %hi(D_800741F0) -/* 10A75C 802E8EDC 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 10A760 802E8EE0 3C12800A */ lui $s2, %hi(D_8009A674) -/* 10A764 802E8EE4 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 10A758 802E8ED8 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 10A75C 802E8EDC 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 10A760 802E8EE0 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 10A764 802E8EE4 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 10A768 802E8EE8 96050000 */ lhu $a1, ($s0) /* 10A76C 802E8EEC 8E420000 */ lw $v0, ($s2) /* 10A770 802E8EF0 00052980 */ sll $a1, $a1, 6 diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037638.s b/asm/nonmatchings/code_121f0_len_1290/func_80037638.s index 0130d25d6b..b3ef050284 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037638.s +++ b/asm/nonmatchings/code_121f0_len_1290/func_80037638.s @@ -22,25 +22,25 @@ glabel func_80037638 /* 12A7C 8003767C 00220821 */ addu $at, $at, $v0 /* 12A80 80037680 8C2283E0 */ lw $v0, %lo(D_800983E0)($at) /* 12A84 80037684 00400008 */ jr $v0 -/* 12A88 80037688 00000000 */ nop +/* 12A88 80037688 00000000 */ nop /* 12A8C 8003768C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 12A90 80037690 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 12A94 80037694 804300AF */ lb $v1, 0xaf($v0) /* 12A98 80037698 804200B0 */ lb $v0, 0xb0($v0) /* 12A9C 8003769C 44836000 */ mtc1 $v1, $f12 -/* 12AA0 800376A0 00000000 */ nop +/* 12AA0 800376A0 00000000 */ nop /* 12AA4 800376A4 46806320 */ cvt.s.w $f12, $f12 /* 12AA8 800376A8 44820000 */ mtc1 $v0, $f0 -/* 12AAC 800376AC 00000000 */ nop +/* 12AAC 800376AC 00000000 */ nop /* 12AB0 800376B0 46800020 */ cvt.s.w $f0, $f0 /* 12AB4 800376B4 0800DDC2 */ j .L80037708 /* 12AB8 800376B8 46006303 */ div.s $f12, $f12, $f0 /* 12ABC 800376BC 44806000 */ mtc1 $zero, $f12 /* 12AC0 800376C0 0800DDC4 */ j .L80037710 -/* 12AC4 800376C4 00000000 */ nop +/* 12AC4 800376C4 00000000 */ nop /* 12AC8 800376C8 44806000 */ mtc1 $zero, $f12 /* 12ACC 800376CC 0800DDC4 */ j .L80037710 -/* 12AD0 800376D0 00000000 */ nop +/* 12AD0 800376D0 00000000 */ nop /* 12AD4 800376D4 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* 12AD8 800376D8 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 12ADC 800376DC 806200AF */ lb $v0, 0xaf($v1) @@ -48,23 +48,23 @@ glabel func_80037638 /* 12AE4 800376E4 2442FFFF */ addiu $v0, $v0, -1 /* 12AE8 800376E8 00621023 */ subu $v0, $v1, $v0 /* 12AEC 800376EC 44826000 */ mtc1 $v0, $f12 -/* 12AF0 800376F0 00000000 */ nop +/* 12AF0 800376F0 00000000 */ nop /* 12AF4 800376F4 46806320 */ cvt.s.w $f12, $f12 /* 12AF8 800376F8 44830000 */ mtc1 $v1, $f0 -/* 12AFC 800376FC 00000000 */ nop +/* 12AFC 800376FC 00000000 */ nop /* 12B00 80037700 46800020 */ cvt.s.w $f0, $f0 /* 12B04 80037704 46006303 */ div.s $f12, $f12, $f0 .L80037708: /* 12B08 80037708 460C6302 */ mul.s $f12, $f12, $f12 -/* 12B0C 8003770C 00000000 */ nop +/* 12B0C 8003770C 00000000 */ nop .L80037710: /* 12B10 80037710 0C00DE5A */ jal func_80037968 /* 12B14 80037714 46006386 */ mov.s $f14, $f12 .L80037718: /* 12B18 80037718 3C03FF10 */ lui $v1, 0xff10 /* 12B1C 8003771C 3463013F */ ori $v1, $v1, 0x13f -/* 12B20 80037720 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 12B24 80037724 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 12B20 80037720 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 12B24 80037724 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 12B28 80037728 3C12E700 */ lui $s2, 0xe700 /* 12B2C 8003772C 8E110000 */ lw $s1, ($s0) /* 12B30 80037730 3C04800A */ lui $a0, %hi(D_8009A64C) diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037994.s b/asm/nonmatchings/code_121f0_len_1290/func_80037994.s index 2bed3b44b2..ba7fe6188b 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037994.s +++ b/asm/nonmatchings/code_121f0_len_1290/func_80037994.s @@ -4,8 +4,8 @@ glabel func_80037994 /* 12D94 80037994 27BDFFF8 */ addiu $sp, $sp, -8 /* 12D98 80037998 0000602D */ daddu $t4, $zero, $zero -/* 12D9C 8003799C 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 12DA0 800379A0 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 12D9C 8003799C 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 12DA0 800379A0 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 12DA4 800379A4 0040402D */ daddu $t0, $v0, $zero /* 12DA8 800379A8 3C19800A */ lui $t9, %hi(D_800A0978) /* 12DAC 800379AC 27390978 */ addiu $t9, $t9, %lo(D_800A0978) @@ -29,14 +29,14 @@ glabel func_80037994 /* 12DF4 800379F4 AC820004 */ sw $v0, 4($a0) /* 12DF8 800379F8 24620008 */ addiu $v0, $v1, 8 /* 12DFC 800379FC 46006302 */ mul.s $f12, $f12, $f0 -/* 12E00 80037A00 00000000 */ nop +/* 12E00 80037A00 00000000 */ nop /* 12E04 80037A04 AD020000 */ sw $v0, ($t0) /* 12E08 80037A08 3C02E700 */ lui $v0, 0xe700 /* 12E0C 80037A0C AC620000 */ sw $v0, ($v1) /* 12E10 80037A10 AC600004 */ sw $zero, 4($v1) /* 12E14 80037A14 4600608D */ trunc.w.s $f2, $f12 /* 12E18 80037A18 440E1000 */ mfc1 $t6, $f2 -/* 12E1C 80037A1C 00000000 */ nop +/* 12E1C 80037A1C 00000000 */ nop /* 12E20 80037A20 25C9000F */ addiu $t1, $t6, 0xf .L80037A24: /* 12E24 80037A24 3C04FD18 */ lui $a0, 0xfd18 @@ -138,8 +138,8 @@ glabel func_80037994 /* 12F8C 80037B8C 29820038 */ slti $v0, $t4, 0x38 /* 12F90 80037B90 1440FFA4 */ bnez $v0, .L80037A24 /* 12F94 80037B94 AC640004 */ sw $a0, 4($v1) -/* 12F98 80037B98 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 12F9C 80037B9C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 12F98 80037B98 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 12F9C 80037B9C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 12FA0 80037BA0 8C620000 */ lw $v0, ($v1) /* 12FA4 80037BA4 0040202D */ daddu $a0, $v0, $zero /* 12FA8 80037BA8 24420008 */ addiu $v0, $v0, 8 diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037BC8.s b/asm/nonmatchings/code_121f0_len_1290/func_80037BC8.s index a1275a0c58..c1ec6f0999 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037BC8.s +++ b/asm/nonmatchings/code_121f0_len_1290/func_80037BC8.s @@ -71,8 +71,8 @@ glabel func_80037BC8 /* 130B8 80037CB8 3C0C0018 */ lui $t4, 0x18 /* 130BC 80037CBC 358C0224 */ ori $t4, $t4, 0x224 /* 130C0 80037CC0 3C0E0400 */ lui $t6, 0x400 -/* 130C4 80037CC4 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 130C8 80037CC8 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 130C4 80037CC4 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 130C8 80037CC8 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 130CC 80037CCC 35CE0400 */ ori $t6, $t6, 0x400 /* 130D0 80037CD0 8CA20000 */ lw $v0, ($a1) /* 130D4 80037CD4 3C03DE00 */ lui $v1, 0xde00 diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s b/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s index 30fb75cf77..e17aa96af1 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s +++ b/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s @@ -3,8 +3,8 @@ glabel func_80037E14 /* 13214 80037E14 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 13218 80037E18 3C07800A */ lui $a3, %hi(D_8009A66C) -/* 1321C 80037E1C 24E7A66C */ addiu $a3, $a3, %lo(D_8009A66C) +/* 13218 80037E18 3C07800A */ lui $a3, %hi(gMasterGfxPos) +/* 1321C 80037E1C 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) /* 13220 80037E20 3C02DE00 */ lui $v0, 0xde00 /* 13224 80037E24 AFB7001C */ sw $s7, 0x1c($sp) /* 13228 80037E28 AFB60018 */ sw $s6, 0x18($sp) @@ -24,7 +24,7 @@ glabel func_80037E14 /* 13260 80037E60 3C028007 */ lui $v0, %hi(D_80077A50) /* 13264 80037E64 24427A50 */ addiu $v0, $v0, %lo(D_80077A50) /* 13268 80037E68 46006302 */ mul.s $f12, $f12, $f0 -/* 1326C 80037E6C 00000000 */ nop +/* 1326C 80037E6C 00000000 */ nop /* 13270 80037E70 AC620004 */ sw $v0, 4($v1) /* 13274 80037E74 24A20008 */ addiu $v0, $a1, 8 /* 13278 80037E78 ACE20000 */ sw $v0, ($a3) @@ -33,7 +33,7 @@ glabel func_80037E14 /* 13284 80037E84 ACA20000 */ sw $v0, ($a1) /* 13288 80037E88 4600008D */ trunc.w.s $f2, $f0 /* 1328C 80037E8C 44061000 */ mfc1 $a2, $f2 -/* 13290 80037E90 00000000 */ nop +/* 13290 80037E90 00000000 */ nop /* 13294 80037E94 28C200FF */ slti $v0, $a2, 0xff /* 13298 80037E98 10400011 */ beqz $v0, .L80037EE0 /* 1329C 80037E9C ACA00004 */ sw $zero, 4($a1) @@ -56,8 +56,8 @@ glabel func_80037E14 /* 132DC 80037EDC ACA20014 */ sw $v0, 0x14($a1) .L80037EE0: /* 132E0 80037EE0 0000602D */ daddu $t4, $zero, $zero -/* 132E4 80037EE4 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 132E8 80037EE8 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 132E4 80037EE4 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 132E8 80037EE8 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 132EC 80037EEC 3C10FD68 */ lui $s0, 0xfd68 /* 132F0 80037EF0 3610008F */ ori $s0, $s0, 0x8f /* 132F4 80037EF4 3C16800A */ lui $s6, %hi(D_800A097C) @@ -139,8 +139,8 @@ glabel func_80037E14 /* 13420 80038020 29820002 */ slti $v0, $t4, 2 /* 13424 80038024 1440FFC7 */ bnez $v0, .L80037F44 /* 13428 80038028 AC670044 */ sw $a3, 0x44($v1) -/* 1342C 8003802C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 13430 80038030 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 1342C 8003802C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 13430 80038030 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 13434 80038034 8C620000 */ lw $v0, ($v1) /* 13438 80038038 0040202D */ daddu $a0, $v0, $zero /* 1343C 8003803C 24420008 */ addiu $v0, $v0, 8 @@ -158,5 +158,5 @@ glabel func_80037E14 /* 1346C 8003806C 8FB00000 */ lw $s0, ($sp) /* 13470 80038070 03E00008 */ jr $ra /* 13474 80038074 27BD0020 */ addiu $sp, $sp, 0x20 -/* 13478 80038078 00000000 */ nop -/* 1347C 8003807C 00000000 */ nop +/* 13478 80038078 00000000 */ nop +/* 1347C 8003807C 00000000 */ nop diff --git a/asm/nonmatchings/code_135EE0/pause_draw_rect.s b/asm/nonmatchings/code_135EE0/pause_draw_rect.s index 9e9557b6f2..6dc62c141e 100644 --- a/asm/nonmatchings/code_135EE0/pause_draw_rect.s +++ b/asm/nonmatchings/code_135EE0/pause_draw_rect.s @@ -10,9 +10,9 @@ glabel pause_draw_rect /* 137BAC 8024486C 14400075 */ bnez $v0, .L80244A44 /* 137BB0 80244870 28A2F581 */ slti $v0, $a1, -0xa7f /* 137BB4 80244874 14400073 */ bnez $v0, .L80244A44 -/* 137BB8 80244878 00000000 */ nop +/* 137BB8 80244878 00000000 */ nop /* 137BBC 8024487C 18C00071 */ blez $a2, .L80244A44 -/* 137BC0 80244880 00000000 */ nop +/* 137BC0 80244880 00000000 */ nop /* 137BC4 80244884 18E0006F */ blez $a3, .L80244A44 /* 137BC8 80244888 28820500 */ slti $v0, $a0, 0x500 /* 137BCC 8024488C 1040006D */ beqz $v0, .L80244A44 @@ -22,9 +22,9 @@ glabel pause_draw_rect /* 137BDC 8024489C 10400069 */ beqz $v0, .L80244A44 /* 137BE0 802448A0 28E20A80 */ slti $v0, $a3, 0xa80 /* 137BE4 802448A4 10400067 */ beqz $v0, .L80244A44 -/* 137BE8 802448A8 00000000 */ nop -/* 137BEC 802448AC 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 137BF0 802448B0 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 137BE8 802448A8 00000000 */ nop +/* 137BEC 802448AC 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 137BF0 802448B0 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 137BF4 802448B4 8C480000 */ lw $t0, ($v0) /* 137BF8 802448B8 25030008 */ addiu $v1, $t0, 8 /* 137BFC 802448BC AC430000 */ sw $v1, ($v0) @@ -65,8 +65,8 @@ glabel pause_draw_rect /* 137C78 80244938 00621025 */ or $v0, $v1, $v0 /* 137C7C 8024493C AD020004 */ sw $v0, 4($t0) .L80244940: -/* 137C80 80244940 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 137C84 80244944 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 137C80 80244940 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 137C84 80244944 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 137C88 80244948 8C620000 */ lw $v0, ($v1) /* 137C8C 8024494C 0040202D */ daddu $a0, $v0, $zero /* 137C90 80244950 24420008 */ addiu $v0, $v0, 8 @@ -127,8 +127,8 @@ glabel pause_draw_rect .L80244A0C: /* 137D4C 80244A0C 00C21025 */ or $v0, $a2, $v0 /* 137D50 80244A10 AC820000 */ sw $v0, ($a0) -/* 137D54 80244A14 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 137D58 80244A18 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 137D54 80244A14 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 137D58 80244A18 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 137D5C 80244A1C 8C620000 */ lw $v0, ($v1) /* 137D60 80244A20 0040202D */ daddu $a0, $v0, $zero /* 137D64 80244A24 24420008 */ addiu $v0, $v0, 8 @@ -141,4 +141,4 @@ glabel pause_draw_rect /* 137D80 80244A40 AC820004 */ sw $v0, 4($a0) .L80244A44: /* 137D84 80244A44 03E00008 */ jr $ra -/* 137D88 80244A48 00000000 */ nop +/* 137D88 80244A48 00000000 */ nop diff --git a/asm/nonmatchings/code_135EE0/pause_textbox_draw_contents.s b/asm/nonmatchings/code_135EE0/pause_textbox_draw_contents.s index d37486d0e6..3480a14fba 100644 --- a/asm/nonmatchings/code_135EE0/pause_textbox_draw_contents.s +++ b/asm/nonmatchings/code_135EE0/pause_textbox_draw_contents.s @@ -31,7 +31,7 @@ glabel pause_textbox_draw_contents /* 136918 802435D8 26860004 */ addiu $a2, $s4, 4 /* 13691C 802435DC 8E040004 */ lw $a0, 4($s0) /* 136920 802435E0 0C0511F8 */ jal draw_icon_2 -/* 136924 802435E4 00000000 */ nop +/* 136924 802435E4 00000000 */ nop /* 136928 802435E8 8E220000 */ lw $v0, ($s1) .L802435EC: /* 13692C 802435EC 3C038027 */ lui $v1, %hi(D_8027010C) @@ -48,11 +48,11 @@ glabel pause_textbox_draw_contents /* 136958 80243618 24C6FFFC */ addiu $a2, $a2, -4 /* 13695C 8024361C 8E040008 */ lw $a0, 8($s0) /* 136960 80243620 0C0511F8 */ jal draw_icon_2 -/* 136964 80243624 00000000 */ nop +/* 136964 80243624 00000000 */ nop .L80243628: /* 136968 80243628 0240202D */ daddu $a0, $s2, $zero -/* 13696C 8024362C 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 136970 80243630 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 13696C 8024362C 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 136970 80243630 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 136974 80243634 2665000A */ addiu $a1, $s3, 0xa /* 136978 80243638 3C02E700 */ lui $v0, 0xe700 /* 13697C 8024363C 3C10ED00 */ lui $s0, 0xed00 @@ -68,54 +68,54 @@ glabel pause_textbox_draw_contents /* 1369A4 80243664 AC620000 */ sw $v0, ($v1) /* 1369A8 80243668 26620001 */ addiu $v0, $s3, 1 /* 1369AC 8024366C 44821000 */ mtc1 $v0, $f2 -/* 1369B0 80243670 00000000 */ nop +/* 1369B0 80243670 00000000 */ nop /* 1369B4 80243674 468010A0 */ cvt.s.w $f2, $f2 /* 1369B8 80243678 AC600004 */ sw $zero, 4($v1) /* 1369BC 8024367C 25030008 */ addiu $v1, $t0, 8 /* 1369C0 80243680 46041082 */ mul.s $f2, $f2, $f4 -/* 1369C4 80243684 00000000 */ nop +/* 1369C4 80243684 00000000 */ nop /* 1369C8 80243688 26820001 */ addiu $v0, $s4, 1 /* 1369CC 8024368C 44820000 */ mtc1 $v0, $f0 -/* 1369D0 80243690 00000000 */ nop +/* 1369D0 80243690 00000000 */ nop /* 1369D4 80243694 46800020 */ cvt.s.w $f0, $f0 /* 1369D8 80243698 02751021 */ addu $v0, $s3, $s5 /* 1369DC 8024369C 2442FFFF */ addiu $v0, $v0, -1 /* 1369E0 802436A0 46040002 */ mul.s $f0, $f0, $f4 -/* 1369E4 802436A4 00000000 */ nop +/* 1369E4 802436A4 00000000 */ nop /* 1369E8 802436A8 AE230000 */ sw $v1, ($s1) /* 1369EC 802436AC 4600118D */ trunc.w.s $f6, $f2 /* 1369F0 802436B0 44033000 */ mfc1 $v1, $f6 -/* 1369F4 802436B4 00000000 */ nop +/* 1369F4 802436B4 00000000 */ nop /* 1369F8 802436B8 30630FFF */ andi $v1, $v1, 0xfff /* 1369FC 802436BC 00031B00 */ sll $v1, $v1, 0xc /* 136A00 802436C0 4600018D */ trunc.w.s $f6, $f0 /* 136A04 802436C4 44073000 */ mfc1 $a3, $f6 -/* 136A08 802436C8 00000000 */ nop +/* 136A08 802436C8 00000000 */ nop /* 136A0C 802436CC 30E70FFF */ andi $a3, $a3, 0xfff /* 136A10 802436D0 00F03825 */ or $a3, $a3, $s0 /* 136A14 802436D4 44821000 */ mtc1 $v0, $f2 -/* 136A18 802436D8 00000000 */ nop +/* 136A18 802436D8 00000000 */ nop /* 136A1C 802436DC 468010A0 */ cvt.s.w $f2, $f2 /* 136A20 802436E0 00671825 */ or $v1, $v1, $a3 /* 136A24 802436E4 46041082 */ mul.s $f2, $f2, $f4 -/* 136A28 802436E8 00000000 */ nop +/* 136A28 802436E8 00000000 */ nop /* 136A2C 802436EC 02961021 */ addu $v0, $s4, $s6 /* 136A30 802436F0 2442FFFF */ addiu $v0, $v0, -1 /* 136A34 802436F4 44820000 */ mtc1 $v0, $f0 -/* 136A38 802436F8 00000000 */ nop +/* 136A38 802436F8 00000000 */ nop /* 136A3C 802436FC 46800020 */ cvt.s.w $f0, $f0 /* 136A40 80243700 240700FF */ addiu $a3, $zero, 0xff /* 136A44 80243704 46040002 */ mul.s $f0, $f0, $f4 -/* 136A48 80243708 00000000 */ nop +/* 136A48 80243708 00000000 */ nop /* 136A4C 8024370C AD030000 */ sw $v1, ($t0) /* 136A50 80243710 4600118D */ trunc.w.s $f6, $f2 /* 136A54 80243714 44023000 */ mfc1 $v0, $f6 -/* 136A58 80243718 00000000 */ nop +/* 136A58 80243718 00000000 */ nop /* 136A5C 8024371C 30420FFF */ andi $v0, $v0, 0xfff /* 136A60 80243720 00021300 */ sll $v0, $v0, 0xc /* 136A64 80243724 4600018D */ trunc.w.s $f6, $f0 /* 136A68 80243728 44033000 */ mfc1 $v1, $f6 -/* 136A6C 8024372C 00000000 */ nop +/* 136A6C 8024372C 00000000 */ nop /* 136A70 80243730 30630FFF */ andi $v1, $v1, 0xfff /* 136A74 80243734 00431025 */ or $v0, $v0, $v1 /* 136A78 80243738 AD020004 */ sw $v0, 4($t0) diff --git a/asm/nonmatchings/code_135EE0/pause_tutorial_draw_contents.s b/asm/nonmatchings/code_135EE0/pause_tutorial_draw_contents.s index a16056e662..5cb39cd61b 100644 --- a/asm/nonmatchings/code_135EE0/pause_tutorial_draw_contents.s +++ b/asm/nonmatchings/code_135EE0/pause_tutorial_draw_contents.s @@ -41,11 +41,11 @@ glabel pause_tutorial_draw_contents /* 136BC4 80243884 36941630 */ ori $s4, $s4, 0x1630 /* 136BC8 80243888 0000B82D */ daddu $s7, $zero, $zero /* 136BCC 8024388C 27B50068 */ addiu $s5, $sp, 0x68 -/* 136BD0 80243890 3C028007 */ lui $v0, %hi(D_800741F0) -/* 136BD4 80243894 244241F0 */ addiu $v0, $v0, %lo(D_800741F0) +/* 136BD0 80243890 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* 136BD4 80243894 244241F0 */ addiu $v0, $v0, %lo(gMatrixListPos) /* 136BD8 80243898 0040F02D */ daddu $fp, $v0, $zero -/* 136BDC 8024389C 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 136BE0 802438A0 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 136BDC 8024389C 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 136BE0 802438A0 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 136BE4 802438A4 0040B02D */ daddu $s6, $v0, $zero /* 136BE8 802438A8 3C12FA00 */ lui $s2, 0xfa00 /* 136BEC 802438AC 8FAE0124 */ lw $t6, 0x124($sp) @@ -153,8 +153,8 @@ glabel pause_tutorial_draw_contents /* 136D84 80243A44 E7B6001C */ swc1 $f22, 0x1c($sp) /* 136D88 80243A48 27A40028 */ addiu $a0, $sp, 0x28 /* 136D8C 80243A4C 97C50000 */ lhu $a1, ($fp) -/* 136D90 80243A50 3C02800A */ lui $v0, %hi(D_8009A674) -/* 136D94 80243A54 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 136D90 80243A50 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 136D94 80243A54 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 136D98 80243A58 00052980 */ sll $a1, $a1, 6 /* 136D9C 80243A5C 00B42821 */ addu $a1, $a1, $s4 /* 136DA0 80243A60 0C019D40 */ jal guMtxF2L @@ -171,8 +171,8 @@ glabel pause_tutorial_draw_contents /* 136DCC 80243A8C 00021180 */ sll $v0, $v0, 6 /* 136DD0 80243A90 ACA40000 */ sw $a0, ($a1) /* 136DD4 80243A94 A7C30000 */ sh $v1, ($fp) -/* 136DD8 80243A98 3C03800A */ lui $v1, %hi(D_8009A674) -/* 136DDC 80243A9C 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 136DD8 80243A98 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 136DDC 80243A9C 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 136DE0 80243AA0 00541021 */ addu $v0, $v0, $s4 /* 136DE4 80243AA4 00621821 */ addu $v1, $v1, $v0 /* 136DE8 80243AA8 ACA30004 */ sw $v1, 4($a1) @@ -182,7 +182,7 @@ glabel pause_tutorial_draw_contents /* 136DF4 80243AB4 12E2000B */ beq $s7, $v0, .L80243AE4 /* 136DF8 80243AB8 27A40028 */ addiu $a0, $sp, 0x28 /* 136DFC 80243ABC 08090EC0 */ j .L80243B00 -/* 136E00 80243AC0 00000000 */ nop +/* 136E00 80243AC0 00000000 */ nop .L80243AC4: /* 136E04 80243AC4 27A40028 */ addiu $a0, $sp, 0x28 /* 136E08 80243AC8 3C054220 */ lui $a1, 0x4220 @@ -238,8 +238,8 @@ glabel pause_tutorial_draw_contents /* 136EC4 80243B84 00A0302D */ daddu $a2, $a1, $zero /* 136EC8 80243B88 27A40028 */ addiu $a0, $sp, 0x28 /* 136ECC 80243B8C 97C50000 */ lhu $a1, ($fp) -/* 136ED0 80243B90 3C02800A */ lui $v0, %hi(D_8009A674) -/* 136ED4 80243B94 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 136ED0 80243B90 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 136ED4 80243B94 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 136ED8 80243B98 8FAE00D0 */ lw $t6, 0xd0($sp) /* 136EDC 80243B9C 00052980 */ sll $a1, $a1, 6 /* 136EE0 80243BA0 00AE2821 */ addu $a1, $a1, $t6 @@ -254,8 +254,8 @@ glabel pause_tutorial_draw_contents /* 136F04 80243BC4 26F70001 */ addiu $s7, $s7, 1 /* 136F08 80243BC8 8EC80000 */ lw $t0, ($s6) /* 136F0C 80243BCC 97C90000 */ lhu $t1, ($fp) -/* 136F10 80243BD0 3C03800A */ lui $v1, %hi(D_8009A674) -/* 136F14 80243BD4 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 136F10 80243BD0 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 136F14 80243BD4 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 136F18 80243BD8 0100202D */ daddu $a0, $t0, $zero /* 136F1C 80243BDC AC820000 */ sw $v0, ($a0) /* 136F20 80243BE0 3122FFFF */ andi $v0, $t1, 0xffff @@ -337,8 +337,8 @@ glabel pause_tutorial_draw_contents /* 137050 80243D10 00042080 */ sll $a0, $a0, 2 /* 137054 80243D14 0C090D06 */ jal pause_interp_text_scroll /* 137058 80243D18 00822023 */ subu $a0, $a0, $v0 -/* 13705C 80243D1C 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 137060 80243D20 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 13705C 80243D1C 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 137060 80243D20 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 137064 80243D24 8D060000 */ lw $a2, ($t0) /* 137068 80243D28 8FAE0124 */ lw $t6, 0x124($sp) /* 13706C 80243D2C 3C014080 */ lui $at, 0x4080 @@ -346,57 +346,57 @@ glabel pause_tutorial_draw_contents /* 137074 80243D34 8FAF0128 */ lw $t7, 0x128($sp) /* 137078 80243D38 01D41821 */ addu $v1, $t6, $s4 /* 13707C 80243D3C 44831000 */ mtc1 $v1, $f2 -/* 137080 80243D40 00000000 */ nop +/* 137080 80243D40 00000000 */ nop /* 137084 80243D44 468010A0 */ cvt.s.w $f2, $f2 /* 137088 80243D48 00C0382D */ daddu $a3, $a2, $zero /* 13708C 80243D4C 46041082 */ mul.s $f2, $f2, $f4 -/* 137090 80243D50 00000000 */ nop +/* 137090 80243D50 00000000 */ nop /* 137094 80243D54 01F41821 */ addu $v1, $t7, $s4 /* 137098 80243D58 44830000 */ mtc1 $v1, $f0 -/* 13709C 80243D5C 00000000 */ nop +/* 13709C 80243D5C 00000000 */ nop /* 1370A0 80243D60 46800020 */ cvt.s.w $f0, $f0 /* 1370A4 80243D64 24C60008 */ addiu $a2, $a2, 8 /* 1370A8 80243D68 3C03ED00 */ lui $v1, 0xed00 /* 1370AC 80243D6C 46040002 */ mul.s $f0, $f0, $f4 -/* 1370B0 80243D70 00000000 */ nop +/* 1370B0 80243D70 00000000 */ nop /* 1370B4 80243D74 8FAF0124 */ lw $t7, 0x124($sp) /* 1370B8 80243D78 4600118D */ trunc.w.s $f6, $f2 /* 1370BC 80243D7C 44043000 */ mfc1 $a0, $f6 -/* 1370C0 80243D80 00000000 */ nop +/* 1370C0 80243D80 00000000 */ nop /* 1370C4 80243D84 30840FFF */ andi $a0, $a0, 0xfff /* 1370C8 80243D88 00042300 */ sll $a0, $a0, 0xc /* 1370CC 80243D8C 4600018D */ trunc.w.s $f6, $f0 /* 1370D0 80243D90 44053000 */ mfc1 $a1, $f6 -/* 1370D4 80243D94 00000000 */ nop +/* 1370D4 80243D94 00000000 */ nop /* 1370D8 80243D98 30A50FFF */ andi $a1, $a1, 0xfff /* 1370DC 80243D9C 8FAE012C */ lw $t6, 0x12c($sp) /* 1370E0 80243DA0 00A32825 */ or $a1, $a1, $v1 /* 1370E4 80243DA4 01EE1821 */ addu $v1, $t7, $t6 /* 1370E8 80243DA8 2463FFFF */ addiu $v1, $v1, -1 /* 1370EC 80243DAC 44831000 */ mtc1 $v1, $f2 -/* 1370F0 80243DB0 00000000 */ nop +/* 1370F0 80243DB0 00000000 */ nop /* 1370F4 80243DB4 468010A0 */ cvt.s.w $f2, $f2 /* 1370F8 80243DB8 46041082 */ mul.s $f2, $f2, $f4 -/* 1370FC 80243DBC 00000000 */ nop +/* 1370FC 80243DBC 00000000 */ nop /* 137100 80243DC0 8FAF0128 */ lw $t7, 0x128($sp) /* 137104 80243DC4 8FAE0130 */ lw $t6, 0x130($sp) /* 137108 80243DC8 00852025 */ or $a0, $a0, $a1 /* 13710C 80243DCC 01EE1821 */ addu $v1, $t7, $t6 /* 137110 80243DD0 2463FFFF */ addiu $v1, $v1, -1 /* 137114 80243DD4 44830000 */ mtc1 $v1, $f0 -/* 137118 80243DD8 00000000 */ nop +/* 137118 80243DD8 00000000 */ nop /* 13711C 80243DDC 46800020 */ cvt.s.w $f0, $f0 /* 137120 80243DE0 46040002 */ mul.s $f0, $f0, $f4 -/* 137124 80243DE4 00000000 */ nop +/* 137124 80243DE4 00000000 */ nop /* 137128 80243DE8 ACE40000 */ sw $a0, ($a3) /* 13712C 80243DEC 4600118D */ trunc.w.s $f6, $f2 /* 137130 80243DF0 44033000 */ mfc1 $v1, $f6 -/* 137134 80243DF4 00000000 */ nop +/* 137134 80243DF4 00000000 */ nop /* 137138 80243DF8 30630FFF */ andi $v1, $v1, 0xfff /* 13713C 80243DFC 00031B00 */ sll $v1, $v1, 0xc /* 137140 80243E00 4600018D */ trunc.w.s $f6, $f0 /* 137144 80243E04 44043000 */ mfc1 $a0, $f6 -/* 137148 80243E08 00000000 */ nop +/* 137148 80243E08 00000000 */ nop /* 13714C 80243E0C 30840FFF */ andi $a0, $a0, 0xfff /* 137150 80243E10 00641825 */ or $v1, $v1, $a0 /* 137154 80243E14 ACE30004 */ sw $v1, 4($a3) @@ -487,7 +487,7 @@ glabel pause_tutorial_draw_contents /* 1372A8 80243F68 00822021 */ addu $a0, $a0, $v0 /* 1372AC 80243F6C 8C8400E8 */ lw $a0, %lo(gPauseMenuCommonIconIDs)($a0) /* 1372B0 80243F70 0C051308 */ jal func_80144C20 -/* 1372B4 80243F74 00000000 */ nop +/* 1372B4 80243F74 00000000 */ nop /* 1372B8 80243F78 8EA20000 */ lw $v0, ($s5) /* 1372BC 80243F7C 00021080 */ sll $v0, $v0, 2 /* 1372C0 80243F80 3C018025 */ lui $at, %hi(D_8024F090) @@ -498,7 +498,7 @@ glabel pause_tutorial_draw_contents /* 1372D4 80243F94 00822021 */ addu $a0, $a0, $v0 /* 1372D8 80243F98 8C8400E8 */ lw $a0, %lo(gPauseMenuCommonIconIDs)($a0) /* 1372DC 80243F9C 0C0511F8 */ jal draw_icon_2 -/* 1372E0 80243FA0 00000000 */ nop +/* 1372E0 80243FA0 00000000 */ nop /* 1372E4 80243FA4 8EA20000 */ lw $v0, ($s5) /* 1372E8 80243FA8 3C108027 */ lui $s0, %hi(gPauseMenuCommonIconIDs) /* 1372EC 80243FAC 261000E8 */ addiu $s0, $s0, %lo(gPauseMenuCommonIconIDs) @@ -515,7 +515,7 @@ glabel pause_tutorial_draw_contents /* 137318 80243FD8 25E60032 */ addiu $a2, $t7, 0x32 /* 13731C 80243FDC 8E04001C */ lw $a0, 0x1c($s0) /* 137320 80243FE0 0C0511F8 */ jal draw_icon_2 -/* 137324 80243FE4 00000000 */ nop +/* 137324 80243FE4 00000000 */ nop .L80243FE8: /* 137328 80243FE8 8EA20000 */ lw $v0, ($s5) /* 13732C 80243FEC 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/code_1370_len_7d0/func_80026164.s b/asm/nonmatchings/code_1370_len_7d0/func_80026164.s index 10fd8bea6e..e9aea249e8 100644 --- a/asm/nonmatchings/code_1370_len_7d0/func_80026164.s +++ b/asm/nonmatchings/code_1370_len_7d0/func_80026164.s @@ -3,13 +3,13 @@ glabel func_80026164 /* 1564 80026164 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 1568 80026168 3C048007 */ lui $a0, %hi(D_800741F4) -/* 156C 8002616C 8C8441F4 */ lw $a0, %lo(D_800741F4)($a0) +/* 1568 80026168 3C048007 */ lui $a0, %hi(gCurrentDisplayContextIndex) +/* 156C 8002616C 8C8441F4 */ lw $a0, %lo(gCurrentDisplayContextIndex)($a0) /* 1570 80026170 3C058016 */ lui $a1, %hi(D_80164000) /* 1574 80026174 24A54000 */ addiu $a1, $a1, %lo(D_80164000) /* 1578 80026178 AFB20020 */ sw $s2, 0x20($sp) -/* 157C 8002617C 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 1580 80026180 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 157C 8002617C 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 1580 80026180 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 1584 80026184 AFBF003C */ sw $ra, 0x3c($sp) /* 1588 80026188 AFBE0038 */ sw $fp, 0x38($sp) /* 158C 8002618C AFB70034 */ sw $s7, 0x34($sp) @@ -19,8 +19,8 @@ glabel func_80026164 /* 159C 8002619C AFB30024 */ sw $s3, 0x24($sp) /* 15A0 800261A0 AFB1001C */ sw $s1, 0x1c($sp) /* 15A4 800261A4 AFB00018 */ sw $s0, 0x18($sp) -/* 15A8 800261A8 3C018007 */ lui $at, %hi(D_800741F0) -/* 15AC 800261AC A42041F0 */ sh $zero, %lo(D_800741F0)($at) +/* 15A8 800261A8 3C018007 */ lui $at, %hi(gMatrixListPos) +/* 15AC 800261AC A42041F0 */ sh $zero, %lo(gMatrixListPos)($at) /* 15B0 800261B0 00041040 */ sll $v0, $a0, 1 /* 15B4 800261B4 00441021 */ addu $v0, $v0, $a0 /* 15B8 800261B8 000210C0 */ sll $v0, $v0, 3 @@ -31,8 +31,8 @@ glabel func_80026164 /* 15CC 800261CC 00441023 */ subu $v0, $v0, $a0 /* 15D0 800261D0 00021100 */ sll $v0, $v0, 4 /* 15D4 800261D4 00451021 */ addu $v0, $v0, $a1 -/* 15D8 800261D8 3C01800A */ lui $at, %hi(D_8009A674) -/* 15DC 800261DC AC22A674 */ sw $v0, %lo(D_8009A674)($at) +/* 15D8 800261D8 3C01800A */ lui $at, %hi(gDisplayContext) +/* 15DC 800261DC AC22A674 */ sw $v0, %lo(gDisplayContext)($at) /* 15E0 800261E0 24420230 */ addiu $v0, $v0, 0x230 /* 15E4 800261E4 AE420000 */ sw $v0, ($s2) /* 15E8 800261E8 3C118007 */ lui $s1, %hi(D_80073E04) @@ -322,13 +322,13 @@ glabel func_80026164 /* 1A48 80026648 28420014 */ slti $v0, $v0, 0x14 /* 1A4C 8002664C 1440FF73 */ bnez $v0, .L8002641C /* 1A50 80026650 0000702D */ daddu $t6, $zero, $zero -/* 1A54 80026654 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 1A58 80026658 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 1A54 80026654 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 1A58 80026658 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 1A5C 8002665C 3C038007 */ lui $v1, %hi(D_80074010) /* 1A60 80026660 24634010 */ addiu $v1, $v1, %lo(D_80074010) /* 1A64 80026664 8CC50000 */ lw $a1, ($a2) -/* 1A68 80026668 3C08800A */ lui $t0, %hi(D_8009A674) -/* 1A6C 8002666C 8D08A674 */ lw $t0, %lo(D_8009A674)($t0) +/* 1A68 80026668 3C08800A */ lui $t0, %hi(gDisplayContext) +/* 1A6C 8002666C 8D08A674 */ lw $t0, %lo(gDisplayContext)($t0) /* 1A70 80026670 94620000 */ lhu $v0, ($v1) /* 1A74 80026674 00A0382D */ daddu $a3, $a1, $zero /* 1A78 80026678 24A50008 */ addiu $a1, $a1, 8 @@ -351,8 +351,8 @@ glabel func_80026164 /* 1ABC 800266BC 0000302D */ daddu $a2, $zero, $zero /* 1AC0 800266C0 0C00B331 */ jal nuGfxTaskStart /* 1AC4 800266C4 3C070004 */ lui $a3, 4 -/* 1AC8 800266C8 3C038007 */ lui $v1, %hi(D_800741F4) -/* 1ACC 800266CC 246341F4 */ addiu $v1, $v1, %lo(D_800741F4) +/* 1AC8 800266C8 3C038007 */ lui $v1, %hi(gCurrentDisplayContextIndex) +/* 1ACC 800266CC 246341F4 */ addiu $v1, $v1, %lo(gCurrentDisplayContextIndex) /* 1AD0 800266D0 8C620000 */ lw $v0, ($v1) /* 1AD4 800266D4 38420001 */ xori $v0, $v0, 1 /* 1AD8 800266D8 AC620000 */ sw $v0, ($v1) diff --git a/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s b/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s index 96a938c9b3..e08e8bc379 100644 --- a/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s +++ b/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s @@ -53,7 +53,7 @@ glabel pause_badges_draw_contents /* 13A904 802475C4 15210004 */ bne $t1, $at, .L802475D8 /* 13A908 802475C8 3C018000 */ lui $at, 0x8000 /* 13A90C 802475CC 14610002 */ bne $v1, $at, .L802475D8 -/* 13A910 802475D0 00000000 */ nop +/* 13A910 802475D0 00000000 */ nop /* 13A914 802475D4 0006000D */ break 6 .L802475D8: /* 13A918 802475D8 00005012 */ mflo $t2 @@ -110,7 +110,7 @@ glabel pause_badges_draw_contents /* 13A9E0 802476A0 24060001 */ addiu $a2, $zero, 1 .L802476A4: /* 13A9E4 802476A4 18E005AD */ blez $a3, .L80248D5C -/* 13A9E8 802476A8 00000000 */ nop +/* 13A9E8 802476A8 00000000 */ nop /* 13A9EC 802476AC 190005AB */ blez $t0, .L80248D5C /* 13A9F0 802476B0 2882013F */ slti $v0, $a0, 0x13f /* 13A9F4 802476B4 104005A9 */ beqz $v0, .L80248D5C @@ -124,13 +124,13 @@ glabel pause_badges_draw_contents /* 13AA10 802476D0 50400001 */ beql $v0, $zero, .L802476D8 /* 13AA14 802476D4 240800EF */ addiu $t0, $zero, 0xef .L802476D8: -/* 13AA18 802476D8 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 13AA1C 802476DC 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 13AA18 802476D8 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 13AA1C 802476DC 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 13AA20 802476E0 44841000 */ mtc1 $a0, $f2 -/* 13AA24 802476E4 00000000 */ nop +/* 13AA24 802476E4 00000000 */ nop /* 13AA28 802476E8 468010A0 */ cvt.s.w $f2, $f2 /* 13AA2C 802476EC 44860000 */ mtc1 $a2, $f0 -/* 13AA30 802476F0 00000000 */ nop +/* 13AA30 802476F0 00000000 */ nop /* 13AA34 802476F4 46800020 */ cvt.s.w $f0, $f0 /* 13AA38 802476F8 8FAB00C4 */ lw $t3, 0xc4($sp) /* 13AA3C 802476FC 8FAA00C8 */ lw $t2, 0xc8($sp) @@ -141,45 +141,45 @@ glabel pause_badges_draw_contents /* 13AA50 80247710 AFA00054 */ sw $zero, 0x54($sp) /* 13AA54 80247714 256B0077 */ addiu $t3, $t3, 0x77 /* 13AA58 80247718 46041082 */ mul.s $f2, $f2, $f4 -/* 13AA5C 8024771C 00000000 */ nop +/* 13AA5C 8024771C 00000000 */ nop /* 13AA60 80247720 254A0011 */ addiu $t2, $t2, 0x11 /* 13AA64 80247724 AFAB007C */ sw $t3, 0x7c($sp) /* 13AA68 80247728 AFAA0080 */ sw $t2, 0x80($sp) /* 13AA6C 8024772C 8C620000 */ lw $v0, ($v1) /* 13AA70 80247730 46040002 */ mul.s $f0, $f0, $f4 -/* 13AA74 80247734 00000000 */ nop +/* 13AA74 80247734 00000000 */ nop /* 13AA78 80247738 0040282D */ daddu $a1, $v0, $zero /* 13AA7C 8024773C 24420008 */ addiu $v0, $v0, 8 /* 13AA80 80247740 AC620000 */ sw $v0, ($v1) /* 13AA84 80247744 4600118D */ trunc.w.s $f6, $f2 /* 13AA88 80247748 44023000 */ mfc1 $v0, $f6 -/* 13AA8C 8024774C 00000000 */ nop +/* 13AA8C 8024774C 00000000 */ nop /* 13AA90 80247750 30420FFF */ andi $v0, $v0, 0xfff /* 13AA94 80247754 00021300 */ sll $v0, $v0, 0xc /* 13AA98 80247758 4600018D */ trunc.w.s $f6, $f0 /* 13AA9C 8024775C 44033000 */ mfc1 $v1, $f6 /* 13AAA0 80247760 44871000 */ mtc1 $a3, $f2 -/* 13AAA4 80247764 00000000 */ nop +/* 13AAA4 80247764 00000000 */ nop /* 13AAA8 80247768 468010A0 */ cvt.s.w $f2, $f2 /* 13AAAC 8024776C 46041082 */ mul.s $f2, $f2, $f4 -/* 13AAB0 80247770 00000000 */ nop +/* 13AAB0 80247770 00000000 */ nop /* 13AAB4 80247774 30630FFF */ andi $v1, $v1, 0xfff /* 13AAB8 80247778 00641825 */ or $v1, $v1, $a0 /* 13AABC 8024777C 00431025 */ or $v0, $v0, $v1 /* 13AAC0 80247780 44880000 */ mtc1 $t0, $f0 -/* 13AAC4 80247784 00000000 */ nop +/* 13AAC4 80247784 00000000 */ nop /* 13AAC8 80247788 46800020 */ cvt.s.w $f0, $f0 /* 13AACC 8024778C 46040002 */ mul.s $f0, $f0, $f4 -/* 13AAD0 80247790 00000000 */ nop +/* 13AAD0 80247790 00000000 */ nop /* 13AAD4 80247794 ACA20000 */ sw $v0, ($a1) /* 13AAD8 80247798 4600118D */ trunc.w.s $f6, $f2 /* 13AADC 8024779C 44023000 */ mfc1 $v0, $f6 -/* 13AAE0 802477A0 00000000 */ nop +/* 13AAE0 802477A0 00000000 */ nop /* 13AAE4 802477A4 30420FFF */ andi $v0, $v0, 0xfff /* 13AAE8 802477A8 00021300 */ sll $v0, $v0, 0xc /* 13AAEC 802477AC 4600018D */ trunc.w.s $f6, $f0 /* 13AAF0 802477B0 44033000 */ mfc1 $v1, $f6 -/* 13AAF4 802477B4 00000000 */ nop +/* 13AAF4 802477B4 00000000 */ nop /* 13AAF8 802477B8 30630FFF */ andi $v1, $v1, 0xfff /* 13AAFC 802477BC 00431025 */ or $v0, $v0, $v1 /* 13AB00 802477C0 ACA20004 */ sw $v0, 4($a1) @@ -256,13 +256,13 @@ glabel pause_badges_draw_contents /* 13AC08 802478C8 3C038027 */ lui $v1, %hi(gBadgeMenuLevel) /* 13AC0C 802478CC 8C630398 */ lw $v1, %lo(gBadgeMenuLevel)($v1) /* 13AC10 802478D0 14620025 */ bne $v1, $v0, .L80247968 -/* 13AC14 802478D4 00000000 */ nop +/* 13AC14 802478D4 00000000 */ nop /* 13AC18 802478D8 8FA40050 */ lw $a0, 0x50($sp) /* 13AC1C 802478DC 0C091C76 */ jal pause_badges_get_column /* 13AC20 802478E0 03C0282D */ daddu $a1, $fp, $zero /* 13AC24 802478E4 8FAA005C */ lw $t2, 0x5c($sp) /* 13AC28 802478E8 144A001F */ bne $v0, $t2, .L80247968 -/* 13AC2C 802478EC 00000000 */ nop +/* 13AC2C 802478EC 00000000 */ nop /* 13AC30 802478F0 8FA40050 */ lw $a0, 0x50($sp) /* 13AC34 802478F4 0C091C88 */ jal pause_badges_get_row /* 13AC38 802478F8 03C0282D */ daddu $a1, $fp, $zero @@ -335,7 +335,7 @@ glabel pause_badges_draw_contents .L802479F4: /* 13AD34 802479F4 8FAB0084 */ lw $t3, 0x84($sp) /* 13AD38 802479F8 1160002A */ beqz $t3, .L80247AA4 -/* 13AD3C 802479FC 00000000 */ nop +/* 13AD3C 802479FC 00000000 */ nop /* 13AD40 80247A00 0C091CAA */ jal pause_badges_scroll_offset_x /* 13AD44 80247A04 02E0202D */ daddu $a0, $s7, $zero /* 13AD48 80247A08 8FAA007C */ lw $t2, 0x7c($sp) @@ -373,7 +373,7 @@ glabel pause_badges_draw_contents /* 13ADC8 80247A88 0C03D4B8 */ jal draw_box /* 13ADCC 80247A8C AFA20048 */ sw $v0, 0x48($sp) /* 13ADD0 80247A90 08091EAD */ j .L80247AB4 -/* 13ADD4 80247A94 00000000 */ nop +/* 13ADD4 80247A94 00000000 */ nop .L80247A98: /* 13ADD8 80247A98 240A0001 */ addiu $t2, $zero, 1 /* 13ADDC 80247A9C 08091E2D */ j .L802478B4 @@ -387,7 +387,7 @@ glabel pause_badges_draw_contents /* 13ADF4 80247AB4 0C091C9C */ jal pause_badges_is_visible /* 13ADF8 80247AB8 02C0202D */ daddu $a0, $s6, $zero /* 13ADFC 80247ABC 104001A2 */ beqz $v0, .L80248148 -/* 13AE00 80247AC0 00000000 */ nop +/* 13AE00 80247AC0 00000000 */ nop /* 13AE04 80247AC4 8FAB0054 */ lw $t3, 0x54($sp) /* 13AE08 80247AC8 15600058 */ bnez $t3, .L80247C2C /* 13AE0C 80247ACC 24020001 */ addiu $v0, $zero, 1 @@ -416,7 +416,7 @@ glabel pause_badges_draw_contents /* 13AE68 80247B28 0C04993B */ jal draw_string /* 13AE6C 80247B2C AFAA0014 */ sw $t2, 0x14($sp) /* 13AE70 80247B30 08091F09 */ j .L80247C24 -/* 13AE74 80247B34 00000000 */ nop +/* 13AE74 80247B34 00000000 */ nop .L80247B38: /* 13AE78 80247B38 000212C3 */ sra $v0, $v0, 0xb /* 13AE7C 80247B3C 3C0B8008 */ lui $t3, %hi(gItemTable) @@ -424,9 +424,9 @@ glabel pause_badges_draw_contents /* 13AE84 80247B44 004B8821 */ addu $s1, $v0, $t3 /* 13AE88 80247B48 8E220000 */ lw $v0, ($s1) /* 13AE8C 80247B4C 10400015 */ beqz $v0, .L80247BA4 -/* 13AE90 80247B50 00000000 */ nop +/* 13AE90 80247B50 00000000 */ nop /* 13AE94 80247B54 18400013 */ blez $v0, .L80247BA4 -/* 13AE98 80247B58 00000000 */ nop +/* 13AE98 80247B58 00000000 */ nop /* 13AE9C 80247B5C 0C091CAA */ jal pause_badges_scroll_offset_x /* 13AEA0 80247B60 02E0202D */ daddu $a0, $s7, $zero /* 13AEA4 80247B64 8FAA007C */ lw $t2, 0x7c($sp) @@ -497,11 +497,11 @@ glabel pause_badges_draw_contents /* 13AF9C 80247C5C 34058000 */ ori $a1, $zero, 0x8000 /* 13AFA0 80247C60 8FAA0088 */ lw $t2, 0x88($sp) /* 13AFA4 80247C64 11400005 */ beqz $t2, .L80247C7C -/* 13AFA8 80247C68 00000000 */ nop +/* 13AFA8 80247C68 00000000 */ nop /* 13AFAC 80247C6C 3C118027 */ lui $s1, %hi(D_802703FC) /* 13AFB0 80247C70 8E3103FC */ lw $s1, %lo(D_802703FC)($s1) /* 13AFB4 80247C74 08091F51 */ j .L80247D44 -/* 13AFB8 80247C78 00000000 */ nop +/* 13AFB8 80247C78 00000000 */ nop .L80247C7C: /* 13AFBC 80247C7C 12A00010 */ beqz $s5, .L80247CC0 /* 13AFC0 80247C80 0220202D */ daddu $a0, $s1, $zero @@ -575,11 +575,11 @@ glabel pause_badges_draw_contents /* 13B0BC 80247D7C 00543021 */ addu $a2, $v0, $s4 /* 13B0C0 80247D80 8FAB0058 */ lw $t3, 0x58($sp) /* 13B0C4 80247D84 15600005 */ bnez $t3, .L80247D9C -/* 13B0C8 80247D88 00000000 */ nop +/* 13B0C8 80247D88 00000000 */ nop /* 13B0CC 80247D8C 0C0511F8 */ jal draw_icon_2 /* 13B0D0 80247D90 0220202D */ daddu $a0, $s1, $zero /* 13B0D4 80247D94 08091F69 */ j .L80247DA4 -/* 13B0D8 80247D98 00000000 */ nop +/* 13B0D8 80247D98 00000000 */ nop .L80247D9C: /* 13B0DC 80247D9C 0C0511F1 */ jal draw_icon_1 /* 13B0E0 80247DA0 0220202D */ daddu $a0, $s1, $zero @@ -591,7 +591,7 @@ glabel pause_badges_draw_contents /* 13B0F0 80247DB0 8FAB0054 */ lw $t3, 0x54($sp) /* 13B0F4 80247DB4 24020002 */ addiu $v0, $zero, 2 /* 13B0F8 80247DB8 156200E3 */ bne $t3, $v0, .L80248148 -/* 13B0FC 80247DBC 00000000 */ nop +/* 13B0FC 80247DBC 00000000 */ nop /* 13B100 80247DC0 8FAA0088 */ lw $t2, 0x88($sp) /* 13B104 80247DC4 154000E0 */ bnez $t2, .L80248148 /* 13B108 80247DC8 00131400 */ sll $v0, $s3, 0x10 @@ -614,8 +614,8 @@ glabel pause_badges_draw_contents .L80247E0C: /* 13B14C 80247E0C 3C04E300 */ lui $a0, 0xe300 /* 13B150 80247E10 34841201 */ ori $a0, $a0, 0x1201 -/* 13B154 80247E14 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 13B158 80247E18 8CA5A66C */ lw $a1, %lo(D_8009A66C)($a1) +/* 13B154 80247E14 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 13B158 80247E18 8CA5A66C */ lw $a1, %lo(gMasterGfxPos)($a1) /* 13B15C 80247E1C 3C02DE00 */ lui $v0, 0xde00 /* 13B160 80247E20 00A0182D */ daddu $v1, $a1, $zero /* 13B164 80247E24 24A50008 */ addiu $a1, $a1, 8 @@ -624,10 +624,10 @@ glabel pause_badges_draw_contents /* 13B170 80247E30 2442F348 */ addiu $v0, $v0, %lo(D_8026F348) /* 13B174 80247E34 AC620004 */ sw $v0, 4($v1) /* 13B178 80247E38 24A20008 */ addiu $v0, $a1, 8 -/* 13B17C 80247E3C 3C01800A */ lui $at, %hi(D_8009A66C) -/* 13B180 80247E40 AC25A66C */ sw $a1, %lo(D_8009A66C)($at) -/* 13B184 80247E44 3C01800A */ lui $at, %hi(D_8009A66C) -/* 13B188 80247E48 AC22A66C */ sw $v0, %lo(D_8009A66C)($at) +/* 13B17C 80247E3C 3C01800A */ lui $at, %hi(gMasterGfxPos) +/* 13B180 80247E40 AC25A66C */ sw $a1, %lo(gMasterGfxPos)($at) +/* 13B184 80247E44 3C01800A */ lui $at, %hi(gMasterGfxPos) +/* 13B188 80247E48 AC22A66C */ sw $v0, %lo(gMasterGfxPos)($at) /* 13B18C 80247E4C 24022000 */ addiu $v0, $zero, 0x2000 /* 13B190 80247E50 ACA40000 */ sw $a0, ($a1) /* 13B194 80247E54 ACA20004 */ sw $v0, 4($a1) @@ -638,16 +638,16 @@ glabel pause_badges_draw_contents /* 13B1A8 80247E68 0000802D */ daddu $s0, $zero, $zero /* 13B1AC 80247E6C 2A740005 */ slti $s4, $s3, 5 .L80247E70: -/* 13B1B0 80247E70 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 13B1B4 80247E74 8C42A66C */ lw $v0, %lo(D_8009A66C)($v0) +/* 13B1B0 80247E70 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 13B1B4 80247E74 8C42A66C */ lw $v0, %lo(gMasterGfxPos)($v0) /* 13B1B8 80247E78 02E0202D */ daddu $a0, $s7, $zero /* 13B1BC 80247E7C 0040182D */ daddu $v1, $v0, $zero /* 13B1C0 80247E80 3C0AFA00 */ lui $t2, 0xfa00 /* 13B1C4 80247E84 AC6A0000 */ sw $t2, ($v1) /* 13B1C8 80247E88 8FAB0090 */ lw $t3, 0x90($sp) /* 13B1CC 80247E8C 24420008 */ addiu $v0, $v0, 8 -/* 13B1D0 80247E90 3C01800A */ lui $at, %hi(D_8009A66C) -/* 13B1D4 80247E94 AC22A66C */ sw $v0, %lo(D_8009A66C)($at) +/* 13B1D0 80247E90 3C01800A */ lui $at, %hi(gMasterGfxPos) +/* 13B1D4 80247E94 AC22A66C */ sw $v0, %lo(gMasterGfxPos)($at) /* 13B1D8 80247E98 0C091CAA */ jal pause_badges_scroll_offset_x /* 13B1DC 80247E9C AC6B0004 */ sw $t3, 4($v1) /* 13B1E0 80247EA0 8FAA0094 */ lw $t2, 0x94($sp) @@ -686,7 +686,7 @@ glabel pause_badges_draw_contents /* 13B260 80247F20 26100001 */ addiu $s0, $s0, 1 /* 13B264 80247F24 0213102A */ slt $v0, $s0, $s3 /* 13B268 80247F28 1440FFD1 */ bnez $v0, .L80247E70 -/* 13B26C 80247F2C 00000000 */ nop +/* 13B26C 80247F2C 00000000 */ nop .L80247F30: /* 13B270 80247F30 3C06E200 */ lui $a2, 0xe200 /* 13B274 80247F34 34C6001C */ ori $a2, $a2, 0x1c @@ -694,22 +694,22 @@ glabel pause_badges_draw_contents /* 13B27C 80247F3C 34A54340 */ ori $a1, $a1, 0x4340 /* 13B280 80247F40 0000802D */ daddu $s0, $zero, $zero /* 13B284 80247F44 3C02E700 */ lui $v0, 0xe700 -/* 13B288 80247F48 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 13B28C 80247F4C 8C84A66C */ lw $a0, %lo(D_8009A66C)($a0) +/* 13B288 80247F48 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 13B28C 80247F4C 8C84A66C */ lw $a0, %lo(gMasterGfxPos)($a0) /* 13B290 80247F50 240B00FF */ addiu $t3, $zero, 0xff /* 13B294 80247F54 0080182D */ daddu $v1, $a0, $zero /* 13B298 80247F58 24840008 */ addiu $a0, $a0, 8 /* 13B29C 80247F5C AC620000 */ sw $v0, ($v1) /* 13B2A0 80247F60 24820008 */ addiu $v0, $a0, 8 -/* 13B2A4 80247F64 3C01800A */ lui $at, %hi(D_8009A66C) -/* 13B2A8 80247F68 AC24A66C */ sw $a0, %lo(D_8009A66C)($at) -/* 13B2AC 80247F6C 3C01800A */ lui $at, %hi(D_8009A66C) -/* 13B2B0 80247F70 AC22A66C */ sw $v0, %lo(D_8009A66C)($at) +/* 13B2A4 80247F64 3C01800A */ lui $at, %hi(gMasterGfxPos) +/* 13B2A8 80247F68 AC24A66C */ sw $a0, %lo(gMasterGfxPos)($at) +/* 13B2AC 80247F6C 3C01800A */ lui $at, %hi(gMasterGfxPos) +/* 13B2B0 80247F70 AC22A66C */ sw $v0, %lo(gMasterGfxPos)($at) /* 13B2B4 80247F74 24820010 */ addiu $v0, $a0, 0x10 /* 13B2B8 80247F78 AC600004 */ sw $zero, 4($v1) /* 13B2BC 80247F7C 3C0AFA00 */ lui $t2, 0xfa00 -/* 13B2C0 80247F80 3C01800A */ lui $at, %hi(D_8009A66C) -/* 13B2C4 80247F84 AC22A66C */ sw $v0, %lo(D_8009A66C)($at) +/* 13B2C0 80247F80 3C01800A */ lui $at, %hi(gMasterGfxPos) +/* 13B2C4 80247F84 AC22A66C */ sw $v0, %lo(gMasterGfxPos)($at) /* 13B2C8 80247F88 000B1400 */ sll $v0, $t3, 0x10 /* 13B2CC 80247F8C AC8A0008 */ sw $t2, 8($a0) /* 13B2D0 80247F90 240A0064 */ addiu $t2, $zero, 0x64 @@ -765,16 +765,16 @@ glabel pause_badges_draw_contents .L80248050: /* 13B390 80248050 0213102A */ slt $v0, $s0, $s3 /* 13B394 80248054 1440FFD7 */ bnez $v0, .L80247FB4 -/* 13B398 80248058 00000000 */ nop +/* 13B398 80248058 00000000 */ nop /* 13B39C 8024805C 08092052 */ j .L80248148 -/* 13B3A0 80248060 00000000 */ nop +/* 13B3A0 80248060 00000000 */ nop .L80248064: /* 13B3A4 80248064 346364FF */ ori $v1, $v1, 0x64ff /* 13B3A8 80248068 0000802D */ daddu $s0, $zero, $zero /* 13B3AC 8024806C 24A20010 */ addiu $v0, $a1, 0x10 /* 13B3B0 80248070 3C0AFA00 */ lui $t2, 0xfa00 -/* 13B3B4 80248074 3C01800A */ lui $at, %hi(D_8009A66C) -/* 13B3B8 80248078 AC22A66C */ sw $v0, %lo(D_8009A66C)($at) +/* 13B3B4 80248074 3C01800A */ lui $at, %hi(gMasterGfxPos) +/* 13B3B8 80248078 AC22A66C */ sw $v0, %lo(gMasterGfxPos)($at) /* 13B3BC 8024807C ACAA0008 */ sw $t2, 8($a1) /* 13B3C0 80248080 1A600028 */ blez $s3, .L80248124 /* 13B3C4 80248084 ACA3000C */ sw $v1, 0xc($a1) @@ -818,14 +818,14 @@ glabel pause_badges_draw_contents /* 13B454 80248114 26100001 */ addiu $s0, $s0, 1 /* 13B458 80248118 0213102A */ slt $v0, $s0, $s3 /* 13B45C 8024811C 1440FFDB */ bnez $v0, .L8024808C -/* 13B460 80248120 00000000 */ nop +/* 13B460 80248120 00000000 */ nop .L80248124: -/* 13B464 80248124 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 13B468 80248128 8C42A66C */ lw $v0, %lo(D_8009A66C)($v0) +/* 13B464 80248124 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 13B468 80248128 8C42A66C */ lw $v0, %lo(gMasterGfxPos)($v0) /* 13B46C 8024812C 0040182D */ daddu $v1, $v0, $zero /* 13B470 80248130 24420008 */ addiu $v0, $v0, 8 -/* 13B474 80248134 3C01800A */ lui $at, %hi(D_8009A66C) -/* 13B478 80248138 AC22A66C */ sw $v0, %lo(D_8009A66C)($at) +/* 13B474 80248134 3C01800A */ lui $at, %hi(gMasterGfxPos) +/* 13B478 80248138 AC22A66C */ sw $v0, %lo(gMasterGfxPos)($at) /* 13B47C 8024813C 3C02E700 */ lui $v0, 0xe700 /* 13B480 80248140 AC620000 */ sw $v0, ($v1) /* 13B484 80248144 AC600004 */ sw $zero, 4($v1) @@ -835,7 +835,7 @@ glabel pause_badges_draw_contents /* 13B490 80248150 27DE0001 */ addiu $fp, $fp, 1 /* 13B494 80248154 03C2102A */ slt $v0, $fp, $v0 /* 13B498 80248158 1440FDB2 */ bnez $v0, .L80247824 -/* 13B49C 8024815C 00000000 */ nop +/* 13B49C 8024815C 00000000 */ nop .L80248160: /* 13B4A0 80248160 8FAB0050 */ lw $t3, 0x50($sp) /* 13B4A4 80248164 256B0001 */ addiu $t3, $t3, 1 @@ -848,8 +848,8 @@ glabel pause_badges_draw_contents /* 13B4BC 8024817C 29420003 */ slti $v0, $t2, 3 /* 13B4C0 80248180 1440FD90 */ bnez $v0, .L802477C4 /* 13B4C4 80248184 AFAA0054 */ sw $t2, 0x54($sp) -/* 13B4C8 80248188 3C09800A */ lui $t1, %hi(D_8009A66C) -/* 13B4CC 8024818C 2529A66C */ addiu $t1, $t1, %lo(D_8009A66C) +/* 13B4C8 80248188 3C09800A */ lui $t1, %hi(gMasterGfxPos) +/* 13B4CC 8024818C 2529A66C */ addiu $t1, $t1, %lo(gMasterGfxPos) /* 13B4D0 80248190 8FAB00C4 */ lw $t3, 0xc4($sp) /* 13B4D4 80248194 8FAA00C8 */ lw $t2, 0xc8($sp) /* 13B4D8 80248198 8D250000 */ lw $a1, ($t1) @@ -875,7 +875,7 @@ glabel pause_badges_draw_contents /* 13B524 802481E4 24060001 */ addiu $a2, $zero, 1 .L802481E8: /* 13B528 802481E8 18E002DC */ blez $a3, .L80248D5C -/* 13B52C 802481EC 00000000 */ nop +/* 13B52C 802481EC 00000000 */ nop /* 13B530 802481F0 190002DA */ blez $t0, .L80248D5C /* 13B534 802481F4 2882013F */ slti $v0, $a0, 0x13f /* 13B538 802481F8 104002D8 */ beqz $v0, .L80248D5C @@ -892,47 +892,47 @@ glabel pause_badges_draw_contents /* 13B55C 8024821C 3C014080 */ lui $at, 0x4080 /* 13B560 80248220 44812000 */ mtc1 $at, $f4 /* 13B564 80248224 44840000 */ mtc1 $a0, $f0 -/* 13B568 80248228 00000000 */ nop +/* 13B568 80248228 00000000 */ nop /* 13B56C 8024822C 46800020 */ cvt.s.w $f0, $f0 /* 13B570 80248230 46040002 */ mul.s $f0, $f0, $f4 -/* 13B574 80248234 00000000 */ nop +/* 13B574 80248234 00000000 */ nop /* 13B578 80248238 24A20008 */ addiu $v0, $a1, 8 /* 13B57C 8024823C 44861000 */ mtc1 $a2, $f2 -/* 13B580 80248240 00000000 */ nop +/* 13B580 80248240 00000000 */ nop /* 13B584 80248244 468010A0 */ cvt.s.w $f2, $f2 /* 13B588 80248248 3C04ED00 */ lui $a0, 0xed00 /* 13B58C 8024824C 46041082 */ mul.s $f2, $f2, $f4 -/* 13B590 80248250 00000000 */ nop +/* 13B590 80248250 00000000 */ nop /* 13B594 80248254 AD220000 */ sw $v0, ($t1) /* 13B598 80248258 4600018D */ trunc.w.s $f6, $f0 /* 13B59C 8024825C 44023000 */ mfc1 $v0, $f6 -/* 13B5A0 80248260 00000000 */ nop +/* 13B5A0 80248260 00000000 */ nop /* 13B5A4 80248264 30420FFF */ andi $v0, $v0, 0xfff /* 13B5A8 80248268 00021300 */ sll $v0, $v0, 0xc /* 13B5AC 8024826C 4600118D */ trunc.w.s $f6, $f2 /* 13B5B0 80248270 44033000 */ mfc1 $v1, $f6 /* 13B5B4 80248274 44871000 */ mtc1 $a3, $f2 -/* 13B5B8 80248278 00000000 */ nop +/* 13B5B8 80248278 00000000 */ nop /* 13B5BC 8024827C 468010A0 */ cvt.s.w $f2, $f2 /* 13B5C0 80248280 46041082 */ mul.s $f2, $f2, $f4 -/* 13B5C4 80248284 00000000 */ nop +/* 13B5C4 80248284 00000000 */ nop /* 13B5C8 80248288 30630FFF */ andi $v1, $v1, 0xfff /* 13B5CC 8024828C 00641825 */ or $v1, $v1, $a0 /* 13B5D0 80248290 00431025 */ or $v0, $v0, $v1 /* 13B5D4 80248294 44880000 */ mtc1 $t0, $f0 -/* 13B5D8 80248298 00000000 */ nop +/* 13B5D8 80248298 00000000 */ nop /* 13B5DC 8024829C 46800020 */ cvt.s.w $f0, $f0 /* 13B5E0 802482A0 46040002 */ mul.s $f0, $f0, $f4 -/* 13B5E4 802482A4 00000000 */ nop +/* 13B5E4 802482A4 00000000 */ nop /* 13B5E8 802482A8 ACA20000 */ sw $v0, ($a1) /* 13B5EC 802482AC 4600118D */ trunc.w.s $f6, $f2 /* 13B5F0 802482B0 44023000 */ mfc1 $v0, $f6 -/* 13B5F4 802482B4 00000000 */ nop +/* 13B5F4 802482B4 00000000 */ nop /* 13B5F8 802482B8 30420FFF */ andi $v0, $v0, 0xfff /* 13B5FC 802482BC 00021300 */ sll $v0, $v0, 0xc /* 13B600 802482C0 4600018D */ trunc.w.s $f6, $f0 /* 13B604 802482C4 44033000 */ mfc1 $v1, $f6 -/* 13B608 802482C8 00000000 */ nop +/* 13B608 802482C8 00000000 */ nop /* 13B60C 802482CC 30630FFF */ andi $v1, $v1, 0xfff /* 13B610 802482D0 00431025 */ or $v0, $v0, $v1 /* 13B614 802482D4 3C038027 */ lui $v1, %hi(gPauseMenuCurrentTab) @@ -944,7 +944,7 @@ glabel pause_badges_draw_contents /* 13B62C 802482EC 3C038027 */ lui $v1, %hi(gBadgeMenuLevel) /* 13B630 802482F0 8C630398 */ lw $v1, %lo(gBadgeMenuLevel)($v1) /* 13B634 802482F4 14620026 */ bne $v1, $v0, .L80248390 -/* 13B638 802482F8 00000000 */ nop +/* 13B638 802482F8 00000000 */ nop /* 13B63C 802482FC 3C118027 */ lui $s1, %hi(gBadgeMenuCurrentPage) /* 13B640 80248300 26310280 */ addiu $s1, $s1, %lo(gBadgeMenuCurrentPage) /* 13B644 80248304 8E220000 */ lw $v0, ($s1) @@ -960,7 +960,7 @@ glabel pause_badges_draw_contents /* 13B66C 8024832C 2546000E */ addiu $a2, $t2, 0xe /* 13B670 80248330 8E040044 */ lw $a0, 0x44($s0) /* 13B674 80248334 0C0511F8 */ jal draw_icon_2 -/* 13B678 80248338 00000000 */ nop +/* 13B678 80248338 00000000 */ nop /* 13B67C 8024833C 8E220000 */ lw $v0, ($s1) /* 13B680 80248340 24420001 */ addiu $v0, $v0, 1 .L80248344: @@ -971,7 +971,7 @@ glabel pause_badges_draw_contents /* 13B694 80248354 00431021 */ addu $v0, $v0, $v1 /* 13B698 80248358 90420288 */ lbu $v0, %lo(gBadgeMenuPages)($v0) /* 13B69C 8024835C 1040000C */ beqz $v0, .L80248390 -/* 13B6A0 80248360 00000000 */ nop +/* 13B6A0 80248360 00000000 */ nop /* 13B6A4 80248364 3C108027 */ lui $s0, %hi(D_802703A8) /* 13B6A8 80248368 261003A8 */ addiu $s0, $s0, %lo(D_802703A8) /* 13B6AC 8024836C 8FAB00C4 */ lw $t3, 0xc4($sp) @@ -982,7 +982,7 @@ glabel pause_badges_draw_contents /* 13B6C0 80248380 25460092 */ addiu $a2, $t2, 0x92 /* 13B6C4 80248384 8E040048 */ lw $a0, 0x48($s0) /* 13B6C8 80248388 0C0511F8 */ jal draw_icon_2 -/* 13B6CC 8024838C 00000000 */ nop +/* 13B6CC 8024838C 00000000 */ nop .L80248390: /* 13B6D0 80248390 3C108027 */ lui $s0, %hi(D_802703A8) /* 13B6D4 80248394 261003A8 */ addiu $s0, $s0, %lo(D_802703A8) @@ -1058,8 +1058,8 @@ glabel pause_badges_draw_contents /* 13B7E8 802484A8 01652821 */ addu $a1, $t3, $a1 /* 13B7EC 802484AC 3C05E300 */ lui $a1, 0xe300 /* 13B7F0 802484B0 34A51201 */ ori $a1, $a1, 0x1201 -/* 13B7F4 802484B4 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 13B7F8 802484B8 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 13B7F4 802484B4 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 13B7F8 802484B8 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 13B7FC 802484BC 0000882D */ daddu $s1, $zero, $zero /* 13B800 802484C0 3C02DE00 */ lui $v0, 0xde00 /* 13B804 802484C4 0220B02D */ daddu $s6, $s1, $zero @@ -1120,8 +1120,8 @@ glabel pause_badges_draw_contents /* 13B8DC 8024859C 1440FFE3 */ bnez $v0, .L8024852C /* 13B8E0 802485A0 0000202D */ daddu $a0, $zero, $zero .L802485A4: -/* 13B8E4 802485A4 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 13B8E8 802485A8 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 13B8E4 802485A4 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 13B8E8 802485A8 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 13B8EC 802485AC 8CA40000 */ lw $a0, ($a1) /* 13B8F0 802485B0 3C02E700 */ lui $v0, 0xe700 /* 13B8F4 802485B4 0080182D */ daddu $v1, $a0, $zero @@ -1175,8 +1175,8 @@ glabel pause_badges_draw_contents /* 13B9B0 80248670 1440FFE9 */ bnez $v0, .L80248618 /* 13B9B4 80248674 02320018 */ mult $s1, $s2 .L80248678: -/* 13B9B8 80248678 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 13B9BC 8024867C 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 13B9B8 80248678 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 13B9BC 8024867C 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 13B9C0 80248680 3C02E700 */ lui $v0, 0xe700 /* 13B9C4 80248684 8E030000 */ lw $v1, ($s0) /* 13B9C8 80248688 8FAB006C */ lw $t3, 0x6c($sp) @@ -1192,7 +1192,7 @@ glabel pause_badges_draw_contents /* 13B9F0 802486B0 00041100 */ sll $v0, $a0, 4 /* 13B9F4 802486B4 00441023 */ subu $v0, $v0, $a0 /* 13B9F8 802486B8 44826000 */ mtc1 $v0, $f12 -/* 13B9FC 802486BC 00000000 */ nop +/* 13B9FC 802486BC 00000000 */ nop /* 13BA00 802486C0 46806320 */ cvt.s.w $f12, $f12 /* 13BA04 802486C4 0C00A8BB */ jal sin_deg /* 13BA08 802486C8 AE030000 */ sw $v1, ($s0) @@ -1209,7 +1209,7 @@ glabel pause_badges_draw_contents /* 13BA34 802486F4 D422FFB0 */ ldc1 $f2, %lo(D_8026FFB0)($at) /* 13BA38 802486F8 46000021 */ cvt.d.s $f0, $f0 /* 13BA3C 802486FC 46220002 */ mul.d $f0, $f0, $f2 -/* 13BA40 80248700 00000000 */ nop +/* 13BA40 80248700 00000000 */ nop /* 13BA44 80248704 24A50008 */ addiu $a1, $a1, 8 /* 13BA48 80248708 AE050000 */ sw $a1, ($s0) /* 13BA4C 8024870C AC440000 */ sw $a0, ($v0) @@ -1225,21 +1225,21 @@ glabel pause_badges_draw_contents /* 13BA74 80248734 44811000 */ mtc1 $at, $f2 /* 13BA78 80248738 46200020 */ cvt.s.d $f0, $f0 /* 13BA7C 8024873C 46020002 */ mul.s $f0, $f0, $f2 -/* 13BA80 80248740 00000000 */ nop +/* 13BA80 80248740 00000000 */ nop /* 13BA84 80248744 ACA20000 */ sw $v0, ($a1) /* 13BA88 80248748 00171400 */ sll $v0, $s7, 0x10 /* 13BA8C 8024874C 001E1A00 */ sll $v1, $fp, 8 /* 13BA90 80248750 00431025 */ or $v0, $v0, $v1 /* 13BA94 80248754 4600018D */ trunc.w.s $f6, $f0 /* 13BA98 80248758 44043000 */ mfc1 $a0, $f6 -/* 13BA9C 8024875C 00000000 */ nop +/* 13BA9C 8024875C 00000000 */ nop /* 13BAA0 80248760 308400FF */ andi $a0, $a0, 0xff /* 13BAA4 80248764 00441025 */ or $v0, $v0, $a0 /* 13BAA8 80248768 ACA20004 */ sw $v0, 4($a1) /* 13BAAC 8024876C 8FAB006C */ lw $t3, 0x6c($sp) /* 13BAB0 80248770 022B102A */ slt $v0, $s1, $t3 /* 13BAB4 80248774 10400046 */ beqz $v0, .L80248890 -/* 13BAB8 80248778 00000000 */ nop +/* 13BAB8 80248778 00000000 */ nop /* 13BABC 8024877C 3C106666 */ lui $s0, 0x6666 /* 13BAC0 80248780 36106667 */ ori $s0, $s0, 0x6667 /* 13BAC4 80248784 02300018 */ mult $s1, $s0 @@ -1270,7 +1270,7 @@ glabel pause_badges_draw_contents /* 13BB24 802487E4 1440FFE8 */ bnez $v0, .L80248788 /* 13BB28 802487E8 02300018 */ mult $s1, $s0 /* 13BB2C 802487EC 08092224 */ j .L80248890 -/* 13BB30 802487F0 00000000 */ nop +/* 13BB30 802487F0 00000000 */ nop .L802487F4: /* 13BB34 802487F4 ACA20000 */ sw $v0, ($a1) /* 13BB38 802487F8 3C02FA00 */ lui $v0, 0xfa00 @@ -1313,8 +1313,8 @@ glabel pause_badges_draw_contents /* 13BBC8 80248888 1440FFE8 */ bnez $v0, .L8024882C /* 13BBCC 8024888C 02300018 */ mult $s1, $s0 .L80248890: -/* 13BBD0 80248890 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 13BBD4 80248894 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 13BBD0 80248890 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 13BBD4 80248894 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 13BBD8 80248898 8C620000 */ lw $v0, ($v1) /* 13BBDC 8024889C 0040202D */ daddu $a0, $v0, $zero /* 13BBE0 802488A0 24420008 */ addiu $v0, $v0, 8 @@ -1464,7 +1464,7 @@ glabel pause_badges_draw_contents /* 13BDF0 80248AB0 806300D4 */ lb $v1, %lo(gPauseMenuCurrentTab)($v1) /* 13BDF4 80248AB4 24020002 */ addiu $v0, $zero, 2 /* 13BDF8 80248AB8 14620050 */ bne $v1, $v0, .L80248BFC -/* 13BDFC 80248ABC 00000000 */ nop +/* 13BDFC 80248ABC 00000000 */ nop /* 13BE00 80248AC0 3C028027 */ lui $v0, %hi(gBadgeMenuLevel) /* 13BE04 80248AC4 8C420398 */ lw $v0, %lo(gBadgeMenuLevel)($v0) /* 13BE08 80248AC8 14400009 */ bnez $v0, .L80248AF0 @@ -1538,7 +1538,7 @@ glabel pause_badges_draw_contents /* 13BF0C 80248BCC 0C090AEB */ jal func_80242BAC /* 13BF10 80248BD0 01463021 */ addu $a2, $t2, $a2 /* 13BF14 80248BD4 080922FF */ j .L80248BFC -/* 13BF18 80248BD8 00000000 */ nop +/* 13BF18 80248BD8 00000000 */ nop .L80248BDC: /* 13BF1C 80248BDC 2605005D */ addiu $a1, $s0, 0x5d /* 13BF20 80248BE0 24C60017 */ addiu $a2, $a2, 0x17 @@ -1548,13 +1548,13 @@ glabel pause_badges_draw_contents /* 13BF30 80248BF0 01463021 */ addu $a2, $t2, $a2 .L80248BF4: /* 13BF34 80248BF4 0C090B41 */ jal func_80242D04 -/* 13BF38 80248BF8 00000000 */ nop +/* 13BF38 80248BF8 00000000 */ nop .L80248BFC: /* 13BF3C 80248BFC 3C108027 */ lui $s0, %hi(gBadgeMenuBShowNotEnoughBP) /* 13BF40 80248C00 261003A0 */ addiu $s0, $s0, %lo(gBadgeMenuBShowNotEnoughBP) /* 13BF44 80248C04 8E020000 */ lw $v0, ($s0) /* 13BF48 80248C08 10400054 */ beqz $v0, .L80248D5C -/* 13BF4C 80248C0C 00000000 */ nop +/* 13BF4C 80248C0C 00000000 */ nop /* 13BF50 80248C10 0C090AE8 */ jal pause_set_cursor_opacity /* 13BF54 80248C14 0000202D */ daddu $a0, $zero, $zero /* 13BF58 80248C18 8E020000 */ lw $v0, ($s0) diff --git a/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s b/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s index a50501753f..bf12d4f582 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s @@ -58,7 +58,7 @@ glabel pause_items_draw_contents /* 13CD80 80249A40 15010004 */ bne $t0, $at, .L80249A54 /* 13CD84 80249A44 3C018000 */ lui $at, 0x8000 /* 13CD88 80249A48 14610002 */ bne $v1, $at, .L80249A54 -/* 13CD8C 80249A4C 00000000 */ nop +/* 13CD8C 80249A4C 00000000 */ nop /* 13CD90 80249A50 0006000D */ break 6 .L80249A54: /* 13CD94 80249A54 00005012 */ mflo $t2 @@ -94,7 +94,7 @@ glabel pause_items_draw_contents /* 13CE08 80249AC8 24060001 */ addiu $a2, $zero, 1 .L80249ACC: /* 13CE0C 80249ACC 18E00277 */ blez $a3, .L8024A4AC -/* 13CE10 80249AD0 00000000 */ nop +/* 13CE10 80249AD0 00000000 */ nop /* 13CE14 80249AD4 19000275 */ blez $t0, .L8024A4AC /* 13CE18 80249AD8 2882013F */ slti $v0, $a0, 0x13f /* 13CE1C 80249ADC 10400273 */ beqz $v0, .L8024A4AC @@ -108,13 +108,13 @@ glabel pause_items_draw_contents /* 13CE38 80249AF8 50400001 */ beql $v0, $zero, .L80249B00 /* 13CE3C 80249AFC 240800EF */ addiu $t0, $zero, 0xef .L80249B00: -/* 13CE40 80249B00 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 13CE44 80249B04 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 13CE40 80249B00 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 13CE44 80249B04 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 13CE48 80249B08 44841000 */ mtc1 $a0, $f2 -/* 13CE4C 80249B0C 00000000 */ nop +/* 13CE4C 80249B0C 00000000 */ nop /* 13CE50 80249B10 468010A0 */ cvt.s.w $f2, $f2 /* 13CE54 80249B14 44860000 */ mtc1 $a2, $f0 -/* 13CE58 80249B18 00000000 */ nop +/* 13CE58 80249B18 00000000 */ nop /* 13CE5C 80249B1C 46800020 */ cvt.s.w $f0, $f0 /* 13CE60 80249B20 8FAA00AC */ lw $t2, 0xac($sp) /* 13CE64 80249B24 8FAB00B0 */ lw $t3, 0xb0($sp) @@ -125,45 +125,45 @@ glabel pause_items_draw_contents /* 13CE78 80249B38 AFA00050 */ sw $zero, 0x50($sp) /* 13CE7C 80249B3C 254A0077 */ addiu $t2, $t2, 0x77 /* 13CE80 80249B40 46041082 */ mul.s $f2, $f2, $f4 -/* 13CE84 80249B44 00000000 */ nop +/* 13CE84 80249B44 00000000 */ nop /* 13CE88 80249B48 256B0011 */ addiu $t3, $t3, 0x11 /* 13CE8C 80249B4C AFAA006C */ sw $t2, 0x6c($sp) /* 13CE90 80249B50 AFAB0070 */ sw $t3, 0x70($sp) /* 13CE94 80249B54 8C620000 */ lw $v0, ($v1) /* 13CE98 80249B58 46040002 */ mul.s $f0, $f0, $f4 -/* 13CE9C 80249B5C 00000000 */ nop +/* 13CE9C 80249B5C 00000000 */ nop /* 13CEA0 80249B60 0040282D */ daddu $a1, $v0, $zero /* 13CEA4 80249B64 24420008 */ addiu $v0, $v0, 8 /* 13CEA8 80249B68 AC620000 */ sw $v0, ($v1) /* 13CEAC 80249B6C 4600118D */ trunc.w.s $f6, $f2 /* 13CEB0 80249B70 44023000 */ mfc1 $v0, $f6 -/* 13CEB4 80249B74 00000000 */ nop +/* 13CEB4 80249B74 00000000 */ nop /* 13CEB8 80249B78 30420FFF */ andi $v0, $v0, 0xfff /* 13CEBC 80249B7C 00021300 */ sll $v0, $v0, 0xc /* 13CEC0 80249B80 4600018D */ trunc.w.s $f6, $f0 /* 13CEC4 80249B84 44033000 */ mfc1 $v1, $f6 /* 13CEC8 80249B88 44871000 */ mtc1 $a3, $f2 -/* 13CECC 80249B8C 00000000 */ nop +/* 13CECC 80249B8C 00000000 */ nop /* 13CED0 80249B90 468010A0 */ cvt.s.w $f2, $f2 /* 13CED4 80249B94 46041082 */ mul.s $f2, $f2, $f4 -/* 13CED8 80249B98 00000000 */ nop +/* 13CED8 80249B98 00000000 */ nop /* 13CEDC 80249B9C 30630FFF */ andi $v1, $v1, 0xfff /* 13CEE0 80249BA0 00641825 */ or $v1, $v1, $a0 /* 13CEE4 80249BA4 00431025 */ or $v0, $v0, $v1 /* 13CEE8 80249BA8 44880000 */ mtc1 $t0, $f0 -/* 13CEEC 80249BAC 00000000 */ nop +/* 13CEEC 80249BAC 00000000 */ nop /* 13CEF0 80249BB0 46800020 */ cvt.s.w $f0, $f0 /* 13CEF4 80249BB4 46040002 */ mul.s $f0, $f0, $f4 -/* 13CEF8 80249BB8 00000000 */ nop +/* 13CEF8 80249BB8 00000000 */ nop /* 13CEFC 80249BBC ACA20000 */ sw $v0, ($a1) /* 13CF00 80249BC0 4600118D */ trunc.w.s $f6, $f2 /* 13CF04 80249BC4 44023000 */ mfc1 $v0, $f6 -/* 13CF08 80249BC8 00000000 */ nop +/* 13CF08 80249BC8 00000000 */ nop /* 13CF0C 80249BCC 30420FFF */ andi $v0, $v0, 0xfff /* 13CF10 80249BD0 00021300 */ sll $v0, $v0, 0xc /* 13CF14 80249BD4 4600018D */ trunc.w.s $f6, $f0 /* 13CF18 80249BD8 44033000 */ mfc1 $v1, $f6 -/* 13CF1C 80249BDC 00000000 */ nop +/* 13CF1C 80249BDC 00000000 */ nop /* 13CF20 80249BE0 30630FFF */ andi $v1, $v1, 0xfff /* 13CF24 80249BE4 00431025 */ or $v0, $v0, $v1 /* 13CF28 80249BE8 ACA20004 */ sw $v0, 4($a1) @@ -176,7 +176,7 @@ glabel pause_items_draw_contents /* 13CF3C 80249BFC 8FAA007C */ lw $t2, 0x7c($sp) /* 13CF40 80249C00 91420000 */ lbu $v0, ($t2) /* 13CF44 80249C04 104000E2 */ beqz $v0, .L80249F90 -/* 13CF48 80249C08 00000000 */ nop +/* 13CF48 80249C08 00000000 */ nop /* 13CF4C 80249C0C 03C0202D */ daddu $a0, $fp, $zero /* 13CF50 80249C10 0C09260A */ jal pause_items_get_pos_y /* 13CF54 80249C14 0000282D */ daddu $a1, $zero, $zero @@ -255,10 +255,10 @@ glabel pause_items_draw_contents /* 13D068 80249D28 0C09264C */ jal pause_items_is_visible /* 13D06C 80249D2C 02E0202D */ daddu $a0, $s7, $zero /* 13D070 80249D30 1040008B */ beqz $v0, .L80249F60 -/* 13D074 80249D34 00000000 */ nop +/* 13D074 80249D34 00000000 */ nop /* 13D078 80249D38 8FAB0050 */ lw $t3, 0x50($sp) /* 13D07C 80249D3C 15600035 */ bnez $t3, .L80249E14 -/* 13D080 80249D40 00000000 */ nop +/* 13D080 80249D40 00000000 */ nop /* 13D084 80249D44 8FAA0074 */ lw $t2, 0x74($sp) /* 13D088 80249D48 11400016 */ beqz $t2, .L80249DA4 /* 13D08C 80249D4C 00161400 */ sll $v0, $s6, 0x10 @@ -290,9 +290,9 @@ glabel pause_items_draw_contents /* 13D0F0 80249DB0 004B8821 */ addu $s1, $v0, $t3 /* 13D0F4 80249DB4 8E220000 */ lw $v0, ($s1) /* 13D0F8 80249DB8 10400016 */ beqz $v0, .L80249E14 -/* 13D0FC 80249DBC 00000000 */ nop +/* 13D0FC 80249DBC 00000000 */ nop /* 13D100 80249DC0 18400014 */ blez $v0, .L80249E14 -/* 13D104 80249DC4 00000000 */ nop +/* 13D104 80249DC4 00000000 */ nop /* 13D108 80249DC8 0C09265A */ jal pause_items_scroll_offset_x /* 13D10C 80249DCC 8FA40068 */ lw $a0, 0x68($sp) /* 13D110 80249DD0 8FAA006C */ lw $t2, 0x6c($sp) @@ -312,7 +312,7 @@ glabel pause_items_draw_contents /* 13D148 80249E08 00553021 */ addu $a2, $v0, $s5 .L80249E0C: /* 13D14C 80249E0C 0C04993B */ jal draw_string -/* 13D150 80249E10 00000000 */ nop +/* 13D150 80249E10 00000000 */ nop .L80249E14: /* 13D154 80249E14 8FAA0050 */ lw $t2, 0x50($sp) /* 13D158 80249E18 240B0001 */ addiu $t3, $zero, 1 @@ -327,11 +327,11 @@ glabel pause_items_draw_contents /* 13D17C 80249E3C 34058000 */ ori $a1, $zero, 0x8000 /* 13D180 80249E40 8FAB0074 */ lw $t3, 0x74($sp) /* 13D184 80249E44 11600005 */ beqz $t3, .L80249E5C -/* 13D188 80249E48 00000000 */ nop +/* 13D188 80249E48 00000000 */ nop /* 13D18C 80249E4C 3C118027 */ lui $s1, %hi(D_80270634) /* 13D190 80249E50 8E310634 */ lw $s1, %lo(D_80270634)($s1) /* 13D194 80249E54 080927B9 */ j .L80249EE4 -/* 13D198 80249E58 00000000 */ nop +/* 13D198 80249E58 00000000 */ nop .L80249E5C: /* 13D19C 80249E5C 12600010 */ beqz $s3, .L80249EA0 /* 13D1A0 80249E60 0220202D */ daddu $a0, $s1, $zero @@ -371,7 +371,7 @@ glabel pause_items_draw_contents .L80249EE4: /* 13D224 80249EE4 8FA40068 */ lw $a0, 0x68($sp) /* 13D228 80249EE8 0C09265A */ jal pause_items_scroll_offset_x -/* 13D22C 80249EEC 00000000 */ nop +/* 13D22C 80249EEC 00000000 */ nop /* 13D230 80249EF0 02E0202D */ daddu $a0, $s7, $zero /* 13D234 80249EF4 8FAA00AC */ lw $t2, 0xac($sp) /* 13D238 80249EF8 24500069 */ addiu $s0, $v0, 0x69 @@ -387,11 +387,11 @@ glabel pause_items_draw_contents /* 13D260 80249F20 00553021 */ addu $a2, $v0, $s5 /* 13D264 80249F24 8FAA0054 */ lw $t2, 0x54($sp) /* 13D268 80249F28 15400005 */ bnez $t2, .L80249F40 -/* 13D26C 80249F2C 00000000 */ nop +/* 13D26C 80249F2C 00000000 */ nop /* 13D270 80249F30 0C0511F8 */ jal draw_icon_2 /* 13D274 80249F34 0220202D */ daddu $a0, $s1, $zero /* 13D278 80249F38 080927D2 */ j .L80249F48 -/* 13D27C 80249F3C 00000000 */ nop +/* 13D27C 80249F3C 00000000 */ nop .L80249F40: /* 13D280 80249F40 0C0511F1 */ jal draw_icon_1 /* 13D284 80249F44 0220202D */ daddu $a0, $s1, $zero @@ -408,7 +408,7 @@ glabel pause_items_draw_contents /* 13D2A8 80249F68 26520001 */ addiu $s2, $s2, 1 /* 13D2AC 80249F6C 0242102A */ slt $v0, $s2, $v0 /* 13D2B0 80249F70 1440FF33 */ bnez $v0, .L80249C40 -/* 13D2B4 80249F74 00000000 */ nop +/* 13D2B4 80249F74 00000000 */ nop .L80249F78: /* 13D2B8 80249F78 27DE0001 */ addiu $fp, $fp, 1 /* 13D2BC 80249F7C 8FAA007C */ lw $t2, 0x7c($sp) @@ -422,8 +422,8 @@ glabel pause_items_draw_contents /* 13D2D8 80249F98 29620003 */ slti $v0, $t3, 3 /* 13D2DC 80249F9C 1440FF13 */ bnez $v0, .L80249BEC /* 13D2E0 80249FA0 AFAB0050 */ sw $t3, 0x50($sp) -/* 13D2E4 80249FA4 3C09800A */ lui $t1, %hi(D_8009A66C) -/* 13D2E8 80249FA8 2529A66C */ addiu $t1, $t1, %lo(D_8009A66C) +/* 13D2E4 80249FA4 3C09800A */ lui $t1, %hi(gMasterGfxPos) +/* 13D2E8 80249FA8 2529A66C */ addiu $t1, $t1, %lo(gMasterGfxPos) /* 13D2EC 80249FAC 8FAA00AC */ lw $t2, 0xac($sp) /* 13D2F0 80249FB0 8FAB00B0 */ lw $t3, 0xb0($sp) /* 13D2F4 80249FB4 8D250000 */ lw $a1, ($t1) @@ -449,7 +449,7 @@ glabel pause_items_draw_contents /* 13D340 8024A000 24060001 */ addiu $a2, $zero, 1 .L8024A004: /* 13D344 8024A004 18E00129 */ blez $a3, .L8024A4AC -/* 13D348 8024A008 00000000 */ nop +/* 13D348 8024A008 00000000 */ nop /* 13D34C 8024A00C 19000127 */ blez $t0, .L8024A4AC /* 13D350 8024A010 2882013F */ slti $v0, $a0, 0x13f /* 13D354 8024A014 10400125 */ beqz $v0, .L8024A4AC @@ -466,47 +466,47 @@ glabel pause_items_draw_contents /* 13D378 8024A038 3C014080 */ lui $at, 0x4080 /* 13D37C 8024A03C 44812000 */ mtc1 $at, $f4 /* 13D380 8024A040 44840000 */ mtc1 $a0, $f0 -/* 13D384 8024A044 00000000 */ nop +/* 13D384 8024A044 00000000 */ nop /* 13D388 8024A048 46800020 */ cvt.s.w $f0, $f0 /* 13D38C 8024A04C 46040002 */ mul.s $f0, $f0, $f4 -/* 13D390 8024A050 00000000 */ nop +/* 13D390 8024A050 00000000 */ nop /* 13D394 8024A054 24A20008 */ addiu $v0, $a1, 8 /* 13D398 8024A058 44861000 */ mtc1 $a2, $f2 -/* 13D39C 8024A05C 00000000 */ nop +/* 13D39C 8024A05C 00000000 */ nop /* 13D3A0 8024A060 468010A0 */ cvt.s.w $f2, $f2 /* 13D3A4 8024A064 3C04ED00 */ lui $a0, 0xed00 /* 13D3A8 8024A068 46041082 */ mul.s $f2, $f2, $f4 -/* 13D3AC 8024A06C 00000000 */ nop +/* 13D3AC 8024A06C 00000000 */ nop /* 13D3B0 8024A070 AD220000 */ sw $v0, ($t1) /* 13D3B4 8024A074 4600018D */ trunc.w.s $f6, $f0 /* 13D3B8 8024A078 44023000 */ mfc1 $v0, $f6 -/* 13D3BC 8024A07C 00000000 */ nop +/* 13D3BC 8024A07C 00000000 */ nop /* 13D3C0 8024A080 30420FFF */ andi $v0, $v0, 0xfff /* 13D3C4 8024A084 00021300 */ sll $v0, $v0, 0xc /* 13D3C8 8024A088 4600118D */ trunc.w.s $f6, $f2 /* 13D3CC 8024A08C 44033000 */ mfc1 $v1, $f6 /* 13D3D0 8024A090 44871000 */ mtc1 $a3, $f2 -/* 13D3D4 8024A094 00000000 */ nop +/* 13D3D4 8024A094 00000000 */ nop /* 13D3D8 8024A098 468010A0 */ cvt.s.w $f2, $f2 /* 13D3DC 8024A09C 46041082 */ mul.s $f2, $f2, $f4 -/* 13D3E0 8024A0A0 00000000 */ nop +/* 13D3E0 8024A0A0 00000000 */ nop /* 13D3E4 8024A0A4 30630FFF */ andi $v1, $v1, 0xfff /* 13D3E8 8024A0A8 00641825 */ or $v1, $v1, $a0 /* 13D3EC 8024A0AC 00431025 */ or $v0, $v0, $v1 /* 13D3F0 8024A0B0 44880000 */ mtc1 $t0, $f0 -/* 13D3F4 8024A0B4 00000000 */ nop +/* 13D3F4 8024A0B4 00000000 */ nop /* 13D3F8 8024A0B8 46800020 */ cvt.s.w $f0, $f0 /* 13D3FC 8024A0BC 46040002 */ mul.s $f0, $f0, $f4 -/* 13D400 8024A0C0 00000000 */ nop +/* 13D400 8024A0C0 00000000 */ nop /* 13D404 8024A0C4 ACA20000 */ sw $v0, ($a1) /* 13D408 8024A0C8 4600118D */ trunc.w.s $f6, $f2 /* 13D40C 8024A0CC 44023000 */ mfc1 $v0, $f6 -/* 13D410 8024A0D0 00000000 */ nop +/* 13D410 8024A0D0 00000000 */ nop /* 13D414 8024A0D4 30420FFF */ andi $v0, $v0, 0xfff /* 13D418 8024A0D8 00021300 */ sll $v0, $v0, 0xc /* 13D41C 8024A0DC 4600018D */ trunc.w.s $f6, $f0 /* 13D420 8024A0E0 44033000 */ mfc1 $v1, $f6 -/* 13D424 8024A0E4 00000000 */ nop +/* 13D424 8024A0E4 00000000 */ nop /* 13D428 8024A0E8 30630FFF */ andi $v1, $v1, 0xfff /* 13D42C 8024A0EC 00431025 */ or $v0, $v0, $v1 /* 13D430 8024A0F0 3C038027 */ lui $v1, %hi(gPauseMenuCurrentTab) @@ -518,7 +518,7 @@ glabel pause_items_draw_contents /* 13D448 8024A108 3C038027 */ lui $v1, %hi(gItemMenuLevel) /* 13D44C 8024A10C 8C6305E0 */ lw $v1, %lo(gItemMenuLevel)($v1) /* 13D450 8024A110 14620026 */ bne $v1, $v0, .L8024A1AC -/* 13D454 8024A114 00000000 */ nop +/* 13D454 8024A114 00000000 */ nop /* 13D458 8024A118 3C118027 */ lui $s1, %hi(gItemMenuCurrentPage) /* 13D45C 8024A11C 263104C8 */ addiu $s1, $s1, %lo(gItemMenuCurrentPage) /* 13D460 8024A120 8E220000 */ lw $v0, ($s1) @@ -534,7 +534,7 @@ glabel pause_items_draw_contents /* 13D488 8024A148 2546000E */ addiu $a2, $t2, 0xe /* 13D48C 8024A14C 8E040040 */ lw $a0, 0x40($s0) /* 13D490 8024A150 0C0511F8 */ jal draw_icon_2 -/* 13D494 8024A154 00000000 */ nop +/* 13D494 8024A154 00000000 */ nop /* 13D498 8024A158 8E220000 */ lw $v0, ($s1) /* 13D49C 8024A15C 24420001 */ addiu $v0, $v0, 1 .L8024A160: @@ -545,7 +545,7 @@ glabel pause_items_draw_contents /* 13D4B0 8024A170 00431021 */ addu $v0, $v0, $v1 /* 13D4B4 8024A174 904204D0 */ lbu $v0, %lo(gItemMenuPages)($v0) /* 13D4B8 8024A178 1040000C */ beqz $v0, .L8024A1AC -/* 13D4BC 8024A17C 00000000 */ nop +/* 13D4BC 8024A17C 00000000 */ nop /* 13D4C0 8024A180 3C108027 */ lui $s0, %hi(D_802705E8) /* 13D4C4 8024A184 261005E8 */ addiu $s0, $s0, %lo(D_802705E8) /* 13D4C8 8024A188 8FAB00AC */ lw $t3, 0xac($sp) @@ -556,7 +556,7 @@ glabel pause_items_draw_contents /* 13D4DC 8024A19C 25460092 */ addiu $a2, $t2, 0x92 /* 13D4E0 8024A1A0 8E040044 */ lw $a0, 0x44($s0) /* 13D4E4 8024A1A4 0C0511F8 */ jal draw_icon_2 -/* 13D4E8 8024A1A8 00000000 */ nop +/* 13D4E8 8024A1A8 00000000 */ nop .L8024A1AC: /* 13D4EC 8024A1AC 3C038027 */ lui $v1, %hi(gItemMenuCurrentTab) /* 13D4F0 8024A1B0 8C6305E4 */ lw $v1, %lo(gItemMenuCurrentTab)($v1) @@ -682,7 +682,7 @@ glabel pause_items_draw_contents /* 13D6A8 8024A368 806300D4 */ lb $v1, %lo(gPauseMenuCurrentTab)($v1) /* 13D6AC 8024A36C 24020003 */ addiu $v0, $zero, 3 /* 13D6B0 8024A370 1462004E */ bne $v1, $v0, .L8024A4AC -/* 13D6B4 8024A374 00000000 */ nop +/* 13D6B4 8024A374 00000000 */ nop /* 13D6B8 8024A378 3C028027 */ lui $v0, %hi(gItemMenuLevel) /* 13D6BC 8024A37C 8C4205E0 */ lw $v0, %lo(gItemMenuLevel)($v0) /* 13D6C0 8024A380 14400008 */ bnez $v0, .L8024A3A4 @@ -755,7 +755,7 @@ glabel pause_items_draw_contents /* 13D7C0 8024A480 0C090AEB */ jal func_80242BAC /* 13D7C4 8024A484 01463021 */ addu $a2, $t2, $a2 /* 13D7C8 8024A488 0809292B */ j .L8024A4AC -/* 13D7CC 8024A48C 00000000 */ nop +/* 13D7CC 8024A48C 00000000 */ nop .L8024A490: /* 13D7D0 8024A490 26050055 */ addiu $a1, $s0, 0x55 /* 13D7D4 8024A494 24C60017 */ addiu $a2, $a2, 0x17 diff --git a/asm/nonmatchings/code_13E120/pause_partners_draw_contents.s b/asm/nonmatchings/code_13E120/pause_partners_draw_contents.s index c5d9bdcfb8..52ab98e1ba 100644 --- a/asm/nonmatchings/code_13E120/pause_partners_draw_contents.s +++ b/asm/nonmatchings/code_13E120/pause_partners_draw_contents.s @@ -10,8 +10,8 @@ glabel pause_partners_draw_contents /* 13E24C 8024AF0C 3C130001 */ lui $s3, 1 /* 13E250 8024AF10 36731630 */ ori $s3, $s3, 0x1630 /* 13E254 8024AF14 AFB1013C */ sw $s1, 0x13c($sp) -/* 13E258 8024AF18 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 13E25C 8024AF1C 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 13E258 8024AF18 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 13E25C 8024AF1C 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 13E260 8024AF20 AFBF015C */ sw $ra, 0x15c($sp) /* 13E264 8024AF24 AFBE0158 */ sw $fp, 0x158($sp) /* 13E268 8024AF28 AFB70154 */ sw $s7, 0x154($sp) @@ -52,10 +52,10 @@ glabel pause_partners_draw_contents /* 13E2F4 8024AFB4 0C018E44 */ jal guOrthoF /* 13E2F8 8024AFB8 E7A4001C */ swc1 $f4, 0x1c($sp) /* 13E2FC 8024AFBC 27A40050 */ addiu $a0, $sp, 0x50 -/* 13E300 8024AFC0 3C108007 */ lui $s0, %hi(D_800741F0) -/* 13E304 8024AFC4 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 13E308 8024AFC8 3C12800A */ lui $s2, %hi(D_8009A674) -/* 13E30C 8024AFCC 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 13E300 8024AFC0 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 13E304 8024AFC4 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 13E308 8024AFC8 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 13E30C 8024AFCC 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 13E310 8024AFD0 96050000 */ lhu $a1, ($s0) /* 13E314 8024AFD4 8E420000 */ lw $v0, ($s2) /* 13E318 8024AFD8 00052980 */ sll $a1, $a1, 6 @@ -125,19 +125,19 @@ glabel pause_partners_draw_contents /* 13E410 8024B0D0 14410004 */ bne $v0, $at, .L8024B0E4 /* 13E414 8024B0D4 3C018000 */ lui $at, 0x8000 /* 13E418 8024B0D8 16610002 */ bne $s3, $at, .L8024B0E4 -/* 13E41C 8024B0DC 00000000 */ nop +/* 13E41C 8024B0DC 00000000 */ nop /* 13E420 8024B0E0 0006000D */ break 6 .L8024B0E4: /* 13E424 8024B0E4 00001012 */ mflo $v0 /* 13E428 8024B0E8 3C018027 */ lui $at, %hi(D_802706A8) /* 13E42C 8024B0EC C42006A8 */ lwc1 $f0, %lo(D_802706A8)($at) /* 13E430 8024B0F0 44826000 */ mtc1 $v0, $f12 -/* 13E434 8024B0F4 00000000 */ nop +/* 13E434 8024B0F4 00000000 */ nop /* 13E438 8024B0F8 46806320 */ cvt.s.w $f12, $f12 /* 13E43C 8024B0FC 0C00A8D4 */ jal cos_deg /* 13E440 8024B100 46006301 */ sub.s $f12, $f12, $f0 /* 13E444 8024B104 46160002 */ mul.s $f0, $f0, $f22 -/* 13E448 8024B108 00000000 */ nop +/* 13E448 8024B108 00000000 */ nop /* 13E44C 8024B10C 0000882D */ daddu $s1, $zero, $zero /* 13E450 8024B110 1A00000B */ blez $s0, .L8024B140 /* 13E454 8024B114 46140080 */ add.s $f2, $f0, $f20 @@ -145,9 +145,9 @@ glabel pause_partners_draw_contents .L8024B11C: /* 13E45C 8024B11C C4600000 */ lwc1 $f0, ($v1) /* 13E460 8024B120 4600103C */ c.lt.s $f2, $f0 -/* 13E464 8024B124 00000000 */ nop +/* 13E464 8024B124 00000000 */ nop /* 13E468 8024B128 45010005 */ bc1t .L8024B140 -/* 13E46C 8024B12C 00000000 */ nop +/* 13E46C 8024B12C 00000000 */ nop /* 13E470 8024B130 26310001 */ addiu $s1, $s1, 1 /* 13E474 8024B134 0230102A */ slt $v0, $s1, $s0 /* 13E478 8024B138 1440FFF8 */ bnez $v0, .L8024B11C @@ -214,26 +214,26 @@ glabel pause_partners_draw_contents /* 13E554 8024B214 14810004 */ bne $a0, $at, .L8024B228 /* 13E558 8024B218 3C018000 */ lui $at, 0x8000 /* 13E55C 8024B21C 14410002 */ bne $v0, $at, .L8024B228 -/* 13E560 8024B220 00000000 */ nop +/* 13E560 8024B220 00000000 */ nop /* 13E564 8024B224 0006000D */ break 6 .L8024B228: /* 13E568 8024B228 00001012 */ mflo $v0 /* 13E56C 8024B22C 3C018027 */ lui $at, %hi(D_802706A8) /* 13E570 8024B230 C42006A8 */ lwc1 $f0, %lo(D_802706A8)($at) /* 13E574 8024B234 4482A000 */ mtc1 $v0, $f20 -/* 13E578 8024B238 00000000 */ nop +/* 13E578 8024B238 00000000 */ nop /* 13E57C 8024B23C 4680A520 */ cvt.s.w $f20, $f20 /* 13E580 8024B240 00041040 */ sll $v0, $a0, 1 /* 13E584 8024B244 00441021 */ addu $v0, $v0, $a0 /* 13E588 8024B248 4600A501 */ sub.s $f20, $f20, $f0 /* 13E58C 8024B24C 24420011 */ addiu $v0, $v0, 0x11 /* 13E590 8024B250 4482B000 */ mtc1 $v0, $f22 -/* 13E594 8024B254 00000000 */ nop +/* 13E594 8024B254 00000000 */ nop /* 13E598 8024B258 4680B5A0 */ cvt.s.w $f22, $f22 /* 13E59C 8024B25C 0C00A8BB */ jal sin_deg /* 13E5A0 8024B260 4600A306 */ mov.s $f12, $f20 /* 13E5A4 8024B264 4600B582 */ mul.s $f22, $f22, $f0 -/* 13E5A8 8024B268 00000000 */ nop +/* 13E5A8 8024B268 00000000 */ nop /* 13E5AC 8024B26C 3C014228 */ lui $at, 0x4228 /* 13E5B0 8024B270 44810000 */ mtc1 $at, $f0 /* 13E5B4 8024B274 4600A306 */ mov.s $f12, $f20 @@ -241,21 +241,21 @@ glabel pause_partners_draw_contents /* 13E5BC 8024B27C 4600B580 */ add.s $f22, $f22, $f0 /* 13E5C0 8024B280 3C0141F0 */ lui $at, 0x41f0 /* 13E5C4 8024B284 44811000 */ mtc1 $at, $f2 -/* 13E5C8 8024B288 00000000 */ nop +/* 13E5C8 8024B288 00000000 */ nop /* 13E5CC 8024B28C 46020002 */ mul.s $f0, $f0, $f2 -/* 13E5D0 8024B290 00000000 */ nop +/* 13E5D0 8024B290 00000000 */ nop /* 13E5D4 8024B294 4600A306 */ mov.s $f12, $f20 /* 13E5D8 8024B298 0C00A8D4 */ jal cos_deg /* 13E5DC 8024B29C 46001601 */ sub.s $f24, $f2, $f0 /* 13E5E0 8024B2A0 3C0141A0 */ lui $at, 0x41a0 /* 13E5E4 8024B2A4 44811000 */ mtc1 $at, $f2 -/* 13E5E8 8024B2A8 00000000 */ nop +/* 13E5E8 8024B2A8 00000000 */ nop /* 13E5EC 8024B2AC 46020002 */ mul.s $f0, $f0, $f2 -/* 13E5F0 8024B2B0 00000000 */ nop +/* 13E5F0 8024B2B0 00000000 */ nop /* 13E5F4 8024B2B4 8FAC018C */ lw $t4, 0x18c($sp) /* 13E5F8 8024B2B8 25820016 */ addiu $v0, $t4, 0x16 /* 13E5FC 8024B2BC 44821000 */ mtc1 $v0, $f2 -/* 13E600 8024B2C0 00000000 */ nop +/* 13E600 8024B2C0 00000000 */ nop /* 13E604 8024B2C4 468010A0 */ cvt.s.w $f2, $f2 /* 13E608 8024B2C8 46161080 */ add.s $f2, $f2, $f22 /* 13E60C 8024B2CC 44051000 */ mfc1 $a1, $f2 @@ -270,7 +270,7 @@ glabel pause_partners_draw_contents /* 13E630 8024B2F0 461A0000 */ add.s $f0, $f0, $f26 /* 13E634 8024B2F4 25A20051 */ addiu $v0, $t5, 0x51 /* 13E638 8024B2F8 44822000 */ mtc1 $v0, $f4 -/* 13E63C 8024B2FC 00000000 */ nop +/* 13E63C 8024B2FC 00000000 */ nop /* 13E640 8024B300 46802120 */ cvt.s.w $f4, $f4 /* 13E644 8024B304 4600C287 */ neg.s $f10, $f24 /* 13E648 8024B308 460010A1 */ cvt.d.s $f2, $f2 @@ -305,24 +305,24 @@ glabel pause_partners_draw_contents /* 13E6BC 8024B37C 00A0302D */ daddu $a2, $a1, $zero /* 13E6C0 8024B380 3C014100 */ lui $at, 0x4100 /* 13E6C4 8024B384 44810000 */ mtc1 $at, $f0 -/* 13E6C8 8024B388 00000000 */ nop +/* 13E6C8 8024B388 00000000 */ nop /* 13E6CC 8024B38C 4618003C */ c.lt.s $f0, $f24 -/* 13E6D0 8024B390 00000000 */ nop +/* 13E6D0 8024B390 00000000 */ nop /* 13E6D4 8024B394 45010011 */ bc1t .L8024B3DC /* 13E6D8 8024B398 240600A0 */ addiu $a2, $zero, 0xa0 /* 13E6DC 8024B39C 3C0142BE */ lui $at, 0x42be /* 13E6E0 8024B3A0 44811000 */ mtc1 $at, $f2 -/* 13E6E4 8024B3A4 00000000 */ nop +/* 13E6E4 8024B3A4 00000000 */ nop /* 13E6E8 8024B3A8 4602C082 */ mul.s $f2, $f24, $f2 -/* 13E6EC 8024B3AC 00000000 */ nop +/* 13E6EC 8024B3AC 00000000 */ nop /* 13E6F0 8024B3B0 3C013E00 */ lui $at, 0x3e00 /* 13E6F4 8024B3B4 44810000 */ mtc1 $at, $f0 -/* 13E6F8 8024B3B8 00000000 */ nop +/* 13E6F8 8024B3B8 00000000 */ nop /* 13E6FC 8024B3BC 46001082 */ mul.s $f2, $f2, $f0 -/* 13E700 8024B3C0 00000000 */ nop +/* 13E700 8024B3C0 00000000 */ nop /* 13E704 8024B3C4 3C01437F */ lui $at, 0x437f /* 13E708 8024B3C8 44810000 */ mtc1 $at, $f0 -/* 13E70C 8024B3CC 00000000 */ nop +/* 13E70C 8024B3CC 00000000 */ nop /* 13E710 8024B3D0 46020001 */ sub.s $f0, $f0, $f2 /* 13E714 8024B3D4 4600028D */ trunc.w.s $f10, $f0 /* 13E718 8024B3D8 44065000 */ mfc1 $a2, $f10 @@ -362,8 +362,8 @@ glabel pause_partners_draw_contents /* 13E79C 8024B45C 001118C0 */ sll $v1, $s1, 3 .L8024B460: /* 13E7A0 8024B460 3C05D838 */ lui $a1, 0xd838 -/* 13E7A4 8024B464 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 13E7A8 8024B468 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 13E7A4 8024B464 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 13E7A8 8024B468 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 13E7AC 8024B46C 34A50002 */ ori $a1, $a1, 2 /* 13E7B0 8024B470 8C620000 */ lw $v0, ($v1) /* 13E7B4 8024B474 3C128027 */ lui $s2, %hi(gPauseMenuCurrentTab) @@ -377,7 +377,7 @@ glabel pause_partners_draw_contents /* 13E7D4 8024B494 82500000 */ lb $s0, ($s2) /* 13E7D8 8024B498 24020004 */ addiu $v0, $zero, 4 /* 13E7DC 8024B49C 16020014 */ bne $s0, $v0, .L8024B4F0 -/* 13E7E0 8024B4A0 00000000 */ nop +/* 13E7E0 8024B4A0 00000000 */ nop /* 13E7E4 8024B4A4 3C118027 */ lui $s1, %hi(D_802706AC) /* 13E7E8 8024B4A8 263106AC */ addiu $s1, $s1, %lo(D_802706AC) /* 13E7EC 8024B4AC 8E220000 */ lw $v0, ($s1) @@ -391,7 +391,7 @@ glabel pause_partners_draw_contents .L8024B4CC: /* 13E80C 8024B4CC 82420000 */ lb $v0, ($s2) /* 13E810 8024B4D0 14500007 */ bne $v0, $s0, .L8024B4F0 -/* 13E814 8024B4D4 00000000 */ nop +/* 13E814 8024B4D4 00000000 */ nop /* 13E818 8024B4D8 8E220000 */ lw $v0, ($s1) /* 13E81C 8024B4DC 14400004 */ bnez $v0, .L8024B4F0 /* 13E820 8024B4E0 24040008 */ addiu $a0, $zero, 8 @@ -412,7 +412,7 @@ glabel pause_partners_draw_contents /* 13E854 8024B514 24090001 */ addiu $t1, $zero, 1 .L8024B518: /* 13E858 8024B518 19400193 */ blez $t2, .L8024BB68 -/* 13E85C 8024B51C 00000000 */ nop +/* 13E85C 8024B51C 00000000 */ nop /* 13E860 8024B520 19600191 */ blez $t3, .L8024BB68 /* 13E864 8024B524 28A2013F */ slti $v0, $a1, 0x13f /* 13E868 8024B528 1040018F */ beqz $v0, .L8024BB68 @@ -430,27 +430,27 @@ glabel pause_partners_draw_contents /* 13E890 8024B550 C42006A8 */ lwc1 $f0, %lo(D_802706A8)($at) /* 13E894 8024B554 3C0143B4 */ lui $at, 0x43b4 /* 13E898 8024B558 44812000 */ mtc1 $at, $f4 -/* 13E89C 8024B55C 00000000 */ nop +/* 13E89C 8024B55C 00000000 */ nop /* 13E8A0 8024B560 46040000 */ add.s $f0, $f0, $f4 /* 13E8A4 8024B564 3C01466A */ lui $at, 0x466a /* 13E8A8 8024B568 34216000 */ ori $at, $at, 0x6000 /* 13E8AC 8024B56C 44811000 */ mtc1 $at, $f2 -/* 13E8B0 8024B570 00000000 */ nop +/* 13E8B0 8024B570 00000000 */ nop /* 13E8B4 8024B574 46020002 */ mul.s $f0, $f0, $f2 -/* 13E8B8 8024B578 00000000 */ nop +/* 13E8B8 8024B578 00000000 */ nop /* 13E8BC 8024B57C 3C038027 */ lui $v1, %hi(D_802706B0) /* 13E8C0 8024B580 8C6306B0 */ lw $v1, %lo(D_802706B0)($v1) /* 13E8C4 8024B584 44831000 */ mtc1 $v1, $f2 -/* 13E8C8 8024B588 00000000 */ nop +/* 13E8C8 8024B588 00000000 */ nop /* 13E8CC 8024B58C 468010A0 */ cvt.s.w $f2, $f2 /* 13E8D0 8024B590 46020002 */ mul.s $f0, $f0, $f2 -/* 13E8D4 8024B594 00000000 */ nop +/* 13E8D4 8024B594 00000000 */ nop /* 13E8D8 8024B598 3C0245E7 */ lui $v0, 0x45e7 /* 13E8DC 8024B59C 3442B273 */ ori $v0, $v0, 0xb273 /* 13E8E0 8024B5A0 46040003 */ div.s $f0, $f0, $f4 /* 13E8E4 8024B5A4 4600028D */ trunc.w.s $f10, $f0 /* 13E8E8 8024B5A8 44075000 */ mfc1 $a3, $f10 -/* 13E8EC 8024B5AC 00000000 */ nop +/* 13E8EC 8024B5AC 00000000 */ nop /* 13E8F0 8024B5B0 00E20018 */ mult $a3, $v0 /* 13E8F4 8024B5B4 000717C3 */ sra $v0, $a3, 0x1f /* 13E8F8 8024B5B8 00004010 */ mfhi $t0 @@ -464,55 +464,55 @@ glabel pause_partners_draw_contents /* 13E914 8024B5D4 14610004 */ bne $v1, $at, .L8024B5E8 /* 13E918 8024B5D8 3C018000 */ lui $at, 0x8000 /* 13E91C 8024B5DC 14C10002 */ bne $a2, $at, .L8024B5E8 -/* 13E920 8024B5E0 00000000 */ nop +/* 13E920 8024B5E0 00000000 */ nop /* 13E924 8024B5E4 0006000D */ break 6 .L8024B5E8: /* 13E928 8024B5E8 00002010 */ mfhi $a0 /* 13E92C 8024B5EC 3C014080 */ lui $at, 0x4080 /* 13E930 8024B5F0 44814000 */ mtc1 $at, $f8 /* 13E934 8024B5F4 448B3000 */ mtc1 $t3, $f6 -/* 13E938 8024B5F8 00000000 */ nop +/* 13E938 8024B5F8 00000000 */ nop /* 13E93C 8024B5FC 468031A0 */ cvt.s.w $f6, $f6 /* 13E940 8024B600 46083182 */ mul.s $f6, $f6, $f8 -/* 13E944 8024B604 00000000 */ nop +/* 13E944 8024B604 00000000 */ nop /* 13E948 8024B608 3C19E700 */ lui $t9, 0xe700 /* 13E94C 8024B60C 3C1E8025 */ lui $fp, %hi(D_8024F73C) /* 13E950 8024B610 27DEF73C */ addiu $fp, $fp, %lo(D_8024F73C) /* 13E954 8024B614 44851000 */ mtc1 $a1, $f2 -/* 13E958 8024B618 00000000 */ nop +/* 13E958 8024B618 00000000 */ nop /* 13E95C 8024B61C 468010A0 */ cvt.s.w $f2, $f2 /* 13E960 8024B620 3C05ED00 */ lui $a1, 0xed00 /* 13E964 8024B624 46081082 */ mul.s $f2, $f2, $f8 -/* 13E968 8024B628 00000000 */ nop +/* 13E968 8024B628 00000000 */ nop /* 13E96C 8024B62C 3C0CF548 */ lui $t4, 0xf548 /* 13E970 8024B630 358C2600 */ ori $t4, $t4, 0x2600 /* 13E974 8024B634 44890000 */ mtc1 $t1, $f0 -/* 13E978 8024B638 00000000 */ nop +/* 13E978 8024B638 00000000 */ nop /* 13E97C 8024B63C 46800020 */ cvt.s.w $f0, $f0 /* 13E980 8024B640 448A2000 */ mtc1 $t2, $f4 -/* 13E984 8024B644 00000000 */ nop +/* 13E984 8024B644 00000000 */ nop /* 13E988 8024B648 46802120 */ cvt.s.w $f4, $f4 /* 13E98C 8024B64C 46080002 */ mul.s $f0, $f0, $f8 -/* 13E990 8024B650 00000000 */ nop +/* 13E990 8024B650 00000000 */ nop /* 13E994 8024B654 AFAC0110 */ sw $t4, 0x110($sp) -/* 13E998 8024B658 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 13E99C 8024B65C 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 13E998 8024B658 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 13E99C 8024B65C 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 13E9A0 8024B660 0040882D */ daddu $s1, $v0, $zero /* 13E9A4 8024B664 8E220000 */ lw $v0, ($s1) /* 13E9A8 8024B668 46082102 */ mul.s $f4, $f4, $f8 -/* 13E9AC 8024B66C 00000000 */ nop +/* 13E9AC 8024B66C 00000000 */ nop /* 13E9B0 8024B670 AFA00114 */ sw $zero, 0x114($sp) /* 13E9B4 8024B674 0040402D */ daddu $t0, $v0, $zero /* 13E9B8 8024B678 24420008 */ addiu $v0, $v0, 8 /* 13E9BC 8024B67C AE220000 */ sw $v0, ($s1) /* 13E9C0 8024B680 4600128D */ trunc.w.s $f10, $f2 /* 13E9C4 8024B684 44025000 */ mfc1 $v0, $f10 -/* 13E9C8 8024B688 00000000 */ nop +/* 13E9C8 8024B688 00000000 */ nop /* 13E9CC 8024B68C 30420FFF */ andi $v0, $v0, 0xfff /* 13E9D0 8024B690 00021300 */ sll $v0, $v0, 0xc /* 13E9D4 8024B694 4600028D */ trunc.w.s $f10, $f0 /* 13E9D8 8024B698 44035000 */ mfc1 $v1, $f10 -/* 13E9DC 8024B69C 00000000 */ nop +/* 13E9DC 8024B69C 00000000 */ nop /* 13E9E0 8024B6A0 30630FFF */ andi $v1, $v1, 0xfff /* 13E9E4 8024B6A4 00651825 */ or $v1, $v1, $a1 /* 13E9E8 8024B6A8 00431025 */ or $v0, $v0, $v1 @@ -526,19 +526,19 @@ glabel pause_partners_draw_contents /* 13EA08 8024B6C8 000318C0 */ sll $v1, $v1, 3 /* 13EA0C 8024B6CC 0067B823 */ subu $s7, $v1, $a3 /* 13EA10 8024B6D0 44971000 */ mtc1 $s7, $f2 -/* 13EA14 8024B6D4 00000000 */ nop +/* 13EA14 8024B6D4 00000000 */ nop /* 13EA18 8024B6D8 468010A1 */ cvt.d.w $f2, $f2 /* 13EA1C 8024B6DC 3C018027 */ lui $at, %hi(D_80270040) /* 13EA20 8024B6E0 D4200040 */ ldc1 $f0, %lo(D_80270040)($at) /* 13EA24 8024B6E4 4600228D */ trunc.w.s $f10, $f4 /* 13EA28 8024B6E8 44025000 */ mfc1 $v0, $f10 /* 13EA2C 8024B6EC 46201082 */ mul.d $f2, $f2, $f0 -/* 13EA30 8024B6F0 00000000 */ nop +/* 13EA30 8024B6F0 00000000 */ nop /* 13EA34 8024B6F4 30420FFF */ andi $v0, $v0, 0xfff /* 13EA38 8024B6F8 00021300 */ sll $v0, $v0, 0xc /* 13EA3C 8024B6FC 4600328D */ trunc.w.s $f10, $f6 /* 13EA40 8024B700 44035000 */ mfc1 $v1, $f10 -/* 13EA44 8024B704 00000000 */ nop +/* 13EA44 8024B704 00000000 */ nop /* 13EA48 8024B708 30630FFF */ andi $v1, $v1, 0xfff /* 13EA4C 8024B70C 00431025 */ or $v0, $v0, $v1 /* 13EA50 8024B710 AD020004 */ sw $v0, 4($t0) @@ -730,7 +730,7 @@ glabel pause_partners_draw_contents /* 13ED24 8024B9E4 24080001 */ addiu $t0, $zero, 1 .L8024B9E8: /* 13ED28 8024B9E8 1940005F */ blez $t2, .L8024BB68 -/* 13ED2C 8024B9EC 00000000 */ nop +/* 13ED2C 8024B9EC 00000000 */ nop /* 13ED30 8024B9F0 1960005D */ blez $t3, .L8024BB68 /* 13ED34 8024B9F4 28E2013F */ slti $v0, $a3, 0x13f /* 13ED38 8024B9F8 1040005B */ beqz $v0, .L8024BB68 @@ -744,13 +744,13 @@ glabel pause_partners_draw_contents /* 13ED54 8024BA14 50400001 */ beql $v0, $zero, .L8024BA1C /* 13ED58 8024BA18 240B00EF */ addiu $t3, $zero, 0xef .L8024BA1C: -/* 13ED5C 8024BA1C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 13ED60 8024BA20 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 13ED5C 8024BA1C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 13ED60 8024BA20 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 13ED64 8024BA24 44871000 */ mtc1 $a3, $f2 -/* 13ED68 8024BA28 00000000 */ nop +/* 13ED68 8024BA28 00000000 */ nop /* 13ED6C 8024BA2C 468010A0 */ cvt.s.w $f2, $f2 /* 13ED70 8024BA30 44880000 */ mtc1 $t0, $f0 -/* 13ED74 8024BA34 00000000 */ nop +/* 13ED74 8024BA34 00000000 */ nop /* 13ED78 8024BA38 46800020 */ cvt.s.w $f0, $f0 /* 13ED7C 8024BA3C 3C08ED00 */ lui $t0, 0xed00 /* 13ED80 8024BA40 8FAD018C */ lw $t5, 0x18c($sp) @@ -759,43 +759,43 @@ glabel pause_partners_draw_contents /* 13ED8C 8024BA4C 44812000 */ mtc1 $at, $f4 /* 13ED90 8024BA50 8FAF0190 */ lw $t7, 0x190($sp) /* 13ED94 8024BA54 46041082 */ mul.s $f2, $f2, $f4 -/* 13ED98 8024BA58 00000000 */ nop +/* 13ED98 8024BA58 00000000 */ nop /* 13ED9C 8024BA5C 25A6007A */ addiu $a2, $t5, 0x7a /* 13EDA0 8024BA60 25E70010 */ addiu $a3, $t7, 0x10 /* 13EDA4 8024BA64 0040482D */ daddu $t1, $v0, $zero /* 13EDA8 8024BA68 24420008 */ addiu $v0, $v0, 8 /* 13EDAC 8024BA6C 46040002 */ mul.s $f0, $f0, $f4 -/* 13EDB0 8024BA70 00000000 */ nop +/* 13EDB0 8024BA70 00000000 */ nop /* 13EDB4 8024BA74 AC620000 */ sw $v0, ($v1) /* 13EDB8 8024BA78 4600128D */ trunc.w.s $f10, $f2 /* 13EDBC 8024BA7C 44025000 */ mfc1 $v0, $f10 -/* 13EDC0 8024BA80 00000000 */ nop +/* 13EDC0 8024BA80 00000000 */ nop /* 13EDC4 8024BA84 30420FFF */ andi $v0, $v0, 0xfff /* 13EDC8 8024BA88 00021300 */ sll $v0, $v0, 0xc /* 13EDCC 8024BA8C 4600028D */ trunc.w.s $f10, $f0 /* 13EDD0 8024BA90 44035000 */ mfc1 $v1, $f10 /* 13EDD4 8024BA94 448A1000 */ mtc1 $t2, $f2 -/* 13EDD8 8024BA98 00000000 */ nop +/* 13EDD8 8024BA98 00000000 */ nop /* 13EDDC 8024BA9C 468010A0 */ cvt.s.w $f2, $f2 /* 13EDE0 8024BAA0 46041082 */ mul.s $f2, $f2, $f4 -/* 13EDE4 8024BAA4 00000000 */ nop +/* 13EDE4 8024BAA4 00000000 */ nop /* 13EDE8 8024BAA8 30630FFF */ andi $v1, $v1, 0xfff /* 13EDEC 8024BAAC 00681825 */ or $v1, $v1, $t0 /* 13EDF0 8024BAB0 00431025 */ or $v0, $v0, $v1 /* 13EDF4 8024BAB4 448B0000 */ mtc1 $t3, $f0 -/* 13EDF8 8024BAB8 00000000 */ nop +/* 13EDF8 8024BAB8 00000000 */ nop /* 13EDFC 8024BABC 46800020 */ cvt.s.w $f0, $f0 /* 13EE00 8024BAC0 46040002 */ mul.s $f0, $f0, $f4 -/* 13EE04 8024BAC4 00000000 */ nop +/* 13EE04 8024BAC4 00000000 */ nop /* 13EE08 8024BAC8 AD220000 */ sw $v0, ($t1) /* 13EE0C 8024BACC 4600128D */ trunc.w.s $f10, $f2 /* 13EE10 8024BAD0 44025000 */ mfc1 $v0, $f10 -/* 13EE14 8024BAD4 00000000 */ nop +/* 13EE14 8024BAD4 00000000 */ nop /* 13EE18 8024BAD8 30420FFF */ andi $v0, $v0, 0xfff /* 13EE1C 8024BADC 00021300 */ sll $v0, $v0, 0xc /* 13EE20 8024BAE0 4600028D */ trunc.w.s $f10, $f0 /* 13EE24 8024BAE4 44035000 */ mfc1 $v1, $f10 -/* 13EE28 8024BAE8 00000000 */ nop +/* 13EE28 8024BAE8 00000000 */ nop /* 13EE2C 8024BAEC 30630FFF */ andi $v1, $v1, 0xfff /* 13EE30 8024BAF0 00431025 */ or $v0, $v0, $v1 /* 13EE34 8024BAF4 AD220004 */ sw $v0, 4($t1) diff --git a/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s b/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s index c8eef96f24..910c6f3683 100644 --- a/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s +++ b/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s @@ -28,8 +28,8 @@ glabel pause_spirits_draw_contents /* 13FD9C 8024CA5C 34A50008 */ ori $a1, $a1, 8 /* 13FDA0 8024CA60 0000A02D */ daddu $s4, $zero, $zero /* 13FDA4 8024CA64 AFA200D0 */ sw $v0, 0xd0($sp) -/* 13FDA8 8024CA68 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 13FDAC 8024CA6C 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 13FDA8 8024CA68 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 13FDAC 8024CA6C 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 13FDB0 8024CA70 0040882D */ daddu $s1, $v0, $zero /* 13FDB4 8024CA74 3C1EE700 */ lui $fp, 0xe700 /* 13FDB8 8024CA78 24170400 */ addiu $s7, $zero, 0x400 @@ -164,10 +164,10 @@ glabel pause_spirits_draw_contents /* 13FFB8 8024CC78 0C018E44 */ jal guOrthoF /* 13FFBC 8024CC7C E7B6001C */ swc1 $f22, 0x1c($sp) /* 13FFC0 8024CC80 27A40050 */ addiu $a0, $sp, 0x50 -/* 13FFC4 8024CC84 3C118007 */ lui $s1, %hi(D_800741F0) -/* 13FFC8 8024CC88 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 13FFCC 8024CC8C 3C12800A */ lui $s2, %hi(D_8009A674) -/* 13FFD0 8024CC90 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 13FFC4 8024CC84 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 13FFC8 8024CC88 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 13FFCC 8024CC8C 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 13FFD0 8024CC90 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 13FFD4 8024CC94 96250000 */ lhu $a1, ($s1) /* 13FFD8 8024CC98 8E420000 */ lw $v0, ($s2) /* 13FFDC 8024CC9C 00052980 */ sll $a1, $a1, 6 @@ -177,8 +177,8 @@ glabel pause_spirits_draw_contents /* 13FFEC 8024CCAC 3C09DA38 */ lui $t1, 0xda38 /* 13FFF0 8024CCB0 35290007 */ ori $t1, $t1, 7 /* 13FFF4 8024CCB4 27A40050 */ addiu $a0, $sp, 0x50 -/* 13FFF8 8024CCB8 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 13FFFC 8024CCBC 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 13FFF8 8024CCB8 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 13FFFC 8024CCBC 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 140000 8024CCC0 8E030000 */ lw $v1, ($s0) /* 140004 8024CCC4 4405A000 */ mfc1 $a1, $f20 /* 140008 8024CCC8 4406A000 */ mfc1 $a2, $f20 @@ -243,7 +243,7 @@ glabel pause_spirits_draw_contents /* 1400F0 8024CDB0 8FB800D0 */ lw $t8, 0xd0($sp) /* 1400F4 8024CDB4 00021080 */ sll $v0, $v0, 2 /* 1400F8 8024CDB8 4482B000 */ mtc1 $v0, $f22 -/* 1400FC 8024CDBC 00000000 */ nop +/* 1400FC 8024CDBC 00000000 */ nop /* 140100 8024CDC0 4680B5A0 */ cvt.s.w $f22, $f22 /* 140104 8024CDC4 001210C0 */ sll $v0, $s2, 3 /* 140108 8024CDC8 00431021 */ addu $v0, $v0, $v1 @@ -264,27 +264,27 @@ glabel pause_spirits_draw_contents /* 140140 8024CE00 D4240050 */ ldc1 $f4, %lo(D_80270050)($at) /* 140144 8024CE04 4600B5A1 */ cvt.d.s $f22, $f22 /* 140148 8024CE08 4624B102 */ mul.d $f4, $f22, $f4 -/* 14014C 8024CE0C 00000000 */ nop +/* 14014C 8024CE0C 00000000 */ nop /* 140150 8024CE10 3C018027 */ lui $at, %hi(D_80270058) /* 140154 8024CE14 D4220058 */ ldc1 $f2, %lo(D_80270058)($at) /* 140158 8024CE18 4492A000 */ mtc1 $s2, $f20 -/* 14015C 8024CE1C 00000000 */ nop +/* 14015C 8024CE1C 00000000 */ nop /* 140160 8024CE20 4680A521 */ cvt.d.w $f20, $f20 /* 140164 8024CE24 4622A082 */ mul.d $f2, $f20, $f2 -/* 140168 8024CE28 00000000 */ nop +/* 140168 8024CE28 00000000 */ nop /* 14016C 8024CE2C 3C018027 */ lui $at, %hi(D_80270060) /* 140170 8024CE30 D4200060 */ ldc1 $f0, %lo(D_80270060)($at) /* 140174 8024CE34 46201080 */ add.d $f2, $f2, $f0 /* 140178 8024CE38 4622B082 */ mul.d $f2, $f22, $f2 -/* 14017C 8024CE3C 00000000 */ nop +/* 14017C 8024CE3C 00000000 */ nop /* 140180 8024CE40 02520018 */ mult $s2, $s2 /* 140184 8024CE44 0000C012 */ mflo $t8 -/* 140188 8024CE48 00000000 */ nop -/* 14018C 8024CE4C 00000000 */ nop +/* 140188 8024CE48 00000000 */ nop +/* 14018C 8024CE4C 00000000 */ nop /* 140190 8024CE50 03120018 */ mult $t8, $s2 /* 140194 8024CE54 0000C012 */ mflo $t8 /* 140198 8024CE58 44986000 */ mtc1 $t8, $f12 -/* 14019C 8024CE5C 00000000 */ nop +/* 14019C 8024CE5C 00000000 */ nop /* 1401A0 8024CE60 46806321 */ cvt.d.w $f12, $f12 /* 1401A4 8024CE64 46246300 */ add.d $f12, $f12, $f4 /* 1401A8 8024CE68 46226300 */ add.d $f12, $f12, $f2 @@ -293,18 +293,18 @@ glabel pause_spirits_draw_contents /* 1401B4 8024CE74 3C013FD0 */ lui $at, 0x3fd0 /* 1401B8 8024CE78 44816800 */ mtc1 $at, $f13 /* 1401BC 8024CE7C 44806000 */ mtc1 $zero, $f12 -/* 1401C0 8024CE80 00000000 */ nop +/* 1401C0 8024CE80 00000000 */ nop /* 1401C4 8024CE84 462CA302 */ mul.d $f12, $f20, $f12 -/* 1401C8 8024CE88 00000000 */ nop +/* 1401C8 8024CE88 00000000 */ nop /* 1401CC 8024CE8C 3C018027 */ lui $at, %hi(D_80270068) /* 1401D0 8024CE90 D4220068 */ ldc1 $f2, %lo(D_80270068)($at) /* 1401D4 8024CE94 4622A502 */ mul.d $f20, $f20, $f2 -/* 1401D8 8024CE98 00000000 */ nop +/* 1401D8 8024CE98 00000000 */ nop /* 1401DC 8024CE9C 3C018027 */ lui $at, %hi(D_80270070) /* 1401E0 8024CEA0 D4220070 */ ldc1 $f2, %lo(D_80270070)($at) /* 1401E4 8024CEA4 46341081 */ sub.d $f2, $f2, $f20 /* 1401E8 8024CEA8 4622B082 */ mul.d $f2, $f22, $f2 -/* 1401EC 8024CEAC 00000000 */ nop +/* 1401EC 8024CEAC 00000000 */ nop /* 1401F0 8024CEB0 46366300 */ add.d $f12, $f12, $f22 /* 1401F4 8024CEB4 46226300 */ add.d $f12, $f12, $f2 /* 1401F8 8024CEB8 46000506 */ mov.s $f20, $f0 @@ -312,13 +312,13 @@ glabel pause_spirits_draw_contents /* 140200 8024CEC0 46206320 */ cvt.s.d $f12, $f12 /* 140204 8024CEC4 3C0140A0 */ lui $at, 0x40a0 /* 140208 8024CEC8 44811000 */ mtc1 $at, $f2 -/* 14020C 8024CECC 00000000 */ nop +/* 14020C 8024CECC 00000000 */ nop /* 140210 8024CED0 4602A502 */ mul.s $f20, $f20, $f2 -/* 140214 8024CED4 00000000 */ nop +/* 140214 8024CED4 00000000 */ nop /* 140218 8024CED8 241000FF */ addiu $s0, $zero, 0xff /* 14021C 8024CEDC 0200882D */ daddu $s1, $s0, $zero /* 140220 8024CEE0 4600A502 */ mul.s $f20, $f20, $f0 -/* 140224 8024CEE4 00000000 */ nop +/* 140224 8024CEE4 00000000 */ nop .L8024CEE8: /* 140228 8024CEE8 24050008 */ addiu $a1, $zero, 8 /* 14022C 8024CEEC 3C038027 */ lui $v1, %hi(D_802706E0) @@ -339,14 +339,14 @@ glabel pause_spirits_draw_contents /* 140268 8024CF28 8FB80134 */ lw $t8, 0x134($sp) /* 14026C 8024CF2C 27020016 */ addiu $v0, $t8, 0x16 /* 140270 8024CF30 44820000 */ mtc1 $v0, $f0 -/* 140274 8024CF34 00000000 */ nop +/* 140274 8024CF34 00000000 */ nop /* 140278 8024CF38 46800020 */ cvt.s.w $f0, $f0 /* 14027C 8024CF3C 46180000 */ add.s $f0, $f0, $f24 /* 140280 8024CF40 8FB80138 */ lw $t8, 0x138($sp) /* 140284 8024CF44 2702004D */ addiu $v0, $t8, 0x4d /* 140288 8024CF48 44050000 */ mfc1 $a1, $f0 /* 14028C 8024CF4C 44820000 */ mtc1 $v0, $f0 -/* 140290 8024CF50 00000000 */ nop +/* 140290 8024CF50 00000000 */ nop /* 140294 8024CF54 46800020 */ cvt.s.w $f0, $f0 /* 140298 8024CF58 461C0000 */ add.s $f0, $f0, $f28 /* 14029C 8024CF5C 46140000 */ add.s $f0, $f0, $f20 @@ -409,8 +409,8 @@ glabel pause_spirits_draw_contents /* 140378 8024D038 3C02D838 */ lui $v0, 0xd838 /* 14037C 8024D03C 34420002 */ ori $v0, $v0, 2 /* 140380 8024D040 8FB80134 */ lw $t8, 0x134($sp) -/* 140384 8024D044 3C0C800A */ lui $t4, %hi(D_8009A66C) -/* 140388 8024D048 258CA66C */ addiu $t4, $t4, %lo(D_8009A66C) +/* 140384 8024D044 3C0C800A */ lui $t4, %hi(gMasterGfxPos) +/* 140388 8024D048 258CA66C */ addiu $t4, $t4, %lo(gMasterGfxPos) /* 14038C 8024D04C 27060007 */ addiu $a2, $t8, 7 /* 140390 8024D050 8FB80138 */ lw $t8, 0x138($sp) /* 140394 8024D054 8D890000 */ lw $t1, ($t4) @@ -432,7 +432,7 @@ glabel pause_spirits_draw_contents /* 1403D0 8024D090 24080001 */ addiu $t0, $zero, 1 .L8024D094: /* 1403D4 8024D094 1940006D */ blez $t2, .L8024D24C -/* 1403D8 8024D098 00000000 */ nop +/* 1403D8 8024D098 00000000 */ nop /* 1403DC 8024D09C 1960006B */ blez $t3, .L8024D24C /* 1403E0 8024D0A0 28C2013F */ slti $v0, $a2, 0x13f /* 1403E4 8024D0A4 10400069 */ beqz $v0, .L8024D24C @@ -447,53 +447,53 @@ glabel pause_spirits_draw_contents /* 140404 8024D0C4 240B00EF */ addiu $t3, $zero, 0xef .L8024D0C8: /* 140408 8024D0C8 44861000 */ mtc1 $a2, $f2 -/* 14040C 8024D0CC 00000000 */ nop +/* 14040C 8024D0CC 00000000 */ nop /* 140410 8024D0D0 468010A0 */ cvt.s.w $f2, $f2 /* 140414 8024D0D4 25220008 */ addiu $v0, $t1, 8 /* 140418 8024D0D8 3C014080 */ lui $at, 0x4080 /* 14041C 8024D0DC 44812000 */ mtc1 $at, $f4 /* 140420 8024D0E0 44880000 */ mtc1 $t0, $f0 -/* 140424 8024D0E4 00000000 */ nop +/* 140424 8024D0E4 00000000 */ nop /* 140428 8024D0E8 46800020 */ cvt.s.w $f0, $f0 /* 14042C 8024D0EC 46041082 */ mul.s $f2, $f2, $f4 -/* 140430 8024D0F0 00000000 */ nop +/* 140430 8024D0F0 00000000 */ nop /* 140434 8024D0F4 8FB80134 */ lw $t8, 0x134($sp) /* 140438 8024D0F8 3C08ED00 */ lui $t0, 0xed00 /* 14043C 8024D0FC 27060007 */ addiu $a2, $t8, 7 /* 140440 8024D100 8FB80138 */ lw $t8, 0x138($sp) /* 140444 8024D104 46040002 */ mul.s $f0, $f0, $f4 -/* 140448 8024D108 00000000 */ nop +/* 140448 8024D108 00000000 */ nop /* 14044C 8024D10C AD820000 */ sw $v0, ($t4) /* 140450 8024D110 2707000E */ addiu $a3, $t8, 0xe /* 140454 8024D114 4600118D */ trunc.w.s $f6, $f2 /* 140458 8024D118 44023000 */ mfc1 $v0, $f6 -/* 14045C 8024D11C 00000000 */ nop +/* 14045C 8024D11C 00000000 */ nop /* 140460 8024D120 30420FFF */ andi $v0, $v0, 0xfff /* 140464 8024D124 00021300 */ sll $v0, $v0, 0xc /* 140468 8024D128 4600018D */ trunc.w.s $f6, $f0 /* 14046C 8024D12C 44033000 */ mfc1 $v1, $f6 /* 140470 8024D130 448A1000 */ mtc1 $t2, $f2 -/* 140474 8024D134 00000000 */ nop +/* 140474 8024D134 00000000 */ nop /* 140478 8024D138 468010A0 */ cvt.s.w $f2, $f2 /* 14047C 8024D13C 46041082 */ mul.s $f2, $f2, $f4 -/* 140480 8024D140 00000000 */ nop +/* 140480 8024D140 00000000 */ nop /* 140484 8024D144 30630FFF */ andi $v1, $v1, 0xfff /* 140488 8024D148 00681825 */ or $v1, $v1, $t0 /* 14048C 8024D14C 00431025 */ or $v0, $v0, $v1 /* 140490 8024D150 448B0000 */ mtc1 $t3, $f0 -/* 140494 8024D154 00000000 */ nop +/* 140494 8024D154 00000000 */ nop /* 140498 8024D158 46800020 */ cvt.s.w $f0, $f0 /* 14049C 8024D15C 46040002 */ mul.s $f0, $f0, $f4 -/* 1404A0 8024D160 00000000 */ nop +/* 1404A0 8024D160 00000000 */ nop /* 1404A4 8024D164 AD220000 */ sw $v0, ($t1) /* 1404A8 8024D168 4600118D */ trunc.w.s $f6, $f2 /* 1404AC 8024D16C 44023000 */ mfc1 $v0, $f6 -/* 1404B0 8024D170 00000000 */ nop +/* 1404B0 8024D170 00000000 */ nop /* 1404B4 8024D174 30420FFF */ andi $v0, $v0, 0xfff /* 1404B8 8024D178 00021300 */ sll $v0, $v0, 0xc /* 1404BC 8024D17C 4600018D */ trunc.w.s $f6, $f0 /* 1404C0 8024D180 44033000 */ mfc1 $v1, $f6 -/* 1404C4 8024D184 00000000 */ nop +/* 1404C4 8024D184 00000000 */ nop /* 1404C8 8024D188 30630FFF */ andi $v1, $v1, 0xfff /* 1404CC 8024D18C 00431025 */ or $v0, $v0, $v1 /* 1404D0 8024D190 AD220004 */ sw $v0, 4($t1) diff --git a/asm/nonmatchings/code_140C70/pause_map_draw_contents.s b/asm/nonmatchings/code_140C70/pause_map_draw_contents.s index d60a70dec4..1c36e963a6 100644 --- a/asm/nonmatchings/code_140C70/pause_map_draw_contents.s +++ b/asm/nonmatchings/code_140C70/pause_map_draw_contents.s @@ -5,8 +5,8 @@ glabel pause_map_draw_contents /* 140E5C 8024DB1C 27BDFF60 */ addiu $sp, $sp, -0xa0 /* 140E60 8024DB20 AFB7008C */ sw $s7, 0x8c($sp) /* 140E64 8024DB24 0000B82D */ daddu $s7, $zero, $zero -/* 140E68 8024DB28 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 140E6C 8024DB2C 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 140E68 8024DB28 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 140E6C 8024DB2C 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 140E70 8024DB30 AFB10074 */ sw $s1, 0x74($sp) /* 140E74 8024DB34 0040882D */ daddu $s1, $v0, $zero /* 140E78 8024DB38 AFB40080 */ sw $s4, 0x80($sp) @@ -167,7 +167,7 @@ glabel pause_map_draw_contents /* 1410D4 8024DD94 24030001 */ addiu $v1, $zero, 1 .L8024DD98: /* 1410D8 8024DD98 18C001DF */ blez $a2, .L8024E518 -/* 1410DC 8024DD9C 00000000 */ nop +/* 1410DC 8024DD9C 00000000 */ nop /* 1410E0 8024DDA0 18E001DD */ blez $a3, .L8024E518 /* 1410E4 8024DDA4 2882013F */ slti $v0, $a0, 0x13f /* 1410E8 8024DDA8 104001DB */ beqz $v0, .L8024E518 @@ -184,15 +184,15 @@ glabel pause_map_draw_contents /* 14110C 8024DDCC 3C0E8025 */ lui $t6, %hi(D_802502B8) /* 141110 8024DDD0 25CE02B8 */ addiu $t6, $t6, %lo(D_802502B8) /* 141114 8024DDD4 0000B82D */ daddu $s7, $zero, $zero -/* 141118 8024DDD8 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 14111C 8024DDDC 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 141118 8024DDD8 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 14111C 8024DDDC 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 141120 8024DDE0 44841000 */ mtc1 $a0, $f2 -/* 141124 8024DDE4 00000000 */ nop +/* 141124 8024DDE4 00000000 */ nop /* 141128 8024DDE8 468010A0 */ cvt.s.w $f2, $f2 /* 14112C 8024DDEC 24A20010 */ addiu $v0, $a1, 0x10 /* 141130 8024DDF0 8FAF0050 */ lw $t7, 0x50($sp) /* 141134 8024DDF4 44830000 */ mtc1 $v1, $f0 -/* 141138 8024DDF8 00000000 */ nop +/* 141138 8024DDF8 00000000 */ nop /* 14113C 8024DDFC 46800020 */ cvt.s.w $f0, $f0 /* 141140 8024DE00 AFAE005C */ sw $t6, 0x5c($sp) /* 141144 8024DE04 8FAE00A4 */ lw $t6, 0xa4($sp) @@ -200,7 +200,7 @@ glabel pause_map_draw_contents /* 14114C 8024DE0C 44812000 */ mtc1 $at, $f4 /* 141150 8024DE10 01EE7821 */ addu $t7, $t7, $t6 /* 141154 8024DE14 46041082 */ mul.s $f2, $f2, $f4 -/* 141158 8024DE18 00000000 */ nop +/* 141158 8024DE18 00000000 */ nop /* 14115C 8024DE1C AFAF0060 */ sw $t7, 0x60($sp) /* 141160 8024DE20 8FAF0054 */ lw $t7, 0x54($sp) /* 141164 8024DE24 8FAE00A8 */ lw $t6, 0xa8($sp) @@ -209,38 +209,38 @@ glabel pause_map_draw_contents /* 141170 8024DE30 AFAF0064 */ sw $t7, 0x64($sp) /* 141174 8024DE34 8FAF005C */ lw $t7, 0x5c($sp) /* 141178 8024DE38 46040002 */ mul.s $f0, $f0, $f4 -/* 14117C 8024DE3C 00000000 */ nop +/* 14117C 8024DE3C 00000000 */ nop /* 141180 8024DE40 AE220000 */ sw $v0, ($s1) /* 141184 8024DE44 25FE0008 */ addiu $fp, $t7, 8 /* 141188 8024DE48 4600118D */ trunc.w.s $f6, $f2 /* 14118C 8024DE4C 44023000 */ mfc1 $v0, $f6 -/* 141190 8024DE50 00000000 */ nop +/* 141190 8024DE50 00000000 */ nop /* 141194 8024DE54 30420FFF */ andi $v0, $v0, 0xfff /* 141198 8024DE58 00021300 */ sll $v0, $v0, 0xc /* 14119C 8024DE5C 4600018D */ trunc.w.s $f6, $f0 /* 1411A0 8024DE60 44033000 */ mfc1 $v1, $f6 /* 1411A4 8024DE64 44861000 */ mtc1 $a2, $f2 -/* 1411A8 8024DE68 00000000 */ nop +/* 1411A8 8024DE68 00000000 */ nop /* 1411AC 8024DE6C 468010A0 */ cvt.s.w $f2, $f2 /* 1411B0 8024DE70 46041082 */ mul.s $f2, $f2, $f4 -/* 1411B4 8024DE74 00000000 */ nop +/* 1411B4 8024DE74 00000000 */ nop /* 1411B8 8024DE78 30630FFF */ andi $v1, $v1, 0xfff /* 1411BC 8024DE7C 00641825 */ or $v1, $v1, $a0 /* 1411C0 8024DE80 00431025 */ or $v0, $v0, $v1 /* 1411C4 8024DE84 44870000 */ mtc1 $a3, $f0 -/* 1411C8 8024DE88 00000000 */ nop +/* 1411C8 8024DE88 00000000 */ nop /* 1411CC 8024DE8C 46800020 */ cvt.s.w $f0, $f0 /* 1411D0 8024DE90 46040002 */ mul.s $f0, $f0, $f4 -/* 1411D4 8024DE94 00000000 */ nop +/* 1411D4 8024DE94 00000000 */ nop /* 1411D8 8024DE98 ACA20008 */ sw $v0, 8($a1) /* 1411DC 8024DE9C 4600118D */ trunc.w.s $f6, $f2 /* 1411E0 8024DEA0 44023000 */ mfc1 $v0, $f6 -/* 1411E4 8024DEA4 00000000 */ nop +/* 1411E4 8024DEA4 00000000 */ nop /* 1411E8 8024DEA8 30420FFF */ andi $v0, $v0, 0xfff /* 1411EC 8024DEAC 00021300 */ sll $v0, $v0, 0xc /* 1411F0 8024DEB0 4600018D */ trunc.w.s $f6, $f0 /* 1411F4 8024DEB4 44033000 */ mfc1 $v1, $f6 -/* 1411F8 8024DEB8 00000000 */ nop +/* 1411F8 8024DEB8 00000000 */ nop /* 1411FC 8024DEBC 30630FFF */ andi $v1, $v1, 0xfff /* 141200 8024DEC0 00431025 */ or $v0, $v0, $v1 /* 141204 8024DEC4 ACA2000C */ sw $v0, 0xc($a1) @@ -413,28 +413,28 @@ glabel pause_map_draw_contents /* 141488 8024E148 24C6FFF9 */ addiu $a2, $a2, -7 /* 14148C 8024E14C 8E040000 */ lw $a0, ($s0) /* 141490 8024E150 0C0511F8 */ jal draw_icon_2 -/* 141494 8024E154 00000000 */ nop +/* 141494 8024E154 00000000 */ nop /* 141498 8024E158 3C138027 */ lui $s3, %hi(gPauseMenuCurrentTab) /* 14149C 8024E15C 267300D4 */ addiu $s3, $s3, %lo(gPauseMenuCurrentTab) /* 1414A0 8024E160 82700000 */ lb $s0, ($s3) /* 1414A4 8024E164 24020006 */ addiu $v0, $zero, 6 /* 1414A8 8024E168 16020081 */ bne $s0, $v0, .L8024E370 -/* 1414AC 8024E16C 00000000 */ nop +/* 1414AC 8024E16C 00000000 */ nop /* 1414B0 8024E170 3C018027 */ lui $at, %hi(D_80270714) /* 1414B4 8024E174 C4200714 */ lwc1 $f0, %lo(D_80270714)($at) /* 1414B8 8024E178 44922000 */ mtc1 $s2, $f4 -/* 1414BC 8024E17C 00000000 */ nop +/* 1414BC 8024E17C 00000000 */ nop /* 1414C0 8024E180 46802120 */ cvt.s.w $f4, $f4 /* 1414C4 8024E184 46002100 */ add.s $f4, $f4, $f0 /* 1414C8 8024E188 3C018027 */ lui $at, %hi(D_80270718) /* 1414CC 8024E18C C4200718 */ lwc1 $f0, %lo(D_80270718)($at) /* 1414D0 8024E190 44911000 */ mtc1 $s1, $f2 -/* 1414D4 8024E194 00000000 */ nop +/* 1414D4 8024E194 00000000 */ nop /* 1414D8 8024E198 468010A0 */ cvt.s.w $f2, $f2 /* 1414DC 8024E19C 46001080 */ add.s $f2, $f2, $f0 /* 1414E0 8024E1A0 3C014100 */ lui $at, 0x4100 /* 1414E4 8024E1A4 44810000 */ mtc1 $at, $f0 -/* 1414E8 8024E1A8 00000000 */ nop +/* 1414E8 8024E1A8 00000000 */ nop /* 1414EC 8024E1AC 46002101 */ sub.s $f4, $f4, $f0 /* 1414F0 8024E1B0 4600118D */ trunc.w.s $f6, $f2 /* 1414F4 8024E1B4 44063000 */ mfc1 $a2, $f6 @@ -444,9 +444,9 @@ glabel pause_map_draw_contents /* 141504 8024E1C4 24040029 */ addiu $a0, $zero, 0x29 /* 141508 8024E1C8 82620000 */ lb $v0, ($s3) /* 14150C 8024E1CC 14500068 */ bne $v0, $s0, .L8024E370 -/* 141510 8024E1D0 00000000 */ nop -/* 141514 8024E1D4 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 141518 8024E1D8 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 141510 8024E1D0 00000000 */ nop +/* 141514 8024E1D4 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 141518 8024E1D8 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 14151C 8024E1DC 3C05AAAA */ lui $a1, 0xaaaa /* 141520 8024E1E0 34A5AAAB */ ori $a1, $a1, 0xaaab /* 141524 8024E1E4 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -500,9 +500,9 @@ glabel pause_map_draw_contents /* 1415E0 8024E2A0 C6820000 */ lwc1 $f2, ($s4) /* 1415E4 8024E2A4 3C01C2AC */ lui $at, 0xc2ac /* 1415E8 8024E2A8 44810000 */ mtc1 $at, $f0 -/* 1415EC 8024E2AC 00000000 */ nop +/* 1415EC 8024E2AC 00000000 */ nop /* 1415F0 8024E2B0 4602003C */ c.lt.s $f0, $f2 -/* 1415F4 8024E2B4 00000000 */ nop +/* 1415F4 8024E2B4 00000000 */ nop /* 1415F8 8024E2B8 45020001 */ bc1fl .L8024E2C0 /* 1415FC 8024E2BC 0000902D */ daddu $s2, $zero, $zero .L8024E2C0: @@ -518,7 +518,7 @@ glabel pause_map_draw_contents /* 141624 8024E2E4 26520708 */ addiu $s2, $s2, %lo(D_80270708) /* 141628 8024E2E8 C6400000 */ lwc1 $f0, ($s2) /* 14162C 8024E2EC 4614003C */ c.lt.s $f0, $f20 -/* 141630 8024E2F0 00000000 */ nop +/* 141630 8024E2F0 00000000 */ nop /* 141634 8024E2F4 45020001 */ bc1fl .L8024E2FC /* 141638 8024E2F8 0000982D */ daddu $s3, $zero, $zero .L8024E2FC: @@ -538,9 +538,9 @@ glabel pause_map_draw_contents /* 141670 8024E330 C6420000 */ lwc1 $f2, ($s2) /* 141674 8024E334 3C01C352 */ lui $at, 0xc352 /* 141678 8024E338 44810000 */ mtc1 $at, $f0 -/* 14167C 8024E33C 00000000 */ nop +/* 14167C 8024E33C 00000000 */ nop /* 141680 8024E340 4602003C */ c.lt.s $f0, $f2 -/* 141684 8024E344 00000000 */ nop +/* 141684 8024E344 00000000 */ nop /* 141688 8024E348 45020001 */ bc1fl .L8024E350 /* 14168C 8024E34C 0000882D */ daddu $s1, $zero, $zero .L8024E350: @@ -566,7 +566,7 @@ glabel pause_map_draw_contents /* 1416D4 8024E394 24080001 */ addiu $t0, $zero, 1 .L8024E398: /* 1416D8 8024E398 1940005F */ blez $t2, .L8024E518 -/* 1416DC 8024E39C 00000000 */ nop +/* 1416DC 8024E39C 00000000 */ nop /* 1416E0 8024E3A0 1960005D */ blez $t3, .L8024E518 /* 1416E4 8024E3A4 28E2013F */ slti $v0, $a3, 0x13f /* 1416E8 8024E3A8 1040005B */ beqz $v0, .L8024E518 @@ -580,13 +580,13 @@ glabel pause_map_draw_contents /* 141704 8024E3C4 50400001 */ beql $v0, $zero, .L8024E3CC /* 141708 8024E3C8 240B00EF */ addiu $t3, $zero, 0xef .L8024E3CC: -/* 14170C 8024E3CC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 141710 8024E3D0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 14170C 8024E3CC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 141710 8024E3D0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 141714 8024E3D4 44871000 */ mtc1 $a3, $f2 -/* 141718 8024E3D8 00000000 */ nop +/* 141718 8024E3D8 00000000 */ nop /* 14171C 8024E3DC 468010A0 */ cvt.s.w $f2, $f2 /* 141720 8024E3E0 44880000 */ mtc1 $t0, $f0 -/* 141724 8024E3E4 00000000 */ nop +/* 141724 8024E3E4 00000000 */ nop /* 141728 8024E3E8 46800020 */ cvt.s.w $f0, $f0 /* 14172C 8024E3EC 3C08ED00 */ lui $t0, 0xed00 /* 141730 8024E3F0 8FAF00A4 */ lw $t7, 0xa4($sp) @@ -595,43 +595,43 @@ glabel pause_map_draw_contents /* 14173C 8024E3FC 44812000 */ mtc1 $at, $f4 /* 141740 8024E400 8FAE00A8 */ lw $t6, 0xa8($sp) /* 141744 8024E404 46041082 */ mul.s $f2, $f2, $f4 -/* 141748 8024E408 00000000 */ nop +/* 141748 8024E408 00000000 */ nop /* 14174C 8024E40C 25E60012 */ addiu $a2, $t7, 0x12 /* 141750 8024E410 25C7000E */ addiu $a3, $t6, 0xe /* 141754 8024E414 0040482D */ daddu $t1, $v0, $zero /* 141758 8024E418 24420008 */ addiu $v0, $v0, 8 /* 14175C 8024E41C 46040002 */ mul.s $f0, $f0, $f4 -/* 141760 8024E420 00000000 */ nop +/* 141760 8024E420 00000000 */ nop /* 141764 8024E424 AC620000 */ sw $v0, ($v1) /* 141768 8024E428 4600118D */ trunc.w.s $f6, $f2 /* 14176C 8024E42C 44023000 */ mfc1 $v0, $f6 -/* 141770 8024E430 00000000 */ nop +/* 141770 8024E430 00000000 */ nop /* 141774 8024E434 30420FFF */ andi $v0, $v0, 0xfff /* 141778 8024E438 00021300 */ sll $v0, $v0, 0xc /* 14177C 8024E43C 4600018D */ trunc.w.s $f6, $f0 /* 141780 8024E440 44033000 */ mfc1 $v1, $f6 /* 141784 8024E444 448A1000 */ mtc1 $t2, $f2 -/* 141788 8024E448 00000000 */ nop +/* 141788 8024E448 00000000 */ nop /* 14178C 8024E44C 468010A0 */ cvt.s.w $f2, $f2 /* 141790 8024E450 46041082 */ mul.s $f2, $f2, $f4 -/* 141794 8024E454 00000000 */ nop +/* 141794 8024E454 00000000 */ nop /* 141798 8024E458 30630FFF */ andi $v1, $v1, 0xfff /* 14179C 8024E45C 00681825 */ or $v1, $v1, $t0 /* 1417A0 8024E460 00431025 */ or $v0, $v0, $v1 /* 1417A4 8024E464 448B0000 */ mtc1 $t3, $f0 -/* 1417A8 8024E468 00000000 */ nop +/* 1417A8 8024E468 00000000 */ nop /* 1417AC 8024E46C 46800020 */ cvt.s.w $f0, $f0 /* 1417B0 8024E470 46040002 */ mul.s $f0, $f0, $f4 -/* 1417B4 8024E474 00000000 */ nop +/* 1417B4 8024E474 00000000 */ nop /* 1417B8 8024E478 AD220000 */ sw $v0, ($t1) /* 1417BC 8024E47C 4600118D */ trunc.w.s $f6, $f2 /* 1417C0 8024E480 44023000 */ mfc1 $v0, $f6 -/* 1417C4 8024E484 00000000 */ nop +/* 1417C4 8024E484 00000000 */ nop /* 1417C8 8024E488 30420FFF */ andi $v0, $v0, 0xfff /* 1417CC 8024E48C 00021300 */ sll $v0, $v0, 0xc /* 1417D0 8024E490 4600018D */ trunc.w.s $f6, $f0 /* 1417D4 8024E494 44033000 */ mfc1 $v1, $f6 -/* 1417D8 8024E498 00000000 */ nop +/* 1417D8 8024E498 00000000 */ nop /* 1417DC 8024E49C 30630FFF */ andi $v1, $v1, 0xfff /* 1417E0 8024E4A0 00431025 */ or $v0, $v0, $v1 /* 1417E4 8024E4A4 AD220004 */ sw $v0, 4($t1) diff --git a/asm/nonmatchings/code_1421C0/pause_draw_menu_label.s b/asm/nonmatchings/code_1421C0/pause_draw_menu_label.s index ac891b9198..07edf96df2 100644 --- a/asm/nonmatchings/code_1421C0/pause_draw_menu_label.s +++ b/asm/nonmatchings/code_1421C0/pause_draw_menu_label.s @@ -28,8 +28,8 @@ glabel pause_draw_menu_label /* 142220 8024EEE0 50E20001 */ beql $a3, $v0, .L8024EEE8 /* 142224 8024EEE4 240600A0 */ addiu $a2, $zero, 0xa0 .L8024EEE8: -/* 142228 8024EEE8 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 14222C 8024EEEC 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 142228 8024EEE8 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 14222C 8024EEEC 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 142230 8024EEF0 3C02DE00 */ lui $v0, 0xde00 /* 142234 8024EEF4 01063021 */ addu $a2, $t0, $a2 /* 142238 8024EEF8 8CA30000 */ lw $v1, ($a1) @@ -57,4 +57,4 @@ glabel pause_draw_menu_label /* 142290 8024EF50 8FBF0028 */ lw $ra, 0x28($sp) /* 142294 8024EF54 03E00008 */ jr $ra /* 142298 8024EF58 27BD0030 */ addiu $sp, $sp, 0x30 -/* 14229C 8024EF5C 00000000 */ nop +/* 14229C 8024EF5C 00000000 */ nop diff --git a/asm/nonmatchings/code_163400/func_80243CCC.s b/asm/nonmatchings/code_163400/func_80243CCC.s index d1d5ac49c8..9b018c4370 100644 --- a/asm/nonmatchings/code_163400/func_80243CCC.s +++ b/asm/nonmatchings/code_163400/func_80243CCC.s @@ -15,8 +15,8 @@ glabel func_80243CCC /* 164554 80243CF4 354A001C */ ori $t2, $t2, 0x1c /* 164558 80243CF8 3C080050 */ lui $t0, 0x50 /* 16455C 80243CFC 35084340 */ ori $t0, $t0, 0x4340 -/* 164560 80243D00 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 164564 80243D04 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 164560 80243D00 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 164564 80243D04 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 164568 80243D08 3C038016 */ lui $v1, %hi(gUIPanels) /* 16456C 80243D0C 24639D50 */ addiu $v1, $v1, %lo(gUIPanels) /* 164570 80243D10 00042140 */ sll $a0, $a0, 5 @@ -128,7 +128,7 @@ glabel func_80243CCC /* 164710 80243EB0 2A620014 */ slti $v0, $s3, 0x14 .L80243EB4: /* 164714 80243EB4 14400004 */ bnez $v0, .L80243EC8 -/* 164718 80243EB8 00000000 */ nop +/* 164718 80243EB8 00000000 */ nop /* 16471C 80243EBC 92820000 */ lbu $v0, ($s4) /* 164720 80243EC0 304200F7 */ andi $v0, $v0, 0xf7 /* 164724 80243EC4 A2820000 */ sb $v0, ($s4) diff --git a/asm/nonmatchings/code_163400/func_80243EEC.s b/asm/nonmatchings/code_163400/func_80243EEC.s index d35cd65fb9..1d1a9758f7 100644 --- a/asm/nonmatchings/code_163400/func_80243EEC.s +++ b/asm/nonmatchings/code_163400/func_80243EEC.s @@ -23,8 +23,8 @@ glabel func_80243EEC /* 164794 80243F34 3C0AE200 */ lui $t2, 0xe200 /* 164798 80243F38 354A001C */ ori $t2, $t2, 0x1c /* 16479C 80243F3C 3C080050 */ lui $t0, 0x50 -/* 1647A0 80243F40 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 1647A4 80243F44 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 1647A0 80243F40 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 1647A4 80243F44 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 1647A8 80243F48 35084340 */ ori $t0, $t0, 0x4340 /* 1647AC 80243F4C 8C640000 */ lw $a0, ($v1) /* 1647B0 80243F50 3C02E700 */ lui $v0, 0xe700 diff --git a/asm/nonmatchings/code_163400/func_802440BC.s b/asm/nonmatchings/code_163400/func_802440BC.s index 3470f1eca7..fd7ed13784 100644 --- a/asm/nonmatchings/code_163400/func_802440BC.s +++ b/asm/nonmatchings/code_163400/func_802440BC.s @@ -24,11 +24,11 @@ glabel func_802440BC /* 164968 80244108 80830004 */ lb $v1, 4($a0) /* 16496C 8024410C 24020004 */ addiu $v0, $zero, 4 /* 164970 80244110 146201E1 */ bne $v1, $v0, .L80244898 -/* 164974 80244114 00000000 */ nop +/* 164974 80244114 00000000 */ nop /* 164978 80244118 90820003 */ lbu $v0, 3($a0) /* 16497C 8024411C 2C420004 */ sltiu $v0, $v0, 4 /* 164980 80244120 104001DD */ beqz $v0, .L80244898 -/* 164984 80244124 00000000 */ nop +/* 164984 80244124 00000000 */ nop /* 164988 80244128 90820003 */ lbu $v0, 3($a0) /* 16498C 8024412C 3C038025 */ lui $v1, %hi(D_8024C094) /* 164990 80244130 8C63C094 */ lw $v1, %lo(D_8024C094)($v1) @@ -41,35 +41,35 @@ glabel func_802440BC /* 1649AC 8024414C 10620011 */ beq $v1, $v0, .L80244194 /* 1649B0 80244150 0064102A */ slt $v0, $v1, $a0 /* 1649B4 80244154 10400005 */ beqz $v0, .L8024416C -/* 1649B8 80244158 00000000 */ nop +/* 1649B8 80244158 00000000 */ nop /* 1649BC 8024415C 10600007 */ beqz $v1, .L8024417C -/* 1649C0 80244160 00000000 */ nop +/* 1649C0 80244160 00000000 */ nop /* 1649C4 80244164 0809106F */ j .L802441BC -/* 1649C8 80244168 00000000 */ nop +/* 1649C8 80244168 00000000 */ nop .L8024416C: /* 1649CC 8024416C 1064000F */ beq $v1, $a0, .L802441AC -/* 1649D0 80244170 00000000 */ nop +/* 1649D0 80244170 00000000 */ nop /* 1649D4 80244174 0809106F */ j .L802441BC -/* 1649D8 80244178 00000000 */ nop +/* 1649D8 80244178 00000000 */ nop .L8024417C: /* 1649DC 8024417C 3C014302 */ lui $at, 0x4302 /* 1649E0 80244180 4481C000 */ mtc1 $at, $f24 /* 1649E4 80244184 3C0142B4 */ lui $at, 0x42b4 /* 1649E8 80244188 4481B000 */ mtc1 $at, $f22 /* 1649EC 8024418C 08091073 */ j .L802441CC -/* 1649F0 80244190 00000000 */ nop +/* 1649F0 80244190 00000000 */ nop .L80244194: /* 1649F4 80244194 3C01433E */ lui $at, 0x433e /* 1649F8 80244198 4481C000 */ mtc1 $at, $f24 /* 1649FC 8024419C 3C0142B4 */ lui $at, 0x42b4 /* 164A00 802441A0 4481B000 */ mtc1 $at, $f22 /* 164A04 802441A4 08091073 */ j .L802441CC -/* 164A08 802441A8 00000000 */ nop +/* 164A08 802441A8 00000000 */ nop .L802441AC: /* 164A0C 802441AC 3C014302 */ lui $at, 0x4302 /* 164A10 802441B0 4481C000 */ mtc1 $at, $f24 /* 164A14 802441B4 08091071 */ j .L802441C4 -/* 164A18 802441B8 00000000 */ nop +/* 164A18 802441B8 00000000 */ nop .L802441BC: /* 164A1C 802441BC 3C01433E */ lui $at, 0x433e /* 164A20 802441C0 4481C000 */ mtc1 $at, $f24 @@ -82,19 +82,19 @@ glabel func_802440BC /* 164A34 802441D4 90430003 */ lbu $v1, 3($v0) /* 164A38 802441D8 24020001 */ addiu $v0, $zero, 1 /* 164A3C 802441DC 10620012 */ beq $v1, $v0, .L80244228 -/* 164A40 802441E0 00000000 */ nop +/* 164A40 802441E0 00000000 */ nop /* 164A44 802441E4 28620002 */ slti $v0, $v1, 2 /* 164A48 802441E8 50400005 */ beql $v0, $zero, .L80244200 /* 164A4C 802441EC 24020002 */ addiu $v0, $zero, 2 /* 164A50 802441F0 10600007 */ beqz $v1, .L80244210 -/* 164A54 802441F4 00000000 */ nop +/* 164A54 802441F4 00000000 */ nop /* 164A58 802441F8 08091094 */ j .L80244250 -/* 164A5C 802441FC 00000000 */ nop +/* 164A5C 802441FC 00000000 */ nop .L80244200: /* 164A60 80244200 1062000F */ beq $v1, $v0, .L80244240 -/* 164A64 80244204 00000000 */ nop +/* 164A64 80244204 00000000 */ nop /* 164A68 80244208 08091094 */ j .L80244250 -/* 164A6C 8024420C 00000000 */ nop +/* 164A6C 8024420C 00000000 */ nop .L80244210: /* 164A70 80244210 3C014302 */ lui $at, 0x4302 /* 164A74 80244214 44811000 */ mtc1 $at, $f2 @@ -113,7 +113,7 @@ glabel func_802440BC /* 164AA0 80244240 3C014302 */ lui $at, 0x4302 /* 164AA4 80244244 44811000 */ mtc1 $at, $f2 /* 164AA8 80244248 08091096 */ j .L80244258 -/* 164AAC 8024424C 00000000 */ nop +/* 164AAC 8024424C 00000000 */ nop .L80244250: /* 164AB0 80244250 3C01433E */ lui $at, 0x433e /* 164AB4 80244254 44811000 */ mtc1 $at, $f2 @@ -135,8 +135,8 @@ glabel func_802440BC /* 164AEC 8024428C 3C08DC08 */ lui $t0, 0xdc08 /* 164AF0 80244290 35080008 */ ori $t0, $t0, 8 /* 164AF4 80244294 27A40020 */ addiu $a0, $sp, 0x20 -/* 164AF8 80244298 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 164AFC 8024429C 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 164AF8 80244298 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 164AFC 8024429C 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 164B00 802442A0 4480A000 */ mtc1 $zero, $f20 /* 164B04 802442A4 8E220000 */ lw $v0, ($s1) /* 164B08 802442A8 3C0643A0 */ lui $a2, 0x43a0 @@ -165,10 +165,10 @@ glabel func_802440BC /* 164B64 80244304 0C018E44 */ jal guOrthoF /* 164B68 80244308 46020701 */ sub.s $f28, $f0, $f2 /* 164B6C 8024430C 27A40020 */ addiu $a0, $sp, 0x20 -/* 164B70 80244310 3C128007 */ lui $s2, %hi(D_800741F0) -/* 164B74 80244314 265241F0 */ addiu $s2, $s2, %lo(D_800741F0) -/* 164B78 80244318 3C14800A */ lui $s4, %hi(D_8009A674) -/* 164B7C 8024431C 2694A674 */ addiu $s4, $s4, %lo(D_8009A674) +/* 164B70 80244310 3C128007 */ lui $s2, %hi(gMatrixListPos) +/* 164B74 80244314 265241F0 */ addiu $s2, $s2, %lo(gMatrixListPos) +/* 164B78 80244318 3C14800A */ lui $s4, %hi(gDisplayContext) +/* 164B7C 8024431C 2694A674 */ addiu $s4, $s4, %lo(gDisplayContext) /* 164B80 80244320 96450000 */ lhu $a1, ($s2) /* 164B84 80244324 8E820000 */ lw $v0, ($s4) /* 164B88 80244328 00052980 */ sll $a1, $a1, 6 diff --git a/asm/nonmatchings/code_163400/pause_set_cursor_opacity.s b/asm/nonmatchings/code_163400/pause_set_cursor_opacity.s index 1bdc6dad6c..315205be0b 100644 --- a/asm/nonmatchings/code_163400/pause_set_cursor_opacity.s +++ b/asm/nonmatchings/code_163400/pause_set_cursor_opacity.s @@ -10,9 +10,9 @@ glabel pause_set_cursor_opacity /* 163414 80242BB4 14400075 */ bnez $v0, .L80242D8C /* 163418 80242BB8 28A2F581 */ slti $v0, $a1, -0xa7f /* 16341C 80242BBC 14400073 */ bnez $v0, .L80242D8C -/* 163420 80242BC0 00000000 */ nop +/* 163420 80242BC0 00000000 */ nop /* 163424 80242BC4 18C00071 */ blez $a2, .L80242D8C -/* 163428 80242BC8 00000000 */ nop +/* 163428 80242BC8 00000000 */ nop /* 16342C 80242BCC 18E0006F */ blez $a3, .L80242D8C /* 163430 80242BD0 28820500 */ slti $v0, $a0, 0x500 /* 163434 80242BD4 1040006D */ beqz $v0, .L80242D8C @@ -22,9 +22,9 @@ glabel pause_set_cursor_opacity /* 163444 80242BE4 10400069 */ beqz $v0, .L80242D8C /* 163448 80242BE8 28E20A80 */ slti $v0, $a3, 0xa80 /* 16344C 80242BEC 10400067 */ beqz $v0, .L80242D8C -/* 163450 80242BF0 00000000 */ nop -/* 163454 80242BF4 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 163458 80242BF8 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 163450 80242BF0 00000000 */ nop +/* 163454 80242BF4 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 163458 80242BF8 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 16345C 80242BFC 8C480000 */ lw $t0, ($v0) /* 163460 80242C00 25030008 */ addiu $v1, $t0, 8 /* 163464 80242C04 AC430000 */ sw $v1, ($v0) @@ -65,8 +65,8 @@ glabel pause_set_cursor_opacity /* 1634E0 80242C80 00621025 */ or $v0, $v1, $v0 /* 1634E4 80242C84 AD020004 */ sw $v0, 4($t0) .L80242C88: -/* 1634E8 80242C88 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 1634EC 80242C8C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 1634E8 80242C88 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 1634EC 80242C8C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 1634F0 80242C90 8C620000 */ lw $v0, ($v1) /* 1634F4 80242C94 0040202D */ daddu $a0, $v0, $zero /* 1634F8 80242C98 24420008 */ addiu $v0, $v0, 8 @@ -127,8 +127,8 @@ glabel pause_set_cursor_opacity .L80242D54: /* 1635B4 80242D54 00C21025 */ or $v0, $a2, $v0 /* 1635B8 80242D58 AC820000 */ sw $v0, ($a0) -/* 1635BC 80242D5C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 1635C0 80242D60 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 1635BC 80242D5C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 1635C0 80242D60 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 1635C4 80242D64 8C620000 */ lw $v0, ($v1) /* 1635C8 80242D68 0040202D */ daddu $a0, $v0, $zero /* 1635CC 80242D6C 24420008 */ addiu $v0, $v0, 8 @@ -141,4 +141,4 @@ glabel pause_set_cursor_opacity /* 1635E8 80242D88 AC820004 */ sw $v0, 4($a0) .L80242D8C: /* 1635EC 80242D8C 03E00008 */ jr $ra -/* 1635F0 80242D90 00000000 */ nop +/* 1635F0 80242D90 00000000 */ nop diff --git a/asm/nonmatchings/code_168590/func_8024830C.s b/asm/nonmatchings/code_168590/func_8024830C.s index ae73bf3932..04f845603b 100644 --- a/asm/nonmatchings/code_168590/func_8024830C.s +++ b/asm/nonmatchings/code_168590/func_8024830C.s @@ -27,7 +27,7 @@ glabel func_8024830C /* 168BC4 80248364 3C028025 */ lui $v0, %hi(func_80248170) /* 168BC8 80248368 24428170 */ addiu $v0, $v0, %lo(func_80248170) /* 168BCC 8024836C 1462012B */ bne $v1, $v0, .L8024881C -/* 168BD0 80248370 00000000 */ nop +/* 168BD0 80248370 00000000 */ nop /* 168BD4 80248374 9082001C */ lbu $v0, 0x1c($a0) /* 168BD8 80248378 83CB0004 */ lb $t3, 4($fp) /* 168BDC 8024837C 00021040 */ sll $v0, $v0, 1 @@ -48,8 +48,8 @@ glabel func_8024830C /* 168C14 802483B4 3C014080 */ lui $at, 0x4080 /* 168C18 802483B8 4481A000 */ mtc1 $at, $f20 /* 168C1C 802483BC 8FAB0094 */ lw $t3, 0x94($sp) -/* 168C20 802483C0 3C0A800A */ lui $t2, %hi(D_8009A66C) -/* 168C24 802483C4 254AA66C */ addiu $t2, $t2, %lo(D_8009A66C) +/* 168C20 802483C0 3C0A800A */ lui $t2, %hi(gMasterGfxPos) +/* 168C24 802483C4 254AA66C */ addiu $t2, $t2, %lo(gMasterGfxPos) /* 168C28 802483C8 AFA0003C */ sw $zero, 0x3c($sp) /* 168C2C 802483CC AFA00040 */ sw $zero, 0x40($sp) /* 168C30 802483D0 012B5821 */ addu $t3, $t1, $t3 @@ -65,11 +65,11 @@ glabel func_8024830C /* 168C50 802483F0 15000026 */ bnez $t0, .L8024848C /* 168C54 802483F4 25720004 */ addiu $s2, $t3, 4 /* 168C58 802483F8 44891000 */ mtc1 $t1, $f2 -/* 168C5C 802483FC 00000000 */ nop +/* 168C5C 802483FC 00000000 */ nop /* 168C60 80248400 468010A0 */ cvt.s.w $f2, $f2 /* 168C64 80248404 8FAB001C */ lw $t3, 0x1c($sp) /* 168C68 80248408 46141082 */ mul.s $f2, $f2, $f20 -/* 168C6C 8024840C 00000000 */ nop +/* 168C6C 8024840C 00000000 */ nop /* 168C70 80248410 AFAB0024 */ sw $t3, 0x24($sp) /* 168C74 80248414 8D420000 */ lw $v0, ($t2) /* 168C78 80248418 8FAB0090 */ lw $t3, 0x90($sp) @@ -77,23 +77,23 @@ glabel func_8024830C /* 168C80 80248420 24420008 */ addiu $v0, $v0, 8 /* 168C84 80248424 01722021 */ addu $a0, $t3, $s2 /* 168C88 80248428 44840000 */ mtc1 $a0, $f0 -/* 168C8C 8024842C 00000000 */ nop +/* 168C8C 8024842C 00000000 */ nop /* 168C90 80248430 46800020 */ cvt.s.w $f0, $f0 /* 168C94 80248434 46140002 */ mul.s $f0, $f0, $f20 -/* 168C98 80248438 00000000 */ nop +/* 168C98 80248438 00000000 */ nop /* 168C9C 8024843C AD420000 */ sw $v0, ($t2) /* 168CA0 80248440 4600118D */ trunc.w.s $f6, $f2 /* 168CA4 80248444 44033000 */ mfc1 $v1, $f6 -/* 168CA8 80248448 00000000 */ nop +/* 168CA8 80248448 00000000 */ nop /* 168CAC 8024844C 30630FFF */ andi $v1, $v1, 0xfff /* 168CB0 80248450 00031B00 */ sll $v1, $v1, 0xc /* 168CB4 80248454 C7A2002C */ lwc1 $f2, 0x2c($sp) /* 168CB8 80248458 468010A0 */ cvt.s.w $f2, $f2 /* 168CBC 8024845C 46141082 */ mul.s $f2, $f2, $f20 -/* 168CC0 80248460 00000000 */ nop +/* 168CC0 80248460 00000000 */ nop /* 168CC4 80248464 4600018D */ trunc.w.s $f6, $f0 /* 168CC8 80248468 44023000 */ mfc1 $v0, $f6 -/* 168CCC 8024846C 00000000 */ nop +/* 168CCC 8024846C 00000000 */ nop /* 168CD0 80248470 30420FFF */ andi $v0, $v0, 0xfff /* 168CD4 80248474 3C0BED00 */ lui $t3, 0xed00 /* 168CD8 80248478 004B1025 */ or $v0, $v0, $t3 @@ -103,12 +103,12 @@ glabel func_8024830C /* 168CE8 80248488 008B2021 */ addu $a0, $a0, $t3 .L8024848C: /* 168CEC 8024848C 44891000 */ mtc1 $t1, $f2 -/* 168CF0 80248490 00000000 */ nop +/* 168CF0 80248490 00000000 */ nop /* 168CF4 80248494 468010A0 */ cvt.s.w $f2, $f2 /* 168CF8 80248498 8D430000 */ lw $v1, ($t2) /* 168CFC 8024849C 8FAB0020 */ lw $t3, 0x20($sp) /* 168D00 802484A0 46141082 */ mul.s $f2, $f2, $f20 -/* 168D04 802484A4 00000000 */ nop +/* 168D04 802484A4 00000000 */ nop /* 168D08 802484A8 AFAB0024 */ sw $t3, 0x24($sp) /* 168D0C 802484AC 8FAB0090 */ lw $t3, 0x90($sp) /* 168D10 802484B0 0060282D */ daddu $a1, $v1, $zero @@ -118,42 +118,42 @@ glabel func_8024830C /* 168D20 802484C0 AD430000 */ sw $v1, ($t2) /* 168D24 802484C4 008B1021 */ addu $v0, $a0, $t3 /* 168D28 802484C8 44820000 */ mtc1 $v0, $f0 -/* 168D2C 802484CC 00000000 */ nop +/* 168D2C 802484CC 00000000 */ nop /* 168D30 802484D0 46800020 */ cvt.s.w $f0, $f0 /* 168D34 802484D4 24840010 */ addiu $a0, $a0, 0x10 /* 168D38 802484D8 46140002 */ mul.s $f0, $f0, $f20 -/* 168D3C 802484DC 00000000 */ nop +/* 168D3C 802484DC 00000000 */ nop /* 168D40 802484E0 4600118D */ trunc.w.s $f6, $f2 /* 168D44 802484E4 44033000 */ mfc1 $v1, $f6 -/* 168D48 802484E8 00000000 */ nop +/* 168D48 802484E8 00000000 */ nop /* 168D4C 802484EC 30630FFF */ andi $v1, $v1, 0xfff /* 168D50 802484F0 00031B00 */ sll $v1, $v1, 0xc /* 168D54 802484F4 C7A2002C */ lwc1 $f2, 0x2c($sp) /* 168D58 802484F8 468010A0 */ cvt.s.w $f2, $f2 /* 168D5C 802484FC 46141082 */ mul.s $f2, $f2, $f20 -/* 168D60 80248500 00000000 */ nop +/* 168D60 80248500 00000000 */ nop /* 168D64 80248504 4600018D */ trunc.w.s $f6, $f0 /* 168D68 80248508 44023000 */ mfc1 $v0, $f6 -/* 168D6C 8024850C 00000000 */ nop +/* 168D6C 8024850C 00000000 */ nop /* 168D70 80248510 30420FFF */ andi $v0, $v0, 0xfff /* 168D74 80248514 3C0BED00 */ lui $t3, 0xed00 /* 168D78 80248518 004B1025 */ or $v0, $v0, $t3 /* 168D7C 8024851C 00621825 */ or $v1, $v1, $v0 .L80248520: /* 168D80 80248520 44840000 */ mtc1 $a0, $f0 -/* 168D84 80248524 00000000 */ nop +/* 168D84 80248524 00000000 */ nop /* 168D88 80248528 46800020 */ cvt.s.w $f0, $f0 /* 168D8C 8024852C 46140002 */ mul.s $f0, $f0, $f20 -/* 168D90 80248530 00000000 */ nop +/* 168D90 80248530 00000000 */ nop /* 168D94 80248534 ACA30000 */ sw $v1, ($a1) /* 168D98 80248538 4600118D */ trunc.w.s $f6, $f2 /* 168D9C 8024853C 44033000 */ mfc1 $v1, $f6 -/* 168DA0 80248540 00000000 */ nop +/* 168DA0 80248540 00000000 */ nop /* 168DA4 80248544 30630FFF */ andi $v1, $v1, 0xfff /* 168DA8 80248548 00031B00 */ sll $v1, $v1, 0xc /* 168DAC 8024854C 4600018D */ trunc.w.s $f6, $f0 /* 168DB0 80248550 44023000 */ mfc1 $v0, $f6 -/* 168DB4 80248554 00000000 */ nop +/* 168DB4 80248554 00000000 */ nop /* 168DB8 80248558 30420FFF */ andi $v0, $v0, 0xfff /* 168DBC 8024855C 00621825 */ or $v1, $v1, $v0 /* 168DC0 80248560 ACA30004 */ sw $v1, 4($a1) @@ -169,11 +169,11 @@ glabel func_8024830C /* 168DE4 80248584 01630018 */ mult $t3, $v1 /* 168DE8 80248588 00006012 */ mflo $t4 /* 168DEC 8024858C 83C20006 */ lb $v0, 6($fp) -/* 168DF0 80248590 00000000 */ nop +/* 168DF0 80248590 00000000 */ nop /* 168DF4 80248594 01820018 */ mult $t4, $v0 /* 168DF8 80248598 00001012 */ mflo $v0 -/* 168DFC 8024859C 00000000 */ nop -/* 168E00 802485A0 00000000 */ nop +/* 168DFC 8024859C 00000000 */ nop +/* 168E00 802485A0 00000000 */ nop /* 168E04 802485A4 00760018 */ mult $v1, $s6 /* 168E08 802485A8 00001812 */ mflo $v1 /* 168E0C 802485AC 00431021 */ addu $v0, $v0, $v1 @@ -220,7 +220,7 @@ glabel func_8024830C /* 168EA8 80248648 3C048025 */ lui $a0, %hi(D_8024C108) /* 168EAC 8024864C 8C84C108 */ lw $a0, %lo(D_8024C108)($a0) /* 168EB0 80248650 0C0511F8 */ jal draw_icon_2 -/* 168EB4 80248654 00000000 */ nop +/* 168EB4 80248654 00000000 */ nop /* 168EB8 80248658 0000182D */ daddu $v1, $zero, $zero /* 168EBC 8024865C 8FAA0050 */ lw $t2, 0x50($sp) /* 168EC0 80248660 8FA9004C */ lw $t1, 0x4c($sp) @@ -274,7 +274,7 @@ glabel func_8024830C /* 168F5C 802486FC 25080001 */ addiu $t0, $t0, 1 /* 168F60 80248700 29020002 */ slti $v0, $t0, 2 /* 168F64 80248704 1440FF39 */ bnez $v0, .L802483EC -/* 168F68 80248708 00000000 */ nop +/* 168F68 80248708 00000000 */ nop /* 168F6C 8024870C 8FAB003C */ lw $t3, 0x3c($sp) /* 168F70 80248710 256B0011 */ addiu $t3, $t3, 0x11 /* 168F74 80248714 AFAB003C */ sw $t3, 0x3c($sp) @@ -285,61 +285,61 @@ glabel func_8024830C /* 168F88 80248728 26D60001 */ addiu $s6, $s6, 1 /* 168F8C 8024872C 02C2102A */ slt $v0, $s6, $v0 /* 168F90 80248730 1440FF29 */ bnez $v0, .L802483D8 -/* 168F94 80248734 00000000 */ nop +/* 168F94 80248734 00000000 */ nop .L80248738: -/* 168F98 80248738 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 168F9C 8024873C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 168F98 80248738 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 168F9C 8024873C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 168FA0 80248740 44891000 */ mtc1 $t1, $f2 -/* 168FA4 80248744 00000000 */ nop +/* 168FA4 80248744 00000000 */ nop /* 168FA8 80248748 468010A0 */ cvt.s.w $f2, $f2 /* 168FAC 8024874C 3C014080 */ lui $at, 0x4080 /* 168FB0 80248750 44812000 */ mtc1 $at, $f4 /* 168FB4 80248754 C7A00090 */ lwc1 $f0, 0x90($sp) /* 168FB8 80248758 46800020 */ cvt.s.w $f0, $f0 /* 168FBC 8024875C 46041082 */ mul.s $f2, $f2, $f4 -/* 168FC0 80248760 00000000 */ nop +/* 168FC0 80248760 00000000 */ nop /* 168FC4 80248764 8C620000 */ lw $v0, ($v1) /* 168FC8 80248768 3C05ED00 */ lui $a1, 0xed00 /* 168FCC 8024876C 0040302D */ daddu $a2, $v0, $zero /* 168FD0 80248770 24420008 */ addiu $v0, $v0, 8 /* 168FD4 80248774 46040002 */ mul.s $f0, $f0, $f4 -/* 168FD8 80248778 00000000 */ nop +/* 168FD8 80248778 00000000 */ nop /* 168FDC 8024877C AC620000 */ sw $v0, ($v1) /* 168FE0 80248780 4600118D */ trunc.w.s $f6, $f2 /* 168FE4 80248784 44043000 */ mfc1 $a0, $f6 -/* 168FE8 80248788 00000000 */ nop +/* 168FE8 80248788 00000000 */ nop /* 168FEC 8024878C 30840FFF */ andi $a0, $a0, 0xfff /* 168FF0 80248790 00042300 */ sll $a0, $a0, 0xc /* 168FF4 80248794 4600018D */ trunc.w.s $f6, $f0 /* 168FF8 80248798 44033000 */ mfc1 $v1, $f6 -/* 168FFC 8024879C 00000000 */ nop +/* 168FFC 8024879C 00000000 */ nop /* 169000 802487A0 30630FFF */ andi $v1, $v1, 0xfff /* 169004 802487A4 8FAB0094 */ lw $t3, 0x94($sp) /* 169008 802487A8 00651825 */ or $v1, $v1, $a1 /* 16900C 802487AC 012B1021 */ addu $v0, $t1, $t3 /* 169010 802487B0 44821000 */ mtc1 $v0, $f2 -/* 169014 802487B4 00000000 */ nop +/* 169014 802487B4 00000000 */ nop /* 169018 802487B8 468010A0 */ cvt.s.w $f2, $f2 /* 16901C 802487BC 46041082 */ mul.s $f2, $f2, $f4 -/* 169020 802487C0 00000000 */ nop +/* 169020 802487C0 00000000 */ nop /* 169024 802487C4 8FA20098 */ lw $v0, 0x98($sp) /* 169028 802487C8 8FAB0090 */ lw $t3, 0x90($sp) /* 16902C 802487CC 00832025 */ or $a0, $a0, $v1 /* 169030 802487D0 01621021 */ addu $v0, $t3, $v0 /* 169034 802487D4 44820000 */ mtc1 $v0, $f0 -/* 169038 802487D8 00000000 */ nop +/* 169038 802487D8 00000000 */ nop /* 16903C 802487DC 46800020 */ cvt.s.w $f0, $f0 /* 169040 802487E0 46040002 */ mul.s $f0, $f0, $f4 -/* 169044 802487E4 00000000 */ nop +/* 169044 802487E4 00000000 */ nop /* 169048 802487E8 ACC40000 */ sw $a0, ($a2) /* 16904C 802487EC 4600118D */ trunc.w.s $f6, $f2 /* 169050 802487F0 44023000 */ mfc1 $v0, $f6 -/* 169054 802487F4 00000000 */ nop +/* 169054 802487F4 00000000 */ nop /* 169058 802487F8 30420FFF */ andi $v0, $v0, 0xfff /* 16905C 802487FC 00021300 */ sll $v0, $v0, 0xc /* 169060 80248800 4600018D */ trunc.w.s $f6, $f0 /* 169064 80248804 44033000 */ mfc1 $v1, $f6 -/* 169068 80248808 00000000 */ nop +/* 169068 80248808 00000000 */ nop /* 16906C 8024880C 30630FFF */ andi $v1, $v1, 0xfff /* 169070 80248810 00431025 */ or $v0, $v0, $v1 /* 169074 80248814 08092272 */ j .L802489C8 @@ -366,8 +366,8 @@ glabel func_8024830C /* 1690BC 8024885C 00021603 */ sra $v0, $v0, 0x18 /* 1690C0 80248860 01020018 */ mult $t0, $v0 /* 1690C4 80248864 00001012 */ mflo $v0 -/* 1690C8 80248868 00000000 */ nop -/* 1690CC 8024886C 00000000 */ nop +/* 1690C8 80248868 00000000 */ nop +/* 1690CC 8024886C 00000000 */ nop /* 1690D0 80248870 00760018 */ mult $v1, $s6 /* 1690D4 80248874 00001812 */ mflo $v1 /* 1690D8 80248878 00431021 */ addu $v0, $v0, $v1 @@ -412,7 +412,7 @@ glabel func_8024830C /* 16916C 8024890C 3C048025 */ lui $a0, %hi(D_8024C108) /* 169170 80248910 8C84C108 */ lw $a0, %lo(D_8024C108)($a0) /* 169174 80248914 0C0511F8 */ jal draw_icon_2 -/* 169178 80248918 00000000 */ nop +/* 169178 80248918 00000000 */ nop /* 16917C 8024891C 0000182D */ daddu $v1, $zero, $zero /* 169180 80248920 8FA9004C */ lw $t1, 0x4c($sp) .L80248924: @@ -464,13 +464,13 @@ glabel func_8024830C /* 169218 802489B8 26940001 */ addiu $s4, $s4, 1 /* 16921C 802489BC 0282102A */ slt $v0, $s4, $v0 /* 169220 802489C0 1440FF9A */ bnez $v0, .L8024882C -/* 169224 802489C4 00000000 */ nop +/* 169224 802489C4 00000000 */ nop .L802489C8: /* 169228 802489C8 3C038025 */ lui $v1, %hi(D_8024C098) /* 16922C 802489CC 8063C098 */ lb $v1, %lo(D_8024C098)($v1) /* 169230 802489D0 24020003 */ addiu $v0, $zero, 3 /* 169234 802489D4 1462001D */ bne $v1, $v0, .L80248A4C -/* 169238 802489D8 00000000 */ nop +/* 169238 802489D8 00000000 */ nop /* 16923C 802489DC 3C028025 */ lui $v0, %hi(D_8024C08C) /* 169240 802489E0 8C42C08C */ lw $v0, %lo(D_8024C08C)($v0) /* 169244 802489E4 3C03000F */ lui $v1, 0xf diff --git a/asm/nonmatchings/code_169BE0/func_80249380.s b/asm/nonmatchings/code_169BE0/func_80249380.s index d3bff62028..2809dd9be5 100644 --- a/asm/nonmatchings/code_169BE0/func_80249380.s +++ b/asm/nonmatchings/code_169BE0/func_80249380.s @@ -45,8 +45,8 @@ glabel func_80249380 /* 169C7C 8024941C 8C8C0000 */ lw $t4, ($a0) /* 169C80 80249420 10400130 */ beqz $v0, .L802498E4 /* 169C84 80249424 240200F7 */ addiu $v0, $zero, 0xf7 -/* 169C88 80249428 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 169C8C 8024942C 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 169C88 80249428 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 169C8C 8024942C 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 169C90 80249430 8C820004 */ lw $v0, 4($a0) /* 169C94 80249434 8D040000 */ lw $a0, ($t0) /* 169C98 80249438 3C038025 */ lui $v1, %hi(D_8024B7C8) @@ -170,7 +170,7 @@ glabel func_80249380 /* 169E58 802495F8 14C10004 */ bne $a2, $at, .L8024960C /* 169E5C 802495FC 3C018000 */ lui $at, 0x8000 /* 169E60 80249600 14610002 */ bne $v1, $at, .L8024960C -/* 169E64 80249604 00000000 */ nop +/* 169E64 80249604 00000000 */ nop /* 169E68 80249608 0006000D */ break 6 .L8024960C: /* 169E6C 8024960C 00001012 */ mflo $v0 @@ -181,8 +181,8 @@ glabel func_80249380 .L8024961C: /* 169E7C 8024961C 00821025 */ or $v0, $a0, $v0 /* 169E80 80249620 ACA20014 */ sw $v0, 0x14($a1) -/* 169E84 80249624 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 169E88 80249628 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 169E84 80249624 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 169E88 80249628 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 169E8C 8024962C 8CA40000 */ lw $a0, ($a1) /* 169E90 80249630 3C02E700 */ lui $v0, 0xe700 /* 169E94 80249634 0080182D */ daddu $v1, $a0, $zero @@ -215,8 +215,8 @@ glabel func_80249380 /* 169F00 802496A0 080925EB */ j .L802497AC /* 169F04 802496A4 AC83000C */ sw $v1, 0xc($a0) .L802496A8: -/* 169F08 802496A8 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 169F0C 802496AC 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 169F08 802496A8 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 169F0C 802496AC 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 169F10 802496B0 00123043 */ sra $a2, $s2, 1 /* 169F14 802496B4 24C2FFFF */ addiu $v0, $a2, -1 /* 169F18 802496B8 30420FFF */ andi $v0, $v0, 0xfff @@ -297,8 +297,8 @@ glabel func_80249380 /* 16A040 802497E0 26460002 */ addiu $a2, $s2, 2 /* 16A044 802497E4 02A63021 */ addu $a2, $s5, $a2 /* 16A048 802497E8 00063080 */ sll $a2, $a2, 2 -/* 16A04C 802497EC 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 16A050 802497F0 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 16A04C 802497EC 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 16A050 802497F0 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 16A054 802497F4 26670002 */ addiu $a3, $s3, 2 /* 16A058 802497F8 02C73821 */ addu $a3, $s6, $a3 /* 16A05C 802497FC 8E020000 */ lw $v0, ($s0) @@ -354,8 +354,8 @@ glabel func_80249380 /* 16A120 802498C0 AFA2001C */ sw $v0, 0x1c($sp) /* 16A124 802498C4 0C090AE8 */ jal pause_set_cursor_opacity /* 16A128 802498C8 AFA20020 */ sw $v0, 0x20($sp) -/* 16A12C 802498CC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 16A130 802498D0 8C63A66C */ lw $v1, %lo(D_8009A66C)($v1) +/* 16A12C 802498CC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 16A130 802498D0 8C63A66C */ lw $v1, %lo(gMasterGfxPos)($v1) /* 16A134 802498D4 3C018025 */ lui $at, %hi(D_8024B7C8) /* 16A138 802498D8 AC23B7C8 */ sw $v1, %lo(D_8024B7C8)($at) /* 16A13C 802498DC 08092655 */ j .L80249954 @@ -373,7 +373,7 @@ glabel func_80249380 /* 16A164 80249904 1122000A */ beq $t1, $v0, .L80249930 /* 16A168 80249908 0000102D */ daddu $v0, $zero, $zero /* 16A16C 8024990C 08092655 */ j .L80249954 -/* 16A170 80249910 00000000 */ nop +/* 16A170 80249910 00000000 */ nop .L80249914: /* 16A174 80249914 240200F5 */ addiu $v0, $zero, 0xf5 /* 16A178 80249918 11220009 */ beq $t1, $v0, .L80249940 @@ -381,7 +381,7 @@ glabel func_80249380 /* 16A180 80249920 11220009 */ beq $t1, $v0, .L80249948 /* 16A184 80249924 0000102D */ daddu $v0, $zero, $zero /* 16A188 80249928 08092655 */ j .L80249954 -/* 16A18C 8024992C 00000000 */ nop +/* 16A18C 8024992C 00000000 */ nop .L80249930: /* 16A190 80249930 08092654 */ j .L80249950 /* 16A194 80249934 ACA00000 */ sw $zero, ($a1) diff --git a/asm/nonmatchings/code_16c8e0/func_8023F088.s b/asm/nonmatchings/code_16c8e0/func_8023F088.s index 22bce7f464..452ac0cc6b 100644 --- a/asm/nonmatchings/code_16c8e0/func_8023F088.s +++ b/asm/nonmatchings/code_16c8e0/func_8023F088.s @@ -28,7 +28,7 @@ glabel func_8023F088 /* 16D9C4 8023F0E4 0C099EF7 */ jal hide_foreground_models_unsafe /* 16D9C8 8023F0E8 0044B821 */ addu $s7, $v0, $a0 /* 16D9CC 8023F0EC 0C046EE9 */ jal is_world_fog_enabled -/* 16D9D0 8023F0F0 00000000 */ nop +/* 16D9D0 8023F0F0 00000000 */ nop /* 16D9D4 8023F0F4 10400043 */ beqz $v0, .L8023F204 /* 16D9D8 8023F0F8 27A40010 */ addiu $a0, $sp, 0x10 /* 16D9DC 8023F0FC 24140001 */ addiu $s4, $zero, 1 @@ -59,7 +59,7 @@ glabel func_8023F088 /* 16DA3C 8023F15C 0641FFFD */ bgez $s2, .L8023F154 /* 16DA40 8023F160 2442FFFE */ addiu $v0, $v0, -2 /* 16DA44 8023F164 0808FC81 */ j .L8023F204 -/* 16DA48 8023F168 00000000 */ nop +/* 16DA48 8023F168 00000000 */ nop .L8023F16C: /* 16DA4C 8023F16C 3C13802A */ lui $s3, %hi(D_8029F038) /* 16DA50 8023F170 2673F038 */ addiu $s3, $s3, %lo(D_8029F038) @@ -119,8 +119,8 @@ glabel func_8023F088 /* 16DB20 8023F240 3C06E200 */ lui $a2, 0xe200 /* 16DB24 8023F244 34C6001C */ ori $a2, $a2, 0x1c /* 16DB28 8023F248 3C07E300 */ lui $a3, 0xe300 -/* 16DB2C 8023F24C 3C0B800A */ lui $t3, %hi(D_8009A66C) -/* 16DB30 8023F250 256BA66C */ addiu $t3, $t3, %lo(D_8009A66C) +/* 16DB2C 8023F24C 3C0B800A */ lui $t3, %hi(gMasterGfxPos) +/* 16DB30 8023F250 256BA66C */ addiu $t3, $t3, %lo(gMasterGfxPos) /* 16DB34 8023F254 34E71201 */ ori $a3, $a3, 0x1201 /* 16DB38 8023F258 3C0CE700 */ lui $t4, 0xe700 /* 16DB3C 8023F25C 8D6A0000 */ lw $t2, ($t3) @@ -157,27 +157,27 @@ glabel func_8023F088 /* 16DBB8 8023F2D8 25430028 */ addiu $v1, $t2, 0x28 /* 16DBBC 8023F2DC AD630000 */ sw $v1, ($t3) /* 16DBC0 8023F2E0 44821000 */ mtc1 $v0, $f2 -/* 16DBC4 8023F2E4 00000000 */ nop +/* 16DBC4 8023F2E4 00000000 */ nop /* 16DBC8 8023F2E8 468010A0 */ cvt.s.w $f2, $f2 /* 16DBCC 8023F2EC 46041082 */ mul.s $f2, $f2, $f4 -/* 16DBD0 8023F2F0 00000000 */ nop +/* 16DBD0 8023F2F0 00000000 */ nop /* 16DBD4 8023F2F4 25430030 */ addiu $v1, $t2, 0x30 /* 16DBD8 8023F2F8 86E20010 */ lh $v0, 0x10($s7) /* 16DBDC 8023F2FC 3C04ED00 */ lui $a0, 0xed00 /* 16DBE0 8023F300 44820000 */ mtc1 $v0, $f0 -/* 16DBE4 8023F304 00000000 */ nop +/* 16DBE4 8023F304 00000000 */ nop /* 16DBE8 8023F308 46800020 */ cvt.s.w $f0, $f0 /* 16DBEC 8023F30C 46040002 */ mul.s $f0, $f0, $f4 -/* 16DBF0 8023F310 00000000 */ nop +/* 16DBF0 8023F310 00000000 */ nop /* 16DBF4 8023F314 AD630000 */ sw $v1, ($t3) /* 16DBF8 8023F318 4600118D */ trunc.w.s $f6, $f2 /* 16DBFC 8023F31C 44023000 */ mfc1 $v0, $f6 -/* 16DC00 8023F320 00000000 */ nop +/* 16DC00 8023F320 00000000 */ nop /* 16DC04 8023F324 30420FFF */ andi $v0, $v0, 0xfff /* 16DC08 8023F328 00021300 */ sll $v0, $v0, 0xc /* 16DC0C 8023F32C 4600018D */ trunc.w.s $f6, $f0 /* 16DC10 8023F330 44033000 */ mfc1 $v1, $f6 -/* 16DC14 8023F334 00000000 */ nop +/* 16DC14 8023F334 00000000 */ nop /* 16DC18 8023F338 30630FFF */ andi $v1, $v1, 0xfff /* 16DC1C 8023F33C 00641825 */ or $v1, $v1, $a0 /* 16DC20 8023F340 00431025 */ or $v0, $v0, $v1 @@ -190,29 +190,29 @@ glabel func_8023F088 /* 16DC3C 8023F35C 00441021 */ addu $v0, $v0, $a0 /* 16DC40 8023F360 2442FFFF */ addiu $v0, $v0, -1 /* 16DC44 8023F364 44821000 */ mtc1 $v0, $f2 -/* 16DC48 8023F368 00000000 */ nop +/* 16DC48 8023F368 00000000 */ nop /* 16DC4C 8023F36C 468010A0 */ cvt.s.w $f2, $f2 /* 16DC50 8023F370 25440040 */ addiu $a0, $t2, 0x40 /* 16DC54 8023F374 86E20010 */ lh $v0, 0x10($s7) /* 16DC58 8023F378 46041082 */ mul.s $f2, $f2, $f4 -/* 16DC5C 8023F37C 00000000 */ nop +/* 16DC5C 8023F37C 00000000 */ nop /* 16DC60 8023F380 AD640000 */ sw $a0, ($t3) /* 16DC64 8023F384 00431021 */ addu $v0, $v0, $v1 /* 16DC68 8023F388 2442FFFF */ addiu $v0, $v0, -1 /* 16DC6C 8023F38C 44820000 */ mtc1 $v0, $f0 -/* 16DC70 8023F390 00000000 */ nop +/* 16DC70 8023F390 00000000 */ nop /* 16DC74 8023F394 46800020 */ cvt.s.w $f0, $f0 /* 16DC78 8023F398 46040002 */ mul.s $f0, $f0, $f4 -/* 16DC7C 8023F39C 00000000 */ nop +/* 16DC7C 8023F39C 00000000 */ nop /* 16DC80 8023F3A0 AD4C0038 */ sw $t4, 0x38($t2) /* 16DC84 8023F3A4 4600118D */ trunc.w.s $f6, $f2 /* 16DC88 8023F3A8 44023000 */ mfc1 $v0, $f6 -/* 16DC8C 8023F3AC 00000000 */ nop +/* 16DC8C 8023F3AC 00000000 */ nop /* 16DC90 8023F3B0 30420FFF */ andi $v0, $v0, 0xfff /* 16DC94 8023F3B4 00021300 */ sll $v0, $v0, 0xc /* 16DC98 8023F3B8 4600018D */ trunc.w.s $f6, $f0 /* 16DC9C 8023F3BC 44033000 */ mfc1 $v1, $f6 -/* 16DCA0 8023F3C0 00000000 */ nop +/* 16DCA0 8023F3C0 00000000 */ nop /* 16DCA4 8023F3C4 30630FFF */ andi $v1, $v1, 0xfff /* 16DCA8 8023F3C8 00431025 */ or $v0, $v0, $v1 /* 16DCAC 8023F3CC AD420034 */ sw $v0, 0x34($t2) @@ -302,7 +302,7 @@ glabel func_8023F088 /* 16DDF0 8023F510 15C10004 */ bne $t6, $at, .L8023F524 /* 16DDF4 8023F514 3C018000 */ lui $at, 0x8000 /* 16DDF8 8023F518 14410002 */ bne $v0, $at, .L8023F524 -/* 16DDFC 8023F51C 00000000 */ nop +/* 16DDFC 8023F51C 00000000 */ nop /* 16DE00 8023F520 0006000D */ break 6 .L8023F524: /* 16DE04 8023F524 00006812 */ mflo $t5 @@ -315,7 +315,7 @@ glabel func_8023F088 /* 16DE1C 8023F53C 15A10004 */ bne $t5, $at, .L8023F550 /* 16DE20 8023F540 3C018000 */ lui $at, 0x8000 /* 16DE24 8023F544 14610002 */ bne $v1, $at, .L8023F550 -/* 16DE28 8023F548 00000000 */ nop +/* 16DE28 8023F548 00000000 */ nop /* 16DE2C 8023F54C 0006000D */ break 6 .L8023F550: /* 16DE30 8023F550 0000B012 */ mflo $s6 @@ -327,8 +327,8 @@ glabel func_8023F088 /* 16DE48 8023F568 86F90010 */ lh $t9, 0x10($s7) /* 16DE4C 8023F56C 1AC0008F */ blez $s6, .L8023F7AC /* 16DE50 8023F570 0000902D */ daddu $s2, $zero, $zero -/* 16DE54 8023F574 3C0A800A */ lui $t2, %hi(D_8009A66C) -/* 16DE58 8023F578 254AA66C */ addiu $t2, $t2, %lo(D_8009A66C) +/* 16DE54 8023F574 3C0A800A */ lui $t2, %hi(gMasterGfxPos) +/* 16DE58 8023F578 254AA66C */ addiu $t2, $t2, %lo(gMasterGfxPos) /* 16DE5C 8023F57C 25C2FFFF */ addiu $v0, $t6, -1 /* 16DE60 8023F580 30420FFF */ andi $v0, $v0, 0xfff /* 16DE64 8023F584 3C03FD48 */ lui $v1, 0xfd48 @@ -497,8 +497,8 @@ glabel func_8023F088 /* 16E0E0 8023F800 3C090049 */ lui $t1, 0x49 /* 16E0E4 8023F804 3529C000 */ ori $t1, $t1, 0xc000 /* 16E0E8 8023F808 3C0A1000 */ lui $t2, 0x1000 -/* 16E0EC 8023F80C 3C07800A */ lui $a3, %hi(D_8009A66C) -/* 16E0F0 8023F810 24E7A66C */ addiu $a3, $a3, %lo(D_8009A66C) +/* 16E0EC 8023F80C 3C07800A */ lui $a3, %hi(gMasterGfxPos) +/* 16E0F0 8023F810 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) /* 16E0F4 8023F814 354A0400 */ ori $t2, $t2, 0x400 /* 16E0F8 8023F818 25C2FFFF */ addiu $v0, $t6, -1 /* 16E0FC 8023F81C 30420FFF */ andi $v0, $v0, 0xfff @@ -654,8 +654,8 @@ glabel func_8023F088 /* 16E350 8023FA70 37180014 */ ori $t8, $t8, 0x14 /* 16E354 8023FA74 3C19DB04 */ lui $t9, 0xdb04 /* 16E358 8023FA78 3739001C */ ori $t9, $t9, 0x1c -/* 16E35C 8023FA7C 3C1E800A */ lui $fp, %hi(D_8009A66C) -/* 16E360 8023FA80 27DEA66C */ addiu $fp, $fp, %lo(D_8009A66C) +/* 16E35C 8023FA7C 3C1E800A */ lui $fp, %hi(gMasterGfxPos) +/* 16E360 8023FA80 27DEA66C */ addiu $fp, $fp, %lo(gMasterGfxPos) /* 16E364 8023FA84 3C16FF10 */ lui $s6, 0xff10 /* 16E368 8023FA88 36D6013F */ ori $s6, $s6, 0x13f /* 16E36C 8023FA8C AFB50048 */ sw $s5, 0x48($sp) @@ -692,27 +692,27 @@ glabel func_8023F088 /* 16E3E8 8023FB08 86E2000E */ lh $v0, 0xe($s7) /* 16E3EC 8023FB0C 86E30010 */ lh $v1, 0x10($s7) /* 16E3F0 8023FB10 44821000 */ mtc1 $v0, $f2 -/* 16E3F4 8023FB14 00000000 */ nop +/* 16E3F4 8023FB14 00000000 */ nop /* 16E3F8 8023FB18 468010A0 */ cvt.s.w $f2, $f2 /* 16E3FC 8023FB1C 46041082 */ mul.s $f2, $f2, $f4 -/* 16E400 8023FB20 00000000 */ nop +/* 16E400 8023FB20 00000000 */ nop /* 16E404 8023FB24 26020030 */ addiu $v0, $s0, 0x30 /* 16E408 8023FB28 44830000 */ mtc1 $v1, $f0 -/* 16E40C 8023FB2C 00000000 */ nop +/* 16E40C 8023FB2C 00000000 */ nop /* 16E410 8023FB30 46800020 */ cvt.s.w $f0, $f0 /* 16E414 8023FB34 AFC20000 */ sw $v0, ($fp) /* 16E418 8023FB38 26020038 */ addiu $v0, $s0, 0x38 /* 16E41C 8023FB3C 46040002 */ mul.s $f0, $f0, $f4 -/* 16E420 8023FB40 00000000 */ nop +/* 16E420 8023FB40 00000000 */ nop /* 16E424 8023FB44 AFC20000 */ sw $v0, ($fp) /* 16E428 8023FB48 4600118D */ trunc.w.s $f6, $f2 /* 16E42C 8023FB4C 44023000 */ mfc1 $v0, $f6 -/* 16E430 8023FB50 00000000 */ nop +/* 16E430 8023FB50 00000000 */ nop /* 16E434 8023FB54 30420FFF */ andi $v0, $v0, 0xfff /* 16E438 8023FB58 00021300 */ sll $v0, $v0, 0xc /* 16E43C 8023FB5C 4600018D */ trunc.w.s $f6, $f0 /* 16E440 8023FB60 44033000 */ mfc1 $v1, $f6 -/* 16E444 8023FB64 00000000 */ nop +/* 16E444 8023FB64 00000000 */ nop /* 16E448 8023FB68 30630FFF */ andi $v1, $v1, 0xfff /* 16E44C 8023FB6C 00641825 */ or $v1, $v1, $a0 /* 16E450 8023FB70 00431025 */ or $v0, $v0, $v1 @@ -727,27 +727,27 @@ glabel func_8023F088 /* 16E474 8023FB94 AE00002C */ sw $zero, 0x2c($s0) /* 16E478 8023FB98 00651821 */ addu $v1, $v1, $a1 /* 16E47C 8023FB9C 44831000 */ mtc1 $v1, $f2 -/* 16E480 8023FBA0 00000000 */ nop +/* 16E480 8023FBA0 00000000 */ nop /* 16E484 8023FBA4 468010A0 */ cvt.s.w $f2, $f2 /* 16E488 8023FBA8 46041082 */ mul.s $f2, $f2, $f4 -/* 16E48C 8023FBAC 00000000 */ nop +/* 16E48C 8023FBAC 00000000 */ nop /* 16E490 8023FBB0 AE080030 */ sw $t0, 0x30($s0) /* 16E494 8023FBB4 AE000034 */ sw $zero, 0x34($s0) /* 16E498 8023FBB8 00862021 */ addu $a0, $a0, $a2 /* 16E49C 8023FBBC 44840000 */ mtc1 $a0, $f0 -/* 16E4A0 8023FBC0 00000000 */ nop +/* 16E4A0 8023FBC0 00000000 */ nop /* 16E4A4 8023FBC4 46800020 */ cvt.s.w $f0, $f0 /* 16E4A8 8023FBC8 46040002 */ mul.s $f0, $f0, $f4 -/* 16E4AC 8023FBCC 00000000 */ nop +/* 16E4AC 8023FBCC 00000000 */ nop /* 16E4B0 8023FBD0 AE090038 */ sw $t1, 0x38($s0) /* 16E4B4 8023FBD4 4600118D */ trunc.w.s $f6, $f2 /* 16E4B8 8023FBD8 44023000 */ mfc1 $v0, $f6 -/* 16E4BC 8023FBDC 00000000 */ nop +/* 16E4BC 8023FBDC 00000000 */ nop /* 16E4C0 8023FBE0 30420FFF */ andi $v0, $v0, 0xfff /* 16E4C4 8023FBE4 00021300 */ sll $v0, $v0, 0xc /* 16E4C8 8023FBE8 4600018D */ trunc.w.s $f6, $f0 /* 16E4CC 8023FBEC 44033000 */ mfc1 $v1, $f6 -/* 16E4D0 8023FBF0 00000000 */ nop +/* 16E4D0 8023FBF0 00000000 */ nop /* 16E4D4 8023FBF4 30630FFF */ andi $v1, $v1, 0xfff /* 16E4D8 8023FBF8 00431025 */ or $v0, $v0, $v1 /* 16E4DC 8023FBFC AE020024 */ sw $v0, 0x24($s0) @@ -932,8 +932,8 @@ glabel func_8023F088 .L8023FEC8: /* 16E7A8 8023FEC8 3C10800A */ lui $s0, %hi(D_8009A634) /* 16E7AC 8023FECC 2610A634 */ addiu $s0, $s0, %lo(D_8009A634) -/* 16E7B0 8023FED0 3C11800A */ lui $s1, %hi(D_8009A674) -/* 16E7B4 8023FED4 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 16E7B0 8023FED0 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 16E7B4 8023FED4 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 16E7B8 8023FED8 8FC30000 */ lw $v1, ($fp) /* 16E7BC 8023FEDC 86050000 */ lh $a1, ($s0) /* 16E7C0 8023FEE0 8E220000 */ lw $v0, ($s1) diff --git a/asm/nonmatchings/code_17D6A0/func_8024F768.s b/asm/nonmatchings/code_17D6A0/func_8024F768.s index 07e05454e3..9708501032 100644 --- a/asm/nonmatchings/code_17D6A0/func_8024F768.s +++ b/asm/nonmatchings/code_17D6A0/func_8024F768.s @@ -8,8 +8,8 @@ glabel func_8024F768 /* 17E054 8024F774 2407000A */ addiu $a3, $zero, 0xa .L8024F778: /* 17E058 8024F778 3C056666 */ lui $a1, 0x6666 -/* 17E05C 8024F77C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 17E060 8024F780 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 17E05C 8024F77C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 17E060 8024F780 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 17E064 8024F784 34A56667 */ ori $a1, $a1, 0x6667 /* 17E068 8024F788 00071A00 */ sll $v1, $a3, 8 /* 17E06C 8024F78C 00671823 */ subu $v1, $v1, $a3 diff --git a/asm/nonmatchings/code_190B20/func_8026787C.s b/asm/nonmatchings/code_190B20/func_8026787C.s index e8185a6e04..4437e47c8d 100644 --- a/asm/nonmatchings/code_190B20/func_8026787C.s +++ b/asm/nonmatchings/code_190B20/func_8026787C.s @@ -6,8 +6,8 @@ glabel func_8026787C /* 196160 80267880 0080602D */ daddu $t4, $a0, $zero /* 196164 80267884 00A0682D */ daddu $t5, $a1, $zero /* 196168 80267888 00E0582D */ daddu $t3, $a3, $zero -/* 19616C 8026788C 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 196170 80267890 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 19616C 8026788C 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 196170 80267890 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 196174 80267894 3C02E700 */ lui $v0, 0xe700 /* 196178 80267898 AFB00000 */ sw $s0, ($sp) /* 19617C 8026789C 8D070000 */ lw $a3, ($t0) @@ -65,8 +65,8 @@ glabel func_8026787C /* 196244 80267964 3C0AFCFF */ lui $t2, 0xfcff /* 196248 80267968 354AFFFF */ ori $t2, $t2, 0xffff /* 19624C 8026796C 3C08FFFC */ lui $t0, 0xfffc -/* 196250 80267970 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 196254 80267974 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 196250 80267970 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 196254 80267974 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 196258 80267978 3508F279 */ ori $t0, $t0, 0xf279 /* 19625C 8026797C 3C02FA00 */ lui $v0, 0xfa00 /* 196260 80267980 8CC50000 */ lw $a1, ($a2) diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_800269EC.s b/asm/nonmatchings/code_1b40_len_20b0/func_800269EC.s index 32249c8396..ef6c89865e 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_800269EC.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_800269EC.s @@ -7,15 +7,15 @@ glabel func_800269EC /* 1DF4 800269F4 3C120001 */ lui $s2, 1 /* 1DF8 800269F8 36520630 */ ori $s2, $s2, 0x630 /* 1DFC 800269FC AFB10014 */ sw $s1, 0x14($sp) -/* 1E00 80026A00 3C11800A */ lui $s1, %hi(D_8009A674) -/* 1E04 80026A04 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) -/* 1E08 80026A08 3C048007 */ lui $a0, %hi(D_800741F4) -/* 1E0C 80026A0C 8C8441F4 */ lw $a0, %lo(D_800741F4)($a0) +/* 1E00 80026A00 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 1E04 80026A04 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) +/* 1E08 80026A08 3C048007 */ lui $a0, %hi(gCurrentDisplayContextIndex) +/* 1E0C 80026A0C 8C8441F4 */ lw $a0, %lo(gCurrentDisplayContextIndex)($a0) /* 1E10 80026A10 3C058016 */ lui $a1, %hi(D_80164000) /* 1E14 80026A14 24A54000 */ addiu $a1, $a1, %lo(D_80164000) /* 1E18 80026A18 AFB00010 */ sw $s0, 0x10($sp) -/* 1E1C 80026A1C 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 1E20 80026A20 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 1E1C 80026A1C 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 1E20 80026A20 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 1E24 80026A24 AFBF001C */ sw $ra, 0x1c($sp) /* 1E28 80026A28 00041040 */ sll $v0, $a0, 1 /* 1E2C 80026A2C 00441021 */ addu $v0, $v0, $a0 @@ -32,7 +32,7 @@ glabel func_800269EC /* 1E58 80026A58 0C009C68 */ jal func_800271A0 /* 1E5C 80026A5C AE020000 */ sw $v0, ($s0) /* 1E60 80026A60 0C009F84 */ jal func_80027E10 -/* 1E64 80026A64 00000000 */ nop +/* 1E64 80026A64 00000000 */ nop /* 1E68 80026A68 8E030000 */ lw $v1, ($s0) /* 1E6C 80026A6C 3C02E900 */ lui $v0, 0xe900 /* 1E70 80026A70 0060202D */ daddu $a0, $v1, $zero @@ -54,15 +54,15 @@ glabel func_800269EC /* 1EB0 80026AB0 3C040001 */ lui $a0, 1 .L80026AB4: /* 1EB4 80026AB4 08009AAD */ j .L80026AB4 -/* 1EB8 80026AB8 00000000 */ nop +/* 1EB8 80026AB8 00000000 */ nop .L80026ABC: /* 1EBC 80026ABC 34840630 */ ori $a0, $a0, 0x630 /* 1EC0 80026AC0 0000302D */ daddu $a2, $zero, $zero /* 1EC4 80026AC4 00C0382D */ daddu $a3, $a2, $zero -/* 1EC8 80026AC8 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 1ECC 80026ACC 8CA5A66C */ lw $a1, %lo(D_8009A66C)($a1) -/* 1ED0 80026AD0 3C02800A */ lui $v0, %hi(D_8009A674) -/* 1ED4 80026AD4 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 1EC8 80026AC8 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 1ECC 80026ACC 8CA5A66C */ lw $a1, %lo(gMasterGfxPos)($a1) +/* 1ED0 80026AD0 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 1ED4 80026AD4 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 1ED8 80026AD8 00A42823 */ subu $a1, $a1, $a0 /* 1EDC 80026ADC 00A22823 */ subu $a1, $a1, $v0 /* 1EE0 80026AE0 000528C3 */ sra $a1, $a1, 3 diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_800271A0.s b/asm/nonmatchings/code_1b40_len_20b0/func_800271A0.s index 31fd5cc68e..6a1d3447c9 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_800271A0.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_800271A0.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_800271A0 -/* 25A0 800271A0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 25A4 800271A4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 25A0 800271A0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 25A4 800271A4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 25A8 800271A8 8C830000 */ lw $v1, ($a0) /* 25AC 800271AC 3C02DB06 */ lui $v0, 0xdb06 /* 25B0 800271B0 0060282D */ daddu $a1, $v1, $zero diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_80027BAC.s b/asm/nonmatchings/code_1b40_len_20b0/func_80027BAC.s index 3748dee331..2d53f37aab 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_80027BAC.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_80027BAC.s @@ -18,8 +18,8 @@ glabel func_80027BAC /* 2FE0 80027BE0 3C0CE300 */ lui $t4, 0xe300 /* 2FE4 80027BE4 358C1201 */ ori $t4, $t4, 0x1201 /* 2FE8 80027BE8 0000C82D */ daddu $t9, $zero, $zero -/* 2FEC 80027BEC 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 2FF0 80027BF0 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 2FEC 80027BEC 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 2FF0 80027BF0 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 2FF4 80027BF4 0040682D */ daddu $t5, $v0, $zero /* 2FF8 80027BF8 AFB5001C */ sw $s5, 0x1c($sp) /* 2FFC 80027BFC 3C15FD10 */ lui $s5, 0xfd10 diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s b/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s index 7045791ae0..25f79c3a57 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s @@ -4,8 +4,8 @@ glabel func_80027E10 /* 3210 80027E10 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 3214 80027E14 3C040050 */ lui $a0, 0x50 -/* 3218 80027E18 3C0C800A */ lui $t4, %hi(D_8009A66C) -/* 321C 80027E1C 258CA66C */ addiu $t4, $t4, %lo(D_8009A66C) +/* 3218 80027E18 3C0C800A */ lui $t4, %hi(gMasterGfxPos) +/* 321C 80027E1C 258CA66C */ addiu $t4, $t4, %lo(gMasterGfxPos) /* 3220 80027E20 348403C0 */ ori $a0, $a0, 0x3c0 /* 3224 80027E24 3C02ED00 */ lui $v0, 0xed00 /* 3228 80027E28 AFBF0044 */ sw $ra, 0x44($sp) @@ -49,13 +49,13 @@ glabel func_80027E10 /* 32C0 80027EC0 10620008 */ beq $v1, $v0, .L80027EE4 /* 32C4 80027EC4 3C03FF10 */ lui $v1, 0xff10 /* 32C8 80027EC8 0800A0CB */ j .L8002832C -/* 32CC 80027ECC 00000000 */ nop +/* 32CC 80027ECC 00000000 */ nop .L80027ED0: /* 32D0 80027ED0 24020030 */ addiu $v0, $zero, 0x30 /* 32D4 80027ED4 10620053 */ beq $v1, $v0, .L80028024 -/* 32D8 80027ED8 00000000 */ nop +/* 32D8 80027ED8 00000000 */ nop /* 32DC 80027EDC 0800A0CB */ j .L8002832C -/* 32E0 80027EE0 00000000 */ nop +/* 32E0 80027EE0 00000000 */ nop .L80027EE4: /* 32E4 80027EE4 3463013F */ ori $v1, $v1, 0x13f /* 32E8 80027EE8 3C06E300 */ lui $a2, 0xe300 @@ -176,8 +176,8 @@ glabel func_80027E10 /* 34A8 800280A8 3C10E300 */ lui $s0, 0xe300 /* 34AC 800280AC 36101201 */ ori $s0, $s0, 0x1201 /* 34B0 800280B0 0000C82D */ daddu $t9, $zero, $zero -/* 34B4 800280B4 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 34B8 800280B8 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 34B4 800280B4 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 34B8 800280B8 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 34BC 800280BC 0040902D */ daddu $s2, $v0, $zero /* 34C0 800280C0 AFAE0018 */ sw $t6, 0x18($sp) /* 34C4 800280C4 3C0EFD10 */ lui $t6, 0xfd10 @@ -334,7 +334,7 @@ glabel func_80027E10 /* 371C 8002831C 1440FFBB */ bnez $v0, .L8002820C /* 3720 80028320 AC60004C */ sw $zero, 0x4c($v1) /* 3724 80028324 0800A1E4 */ j .L80028790 -/* 3728 80028328 00000000 */ nop +/* 3728 80028328 00000000 */ nop .L8002832C: /* 372C 8002832C 3C02800A */ lui $v0, %hi(D_8009A650) /* 3730 80028330 8C42A650 */ lw $v0, %lo(D_8009A650)($v0) @@ -342,8 +342,8 @@ glabel func_80027E10 /* 3738 80028338 1040000E */ beqz $v0, .L80028374 /* 373C 8002833C 3C05FF10 */ lui $a1, 0xff10 /* 3740 80028340 34A5013F */ ori $a1, $a1, 0x13f -/* 3744 80028344 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 3748 80028348 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 3744 80028344 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 3748 80028348 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 374C 8002834C 8C620000 */ lw $v0, ($v1) /* 3750 80028350 3C04800A */ lui $a0, %hi(D_8009A64C) /* 3754 80028354 8C84A64C */ lw $a0, %lo(D_8009A64C)($a0) @@ -365,8 +365,8 @@ glabel func_80027E10 /* 3790 80028390 3529FFFC */ ori $t1, $t1, 0xfffc /* 3794 80028394 3C0AF64F */ lui $t2, 0xf64f /* 3798 80028398 354AC3BC */ ori $t2, $t2, 0xc3bc -/* 379C 8002839C 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 37A0 800283A0 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 379C 8002839C 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 37A0 800283A0 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 37A4 800283A4 3C02FE00 */ lui $v0, 0xfe00 /* 37A8 800283A8 8E300000 */ lw $s0, ($s1) /* 37AC 800283AC 3C04800A */ lui $a0, %hi(D_8009A64C) @@ -497,8 +497,8 @@ glabel func_80027E10 /* 3970 80028570 30420001 */ andi $v0, $v0, 1 /* 3974 80028574 14400017 */ bnez $v0, .L800285D4 /* 3978 80028578 3C04F600 */ lui $a0, 0xf600 -/* 397C 8002857C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 3980 80028580 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 397C 8002857C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 3980 80028580 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 3984 80028584 8C620000 */ lw $v0, ($v1) /* 3988 80028588 0040282D */ daddu $a1, $v0, $zero /* 398C 8002858C 24420008 */ addiu $v0, $v0, 8 @@ -521,15 +521,15 @@ glabel func_80027E10 /* 39D0 800285D0 ACA30004 */ sw $v1, 4($a1) .L800285D4: /* 39D4 800285D4 0C0517B0 */ jal func_80145EC0 -/* 39D8 800285D8 00000000 */ nop +/* 39D8 800285D8 00000000 */ nop .L800285DC: /* 39DC 800285DC 3C04E300 */ lui $a0, 0xe300 /* 39E0 800285E0 34840A01 */ ori $a0, $a0, 0xa01 /* 39E4 800285E4 3C05E200 */ lui $a1, 0xe200 /* 39E8 800285E8 34A5001C */ ori $a1, $a1, 0x1c /* 39EC 800285EC 3C060001 */ lui $a2, 1 -/* 39F0 800285F0 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 39F4 800285F4 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 39F0 800285F0 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 39F4 800285F4 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 39F8 800285F8 34C60001 */ ori $a2, $a2, 1 /* 39FC 800285FC 8D070000 */ lw $a3, ($t0) /* 3A00 80028600 3C03E700 */ lui $v1, 0xe700 @@ -636,8 +636,8 @@ glabel func_80027E10 /* 3B88 80028788 AC600000 */ sw $zero, ($v1) /* 3B8C 8002878C AC600004 */ sw $zero, 4($v1) .L80028790: -/* 3B90 80028790 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 3B94 80028794 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 3B90 80028790 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 3B94 80028794 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 3B98 80028798 8C620000 */ lw $v0, ($v1) /* 3B9C 8002879C 0040202D */ daddu $a0, $v0, $zero /* 3BA0 800287A0 24420008 */ addiu $v0, $v0, 8 @@ -658,6 +658,6 @@ glabel func_80027E10 /* 3BD8 800287D8 8FB00020 */ lw $s0, 0x20($sp) /* 3BDC 800287DC 03E00008 */ jr $ra /* 3BE0 800287E0 27BD0048 */ addiu $sp, $sp, 0x48 -/* 3BE4 800287E4 00000000 */ nop -/* 3BE8 800287E8 00000000 */ nop -/* 3BEC 800287EC 00000000 */ nop +/* 3BE4 800287E4 00000000 */ nop +/* 3BE8 800287E8 00000000 */ nop +/* 3BEC 800287EC 00000000 */ nop diff --git a/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s b/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s index fa2c0ef42e..f6aedcc8eb 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s +++ b/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s @@ -3,24 +3,24 @@ glabel gfx_draw_frame /* 1F08 80026B08 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 1F0C 80026B0C 3C04800A */ lui $a0, %hi(D_8009A674) -/* 1F10 80026B10 8C84A674 */ lw $a0, %lo(D_8009A674)($a0) -/* 1F14 80026B14 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 1F18 80026B18 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 1F0C 80026B0C 3C04800A */ lui $a0, %hi(gDisplayContext) +/* 1F10 80026B10 8C84A674 */ lw $a0, %lo(gDisplayContext)($a0) +/* 1F14 80026B14 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 1F18 80026B18 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 1F1C 80026B1C AFB00010 */ sw $s0, 0x10($sp) /* 1F20 80026B20 3C10800A */ lui $s0, %hi(D_8009A650) /* 1F24 80026B24 2610A650 */ addiu $s0, $s0, %lo(D_8009A650) /* 1F28 80026B28 AFBF0018 */ sw $ra, 0x18($sp) /* 1F2C 80026B2C AFB10014 */ sw $s1, 0x14($sp) -/* 1F30 80026B30 3C018007 */ lui $at, %hi(D_800741F0) -/* 1F34 80026B34 A42041F0 */ sh $zero, %lo(D_800741F0)($at) +/* 1F30 80026B30 3C018007 */ lui $at, %hi(gMatrixListPos) +/* 1F34 80026B34 A42041F0 */ sh $zero, %lo(gMatrixListPos)($at) /* 1F38 80026B38 8E020000 */ lw $v0, ($s0) /* 1F3C 80026B3C 24830230 */ addiu $v1, $a0, 0x230 /* 1F40 80026B40 30420008 */ andi $v0, $v0, 8 /* 1F44 80026B44 10400007 */ beqz $v0, .L80026B64 /* 1F48 80026B48 ACA30000 */ sw $v1, ($a1) -/* 1F4C 80026B4C 3C038007 */ lui $v1, %hi(D_800741F4) -/* 1F50 80026B50 246341F4 */ addiu $v1, $v1, %lo(D_800741F4) +/* 1F4C 80026B4C 3C038007 */ lui $v1, %hi(gCurrentDisplayContextIndex) +/* 1F50 80026B50 246341F4 */ addiu $v1, $v1, %lo(gCurrentDisplayContextIndex) /* 1F54 80026B54 8C620000 */ lw $v0, ($v1) /* 1F58 80026B58 38420001 */ xori $v0, $v0, 1 /* 1F5C 80026B5C 08009B72 */ j .L80026DC8 @@ -38,31 +38,31 @@ glabel gfx_draw_frame /* 1F88 80026B88 8E020000 */ lw $v0, ($s0) /* 1F8C 80026B8C 30420002 */ andi $v0, $v0, 2 /* 1F90 80026B90 14400003 */ bnez $v0, .L80026BA0 -/* 1F94 80026B94 00000000 */ nop +/* 1F94 80026B94 00000000 */ nop /* 1F98 80026B98 0C00B5CF */ jal render_frame /* 1F9C 80026B9C 0000202D */ daddu $a0, $zero, $zero .L80026BA0: /* 1FA0 80026BA0 0C038098 */ jal func_800E0260 -/* 1FA4 80026BA4 00000000 */ nop +/* 1FA4 80026BA4 00000000 */ nop /* 1FA8 80026BA8 0C0B0FB9 */ jal func_802C3EE4 -/* 1FAC 80026BAC 00000000 */ nop +/* 1FAC 80026BAC 00000000 */ nop /* 1FB0 80026BB0 0C04E088 */ jal func_80138220 -/* 1FB4 80026BB4 00000000 */ nop +/* 1FB4 80026BB4 00000000 */ nop /* 1FB8 80026BB8 0C048D54 */ jal func_80123550 -/* 1FBC 80026BBC 00000000 */ nop +/* 1FBC 80026BBC 00000000 */ nop /* 1FC0 80026BC0 0C050884 */ jal func_80142210 -/* 1FC4 80026BC4 00000000 */ nop +/* 1FC4 80026BC4 00000000 */ nop /* 1FC8 80026BC8 0C0167E5 */ jal func_80059F94 -/* 1FCC 80026BCC 00000000 */ nop +/* 1FCC 80026BCC 00000000 */ nop /* 1FD0 80026BD0 0C044BD6 */ jal render_ui -/* 1FD4 80026BD4 00000000 */ nop +/* 1FD4 80026BD4 00000000 */ nop /* 1FD8 80026BD8 8E020000 */ lw $v0, ($s0) /* 1FDC 80026BDC 3C030001 */ lui $v1, 1 /* 1FE0 80026BE0 00431024 */ and $v0, $v0, $v1 /* 1FE4 80026BE4 14400003 */ bnez $v0, .L80026BF4 -/* 1FE8 80026BE8 00000000 */ nop +/* 1FE8 80026BE8 00000000 */ nop /* 1FEC 80026BEC 0C051EB1 */ jal func_80147AC4 -/* 1FF0 80026BF0 00000000 */ nop +/* 1FF0 80026BF0 00000000 */ nop .L80026BF4: /* 1FF4 80026BF4 8E020000 */ lw $v0, ($s0) /* 1FF8 80026BF8 30420002 */ andi $v0, $v0, 2 @@ -72,7 +72,7 @@ glabel gfx_draw_frame /* 2008 80026C08 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 200C 80026C0C 80420078 */ lb $v0, 0x78($v0) /* 2010 80026C10 14400004 */ bnez $v0, .L80026C24 -/* 2014 80026C14 00000000 */ nop +/* 2014 80026C14 00000000 */ nop /* 2018 80026C18 0C00B5CF */ jal render_frame /* 201C 80026C1C 24040001 */ addiu $a0, $zero, 1 /* 2020 80026C20 3C100010 */ lui $s0, 0x10 @@ -83,68 +83,68 @@ glabel gfx_draw_frame /* 2030 80026C30 36100010 */ ori $s0, $s0, 0x10 /* 2034 80026C34 00501024 */ and $v0, $v0, $s0 /* 2038 80026C38 14400003 */ bnez $v0, .L80026C48 -/* 203C 80026C3C 00000000 */ nop +/* 203C 80026C3C 00000000 */ nop /* 2040 80026C40 0C049081 */ jal render_messages -/* 2044 80026C44 00000000 */ nop +/* 2044 80026C44 00000000 */ nop .L80026C48: /* 2048 80026C48 0C048D38 */ jal func_801234E0 -/* 204C 80026C4C 00000000 */ nop +/* 204C 80026C4C 00000000 */ nop /* 2050 80026C50 0C0509C7 */ jal func_8014271C -/* 2054 80026C54 00000000 */ nop +/* 2054 80026C54 00000000 */ nop /* 2058 80026C58 0C04E068 */ jal func_801381A0 -/* 205C 80026C5C 00000000 */ nop +/* 205C 80026C5C 00000000 */ nop /* 2060 80026C60 8E220000 */ lw $v0, ($s1) /* 2064 80026C64 24030010 */ addiu $v1, $zero, 0x10 /* 2068 80026C68 00501024 */ and $v0, $v0, $s0 /* 206C 80026C6C 14430003 */ bne $v0, $v1, .L80026C7C -/* 2070 80026C70 00000000 */ nop +/* 2070 80026C70 00000000 */ nop /* 2074 80026C74 0C049081 */ jal render_messages -/* 2078 80026C78 00000000 */ nop +/* 2078 80026C78 00000000 */ nop .L80026C7C: /* 207C 80026C7C 0C00AEA0 */ jal render_curtains -/* 2080 80026C80 00000000 */ nop +/* 2080 80026C80 00000000 */ nop /* 2084 80026C84 8E220000 */ lw $v0, ($s1) /* 2088 80026C88 3C030010 */ lui $v1, 0x10 /* 208C 80026C8C 00431024 */ and $v0, $v0, $v1 /* 2090 80026C90 10400003 */ beqz $v0, .L80026CA0 -/* 2094 80026C94 00000000 */ nop +/* 2094 80026C94 00000000 */ nop /* 2098 80026C98 0C049081 */ jal render_messages -/* 209C 80026C9C 00000000 */ nop +/* 209C 80026C9C 00000000 */ nop .L80026CA0: /* 20A0 80026CA0 8E220000 */ lw $v0, ($s1) /* 20A4 80026CA4 3C030001 */ lui $v1, 1 /* 20A8 80026CA8 00431024 */ and $v0, $v0, $v1 /* 20AC 80026CAC 10400003 */ beqz $v0, .L80026CBC -/* 20B0 80026CB0 00000000 */ nop +/* 20B0 80026CB0 00000000 */ nop /* 20B4 80026CB4 0C051EB1 */ jal func_80147AC4 -/* 20B8 80026CB8 00000000 */ nop +/* 20B8 80026CB8 00000000 */ nop .L80026CBC: /* 20BC 80026CBC 0C044BF1 */ jal func_80112FC4 -/* 20C0 80026CC0 00000000 */ nop +/* 20C0 80026CC0 00000000 */ nop /* 20C4 80026CC4 8E220000 */ lw $v0, ($s1) /* 20C8 80026CC8 30420020 */ andi $v0, $v0, 0x20 /* 20CC 80026CCC 10400010 */ beqz $v0, .L80026D10 -/* 20D0 80026CD0 00000000 */ nop +/* 20D0 80026CD0 00000000 */ nop /* 20D4 80026CD4 3C038007 */ lui $v1, %hi(D_800741A2) /* 20D8 80026CD8 846341A2 */ lh $v1, %lo(D_800741A2)($v1) /* 20DC 80026CDC 28620002 */ slti $v0, $v1, 2 /* 20E0 80026CE0 1040000B */ beqz $v0, .L80026D10 -/* 20E4 80026CE4 00000000 */ nop +/* 20E4 80026CE4 00000000 */ nop /* 20E8 80026CE8 04600009 */ bltz $v1, .L80026D10 /* 20EC 80026CEC 24040007 */ addiu $a0, $zero, 7 /* 20F0 80026CF0 3C028007 */ lui $v0, %hi(D_800741A0) /* 20F4 80026CF4 844241A0 */ lh $v0, %lo(D_800741A0)($v0) /* 20F8 80026CF8 44820000 */ mtc1 $v0, $f0 -/* 20FC 80026CFC 00000000 */ nop +/* 20FC 80026CFC 00000000 */ nop /* 2100 80026D00 46800020 */ cvt.s.w $f0, $f0 /* 2104 80026D04 44050000 */ mfc1 $a1, $f0 /* 2108 80026D08 0C04DAA0 */ jal func_80136A80 /* 210C 80026D0C 0000302D */ daddu $a2, $zero, $zero .L80026D10: -/* 2110 80026D10 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 2114 80026D14 8C42A66C */ lw $v0, %lo(D_8009A66C)($v0) -/* 2118 80026D18 3C03800A */ lui $v1, %hi(D_8009A674) -/* 211C 80026D1C 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 2110 80026D10 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 2114 80026D14 8C42A66C */ lw $v0, %lo(gMasterGfxPos)($v0) +/* 2118 80026D18 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 211C 80026D1C 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 2120 80026D20 2442FDD0 */ addiu $v0, $v0, -0x230 /* 2124 80026D24 00431023 */ subu $v0, $v0, $v1 /* 2128 80026D28 000210C2 */ srl $v0, $v0, 3 @@ -153,15 +153,15 @@ glabel gfx_draw_frame /* 2134 80026D34 0000302D */ daddu $a2, $zero, $zero .L80026D38: /* 2138 80026D38 08009B4E */ j .L80026D38 -/* 213C 80026D3C 00000000 */ nop +/* 213C 80026D3C 00000000 */ nop .L80026D40: /* 2140 80026D40 3C070004 */ lui $a3, 4 -/* 2144 80026D44 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 2148 80026D48 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 2144 80026D44 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 2148 80026D48 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 214C 80026D4C 34E70001 */ ori $a3, $a3, 1 /* 2150 80026D50 8D030000 */ lw $v1, ($t0) -/* 2154 80026D54 3C02800A */ lui $v0, %hi(D_8009A674) -/* 2158 80026D58 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 2154 80026D54 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 2158 80026D58 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 215C 80026D5C 0060482D */ daddu $t1, $v1, $zero /* 2160 80026D60 24630008 */ addiu $v1, $v1, 8 /* 2164 80026D64 24440230 */ addiu $a0, $v0, 0x230 @@ -181,8 +181,8 @@ glabel gfx_draw_frame /* 219C 80026D9C AC600004 */ sw $zero, 4($v1) /* 21A0 80026DA0 24050140 */ addiu $a1, $zero, 0x140 /* 21A4 80026DA4 240600F0 */ addiu $a2, $zero, 0xf0 -/* 21A8 80026DA8 3C038007 */ lui $v1, %hi(D_800741F4) -/* 21AC 80026DAC 246341F4 */ addiu $v1, $v1, %lo(D_800741F4) +/* 21A8 80026DA8 3C038007 */ lui $v1, %hi(gCurrentDisplayContextIndex) +/* 21AC 80026DAC 246341F4 */ addiu $v1, $v1, %lo(gCurrentDisplayContextIndex) /* 21B0 80026DB0 8C620000 */ lw $v0, ($v1) /* 21B4 80026DB4 3C04800A */ lui $a0, %hi(D_8009A64C) /* 21B8 80026DB8 8C84A64C */ lw $a0, %lo(D_8009A64C)($a0) diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_800465E0.s b/asm/nonmatchings/code_20ec0_len_5040/func_800465E0.s index d1a3b53ba0..76223c61a0 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_800465E0.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_800465E0.s @@ -38,8 +38,8 @@ glabel func_800465E0 /* 21A64 80046664 27B6002C */ addiu $s6, $sp, 0x2c /* 21A68 80046668 AFB50054 */ sw $s5, 0x54($sp) /* 21A6C 8004666C 27B50030 */ addiu $s5, $sp, 0x30 -/* 21A70 80046670 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 21A74 80046674 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 21A70 80046670 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 21A74 80046674 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 21A78 80046678 3C06800B */ lui $a2, %hi(gCameras) /* 21A7C 8004667C 24C61D80 */ addiu $a2, $a2, %lo(gCameras) /* 21A80 80046680 AFBF0064 */ sw $ra, 0x64($sp) @@ -139,15 +139,15 @@ glabel func_800465E0 /* 21BF4 800467F4 0C051280 */ jal set_icon_flags /* 21BF8 800467F8 0300282D */ daddu $a1, $t8, $zero /* 21BFC 800467FC 08011A34 */ j .L800468D0 -/* 21C00 80046800 00000000 */ nop +/* 21C00 80046800 00000000 */ nop .L80046804: /* 21C04 80046804 14400006 */ bnez $v0, .L80046820 -/* 21C08 80046808 00000000 */ nop +/* 21C08 80046808 00000000 */ nop /* 21C0C 8004680C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 21C10 80046810 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 21C14 80046814 80420070 */ lb $v0, 0x70($v0) /* 21C18 80046818 105E002D */ beq $v0, $fp, .L800468D0 -/* 21C1C 8004681C 00000000 */ nop +/* 21C1C 8004681C 00000000 */ nop .L80046820: /* 21C20 80046820 8E24FF94 */ lw $a0, -0x6c($s1) /* 21C24 80046824 0C05128B */ jal clear_icon_flags @@ -197,16 +197,16 @@ glabel func_800465E0 /* 21CD0 800468D0 8222FF8F */ lb $v0, -0x71($s1) /* 21CD4 800468D4 24180002 */ addiu $t8, $zero, 2 /* 21CD8 800468D8 14580036 */ bne $v0, $t8, .L800469B4 -/* 21CDC 800468DC 00000000 */ nop +/* 21CDC 800468DC 00000000 */ nop /* 21CE0 800468E0 8E820000 */ lw $v0, ($s4) /* 21CE4 800468E4 00581024 */ and $v0, $v0, $t8 /* 21CE8 800468E8 14400006 */ bnez $v0, .L80046904 -/* 21CEC 800468EC 00000000 */ nop +/* 21CEC 800468EC 00000000 */ nop /* 21CF0 800468F0 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 21CF4 800468F4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 21CF8 800468F8 80420070 */ lb $v0, 0x70($v0) /* 21CFC 800468FC 105E002D */ beq $v0, $fp, .L800469B4 -/* 21D00 80046900 00000000 */ nop +/* 21D00 80046900 00000000 */ nop .L80046904: /* 21D04 80046904 8E24FF98 */ lw $a0, -0x68($s1) /* 21D08 80046908 0C05128B */ jal clear_icon_flags @@ -266,15 +266,15 @@ glabel func_800465E0 /* 21DD8 800469D8 0C051280 */ jal set_icon_flags /* 21DDC 800469DC 0300282D */ daddu $a1, $t8, $zero /* 21DE0 800469E0 08011AB4 */ j .L80046AD0 -/* 21DE4 800469E4 00000000 */ nop +/* 21DE4 800469E4 00000000 */ nop .L800469E8: /* 21DE8 800469E8 14400006 */ bnez $v0, .L80046A04 -/* 21DEC 800469EC 00000000 */ nop +/* 21DEC 800469EC 00000000 */ nop /* 21DF0 800469F0 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 21DF4 800469F4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 21DF8 800469F8 80420070 */ lb $v0, 0x70($v0) /* 21DFC 800469FC 105E0034 */ beq $v0, $fp, .L80046AD0 -/* 21E00 80046A00 00000000 */ nop +/* 21E00 80046A00 00000000 */ nop .L80046A04: /* 21E04 80046A04 8E24FFA4 */ lw $a0, -0x5c($s1) /* 21E08 80046A08 0C05128B */ jal clear_icon_flags @@ -295,7 +295,7 @@ glabel func_800465E0 /* 21E40 80046A40 46041080 */ add.s $f2, $f2, $f4 /* 21E44 80046A44 E7A00024 */ swc1 $f0, 0x24($sp) /* 21E48 80046A48 44820000 */ mtc1 $v0, $f0 -/* 21E4C 80046A4C 00000000 */ nop +/* 21E4C 80046A4C 00000000 */ nop /* 21E50 80046A50 46800020 */ cvt.s.w $f0, $f0 /* 21E54 80046A54 0C00A6C9 */ jal clamp_angle /* 21E58 80046A58 46001500 */ add.s $f20, $f2, $f0 @@ -332,16 +332,16 @@ glabel func_800465E0 /* 21ED0 80046AD0 8222FF9F */ lb $v0, -0x61($s1) /* 21ED4 80046AD4 24180002 */ addiu $t8, $zero, 2 /* 21ED8 80046AD8 1458003D */ bne $v0, $t8, .L80046BD0 -/* 21EDC 80046ADC 00000000 */ nop +/* 21EDC 80046ADC 00000000 */ nop /* 21EE0 80046AE0 8E820000 */ lw $v0, ($s4) /* 21EE4 80046AE4 00581024 */ and $v0, $v0, $t8 /* 21EE8 80046AE8 14400006 */ bnez $v0, .L80046B04 -/* 21EEC 80046AEC 00000000 */ nop +/* 21EEC 80046AEC 00000000 */ nop /* 21EF0 80046AF0 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 21EF4 80046AF4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 21EF8 80046AF8 80420070 */ lb $v0, 0x70($v0) /* 21EFC 80046AFC 105E0034 */ beq $v0, $fp, .L80046BD0 -/* 21F00 80046B00 00000000 */ nop +/* 21F00 80046B00 00000000 */ nop .L80046B04: /* 21F04 80046B04 8E24FFA8 */ lw $a0, -0x58($s1) /* 21F08 80046B08 0C05128B */ jal clear_icon_flags @@ -365,7 +365,7 @@ glabel func_800465E0 /* 21F48 80046B48 46041080 */ add.s $f2, $f2, $f4 /* 21F4C 80046B4C E7A00024 */ swc1 $f0, 0x24($sp) /* 21F50 80046B50 44820000 */ mtc1 $v0, $f0 -/* 21F54 80046B54 00000000 */ nop +/* 21F54 80046B54 00000000 */ nop /* 21F58 80046B58 46800020 */ cvt.s.w $f0, $f0 /* 21F5C 80046B5C 0C00A6C9 */ jal clamp_angle /* 21F60 80046B60 46001500 */ add.s $f20, $f2, $f0 @@ -409,15 +409,15 @@ glabel func_800465E0 /* 21FF4 80046BF4 0C051280 */ jal set_icon_flags /* 21FF8 80046BF8 0300282D */ daddu $a1, $t8, $zero /* 21FFC 80046BFC 08011B3D */ j .L80046CF4 -/* 22000 80046C00 00000000 */ nop +/* 22000 80046C00 00000000 */ nop .L80046C04: /* 22004 80046C04 14400006 */ bnez $v0, .L80046C20 -/* 22008 80046C08 00000000 */ nop +/* 22008 80046C08 00000000 */ nop /* 2200C 80046C0C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 22010 80046C10 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 22014 80046C14 80420070 */ lb $v0, 0x70($v0) /* 22018 80046C18 105E0036 */ beq $v0, $fp, .L80046CF4 -/* 2201C 80046C1C 00000000 */ nop +/* 2201C 80046C1C 00000000 */ nop .L80046C20: /* 22020 80046C20 8E24FFB4 */ lw $a0, -0x4c($s1) /* 22024 80046C24 0C05128B */ jal clear_icon_flags @@ -441,7 +441,7 @@ glabel func_800465E0 /* 22064 80046C64 46041080 */ add.s $f2, $f2, $f4 /* 22068 80046C68 E7A00024 */ swc1 $f0, 0x24($sp) /* 2206C 80046C6C 44820000 */ mtc1 $v0, $f0 -/* 22070 80046C70 00000000 */ nop +/* 22070 80046C70 00000000 */ nop /* 22074 80046C74 46800020 */ cvt.s.w $f0, $f0 /* 22078 80046C78 0C00A6C9 */ jal clamp_angle /* 2207C 80046C7C 46001500 */ add.s $f20, $f2, $f0 @@ -478,16 +478,16 @@ glabel func_800465E0 /* 220F4 80046CF4 8222FFAF */ lb $v0, -0x51($s1) /* 220F8 80046CF8 24180002 */ addiu $t8, $zero, 2 /* 220FC 80046CFC 1458003F */ bne $v0, $t8, .L80046DFC -/* 22100 80046D00 00000000 */ nop +/* 22100 80046D00 00000000 */ nop /* 22104 80046D04 8E820000 */ lw $v0, ($s4) /* 22108 80046D08 00581024 */ and $v0, $v0, $t8 /* 2210C 80046D0C 14400006 */ bnez $v0, .L80046D28 -/* 22110 80046D10 00000000 */ nop +/* 22110 80046D10 00000000 */ nop /* 22114 80046D14 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 22118 80046D18 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 2211C 80046D1C 80420070 */ lb $v0, 0x70($v0) /* 22120 80046D20 105E0036 */ beq $v0, $fp, .L80046DFC -/* 22124 80046D24 00000000 */ nop +/* 22124 80046D24 00000000 */ nop .L80046D28: /* 22128 80046D28 8E24FFB8 */ lw $a0, -0x48($s1) /* 2212C 80046D2C 0C05128B */ jal clear_icon_flags @@ -514,7 +514,7 @@ glabel func_800465E0 /* 22174 80046D74 46041080 */ add.s $f2, $f2, $f4 /* 22178 80046D78 E7A00024 */ swc1 $f0, 0x24($sp) /* 2217C 80046D7C 44820000 */ mtc1 $v0, $f0 -/* 22180 80046D80 00000000 */ nop +/* 22180 80046D80 00000000 */ nop /* 22184 80046D84 46800020 */ cvt.s.w $f0, $f0 /* 22188 80046D88 0C00A6C9 */ jal clamp_angle /* 2218C 80046D8C 46001500 */ add.s $f20, $f2, $f0 @@ -558,37 +558,37 @@ glabel func_800465E0 /* 22220 80046E20 0C051280 */ jal set_icon_flags /* 22224 80046E24 0300282D */ daddu $a1, $t8, $zero /* 22228 80046E28 08011BE9 */ j .L80046FA4 -/* 2222C 80046E2C 00000000 */ nop +/* 2222C 80046E2C 00000000 */ nop .L80046E30: /* 22230 80046E30 8E24FFD0 */ lw $a0, -0x30($s1) /* 22234 80046E34 0C051280 */ jal set_icon_flags /* 22238 80046E38 24050002 */ addiu $a1, $zero, 2 /* 2223C 80046E3C 08011C56 */ j .L80047158 -/* 22240 80046E40 00000000 */ nop +/* 22240 80046E40 00000000 */ nop .L80046E44: /* 22244 80046E44 8E24FFDC */ lw $a0, -0x24($s1) /* 22248 80046E48 0C051280 */ jal set_icon_flags /* 2224C 80046E4C 24050002 */ addiu $a1, $zero, 2 /* 22250 80046E50 08011CA1 */ j .L80047284 -/* 22254 80046E54 00000000 */ nop +/* 22254 80046E54 00000000 */ nop .L80046E58: /* 22258 80046E58 8E24FFE8 */ lw $a0, -0x18($s1) /* 2225C 80046E5C 0C051280 */ jal set_icon_flags /* 22260 80046E60 24050002 */ addiu $a1, $zero, 2 /* 22264 80046E64 08011CEC */ j .L800473B0 -/* 22268 80046E68 00000000 */ nop +/* 22268 80046E68 00000000 */ nop .L80046E6C: /* 2226C 80046E6C 8E24FFF0 */ lw $a0, -0x10($s1) /* 22270 80046E70 0C051280 */ jal set_icon_flags /* 22274 80046E74 24050002 */ addiu $a1, $zero, 2 /* 22278 80046E78 08011D17 */ j .L8004745C -/* 2227C 80046E7C 00000000 */ nop +/* 2227C 80046E7C 00000000 */ nop .L80046E80: /* 22280 80046E80 8E24FFF8 */ lw $a0, -8($s1) /* 22284 80046E84 0C051280 */ jal set_icon_flags /* 22288 80046E88 24050002 */ addiu $a1, $zero, 2 /* 2228C 80046E8C 08011D42 */ j .L80047508 -/* 22290 80046E90 00000000 */ nop +/* 22290 80046E90 00000000 */ nop .L80046E94: /* 22294 80046E94 8E240000 */ lw $a0, ($s1) /* 22298 80046E98 0C051280 */ jal set_icon_flags @@ -597,12 +597,12 @@ glabel func_800465E0 /* 222A4 80046EA4 263100B0 */ addiu $s1, $s1, 0xb0 .L80046EA8: /* 222A8 80046EA8 14400006 */ bnez $v0, .L80046EC4 -/* 222AC 80046EAC 00000000 */ nop +/* 222AC 80046EAC 00000000 */ nop /* 222B0 80046EB0 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 222B4 80046EB4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 222B8 80046EB8 80420070 */ lb $v0, 0x70($v0) /* 222BC 80046EBC 105E0039 */ beq $v0, $fp, .L80046FA4 -/* 222C0 80046EC0 00000000 */ nop +/* 222C0 80046EC0 00000000 */ nop .L80046EC4: /* 222C4 80046EC4 8E24FFC4 */ lw $a0, -0x3c($s1) /* 222C8 80046EC8 0C05128B */ jal clear_icon_flags @@ -630,7 +630,7 @@ glabel func_800465E0 /* 22314 80046F14 46041080 */ add.s $f2, $f2, $f4 /* 22318 80046F18 E7A00024 */ swc1 $f0, 0x24($sp) /* 2231C 80046F1C 44820000 */ mtc1 $v0, $f0 -/* 22320 80046F20 00000000 */ nop +/* 22320 80046F20 00000000 */ nop /* 22324 80046F24 46800020 */ cvt.s.w $f0, $f0 /* 22328 80046F28 0C00A6C9 */ jal clamp_angle /* 2232C 80046F2C 46001500 */ add.s $f20, $f2, $f0 @@ -667,16 +667,16 @@ glabel func_800465E0 /* 223A4 80046FA4 8230FFBF */ lb $s0, -0x41($s1) /* 223A8 80046FA8 24180002 */ addiu $t8, $zero, 2 /* 223AC 80046FAC 1618003F */ bne $s0, $t8, .L800470AC -/* 223B0 80046FB0 00000000 */ nop +/* 223B0 80046FB0 00000000 */ nop /* 223B4 80046FB4 8E820000 */ lw $v0, ($s4) /* 223B8 80046FB8 00581024 */ and $v0, $v0, $t8 /* 223BC 80046FBC 14400006 */ bnez $v0, .L80046FD8 -/* 223C0 80046FC0 00000000 */ nop +/* 223C0 80046FC0 00000000 */ nop /* 223C4 80046FC4 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 223C8 80046FC8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 223CC 80046FCC 80420070 */ lb $v0, 0x70($v0) /* 223D0 80046FD0 105E0036 */ beq $v0, $fp, .L800470AC -/* 223D4 80046FD4 00000000 */ nop +/* 223D4 80046FD4 00000000 */ nop .L80046FD8: /* 223D8 80046FD8 8E24FFC8 */ lw $a0, -0x38($s1) /* 223DC 80046FDC 0C05128B */ jal clear_icon_flags @@ -703,7 +703,7 @@ glabel func_800465E0 /* 22424 80047024 46041080 */ add.s $f2, $f2, $f4 /* 22428 80047028 E7A00024 */ swc1 $f0, 0x24($sp) /* 2242C 8004702C 44820000 */ mtc1 $v0, $f0 -/* 22430 80047030 00000000 */ nop +/* 22430 80047030 00000000 */ nop /* 22434 80047034 46800020 */ cvt.s.w $f0, $f0 /* 22438 80047038 0C00A6C9 */ jal clamp_angle /* 2243C 8004703C 46001500 */ add.s $f20, $f2, $f0 @@ -737,18 +737,18 @@ glabel func_800465E0 .L800470AC: /* 224AC 800470AC 8222FFCC */ lb $v0, -0x34($s1) /* 224B0 800470B0 10400029 */ beqz $v0, .L80047158 -/* 224B4 800470B4 00000000 */ nop +/* 224B4 800470B4 00000000 */ nop /* 224B8 800470B8 8E830000 */ lw $v1, ($s4) /* 224BC 800470BC 30620040 */ andi $v0, $v1, 0x40 /* 224C0 800470C0 1440FF5B */ bnez $v0, .L80046E30 /* 224C4 800470C4 30620002 */ andi $v0, $v1, 2 /* 224C8 800470C8 14400006 */ bnez $v0, .L800470E4 -/* 224CC 800470CC 00000000 */ nop +/* 224CC 800470CC 00000000 */ nop /* 224D0 800470D0 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 224D4 800470D4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 224D8 800470D8 80420070 */ lb $v0, 0x70($v0) /* 224DC 800470DC 105E001E */ beq $v0, $fp, .L80047158 -/* 224E0 800470E0 00000000 */ nop +/* 224E0 800470E0 00000000 */ nop .L800470E4: /* 224E4 800470E4 8E24FFD0 */ lw $a0, -0x30($s1) /* 224E8 800470E8 0C05128B */ jal clear_icon_flags @@ -782,7 +782,7 @@ glabel func_800465E0 .L80047158: /* 22558 80047158 8222FFCD */ lb $v0, -0x33($s1) /* 2255C 8004715C 1040001E */ beqz $v0, .L800471D8 -/* 22560 80047160 00000000 */ nop +/* 22560 80047160 00000000 */ nop /* 22564 80047164 8E24FFD4 */ lw $a0, -0x2c($s1) /* 22568 80047168 0C05128B */ jal clear_icon_flags /* 2256C 8004716C 24050002 */ addiu $a1, $zero, 2 @@ -815,18 +815,18 @@ glabel func_800465E0 .L800471D8: /* 225D8 800471D8 8222FFD8 */ lb $v0, -0x28($s1) /* 225DC 800471DC 10400029 */ beqz $v0, .L80047284 -/* 225E0 800471E0 00000000 */ nop +/* 225E0 800471E0 00000000 */ nop /* 225E4 800471E4 8E830000 */ lw $v1, ($s4) /* 225E8 800471E8 30620080 */ andi $v0, $v1, 0x80 /* 225EC 800471EC 1440FF15 */ bnez $v0, .L80046E44 /* 225F0 800471F0 30620002 */ andi $v0, $v1, 2 /* 225F4 800471F4 14400006 */ bnez $v0, .L80047210 -/* 225F8 800471F8 00000000 */ nop +/* 225F8 800471F8 00000000 */ nop /* 225FC 800471FC 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 22600 80047200 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 22604 80047204 80420070 */ lb $v0, 0x70($v0) /* 22608 80047208 105E001E */ beq $v0, $fp, .L80047284 -/* 2260C 8004720C 00000000 */ nop +/* 2260C 8004720C 00000000 */ nop .L80047210: /* 22610 80047210 8E24FFDC */ lw $a0, -0x24($s1) /* 22614 80047214 0C05128B */ jal clear_icon_flags @@ -860,7 +860,7 @@ glabel func_800465E0 .L80047284: /* 22684 80047284 8222FFD9 */ lb $v0, -0x27($s1) /* 22688 80047288 1040001E */ beqz $v0, .L80047304 -/* 2268C 8004728C 00000000 */ nop +/* 2268C 8004728C 00000000 */ nop /* 22690 80047290 8E24FFE0 */ lw $a0, -0x20($s1) /* 22694 80047294 0C05128B */ jal clear_icon_flags /* 22698 80047298 24050002 */ addiu $a1, $zero, 2 @@ -893,18 +893,18 @@ glabel func_800465E0 .L80047304: /* 22704 80047304 8222FFE4 */ lb $v0, -0x1c($s1) /* 22708 80047308 10400029 */ beqz $v0, .L800473B0 -/* 2270C 8004730C 00000000 */ nop +/* 2270C 8004730C 00000000 */ nop /* 22710 80047310 8E830000 */ lw $v1, ($s4) /* 22714 80047314 30620100 */ andi $v0, $v1, 0x100 /* 22718 80047318 1440FECF */ bnez $v0, .L80046E58 /* 2271C 8004731C 30620002 */ andi $v0, $v1, 2 /* 22720 80047320 14400006 */ bnez $v0, .L8004733C -/* 22724 80047324 00000000 */ nop +/* 22724 80047324 00000000 */ nop /* 22728 80047328 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 2272C 8004732C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 22730 80047330 80420070 */ lb $v0, 0x70($v0) /* 22734 80047334 105E001E */ beq $v0, $fp, .L800473B0 -/* 22738 80047338 00000000 */ nop +/* 22738 80047338 00000000 */ nop .L8004733C: /* 2273C 8004733C 8E24FFE8 */ lw $a0, -0x18($s1) /* 22740 80047340 0C05128B */ jal clear_icon_flags @@ -938,18 +938,18 @@ glabel func_800465E0 .L800473B0: /* 227B0 800473B0 8222FFEC */ lb $v0, -0x14($s1) /* 227B4 800473B4 10400029 */ beqz $v0, .L8004745C -/* 227B8 800473B8 00000000 */ nop +/* 227B8 800473B8 00000000 */ nop /* 227BC 800473BC 8E830000 */ lw $v1, ($s4) /* 227C0 800473C0 30620200 */ andi $v0, $v1, 0x200 /* 227C4 800473C4 1440FEA9 */ bnez $v0, .L80046E6C /* 227C8 800473C8 30620002 */ andi $v0, $v1, 2 /* 227CC 800473CC 14400006 */ bnez $v0, .L800473E8 -/* 227D0 800473D0 00000000 */ nop +/* 227D0 800473D0 00000000 */ nop /* 227D4 800473D4 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 227D8 800473D8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 227DC 800473DC 80420070 */ lb $v0, 0x70($v0) /* 227E0 800473E0 105E001E */ beq $v0, $fp, .L8004745C -/* 227E4 800473E4 00000000 */ nop +/* 227E4 800473E4 00000000 */ nop .L800473E8: /* 227E8 800473E8 8E24FFF0 */ lw $a0, -0x10($s1) /* 227EC 800473EC 0C05128B */ jal clear_icon_flags @@ -983,18 +983,18 @@ glabel func_800465E0 .L8004745C: /* 2285C 8004745C 8222FFF4 */ lb $v0, -0xc($s1) /* 22860 80047460 10400029 */ beqz $v0, .L80047508 -/* 22864 80047464 00000000 */ nop +/* 22864 80047464 00000000 */ nop /* 22868 80047468 8E830000 */ lw $v1, ($s4) /* 2286C 8004746C 30620400 */ andi $v0, $v1, 0x400 /* 22870 80047470 1440FE83 */ bnez $v0, .L80046E80 /* 22874 80047474 30620002 */ andi $v0, $v1, 2 /* 22878 80047478 14400006 */ bnez $v0, .L80047494 -/* 2287C 8004747C 00000000 */ nop +/* 2287C 8004747C 00000000 */ nop /* 22880 80047480 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 22884 80047484 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 22888 80047488 80420070 */ lb $v0, 0x70($v0) /* 2288C 8004748C 105E001E */ beq $v0, $fp, .L80047508 -/* 22890 80047490 00000000 */ nop +/* 22890 80047490 00000000 */ nop .L80047494: /* 22894 80047494 8E24FFF8 */ lw $a0, -8($s1) /* 22898 80047498 0C05128B */ jal clear_icon_flags @@ -1034,7 +1034,7 @@ glabel func_800465E0 /* 2291C 8004751C 1440FE5D */ bnez $v0, .L80046E94 /* 22920 80047520 30620002 */ andi $v0, $v1, 2 /* 22924 80047524 14400006 */ bnez $v0, .L80047540 -/* 22928 80047528 00000000 */ nop +/* 22928 80047528 00000000 */ nop /* 2292C 8004752C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 22930 80047530 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 22934 80047534 80420070 */ lb $v0, 0x70($v0) diff --git a/asm/nonmatchings/code_325AD0/func_E02000AC.s b/asm/nonmatchings/code_325AD0/func_E02000AC.s index d395296dda..43180f5cda 100644 --- a/asm/nonmatchings/code_325AD0/func_E02000AC.s +++ b/asm/nonmatchings/code_325AD0/func_E02000AC.s @@ -7,8 +7,8 @@ glabel func_E02000AC /* 325B84 E02000B4 34C680FF */ ori $a2, $a2, 0x80ff /* 325B88 E02000B8 AFB50034 */ sw $s5, 0x34($sp) /* 325B8C E02000BC 0000A82D */ daddu $s5, $zero, $zero -/* 325B90 E02000C0 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 325B94 E02000C4 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 325B90 E02000C0 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 325B94 E02000C4 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 325B98 E02000C8 0040502D */ daddu $t2, $v0, $zero /* 325B9C E02000CC 3C0EF510 */ lui $t6, 0xf510 /* 325BA0 E02000D0 35CE2800 */ ori $t6, $t6, 0x2800 @@ -219,5 +219,5 @@ glabel func_E02000AC /* 325ECC E02003FC 8FB00020 */ lw $s0, 0x20($sp) /* 325ED0 E0200400 03E00008 */ jr $ra /* 325ED4 E0200404 27BD0048 */ addiu $sp, $sp, 0x48 -/* 325ED8 E0200408 00000000 */ nop -/* 325EDC E020040C 00000000 */ nop +/* 325ED8 E0200408 00000000 */ nop +/* 325EDC E020040C 00000000 */ nop diff --git a/asm/nonmatchings/code_3278F0/func_E0002300.s b/asm/nonmatchings/code_3278F0/func_E0002300.s index e0ca889815..3a342952ee 100644 --- a/asm/nonmatchings/code_3278F0/func_E0002300.s +++ b/asm/nonmatchings/code_3278F0/func_E0002300.s @@ -6,8 +6,8 @@ glabel func_E0002300 /* 327BF4 E0002304 3C08DB06 */ lui $t0, 0xdb06 /* 327BF8 E0002308 35080024 */ ori $t0, $t0, 0x24 /* 327BFC E000230C AFB50074 */ sw $s5, 0x74($sp) -/* 327C00 E0002310 3C15800A */ lui $s5, %hi(D_8009A66C) -/* 327C04 E0002314 26B5A66C */ addiu $s5, $s5, %lo(D_8009A66C) +/* 327C00 E0002310 3C15800A */ lui $s5, %hi(gMasterGfxPos) +/* 327C04 E0002314 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) /* 327C08 E0002318 3C02E700 */ lui $v0, 0xe700 /* 327C0C E000231C AFBF0084 */ sw $ra, 0x84($sp) /* 327C10 E0002320 AFBE0080 */ sw $fp, 0x80($sp) @@ -68,10 +68,10 @@ glabel func_E0002300 /* 327CEC E00023FC 0C080180 */ jal func_E0200600 /* 327CF0 E0002400 E7A0001C */ swc1 $f0, 0x1c($sp) /* 327CF4 E0002404 27A40020 */ addiu $a0, $sp, 0x20 -/* 327CF8 E0002408 3C118007 */ lui $s1, %hi(D_800741F0) -/* 327CFC E000240C 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 327D00 E0002410 3C13800A */ lui $s3, %hi(D_8009A674) -/* 327D04 E0002414 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* 327CF8 E0002408 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 327CFC E000240C 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 327D00 E0002410 3C13800A */ lui $s3, %hi(gDisplayContext) +/* 327D04 E0002414 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* 327D08 E0002418 96250000 */ lhu $a1, ($s1) /* 327D0C E000241C 8E620000 */ lw $v0, ($s3) /* 327D10 E0002420 00052980 */ sll $a1, $a1, 6 @@ -163,13 +163,13 @@ glabel func_E0002300 /* 327E60 E0002570 86030000 */ lh $v1, ($s0) /* 327E64 E0002574 2442FFFF */ addiu $v0, $v0, -1 /* 327E68 E0002578 44826000 */ mtc1 $v0, $f12 -/* 327E6C E000257C 00000000 */ nop +/* 327E6C E000257C 00000000 */ nop /* 327E70 E0002580 46806320 */ cvt.s.w $f12, $f12 /* 327E74 E0002584 44831000 */ mtc1 $v1, $f2 -/* 327E78 E0002588 00000000 */ nop +/* 327E78 E0002588 00000000 */ nop /* 327E7C E000258C 468010A0 */ cvt.s.w $f2, $f2 /* 327E80 E0002590 460C103E */ c.le.s $f2, $f12 -/* 327E84 E0002594 00000000 */ nop +/* 327E84 E0002594 00000000 */ nop /* 327E88 E0002598 45000004 */ bc1f .LE00025AC /* 327E8C E000259C 240700FF */ addiu $a3, $zero, 0xff /* 327E90 E00025A0 8EA80018 */ lw $t0, 0x18($s5) @@ -177,24 +177,24 @@ glabel func_E0002300 /* 327E98 E00025A8 3C06D838 */ lui $a2, 0xd838 .LE00025AC: /* 327E9C E00025AC 46146302 */ mul.s $f12, $f12, $f20 -/* 327EA0 E00025B0 00000000 */ nop +/* 327EA0 E00025B0 00000000 */ nop /* 327EA4 E00025B4 3C0142B4 */ lui $at, 0x42b4 /* 327EA8 E00025B8 44810000 */ mtc1 $at, $f0 /* 327EAC E00025BC 46026303 */ div.s $f12, $f12, $f2 /* 327EB0 E00025C0 46006302 */ mul.s $f12, $f12, $f0 -/* 327EB4 E00025C4 00000000 */ nop +/* 327EB4 E00025C4 00000000 */ nop /* 327EB8 E00025C8 0C080140 */ jal func_E0200500 /* 327EBC E00025CC 46146303 */ div.s $f12, $f12, $f20 /* 327EC0 E00025D0 46140082 */ mul.s $f2, $f0, $f20 -/* 327EC4 E00025D4 00000000 */ nop +/* 327EC4 E00025D4 00000000 */ nop /* 327EC8 E00025D8 3C01437F */ lui $at, 0x437f /* 327ECC E00025DC 44810000 */ mtc1 $at, $f0 -/* 327ED0 E00025E0 00000000 */ nop +/* 327ED0 E00025E0 00000000 */ nop /* 327ED4 E00025E4 46001002 */ mul.s $f0, $f2, $f0 -/* 327ED8 E00025E8 00000000 */ nop +/* 327ED8 E00025E8 00000000 */ nop /* 327EDC E00025EC 4600010D */ trunc.w.s $f4, $f0 /* 327EE0 E00025F0 44032000 */ mfc1 $v1, $f4 -/* 327EE4 E00025F4 00000000 */ nop +/* 327EE4 E00025F4 00000000 */ nop /* 327EE8 E00025F8 04610002 */ bgez $v1, .LE0002604 /* 327EEC E00025FC 0060102D */ daddu $v0, $v1, $zero /* 327EF0 E0002600 246200FF */ addiu $v0, $v1, 0xff @@ -204,7 +204,7 @@ glabel func_E0002300 /* 327EFC E000260C 00623823 */ subu $a3, $v1, $v0 /* 327F00 E0002610 4600110D */ trunc.w.s $f4, $f2 /* 327F04 E0002614 44022000 */ mfc1 $v0, $f4 -/* 327F08 E0002618 00000000 */ nop +/* 327F08 E0002618 00000000 */ nop /* 327F0C E000261C 00021080 */ sll $v0, $v0, 2 /* 327F10 E0002620 00551021 */ addu $v0, $v0, $s5 /* 327F14 E0002624 8C480000 */ lw $t0, ($v0) @@ -250,8 +250,8 @@ glabel func_E0002300 /* 327FAC E00026BC 2694002C */ addiu $s4, $s4, 0x2c .LE00026C0: /* 327FB0 E00026C0 3C03D838 */ lui $v1, 0xd838 -/* 327FB4 E00026C4 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 327FB8 E00026C8 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 327FB4 E00026C4 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 327FB8 E00026C8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 327FBC E00026CC 8C820000 */ lw $v0, ($a0) /* 327FC0 E00026D0 34630002 */ ori $v1, $v1, 2 /* 327FC4 E00026D4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/code_328110/func_E000C798.s b/asm/nonmatchings/code_328110/func_E000C798.s index a321e543f7..8206bdb1be 100644 --- a/asm/nonmatchings/code_328110/func_E000C798.s +++ b/asm/nonmatchings/code_328110/func_E000C798.s @@ -12,8 +12,8 @@ glabel func_E000C798 /* 3288C4 E000C7B4 3C120001 */ lui $s2, 1 /* 3288C8 E000C7B8 36521630 */ ori $s2, $s2, 0x1630 /* 3288CC E000C7BC AFB300EC */ sw $s3, 0xec($sp) -/* 3288D0 E000C7C0 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 3288D4 E000C7C4 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 3288D0 E000C7C0 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 3288D4 E000C7C4 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 3288D8 E000C7C8 AFBF0104 */ sw $ra, 0x104($sp) /* 3288DC E000C7CC AFB700FC */ sw $s7, 0xfc($sp) /* 3288E0 E000C7D0 AFB600F8 */ sw $s6, 0xf8($sp) @@ -88,10 +88,10 @@ glabel func_E000C798 /* 3289F4 E000C8E4 0C080114 */ jal func_E0200450 /* 3289F8 E000C8E8 0200302D */ daddu $a2, $s0, $zero /* 3289FC E000C8EC 0200202D */ daddu $a0, $s0, $zero -/* 328A00 E000C8F0 3C108007 */ lui $s0, %hi(D_800741F0) -/* 328A04 E000C8F4 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 328A08 E000C8F8 3C11800A */ lui $s1, %hi(D_8009A674) -/* 328A0C E000C8FC 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 328A00 E000C8F0 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 328A04 E000C8F4 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 328A08 E000C8F8 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 328A0C E000C8FC 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 328A10 E000C900 96050000 */ lhu $a1, ($s0) /* 328A14 E000C904 8E220000 */ lw $v0, ($s1) /* 328A18 E000C908 00052980 */ sll $a1, $a1, 6 @@ -149,8 +149,8 @@ glabel func_E000C798 /* 328AE0 E000C9D0 24040020 */ addiu $a0, $zero, 0x20 /* 328AE4 E000C9D4 24040018 */ addiu $a0, $zero, 0x18 .LE000C9D8: -/* 328AE8 E000C9D8 3C0A800A */ lui $t2, %hi(D_8009A66C) -/* 328AEC E000C9DC 254AA66C */ addiu $t2, $t2, %lo(D_8009A66C) +/* 328AE8 E000C9D8 3C0A800A */ lui $t2, %hi(gMasterGfxPos) +/* 328AEC E000C9DC 254AA66C */ addiu $t2, $t2, %lo(gMasterGfxPos) /* 328AF0 E000C9E0 3C09F200 */ lui $t1, 0xf200 /* 328AF4 E000C9E4 8FAB00D8 */ lw $t3, 0xd8($sp) /* 328AF8 E000C9E8 8D450000 */ lw $a1, ($t2) @@ -195,9 +195,9 @@ glabel func_E000C798 /* 328B8C E000CA7C ACA20004 */ sw $v0, 4($a1) /* 328B90 E000CA80 24020002 */ addiu $v0, $zero, 2 /* 328B94 E000CA84 16A2000A */ bne $s5, $v0, .LE000CAB0 -/* 328B98 E000CA88 00000000 */ nop -/* 328B9C E000CA8C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 328BA0 E000CA90 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 328B98 E000CA88 00000000 */ nop +/* 328B9C E000CA8C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 328BA0 E000CA90 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 328BA4 E000CA94 8C620000 */ lw $v0, ($v1) /* 328BA8 E000CA98 0040202D */ daddu $a0, $v0, $zero /* 328BAC E000CA9C 24420008 */ addiu $v0, $v0, 8 @@ -211,14 +211,14 @@ glabel func_E000C798 /* 328BC8 E000CAB8 0222102A */ slt $v0, $s1, $v0 /* 328BCC E000CABC 10400036 */ beqz $v0, .LE000CB98 /* 328BD0 E000CAC0 26940044 */ addiu $s4, $s4, 0x44 -/* 328BD4 E000CAC4 3C16800A */ lui $s6, %hi(D_8009A674) -/* 328BD8 E000CAC8 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) -/* 328BDC E000CACC 3C158007 */ lui $s5, %hi(D_800741F0) -/* 328BE0 E000CAD0 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) +/* 328BD4 E000CAC4 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 328BD8 E000CAC8 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) +/* 328BDC E000CACC 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 328BE0 E000CAD0 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) /* 328BE4 E000CAD4 3C130001 */ lui $s3, 1 /* 328BE8 E000CAD8 36731630 */ ori $s3, $s3, 0x1630 -/* 328BEC E000CADC 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 328BF0 E000CAE0 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 328BEC E000CADC 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 328BF0 E000CAE0 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 328BF4 E000CAE4 2690000C */ addiu $s0, $s4, 0xc .LE000CAE8: /* 328BF8 E000CAE8 27A40018 */ addiu $a0, $sp, 0x18 @@ -267,8 +267,8 @@ glabel func_E000C798 /* 328CA4 E000CB94 AE440000 */ sw $a0, ($s2) .LE000CB98: /* 328CA8 E000CB98 3C03D838 */ lui $v1, 0xd838 -/* 328CAC E000CB9C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 328CB0 E000CBA0 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 328CAC E000CB9C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 328CB0 E000CBA0 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 328CB4 E000CBA4 8C820000 */ lw $v0, ($a0) /* 328CB8 E000CBA8 34630002 */ ori $v1, $v1, 2 /* 328CBC E000CBAC 0040282D */ daddu $a1, $v0, $zero @@ -294,5 +294,5 @@ glabel func_E000C798 /* 328D0C E000CBFC 8FB000E0 */ lw $s0, 0xe0($sp) /* 328D10 E000CC00 03E00008 */ jr $ra /* 328D14 E000CC04 27BD0108 */ addiu $sp, $sp, 0x108 -/* 328D18 E000CC08 00000000 */ nop -/* 328D1C E000CC0C 00000000 */ nop +/* 328D18 E000CC08 00000000 */ nop +/* 328D1C E000CC0C 00000000 */ nop diff --git a/asm/nonmatchings/code_32C110/func_E000E288.s b/asm/nonmatchings/code_32C110/func_E000E288.s index fd6dfb3b1f..14122355b5 100644 --- a/asm/nonmatchings/code_32C110/func_E000E288.s +++ b/asm/nonmatchings/code_32C110/func_E000E288.s @@ -25,17 +25,17 @@ glabel func_E000E288 /* 32C3E8 E000E2D8 3C1E0900 */ lui $fp, 0x900 /* 32C3EC E000E2DC 27DE2B20 */ addiu $fp, $fp, 0x2b20 /* 32C3F0 E000E2E0 1160000A */ beqz $t3, .LE000E30C -/* 32C3F4 E000E2E4 00000000 */ nop +/* 32C3F4 E000E2E4 00000000 */ nop .LE000E2E8: /* 32C3F8 E000E2E8 3C0A0900 */ lui $t2, 0x900 /* 32C3FC E000E2EC 254A2950 */ addiu $t2, $t2, 0x2950 /* 32C400 E000E2F0 24020001 */ addiu $v0, $zero, 1 /* 32C404 E000E2F4 15620007 */ bne $t3, $v0, .LE000E314 -/* 32C408 E000E2F8 00000000 */ nop +/* 32C408 E000E2F8 00000000 */ nop /* 32C40C E000E2FC 3C0A0900 */ lui $t2, 0x900 /* 32C410 E000E300 254A2868 */ addiu $t2, $t2, 0x2868 /* 32C414 E000E304 080038C5 */ j .LE000E314 -/* 32C418 E000E308 00000000 */ nop +/* 32C418 E000E308 00000000 */ nop .LE000E30C: /* 32C41C E000E30C 3C0A0900 */ lui $t2, 0x900 /* 32C420 E000E310 254A2780 */ addiu $t2, $t2, 0x2780 @@ -60,8 +60,8 @@ glabel func_E000E288 .LE000E34C: /* 32C45C E000E34C 3C05E6DE */ lui $a1, 0xe6de /* 32C460 E000E350 34A5DE6E */ ori $a1, $a1, 0xde6e -/* 32C464 E000E354 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 32C468 E000E358 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 32C464 E000E354 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 32C468 E000E358 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 32C46C E000E35C 24090020 */ addiu $t1, $zero, 0x20 /* 32C470 E000E360 8D060000 */ lw $a2, ($t0) /* 32C474 E000E364 3C02E700 */ lui $v0, 0xe700 @@ -157,14 +157,14 @@ glabel func_E000E288 /* 32C5D0 E000E4C0 0000882D */ daddu $s1, $zero, $zero /* 32C5D4 E000E4C4 27B40058 */ addiu $s4, $sp, 0x58 /* 32C5D8 E000E4C8 4480A000 */ mtc1 $zero, $f20 -/* 32C5DC E000E4CC 3C16800A */ lui $s6, %hi(D_8009A674) -/* 32C5E0 E000E4D0 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) -/* 32C5E4 E000E4D4 3C158007 */ lui $s5, %hi(D_800741F0) -/* 32C5E8 E000E4D8 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) +/* 32C5DC E000E4CC 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 32C5E0 E000E4D0 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) +/* 32C5E4 E000E4D4 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 32C5E8 E000E4D8 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) /* 32C5EC E000E4DC 3C130001 */ lui $s3, 1 /* 32C5F0 E000E4E0 36731630 */ ori $s3, $s3, 0x1630 -/* 32C5F4 E000E4E4 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 32C5F8 E000E4E8 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 32C5F4 E000E4E4 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 32C5F8 E000E4E8 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 32C5FC E000E4EC 24F00010 */ addiu $s0, $a3, 0x10 .LE000E4F0: /* 32C600 E000E4F0 27A40018 */ addiu $a0, $sp, 0x18 @@ -237,8 +237,8 @@ glabel func_E000E288 /* 32C70C E000E5FC 1440FFBC */ bnez $v0, .LE000E4F0 /* 32C710 E000E600 AE440000 */ sw $a0, ($s2) .LE000E604: -/* 32C714 E000E604 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 32C718 E000E608 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 32C714 E000E604 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 32C718 E000E608 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 32C71C E000E60C 8C620000 */ lw $v0, ($v1) /* 32C720 E000E610 0040202D */ daddu $a0, $v0, $zero /* 32C724 E000E614 24420008 */ addiu $v0, $v0, 8 @@ -259,4 +259,4 @@ glabel func_E000E288 /* 32C760 E000E650 D7B400C0 */ ldc1 $f20, 0xc0($sp) /* 32C764 E000E654 03E00008 */ jr $ra /* 32C768 E000E658 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* 32C76C E000E65C 00000000 */ nop +/* 32C76C E000E65C 00000000 */ nop diff --git a/asm/nonmatchings/code_32C7A0/func_E0010510.s b/asm/nonmatchings/code_32C7A0/func_E0010510.s index ca0f20306f..a5a636d8be 100644 --- a/asm/nonmatchings/code_32C7A0/func_E0010510.s +++ b/asm/nonmatchings/code_32C7A0/func_E0010510.s @@ -6,8 +6,8 @@ glabel func_E0010510 /* 32CCB4 E0010514 0080602D */ daddu $t4, $a0, $zero /* 32CCB8 E0010518 3C05DB06 */ lui $a1, 0xdb06 /* 32CCBC E001051C 34A50024 */ ori $a1, $a1, 0x24 -/* 32CCC0 E0010520 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 32CCC4 E0010524 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 32CCC0 E0010520 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 32CCC4 E0010524 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 32CCC8 E0010528 3C02E700 */ lui $v0, 0xe700 /* 32CCCC E001052C AFB7001C */ sw $s7, 0x1c($sp) /* 32CCD0 E0010530 AFB60018 */ sw $s6, 0x18($sp) @@ -35,10 +35,10 @@ glabel func_E0010510 /* 32CD28 E0010588 24840008 */ addiu $a0, $a0, 8 /* 32CD2C E001058C 1840004A */ blez $v0, .LE00106B8 /* 32CD30 E0010590 ACC40000 */ sw $a0, ($a2) -/* 32CD34 E0010594 3C0F800A */ lui $t7, %hi(D_8009A674) -/* 32CD38 E0010598 25EFA674 */ addiu $t7, $t7, %lo(D_8009A674) -/* 32CD3C E001059C 3C0D8007 */ lui $t5, %hi(D_800741F0) -/* 32CD40 E00105A0 25AD41F0 */ addiu $t5, $t5, %lo(D_800741F0) +/* 32CD34 E0010594 3C0F800A */ lui $t7, %hi(gDisplayContext) +/* 32CD38 E0010598 25EFA674 */ addiu $t7, $t7, %lo(gDisplayContext) +/* 32CD3C E001059C 3C0D8007 */ lui $t5, %hi(gMatrixListPos) +/* 32CD40 E00105A0 25AD41F0 */ addiu $t5, $t5, %lo(gMatrixListPos) /* 32CD44 E00105A4 3C0B0001 */ lui $t3, 1 /* 32CD48 E00105A8 356B1630 */ ori $t3, $t3, 0x1630 /* 32CD4C E00105AC 00C0502D */ daddu $t2, $a2, $zero @@ -112,8 +112,8 @@ glabel func_E0010510 /* 32CE50 E00106B0 1440FFC8 */ bnez $v0, .LE00105D4 /* 32CE54 E00106B4 25080098 */ addiu $t0, $t0, 0x98 .LE00106B8: -/* 32CE58 E00106B8 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 32CE5C E00106BC 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 32CE58 E00106B8 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 32CE5C E00106BC 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 32CE60 E00106C0 8C620000 */ lw $v0, ($v1) /* 32CE64 E00106C4 0040202D */ daddu $a0, $v0, $zero /* 32CE68 E00106C8 24420008 */ addiu $v0, $v0, 8 @@ -131,6 +131,6 @@ glabel func_E0010510 /* 32CE98 E00106F8 8FB00000 */ lw $s0, ($sp) /* 32CE9C E00106FC 03E00008 */ jr $ra /* 32CEA0 E0010700 27BD0020 */ addiu $sp, $sp, 0x20 -/* 32CEA4 E0010704 00000000 */ nop -/* 32CEA8 E0010708 00000000 */ nop -/* 32CEAC E001070C 00000000 */ nop +/* 32CEA4 E0010704 00000000 */ nop +/* 32CEA8 E0010708 00000000 */ nop +/* 32CEAC E001070C 00000000 */ nop diff --git a/asm/nonmatchings/code_32DD10/func_E0012564.s b/asm/nonmatchings/code_32DD10/func_E0012564.s index 5dafc05f30..ee99137c64 100644 --- a/asm/nonmatchings/code_32DD10/func_E0012564.s +++ b/asm/nonmatchings/code_32DD10/func_E0012564.s @@ -6,8 +6,8 @@ glabel func_E0012564 /* 32E278 E0012568 0080602D */ daddu $t4, $a0, $zero /* 32E27C E001256C 3C05DB06 */ lui $a1, 0xdb06 /* 32E280 E0012570 34A50024 */ ori $a1, $a1, 0x24 -/* 32E284 E0012574 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 32E288 E0012578 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 32E284 E0012574 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 32E288 E0012578 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 32E28C E001257C 3C02E700 */ lui $v0, 0xe700 /* 32E290 E0012580 AFB7001C */ sw $s7, 0x1c($sp) /* 32E294 E0012584 AFB60018 */ sw $s6, 0x18($sp) @@ -35,10 +35,10 @@ glabel func_E0012564 /* 32E2EC E00125DC 24840008 */ addiu $a0, $a0, 8 /* 32E2F0 E00125E0 18400053 */ blez $v0, .LE0012730 /* 32E2F4 E00125E4 ACC40000 */ sw $a0, ($a2) -/* 32E2F8 E00125E8 3C0E800A */ lui $t6, %hi(D_8009A674) -/* 32E2FC E00125EC 25CEA674 */ addiu $t6, $t6, %lo(D_8009A674) -/* 32E300 E00125F0 3C0D8007 */ lui $t5, %hi(D_800741F0) -/* 32E304 E00125F4 25AD41F0 */ addiu $t5, $t5, %lo(D_800741F0) +/* 32E2F8 E00125E8 3C0E800A */ lui $t6, %hi(gDisplayContext) +/* 32E2FC E00125EC 25CEA674 */ addiu $t6, $t6, %lo(gDisplayContext) +/* 32E300 E00125F0 3C0D8007 */ lui $t5, %hi(gMatrixListPos) +/* 32E304 E00125F4 25AD41F0 */ addiu $t5, $t5, %lo(gMatrixListPos) /* 32E308 E00125F8 3C0B0001 */ lui $t3, 1 /* 32E30C E00125FC 356B1630 */ ori $t3, $t3, 0x1630 /* 32E310 E0012600 00C0502D */ daddu $t2, $a2, $zero @@ -122,8 +122,8 @@ glabel func_E0012564 /* 32E438 E0012728 1440FFC0 */ bnez $v0, .LE001262C /* 32E43C E001272C 24E70098 */ addiu $a3, $a3, 0x98 .LE0012730: -/* 32E440 E0012730 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 32E444 E0012734 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 32E440 E0012730 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 32E444 E0012734 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 32E448 E0012738 8C620000 */ lw $v0, ($v1) /* 32E44C E001273C 0040202D */ daddu $a0, $v0, $zero /* 32E450 E0012740 24420008 */ addiu $v0, $v0, 8 @@ -141,4 +141,4 @@ glabel func_E0012564 /* 32E480 E0012770 8FB00000 */ lw $s0, ($sp) /* 32E484 E0012774 03E00008 */ jr $ra /* 32E488 E0012778 27BD0020 */ addiu $sp, $sp, 0x20 -/* 32E48C E001277C 00000000 */ nop +/* 32E48C E001277C 00000000 */ nop diff --git a/asm/nonmatchings/code_32E490/func_E00144E0.s b/asm/nonmatchings/code_32E490/func_E00144E0.s index c83add09cd..d6c433c04b 100644 --- a/asm/nonmatchings/code_32E490/func_E00144E0.s +++ b/asm/nonmatchings/code_32E490/func_E00144E0.s @@ -9,8 +9,8 @@ glabel func_E00144E0 /* 32E980 E00144F0 34A50024 */ ori $a1, $a1, 0x24 /* 32E984 E00144F4 AFB200A8 */ sw $s2, 0xa8($sp) /* 32E988 E00144F8 0000902D */ daddu $s2, $zero, $zero -/* 32E98C E00144FC 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 32E990 E0014500 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 32E98C E00144FC 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 32E990 E0014500 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 32E994 E0014504 3C02E700 */ lui $v0, 0xe700 /* 32E998 E0014508 AFBF00C4 */ sw $ra, 0xc4($sp) /* 32E99C E001450C AFBE00C0 */ sw $fp, 0xc0($sp) @@ -47,10 +47,10 @@ glabel func_E00144E0 /* 32EA18 E0014588 ACC30000 */ sw $v1, ($a2) /* 32EA1C E001458C 4480A000 */ mtc1 $zero, $f20 /* 32EA20 E0014590 27B50060 */ addiu $s5, $sp, 0x60 -/* 32EA24 E0014594 3C1E800A */ lui $fp, %hi(D_8009A674) -/* 32EA28 E0014598 27DEA674 */ addiu $fp, $fp, %lo(D_8009A674) -/* 32EA2C E001459C 3C178007 */ lui $s7, %hi(D_800741F0) -/* 32EA30 E00145A0 26F741F0 */ addiu $s7, $s7, %lo(D_800741F0) +/* 32EA24 E0014594 3C1E800A */ lui $fp, %hi(gDisplayContext) +/* 32EA28 E0014598 27DEA674 */ addiu $fp, $fp, %lo(gDisplayContext) +/* 32EA2C E001459C 3C178007 */ lui $s7, %hi(gMatrixListPos) +/* 32EA30 E00145A0 26F741F0 */ addiu $s7, $s7, %lo(gMatrixListPos) /* 32EA34 E00145A4 3C140001 */ lui $s4, 1 /* 32EA38 E00145A8 36941630 */ ori $s4, $s4, 0x1630 /* 32EA3C E00145AC 00C0982D */ daddu $s3, $a2, $zero @@ -149,8 +149,8 @@ glabel func_E00144E0 /* 32EBA8 E0014718 1440FFA6 */ bnez $v0, .LE00145B4 /* 32EBAC E001471C 2631004C */ addiu $s1, $s1, 0x4c .LE0014720: -/* 32EBB0 E0014720 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 32EBB4 E0014724 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 32EBB0 E0014720 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 32EBB4 E0014724 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 32EBB8 E0014728 8C620000 */ lw $v0, ($v1) /* 32EBBC E001472C 0040202D */ daddu $a0, $v0, $zero /* 32EBC0 E0014730 24420008 */ addiu $v0, $v0, 8 @@ -171,5 +171,5 @@ glabel func_E00144E0 /* 32EBFC E001476C D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 32EC00 E0014770 03E00008 */ jr $ra /* 32EC04 E0014774 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* 32EC08 E0014778 00000000 */ nop -/* 32EC0C E001477C 00000000 */ nop +/* 32EC08 E0014778 00000000 */ nop +/* 32EC0C E001477C 00000000 */ nop diff --git a/asm/nonmatchings/code_32EE30/func_E0016454.s b/asm/nonmatchings/code_32EE30/func_E0016454.s index c4cb43ce12..fb40b27857 100644 --- a/asm/nonmatchings/code_32EE30/func_E0016454.s +++ b/asm/nonmatchings/code_32EE30/func_E0016454.s @@ -9,8 +9,8 @@ glabel func_E0016454 /* 32F294 E0016464 34A50024 */ ori $a1, $a1, 0x24 /* 32F298 E0016468 AFB300AC */ sw $s3, 0xac($sp) /* 32F29C E001646C 0000982D */ daddu $s3, $zero, $zero -/* 32F2A0 E0016470 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 32F2A4 E0016474 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 32F2A0 E0016470 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 32F2A4 E0016474 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 32F2A8 E0016478 3C02E700 */ lui $v0, 0xe700 /* 32F2AC E001647C AFBF00C4 */ sw $ra, 0xc4($sp) /* 32F2B0 E0016480 AFBE00C0 */ sw $fp, 0xc0($sp) @@ -47,10 +47,10 @@ glabel func_E0016454 /* 32F32C E00164FC 18400070 */ blez $v0, .LE00166C0 /* 32F330 E0016500 ACC30000 */ sw $v1, ($a2) /* 32F334 E0016504 27B10060 */ addiu $s1, $sp, 0x60 -/* 32F338 E0016508 3C1E800A */ lui $fp, %hi(D_8009A674) -/* 32F33C E001650C 27DEA674 */ addiu $fp, $fp, %lo(D_8009A674) -/* 32F340 E0016510 3C178007 */ lui $s7, %hi(D_800741F0) -/* 32F344 E0016514 26F741F0 */ addiu $s7, $s7, %lo(D_800741F0) +/* 32F338 E0016508 3C1E800A */ lui $fp, %hi(gDisplayContext) +/* 32F33C E001650C 27DEA674 */ addiu $fp, $fp, %lo(gDisplayContext) +/* 32F340 E0016510 3C178007 */ lui $s7, %hi(gMatrixListPos) +/* 32F344 E0016514 26F741F0 */ addiu $s7, $s7, %lo(gMatrixListPos) /* 32F348 E0016518 3C150001 */ lui $s5, 1 /* 32F34C E001651C 36B51630 */ ori $s5, $s5, 0x1630 /* 32F350 E0016520 00C0A02D */ daddu $s4, $a2, $zero @@ -160,8 +160,8 @@ glabel func_E0016454 /* 32F4E8 E00166B8 1440FF9E */ bnez $v0, .LE0016534 /* 32F4EC E00166BC 26520050 */ addiu $s2, $s2, 0x50 .LE00166C0: -/* 32F4F0 E00166C0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 32F4F4 E00166C4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 32F4F0 E00166C0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 32F4F4 E00166C4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 32F4F8 E00166C8 8C620000 */ lw $v0, ($v1) /* 32F4FC E00166CC 0040202D */ daddu $a0, $v0, $zero /* 32F500 E00166D0 24420008 */ addiu $v0, $v0, 8 @@ -183,4 +183,4 @@ glabel func_E0016454 /* 32F540 E0016710 D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 32F544 E0016714 03E00008 */ jr $ra /* 32F548 E0016718 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 32F54C E001671C 00000000 */ nop +/* 32F54C E001671C 00000000 */ nop diff --git a/asm/nonmatchings/code_32F580/func_E00183D8.s b/asm/nonmatchings/code_32F580/func_E00183D8.s index 57b9d0e2bd..c2a3a117a1 100644 --- a/asm/nonmatchings/code_32F580/func_E00183D8.s +++ b/asm/nonmatchings/code_32F580/func_E00183D8.s @@ -6,8 +6,8 @@ glabel func_E00183D8 /* 32F95C E00183DC 0080602D */ daddu $t4, $a0, $zero /* 32F960 E00183E0 3C05DB06 */ lui $a1, 0xdb06 /* 32F964 E00183E4 34A50024 */ ori $a1, $a1, 0x24 -/* 32F968 E00183E8 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 32F96C E00183EC 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 32F968 E00183E8 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 32F96C E00183EC 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 32F970 E00183F0 3C02E700 */ lui $v0, 0xe700 /* 32F974 E00183F4 AFB7001C */ sw $s7, 0x1c($sp) /* 32F978 E00183F8 AFB60018 */ sw $s6, 0x18($sp) @@ -35,10 +35,10 @@ glabel func_E00183D8 /* 32F9D0 E0018450 24840008 */ addiu $a0, $a0, 8 /* 32F9D4 E0018454 1840004A */ blez $v0, .LE0018580 /* 32F9D8 E0018458 ACC40000 */ sw $a0, ($a2) -/* 32F9DC E001845C 3C0F800A */ lui $t7, %hi(D_8009A674) -/* 32F9E0 E0018460 25EFA674 */ addiu $t7, $t7, %lo(D_8009A674) -/* 32F9E4 E0018464 3C0D8007 */ lui $t5, %hi(D_800741F0) -/* 32F9E8 E0018468 25AD41F0 */ addiu $t5, $t5, %lo(D_800741F0) +/* 32F9DC E001845C 3C0F800A */ lui $t7, %hi(gDisplayContext) +/* 32F9E0 E0018460 25EFA674 */ addiu $t7, $t7, %lo(gDisplayContext) +/* 32F9E4 E0018464 3C0D8007 */ lui $t5, %hi(gMatrixListPos) +/* 32F9E8 E0018468 25AD41F0 */ addiu $t5, $t5, %lo(gMatrixListPos) /* 32F9EC E001846C 3C0B0001 */ lui $t3, 1 /* 32F9F0 E0018470 356B1630 */ ori $t3, $t3, 0x1630 /* 32F9F4 E0018474 00C0502D */ daddu $t2, $a2, $zero @@ -112,8 +112,8 @@ glabel func_E00183D8 /* 32FAF8 E0018578 1440FFC8 */ bnez $v0, .LE001849C /* 32FAFC E001857C 25080098 */ addiu $t0, $t0, 0x98 .LE0018580: -/* 32FB00 E0018580 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 32FB04 E0018584 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 32FB00 E0018580 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 32FB04 E0018584 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 32FB08 E0018588 8C620000 */ lw $v0, ($v1) /* 32FB0C E001858C 0040202D */ daddu $a0, $v0, $zero /* 32FB10 E0018590 24420008 */ addiu $v0, $v0, 8 @@ -131,4 +131,4 @@ glabel func_E00183D8 /* 32FB40 E00185C0 8FB00000 */ lw $s0, ($sp) /* 32FB44 E00185C4 03E00008 */ jr $ra /* 32FB48 E00185C8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 32FB4C E00185CC 00000000 */ nop +/* 32FB4C E00185CC 00000000 */ nop diff --git a/asm/nonmatchings/code_32FE30/func_E001A440.s b/asm/nonmatchings/code_32FE30/func_E001A440.s index be26fbfaa1..c7936fae69 100644 --- a/asm/nonmatchings/code_32FE30/func_E001A440.s +++ b/asm/nonmatchings/code_32FE30/func_E001A440.s @@ -7,8 +7,8 @@ glabel func_E001A440 /* 330278 E001A448 3C08DB06 */ lui $t0, 0xdb06 /* 33027C E001A44C 35080024 */ ori $t0, $t0, 0x24 /* 330280 E001A450 AFB400B8 */ sw $s4, 0xb8($sp) -/* 330284 E001A454 3C14800A */ lui $s4, %hi(D_8009A66C) -/* 330288 E001A458 2694A66C */ addiu $s4, $s4, %lo(D_8009A66C) +/* 330284 E001A454 3C14800A */ lui $s4, %hi(gMasterGfxPos) +/* 330288 E001A458 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) /* 33028C E001A45C 27A40020 */ addiu $a0, $sp, 0x20 /* 330290 E001A460 3C02E700 */ lui $v0, 0xe700 /* 330294 E001A464 AFBF00BC */ sw $ra, 0xbc($sp) @@ -47,10 +47,10 @@ glabel func_E001A440 /* 330318 E001A4E8 0C080180 */ jal func_E0200600 /* 33031C E001A4EC AE830000 */ sw $v1, ($s4) /* 330320 E001A4F0 27A40020 */ addiu $a0, $sp, 0x20 -/* 330324 E001A4F4 3C108007 */ lui $s0, %hi(D_800741F0) -/* 330328 E001A4F8 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 33032C E001A4FC 3C11800A */ lui $s1, %hi(D_8009A674) -/* 330330 E001A500 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 330324 E001A4F4 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 330328 E001A4F8 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 33032C E001A4FC 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 330330 E001A500 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 330334 E001A504 96050000 */ lhu $a1, ($s0) /* 330338 E001A508 8E220000 */ lw $v0, ($s1) /* 33033C E001A50C 00052980 */ sll $a1, $a1, 6 @@ -119,4 +119,4 @@ glabel func_E001A440 /* 330430 E001A600 8FB000A8 */ lw $s0, 0xa8($sp) /* 330434 E001A604 03E00008 */ jr $ra /* 330438 E001A608 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 33043C E001A60C 00000000 */ nop +/* 33043C E001A60C 00000000 */ nop diff --git a/asm/nonmatchings/code_330910/func_E001C30C.s b/asm/nonmatchings/code_330910/func_E001C30C.s index 130061636c..216f4ad6e3 100644 --- a/asm/nonmatchings/code_330910/func_E001C30C.s +++ b/asm/nonmatchings/code_330910/func_E001C30C.s @@ -10,8 +10,8 @@ glabel func_E001C30C /* 330C30 E001C320 AFB70174 */ sw $s7, 0x174($sp) /* 330C34 E001C324 3C170001 */ lui $s7, 1 /* 330C38 E001C328 AFB1015C */ sw $s1, 0x15c($sp) -/* 330C3C E001C32C 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 330C40 E001C330 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 330C3C E001C32C 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 330C40 E001C330 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 330C44 E001C334 AFBF017C */ sw $ra, 0x17c($sp) /* 330C48 E001C338 AFBE0178 */ sw $fp, 0x178($sp) /* 330C4C E001C33C AFB60170 */ sw $s6, 0x170($sp) @@ -79,10 +79,10 @@ glabel func_E001C30C /* 330D44 E001C434 0C080114 */ jal func_E0200450 /* 330D48 E001C438 0280302D */ daddu $a2, $s4, $zero /* 330D4C E001C43C 0280202D */ daddu $a0, $s4, $zero -/* 330D50 E001C440 3C128007 */ lui $s2, %hi(D_800741F0) -/* 330D54 E001C444 265241F0 */ addiu $s2, $s2, %lo(D_800741F0) -/* 330D58 E001C448 3C15800A */ lui $s5, %hi(D_8009A674) -/* 330D5C E001C44C 26B5A674 */ addiu $s5, $s5, %lo(D_8009A674) +/* 330D50 E001C440 3C128007 */ lui $s2, %hi(gMatrixListPos) +/* 330D54 E001C444 265241F0 */ addiu $s2, $s2, %lo(gMatrixListPos) +/* 330D58 E001C448 3C15800A */ lui $s5, %hi(gDisplayContext) +/* 330D5C E001C44C 26B5A674 */ addiu $s5, $s5, %lo(gDisplayContext) /* 330D60 E001C450 96450000 */ lhu $a1, ($s2) /* 330D64 E001C454 8EA20000 */ lw $v0, ($s5) /* 330D68 E001C458 00052980 */ sll $a1, $a1, 6 @@ -181,5 +181,5 @@ glabel func_E001C30C /* 330EDC E001C5CC D7B40180 */ ldc1 $f20, 0x180($sp) /* 330EE0 E001C5D0 03E00008 */ jr $ra /* 330EE4 E001C5D4 27BD0190 */ addiu $sp, $sp, 0x190 -/* 330EE8 E001C5D8 00000000 */ nop -/* 330EEC E001C5DC 00000000 */ nop +/* 330EE8 E001C5D8 00000000 */ nop +/* 330EEC E001C5DC 00000000 */ nop diff --git a/asm/nonmatchings/code_331940/func_E001E730.s b/asm/nonmatchings/code_331940/func_E001E730.s index 4604fdc9ee..be5b4db071 100644 --- a/asm/nonmatchings/code_331940/func_E001E730.s +++ b/asm/nonmatchings/code_331940/func_E001E730.s @@ -5,8 +5,8 @@ glabel func_E001E730 /* 332070 E001E730 27BDFF20 */ addiu $sp, $sp, -0xe0 /* 332074 E001E734 3C03DB06 */ lui $v1, 0xdb06 /* 332078 E001E738 AFB700BC */ sw $s7, 0xbc($sp) -/* 33207C E001E73C 3C17800A */ lui $s7, %hi(D_8009A66C) -/* 332080 E001E740 26F7A66C */ addiu $s7, $s7, %lo(D_8009A66C) +/* 33207C E001E73C 3C17800A */ lui $s7, %hi(gMasterGfxPos) +/* 332080 E001E740 26F7A66C */ addiu $s7, $s7, %lo(gMasterGfxPos) /* 332084 E001E744 34630024 */ ori $v1, $v1, 0x24 /* 332088 E001E748 AFBF00C4 */ sw $ra, 0xc4($sp) /* 33208C E001E74C AFBE00C0 */ sw $fp, 0xc0($sp) @@ -83,10 +83,10 @@ glabel func_E001E730 /* 3321A8 E001E868 0C080114 */ jal func_E0200450 /* 3321AC E001E86C 00A0302D */ daddu $a2, $a1, $zero /* 3321B0 E001E870 27A40020 */ addiu $a0, $sp, 0x20 -/* 3321B4 E001E874 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3321B8 E001E878 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3321BC E001E87C 3C14800A */ lui $s4, %hi(D_8009A674) -/* 3321C0 E001E880 2694A674 */ addiu $s4, $s4, %lo(D_8009A674) +/* 3321B4 E001E874 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3321B8 E001E878 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3321BC E001E87C 3C14800A */ lui $s4, %hi(gDisplayContext) +/* 3321C0 E001E880 2694A674 */ addiu $s4, $s4, %lo(gDisplayContext) /* 3321C4 E001E884 96050000 */ lhu $a1, ($s0) /* 3321C8 E001E888 8E820000 */ lw $v0, ($s4) /* 3321CC E001E88C 00052980 */ sll $a1, $a1, 6 @@ -181,11 +181,11 @@ glabel func_E001E730 /* 332320 E001E9E0 C6C0001C */ lwc1 $f0, 0x1c($s6) /* 332324 E001E9E4 3C013F80 */ lui $at, 0x3f80 /* 332328 E001E9E8 4481B000 */ mtc1 $at, $f22 -/* 33232C E001E9EC 00000000 */ nop +/* 33232C E001E9EC 00000000 */ nop /* 332330 E001E9F0 4616003E */ c.le.s $f0, $f22 -/* 332334 E001E9F4 00000000 */ nop +/* 332334 E001E9F4 00000000 */ nop /* 332338 E001E9F8 450000C5 */ bc1f .LE001ED10 -/* 33233C E001E9FC 00000000 */ nop +/* 33233C E001E9FC 00000000 */ nop /* 332340 E001EA00 8EC2003C */ lw $v0, 0x3c($s6) /* 332344 E001EA04 24440005 */ addiu $a0, $v0, 5 /* 332348 E001EA08 04810002 */ bgez $a0, .LE001EA14 @@ -239,14 +239,14 @@ glabel func_E001E730 /* 332404 E001EAC4 0C080118 */ jal func_E0200460 /* 332408 E001EAC8 02C52821 */ addu $a1, $s6, $a1 /* 33240C E001EACC 0000402D */ daddu $t0, $zero, $zero -/* 332410 E001EAD0 3C15800A */ lui $s5, %hi(D_8009A674) -/* 332414 E001EAD4 26B5A674 */ addiu $s5, $s5, %lo(D_8009A674) -/* 332418 E001EAD8 3C0D8007 */ lui $t5, %hi(D_800741F0) -/* 33241C E001EADC 25AD41F0 */ addiu $t5, $t5, %lo(D_800741F0) +/* 332410 E001EAD0 3C15800A */ lui $s5, %hi(gDisplayContext) +/* 332414 E001EAD4 26B5A674 */ addiu $s5, $s5, %lo(gDisplayContext) +/* 332418 E001EAD8 3C0D8007 */ lui $t5, %hi(gMatrixListPos) +/* 33241C E001EADC 25AD41F0 */ addiu $t5, $t5, %lo(gMatrixListPos) /* 332420 E001EAE0 3C0C0001 */ lui $t4, 1 /* 332424 E001EAE4 358C1630 */ ori $t4, $t4, 0x1630 -/* 332428 E001EAE8 3C0B800A */ lui $t3, %hi(D_8009A66C) -/* 33242C E001EAEC 256BA66C */ addiu $t3, $t3, %lo(D_8009A66C) +/* 332428 E001EAE8 3C0B800A */ lui $t3, %hi(gMasterGfxPos) +/* 33242C E001EAEC 256BA66C */ addiu $t3, $t3, %lo(gMasterGfxPos) /* 332430 E001EAF0 3C13DA38 */ lui $s3, 0xda38 /* 332434 E001EAF4 3C100100 */ lui $s0, 0x100 /* 332438 E001EAF8 36102000 */ ori $s0, $s0, 0x2000 @@ -318,8 +318,8 @@ glabel func_E001E730 /* 332534 E001EBF4 1440FFC7 */ bnez $v0, .LE001EB14 /* 332538 E001EBF8 AC92000C */ sw $s2, 0xc($a0) /* 33253C E001EBFC 0000402D */ daddu $t0, $zero, $zero -/* 332540 E001EC00 3C0C800A */ lui $t4, %hi(D_8009A66C) -/* 332544 E001EC04 258CA66C */ addiu $t4, $t4, %lo(D_8009A66C) +/* 332540 E001EC00 3C0C800A */ lui $t4, %hi(gMasterGfxPos) +/* 332544 E001EC04 258CA66C */ addiu $t4, $t4, %lo(gMasterGfxPos) /* 332548 E001EC08 3C0B0600 */ lui $t3, 0x600 /* 33254C E001EC0C 240A0001 */ addiu $t2, $zero, 1 /* 332550 E001EC10 3C0D0604 */ lui $t5, 0x604 @@ -334,7 +334,7 @@ glabel func_E001E730 /* 332570 E001EC30 AD820000 */ sw $v0, ($t4) /* 332574 E001EC34 00081040 */ sll $v0, $t0, 1 /* 332578 E001EC38 14400004 */ bnez $v0, .LE001EC4C -/* 33257C E001EC3C 00000000 */ nop +/* 33257C E001EC3C 00000000 */ nop /* 332580 E001EC40 00081440 */ sll $v0, $t0, 0x11 /* 332584 E001EC44 08007B1D */ j .LE001EC74 /* 332588 E001EC48 34420204 */ ori $v0, $v0, 0x204 @@ -386,8 +386,8 @@ glabel func_E001E730 /* 332620 E001ECE0 29020004 */ slti $v0, $t0, 4 /* 332624 E001ECE4 1440FFD0 */ bnez $v0, .LE001EC28 /* 332628 E001ECE8 25290004 */ addiu $t1, $t1, 4 -/* 33262C E001ECEC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 332630 E001ECF0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 33262C E001ECEC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 332630 E001ECF0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 332634 E001ECF4 8C620000 */ lw $v0, ($v1) /* 332638 E001ECF8 0040202D */ daddu $a0, $v0, $zero /* 33263C E001ECFC 24420008 */ addiu $v0, $v0, 8 @@ -411,4 +411,4 @@ glabel func_E001E730 /* 332680 E001ED40 D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 332684 E001ED44 03E00008 */ jr $ra /* 332688 E001ED48 27BD00E0 */ addiu $sp, $sp, 0xe0 -/* 33268C E001ED4C 00000000 */ nop +/* 33268C E001ED4C 00000000 */ nop diff --git a/asm/nonmatchings/code_333EC0/func_E00205D0.s b/asm/nonmatchings/code_333EC0/func_E00205D0.s index 1caf40246d..106c761202 100644 --- a/asm/nonmatchings/code_333EC0/func_E00205D0.s +++ b/asm/nonmatchings/code_333EC0/func_E00205D0.s @@ -5,8 +5,8 @@ glabel func_E00205D0 /* 334490 E00205D0 27BDFF20 */ addiu $sp, $sp, -0xe0 /* 334494 E00205D4 3C06DB06 */ lui $a2, 0xdb06 /* 334498 E00205D8 AFB600C0 */ sw $s6, 0xc0($sp) -/* 33449C E00205DC 3C16800A */ lui $s6, %hi(D_8009A66C) -/* 3344A0 E00205E0 26D6A66C */ addiu $s6, $s6, %lo(D_8009A66C) +/* 33449C E00205DC 3C16800A */ lui $s6, %hi(gMasterGfxPos) +/* 3344A0 E00205E0 26D6A66C */ addiu $s6, $s6, %lo(gMasterGfxPos) /* 3344A4 E00205E4 34C60024 */ ori $a2, $a2, 0x24 /* 3344A8 E00205E8 AFBF00CC */ sw $ra, 0xcc($sp) /* 3344AC E00205EC AFBE00C8 */ sw $fp, 0xc8($sp) @@ -73,10 +73,10 @@ glabel func_E00205D0 /* 3345A0 E00206E0 0C080114 */ jal func_E0200450 /* 3345A4 E00206E4 00A0302D */ daddu $a2, $a1, $zero /* 3345A8 E00206E8 27A40018 */ addiu $a0, $sp, 0x18 -/* 3345AC E00206EC 3C118007 */ lui $s1, %hi(D_800741F0) -/* 3345B0 E00206F0 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 3345B4 E00206F4 3C12800A */ lui $s2, %hi(D_8009A674) -/* 3345B8 E00206F8 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 3345AC E00206EC 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 3345B0 E00206F0 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 3345B4 E00206F4 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 3345B8 E00206F8 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 3345BC E00206FC 96220000 */ lhu $v0, ($s1) /* 3345C0 E0020700 8E460000 */ lw $a2, ($s2) /* 3345C4 E0020704 00022980 */ sll $a1, $v0, 6 @@ -152,10 +152,10 @@ glabel func_E00205D0 /* 3346D8 E0020818 1440010F */ bnez $v0, .LE0020C58 /* 3346DC E002081C 0000982D */ daddu $s3, $zero, $zero /* 3346E0 E0020820 27B10058 */ addiu $s1, $sp, 0x58 -/* 3346E4 E0020824 3C1E800A */ lui $fp, %hi(D_8009A674) -/* 3346E8 E0020828 27DEA674 */ addiu $fp, $fp, %lo(D_8009A674) -/* 3346EC E002082C 3C178007 */ lui $s7, %hi(D_800741F0) -/* 3346F0 E0020830 26F741F0 */ addiu $s7, $s7, %lo(D_800741F0) +/* 3346E4 E0020824 3C1E800A */ lui $fp, %hi(gDisplayContext) +/* 3346E8 E0020828 27DEA674 */ addiu $fp, $fp, %lo(gDisplayContext) +/* 3346EC E002082C 3C178007 */ lui $s7, %hi(gMatrixListPos) +/* 3346F0 E0020830 26F741F0 */ addiu $s7, $s7, %lo(gMatrixListPos) /* 3346F4 E0020834 3C150001 */ lui $s5, 1 /* 3346F8 E0020838 36B51630 */ ori $s5, $s5, 0x1630 /* 3346FC E002083C 02C0902D */ daddu $s2, $s6, $zero @@ -261,11 +261,11 @@ glabel func_E00205D0 /* 334888 E00209C8 1440FFA1 */ bnez $v0, .LE0020850 /* 33488C E00209CC AC870010 */ sw $a3, 0x10($a0) /* 334890 E00209D0 08008316 */ j .LE0020C58 -/* 334894 E00209D4 00000000 */ nop +/* 334894 E00209D4 00000000 */ nop .LE00209D8: /* 334898 E00209D8 3C03DA38 */ lui $v1, 0xda38 -/* 33489C E00209DC 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 3348A0 E00209E0 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 33489C E00209DC 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 3348A0 E00209E0 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 3348A4 E00209E4 8CC50000 */ lw $a1, ($a2) /* 3348A8 E00209E8 34630002 */ ori $v1, $v1, 2 /* 3348AC E00209EC 00A0102D */ daddu $v0, $a1, $zero @@ -290,14 +290,14 @@ glabel func_E00205D0 /* 3348F8 E0020A38 12A00009 */ beqz $s5, .LE0020A60 /* 3348FC E0020A3C 24090010 */ addiu $t1, $zero, 0x10 /* 334900 E0020A40 080082E2 */ j .LE0020B88 -/* 334904 E0020A44 00000000 */ nop +/* 334904 E0020A44 00000000 */ nop .LE0020A48: /* 334908 E0020A48 12A2001E */ beq $s5, $v0, .LE0020AC4 /* 33490C E0020A4C 24020004 */ addiu $v0, $zero, 4 /* 334910 E0020A50 12A20046 */ beq $s5, $v0, .LE0020B6C /* 334914 E0020A54 24090020 */ addiu $t1, $zero, 0x20 /* 334918 E0020A58 080082E2 */ j .LE0020B88 -/* 33491C E0020A5C 00000000 */ nop +/* 33491C E0020A5C 00000000 */ nop .LE0020A60: /* 334920 E0020A60 00041900 */ sll $v1, $a0, 4 /* 334924 E0020A64 24020080 */ addiu $v0, $zero, 0x80 @@ -379,9 +379,9 @@ glabel func_E00205D0 /* 334A44 E0020B84 AFA900A0 */ sw $t1, 0xa0($sp) .LE0020B88: /* 334A48 E0020B88 10E0000A */ beqz $a3, .LE0020BB4 -/* 334A4C E0020B8C 00000000 */ nop -/* 334A50 E0020B90 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 334A54 E0020B94 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 334A4C E0020B8C 00000000 */ nop +/* 334A50 E0020B90 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 334A54 E0020B94 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 334A58 E0020B98 8C620000 */ lw $v0, ($v1) /* 334A5C E0020B9C 0040202D */ daddu $a0, $v0, $zero /* 334A60 E0020BA0 24420008 */ addiu $v0, $v0, 8 @@ -390,8 +390,8 @@ glabel func_E00205D0 /* 334A6C E0020BAC AC820000 */ sw $v0, ($a0) /* 334A70 E0020BB0 AC870004 */ sw $a3, 4($a0) .LE0020BB4: -/* 334A74 E0020BB4 3C07800A */ lui $a3, %hi(D_8009A66C) -/* 334A78 E0020BB8 24E7A66C */ addiu $a3, $a3, %lo(D_8009A66C) +/* 334A74 E0020BB4 3C07800A */ lui $a3, %hi(gMasterGfxPos) +/* 334A78 E0020BB8 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) /* 334A7C E0020BBC 00171080 */ sll $v0, $s7, 2 /* 334A80 E0020BC0 30420FFF */ andi $v0, $v0, 0xfff /* 334A84 E0020BC4 00021300 */ sll $v0, $v0, 0xc diff --git a/asm/nonmatchings/code_337240/func_E0022998.s b/asm/nonmatchings/code_337240/func_E0022998.s index e9d7673d75..05084da748 100644 --- a/asm/nonmatchings/code_337240/func_E0022998.s +++ b/asm/nonmatchings/code_337240/func_E0022998.s @@ -8,8 +8,8 @@ glabel func_E0022998 /* 337BE4 E00229A4 AFA40100 */ sw $a0, 0x100($sp) /* 337BE8 E00229A8 27A40018 */ addiu $a0, $sp, 0x18 /* 337BEC E00229AC AFB300E4 */ sw $s3, 0xe4($sp) -/* 337BF0 E00229B0 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 337BF4 E00229B4 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 337BF0 E00229B0 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 337BF4 E00229B4 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 337BF8 E00229B8 3C02E700 */ lui $v0, 0xe700 /* 337BFC E00229BC AFBF00FC */ sw $ra, 0xfc($sp) /* 337C00 E00229C0 AFBE00F8 */ sw $fp, 0xf8($sp) @@ -83,8 +83,8 @@ glabel func_E0022998 /* 337D10 E0022AD0 18400069 */ blez $v0, .LE0022C78 /* 337D14 E0022AD4 26100030 */ addiu $s0, $s0, 0x30 /* 337D18 E0022AD8 0240B02D */ daddu $s6, $s2, $zero -/* 337D1C E0022ADC 3C1E8007 */ lui $fp, %hi(D_800741F0) -/* 337D20 E0022AE0 27DE41F0 */ addiu $fp, $fp, %lo(D_800741F0) +/* 337D1C E0022ADC 3C1E8007 */ lui $fp, %hi(gMatrixListPos) +/* 337D20 E0022AE0 27DE41F0 */ addiu $fp, $fp, %lo(gMatrixListPos) /* 337D24 E0022AE4 3C150001 */ lui $s5, 1 /* 337D28 E0022AE8 36B51630 */ ori $s5, $s5, 0x1630 /* 337D2C E0022AEC 0260902D */ daddu $s2, $s3, $zero @@ -112,8 +112,8 @@ glabel func_E0022998 /* 337D80 E0022B40 E7A00080 */ swc1 $f0, 0x80($sp) /* 337D84 E0022B44 27A40018 */ addiu $a0, $sp, 0x18 /* 337D88 E0022B48 97C50000 */ lhu $a1, ($fp) -/* 337D8C E0022B4C 3C02800A */ lui $v0, %hi(D_8009A674) -/* 337D90 E0022B50 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 337D8C E0022B4C 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 337D90 E0022B50 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 337D94 E0022B54 00052980 */ sll $a1, $a1, 6 /* 337D98 E0022B58 00B52821 */ addu $a1, $a1, $s5 /* 337D9C E0022B5C 0C080118 */ jal func_E0200460 @@ -163,8 +163,8 @@ glabel func_E0022998 /* 337E4C E0022C0C 00042180 */ sll $a0, $a0, 6 /* 337E50 E0022C10 AD030004 */ sw $v1, 4($t0) /* 337E54 E0022C14 ACE20000 */ sw $v0, ($a3) -/* 337E58 E0022C18 3C02800A */ lui $v0, %hi(D_8009A674) -/* 337E5C E0022C1C 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 337E58 E0022C18 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 337E5C E0022C1C 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 337E60 E0022C20 00952021 */ addu $a0, $a0, $s5 /* 337E64 E0022C24 00441021 */ addu $v0, $v0, $a0 /* 337E68 E0022C28 ACE20004 */ sw $v0, 4($a3) @@ -189,8 +189,8 @@ glabel func_E0022998 /* 337EB0 E0022C70 1440FFA2 */ bnez $v0, .LE0022AFC /* 337EB4 E0022C74 26100030 */ addiu $s0, $s0, 0x30 .LE0022C78: -/* 337EB8 E0022C78 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 337EBC E0022C7C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 337EB8 E0022C78 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 337EBC E0022C7C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 337EC0 E0022C80 8C620000 */ lw $v0, ($v1) /* 337EC4 E0022C84 0040202D */ daddu $a0, $v0, $zero /* 337EC8 E0022C88 24420008 */ addiu $v0, $v0, 8 @@ -210,4 +210,4 @@ glabel func_E0022998 /* 337F00 E0022CC0 8FB000D8 */ lw $s0, 0xd8($sp) /* 337F04 E0022CC4 03E00008 */ jr $ra /* 337F08 E0022CC8 27BD0100 */ addiu $sp, $sp, 0x100 -/* 337F0C E0022CCC 00000000 */ nop +/* 337F0C E0022CCC 00000000 */ nop diff --git a/asm/nonmatchings/code_339250/func_E0024454.s b/asm/nonmatchings/code_339250/func_E0024454.s index 3311c6be7a..7aab9ecad4 100644 --- a/asm/nonmatchings/code_339250/func_E0024454.s +++ b/asm/nonmatchings/code_339250/func_E0024454.s @@ -4,8 +4,8 @@ glabel func_E0024454 /* 3396A4 E0024454 27BDFF18 */ addiu $sp, $sp, -0xe8 /* 3396A8 E0024458 3C07DB06 */ lui $a3, 0xdb06 -/* 3396AC E002445C 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 3396B0 E0024460 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 3396AC E002445C 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 3396B0 E0024460 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 3396B4 E0024464 34E70024 */ ori $a3, $a3, 0x24 /* 3396B8 E0024468 AFBF00B4 */ sw $ra, 0xb4($sp) /* 3396BC E002446C AFBE00B0 */ sw $fp, 0xb0($sp) @@ -71,7 +71,7 @@ glabel func_E0024454 /* 3397AC E002455C 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 3397B0 E0024560 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* 3397B4 E0024564 4482B000 */ mtc1 $v0, $f22 -/* 3397B8 E0024568 00000000 */ nop +/* 3397B8 E0024568 00000000 */ nop /* 3397BC E002456C 4680B5A0 */ cvt.s.w $f22, $f22 /* 3397C0 E0024570 00031080 */ sll $v0, $v1, 2 /* 3397C4 E0024574 00431021 */ addu $v0, $v0, $v1 @@ -92,33 +92,33 @@ glabel func_E0024454 /* 3397FC E00245AC 000210C0 */ sll $v0, $v0, 3 /* 339800 E00245B0 00431021 */ addu $v0, $v0, $v1 /* 339804 E00245B4 4482B000 */ mtc1 $v0, $f22 -/* 339808 E00245B8 00000000 */ nop +/* 339808 E00245B8 00000000 */ nop /* 33980C E00245BC 4680B5A0 */ cvt.s.w $f22, $f22 /* 339810 E00245C0 C7A4007C */ lwc1 $f4, 0x7c($sp) /* 339814 E00245C4 3C0140C0 */ lui $at, 0x40c0 /* 339818 E00245C8 4481C000 */ mtc1 $at, $f24 /* 33981C E00245CC 4480F000 */ mtc1 $zero, $f30 /* 339820 E00245D0 4604D682 */ mul.s $f26, $f26, $f4 -/* 339824 E00245D4 00000000 */ nop +/* 339824 E00245D4 00000000 */ nop .LE00245D8: /* 339828 E00245D8 0000B82D */ daddu $s7, $zero, $zero -/* 33982C E00245DC 3C1E8007 */ lui $fp, %hi(D_800741F0) -/* 339830 E00245E0 27DE41F0 */ addiu $fp, $fp, %lo(D_800741F0) +/* 33982C E00245DC 3C1E8007 */ lui $fp, %hi(gMatrixListPos) +/* 339830 E00245E0 27DE41F0 */ addiu $fp, $fp, %lo(gMatrixListPos) /* 339834 E00245E4 3C080001 */ lui $t0, 1 /* 339838 E00245E8 35081630 */ ori $t0, $t0, 0x1630 /* 33983C E00245EC 4480E000 */ mtc1 $zero, $f28 -/* 339840 E00245F0 3C15800A */ lui $s5, %hi(D_8009A66C) -/* 339844 E00245F4 26B5A66C */ addiu $s5, $s5, %lo(D_8009A66C) +/* 339840 E00245F0 3C15800A */ lui $s5, %hi(gMasterGfxPos) +/* 339844 E00245F4 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) /* 339848 E00245F8 AFA8008C */ sw $t0, 0x8c($sp) .LE00245FC: /* 33984C E00245FC 1AE00033 */ blez $s7, .LE00246CC -/* 339850 E0024600 00000000 */ nop +/* 339850 E0024600 00000000 */ nop /* 339854 E0024604 8FA80070 */ lw $t0, 0x70($sp) /* 339858 E0024608 15000013 */ bnez $t0, .LE0024658 -/* 33985C E002460C 00000000 */ nop +/* 33985C E002460C 00000000 */ nop /* 339860 E0024610 3C01428C */ lui $at, 0x428c /* 339864 E0024614 44810000 */ mtc1 $at, $f0 -/* 339868 E0024618 00000000 */ nop +/* 339868 E0024618 00000000 */ nop /* 33986C E002461C 4600B581 */ sub.s $f22, $f22, $f0 /* 339870 E0024620 C6C0001C */ lwc1 $f0, 0x1c($s6) /* 339874 E0024624 46000000 */ add.s $f0, $f0, $f0 @@ -140,13 +140,13 @@ glabel func_E0024454 /* 3398B0 E0024660 D4224D00 */ ldc1 $f2, %lo(D_E0024D00)($at) /* 3398B4 E0024664 46000021 */ cvt.d.s $f0, $f0 /* 3398B8 E0024668 46220002 */ mul.d $f0, $f0, $f2 -/* 3398BC E002466C 00000000 */ nop +/* 3398BC E002466C 00000000 */ nop /* 3398C0 E0024670 46200000 */ add.d $f0, $f0, $f0 /* 3398C4 E0024674 4600D0A1 */ cvt.d.s $f2, $f26 /* 3398C8 E0024678 46201081 */ sub.d $f2, $f2, $f0 /* 3398CC E002467C 3C014248 */ lui $at, 0x4248 /* 3398D0 E0024680 44810000 */ mtc1 $at, $f0 -/* 3398D4 E0024684 00000000 */ nop +/* 3398D4 E0024684 00000000 */ nop /* 3398D8 E0024688 4600B581 */ sub.s $f22, $f22, $f0 /* 3398DC E002468C 462016A0 */ cvt.s.d $f26, $f2 .LE0024690: @@ -180,8 +180,8 @@ glabel func_E0024454 /* 339948 E00246F8 E7A4001C */ swc1 $f4, 0x1c($sp) /* 33994C E00246FC 27A40020 */ addiu $a0, $sp, 0x20 /* 339950 E0024700 97C50000 */ lhu $a1, ($fp) -/* 339954 E0024704 3C02800A */ lui $v0, %hi(D_8009A674) -/* 339958 E0024708 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 339954 E0024704 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 339958 E0024708 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 33995C E002470C 8FA8008C */ lw $t0, 0x8c($sp) /* 339960 E0024710 00052980 */ sll $a1, $a1, 6 /* 339964 E0024714 00A82821 */ addu $a1, $a1, $t0 @@ -200,18 +200,18 @@ glabel func_E0024454 /* 339998 E0024748 00021180 */ sll $v0, $v0, 6 /* 33999C E002474C A7C30000 */ sh $v1, ($fp) /* 3399A0 E0024750 8FA8008C */ lw $t0, 0x8c($sp) -/* 3399A4 E0024754 3C03800A */ lui $v1, %hi(D_8009A674) -/* 3399A8 E0024758 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 3399A4 E0024754 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 3399A8 E0024758 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 3399AC E002475C 00481021 */ addu $v0, $v0, $t0 /* 3399B0 E0024760 00621821 */ addu $v1, $v1, $v0 /* 3399B4 E0024764 0C080140 */ jal func_E0200500 /* 3399B8 E0024768 AC830004 */ sw $v1, 4($a0) /* 3399BC E002476C 46180502 */ mul.s $f20, $f0, $f24 -/* 3399C0 E0024770 00000000 */ nop +/* 3399C0 E0024770 00000000 */ nop /* 3399C4 E0024774 0C080144 */ jal func_E0200510 /* 3399C8 E0024778 4600B306 */ mov.s $f12, $f22 /* 3399CC E002477C 46180002 */ mul.s $f0, $f0, $f24 -/* 3399D0 E0024780 00000000 */ nop +/* 3399D0 E0024780 00000000 */ nop /* 3399D4 E0024784 27A40020 */ addiu $a0, $sp, 0x20 /* 3399D8 E0024788 4407E000 */ mfc1 $a3, $f28 /* 3399DC E002478C 3C0142F0 */ lui $at, 0x42f0 @@ -222,8 +222,8 @@ glabel func_E0024454 /* 3399F0 E00247A0 4604B580 */ add.s $f22, $f22, $f4 /* 3399F4 E00247A4 27A40020 */ addiu $a0, $sp, 0x20 /* 3399F8 E00247A8 97C30000 */ lhu $v1, ($fp) -/* 3399FC E00247AC 3C05800A */ lui $a1, %hi(D_8009A674) -/* 339A00 E00247B0 8CA5A674 */ lw $a1, %lo(D_8009A674)($a1) +/* 3399FC E00247AC 3C05800A */ lui $a1, %hi(gDisplayContext) +/* 339A00 E00247B0 8CA5A674 */ lw $a1, %lo(gDisplayContext)($a1) /* 339A04 E00247B4 8FA8008C */ lw $t0, 0x8c($sp) /* 339A08 E00247B8 3062FFFF */ andi $v0, $v1, 0xffff /* 339A0C E00247BC 00021180 */ sll $v0, $v0, 6 @@ -236,11 +236,11 @@ glabel func_E0024454 /* 339A28 E00247D8 0C080140 */ jal func_E0200500 /* 339A2C E00247DC 4600B306 */ mov.s $f12, $f22 /* 339A30 E00247E0 46180502 */ mul.s $f20, $f0, $f24 -/* 339A34 E00247E4 00000000 */ nop +/* 339A34 E00247E4 00000000 */ nop /* 339A38 E00247E8 0C080144 */ jal func_E0200510 /* 339A3C E00247EC 4600B306 */ mov.s $f12, $f22 /* 339A40 E00247F0 46180002 */ mul.s $f0, $f0, $f24 -/* 339A44 E00247F4 00000000 */ nop +/* 339A44 E00247F4 00000000 */ nop /* 339A48 E00247F8 27A40020 */ addiu $a0, $sp, 0x20 /* 339A4C E00247FC 4407E000 */ mfc1 $a3, $f28 /* 339A50 E0024800 3C0142F0 */ lui $at, 0x42f0 @@ -251,8 +251,8 @@ glabel func_E0024454 /* 339A64 E0024814 4604B580 */ add.s $f22, $f22, $f4 /* 339A68 E0024818 27A40020 */ addiu $a0, $sp, 0x20 /* 339A6C E002481C 97C30000 */ lhu $v1, ($fp) -/* 339A70 E0024820 3C05800A */ lui $a1, %hi(D_8009A674) -/* 339A74 E0024824 8CA5A674 */ lw $a1, %lo(D_8009A674)($a1) +/* 339A70 E0024820 3C05800A */ lui $a1, %hi(gDisplayContext) +/* 339A74 E0024824 8CA5A674 */ lw $a1, %lo(gDisplayContext)($a1) /* 339A78 E0024828 8FA8008C */ lw $t0, 0x8c($sp) /* 339A7C E002482C 3062FFFF */ andi $v0, $v1, 0xffff /* 339A80 E0024830 00021180 */ sll $v0, $v0, 6 @@ -265,11 +265,11 @@ glabel func_E0024454 /* 339A9C E002484C 0C080140 */ jal func_E0200500 /* 339AA0 E0024850 4600B306 */ mov.s $f12, $f22 /* 339AA4 E0024854 46180502 */ mul.s $f20, $f0, $f24 -/* 339AA8 E0024858 00000000 */ nop +/* 339AA8 E0024858 00000000 */ nop /* 339AAC E002485C 0C080144 */ jal func_E0200510 /* 339AB0 E0024860 4600B306 */ mov.s $f12, $f22 /* 339AB4 E0024864 46180002 */ mul.s $f0, $f0, $f24 -/* 339AB8 E0024868 00000000 */ nop +/* 339AB8 E0024868 00000000 */ nop /* 339ABC E002486C 0000A02D */ daddu $s4, $zero, $zero /* 339AC0 E0024870 3C13E002 */ lui $s3, %hi(D_E0024CC0) /* 339AC4 E0024874 26734CC0 */ addiu $s3, $s3, %lo(D_E0024CC0) @@ -280,8 +280,8 @@ glabel func_E0024454 /* 339AD8 E0024888 27A40020 */ addiu $a0, $sp, 0x20 /* 339ADC E002488C 27A40020 */ addiu $a0, $sp, 0x20 /* 339AE0 E0024890 97C30000 */ lhu $v1, ($fp) -/* 339AE4 E0024894 3C05800A */ lui $a1, %hi(D_8009A674) -/* 339AE8 E0024898 8CA5A674 */ lw $a1, %lo(D_8009A674)($a1) +/* 339AE4 E0024894 3C05800A */ lui $a1, %hi(gDisplayContext) +/* 339AE8 E0024898 8CA5A674 */ lw $a1, %lo(gDisplayContext)($a1) /* 339AEC E002489C 8FA8008C */ lw $t0, 0x8c($sp) /* 339AF0 E00248A0 3062FFFF */ andi $v0, $v1, 0xffff /* 339AF4 E00248A4 00021180 */ sll $v0, $v0, 6 @@ -392,8 +392,8 @@ glabel func_E0024454 /* 339C8C E0024A3C AC650000 */ sw $a1, ($v1) /* 339C90 E0024A40 1440FEEE */ bnez $v0, .LE00245FC /* 339C94 E0024A44 AC640004 */ sw $a0, 4($v1) -/* 339C98 E0024A48 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 339C9C E0024A4C 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 339C98 E0024A48 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 339C9C E0024A4C 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 339CA0 E0024A50 8C430000 */ lw $v1, ($v0) /* 339CA4 E0024A54 0060202D */ daddu $a0, $v1, $zero /* 339CA8 E0024A58 24630008 */ addiu $v1, $v1, 8 @@ -407,10 +407,10 @@ glabel func_E0024454 /* 339CC8 E0024A78 AD030004 */ sw $v1, 4($t0) /* 339CCC E0024A7C 8FA80070 */ lw $t0, 0x70($sp) /* 339CD0 E0024A80 15000004 */ bnez $t0, .LE0024A94 -/* 339CD4 E0024A84 00000000 */ nop +/* 339CD4 E0024A84 00000000 */ nop /* 339CD8 E0024A88 4480F000 */ mtc1 $zero, $f30 /* 339CDC E0024A8C 080092B2 */ j .LE0024AC8 -/* 339CE0 E0024A90 00000000 */ nop +/* 339CE0 E0024A90 00000000 */ nop .LE0024A94: /* 339CE4 E0024A94 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 339CE8 E0024A98 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) @@ -444,18 +444,18 @@ glabel func_E0024454 /* 339D54 E0024B04 0C080180 */ jal func_E0200600 /* 339D58 E0024B08 E7A0001C */ swc1 $f0, 0x1c($sp) /* 339D5C E0024B0C 27A40020 */ addiu $a0, $sp, 0x20 -/* 339D60 E0024B10 3C118007 */ lui $s1, %hi(D_800741F0) -/* 339D64 E0024B14 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 339D68 E0024B18 3C13800A */ lui $s3, %hi(D_8009A674) -/* 339D6C E0024B1C 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* 339D60 E0024B10 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 339D64 E0024B14 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 339D68 E0024B18 3C13800A */ lui $s3, %hi(gDisplayContext) +/* 339D6C E0024B1C 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* 339D70 E0024B20 96250000 */ lhu $a1, ($s1) /* 339D74 E0024B24 8E620000 */ lw $v0, ($s3) /* 339D78 E0024B28 00052980 */ sll $a1, $a1, 6 /* 339D7C E0024B2C 00B02821 */ addu $a1, $a1, $s0 /* 339D80 E0024B30 0C080118 */ jal func_E0200460 /* 339D84 E0024B34 00452821 */ addu $a1, $v0, $a1 -/* 339D88 E0024B38 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 339D8C E0024B3C 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 339D88 E0024B38 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 339D8C E0024B3C 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 339D90 E0024B40 8E450000 */ lw $a1, ($s2) /* 339D94 E0024B44 00A0202D */ daddu $a0, $a1, $zero /* 339D98 E0024B48 24A50008 */ addiu $a1, $a1, 8 @@ -520,8 +520,8 @@ glabel func_E0024454 /* 339E7C E0024C2C AC680004 */ sw $t0, 4($v1) .LE0024C30: /* 339E80 E0024C30 3C03D838 */ lui $v1, 0xd838 -/* 339E84 E0024C34 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 339E88 E0024C38 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 339E84 E0024C34 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 339E88 E0024C38 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 339E8C E0024C3C 8C820000 */ lw $v0, ($a0) /* 339E90 E0024C40 34630002 */ ori $v1, $v1, 2 /* 339E94 E0024C44 0040282D */ daddu $a1, $v0, $zero @@ -553,5 +553,5 @@ glabel func_E0024454 /* 339EFC E0024CAC D7B400B8 */ ldc1 $f20, 0xb8($sp) /* 339F00 E0024CB0 03E00008 */ jr $ra /* 339F04 E0024CB4 27BD00E8 */ addiu $sp, $sp, 0xe8 -/* 339F08 E0024CB8 00000000 */ nop -/* 339F0C E0024CBC 00000000 */ nop +/* 339F08 E0024CB8 00000000 */ nop +/* 339F0C E0024CBC 00000000 */ nop diff --git a/asm/nonmatchings/code_33B180/func_E00264F4.s b/asm/nonmatchings/code_33B180/func_E00264F4.s index 9c51c1e1d1..ee7170d8df 100644 --- a/asm/nonmatchings/code_33B180/func_E00264F4.s +++ b/asm/nonmatchings/code_33B180/func_E00264F4.s @@ -8,8 +8,8 @@ glabel func_E00264F4 /* 33B680 E0026500 3C07DB06 */ lui $a3, 0xdb06 /* 33B684 E0026504 34E70024 */ ori $a3, $a3, 0x24 /* 33B688 E0026508 AFB500FC */ sw $s5, 0xfc($sp) -/* 33B68C E002650C 3C15800A */ lui $s5, %hi(D_8009A66C) -/* 33B690 E0026510 26B5A66C */ addiu $s5, $s5, %lo(D_8009A66C) +/* 33B68C E002650C 3C15800A */ lui $s5, %hi(gMasterGfxPos) +/* 33B690 E0026510 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) /* 33B694 E0026514 27A40020 */ addiu $a0, $sp, 0x20 /* 33B698 E0026518 3C08800B */ lui $t0, %hi(gCameras) /* 33B69C E002651C 25081D80 */ addiu $t0, $t0, %lo(gCameras) @@ -95,10 +95,10 @@ glabel func_E00264F4 /* 33B7D8 E0026658 3C014680 */ lui $at, 0x4680 /* 33B7DC E002665C 44812000 */ mtc1 $at, $f4 /* 33B7E0 E0026660 44823000 */ mtc1 $v0, $f6 -/* 33B7E4 E0026664 00000000 */ nop +/* 33B7E4 E0026664 00000000 */ nop /* 33B7E8 E0026668 468031A0 */ cvt.s.w $f6, $f6 /* 33B7EC E002666C 44830000 */ mtc1 $v1, $f0 -/* 33B7F0 E0026670 00000000 */ nop +/* 33B7F0 E0026670 00000000 */ nop /* 33B7F4 E0026674 46800020 */ cvt.s.w $f0, $f0 /* 33B7F8 E0026678 46003183 */ div.s $f6, $f6, $f0 /* 33B7FC E002667C 44073000 */ mfc1 $a3, $f6 @@ -112,10 +112,10 @@ glabel func_E00264F4 /* 33B81C E002669C 0C080114 */ jal func_E0200450 /* 33B820 E00266A0 00A0302D */ daddu $a2, $a1, $zero /* 33B824 E00266A4 27A40020 */ addiu $a0, $sp, 0x20 -/* 33B828 E00266A8 3C108007 */ lui $s0, %hi(D_800741F0) -/* 33B82C E00266AC 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 33B830 E00266B0 3C11800A */ lui $s1, %hi(D_8009A674) -/* 33B834 E00266B4 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 33B828 E00266A8 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 33B82C E00266AC 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 33B830 E00266B0 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 33B834 E00266B4 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 33B838 E00266B8 96050000 */ lhu $a1, ($s0) /* 33B83C E00266BC 8E220000 */ lw $v0, ($s1) /* 33B840 E00266C0 00052980 */ sll $a1, $a1, 6 @@ -142,7 +142,7 @@ glabel func_E00264F4 /* 33B894 E0026714 1696000E */ bne $s4, $s6, .LE0026750 /* 33B898 E0026718 3C120001 */ lui $s2, 1 /* 33B89C E002671C 44800000 */ mtc1 $zero, $f0 -/* 33B8A0 E0026720 00000000 */ nop +/* 33B8A0 E0026720 00000000 */ nop /* 33B8A4 E0026724 44050000 */ mfc1 $a1, $f0 /* 33B8A8 E0026728 3C07C28C */ lui $a3, 0xc28c /* 33B8AC E002672C 080099D1 */ j .LE0026744 @@ -159,10 +159,10 @@ glabel func_E00264F4 .LE0026750: /* 33B8D0 E0026750 36521630 */ ori $s2, $s2, 0x1630 /* 33B8D4 E0026754 27A40020 */ addiu $a0, $sp, 0x20 -/* 33B8D8 E0026758 3C108007 */ lui $s0, %hi(D_800741F0) -/* 33B8DC E002675C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 33B8E0 E0026760 3C11800A */ lui $s1, %hi(D_8009A674) -/* 33B8E4 E0026764 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 33B8D8 E0026758 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 33B8DC E002675C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 33B8E0 E0026760 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 33B8E4 E0026764 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 33B8E8 E0026768 96050000 */ lhu $a1, ($s0) /* 33B8EC E002676C 8E220000 */ lw $v0, ($s1) /* 33B8F0 E0026770 00052980 */ sll $a1, $a1, 6 @@ -171,8 +171,8 @@ glabel func_E00264F4 /* 33B8FC E002677C 00452821 */ addu $a1, $v0, $a1 /* 33B900 E0026780 3C03DA38 */ lui $v1, 0xda38 /* 33B904 E0026784 34630002 */ ori $v1, $v1, 2 -/* 33B908 E0026788 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 33B90C E002678C 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 33B908 E0026788 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 33B90C E002678C 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 33B910 E0026790 8CC20000 */ lw $v0, ($a2) /* 33B914 E0026794 96040000 */ lhu $a0, ($s0) /* 33B918 E0026798 0040282D */ daddu $a1, $v0, $zero @@ -286,8 +286,8 @@ glabel func_E00264F4 .LE0026944: /* 33BAC4 E0026944 3C02D838 */ lui $v0, 0xd838 /* 33BAC8 E0026948 34420002 */ ori $v0, $v0, 2 -/* 33BACC E002694C 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 33BAD0 E0026950 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 33BACC E002694C 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 33BAD0 E0026950 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 33BAD4 E0026954 8CA40000 */ lw $a0, ($a1) /* 33BAD8 E0026958 3C06DA38 */ lui $a2, 0xda38 /* 33BADC E002695C 0080182D */ daddu $v1, $a0, $zero @@ -300,8 +300,8 @@ glabel func_E00264F4 /* 33BAF8 E0026978 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* 33BAFC E002697C 24820008 */ addiu $v0, $a0, 8 /* 33BB00 E0026980 ACA20000 */ sw $v0, ($a1) -/* 33BB04 E0026984 3C02800A */ lui $v0, %hi(D_8009A674) -/* 33BB08 E0026988 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 33BB04 E0026984 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 33BB08 E0026988 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 33BB0C E002698C 34C60007 */ ori $a2, $a2, 7 /* 33BB10 E0026990 AC860000 */ sw $a2, ($a0) /* 33BB14 E0026994 00031980 */ sll $v1, $v1, 6 @@ -326,4 +326,4 @@ glabel func_E00264F4 /* 33BB60 E00269E0 D7B40110 */ ldc1 $f20, 0x110($sp) /* 33BB64 E00269E4 03E00008 */ jr $ra /* 33BB68 E00269E8 27BD0118 */ addiu $sp, $sp, 0x118 -/* 33BB6C E00269EC 00000000 */ nop +/* 33BB6C E00269EC 00000000 */ nop diff --git a/asm/nonmatchings/code_33CDF0/func_E002852C.s b/asm/nonmatchings/code_33CDF0/func_E002852C.s index d8b0738bc2..f6824e27e1 100644 --- a/asm/nonmatchings/code_33CDF0/func_E002852C.s +++ b/asm/nonmatchings/code_33CDF0/func_E002852C.s @@ -10,8 +10,8 @@ glabel func_E002852C /* 33D330 E0028540 3C061464 */ lui $a2, 0x1464 /* 33D334 E0028544 34C61400 */ ori $a2, $a2, 0x1400 /* 33D338 E0028548 AFB300E4 */ sw $s3, 0xe4($sp) -/* 33D33C E002854C 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 33D340 E0028550 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 33D33C E002854C 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 33D340 E0028550 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 33D344 E0028554 AFBF00F8 */ sw $ra, 0xf8($sp) /* 33D348 E0028558 AFB600F0 */ sw $s6, 0xf0($sp) /* 33D34C E002855C AFB500EC */ sw $s5, 0xec($sp) @@ -83,10 +83,10 @@ glabel func_E002852C /* 33D454 E0028664 0242102A */ slt $v0, $s2, $v0 /* 33D458 E0028668 1040004E */ beqz $v0, .LE00287A4 /* 33D45C E002866C 26100030 */ addiu $s0, $s0, 0x30 -/* 33D460 E0028670 3C16800A */ lui $s6, %hi(D_8009A674) -/* 33D464 E0028674 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) -/* 33D468 E0028678 3C158007 */ lui $s5, %hi(D_800741F0) -/* 33D46C E002867C 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) +/* 33D460 E0028670 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 33D464 E0028674 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) +/* 33D468 E0028678 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 33D46C E002867C 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) /* 33D470 E0028680 3C140001 */ lui $s4, 1 /* 33D474 E0028684 36941630 */ ori $s4, $s4, 0x1630 /* 33D478 E0028688 26100020 */ addiu $s0, $s0, 0x20 @@ -175,5 +175,5 @@ glabel func_E002852C /* 33D5BC E00287CC D7B40100 */ ldc1 $f20, 0x100($sp) /* 33D5C0 E00287D0 03E00008 */ jr $ra /* 33D5C4 E00287D4 27BD0110 */ addiu $sp, $sp, 0x110 -/* 33D5C8 E00287D8 00000000 */ nop -/* 33D5CC E00287DC 00000000 */ nop +/* 33D5C8 E00287D8 00000000 */ nop +/* 33D5CC E00287DC 00000000 */ nop diff --git a/asm/nonmatchings/code_33E8C0/func_E002A3C4.s b/asm/nonmatchings/code_33E8C0/func_E002A3C4.s index 520a758905..bd5bd54a7a 100644 --- a/asm/nonmatchings/code_33E8C0/func_E002A3C4.s +++ b/asm/nonmatchings/code_33E8C0/func_E002A3C4.s @@ -6,8 +6,8 @@ glabel func_E002A3C4 /* 33EC88 E002A3C8 3C02DB06 */ lui $v0, 0xdb06 /* 33EC8C E002A3CC 34420024 */ ori $v0, $v0, 0x24 /* 33EC90 E002A3D0 AFB200E8 */ sw $s2, 0xe8($sp) -/* 33EC94 E002A3D4 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 33EC98 E002A3D8 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 33EC94 E002A3D4 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 33EC98 E002A3D8 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 33EC9C E002A3DC AFBF0104 */ sw $ra, 0x104($sp) /* 33ECA0 E002A3E0 AFBE0100 */ sw $fp, 0x100($sp) /* 33ECA4 E002A3E4 AFB700FC */ sw $s7, 0xfc($sp) @@ -108,10 +108,10 @@ glabel func_E002A3C4 /* 33EE1C E002A55C 0262102A */ slt $v0, $s3, $v0 /* 33EE20 E002A560 10400061 */ beqz $v0, .LE002A6E8 /* 33EE24 E002A564 26100048 */ addiu $s0, $s0, 0x48 -/* 33EE28 E002A568 3C17800A */ lui $s7, %hi(D_8009A674) -/* 33EE2C E002A56C 26F7A674 */ addiu $s7, $s7, %lo(D_8009A674) -/* 33EE30 E002A570 3C148007 */ lui $s4, %hi(D_800741F0) -/* 33EE34 E002A574 269441F0 */ addiu $s4, $s4, %lo(D_800741F0) +/* 33EE28 E002A568 3C17800A */ lui $s7, %hi(gDisplayContext) +/* 33EE2C E002A56C 26F7A674 */ addiu $s7, $s7, %lo(gDisplayContext) +/* 33EE30 E002A570 3C148007 */ lui $s4, %hi(gMatrixListPos) +/* 33EE34 E002A574 269441F0 */ addiu $s4, $s4, %lo(gMatrixListPos) /* 33EE38 E002A578 3C150001 */ lui $s5, 1 /* 33EE3C E002A57C 36B51630 */ ori $s5, $s5, 0x1630 /* 33EE40 E002A580 0220B02D */ daddu $s6, $s1, $zero @@ -221,5 +221,5 @@ glabel func_E002A3C4 /* 33EFCC E002A70C 8FB000E0 */ lw $s0, 0xe0($sp) /* 33EFD0 E002A710 03E00008 */ jr $ra /* 33EFD4 E002A714 27BD0108 */ addiu $sp, $sp, 0x108 -/* 33EFD8 E002A718 00000000 */ nop -/* 33EFDC E002A71C 00000000 */ nop +/* 33EFD8 E002A718 00000000 */ nop +/* 33EFDC E002A71C 00000000 */ nop diff --git a/asm/nonmatchings/code_33FE80/func_E002C414.s b/asm/nonmatchings/code_33FE80/func_E002C414.s index dfe44c2d04..010923fdb0 100644 --- a/asm/nonmatchings/code_33FE80/func_E002C414.s +++ b/asm/nonmatchings/code_33FE80/func_E002C414.s @@ -6,8 +6,8 @@ glabel func_E002C414 /* 340298 E002C418 3C02DB06 */ lui $v0, 0xdb06 /* 34029C E002C41C 34420024 */ ori $v0, $v0, 0x24 /* 3402A0 E002C420 AFB40138 */ sw $s4, 0x138($sp) -/* 3402A4 E002C424 3C14800A */ lui $s4, %hi(D_8009A66C) -/* 3402A8 E002C428 2694A66C */ addiu $s4, $s4, %lo(D_8009A66C) +/* 3402A4 E002C424 3C14800A */ lui $s4, %hi(gMasterGfxPos) +/* 3402A8 E002C428 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) /* 3402AC E002C42C AFA40160 */ sw $a0, 0x160($sp) /* 3402B0 E002C430 8FA80160 */ lw $t0, 0x160($sp) /* 3402B4 E002C434 3C038000 */ lui $v1, 0x8000 @@ -118,10 +118,10 @@ glabel func_E002C414 /* 340458 E002C5D8 0C080114 */ jal func_E0200450 /* 34045C E002C5DC 0200302D */ daddu $a2, $s0, $zero /* 340460 E002C5E0 0200202D */ daddu $a0, $s0, $zero -/* 340464 E002C5E4 3C108007 */ lui $s0, %hi(D_800741F0) -/* 340468 E002C5E8 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 34046C E002C5EC 3C11800A */ lui $s1, %hi(D_8009A674) -/* 340470 E002C5F0 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 340464 E002C5E4 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 340468 E002C5E8 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 34046C E002C5EC 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 340470 E002C5F0 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 340474 E002C5F4 96050000 */ lhu $a1, ($s0) /* 340478 E002C5F8 8E220000 */ lw $v0, ($s1) /* 34047C E002C5FC 00052980 */ sll $a1, $a1, 6 @@ -226,8 +226,8 @@ glabel func_E002C414 /* 340604 E002C784 26730040 */ addiu $s3, $s3, 0x40 /* 340608 E002C788 0220902D */ daddu $s2, $s1, $zero /* 34060C E002C78C 4600B506 */ mov.s $f20, $f22 -/* 340610 E002C790 3C1E8007 */ lui $fp, %hi(D_800741F0) -/* 340614 E002C794 27DE41F0 */ addiu $fp, $fp, %lo(D_800741F0) +/* 340610 E002C790 3C1E8007 */ lui $fp, %hi(gMatrixListPos) +/* 340614 E002C794 27DE41F0 */ addiu $fp, $fp, %lo(gMatrixListPos) /* 340618 E002C798 3C170001 */ lui $s7, 1 /* 34061C E002C79C 36F71630 */ ori $s7, $s7, 0x1630 /* 340620 E002C7A0 3C039696 */ lui $v1, 0x9696 @@ -275,8 +275,8 @@ glabel func_E002C414 /* 3406C4 E002C844 00A0302D */ daddu $a2, $a1, $zero /* 3406C8 E002C848 27A40020 */ addiu $a0, $sp, 0x20 /* 3406CC E002C84C 97C50000 */ lhu $a1, ($fp) -/* 3406D0 E002C850 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3406D4 E002C854 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 3406D0 E002C850 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3406D4 E002C854 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3406D8 E002C858 00052980 */ sll $a1, $a1, 6 /* 3406DC E002C85C 00B72821 */ addu $a1, $a1, $s7 /* 3406E0 E002C860 0C080118 */ jal func_E0200460 @@ -294,8 +294,8 @@ glabel func_E002C414 /* 340710 E002C890 3042FFFF */ andi $v0, $v0, 0xffff /* 340714 E002C894 00021180 */ sll $v0, $v0, 6 /* 340718 E002C898 A7C30000 */ sh $v1, ($fp) -/* 34071C E002C89C 3C03800A */ lui $v1, %hi(D_8009A674) -/* 340720 E002C8A0 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 34071C E002C89C 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 340720 E002C8A0 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 340724 E002C8A4 00571021 */ addu $v0, $v0, $s7 /* 340728 E002C8A8 00621821 */ addu $v1, $v1, $v0 /* 34072C E002C8AC 24820008 */ addiu $v0, $a0, 8 @@ -335,4 +335,4 @@ glabel func_E002C414 /* 3407B0 E002C930 D7B40150 */ ldc1 $f20, 0x150($sp) /* 3407B4 E002C934 03E00008 */ jr $ra /* 3407B8 E002C938 27BD0160 */ addiu $sp, $sp, 0x160 -/* 3407BC E002C93C 00000000 */ nop +/* 3407BC E002C93C 00000000 */ nop diff --git a/asm/nonmatchings/code_3419E0/func_E002E368.s b/asm/nonmatchings/code_3419E0/func_E002E368.s index 6ddc52401c..8a1f538125 100644 --- a/asm/nonmatchings/code_3419E0/func_E002E368.s +++ b/asm/nonmatchings/code_3419E0/func_E002E368.s @@ -32,8 +32,8 @@ glabel func_E002E368 /* 341DB0 E002E3D0 34C60024 */ ori $a2, $a2, 0x24 /* 341DB4 E002E3D4 27A40018 */ addiu $a0, $sp, 0x18 /* 341DB8 E002E3D8 3C120001 */ lui $s2, 1 -/* 341DBC E002E3DC 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 341DC0 E002E3E0 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 341DBC E002E3DC 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 341DC0 E002E3E0 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 341DC4 E002E3E4 36521630 */ ori $s2, $s2, 0x1630 /* 341DC8 E002E3E8 8E630000 */ lw $v1, ($s3) /* 341DCC E002E3EC 3C02E700 */ lui $v0, 0xe700 @@ -88,10 +88,10 @@ glabel func_E002E368 /* 341E90 E002E4B0 0C080114 */ jal func_E0200450 /* 341E94 E002E4B4 0200302D */ daddu $a2, $s0, $zero /* 341E98 E002E4B8 0200202D */ daddu $a0, $s0, $zero -/* 341E9C E002E4BC 3C108007 */ lui $s0, %hi(D_800741F0) -/* 341EA0 E002E4C0 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 341EA4 E002E4C4 3C11800A */ lui $s1, %hi(D_8009A674) -/* 341EA8 E002E4C8 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 341E9C E002E4BC 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 341EA0 E002E4C0 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 341EA4 E002E4C4 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 341EA8 E002E4C8 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 341EAC E002E4CC 96050000 */ lhu $a1, ($s0) /* 341EB0 E002E4D0 8E220000 */ lw $v0, ($s1) /* 341EB4 E002E4D4 00052980 */ sll $a1, $a1, 6 @@ -170,14 +170,14 @@ glabel func_E002E368 /* 341FD0 E002E5F0 0222102A */ slt $v0, $s1, $v0 /* 341FD4 E002E5F4 10400036 */ beqz $v0, .LE002E6D0 /* 341FD8 E002E5F8 26940044 */ addiu $s4, $s4, 0x44 -/* 341FDC E002E5FC 3C16800A */ lui $s6, %hi(D_8009A674) -/* 341FE0 E002E600 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) -/* 341FE4 E002E604 3C158007 */ lui $s5, %hi(D_800741F0) -/* 341FE8 E002E608 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) +/* 341FDC E002E5FC 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 341FE0 E002E600 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) +/* 341FE4 E002E604 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 341FE8 E002E608 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) /* 341FEC E002E60C 3C130001 */ lui $s3, 1 /* 341FF0 E002E610 36731630 */ ori $s3, $s3, 0x1630 -/* 341FF4 E002E614 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 341FF8 E002E618 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 341FF4 E002E614 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 341FF8 E002E618 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 341FFC E002E61C 2690000C */ addiu $s0, $s4, 0xc .LE002E620: /* 342000 E002E620 27A40018 */ addiu $a0, $sp, 0x18 @@ -226,8 +226,8 @@ glabel func_E002E368 /* 3420AC E002E6CC AE440000 */ sw $a0, ($s2) .LE002E6D0: /* 3420B0 E002E6D0 3C03D838 */ lui $v1, 0xd838 -/* 3420B4 E002E6D4 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 3420B8 E002E6D8 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 3420B4 E002E6D4 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 3420B8 E002E6D8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 3420BC E002E6DC 8C820000 */ lw $v0, ($a0) /* 3420C0 E002E6E0 34630002 */ ori $v1, $v1, 2 /* 3420C4 E002E6E4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/code_342140/func_E0030A68.s b/asm/nonmatchings/code_342140/func_E0030A68.s index e3c9c91550..b4d1994293 100644 --- a/asm/nonmatchings/code_342140/func_E0030A68.s +++ b/asm/nonmatchings/code_342140/func_E0030A68.s @@ -5,8 +5,8 @@ glabel func_E0030A68 /* 342BA8 E0030A68 27BDFF20 */ addiu $sp, $sp, -0xe0 /* 342BAC E0030A6C 3C05DB06 */ lui $a1, 0xdb06 /* 342BB0 E0030A70 34A50024 */ ori $a1, $a1, 0x24 -/* 342BB4 E0030A74 3C09800A */ lui $t1, %hi(D_8009A66C) -/* 342BB8 E0030A78 2529A66C */ addiu $t1, $t1, %lo(D_8009A66C) +/* 342BB4 E0030A74 3C09800A */ lui $t1, %hi(gMasterGfxPos) +/* 342BB8 E0030A78 2529A66C */ addiu $t1, $t1, %lo(gMasterGfxPos) /* 342BBC E0030A7C 3C0638E3 */ lui $a2, 0x38e3 /* 342BC0 E0030A80 3C02E700 */ lui $v0, 0xe700 /* 342BC4 E0030A84 AFBF00CC */ sw $ra, 0xcc($sp) @@ -68,8 +68,8 @@ glabel func_E0030A68 /* 342CA4 E0030B64 354A8E39 */ ori $t2, $t2, 0x8e39 /* 342CA8 E0030B68 AFAA0098 */ sw $t2, 0x98($sp) /* 342CAC E0030B6C 27AA0058 */ addiu $t2, $sp, 0x58 -/* 342CB0 E0030B70 3C168007 */ lui $s6, %hi(D_800741F0) -/* 342CB4 E0030B74 26D641F0 */ addiu $s6, $s6, %lo(D_800741F0) +/* 342CB0 E0030B70 3C168007 */ lui $s6, %hi(gMatrixListPos) +/* 342CB4 E0030B74 26D641F0 */ addiu $s6, $s6, %lo(gMatrixListPos) /* 342CB8 E0030B78 3C130001 */ lui $s3, 1 /* 342CBC E0030B7C 36731630 */ ori $s3, $s3, 0x1630 /* 342CC0 E0030B80 AFAA009C */ sw $t2, 0x9c($sp) @@ -175,8 +175,8 @@ glabel func_E0030A68 /* 342E4C E0030D0C 00A0302D */ daddu $a2, $a1, $zero /* 342E50 E0030D10 27A40018 */ addiu $a0, $sp, 0x18 /* 342E54 E0030D14 96C50000 */ lhu $a1, ($s6) -/* 342E58 E0030D18 3C02800A */ lui $v0, %hi(D_8009A674) -/* 342E5C E0030D1C 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 342E58 E0030D18 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 342E5C E0030D1C 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 342E60 E0030D20 00052980 */ sll $a1, $a1, 6 /* 342E64 E0030D24 00B32821 */ addu $a1, $a1, $s3 /* 342E68 E0030D28 0C080118 */ jal func_E0200460 @@ -186,8 +186,8 @@ glabel func_E0030A68 /* 342E78 E0030D38 4406A000 */ mfc1 $a2, $f20 /* 342E7C E0030D3C 4407A000 */ mfc1 $a3, $f20 /* 342E80 E0030D40 96C80000 */ lhu $t0, ($s6) -/* 342E84 E0030D44 3C03800A */ lui $v1, %hi(D_8009A674) -/* 342E88 E0030D48 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 342E84 E0030D44 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 342E88 E0030D48 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 342E8C E0030D4C 0120282D */ daddu $a1, $t1, $zero /* 342E90 E0030D50 3C0ADA38 */ lui $t2, 0xda38 /* 342E94 E0030D54 3102FFFF */ andi $v0, $t0, 0xffff @@ -205,8 +205,8 @@ glabel func_E0030A68 /* 342EC4 E0030D84 A6C80000 */ sh $t0, ($s6) /* 342EC8 E0030D88 27A40018 */ addiu $a0, $sp, 0x18 /* 342ECC E0030D8C 96C50000 */ lhu $a1, ($s6) -/* 342ED0 E0030D90 3C02800A */ lui $v0, %hi(D_8009A674) -/* 342ED4 E0030D94 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 342ED0 E0030D90 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 342ED4 E0030D94 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 342ED8 E0030D98 00052980 */ sll $a1, $a1, 6 /* 342EDC E0030D9C 00B32821 */ addu $a1, $a1, $s3 /* 342EE0 E0030DA0 0C080118 */ jal func_E0200460 @@ -222,8 +222,8 @@ glabel func_E0030A68 /* 342F08 E0030DC8 AE240000 */ sw $a0, ($s1) /* 342F0C E0030DCC ACAA0000 */ sw $t2, ($a1) /* 342F10 E0030DD0 A6C20000 */ sh $v0, ($s6) -/* 342F14 E0030DD4 3C02800A */ lui $v0, %hi(D_8009A674) -/* 342F18 E0030DD8 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 342F14 E0030DD4 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 342F18 E0030DD8 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 342F1C E0030DDC 00731821 */ addu $v1, $v1, $s3 /* 342F20 E0030DE0 00431021 */ addu $v0, $v0, $v1 /* 342F24 E0030DE4 ACA20004 */ sw $v0, 4($a1) @@ -268,5 +268,5 @@ glabel func_E0030A68 /* 342FBC E0030E7C D7B400D0 */ ldc1 $f20, 0xd0($sp) /* 342FC0 E0030E80 03E00008 */ jr $ra /* 342FC4 E0030E84 27BD00E0 */ addiu $sp, $sp, 0xe0 -/* 342FC8 E0030E88 00000000 */ nop -/* 342FCC E0030E8C 00000000 */ nop +/* 342FC8 E0030E88 00000000 */ nop +/* 342FCC E0030E8C 00000000 */ nop diff --git a/asm/nonmatchings/code_343680/func_E003245C.s b/asm/nonmatchings/code_343680/func_E003245C.s index b2af58b6c2..6e56526722 100644 --- a/asm/nonmatchings/code_343680/func_E003245C.s +++ b/asm/nonmatchings/code_343680/func_E003245C.s @@ -11,8 +11,8 @@ glabel func_E003245C /* 343AF4 E0032474 3C160001 */ lui $s6, 1 /* 343AF8 E0032478 36D61630 */ ori $s6, $s6, 0x1630 /* 343AFC E003247C AFB200A0 */ sw $s2, 0xa0($sp) -/* 343B00 E0032480 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 343B04 E0032484 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 343B00 E0032480 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 343B04 E0032484 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 343B08 E0032488 AFBF00B8 */ sw $ra, 0xb8($sp) /* 343B0C E003248C AFB700B4 */ sw $s7, 0xb4($sp) /* 343B10 E0032490 AFB500AC */ sw $s5, 0xac($sp) @@ -72,10 +72,10 @@ glabel func_E003245C /* 343BE8 E0032568 0C080114 */ jal func_E0200450 /* 343BEC E003256C 00A0302D */ daddu $a2, $a1, $zero /* 343BF0 E0032570 27A40018 */ addiu $a0, $sp, 0x18 -/* 343BF4 E0032574 3C148007 */ lui $s4, %hi(D_800741F0) -/* 343BF8 E0032578 269441F0 */ addiu $s4, $s4, %lo(D_800741F0) -/* 343BFC E003257C 3C17800A */ lui $s7, %hi(D_8009A674) -/* 343C00 E0032580 26F7A674 */ addiu $s7, $s7, %lo(D_8009A674) +/* 343BF4 E0032574 3C148007 */ lui $s4, %hi(gMatrixListPos) +/* 343BF8 E0032578 269441F0 */ addiu $s4, $s4, %lo(gMatrixListPos) +/* 343BFC E003257C 3C17800A */ lui $s7, %hi(gDisplayContext) +/* 343C00 E0032580 26F7A674 */ addiu $s7, $s7, %lo(gDisplayContext) /* 343C04 E0032584 96850000 */ lhu $a1, ($s4) /* 343C08 E0032588 8EE20000 */ lw $v0, ($s7) /* 343C0C E003258C 00052980 */ sll $a1, $a1, 6 @@ -214,8 +214,8 @@ glabel func_E003245C /* 343E0C E003278C 3C0A5555 */ lui $t2, 0x5555 /* 343E10 E0032790 354A5556 */ ori $t2, $t2, 0x5556 /* 343E14 E0032794 3C09D838 */ lui $t1, 0xd838 -/* 343E18 E0032798 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 343E1C E003279C 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 343E18 E0032798 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 343E1C E003279C 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 343E20 E00327A0 35290002 */ ori $t1, $t1, 2 /* 343E24 E00327A4 3C02FA00 */ lui $v0, 0xfa00 /* 343E28 E00327A8 306300FF */ andi $v1, $v1, 0xff @@ -231,8 +231,8 @@ glabel func_E003245C /* 343E50 E00327D0 00441025 */ or $v0, $v0, $a0 /* 343E54 E00327D4 00621825 */ or $v1, $v1, $v0 /* 343E58 E00327D8 24A20008 */ addiu $v0, $a1, 8 -/* 343E5C E00327DC 3C048007 */ lui $a0, %hi(D_800741F0) -/* 343E60 E00327E0 248441F0 */ addiu $a0, $a0, %lo(D_800741F0) +/* 343E5C E00327DC 3C048007 */ lui $a0, %hi(gMatrixListPos) +/* 343E60 E00327E0 248441F0 */ addiu $a0, $a0, %lo(gMatrixListPos) /* 343E64 E00327E4 ACE30004 */ sw $v1, 4($a3) /* 343E68 E00327E8 ACC20000 */ sw $v0, ($a2) /* 343E6C E00327EC 94820000 */ lhu $v0, ($a0) @@ -242,8 +242,8 @@ glabel func_E003245C /* 343E7C E00327FC 3042FFFF */ andi $v0, $v0, 0xffff /* 343E80 E0032800 00021180 */ sll $v0, $v0, 6 /* 343E84 E0032804 A4830000 */ sh $v1, ($a0) -/* 343E88 E0032808 3C03800A */ lui $v1, %hi(D_8009A674) -/* 343E8C E003280C 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 343E88 E0032808 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 343E8C E003280C 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 343E90 E0032810 00481021 */ addu $v0, $v0, $t0 /* 343E94 E0032814 00621821 */ addu $v1, $v1, $v0 /* 343E98 E0032818 24A20010 */ addiu $v0, $a1, 0x10 diff --git a/asm/nonmatchings/code_344A10/func_E0034310.s b/asm/nonmatchings/code_344A10/func_E0034310.s index e9d73a7f40..9ca9184c63 100644 --- a/asm/nonmatchings/code_344A10/func_E0034310.s +++ b/asm/nonmatchings/code_344A10/func_E0034310.s @@ -5,8 +5,8 @@ glabel func_E0034310 /* 344D20 E0034310 27BDFEE8 */ addiu $sp, $sp, -0x118 /* 344D24 E0034314 3C03DB06 */ lui $v1, 0xdb06 /* 344D28 E0034318 AFB600F8 */ sw $s6, 0xf8($sp) -/* 344D2C E003431C 3C16800A */ lui $s6, %hi(D_8009A66C) -/* 344D30 E0034320 26D6A66C */ addiu $s6, $s6, %lo(D_8009A66C) +/* 344D2C E003431C 3C16800A */ lui $s6, %hi(gMasterGfxPos) +/* 344D30 E0034320 26D6A66C */ addiu $s6, $s6, %lo(gMasterGfxPos) /* 344D34 E0034324 34630024 */ ori $v1, $v1, 0x24 /* 344D38 E0034328 AFBF0104 */ sw $ra, 0x104($sp) /* 344D3C E003432C AFBE0100 */ sw $fp, 0x100($sp) @@ -96,10 +96,10 @@ glabel func_E0034310 /* 344E8C E003447C 0C080114 */ jal func_E0200450 /* 344E90 E0034480 27A60018 */ addiu $a2, $sp, 0x18 /* 344E94 E0034484 27A40018 */ addiu $a0, $sp, 0x18 -/* 344E98 E0034488 3C108007 */ lui $s0, %hi(D_800741F0) -/* 344E9C E003448C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 344EA0 E0034490 3C11800A */ lui $s1, %hi(D_8009A674) -/* 344EA4 E0034494 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 344E98 E0034488 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 344E9C E003448C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 344EA0 E0034490 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 344EA4 E0034494 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 344EA8 E0034498 96050000 */ lhu $a1, ($s0) /* 344EAC E003449C 8E220000 */ lw $v0, ($s1) /* 344EB0 E00344A0 00052980 */ sll $a1, $a1, 6 @@ -196,10 +196,10 @@ glabel func_E0034310 /* 345014 E0034604 0C080114 */ jal func_E0200450 /* 345018 E0034608 00A0302D */ daddu $a2, $a1, $zero /* 34501C E003460C 27A40018 */ addiu $a0, $sp, 0x18 -/* 345020 E0034610 3C108007 */ lui $s0, %hi(D_800741F0) -/* 345024 E0034614 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 345028 E0034618 3C11800A */ lui $s1, %hi(D_8009A674) -/* 34502C E003461C 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 345020 E0034610 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 345024 E0034614 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 345028 E0034618 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 34502C E003461C 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 345030 E0034620 96050000 */ lhu $a1, ($s0) /* 345034 E0034624 8E220000 */ lw $v0, ($s1) /* 345038 E0034628 00052980 */ sll $a1, $a1, 6 @@ -286,6 +286,6 @@ glabel func_E0034310 /* 345178 E0034768 D7B40108 */ ldc1 $f20, 0x108($sp) /* 34517C E003476C 03E00008 */ jr $ra /* 345180 E0034770 27BD0118 */ addiu $sp, $sp, 0x118 -/* 345184 E0034774 00000000 */ nop -/* 345188 E0034778 00000000 */ nop -/* 34518C E003477C 00000000 */ nop +/* 345184 E0034774 00000000 */ nop +/* 345188 E0034778 00000000 */ nop +/* 34518C E003477C 00000000 */ nop diff --git a/asm/nonmatchings/code_3454E0/func_E0036224.s b/asm/nonmatchings/code_3454E0/func_E0036224.s index 6079167f06..7701491fca 100644 --- a/asm/nonmatchings/code_3454E0/func_E0036224.s +++ b/asm/nonmatchings/code_3454E0/func_E0036224.s @@ -21,11 +21,11 @@ glabel func_E0036224 /* 345744 E0036264 C4F80018 */ lwc1 $f24, 0x18($a3) /* 345748 E0036268 8CF30000 */ lw $s3, ($a3) /* 34574C E003626C 4600C032 */ c.eq.s $f24, $f0 -/* 345750 E0036270 00000000 */ nop +/* 345750 E0036270 00000000 */ nop /* 345754 E0036274 450100E0 */ bc1t .LE00365F8 /* 345758 E0036278 3C04DB06 */ lui $a0, 0xdb06 -/* 34575C E003627C 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 345760 E0036280 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 34575C E003627C 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 345760 E0036280 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 345764 E0036284 34840024 */ ori $a0, $a0, 0x24 /* 345768 E0036288 8CC50000 */ lw $a1, ($a2) /* 34576C E003628C 3C02E700 */ lui $v0, 0xe700 @@ -125,7 +125,7 @@ glabel func_E0036224 /* 3458DC E00363FC D4226650 */ ldc1 $f2, %lo(D_E0036650)($at) /* 3458E0 E0036400 4600C021 */ cvt.d.s $f0, $f24 /* 3458E4 E0036404 46220002 */ mul.d $f0, $f0, $f2 -/* 3458E8 E0036408 00000000 */ nop +/* 3458E8 E0036408 00000000 */ nop /* 3458EC E003640C 3C120001 */ lui $s2, 1 /* 3458F0 E0036410 36521630 */ ori $s2, $s2, 0x1630 /* 3458F4 E0036414 0200202D */ daddu $a0, $s0, $zero @@ -139,10 +139,10 @@ glabel func_E0036224 /* 345914 E0036434 0C080114 */ jal func_E0200450 /* 345918 E0036438 00A0302D */ daddu $a2, $a1, $zero /* 34591C E003643C 27A40018 */ addiu $a0, $sp, 0x18 -/* 345920 E0036440 3C108007 */ lui $s0, %hi(D_800741F0) -/* 345924 E0036444 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 345928 E0036448 3C11800A */ lui $s1, %hi(D_8009A674) -/* 34592C E003644C 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 345920 E0036440 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 345924 E0036444 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 345928 E0036448 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 34592C E003644C 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 345930 E0036450 96050000 */ lhu $a1, ($s0) /* 345934 E0036454 8E220000 */ lw $v0, ($s1) /* 345938 E0036458 00052980 */ sll $a1, $a1, 6 @@ -156,8 +156,8 @@ glabel func_E0036224 /* 345958 E0036478 26F70000 */ addiu $s7, $s7, 0 /* 34595C E003647C 3C160900 */ lui $s6, 0x900 /* 345960 E0036480 26D64000 */ addiu $s6, $s6, 0x4000 -/* 345964 E0036484 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 345968 E0036488 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 345964 E0036484 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 345968 E0036488 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 34596C E003648C 0040302D */ daddu $a2, $v0, $zero /* 345970 E0036490 3C0DFD68 */ lui $t5, 0xfd68 /* 345974 E0036494 35AD007F */ ori $t5, $t5, 0x7f @@ -236,8 +236,8 @@ glabel func_E0036224 /* 345A90 E00365B0 1440FFD6 */ bnez $v0, .LE003650C /* 345A94 E00365B4 AC640034 */ sw $a0, 0x34($v1) /* 345A98 E00365B8 3C03D838 */ lui $v1, 0xd838 -/* 345A9C E00365BC 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 345AA0 E00365C0 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 345A9C E00365BC 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 345AA0 E00365C0 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 345AA4 E00365C4 8C820000 */ lw $v0, ($a0) /* 345AA8 E00365C8 34630002 */ ori $v1, $v1, 2 /* 345AAC E00365CC 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/code_34DD20/func_E0038748.s b/asm/nonmatchings/code_34DD20/func_E0038748.s index 075f38bf58..e370db410a 100644 --- a/asm/nonmatchings/code_34DD20/func_E0038748.s +++ b/asm/nonmatchings/code_34DD20/func_E0038748.s @@ -6,8 +6,8 @@ glabel func_E0038748 /* 34E46C E003874C AFB700B4 */ sw $s7, 0xb4($sp) /* 34E470 E0038750 0080B82D */ daddu $s7, $a0, $zero /* 34E474 E0038754 3C02DB06 */ lui $v0, 0xdb06 -/* 34E478 E0038758 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 34E47C E003875C 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 34E478 E0038758 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 34E47C E003875C 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 34E480 E0038760 34420024 */ ori $v0, $v0, 0x24 /* 34E484 E0038764 AFBF00BC */ sw $ra, 0xbc($sp) /* 34E488 E0038768 AFBE00B8 */ sw $fp, 0xb8($sp) @@ -52,10 +52,10 @@ glabel func_E0038748 /* 34E524 E0038804 27B10058 */ addiu $s1, $sp, 0x58 /* 34E528 E0038808 3C1E800B */ lui $fp, %hi(gCameras) /* 34E52C E003880C 27DE1D80 */ addiu $fp, $fp, %lo(gCameras) -/* 34E530 E0038810 3C16800A */ lui $s6, %hi(D_8009A674) -/* 34E534 E0038814 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) -/* 34E538 E0038818 3C158007 */ lui $s5, %hi(D_800741F0) -/* 34E53C E003881C 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) +/* 34E530 E0038810 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 34E534 E0038814 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) +/* 34E538 E0038818 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 34E53C E003881C 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) /* 34E540 E0038820 3C140001 */ lui $s4, 1 /* 34E544 E0038824 36941630 */ ori $s4, $s4, 0x1630 /* 34E548 E0038828 00C0982D */ daddu $s3, $a2, $zero @@ -171,6 +171,6 @@ glabel func_E0038748 /* 34E6F8 E00389D8 D7B400C0 */ ldc1 $f20, 0xc0($sp) /* 34E6FC E00389DC 03E00008 */ jr $ra /* 34E700 E00389E0 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* 34E704 E00389E4 00000000 */ nop -/* 34E708 E00389E8 00000000 */ nop -/* 34E70C E00389EC 00000000 */ nop +/* 34E704 E00389E4 00000000 */ nop +/* 34E708 E00389E8 00000000 */ nop +/* 34E70C E00389EC 00000000 */ nop diff --git a/asm/nonmatchings/code_34EC80/func_E003A354.s b/asm/nonmatchings/code_34EC80/func_E003A354.s index 7a9febf258..9c20c1bf55 100644 --- a/asm/nonmatchings/code_34EC80/func_E003A354.s +++ b/asm/nonmatchings/code_34EC80/func_E003A354.s @@ -11,8 +11,8 @@ glabel func_E003A354 /* 34EFEC E003A36C AFB200E8 */ sw $s2, 0xe8($sp) /* 34EFF0 E003A370 3C120001 */ lui $s2, 1 /* 34EFF4 E003A374 AFB300EC */ sw $s3, 0xec($sp) -/* 34EFF8 E003A378 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 34EFFC E003A37C 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 34EFF8 E003A378 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 34EFFC E003A37C 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 34F000 E003A380 AFBF0104 */ sw $ra, 0x104($sp) /* 34F004 E003A384 AFB700FC */ sw $s7, 0xfc($sp) /* 34F008 E003A388 AFB600F8 */ sw $s6, 0xf8($sp) @@ -41,9 +41,9 @@ glabel func_E003A354 /* 34F064 E003A3E4 3C02E700 */ lui $v0, 0xe700 /* 34F068 E003A3E8 4600110D */ trunc.w.s $f4, $f2 /* 34F06C E003A3EC 44152000 */ mfc1 $s5, $f4 -/* 34F070 E003A3F0 00000000 */ nop +/* 34F070 E003A3F0 00000000 */ nop /* 34F074 E003A3F4 44950000 */ mtc1 $s5, $f0 -/* 34F078 E003A3F8 00000000 */ nop +/* 34F078 E003A3F8 00000000 */ nop /* 34F07C E003A3FC 46800020 */ cvt.s.w $f0, $f0 /* 34F080 E003A400 46001081 */ sub.s $f2, $f2, $f0 /* 34F084 E003A404 ACA20000 */ sw $v0, ($a1) @@ -62,7 +62,7 @@ glabel func_E003A354 /* 34F0B8 E003A438 00A22821 */ addu $a1, $a1, $v0 /* 34F0BC E003A43C 3AA20007 */ xori $v0, $s5, 7 /* 34F0C0 E003A440 46001082 */ mul.s $f2, $f2, $f0 -/* 34F0C4 E003A444 00000000 */ nop +/* 34F0C4 E003A444 00000000 */ nop /* 34F0C8 E003A448 AC650004 */ sw $a1, 4($v1) /* 34F0CC E003A44C 8E850004 */ lw $a1, 4($s4) /* 34F0D0 E003A450 8E860008 */ lw $a2, 8($s4) @@ -99,10 +99,10 @@ glabel func_E003A354 /* 34F14C E003A4CC 0C080114 */ jal func_E0200450 /* 34F150 E003A4D0 0200302D */ daddu $a2, $s0, $zero /* 34F154 E003A4D4 0200202D */ daddu $a0, $s0, $zero -/* 34F158 E003A4D8 3C108007 */ lui $s0, %hi(D_800741F0) -/* 34F15C E003A4DC 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 34F160 E003A4E0 3C11800A */ lui $s1, %hi(D_8009A674) -/* 34F164 E003A4E4 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 34F158 E003A4D8 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 34F15C E003A4DC 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 34F160 E003A4E0 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 34F164 E003A4E4 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 34F168 E003A4E8 96050000 */ lhu $a1, ($s0) /* 34F16C E003A4EC 8E220000 */ lw $v0, ($s1) /* 34F170 E003A4F0 00052980 */ sll $a1, $a1, 6 @@ -150,8 +150,8 @@ glabel func_E003A354 /* 34F214 E003A594 ACA40008 */ sw $a0, 8($a1) /* 34F218 E003A598 ACA2000C */ sw $v0, 0xc($a1) .LE003A59C: -/* 34F21C E003A59C 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 34F220 E003A5A0 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 34F21C E003A59C 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 34F220 E003A5A0 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 34F224 E003A5A4 3C02FB00 */ lui $v0, 0xfb00 /* 34F228 E003A5A8 3C04F200 */ lui $a0, 0xf200 /* 34F22C E003A5AC 8D050000 */ lw $a1, ($t0) @@ -210,14 +210,14 @@ glabel func_E003A354 /* 34F2F8 E003A678 0222102A */ slt $v0, $s1, $v0 /* 34F2FC E003A67C 10400037 */ beqz $v0, .LE003A75C /* 34F300 E003A680 26940034 */ addiu $s4, $s4, 0x34 -/* 34F304 E003A684 3C16800A */ lui $s6, %hi(D_8009A674) -/* 34F308 E003A688 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) -/* 34F30C E003A68C 3C158007 */ lui $s5, %hi(D_800741F0) -/* 34F310 E003A690 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) +/* 34F304 E003A684 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 34F308 E003A688 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) +/* 34F30C E003A68C 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 34F310 E003A690 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) /* 34F314 E003A694 3C130001 */ lui $s3, 1 /* 34F318 E003A698 36731630 */ ori $s3, $s3, 0x1630 -/* 34F31C E003A69C 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 34F320 E003A6A0 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 34F31C E003A69C 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 34F320 E003A6A0 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 34F324 E003A6A4 2690000C */ addiu $s0, $s4, 0xc .LE003A6A8: /* 34F328 E003A6A8 27A40018 */ addiu $a0, $sp, 0x18 @@ -267,8 +267,8 @@ glabel func_E003A354 /* 34F3D8 E003A758 AE440000 */ sw $a0, ($s2) .LE003A75C: /* 34F3DC E003A75C 3C02D838 */ lui $v0, 0xd838 -/* 34F3E0 E003A760 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 34F3E4 E003A764 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 34F3E0 E003A760 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 34F3E4 E003A764 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 34F3E8 E003A768 8CA40000 */ lw $a0, ($a1) /* 34F3EC E003A76C 34420002 */ ori $v0, $v0, 2 /* 34F3F0 E003A770 0080182D */ daddu $v1, $a0, $zero @@ -305,6 +305,6 @@ glabel func_E003A354 /* 34F468 E003A7E8 8FB000E0 */ lw $s0, 0xe0($sp) /* 34F46C E003A7EC 03E00008 */ jr $ra /* 34F470 E003A7F0 27BD0108 */ addiu $sp, $sp, 0x108 -/* 34F474 E003A7F4 00000000 */ nop -/* 34F478 E003A7F8 00000000 */ nop -/* 34F47C E003A7FC 00000000 */ nop +/* 34F474 E003A7F4 00000000 */ nop +/* 34F478 E003A7F8 00000000 */ nop +/* 34F47C E003A7FC 00000000 */ nop diff --git a/asm/nonmatchings/code_34F4C0/func_E003C498.s b/asm/nonmatchings/code_34F4C0/func_E003C498.s index eaf45e77c4..8d0f1ad144 100644 --- a/asm/nonmatchings/code_34F4C0/func_E003C498.s +++ b/asm/nonmatchings/code_34F4C0/func_E003C498.s @@ -8,8 +8,8 @@ glabel func_E003C498 /* 34F964 E003C4A4 AFA400E8 */ sw $a0, 0xe8($sp) /* 34F968 E003C4A8 27A40020 */ addiu $a0, $sp, 0x20 /* 34F96C E003C4AC AFB300BC */ sw $s3, 0xbc($sp) -/* 34F970 E003C4B0 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 34F974 E003C4B4 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 34F970 E003C4B0 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 34F974 E003C4B4 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 34F978 E003C4B8 8FAA00E8 */ lw $t2, 0xe8($sp) /* 34F97C E003C4BC 3C02E700 */ lui $v0, 0xe700 /* 34F980 E003C4C0 AFBF00D4 */ sw $ra, 0xd4($sp) @@ -73,10 +73,10 @@ glabel func_E003C498 /* 34FA68 E003C5A8 0C080114 */ jal func_E0200450 /* 34FA6C E003C5AC 00A0302D */ daddu $a2, $a1, $zero /* 34FA70 E003C5B0 27A40020 */ addiu $a0, $sp, 0x20 -/* 34FA74 E003C5B4 3C108007 */ lui $s0, %hi(D_800741F0) -/* 34FA78 E003C5B8 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 34FA7C E003C5BC 3C11800A */ lui $s1, %hi(D_8009A674) -/* 34FA80 E003C5C0 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 34FA74 E003C5B4 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 34FA78 E003C5B8 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 34FA7C E003C5BC 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 34FA80 E003C5C0 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 34FA84 E003C5C4 96050000 */ lhu $a1, ($s0) /* 34FA88 E003C5C8 8E220000 */ lw $v0, ($s1) /* 34FA8C E003C5CC 00052980 */ sll $a1, $a1, 6 @@ -140,12 +140,12 @@ glabel func_E003C498 /* 34FB6C E003C6AC 0242102A */ slt $v0, $s2, $v0 /* 34FB70 E003C6B0 10400161 */ beqz $v0, .LE003CC38 /* 34FB74 E003C6B4 3C15DE00 */ lui $s5, 0xde00 -/* 34FB78 E003C6B8 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 34FB7C E003C6BC 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) -/* 34FB80 E003C6C0 3C17800A */ lui $s7, %hi(D_8009A674) -/* 34FB84 E003C6C4 26F7A674 */ addiu $s7, $s7, %lo(D_8009A674) -/* 34FB88 E003C6C8 3C168007 */ lui $s6, %hi(D_800741F0) -/* 34FB8C E003C6CC 26D641F0 */ addiu $s6, $s6, %lo(D_800741F0) +/* 34FB78 E003C6B8 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 34FB7C E003C6BC 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) +/* 34FB80 E003C6C0 3C17800A */ lui $s7, %hi(gDisplayContext) +/* 34FB84 E003C6C4 26F7A674 */ addiu $s7, $s7, %lo(gDisplayContext) +/* 34FB88 E003C6C8 3C168007 */ lui $s6, %hi(gMatrixListPos) +/* 34FB8C E003C6CC 26D641F0 */ addiu $s6, $s6, %lo(gMatrixListPos) /* 34FB90 E003C6D0 3C130001 */ lui $s3, 1 /* 34FB94 E003C6D4 36731630 */ ori $s3, $s3, 0x1630 /* 34FB98 E003C6D8 3C1ED838 */ lui $fp, 0xd838 @@ -247,7 +247,7 @@ glabel func_E003C498 /* 34FD14 E003C854 46020000 */ add.s $f0, $f0, $f2 /* 34FD18 E003C858 46000021 */ cvt.d.s $f0, $f0 /* 34FD1C E003C85C 46360002 */ mul.d $f0, $f0, $f22 -/* 34FD20 E003C860 00000000 */ nop +/* 34FD20 E003C860 00000000 */ nop /* 34FD24 E003C864 46200020 */ cvt.s.d $f0, $f0 /* 34FD28 E003C868 E7A00014 */ swc1 $f0, 0x14($sp) /* 34FD2C E003C86C C620FFDC */ lwc1 $f0, -0x24($s1) @@ -255,7 +255,7 @@ glabel func_E003C498 /* 34FD34 E003C874 46020000 */ add.s $f0, $f0, $f2 /* 34FD38 E003C878 46000021 */ cvt.d.s $f0, $f0 /* 34FD3C E003C87C 46360002 */ mul.d $f0, $f0, $f22 -/* 34FD40 E003C880 00000000 */ nop +/* 34FD40 E003C880 00000000 */ nop /* 34FD44 E003C884 4405A000 */ mfc1 $a1, $f20 /* 34FD48 E003C888 46200020 */ cvt.s.d $f0, $f0 /* 34FD4C E003C88C E7A00018 */ swc1 $f0, 0x18($sp) @@ -267,7 +267,7 @@ glabel func_E003C498 /* 34FD64 E003C8A4 25290001 */ addiu $t1, $t1, 1 /* 34FD68 E003C8A8 46000021 */ cvt.d.s $f0, $f0 /* 34FD6C E003C8AC 46360002 */ mul.d $f0, $f0, $f22 -/* 34FD70 E003C8B0 00000000 */ nop +/* 34FD70 E003C8B0 00000000 */ nop /* 34FD74 E003C8B4 27A40020 */ addiu $a0, $sp, 0x20 /* 34FD78 E003C8B8 25020008 */ addiu $v0, $t0, 8 /* 34FD7C E003C8BC AE080000 */ sw $t0, ($s0) @@ -501,8 +501,8 @@ glabel func_E003C498 /* 3500F4 E003CC34 AE020000 */ sw $v0, ($s0) .LE003CC38: /* 3500F8 E003CC38 3C05D838 */ lui $a1, 0xd838 -/* 3500FC E003CC3C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 350100 E003CC40 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 3500FC E003CC3C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 350100 E003CC40 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 350104 E003CC44 8C620000 */ lw $v0, ($v1) /* 350108 E003CC48 34A50002 */ ori $a1, $a1, 2 /* 35010C E003CC4C 0040202D */ daddu $a0, $v0, $zero @@ -525,4 +525,4 @@ glabel func_E003C498 /* 350150 E003CC90 D7B400D8 */ ldc1 $f20, 0xd8($sp) /* 350154 E003CC94 03E00008 */ jr $ra /* 350158 E003CC98 27BD00E8 */ addiu $sp, $sp, 0xe8 -/* 35015C E003CC9C 00000000 */ nop +/* 35015C E003CC9C 00000000 */ nop diff --git a/asm/nonmatchings/code_352440/func_E003E638.s b/asm/nonmatchings/code_352440/func_E003E638.s index 3fad19fab1..1de085138a 100644 --- a/asm/nonmatchings/code_352440/func_E003E638.s +++ b/asm/nonmatchings/code_352440/func_E003E638.s @@ -10,8 +10,8 @@ glabel func_E003E638 /* 352A8C E003E64C AFB500A4 */ sw $s5, 0xa4($sp) /* 352A90 E003E650 3C150001 */ lui $s5, 1 /* 352A94 E003E654 AFB20098 */ sw $s2, 0x98($sp) -/* 352A98 E003E658 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 352A9C E003E65C 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 352A98 E003E658 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 352A9C E003E65C 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 352AA0 E003E660 AFB600A8 */ sw $s6, 0xa8($sp) /* 352AA4 E003E664 3C16E700 */ lui $s6, 0xe700 /* 352AA8 E003E668 AFBF00AC */ sw $ra, 0xac($sp) @@ -79,10 +79,10 @@ glabel func_E003E638 /* 352BA0 E003E760 0C080114 */ jal func_E0200450 /* 352BA4 E003E764 00A0302D */ daddu $a2, $a1, $zero /* 352BA8 E003E768 27A40010 */ addiu $a0, $sp, 0x10 -/* 352BAC E003E76C 3C108007 */ lui $s0, %hi(D_800741F0) -/* 352BB0 E003E770 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 352BB4 E003E774 3C13800A */ lui $s3, %hi(D_8009A674) -/* 352BB8 E003E778 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* 352BAC E003E76C 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 352BB0 E003E770 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 352BB4 E003E774 3C13800A */ lui $s3, %hi(gDisplayContext) +/* 352BB8 E003E778 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* 352BBC E003E77C 96050000 */ lhu $a1, ($s0) /* 352BC0 E003E780 8E620000 */ lw $v0, ($s3) /* 352BC4 E003E784 00052980 */ sll $a1, $a1, 6 @@ -142,5 +142,5 @@ glabel func_E003E638 /* 352C9C E003E85C 8FB00090 */ lw $s0, 0x90($sp) /* 352CA0 E003E860 03E00008 */ jr $ra /* 352CA4 E003E864 27BD00B0 */ addiu $sp, $sp, 0xb0 -/* 352CA8 E003E868 00000000 */ nop -/* 352CAC E003E86C 00000000 */ nop +/* 352CA8 E003E868 00000000 */ nop +/* 352CAC E003E86C 00000000 */ nop diff --git a/asm/nonmatchings/code_353300/func_E0040348.s b/asm/nonmatchings/code_353300/func_E0040348.s index 891297ed05..171557c167 100644 --- a/asm/nonmatchings/code_353300/func_E0040348.s +++ b/asm/nonmatchings/code_353300/func_E0040348.s @@ -5,8 +5,8 @@ glabel func_E0040348 /* 353648 E0040348 27BDFF08 */ addiu $sp, $sp, -0xf8 /* 35364C E004034C 3C03DB06 */ lui $v1, 0xdb06 /* 353650 E0040350 AFB400E8 */ sw $s4, 0xe8($sp) -/* 353654 E0040354 3C14800A */ lui $s4, %hi(D_8009A66C) -/* 353658 E0040358 2694A66C */ addiu $s4, $s4, %lo(D_8009A66C) +/* 353654 E0040354 3C14800A */ lui $s4, %hi(gMasterGfxPos) +/* 353658 E0040358 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) /* 35365C E004035C 34630024 */ ori $v1, $v1, 0x24 /* 353660 E0040360 AFB600F0 */ sw $s6, 0xf0($sp) /* 353664 E0040364 3C16E700 */ lui $s6, 0xe700 @@ -36,7 +36,7 @@ glabel func_E0040348 /* 3536C4 E00403C4 24E20008 */ addiu $v0, $a3, 8 /* 3536C8 E00403C8 AE820000 */ sw $v0, ($s4) /* 3536CC E00403CC 46040002 */ mul.s $f0, $f0, $f4 -/* 3536D0 E00403D0 00000000 */ nop +/* 3536D0 E00403D0 00000000 */ nop /* 3536D4 E00403D4 8C62001C */ lw $v0, 0x1c($v1) /* 3536D8 E00403D8 3C15800B */ lui $s5, %hi(gCameras) /* 3536DC E00403DC 26B51D80 */ addiu $s5, $s5, %lo(gCameras) @@ -44,7 +44,7 @@ glabel func_E0040348 /* 3536E4 E00403E4 ACE20004 */ sw $v0, 4($a3) /* 3536E8 E00403E8 8E030000 */ lw $v1, ($s0) /* 3536EC E00403EC 46041082 */ mul.s $f2, $f2, $f4 -/* 3536F0 E00403F0 00000000 */ nop +/* 3536F0 E00403F0 00000000 */ nop /* 3536F4 E00403F4 00031080 */ sll $v0, $v1, 2 /* 3536F8 E00403F8 00431021 */ addu $v0, $v0, $v1 /* 3536FC E00403FC 00021080 */ sll $v0, $v0, 2 @@ -103,27 +103,27 @@ glabel func_E0040348 /* 3537D0 E00404D0 8502000E */ lh $v0, 0xe($t0) /* 3537D4 E00404D4 24E30018 */ addiu $v1, $a3, 0x18 /* 3537D8 E00404D8 44821000 */ mtc1 $v0, $f2 -/* 3537DC E00404DC 00000000 */ nop +/* 3537DC E00404DC 00000000 */ nop /* 3537E0 E00404E0 468010A0 */ cvt.s.w $f2, $f2 /* 3537E4 E00404E4 46041082 */ mul.s $f2, $f2, $f4 -/* 3537E8 E00404E8 00000000 */ nop +/* 3537E8 E00404E8 00000000 */ nop /* 3537EC E00404EC AE830000 */ sw $v1, ($s4) /* 3537F0 E00404F0 85020010 */ lh $v0, 0x10($t0) /* 3537F4 E00404F4 24E30020 */ addiu $v1, $a3, 0x20 /* 3537F8 E00404F8 44820000 */ mtc1 $v0, $f0 -/* 3537FC E00404FC 00000000 */ nop +/* 3537FC E00404FC 00000000 */ nop /* 353800 E0040500 46800020 */ cvt.s.w $f0, $f0 /* 353804 E0040504 46040002 */ mul.s $f0, $f0, $f4 -/* 353808 E0040508 00000000 */ nop +/* 353808 E0040508 00000000 */ nop /* 35380C E004050C AE830000 */ sw $v1, ($s4) /* 353810 E0040510 4600118D */ trunc.w.s $f6, $f2 /* 353814 E0040514 44023000 */ mfc1 $v0, $f6 -/* 353818 E0040518 00000000 */ nop +/* 353818 E0040518 00000000 */ nop /* 35381C E004051C 30420FFF */ andi $v0, $v0, 0xfff /* 353820 E0040520 00021300 */ sll $v0, $v0, 0xc /* 353824 E0040524 4600018D */ trunc.w.s $f6, $f0 /* 353828 E0040528 44033000 */ mfc1 $v1, $f6 -/* 35382C E004052C 00000000 */ nop +/* 35382C E004052C 00000000 */ nop /* 353830 E0040530 30630FFF */ andi $v1, $v1, 0xfff /* 353834 E0040534 00641825 */ or $v1, $v1, $a0 /* 353838 E0040538 00431025 */ or $v0, $v0, $v1 @@ -135,27 +135,27 @@ glabel func_E0040348 /* 353850 E0040550 85020010 */ lh $v0, 0x10($t0) /* 353854 E0040554 00641821 */ addu $v1, $v1, $a0 /* 353858 E0040558 44831000 */ mtc1 $v1, $f2 -/* 35385C E004055C 00000000 */ nop +/* 35385C E004055C 00000000 */ nop /* 353860 E0040560 468010A0 */ cvt.s.w $f2, $f2 /* 353864 E0040564 46041082 */ mul.s $f2, $f2, $f4 -/* 353868 E0040568 00000000 */ nop +/* 353868 E0040568 00000000 */ nop /* 35386C E004056C 8503000C */ lh $v1, 0xc($t0) /* 353870 E0040570 24E40030 */ addiu $a0, $a3, 0x30 /* 353874 E0040574 00431021 */ addu $v0, $v0, $v1 /* 353878 E0040578 44820000 */ mtc1 $v0, $f0 -/* 35387C E004057C 00000000 */ nop +/* 35387C E004057C 00000000 */ nop /* 353880 E0040580 46800020 */ cvt.s.w $f0, $f0 /* 353884 E0040584 46040002 */ mul.s $f0, $f0, $f4 -/* 353888 E0040588 00000000 */ nop +/* 353888 E0040588 00000000 */ nop /* 35388C E004058C AE840000 */ sw $a0, ($s4) /* 353890 E0040590 4600118D */ trunc.w.s $f6, $f2 /* 353894 E0040594 44023000 */ mfc1 $v0, $f6 -/* 353898 E0040598 00000000 */ nop +/* 353898 E0040598 00000000 */ nop /* 35389C E004059C 30420FFF */ andi $v0, $v0, 0xfff /* 3538A0 E00405A0 00021300 */ sll $v0, $v0, 0xc /* 3538A4 E00405A4 4600018D */ trunc.w.s $f6, $f0 /* 3538A8 E00405A8 44033000 */ mfc1 $v1, $f6 -/* 3538AC E00405AC 00000000 */ nop +/* 3538AC E00405AC 00000000 */ nop /* 3538B0 E00405B0 30630FFF */ andi $v1, $v1, 0xfff /* 3538B4 E00405B4 00431025 */ or $v0, $v0, $v1 /* 3538B8 E00405B8 ACE2002C */ sw $v0, 0x2c($a3) @@ -251,11 +251,11 @@ glabel func_E0040348 /* 353A1C E004071C C6420010 */ lwc1 $f2, 0x10($s2) /* 353A20 E0040720 C6400030 */ lwc1 $f0, 0x30($s2) /* 353A24 E0040724 46001002 */ mul.s $f0, $f2, $f0 -/* 353A28 E0040728 00000000 */ nop +/* 353A28 E0040728 00000000 */ nop /* 353A2C E004072C 44050000 */ mfc1 $a1, $f0 /* 353A30 E0040730 C640002C */ lwc1 $f0, 0x2c($s2) /* 353A34 E0040734 46001002 */ mul.s $f0, $f2, $f0 -/* 353A38 E0040738 00000000 */ nop +/* 353A38 E0040738 00000000 */ nop /* 353A3C E004073C 0220202D */ daddu $a0, $s1, $zero /* 353A40 E0040740 44071000 */ mfc1 $a3, $f2 /* 353A44 E0040744 3C120001 */ lui $s2, 1 @@ -267,10 +267,10 @@ glabel func_E0040348 /* 353A5C E004075C 0C080114 */ jal func_E0200450 /* 353A60 E0040760 0200302D */ daddu $a2, $s0, $zero /* 353A64 E0040764 0200202D */ daddu $a0, $s0, $zero -/* 353A68 E0040768 3C108007 */ lui $s0, %hi(D_800741F0) -/* 353A6C E004076C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 353A70 E0040770 3C11800A */ lui $s1, %hi(D_8009A674) -/* 353A74 E0040774 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 353A68 E0040768 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 353A6C E004076C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 353A70 E0040770 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 353A74 E0040774 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 353A78 E0040778 96050000 */ lhu $a1, ($s0) /* 353A7C E004077C 8E220000 */ lw $v0, ($s1) /* 353A80 E0040780 00052980 */ sll $a1, $a1, 6 @@ -319,5 +319,5 @@ glabel func_E0040348 /* 353B2C E004082C 8FB000D8 */ lw $s0, 0xd8($sp) /* 353B30 E0040830 03E00008 */ jr $ra /* 353B34 E0040834 27BD00F8 */ addiu $sp, $sp, 0xf8 -/* 353B38 E0040838 00000000 */ nop -/* 353B3C E004083C 00000000 */ nop +/* 353B38 E0040838 00000000 */ nop +/* 353B3C E004083C 00000000 */ nop diff --git a/asm/nonmatchings/code_3547A0/func_E00423B8.s b/asm/nonmatchings/code_3547A0/func_E00423B8.s index 40a97ea77c..d924682276 100644 --- a/asm/nonmatchings/code_3547A0/func_E00423B8.s +++ b/asm/nonmatchings/code_3547A0/func_E00423B8.s @@ -7,8 +7,8 @@ glabel func_E00423B8 /* 354B60 E00423C0 34A50024 */ ori $a1, $a1, 0x24 /* 354B64 E00423C4 3C0638E3 */ lui $a2, 0x38e3 /* 354B68 E00423C8 34C68E39 */ ori $a2, $a2, 0x8e39 -/* 354B6C E00423CC 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 354B70 E00423D0 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 354B6C E00423CC 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 354B70 E00423D0 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 354B74 E00423D4 3C02E700 */ lui $v0, 0xe700 /* 354B78 E00423D8 AFBF00C4 */ sw $ra, 0xc4($sp) /* 354B7C E00423DC AFBE00C0 */ sw $fp, 0xc0($sp) @@ -181,10 +181,10 @@ glabel func_E00423B8 /* 354E14 E0042674 0C080114 */ jal func_E0200450 /* 354E18 E0042678 00A0302D */ daddu $a2, $a1, $zero /* 354E1C E004267C 27A40018 */ addiu $a0, $sp, 0x18 -/* 354E20 E0042680 3C058007 */ lui $a1, %hi(D_800741F0) -/* 354E24 E0042684 94A541F0 */ lhu $a1, %lo(D_800741F0)($a1) -/* 354E28 E0042688 3C02800A */ lui $v0, %hi(D_8009A674) -/* 354E2C E004268C 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 354E20 E0042680 3C058007 */ lui $a1, %hi(gMatrixListPos) +/* 354E24 E0042684 94A541F0 */ lhu $a1, %lo(gMatrixListPos)($a1) +/* 354E28 E0042688 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 354E2C E004268C 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 354E30 E0042690 8FA9009C */ lw $t1, 0x9c($sp) /* 354E34 E0042694 00052980 */ sll $a1, $a1, 6 /* 354E38 E0042698 00A92821 */ addu $a1, $a1, $t1 @@ -196,18 +196,18 @@ glabel func_E00423B8 /* 354E50 E00426B0 0080282D */ daddu $a1, $a0, $zero /* 354E54 E00426B4 24840008 */ addiu $a0, $a0, 8 /* 354E58 E00426B8 AE840000 */ sw $a0, ($s4) -/* 354E5C E00426BC 3C028007 */ lui $v0, %hi(D_800741F0) -/* 354E60 E00426C0 944241F0 */ lhu $v0, %lo(D_800741F0)($v0) +/* 354E5C E00426BC 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* 354E60 E00426C0 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) /* 354E64 E00426C4 3C03DA38 */ lui $v1, 0xda38 /* 354E68 E00426C8 ACA30000 */ sw $v1, ($a1) /* 354E6C E00426CC 8FA9009C */ lw $t1, 0x9c($sp) /* 354E70 E00426D0 24430001 */ addiu $v1, $v0, 1 /* 354E74 E00426D4 3042FFFF */ andi $v0, $v0, 0xffff /* 354E78 E00426D8 00021180 */ sll $v0, $v0, 6 -/* 354E7C E00426DC 3C018007 */ lui $at, %hi(D_800741F0) -/* 354E80 E00426E0 A42341F0 */ sh $v1, %lo(D_800741F0)($at) -/* 354E84 E00426E4 3C03800A */ lui $v1, %hi(D_8009A674) -/* 354E88 E00426E8 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 354E7C E00426DC 3C018007 */ lui $at, %hi(gMatrixListPos) +/* 354E80 E00426E0 A42341F0 */ sh $v1, %lo(gMatrixListPos)($at) +/* 354E84 E00426E4 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 354E88 E00426E8 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 354E8C E00426EC 00491021 */ addu $v0, $v0, $t1 /* 354E90 E00426F0 00621821 */ addu $v1, $v1, $v0 /* 354E94 E00426F4 24820008 */ addiu $v0, $a0, 8 @@ -243,6 +243,6 @@ glabel func_E00423B8 /* 354F08 E0042768 D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 354F0C E004276C 03E00008 */ jr $ra /* 354F10 E0042770 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 354F14 E0042774 00000000 */ nop -/* 354F18 E0042778 00000000 */ nop -/* 354F1C E004277C 00000000 */ nop +/* 354F14 E0042774 00000000 */ nop +/* 354F18 E0042778 00000000 */ nop +/* 354F1C E004277C 00000000 */ nop diff --git a/asm/nonmatchings/code_354F60/func_E004491C.s b/asm/nonmatchings/code_354F60/func_E004491C.s index 40f7115ea5..2299244f48 100644 --- a/asm/nonmatchings/code_354F60/func_E004491C.s +++ b/asm/nonmatchings/code_354F60/func_E004491C.s @@ -7,8 +7,8 @@ glabel func_E004491C /* 355884 E0044924 34E70024 */ ori $a3, $a3, 0x24 /* 355888 E0044928 AFA40118 */ sw $a0, 0x118($sp) /* 35588C E004492C 27A40018 */ addiu $a0, $sp, 0x18 -/* 355890 E0044930 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 355894 E0044934 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 355890 E0044930 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 355894 E0044934 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 355898 E0044938 AFBF00FC */ sw $ra, 0xfc($sp) /* 35589C E004493C AFBE00F8 */ sw $fp, 0xf8($sp) /* 3558A0 E0044940 AFB700F4 */ sw $s7, 0xf4($sp) @@ -87,7 +87,7 @@ glabel func_E004491C /* 3559C4 E0044A64 00220821 */ addu $at, $at, $v0 /* 3559C8 E0044A68 8C224F00 */ lw $v0, %lo(D_E0044F00)($at) /* 3559CC E0044A6C 00400008 */ jr $v0 -/* 3559D0 E0044A70 00000000 */ nop +/* 3559D0 E0044A70 00000000 */ nop /* 3559D4 E0044A74 3C013F80 */ lui $at, 0x3f80 /* 3559D8 E0044A78 4481C000 */ mtc1 $at, $f24 /* 3559DC E0044A7C 3C013F00 */ lui $at, 0x3f00 @@ -96,7 +96,7 @@ glabel func_E004491C /* 3559E8 E0044A88 3421CCCD */ ori $at, $at, 0xcccd /* 3559EC E0044A8C 4481A000 */ mtc1 $at, $f20 /* 3559F0 E0044A90 080112CC */ j .LE0044B30 -/* 3559F4 E0044A94 00000000 */ nop +/* 3559F4 E0044A94 00000000 */ nop /* 3559F8 E0044A98 3C013F80 */ lui $at, 0x3f80 /* 3559FC E0044A9C 4481C000 */ mtc1 $at, $f24 /* 355A00 E0044AA0 3C013F4C */ lui $at, 0x3f4c @@ -110,8 +110,8 @@ glabel func_E004491C /* 355A20 E0044AC0 3C06E200 */ lui $a2, 0xe200 /* 355A24 E0044AC4 34C6001C */ ori $a2, $a2, 0x1c /* 355A28 E0044AC8 3C050050 */ lui $a1, 0x50 -/* 355A2C E0044ACC 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 355A30 E0044AD0 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 355A2C E0044ACC 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 355A30 E0044AD0 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 355A34 E0044AD4 8C820000 */ lw $v0, ($a0) /* 355A38 E0044AD8 34A54B50 */ ori $a1, $a1, 0x4b50 /* 355A3C E0044ADC 0040182D */ daddu $v1, $v0, $zero @@ -144,12 +144,12 @@ glabel func_E004491C /* 355AA0 E0044B40 18400083 */ blez $v0, .LE0044D50 /* 355AA4 E0044B44 0000902D */ daddu $s2, $zero, $zero /* 355AA8 E0044B48 27B60058 */ addiu $s6, $sp, 0x58 -/* 355AAC E0044B4C 3C178007 */ lui $s7, %hi(D_800741F0) -/* 355AB0 E0044B50 26F741F0 */ addiu $s7, $s7, %lo(D_800741F0) +/* 355AAC E0044B4C 3C178007 */ lui $s7, %hi(gMatrixListPos) +/* 355AB0 E0044B50 26F741F0 */ addiu $s7, $s7, %lo(gMatrixListPos) /* 355AB4 E0044B54 3C150001 */ lui $s5, 1 /* 355AB8 E0044B58 36B51630 */ ori $s5, $s5, 0x1630 -/* 355ABC E0044B5C 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 355AC0 E0044B60 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 355ABC E0044B5C 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 355AC0 E0044B60 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 355AC4 E0044B64 2631001C */ addiu $s1, $s1, 0x1c /* 355AC8 E0044B68 3C1EE004 */ lui $fp, %hi(D_E0044DD0) /* 355ACC E0044B6C 27DE4DD0 */ addiu $fp, $fp, %lo(D_E0044DD0) @@ -157,7 +157,7 @@ glabel func_E004491C .LE0044B74: /* 355AD4 E0044B74 8E34000C */ lw $s4, 0xc($s1) /* 355AD8 E0044B78 0680006E */ bltz $s4, .LE0044D34 -/* 355ADC E0044B7C 00000000 */ nop +/* 355ADC E0044B7C 00000000 */ nop /* 355AE0 E0044B80 8E25FFE8 */ lw $a1, -0x18($s1) /* 355AE4 E0044B84 8E26FFEC */ lw $a2, -0x14($s1) /* 355AE8 E0044B88 8E27FFF0 */ lw $a3, -0x10($s1) @@ -173,8 +173,8 @@ glabel func_E004491C /* 355B10 E0044BB0 E7A00058 */ swc1 $f0, 0x58($sp) /* 355B14 E0044BB4 27A40018 */ addiu $a0, $sp, 0x18 /* 355B18 E0044BB8 96E50000 */ lhu $a1, ($s7) -/* 355B1C E0044BBC 3C02800A */ lui $v0, %hi(D_8009A674) -/* 355B20 E0044BC0 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 355B1C E0044BBC 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 355B20 E0044BC0 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 355B24 E0044BC4 00052980 */ sll $a1, $a1, 6 /* 355B28 E0044BC8 00B52821 */ addu $a1, $a1, $s5 /* 355B2C E0044BCC 0C080118 */ jal func_E0200460 @@ -186,27 +186,27 @@ glabel func_E004491C .LE0044BE4: /* 355B44 E0044BE4 92020000 */ lbu $v0, ($s0) /* 355B48 E0044BE8 44822000 */ mtc1 $v0, $f4 -/* 355B4C E0044BEC 00000000 */ nop +/* 355B4C E0044BEC 00000000 */ nop /* 355B50 E0044BF0 46802120 */ cvt.s.w $f4, $f4 /* 355B54 E0044BF4 46182102 */ mul.s $f4, $f4, $f24 -/* 355B58 E0044BF8 00000000 */ nop +/* 355B58 E0044BF8 00000000 */ nop /* 355B5C E0044BFC 26100001 */ addiu $s0, $s0, 1 /* 355B60 E0044C00 92020000 */ lbu $v0, ($s0) /* 355B64 E0044C04 44821000 */ mtc1 $v0, $f2 -/* 355B68 E0044C08 00000000 */ nop +/* 355B68 E0044C08 00000000 */ nop /* 355B6C E0044C0C 468010A0 */ cvt.s.w $f2, $f2 /* 355B70 E0044C10 46161082 */ mul.s $f2, $f2, $f22 -/* 355B74 E0044C14 00000000 */ nop +/* 355B74 E0044C14 00000000 */ nop /* 355B78 E0044C18 26100001 */ addiu $s0, $s0, 1 /* 355B7C E0044C1C 92020000 */ lbu $v0, ($s0) /* 355B80 E0044C20 44820000 */ mtc1 $v0, $f0 -/* 355B84 E0044C24 00000000 */ nop +/* 355B84 E0044C24 00000000 */ nop /* 355B88 E0044C28 46800020 */ cvt.s.w $f0, $f0 /* 355B8C E0044C2C 46140002 */ mul.s $f0, $f0, $f20 -/* 355B90 E0044C30 00000000 */ nop +/* 355B90 E0044C30 00000000 */ nop /* 355B94 E0044C34 4600218D */ trunc.w.s $f6, $f4 /* 355B98 E0044C38 44033000 */ mfc1 $v1, $f6 -/* 355B9C E0044C3C 00000000 */ nop +/* 355B9C E0044C3C 00000000 */ nop /* 355BA0 E0044C40 28620100 */ slti $v0, $v1, 0x100 /* 355BA4 E0044C44 4600118D */ trunc.w.s $f6, $f2 /* 355BA8 E0044C48 44073000 */ mfc1 $a3, $f6 @@ -252,8 +252,8 @@ glabel func_E004491C /* 355C3C E0044CDC 3042FFFF */ andi $v0, $v0, 0xffff /* 355C40 E0044CE0 00021180 */ sll $v0, $v0, 6 /* 355C44 E0044CE4 A6E30000 */ sh $v1, ($s7) -/* 355C48 E0044CE8 3C03800A */ lui $v1, %hi(D_8009A674) -/* 355C4C E0044CEC 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 355C48 E0044CE8 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 355C4C E0044CEC 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 355C50 E0044CF0 00551021 */ addu $v0, $v0, $s5 /* 355C54 E0044CF4 00621821 */ addu $v1, $v1, $v0 /* 355C58 E0044CF8 24820010 */ addiu $v0, $a0, 0x10 @@ -280,8 +280,8 @@ glabel func_E004491C /* 355CA8 E0044D48 1440FF8A */ bnez $v0, .LE0044B74 /* 355CAC E0044D4C 2631002C */ addiu $s1, $s1, 0x2c .LE0044D50: -/* 355CB0 E0044D50 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 355CB4 E0044D54 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 355CB0 E0044D50 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 355CB4 E0044D54 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 355CB8 E0044D58 8C620000 */ lw $v0, ($v1) /* 355CBC E0044D5C 0040202D */ daddu $a0, $v0, $zero /* 355CC0 E0044D60 24420008 */ addiu $v0, $v0, 8 diff --git a/asm/nonmatchings/code_355EE0/func_E00462C0.s b/asm/nonmatchings/code_355EE0/func_E00462C0.s index 0cdcbaba8e..4fb63c88ca 100644 --- a/asm/nonmatchings/code_355EE0/func_E00462C0.s +++ b/asm/nonmatchings/code_355EE0/func_E00462C0.s @@ -4,8 +4,8 @@ glabel func_E00462C0 /* 3561A0 E00462C0 27BDFF48 */ addiu $sp, $sp, -0xb8 /* 3561A4 E00462C4 3C05DB06 */ lui $a1, 0xdb06 -/* 3561A8 E00462C8 3C09800A */ lui $t1, %hi(D_8009A66C) -/* 3561AC E00462CC 2529A66C */ addiu $t1, $t1, %lo(D_8009A66C) +/* 3561A8 E00462C8 3C09800A */ lui $t1, %hi(gMasterGfxPos) +/* 3561AC E00462CC 2529A66C */ addiu $t1, $t1, %lo(gMasterGfxPos) /* 3561B0 E00462D0 34A50024 */ ori $a1, $a1, 0x24 /* 3561B4 E00462D4 3C02E700 */ lui $v0, 0xe700 /* 3561B8 E00462D8 AFBF00B4 */ sw $ra, 0xb4($sp) @@ -32,7 +32,7 @@ glabel func_E00462C0 /* 35620C E004632C C6600024 */ lwc1 $f0, 0x24($s3) /* 356210 E0046330 25020008 */ addiu $v0, $t0, 8 /* 356214 E0046334 4602003E */ c.le.s $f0, $f2 -/* 356218 E0046338 00000000 */ nop +/* 356218 E0046338 00000000 */ nop /* 35621C E004633C 45000032 */ bc1f .LE0046408 /* 356220 E0046340 AD220000 */ sw $v0, ($t1) /* 356224 E0046344 3C047F7F */ lui $a0, 0x7f7f @@ -140,18 +140,18 @@ glabel func_E00462C0 .LE00464D8: /* 3563B8 E00464D8 36521630 */ ori $s2, $s2, 0x1630 /* 3563BC E00464DC 27A40020 */ addiu $a0, $sp, 0x20 -/* 3563C0 E00464E0 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3563C4 E00464E4 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3563C8 E00464E8 3C11800A */ lui $s1, %hi(D_8009A674) -/* 3563CC E00464EC 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 3563C0 E00464E0 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3563C4 E00464E4 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3563C8 E00464E8 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 3563CC E00464EC 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 3563D0 E00464F0 96050000 */ lhu $a1, ($s0) /* 3563D4 E00464F4 8E220000 */ lw $v0, ($s1) /* 3563D8 E00464F8 00052980 */ sll $a1, $a1, 6 /* 3563DC E00464FC 00B22821 */ addu $a1, $a1, $s2 /* 3563E0 E0046500 0C080118 */ jal func_E0200460 /* 3563E4 E0046504 00452821 */ addu $a1, $v0, $a1 -/* 3563E8 E0046508 3C07800A */ lui $a3, %hi(D_8009A66C) -/* 3563EC E004650C 24E7A66C */ addiu $a3, $a3, %lo(D_8009A66C) +/* 3563E8 E0046508 3C07800A */ lui $a3, %hi(gMasterGfxPos) +/* 3563EC E004650C 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) /* 3563F0 E0046510 8CE60000 */ lw $a2, ($a3) /* 3563F4 E0046514 00C0282D */ daddu $a1, $a2, $zero /* 3563F8 E0046518 24C60008 */ addiu $a2, $a2, 8 @@ -169,7 +169,7 @@ glabel func_E00462C0 /* 356428 E0046548 C6600024 */ lwc1 $f0, 0x24($s3) /* 35642C E004654C 24840001 */ addiu $a0, $a0, 1 /* 356430 E0046550 4602003E */ c.le.s $f0, $f2 -/* 356434 E0046554 00000000 */ nop +/* 356434 E0046554 00000000 */ nop /* 356438 E0046558 45000007 */ bc1f .LE0046578 /* 35643C E004655C A6040000 */ sh $a0, ($s0) /* 356440 E0046560 3C02DE00 */ lui $v0, 0xde00 @@ -191,8 +191,8 @@ glabel func_E00462C0 /* 356478 E0046598 ACE20000 */ sw $v0, ($a3) /* 35647C E004659C ACC30004 */ sw $v1, 4($a2) /* 356480 E00465A0 3C03D838 */ lui $v1, 0xd838 -/* 356484 E00465A4 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 356488 E00465A8 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 356484 E00465A4 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 356488 E00465A8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 35648C E00465AC 8C820000 */ lw $v0, ($a0) /* 356490 E00465B0 34630002 */ ori $v1, $v1, 2 /* 356494 E00465B4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/code_356980/func_E0048218.s b/asm/nonmatchings/code_356980/func_E0048218.s index db2be4d98f..43b36282ef 100644 --- a/asm/nonmatchings/code_356980/func_E0048218.s +++ b/asm/nonmatchings/code_356980/func_E0048218.s @@ -8,8 +8,8 @@ glabel func_E0048218 /* 356BA4 E0048224 34E70024 */ ori $a3, $a3, 0x24 /* 356BA8 E0048228 27A40020 */ addiu $a0, $sp, 0x20 /* 356BAC E004822C AFB500BC */ sw $s5, 0xbc($sp) -/* 356BB0 E0048230 3C15800A */ lui $s5, %hi(D_8009A66C) -/* 356BB4 E0048234 26B5A66C */ addiu $s5, $s5, %lo(D_8009A66C) +/* 356BB0 E0048230 3C15800A */ lui $s5, %hi(gMasterGfxPos) +/* 356BB4 E0048234 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) /* 356BB8 E0048238 AFB300B4 */ sw $s3, 0xb4($sp) /* 356BBC E004823C 3C130001 */ lui $s3, 1 /* 356BC0 E0048240 36731630 */ ori $s3, $s3, 0x1630 @@ -46,9 +46,9 @@ glabel func_E0048218 /* 356C3C E00482BC 3C02E700 */ lui $v0, 0xe700 /* 356C40 E00482C0 4600328D */ trunc.w.s $f10, $f6 /* 356C44 E00482C4 44165000 */ mfc1 $s6, $f10 -/* 356C48 E00482C8 00000000 */ nop +/* 356C48 E00482C8 00000000 */ nop /* 356C4C E00482CC 44961000 */ mtc1 $s6, $f2 -/* 356C50 E00482D0 00000000 */ nop +/* 356C50 E00482D0 00000000 */ nop /* 356C54 E00482D4 468010A0 */ cvt.s.w $f2, $f2 /* 356C58 E00482D8 46023181 */ sub.s $f6, $f6, $f2 /* 356C5C E00482DC AC620000 */ sw $v0, ($v1) @@ -84,7 +84,7 @@ glabel func_E0048218 /* 356CD4 E0048354 C6800004 */ lwc1 $f0, 4($s4) /* 356CD8 E0048358 44064000 */ mfc1 $a2, $f8 /* 356CDC E004835C 46043182 */ mul.s $f6, $f6, $f4 -/* 356CE0 E0048360 00000000 */ nop +/* 356CE0 E0048360 00000000 */ nop /* 356CE4 E0048364 AEA20000 */ sw $v0, ($s5) /* 356CE8 E0048368 3AC20007 */ xori $v0, $s6, 7 /* 356CEC E004836C E7A00014 */ swc1 $f0, 0x14($sp) @@ -109,10 +109,10 @@ glabel func_E0048218 /* 356D38 E00483B8 0C080114 */ jal func_E0200450 /* 356D3C E00483BC 00A0302D */ daddu $a2, $a1, $zero /* 356D40 E00483C0 27A40020 */ addiu $a0, $sp, 0x20 -/* 356D44 E00483C4 3C108007 */ lui $s0, %hi(D_800741F0) -/* 356D48 E00483C8 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 356D4C E00483CC 3C11800A */ lui $s1, %hi(D_8009A674) -/* 356D50 E00483D0 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 356D44 E00483C4 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 356D48 E00483C8 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 356D4C E00483CC 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 356D50 E00483D0 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 356D54 E00483D4 96050000 */ lhu $a1, ($s0) /* 356D58 E00483D8 8E220000 */ lw $v0, ($s1) /* 356D5C E00483DC 00052980 */ sll $a1, $a1, 6 @@ -138,20 +138,20 @@ glabel func_E0048218 /* 356DAC E004842C C6800020 */ lwc1 $f0, 0x20($s4) /* 356DB0 E0048430 3C0140A0 */ lui $at, 0x40a0 /* 356DB4 E0048434 44811000 */ mtc1 $at, $f2 -/* 356DB8 E0048438 00000000 */ nop +/* 356DB8 E0048438 00000000 */ nop /* 356DBC E004843C 4600103C */ c.lt.s $f2, $f0 -/* 356DC0 E0048440 00000000 */ nop +/* 356DC0 E0048440 00000000 */ nop /* 356DC4 E0048444 45000007 */ bc1f .LE0048464 /* 356DC8 E0048448 4600B106 */ mov.s $f4, $f22 /* 356DCC E004844C 46020001 */ sub.s $f0, $f0, $f2 /* 356DD0 E0048450 46002101 */ sub.s $f4, $f4, $f0 /* 356DD4 E0048454 4614203C */ c.lt.s $f4, $f20 -/* 356DD8 E0048458 00000000 */ nop +/* 356DD8 E0048458 00000000 */ nop /* 356DDC E004845C 45030001 */ bc1tl .LE0048464 /* 356DE0 E0048460 4600A106 */ mov.s $f4, $f20 .LE0048464: -/* 356DE4 E0048464 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 356DE8 E0048468 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 356DE4 E0048464 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 356DE8 E0048468 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 356DEC E004846C 8C620000 */ lw $v0, ($v1) /* 356DF0 E0048470 3C01437F */ lui $at, 0x437f /* 356DF4 E0048474 44810000 */ mtc1 $at, $f0 @@ -160,78 +160,78 @@ glabel func_E0048218 /* 356E00 E0048480 0040202D */ daddu $a0, $v0, $zero /* 356E04 E0048484 24420008 */ addiu $v0, $v0, 8 /* 356E08 E0048488 46002002 */ mul.s $f0, $f4, $f0 -/* 356E0C E004848C 00000000 */ nop +/* 356E0C E004848C 00000000 */ nop /* 356E10 E0048490 AC620000 */ sw $v0, ($v1) /* 356E14 E0048494 3C02FA00 */ lui $v0, 0xfa00 /* 356E18 E0048498 AC820000 */ sw $v0, ($a0) /* 356E1C E004849C 4600103E */ c.le.s $f2, $f0 -/* 356E20 E00484A0 00000000 */ nop +/* 356E20 E00484A0 00000000 */ nop /* 356E24 E00484A4 45010005 */ bc1t .LE00484BC /* 356E28 E00484A8 24840004 */ addiu $a0, $a0, 4 /* 356E2C E00484AC 4600028D */ trunc.w.s $f10, $f0 /* 356E30 E00484B0 44035000 */ mfc1 $v1, $f10 /* 356E34 E00484B4 08012135 */ j .LE00484D4 -/* 356E38 E00484B8 00000000 */ nop +/* 356E38 E00484B8 00000000 */ nop .LE00484BC: /* 356E3C E00484BC 46020001 */ sub.s $f0, $f0, $f2 /* 356E40 E00484C0 3C028000 */ lui $v0, 0x8000 /* 356E44 E00484C4 4600028D */ trunc.w.s $f10, $f0 /* 356E48 E00484C8 44035000 */ mfc1 $v1, $f10 -/* 356E4C E00484CC 00000000 */ nop +/* 356E4C E00484CC 00000000 */ nop /* 356E50 E00484D0 00621825 */ or $v1, $v1, $v0 .LE00484D4: /* 356E54 E00484D4 3C014190 */ lui $at, 0x4190 /* 356E58 E00484D8 44810000 */ mtc1 $at, $f0 -/* 356E5C E00484DC 00000000 */ nop +/* 356E5C E00484DC 00000000 */ nop /* 356E60 E00484E0 46002002 */ mul.s $f0, $f4, $f0 -/* 356E64 E00484E4 00000000 */ nop +/* 356E64 E00484E4 00000000 */ nop /* 356E68 E00484E8 3C014F00 */ lui $at, 0x4f00 /* 356E6C E00484EC 44811000 */ mtc1 $at, $f2 -/* 356E70 E00484F0 00000000 */ nop +/* 356E70 E00484F0 00000000 */ nop /* 356E74 E00484F4 4600103E */ c.le.s $f2, $f0 -/* 356E78 E00484F8 00000000 */ nop +/* 356E78 E00484F8 00000000 */ nop /* 356E7C E00484FC 45010005 */ bc1t .LE0048514 /* 356E80 E0048500 00032E00 */ sll $a1, $v1, 0x18 /* 356E84 E0048504 4600028D */ trunc.w.s $f10, $f0 /* 356E88 E0048508 44035000 */ mfc1 $v1, $f10 /* 356E8C E004850C 0801214B */ j .LE004852C -/* 356E90 E0048510 00000000 */ nop +/* 356E90 E0048510 00000000 */ nop .LE0048514: /* 356E94 E0048514 46020001 */ sub.s $f0, $f0, $f2 /* 356E98 E0048518 3C028000 */ lui $v0, 0x8000 /* 356E9C E004851C 4600028D */ trunc.w.s $f10, $f0 /* 356EA0 E0048520 44035000 */ mfc1 $v1, $f10 -/* 356EA4 E0048524 00000000 */ nop +/* 356EA4 E0048524 00000000 */ nop /* 356EA8 E0048528 00621825 */ or $v1, $v1, $v0 .LE004852C: /* 356EAC E004852C 3C01426C */ lui $at, 0x426c /* 356EB0 E0048530 44810000 */ mtc1 $at, $f0 -/* 356EB4 E0048534 00000000 */ nop +/* 356EB4 E0048534 00000000 */ nop /* 356EB8 E0048538 46002002 */ mul.s $f0, $f4, $f0 -/* 356EBC E004853C 00000000 */ nop +/* 356EBC E004853C 00000000 */ nop /* 356EC0 E0048540 306200FF */ andi $v0, $v1, 0xff /* 356EC4 E0048544 00021400 */ sll $v0, $v0, 0x10 /* 356EC8 E0048548 3C014F00 */ lui $at, 0x4f00 /* 356ECC E004854C 44811000 */ mtc1 $at, $f2 -/* 356ED0 E0048550 00000000 */ nop +/* 356ED0 E0048550 00000000 */ nop /* 356ED4 E0048554 4600103E */ c.le.s $f2, $f0 -/* 356ED8 E0048558 00000000 */ nop +/* 356ED8 E0048558 00000000 */ nop /* 356EDC E004855C 45010005 */ bc1t .LE0048574 /* 356EE0 E0048560 00A23825 */ or $a3, $a1, $v0 /* 356EE4 E0048564 4600028D */ trunc.w.s $f10, $f0 /* 356EE8 E0048568 44065000 */ mfc1 $a2, $f10 /* 356EEC E004856C 08012163 */ j .LE004858C -/* 356EF0 E0048570 00000000 */ nop +/* 356EF0 E0048570 00000000 */ nop .LE0048574: /* 356EF4 E0048574 46020001 */ sub.s $f0, $f0, $f2 /* 356EF8 E0048578 3C028000 */ lui $v0, 0x8000 /* 356EFC E004857C 4600028D */ trunc.w.s $f10, $f0 /* 356F00 E0048580 44065000 */ mfc1 $a2, $f10 -/* 356F04 E0048584 00000000 */ nop +/* 356F04 E0048584 00000000 */ nop /* 356F08 E0048588 00C23025 */ or $a2, $a2, $v0 .LE004858C: -/* 356F0C E004858C 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 356F10 E0048590 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 356F0C E004858C 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 356F10 E0048590 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 356F14 E0048594 30C200FF */ andi $v0, $a2, 0xff /* 356F18 E0048598 00021200 */ sll $v0, $v0, 8 /* 356F1C E004859C 8CA30000 */ lw $v1, ($a1) @@ -244,78 +244,78 @@ glabel func_E0048218 /* 356F38 E00485B8 44811000 */ mtc1 $at, $f2 /* 356F3C E00485BC 0060202D */ daddu $a0, $v1, $zero /* 356F40 E00485C0 46002002 */ mul.s $f0, $f4, $f0 -/* 356F44 E00485C4 00000000 */ nop +/* 356F44 E00485C4 00000000 */ nop /* 356F48 E00485C8 24630008 */ addiu $v1, $v1, 8 /* 356F4C E00485CC 24870004 */ addiu $a3, $a0, 4 /* 356F50 E00485D0 ACA30000 */ sw $v1, ($a1) /* 356F54 E00485D4 4600103E */ c.le.s $f2, $f0 -/* 356F58 E00485D8 00000000 */ nop +/* 356F58 E00485D8 00000000 */ nop /* 356F5C E00485DC 45010005 */ bc1t .LE00485F4 /* 356F60 E00485E0 AC820000 */ sw $v0, ($a0) /* 356F64 E00485E4 4600028D */ trunc.w.s $f10, $f0 /* 356F68 E00485E8 44035000 */ mfc1 $v1, $f10 /* 356F6C E00485EC 08012183 */ j .LE004860C -/* 356F70 E00485F0 00000000 */ nop +/* 356F70 E00485F0 00000000 */ nop .LE00485F4: /* 356F74 E00485F4 46020001 */ sub.s $f0, $f0, $f2 /* 356F78 E00485F8 3C028000 */ lui $v0, 0x8000 /* 356F7C E00485FC 4600028D */ trunc.w.s $f10, $f0 /* 356F80 E0048600 44035000 */ mfc1 $v1, $f10 -/* 356F84 E0048604 00000000 */ nop +/* 356F84 E0048604 00000000 */ nop /* 356F88 E0048608 00621825 */ or $v1, $v1, $v0 .LE004860C: /* 356F8C E004860C 3C014254 */ lui $at, 0x4254 /* 356F90 E0048610 44810000 */ mtc1 $at, $f0 -/* 356F94 E0048614 00000000 */ nop +/* 356F94 E0048614 00000000 */ nop /* 356F98 E0048618 46002002 */ mul.s $f0, $f4, $f0 -/* 356F9C E004861C 00000000 */ nop +/* 356F9C E004861C 00000000 */ nop /* 356FA0 E0048620 3C014F00 */ lui $at, 0x4f00 /* 356FA4 E0048624 44811000 */ mtc1 $at, $f2 -/* 356FA8 E0048628 00000000 */ nop +/* 356FA8 E0048628 00000000 */ nop /* 356FAC E004862C 4600103E */ c.le.s $f2, $f0 -/* 356FB0 E0048630 00000000 */ nop +/* 356FB0 E0048630 00000000 */ nop /* 356FB4 E0048634 45010005 */ bc1t .LE004864C /* 356FB8 E0048638 00032600 */ sll $a0, $v1, 0x18 /* 356FBC E004863C 4600028D */ trunc.w.s $f10, $f0 /* 356FC0 E0048640 44035000 */ mfc1 $v1, $f10 /* 356FC4 E0048644 08012199 */ j .LE0048664 -/* 356FC8 E0048648 00000000 */ nop +/* 356FC8 E0048648 00000000 */ nop .LE004864C: /* 356FCC E004864C 46020001 */ sub.s $f0, $f0, $f2 /* 356FD0 E0048650 3C028000 */ lui $v0, 0x8000 /* 356FD4 E0048654 4600028D */ trunc.w.s $f10, $f0 /* 356FD8 E0048658 44035000 */ mfc1 $v1, $f10 -/* 356FDC E004865C 00000000 */ nop +/* 356FDC E004865C 00000000 */ nop /* 356FE0 E0048660 00621825 */ or $v1, $v1, $v0 .LE0048664: /* 356FE4 E0048664 3C0141C0 */ lui $at, 0x41c0 /* 356FE8 E0048668 44810000 */ mtc1 $at, $f0 -/* 356FEC E004866C 00000000 */ nop +/* 356FEC E004866C 00000000 */ nop /* 356FF0 E0048670 46002002 */ mul.s $f0, $f4, $f0 -/* 356FF4 E0048674 00000000 */ nop +/* 356FF4 E0048674 00000000 */ nop /* 356FF8 E0048678 306200FF */ andi $v0, $v1, 0xff /* 356FFC E004867C 00021400 */ sll $v0, $v0, 0x10 /* 357000 E0048680 3C014F00 */ lui $at, 0x4f00 /* 357004 E0048684 44811000 */ mtc1 $at, $f2 -/* 357008 E0048688 00000000 */ nop +/* 357008 E0048688 00000000 */ nop /* 35700C E004868C 4600103E */ c.le.s $f2, $f0 -/* 357010 E0048690 00000000 */ nop +/* 357010 E0048690 00000000 */ nop /* 357014 E0048694 45010005 */ bc1t .LE00486AC /* 357018 E0048698 00823025 */ or $a2, $a0, $v0 /* 35701C E004869C 4600028D */ trunc.w.s $f10, $f0 /* 357020 E00486A0 44035000 */ mfc1 $v1, $f10 /* 357024 E00486A4 080121B1 */ j .LE00486C4 -/* 357028 E00486A8 00000000 */ nop +/* 357028 E00486A8 00000000 */ nop .LE00486AC: /* 35702C E00486AC 46020001 */ sub.s $f0, $f0, $f2 /* 357030 E00486B0 3C028000 */ lui $v0, 0x8000 /* 357034 E00486B4 4600028D */ trunc.w.s $f10, $f0 /* 357038 E00486B8 44035000 */ mfc1 $v1, $f10 -/* 35703C E00486BC 00000000 */ nop +/* 35703C E00486BC 00000000 */ nop /* 357040 E00486C0 00621825 */ or $v1, $v1, $v0 .LE00486C4: -/* 357044 E00486C4 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 357048 E00486C8 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 357044 E00486C4 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 357048 E00486C8 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 35704C E00486CC 306200FF */ andi $v0, $v1, 0xff /* 357050 E00486D0 00021200 */ sll $v0, $v0, 8 /* 357054 E00486D4 00C21025 */ or $v0, $a2, $v0 @@ -330,28 +330,28 @@ glabel func_E0048218 /* 357078 E00486F8 44811000 */ mtc1 $at, $f2 /* 35707C E00486FC 0080182D */ daddu $v1, $a0, $zero /* 357080 E0048700 46002002 */ mul.s $f0, $f4, $f0 -/* 357084 E0048704 00000000 */ nop +/* 357084 E0048704 00000000 */ nop /* 357088 E0048708 24840008 */ addiu $a0, $a0, 8 /* 35708C E004870C 24660004 */ addiu $a2, $v1, 4 /* 357090 E0048710 ACA40000 */ sw $a0, ($a1) /* 357094 E0048714 4600103E */ c.le.s $f2, $f0 -/* 357098 E0048718 00000000 */ nop +/* 357098 E0048718 00000000 */ nop /* 35709C E004871C 45010005 */ bc1t .LE0048734 /* 3570A0 E0048720 AC620000 */ sw $v0, ($v1) /* 3570A4 E0048724 4600028D */ trunc.w.s $f10, $f0 /* 3570A8 E0048728 44055000 */ mfc1 $a1, $f10 /* 3570AC E004872C 080121D3 */ j .LE004874C -/* 3570B0 E0048730 00000000 */ nop +/* 3570B0 E0048730 00000000 */ nop .LE0048734: /* 3570B4 E0048734 46020001 */ sub.s $f0, $f0, $f2 /* 3570B8 E0048738 3C028000 */ lui $v0, 0x8000 /* 3570BC E004873C 4600028D */ trunc.w.s $f10, $f0 /* 3570C0 E0048740 44055000 */ mfc1 $a1, $f10 -/* 3570C4 E0048744 00000000 */ nop +/* 3570C4 E0048744 00000000 */ nop /* 3570C8 E0048748 00A22825 */ or $a1, $a1, $v0 .LE004874C: -/* 3570CC E004874C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 3570D0 E0048750 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 3570CC E004874C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 3570D0 E0048750 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 3570D4 E0048754 30A200FF */ andi $v0, $a1, 0xff /* 3570D8 E0048758 8C830000 */ lw $v1, ($a0) /* 3570DC E004875C 00021200 */ sll $v0, $v0, 8 @@ -363,36 +363,36 @@ glabel func_E0048218 /* 3570F4 E0048774 44811000 */ mtc1 $at, $f2 /* 3570F8 E0048778 0060282D */ daddu $a1, $v1, $zero /* 3570FC E004877C 46002002 */ mul.s $f0, $f4, $f0 -/* 357100 E0048780 00000000 */ nop +/* 357100 E0048780 00000000 */ nop /* 357104 E0048784 24630008 */ addiu $v1, $v1, 8 /* 357108 E0048788 24A90004 */ addiu $t1, $a1, 4 /* 35710C E004878C AC830000 */ sw $v1, ($a0) /* 357110 E0048790 4600103E */ c.le.s $f2, $f0 -/* 357114 E0048794 00000000 */ nop +/* 357114 E0048794 00000000 */ nop /* 357118 E0048798 45010005 */ bc1t .LE00487B0 /* 35711C E004879C ACA20000 */ sw $v0, ($a1) /* 357120 E00487A0 4600028D */ trunc.w.s $f10, $f0 /* 357124 E00487A4 44035000 */ mfc1 $v1, $f10 /* 357128 E00487A8 080121F2 */ j .LE00487C8 -/* 35712C E00487AC 00000000 */ nop +/* 35712C E00487AC 00000000 */ nop .LE00487B0: /* 357130 E00487B0 46020001 */ sub.s $f0, $f0, $f2 /* 357134 E00487B4 3C028000 */ lui $v0, 0x8000 /* 357138 E00487B8 4600028D */ trunc.w.s $f10, $f0 /* 35713C E00487BC 44035000 */ mfc1 $v1, $f10 -/* 357140 E00487C0 00000000 */ nop +/* 357140 E00487C0 00000000 */ nop /* 357144 E00487C4 00621825 */ or $v1, $v1, $v0 .LE00487C8: /* 357148 E00487C8 3C014358 */ lui $at, 0x4358 /* 35714C E00487CC 44810000 */ mtc1 $at, $f0 -/* 357150 E00487D0 00000000 */ nop +/* 357150 E00487D0 00000000 */ nop /* 357154 E00487D4 46002002 */ mul.s $f0, $f4, $f0 -/* 357158 E00487D8 00000000 */ nop +/* 357158 E00487D8 00000000 */ nop /* 35715C E00487DC 3C014F00 */ lui $at, 0x4f00 /* 357160 E00487E0 44811000 */ mtc1 $at, $f2 -/* 357164 E00487E4 00000000 */ nop +/* 357164 E00487E4 00000000 */ nop /* 357168 E00487E8 4600103E */ c.le.s $f2, $f0 -/* 35716C E00487EC 00000000 */ nop +/* 35716C E00487EC 00000000 */ nop /* 357170 E00487F0 45010005 */ bc1t .LE0048808 /* 357174 E00487F4 00034600 */ sll $t0, $v1, 0x18 /* 357178 E00487F8 4600028D */ trunc.w.s $f10, $f0 @@ -404,15 +404,15 @@ glabel func_E0048218 /* 35718C E004880C 3C028000 */ lui $v0, 0x8000 /* 357190 E0048810 4600028D */ trunc.w.s $f10, $f0 /* 357194 E0048814 44075000 */ mfc1 $a3, $f10 -/* 357198 E0048818 00000000 */ nop +/* 357198 E0048818 00000000 */ nop /* 35719C E004881C 00E23825 */ or $a3, $a3, $v0 /* 3571A0 E0048820 3C06FC26 */ lui $a2, 0xfc26 .LE0048824: /* 3571A4 E0048824 34C62A60 */ ori $a2, $a2, 0x2a60 /* 3571A8 E0048828 3C0516FC */ lui $a1, 0x16fc /* 3571AC E004882C 34A59378 */ ori $a1, $a1, 0x9378 -/* 3571B0 E0048830 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 3571B4 E0048834 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 3571B0 E0048830 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 3571B4 E0048834 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 3571B8 E0048838 30E200FF */ andi $v0, $a3, 0xff /* 3571BC E004883C 00021200 */ sll $v0, $v0, 8 /* 3571C0 E0048840 8C830000 */ lw $v1, ($a0) @@ -449,8 +449,8 @@ glabel func_E0048218 /* 357238 E00488B8 00431025 */ or $v0, $v0, $v1 /* 35723C E00488BC ACC20014 */ sw $v0, 0x14($a2) .LE00488C0: -/* 357240 E00488C0 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 357244 E00488C4 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 357240 E00488C0 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 357244 E00488C4 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 357248 E00488C8 001611C0 */ sll $v0, $s6, 7 /* 35724C E00488CC 30420FFF */ andi $v0, $v0, 0xfff /* 357250 E00488D0 00021300 */ sll $v0, $v0, 0xc @@ -498,8 +498,8 @@ glabel func_E0048218 .LE0048974: /* 3572F4 E0048974 ACA20004 */ sw $v0, 4($a1) /* 3572F8 E0048978 3C06D838 */ lui $a2, 0xd838 -/* 3572FC E004897C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 357300 E0048980 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 3572FC E004897C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 357300 E0048980 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 357304 E0048984 34C60002 */ ori $a2, $a2, 2 /* 357308 E0048988 8C820000 */ lw $v0, ($a0) /* 35730C E004898C 3C03DE00 */ lui $v1, 0xde00 @@ -528,6 +528,6 @@ glabel func_E0048218 /* 357368 E00489E8 D7B400D0 */ ldc1 $f20, 0xd0($sp) /* 35736C E00489EC 03E00008 */ jr $ra /* 357370 E00489F0 27BD00E0 */ addiu $sp, $sp, 0xe0 -/* 357374 E00489F4 00000000 */ nop -/* 357378 E00489F8 00000000 */ nop -/* 35737C E00489FC 00000000 */ nop +/* 357374 E00489F4 00000000 */ nop +/* 357378 E00489F8 00000000 */ nop +/* 35737C E00489FC 00000000 */ nop diff --git a/asm/nonmatchings/code_3584C0/func_E004A78C.s b/asm/nonmatchings/code_3584C0/func_E004A78C.s index 100a8fc76d..2c3c7fdd7d 100644 --- a/asm/nonmatchings/code_3584C0/func_E004A78C.s +++ b/asm/nonmatchings/code_3584C0/func_E004A78C.s @@ -71,8 +71,8 @@ glabel func_E004A78C .LE004A894: /* 358D54 E004A894 34C60024 */ ori $a2, $a2, 0x24 /* 358D58 E004A898 27A40020 */ addiu $a0, $sp, 0x20 -/* 358D5C E004A89C 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 358D60 E004A8A0 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 358D5C E004A89C 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 358D60 E004A8A0 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 358D64 E004A8A4 3C02E700 */ lui $v0, 0xe700 /* 358D68 E004A8A8 8E680000 */ lw $t0, ($s3) /* 358D6C E004A8AC 4480A000 */ mtc1 $zero, $f20 @@ -124,10 +124,10 @@ glabel func_E004A78C /* 358E24 E004A964 0C080180 */ jal func_E0200600 /* 358E28 E004A968 E7A0001C */ swc1 $f0, 0x1c($sp) /* 358E2C E004A96C 27A40020 */ addiu $a0, $sp, 0x20 -/* 358E30 E004A970 3C158007 */ lui $s5, %hi(D_800741F0) -/* 358E34 E004A974 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) -/* 358E38 E004A978 3C16800A */ lui $s6, %hi(D_8009A674) -/* 358E3C E004A97C 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) +/* 358E30 E004A970 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 358E34 E004A974 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) +/* 358E38 E004A978 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 358E3C E004A97C 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) /* 358E40 E004A980 96A50000 */ lhu $a1, ($s5) /* 358E44 E004A984 8EC20000 */ lw $v0, ($s6) /* 358E48 E004A988 00052980 */ sll $a1, $a1, 6 @@ -173,7 +173,7 @@ glabel func_E004A78C .LE004AA28: /* 358EE8 E004AA28 8E020008 */ lw $v0, 8($s0) /* 358EEC E004AA2C 0440007E */ bltz $v0, .LE004AC28 -/* 358EF0 E004AA30 00000000 */ nop +/* 358EF0 E004AA30 00000000 */ nop /* 358EF4 E004AA34 8E05FFC0 */ lw $a1, -0x40($s0) /* 358EF8 E004AA38 8E06FFC4 */ lw $a2, -0x3c($s0) /* 358EFC E004AA3C 8E07FFC8 */ lw $a3, -0x38($s0) @@ -192,15 +192,15 @@ glabel func_E004A78C /* 358F30 E004AA70 C604FFD8 */ lwc1 $f4, -0x28($s0) /* 358F34 E004AA74 46002121 */ cvt.d.s $f4, $f4 /* 358F38 E004AA78 46342102 */ mul.d $f4, $f4, $f20 -/* 358F3C E004AA7C 00000000 */ nop +/* 358F3C E004AA7C 00000000 */ nop /* 358F40 E004AA80 C602FFDC */ lwc1 $f2, -0x24($s0) /* 358F44 E004AA84 460010A1 */ cvt.d.s $f2, $f2 /* 358F48 E004AA88 46341082 */ mul.d $f2, $f2, $f20 -/* 358F4C E004AA8C 00000000 */ nop +/* 358F4C E004AA8C 00000000 */ nop /* 358F50 E004AA90 C600FFE0 */ lwc1 $f0, -0x20($s0) /* 358F54 E004AA94 46000021 */ cvt.d.s $f0, $f0 /* 358F58 E004AA98 46340002 */ mul.d $f0, $f0, $f20 -/* 358F5C E004AA9C 00000000 */ nop +/* 358F5C E004AA9C 00000000 */ nop /* 358F60 E004AAA0 46202120 */ cvt.s.d $f4, $f4 /* 358F64 E004AAA4 462010A0 */ cvt.s.d $f2, $f2 /* 358F68 E004AAA8 46200020 */ cvt.s.d $f0, $f0 @@ -225,8 +225,8 @@ glabel func_E004A78C /* 358FB4 E004AAF4 00A0302D */ daddu $a2, $a1, $zero /* 358FB8 E004AAF8 27A40020 */ addiu $a0, $sp, 0x20 /* 358FBC E004AAFC 96C50000 */ lhu $a1, ($s6) -/* 358FC0 E004AB00 3C02800A */ lui $v0, %hi(D_8009A674) -/* 358FC4 E004AB04 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 358FC0 E004AB00 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 358FC4 E004AB04 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 358FC8 E004AB08 00052980 */ sll $a1, $a1, 6 /* 358FCC E004AB0C 00B52821 */ addu $a1, $a1, $s5 /* 358FD0 E004AB10 0C080118 */ jal func_E0200460 @@ -243,7 +243,7 @@ glabel func_E004A78C /* 358FFC E004AB3C 24630008 */ addiu $v1, $v1, 8 /* 359000 E004AB40 4600018D */ trunc.w.s $f6, $f0 /* 359004 E004AB44 44023000 */ mfc1 $v0, $f6 -/* 359008 E004AB48 00000000 */ nop +/* 359008 E004AB48 00000000 */ nop /* 35900C E004AB4C 30420FFF */ andi $v0, $v0, 0xfff /* 359010 E004AB50 005E1025 */ or $v0, $v0, $fp /* 359014 E004AB54 AE630000 */ sw $v1, ($s3) @@ -263,7 +263,7 @@ glabel func_E004A78C /* 35904C E004AB8C AE620000 */ sw $v0, ($s3) /* 359050 E004AB90 4600018D */ trunc.w.s $f6, $f0 /* 359054 E004AB94 44023000 */ mfc1 $v0, $f6 -/* 359058 E004AB98 00000000 */ nop +/* 359058 E004AB98 00000000 */ nop /* 35905C E004AB9C 2442007C */ addiu $v0, $v0, 0x7c /* 359060 E004ABA0 30420FFF */ andi $v0, $v0, 0xfff /* 359064 E004ABA4 00461025 */ or $v0, $v0, $a2 @@ -273,15 +273,15 @@ glabel func_E004A78C /* 359074 E004ABB4 AE620000 */ sw $v0, ($s3) /* 359078 E004ABB8 4600018D */ trunc.w.s $f6, $f0 /* 35907C E004ABBC 44023000 */ mfc1 $v0, $f6 -/* 359080 E004ABC0 00000000 */ nop +/* 359080 E004ABC0 00000000 */ nop /* 359084 E004ABC4 30420FFF */ andi $v0, $v0, 0xfff /* 359088 E004ABC8 005E1025 */ or $v0, $v0, $fp /* 35908C E004ABCC AC620000 */ sw $v0, ($v1) /* 359090 E004ABD0 C6000000 */ lwc1 $f0, ($s0) /* 359094 E004ABD4 3C02DA38 */ lui $v0, 0xda38 /* 359098 E004ABD8 AC620008 */ sw $v0, 8($v1) -/* 35909C E004ABDC 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3590A0 E004ABE0 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 35909C E004ABDC 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3590A0 E004ABE0 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3590A4 E004ABE4 3C0F0900 */ lui $t7, 0x900 /* 3590A8 E004ABE8 25EF0940 */ addiu $t7, $t7, 0x940 /* 3590AC E004ABEC AC6F0014 */ sw $t7, 0x14($v1) @@ -294,7 +294,7 @@ glabel func_E004A78C /* 3590C8 E004AC08 AC62001C */ sw $v0, 0x1c($v1) /* 3590CC E004AC0C 4600018D */ trunc.w.s $f6, $f0 /* 3590D0 E004AC10 44023000 */ mfc1 $v0, $f6 -/* 3590D4 E004AC14 00000000 */ nop +/* 3590D4 E004AC14 00000000 */ nop /* 3590D8 E004AC18 2442007C */ addiu $v0, $v0, 0x7c /* 3590DC E004AC1C 30420FFF */ andi $v0, $v0, 0xfff /* 3590E0 E004AC20 00481025 */ or $v0, $v0, $t0 @@ -311,8 +311,8 @@ glabel func_E004A78C /* 359104 E004AC44 354AF9FF */ ori $t2, $t2, 0xf9ff /* 359108 E004AC48 3C0BD9FF */ lui $t3, 0xd9ff /* 35910C E004AC4C 356BFFFF */ ori $t3, $t3, 0xffff -/* 359110 E004AC50 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 359114 E004AC54 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 359110 E004AC50 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 359114 E004AC54 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 359118 E004AC58 3C02DF00 */ lui $v0, 0xdf00 /* 35911C E004AC5C 8CA30000 */ lw $v1, ($a1) /* 359120 E004AC60 3C09FA00 */ lui $t1, 0xfa00 @@ -442,4 +442,4 @@ glabel func_E004A78C /* 359310 E004AE50 D7B40100 */ ldc1 $f20, 0x100($sp) /* 359314 E004AE54 03E00008 */ jr $ra /* 359318 E004AE58 27BD0118 */ addiu $sp, $sp, 0x118 -/* 35931C E004AE5C 00000000 */ nop +/* 35931C E004AE5C 00000000 */ nop diff --git a/asm/nonmatchings/code_359F20/func_E004C3A8.s b/asm/nonmatchings/code_359F20/func_E004C3A8.s index 483ea3f61d..06fe0ff96d 100644 --- a/asm/nonmatchings/code_359F20/func_E004C3A8.s +++ b/asm/nonmatchings/code_359F20/func_E004C3A8.s @@ -12,8 +12,8 @@ glabel func_E004C3A8 /* 35A2E4 E004C3C4 AFB500AC */ sw $s5, 0xac($sp) /* 35A2E8 E004C3C8 3C150001 */ lui $s5, 1 /* 35A2EC E004C3CC AFB200A0 */ sw $s2, 0xa0($sp) -/* 35A2F0 E004C3D0 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 35A2F4 E004C3D4 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 35A2F0 E004C3D0 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 35A2F4 E004C3D4 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 35A2F8 E004C3D8 AFB600B0 */ sw $s6, 0xb0($sp) /* 35A2FC E004C3DC 3C16E700 */ lui $s6, 0xe700 /* 35A300 E004C3E0 AFBF00B4 */ sw $ra, 0xb4($sp) @@ -118,10 +118,10 @@ glabel func_E004C3A8 /* 35A48C E004C56C 0C080114 */ jal func_E0200450 /* 35A490 E004C570 00A0302D */ daddu $a2, $a1, $zero /* 35A494 E004C574 27A40018 */ addiu $a0, $sp, 0x18 -/* 35A498 E004C578 3C108007 */ lui $s0, %hi(D_800741F0) -/* 35A49C E004C57C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 35A4A0 E004C580 3C11800A */ lui $s1, %hi(D_8009A674) -/* 35A4A4 E004C584 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 35A498 E004C578 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 35A49C E004C57C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 35A4A0 E004C580 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 35A4A4 E004C584 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 35A4A8 E004C588 96050000 */ lhu $a1, ($s0) /* 35A4AC E004C58C 8E220000 */ lw $v0, ($s1) /* 35A4B0 E004C590 00052980 */ sll $a1, $a1, 6 @@ -173,6 +173,6 @@ glabel func_E004C3A8 /* 35A568 E004C648 D7B400B8 */ ldc1 $f20, 0xb8($sp) /* 35A56C E004C64C 03E00008 */ jr $ra /* 35A570 E004C650 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 35A574 E004C654 00000000 */ nop -/* 35A578 E004C658 00000000 */ nop -/* 35A57C E004C65C 00000000 */ nop +/* 35A574 E004C654 00000000 */ nop +/* 35A578 E004C658 00000000 */ nop +/* 35A57C E004C65C 00000000 */ nop diff --git a/asm/nonmatchings/code_35B9D0/func_E004E214.s b/asm/nonmatchings/code_35B9D0/func_E004E214.s index 5e693af07f..646d8810c7 100644 --- a/asm/nonmatchings/code_35B9D0/func_E004E214.s +++ b/asm/nonmatchings/code_35B9D0/func_E004E214.s @@ -8,8 +8,8 @@ glabel func_E004E214 /* 35BBF0 E004E220 34E70024 */ ori $a3, $a3, 0x24 /* 35BBF4 E004E224 27A40020 */ addiu $a0, $sp, 0x20 /* 35BBF8 E004E228 AFB700BC */ sw $s7, 0xbc($sp) -/* 35BBFC E004E22C 3C17800A */ lui $s7, %hi(D_8009A66C) -/* 35BC00 E004E230 26F7A66C */ addiu $s7, $s7, %lo(D_8009A66C) +/* 35BBFC E004E22C 3C17800A */ lui $s7, %hi(gMasterGfxPos) +/* 35BC00 E004E230 26F7A66C */ addiu $s7, $s7, %lo(gMasterGfxPos) /* 35BC04 E004E234 AFB600B8 */ sw $s6, 0xb8($sp) /* 35BC08 E004E238 3C160001 */ lui $s6, 1 /* 35BC0C E004E23C 36D61630 */ ori $s6, $s6, 0x1630 @@ -41,9 +41,9 @@ glabel func_E004E214 /* 35BC74 E004E2A4 3C02E700 */ lui $v0, 0xe700 /* 35BC78 E004E2A8 4600328D */ trunc.w.s $f10, $f6 /* 35BC7C E004E2AC 44145000 */ mfc1 $s4, $f10 -/* 35BC80 E004E2B0 00000000 */ nop +/* 35BC80 E004E2B0 00000000 */ nop /* 35BC84 E004E2B4 44941000 */ mtc1 $s4, $f2 -/* 35BC88 E004E2B8 00000000 */ nop +/* 35BC88 E004E2B8 00000000 */ nop /* 35BC8C E004E2BC 468010A0 */ cvt.s.w $f2, $f2 /* 35BC90 E004E2C0 3A950007 */ xori $s5, $s4, 7 /* 35BC94 E004E2C4 2EB50001 */ sltiu $s5, $s5, 1 @@ -80,7 +80,7 @@ glabel func_E004E214 /* 35BD10 E004E340 C6200004 */ lwc1 $f0, 4($s1) /* 35BD14 E004E344 44064000 */ mfc1 $a2, $f8 /* 35BD18 E004E348 46043182 */ mul.s $f6, $f6, $f4 -/* 35BD1C E004E34C 00000000 */ nop +/* 35BD1C E004E34C 00000000 */ nop /* 35BD20 E004E350 AEE20000 */ sw $v0, ($s7) /* 35BD24 E004E354 E7A00014 */ swc1 $f0, 0x14($sp) /* 35BD28 E004E358 C6200008 */ lwc1 $f0, 8($s1) @@ -106,10 +106,10 @@ glabel func_E004E214 /* 35BD78 E004E3A8 0C080114 */ jal func_E0200450 /* 35BD7C E004E3AC 00A0302D */ daddu $a2, $a1, $zero /* 35BD80 E004E3B0 27A40020 */ addiu $a0, $sp, 0x20 -/* 35BD84 E004E3B4 3C108007 */ lui $s0, %hi(D_800741F0) -/* 35BD88 E004E3B8 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 35BD8C E004E3BC 3C12800A */ lui $s2, %hi(D_8009A674) -/* 35BD90 E004E3C0 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 35BD84 E004E3B4 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 35BD88 E004E3B8 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 35BD8C E004E3BC 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 35BD90 E004E3C0 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 35BD94 E004E3C4 96050000 */ lhu $a1, ($s0) /* 35BD98 E004E3C8 8E420000 */ lw $v0, ($s2) /* 35BD9C E004E3CC 00052980 */ sll $a1, $a1, 6 @@ -213,8 +213,8 @@ glabel func_E004E214 /* 35BF1C E004E54C 3C06E200 */ lui $a2, 0xe200 /* 35BF20 E004E550 34C61E01 */ ori $a2, $a2, 0x1e01 /* 35BF24 E004E554 3C07D838 */ lui $a3, 0xd838 -/* 35BF28 E004E558 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 35BF2C E004E55C 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 35BF28 E004E558 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 35BF2C E004E55C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 35BF30 E004E560 34E70002 */ ori $a3, $a3, 2 /* 35BF34 E004E564 8C820000 */ lw $v0, ($a0) /* 35BF38 E004E568 3C03DE00 */ lui $v1, 0xde00 @@ -245,5 +245,5 @@ glabel func_E004E214 /* 35BF9C E004E5CC D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 35BFA0 E004E5D0 03E00008 */ jr $ra /* 35BFA4 E004E5D4 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* 35BFA8 E004E5D8 00000000 */ nop -/* 35BFAC E004E5DC 00000000 */ nop +/* 35BFA8 E004E5D8 00000000 */ nop +/* 35BFAC E004E5DC 00000000 */ nop diff --git a/asm/nonmatchings/code_35BFD0/func_E0050308.s b/asm/nonmatchings/code_35BFD0/func_E0050308.s index 3a7380596b..85de0aa212 100644 --- a/asm/nonmatchings/code_35BFD0/func_E0050308.s +++ b/asm/nonmatchings/code_35BFD0/func_E0050308.s @@ -8,8 +8,8 @@ glabel func_E0050308 /* 35C2E4 E0050314 34C60024 */ ori $a2, $a2, 0x24 /* 35C2E8 E0050318 27A40018 */ addiu $a0, $sp, 0x18 /* 35C2EC E005031C AFB400A8 */ sw $s4, 0xa8($sp) -/* 35C2F0 E0050320 3C14800A */ lui $s4, %hi(D_8009A66C) -/* 35C2F4 E0050324 2694A66C */ addiu $s4, $s4, %lo(D_8009A66C) +/* 35C2F0 E0050320 3C14800A */ lui $s4, %hi(gMasterGfxPos) +/* 35C2F4 E0050324 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) /* 35C2F8 E0050328 AFB200A0 */ sw $s2, 0xa0($sp) /* 35C2FC E005032C 3C120001 */ lui $s2, 1 /* 35C300 E0050330 3C02E700 */ lui $v0, 0xe700 @@ -77,10 +77,10 @@ glabel func_E0050308 /* 35C3F8 E0050428 0C080114 */ jal func_E0200450 /* 35C3FC E005042C 00A0302D */ daddu $a2, $a1, $zero /* 35C400 E0050430 27A40018 */ addiu $a0, $sp, 0x18 -/* 35C404 E0050434 3C108007 */ lui $s0, %hi(D_800741F0) -/* 35C408 E0050438 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 35C40C E005043C 3C11800A */ lui $s1, %hi(D_8009A674) -/* 35C410 E0050440 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 35C404 E0050434 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 35C408 E0050438 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 35C40C E005043C 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 35C410 E0050440 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 35C414 E0050444 96050000 */ lhu $a1, ($s0) /* 35C418 E0050448 8E220000 */ lw $v0, ($s1) /* 35C41C E005044C 00052980 */ sll $a1, $a1, 6 @@ -104,7 +104,7 @@ glabel func_E0050308 /* 35C464 E0050494 C6600010 */ lwc1 $f0, 0x10($s3) /* 35C468 E0050498 24840001 */ addiu $a0, $a0, 1 /* 35C46C E005049C 4600A03C */ c.lt.s $f20, $f0 -/* 35C470 E00504A0 00000000 */ nop +/* 35C470 E00504A0 00000000 */ nop /* 35C474 E00504A4 4500000D */ bc1f .LE00504DC /* 35C478 E00504A8 A6040000 */ sh $a0, ($s0) /* 35C47C E00504AC 3C040900 */ lui $a0, 0x900 @@ -134,8 +134,8 @@ glabel func_E0050308 /* 35C4D4 E0050504 ACC40004 */ sw $a0, 4($a2) .LE0050508: /* 35C4D8 E0050508 3C05D838 */ lui $a1, 0xd838 -/* 35C4DC E005050C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 35C4E0 E0050510 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 35C4DC E005050C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 35C4E0 E0050510 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 35C4E4 E0050514 8C620000 */ lw $v0, ($v1) /* 35C4E8 E0050518 34A50002 */ ori $a1, $a1, 2 /* 35C4EC E005051C 0040202D */ daddu $a0, $v0, $zero @@ -154,4 +154,4 @@ glabel func_E0050308 /* 35C520 E0050550 D7B400B0 */ ldc1 $f20, 0xb0($sp) /* 35C524 E0050554 03E00008 */ jr $ra /* 35C528 E0050558 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 35C52C E005055C 00000000 */ nop +/* 35C52C E005055C 00000000 */ nop diff --git a/asm/nonmatchings/code_35CA80/func_E0052460.s b/asm/nonmatchings/code_35CA80/func_E0052460.s index 57b7150039..87feea8984 100644 --- a/asm/nonmatchings/code_35CA80/func_E0052460.s +++ b/asm/nonmatchings/code_35CA80/func_E0052460.s @@ -4,8 +4,8 @@ glabel func_E0052460 /* 35CEE0 E0052460 27BDFF28 */ addiu $sp, $sp, -0xd8 /* 35CEE4 E0052464 3C05DB06 */ lui $a1, 0xdb06 -/* 35CEE8 E0052468 3C07800A */ lui $a3, %hi(D_8009A66C) -/* 35CEEC E005246C 24E7A66C */ addiu $a3, $a3, %lo(D_8009A66C) +/* 35CEE8 E0052468 3C07800A */ lui $a3, %hi(gMasterGfxPos) +/* 35CEEC E005246C 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) /* 35CEF0 E0052470 34A50024 */ ori $a1, $a1, 0x24 /* 35CEF4 E0052474 3C02E700 */ lui $v0, 0xe700 /* 35CEF8 E0052478 AFBF00C4 */ sw $ra, 0xc4($sp) @@ -70,16 +70,16 @@ glabel func_E0052460 /* 35CFD8 E0052558 3C120001 */ lui $s2, 1 /* 35CFDC E005255C 36521630 */ ori $s2, $s2, 0x1630 /* 35CFE0 E0052560 0000982D */ daddu $s3, $zero, $zero -/* 35CFE4 E0052564 3C02800A */ lui $v0, %hi(D_8009A674) -/* 35CFE8 E0052568 2442A674 */ addiu $v0, $v0, %lo(D_8009A674) +/* 35CFE4 E0052564 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 35CFE8 E0052568 2442A674 */ addiu $v0, $v0, %lo(gDisplayContext) /* 35CFEC E005256C 0040B82D */ daddu $s7, $v0, $zero -/* 35CFF0 E0052570 3C028007 */ lui $v0, %hi(D_800741F0) -/* 35CFF4 E0052574 244241F0 */ addiu $v0, $v0, %lo(D_800741F0) +/* 35CFF0 E0052570 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* 35CFF4 E0052574 244241F0 */ addiu $v0, $v0, %lo(gMatrixListPos) /* 35CFF8 E0052578 0040B02D */ daddu $s6, $v0, $zero /* 35CFFC E005257C 3C1E0001 */ lui $fp, 1 /* 35D000 E0052580 37DE1630 */ ori $fp, $fp, 0x1630 -/* 35D004 E0052584 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 35D008 E0052588 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 35D004 E0052584 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 35D008 E0052588 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 35D00C E005258C 0040A82D */ daddu $s5, $v0, $zero /* 35D010 E0052590 8D050004 */ lw $a1, 4($t0) /* 35D014 E0052594 8D060008 */ lw $a2, 8($t0) @@ -260,8 +260,8 @@ glabel func_E0052460 /* 35D2CC E005284C ACA90008 */ sw $t1, 8($a1) /* 35D2D0 E0052850 1440FFCD */ bnez $v0, .LE0052788 /* 35D2D4 E0052854 ACA3000C */ sw $v1, 0xc($a1) -/* 35D2D8 E0052858 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 35D2DC E005285C 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 35D2D8 E0052858 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 35D2DC E005285C 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 35D2E0 E0052860 8CC50000 */ lw $a1, ($a2) /* 35D2E4 E0052864 00A0102D */ daddu $v0, $a1, $zero /* 35D2E8 E0052868 24A50008 */ addiu $a1, $a1, 8 @@ -306,7 +306,7 @@ glabel func_E0052460 /* 35D380 E0052900 1440FFF0 */ bnez $v0, .LE00528C4 /* 35D384 E0052904 ACA00004 */ sw $zero, 4($a1) /* 35D388 E0052908 08014A67 */ j .LE005299C -/* 35D38C E005290C 00000000 */ nop +/* 35D38C E005290C 00000000 */ nop .LE0052910: /* 35D390 E0052910 3C030500 */ lui $v1, 0x500 /* 35D394 E0052914 34630204 */ ori $v1, $v1, 0x204 @@ -359,6 +359,6 @@ glabel func_E0052460 /* 35D448 E00529C8 D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 35D44C E00529CC 03E00008 */ jr $ra /* 35D450 E00529D0 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 35D454 E00529D4 00000000 */ nop -/* 35D458 E00529D8 00000000 */ nop -/* 35D45C E00529DC 00000000 */ nop +/* 35D454 E00529D4 00000000 */ nop +/* 35D458 E00529D8 00000000 */ nop +/* 35D45C E00529DC 00000000 */ nop diff --git a/asm/nonmatchings/code_35DA00/func_E0056BD0.s b/asm/nonmatchings/code_35DA00/func_E0056BD0.s index 113e6966f8..988302f678 100644 --- a/asm/nonmatchings/code_35DA00/func_E0056BD0.s +++ b/asm/nonmatchings/code_35DA00/func_E0056BD0.s @@ -27,8 +27,8 @@ glabel func_E0056BD0 .LE0056C28: /* 35E628 E0056C28 34420024 */ ori $v0, $v0, 0x24 /* 35E62C E0056C2C 3C061464 */ lui $a2, 0x1464 -/* 35E630 E0056C30 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 35E634 E0056C34 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 35E630 E0056C30 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 35E634 E0056C34 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 35E638 E0056C38 8E650000 */ lw $a1, ($s3) /* 35E63C E0056C3C 34C61400 */ ori $a2, $a2, 0x1400 /* 35E640 E0056C40 00A0202D */ daddu $a0, $a1, $zero @@ -91,10 +91,10 @@ glabel func_E0056BD0 /* 35E724 E0056D24 0242102A */ slt $v0, $s2, $v0 /* 35E728 E0056D28 1040004C */ beqz $v0, .LE0056E5C /* 35E72C E0056D2C 2610003C */ addiu $s0, $s0, 0x3c -/* 35E730 E0056D30 3C16800A */ lui $s6, %hi(D_8009A674) -/* 35E734 E0056D34 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) -/* 35E738 E0056D38 3C158007 */ lui $s5, %hi(D_800741F0) -/* 35E73C E0056D3C 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) +/* 35E730 E0056D30 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 35E734 E0056D34 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) +/* 35E738 E0056D38 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 35E73C E0056D3C 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) /* 35E740 E0056D40 3C140001 */ lui $s4, 1 /* 35E744 E0056D44 36941630 */ ori $s4, $s4, 0x1630 /* 35E748 E0056D48 26100020 */ addiu $s0, $s0, 0x20 @@ -182,6 +182,6 @@ glabel func_E0056BD0 /* 35E888 E0056E88 D7B40100 */ ldc1 $f20, 0x100($sp) /* 35E88C E0056E8C 03E00008 */ jr $ra /* 35E890 E0056E90 27BD0110 */ addiu $sp, $sp, 0x110 -/* 35E894 E0056E94 00000000 */ nop -/* 35E898 E0056E98 00000000 */ nop -/* 35E89C E0056E9C 00000000 */ nop +/* 35E894 E0056E94 00000000 */ nop +/* 35E898 E0056E98 00000000 */ nop +/* 35E89C E0056E9C 00000000 */ nop diff --git a/asm/nonmatchings/code_35E920/func_E00584D4.s b/asm/nonmatchings/code_35E920/func_E00584D4.s index f4a771358d..70aeab9cab 100644 --- a/asm/nonmatchings/code_35E920/func_E00584D4.s +++ b/asm/nonmatchings/code_35E920/func_E00584D4.s @@ -10,8 +10,8 @@ glabel func_E00584D4 /* 35EE08 E00584E8 3C061464 */ lui $a2, 0x1464 /* 35EE0C E00584EC 34C61400 */ ori $a2, $a2, 0x1400 /* 35EE10 E00584F0 AFB300E4 */ sw $s3, 0xe4($sp) -/* 35EE14 E00584F4 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 35EE18 E00584F8 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 35EE14 E00584F4 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 35EE18 E00584F8 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 35EE1C E00584FC AFBF00F8 */ sw $ra, 0xf8($sp) /* 35EE20 E0058500 AFB600F0 */ sw $s6, 0xf0($sp) /* 35EE24 E0058504 AFB500EC */ sw $s5, 0xec($sp) @@ -83,10 +83,10 @@ glabel func_E00584D4 /* 35EF2C E005860C 0242102A */ slt $v0, $s2, $v0 /* 35EF30 E0058610 1040004E */ beqz $v0, .LE005874C /* 35EF34 E0058614 26100034 */ addiu $s0, $s0, 0x34 -/* 35EF38 E0058618 3C16800A */ lui $s6, %hi(D_8009A674) -/* 35EF3C E005861C 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) -/* 35EF40 E0058620 3C158007 */ lui $s5, %hi(D_800741F0) -/* 35EF44 E0058624 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) +/* 35EF38 E0058618 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 35EF3C E005861C 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) +/* 35EF40 E0058620 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 35EF44 E0058624 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) /* 35EF48 E0058628 3C140001 */ lui $s4, 1 /* 35EF4C E005862C 36941630 */ ori $s4, $s4, 0x1630 /* 35EF50 E0058630 26100020 */ addiu $s0, $s0, 0x20 diff --git a/asm/nonmatchings/code_3602C0/func_E005A3F4.s b/asm/nonmatchings/code_3602C0/func_E005A3F4.s index 059a227346..3196ddc813 100644 --- a/asm/nonmatchings/code_3602C0/func_E005A3F4.s +++ b/asm/nonmatchings/code_3602C0/func_E005A3F4.s @@ -12,8 +12,8 @@ glabel func_E005A3F4 /* 3606D0 E005A410 3C100001 */ lui $s0, 1 /* 3606D4 E005A414 36101630 */ ori $s0, $s0, 0x1630 /* 3606D8 E005A418 AFB200A0 */ sw $s2, 0xa0($sp) -/* 3606DC E005A41C 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 3606E0 E005A420 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 3606DC E005A41C 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 3606E0 E005A420 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 3606E4 E005A424 3C02E700 */ lui $v0, 0xe700 /* 3606E8 E005A428 AFBF00BC */ sw $ra, 0xbc($sp) /* 3606EC E005A42C AFB700B4 */ sw $s7, 0xb4($sp) @@ -80,10 +80,10 @@ glabel func_E005A3F4 /* 3607E0 E005A520 0C080114 */ jal func_E0200450 /* 3607E4 E005A524 00A0302D */ daddu $a2, $a1, $zero /* 3607E8 E005A528 27A40018 */ addiu $a0, $sp, 0x18 -/* 3607EC E005A52C 3C158007 */ lui $s5, %hi(D_800741F0) -/* 3607F0 E005A530 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) -/* 3607F4 E005A534 3C16800A */ lui $s6, %hi(D_8009A674) -/* 3607F8 E005A538 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) +/* 3607EC E005A52C 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 3607F0 E005A530 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) +/* 3607F4 E005A534 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 3607F8 E005A538 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) /* 3607FC E005A53C 96A50000 */ lhu $a1, ($s5) /* 360800 E005A540 8EC20000 */ lw $v0, ($s6) /* 360804 E005A544 00052980 */ sll $a1, $a1, 6 @@ -191,8 +191,8 @@ glabel func_E005A3F4 /* 360998 E005A6D8 AE440000 */ sw $a0, ($s2) .LE005A6DC: /* 36099C E005A6DC 3C05D838 */ lui $a1, 0xd838 -/* 3609A0 E005A6E0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 3609A4 E005A6E4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 3609A0 E005A6E0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 3609A4 E005A6E4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 3609A8 E005A6E8 8C620000 */ lw $v0, ($v1) /* 3609AC E005A6EC 34A50002 */ ori $a1, $a1, 2 /* 3609B0 E005A6F0 0040202D */ daddu $a0, $v0, $zero @@ -216,6 +216,6 @@ glabel func_E005A3F4 /* 3609F8 E005A738 D7B400C0 */ ldc1 $f20, 0xc0($sp) /* 3609FC E005A73C 03E00008 */ jr $ra /* 360A00 E005A740 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 360A04 E005A744 00000000 */ nop -/* 360A08 E005A748 00000000 */ nop -/* 360A0C E005A74C 00000000 */ nop +/* 360A04 E005A744 00000000 */ nop +/* 360A08 E005A748 00000000 */ nop +/* 360A0C E005A74C 00000000 */ nop diff --git a/asm/nonmatchings/code_360F40/func_E005C2F8.s b/asm/nonmatchings/code_360F40/func_E005C2F8.s index 6c65623a66..6329f13885 100644 --- a/asm/nonmatchings/code_360F40/func_E005C2F8.s +++ b/asm/nonmatchings/code_360F40/func_E005C2F8.s @@ -11,8 +11,8 @@ glabel func_E005C2F8 /* 361250 E005C310 AFB500F4 */ sw $s5, 0xf4($sp) /* 361254 E005C314 3C150001 */ lui $s5, 1 /* 361258 E005C318 AFB700FC */ sw $s7, 0xfc($sp) -/* 36125C E005C31C 3C17800A */ lui $s7, %hi(D_8009A66C) -/* 361260 E005C320 26F7A66C */ addiu $s7, $s7, %lo(D_8009A66C) +/* 36125C E005C31C 3C17800A */ lui $s7, %hi(gMasterGfxPos) +/* 361260 E005C320 26F7A66C */ addiu $s7, $s7, %lo(gMasterGfxPos) /* 361264 E005C324 AFBF0104 */ sw $ra, 0x104($sp) /* 361268 E005C328 AFB600F8 */ sw $s6, 0xf8($sp) /* 36126C E005C32C AFB400F0 */ sw $s4, 0xf0($sp) @@ -48,9 +48,9 @@ glabel func_E005C2F8 /* 3612E4 E005C3A4 3C02DE00 */ lui $v0, 0xde00 /* 3612E8 E005C3A8 4600110D */ trunc.w.s $f4, $f2 /* 3612EC E005C3AC 44132000 */ mfc1 $s3, $f4 -/* 3612F0 E005C3B0 00000000 */ nop +/* 3612F0 E005C3B0 00000000 */ nop /* 3612F4 E005C3B4 44930000 */ mtc1 $s3, $f0 -/* 3612F8 E005C3B8 00000000 */ nop +/* 3612F8 E005C3B8 00000000 */ nop /* 3612FC E005C3BC 46800020 */ cvt.s.w $f0, $f0 /* 361300 E005C3C0 3A740006 */ xori $s4, $s3, 6 /* 361304 E005C3C4 46001081 */ sub.s $f2, $f2, $f0 @@ -62,7 +62,7 @@ glabel func_E005C2F8 /* 36131C E005C3DC ACA7000C */ sw $a3, 0xc($a1) /* 361320 E005C3E0 00621821 */ addu $v1, $v1, $v0 /* 361324 E005C3E4 46001082 */ mul.s $f2, $f2, $f0 -/* 361328 E005C3E8 00000000 */ nop +/* 361328 E005C3E8 00000000 */ nop /* 36132C E005C3EC ACA30004 */ sw $v1, 4($a1) /* 361330 E005C3F0 8EC50004 */ lw $a1, 4($s6) /* 361334 E005C3F4 8EC60008 */ lw $a2, 8($s6) @@ -98,10 +98,10 @@ glabel func_E005C2F8 /* 3613AC E005C46C 0C080114 */ jal func_E0200450 /* 3613B0 E005C470 0200302D */ daddu $a2, $s0, $zero /* 3613B4 E005C474 0200202D */ daddu $a0, $s0, $zero -/* 3613B8 E005C478 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3613BC E005C47C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3613C0 E005C480 3C11800A */ lui $s1, %hi(D_8009A674) -/* 3613C4 E005C484 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 3613B8 E005C478 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3613BC E005C47C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3613C0 E005C480 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 3613C4 E005C484 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 3613C8 E005C488 96050000 */ lhu $a1, ($s0) /* 3613CC E005C48C 8E220000 */ lw $v0, ($s1) /* 3613D0 E005C490 00052980 */ sll $a1, $a1, 6 @@ -185,14 +185,14 @@ glabel func_E005C2F8 /* 361500 E005C5C0 0222102A */ slt $v0, $s1, $v0 /* 361504 E005C5C4 10400037 */ beqz $v0, .LE005C6A4 /* 361508 E005C5C8 26D60034 */ addiu $s6, $s6, 0x34 -/* 36150C E005C5CC 3C15800A */ lui $s5, %hi(D_8009A674) -/* 361510 E005C5D0 26B5A674 */ addiu $s5, $s5, %lo(D_8009A674) -/* 361514 E005C5D4 3C148007 */ lui $s4, %hi(D_800741F0) -/* 361518 E005C5D8 269441F0 */ addiu $s4, $s4, %lo(D_800741F0) +/* 36150C E005C5CC 3C15800A */ lui $s5, %hi(gDisplayContext) +/* 361510 E005C5D0 26B5A674 */ addiu $s5, $s5, %lo(gDisplayContext) +/* 361514 E005C5D4 3C148007 */ lui $s4, %hi(gMatrixListPos) +/* 361518 E005C5D8 269441F0 */ addiu $s4, $s4, %lo(gMatrixListPos) /* 36151C E005C5DC 3C130001 */ lui $s3, 1 /* 361520 E005C5E0 36731630 */ ori $s3, $s3, 0x1630 -/* 361524 E005C5E4 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 361528 E005C5E8 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 361524 E005C5E4 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 361528 E005C5E8 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 36152C E005C5EC 26D0000C */ addiu $s0, $s6, 0xc .LE005C5F0: /* 361530 E005C5F0 27A40018 */ addiu $a0, $sp, 0x18 @@ -242,8 +242,8 @@ glabel func_E005C2F8 /* 3615E0 E005C6A0 AE440000 */ sw $a0, ($s2) .LE005C6A4: /* 3615E4 E005C6A4 3C05D838 */ lui $a1, 0xd838 -/* 3615E8 E005C6A8 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 3615EC E005C6AC 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 3615E8 E005C6A8 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 3615EC E005C6AC 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 3615F0 E005C6B0 8C620000 */ lw $v0, ($v1) /* 3615F4 E005C6B4 34A50002 */ ori $a1, $a1, 2 /* 3615F8 E005C6B8 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_3625C0/func_E005E334.s b/asm/nonmatchings/code_3625C0/func_E005E334.s index 1ec841322b..1191fc4610 100644 --- a/asm/nonmatchings/code_3625C0/func_E005E334.s +++ b/asm/nonmatchings/code_3625C0/func_E005E334.s @@ -22,8 +22,8 @@ glabel func_E005E334 /* 362938 E005E378 34E70024 */ ori $a3, $a3, 0x24 /* 36293C E005E37C 27A40018 */ addiu $a0, $sp, 0x18 /* 362940 E005E380 3C110001 */ lui $s1, 1 -/* 362944 E005E384 3C16800A */ lui $s6, %hi(D_8009A66C) -/* 362948 E005E388 26D6A66C */ addiu $s6, $s6, %lo(D_8009A66C) +/* 362944 E005E384 3C16800A */ lui $s6, %hi(gMasterGfxPos) +/* 362948 E005E388 26D6A66C */ addiu $s6, $s6, %lo(gMasterGfxPos) /* 36294C E005E38C 8EC30000 */ lw $v1, ($s6) /* 362950 E005E390 36311630 */ ori $s1, $s1, 0x1630 /* 362954 E005E394 0060282D */ daddu $a1, $v1, $zero @@ -83,10 +83,10 @@ glabel func_E005E334 /* 362A2C E005E46C 0C080114 */ jal func_E0200450 /* 362A30 E005E470 0200302D */ daddu $a2, $s0, $zero /* 362A34 E005E474 0200202D */ daddu $a0, $s0, $zero -/* 362A38 E005E478 3C108007 */ lui $s0, %hi(D_800741F0) -/* 362A3C E005E47C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 362A40 E005E480 3C17800A */ lui $s7, %hi(D_8009A674) -/* 362A44 E005E484 26F7A674 */ addiu $s7, $s7, %lo(D_8009A674) +/* 362A38 E005E478 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 362A3C E005E47C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 362A40 E005E480 3C17800A */ lui $s7, %hi(gDisplayContext) +/* 362A44 E005E484 26F7A674 */ addiu $s7, $s7, %lo(gDisplayContext) /* 362A48 E005E488 96050000 */ lhu $a1, ($s0) /* 362A4C E005E48C 8EE20000 */ lw $v0, ($s7) /* 362A50 E005E490 00052980 */ sll $a1, $a1, 6 @@ -188,8 +188,8 @@ glabel func_E005E334 /* 362BCC E005E60C AE240000 */ sw $a0, ($s1) .LE005E610: /* 362BD0 E005E610 3C05D838 */ lui $a1, 0xd838 -/* 362BD4 E005E614 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 362BD8 E005E618 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 362BD4 E005E614 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 362BD8 E005E618 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 362BDC E005E61C 8C620000 */ lw $v0, ($v1) /* 362BE0 E005E620 34A50002 */ ori $a1, $a1, 2 /* 362BE4 E005E624 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_363160/func_E0060450.s b/asm/nonmatchings/code_363160/func_E0060450.s index 9a6b50af6e..2182aba9e0 100644 --- a/asm/nonmatchings/code_363160/func_E0060450.s +++ b/asm/nonmatchings/code_363160/func_E0060450.s @@ -6,8 +6,8 @@ glabel func_E0060450 /* 3635B4 E0060454 3C02DB06 */ lui $v0, 0xdb06 /* 3635B8 E0060458 34420024 */ ori $v0, $v0, 0x24 /* 3635BC E006045C AFB400E8 */ sw $s4, 0xe8($sp) -/* 3635C0 E0060460 3C14800A */ lui $s4, %hi(D_8009A66C) -/* 3635C4 E0060464 2694A66C */ addiu $s4, $s4, %lo(D_8009A66C) +/* 3635C0 E0060460 3C14800A */ lui $s4, %hi(gMasterGfxPos) +/* 3635C4 E0060464 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) /* 3635C8 E0060468 AFBF00FC */ sw $ra, 0xfc($sp) /* 3635CC E006046C AFBE00F8 */ sw $fp, 0xf8($sp) /* 3635D0 E0060470 AFB700F4 */ sw $s7, 0xf4($sp) @@ -87,10 +87,10 @@ glabel func_E0060450 /* 3636F8 E0060598 10400056 */ beqz $v0, .LE00606F4 /* 3636FC E006059C 26100030 */ addiu $s0, $s0, 0x30 /* 363700 E00605A0 0220902D */ daddu $s2, $s1, $zero -/* 363704 E00605A4 3C1E800A */ lui $fp, %hi(D_8009A674) -/* 363708 E00605A8 27DEA674 */ addiu $fp, $fp, %lo(D_8009A674) -/* 36370C E00605AC 3C178007 */ lui $s7, %hi(D_800741F0) -/* 363710 E00605B0 26F741F0 */ addiu $s7, $s7, %lo(D_800741F0) +/* 363704 E00605A4 3C1E800A */ lui $fp, %hi(gDisplayContext) +/* 363708 E00605A8 27DEA674 */ addiu $fp, $fp, %lo(gDisplayContext) +/* 36370C E00605AC 3C178007 */ lui $s7, %hi(gMatrixListPos) +/* 363710 E00605B0 26F741F0 */ addiu $s7, $s7, %lo(gMatrixListPos) /* 363714 E00605B4 3C160001 */ lui $s6, 1 /* 363718 E00605B8 36D61630 */ ori $s6, $s6, 0x1630 /* 36371C E00605BC 26110020 */ addiu $s1, $s0, 0x20 @@ -188,4 +188,4 @@ glabel func_E0060450 /* 363880 E0060720 D7B40100 */ ldc1 $f20, 0x100($sp) /* 363884 E0060724 03E00008 */ jr $ra /* 363888 E0060728 27BD0110 */ addiu $sp, $sp, 0x110 -/* 36388C E006072C 00000000 */ nop +/* 36388C E006072C 00000000 */ nop diff --git a/asm/nonmatchings/code_364300/func_E00624EC.s b/asm/nonmatchings/code_364300/func_E00624EC.s index c228208582..3ccfae4cb4 100644 --- a/asm/nonmatchings/code_364300/func_E00624EC.s +++ b/asm/nonmatchings/code_364300/func_E00624EC.s @@ -12,8 +12,8 @@ glabel func_E00624EC /* 364808 E0062508 3C110001 */ lui $s1, 1 /* 36480C E006250C 36311630 */ ori $s1, $s1, 0x1630 /* 364810 E0062510 AFB300EC */ sw $s3, 0xec($sp) -/* 364814 E0062514 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 364818 E0062518 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 364814 E0062514 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 364818 E0062518 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 36481C E006251C AFBF0104 */ sw $ra, 0x104($sp) /* 364820 E0062520 AFB700FC */ sw $s7, 0xfc($sp) /* 364824 E0062524 AFB600F8 */ sw $s6, 0xf8($sp) @@ -83,10 +83,10 @@ glabel func_E00624EC /* 364924 E0062624 0C080114 */ jal func_E0200450 /* 364928 E0062628 0200302D */ daddu $a2, $s0, $zero /* 36492C E006262C 0200202D */ daddu $a0, $s0, $zero -/* 364930 E0062630 3C108007 */ lui $s0, %hi(D_800741F0) -/* 364934 E0062634 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 364938 E0062638 3C16800A */ lui $s6, %hi(D_8009A674) -/* 36493C E006263C 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) +/* 364930 E0062630 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 364934 E0062634 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 364938 E0062638 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 36493C E006263C 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) /* 364940 E0062640 96050000 */ lhu $a1, ($s0) /* 364944 E0062644 8EC20000 */ lw $v0, ($s6) /* 364948 E0062648 00052980 */ sll $a1, $a1, 6 @@ -216,8 +216,8 @@ glabel func_E00624EC /* 364B34 E0062834 AE640000 */ sw $a0, ($s3) .LE0062838: /* 364B38 E0062838 3C03D838 */ lui $v1, 0xd838 -/* 364B3C E006283C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 364B40 E0062840 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 364B3C E006283C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 364B40 E0062840 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 364B44 E0062844 8C820000 */ lw $v0, ($a0) /* 364B48 E0062848 34630002 */ ori $v1, $v1, 2 /* 364B4C E006284C 0040282D */ daddu $a1, $v0, $zero @@ -246,6 +246,6 @@ glabel func_E00624EC /* 364BA8 E00628A8 D7B40108 */ ldc1 $f20, 0x108($sp) /* 364BAC E00628AC 03E00008 */ jr $ra /* 364BB0 E00628B0 27BD0120 */ addiu $sp, $sp, 0x120 -/* 364BB4 E00628B4 00000000 */ nop -/* 364BB8 E00628B8 00000000 */ nop -/* 364BBC E00628BC 00000000 */ nop +/* 364BB4 E00628B4 00000000 */ nop +/* 364BB8 E00628B8 00000000 */ nop +/* 364BBC E00628BC 00000000 */ nop diff --git a/asm/nonmatchings/code_364F10/func_E0064414.s b/asm/nonmatchings/code_364F10/func_E0064414.s index afd7a08c00..307e24f52c 100644 --- a/asm/nonmatchings/code_364F10/func_E0064414.s +++ b/asm/nonmatchings/code_364F10/func_E0064414.s @@ -4,8 +4,8 @@ glabel func_E0064414 /* 365324 E0064414 27BDFEE8 */ addiu $sp, $sp, -0x118 /* 365328 E0064418 AFB300E4 */ sw $s3, 0xe4($sp) -/* 36532C E006441C 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 365330 E0064420 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 36532C E006441C 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 365330 E0064420 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 365334 E0064424 AFBF00FC */ sw $ra, 0xfc($sp) /* 365338 E0064428 AFBE00F8 */ sw $fp, 0xf8($sp) /* 36533C E006442C AFB700F4 */ sw $s7, 0xf4($sp) @@ -92,10 +92,10 @@ glabel func_E0064414 /* 365480 E0064570 0C080180 */ jal func_E0200600 /* 365484 E0064574 E7A0001C */ swc1 $f0, 0x1c($sp) /* 365488 E0064578 27A40020 */ addiu $a0, $sp, 0x20 -/* 36548C E006457C 3C158007 */ lui $s5, %hi(D_800741F0) -/* 365490 E0064580 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) -/* 365494 E0064584 3C16800A */ lui $s6, %hi(D_8009A674) -/* 365498 E0064588 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) +/* 36548C E006457C 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 365490 E0064580 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) +/* 365494 E0064584 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 365498 E0064588 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) /* 36549C E006458C 96A50000 */ lhu $a1, ($s5) /* 3654A0 E0064590 8EC20000 */ lw $v0, ($s6) /* 3654A4 E0064594 00052980 */ sll $a1, $a1, 6 @@ -153,7 +153,7 @@ glabel func_E0064414 .LE0064664: /* 365574 E0064664 8E020008 */ lw $v0, 8($s0) /* 365578 E0064668 0440007E */ bltz $v0, .LE0064864 -/* 36557C E006466C 00000000 */ nop +/* 36557C E006466C 00000000 */ nop /* 365580 E0064670 8E05FFC0 */ lw $a1, -0x40($s0) /* 365584 E0064674 8E06FFC4 */ lw $a2, -0x3c($s0) /* 365588 E0064678 8E07FFC8 */ lw $a3, -0x38($s0) @@ -172,15 +172,15 @@ glabel func_E0064414 /* 3655BC E00646AC C604FFD8 */ lwc1 $f4, -0x28($s0) /* 3655C0 E00646B0 46002121 */ cvt.d.s $f4, $f4 /* 3655C4 E00646B4 46342102 */ mul.d $f4, $f4, $f20 -/* 3655C8 E00646B8 00000000 */ nop +/* 3655C8 E00646B8 00000000 */ nop /* 3655CC E00646BC C602FFDC */ lwc1 $f2, -0x24($s0) /* 3655D0 E00646C0 460010A1 */ cvt.d.s $f2, $f2 /* 3655D4 E00646C4 46341082 */ mul.d $f2, $f2, $f20 -/* 3655D8 E00646C8 00000000 */ nop +/* 3655D8 E00646C8 00000000 */ nop /* 3655DC E00646CC C600FFE0 */ lwc1 $f0, -0x20($s0) /* 3655E0 E00646D0 46000021 */ cvt.d.s $f0, $f0 /* 3655E4 E00646D4 46340002 */ mul.d $f0, $f0, $f20 -/* 3655E8 E00646D8 00000000 */ nop +/* 3655E8 E00646D8 00000000 */ nop /* 3655EC E00646DC 46202120 */ cvt.s.d $f4, $f4 /* 3655F0 E00646E0 462010A0 */ cvt.s.d $f2, $f2 /* 3655F4 E00646E4 46200020 */ cvt.s.d $f0, $f0 @@ -205,8 +205,8 @@ glabel func_E0064414 /* 365640 E0064730 00A0302D */ daddu $a2, $a1, $zero /* 365644 E0064734 27A40020 */ addiu $a0, $sp, 0x20 /* 365648 E0064738 96C50000 */ lhu $a1, ($s6) -/* 36564C E006473C 3C02800A */ lui $v0, %hi(D_8009A674) -/* 365650 E0064740 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 36564C E006473C 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 365650 E0064740 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 365654 E0064744 00052980 */ sll $a1, $a1, 6 /* 365658 E0064748 00B52821 */ addu $a1, $a1, $s5 /* 36565C E006474C 0C080118 */ jal func_E0200460 @@ -223,7 +223,7 @@ glabel func_E0064414 /* 365688 E0064778 24630008 */ addiu $v1, $v1, 8 /* 36568C E006477C 4600018D */ trunc.w.s $f6, $f0 /* 365690 E0064780 44023000 */ mfc1 $v0, $f6 -/* 365694 E0064784 00000000 */ nop +/* 365694 E0064784 00000000 */ nop /* 365698 E0064788 30420FFF */ andi $v0, $v0, 0xfff /* 36569C E006478C 005E1025 */ or $v0, $v0, $fp /* 3656A0 E0064790 AE630000 */ sw $v1, ($s3) @@ -243,7 +243,7 @@ glabel func_E0064414 /* 3656D8 E00647C8 AE620000 */ sw $v0, ($s3) /* 3656DC E00647CC 4600018D */ trunc.w.s $f6, $f0 /* 3656E0 E00647D0 44023000 */ mfc1 $v0, $f6 -/* 3656E4 E00647D4 00000000 */ nop +/* 3656E4 E00647D4 00000000 */ nop /* 3656E8 E00647D8 2442007C */ addiu $v0, $v0, 0x7c /* 3656EC E00647DC 30420FFF */ andi $v0, $v0, 0xfff /* 3656F0 E00647E0 00461025 */ or $v0, $v0, $a2 @@ -253,15 +253,15 @@ glabel func_E0064414 /* 365700 E00647F0 AE620000 */ sw $v0, ($s3) /* 365704 E00647F4 4600018D */ trunc.w.s $f6, $f0 /* 365708 E00647F8 44023000 */ mfc1 $v0, $f6 -/* 36570C E00647FC 00000000 */ nop +/* 36570C E00647FC 00000000 */ nop /* 365710 E0064800 30420FFF */ andi $v0, $v0, 0xfff /* 365714 E0064804 005E1025 */ or $v0, $v0, $fp /* 365718 E0064808 AC620000 */ sw $v0, ($v1) /* 36571C E006480C C6000000 */ lwc1 $f0, ($s0) /* 365720 E0064810 3C02DA38 */ lui $v0, 0xda38 /* 365724 E0064814 AC620008 */ sw $v0, 8($v1) -/* 365728 E0064818 3C02800A */ lui $v0, %hi(D_8009A674) -/* 36572C E006481C 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 365728 E0064818 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 36572C E006481C 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 365730 E0064820 3C0D0900 */ lui $t5, 0x900 /* 365734 E0064824 25AD0540 */ addiu $t5, $t5, 0x540 /* 365738 E0064828 AC6D0014 */ sw $t5, 0x14($v1) @@ -274,7 +274,7 @@ glabel func_E0064414 /* 365754 E0064844 AC62001C */ sw $v0, 0x1c($v1) /* 365758 E0064848 4600018D */ trunc.w.s $f6, $f0 /* 36575C E006484C 44023000 */ mfc1 $v0, $f6 -/* 365760 E0064850 00000000 */ nop +/* 365760 E0064850 00000000 */ nop /* 365764 E0064854 2442007C */ addiu $v0, $v0, 0x7c /* 365768 E0064858 30420FFF */ andi $v0, $v0, 0xfff /* 36576C E006485C 00481025 */ or $v0, $v0, $t0 @@ -289,8 +289,8 @@ glabel func_E0064414 .LE006487C: /* 36578C E006487C 3C0AD9FF */ lui $t2, 0xd9ff /* 365790 E0064880 354AF9FF */ ori $t2, $t2, 0xf9ff -/* 365794 E0064884 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 365798 E0064888 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 365794 E0064884 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 365798 E0064888 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 36579C E006488C 3C02DF00 */ lui $v0, 0xdf00 /* 3657A0 E0064890 8CA30000 */ lw $v1, ($a1) /* 3657A4 E0064894 3C09FA00 */ lui $t1, 0xfa00 diff --git a/asm/nonmatchings/code_366030/func_E0066770.s b/asm/nonmatchings/code_366030/func_E0066770.s index 5ff4129c96..9d95f44e00 100644 --- a/asm/nonmatchings/code_366030/func_E0066770.s +++ b/asm/nonmatchings/code_366030/func_E0066770.s @@ -12,8 +12,8 @@ glabel func_E0066770 /* 3667BC E006678C 3C120001 */ lui $s2, 1 /* 3667C0 E0066790 36521630 */ ori $s2, $s2, 0x1630 /* 3667C4 E0066794 AFB600C0 */ sw $s6, 0xc0($sp) -/* 3667C8 E0066798 3C16800A */ lui $s6, %hi(D_8009A66C) -/* 3667CC E006679C 26D6A66C */ addiu $s6, $s6, %lo(D_8009A66C) +/* 3667C8 E0066798 3C16800A */ lui $s6, %hi(gMasterGfxPos) +/* 3667CC E006679C 26D6A66C */ addiu $s6, $s6, %lo(gMasterGfxPos) /* 3667D0 E00667A0 AFBF00CC */ sw $ra, 0xcc($sp) /* 3667D4 E00667A4 AFBE00C8 */ sw $fp, 0xc8($sp) /* 3667D8 E00667A8 AFB500BC */ sw $s5, 0xbc($sp) @@ -84,11 +84,11 @@ glabel func_E0066770 /* 3668DC E00668AC E7B40018 */ swc1 $f20, 0x18($sp) /* 3668E0 E00668B0 E7A20014 */ swc1 $f2, 0x14($sp) /* 3668E4 E00668B4 44821000 */ mtc1 $v0, $f2 -/* 3668E8 E00668B8 00000000 */ nop +/* 3668E8 E00668B8 00000000 */ nop /* 3668EC E00668BC 468010A0 */ cvt.s.w $f2, $f2 /* 3668F0 E00668C0 E7A00010 */ swc1 $f0, 0x10($sp) /* 3668F4 E00668C4 44830000 */ mtc1 $v1, $f0 -/* 3668F8 E00668C8 00000000 */ nop +/* 3668F8 E00668C8 00000000 */ nop /* 3668FC E00668CC 46800020 */ cvt.s.w $f0, $f0 /* 366900 E00668D0 46001083 */ div.s $f2, $f2, $f0 /* 366904 E00668D4 8E860060 */ lw $a2, 0x60($s4) @@ -100,10 +100,10 @@ glabel func_E0066770 /* 36691C E00668EC 0C080114 */ jal func_E0200450 /* 366920 E00668F0 00A0302D */ daddu $a2, $a1, $zero /* 366924 E00668F4 27A40020 */ addiu $a0, $sp, 0x20 -/* 366928 E00668F8 3C108007 */ lui $s0, %hi(D_800741F0) -/* 36692C E00668FC 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 366930 E0066900 3C11800A */ lui $s1, %hi(D_8009A674) -/* 366934 E0066904 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 366928 E00668F8 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 36692C E00668FC 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 366930 E0066900 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 366934 E0066904 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 366938 E0066908 96050000 */ lhu $a1, ($s0) /* 36693C E006690C 8E220000 */ lw $v0, ($s1) /* 366940 E0066910 00052980 */ sll $a1, $a1, 6 @@ -278,8 +278,8 @@ glabel func_E0066770 .LE0066BA4: /* 366BD4 E0066BA4 3C02D838 */ lui $v0, 0xd838 /* 366BD8 E0066BA8 34420002 */ ori $v0, $v0, 2 -/* 366BDC E0066BAC 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 366BE0 E0066BB0 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 366BDC E0066BAC 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 366BE0 E0066BB0 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 366BE4 E0066BB4 8CA40000 */ lw $a0, ($a1) /* 366BE8 E0066BB8 3C06DA38 */ lui $a2, 0xda38 /* 366BEC E0066BBC 0080182D */ daddu $v1, $a0, $zero @@ -292,8 +292,8 @@ glabel func_E0066770 /* 366C08 E0066BD8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* 366C0C E0066BDC 24820008 */ addiu $v0, $a0, 8 /* 366C10 E0066BE0 ACA20000 */ sw $v0, ($a1) -/* 366C14 E0066BE4 3C02800A */ lui $v0, %hi(D_8009A674) -/* 366C18 E0066BE8 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 366C14 E0066BE4 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 366C18 E0066BE8 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 366C1C E0066BEC 34C60007 */ ori $a2, $a2, 7 /* 366C20 E0066BF0 AC860000 */ sw $a2, ($a0) /* 366C24 E0066BF4 00031980 */ sll $v1, $v1, 6 @@ -318,4 +318,4 @@ glabel func_E0066770 /* 366C70 E0066C40 D7B400D0 */ ldc1 $f20, 0xd0($sp) /* 366C74 E0066C44 03E00008 */ jr $ra /* 366C78 E0066C48 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 366C7C E0066C4C 00000000 */ nop +/* 366C7C E0066C4C 00000000 */ nop diff --git a/asm/nonmatchings/code_36A8D0/func_E0068234.s b/asm/nonmatchings/code_36A8D0/func_E0068234.s index 80b1b6168e..30215914a9 100644 --- a/asm/nonmatchings/code_36A8D0/func_E0068234.s +++ b/asm/nonmatchings/code_36A8D0/func_E0068234.s @@ -5,8 +5,8 @@ glabel func_E0068234 /* 36AB04 E0068234 27BDFF78 */ addiu $sp, $sp, -0x88 /* 36AB08 E0068238 3C07DB06 */ lui $a3, 0xdb06 /* 36AB0C E006823C AFB10064 */ sw $s1, 0x64($sp) -/* 36AB10 E0068240 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 36AB14 E0068244 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 36AB10 E0068240 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 36AB14 E0068244 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 36AB18 E0068248 34E70024 */ ori $a3, $a3, 0x24 /* 36AB1C E006824C AFB3006C */ sw $s3, 0x6c($sp) /* 36AB20 E0068250 3C130001 */ lui $s3, 1 @@ -71,10 +71,10 @@ glabel func_E0068234 /* 36AC0C E006833C 0C080180 */ jal func_E0200600 /* 36AC10 E0068340 E7A0001C */ swc1 $f0, 0x1c($sp) /* 36AC14 E0068344 27A40020 */ addiu $a0, $sp, 0x20 -/* 36AC18 E0068348 3C108007 */ lui $s0, %hi(D_800741F0) -/* 36AC1C E006834C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 36AC20 E0068350 3C12800A */ lui $s2, %hi(D_8009A674) -/* 36AC24 E0068354 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 36AC18 E0068348 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 36AC1C E006834C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 36AC20 E0068350 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 36AC24 E0068354 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 36AC28 E0068358 96050000 */ lhu $a1, ($s0) /* 36AC2C E006835C 8E420000 */ lw $v0, ($s2) /* 36AC30 E0068360 00052980 */ sll $a1, $a1, 6 @@ -104,7 +104,7 @@ glabel func_E0068234 /* 36AC90 E00683C0 3C01E007 */ lui $at, %hi(D_E0068600) /* 36AC94 E00683C4 D4208600 */ ldc1 $f0, %lo(D_E0068600)($at) /* 36AC98 E00683C8 46201002 */ mul.d $f0, $f2, $f0 -/* 36AC9C E00683CC 00000000 */ nop +/* 36AC9C E00683CC 00000000 */ nop /* 36ACA0 E00683D0 4620010D */ trunc.w.d $f4, $f0 /* 36ACA4 E00683D4 44092000 */ mfc1 $t1, $f4 /* 36ACA8 E00683D8 0801A0FB */ j .LE00683EC @@ -117,8 +117,8 @@ glabel func_E0068234 /* 36ACBC E00683EC 3C0AE300 */ lui $t2, 0xe300 /* 36ACC0 E00683F0 354A1801 */ ori $t2, $t2, 0x1801 /* 36ACC4 E00683F4 3C0BE300 */ lui $t3, 0xe300 -/* 36ACC8 E00683F8 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 36ACCC E00683FC 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 36ACC8 E00683F8 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 36ACCC E00683FC 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 36ACD0 E0068400 356B1A01 */ ori $t3, $t3, 0x1a01 /* 36ACD4 E0068404 3C06FB00 */ lui $a2, 0xfb00 /* 36ACD8 E0068408 240D0040 */ addiu $t5, $zero, 0x40 @@ -227,4 +227,4 @@ glabel func_E0068234 /* 36AE70 E00685A0 8FB00060 */ lw $s0, 0x60($sp) /* 36AE74 E00685A4 03E00008 */ jr $ra /* 36AE78 E00685A8 27BD0088 */ addiu $sp, $sp, 0x88 -/* 36AE7C E00685AC 00000000 */ nop +/* 36AE7C E00685AC 00000000 */ nop diff --git a/asm/nonmatchings/code_36D020/func_E006A85C.s b/asm/nonmatchings/code_36D020/func_E006A85C.s index 5643b8a4b5..0d90c0aaf8 100644 --- a/asm/nonmatchings/code_36D020/func_E006A85C.s +++ b/asm/nonmatchings/code_36D020/func_E006A85C.s @@ -2,20 +2,20 @@ .set noreorder # don't insert nops after branches glabel func_E006A85C -/* 36D87C E006A85C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 36D880 E006A860 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 36D87C E006A85C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 36D880 E006A860 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 36D884 E006A864 C4820034 */ lwc1 $f2, 0x34($a0) /* 36D888 E006A868 3C014080 */ lui $at, 0x4080 /* 36D88C E006A86C 44812000 */ mtc1 $at, $f4 /* 36D890 E006A870 3C08F200 */ lui $t0, 0xf200 /* 36D894 E006A874 46041082 */ mul.s $f2, $f2, $f4 -/* 36D898 E006A878 00000000 */ nop +/* 36D898 E006A878 00000000 */ nop /* 36D89C E006A87C 8C670000 */ lw $a3, ($v1) /* 36D8A0 E006A880 C4800038 */ lwc1 $f0, 0x38($a0) /* 36D8A4 E006A884 00E0482D */ daddu $t1, $a3, $zero /* 36D8A8 E006A888 24E70008 */ addiu $a3, $a3, 8 /* 36D8AC E006A88C 46040002 */ mul.s $f0, $f0, $f4 -/* 36D8B0 E006A890 00000000 */ nop +/* 36D8B0 E006A890 00000000 */ nop /* 36D8B4 E006A894 24E20008 */ addiu $v0, $a3, 8 /* 36D8B8 E006A898 AC670000 */ sw $a3, ($v1) /* 36D8BC E006A89C AC620000 */ sw $v0, ($v1) @@ -32,13 +32,13 @@ glabel func_E006A85C /* 36D8E8 E006A8C8 C480003C */ lwc1 $f0, 0x3c($a0) /* 36D8EC E006A8CC 30420FFF */ andi $v0, $v0, 0xfff /* 36D8F0 E006A8D0 46040002 */ mul.s $f0, $f0, $f4 -/* 36D8F4 E006A8D4 00000000 */ nop +/* 36D8F4 E006A8D4 00000000 */ nop /* 36D8F8 E006A8D8 00021300 */ sll $v0, $v0, 0xc /* 36D8FC E006A8DC 24C60100 */ addiu $a2, $a2, 0x100 /* 36D900 E006A8E0 C4820040 */ lwc1 $f2, 0x40($a0) /* 36D904 E006A8E4 30C60FFF */ andi $a2, $a2, 0xfff /* 36D908 E006A8E8 46041082 */ mul.s $f2, $f2, $f4 -/* 36D90C E006A8EC 00000000 */ nop +/* 36D90C E006A8EC 00000000 */ nop /* 36D910 E006A8F0 00461025 */ or $v0, $v0, $a2 /* 36D914 E006A8F4 AD250000 */ sw $a1, ($t1) /* 36D918 E006A8F8 AD220004 */ sw $v0, 4($t1) diff --git a/asm/nonmatchings/code_36D020/func_E006A94C.s b/asm/nonmatchings/code_36D020/func_E006A94C.s index 2c0e0377bc..5378c8a629 100644 --- a/asm/nonmatchings/code_36D020/func_E006A94C.s +++ b/asm/nonmatchings/code_36D020/func_E006A94C.s @@ -7,8 +7,8 @@ glabel func_E006A94C /* 36D974 E006A954 8FA80120 */ lw $t0, 0x120($sp) /* 36D978 E006A958 3C07DB06 */ lui $a3, 0xdb06 /* 36D97C E006A95C AFB100E4 */ sw $s1, 0xe4($sp) -/* 36D980 E006A960 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 36D984 E006A964 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 36D980 E006A960 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 36D984 E006A964 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 36D988 E006A968 AFBF0104 */ sw $ra, 0x104($sp) /* 36D98C E006A96C AFBE0100 */ sw $fp, 0x100($sp) /* 36D990 E006A970 AFB700FC */ sw $s7, 0xfc($sp) @@ -67,8 +67,8 @@ glabel func_E006A94C /* 36DA64 E006AA44 2AF60002 */ slti $s6, $s7, 2 /* 36DA68 E006AA48 27B00058 */ addiu $s0, $sp, 0x58 /* 36DA6C E006AA4C 0220982D */ daddu $s3, $s1, $zero -/* 36DA70 E006AA50 3C1E8007 */ lui $fp, %hi(D_800741F0) -/* 36DA74 E006AA54 27DE41F0 */ addiu $fp, $fp, %lo(D_800741F0) +/* 36DA70 E006AA50 3C1E8007 */ lui $fp, %hi(gMatrixListPos) +/* 36DA74 E006AA54 27DE41F0 */ addiu $fp, $fp, %lo(gMatrixListPos) /* 36DA78 E006AA58 3C150001 */ lui $s5, 1 /* 36DA7C E006AA5C 36B51630 */ ori $s5, $s5, 0x1630 /* 36DA80 E006AA60 26510024 */ addiu $s1, $s2, 0x24 @@ -103,7 +103,7 @@ glabel func_E006A94C /* 36DAEC E006AACC 46161000 */ add.s $f0, $f2, $f22 /* 36DAF0 E006AAD0 3C014234 */ lui $at, 0x4234 /* 36DAF4 E006AAD4 44810000 */ mtc1 $at, $f0 -/* 36DAF8 E006AAD8 00000000 */ nop +/* 36DAF8 E006AAD8 00000000 */ nop /* 36DAFC E006AADC 46001000 */ add.s $f0, $f2, $f0 .LE006AAE0: /* 36DB00 E006AAE0 44050000 */ mfc1 $a1, $f0 @@ -137,14 +137,14 @@ glabel func_E006A94C /* 36DB70 E006AB50 00A0302D */ daddu $a2, $a1, $zero /* 36DB74 E006AB54 3C014040 */ lui $at, 0x4040 /* 36DB78 E006AB58 44810000 */ mtc1 $at, $f0 -/* 36DB7C E006AB5C 00000000 */ nop +/* 36DB7C E006AB5C 00000000 */ nop /* 36DB80 E006AB60 4600A000 */ add.s $f0, $f20, $f0 /* 36DB84 E006AB64 3C013FD0 */ lui $at, 0x3fd0 /* 36DB88 E006AB68 44811800 */ mtc1 $at, $f3 /* 36DB8C E006AB6C 44801000 */ mtc1 $zero, $f2 /* 36DB90 E006AB70 46000021 */ cvt.d.s $f0, $f0 /* 36DB94 E006AB74 46220002 */ mul.d $f0, $f0, $f2 -/* 36DB98 E006AB78 00000000 */ nop +/* 36DB98 E006AB78 00000000 */ nop /* 36DB9C E006AB7C 32830003 */ andi $v1, $s4, 3 /* 36DBA0 E006AB80 24020001 */ addiu $v0, $zero, 1 /* 36DBA4 E006AB84 46200120 */ cvt.s.d $f4, $f0 @@ -154,7 +154,7 @@ glabel func_E006A94C /* 36DBB4 E006AB94 10400005 */ beqz $v0, .LE006ABAC /* 36DBB8 E006AB98 24020002 */ addiu $v0, $zero, 2 /* 36DBBC E006AB9C 10600007 */ beqz $v1, .LE006ABBC -/* 36DBC0 E006ABA0 00000000 */ nop +/* 36DBC0 E006ABA0 00000000 */ nop /* 36DBC4 E006ABA4 0801AAFD */ j .LE006ABF4 /* 36DBC8 E006ABA8 4600A006 */ mov.s $f0, $f20 .LE006ABAC: @@ -178,7 +178,7 @@ glabel func_E006A94C /* 36DC04 E006ABE4 D422AF60 */ ldc1 $f2, %lo(D_E006AF60)($at) .LE006ABE8: /* 36DC08 E006ABE8 46220002 */ mul.d $f0, $f0, $f2 -/* 36DC0C E006ABEC 00000000 */ nop +/* 36DC0C E006ABEC 00000000 */ nop /* 36DC10 E006ABF0 46200020 */ cvt.s.d $f0, $f0 .LE006ABF4: /* 36DC14 E006ABF4 44053000 */ mfc1 $a1, $f6 @@ -243,8 +243,8 @@ glabel func_E006A94C /* 36DCF8 E006ACD8 26940001 */ addiu $s4, $s4, 1 /* 36DCFC E006ACDC 26310094 */ addiu $s1, $s1, 0x94 /* 36DD00 E006ACE0 97C50000 */ lhu $a1, ($fp) -/* 36DD04 E006ACE4 3C02800A */ lui $v0, %hi(D_8009A674) -/* 36DD08 E006ACE8 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 36DD04 E006ACE4 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 36DD08 E006ACE8 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 36DD0C E006ACEC 00052980 */ sll $a1, $a1, 6 /* 36DD10 E006ACF0 00B52821 */ addu $a1, $a1, $s5 /* 36DD14 E006ACF4 0C080118 */ jal func_E0200460 @@ -263,8 +263,8 @@ glabel func_E006A94C /* 36DD48 E006AD28 3063FFFF */ andi $v1, $v1, 0xffff /* 36DD4C E006AD2C 00031980 */ sll $v1, $v1, 6 /* 36DD50 E006AD30 A7C20000 */ sh $v0, ($fp) -/* 36DD54 E006AD34 3C02800A */ lui $v0, %hi(D_8009A674) -/* 36DD58 E006AD38 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 36DD54 E006AD34 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 36DD58 E006AD38 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 36DD5C E006AD3C 00751821 */ addu $v1, $v1, $s5 /* 36DD60 E006AD40 00431021 */ addu $v0, $v0, $v1 /* 36DD64 E006AD44 ACA20004 */ sw $v0, 4($a1) @@ -285,8 +285,8 @@ glabel func_E006A94C /* 36DDA0 E006AD80 1440FF3B */ bnez $v0, .LE006AA70 /* 36DDA4 E006AD84 AE640000 */ sw $a0, ($s3) .LE006AD88: -/* 36DDA8 E006AD88 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 36DDAC E006AD8C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 36DDA8 E006AD88 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 36DDAC E006AD8C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 36DDB0 E006AD90 8C620000 */ lw $v0, ($v1) /* 36DDB4 E006AD94 0040202D */ daddu $a0, $v0, $zero /* 36DDB8 E006AD98 24420008 */ addiu $v0, $v0, 8 @@ -309,5 +309,5 @@ glabel func_E006A94C /* 36DDFC E006ADDC D7B40108 */ ldc1 $f20, 0x108($sp) /* 36DE00 E006ADE0 03E00008 */ jr $ra /* 36DE04 E006ADE4 27BD0120 */ addiu $sp, $sp, 0x120 -/* 36DE08 E006ADE8 00000000 */ nop -/* 36DE0C E006ADEC 00000000 */ nop +/* 36DE08 E006ADE8 00000000 */ nop +/* 36DE0C E006ADEC 00000000 */ nop diff --git a/asm/nonmatchings/code_36E1D0/func_E006C5E8.s b/asm/nonmatchings/code_36E1D0/func_E006C5E8.s index ee71f96b46..2815ec0d86 100644 --- a/asm/nonmatchings/code_36E1D0/func_E006C5E8.s +++ b/asm/nonmatchings/code_36E1D0/func_E006C5E8.s @@ -5,8 +5,8 @@ glabel func_E006C5E8 /* 36E7B8 E006C5E8 27BDFF18 */ addiu $sp, $sp, -0xe8 /* 36E7BC E006C5EC 3C05DB06 */ lui $a1, 0xdb06 /* 36E7C0 E006C5F0 AFB400C0 */ sw $s4, 0xc0($sp) -/* 36E7C4 E006C5F4 3C14800A */ lui $s4, %hi(D_8009A66C) -/* 36E7C8 E006C5F8 2694A66C */ addiu $s4, $s4, %lo(D_8009A66C) +/* 36E7C4 E006C5F4 3C14800A */ lui $s4, %hi(gMasterGfxPos) +/* 36E7C8 E006C5F8 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) /* 36E7CC E006C5FC AFBF00D4 */ sw $ra, 0xd4($sp) /* 36E7D0 E006C600 AFBE00D0 */ sw $fp, 0xd0($sp) /* 36E7D4 E006C604 AFB700CC */ sw $s7, 0xcc($sp) @@ -69,20 +69,20 @@ glabel func_E006C5E8 /* 36E8B4 E006C6E4 C666001C */ lwc1 $f6, 0x1c($s3) /* 36E8B8 E006C6E8 3C014080 */ lui $at, 0x4080 /* 36E8BC E006C6EC 44814000 */ mtc1 $at, $f8 -/* 36E8C0 E006C6F0 00000000 */ nop +/* 36E8C0 E006C6F0 00000000 */ nop /* 36E8C4 E006C6F4 46083182 */ mul.s $f6, $f6, $f8 -/* 36E8C8 E006C6F8 00000000 */ nop +/* 36E8C8 E006C6F8 00000000 */ nop /* 36E8CC E006C6FC C6640020 */ lwc1 $f4, 0x20($s3) /* 36E8D0 E006C700 46082102 */ mul.s $f4, $f4, $f8 -/* 36E8D4 E006C704 00000000 */ nop +/* 36E8D4 E006C704 00000000 */ nop /* 36E8D8 E006C708 C6620024 */ lwc1 $f2, 0x24($s3) /* 36E8DC E006C70C 46081082 */ mul.s $f2, $f2, $f8 -/* 36E8E0 E006C710 00000000 */ nop +/* 36E8E0 E006C710 00000000 */ nop /* 36E8E4 E006C714 24C20010 */ addiu $v0, $a2, 0x10 /* 36E8E8 E006C718 AE820000 */ sw $v0, ($s4) /* 36E8EC E006C71C C6600028 */ lwc1 $f0, 0x28($s3) /* 36E8F0 E006C720 46080002 */ mul.s $f0, $f0, $f8 -/* 36E8F4 E006C724 00000000 */ nop +/* 36E8F4 E006C724 00000000 */ nop /* 36E8F8 E006C728 2AA20003 */ slti $v0, $s5, 3 /* 36E8FC E006C72C 4600328D */ trunc.w.s $f10, $f6 /* 36E900 E006C730 44165000 */ mfc1 $s6, $f10 @@ -105,10 +105,10 @@ glabel func_E006C5E8 /* 36E944 E006C774 3C013F80 */ lui $at, 0x3f80 /* 36E948 E006C778 44812000 */ mtc1 $at, $f4 /* 36E94C E006C77C 44823000 */ mtc1 $v0, $f6 -/* 36E950 E006C780 00000000 */ nop +/* 36E950 E006C780 00000000 */ nop /* 36E954 E006C784 468031A0 */ cvt.s.w $f6, $f6 /* 36E958 E006C788 44830000 */ mtc1 $v1, $f0 -/* 36E95C E006C78C 00000000 */ nop +/* 36E95C E006C78C 00000000 */ nop /* 36E960 E006C790 46800020 */ cvt.s.w $f0, $f0 /* 36E964 E006C794 46003183 */ div.s $f6, $f6, $f0 /* 36E968 E006C798 44073000 */ mfc1 $a3, $f6 @@ -118,10 +118,10 @@ glabel func_E006C5E8 /* 36E978 E006C7A8 0C080160 */ jal func_E0200580 /* 36E97C E006C7AC E7A40018 */ swc1 $f4, 0x18($sp) /* 36E980 E006C7B0 27A40020 */ addiu $a0, $sp, 0x20 -/* 36E984 E006C7B4 3C108007 */ lui $s0, %hi(D_800741F0) -/* 36E988 E006C7B8 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 36E98C E006C7BC 3C11800A */ lui $s1, %hi(D_8009A674) -/* 36E990 E006C7C0 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 36E984 E006C7B4 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 36E988 E006C7B8 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 36E98C E006C7BC 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 36E990 E006C7C0 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 36E994 E006C7C4 96050000 */ lhu $a1, ($s0) /* 36E998 E006C7C8 8E220000 */ lw $v0, ($s1) /* 36E99C E006C7CC 00052980 */ sll $a1, $a1, 6 @@ -225,10 +225,10 @@ glabel func_E006C5E8 /* 36EB1C E006C94C 0C080114 */ jal func_E0200450 /* 36EB20 E006C950 00A0302D */ daddu $a2, $a1, $zero /* 36EB24 E006C954 27A40020 */ addiu $a0, $sp, 0x20 -/* 36EB28 E006C958 3C108007 */ lui $s0, %hi(D_800741F0) -/* 36EB2C E006C95C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 36EB30 E006C960 3C11800A */ lui $s1, %hi(D_8009A674) -/* 36EB34 E006C964 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 36EB28 E006C958 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 36EB2C E006C95C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 36EB30 E006C960 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 36EB34 E006C964 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 36EB38 E006C968 96050000 */ lhu $a1, ($s0) /* 36EB3C E006C96C 8E220000 */ lw $v0, ($s1) /* 36EB40 E006C970 00052980 */ sll $a1, $a1, 6 @@ -236,8 +236,8 @@ glabel func_E006C5E8 /* 36EB48 E006C978 0C080118 */ jal func_E0200460 /* 36EB4C E006C97C 00452821 */ addu $a1, $v0, $a1 /* 36EB50 E006C980 3C03DA38 */ lui $v1, 0xda38 -/* 36EB54 E006C984 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 36EB58 E006C988 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 36EB54 E006C984 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 36EB58 E006C988 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 36EB5C E006C98C 34630002 */ ori $v1, $v1, 2 /* 36EB60 E006C990 8CA40000 */ lw $a0, ($a1) /* 36EB64 E006C994 96020000 */ lhu $v0, ($s0) @@ -263,8 +263,8 @@ glabel func_E006C5E8 /* 36EBB4 E006C9E4 AC820004 */ sw $v0, 4($a0) .LE006C9E8: /* 36EBB8 E006C9E8 3C06D838 */ lui $a2, 0xd838 -/* 36EBBC E006C9EC 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 36EBC0 E006C9F0 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 36EBBC E006C9EC 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 36EBC0 E006C9F0 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 36EBC4 E006C9F4 34C60002 */ ori $a2, $a2, 2 /* 36EBC8 E006C9F8 32C30FFF */ andi $v1, $s6, 0xfff /* 36EBCC E006C9FC 00031B00 */ sll $v1, $v1, 0xc @@ -325,8 +325,8 @@ glabel func_E006C5E8 /* 36ECA8 E006CAD8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* 36ECAC E006CADC 24E20028 */ addiu $v0, $a3, 0x28 /* 36ECB0 E006CAE0 AD020000 */ sw $v0, ($t0) -/* 36ECB4 E006CAE4 3C02800A */ lui $v0, %hi(D_8009A674) -/* 36ECB8 E006CAE8 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 36ECB4 E006CAE4 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 36ECB8 E006CAE8 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 36ECBC E006CAEC 34840007 */ ori $a0, $a0, 7 /* 36ECC0 E006CAF0 ACE40020 */ sw $a0, 0x20($a3) /* 36ECC4 E006CAF4 00031980 */ sll $v1, $v1, 6 @@ -355,6 +355,6 @@ glabel func_E006C5E8 /* 36ED18 E006CB48 D7B400D8 */ ldc1 $f20, 0xd8($sp) /* 36ED1C E006CB4C 03E00008 */ jr $ra /* 36ED20 E006CB50 27BD00E8 */ addiu $sp, $sp, 0xe8 -/* 36ED24 E006CB54 00000000 */ nop -/* 36ED28 E006CB58 00000000 */ nop -/* 36ED2C E006CB5C 00000000 */ nop +/* 36ED24 E006CB54 00000000 */ nop +/* 36ED28 E006CB58 00000000 */ nop +/* 36ED2C E006CB5C 00000000 */ nop diff --git a/asm/nonmatchings/code_372790/func_E006E764.s b/asm/nonmatchings/code_372790/func_E006E764.s index 3473500318..50c374cae1 100644 --- a/asm/nonmatchings/code_372790/func_E006E764.s +++ b/asm/nonmatchings/code_372790/func_E006E764.s @@ -5,8 +5,8 @@ glabel func_E006E764 /* 372EF4 E006E764 27BDFF30 */ addiu $sp, $sp, -0xd0 /* 372EF8 E006E768 3C07DB06 */ lui $a3, 0xdb06 /* 372EFC E006E76C AFB500B4 */ sw $s5, 0xb4($sp) -/* 372F00 E006E770 3C15800A */ lui $s5, %hi(D_8009A66C) -/* 372F04 E006E774 26B5A66C */ addiu $s5, $s5, %lo(D_8009A66C) +/* 372F00 E006E770 3C15800A */ lui $s5, %hi(gMasterGfxPos) +/* 372F04 E006E774 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) /* 372F08 E006E778 AFBF00C4 */ sw $ra, 0xc4($sp) /* 372F0C E006E77C AFBE00C0 */ sw $fp, 0xc0($sp) /* 372F10 E006E780 AFB700BC */ sw $s7, 0xbc($sp) @@ -38,9 +38,9 @@ glabel func_E006E764 /* 372F78 E006E7E8 3C02E700 */ lui $v0, 0xe700 /* 372F7C E006E7EC 4600110D */ trunc.w.s $f4, $f2 /* 372F80 E006E7F0 44162000 */ mfc1 $s6, $f4 -/* 372F84 E006E7F4 00000000 */ nop +/* 372F84 E006E7F4 00000000 */ nop /* 372F88 E006E7F8 44960000 */ mtc1 $s6, $f0 -/* 372F8C E006E7FC 00000000 */ nop +/* 372F8C E006E7FC 00000000 */ nop /* 372F90 E006E800 46800020 */ cvt.s.w $f0, $f0 /* 372F94 E006E804 46001081 */ sub.s $f2, $f2, $f0 /* 372F98 E006E808 AC620000 */ sw $v0, ($v1) @@ -51,7 +51,7 @@ glabel func_E006E764 /* 372FAC E006E81C 44810000 */ mtc1 $at, $f0 /* 372FB0 E006E820 8C42001C */ lw $v0, 0x1c($v0) /* 372FB4 E006E824 46001082 */ mul.s $f2, $f2, $f0 -/* 372FB8 E006E828 00000000 */ nop +/* 372FB8 E006E828 00000000 */ nop /* 372FBC E006E82C 3C038000 */ lui $v1, 0x8000 /* 372FC0 E006E830 00431021 */ addu $v0, $v0, $v1 /* 372FC4 E006E834 ACA20004 */ sw $v0, 4($a1) @@ -93,10 +93,10 @@ glabel func_E006E764 /* 373054 E006E8C4 0C080114 */ jal func_E0200450 /* 373058 E006E8C8 00A0302D */ daddu $a2, $a1, $zero /* 37305C E006E8CC 27A40018 */ addiu $a0, $sp, 0x18 -/* 373060 E006E8D0 3C108007 */ lui $s0, %hi(D_800741F0) -/* 373064 E006E8D4 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 373068 E006E8D8 3C11800A */ lui $s1, %hi(D_8009A674) -/* 37306C E006E8DC 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 373060 E006E8D0 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 373064 E006E8D4 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 373068 E006E8D8 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 37306C E006E8DC 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 373070 E006E8E0 96050000 */ lhu $a1, ($s0) /* 373074 E006E8E4 8E220000 */ lw $v0, ($s1) /* 373078 E006E8E8 00052980 */ sll $a1, $a1, 6 @@ -246,10 +246,10 @@ glabel func_E006E764 /* 3732B4 E006EB24 0C080114 */ jal func_E0200450 /* 3732B8 E006EB28 00A0302D */ daddu $a2, $a1, $zero /* 3732BC E006EB2C 27A40018 */ addiu $a0, $sp, 0x18 -/* 3732C0 E006EB30 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3732C4 E006EB34 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3732C8 E006EB38 3C11800A */ lui $s1, %hi(D_8009A674) -/* 3732CC E006EB3C 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 3732C0 E006EB30 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3732C4 E006EB34 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3732C8 E006EB38 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 3732CC E006EB3C 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 3732D0 E006EB40 96050000 */ lhu $a1, ($s0) /* 3732D4 E006EB44 8E220000 */ lw $v0, ($s1) /* 3732D8 E006EB48 00052980 */ sll $a1, $a1, 6 @@ -296,5 +296,5 @@ glabel func_E006E764 /* 37337C E006EBEC D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 373380 E006EBF0 03E00008 */ jr $ra /* 373384 E006EBF4 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* 373388 E006EBF8 00000000 */ nop -/* 37338C E006EBFC 00000000 */ nop +/* 373388 E006EBF8 00000000 */ nop +/* 37338C E006EBFC 00000000 */ nop diff --git a/asm/nonmatchings/code_3740B0/func_E0070740.s b/asm/nonmatchings/code_3740B0/func_E0070740.s index 6babf74bab..98cffbd592 100644 --- a/asm/nonmatchings/code_3740B0/func_E0070740.s +++ b/asm/nonmatchings/code_3740B0/func_E0070740.s @@ -11,8 +11,8 @@ glabel func_E0070740 /* 374808 E0070758 3C110001 */ lui $s1, 1 /* 37480C E007075C 36311630 */ ori $s1, $s1, 0x1630 /* 374810 E0070760 AFB500C4 */ sw $s5, 0xc4($sp) -/* 374814 E0070764 3C15800A */ lui $s5, %hi(D_8009A66C) -/* 374818 E0070768 26B5A66C */ addiu $s5, $s5, %lo(D_8009A66C) +/* 374814 E0070764 3C15800A */ lui $s5, %hi(gMasterGfxPos) +/* 374818 E0070768 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) /* 37481C E007076C AFBF00D4 */ sw $ra, 0xd4($sp) /* 374820 E0070770 AFBE00D0 */ sw $fp, 0xd0($sp) /* 374824 E0070774 AFB700CC */ sw $s7, 0xcc($sp) @@ -69,10 +69,10 @@ glabel func_E0070740 /* 3748F0 E0070840 0C080114 */ jal func_E0200450 /* 3748F4 E0070844 00A0302D */ daddu $a2, $a1, $zero /* 3748F8 E0070848 27A40020 */ addiu $a0, $sp, 0x20 -/* 3748FC E007084C 3C108007 */ lui $s0, %hi(D_800741F0) -/* 374900 E0070850 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 374904 E0070854 3C16800A */ lui $s6, %hi(D_8009A674) -/* 374908 E0070858 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) +/* 3748FC E007084C 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 374900 E0070850 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 374904 E0070854 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 374908 E0070858 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) /* 37490C E007085C 96050000 */ lhu $a1, ($s0) /* 374910 E0070860 8EC20000 */ lw $v0, ($s6) /* 374914 E0070864 00052980 */ sll $a1, $a1, 6 @@ -147,10 +147,10 @@ glabel func_E0070740 .LE0070978: /* 374A28 E0070978 8E02FFE4 */ lw $v0, -0x1c($s0) /* 374A2C E007097C 04400052 */ bltz $v0, .LE0070AC8 -/* 374A30 E0070980 00000000 */ nop +/* 374A30 E0070980 00000000 */ nop /* 374A34 E0070984 C6000014 */ lwc1 $f0, 0x14($s0) /* 374A38 E0070988 46140002 */ mul.s $f0, $f0, $f20 -/* 374A3C E007098C 00000000 */ nop +/* 374A3C E007098C 00000000 */ nop /* 374A40 E0070990 4405C000 */ mfc1 $a1, $f24 /* 374A44 E0070994 4406C000 */ mfc1 $a2, $f24 /* 374A48 E0070998 E7A00010 */ swc1 $f0, 0x10($sp) @@ -189,12 +189,12 @@ glabel func_E0070740 /* 374ACC E0070A1C C6000000 */ lwc1 $f0, ($s0) /* 374AD0 E0070A20 46800020 */ cvt.s.w $f0, $f0 /* 374AD4 E0070A24 46140002 */ mul.s $f0, $f0, $f20 -/* 374AD8 E0070A28 00000000 */ nop +/* 374AD8 E0070A28 00000000 */ nop /* 374ADC E0070A2C 24820008 */ addiu $v0, $a0, 8 /* 374AE0 E0070A30 24840004 */ addiu $a0, $a0, 4 /* 374AE4 E0070A34 A6E50000 */ sh $a1, ($s7) /* 374AE8 E0070A38 4600B03E */ c.le.s $f22, $f0 -/* 374AEC E0070A3C 00000000 */ nop +/* 374AEC E0070A3C 00000000 */ nop /* 374AF0 E0070A40 45010005 */ bc1t .LE0070A58 /* 374AF4 E0070A44 AE220000 */ sw $v0, ($s1) /* 374AF8 E0070A48 4600010D */ trunc.w.s $f4, $f0 @@ -206,7 +206,7 @@ glabel func_E0070740 /* 374B0C E0070A5C 3C028000 */ lui $v0, 0x8000 /* 374B10 E0070A60 4600010D */ trunc.w.s $f4, $f0 /* 374B14 E0070A64 44052000 */ mfc1 $a1, $f4 -/* 374B18 E0070A68 00000000 */ nop +/* 374B18 E0070A68 00000000 */ nop /* 374B1C E0070A6C 00A22825 */ or $a1, $a1, $v0 /* 374B20 E0070A70 3C06D838 */ lui $a2, 0xd838 .LE0070A74: @@ -244,8 +244,8 @@ glabel func_E0070740 /* 374B98 E0070AE8 36B51630 */ ori $s5, $s5, 0x1630 /* 374B9C E0070AEC 3C1ED838 */ lui $fp, 0xd838 /* 374BA0 E0070AF0 37DE0002 */ ori $fp, $fp, 2 -/* 374BA4 E0070AF4 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 374BA8 E0070AF8 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 374BA4 E0070AF4 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 374BA8 E0070AF8 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 374BAC E0070AFC 3C02DF00 */ lui $v0, 0xdf00 /* 374BB0 E0070B00 3C16DE00 */ lui $s6, 0xde00 /* 374BB4 E0070B04 8E030000 */ lw $v1, ($s0) @@ -275,10 +275,10 @@ glabel func_E0070740 /* 374C14 E0070B64 0C080104 */ jal func_E0200410 /* 374C18 E0070B68 E7B80010 */ swc1 $f24, 0x10($sp) /* 374C1C E0070B6C 27A40020 */ addiu $a0, $sp, 0x20 -/* 374C20 E0070B70 3C118007 */ lui $s1, %hi(D_800741F0) -/* 374C24 E0070B74 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 374C28 E0070B78 3C13800A */ lui $s3, %hi(D_8009A674) -/* 374C2C E0070B7C 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* 374C20 E0070B70 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 374C24 E0070B74 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 374C28 E0070B78 3C13800A */ lui $s3, %hi(gDisplayContext) +/* 374C2C E0070B7C 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* 374C30 E0070B80 96250000 */ lhu $a1, ($s1) /* 374C34 E0070B84 8E620000 */ lw $v0, ($s3) /* 374C38 E0070B88 00052980 */ sll $a1, $a1, 6 diff --git a/asm/nonmatchings/code_374E50/func_E00723D4.s b/asm/nonmatchings/code_374E50/func_E00723D4.s index cbd460764a..5290b0e34f 100644 --- a/asm/nonmatchings/code_374E50/func_E00723D4.s +++ b/asm/nonmatchings/code_374E50/func_E00723D4.s @@ -7,8 +7,8 @@ glabel func_E00723D4 /* 37522C E00723DC 34630024 */ ori $v1, $v1, 0x24 /* 375230 E00723E0 3C05FFB3 */ lui $a1, 0xffb3 /* 375234 E00723E4 AFB10094 */ sw $s1, 0x94($sp) -/* 375238 E00723E8 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 37523C E00723EC 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 375238 E00723E8 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 37523C E00723EC 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 375240 E00723F0 34A51E00 */ ori $a1, $a1, 0x1e00 /* 375244 E00723F4 AFB500A4 */ sw $s5, 0xa4($sp) /* 375248 E00723F8 3C15E700 */ lui $s5, 0xe700 @@ -64,13 +64,13 @@ glabel func_E00723D4 /* 375310 E00724C0 AD02001C */ sw $v0, 0x1c($t0) /* 375314 E00724C4 C6020030 */ lwc1 $f2, 0x30($s0) /* 375318 E00724C8 46041082 */ mul.s $f2, $f2, $f4 -/* 37531C E00724CC 00000000 */ nop +/* 37531C E00724CC 00000000 */ nop /* 375320 E00724D0 3C130001 */ lui $s3, 1 /* 375324 E00724D4 36731630 */ ori $s3, $s3, 0x1630 /* 375328 E00724D8 C6000034 */ lwc1 $f0, 0x34($s0) /* 37532C E00724DC 3C07F200 */ lui $a3, 0xf200 /* 375330 E00724E0 46040002 */ mul.s $f0, $f0, $f4 -/* 375334 E00724E4 00000000 */ nop +/* 375334 E00724E4 00000000 */ nop /* 375338 E00724E8 27A40010 */ addiu $a0, $sp, 0x10 /* 37533C E00724EC 25020028 */ addiu $v0, $t0, 0x28 /* 375340 E00724F0 AE220000 */ sw $v0, ($s1) @@ -87,13 +87,13 @@ glabel func_E00723D4 /* 37536C E007251C C6000038 */ lwc1 $f0, 0x38($s0) /* 375370 E0072520 30420FFF */ andi $v0, $v0, 0xfff /* 375374 E0072524 46040002 */ mul.s $f0, $f0, $f4 -/* 375378 E0072528 00000000 */ nop +/* 375378 E0072528 00000000 */ nop /* 37537C E007252C 00021300 */ sll $v0, $v0, 0xc /* 375380 E0072530 24C600FC */ addiu $a2, $a2, 0xfc /* 375384 E0072534 C602003C */ lwc1 $f2, 0x3c($s0) /* 375388 E0072538 30C60FFF */ andi $a2, $a2, 0xfff /* 37538C E007253C 46041082 */ mul.s $f2, $f2, $f4 -/* 375390 E0072540 00000000 */ nop +/* 375390 E0072540 00000000 */ nop /* 375394 E0072544 00461025 */ or $v0, $v0, $a2 /* 375398 E0072548 AD050020 */ sw $a1, 0x20($t0) /* 37539C E007254C AD020024 */ sw $v0, 0x24($t0) @@ -133,10 +133,10 @@ glabel func_E00723D4 /* 375424 E00725D4 0C080114 */ jal func_E0200450 /* 375428 E00725D8 00A0302D */ daddu $a2, $a1, $zero /* 37542C E00725DC 27A40010 */ addiu $a0, $sp, 0x10 -/* 375430 E00725E0 3C108007 */ lui $s0, %hi(D_800741F0) -/* 375434 E00725E4 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 375438 E00725E8 3C12800A */ lui $s2, %hi(D_8009A674) -/* 37543C E00725EC 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 375430 E00725E0 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 375434 E00725E4 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 375438 E00725E8 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 37543C E00725EC 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 375440 E00725F0 96050000 */ lhu $a1, ($s0) /* 375444 E00725F4 8E420000 */ lw $v0, ($s2) /* 375448 E00725F8 00052980 */ sll $a1, $a1, 6 @@ -184,4 +184,4 @@ glabel func_E00723D4 /* 3754F0 E00726A0 8FB00090 */ lw $s0, 0x90($sp) /* 3754F4 E00726A4 03E00008 */ jr $ra /* 3754F8 E00726A8 27BD00B0 */ addiu $sp, $sp, 0xb0 -/* 3754FC E00726AC 00000000 */ nop +/* 3754FC E00726AC 00000000 */ nop diff --git a/asm/nonmatchings/code_376460/func_E00745E0.s b/asm/nonmatchings/code_376460/func_E00745E0.s index c624d80199..a8f09dca5e 100644 --- a/asm/nonmatchings/code_376460/func_E00745E0.s +++ b/asm/nonmatchings/code_376460/func_E00745E0.s @@ -11,8 +11,8 @@ glabel func_E00745E0 /* 376A58 E00745F8 3C110001 */ lui $s1, 1 /* 376A5C E00745FC 36311630 */ ori $s1, $s1, 0x1630 /* 376A60 E0074600 AFB500C4 */ sw $s5, 0xc4($sp) -/* 376A64 E0074604 3C15800A */ lui $s5, %hi(D_8009A66C) -/* 376A68 E0074608 26B5A66C */ addiu $s5, $s5, %lo(D_8009A66C) +/* 376A64 E0074604 3C15800A */ lui $s5, %hi(gMasterGfxPos) +/* 376A68 E0074608 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) /* 376A6C E007460C AFBF00D4 */ sw $ra, 0xd4($sp) /* 376A70 E0074610 AFBE00D0 */ sw $fp, 0xd0($sp) /* 376A74 E0074614 AFB700CC */ sw $s7, 0xcc($sp) @@ -69,10 +69,10 @@ glabel func_E00745E0 /* 376B40 E00746E0 0C080114 */ jal func_E0200450 /* 376B44 E00746E4 00A0302D */ daddu $a2, $a1, $zero /* 376B48 E00746E8 27A40020 */ addiu $a0, $sp, 0x20 -/* 376B4C E00746EC 3C108007 */ lui $s0, %hi(D_800741F0) -/* 376B50 E00746F0 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 376B54 E00746F4 3C16800A */ lui $s6, %hi(D_8009A674) -/* 376B58 E00746F8 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) +/* 376B4C E00746EC 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 376B50 E00746F0 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 376B54 E00746F4 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 376B58 E00746F8 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) /* 376B5C E00746FC 96050000 */ lhu $a1, ($s0) /* 376B60 E0074700 8EC20000 */ lw $v0, ($s6) /* 376B64 E0074704 00052980 */ sll $a1, $a1, 6 @@ -147,10 +147,10 @@ glabel func_E00745E0 .LE0074818: /* 376C78 E0074818 8E02FFE4 */ lw $v0, -0x1c($s0) /* 376C7C E007481C 04400052 */ bltz $v0, .LE0074968 -/* 376C80 E0074820 00000000 */ nop +/* 376C80 E0074820 00000000 */ nop /* 376C84 E0074824 C6000014 */ lwc1 $f0, 0x14($s0) /* 376C88 E0074828 46140002 */ mul.s $f0, $f0, $f20 -/* 376C8C E007482C 00000000 */ nop +/* 376C8C E007482C 00000000 */ nop /* 376C90 E0074830 4405C000 */ mfc1 $a1, $f24 /* 376C94 E0074834 4406C000 */ mfc1 $a2, $f24 /* 376C98 E0074838 E7A00010 */ swc1 $f0, 0x10($sp) @@ -189,12 +189,12 @@ glabel func_E00745E0 /* 376D1C E00748BC C6000000 */ lwc1 $f0, ($s0) /* 376D20 E00748C0 46800020 */ cvt.s.w $f0, $f0 /* 376D24 E00748C4 46140002 */ mul.s $f0, $f0, $f20 -/* 376D28 E00748C8 00000000 */ nop +/* 376D28 E00748C8 00000000 */ nop /* 376D2C E00748CC 24820008 */ addiu $v0, $a0, 8 /* 376D30 E00748D0 24840004 */ addiu $a0, $a0, 4 /* 376D34 E00748D4 A6E50000 */ sh $a1, ($s7) /* 376D38 E00748D8 4600B03E */ c.le.s $f22, $f0 -/* 376D3C E00748DC 00000000 */ nop +/* 376D3C E00748DC 00000000 */ nop /* 376D40 E00748E0 45010005 */ bc1t .LE00748F8 /* 376D44 E00748E4 AE220000 */ sw $v0, ($s1) /* 376D48 E00748E8 4600010D */ trunc.w.s $f4, $f0 @@ -206,7 +206,7 @@ glabel func_E00745E0 /* 376D5C E00748FC 3C028000 */ lui $v0, 0x8000 /* 376D60 E0074900 4600010D */ trunc.w.s $f4, $f0 /* 376D64 E0074904 44052000 */ mfc1 $a1, $f4 -/* 376D68 E0074908 00000000 */ nop +/* 376D68 E0074908 00000000 */ nop /* 376D6C E007490C 00A22825 */ or $a1, $a1, $v0 /* 376D70 E0074910 3C06D838 */ lui $a2, 0xd838 .LE0074914: @@ -244,8 +244,8 @@ glabel func_E00745E0 /* 376DE8 E0074988 36B51630 */ ori $s5, $s5, 0x1630 /* 376DEC E007498C 3C1ED838 */ lui $fp, 0xd838 /* 376DF0 E0074990 37DE0002 */ ori $fp, $fp, 2 -/* 376DF4 E0074994 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 376DF8 E0074998 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 376DF4 E0074994 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 376DF8 E0074998 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 376DFC E007499C 3C02DF00 */ lui $v0, 0xdf00 /* 376E00 E00749A0 3C16DE00 */ lui $s6, 0xde00 /* 376E04 E00749A4 8E030000 */ lw $v1, ($s0) @@ -271,10 +271,10 @@ glabel func_E00745E0 /* 376E54 E00749F4 0C080104 */ jal func_E0200410 /* 376E58 E00749F8 E7B40010 */ swc1 $f20, 0x10($sp) /* 376E5C E00749FC 27A40020 */ addiu $a0, $sp, 0x20 -/* 376E60 E0074A00 3C118007 */ lui $s1, %hi(D_800741F0) -/* 376E64 E0074A04 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 376E68 E0074A08 3C13800A */ lui $s3, %hi(D_8009A674) -/* 376E6C E0074A0C 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* 376E60 E0074A00 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 376E64 E0074A04 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 376E68 E0074A08 3C13800A */ lui $s3, %hi(gDisplayContext) +/* 376E6C E0074A0C 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* 376E70 E0074A10 96250000 */ lhu $a1, ($s1) /* 376E74 E0074A14 8E620000 */ lw $v0, ($s3) /* 376E78 E0074A18 00052980 */ sll $a1, $a1, 6 diff --git a/asm/nonmatchings/code_377070/func_E007685C.s b/asm/nonmatchings/code_377070/func_E007685C.s index 88b0000a1c..c15255f068 100644 --- a/asm/nonmatchings/code_377070/func_E007685C.s +++ b/asm/nonmatchings/code_377070/func_E007685C.s @@ -5,8 +5,8 @@ glabel func_E007685C /* 3778CC E007685C 27BDFF00 */ addiu $sp, $sp, -0x100 /* 3778D0 E0076860 3C02DB06 */ lui $v0, 0xdb06 /* 3778D4 E0076864 34420024 */ ori $v0, $v0, 0x24 -/* 3778D8 E0076868 3C09800A */ lui $t1, %hi(D_8009A66C) -/* 3778DC E007686C 2529A66C */ addiu $t1, $t1, %lo(D_8009A66C) +/* 3778D8 E0076868 3C09800A */ lui $t1, %hi(gMasterGfxPos) +/* 3778DC E007686C 2529A66C */ addiu $t1, $t1, %lo(gMasterGfxPos) /* 3778E0 E0076870 AFBF00F4 */ sw $ra, 0xf4($sp) /* 3778E4 E0076874 AFB600F0 */ sw $s6, 0xf0($sp) /* 3778E8 E0076878 AFB500EC */ sw $s5, 0xec($sp) @@ -52,7 +52,7 @@ glabel func_E007685C /* 377988 E0076918 8E650064 */ lw $a1, 0x64($s3) /* 37798C E007691C 44060000 */ mfc1 $a2, $f0 /* 377990 E0076920 0801DA5C */ j .LE0076970 -/* 377994 E0076924 00000000 */ nop +/* 377994 E0076924 00000000 */ nop .LE0076928: /* 377998 E0076928 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 37799C E007692C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) @@ -74,7 +74,7 @@ glabel func_E007685C /* 3779DC E007696C AFA60010 */ sw $a2, 0x10($sp) .LE0076970: /* 3779E0 E0076970 0C080104 */ jal func_E0200410 -/* 3779E4 E0076974 00000000 */ nop +/* 3779E4 E0076974 00000000 */ nop /* 3779E8 E0076978 27B40058 */ addiu $s4, $sp, 0x58 /* 3779EC E007697C 0280202D */ daddu $a0, $s4, $zero /* 3779F0 E0076980 27A50018 */ addiu $a1, $sp, 0x18 @@ -102,10 +102,10 @@ glabel func_E007685C /* 377A48 E00769D8 46000007 */ neg.s $f0, $f0 /* 377A4C E00769DC 46040003 */ div.s $f0, $f0, $f4 /* 377A50 E00769E0 46020002 */ mul.s $f0, $f0, $f2 -/* 377A54 E00769E4 00000000 */ nop +/* 377A54 E00769E4 00000000 */ nop /* 377A58 E00769E8 44050000 */ mfc1 $a1, $f0 /* 377A5C E00769EC 44800000 */ mtc1 $zero, $f0 -/* 377A60 E00769F0 00000000 */ nop +/* 377A60 E00769F0 00000000 */ nop /* 377A64 E00769F4 44060000 */ mfc1 $a2, $f0 /* 377A68 E00769F8 0280202D */ daddu $a0, $s4, $zero /* 377A6C E00769FC 0C080108 */ jal func_E0200420 @@ -118,10 +118,10 @@ glabel func_E007685C .LE0076A18: /* 377A88 E0076A18 36521630 */ ori $s2, $s2, 0x1630 /* 377A8C E0076A1C 0200202D */ daddu $a0, $s0, $zero -/* 377A90 E0076A20 3C108007 */ lui $s0, %hi(D_800741F0) -/* 377A94 E0076A24 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 377A98 E0076A28 3C11800A */ lui $s1, %hi(D_8009A674) -/* 377A9C E0076A2C 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 377A90 E0076A20 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 377A94 E0076A24 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 377A98 E0076A28 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 377A9C E0076A2C 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 377AA0 E0076A30 96050000 */ lhu $a1, ($s0) /* 377AA4 E0076A34 8E220000 */ lw $v0, ($s1) /* 377AA8 E0076A38 00052980 */ sll $a1, $a1, 6 @@ -132,8 +132,8 @@ glabel func_E007685C /* 377ABC E0076A4C 34630002 */ ori $v1, $v1, 2 /* 377AC0 E0076A50 3C06D838 */ lui $a2, 0xd838 /* 377AC4 E0076A54 34C60002 */ ori $a2, $a2, 2 -/* 377AC8 E0076A58 3C09800A */ lui $t1, %hi(D_8009A66C) -/* 377ACC E0076A5C 2529A66C */ addiu $t1, $t1, %lo(D_8009A66C) +/* 377AC8 E0076A58 3C09800A */ lui $t1, %hi(gMasterGfxPos) +/* 377ACC E0076A5C 2529A66C */ addiu $t1, $t1, %lo(gMasterGfxPos) /* 377AD0 E0076A60 27A40018 */ addiu $a0, $sp, 0x18 /* 377AD4 E0076A64 8D280000 */ lw $t0, ($t1) /* 377AD8 E0076A68 96020000 */ lhu $v0, ($s0) @@ -176,7 +176,7 @@ glabel func_E007685C /* 377B6C E0076AFC 8E650064 */ lw $a1, 0x64($s3) /* 377B70 E0076B00 44060000 */ mfc1 $a2, $f0 /* 377B74 E0076B04 0801DAD5 */ j .LE0076B54 -/* 377B78 E0076B08 00000000 */ nop +/* 377B78 E0076B08 00000000 */ nop .LE0076B0C: /* 377B7C E0076B0C 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 377B80 E0076B10 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) @@ -198,7 +198,7 @@ glabel func_E007685C /* 377BC0 E0076B50 AFA60010 */ sw $a2, 0x10($sp) .LE0076B54: /* 377BC4 E0076B54 0C080104 */ jal func_E0200410 -/* 377BC8 E0076B58 00000000 */ nop +/* 377BC8 E0076B58 00000000 */ nop /* 377BCC E0076B5C 27B10058 */ addiu $s1, $sp, 0x58 /* 377BD0 E0076B60 0220202D */ daddu $a0, $s1, $zero /* 377BD4 E0076B64 27A50018 */ addiu $a1, $sp, 0x18 @@ -224,10 +224,10 @@ glabel func_E007685C /* 377C24 E0076BB4 46000007 */ neg.s $f0, $f0 /* 377C28 E0076BB8 46040003 */ div.s $f0, $f0, $f4 /* 377C2C E0076BBC 46020002 */ mul.s $f0, $f0, $f2 -/* 377C30 E0076BC0 00000000 */ nop +/* 377C30 E0076BC0 00000000 */ nop /* 377C34 E0076BC4 44050000 */ mfc1 $a1, $f0 /* 377C38 E0076BC8 44800000 */ mtc1 $zero, $f0 -/* 377C3C E0076BCC 00000000 */ nop +/* 377C3C E0076BCC 00000000 */ nop /* 377C40 E0076BD0 44060000 */ mfc1 $a2, $f0 /* 377C44 E0076BD4 0220202D */ daddu $a0, $s1, $zero /* 377C48 E0076BD8 0C080108 */ jal func_E0200420 @@ -240,10 +240,10 @@ glabel func_E007685C .LE0076BF4: /* 377C64 E0076BF4 36521630 */ ori $s2, $s2, 0x1630 /* 377C68 E0076BF8 0200202D */ daddu $a0, $s0, $zero -/* 377C6C E0076BFC 3C108007 */ lui $s0, %hi(D_800741F0) -/* 377C70 E0076C00 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 377C74 E0076C04 3C11800A */ lui $s1, %hi(D_8009A674) -/* 377C78 E0076C08 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 377C6C E0076BFC 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 377C70 E0076C00 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 377C74 E0076C04 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 377C78 E0076C08 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 377C7C E0076C0C 96050000 */ lhu $a1, ($s0) /* 377C80 E0076C10 8E220000 */ lw $v0, ($s1) /* 377C84 E0076C14 00052980 */ sll $a1, $a1, 6 @@ -253,8 +253,8 @@ glabel func_E007685C /* 377C94 E0076C24 3C03DA38 */ lui $v1, 0xda38 /* 377C98 E0076C28 34630002 */ ori $v1, $v1, 2 /* 377C9C E0076C2C 3C06D838 */ lui $a2, 0xd838 -/* 377CA0 E0076C30 3C07800A */ lui $a3, %hi(D_8009A66C) -/* 377CA4 E0076C34 24E7A66C */ addiu $a3, $a3, %lo(D_8009A66C) +/* 377CA0 E0076C30 3C07800A */ lui $a3, %hi(gMasterGfxPos) +/* 377CA4 E0076C34 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) /* 377CA8 E0076C38 34C60002 */ ori $a2, $a2, 2 /* 377CAC E0076C3C 3C08DE00 */ lui $t0, 0xde00 /* 377CB0 E0076C40 00154880 */ sll $t1, $s5, 2 @@ -318,13 +318,13 @@ glabel func_E007685C /* 377D98 E0076D28 ACA2001C */ sw $v0, 0x1c($a1) /* 377D9C E0076D2C C6620034 */ lwc1 $f2, 0x34($s3) /* 377DA0 E0076D30 46041082 */ mul.s $f2, $f2, $f4 -/* 377DA4 E0076D34 00000000 */ nop +/* 377DA4 E0076D34 00000000 */ nop /* 377DA8 E0076D38 3C06F200 */ lui $a2, 0xf200 /* 377DAC E0076D3C 3C040100 */ lui $a0, 0x100 /* 377DB0 E0076D40 C6600040 */ lwc1 $f0, 0x40($s3) /* 377DB4 E0076D44 24A20028 */ addiu $v0, $a1, 0x28 /* 377DB8 E0076D48 46040002 */ mul.s $f0, $f0, $f4 -/* 377DBC E0076D4C 00000000 */ nop +/* 377DBC E0076D4C 00000000 */ nop /* 377DC0 E0076D50 ACE20000 */ sw $v0, ($a3) /* 377DC4 E0076D54 24A20030 */ addiu $v0, $a1, 0x30 /* 377DC8 E0076D58 ACE20000 */ sw $v0, ($a3) @@ -354,13 +354,13 @@ glabel func_E007685C /* 377E28 E0076DB8 C662004C */ lwc1 $f2, 0x4c($s3) /* 377E2C E0076DBC 24A20038 */ addiu $v0, $a1, 0x38 /* 377E30 E0076DC0 46041082 */ mul.s $f2, $f2, $f4 -/* 377E34 E0076DC4 00000000 */ nop +/* 377E34 E0076DC4 00000000 */ nop /* 377E38 E0076DC8 ACE20000 */ sw $v0, ($a3) /* 377E3C E0076DCC C6600058 */ lwc1 $f0, 0x58($s3) /* 377E40 E0076DD0 24A20040 */ addiu $v0, $a1, 0x40 /* 377E44 E0076DD4 ACE20000 */ sw $v0, ($a3) /* 377E48 E0076DD8 46040002 */ mul.s $f0, $f0, $f4 -/* 377E4C E0076DDC 00000000 */ nop +/* 377E4C E0076DDC 00000000 */ nop /* 377E50 E0076DE0 24A20048 */ addiu $v0, $a1, 0x48 /* 377E54 E0076DE4 ACE20000 */ sw $v0, ($a3) /* 377E58 E0076DE8 ACA80038 */ sw $t0, 0x38($a1) @@ -402,6 +402,6 @@ glabel func_E007685C /* 377EE8 E0076E78 D7B400F8 */ ldc1 $f20, 0xf8($sp) /* 377EEC E0076E7C 03E00008 */ jr $ra /* 377EF0 E0076E80 27BD0100 */ addiu $sp, $sp, 0x100 -/* 377EF4 E0076E84 00000000 */ nop -/* 377EF8 E0076E88 00000000 */ nop -/* 377EFC E0076E8C 00000000 */ nop +/* 377EF4 E0076E84 00000000 */ nop +/* 377EF8 E0076E88 00000000 */ nop +/* 377EFC E0076E8C 00000000 */ nop diff --git a/asm/nonmatchings/code_37A3F0/func_E007827C.s b/asm/nonmatchings/code_37A3F0/func_E007827C.s index af33e54b57..1befedd7c2 100644 --- a/asm/nonmatchings/code_37A3F0/func_E007827C.s +++ b/asm/nonmatchings/code_37A3F0/func_E007827C.s @@ -22,8 +22,8 @@ glabel func_E007827C /* 37A6B0 E00782C0 2414007F */ addiu $s4, $zero, 0x7f .LE00782C4: /* 37A6B4 E00782C4 3C05DB06 */ lui $a1, 0xdb06 -/* 37A6B8 E00782C8 3C15800A */ lui $s5, %hi(D_8009A66C) -/* 37A6BC E00782CC 26B5A66C */ addiu $s5, $s5, %lo(D_8009A66C) +/* 37A6B8 E00782C8 3C15800A */ lui $s5, %hi(gMasterGfxPos) +/* 37A6BC E00782CC 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) /* 37A6C0 E00782D0 34A50024 */ ori $a1, $a1, 0x24 /* 37A6C4 E00782D4 8EA40000 */ lw $a0, ($s5) /* 37A6C8 E00782D8 3C02E700 */ lui $v0, 0xe700 @@ -63,31 +63,31 @@ glabel func_E007827C /* 37A750 E0078360 24030001 */ addiu $v1, $zero, 1 .LE0078364: /* 37A754 E0078364 10600157 */ beqz $v1, .LE00788C4 -/* 37A758 E0078368 00000000 */ nop +/* 37A758 E0078368 00000000 */ nop /* 37A75C E007836C C7A20018 */ lwc1 $f2, 0x18($sp) /* 37A760 E0078370 44800000 */ mtc1 $zero, $f0 -/* 37A764 E0078374 00000000 */ nop +/* 37A764 E0078374 00000000 */ nop /* 37A768 E0078378 4600103C */ c.lt.s $f2, $f0 -/* 37A76C E007837C 00000000 */ nop +/* 37A76C E007837C 00000000 */ nop /* 37A770 E0078380 45010150 */ bc1t .LE00788C4 -/* 37A774 E0078384 00000000 */ nop +/* 37A774 E0078384 00000000 */ nop /* 37A778 E0078388 C7A4001C */ lwc1 $f4, 0x1c($sp) /* 37A77C E007838C 4600203C */ c.lt.s $f4, $f0 -/* 37A780 E0078390 00000000 */ nop +/* 37A780 E0078390 00000000 */ nop /* 37A784 E0078394 4501014B */ bc1t .LE00788C4 -/* 37A788 E0078398 00000000 */ nop +/* 37A788 E0078398 00000000 */ nop /* 37A78C E007839C 3C0143A0 */ lui $at, 0x43a0 /* 37A790 E00783A0 44810000 */ mtc1 $at, $f0 -/* 37A794 E00783A4 00000000 */ nop +/* 37A794 E00783A4 00000000 */ nop /* 37A798 E00783A8 4602003E */ c.le.s $f0, $f2 -/* 37A79C E00783AC 00000000 */ nop +/* 37A79C E00783AC 00000000 */ nop /* 37A7A0 E00783B0 45010144 */ bc1t .LE00788C4 -/* 37A7A4 E00783B4 00000000 */ nop +/* 37A7A4 E00783B4 00000000 */ nop /* 37A7A8 E00783B8 3C014370 */ lui $at, 0x4370 /* 37A7AC E00783BC 44810000 */ mtc1 $at, $f0 -/* 37A7B0 E00783C0 00000000 */ nop +/* 37A7B0 E00783C0 00000000 */ nop /* 37A7B4 E00783C4 4604003E */ c.le.s $f0, $f4 -/* 37A7B8 E00783C8 00000000 */ nop +/* 37A7B8 E00783C8 00000000 */ nop /* 37A7BC E00783CC 4501013D */ bc1t .LE00788C4 /* 37A7C0 E00783D0 3C02DE00 */ lui $v0, 0xde00 /* 37A7C4 E00783D4 8EA70000 */ lw $a3, ($s5) @@ -114,7 +114,7 @@ glabel func_E007827C /* 37A818 E0078428 35298081 */ ori $t1, $t1, 0x8081 /* 37A81C E007842C 00690018 */ mult $v1, $t1 /* 37A820 E0078430 44960000 */ mtc1 $s6, $f0 -/* 37A824 E0078434 00000000 */ nop +/* 37A824 E0078434 00000000 */ nop /* 37A828 E0078438 46800020 */ cvt.s.w $f0, $f0 /* 37A82C E007843C 46001081 */ sub.s $f2, $f2, $f0 /* 37A830 E0078440 46002001 */ sub.s $f0, $f4, $f0 @@ -122,7 +122,7 @@ glabel func_E007827C /* 37A838 E0078448 E7A60020 */ swc1 $f6, 0x20($sp) /* 37A83C E007844C 00007010 */ mfhi $t6 /* 37A840 E0078450 90460001 */ lbu $a2, 1($v0) -/* 37A844 E0078454 00000000 */ nop +/* 37A844 E0078454 00000000 */ nop /* 37A848 E0078458 00C80018 */ mult $a2, $t0 /* 37A84C E007845C 00162040 */ sll $a0, $s6, 1 /* 37A850 E0078460 90450002 */ lbu $a1, 2($v0) @@ -136,7 +136,7 @@ glabel func_E007827C /* 37A870 E0078480 02E47821 */ addu $t7, $s7, $a0 /* 37A874 E0078484 4600018D */ trunc.w.s $f6, $f0 /* 37A878 E0078488 440A3000 */ mfc1 $t2, $f6 -/* 37A87C E007848C 00000000 */ nop +/* 37A87C E007848C 00000000 */ nop /* 37A880 E0078490 01446021 */ addu $t4, $t2, $a0 /* 37A884 E0078494 00005810 */ mfhi $t3 /* 37A888 E0078498 01C32021 */ addu $a0, $t6, $v1 @@ -189,7 +189,7 @@ glabel func_E007827C /* 37A930 E0078540 16610004 */ bne $s3, $at, .LE0078554 /* 37A934 E0078544 3C018000 */ lui $at, 0x8000 /* 37A938 E0078548 14610002 */ bne $v1, $at, .LE0078554 -/* 37A93C E007854C 00000000 */ nop +/* 37A93C E007854C 00000000 */ nop /* 37A940 E0078550 0006000D */ break 6 .LE0078554: /* 37A944 E0078554 00005812 */ mflo $t3 @@ -202,7 +202,7 @@ glabel func_E007827C /* 37A95C E007856C 16610004 */ bne $s3, $at, .LE0078580 /* 37A960 E0078570 3C018000 */ lui $at, 0x8000 /* 37A964 E0078574 14410002 */ bne $v0, $at, .LE0078580 -/* 37A968 E0078578 00000000 */ nop +/* 37A968 E0078578 00000000 */ nop /* 37A96C E007857C 0006000D */ break 6 .LE0078580: /* 37A970 E0078580 0000B812 */ mflo $s7 @@ -252,7 +252,7 @@ glabel func_E007827C /* 37AA1C E007862C C6200008 */ lwc1 $f0, 8($s1) /* 37AA20 E0078630 02021025 */ or $v0, $s0, $v0 /* 37AA24 E0078634 46002002 */ mul.s $f0, $f4, $f0 -/* 37AA28 E0078638 00000000 */ nop +/* 37AA28 E0078638 00000000 */ nop /* 37AA2C E007863C 0242C825 */ or $t9, $s2, $v0 /* 37AA30 E0078640 8E220014 */ lw $v0, 0x14($s1) /* 37AA34 E0078644 8D250000 */ lw $a1, ($t1) @@ -266,22 +266,22 @@ glabel func_E007827C /* 37AA54 E0078664 0000B812 */ mflo $s7 /* 37AA58 E0078668 C620000C */ lwc1 $f0, 0xc($s1) /* 37AA5C E007866C 44971000 */ mtc1 $s7, $f2 -/* 37AA60 E0078670 00000000 */ nop +/* 37AA60 E0078670 00000000 */ nop /* 37AA64 E0078674 468010A0 */ cvt.s.w $f2, $f2 /* 37AA68 E0078678 46001082 */ mul.s $f2, $f2, $f0 -/* 37AA6C E007867C 00000000 */ nop +/* 37AA6C E007867C 00000000 */ nop /* 37AA70 E0078680 00021080 */ sll $v0, $v0, 2 /* 37AA74 E0078684 24A50008 */ addiu $a1, $a1, 8 /* 37AA78 E0078688 00031880 */ sll $v1, $v1, 2 /* 37AA7C E007868C 44820000 */ mtc1 $v0, $f0 -/* 37AA80 E0078690 00000000 */ nop +/* 37AA80 E0078690 00000000 */ nop /* 37AA84 E0078694 46800020 */ cvt.s.w $f0, $f0 /* 37AA88 E0078698 46020001 */ sub.s $f0, $f0, $f2 /* 37AA8C E007869C 30630FFF */ andi $v1, $v1, 0xfff /* 37AA90 E00786A0 00031B00 */ sll $v1, $v1, 0xc /* 37AA94 E00786A4 4600018D */ trunc.w.s $f6, $f0 /* 37AA98 E00786A8 44023000 */ mfc1 $v0, $f6 -/* 37AA9C E00786AC 00000000 */ nop +/* 37AA9C E00786AC 00000000 */ nop /* 37AAA0 E00786B0 00021080 */ sll $v0, $v0, 2 /* 37AAA4 E00786B4 30420FFF */ andi $v0, $v0, 0xfff /* 37AAA8 E00786B8 3C17F200 */ lui $s7, 0xf200 @@ -292,7 +292,7 @@ glabel func_E007827C /* 37AABC E00786CC C6200008 */ lwc1 $f0, 8($s1) /* 37AAC0 E00786D0 0002A540 */ sll $s4, $v0, 0x15 /* 37AAC4 E00786D4 46002102 */ mul.s $f4, $f4, $f0 -/* 37AAC8 E00786D8 00000000 */ nop +/* 37AAC8 E00786D8 00000000 */ nop /* 37AACC E00786DC C6200000 */ lwc1 $f0, ($s1) /* 37AAD0 E00786E0 46800020 */ cvt.s.w $f0, $f0 /* 37AAD4 E00786E4 AD250000 */ sw $a1, ($t1) @@ -311,22 +311,22 @@ glabel func_E007827C /* 37AB08 E0078718 0000B812 */ mflo $s7 /* 37AB0C E007871C C620000C */ lwc1 $f0, 0xc($s1) /* 37AB10 E0078720 44971000 */ mtc1 $s7, $f2 -/* 37AB14 E0078724 00000000 */ nop +/* 37AB14 E0078724 00000000 */ nop /* 37AB18 E0078728 468010A0 */ cvt.s.w $f2, $f2 /* 37AB1C E007872C 46001082 */ mul.s $f2, $f2, $f0 -/* 37AB20 E0078730 00000000 */ nop +/* 37AB20 E0078730 00000000 */ nop /* 37AB24 E0078734 00021080 */ sll $v0, $v0, 2 /* 37AB28 E0078738 00441021 */ addu $v0, $v0, $a0 /* 37AB2C E007873C 00031880 */ sll $v1, $v1, 2 /* 37AB30 E0078740 44820000 */ mtc1 $v0, $f0 -/* 37AB34 E0078744 00000000 */ nop +/* 37AB34 E0078744 00000000 */ nop /* 37AB38 E0078748 46800020 */ cvt.s.w $f0, $f0 /* 37AB3C E007874C 46020001 */ sub.s $f0, $f0, $f2 /* 37AB40 E0078750 30630FFF */ andi $v1, $v1, 0xfff /* 37AB44 E0078754 00031B00 */ sll $v1, $v1, 0xc /* 37AB48 E0078758 4600018D */ trunc.w.s $f6, $f0 /* 37AB4C E007875C 44023000 */ mfc1 $v0, $f6 -/* 37AB50 E0078760 00000000 */ nop +/* 37AB50 E0078760 00000000 */ nop /* 37AB54 E0078764 00021080 */ sll $v0, $v0, 2 /* 37AB58 E0078768 30420FFF */ andi $v0, $v0, 0xfff /* 37AB5C E007876C 00621825 */ or $v1, $v1, $v0 @@ -429,6 +429,6 @@ glabel func_E007827C /* 37ACD8 E00788E8 8FB00038 */ lw $s0, 0x38($sp) /* 37ACDC E00788EC 03E00008 */ jr $ra /* 37ACE0 E00788F0 27BD0060 */ addiu $sp, $sp, 0x60 -/* 37ACE4 E00788F4 00000000 */ nop -/* 37ACE8 E00788F8 00000000 */ nop -/* 37ACEC E00788FC 00000000 */ nop +/* 37ACE4 E00788F4 00000000 */ nop +/* 37ACE8 E00788F8 00000000 */ nop +/* 37ACEC E00788FC 00000000 */ nop diff --git a/asm/nonmatchings/code_37C540/func_E007A88C.s b/asm/nonmatchings/code_37C540/func_E007A88C.s index f822edc8fd..ed9185eb2b 100644 --- a/asm/nonmatchings/code_37C540/func_E007A88C.s +++ b/asm/nonmatchings/code_37C540/func_E007A88C.s @@ -14,8 +14,8 @@ glabel func_E007A88C /* 37CDF0 E007A8B0 AFB500AC */ sw $s5, 0xac($sp) /* 37CDF4 E007A8B4 24150001 */ addiu $s5, $zero, 1 /* 37CDF8 E007A8B8 AFB1009C */ sw $s1, 0x9c($sp) -/* 37CDFC E007A8BC 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 37CE00 E007A8C0 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 37CDFC E007A8BC 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 37CE00 E007A8C0 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 37CE04 E007A8C4 3C02E700 */ lui $v0, 0xe700 /* 37CE08 E007A8C8 AFBF00BC */ sw $ra, 0xbc($sp) /* 37CE0C E007A8CC AFB700B4 */ sw $s7, 0xb4($sp) @@ -53,10 +53,10 @@ glabel func_E007A88C /* 37CE8C E007A94C 0C080108 */ jal func_E0200420 /* 37CE90 E007A950 26520068 */ addiu $s2, $s2, 0x68 /* 37CE94 E007A954 27A40018 */ addiu $a0, $sp, 0x18 -/* 37CE98 E007A958 3C148007 */ lui $s4, %hi(D_800741F0) -/* 37CE9C E007A95C 269441F0 */ addiu $s4, $s4, %lo(D_800741F0) -/* 37CEA0 E007A960 3C16800A */ lui $s6, %hi(D_8009A674) -/* 37CEA4 E007A964 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) +/* 37CE98 E007A958 3C148007 */ lui $s4, %hi(gMatrixListPos) +/* 37CE9C E007A95C 269441F0 */ addiu $s4, $s4, %lo(gMatrixListPos) +/* 37CEA0 E007A960 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 37CEA4 E007A964 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) /* 37CEA8 E007A968 96850000 */ lhu $a1, ($s4) /* 37CEAC E007A96C 8EC20000 */ lw $v0, ($s6) /* 37CEB0 E007A970 00052980 */ sll $a1, $a1, 6 @@ -195,8 +195,8 @@ glabel func_E007A88C /* 37D0C0 E007AB80 AE640000 */ sw $a0, ($s3) .LE007AB84: /* 37D0C4 E007AB84 3C03D838 */ lui $v1, 0xd838 -/* 37D0C8 E007AB88 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 37D0CC E007AB8C 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 37D0C8 E007AB88 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 37D0CC E007AB8C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 37D0D0 E007AB90 8C820000 */ lw $v0, ($a0) /* 37D0D4 E007AB94 34630002 */ ori $v1, $v1, 2 /* 37D0D8 E007AB98 0040282D */ daddu $a1, $v0, $zero @@ -224,4 +224,4 @@ glabel func_E007A88C /* 37D130 E007ABF0 D7B400C0 */ ldc1 $f20, 0xc0($sp) /* 37D134 E007ABF4 03E00008 */ jr $ra /* 37D138 E007ABF8 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* 37D13C E007ABFC 00000000 */ nop +/* 37D13C E007ABFC 00000000 */ nop diff --git a/asm/nonmatchings/code_37D490/func_E007C1F4.s b/asm/nonmatchings/code_37D490/func_E007C1F4.s index fbc02a4253..2e15e65b22 100644 --- a/asm/nonmatchings/code_37D490/func_E007C1F4.s +++ b/asm/nonmatchings/code_37D490/func_E007C1F4.s @@ -10,8 +10,8 @@ glabel func_E007C1F4 /* 37D698 E007C208 AFB300E4 */ sw $s3, 0xe4($sp) /* 37D69C E007C20C 3C130001 */ lui $s3, 1 /* 37D6A0 E007C210 AFB400E8 */ sw $s4, 0xe8($sp) -/* 37D6A4 E007C214 3C14800A */ lui $s4, %hi(D_8009A66C) -/* 37D6A8 E007C218 2694A66C */ addiu $s4, $s4, %lo(D_8009A66C) +/* 37D6A4 E007C214 3C14800A */ lui $s4, %hi(gMasterGfxPos) +/* 37D6A8 E007C218 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) /* 37D6AC E007C21C AFBF00F0 */ sw $ra, 0xf0($sp) /* 37D6B0 E007C220 AFB500EC */ sw $s5, 0xec($sp) /* 37D6B4 E007C224 AFB200E0 */ sw $s2, 0xe0($sp) @@ -50,9 +50,9 @@ glabel func_E007C1F4 /* 37D738 E007C2A8 00A22821 */ addu $a1, $a1, $v0 /* 37D73C E007C2AC 4600110D */ trunc.w.s $f4, $f2 /* 37D740 E007C2B0 44022000 */ mfc1 $v0, $f4 -/* 37D744 E007C2B4 00000000 */ nop +/* 37D744 E007C2B4 00000000 */ nop /* 37D748 E007C2B8 44820000 */ mtc1 $v0, $f0 -/* 37D74C E007C2BC 00000000 */ nop +/* 37D74C E007C2BC 00000000 */ nop /* 37D750 E007C2C0 46800020 */ cvt.s.w $f0, $f0 /* 37D754 E007C2C4 00021080 */ sll $v0, $v0, 2 /* 37D758 E007C2C8 46001081 */ sub.s $f2, $f2, $f0 @@ -61,7 +61,7 @@ glabel func_E007C1F4 /* 37D764 E007C2D4 00220821 */ addu $at, $at, $v0 /* 37D768 E007C2D8 8C22C510 */ lw $v0, %lo(D_E007C510)($at) /* 37D76C E007C2DC 46181082 */ mul.s $f2, $f2, $f24 -/* 37D770 E007C2E0 00000000 */ nop +/* 37D770 E007C2E0 00000000 */ nop /* 37D774 E007C2E4 AC620014 */ sw $v0, 0x14($v1) /* 37D778 E007C2E8 8E250004 */ lw $a1, 4($s1) /* 37D77C E007C2EC 8E260008 */ lw $a2, 8($s1) @@ -118,10 +118,10 @@ glabel func_E007C1F4 /* 37D848 E007C3B8 0C080114 */ jal func_E0200450 /* 37D84C E007C3BC 0200302D */ daddu $a2, $s0, $zero /* 37D850 E007C3C0 0200202D */ daddu $a0, $s0, $zero -/* 37D854 E007C3C4 3C108007 */ lui $s0, %hi(D_800741F0) -/* 37D858 E007C3C8 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 37D85C E007C3CC 3C12800A */ lui $s2, %hi(D_8009A674) -/* 37D860 E007C3D0 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 37D854 E007C3C4 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 37D858 E007C3C8 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 37D85C E007C3CC 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 37D860 E007C3D0 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 37D864 E007C3D4 96050000 */ lhu $a1, ($s0) /* 37D868 E007C3D8 8E420000 */ lw $v0, ($s2) /* 37D86C E007C3DC 00052980 */ sll $a1, $a1, 6 @@ -147,7 +147,7 @@ glabel func_E007C1F4 /* 37D8BC E007C42C AC830004 */ sw $v1, 4($a0) /* 37D8C0 E007C430 C6220020 */ lwc1 $f2, 0x20($s1) /* 37D8C4 E007C434 4602003C */ c.lt.s $f0, $f2 -/* 37D8C8 E007C438 00000000 */ nop +/* 37D8C8 E007C438 00000000 */ nop /* 37D8CC E007C43C 45000006 */ bc1f .LE007C458 /* 37D8D0 E007C440 24A20008 */ addiu $v0, $a1, 8 /* 37D8D4 E007C444 AE820000 */ sw $v0, ($s4) @@ -163,8 +163,8 @@ glabel func_E007C1F4 .LE007C468: /* 37D8F8 E007C468 ACA20004 */ sw $v0, 4($a1) /* 37D8FC E007C46C 3C07D838 */ lui $a3, 0xd838 -/* 37D900 E007C470 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 37D904 E007C474 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 37D900 E007C470 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 37D904 E007C474 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 37D908 E007C478 34E70002 */ ori $a3, $a3, 2 /* 37D90C E007C47C 3C02FB00 */ lui $v0, 0xfb00 /* 37D910 E007C480 8CA40000 */ lw $a0, ($a1) @@ -200,6 +200,6 @@ glabel func_E007C1F4 /* 37D988 E007C4F8 D7B400F8 */ ldc1 $f20, 0xf8($sp) /* 37D98C E007C4FC 03E00008 */ jr $ra /* 37D990 E007C500 27BD0110 */ addiu $sp, $sp, 0x110 -/* 37D994 E007C504 00000000 */ nop -/* 37D998 E007C508 00000000 */ nop -/* 37D99C E007C50C 00000000 */ nop +/* 37D994 E007C504 00000000 */ nop +/* 37D998 E007C508 00000000 */ nop +/* 37D99C E007C50C 00000000 */ nop diff --git a/asm/nonmatchings/code_37F720/func_E007E54C.s b/asm/nonmatchings/code_37F720/func_E007E54C.s index 4d58adc057..8603b1e255 100644 --- a/asm/nonmatchings/code_37F720/func_E007E54C.s +++ b/asm/nonmatchings/code_37F720/func_E007E54C.s @@ -8,8 +8,8 @@ glabel func_E007E54C /* 37FC78 E007E558 AFA400E8 */ sw $a0, 0xe8($sp) /* 37FC7C E007E55C 27A40018 */ addiu $a0, $sp, 0x18 /* 37FC80 E007E560 AFB600B8 */ sw $s6, 0xb8($sp) -/* 37FC84 E007E564 3C16800A */ lui $s6, %hi(D_8009A66C) -/* 37FC88 E007E568 26D6A66C */ addiu $s6, $s6, %lo(D_8009A66C) +/* 37FC84 E007E564 3C16800A */ lui $s6, %hi(gMasterGfxPos) +/* 37FC88 E007E568 26D6A66C */ addiu $s6, $s6, %lo(gMasterGfxPos) /* 37FC8C E007E56C AFBF00C4 */ sw $ra, 0xc4($sp) /* 37FC90 E007E570 AFBE00C0 */ sw $fp, 0xc0($sp) /* 37FC94 E007E574 AFB700BC */ sw $s7, 0xbc($sp) @@ -79,10 +79,10 @@ glabel func_E007E54C /* 37FD94 E007E674 0C080114 */ jal func_E0200450 /* 37FD98 E007E678 00A0302D */ daddu $a2, $a1, $zero /* 37FD9C E007E67C 27A40018 */ addiu $a0, $sp, 0x18 -/* 37FDA0 E007E680 3C138007 */ lui $s3, %hi(D_800741F0) -/* 37FDA4 E007E684 267341F0 */ addiu $s3, $s3, %lo(D_800741F0) -/* 37FDA8 E007E688 3C17800A */ lui $s7, %hi(D_8009A674) -/* 37FDAC E007E68C 26F7A674 */ addiu $s7, $s7, %lo(D_8009A674) +/* 37FDA0 E007E680 3C138007 */ lui $s3, %hi(gMatrixListPos) +/* 37FDA4 E007E684 267341F0 */ addiu $s3, $s3, %lo(gMatrixListPos) +/* 37FDA8 E007E688 3C17800A */ lui $s7, %hi(gDisplayContext) +/* 37FDAC E007E68C 26F7A674 */ addiu $s7, $s7, %lo(gDisplayContext) /* 37FDB0 E007E690 96650000 */ lhu $a1, ($s3) /* 37FDB4 E007E694 8EE20000 */ lw $v0, ($s7) /* 37FDB8 E007E698 00052980 */ sll $a1, $a1, 6 @@ -243,8 +243,8 @@ glabel func_E007E54C /* 380018 E007E8F8 2631004C */ addiu $s1, $s1, 0x4c .LE007E8FC: /* 38001C E007E8FC 3C05D838 */ lui $a1, 0xd838 -/* 380020 E007E900 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 380024 E007E904 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 380020 E007E900 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 380024 E007E904 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 380028 E007E908 8C620000 */ lw $v0, ($v1) /* 38002C E007E90C 34A50002 */ ori $a1, $a1, 2 /* 380030 E007E910 0040202D */ daddu $a0, $v0, $zero @@ -279,8 +279,8 @@ glabel func_E007E54C /* 3800A0 E007E980 27A40018 */ addiu $a0, $sp, 0x18 /* 3800A4 E007E984 3C1E0001 */ lui $fp, 1 /* 3800A8 E007E988 37DE1630 */ ori $fp, $fp, 0x1630 -/* 3800AC E007E98C 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 3800B0 E007E990 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 3800AC E007E98C 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 3800B0 E007E990 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 3800B4 E007E994 3C15DE00 */ lui $s5, 0xde00 /* 3800B8 E007E998 3C020900 */ lui $v0, 0x900 /* 3800BC E007E99C 24420D40 */ addiu $v0, $v0, 0xd40 @@ -387,10 +387,10 @@ glabel func_E007E54C /* 380250 E007EB30 0C080114 */ jal func_E0200450 /* 380254 E007EB34 00A0302D */ daddu $a2, $a1, $zero /* 380258 E007EB38 27A40018 */ addiu $a0, $sp, 0x18 -/* 38025C E007EB3C 3C108007 */ lui $s0, %hi(D_800741F0) -/* 380260 E007EB40 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 380264 E007EB44 3C12800A */ lui $s2, %hi(D_8009A674) -/* 380268 E007EB48 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 38025C E007EB3C 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 380260 E007EB40 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 380264 E007EB44 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 380268 E007EB48 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 38026C E007EB4C 96050000 */ lhu $a1, ($s0) /* 380270 E007EB50 8E420000 */ lw $v0, ($s2) /* 380274 E007EB54 00052980 */ sll $a1, $a1, 6 @@ -445,6 +445,6 @@ glabel func_E007E54C /* 380338 E007EC18 D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 38033C E007EC1C 03E00008 */ jr $ra /* 380340 E007EC20 27BD00E8 */ addiu $sp, $sp, 0xe8 -/* 380344 E007EC24 00000000 */ nop -/* 380348 E007EC28 00000000 */ nop -/* 38034C E007EC2C 00000000 */ nop +/* 380344 E007EC24 00000000 */ nop +/* 380348 E007EC28 00000000 */ nop +/* 38034C E007EC2C 00000000 */ nop diff --git a/asm/nonmatchings/code_3812C0/func_E0080448.s b/asm/nonmatchings/code_3812C0/func_E0080448.s index fcb41347d3..cca9656bd4 100644 --- a/asm/nonmatchings/code_3812C0/func_E0080448.s +++ b/asm/nonmatchings/code_3812C0/func_E0080448.s @@ -8,8 +8,8 @@ glabel func_E0080448 /* 381714 E0080454 AFA40118 */ sw $a0, 0x118($sp) /* 381718 E0080458 27A40018 */ addiu $a0, $sp, 0x18 /* 38171C E008045C AFB300F4 */ sw $s3, 0xf4($sp) -/* 381720 E0080460 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 381724 E0080464 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 381720 E0080460 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 381724 E0080464 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 381728 E0080468 8FAA0118 */ lw $t2, 0x118($sp) /* 38172C E008046C 3C02E700 */ lui $v0, 0xe700 /* 381730 E0080470 AFBF010C */ sw $ra, 0x10c($sp) @@ -75,10 +75,10 @@ glabel func_E0080448 /* 381820 E0080560 0C080114 */ jal func_E0200450 /* 381824 E0080564 0200302D */ daddu $a2, $s0, $zero /* 381828 E0080568 0200202D */ daddu $a0, $s0, $zero -/* 38182C E008056C 3C168007 */ lui $s6, %hi(D_800741F0) -/* 381830 E0080570 26D641F0 */ addiu $s6, $s6, %lo(D_800741F0) -/* 381834 E0080574 3C1E800A */ lui $fp, %hi(D_8009A674) -/* 381838 E0080578 27DEA674 */ addiu $fp, $fp, %lo(D_8009A674) +/* 38182C E008056C 3C168007 */ lui $s6, %hi(gMatrixListPos) +/* 381830 E0080570 26D641F0 */ addiu $s6, $s6, %lo(gMatrixListPos) +/* 381834 E0080574 3C1E800A */ lui $fp, %hi(gDisplayContext) +/* 381838 E0080578 27DEA674 */ addiu $fp, $fp, %lo(gDisplayContext) /* 38183C E008057C 96C50000 */ lhu $a1, ($s6) /* 381840 E0080580 8FC20000 */ lw $v0, ($fp) /* 381844 E0080584 00052980 */ sll $a1, $a1, 6 @@ -175,7 +175,7 @@ glabel func_E0080448 /* 3819A4 E00806E4 24630004 */ addiu $v1, $v1, 4 /* 3819A8 E00806E8 24020002 */ addiu $v0, $zero, 2 /* 3819AC E00806EC 1682000A */ bne $s4, $v0, .LE0080718 -/* 3819B0 E00806F0 00000000 */ nop +/* 3819B0 E00806F0 00000000 */ nop .LE00806F4: /* 3819B4 E00806F4 8FAA00DC */ lw $t2, 0xdc($sp) /* 3819B8 E00806F8 3C020900 */ lui $v0, 0x900 @@ -210,8 +210,8 @@ glabel func_E0080448 /* 381A24 E0080764 00A0302D */ daddu $a2, $a1, $zero /* 381A28 E0080768 27A40018 */ addiu $a0, $sp, 0x18 /* 381A2C E008076C 96C50000 */ lhu $a1, ($s6) -/* 381A30 E0080770 3C02800A */ lui $v0, %hi(D_8009A674) -/* 381A34 E0080774 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 381A30 E0080770 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 381A34 E0080774 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 381A38 E0080778 00052980 */ sll $a1, $a1, 6 /* 381A3C E008077C 00B52821 */ addu $a1, $a1, $s5 /* 381A40 E0080780 0C080118 */ jal func_E0200460 @@ -219,8 +219,8 @@ glabel func_E0080448 /* 381A48 E0080788 27A40018 */ addiu $a0, $sp, 0x18 /* 381A4C E008078C 8E080000 */ lw $t0, ($s0) /* 381A50 E0080790 96C90000 */ lhu $t1, ($s6) -/* 381A54 E0080794 3C03800A */ lui $v1, %hi(D_8009A674) -/* 381A58 E0080798 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 381A54 E0080794 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 381A58 E0080798 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 381A5C E008079C 44800000 */ mtc1 $zero, $f0 /* 381A60 E00807A0 0100282D */ daddu $a1, $t0, $zero /* 381A64 E00807A4 3C0ADA38 */ lui $t2, 0xda38 @@ -241,8 +241,8 @@ glabel func_E0080448 /* 381AA0 E00807E0 00C0382D */ daddu $a3, $a2, $zero /* 381AA4 E00807E4 27A40018 */ addiu $a0, $sp, 0x18 /* 381AA8 E00807E8 96C50000 */ lhu $a1, ($s6) -/* 381AAC E00807EC 3C02800A */ lui $v0, %hi(D_8009A674) -/* 381AB0 E00807F0 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 381AAC E00807EC 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 381AB0 E00807F0 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 381AB4 E00807F4 00052980 */ sll $a1, $a1, 6 /* 381AB8 E00807F8 00B52821 */ addu $a1, $a1, $s5 /* 381ABC E00807FC 0C080118 */ jal func_E0200460 @@ -258,8 +258,8 @@ glabel func_E0080448 /* 381AE4 E0080824 AE050000 */ sw $a1, ($s0) /* 381AE8 E0080828 AC8A0000 */ sw $t2, ($a0) /* 381AEC E008082C A6C20000 */ sh $v0, ($s6) -/* 381AF0 E0080830 3C02800A */ lui $v0, %hi(D_8009A674) -/* 381AF4 E0080834 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 381AF0 E0080830 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 381AF4 E0080834 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 381AF8 E0080838 00751821 */ addu $v1, $v1, $s5 /* 381AFC E008083C 00431021 */ addu $v0, $v0, $v1 /* 381B00 E0080840 AC820004 */ sw $v0, 4($a0) @@ -406,8 +406,8 @@ glabel func_E0080448 /* 381D10 E0080A50 26310048 */ addiu $s1, $s1, 0x48 .LE0080A54: /* 381D14 E0080A54 3C05D838 */ lui $a1, 0xd838 -/* 381D18 E0080A58 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 381D1C E0080A5C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 381D18 E0080A58 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 381D1C E0080A5C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 381D20 E0080A60 8C620000 */ lw $v0, ($v1) /* 381D24 E0080A64 34A50002 */ ori $a1, $a1, 2 /* 381D28 E0080A68 0040202D */ daddu $a0, $v0, $zero @@ -429,6 +429,6 @@ glabel func_E0080448 /* 381D68 E0080AA8 D7B40110 */ ldc1 $f20, 0x110($sp) /* 381D6C E0080AAC 03E00008 */ jr $ra /* 381D70 E0080AB0 27BD0118 */ addiu $sp, $sp, 0x118 -/* 381D74 E0080AB4 00000000 */ nop -/* 381D78 E0080AB8 00000000 */ nop -/* 381D7C E0080ABC 00000000 */ nop +/* 381D74 E0080AB4 00000000 */ nop +/* 381D78 E0080AB8 00000000 */ nop +/* 381D7C E0080ABC 00000000 */ nop diff --git a/asm/nonmatchings/code_385640/func_E0082580.s b/asm/nonmatchings/code_385640/func_E0082580.s index 394d7fd302..8e4e05f94e 100644 --- a/asm/nonmatchings/code_385640/func_E0082580.s +++ b/asm/nonmatchings/code_385640/func_E0082580.s @@ -49,18 +49,18 @@ glabel func_E0082580 /* 385C70 E0082630 0C080114 */ jal func_E0200450 /* 385C74 E0082634 00A0302D */ daddu $a2, $a1, $zero /* 385C78 E0082638 27A40018 */ addiu $a0, $sp, 0x18 -/* 385C7C E008263C 3C108007 */ lui $s0, %hi(D_800741F0) -/* 385C80 E0082640 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 385C84 E0082644 3C11800A */ lui $s1, %hi(D_8009A674) -/* 385C88 E0082648 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 385C7C E008263C 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 385C80 E0082640 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 385C84 E0082644 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 385C88 E0082648 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 385C8C E008264C 96050000 */ lhu $a1, ($s0) /* 385C90 E0082650 8E220000 */ lw $v0, ($s1) /* 385C94 E0082654 00052980 */ sll $a1, $a1, 6 /* 385C98 E0082658 00B22821 */ addu $a1, $a1, $s2 /* 385C9C E008265C 0C080118 */ jal func_E0200460 /* 385CA0 E0082660 00452821 */ addu $a1, $v0, $a1 -/* 385CA4 E0082664 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 385CA8 E0082668 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 385CA4 E0082664 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 385CA8 E0082668 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 385CAC E008266C 8C620000 */ lw $v0, ($v1) /* 385CB0 E0082670 0040202D */ daddu $a0, $v0, $zero /* 385CB4 E0082674 24420008 */ addiu $v0, $v0, 8 diff --git a/asm/nonmatchings/code_385640/func_E00826C4.s b/asm/nonmatchings/code_385640/func_E00826C4.s index 0d13ec83e5..3b050c2ab1 100644 --- a/asm/nonmatchings/code_385640/func_E00826C4.s +++ b/asm/nonmatchings/code_385640/func_E00826C4.s @@ -50,18 +50,18 @@ glabel func_E00826C4 /* 385DB8 E0082778 0C080114 */ jal func_E0200450 /* 385DBC E008277C 00A0302D */ daddu $a2, $a1, $zero /* 385DC0 E0082780 27A40018 */ addiu $a0, $sp, 0x18 -/* 385DC4 E0082784 3C108007 */ lui $s0, %hi(D_800741F0) -/* 385DC8 E0082788 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 385DCC E008278C 3C12800A */ lui $s2, %hi(D_8009A674) -/* 385DD0 E0082790 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 385DC4 E0082784 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 385DC8 E0082788 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 385DCC E008278C 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 385DD0 E0082790 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 385DD4 E0082794 96050000 */ lhu $a1, ($s0) /* 385DD8 E0082798 8E420000 */ lw $v0, ($s2) /* 385DDC E008279C 00052980 */ sll $a1, $a1, 6 /* 385DE0 E00827A0 00B32821 */ addu $a1, $a1, $s3 /* 385DE4 E00827A4 0C080118 */ jal func_E0200460 /* 385DE8 E00827A8 00452821 */ addu $a1, $v0, $a1 -/* 385DEC E00827AC 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 385DF0 E00827B0 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 385DEC E00827AC 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 385DF0 E00827B0 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 385DF4 E00827B4 8D070000 */ lw $a3, ($t0) /* 385DF8 E00827B8 00E0202D */ daddu $a0, $a3, $zero /* 385DFC E00827BC 24E70008 */ addiu $a3, $a3, 8 diff --git a/asm/nonmatchings/code_385640/func_E00828B4.s b/asm/nonmatchings/code_385640/func_E00828B4.s index 191a25a4ad..08c0686ba4 100644 --- a/asm/nonmatchings/code_385640/func_E00828B4.s +++ b/asm/nonmatchings/code_385640/func_E00828B4.s @@ -10,8 +10,8 @@ glabel func_E00828B4 /* 385F08 E00828C8 AFB20018 */ sw $s2, 0x18($sp) /* 385F0C E00828CC 24120001 */ addiu $s2, $zero, 1 /* 385F10 E00828D0 AFB00010 */ sw $s0, 0x10($sp) -/* 385F14 E00828D4 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 385F18 E00828D8 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 385F14 E00828D4 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 385F18 E00828D8 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 385F1C E00828DC 3C02E700 */ lui $v0, 0xe700 /* 385F20 E00828E0 AFBF0034 */ sw $ra, 0x34($sp) /* 385F24 E00828E4 AFBE0030 */ sw $fp, 0x30($sp) @@ -54,7 +54,7 @@ glabel func_E00828B4 /* 385FB4 E0082974 26520001 */ addiu $s2, $s2, 1 .LE0082978: /* 385FB8 E0082978 167E0008 */ bne $s3, $fp, .LE008299C -/* 385FBC E008297C 00000000 */ nop +/* 385FBC E008297C 00000000 */ nop /* 385FC0 E0082980 8E020000 */ lw $v0, ($s0) /* 385FC4 E0082984 0040182D */ daddu $v1, $v0, $zero /* 385FC8 E0082988 24420008 */ addiu $v0, $v0, 8 @@ -97,8 +97,8 @@ glabel func_E00828B4 /* 386050 E0082A10 26310048 */ addiu $s1, $s1, 0x48 .LE0082A14: /* 386054 E0082A14 3C03D838 */ lui $v1, 0xd838 -/* 386058 E0082A18 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 38605C E0082A1C 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 386058 E0082A18 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 38605C E0082A1C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 386060 E0082A20 8C820000 */ lw $v0, ($a0) /* 386064 E0082A24 34630002 */ ori $v1, $v1, 2 /* 386068 E0082A28 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/code_385640/func_E0082A84.s b/asm/nonmatchings/code_385640/func_E0082A84.s index b594d5e152..a6d7629c40 100644 --- a/asm/nonmatchings/code_385640/func_E0082A84.s +++ b/asm/nonmatchings/code_385640/func_E0082A84.s @@ -10,8 +10,8 @@ glabel func_E0082A84 /* 3860D8 E0082A98 AFB40020 */ sw $s4, 0x20($sp) /* 3860DC E0082A9C 24140001 */ addiu $s4, $zero, 1 /* 3860E0 E0082AA0 AFB00010 */ sw $s0, 0x10($sp) -/* 3860E4 E0082AA4 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 3860E8 E0082AA8 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 3860E4 E0082AA4 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 3860E8 E0082AA8 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 3860EC E0082AAC 3C02E700 */ lui $v0, 0xe700 /* 3860F0 E0082AB0 AFBF0034 */ sw $ra, 0x34($sp) /* 3860F4 E0082AB4 AFBE0030 */ sw $fp, 0x30($sp) @@ -136,8 +136,8 @@ glabel func_E0082A84 /* 3862C0 E0082C80 AE040000 */ sw $a0, ($s0) .LE0082C84: /* 3862C4 E0082C84 3C03D838 */ lui $v1, 0xd838 -/* 3862C8 E0082C88 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 3862CC E0082C8C 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 3862C8 E0082C88 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 3862CC E0082C8C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 3862D0 E0082C90 8C820000 */ lw $v0, ($a0) /* 3862D4 E0082C94 34630002 */ ori $v1, $v1, 2 /* 3862D8 E0082C98 0040282D */ daddu $a1, $v0, $zero @@ -163,6 +163,6 @@ glabel func_E0082A84 /* 386328 E0082CE8 8FB00010 */ lw $s0, 0x10($sp) /* 38632C E0082CEC 03E00008 */ jr $ra /* 386330 E0082CF0 27BD0038 */ addiu $sp, $sp, 0x38 -/* 386334 E0082CF4 00000000 */ nop -/* 386338 E0082CF8 00000000 */ nop -/* 38633C E0082CFC 00000000 */ nop +/* 386334 E0082CF4 00000000 */ nop +/* 386338 E0082CF8 00000000 */ nop +/* 38633C E0082CFC 00000000 */ nop diff --git a/asm/nonmatchings/code_3889D0/func_E0084928.s b/asm/nonmatchings/code_3889D0/func_E0084928.s index f1820815d2..cde66dc5b3 100644 --- a/asm/nonmatchings/code_3889D0/func_E0084928.s +++ b/asm/nonmatchings/code_3889D0/func_E0084928.s @@ -8,8 +8,8 @@ glabel func_E0084928 /* 389304 E0084934 8FAA00A8 */ lw $t2, 0xa8($sp) /* 389308 E0084938 34C60024 */ ori $a2, $a2, 0x24 /* 38930C E008493C AFB3007C */ sw $s3, 0x7c($sp) -/* 389310 E0084940 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 389314 E0084944 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 389310 E0084940 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 389314 E0084944 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 389318 E0084948 AFBF0094 */ sw $ra, 0x94($sp) /* 38931C E008494C AFBE0090 */ sw $fp, 0x90($sp) /* 389320 E0084950 AFB7008C */ sw $s7, 0x8c($sp) @@ -62,10 +62,10 @@ glabel func_E0084928 /* 3893DC E0084A0C 0C080108 */ jal func_E0200420 /* 3893E0 E0084A10 24120001 */ addiu $s2, $zero, 1 /* 3893E4 E0084A14 27A40020 */ addiu $a0, $sp, 0x20 -/* 3893E8 E0084A18 3C148007 */ lui $s4, %hi(D_800741F0) -/* 3893EC E0084A1C 269441F0 */ addiu $s4, $s4, %lo(D_800741F0) -/* 3893F0 E0084A20 3C15800A */ lui $s5, %hi(D_8009A674) -/* 3893F4 E0084A24 26B5A674 */ addiu $s5, $s5, %lo(D_8009A674) +/* 3893E8 E0084A18 3C148007 */ lui $s4, %hi(gMatrixListPos) +/* 3893EC E0084A1C 269441F0 */ addiu $s4, $s4, %lo(gMatrixListPos) +/* 3893F0 E0084A20 3C15800A */ lui $s5, %hi(gDisplayContext) +/* 3893F4 E0084A24 26B5A674 */ addiu $s5, $s5, %lo(gDisplayContext) /* 3893F8 E0084A28 96850000 */ lhu $a1, ($s4) /* 3893FC E0084A2C 8EA20000 */ lw $v0, ($s5) /* 389400 E0084A30 00052980 */ sll $a1, $a1, 6 @@ -109,15 +109,15 @@ glabel func_E0084928 .LE0084AC8: /* 389498 E0084AC8 27A40020 */ addiu $a0, $sp, 0x20 /* 38949C E0084ACC 44912000 */ mtc1 $s1, $f4 -/* 3894A0 E0084AD0 00000000 */ nop +/* 3894A0 E0084AD0 00000000 */ nop /* 3894A4 E0084AD4 46802120 */ cvt.s.w $f4, $f4 /* 3894A8 E0084AD8 44052000 */ mfc1 $a1, $f4 /* 3894AC E0084ADC 44932000 */ mtc1 $s3, $f4 -/* 3894B0 E0084AE0 00000000 */ nop +/* 3894B0 E0084AE0 00000000 */ nop /* 3894B4 E0084AE4 46802120 */ cvt.s.w $f4, $f4 /* 3894B8 E0084AE8 44062000 */ mfc1 $a2, $f4 /* 3894BC E0084AEC 44942000 */ mtc1 $s4, $f4 -/* 3894C0 E0084AF0 00000000 */ nop +/* 3894C0 E0084AF0 00000000 */ nop /* 3894C4 E0084AF4 46802120 */ cvt.s.w $f4, $f4 /* 3894C8 E0084AF8 44072000 */ mfc1 $a3, $f4 /* 3894CC E0084AFC 26940050 */ addiu $s4, $s4, 0x50 @@ -133,10 +133,10 @@ glabel func_E0084928 /* 3894F4 E0084B24 0C080180 */ jal func_E0200600 /* 3894F8 E0084B28 E7A0001C */ swc1 $f0, 0x1c($sp) /* 3894FC E0084B2C 27A40020 */ addiu $a0, $sp, 0x20 -/* 389500 E0084B30 3C058007 */ lui $a1, %hi(D_800741F0) -/* 389504 E0084B34 94A541F0 */ lhu $a1, %lo(D_800741F0)($a1) -/* 389508 E0084B38 3C02800A */ lui $v0, %hi(D_8009A674) -/* 38950C E0084B3C 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 389500 E0084B30 3C058007 */ lui $a1, %hi(gMatrixListPos) +/* 389504 E0084B34 94A541F0 */ lhu $a1, %lo(gMatrixListPos)($a1) +/* 389508 E0084B38 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 38950C E0084B3C 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 389510 E0084B40 00052980 */ sll $a1, $a1, 6 /* 389514 E0084B44 00B72821 */ addu $a1, $a1, $s7 /* 389518 E0084B48 0C080118 */ jal func_E0200460 @@ -147,17 +147,17 @@ glabel func_E0084928 /* 38952C E0084B5C 0080282D */ daddu $a1, $a0, $zero /* 389530 E0084B60 24840008 */ addiu $a0, $a0, 8 /* 389534 E0084B64 AEA40000 */ sw $a0, ($s5) -/* 389538 E0084B68 3C028007 */ lui $v0, %hi(D_800741F0) -/* 38953C E0084B6C 944241F0 */ lhu $v0, %lo(D_800741F0)($v0) +/* 389538 E0084B68 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* 38953C E0084B6C 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) /* 389540 E0084B70 3C03DA38 */ lui $v1, 0xda38 /* 389544 E0084B74 ACA30000 */ sw $v1, ($a1) /* 389548 E0084B78 24430001 */ addiu $v1, $v0, 1 /* 38954C E0084B7C 3042FFFF */ andi $v0, $v0, 0xffff /* 389550 E0084B80 00021180 */ sll $v0, $v0, 6 -/* 389554 E0084B84 3C018007 */ lui $at, %hi(D_800741F0) -/* 389558 E0084B88 A42341F0 */ sh $v1, %lo(D_800741F0)($at) -/* 38955C E0084B8C 3C03800A */ lui $v1, %hi(D_8009A674) -/* 389560 E0084B90 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 389554 E0084B84 3C018007 */ lui $at, %hi(gMatrixListPos) +/* 389558 E0084B88 A42341F0 */ sh $v1, %lo(gMatrixListPos)($at) +/* 38955C E0084B8C 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 389560 E0084B90 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 389564 E0084B94 00571021 */ addu $v0, $v0, $s7 /* 389568 E0084B98 00621821 */ addu $v1, $v1, $v0 /* 38956C E0084B9C 3C02DE00 */ lui $v0, 0xde00 @@ -178,8 +178,8 @@ glabel func_E0084928 /* 3895A8 E0084BD8 1440FFBB */ bnez $v0, .LE0084AC8 /* 3895AC E0084BDC AEA40000 */ sw $a0, ($s5) .LE0084BE0: -/* 3895B0 E0084BE0 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 3895B4 E0084BE4 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 3895B0 E0084BE0 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 3895B4 E0084BE4 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 3895B8 E0084BE8 8D030000 */ lw $v1, ($t0) /* 3895BC E0084BEC 3C02DE00 */ lui $v0, 0xde00 /* 3895C0 E0084BF0 0060202D */ daddu $a0, $v1, $zero @@ -199,10 +199,10 @@ glabel func_E0084928 /* 3895F8 E0084C28 4480A000 */ mtc1 $zero, $f20 /* 3895FC E0084C2C 3C17800B */ lui $s7, %hi(gCameras) /* 389600 E0084C30 26F71D80 */ addiu $s7, $s7, %lo(gCameras) -/* 389604 E0084C34 3C16800A */ lui $s6, %hi(D_8009A674) -/* 389608 E0084C38 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) -/* 38960C E0084C3C 3C158007 */ lui $s5, %hi(D_800741F0) -/* 389610 E0084C40 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) +/* 389604 E0084C34 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 389608 E0084C38 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) +/* 38960C E0084C3C 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 389610 E0084C40 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) /* 389614 E0084C44 3C140001 */ lui $s4, 1 /* 389618 E0084C48 36941630 */ ori $s4, $s4, 0x1630 /* 38961C E0084C4C 26300010 */ addiu $s0, $s1, 0x10 @@ -295,8 +295,8 @@ glabel func_E0084928 /* 389774 E0084DA4 AE640000 */ sw $a0, ($s3) .LE0084DA8: /* 389778 E0084DA8 3C05D838 */ lui $a1, 0xd838 -/* 38977C E0084DAC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 389780 E0084DB0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 38977C E0084DAC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 389780 E0084DB0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 389784 E0084DB4 8C620000 */ lw $v0, ($v1) /* 389788 E0084DB8 34A50002 */ ori $a1, $a1, 2 /* 38978C E0084DBC 0040202D */ daddu $a0, $v0, $zero @@ -319,4 +319,4 @@ glabel func_E0084928 /* 3897D0 E0084E00 D7B40098 */ ldc1 $f20, 0x98($sp) /* 3897D4 E0084E04 03E00008 */ jr $ra /* 3897D8 E0084E08 27BD00A8 */ addiu $sp, $sp, 0xa8 -/* 3897DC E0084E0C 00000000 */ nop +/* 3897DC E0084E0C 00000000 */ nop diff --git a/asm/nonmatchings/code_389850/func_E00863B4.s b/asm/nonmatchings/code_389850/func_E00863B4.s index 3b5d551a6f..85ceaf1272 100644 --- a/asm/nonmatchings/code_389850/func_E00863B4.s +++ b/asm/nonmatchings/code_389850/func_E00863B4.s @@ -21,7 +21,7 @@ glabel func_E00863B4 /* 389C44 E00863F4 44810000 */ mtc1 $at, $f0 /* 389C48 E00863F8 C6820038 */ lwc1 $f2, 0x38($s4) /* 389C4C E00863FC 46001502 */ mul.s $f20, $f2, $f0 -/* 389C50 E0086400 00000000 */ nop +/* 389C50 E0086400 00000000 */ nop /* 389C54 E0086404 4600A10D */ trunc.w.s $f4, $f20 /* 389C58 E0086408 E7A400A4 */ swc1 $f4, 0xa4($sp) /* 389C5C E008640C 8FA900A4 */ lw $t1, 0xa4($sp) @@ -31,8 +31,8 @@ glabel func_E00863B4 /* 389C6C E008641C 10400191 */ beqz $v0, .LE0086A64 /* 389C70 E0086420 3C08DB06 */ lui $t0, 0xdb06 /* 389C74 E0086424 35080024 */ ori $t0, $t0, 0x24 -/* 389C78 E0086428 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 389C7C E008642C 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 389C78 E0086428 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 389C7C E008642C 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 389C80 E0086430 3C02E700 */ lui $v0, 0xe700 /* 389C84 E0086434 8E260000 */ lw $a2, ($s1) /* 389C88 E0086438 44800000 */ mtc1 $zero, $f0 @@ -79,10 +79,10 @@ glabel func_E00863B4 /* 389D2C E00864DC 0C080180 */ jal func_E0200600 /* 389D30 E00864E0 E7A0001C */ swc1 $f0, 0x1c($sp) /* 389D34 E00864E4 27A40020 */ addiu $a0, $sp, 0x20 -/* 389D38 E00864E8 3C108007 */ lui $s0, %hi(D_800741F0) -/* 389D3C E00864EC 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 389D40 E00864F0 3C12800A */ lui $s2, %hi(D_8009A674) -/* 389D44 E00864F4 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 389D38 E00864E8 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 389D3C E00864EC 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 389D40 E00864F0 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 389D44 E00864F4 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 389D48 E00864F8 96050000 */ lhu $a1, ($s0) /* 389D4C E00864FC 8E420000 */ lw $v0, ($s2) /* 389D50 E0086500 00052980 */ sll $a1, $a1, 6 @@ -106,7 +106,7 @@ glabel func_E00863B4 /* 389D98 E0086548 3063FFFF */ andi $v1, $v1, 0xffff /* 389D9C E008654C 00031980 */ sll $v1, $v1, 6 /* 389DA0 E0086550 46020002 */ mul.s $f0, $f0, $f2 -/* 389DA4 E0086554 00000000 */ nop +/* 389DA4 E0086554 00000000 */ nop /* 389DA8 E0086558 8E420000 */ lw $v0, ($s2) /* 389DAC E008655C 00731821 */ addu $v1, $v1, $s3 /* 389DB0 E0086560 00431021 */ addu $v0, $v0, $v1 @@ -126,7 +126,7 @@ glabel func_E00863B4 /* 389DE8 E0086598 12A20028 */ beq $s5, $v0, .LE008663C /* 389DEC E008659C 32C20001 */ andi $v0, $s6, 1 /* 389DF0 E00865A0 0802199A */ j .LE0086668 -/* 389DF4 E00865A4 00000000 */ nop +/* 389DF4 E00865A4 00000000 */ nop .LE00865A8: /* 389DF8 E00865A8 26C3FFFF */ addiu $v1, $s6, -1 /* 389DFC E00865AC 2862000D */ slti $v0, $v1, 0xd @@ -140,15 +140,15 @@ glabel func_E00863B4 /* 389E18 E00865C8 00430018 */ mult $v0, $v1 /* 389E1C E00865CC 00003812 */ mflo $a3 /* 389E20 E00865D0 9282003E */ lbu $v0, 0x3e($s4) -/* 389E24 E00865D4 00000000 */ nop +/* 389E24 E00865D4 00000000 */ nop /* 389E28 E00865D8 00430018 */ mult $v0, $v1 /* 389E2C E00865DC 00003012 */ mflo $a2 /* 389E30 E00865E0 9282003F */ lbu $v0, 0x3f($s4) -/* 389E34 E00865E4 00000000 */ nop +/* 389E34 E00865E4 00000000 */ nop /* 389E38 E00865E8 00430018 */ mult $v0, $v1 /* 389E3C E00865EC 00002812 */ mflo $a1 /* 389E40 E00865F0 92820040 */ lbu $v0, 0x40($s4) -/* 389E44 E00865F4 00000000 */ nop +/* 389E44 E00865F4 00000000 */ nop /* 389E48 E00865F8 00430018 */ mult $v0, $v1 /* 389E4C E00865FC 9289003C */ lbu $t1, 0x3c($s4) /* 389E50 E0086600 00073A03 */ sra $a3, $a3, 8 @@ -191,8 +191,8 @@ glabel func_E00863B4 /* 389EDC E008668C 92890041 */ lbu $t1, 0x41($s4) /* 389EE0 E0086690 AFA900B8 */ sw $t1, 0xb8($sp) .LE0086694: -/* 389EE4 E0086694 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 389EE8 E0086698 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 389EE4 E0086694 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 389EE8 E0086698 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 389EEC E008669C 8C930000 */ lw $s3, ($a0) /* 389EF0 E00866A0 3C02DE00 */ lui $v0, 0xde00 /* 389EF4 E00866A4 AE620008 */ sw $v0, 8($s3) @@ -221,8 +221,8 @@ glabel func_E00863B4 /* 389F4C E00866FC 10400063 */ beqz $v0, .LE008688C /* 389F50 E0086700 0080A82D */ daddu $s5, $a0, $zero /* 389F54 E0086704 27B10060 */ addiu $s1, $sp, 0x60 -/* 389F58 E0086708 3C178007 */ lui $s7, %hi(D_800741F0) -/* 389F5C E008670C 26F741F0 */ addiu $s7, $s7, %lo(D_800741F0) +/* 389F58 E0086708 3C178007 */ lui $s7, %hi(gMatrixListPos) +/* 389F5C E008670C 26F741F0 */ addiu $s7, $s7, %lo(gMatrixListPos) /* 389F60 E0086710 3C160001 */ lui $s6, 1 /* 389F64 E0086714 36D61630 */ ori $s6, $s6, 0x1630 /* 389F68 E0086718 3C03E008 */ lui $v1, %hi(D_E0086AA0) @@ -278,8 +278,8 @@ glabel func_E00863B4 /* 38A02C E00867DC 00A0302D */ daddu $a2, $a1, $zero /* 38A030 E00867E0 27A40020 */ addiu $a0, $sp, 0x20 /* 38A034 E00867E4 96E50000 */ lhu $a1, ($s7) -/* 38A038 E00867E8 3C02800A */ lui $v0, %hi(D_8009A674) -/* 38A03C E00867EC 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 38A038 E00867E8 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 38A03C E00867EC 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 38A040 E00867F0 00052980 */ sll $a1, $a1, 6 /* 38A044 E00867F4 00B62821 */ addu $a1, $a1, $s6 /* 38A048 E00867F8 0C080118 */ jal func_E0200460 @@ -296,8 +296,8 @@ glabel func_E00863B4 /* 38A074 E0086824 3042FFFF */ andi $v0, $v0, 0xffff /* 38A078 E0086828 00021180 */ sll $v0, $v0, 6 /* 38A07C E008682C A6E30000 */ sh $v1, ($s7) -/* 38A080 E0086830 3C03800A */ lui $v1, %hi(D_8009A674) -/* 38A084 E0086834 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 38A080 E0086830 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 38A084 E0086834 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 38A088 E0086838 00561021 */ addu $v0, $v0, $s6 /* 38A08C E008683C 00621821 */ addu $v1, $v1, $v0 /* 38A090 E0086840 ACA30004 */ sw $v1, 4($a1) @@ -323,8 +323,8 @@ glabel func_E00863B4 /* 38A0DC E008688C 27A40020 */ addiu $a0, $sp, 0x20 /* 38A0E0 E0086890 3C150001 */ lui $s5, 1 /* 38A0E4 E0086894 36B51630 */ ori $s5, $s5, 0x1630 -/* 38A0E8 E0086898 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 38A0EC E008689C 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 38A0E8 E0086898 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 38A0EC E008689C 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 38A0F0 E00868A0 3C02DF00 */ lui $v0, 0xdf00 /* 38A0F4 E00868A4 3C14DE00 */ lui $s4, 0xde00 /* 38A0F8 E00868A8 8E080000 */ lw $t0, ($s0) @@ -384,10 +384,10 @@ glabel func_E00863B4 /* 38A1D0 E0086980 0C080104 */ jal func_E0200410 /* 38A1D4 E0086984 AFA60010 */ sw $a2, 0x10($sp) /* 38A1D8 E0086988 27A40020 */ addiu $a0, $sp, 0x20 -/* 38A1DC E008698C 3C118007 */ lui $s1, %hi(D_800741F0) -/* 38A1E0 E0086990 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 38A1E4 E0086994 3C12800A */ lui $s2, %hi(D_8009A674) -/* 38A1E8 E0086998 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 38A1DC E008698C 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 38A1E0 E0086990 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 38A1E4 E0086994 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 38A1E8 E0086998 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 38A1EC E008699C 96250000 */ lhu $a1, ($s1) /* 38A1F0 E00869A0 8E420000 */ lw $v0, ($s2) /* 38A1F4 E00869A4 00052980 */ sll $a1, $a1, 6 @@ -453,4 +453,4 @@ glabel func_E00863B4 /* 38A2E0 E0086A90 D7B400F0 */ ldc1 $f20, 0xf0($sp) /* 38A2E4 E0086A94 03E00008 */ jr $ra /* 38A2E8 E0086A98 27BD0100 */ addiu $sp, $sp, 0x100 -/* 38A2EC E0086A9C 00000000 */ nop +/* 38A2EC E0086A9C 00000000 */ nop diff --git a/asm/nonmatchings/code_38ADF0/func_E00887E0.s b/asm/nonmatchings/code_38ADF0/func_E00887E0.s index e31ec86bc9..56c420bcf0 100644 --- a/asm/nonmatchings/code_38ADF0/func_E00887E0.s +++ b/asm/nonmatchings/code_38ADF0/func_E00887E0.s @@ -10,8 +10,8 @@ glabel func_E00887E0 /* 38B5E4 E00887F4 AFB200B0 */ sw $s2, 0xb0($sp) /* 38B5E8 E00887F8 3C120001 */ lui $s2, 1 /* 38B5EC E00887FC AFB500BC */ sw $s5, 0xbc($sp) -/* 38B5F0 E0088800 3C15800A */ lui $s5, %hi(D_8009A66C) -/* 38B5F4 E0088804 26B5A66C */ addiu $s5, $s5, %lo(D_8009A66C) +/* 38B5F0 E0088800 3C15800A */ lui $s5, %hi(gMasterGfxPos) +/* 38B5F4 E0088804 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) /* 38B5F8 E0088808 AFBF00CC */ sw $ra, 0xcc($sp) /* 38B5FC E008880C AFBE00C8 */ sw $fp, 0xc8($sp) /* 38B600 E0088810 AFB700C4 */ sw $s7, 0xc4($sp) @@ -86,10 +86,10 @@ glabel func_E00887E0 /* 38B714 E0088924 0C080114 */ jal func_E0200450 /* 38B718 E0088928 00A0302D */ daddu $a2, $a1, $zero /* 38B71C E008892C 27A40018 */ addiu $a0, $sp, 0x18 -/* 38B720 E0088930 3C108007 */ lui $s0, %hi(D_800741F0) -/* 38B724 E0088934 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 38B728 E0088938 3C11800A */ lui $s1, %hi(D_8009A674) -/* 38B72C E008893C 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 38B720 E0088930 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 38B724 E0088934 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 38B728 E0088938 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 38B72C E008893C 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 38B730 E0088940 96050000 */ lhu $a1, ($s0) /* 38B734 E0088944 8E220000 */ lw $v0, ($s1) /* 38B738 E0088948 00052980 */ sll $a1, $a1, 6 @@ -155,10 +155,10 @@ glabel func_E00887E0 /* 38B824 E0088A34 0C080108 */ jal func_E0200420 /* 38B828 E0088A38 27A40018 */ addiu $a0, $sp, 0x18 /* 38B82C E0088A3C 27A40018 */ addiu $a0, $sp, 0x18 -/* 38B830 E0088A40 3C058007 */ lui $a1, %hi(D_800741F0) -/* 38B834 E0088A44 94A541F0 */ lhu $a1, %lo(D_800741F0)($a1) -/* 38B838 E0088A48 3C02800A */ lui $v0, %hi(D_8009A674) -/* 38B83C E0088A4C 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 38B830 E0088A40 3C058007 */ lui $a1, %hi(gMatrixListPos) +/* 38B834 E0088A44 94A541F0 */ lhu $a1, %lo(gMatrixListPos)($a1) +/* 38B838 E0088A48 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 38B83C E0088A4C 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 38B840 E0088A50 00052980 */ sll $a1, $a1, 6 /* 38B844 E0088A54 00B72821 */ addu $a1, $a1, $s7 /* 38B848 E0088A58 0C080118 */ jal func_E0200460 @@ -249,8 +249,8 @@ glabel func_E00887E0 /* 38B980 E0088B90 00431025 */ or $v0, $v0, $v1 /* 38B984 E0088B94 ACA20004 */ sw $v0, 4($a1) /* 38B988 E0088B98 24820008 */ addiu $v0, $a0, 8 -/* 38B98C E0088B9C 3C058007 */ lui $a1, %hi(D_800741F0) -/* 38B990 E0088BA0 24A541F0 */ addiu $a1, $a1, %lo(D_800741F0) +/* 38B98C E0088B9C 3C058007 */ lui $a1, %hi(gMatrixListPos) +/* 38B990 E0088BA0 24A541F0 */ addiu $a1, $a1, %lo(gMatrixListPos) /* 38B994 E0088BA4 AE220000 */ sw $v0, ($s1) /* 38B998 E0088BA8 94A20000 */ lhu $v0, ($a1) /* 38B99C E0088BAC 3C03DA38 */ lui $v1, 0xda38 @@ -259,8 +259,8 @@ glabel func_E00887E0 /* 38B9A8 E0088BB8 3042FFFF */ andi $v0, $v0, 0xffff /* 38B9AC E0088BBC 00021180 */ sll $v0, $v0, 6 /* 38B9B0 E0088BC0 A4A30000 */ sh $v1, ($a1) -/* 38B9B4 E0088BC4 3C03800A */ lui $v1, %hi(D_8009A674) -/* 38B9B8 E0088BC8 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 38B9B4 E0088BC4 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 38B9B8 E0088BC8 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 38B9BC E0088BCC 00571021 */ addu $v0, $v0, $s7 /* 38B9C0 E0088BD0 00621821 */ addu $v1, $v1, $v0 /* 38B9C4 E0088BD4 24820010 */ addiu $v0, $a0, 0x10 @@ -283,8 +283,8 @@ glabel func_E00887E0 /* 38BA04 E0088C14 26520034 */ addiu $s2, $s2, 0x34 .LE0088C18: /* 38BA08 E0088C18 3C06D838 */ lui $a2, 0xd838 -/* 38BA0C E0088C1C 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 38BA10 E0088C20 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 38BA0C E0088C1C 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 38BA10 E0088C20 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 38BA14 E0088C24 34C60002 */ ori $a2, $a2, 2 /* 38BA18 E0088C28 8CA30000 */ lw $v1, ($a1) /* 38BA1C E0088C2C 3C02DF00 */ lui $v0, 0xdf00 diff --git a/asm/nonmatchings/code_38C5F0/func_E008A728.s b/asm/nonmatchings/code_38C5F0/func_E008A728.s index 0e9bf6df29..6cd9f09709 100644 --- a/asm/nonmatchings/code_38C5F0/func_E008A728.s +++ b/asm/nonmatchings/code_38C5F0/func_E008A728.s @@ -47,8 +47,8 @@ glabel func_E008A728 /* 38CDBC E008A7CC 27A40018 */ addiu $a0, $sp, 0x18 /* 38CDC0 E008A7D0 3C100001 */ lui $s0, 1 /* 38CDC4 E008A7D4 36101630 */ ori $s0, $s0, 0x1630 -/* 38CDC8 E008A7D8 3C16800A */ lui $s6, %hi(D_8009A66C) -/* 38CDCC E008A7DC 26D6A66C */ addiu $s6, $s6, %lo(D_8009A66C) +/* 38CDC8 E008A7D8 3C16800A */ lui $s6, %hi(gMasterGfxPos) +/* 38CDCC E008A7DC 26D6A66C */ addiu $s6, $s6, %lo(gMasterGfxPos) /* 38CDD0 E008A7E0 3C02E700 */ lui $v0, 0xe700 /* 38CDD4 E008A7E4 8EC50000 */ lw $a1, ($s6) /* 38CDD8 E008A7E8 44800000 */ mtc1 $zero, $f0 @@ -99,10 +99,10 @@ glabel func_E008A728 /* 38CE8C E008A89C 0C080104 */ jal func_E0200410 /* 38CE90 E008A8A0 AFA60010 */ sw $a2, 0x10($sp) /* 38CE94 E008A8A4 27A40018 */ addiu $a0, $sp, 0x18 -/* 38CE98 E008A8A8 3C128007 */ lui $s2, %hi(D_800741F0) -/* 38CE9C E008A8AC 265241F0 */ addiu $s2, $s2, %lo(D_800741F0) -/* 38CEA0 E008A8B0 3C14800A */ lui $s4, %hi(D_8009A674) -/* 38CEA4 E008A8B4 2694A674 */ addiu $s4, $s4, %lo(D_8009A674) +/* 38CE98 E008A8A8 3C128007 */ lui $s2, %hi(gMatrixListPos) +/* 38CE9C E008A8AC 265241F0 */ addiu $s2, $s2, %lo(gMatrixListPos) +/* 38CEA0 E008A8B0 3C14800A */ lui $s4, %hi(gDisplayContext) +/* 38CEA4 E008A8B4 2694A674 */ addiu $s4, $s4, %lo(gDisplayContext) /* 38CEA8 E008A8B8 96450000 */ lhu $a1, ($s2) /* 38CEAC E008A8BC 8E820000 */ lw $v0, ($s4) /* 38CEB0 E008A8C0 00052980 */ sll $a1, $a1, 6 @@ -187,8 +187,8 @@ glabel func_E008A728 /* 38CFE4 E008A9F4 1440FFC7 */ bnez $v0, .LE008A914 /* 38CFE8 E008A9F8 26100034 */ addiu $s0, $s0, 0x34 .LE008A9FC: -/* 38CFEC E008A9FC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 38CFF0 E008AA00 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 38CFEC E008A9FC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 38CFF0 E008AA00 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 38CFF4 E008AA04 8C620000 */ lw $v0, ($v1) /* 38CFF8 E008AA08 0040202D */ daddu $a0, $v0, $zero /* 38CFFC E008AA0C 24420008 */ addiu $v0, $v0, 8 diff --git a/asm/nonmatchings/code_38DE00/func_E008C6FC.s b/asm/nonmatchings/code_38DE00/func_E008C6FC.s index 07906501d0..e4328ef37a 100644 --- a/asm/nonmatchings/code_38DE00/func_E008C6FC.s +++ b/asm/nonmatchings/code_38DE00/func_E008C6FC.s @@ -12,8 +12,8 @@ glabel func_E008C6FC /* 38E518 E008C718 3C100001 */ lui $s0, 1 /* 38E51C E008C71C 36101630 */ ori $s0, $s0, 0x1630 /* 38E520 E008C720 AFB300B4 */ sw $s3, 0xb4($sp) -/* 38E524 E008C724 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 38E528 E008C728 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 38E524 E008C724 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 38E528 E008C728 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 38E52C E008C72C AFBF00CC */ sw $ra, 0xcc($sp) /* 38E530 E008C730 AFB700C4 */ sw $s7, 0xc4($sp) /* 38E534 E008C734 AFB600C0 */ sw $s6, 0xc0($sp) @@ -85,10 +85,10 @@ glabel func_E008C6FC /* 38E63C E008C83C 0C080114 */ jal func_E0200450 /* 38E640 E008C840 00A0302D */ daddu $a2, $a1, $zero /* 38E644 E008C844 27A40020 */ addiu $a0, $sp, 0x20 -/* 38E648 E008C848 3C148007 */ lui $s4, %hi(D_800741F0) -/* 38E64C E008C84C 269441F0 */ addiu $s4, $s4, %lo(D_800741F0) -/* 38E650 E008C850 3C15800A */ lui $s5, %hi(D_8009A674) -/* 38E654 E008C854 26B5A674 */ addiu $s5, $s5, %lo(D_8009A674) +/* 38E648 E008C848 3C148007 */ lui $s4, %hi(gMatrixListPos) +/* 38E64C E008C84C 269441F0 */ addiu $s4, $s4, %lo(gMatrixListPos) +/* 38E650 E008C850 3C15800A */ lui $s5, %hi(gDisplayContext) +/* 38E654 E008C854 26B5A674 */ addiu $s5, $s5, %lo(gDisplayContext) /* 38E658 E008C858 96850000 */ lhu $a1, ($s4) /* 38E65C E008C85C 8EA20000 */ lw $v0, ($s5) /* 38E660 E008C860 00052980 */ sll $a1, $a1, 6 @@ -124,7 +124,7 @@ glabel func_E008C6FC .LE008C8D8: /* 38E6D8 E008C8D8 C600FFCE */ lwc1 $f0, -0x32($s0) /* 38E6DC E008C8DC 4600C002 */ mul.s $f0, $f24, $f0 -/* 38E6E0 E008C8E0 00000000 */ nop +/* 38E6E0 E008C8E0 00000000 */ nop /* 38E6E4 E008C8E4 4406A000 */ mfc1 $a2, $f20 /* 38E6E8 E008C8E8 E7A00010 */ swc1 $f0, 0x10($sp) /* 38E6EC E008C8EC C600FFC2 */ lwc1 $f0, -0x3e($s0) @@ -150,17 +150,17 @@ glabel func_E008C6FC /* 38E73C E008C93C 8FA800A0 */ lw $t0, 0xa0($sp) /* 38E740 E008C940 29020008 */ slti $v0, $t0, 8 /* 38E744 E008C944 1040000B */ beqz $v0, .LE008C974 -/* 38E748 E008C948 00000000 */ nop +/* 38E748 E008C948 00000000 */ nop /* 38E74C E008C94C 4616C001 */ sub.s $f0, $f24, $f22 /* 38E750 E008C950 461A0002 */ mul.s $f0, $f0, $f26 -/* 38E754 E008C954 00000000 */ nop +/* 38E754 E008C954 00000000 */ nop /* 38E758 E008C958 46160003 */ div.s $f0, $f0, $f22 /* 38E75C E008C95C 4600D001 */ sub.s $f0, $f26, $f0 /* 38E760 E008C960 4406A000 */ mfc1 $a2, $f20 /* 38E764 E008C964 4407A000 */ mfc1 $a3, $f20 /* 38E768 E008C968 44050000 */ mfc1 $a1, $f0 /* 38E76C E008C96C 08023260 */ j .LE008C980 -/* 38E770 E008C970 00000000 */ nop +/* 38E770 E008C970 00000000 */ nop .LE008C974: /* 38E774 E008C974 3C054000 */ lui $a1, 0x4000 /* 38E778 E008C978 4406A000 */ mfc1 $a2, $f20 @@ -233,8 +233,8 @@ glabel func_E008C6FC /* 38E880 E008CA80 AE640000 */ sw $a0, ($s3) .LE008CA84: /* 38E884 E008CA84 3C05D838 */ lui $a1, 0xd838 -/* 38E888 E008CA88 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 38E88C E008CA8C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 38E888 E008CA88 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 38E88C E008CA8C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 38E890 E008CA90 8C620000 */ lw $v0, ($v1) /* 38E894 E008CA94 34A50002 */ ori $a1, $a1, 2 /* 38E898 E008CA98 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_38EE60/func_E008E4E0.s b/asm/nonmatchings/code_38EE60/func_E008E4E0.s index 5d73b03c9c..fb59f8c806 100644 --- a/asm/nonmatchings/code_38EE60/func_E008E4E0.s +++ b/asm/nonmatchings/code_38EE60/func_E008E4E0.s @@ -11,8 +11,8 @@ glabel func_E008E4E0 /* 38F358 E008E4F8 3C110001 */ lui $s1, 1 /* 38F35C E008E4FC 36311630 */ ori $s1, $s1, 0x1630 /* 38F360 E008E500 AFB400E8 */ sw $s4, 0xe8($sp) -/* 38F364 E008E504 3C14800A */ lui $s4, %hi(D_8009A66C) -/* 38F368 E008E508 2694A66C */ addiu $s4, $s4, %lo(D_8009A66C) +/* 38F364 E008E504 3C14800A */ lui $s4, %hi(gMasterGfxPos) +/* 38F368 E008E508 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) /* 38F36C E008E50C 8FA90108 */ lw $t1, 0x108($sp) /* 38F370 E008E510 3C02E700 */ lui $v0, 0xe700 /* 38F374 E008E514 AFBF00FC */ sw $ra, 0xfc($sp) @@ -73,10 +73,10 @@ glabel func_E008E4E0 /* 38F450 E008E5F0 0C080114 */ jal func_E0200450 /* 38F454 E008E5F4 00A0302D */ daddu $a2, $a1, $zero /* 38F458 E008E5F8 27A40018 */ addiu $a0, $sp, 0x18 -/* 38F45C E008E5FC 3C108007 */ lui $s0, %hi(D_800741F0) -/* 38F460 E008E600 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 38F464 E008E604 3C16800A */ lui $s6, %hi(D_8009A674) -/* 38F468 E008E608 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) +/* 38F45C E008E5FC 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 38F460 E008E600 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 38F464 E008E604 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 38F468 E008E608 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) /* 38F46C E008E60C 96050000 */ lhu $a1, ($s0) /* 38F470 E008E610 8EC20000 */ lw $v0, ($s6) /* 38F474 E008E614 00052980 */ sll $a1, $a1, 6 @@ -141,11 +141,11 @@ glabel func_E008E4E0 .LE008E700: /* 38F560 E008E700 C6140018 */ lwc1 $f20, 0x18($s0) /* 38F564 E008E704 44800000 */ mtc1 $zero, $f0 -/* 38F568 E008E708 00000000 */ nop +/* 38F568 E008E708 00000000 */ nop /* 38F56C E008E70C 4600A032 */ c.eq.s $f20, $f0 -/* 38F570 E008E710 00000000 */ nop +/* 38F570 E008E710 00000000 */ nop /* 38F574 E008E714 4501003F */ bc1t .LE008E814 -/* 38F578 E008E718 00000000 */ nop +/* 38F578 E008E718 00000000 */ nop /* 38F57C E008E71C 8E220000 */ lw $v0, ($s1) /* 38F580 E008E720 0040182D */ daddu $v1, $v0, $zero /* 38F584 E008E724 24420008 */ addiu $v0, $v0, 8 @@ -217,8 +217,8 @@ glabel func_E008E4E0 /* 38F688 E008E828 26100048 */ addiu $s0, $s0, 0x48 .LE008E82C: /* 38F68C E008E82C 3C05D838 */ lui $a1, 0xd838 -/* 38F690 E008E830 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 38F694 E008E834 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 38F690 E008E830 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 38F694 E008E834 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 38F698 E008E838 8C620000 */ lw $v0, ($v1) /* 38F69C E008E83C 34A50002 */ ori $a1, $a1, 2 /* 38F6A0 E008E840 0040202D */ daddu $a0, $v0, $zero @@ -240,4 +240,4 @@ glabel func_E008E4E0 /* 38F6E0 E008E880 D7B40100 */ ldc1 $f20, 0x100($sp) /* 38F6E4 E008E884 03E00008 */ jr $ra /* 38F6E8 E008E888 27BD0108 */ addiu $sp, $sp, 0x108 -/* 38F6EC E008E88C 00000000 */ nop +/* 38F6EC E008E88C 00000000 */ nop diff --git a/asm/nonmatchings/code_38F900/func_E0090444.s b/asm/nonmatchings/code_38F900/func_E0090444.s index 88c6732907..fade004c45 100644 --- a/asm/nonmatchings/code_38F900/func_E0090444.s +++ b/asm/nonmatchings/code_38F900/func_E0090444.s @@ -21,8 +21,8 @@ glabel func_E0090444 /* 38FD84 E0090484 34840024 */ ori $a0, $a0, 0x24 /* 38FD88 E0090488 3C05E200 */ lui $a1, 0xe200 /* 38FD8C E009048C 34A51D00 */ ori $a1, $a1, 0x1d00 -/* 38FD90 E0090490 3C14800A */ lui $s4, %hi(D_8009A66C) -/* 38FD94 E0090494 2694A66C */ addiu $s4, $s4, %lo(D_8009A66C) +/* 38FD90 E0090490 3C14800A */ lui $s4, %hi(gMasterGfxPos) +/* 38FD94 E0090494 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) /* 38FD98 E0090498 240200C8 */ addiu $v0, $zero, 0xc8 /* 38FD9C E009049C 8E880000 */ lw $t0, ($s4) /* 38FDA0 E00904A0 00433023 */ subu $a2, $v0, $v1 @@ -101,10 +101,10 @@ glabel func_E0090444 /* 38FEC0 E00905C0 0C080114 */ jal func_E0200450 /* 38FEC4 E00905C4 00A0302D */ daddu $a2, $a1, $zero /* 38FEC8 E00905C8 27A40018 */ addiu $a0, $sp, 0x18 -/* 38FECC E00905CC 3C108007 */ lui $s0, %hi(D_800741F0) -/* 38FED0 E00905D0 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 38FED4 E00905D4 3C11800A */ lui $s1, %hi(D_8009A674) -/* 38FED8 E00905D8 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 38FECC E00905CC 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 38FED0 E00905D0 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 38FED4 E00905D4 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 38FED8 E00905D8 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 38FEDC E00905DC 96050000 */ lhu $a1, ($s0) /* 38FEE0 E00905E0 8E220000 */ lw $v0, ($s1) /* 38FEE4 E00905E4 00052980 */ sll $a1, $a1, 6 @@ -225,14 +225,14 @@ glabel func_E0090444 /* 3900AC E00907AC 44811000 */ mtc1 $at, $f2 /* 3900B0 E00907B0 25020030 */ addiu $v0, $t0, 0x30 /* 3900B4 E00907B4 46020002 */ mul.s $f0, $f0, $f2 -/* 3900B8 E00907B8 00000000 */ nop +/* 3900B8 E00907B8 00000000 */ nop /* 3900BC E00907BC AE820000 */ sw $v0, ($s4) /* 3900C0 E00907C0 25020040 */ addiu $v0, $t0, 0x40 /* 3900C4 E00907C4 AE830000 */ sw $v1, ($s4) /* 3900C8 E00907C8 AE820000 */ sw $v0, ($s4) /* 3900CC E00907CC 4600010D */ trunc.w.s $f4, $f0 /* 3900D0 E00907D0 44022000 */ mfc1 $v0, $f4 -/* 3900D4 E00907D4 00000000 */ nop +/* 3900D4 E00907D4 00000000 */ nop /* 3900D8 E00907D8 00021400 */ sll $v0, $v0, 0x10 /* 3900DC E00907DC 00021403 */ sra $v0, $v0, 0x10 /* 3900E0 E00907E0 18400006 */ blez $v0, .LE00907FC @@ -248,17 +248,17 @@ glabel func_E0090444 /* 390100 E0090800 C660000C */ lwc1 $f0, 0xc($s3) /* 390104 E0090804 3C014280 */ lui $at, 0x4280 /* 390108 E0090808 44811000 */ mtc1 $at, $f2 -/* 39010C E009080C 00000000 */ nop +/* 39010C E009080C 00000000 */ nop /* 390110 E0090810 46020000 */ add.s $f0, $f0, $f2 /* 390114 E0090814 3C014080 */ lui $at, 0x4080 /* 390118 E0090818 44811000 */ mtc1 $at, $f2 -/* 39011C E009081C 00000000 */ nop +/* 39011C E009081C 00000000 */ nop /* 390120 E0090820 46020002 */ mul.s $f0, $f0, $f2 -/* 390124 E0090824 00000000 */ nop +/* 390124 E0090824 00000000 */ nop /* 390128 E0090828 0040182D */ daddu $v1, $v0, $zero /* 39012C E009082C 4600010D */ trunc.w.s $f4, $f0 /* 390130 E0090830 44022000 */ mfc1 $v0, $f4 -/* 390134 E0090834 00000000 */ nop +/* 390134 E0090834 00000000 */ nop /* 390138 E0090838 00021400 */ sll $v0, $v0, 0x10 /* 39013C E009083C 00021403 */ sra $v0, $v0, 0x10 /* 390140 E0090840 18400002 */ blez $v0, .LE009084C @@ -268,10 +268,10 @@ glabel func_E0090444 /* 39014C E009084C AC830000 */ sw $v1, ($a0) /* 390150 E0090850 C6600008 */ lwc1 $f0, 8($s3) /* 390154 E0090854 46020002 */ mul.s $f0, $f0, $f2 -/* 390158 E0090858 00000000 */ nop +/* 390158 E0090858 00000000 */ nop /* 39015C E009085C 4600010D */ trunc.w.s $f4, $f0 /* 390160 E0090860 44022000 */ mfc1 $v0, $f4 -/* 390164 E0090864 00000000 */ nop +/* 390164 E0090864 00000000 */ nop /* 390168 E0090868 00021400 */ sll $v0, $v0, 0x10 /* 39016C E009086C 00021403 */ sra $v0, $v0, 0x10 /* 390170 E0090870 18400004 */ blez $v0, .LE0090884 @@ -285,21 +285,21 @@ glabel func_E0090444 /* 390188 E0090888 C660000C */ lwc1 $f0, 0xc($s3) /* 39018C E009088C 3C014080 */ lui $at, 0x4080 /* 390190 E0090890 44811000 */ mtc1 $at, $f2 -/* 390194 E0090894 00000000 */ nop +/* 390194 E0090894 00000000 */ nop /* 390198 E0090898 46020002 */ mul.s $f0, $f0, $f2 -/* 39019C E009089C 00000000 */ nop +/* 39019C E009089C 00000000 */ nop /* 3901A0 E00908A0 0040202D */ daddu $a0, $v0, $zero /* 3901A4 E00908A4 4600010D */ trunc.w.s $f4, $f0 /* 3901A8 E00908A8 44022000 */ mfc1 $v0, $f4 -/* 3901AC E00908AC 00000000 */ nop +/* 3901AC E00908AC 00000000 */ nop /* 3901B0 E00908B0 00021400 */ sll $v0, $v0, 0x10 /* 3901B4 E00908B4 00021403 */ sra $v0, $v0, 0x10 /* 3901B8 E00908B8 18400002 */ blez $v0, .LE00908C4 /* 3901BC E00908BC 30420FFF */ andi $v0, $v0, 0xfff /* 3901C0 E00908C0 00822025 */ or $a0, $a0, $v0 .LE00908C4: -/* 3901C4 E00908C4 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 3901C8 E00908C8 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 3901C4 E00908C4 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 3901C8 E00908C8 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 3901CC E00908CC 8CA30000 */ lw $v1, ($a1) /* 3901D0 E00908D0 3C02E100 */ lui $v0, 0xe100 /* 3901D4 E00908D4 ACC40000 */ sw $a0, ($a2) @@ -307,12 +307,12 @@ glabel func_E0090444 /* 3901DC E00908DC AC820000 */ sw $v0, ($a0) /* 3901E0 E00908E0 C6600008 */ lwc1 $f0, 8($s3) /* 3901E4 E00908E4 46020002 */ mul.s $f0, $f0, $f2 -/* 3901E8 E00908E8 00000000 */ nop +/* 3901E8 E00908E8 00000000 */ nop /* 3901EC E00908EC 24630008 */ addiu $v1, $v1, 8 /* 3901F0 E00908F0 24860004 */ addiu $a2, $a0, 4 /* 3901F4 E00908F4 4600010D */ trunc.w.s $f4, $f0 /* 3901F8 E00908F8 44022000 */ mfc1 $v0, $f4 -/* 3901FC E00908FC 00000000 */ nop +/* 3901FC E00908FC 00000000 */ nop /* 390200 E0090900 00021400 */ sll $v0, $v0, 0x10 /* 390204 E0090904 00021403 */ sra $v0, $v0, 0x10 /* 390208 E0090908 04410007 */ bgez $v0, .LE0090928 @@ -330,18 +330,18 @@ glabel func_E0090444 /* 39022C E009092C C660000C */ lwc1 $f0, 0xc($s3) /* 390230 E0090930 3C014080 */ lui $at, 0x4080 /* 390234 E0090934 44811000 */ mtc1 $at, $f2 -/* 390238 E0090938 00000000 */ nop +/* 390238 E0090938 00000000 */ nop /* 39023C E009093C 46020082 */ mul.s $f2, $f0, $f2 -/* 390240 E0090940 00000000 */ nop +/* 390240 E0090940 00000000 */ nop /* 390244 E0090944 44800000 */ mtc1 $zero, $f0 -/* 390248 E0090948 00000000 */ nop +/* 390248 E0090948 00000000 */ nop /* 39024C E009094C 4600103C */ c.lt.s $f2, $f0 -/* 390250 E0090950 00000000 */ nop +/* 390250 E0090950 00000000 */ nop /* 390254 E0090954 4500000E */ bc1f .LE0090990 /* 390258 E0090958 34830400 */ ori $v1, $a0, 0x400 /* 39025C E009095C 4600110D */ trunc.w.s $f4, $f2 /* 390260 E0090960 44022000 */ mfc1 $v0, $f4 -/* 390264 E0090964 00000000 */ nop +/* 390264 E0090964 00000000 */ nop /* 390268 E0090968 00021400 */ sll $v0, $v0, 0x10 /* 39026C E009096C 000211C3 */ sra $v0, $v0, 7 /* 390270 E0090970 00021023 */ negu $v0, $v0 @@ -355,8 +355,8 @@ glabel func_E0090444 /* 39028C E009098C 00821825 */ or $v1, $a0, $v0 .LE0090990: /* 390290 E0090990 3C050200 */ lui $a1, 0x200 -/* 390294 E0090994 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 390298 E0090998 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 390294 E0090994 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 390298 E0090998 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 39029C E009099C 8C820000 */ lw $v0, ($a0) /* 3902A0 E00909A0 34A5FE00 */ ori $a1, $a1, 0xfe00 /* 3902A4 E00909A4 ACC30000 */ sw $v1, ($a2) @@ -368,8 +368,8 @@ glabel func_E0090444 /* 3902BC E00909BC AC650004 */ sw $a1, 4($v1) .LE00909C0: /* 3902C0 E00909C0 3C06E200 */ lui $a2, 0xe200 -/* 3902C4 E00909C4 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 3902C8 E00909C8 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 3902C4 E00909C4 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 3902C8 E00909C8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 3902CC E00909CC 34C61D00 */ ori $a2, $a2, 0x1d00 /* 3902D0 E00909D0 8C820000 */ lw $v0, ($a0) /* 3902D4 E00909D4 3C05E700 */ lui $a1, 0xe700 @@ -397,6 +397,6 @@ glabel func_E0090444 /* 390328 E0090A28 D7B400B0 */ ldc1 $f20, 0xb0($sp) /* 39032C E0090A2C 03E00008 */ jr $ra /* 390330 E0090A30 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 390334 E0090A34 00000000 */ nop -/* 390338 E0090A38 00000000 */ nop -/* 39033C E0090A3C 00000000 */ nop +/* 390334 E0090A34 00000000 */ nop +/* 390338 E0090A38 00000000 */ nop +/* 39033C E0090A3C 00000000 */ nop diff --git a/asm/nonmatchings/code_391D30/func_E00922A0.s b/asm/nonmatchings/code_391D30/func_E00922A0.s index 051fdda945..abbaaae837 100644 --- a/asm/nonmatchings/code_391D30/func_E00922A0.s +++ b/asm/nonmatchings/code_391D30/func_E00922A0.s @@ -45,10 +45,10 @@ glabel func_E00922A0 /* 392070 E0092340 0C080104 */ jal func_E0200410 /* 392074 E0092344 AFA60010 */ sw $a2, 0x10($sp) /* 392078 E0092348 0200202D */ daddu $a0, $s0, $zero -/* 39207C E009234C 3C128007 */ lui $s2, %hi(D_800741F0) -/* 392080 E0092350 265241F0 */ addiu $s2, $s2, %lo(D_800741F0) -/* 392084 E0092354 3C16800A */ lui $s6, %hi(D_8009A674) -/* 392088 E0092358 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) +/* 39207C E009234C 3C128007 */ lui $s2, %hi(gMatrixListPos) +/* 392080 E0092350 265241F0 */ addiu $s2, $s2, %lo(gMatrixListPos) +/* 392084 E0092354 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 392088 E0092358 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) /* 39208C E009235C 96450000 */ lhu $a1, ($s2) /* 392090 E0092360 8EC20000 */ lw $v0, ($s6) /* 392094 E0092364 00052980 */ sll $a1, $a1, 6 @@ -57,8 +57,8 @@ glabel func_E00922A0 /* 3920A0 E0092370 00452821 */ addu $a1, $v0, $a1 /* 3920A4 E0092374 3C06DB06 */ lui $a2, 0xdb06 /* 3920A8 E0092378 34C60024 */ ori $a2, $a2, 0x24 -/* 3920AC E009237C 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 3920B0 E0092380 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 3920AC E009237C 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 3920B0 E0092380 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 3920B4 E0092384 27A40018 */ addiu $a0, $sp, 0x18 /* 3920B8 E0092388 8E050000 */ lw $a1, ($s0) /* 3920BC E009238C 96480000 */ lhu $t0, ($s2) @@ -143,7 +143,7 @@ glabel func_E00922A0 .LE00924C8: /* 3921F8 E00924C8 8E02001C */ lw $v0, 0x1c($s0) /* 3921FC E00924CC 14400049 */ bnez $v0, .LE00925F4 -/* 392200 E00924D0 00000000 */ nop +/* 392200 E00924D0 00000000 */ nop /* 392204 E00924D4 8E050004 */ lw $a1, 4($s0) /* 392208 E00924D8 8E060008 */ lw $a2, 8($s0) /* 39220C E00924DC 8E07000C */ lw $a3, 0xc($s0) @@ -151,7 +151,7 @@ glabel func_E00922A0 /* 392214 E00924E4 0C080108 */ jal func_E0200420 /* 392218 E00924E8 27A40018 */ addiu $a0, $sp, 0x18 /* 39221C E00924EC 4616A032 */ c.eq.s $f20, $f22 -/* 392220 E00924F0 00000000 */ nop +/* 392220 E00924F0 00000000 */ nop /* 392224 E00924F4 4501000B */ bc1t .LE0092524 /* 392228 E00924F8 27A40018 */ addiu $a0, $sp, 0x18 /* 39222C E00924FC 02A0202D */ daddu $a0, $s5, $zero @@ -226,8 +226,8 @@ glabel func_E00922A0 /* 392338 E0092608 26100024 */ addiu $s0, $s0, 0x24 .LE009260C: /* 39233C E009260C 3C03D838 */ lui $v1, 0xd838 -/* 392340 E0092610 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 392344 E0092614 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 392340 E0092610 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 392344 E0092614 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 392348 E0092618 8C820000 */ lw $v0, ($a0) /* 39234C E009261C 34630002 */ ori $v1, $v1, 2 /* 392350 E0092620 0040282D */ daddu $a1, $v0, $zero @@ -255,6 +255,6 @@ glabel func_E00922A0 /* 3923A8 E0092678 D7B40108 */ ldc1 $f20, 0x108($sp) /* 3923AC E009267C 03E00008 */ jr $ra /* 3923B0 E0092680 27BD0118 */ addiu $sp, $sp, 0x118 -/* 3923B4 E0092684 00000000 */ nop -/* 3923B8 E0092688 00000000 */ nop -/* 3923BC E009268C 00000000 */ nop +/* 3923B4 E0092684 00000000 */ nop +/* 3923B8 E0092688 00000000 */ nop +/* 3923BC E009268C 00000000 */ nop diff --git a/asm/nonmatchings/code_3928D0/func_E00942FC.s b/asm/nonmatchings/code_3928D0/func_E00942FC.s index cbc74c0403..d6a273668a 100644 --- a/asm/nonmatchings/code_3928D0/func_E00942FC.s +++ b/asm/nonmatchings/code_3928D0/func_E00942FC.s @@ -39,8 +39,8 @@ glabel func_E00942FC /* 392C54 E0094384 0C080104 */ jal func_E0200410 /* 392C58 E0094388 AFA60010 */ sw $a2, 0x10($sp) /* 392C5C E009438C 3C04DB06 */ lui $a0, 0xdb06 -/* 392C60 E0094390 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 392C64 E0094394 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 392C60 E0094390 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 392C64 E0094394 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 392C68 E0094398 34840024 */ ori $a0, $a0, 0x24 /* 392C6C E009439C 8E680000 */ lw $t0, ($s3) /* 392C70 E00943A0 3C02E700 */ lui $v0, 0xe700 @@ -67,10 +67,10 @@ glabel func_E00942FC /* 392CC4 E00943F4 0C080114 */ jal func_E0200450 /* 392CC8 E00943F8 00A0302D */ daddu $a2, $a1, $zero /* 392CCC E00943FC 27A40018 */ addiu $a0, $sp, 0x18 -/* 392CD0 E0094400 3C108007 */ lui $s0, %hi(D_800741F0) -/* 392CD4 E0094404 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 392CD8 E0094408 3C11800A */ lui $s1, %hi(D_8009A674) -/* 392CDC E009440C 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 392CD0 E0094400 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 392CD4 E0094404 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 392CD8 E0094408 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 392CDC E009440C 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 392CE0 E0094410 96050000 */ lhu $a1, ($s0) /* 392CE4 E0094414 8E220000 */ lw $v0, ($s1) /* 392CE8 E0094418 00052980 */ sll $a1, $a1, 6 @@ -195,9 +195,9 @@ glabel func_E00942FC /* 392EBC E00945EC 10400059 */ beqz $v0, .LE0094754 /* 392EC0 E00945F0 24020001 */ addiu $v0, $zero, 1 /* 392EC4 E00945F4 16A2000D */ bne $s5, $v0, .LE009462C -/* 392EC8 E00945F8 00000000 */ nop -/* 392ECC E00945FC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 392ED0 E0094600 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 392EC8 E00945F8 00000000 */ nop +/* 392ECC E00945FC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 392ED0 E0094600 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 392ED4 E0094604 8C620000 */ lw $v0, ($v1) /* 392ED8 E0094608 0040202D */ daddu $a0, $v0, $zero /* 392EDC E009460C 24420008 */ addiu $v0, $v0, 8 @@ -221,7 +221,7 @@ glabel func_E00942FC /* 392F20 E0094650 44801000 */ mtc1 $zero, $f2 /* 392F24 E0094654 46000021 */ cvt.d.s $f0, $f0 /* 392F28 E0094658 46220002 */ mul.d $f0, $f0, $f2 -/* 392F2C E009465C 00000000 */ nop +/* 392F2C E009465C 00000000 */ nop /* 392F30 E0094660 3C120001 */ lui $s2, 1 /* 392F34 E0094664 36521630 */ ori $s2, $s2, 0x1630 /* 392F38 E0094668 27B00058 */ addiu $s0, $sp, 0x58 @@ -236,10 +236,10 @@ glabel func_E00942FC /* 392F5C E009468C 0C080114 */ jal func_E0200450 /* 392F60 E0094690 00A0302D */ daddu $a2, $a1, $zero /* 392F64 E0094694 27A40018 */ addiu $a0, $sp, 0x18 -/* 392F68 E0094698 3C108007 */ lui $s0, %hi(D_800741F0) -/* 392F6C E009469C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 392F70 E00946A0 3C11800A */ lui $s1, %hi(D_8009A674) -/* 392F74 E00946A4 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 392F68 E0094698 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 392F6C E009469C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 392F70 E00946A0 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 392F74 E00946A4 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 392F78 E00946A8 96050000 */ lhu $a1, ($s0) /* 392F7C E00946AC 8E220000 */ lw $v0, ($s1) /* 392F80 E00946B0 00052980 */ sll $a1, $a1, 6 @@ -247,8 +247,8 @@ glabel func_E00942FC /* 392F88 E00946B8 0C080118 */ jal func_E0200460 /* 392F8C E00946BC 00452821 */ addu $a1, $v0, $a1 /* 392F90 E00946C0 3C07D838 */ lui $a3, 0xd838 -/* 392F94 E00946C4 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 392F98 E00946C8 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 392F94 E00946C4 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 392F98 E00946C8 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 392F9C E00946CC 8CA40000 */ lw $a0, ($a1) /* 392FA0 E00946D0 34E70002 */ ori $a3, $a3, 2 /* 392FA4 E00946D4 0080302D */ daddu $a2, $a0, $zero @@ -285,8 +285,8 @@ glabel func_E00942FC /* 393020 E0094750 AC820014 */ sw $v0, 0x14($a0) .LE0094754: /* 393024 E0094754 3C05D838 */ lui $a1, 0xd838 -/* 393028 E0094758 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 39302C E009475C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 393028 E0094758 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 39302C E009475C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 393030 E0094760 8C620000 */ lw $v0, ($v1) /* 393034 E0094764 34A50002 */ ori $a1, $a1, 2 /* 393038 E0094768 0040202D */ daddu $a0, $v0, $zero @@ -305,5 +305,5 @@ glabel func_E00942FC /* 39306C E009479C 8FB000D8 */ lw $s0, 0xd8($sp) /* 393070 E00947A0 03E00008 */ jr $ra /* 393074 E00947A4 27BD00F8 */ addiu $sp, $sp, 0xf8 -/* 393078 E00947A8 00000000 */ nop -/* 39307C E00947AC 00000000 */ nop +/* 393078 E00947A8 00000000 */ nop +/* 39307C E00947AC 00000000 */ nop diff --git a/asm/nonmatchings/code_394280/func_E00961BC.s b/asm/nonmatchings/code_394280/func_E00961BC.s index ee5c1cccfa..8153f51eb1 100644 --- a/asm/nonmatchings/code_394280/func_E00961BC.s +++ b/asm/nonmatchings/code_394280/func_E00961BC.s @@ -8,8 +8,8 @@ glabel func_E00961BC /* 394448 E00961C8 34A50024 */ ori $a1, $a1, 0x24 /* 39444C E00961CC 27A40018 */ addiu $a0, $sp, 0x18 /* 394450 E00961D0 AFB1009C */ sw $s1, 0x9c($sp) -/* 394454 E00961D4 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 394458 E00961D8 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 394454 E00961D4 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 394458 E00961D8 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 39445C E00961DC AFB400A8 */ sw $s4, 0xa8($sp) /* 394460 E00961E0 3C140001 */ lui $s4, 1 /* 394464 E00961E4 AFB500AC */ sw $s5, 0xac($sp) @@ -77,10 +77,10 @@ glabel func_E00961BC /* 39455C E00962DC 0C080114 */ jal func_E0200450 /* 394560 E00962E0 00A0302D */ daddu $a2, $a1, $zero /* 394564 E00962E4 27A40018 */ addiu $a0, $sp, 0x18 -/* 394568 E00962E8 3C108007 */ lui $s0, %hi(D_800741F0) -/* 39456C E00962EC 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 394570 E00962F0 3C12800A */ lui $s2, %hi(D_8009A674) -/* 394574 E00962F4 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 394568 E00962E8 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 39456C E00962EC 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 394570 E00962F0 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 394574 E00962F4 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 394578 E00962F8 96050000 */ lhu $a1, ($s0) /* 39457C E00962FC 8E420000 */ lw $v0, ($s2) /* 394580 E0096300 00052980 */ sll $a1, $a1, 6 @@ -138,4 +138,4 @@ glabel func_E00961BC /* 394650 E00963D0 D7B400B8 */ ldc1 $f20, 0xb8($sp) /* 394654 E00963D4 03E00008 */ jr $ra /* 394658 E00963D8 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 39465C E00963DC 00000000 */ nop +/* 39465C E00963DC 00000000 */ nop diff --git a/asm/nonmatchings/code_395BB0/func_E00982EC.s b/asm/nonmatchings/code_395BB0/func_E00982EC.s index c96edb3c0c..6160638926 100644 --- a/asm/nonmatchings/code_395BB0/func_E00982EC.s +++ b/asm/nonmatchings/code_395BB0/func_E00982EC.s @@ -5,8 +5,8 @@ glabel func_E00982EC /* 395E9C E00982EC 27BDFF80 */ addiu $sp, $sp, -0x80 /* 395EA0 E00982F0 3C05DB06 */ lui $a1, 0xdb06 /* 395EA4 E00982F4 AFB50074 */ sw $s5, 0x74($sp) -/* 395EA8 E00982F8 3C15800A */ lui $s5, %hi(D_8009A66C) -/* 395EAC E00982FC 26B5A66C */ addiu $s5, $s5, %lo(D_8009A66C) +/* 395EA8 E00982F8 3C15800A */ lui $s5, %hi(gMasterGfxPos) +/* 395EAC E00982FC 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) /* 395EB0 E0098300 34A50024 */ ori $a1, $a1, 0x24 /* 395EB4 E0098304 3C02E700 */ lui $v0, 0xe700 /* 395EB8 E0098308 AFBF0078 */ sw $ra, 0x78($sp) @@ -47,10 +47,10 @@ glabel func_E00982EC /* 395F44 E0098394 0C080180 */ jal func_E0200600 /* 395F48 E0098398 AEA80000 */ sw $t0, ($s5) /* 395F4C E009839C 27A40020 */ addiu $a0, $sp, 0x20 -/* 395F50 E00983A0 3C108007 */ lui $s0, %hi(D_800741F0) -/* 395F54 E00983A4 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 395F58 E00983A8 3C11800A */ lui $s1, %hi(D_8009A674) -/* 395F5C E00983AC 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 395F50 E00983A0 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 395F54 E00983A4 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 395F58 E00983A8 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 395F5C E00983AC 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 395F60 E00983B0 96050000 */ lhu $a1, ($s0) /* 395F64 E00983B4 8E220000 */ lw $v0, ($s1) /* 395F68 E00983B8 00052980 */ sll $a1, $a1, 6 @@ -98,8 +98,8 @@ glabel func_E00982EC /* 396008 E0098458 ACC40008 */ sw $a0, 8($a2) /* 39600C E009845C ACC3000C */ sw $v1, 0xc($a2) /* 396010 E0098460 3C07D838 */ lui $a3, 0xd838 -/* 396014 E0098464 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 396018 E0098468 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 396014 E0098464 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 396018 E0098468 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 39601C E009846C 34E70002 */ ori $a3, $a3, 2 /* 396020 E0098470 3C06DE00 */ lui $a2, 0xde00 /* 396024 E0098474 8CA40000 */ lw $a0, ($a1) @@ -138,6 +138,6 @@ glabel func_E00982EC /* 3960A8 E00984F8 8FB00060 */ lw $s0, 0x60($sp) /* 3960AC E00984FC 03E00008 */ jr $ra /* 3960B0 E0098500 27BD0080 */ addiu $sp, $sp, 0x80 -/* 3960B4 E0098504 00000000 */ nop -/* 3960B8 E0098508 00000000 */ nop -/* 3960BC E009850C 00000000 */ nop +/* 3960B4 E0098504 00000000 */ nop +/* 3960B8 E0098508 00000000 */ nop +/* 3960BC E009850C 00000000 */ nop diff --git a/asm/nonmatchings/code_3965B0/func_E009A3E0.s b/asm/nonmatchings/code_3965B0/func_E009A3E0.s index 383f2666a1..9968ed28d7 100644 --- a/asm/nonmatchings/code_3965B0/func_E009A3E0.s +++ b/asm/nonmatchings/code_3965B0/func_E009A3E0.s @@ -8,8 +8,8 @@ glabel func_E009A3E0 /* 39699C E009A3EC 354A0024 */ ori $t2, $t2, 0x24 /* 3969A0 E009A3F0 27A40020 */ addiu $a0, $sp, 0x20 /* 3969A4 E009A3F4 AFB200B0 */ sw $s2, 0xb0($sp) -/* 3969A8 E009A3F8 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 3969AC E009A3FC 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 3969A8 E009A3F8 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 3969AC E009A3FC 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 3969B0 E009A400 3C013C23 */ lui $at, 0x3c23 /* 3969B4 E009A404 3421D70A */ ori $at, $at, 0xd70a /* 3969B8 E009A408 44810000 */ mtc1 $at, $f0 @@ -55,11 +55,11 @@ glabel func_E009A3E0 /* 396A58 E009A4A8 E7A00010 */ swc1 $f0, 0x10($sp) /* 396A5C E009A4AC C6A00004 */ lwc1 $f0, 4($s5) /* 396A60 E009A4B0 46040002 */ mul.s $f0, $f0, $f4 -/* 396A64 E009A4B4 00000000 */ nop +/* 396A64 E009A4B4 00000000 */ nop /* 396A68 E009A4B8 E7A00014 */ swc1 $f0, 0x14($sp) /* 396A6C E009A4BC C6A00008 */ lwc1 $f0, 8($s5) /* 396A70 E009A4C0 46040002 */ mul.s $f0, $f0, $f4 -/* 396A74 E009A4C4 00000000 */ nop +/* 396A74 E009A4C4 00000000 */ nop /* 396A78 E009A4C8 3C140001 */ lui $s4, 1 /* 396A7C E009A4CC 36941630 */ ori $s4, $s4, 0x1630 /* 396A80 E009A4D0 27B00060 */ addiu $s0, $sp, 0x60 @@ -67,7 +67,7 @@ glabel func_E009A3E0 /* 396A88 E009A4D8 C6A0000C */ lwc1 $f0, 0xc($s5) /* 396A8C E009A4DC 44801000 */ mtc1 $zero, $f2 /* 396A90 E009A4E0 46040002 */ mul.s $f0, $f0, $f4 -/* 396A94 E009A4E4 00000000 */ nop +/* 396A94 E009A4E4 00000000 */ nop /* 396A98 E009A4E8 44051000 */ mfc1 $a1, $f2 /* 396A9C E009A4EC 0200202D */ daddu $a0, $s0, $zero /* 396AA0 E009A4F0 00A0302D */ daddu $a2, $a1, $zero @@ -79,10 +79,10 @@ glabel func_E009A3E0 /* 396AB8 E009A508 0C080114 */ jal func_E0200450 /* 396ABC E009A50C 00A0302D */ daddu $a2, $a1, $zero /* 396AC0 E009A510 27A40020 */ addiu $a0, $sp, 0x20 -/* 396AC4 E009A514 3C118007 */ lui $s1, %hi(D_800741F0) -/* 396AC8 E009A518 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 396ACC E009A51C 3C13800A */ lui $s3, %hi(D_8009A674) -/* 396AD0 E009A520 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* 396AC4 E009A514 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 396AC8 E009A518 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 396ACC E009A51C 3C13800A */ lui $s3, %hi(gDisplayContext) +/* 396AD0 E009A520 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* 396AD4 E009A524 96250000 */ lhu $a1, ($s1) /* 396AD8 E009A528 8E620000 */ lw $v0, ($s3) /* 396ADC E009A52C 00052980 */ sll $a1, $a1, 6 @@ -95,7 +95,7 @@ glabel func_E009A3E0 /* 396AF8 E009A548 00561023 */ subu $v0, $v0, $s6 /* 396AFC E009A54C 00021040 */ sll $v0, $v0, 1 /* 396B00 E009A550 4482A000 */ mtc1 $v0, $f20 -/* 396B04 E009A554 00000000 */ nop +/* 396B04 E009A554 00000000 */ nop /* 396B08 E009A558 4680A520 */ cvt.s.w $f20, $f20 /* 396B0C E009A55C 4600A306 */ mov.s $f12, $f20 /* 396B10 E009A560 8E500000 */ lw $s0, ($s2) @@ -122,45 +122,45 @@ glabel func_E009A3E0 /* 396B64 E009A5B4 46000506 */ mov.s $f20, $f0 /* 396B68 E009A5B8 3C0141C8 */ lui $at, 0x41c8 /* 396B6C E009A5BC 44811000 */ mtc1 $at, $f2 -/* 396B70 E009A5C0 00000000 */ nop +/* 396B70 E009A5C0 00000000 */ nop /* 396B74 E009A5C4 4602A502 */ mul.s $f20, $f20, $f2 -/* 396B78 E009A5C8 00000000 */ nop +/* 396B78 E009A5C8 00000000 */ nop /* 396B7C E009A5CC 3C014361 */ lui $at, 0x4361 /* 396B80 E009A5D0 44811000 */ mtc1 $at, $f2 /* 396B84 E009A5D4 46000106 */ mov.s $f4, $f0 /* 396B88 E009A5D8 4602A500 */ add.s $f20, $f20, $f2 /* 396B8C E009A5DC 3C014F00 */ lui $at, 0x4f00 /* 396B90 E009A5E0 44811000 */ mtc1 $at, $f2 -/* 396B94 E009A5E4 00000000 */ nop +/* 396B94 E009A5E4 00000000 */ nop /* 396B98 E009A5E8 4614103E */ c.le.s $f2, $f20 -/* 396B9C E009A5EC 00000000 */ nop +/* 396B9C E009A5EC 00000000 */ nop /* 396BA0 E009A5F0 45010005 */ bc1t .LE009A608 /* 396BA4 E009A5F4 26100004 */ addiu $s0, $s0, 4 /* 396BA8 E009A5F8 4600A18D */ trunc.w.s $f6, $f20 /* 396BAC E009A5FC 44023000 */ mfc1 $v0, $f6 /* 396BB0 E009A600 08026987 */ j .LE009A61C -/* 396BB4 E009A604 00000000 */ nop +/* 396BB4 E009A604 00000000 */ nop .LE009A608: /* 396BB8 E009A608 4602A001 */ sub.s $f0, $f20, $f2 /* 396BBC E009A60C 4600018D */ trunc.w.s $f6, $f0 /* 396BC0 E009A610 44023000 */ mfc1 $v0, $f6 -/* 396BC4 E009A614 00000000 */ nop +/* 396BC4 E009A614 00000000 */ nop /* 396BC8 E009A618 005E1025 */ or $v0, $v0, $fp .LE009A61C: /* 396BCC E009A61C 3C0141C8 */ lui $at, 0x41c8 /* 396BD0 E009A620 44810000 */ mtc1 $at, $f0 -/* 396BD4 E009A624 00000000 */ nop +/* 396BD4 E009A624 00000000 */ nop /* 396BD8 E009A628 46002002 */ mul.s $f0, $f4, $f0 -/* 396BDC E009A62C 00000000 */ nop +/* 396BDC E009A62C 00000000 */ nop /* 396BE0 E009A630 3C014361 */ lui $at, 0x4361 /* 396BE4 E009A634 44811000 */ mtc1 $at, $f2 -/* 396BE8 E009A638 00000000 */ nop +/* 396BE8 E009A638 00000000 */ nop /* 396BEC E009A63C 46020000 */ add.s $f0, $f0, $f2 /* 396BF0 E009A640 3C014F00 */ lui $at, 0x4f00 /* 396BF4 E009A644 44811000 */ mtc1 $at, $f2 -/* 396BF8 E009A648 00000000 */ nop +/* 396BF8 E009A648 00000000 */ nop /* 396BFC E009A64C 4600103E */ c.le.s $f2, $f0 -/* 396C00 E009A650 00000000 */ nop +/* 396C00 E009A650 00000000 */ nop /* 396C04 E009A654 45010005 */ bc1t .LE009A66C /* 396C08 E009A658 00022600 */ sll $a0, $v0, 0x18 /* 396C0C E009A65C 4600018D */ trunc.w.s $f6, $f0 @@ -172,7 +172,7 @@ glabel func_E009A3E0 /* 396C20 E009A670 3C028000 */ lui $v0, 0x8000 /* 396C24 E009A674 4600018D */ trunc.w.s $f6, $f0 /* 396C28 E009A678 44033000 */ mfc1 $v1, $f6 -/* 396C2C E009A67C 00000000 */ nop +/* 396C2C E009A67C 00000000 */ nop /* 396C30 E009A680 00621825 */ or $v1, $v1, $v0 /* 396C34 E009A684 306200FF */ andi $v0, $v1, 0xff .LE009A688: @@ -187,8 +187,8 @@ glabel func_E009A3E0 /* 396C58 E009A6A8 24020001 */ addiu $v0, $zero, 1 /* 396C5C E009A6AC 1462002F */ bne $v1, $v0, .LE009A76C /* 396C60 E009A6B0 3C088888 */ lui $t0, 0x8888 -/* 396C64 E009A6B4 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 396C68 E009A6B8 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 396C64 E009A6B4 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 396C68 E009A6B8 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 396C6C E009A6BC 35088889 */ ori $t0, $t0, 0x8889 /* 396C70 E009A6C0 3C06DE00 */ lui $a2, 0xde00 /* 396C74 E009A6C4 3C020900 */ lui $v0, 0x900 @@ -235,9 +235,9 @@ glabel func_E009A3E0 /* 396D18 E009A768 AC82000C */ sw $v0, 0xc($a0) .LE009A76C: /* 396D1C E009A76C 1860000D */ blez $v1, .LE009A7A4 -/* 396D20 E009A770 00000000 */ nop -/* 396D24 E009A774 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 396D28 E009A778 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 396D20 E009A770 00000000 */ nop +/* 396D24 E009A774 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 396D28 E009A778 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 396D2C E009A77C 8C620000 */ lw $v0, ($v1) /* 396D30 E009A780 0040202D */ daddu $a0, $v0, $zero /* 396D34 E009A784 24420008 */ addiu $v0, $v0, 8 @@ -249,8 +249,8 @@ glabel func_E009A3E0 /* 396D4C E009A79C 080269F4 */ j .LE009A7D0 /* 396D50 E009A7A0 AC820004 */ sw $v0, 4($a0) .LE009A7A4: -/* 396D54 E009A7A4 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 396D58 E009A7A8 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 396D54 E009A7A4 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 396D58 E009A7A8 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 396D5C E009A7AC 8C620000 */ lw $v0, ($v1) /* 396D60 E009A7B0 0040202D */ daddu $a0, $v0, $zero /* 396D64 E009A7B4 24420008 */ addiu $v0, $v0, 8 @@ -266,8 +266,8 @@ glabel func_E009A3E0 /* 396D88 E009A7D8 00161080 */ sll $v0, $s6, 2 /* 396D8C E009A7DC 00561021 */ addu $v0, $v0, $s6 /* 396D90 E009A7E0 00029840 */ sll $s3, $v0, 1 -/* 396D94 E009A7E4 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 396D98 E009A7E8 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 396D94 E009A7E4 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 396D98 E009A7E8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 396D9C E009A7EC 8C830000 */ lw $v1, ($a0) /* 396DA0 E009A7F0 0260A02D */ daddu $s4, $s3, $zero /* 396DA4 E009A7F4 24620008 */ addiu $v0, $v1, 8 @@ -281,20 +281,20 @@ glabel func_E009A3E0 /* 396DC0 E009A810 00128140 */ sll $s0, $s2, 5 /* 396DC4 E009A814 02971021 */ addu $v0, $s4, $s7 /* 396DC8 E009A818 44826000 */ mtc1 $v0, $f12 -/* 396DCC E009A81C 00000000 */ nop +/* 396DCC E009A81C 00000000 */ nop /* 396DD0 E009A820 46806320 */ cvt.s.w $f12, $f12 /* 396DD4 E009A824 0C080140 */ jal func_E0200500 /* 396DD8 E009A828 02D08021 */ addu $s0, $s6, $s0 /* 396DDC E009A82C 3C0143FA */ lui $at, 0x43fa /* 396DE0 E009A830 44811000 */ mtc1 $at, $f2 -/* 396DE4 E009A834 00000000 */ nop +/* 396DE4 E009A834 00000000 */ nop /* 396DE8 E009A838 46020002 */ mul.s $f0, $f0, $f2 -/* 396DEC E009A83C 00000000 */ nop +/* 396DEC E009A83C 00000000 */ nop /* 396DF0 E009A840 46160002 */ mul.s $f0, $f0, $f22 -/* 396DF4 E009A844 00000000 */ nop +/* 396DF4 E009A844 00000000 */ nop /* 396DF8 E009A848 02771021 */ addu $v0, $s3, $s7 /* 396DFC E009A84C 44826000 */ mtc1 $v0, $f12 -/* 396E00 E009A850 00000000 */ nop +/* 396E00 E009A850 00000000 */ nop /* 396E04 E009A854 46806320 */ cvt.s.w $f12, $f12 /* 396E08 E009A858 4600018D */ trunc.w.s $f6, $f0 /* 396E0C E009A85C 44113000 */ mfc1 $s1, $f6 @@ -304,20 +304,20 @@ glabel func_E009A3E0 /* 396E1C E009A86C 44811000 */ mtc1 $at, $f2 /* 396E20 E009A870 2694003C */ addiu $s4, $s4, 0x3c /* 396E24 E009A874 46020002 */ mul.s $f0, $f0, $f2 -/* 396E28 E009A878 00000000 */ nop +/* 396E28 E009A878 00000000 */ nop /* 396E2C E009A87C 001219C0 */ sll $v1, $s2, 7 /* 396E30 E009A880 26520001 */ addiu $s2, $s2, 1 /* 396E34 E009A884 2622F380 */ addiu $v0, $s1, -0xc80 /* 396E38 E009A888 26310C80 */ addiu $s1, $s1, 0xc80 /* 396E3C E009A88C 46160002 */ mul.s $f0, $f0, $f22 -/* 396E40 E009A890 00000000 */ nop +/* 396E40 E009A890 00000000 */ nop /* 396E44 E009A894 A6020000 */ sh $v0, ($s0) /* 396E48 E009A898 A6000004 */ sh $zero, 4($s0) /* 396E4C E009A89C A6000008 */ sh $zero, 8($s0) /* 396E50 E009A8A0 A603000A */ sh $v1, 0xa($s0) /* 396E54 E009A8A4 4600018D */ trunc.w.s $f6, $f0 /* 396E58 E009A8A8 44023000 */ mfc1 $v0, $f6 -/* 396E5C E009A8AC 00000000 */ nop +/* 396E5C E009A8AC 00000000 */ nop /* 396E60 E009A8B0 02A21021 */ addu $v0, $s5, $v0 /* 396E64 E009A8B4 A6020002 */ sh $v0, 2($s0) /* 396E68 E009A8B8 26100010 */ addiu $s0, $s0, 0x10 @@ -333,8 +333,8 @@ glabel func_E009A3E0 /* 396E90 E009A8E0 3C040102 */ lui $a0, 0x102 /* 396E94 E009A8E4 34840040 */ ori $a0, $a0, 0x40 /* 396E98 E009A8E8 0000902D */ daddu $s2, $zero, $zero -/* 396E9C E009A8EC 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 396EA0 E009A8F0 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 396E9C E009A8EC 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 396EA0 E009A8F0 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 396EA4 E009A8F4 0040482D */ daddu $t1, $v0, $zero /* 396EA8 E009A8F8 3C0B0600 */ lui $t3, 0x600 /* 396EAC E009A8FC 240A0001 */ addiu $t2, $zero, 1 @@ -378,7 +378,7 @@ glabel func_E009A3E0 /* 396F34 E009A984 AC820000 */ sw $v0, ($a0) .LE009A988: /* 396F38 E009A988 14A00003 */ bnez $a1, .LE009A998 -/* 396F3C E009A98C 00000000 */ nop +/* 396F3C E009A98C 00000000 */ nop /* 396F40 E009A990 08026A71 */ j .LE009A9C4 /* 396F44 E009A994 AC8D0004 */ sw $t5, 4($a0) .LE009A998: @@ -403,8 +403,8 @@ glabel func_E009A3E0 /* 396F88 E009A9D8 25080004 */ addiu $t0, $t0, 4 .LE009A9DC: /* 396F8C E009A9DC 3C03D838 */ lui $v1, 0xd838 -/* 396F90 E009A9E0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 396F94 E009A9E4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 396F90 E009A9E0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 396F94 E009A9E4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 396F98 E009A9E8 8C820000 */ lw $v0, ($a0) /* 396F9C E009A9EC 34630002 */ ori $v1, $v1, 2 /* 396FA0 E009A9F0 0040282D */ daddu $a1, $v0, $zero @@ -432,6 +432,6 @@ glabel func_E009A3E0 /* 396FF8 E009AA48 D7B400D0 */ ldc1 $f20, 0xd0($sp) /* 396FFC E009AA4C 03E00008 */ jr $ra /* 397000 E009AA50 27BD00E0 */ addiu $sp, $sp, 0xe0 -/* 397004 E009AA54 00000000 */ nop -/* 397008 E009AA58 00000000 */ nop -/* 39700C E009AA5C 00000000 */ nop +/* 397004 E009AA54 00000000 */ nop +/* 397008 E009AA58 00000000 */ nop +/* 39700C E009AA5C 00000000 */ nop diff --git a/asm/nonmatchings/code_3981F0/func_E009C220.s b/asm/nonmatchings/code_3981F0/func_E009C220.s index f3481ab78e..f3b52f99e0 100644 --- a/asm/nonmatchings/code_3981F0/func_E009C220.s +++ b/asm/nonmatchings/code_3981F0/func_E009C220.s @@ -8,8 +8,8 @@ glabel func_E009C220 /* 39841C E009C22C 34A50024 */ ori $a1, $a1, 0x24 /* 398420 E009C230 27A40018 */ addiu $a0, $sp, 0x18 /* 398424 E009C234 AFBE00C8 */ sw $fp, 0xc8($sp) -/* 398428 E009C238 3C1E800A */ lui $fp, %hi(D_8009A66C) -/* 39842C E009C23C 27DEA66C */ addiu $fp, $fp, %lo(D_8009A66C) +/* 398428 E009C238 3C1E800A */ lui $fp, %hi(gMasterGfxPos) +/* 39842C E009C23C 27DEA66C */ addiu $fp, $fp, %lo(gMasterGfxPos) /* 398430 E009C240 AFB500BC */ sw $s5, 0xbc($sp) /* 398434 E009C244 3C150001 */ lui $s5, 1 /* 398438 E009C248 AFBF00CC */ sw $ra, 0xcc($sp) @@ -72,10 +72,10 @@ glabel func_E009C220 /* 39851C E009C32C 0C080114 */ jal func_E0200450 /* 398520 E009C330 00A0302D */ daddu $a2, $a1, $zero /* 398524 E009C334 27A40018 */ addiu $a0, $sp, 0x18 -/* 398528 E009C338 3C168007 */ lui $s6, %hi(D_800741F0) -/* 39852C E009C33C 26D641F0 */ addiu $s6, $s6, %lo(D_800741F0) -/* 398530 E009C340 3C13800A */ lui $s3, %hi(D_8009A674) -/* 398534 E009C344 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* 398528 E009C338 3C168007 */ lui $s6, %hi(gMatrixListPos) +/* 39852C E009C33C 26D641F0 */ addiu $s6, $s6, %lo(gMatrixListPos) +/* 398530 E009C340 3C13800A */ lui $s3, %hi(gDisplayContext) +/* 398534 E009C344 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* 398538 E009C348 96C50000 */ lhu $a1, ($s6) /* 39853C E009C34C 8E620000 */ lw $v0, ($s3) /* 398540 E009C350 00052980 */ sll $a1, $a1, 6 @@ -160,7 +160,7 @@ glabel func_E009C220 /* 39867C E009C48C 00431023 */ subu $v0, $v0, $v1 /* 398680 E009C490 2442FF4C */ addiu $v0, $v0, -0xb4 /* 398684 E009C494 44821000 */ mtc1 $v0, $f2 -/* 398688 E009C498 00000000 */ nop +/* 398688 E009C498 00000000 */ nop /* 39868C E009C49C 468010A0 */ cvt.s.w $f2, $f2 /* 398690 E009C4A0 44051000 */ mfc1 $a1, $f2 /* 398694 E009C4A4 27A40018 */ addiu $a0, $sp, 0x18 @@ -250,7 +250,7 @@ glabel func_E009C220 /* 3987E4 E009C5F4 00431023 */ subu $v0, $v0, $v1 /* 3987E8 E009C5F8 02021023 */ subu $v0, $s0, $v0 /* 3987EC E009C5FC 44821000 */ mtc1 $v0, $f2 -/* 3987F0 E009C600 00000000 */ nop +/* 3987F0 E009C600 00000000 */ nop /* 3987F4 E009C604 468010A0 */ cvt.s.w $f2, $f2 /* 3987F8 E009C608 44051000 */ mfc1 $a1, $f2 /* 3987FC E009C60C 27A40018 */ addiu $a0, $sp, 0x18 @@ -312,7 +312,7 @@ glabel func_E009C220 /* 3988DC E009C6EC 00431023 */ subu $v0, $v0, $v1 /* 3988E0 E009C6F0 2442FFA6 */ addiu $v0, $v0, -0x5a /* 3988E4 E009C6F4 44821000 */ mtc1 $v0, $f2 -/* 3988E8 E009C6F8 00000000 */ nop +/* 3988E8 E009C6F8 00000000 */ nop /* 3988EC E009C6FC 468010A0 */ cvt.s.w $f2, $f2 /* 3988F0 E009C700 44051000 */ mfc1 $a1, $f2 /* 3988F4 E009C704 27A40018 */ addiu $a0, $sp, 0x18 @@ -412,7 +412,7 @@ glabel func_E009C220 /* 398A6C E009C87C 00431023 */ subu $v0, $v0, $v1 /* 398A70 E009C880 02028023 */ subu $s0, $s0, $v0 /* 398A74 E009C884 44901000 */ mtc1 $s0, $f2 -/* 398A78 E009C888 00000000 */ nop +/* 398A78 E009C888 00000000 */ nop /* 398A7C E009C88C 468010A0 */ cvt.s.w $f2, $f2 /* 398A80 E009C890 44051000 */ mfc1 $a1, $f2 /* 398A84 E009C894 27A40018 */ addiu $a0, $sp, 0x18 @@ -492,6 +492,6 @@ glabel func_E009C220 /* 398BA8 E009C9B8 D7B400D0 */ ldc1 $f20, 0xd0($sp) /* 398BAC E009C9BC 03E00008 */ jr $ra /* 398BB0 E009C9C0 27BD00E0 */ addiu $sp, $sp, 0xe0 -/* 398BB4 E009C9C4 00000000 */ nop -/* 398BB8 E009C9C8 00000000 */ nop -/* 398BBC E009C9CC 00000000 */ nop +/* 398BB4 E009C9C4 00000000 */ nop +/* 398BB8 E009C9C8 00000000 */ nop +/* 398BBC E009C9CC 00000000 */ nop diff --git a/asm/nonmatchings/code_39FF20/func_E009E424.s b/asm/nonmatchings/code_39FF20/func_E009E424.s index 0251e54887..e56e0e48b2 100644 --- a/asm/nonmatchings/code_39FF20/func_E009E424.s +++ b/asm/nonmatchings/code_39FF20/func_E009E424.s @@ -43,7 +43,7 @@ glabel func_E009E424 /* 3A03DC E009E4BC C7A000DC */ lwc1 $f0, 0xdc($sp) /* 3A03E0 E009E4C0 46800021 */ cvt.d.w $f0, $f0 /* 3A03E4 E009E4C4 46220002 */ mul.d $f0, $f0, $f2 -/* 3A03E8 E009E4C8 00000000 */ nop +/* 3A03E8 E009E4C8 00000000 */ nop /* 3A03EC E009E4CC 4620010D */ trunc.w.d $f4, $f0 /* 3A03F0 E009E4D0 E7A400DC */ swc1 $f4, 0xdc($sp) .LE009E4D4: @@ -51,8 +51,8 @@ glabel func_E009E424 /* 3A03F8 E009E4D8 34C60024 */ ori $a2, $a2, 0x24 /* 3A03FC E009E4DC 27A40018 */ addiu $a0, $sp, 0x18 /* 3A0400 E009E4E0 3C100001 */ lui $s0, 1 -/* 3A0404 E009E4E4 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 3A0408 E009E4E8 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 3A0404 E009E4E4 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 3A0408 E009E4E8 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 3A040C E009E4EC 8E250000 */ lw $a1, ($s1) /* 3A0410 E009E4F0 3C02E700 */ lui $v0, 0xe700 /* 3A0414 E009E4F4 00A0182D */ daddu $v1, $a1, $zero @@ -76,10 +76,10 @@ glabel func_E009E424 /* 3A045C E009E53C 0C080108 */ jal func_E0200420 /* 3A0460 E009E540 24170001 */ addiu $s7, $zero, 1 /* 3A0464 E009E544 27A40018 */ addiu $a0, $sp, 0x18 -/* 3A0468 E009E548 3C138007 */ lui $s3, %hi(D_800741F0) -/* 3A046C E009E54C 267341F0 */ addiu $s3, $s3, %lo(D_800741F0) -/* 3A0470 E009E550 3C15800A */ lui $s5, %hi(D_8009A674) -/* 3A0474 E009E554 26B5A674 */ addiu $s5, $s5, %lo(D_8009A674) +/* 3A0468 E009E548 3C138007 */ lui $s3, %hi(gMatrixListPos) +/* 3A046C E009E54C 267341F0 */ addiu $s3, $s3, %lo(gMatrixListPos) +/* 3A0470 E009E550 3C15800A */ lui $s5, %hi(gDisplayContext) +/* 3A0474 E009E554 26B5A674 */ addiu $s5, $s5, %lo(gDisplayContext) /* 3A0478 E009E558 96650000 */ lhu $a1, ($s3) /* 3A047C E009E55C 8EA20000 */ lw $v0, ($s5) /* 3A0480 E009E560 00052980 */ sll $a1, $a1, 6 @@ -101,7 +101,7 @@ glabel func_E009E424 /* 3A04C0 E009E5A0 4481C000 */ mtc1 $at, $f24 /* 3A04C4 E009E5A4 004D1021 */ addu $v0, $v0, $t5 /* 3A04C8 E009E5A8 44822000 */ mtc1 $v0, $f4 -/* 3A04CC E009E5AC 00000000 */ nop +/* 3A04CC E009E5AC 00000000 */ nop /* 3A04D0 E009E5B0 46802120 */ cvt.s.w $f4, $f4 /* 3A04D4 E009E5B4 0100482D */ daddu $t1, $t0, $zero /* 3A04D8 E009E5B8 44052000 */ mfc1 $a1, $f4 @@ -206,7 +206,7 @@ glabel func_E009E424 .LE009E744: /* 3A0664 E009E744 C634FFFC */ lwc1 $f20, -4($s1) /* 3A0668 E009E748 4616A032 */ c.eq.s $f20, $f22 -/* 3A066C E009E74C 00000000 */ nop +/* 3A066C E009E74C 00000000 */ nop /* 3A0670 E009E750 45030185 */ bc1tl .LE009ED68 /* 3A0674 E009E754 2694000A */ addiu $s4, $s4, 0xa /* 3A0678 E009E758 3C0AFCFF */ lui $t2, 0xfcff @@ -298,7 +298,7 @@ glabel func_E009E424 /* 3A07D0 E009E8B0 C6220000 */ lwc1 $f2, ($s1) /* 3A07D4 E009E8B4 3C0140A0 */ lui $at, 0x40a0 /* 3A07D8 E009E8B8 44810000 */ mtc1 $at, $f0 -/* 3A07DC E009E8BC 00000000 */ nop +/* 3A07DC E009E8BC 00000000 */ nop /* 3A07E0 E009E8C0 46001080 */ add.s $f2, $f2, $f0 /* 3A07E4 E009E8C4 4406B000 */ mfc1 $a2, $f22 /* 3A07E8 E009E8C8 4407B000 */ mfc1 $a3, $f22 @@ -414,7 +414,7 @@ glabel func_E009E424 /* 3A09A0 E009EA80 02821023 */ subu $v0, $s4, $v0 /* 3A09A4 E009EA84 004D1021 */ addu $v0, $v0, $t5 /* 3A09A8 E009EA88 44822000 */ mtc1 $v0, $f4 -/* 3A09AC E009EA8C 00000000 */ nop +/* 3A09AC E009EA8C 00000000 */ nop /* 3A09B0 E009EA90 46802120 */ cvt.s.w $f4, $f4 /* 3A09B4 E009EA94 44052000 */ mfc1 $a1, $f4 /* 3A09B8 E009EA98 0200202D */ daddu $a0, $s0, $zero @@ -439,11 +439,11 @@ glabel func_E009E424 /* 3A0A04 E009EAE4 D422EE30 */ ldc1 $f2, %lo(D_E009EE30)($at) /* 3A0A08 E009EAE8 46000021 */ cvt.d.s $f0, $f0 /* 3A0A0C E009EAEC 46220002 */ mul.d $f0, $f0, $f2 -/* 3A0A10 E009EAF0 00000000 */ nop +/* 3A0A10 E009EAF0 00000000 */ nop /* 3A0A14 E009EAF4 3C013FF0 */ lui $at, 0x3ff0 /* 3A0A18 E009EAF8 44811800 */ mtc1 $at, $f3 /* 3A0A1C E009EAFC 44801000 */ mtc1 $zero, $f2 -/* 3A0A20 E009EB00 00000000 */ nop +/* 3A0A20 E009EB00 00000000 */ nop /* 3A0A24 E009EB04 46220080 */ add.d $f2, $f0, $f2 /* 3A0A28 E009EB08 4620D001 */ sub.d $f0, $f26, $f0 /* 3A0A2C E009EB0C 4407C000 */ mfc1 $a3, $f24 @@ -523,7 +523,7 @@ glabel func_E009E424 /* 3A0B54 E009EC34 00021080 */ sll $v0, $v0, 2 /* 3A0B58 E009EC38 00571023 */ subu $v0, $v0, $s7 /* 3A0B5C E009EC3C 44822000 */ mtc1 $v0, $f4 -/* 3A0B60 E009EC40 00000000 */ nop +/* 3A0B60 E009EC40 00000000 */ nop /* 3A0B64 E009EC44 46802120 */ cvt.s.w $f4, $f4 /* 3A0B68 E009EC48 4406B000 */ mfc1 $a2, $f22 /* 3A0B6C E009EC4C 4407C000 */ mfc1 $a3, $f24 @@ -550,7 +550,7 @@ glabel func_E009E424 /* 3A0BC0 E009ECA0 D422EE38 */ ldc1 $f2, %lo(D_E009EE38)($at) /* 3A0BC4 E009ECA4 46000021 */ cvt.d.s $f0, $f0 /* 3A0BC8 E009ECA8 46220002 */ mul.d $f0, $f0, $f2 -/* 3A0BCC E009ECAC 00000000 */ nop +/* 3A0BCC E009ECAC 00000000 */ nop /* 3A0BD0 E009ECB0 463A0000 */ add.d $f0, $f0, $f26 /* 3A0BD4 E009ECB4 4406C000 */ mfc1 $a2, $f24 /* 3A0BD8 E009ECB8 4407C000 */ mfc1 $a3, $f24 @@ -606,8 +606,8 @@ glabel func_E009E424 /* 3A0C9C E009ED7C 26310034 */ addiu $s1, $s1, 0x34 .LE009ED80: /* 3A0CA0 E009ED80 3C05D838 */ lui $a1, 0xd838 -/* 3A0CA4 E009ED84 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 3A0CA8 E009ED88 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 3A0CA4 E009ED84 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 3A0CA8 E009ED88 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 3A0CAC E009ED8C 8C620000 */ lw $v0, ($v1) /* 3A0CB0 E009ED90 34A50002 */ ori $a1, $a1, 2 /* 3A0CB4 E009ED94 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_3A2290/func_E00A0000.s b/asm/nonmatchings/code_3A2290/func_E00A0000.s index 1acefb4285..d93775e2e1 100644 --- a/asm/nonmatchings/code_3A2290/func_E00A0000.s +++ b/asm/nonmatchings/code_3A2290/func_E00A0000.s @@ -17,8 +17,8 @@ glabel func_E00A0000 /* 3A22C0 E00A0030 AFA20014 */ sw $v0, 0x14($sp) /* 3A22C4 E00A0034 3C04DB06 */ lui $a0, 0xdb06 /* 3A22C8 E00A0038 34840024 */ ori $a0, $a0, 0x24 -/* 3A22CC E00A003C 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 3A22D0 E00A0040 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 3A22CC E00A003C 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 3A22D0 E00A0040 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 3A22D4 E00A0044 0040582D */ daddu $t3, $v0, $zero /* 3A22D8 E00A0048 8CC50000 */ lw $a1, ($a2) /* 3A22DC E00A004C 3C02E700 */ lui $v0, 0xe700 @@ -70,8 +70,8 @@ glabel func_E00A0000 /* 3A238C E00A00FC 35080130 */ ori $t0, $t0, 0x130 /* 3A2390 E00A0100 3C0A0400 */ lui $t2, 0x400 /* 3A2394 E00A0104 354A0400 */ ori $t2, $t2, 0x400 -/* 3A2398 E00A0108 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 3A239C E00A010C 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 3A2398 E00A0108 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 3A239C E00A010C 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 3A23A0 E00A0110 0160202D */ daddu $a0, $t3, $zero /* 3A23A4 E00A0114 8CA20000 */ lw $v0, ($a1) /* 3A23A8 E00A0118 3C03ED00 */ lui $v1, 0xed00 @@ -111,4 +111,4 @@ glabel func_E00A0000 /* 3A2430 E00A01A0 0000102D */ daddu $v0, $zero, $zero /* 3A2434 E00A01A4 03E00008 */ jr $ra /* 3A2438 E00A01A8 27BD0030 */ addiu $sp, $sp, 0x30 -/* 3A243C E00A01AC 00000000 */ nop +/* 3A243C E00A01AC 00000000 */ nop diff --git a/asm/nonmatchings/code_3A2990/func_E00A223C.s b/asm/nonmatchings/code_3A2990/func_E00A223C.s index 7e53715799..5fb4f82cf8 100644 --- a/asm/nonmatchings/code_3A2990/func_E00A223C.s +++ b/asm/nonmatchings/code_3A2990/func_E00A223C.s @@ -5,8 +5,8 @@ glabel func_E00A223C /* 3A2BCC E00A223C 27BDFF60 */ addiu $sp, $sp, -0xa0 /* 3A2BD0 E00A2240 3C07DB06 */ lui $a3, 0xdb06 /* 3A2BD4 E00A2244 34E70024 */ ori $a3, $a3, 0x24 -/* 3A2BD8 E00A2248 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 3A2BDC E00A224C 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 3A2BD8 E00A2248 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 3A2BDC E00A224C 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 3A2BE0 E00A2250 AFB00078 */ sw $s0, 0x78($sp) /* 3A2BE4 E00A2254 0040802D */ daddu $s0, $v0, $zero /* 3A2BE8 E00A2258 AFB60090 */ sw $s6, 0x90($sp) @@ -88,27 +88,27 @@ glabel func_E00A223C /* 3A2D0C E00A237C 10C0016B */ beqz $a2, .LE00A292C /* 3A2D10 E00A2380 E4440038 */ swc1 $f4, 0x38($v0) /* 3A2D14 E00A2384 44800000 */ mtc1 $zero, $f0 -/* 3A2D18 E00A2388 00000000 */ nop +/* 3A2D18 E00A2388 00000000 */ nop /* 3A2D1C E00A238C 4600103C */ c.lt.s $f2, $f0 -/* 3A2D20 E00A2390 00000000 */ nop +/* 3A2D20 E00A2390 00000000 */ nop /* 3A2D24 E00A2394 45030166 */ bc1tl .LE00A2930 /* 3A2D28 E00A2398 26F70004 */ addiu $s7, $s7, 4 /* 3A2D2C E00A239C 4600203C */ c.lt.s $f4, $f0 -/* 3A2D30 E00A23A0 00000000 */ nop +/* 3A2D30 E00A23A0 00000000 */ nop /* 3A2D34 E00A23A4 45030162 */ bc1tl .LE00A2930 /* 3A2D38 E00A23A8 26F70004 */ addiu $s7, $s7, 4 /* 3A2D3C E00A23AC 3C0143A0 */ lui $at, 0x43a0 /* 3A2D40 E00A23B0 44810000 */ mtc1 $at, $f0 -/* 3A2D44 E00A23B4 00000000 */ nop +/* 3A2D44 E00A23B4 00000000 */ nop /* 3A2D48 E00A23B8 4602003E */ c.le.s $f0, $f2 -/* 3A2D4C E00A23BC 00000000 */ nop +/* 3A2D4C E00A23BC 00000000 */ nop /* 3A2D50 E00A23C0 4503015B */ bc1tl .LE00A2930 /* 3A2D54 E00A23C4 26F70004 */ addiu $s7, $s7, 4 /* 3A2D58 E00A23C8 3C014370 */ lui $at, 0x4370 /* 3A2D5C E00A23CC 44810000 */ mtc1 $at, $f0 -/* 3A2D60 E00A23D0 00000000 */ nop +/* 3A2D60 E00A23D0 00000000 */ nop /* 3A2D64 E00A23D4 4604003E */ c.le.s $f0, $f4 -/* 3A2D68 E00A23D8 00000000 */ nop +/* 3A2D68 E00A23D8 00000000 */ nop /* 3A2D6C E00A23DC 45030154 */ bc1tl .LE00A2930 /* 3A2D70 E00A23E0 26F70004 */ addiu $s7, $s7, 4 /* 3A2D74 E00A23E4 3C02E00A */ lui $v0, %hi(D_E00A2A24) @@ -128,11 +128,11 @@ glabel func_E00A223C /* 3A2DAC E00A241C 00640018 */ mult $v1, $a0 /* 3A2DB0 E00A2420 00001812 */ mflo $v1 /* 3A2DB4 E00A2424 8E820060 */ lw $v0, 0x60($s4) -/* 3A2DB8 E00A2428 00000000 */ nop +/* 3A2DB8 E00A2428 00000000 */ nop /* 3A2DBC E00A242C 00440018 */ mult $v0, $a0 /* 3A2DC0 E00A2430 00003812 */ mflo $a3 /* 3A2DC4 E00A2434 8E820064 */ lw $v0, 0x64($s4) -/* 3A2DC8 E00A2438 00000000 */ nop +/* 3A2DC8 E00A2438 00000000 */ nop /* 3A2DCC E00A243C 00440018 */ mult $v0, $a0 /* 3A2DD0 E00A2440 00004812 */ mflo $t1 /* 3A2DD4 E00A2444 8E060000 */ lw $a2, ($s0) @@ -189,7 +189,7 @@ glabel func_E00A223C /* 3A2E94 E00A2504 00621825 */ or $v1, $v1, $v0 /* 3A2E98 E00A2508 C7A00048 */ lwc1 $f0, 0x48($sp) /* 3A2E9C E00A250C 44952000 */ mtc1 $s5, $f4 -/* 3A2EA0 E00A2510 00000000 */ nop +/* 3A2EA0 E00A2510 00000000 */ nop /* 3A2EA4 E00A2514 46802120 */ cvt.s.w $f4, $f4 /* 3A2EA8 E00A2518 ACC30004 */ sw $v1, 4($a2) /* 3A2EAC E00A251C 46040001 */ sub.s $f0, $f0, $f4 @@ -198,11 +198,11 @@ glabel func_E00A223C /* 3A2EB8 E00A2528 46041081 */ sub.s $f2, $f2, $f4 /* 3A2EBC E00A252C 4600018D */ trunc.w.s $f6, $f0 /* 3A2EC0 E00A2530 44133000 */ mfc1 $s3, $f6 -/* 3A2EC4 E00A2534 00000000 */ nop +/* 3A2EC4 E00A2534 00000000 */ nop /* 3A2EC8 E00A2538 02637021 */ addu $t6, $s3, $v1 /* 3A2ECC E00A253C 4600118D */ trunc.w.s $f6, $f2 /* 3A2ED0 E00A2540 44023000 */ mfc1 $v0, $f6 -/* 3A2ED4 E00A2544 00000000 */ nop +/* 3A2ED4 E00A2544 00000000 */ nop /* 3A2ED8 E00A2548 00432021 */ addu $a0, $v0, $v1 /* 3A2EDC E00A254C 06610002 */ bgez $s3, .LE00A2558 /* 3A2EE0 E00A2550 0040582D */ daddu $t3, $v0, $zero @@ -228,7 +228,7 @@ glabel func_E00A223C /* 3A2F1C E00A258C 16410004 */ bne $s2, $at, .LE00A25A0 /* 3A2F20 E00A2590 3C018000 */ lui $at, 0x8000 /* 3A2F24 E00A2594 14610002 */ bne $v1, $at, .LE00A25A0 -/* 3A2F28 E00A2598 00000000 */ nop +/* 3A2F28 E00A2598 00000000 */ nop /* 3A2F2C E00A259C 0006000D */ break 6 .LE00A25A0: /* 3A2F30 E00A25A0 00005012 */ mflo $t2 @@ -241,7 +241,7 @@ glabel func_E00A223C /* 3A2F48 E00A25B8 16410004 */ bne $s2, $at, .LE00A25CC /* 3A2F4C E00A25BC 3C018000 */ lui $at, 0x8000 /* 3A2F50 E00A25C0 14410002 */ bne $v0, $at, .LE00A25CC -/* 3A2F54 E00A25C4 00000000 */ nop +/* 3A2F54 E00A25C4 00000000 */ nop /* 3A2F58 E00A25C8 0006000D */ break 6 .LE00A25CC: /* 3A2F5C E00A25CC 0000B012 */ mflo $s6 @@ -265,7 +265,7 @@ glabel func_E00A223C /* 3A2FA0 E00A2610 000211C0 */ sll $v0, $v0, 7 /* 3A2FA4 E00A2614 8FB6005C */ lw $s6, 0x5c($sp) /* 3A2FA8 E00A2618 44932000 */ mtc1 $s3, $f4 -/* 3A2FAC E00A261C 00000000 */ nop +/* 3A2FAC E00A261C 00000000 */ nop /* 3A2FB0 E00A2620 46802120 */ cvt.s.w $f4, $f4 /* 3A2FB4 E00A2624 AFA20058 */ sw $v0, 0x58($sp) /* 3A2FB8 E00A2628 26C20007 */ addiu $v0, $s6, 7 @@ -292,7 +292,7 @@ glabel func_E00A223C /* 3A300C E00A267C C6200008 */ lwc1 $f0, 8($s1) /* 3A3010 E00A2680 03221025 */ or $v0, $t9, $v0 /* 3A3014 E00A2684 46002002 */ mul.s $f0, $f4, $f0 -/* 3A3018 E00A2688 00000000 */ nop +/* 3A3018 E00A2688 00000000 */ nop /* 3A301C E00A268C AFA20068 */ sw $v0, 0x68($sp) /* 3A3020 E00A2690 8E220014 */ lw $v0, 0x14($s1) /* 3A3024 E00A2694 8E050000 */ lw $a1, ($s0) @@ -306,22 +306,22 @@ glabel func_E00A223C /* 3A3044 E00A26B4 0000B012 */ mflo $s6 /* 3A3048 E00A26B8 C620000C */ lwc1 $f0, 0xc($s1) /* 3A304C E00A26BC 44961000 */ mtc1 $s6, $f2 -/* 3A3050 E00A26C0 00000000 */ nop +/* 3A3050 E00A26C0 00000000 */ nop /* 3A3054 E00A26C4 468010A0 */ cvt.s.w $f2, $f2 /* 3A3058 E00A26C8 46001082 */ mul.s $f2, $f2, $f0 -/* 3A305C E00A26CC 00000000 */ nop +/* 3A305C E00A26CC 00000000 */ nop /* 3A3060 E00A26D0 00021080 */ sll $v0, $v0, 2 /* 3A3064 E00A26D4 24A50008 */ addiu $a1, $a1, 8 /* 3A3068 E00A26D8 00042080 */ sll $a0, $a0, 2 /* 3A306C E00A26DC 44820000 */ mtc1 $v0, $f0 -/* 3A3070 E00A26E0 00000000 */ nop +/* 3A3070 E00A26E0 00000000 */ nop /* 3A3074 E00A26E4 46800020 */ cvt.s.w $f0, $f0 /* 3A3078 E00A26E8 46020001 */ sub.s $f0, $f0, $f2 /* 3A307C E00A26EC 30840FFF */ andi $a0, $a0, 0xfff /* 3A3080 E00A26F0 00042300 */ sll $a0, $a0, 0xc /* 3A3084 E00A26F4 4600018D */ trunc.w.s $f6, $f0 /* 3A3088 E00A26F8 44023000 */ mfc1 $v0, $f6 -/* 3A308C E00A26FC 00000000 */ nop +/* 3A308C E00A26FC 00000000 */ nop /* 3A3090 E00A2700 00021080 */ sll $v0, $v0, 2 /* 3A3094 E00A2704 30420FFF */ andi $v0, $v0, 0xfff /* 3A3098 E00A2708 3C16F200 */ lui $s6, 0xf200 @@ -333,7 +333,7 @@ glabel func_E00A223C /* 3A30B0 E00A2720 00021540 */ sll $v0, $v0, 0x15 /* 3A30B4 E00A2724 AFA20070 */ sw $v0, 0x70($sp) /* 3A30B8 E00A2728 46002102 */ mul.s $f4, $f4, $f0 -/* 3A30BC E00A272C 00000000 */ nop +/* 3A30BC E00A272C 00000000 */ nop /* 3A30C0 E00A2730 C6200000 */ lwc1 $f0, ($s1) /* 3A30C4 E00A2734 46800020 */ cvt.s.w $f0, $f0 /* 3A30C8 E00A2738 AE050000 */ sw $a1, ($s0) @@ -351,22 +351,22 @@ glabel func_E00A223C /* 3A30F8 E00A2768 0000B012 */ mflo $s6 /* 3A30FC E00A276C C620000C */ lwc1 $f0, 0xc($s1) /* 3A3100 E00A2770 44961000 */ mtc1 $s6, $f2 -/* 3A3104 E00A2774 00000000 */ nop +/* 3A3104 E00A2774 00000000 */ nop /* 3A3108 E00A2778 468010A0 */ cvt.s.w $f2, $f2 /* 3A310C E00A277C 46001082 */ mul.s $f2, $f2, $f0 -/* 3A3110 E00A2780 00000000 */ nop +/* 3A3110 E00A2780 00000000 */ nop /* 3A3114 E00A2784 00021080 */ sll $v0, $v0, 2 /* 3A3118 E00A2788 00441021 */ addu $v0, $v0, $a0 /* 3A311C E00A278C 00031880 */ sll $v1, $v1, 2 /* 3A3120 E00A2790 44820000 */ mtc1 $v0, $f0 -/* 3A3124 E00A2794 00000000 */ nop +/* 3A3124 E00A2794 00000000 */ nop /* 3A3128 E00A2798 46800020 */ cvt.s.w $f0, $f0 /* 3A312C E00A279C 46020001 */ sub.s $f0, $f0, $f2 /* 3A3130 E00A27A0 30630FFF */ andi $v1, $v1, 0xfff /* 3A3134 E00A27A4 00031B00 */ sll $v1, $v1, 0xc /* 3A3138 E00A27A8 4600018D */ trunc.w.s $f6, $f0 /* 3A313C E00A27AC 44023000 */ mfc1 $v0, $f6 -/* 3A3140 E00A27B0 00000000 */ nop +/* 3A3140 E00A27B0 00000000 */ nop /* 3A3144 E00A27B4 00021080 */ sll $v0, $v0, 2 /* 3A3148 E00A27B8 30420FFF */ andi $v0, $v0, 0xfff /* 3A314C E00A27BC 00621825 */ or $v1, $v1, $v0 @@ -505,4 +505,4 @@ glabel func_E00A223C /* 3A3350 E00A29C0 8FB00078 */ lw $s0, 0x78($sp) /* 3A3354 E00A29C4 03E00008 */ jr $ra /* 3A3358 E00A29C8 27BD00A0 */ addiu $sp, $sp, 0xa0 -/* 3A335C E00A29CC 00000000 */ nop +/* 3A335C E00A29CC 00000000 */ nop diff --git a/asm/nonmatchings/code_3A37E0/func_E00A4650.s b/asm/nonmatchings/code_3A37E0/func_E00A4650.s index 8570e9229e..84d47a6232 100644 --- a/asm/nonmatchings/code_3A37E0/func_E00A4650.s +++ b/asm/nonmatchings/code_3A37E0/func_E00A4650.s @@ -11,8 +11,8 @@ glabel func_E00A4650 /* 3A3E48 E00A4668 3C170001 */ lui $s7, 1 /* 3A3E4C E00A466C 3C0AE300 */ lui $t2, 0xe300 /* 3A3E50 E00A4670 AFB500B4 */ sw $s5, 0xb4($sp) -/* 3A3E54 E00A4674 3C15800A */ lui $s5, %hi(D_8009A66C) -/* 3A3E58 E00A4678 26B5A66C */ addiu $s5, $s5, %lo(D_8009A66C) +/* 3A3E54 E00A4674 3C15800A */ lui $s5, %hi(gMasterGfxPos) +/* 3A3E58 E00A4678 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) /* 3A3E5C E00A467C AFBF00C4 */ sw $ra, 0xc4($sp) /* 3A3E60 E00A4680 AFBE00C0 */ sw $fp, 0xc0($sp) /* 3A3E64 E00A4684 AFB600B8 */ sw $s6, 0xb8($sp) @@ -73,10 +73,10 @@ glabel func_E00A4650 /* 3A3F40 E00A4760 0C080114 */ jal func_E0200450 /* 3A3F44 E00A4764 00A0302D */ daddu $a2, $a1, $zero /* 3A3F48 E00A4768 27A40018 */ addiu $a0, $sp, 0x18 -/* 3A3F4C E00A476C 3C168007 */ lui $s6, %hi(D_800741F0) -/* 3A3F50 E00A4770 26D641F0 */ addiu $s6, $s6, %lo(D_800741F0) -/* 3A3F54 E00A4774 3C1E800A */ lui $fp, %hi(D_8009A674) -/* 3A3F58 E00A4778 27DEA674 */ addiu $fp, $fp, %lo(D_8009A674) +/* 3A3F4C E00A476C 3C168007 */ lui $s6, %hi(gMatrixListPos) +/* 3A3F50 E00A4770 26D641F0 */ addiu $s6, $s6, %lo(gMatrixListPos) +/* 3A3F54 E00A4774 3C1E800A */ lui $fp, %hi(gDisplayContext) +/* 3A3F58 E00A4778 27DEA674 */ addiu $fp, $fp, %lo(gDisplayContext) /* 3A3F5C E00A477C 96C50000 */ lhu $a1, ($s6) /* 3A3F60 E00A4780 8FC20000 */ lw $v0, ($fp) /* 3A3F64 E00A4784 00052980 */ sll $a1, $a1, 6 @@ -169,7 +169,7 @@ glabel func_E00A4650 /* 3A40C0 E00A48E0 000A1023 */ negu $v0, $t2 /* 3A40C4 E00A48E4 000210C0 */ sll $v0, $v0, 3 /* 3A40C8 E00A48E8 44820000 */ mtc1 $v0, $f0 -/* 3A40CC E00A48EC 00000000 */ nop +/* 3A40CC E00A48EC 00000000 */ nop /* 3A40D0 E00A48F0 46800020 */ cvt.s.w $f0, $f0 /* 3A40D4 E00A48F4 0100482D */ daddu $t1, $t0, $zero /* 3A40D8 E00A48F8 44050000 */ mfc1 $a1, $f0 @@ -258,8 +258,8 @@ glabel func_E00A4650 /* 3A421C E00A4A3C 3C06E300 */ lui $a2, 0xe300 /* 3A4220 E00A4A40 34C61A01 */ ori $a2, $a2, 0x1a01 /* 3A4224 E00A4A44 3C07D838 */ lui $a3, 0xd838 -/* 3A4228 E00A4A48 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 3A422C E00A4A4C 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 3A4228 E00A4A48 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 3A422C E00A4A4C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 3A4230 E00A4A50 8C830000 */ lw $v1, ($a0) /* 3A4234 E00A4A54 34E70002 */ ori $a3, $a3, 2 /* 3A4238 E00A4A58 0060282D */ daddu $a1, $v1, $zero diff --git a/asm/nonmatchings/code_3A5550/func_E00A63A4.s b/asm/nonmatchings/code_3A5550/func_E00A63A4.s index 663574e0bd..3de8ce0256 100644 --- a/asm/nonmatchings/code_3A5550/func_E00A63A4.s +++ b/asm/nonmatchings/code_3A5550/func_E00A63A4.s @@ -7,8 +7,8 @@ glabel func_E00A63A4 /* 3A58FC E00A63AC 3C05DB06 */ lui $a1, 0xdb06 /* 3A5900 E00A63B0 34A50024 */ ori $a1, $a1, 0x24 /* 3A5904 E00A63B4 AFB10094 */ sw $s1, 0x94($sp) -/* 3A5908 E00A63B8 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 3A590C E00A63BC 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 3A5908 E00A63B8 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 3A590C E00A63BC 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 3A5910 E00A63C0 27A40010 */ addiu $a0, $sp, 0x10 /* 3A5914 E00A63C4 AFB600A8 */ sw $s6, 0xa8($sp) /* 3A5918 E00A63C8 3C16E700 */ lui $s6, 0xe700 @@ -54,10 +54,10 @@ glabel func_E00A63A4 /* 3A59B8 E00A6468 0C080114 */ jal func_E0200450 /* 3A59BC E00A646C 00A0302D */ daddu $a2, $a1, $zero /* 3A59C0 E00A6470 27A40010 */ addiu $a0, $sp, 0x10 -/* 3A59C4 E00A6474 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3A59C8 E00A6478 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3A59CC E00A647C 3C13800A */ lui $s3, %hi(D_8009A674) -/* 3A59D0 E00A6480 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* 3A59C4 E00A6474 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3A59C8 E00A6478 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3A59CC E00A647C 3C13800A */ lui $s3, %hi(gDisplayContext) +/* 3A59D0 E00A6480 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* 3A59D4 E00A6484 96050000 */ lhu $a1, ($s0) /* 3A59D8 E00A6488 8E620000 */ lw $v0, ($s3) /* 3A59DC E00A648C 00052980 */ sll $a1, $a1, 6 @@ -112,13 +112,13 @@ glabel func_E00A63A4 /* 3A5AA0 E00A6550 AE220000 */ sw $v0, ($s1) /* 3A5AA4 E00A6554 24A20020 */ addiu $v0, $a1, 0x20 /* 3A5AA8 E00A6558 46041082 */ mul.s $f2, $f2, $f4 -/* 3A5AAC E00A655C 00000000 */ nop +/* 3A5AAC E00A655C 00000000 */ nop /* 3A5AB0 E00A6560 AE220000 */ sw $v0, ($s1) /* 3A5AB4 E00A6564 C6400020 */ lwc1 $f0, 0x20($s2) /* 3A5AB8 E00A6568 24A20028 */ addiu $v0, $a1, 0x28 /* 3A5ABC E00A656C AE220000 */ sw $v0, ($s1) /* 3A5AC0 E00A6570 46040002 */ mul.s $f0, $f0, $f4 -/* 3A5AC4 E00A6574 00000000 */ nop +/* 3A5AC4 E00A6574 00000000 */ nop /* 3A5AC8 E00A6578 24A20030 */ addiu $v0, $a1, 0x30 /* 3A5ACC E00A657C 3C04F200 */ lui $a0, 0xf200 /* 3A5AD0 E00A6580 AE220000 */ sw $v0, ($s1) @@ -142,13 +142,13 @@ glabel func_E00A63A4 /* 3A5B18 E00A65C8 C6420024 */ lwc1 $f2, 0x24($s2) /* 3A5B1C E00A65CC 24A20038 */ addiu $v0, $a1, 0x38 /* 3A5B20 E00A65D0 46041082 */ mul.s $f2, $f2, $f4 -/* 3A5B24 E00A65D4 00000000 */ nop +/* 3A5B24 E00A65D4 00000000 */ nop /* 3A5B28 E00A65D8 AE220000 */ sw $v0, ($s1) /* 3A5B2C E00A65DC C6400028 */ lwc1 $f0, 0x28($s2) /* 3A5B30 E00A65E0 24A20040 */ addiu $v0, $a1, 0x40 /* 3A5B34 E00A65E4 AE220000 */ sw $v0, ($s1) /* 3A5B38 E00A65E8 46040002 */ mul.s $f0, $f0, $f4 -/* 3A5B3C E00A65EC 00000000 */ nop +/* 3A5B3C E00A65EC 00000000 */ nop /* 3A5B40 E00A65F0 3C020900 */ lui $v0, 0x900 /* 3A5B44 E00A65F4 24421418 */ addiu $v0, $v0, 0x1418 /* 3A5B48 E00A65F8 ACA60030 */ sw $a2, 0x30($a1) diff --git a/asm/nonmatchings/code_3A70F0/func_E00A8320.s b/asm/nonmatchings/code_3A70F0/func_E00A8320.s index 3219374518..10ba53ce0d 100644 --- a/asm/nonmatchings/code_3A70F0/func_E00A8320.s +++ b/asm/nonmatchings/code_3A70F0/func_E00A8320.s @@ -12,19 +12,19 @@ glabel func_E00A8320 /* 3A742C E00A833C 36521630 */ ori $s2, $s2, 0x1630 /* 3A7430 E00A8340 AFB400A8 */ sw $s4, 0xa8($sp) /* 3A7434 E00A8344 0000A02D */ daddu $s4, $zero, $zero -/* 3A7438 E00A8348 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3A743C E00A834C 2442A674 */ addiu $v0, $v0, %lo(D_8009A674) +/* 3A7438 E00A8348 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3A743C E00A834C 2442A674 */ addiu $v0, $v0, %lo(gDisplayContext) /* 3A7440 E00A8350 AFBE00B8 */ sw $fp, 0xb8($sp) /* 3A7444 E00A8354 0040F02D */ daddu $fp, $v0, $zero -/* 3A7448 E00A8358 3C028007 */ lui $v0, %hi(D_800741F0) -/* 3A744C E00A835C 244241F0 */ addiu $v0, $v0, %lo(D_800741F0) +/* 3A7448 E00A8358 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* 3A744C E00A835C 244241F0 */ addiu $v0, $v0, %lo(gMatrixListPos) /* 3A7450 E00A8360 AFB600B0 */ sw $s6, 0xb0($sp) /* 3A7454 E00A8364 0040B02D */ daddu $s6, $v0, $zero /* 3A7458 E00A8368 AFB700B4 */ sw $s7, 0xb4($sp) /* 3A745C E00A836C 3C170001 */ lui $s7, 1 /* 3A7460 E00A8370 36F71630 */ ori $s7, $s7, 0x1630 -/* 3A7464 E00A8374 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 3A7468 E00A8378 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 3A7464 E00A8374 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 3A7468 E00A8378 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 3A746C E00A837C AFB500AC */ sw $s5, 0xac($sp) /* 3A7470 E00A8380 0040A82D */ daddu $s5, $v0, $zero /* 3A7474 E00A8384 AFBF00BC */ sw $ra, 0xbc($sp) @@ -168,8 +168,8 @@ glabel func_E00A8320 /* 3A7698 E00A85A8 AC85000C */ sw $a1, 0xc($a0) /* 3A769C E00A85AC 1440FFD2 */ bnez $v0, .LE00A84F8 /* 3A76A0 E00A85B0 AC830004 */ sw $v1, 4($a0) -/* 3A76A4 E00A85B4 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 3A76A8 E00A85B8 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 3A76A4 E00A85B4 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 3A76A8 E00A85B8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 3A76AC E00A85BC 8C820000 */ lw $v0, ($a0) /* 3A76B0 E00A85C0 0040182D */ daddu $v1, $v0, $zero /* 3A76B4 E00A85C4 24420008 */ addiu $v0, $v0, 8 @@ -193,5 +193,5 @@ glabel func_E00A8320 /* 3A76FC E00A860C 8FB00098 */ lw $s0, 0x98($sp) /* 3A7700 E00A8610 03E00008 */ jr $ra /* 3A7704 E00A8614 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 3A7708 E00A8618 00000000 */ nop -/* 3A770C E00A861C 00000000 */ nop +/* 3A7708 E00A8618 00000000 */ nop +/* 3A770C E00A861C 00000000 */ nop diff --git a/asm/nonmatchings/code_3AA920/func_E00AA404.s b/asm/nonmatchings/code_3AA920/func_E00AA404.s index 53e31bbaf2..bc0420b343 100644 --- a/asm/nonmatchings/code_3AA920/func_E00AA404.s +++ b/asm/nonmatchings/code_3AA920/func_E00AA404.s @@ -5,8 +5,8 @@ glabel func_E00AA404 /* 3AAD24 E00AA404 27BDFF40 */ addiu $sp, $sp, -0xc0 /* 3AAD28 E00AA408 3C03DB06 */ lui $v1, 0xdb06 /* 3AAD2C E00AA40C AFB1009C */ sw $s1, 0x9c($sp) -/* 3AAD30 E00AA410 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 3AAD34 E00AA414 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 3AAD30 E00AA410 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 3AAD34 E00AA414 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 3AAD38 E00AA418 34630024 */ ori $v1, $v1, 0x24 /* 3AAD3C E00AA41C AFB700B4 */ sw $s7, 0xb4($sp) /* 3AAD40 E00AA420 3C17E700 */ lui $s7, 0xe700 @@ -42,10 +42,10 @@ glabel func_E00AA404 /* 3AADB8 E00AA498 3421999A */ ori $at, $at, 0x999a /* 3AADBC E00AA49C 44811000 */ mtc1 $at, $f2 /* 3AADC0 E00AA4A0 44820000 */ mtc1 $v0, $f0 -/* 3AADC4 E00AA4A4 00000000 */ nop +/* 3AADC4 E00AA4A4 00000000 */ nop /* 3AADC8 E00AA4A8 46800020 */ cvt.s.w $f0, $f0 /* 3AADCC E00AA4AC 46020002 */ mul.s $f0, $f0, $f2 -/* 3AADD0 E00AA4B0 00000000 */ nop +/* 3AADD0 E00AA4B0 00000000 */ nop /* 3AADD4 E00AA4B4 C6620010 */ lwc1 $f2, 0x10($s3) /* 3AADD8 E00AA4B8 46001080 */ add.s $f2, $f2, $f0 /* 3AADDC E00AA4BC 8E65000C */ lw $a1, 0xc($s3) @@ -80,10 +80,10 @@ glabel func_E00AA404 /* 3AAE50 E00AA530 0C080114 */ jal func_E0200450 /* 3AAE54 E00AA534 00A0302D */ daddu $a2, $a1, $zero /* 3AAE58 E00AA538 27A40018 */ addiu $a0, $sp, 0x18 -/* 3AAE5C E00AA53C 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3AAE60 E00AA540 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3AAE64 E00AA544 3C14800A */ lui $s4, %hi(D_8009A674) -/* 3AAE68 E00AA548 2694A674 */ addiu $s4, $s4, %lo(D_8009A674) +/* 3AAE5C E00AA53C 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3AAE60 E00AA540 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3AAE64 E00AA544 3C14800A */ lui $s4, %hi(gDisplayContext) +/* 3AAE68 E00AA548 2694A674 */ addiu $s4, $s4, %lo(gDisplayContext) /* 3AAE6C E00AA54C 96050000 */ lhu $a1, ($s0) /* 3AAE70 E00AA550 8E820000 */ lw $v0, ($s4) /* 3AAE74 E00AA554 00052980 */ sll $a1, $a1, 6 @@ -174,6 +174,6 @@ glabel func_E00AA404 /* 3AAFC8 E00AA6A8 8FB00098 */ lw $s0, 0x98($sp) /* 3AAFCC E00AA6AC 03E00008 */ jr $ra /* 3AAFD0 E00AA6B0 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 3AAFD4 E00AA6B4 00000000 */ nop -/* 3AAFD8 E00AA6B8 00000000 */ nop -/* 3AAFDC E00AA6BC 00000000 */ nop +/* 3AAFD4 E00AA6B4 00000000 */ nop +/* 3AAFD8 E00AA6B8 00000000 */ nop +/* 3AAFDC E00AA6BC 00000000 */ nop diff --git a/asm/nonmatchings/code_3AEE20/func_E00AC2A4.s b/asm/nonmatchings/code_3AEE20/func_E00AC2A4.s index 7be0770c4b..9875ad2602 100644 --- a/asm/nonmatchings/code_3AEE20/func_E00AC2A4.s +++ b/asm/nonmatchings/code_3AEE20/func_E00AC2A4.s @@ -21,17 +21,17 @@ glabel func_E00AC2A4 /* 3AF104 E00AC2E4 8E9E001C */ lw $fp, 0x1c($s4) /* 3AF108 E00AC2E8 8E970020 */ lw $s7, 0x20($s4) /* 3AF10C E00AC2EC 46020032 */ c.eq.s $f0, $f2 -/* 3AF110 E00AC2F0 00000000 */ nop +/* 3AF110 E00AC2F0 00000000 */ nop /* 3AF114 E00AC2F4 4501011F */ bc1t .LE00AC774 -/* 3AF118 E00AC2F8 00000000 */ nop +/* 3AF118 E00AC2F8 00000000 */ nop /* 3AF11C E00AC2FC C680002C */ lwc1 $f0, 0x2c($s4) /* 3AF120 E00AC300 46020032 */ c.eq.s $f0, $f2 -/* 3AF124 E00AC304 00000000 */ nop +/* 3AF124 E00AC304 00000000 */ nop /* 3AF128 E00AC308 4501011A */ bc1t .LE00AC774 /* 3AF12C E00AC30C 3C08DB06 */ lui $t0, 0xdb06 /* 3AF130 E00AC310 35080024 */ ori $t0, $t0, 0x24 -/* 3AF134 E00AC314 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 3AF138 E00AC318 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 3AF134 E00AC314 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 3AF138 E00AC318 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 3AF13C E00AC31C 3C02E700 */ lui $v0, 0xe700 /* 3AF140 E00AC320 8E660000 */ lw $a2, ($s3) /* 3AF144 E00AC324 44051000 */ mfc1 $a1, $f2 @@ -76,10 +76,10 @@ glabel func_E00AC2A4 /* 3AF1E0 E00AC3C0 0C080180 */ jal func_E0200600 /* 3AF1E4 E00AC3C4 E7A0001C */ swc1 $f0, 0x1c($sp) /* 3AF1E8 E00AC3C8 27A40020 */ addiu $a0, $sp, 0x20 -/* 3AF1EC E00AC3CC 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3AF1F0 E00AC3D0 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3AF1F4 E00AC3D4 3C11800A */ lui $s1, %hi(D_8009A674) -/* 3AF1F8 E00AC3D8 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 3AF1EC E00AC3CC 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3AF1F0 E00AC3D0 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3AF1F4 E00AC3D4 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 3AF1F8 E00AC3D8 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 3AF1FC E00AC3DC 96050000 */ lhu $a1, ($s0) /* 3AF200 E00AC3E0 8E220000 */ lw $v0, ($s1) /* 3AF204 E00AC3E4 00052980 */ sll $a1, $a1, 6 @@ -157,10 +157,10 @@ glabel func_E00AC2A4 /* 3AF31C E00AC4FC 0C080114 */ jal func_E0200450 /* 3AF320 E00AC500 00A0302D */ daddu $a2, $a1, $zero /* 3AF324 E00AC504 27A40020 */ addiu $a0, $sp, 0x20 -/* 3AF328 E00AC508 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3AF32C E00AC50C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3AF330 E00AC510 3C11800A */ lui $s1, %hi(D_8009A674) -/* 3AF334 E00AC514 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 3AF328 E00AC508 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3AF32C E00AC50C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3AF330 E00AC510 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 3AF334 E00AC514 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 3AF338 E00AC518 96050000 */ lhu $a1, ($s0) /* 3AF33C E00AC51C 8E220000 */ lw $v0, ($s1) /* 3AF340 E00AC520 00052980 */ sll $a1, $a1, 6 @@ -170,8 +170,8 @@ glabel func_E00AC2A4 /* 3AF350 E00AC530 3C09D838 */ lui $t1, 0xd838 /* 3AF354 E00AC534 35290002 */ ori $t1, $t1, 2 /* 3AF358 E00AC538 27A40020 */ addiu $a0, $sp, 0x20 -/* 3AF35C E00AC53C 3C15800A */ lui $s5, %hi(D_8009A66C) -/* 3AF360 E00AC540 26B5A66C */ addiu $s5, $s5, %lo(D_8009A66C) +/* 3AF35C E00AC53C 3C15800A */ lui $s5, %hi(gMasterGfxPos) +/* 3AF360 E00AC540 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) /* 3AF364 E00AC544 3C13DA38 */ lui $s3, 0xda38 /* 3AF368 E00AC548 3C16DE00 */ lui $s6, 0xde00 /* 3AF36C E00AC54C 8EA80000 */ lw $t0, ($s5) @@ -289,8 +289,8 @@ glabel func_E00AC2A4 /* 3AF520 E00AC700 AEA20000 */ sw $v0, ($s5) /* 3AF524 E00AC704 ACA30014 */ sw $v1, 0x14($a1) /* 3AF528 E00AC708 3C06D838 */ lui $a2, 0xd838 -/* 3AF52C E00AC70C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 3AF530 E00AC710 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 3AF52C E00AC70C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 3AF530 E00AC710 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 3AF534 E00AC714 34C60002 */ ori $a2, $a2, 2 /* 3AF538 E00AC718 8C830000 */ lw $v1, ($a0) /* 3AF53C E00AC71C 3C02DE00 */ lui $v0, 0xde00 @@ -329,5 +329,5 @@ glabel func_E00AC2A4 /* 3AF5BC E00AC79C D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 3AF5C0 E00AC7A0 03E00008 */ jr $ra /* 3AF5C4 E00AC7A4 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* 3AF5C8 E00AC7A8 00000000 */ nop -/* 3AF5CC E00AC7AC 00000000 */ nop +/* 3AF5C8 E00AC7A8 00000000 */ nop +/* 3AF5CC E00AC7AC 00000000 */ nop diff --git a/asm/nonmatchings/code_3B2350/func_E00AE54C.s b/asm/nonmatchings/code_3B2350/func_E00AE54C.s index efa1e53a0e..73048171f8 100644 --- a/asm/nonmatchings/code_3B2350/func_E00AE54C.s +++ b/asm/nonmatchings/code_3B2350/func_E00AE54C.s @@ -6,8 +6,8 @@ glabel func_E00AE54C /* 3B28A0 E00AE550 3C06DB06 */ lui $a2, 0xdb06 /* 3B28A4 E00AE554 34C60024 */ ori $a2, $a2, 0x24 /* 3B28A8 E00AE558 AFB300BC */ sw $s3, 0xbc($sp) -/* 3B28AC E00AE55C 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 3B28B0 E00AE560 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 3B28AC E00AE55C 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 3B28B0 E00AE560 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 3B28B4 E00AE564 AFBF00D4 */ sw $ra, 0xd4($sp) /* 3B28B8 E00AE568 AFBE00D0 */ sw $fp, 0xd0($sp) /* 3B28BC E00AE56C AFB700CC */ sw $s7, 0xcc($sp) @@ -78,10 +78,10 @@ glabel func_E00AE54C /* 3B29C0 E00AE670 0C080114 */ jal func_E0200450 /* 3B29C4 E00AE674 00A0302D */ daddu $a2, $a1, $zero /* 3B29C8 E00AE678 27A40018 */ addiu $a0, $sp, 0x18 -/* 3B29CC E00AE67C 3C168007 */ lui $s6, %hi(D_800741F0) -/* 3B29D0 E00AE680 26D641F0 */ addiu $s6, $s6, %lo(D_800741F0) -/* 3B29D4 E00AE684 3C17800A */ lui $s7, %hi(D_8009A674) -/* 3B29D8 E00AE688 26F7A674 */ addiu $s7, $s7, %lo(D_8009A674) +/* 3B29CC E00AE67C 3C168007 */ lui $s6, %hi(gMatrixListPos) +/* 3B29D0 E00AE680 26D641F0 */ addiu $s6, $s6, %lo(gMatrixListPos) +/* 3B29D4 E00AE684 3C17800A */ lui $s7, %hi(gDisplayContext) +/* 3B29D8 E00AE688 26F7A674 */ addiu $s7, $s7, %lo(gDisplayContext) /* 3B29DC E00AE68C 96C50000 */ lhu $a1, ($s6) /* 3B29E0 E00AE690 8EE20000 */ lw $v0, ($s7) /* 3B29E4 E00AE694 00052980 */ sll $a1, $a1, 6 @@ -205,9 +205,9 @@ glabel func_E00AE54C /* 3B2BB8 E00AE868 C602FFF4 */ lwc1 $f2, -0xc($s0) /* 3B2BBC E00AE86C 3C013D80 */ lui $at, 0x3d80 /* 3B2BC0 E00AE870 44810000 */ mtc1 $at, $f0 -/* 3B2BC4 E00AE874 00000000 */ nop +/* 3B2BC4 E00AE874 00000000 */ nop /* 3B2BC8 E00AE878 46001082 */ mul.s $f2, $f2, $f0 -/* 3B2BCC E00AE87C 00000000 */ nop +/* 3B2BCC E00AE87C 00000000 */ nop /* 3B2BD0 E00AE880 0260202D */ daddu $a0, $s3, $zero /* 3B2BD4 E00AE884 44051000 */ mfc1 $a1, $f2 /* 3B2BD8 E00AE888 4407B000 */ mfc1 $a3, $f22 @@ -219,8 +219,8 @@ glabel func_E00AE54C /* 3B2BF0 E00AE8A0 00A0302D */ daddu $a2, $a1, $zero /* 3B2BF4 E00AE8A4 27A40018 */ addiu $a0, $sp, 0x18 /* 3B2BF8 E00AE8A8 96E50000 */ lhu $a1, ($s7) -/* 3B2BFC E00AE8AC 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3B2C00 E00AE8B0 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 3B2BFC E00AE8AC 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3B2C00 E00AE8B0 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3B2C04 E00AE8B4 00052980 */ sll $a1, $a1, 6 /* 3B2C08 E00AE8B8 00B42821 */ addu $a1, $a1, $s4 /* 3B2C0C E00AE8BC 0C080118 */ jal func_E0200460 @@ -240,8 +240,8 @@ glabel func_E00AE54C /* 3B2C44 E00AE8F4 3042FFFF */ andi $v0, $v0, 0xffff /* 3B2C48 E00AE8F8 00021180 */ sll $v0, $v0, 6 /* 3B2C4C E00AE8FC A6E30000 */ sh $v1, ($s7) -/* 3B2C50 E00AE900 3C03800A */ lui $v1, %hi(D_8009A674) -/* 3B2C54 E00AE904 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 3B2C50 E00AE900 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 3B2C54 E00AE904 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 3B2C58 E00AE908 00541021 */ addu $v0, $v0, $s4 /* 3B2C5C E00AE90C 00621821 */ addu $v1, $v1, $v0 /* 3B2C60 E00AE910 24820008 */ addiu $v0, $a0, 8 @@ -292,8 +292,8 @@ glabel func_E00AE54C /* 3B2D10 E00AE9C0 3C05E200 */ lui $a1, 0xe200 /* 3B2D14 E00AE9C4 34A51E01 */ ori $a1, $a1, 0x1e01 /* 3B2D18 E00AE9C8 3C06D838 */ lui $a2, 0xd838 -/* 3B2D1C E00AE9CC 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 3B2D20 E00AE9D0 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 3B2D1C E00AE9CC 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 3B2D20 E00AE9D0 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 3B2D24 E00AE9D4 8C820000 */ lw $v0, ($a0) /* 3B2D28 E00AE9D8 34C60002 */ ori $a2, $a2, 2 /* 3B2D2C E00AE9DC 0040182D */ daddu $v1, $v0, $zero @@ -320,4 +320,4 @@ glabel func_E00AE54C /* 3B2D80 E00AEA30 D7B400D8 */ ldc1 $f20, 0xd8($sp) /* 3B2D84 E00AEA34 03E00008 */ jr $ra /* 3B2D88 E00AEA38 27BD00E8 */ addiu $sp, $sp, 0xe8 -/* 3B2D8C E00AEA3C 00000000 */ nop +/* 3B2D8C E00AEA3C 00000000 */ nop diff --git a/asm/nonmatchings/code_3B3EB0/func_E00B0234.s b/asm/nonmatchings/code_3B3EB0/func_E00B0234.s index 645ab52485..e6c0422530 100644 --- a/asm/nonmatchings/code_3B3EB0/func_E00B0234.s +++ b/asm/nonmatchings/code_3B3EB0/func_E00B0234.s @@ -14,12 +14,12 @@ glabel func_E00B0234 /* 3B4108 E00B0258 0000882D */ daddu $s1, $zero, $zero /* 3B410C E00B025C AFB400C0 */ sw $s4, 0xc0($sp) /* 3B4110 E00B0260 27B40060 */ addiu $s4, $sp, 0x60 -/* 3B4114 E00B0264 3C028007 */ lui $v0, %hi(D_800741F0) -/* 3B4118 E00B0268 244241F0 */ addiu $v0, $v0, %lo(D_800741F0) +/* 3B4114 E00B0264 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* 3B4118 E00B0268 244241F0 */ addiu $v0, $v0, %lo(gMatrixListPos) /* 3B411C E00B026C AFB500C4 */ sw $s5, 0xc4($sp) /* 3B4120 E00B0270 0040A82D */ daddu $s5, $v0, $zero -/* 3B4124 E00B0274 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 3B4128 E00B0278 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 3B4124 E00B0274 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 3B4128 E00B0278 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 3B412C E00B027C AFB200B8 */ sw $s2, 0xb8($sp) /* 3B4130 E00B0280 0040902D */ daddu $s2, $v0, $zero /* 3B4134 E00B0284 3C02E700 */ lui $v0, 0xe700 @@ -84,8 +84,8 @@ glabel func_E00B0234 /* 3B4220 E00B0370 E7A0001C */ swc1 $f0, 0x1c($sp) /* 3B4224 E00B0374 27A40020 */ addiu $a0, $sp, 0x20 /* 3B4228 E00B0378 96A50000 */ lhu $a1, ($s5) -/* 3B422C E00B037C 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3B4230 E00B0380 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 3B422C E00B037C 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3B4230 E00B0380 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3B4234 E00B0384 00052980 */ sll $a1, $a1, 6 /* 3B4238 E00B0388 00B02821 */ addu $a1, $a1, $s0 /* 3B423C E00B038C 0C080118 */ jal func_E0200460 @@ -106,8 +106,8 @@ glabel func_E00B0234 /* 3B4278 E00B03C8 3042FFFF */ andi $v0, $v0, 0xffff /* 3B427C E00B03CC 00021180 */ sll $v0, $v0, 6 /* 3B4280 E00B03D0 A6A30000 */ sh $v1, ($s5) -/* 3B4284 E00B03D4 3C03800A */ lui $v1, %hi(D_8009A674) -/* 3B4288 E00B03D8 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 3B4284 E00B03D4 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 3B4288 E00B03D8 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 3B428C E00B03DC 00501021 */ addu $v0, $v0, $s0 /* 3B4290 E00B03E0 00621821 */ addu $v1, $v1, $v0 /* 3B4294 E00B03E4 3C02DE00 */ lui $v0, 0xde00 @@ -123,7 +123,7 @@ glabel func_E00B0234 .LE00B040C: /* 3B42BC E00B040C 27A40020 */ addiu $a0, $sp, 0x20 /* 3B42C0 E00B0410 44962000 */ mtc1 $s6, $f4 -/* 3B42C4 E00B0414 00000000 */ nop +/* 3B42C4 E00B0414 00000000 */ nop /* 3B42C8 E00B0418 46802120 */ cvt.s.w $f4, $f4 /* 3B42CC E00B041C 26D60048 */ addiu $s6, $s6, 0x48 /* 3B42D0 E00B0420 44052000 */ mfc1 $a1, $f4 @@ -158,8 +158,8 @@ glabel func_E00B0234 /* 3B4344 E00B0494 00A0302D */ daddu $a2, $a1, $zero /* 3B4348 E00B0498 27A40020 */ addiu $a0, $sp, 0x20 /* 3B434C E00B049C 96A50000 */ lhu $a1, ($s5) -/* 3B4350 E00B04A0 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3B4354 E00B04A4 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 3B4350 E00B04A0 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3B4354 E00B04A4 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3B4358 E00B04A8 00052980 */ sll $a1, $a1, 6 /* 3B435C E00B04AC 00BE2821 */ addu $a1, $a1, $fp /* 3B4360 E00B04B0 0C080118 */ jal func_E0200460 @@ -177,8 +177,8 @@ glabel func_E00B0234 /* 3B4390 E00B04E0 3042FFFF */ andi $v0, $v0, 0xffff /* 3B4394 E00B04E4 00021180 */ sll $v0, $v0, 6 /* 3B4398 E00B04E8 A6A30000 */ sh $v1, ($s5) -/* 3B439C E00B04EC 3C03800A */ lui $v1, %hi(D_8009A674) -/* 3B43A0 E00B04F0 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 3B439C E00B04EC 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 3B43A0 E00B04F0 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 3B43A4 E00B04F4 005E1021 */ addu $v0, $v0, $fp /* 3B43A8 E00B04F8 00621821 */ addu $v1, $v1, $v0 /* 3B43AC E00B04FC 24820008 */ addiu $v0, $a0, 8 @@ -196,8 +196,8 @@ glabel func_E00B0234 /* 3B43DC E00B052C 2A220005 */ slti $v0, $s1, 5 /* 3B43E0 E00B0530 1440FFB6 */ bnez $v0, .LE00B040C /* 3B43E4 E00B0534 AC860008 */ sw $a2, 8($a0) -/* 3B43E8 E00B0538 3C07800A */ lui $a3, %hi(D_8009A66C) -/* 3B43EC E00B053C 24E7A66C */ addiu $a3, $a3, %lo(D_8009A66C) +/* 3B43E8 E00B0538 3C07800A */ lui $a3, %hi(gMasterGfxPos) +/* 3B43EC E00B053C 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) /* 3B43F0 E00B0540 0000882D */ daddu $s1, $zero, $zero /* 3B43F4 E00B0544 8CE40000 */ lw $a0, ($a3) /* 3B43F8 E00B0548 3C02DF00 */ lui $v0, 0xdf00 @@ -236,10 +236,10 @@ glabel func_E00B0234 /* 3B447C E00B05CC ACE40000 */ sw $a0, ($a3) /* 3B4480 E00B05D0 8FAA00A0 */ lw $t2, 0xa0($sp) /* 3B4484 E00B05D4 000AB8C0 */ sll $s7, $t2, 3 -/* 3B4488 E00B05D8 3C16800A */ lui $s6, %hi(D_8009A674) -/* 3B448C E00B05DC 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) -/* 3B4490 E00B05E0 3C158007 */ lui $s5, %hi(D_800741F0) -/* 3B4494 E00B05E4 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) +/* 3B4488 E00B05D8 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 3B448C E00B05DC 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) +/* 3B4490 E00B05E0 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 3B4494 E00B05E4 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) /* 3B4498 E00B05E8 3C140001 */ lui $s4, 1 /* 3B449C E00B05EC 36941630 */ ori $s4, $s4, 0x1630 /* 3B44A0 E00B05F0 00E0902D */ daddu $s2, $a3, $zero @@ -258,13 +258,13 @@ glabel func_E00B0234 /* 3B44CC E00B061C 14610004 */ bne $v1, $at, .LE00B0630 /* 3B44D0 E00B0620 3C018000 */ lui $at, 0x8000 /* 3B44D4 E00B0624 14410002 */ bne $v0, $at, .LE00B0630 -/* 3B44D8 E00B0628 00000000 */ nop +/* 3B44D8 E00B0628 00000000 */ nop /* 3B44DC E00B062C 0006000D */ break 6 .LE00B0630: /* 3B44E0 E00B0630 00001012 */ mflo $v0 /* 3B44E4 E00B0634 02E21021 */ addu $v0, $s7, $v0 /* 3B44E8 E00B0638 44826000 */ mtc1 $v0, $f12 -/* 3B44EC E00B063C 00000000 */ nop +/* 3B44EC E00B063C 00000000 */ nop /* 3B44F0 E00B0640 46806320 */ cvt.s.w $f12, $f12 /* 3B44F4 E00B0644 0C080144 */ jal func_E0200510 /* 3B44F8 E00B0648 26300001 */ addiu $s0, $s1, 1 @@ -273,16 +273,16 @@ glabel func_E00B0234 /* 3B4504 E00B0654 D42207E8 */ ldc1 $f2, %lo(D_E00B07E8)($at) /* 3B4508 E00B0658 001110C0 */ sll $v0, $s1, 3 /* 3B450C E00B065C 46220002 */ mul.d $f0, $f0, $f2 -/* 3B4510 E00B0660 00000000 */ nop +/* 3B4510 E00B0660 00000000 */ nop /* 3B4514 E00B0664 00511021 */ addu $v0, $v0, $s1 /* 3B4518 E00B0668 00021080 */ sll $v0, $v0, 2 /* 3B451C E00B066C 44822000 */ mtc1 $v0, $f4 -/* 3B4520 E00B0670 00000000 */ nop +/* 3B4520 E00B0670 00000000 */ nop /* 3B4524 E00B0674 46802120 */ cvt.s.w $f4, $f4 /* 3B4528 E00B0678 4405A000 */ mfc1 $a1, $f20 /* 3B452C E00B067C 4406A000 */ mfc1 $a2, $f20 /* 3B4530 E00B0680 44901000 */ mtc1 $s0, $f2 -/* 3B4534 E00B0684 00000000 */ nop +/* 3B4534 E00B0684 00000000 */ nop /* 3B4538 E00B0688 468010A0 */ cvt.s.w $f2, $f2 /* 3B453C E00B068C 460010A1 */ cvt.d.s $f2, $f2 /* 3B4540 E00B0690 46201080 */ add.d $f2, $f2, $f0 @@ -290,7 +290,7 @@ glabel func_E00B0234 /* 3B4548 E00B0698 C660002C */ lwc1 $f0, 0x2c($s3) /* 3B454C E00B069C 462010A0 */ cvt.s.d $f2, $f2 /* 3B4550 E00B06A0 46001082 */ mul.s $f2, $f2, $f0 -/* 3B4554 E00B06A4 00000000 */ nop +/* 3B4554 E00B06A4 00000000 */ nop /* 3B4558 E00B06A8 27A40020 */ addiu $a0, $sp, 0x20 /* 3B455C E00B06AC E7B40014 */ swc1 $f20, 0x14($sp) /* 3B4560 E00B06B0 E7B40018 */ swc1 $f20, 0x18($sp) @@ -339,8 +339,8 @@ glabel func_E00B0234 /* 3B460C E00B075C AE440000 */ sw $a0, ($s2) .LE00B0760: /* 3B4610 E00B0760 3C03D838 */ lui $v1, 0xd838 -/* 3B4614 E00B0764 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 3B4618 E00B0768 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 3B4614 E00B0764 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 3B4618 E00B0768 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 3B461C E00B076C 8C820000 */ lw $v0, ($a0) /* 3B4620 E00B0770 34630002 */ ori $v1, $v1, 2 /* 3B4624 E00B0774 0040282D */ daddu $a1, $v0, $zero @@ -369,4 +369,4 @@ glabel func_E00B0234 /* 3B4680 E00B07D0 D7B400D8 */ ldc1 $f20, 0xd8($sp) /* 3B4684 E00B07D4 03E00008 */ jr $ra /* 3B4688 E00B07D8 27BD00F0 */ addiu $sp, $sp, 0xf0 -/* 3B468C E00B07DC 00000000 */ nop +/* 3B468C E00B07DC 00000000 */ nop diff --git a/asm/nonmatchings/code_3B4790/func_E00B24B0.s b/asm/nonmatchings/code_3B4790/func_E00B24B0.s index 77dec3fe96..b171e4cbcf 100644 --- a/asm/nonmatchings/code_3B4790/func_E00B24B0.s +++ b/asm/nonmatchings/code_3B4790/func_E00B24B0.s @@ -17,8 +17,8 @@ glabel func_E00B24B0 /* 3B4C70 E00B24E0 AFB800A0 */ sw $t8, 0xa0($sp) /* 3B4C74 E00B24E4 24180004 */ addiu $t8, $zero, 4 /* 3B4C78 E00B24E8 AFB100AC */ sw $s1, 0xac($sp) -/* 3B4C7C E00B24EC 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 3B4C80 E00B24F0 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 3B4C7C E00B24EC 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 3B4C80 E00B24F0 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 3B4C84 E00B24F4 3C02E700 */ lui $v0, 0xe700 /* 3B4C88 E00B24F8 AFBF00CC */ sw $ra, 0xcc($sp) /* 3B4C8C E00B24FC AFBE00C8 */ sw $fp, 0xc8($sp) @@ -80,10 +80,10 @@ glabel func_E00B24B0 /* 3B4D6C E00B25DC 0C080114 */ jal func_E0200450 /* 3B4D70 E00B25E0 00A0302D */ daddu $a2, $a1, $zero /* 3B4D74 E00B25E4 27A40010 */ addiu $a0, $sp, 0x10 -/* 3B4D78 E00B25E8 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3B4D7C E00B25EC 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3B4D80 E00B25F0 3C12800A */ lui $s2, %hi(D_8009A674) -/* 3B4D84 E00B25F4 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 3B4D78 E00B25E8 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3B4D7C E00B25EC 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3B4D80 E00B25F0 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 3B4D84 E00B25F4 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 3B4D88 E00B25F8 96050000 */ lhu $a1, ($s0) /* 3B4D8C E00B25FC 8E420000 */ lw $v0, ($s2) /* 3B4D90 E00B2600 00052980 */ sll $a1, $a1, 6 @@ -150,10 +150,10 @@ glabel func_E00B24B0 /* 3B4E80 E00B26F0 13150006 */ beq $t8, $s5, .LE00B270C /* 3B4E84 E00B26F4 2402000B */ addiu $v0, $zero, 0xb /* 3B4E88 E00B26F8 12A2000F */ beq $s5, $v0, .LE00B2738 -/* 3B4E8C E00B26FC 00000000 */ nop +/* 3B4E8C E00B26FC 00000000 */ nop /* 3B4E90 E00B2700 8EC20178 */ lw $v0, 0x178($s6) /* 3B4E94 E00B2704 1440000C */ bnez $v0, .LE00B2738 -/* 3B4E98 E00B2708 00000000 */ nop +/* 3B4E98 E00B2708 00000000 */ nop .LE00B270C: /* 3B4E9C E00B270C 8FB800A4 */ lw $t8, 0xa4($sp) /* 3B4EA0 E00B2710 8EC60118 */ lw $a2, 0x118($s6) @@ -169,22 +169,22 @@ glabel func_E00B24B0 .LE00B2738: /* 3B4EC8 E00B2738 8EE20000 */ lw $v0, ($s7) /* 3B4ECC E00B273C 14400015 */ bnez $v0, .LE00B2794 -/* 3B4ED0 E00B2740 00000000 */ nop +/* 3B4ED0 E00B2740 00000000 */ nop /* 3B4ED4 E00B2744 C6C001A8 */ lwc1 $f0, 0x1a8($s6) /* 3B4ED8 E00B2748 46800020 */ cvt.s.w $f0, $f0 /* 3B4EDC E00B274C 46000021 */ cvt.d.s $f0, $f0 /* 3B4EE0 E00B2750 463C0002 */ mul.d $f0, $f0, $f28 -/* 3B4EE4 E00B2754 00000000 */ nop +/* 3B4EE4 E00B2754 00000000 */ nop /* 3B4EE8 E00B2758 3C014000 */ lui $at, 0x4000 /* 3B4EEC E00B275C 44811800 */ mtc1 $at, $f3 /* 3B4EF0 E00B2760 44801000 */ mtc1 $zero, $f2 -/* 3B4EF4 E00B2764 00000000 */ nop +/* 3B4EF4 E00B2764 00000000 */ nop /* 3B4EF8 E00B2768 46220000 */ add.d $f0, $f0, $f2 /* 3B4EFC E00B276C 3C0140C0 */ lui $at, 0x40c0 /* 3B4F00 E00B2770 44812000 */ mtc1 $at, $f4 /* 3B4F04 E00B2774 462005A0 */ cvt.s.d $f22, $f0 /* 3B4F08 E00B2778 4616203C */ c.lt.s $f4, $f22 -/* 3B4F0C E00B277C 00000000 */ nop +/* 3B4F0C E00B277C 00000000 */ nop /* 3B4F10 E00B2780 45030001 */ bc1tl .LE00B2788 /* 3B4F14 E00B2784 46002586 */ mov.s $f22, $f4 .LE00B2788: @@ -196,17 +196,17 @@ glabel func_E00B24B0 /* 3B4F28 E00B2798 46800020 */ cvt.s.w $f0, $f0 /* 3B4F2C E00B279C 46000021 */ cvt.d.s $f0, $f0 /* 3B4F30 E00B27A0 463C0002 */ mul.d $f0, $f0, $f28 -/* 3B4F34 E00B27A4 00000000 */ nop +/* 3B4F34 E00B27A4 00000000 */ nop /* 3B4F38 E00B27A8 3C013FF0 */ lui $at, 0x3ff0 /* 3B4F3C E00B27AC 44811800 */ mtc1 $at, $f3 /* 3B4F40 E00B27B0 44801000 */ mtc1 $zero, $f2 -/* 3B4F44 E00B27B4 00000000 */ nop +/* 3B4F44 E00B27B4 00000000 */ nop /* 3B4F48 E00B27B8 46220000 */ add.d $f0, $f0, $f2 /* 3B4F4C E00B27BC 3C0141F0 */ lui $at, 0x41f0 /* 3B4F50 E00B27C0 44811000 */ mtc1 $at, $f2 /* 3B4F54 E00B27C4 462005A0 */ cvt.s.d $f22, $f0 /* 3B4F58 E00B27C8 4616103C */ c.lt.s $f2, $f22 -/* 3B4F5C E00B27CC 00000000 */ nop +/* 3B4F5C E00B27CC 00000000 */ nop /* 3B4F60 E00B27D0 45030001 */ bc1tl .LE00B27D8 /* 3B4F64 E00B27D4 46001586 */ mov.s $f22, $f2 .LE00B27D8: @@ -228,32 +228,32 @@ glabel func_E00B24B0 /* 3B4FA0 E00B2810 C7A40098 */ lwc1 $f4, 0x98($sp) /* 3B4FA4 E00B2814 8FB8009C */ lw $t8, 0x9c($sp) /* 3B4FA8 E00B2818 4604B582 */ mul.s $f22, $f22, $f4 -/* 3B4FAC E00B281C 00000000 */ nop +/* 3B4FAC E00B281C 00000000 */ nop /* 3B4FB0 E00B2820 4600C306 */ mov.s $f12, $f24 /* 3B4FB4 E00B2824 03158021 */ addu $s0, $t8, $s5 /* 3B4FB8 E00B2828 0C080140 */ jal func_E0200500 /* 3B4FBC E00B282C 00108180 */ sll $s0, $s0, 6 /* 3B4FC0 E00B2830 4600B502 */ mul.s $f20, $f22, $f0 -/* 3B4FC4 E00B2834 00000000 */ nop +/* 3B4FC4 E00B2834 00000000 */ nop /* 3B4FC8 E00B2838 0C080144 */ jal func_E0200510 /* 3B4FCC E00B283C 4600C306 */ mov.s $f12, $f24 /* 3B4FD0 E00B2840 C6C200E8 */ lwc1 $f2, 0xe8($s6) /* 3B4FD4 E00B2844 46141080 */ add.s $f2, $f2, $f20 /* 3B4FD8 E00B2848 461A1082 */ mul.s $f2, $f2, $f26 -/* 3B4FDC E00B284C 00000000 */ nop +/* 3B4FDC E00B284C 00000000 */ nop /* 3B4FE0 E00B2850 4600B002 */ mul.s $f0, $f22, $f0 -/* 3B4FE4 E00B2854 00000000 */ nop +/* 3B4FE4 E00B2854 00000000 */ nop /* 3B4FE8 E00B2858 4600110D */ trunc.w.s $f4, $f2 /* 3B4FEC E00B285C 44022000 */ mfc1 $v0, $f4 -/* 3B4FF0 E00B2860 00000000 */ nop +/* 3B4FF0 E00B2860 00000000 */ nop /* 3B4FF4 E00B2864 A7C20000 */ sh $v0, ($fp) /* 3B4FF8 E00B2868 C6C20118 */ lwc1 $f2, 0x118($s6) /* 3B4FFC E00B286C 46001080 */ add.s $f2, $f2, $f0 /* 3B5000 E00B2870 461A1082 */ mul.s $f2, $f2, $f26 -/* 3B5004 E00B2874 00000000 */ nop +/* 3B5004 E00B2874 00000000 */ nop /* 3B5008 E00B2878 4600110D */ trunc.w.s $f4, $f2 /* 3B500C E00B287C 44022000 */ mfc1 $v0, $f4 -/* 3B5010 E00B2880 00000000 */ nop +/* 3B5010 E00B2880 00000000 */ nop /* 3B5014 E00B2884 A682FFF3 */ sh $v0, -0xd($s4) /* 3B5018 E00B2888 32A20001 */ andi $v0, $s5, 1 /* 3B501C E00B288C 00022A00 */ sll $a1, $v0, 8 @@ -271,25 +271,25 @@ glabel func_E00B24B0 /* 3B504C E00B28BC A690FFF9 */ sh $s0, -7($s4) /* 3B5050 E00B28C0 A680FFFB */ sh $zero, -5($s4) /* 3B5054 E00B28C4 461A1082 */ mul.s $f2, $f2, $f26 -/* 3B5058 E00B28C8 00000000 */ nop +/* 3B5058 E00B28C8 00000000 */ nop /* 3B505C E00B28CC A285FFFD */ sb $a1, -3($s4) /* 3B5060 E00B28D0 A284FFFE */ sb $a0, -2($s4) /* 3B5064 E00B28D4 A283FFFF */ sb $v1, -1($s4) /* 3B5068 E00B28D8 A2910000 */ sb $s1, ($s4) /* 3B506C E00B28DC 4600110D */ trunc.w.s $f4, $f2 /* 3B5070 E00B28E0 44022000 */ mfc1 $v0, $f4 -/* 3B5074 E00B28E4 00000000 */ nop +/* 3B5074 E00B28E4 00000000 */ nop /* 3B5078 E00B28E8 A682FFF5 */ sh $v0, -0xb($s4) /* 3B507C E00B28EC C6C200E8 */ lwc1 $f2, 0xe8($s6) /* 3B5080 E00B28F0 46141081 */ sub.s $f2, $f2, $f20 /* 3B5084 E00B28F4 461A1082 */ mul.s $f2, $f2, $f26 -/* 3B5088 E00B28F8 00000000 */ nop +/* 3B5088 E00B28F8 00000000 */ nop /* 3B508C E00B28FC 27DE0010 */ addiu $fp, $fp, 0x10 /* 3B5090 E00B2900 26B50001 */ addiu $s5, $s5, 1 /* 3B5094 E00B2904 26940010 */ addiu $s4, $s4, 0x10 /* 3B5098 E00B2908 4600110D */ trunc.w.s $f4, $f2 /* 3B509C E00B290C 44022000 */ mfc1 $v0, $f4 -/* 3B50A0 E00B2910 00000000 */ nop +/* 3B50A0 E00B2910 00000000 */ nop /* 3B50A4 E00B2914 A7C20000 */ sh $v0, ($fp) /* 3B50A8 E00B2918 8FB8009C */ lw $t8, 0x9c($sp) /* 3B50AC E00B291C C6C20118 */ lwc1 $f2, 0x118($s6) @@ -300,14 +300,14 @@ glabel func_E00B24B0 /* 3B50C0 E00B2930 27180001 */ addiu $t8, $t8, 1 /* 3B50C4 E00B2934 AFB800A0 */ sw $t8, 0xa0($sp) /* 3B50C8 E00B2938 461A1082 */ mul.s $f2, $f2, $f26 -/* 3B50CC E00B293C 00000000 */ nop +/* 3B50CC E00B293C 00000000 */ nop /* 3B50D0 E00B2940 8FB800A4 */ lw $t8, 0xa4($sp) /* 3B50D4 E00B2944 27DE0010 */ addiu $fp, $fp, 0x10 /* 3B50D8 E00B2948 27180004 */ addiu $t8, $t8, 4 /* 3B50DC E00B294C AFB800A4 */ sw $t8, 0xa4($sp) /* 3B50E0 E00B2950 4600110D */ trunc.w.s $f4, $f2 /* 3B50E4 E00B2954 44022000 */ mfc1 $v0, $f4 -/* 3B50E8 E00B2958 00000000 */ nop +/* 3B50E8 E00B2958 00000000 */ nop /* 3B50EC E00B295C A682FFF3 */ sh $v0, -0xd($s4) /* 3B50F0 E00B2960 C6C00148 */ lwc1 $f0, 0x148($s6) /* 3B50F4 E00B2964 26D60004 */ addiu $s6, $s6, 4 @@ -316,20 +316,20 @@ glabel func_E00B24B0 /* 3B5100 E00B2970 A690FFF9 */ sh $s0, -7($s4) /* 3B5104 E00B2974 A682FFFB */ sh $v0, -5($s4) /* 3B5108 E00B2978 461A0002 */ mul.s $f0, $f0, $f26 -/* 3B510C E00B297C 00000000 */ nop +/* 3B510C E00B297C 00000000 */ nop /* 3B5110 E00B2980 A285FFFD */ sb $a1, -3($s4) /* 3B5114 E00B2984 A284FFFE */ sb $a0, -2($s4) /* 3B5118 E00B2988 A283FFFF */ sb $v1, -1($s4) /* 3B511C E00B298C A2910000 */ sb $s1, ($s4) /* 3B5120 E00B2990 4600010D */ trunc.w.s $f4, $f0 /* 3B5124 E00B2994 44022000 */ mfc1 $v0, $f4 -/* 3B5128 E00B2998 00000000 */ nop +/* 3B5128 E00B2998 00000000 */ nop /* 3B512C E00B299C A682FFF5 */ sh $v0, -0xb($s4) /* 3B5130 E00B29A0 2AA2000C */ slti $v0, $s5, 0xc /* 3B5134 E00B29A4 1440FF50 */ bnez $v0, .LE00B26E8 /* 3B5138 E00B29A8 26940010 */ addiu $s4, $s4, 0x10 -/* 3B513C E00B29AC 3C07800A */ lui $a3, %hi(D_8009A66C) -/* 3B5140 E00B29B0 24E7A66C */ addiu $a3, $a3, %lo(D_8009A66C) +/* 3B513C E00B29AC 3C07800A */ lui $a3, %hi(gMasterGfxPos) +/* 3B5140 E00B29B0 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) /* 3B5144 E00B29B4 3C080900 */ lui $t0, 0x900 /* 3B5148 E00B29B8 250808A8 */ addiu $t0, $t0, 0x8a8 /* 3B514C E00B29BC 00151040 */ sll $v0, $s5, 1 @@ -402,7 +402,7 @@ glabel func_E00B24B0 /* 3B5244 E00B2AB4 AC820000 */ sw $v0, ($a0) .LE00B2AB8: /* 3B5248 E00B2AB8 14A00003 */ bnez $a1, .LE00B2AC8 -/* 3B524C E00B2ABC 00000000 */ nop +/* 3B524C E00B2ABC 00000000 */ nop /* 3B5250 E00B2AC0 0802CABD */ j .LE00B2AF4 /* 3B5254 E00B2AC4 AC8E0004 */ sw $t6, 4($a0) .LE00B2AC8: @@ -427,8 +427,8 @@ glabel func_E00B24B0 /* 3B5298 E00B2B08 25080004 */ addiu $t0, $t0, 4 .LE00B2B0C: /* 3B529C E00B2B0C 3C03D838 */ lui $v1, 0xd838 -/* 3B52A0 E00B2B10 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 3B52A4 E00B2B14 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 3B52A0 E00B2B10 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 3B52A4 E00B2B14 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 3B52A8 E00B2B18 8C820000 */ lw $v0, ($a0) /* 3B52AC E00B2B1C 34630002 */ ori $v1, $v1, 2 /* 3B52B0 E00B2B20 0040282D */ daddu $a1, $v0, $zero @@ -460,6 +460,6 @@ glabel func_E00B24B0 /* 3B5318 E00B2B88 D7B400D0 */ ldc1 $f20, 0xd0($sp) /* 3B531C E00B2B8C 03E00008 */ jr $ra /* 3B5320 E00B2B90 27BD0100 */ addiu $sp, $sp, 0x100 -/* 3B5324 E00B2B94 00000000 */ nop -/* 3B5328 E00B2B98 00000000 */ nop -/* 3B532C E00B2B9C 00000000 */ nop +/* 3B5324 E00B2B94 00000000 */ nop +/* 3B5328 E00B2B98 00000000 */ nop +/* 3B532C E00B2B9C 00000000 */ nop diff --git a/asm/nonmatchings/code_3B5CF0/func_E00B457C.s b/asm/nonmatchings/code_3B5CF0/func_E00B457C.s index c1565f1b38..df019e3662 100644 --- a/asm/nonmatchings/code_3B5CF0/func_E00B457C.s +++ b/asm/nonmatchings/code_3B5CF0/func_E00B457C.s @@ -14,8 +14,8 @@ glabel func_E00B457C /* 3B6290 E00B45A0 3C16E00B */ lui $s6, %hi(D_E00B4CF0) /* 3B6294 E00B45A4 26D64CF0 */ addiu $s6, $s6, %lo(D_E00B4CF0) /* 3B6298 E00B45A8 AFB100B4 */ sw $s1, 0xb4($sp) -/* 3B629C E00B45AC 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 3B62A0 E00B45B0 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 3B629C E00B45AC 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 3B62A0 E00B45B0 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 3B62A4 E00B45B4 3C02E700 */ lui $v0, 0xe700 /* 3B62A8 E00B45B8 AFBF00D4 */ sw $ra, 0xd4($sp) /* 3B62AC E00B45BC AFBE00D0 */ sw $fp, 0xd0($sp) @@ -56,10 +56,10 @@ glabel func_E00B457C /* 3B6338 E00B4648 0C080108 */ jal func_E0200420 /* 3B633C E00B464C AE280000 */ sw $t0, ($s1) /* 3B6340 E00B4650 27A40020 */ addiu $a0, $sp, 0x20 -/* 3B6344 E00B4654 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3B6348 E00B4658 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3B634C E00B465C 3C12800A */ lui $s2, %hi(D_8009A674) -/* 3B6350 E00B4660 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 3B6344 E00B4654 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3B6348 E00B4658 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3B634C E00B465C 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 3B6350 E00B4660 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 3B6354 E00B4664 96050000 */ lhu $a1, ($s0) /* 3B6358 E00B4668 8E420000 */ lw $v0, ($s2) /* 3B635C E00B466C 00052980 */ sll $a1, $a1, 6 @@ -103,13 +103,13 @@ glabel func_E00B457C /* 3B63F0 E00B4700 00021040 */ sll $v0, $v0, 1 /* 3B63F4 E00B4704 82A3FFF7 */ lb $v1, -9($s5) /* 3B63F8 E00B4708 4482E000 */ mtc1 $v0, $f28 -/* 3B63FC E00B470C 00000000 */ nop +/* 3B63FC E00B470C 00000000 */ nop /* 3B6400 E00B4710 4680E720 */ cvt.s.w $f28, $f28 /* 3B6404 E00B4714 00031080 */ sll $v0, $v1, 2 /* 3B6408 E00B4718 00431021 */ addu $v0, $v0, $v1 /* 3B640C E00B471C 00021040 */ sll $v0, $v0, 1 /* 3B6410 E00B4720 4482C000 */ mtc1 $v0, $f24 -/* 3B6414 E00B4724 00000000 */ nop +/* 3B6414 E00B4724 00000000 */ nop /* 3B6418 E00B4728 4680C620 */ cvt.s.w $f24, $f24 /* 3B641C E00B472C 82A3FFF8 */ lb $v1, -8($s5) /* 3B6420 E00B4730 461EC032 */ c.eq.s $f24, $f30 @@ -117,20 +117,20 @@ glabel func_E00B457C /* 3B6428 E00B4738 00431021 */ addu $v0, $v0, $v1 /* 3B642C E00B473C 00021040 */ sll $v0, $v0, 1 /* 3B6430 E00B4740 4482D000 */ mtc1 $v0, $f26 -/* 3B6434 E00B4744 00000000 */ nop +/* 3B6434 E00B4744 00000000 */ nop /* 3B6438 E00B4748 4680D6A0 */ cvt.s.w $f26, $f26 /* 3B643C E00B474C 45010052 */ bc1t .LE00B4898 -/* 3B6440 E00B4750 00000000 */ nop +/* 3B6440 E00B4750 00000000 */ nop /* 3B6444 E00B4754 3C014120 */ lui $at, 0x4120 /* 3B6448 E00B4758 44813000 */ mtc1 $at, $f6 -/* 3B644C E00B475C 00000000 */ nop +/* 3B644C E00B475C 00000000 */ nop /* 3B6450 E00B4760 4606C002 */ mul.s $f0, $f24, $f6 -/* 3B6454 E00B4764 00000000 */ nop +/* 3B6454 E00B4764 00000000 */ nop /* 3B6458 E00B4768 3C0142C8 */ lui $at, 0x42c8 /* 3B645C E00B476C 44813000 */ mtc1 $at, $f6 -/* 3B6460 E00B4770 00000000 */ nop +/* 3B6460 E00B4770 00000000 */ nop /* 3B6464 E00B4774 4606D082 */ mul.s $f2, $f26, $f6 -/* 3B6468 E00B4778 00000000 */ nop +/* 3B6468 E00B4778 00000000 */ nop /* 3B646C E00B477C 4600E000 */ add.s $f0, $f28, $f0 /* 3B6470 E00B4780 46020000 */ add.s $f0, $f0, $f2 /* 3B6474 E00B4784 4600018D */ trunc.w.s $f6, $f0 @@ -139,81 +139,81 @@ glabel func_E00B457C /* 3B6480 E00B4790 240403E8 */ addiu $a0, $zero, 0x3e8 /* 3B6484 E00B4794 02021021 */ addu $v0, $s0, $v0 /* 3B6488 E00B4798 44826000 */ mtc1 $v0, $f12 -/* 3B648C E00B479C 00000000 */ nop +/* 3B648C E00B479C 00000000 */ nop /* 3B6490 E00B47A0 0C080140 */ jal func_E0200500 /* 3B6494 E00B47A4 46806320 */ cvt.s.w $f12, $f12 /* 3B6498 E00B47A8 3C014120 */ lui $at, 0x4120 /* 3B649C E00B47AC 44813000 */ mtc1 $at, $f6 -/* 3B64A0 E00B47B0 00000000 */ nop +/* 3B64A0 E00B47B0 00000000 */ nop /* 3B64A4 E00B47B4 4606E102 */ mul.s $f4, $f28, $f6 -/* 3B64A8 E00B47B8 00000000 */ nop +/* 3B64A8 E00B47B8 00000000 */ nop /* 3B64AC E00B47BC 3C0142C8 */ lui $at, 0x42c8 /* 3B64B0 E00B47C0 44813000 */ mtc1 $at, $f6 -/* 3B64B4 E00B47C4 00000000 */ nop +/* 3B64B4 E00B47C4 00000000 */ nop /* 3B64B8 E00B47C8 4606C082 */ mul.s $f2, $f24, $f6 -/* 3B64BC E00B47CC 00000000 */ nop +/* 3B64BC E00B47CC 00000000 */ nop /* 3B64C0 E00B47D0 46022100 */ add.s $f4, $f4, $f2 /* 3B64C4 E00B47D4 461A2100 */ add.s $f4, $f4, $f26 /* 3B64C8 E00B47D8 4600218D */ trunc.w.s $f6, $f4 /* 3B64CC E00B47DC 44053000 */ mfc1 $a1, $f6 /* 3B64D0 E00B47E0 3C0141A0 */ lui $at, 0x41a0 /* 3B64D4 E00B47E4 44813000 */ mtc1 $at, $f6 -/* 3B64D8 E00B47E8 00000000 */ nop +/* 3B64D8 E00B47E8 00000000 */ nop /* 3B64DC E00B47EC 46060582 */ mul.s $f22, $f0, $f6 -/* 3B64E0 E00B47F0 00000000 */ nop +/* 3B64E0 E00B47F0 00000000 */ nop /* 3B64E4 E00B47F4 0C080011 */ jal func_E0200044 /* 3B64E8 E00B47F8 240403E8 */ addiu $a0, $zero, 0x3e8 /* 3B64EC E00B47FC 02021021 */ addu $v0, $s0, $v0 /* 3B64F0 E00B4800 44826000 */ mtc1 $v0, $f12 -/* 3B64F4 E00B4804 00000000 */ nop +/* 3B64F4 E00B4804 00000000 */ nop /* 3B64F8 E00B4808 0C080140 */ jal func_E0200500 /* 3B64FC E00B480C 46806320 */ cvt.s.w $f12, $f12 /* 3B6500 E00B4810 3C0142C8 */ lui $at, 0x42c8 /* 3B6504 E00B4814 44813000 */ mtc1 $at, $f6 -/* 3B6508 E00B4818 00000000 */ nop +/* 3B6508 E00B4818 00000000 */ nop /* 3B650C E00B481C 4606E082 */ mul.s $f2, $f28, $f6 -/* 3B6510 E00B4820 00000000 */ nop +/* 3B6510 E00B4820 00000000 */ nop /* 3B6514 E00B4824 3C014120 */ lui $at, 0x4120 /* 3B6518 E00B4828 44813000 */ mtc1 $at, $f6 -/* 3B651C E00B482C 00000000 */ nop +/* 3B651C E00B482C 00000000 */ nop /* 3B6520 E00B4830 4606D102 */ mul.s $f4, $f26, $f6 -/* 3B6524 E00B4834 00000000 */ nop +/* 3B6524 E00B4834 00000000 */ nop /* 3B6528 E00B4838 46181080 */ add.s $f2, $f2, $f24 /* 3B652C E00B483C 46041080 */ add.s $f2, $f2, $f4 /* 3B6530 E00B4840 4600118D */ trunc.w.s $f6, $f2 /* 3B6534 E00B4844 44053000 */ mfc1 $a1, $f6 /* 3B6538 E00B4848 3C0141A0 */ lui $at, 0x41a0 /* 3B653C E00B484C 44813000 */ mtc1 $at, $f6 -/* 3B6540 E00B4850 00000000 */ nop +/* 3B6540 E00B4850 00000000 */ nop /* 3B6544 E00B4854 46060502 */ mul.s $f20, $f0, $f6 -/* 3B6548 E00B4858 00000000 */ nop +/* 3B6548 E00B4858 00000000 */ nop /* 3B654C E00B485C 0C080011 */ jal func_E0200044 /* 3B6550 E00B4860 240403E8 */ addiu $a0, $zero, 0x3e8 /* 3B6554 E00B4864 02021021 */ addu $v0, $s0, $v0 /* 3B6558 E00B4868 44826000 */ mtc1 $v0, $f12 -/* 3B655C E00B486C 00000000 */ nop +/* 3B655C E00B486C 00000000 */ nop /* 3B6560 E00B4870 0C080140 */ jal func_E0200500 /* 3B6564 E00B4874 46806320 */ cvt.s.w $f12, $f12 /* 3B6568 E00B4878 3C0141A0 */ lui $at, 0x41a0 /* 3B656C E00B487C 44813000 */ mtc1 $at, $f6 -/* 3B6570 E00B4880 00000000 */ nop +/* 3B6570 E00B4880 00000000 */ nop /* 3B6574 E00B4884 46060002 */ mul.s $f0, $f0, $f6 -/* 3B6578 E00B4888 00000000 */ nop +/* 3B6578 E00B4888 00000000 */ nop /* 3B657C E00B488C 4616E700 */ add.s $f28, $f28, $f22 /* 3B6580 E00B4890 4614C600 */ add.s $f24, $f24, $f20 /* 3B6584 E00B4894 4600D680 */ add.s $f26, $f26, $f0 .LE00B4898: /* 3B6588 E00B4898 4600E18D */ trunc.w.s $f6, $f28 /* 3B658C E00B489C 44023000 */ mfc1 $v0, $f6 -/* 3B6590 E00B48A0 00000000 */ nop +/* 3B6590 E00B48A0 00000000 */ nop /* 3B6594 E00B48A4 A7C20000 */ sh $v0, ($fp) /* 3B6598 E00B48A8 4600C18D */ trunc.w.s $f6, $f24 /* 3B659C E00B48AC 44023000 */ mfc1 $v0, $f6 -/* 3B65A0 E00B48B0 00000000 */ nop +/* 3B65A0 E00B48B0 00000000 */ nop /* 3B65A4 E00B48B4 A682FFF3 */ sh $v0, -0xd($s4) /* 3B65A8 E00B48B8 4600D18D */ trunc.w.s $f6, $f26 /* 3B65AC E00B48BC 44023000 */ mfc1 $v0, $f6 -/* 3B65B0 E00B48C0 00000000 */ nop +/* 3B65B0 E00B48C0 00000000 */ nop /* 3B65B4 E00B48C4 A682FFF5 */ sh $v0, -0xb($s4) /* 3B65B8 E00B48C8 96A2FFFA */ lhu $v0, -6($s5) /* 3B65BC E00B48CC A682FFF9 */ sh $v0, -7($s4) @@ -239,11 +239,11 @@ glabel func_E00B457C /* 3B660C E00B491C 36101630 */ ori $s0, $s0, 0x1630 /* 3B6610 E00B4920 0000B82D */ daddu $s7, $zero, $zero /* 3B6614 E00B4924 4600F506 */ mov.s $f20, $f30 -/* 3B6618 E00B4928 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3B661C E00B492C 2442A674 */ addiu $v0, $v0, %lo(D_8009A674) +/* 3B6618 E00B4928 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3B661C E00B492C 2442A674 */ addiu $v0, $v0, %lo(gDisplayContext) /* 3B6620 E00B4930 0040A82D */ daddu $s5, $v0, $zero -/* 3B6624 E00B4934 3C028007 */ lui $v0, %hi(D_800741F0) -/* 3B6628 E00B4938 244241F0 */ addiu $v0, $v0, %lo(D_800741F0) +/* 3B6624 E00B4934 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* 3B6628 E00B4938 244241F0 */ addiu $v0, $v0, %lo(gMatrixListPos) /* 3B662C E00B493C 0040982D */ daddu $s3, $v0, $zero /* 3B6630 E00B4940 3C013DCC */ lui $at, 0x3dcc /* 3B6634 E00B4944 3421CCCD */ ori $at, $at, 0xcccd @@ -261,8 +261,8 @@ glabel func_E00B457C /* 3B6664 E00B4974 00B02821 */ addu $a1, $a1, $s0 /* 3B6668 E00B4978 0C080118 */ jal func_E0200460 /* 3B666C E00B497C 00452821 */ addu $a1, $v0, $a1 -/* 3B6670 E00B4980 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 3B6674 E00B4984 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 3B6670 E00B4980 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 3B6674 E00B4984 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 3B6678 E00B4988 8C440000 */ lw $a0, ($v0) /* 3B667C E00B498C 0040902D */ daddu $s2, $v0, $zero /* 3B6680 E00B4990 0080282D */ daddu $a1, $a0, $zero @@ -360,8 +360,8 @@ glabel func_E00B457C /* 3B67E8 E00B4AF8 2AE20004 */ slti $v0, $s7, 4 /* 3B67EC E00B4AFC 1440FFCA */ bnez $v0, .LE00B4A28 /* 3B67F0 E00B4B00 26310004 */ addiu $s1, $s1, 4 -/* 3B67F4 E00B4B04 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 3B67F8 E00B4B08 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 3B67F4 E00B4B04 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 3B67F8 E00B4B08 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 3B67FC E00B4B0C 3C02DE00 */ lui $v0, 0xde00 /* 3B6800 E00B4B10 8C830000 */ lw $v1, ($a0) /* 3B6804 E00B4B14 3C01E00B */ lui $at, %hi(D_E00B4EF8) @@ -380,7 +380,7 @@ glabel func_E00B457C /* 3B6838 E00B4B48 3C02FA00 */ lui $v0, 0xfa00 /* 3B683C E00B4B4C 246C0004 */ addiu $t4, $v1, 4 /* 3B6840 E00B4B50 46220002 */ mul.d $f0, $f0, $f2 -/* 3B6844 E00B4B54 00000000 */ nop +/* 3B6844 E00B4B54 00000000 */ nop /* 3B6848 E00B4B58 AC620000 */ sw $v0, ($v1) /* 3B684C E00B4B5C 8FAD00A0 */ lw $t5, 0xa0($sp) /* 3B6850 E00B4B60 3C0141E0 */ lui $at, 0x41e0 @@ -394,7 +394,7 @@ glabel func_E00B457C /* 3B6870 E00B4B80 00832025 */ or $a0, $a0, $v1 /* 3B6874 E00B4B84 00021200 */ sll $v0, $v0, 8 /* 3B6878 E00B4B88 4620103E */ c.le.d $f2, $f0 -/* 3B687C E00B4B8C 00000000 */ nop +/* 3B687C E00B4B8C 00000000 */ nop /* 3B6880 E00B4B90 45010005 */ bc1t .LE00B4BA8 /* 3B6884 E00B4B94 00825825 */ or $t3, $a0, $v0 /* 3B6888 E00B4B98 4620018D */ trunc.w.d $f6, $f0 @@ -406,7 +406,7 @@ glabel func_E00B457C /* 3B689C E00B4BAC 3C028000 */ lui $v0, 0x8000 /* 3B68A0 E00B4BB0 4620018D */ trunc.w.d $f6, $f0 /* 3B68A4 E00B4BB4 440A3000 */ mfc1 $t2, $f6 -/* 3B68A8 E00B4BB8 00000000 */ nop +/* 3B68A8 E00B4BB8 00000000 */ nop /* 3B68AC E00B4BBC 01425025 */ or $t2, $t2, $v0 /* 3B68B0 E00B4BC0 3C05D9FF */ lui $a1, 0xd9ff .LE00B4BC4: @@ -419,8 +419,8 @@ glabel func_E00B457C /* 3B68CC E00B4BDC 3529C018 */ ori $t1, $t1, 0xc018 /* 3B68D0 E00B4BE0 3C08D838 */ lui $t0, 0xd838 /* 3B68D4 E00B4BE4 35080002 */ ori $t0, $t0, 2 -/* 3B68D8 E00B4BE8 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 3B68DC E00B4BEC 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 3B68D8 E00B4BE8 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 3B68DC E00B4BEC 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 3B68E0 E00B4BF0 314200FF */ andi $v0, $t2, 0xff /* 3B68E4 E00B4BF4 8C830000 */ lw $v1, ($a0) /* 3B68E8 E00B4BF8 01621025 */ or $v0, $t3, $v0 diff --git a/asm/nonmatchings/code_3B7160/func_E00B62E0.s b/asm/nonmatchings/code_3B7160/func_E00B62E0.s index 1f64e9327b..423152a353 100644 --- a/asm/nonmatchings/code_3B7160/func_E00B62E0.s +++ b/asm/nonmatchings/code_3B7160/func_E00B62E0.s @@ -10,8 +10,8 @@ glabel func_E00B62E0 /* 3B7454 E00B62F4 AFB600A8 */ sw $s6, 0xa8($sp) /* 3B7458 E00B62F8 3C160001 */ lui $s6, 1 /* 3B745C E00B62FC AFB3009C */ sw $s3, 0x9c($sp) -/* 3B7460 E00B6300 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 3B7464 E00B6304 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 3B7460 E00B6300 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 3B7464 E00B6304 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 3B7468 E00B6308 36D61630 */ ori $s6, $s6, 0x1630 /* 3B746C E00B630C AFBF00B0 */ sw $ra, 0xb0($sp) /* 3B7470 E00B6310 AFB700AC */ sw $s7, 0xac($sp) @@ -42,7 +42,7 @@ glabel func_E00B62E0 /* 3B74D4 E00B6374 3C038000 */ lui $v1, 0x8000 /* 3B74D8 E00B6378 4600A521 */ cvt.d.s $f20, $f20 /* 3B74DC E00B637C 4620A502 */ mul.d $f20, $f20, $f0 -/* 3B74E0 E00B6380 00000000 */ nop +/* 3B74E0 E00B6380 00000000 */ nop /* 3B74E4 E00B6384 00431021 */ addu $v0, $v0, $v1 /* 3B74E8 E00B6388 3C03800B */ lui $v1, %hi(gCameras) /* 3B74EC E00B638C 24631D80 */ addiu $v1, $v1, %lo(gCameras) @@ -73,10 +73,10 @@ glabel func_E00B62E0 /* 3B7550 E00B63F0 0C080114 */ jal func_E0200450 /* 3B7554 E00B63F4 00A0302D */ daddu $a2, $a1, $zero /* 3B7558 E00B63F8 27A40010 */ addiu $a0, $sp, 0x10 -/* 3B755C E00B63FC 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3B7560 E00B6400 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3B7564 E00B6404 3C14800A */ lui $s4, %hi(D_8009A674) -/* 3B7568 E00B6408 2694A674 */ addiu $s4, $s4, %lo(D_8009A674) +/* 3B755C E00B63FC 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3B7560 E00B6400 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3B7564 E00B6404 3C14800A */ lui $s4, %hi(gDisplayContext) +/* 3B7568 E00B6408 2694A674 */ addiu $s4, $s4, %lo(gDisplayContext) /* 3B756C E00B640C 96050000 */ lhu $a1, ($s0) /* 3B7570 E00B6410 8E820000 */ lw $v0, ($s4) /* 3B7574 E00B6414 00052980 */ sll $a1, $a1, 6 @@ -162,7 +162,7 @@ glabel func_E00B62E0 /* 3B76B0 E00B6550 A0EB0000 */ sb $t3, ($a3) /* 3B76B4 E00B6554 4600018D */ trunc.w.s $f6, $f0 /* 3B76B8 E00B6558 44023000 */ mfc1 $v0, $f6 -/* 3B76BC E00B655C 00000000 */ nop +/* 3B76BC E00B655C 00000000 */ nop /* 3B76C0 E00B6560 00021140 */ sll $v0, $v0, 5 /* 3B76C4 E00B6564 A4E2FFFB */ sh $v0, -5($a3) /* 3B76C8 E00B6568 24E70010 */ addiu $a3, $a3, 0x10 @@ -177,21 +177,21 @@ glabel func_E00B62E0 /* 3B76EC E00B658C A4E0FFF5 */ sh $zero, -0xb($a3) /* 3B76F0 E00B6590 A4E3FFF9 */ sh $v1, -7($a3) /* 3B76F4 E00B6594 46020002 */ mul.s $f0, $f0, $f2 -/* 3B76F8 E00B6598 00000000 */ nop +/* 3B76F8 E00B6598 00000000 */ nop /* 3B76FC E00B659C A4EEFFFB */ sh $t6, -5($a3) /* 3B7700 E00B65A0 A0ECFFFD */ sb $t4, -3($a3) /* 3B7704 E00B65A4 A0ECFFFE */ sb $t4, -2($a3) /* 3B7708 E00B65A8 A0ECFFFF */ sb $t4, -1($a3) /* 3B770C E00B65AC 4600018D */ trunc.w.s $f6, $f0 /* 3B7710 E00B65B0 44023000 */ mfc1 $v0, $f6 -/* 3B7714 E00B65B4 00000000 */ nop +/* 3B7714 E00B65B4 00000000 */ nop /* 3B7718 E00B65B8 A4E2FFF3 */ sh $v0, -0xd($a3) /* 3B771C E00B65BC 2922000C */ slti $v0, $t1, 0xc /* 3B7720 E00B65C0 1440FFD7 */ bnez $v0, .LE00B6520 /* 3B7724 E00B65C4 24E70010 */ addiu $a3, $a3, 0x10 /* 3B7728 E00B65C8 0120302D */ daddu $a2, $t1, $zero -/* 3B772C E00B65CC 3C07800A */ lui $a3, %hi(D_8009A66C) -/* 3B7730 E00B65D0 24E7A66C */ addiu $a3, $a3, %lo(D_8009A66C) +/* 3B772C E00B65CC 3C07800A */ lui $a3, %hi(gMasterGfxPos) +/* 3B7730 E00B65D0 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) /* 3B7734 E00B65D4 00061040 */ sll $v0, $a2, 1 /* 3B7738 E00B65D8 0000482D */ daddu $t1, $zero, $zero /* 3B773C E00B65DC 304400FF */ andi $a0, $v0, 0xff @@ -247,7 +247,7 @@ glabel func_E00B62E0 /* 3B77F4 E00B6694 AC820000 */ sw $v0, ($a0) .LE00B6698: /* 3B77F8 E00B6698 14A00003 */ bnez $a1, .LE00B66A8 -/* 3B77FC E00B669C 00000000 */ nop +/* 3B77FC E00B669C 00000000 */ nop /* 3B7800 E00B66A0 0802D9B5 */ j .LE00B66D4 /* 3B7804 E00B66A4 AC8F0004 */ sw $t7, 4($a0) .LE00B66A8: @@ -272,8 +272,8 @@ glabel func_E00B62E0 /* 3B7848 E00B66E8 254A0004 */ addiu $t2, $t2, 4 .LE00B66EC: /* 3B784C E00B66EC 3C05D838 */ lui $a1, 0xd838 -/* 3B7850 E00B66F0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 3B7854 E00B66F4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 3B7850 E00B66F0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 3B7854 E00B66F4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 3B7858 E00B66F8 8C620000 */ lw $v0, ($v1) /* 3B785C E00B66FC 34A50002 */ ori $a1, $a1, 2 /* 3B7860 E00B6700 0040202D */ daddu $a0, $v0, $zero @@ -294,5 +294,5 @@ glabel func_E00B62E0 /* 3B789C E00B673C D7B400B8 */ ldc1 $f20, 0xb8($sp) /* 3B78A0 E00B6740 03E00008 */ jr $ra /* 3B78A4 E00B6744 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 3B78A8 E00B6748 00000000 */ nop -/* 3B78AC E00B674C 00000000 */ nop +/* 3B78A8 E00B6748 00000000 */ nop +/* 3B78AC E00B674C 00000000 */ nop diff --git a/asm/nonmatchings/code_3B7B80/func_E00B8208.s b/asm/nonmatchings/code_3B7B80/func_E00B8208.s index f60db10268..ed95b82e31 100644 --- a/asm/nonmatchings/code_3B7B80/func_E00B8208.s +++ b/asm/nonmatchings/code_3B7B80/func_E00B8208.s @@ -60,8 +60,8 @@ glabel func_E00B8208 /* 3B7E5C E00B82DC 3C05DB06 */ lui $a1, 0xdb06 /* 3B7E60 E00B82E0 34A50024 */ ori $a1, $a1, 0x24 /* 3B7E64 E00B82E4 27A40018 */ addiu $a0, $sp, 0x18 -/* 3B7E68 E00B82E8 3C14800A */ lui $s4, %hi(D_8009A66C) -/* 3B7E6C E00B82EC 2694A66C */ addiu $s4, $s4, %lo(D_8009A66C) +/* 3B7E68 E00B82E8 3C14800A */ lui $s4, %hi(gMasterGfxPos) +/* 3B7E6C E00B82EC 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) /* 3B7E70 E00B82F0 3C120001 */ lui $s2, 1 /* 3B7E74 E00B82F4 8E880000 */ lw $t0, ($s4) /* 3B7E78 E00B82F8 3C02E700 */ lui $v0, 0xe700 @@ -94,10 +94,10 @@ glabel func_E00B8208 /* 3B7EE4 E00B8364 0C080114 */ jal func_E0200450 /* 3B7EE8 E00B8368 00A0302D */ daddu $a2, $a1, $zero /* 3B7EEC E00B836C 27A40018 */ addiu $a0, $sp, 0x18 -/* 3B7EF0 E00B8370 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3B7EF4 E00B8374 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3B7EF8 E00B8378 3C11800A */ lui $s1, %hi(D_8009A674) -/* 3B7EFC E00B837C 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 3B7EF0 E00B8370 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3B7EF4 E00B8374 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3B7EF8 E00B8378 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 3B7EFC E00B837C 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 3B7F00 E00B8380 96050000 */ lhu $a1, ($s0) /* 3B7F04 E00B8384 8E220000 */ lw $v0, ($s1) /* 3B7F08 E00B8388 00052980 */ sll $a1, $a1, 6 @@ -236,8 +236,8 @@ glabel func_E00B8208 /* 3B8114 E00B8594 0000902D */ daddu $s2, $zero, $zero /* 3B8118 E00B8598 3C1E0001 */ lui $fp, 1 /* 3B811C E00B859C 37DE1630 */ ori $fp, $fp, 0x1630 -/* 3B8120 E00B85A0 3C14800A */ lui $s4, %hi(D_8009A66C) -/* 3B8124 E00B85A4 2694A66C */ addiu $s4, $s4, %lo(D_8009A66C) +/* 3B8120 E00B85A0 3C14800A */ lui $s4, %hi(gMasterGfxPos) +/* 3B8124 E00B85A4 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) /* 3B8128 E00B85A8 8FAA00C4 */ lw $t2, 0xc4($sp) /* 3B812C E00B85AC 0240982D */ daddu $s3, $s2, $zero /* 3B8130 E00B85B0 AFAA00B8 */ sw $t2, 0xb8($sp) @@ -256,7 +256,7 @@ glabel func_E00B8208 /* 3B815C E00B85DC 16C10004 */ bne $s6, $at, .LE00B85F0 /* 3B8160 E00B85E0 3C018000 */ lui $at, 0x8000 /* 3B8164 E00B85E4 15410002 */ bne $t2, $at, .LE00B85F0 -/* 3B8168 E00B85E8 00000000 */ nop +/* 3B8168 E00B85E8 00000000 */ nop /* 3B816C E00B85EC 0006000D */ break 6 .LE00B85F0: /* 3B8170 E00B85F0 00001810 */ mfhi $v1 @@ -282,12 +282,12 @@ glabel func_E00B8208 /* 3B81C0 E00B8640 44811000 */ mtc1 $at, $f2 /* 3B81C4 E00B8644 4407A000 */ mfc1 $a3, $f20 /* 3B81C8 E00B8648 44820000 */ mtc1 $v0, $f0 -/* 3B81CC E00B864C 00000000 */ nop +/* 3B81CC E00B864C 00000000 */ nop /* 3B81D0 E00B8650 46800020 */ cvt.s.w $f0, $f0 /* 3B81D4 E00B8654 82220000 */ lb $v0, ($s1) /* 3B81D8 E00B8658 46020000 */ add.s $f0, $f0, $f2 /* 3B81DC E00B865C 44822000 */ mtc1 $v0, $f4 -/* 3B81E0 E00B8660 00000000 */ nop +/* 3B81E0 E00B8660 00000000 */ nop /* 3B81E4 E00B8664 46802120 */ cvt.s.w $f4, $f4 /* 3B81E8 E00B8668 44052000 */ mfc1 $a1, $f4 /* 3B81EC E00B866C 44060000 */ mfc1 $a2, $f0 @@ -297,18 +297,18 @@ glabel func_E00B8208 /* 3B81FC E00B867C 020A8021 */ addu $s0, $s0, $t2 /* 3B8200 E00B8680 86020002 */ lh $v0, 2($s0) /* 3B8204 E00B8684 44821000 */ mtc1 $v0, $f2 -/* 3B8208 E00B8688 00000000 */ nop +/* 3B8208 E00B8688 00000000 */ nop /* 3B820C E00B868C 468010A0 */ cvt.s.w $f2, $f2 /* 3B8210 E00B8690 460010A1 */ cvt.d.s $f2, $f2 /* 3B8214 E00B8694 46361082 */ mul.d $f2, $f2, $f22 -/* 3B8218 E00B8698 00000000 */ nop +/* 3B8218 E00B8698 00000000 */ nop /* 3B821C E00B869C 86020004 */ lh $v0, 4($s0) /* 3B8220 E00B86A0 44820000 */ mtc1 $v0, $f0 -/* 3B8224 E00B86A4 00000000 */ nop +/* 3B8224 E00B86A4 00000000 */ nop /* 3B8228 E00B86A8 46800020 */ cvt.s.w $f0, $f0 /* 3B822C E00B86AC 46000021 */ cvt.d.s $f0, $f0 /* 3B8230 E00B86B0 46360002 */ mul.d $f0, $f0, $f22 -/* 3B8234 E00B86B4 00000000 */ nop +/* 3B8234 E00B86B4 00000000 */ nop /* 3B8238 E00B86B8 4407C000 */ mfc1 $a3, $f24 /* 3B823C E00B86BC 462010A0 */ cvt.s.d $f2, $f2 /* 3B8240 E00B86C0 44051000 */ mfc1 $a1, $f2 @@ -324,7 +324,7 @@ glabel func_E00B8208 /* 3B8268 E00B86E8 3C0AE00C */ lui $t2, %hi(D_E00B8CA4) /* 3B826C E00B86EC 254A8CA4 */ addiu $t2, $t2, %lo(D_E00B8CA4) /* 3B8270 E00B86F0 44821000 */ mtc1 $v0, $f2 -/* 3B8274 E00B86F4 00000000 */ nop +/* 3B8274 E00B86F4 00000000 */ nop /* 3B8278 E00B86F8 468010A0 */ cvt.s.w $f2, $f2 /* 3B827C E00B86FC 02571021 */ addu $v0, $s2, $s7 /* 3B8280 E00B8700 30420007 */ andi $v0, $v0, 7 @@ -344,10 +344,10 @@ glabel func_E00B8208 /* 3B82B8 E00B8738 0C080114 */ jal func_E0200450 /* 3B82BC E00B873C 00A0302D */ daddu $a2, $a1, $zero /* 3B82C0 E00B8740 27A40018 */ addiu $a0, $sp, 0x18 -/* 3B82C4 E00B8744 3C058007 */ lui $a1, %hi(D_800741F0) -/* 3B82C8 E00B8748 94A541F0 */ lhu $a1, %lo(D_800741F0)($a1) -/* 3B82CC E00B874C 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3B82D0 E00B8750 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 3B82C4 E00B8744 3C058007 */ lui $a1, %hi(gMatrixListPos) +/* 3B82C8 E00B8748 94A541F0 */ lhu $a1, %lo(gMatrixListPos)($a1) +/* 3B82CC E00B874C 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3B82D0 E00B8750 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3B82D4 E00B8754 00052980 */ sll $a1, $a1, 6 /* 3B82D8 E00B8758 00BE2821 */ addu $a1, $a1, $fp /* 3B82DC E00B875C 0C080118 */ jal func_E0200460 @@ -358,17 +358,17 @@ glabel func_E00B8208 /* 3B82F0 E00B8770 0080282D */ daddu $a1, $a0, $zero /* 3B82F4 E00B8774 24840008 */ addiu $a0, $a0, 8 /* 3B82F8 E00B8778 AE840000 */ sw $a0, ($s4) -/* 3B82FC E00B877C 3C028007 */ lui $v0, %hi(D_800741F0) -/* 3B8300 E00B8780 944241F0 */ lhu $v0, %lo(D_800741F0)($v0) +/* 3B82FC E00B877C 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* 3B8300 E00B8780 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) /* 3B8304 E00B8784 3C03DA38 */ lui $v1, 0xda38 /* 3B8308 E00B8788 ACA30000 */ sw $v1, ($a1) /* 3B830C E00B878C 24430001 */ addiu $v1, $v0, 1 /* 3B8310 E00B8790 3042FFFF */ andi $v0, $v0, 0xffff /* 3B8314 E00B8794 00021180 */ sll $v0, $v0, 6 -/* 3B8318 E00B8798 3C018007 */ lui $at, %hi(D_800741F0) -/* 3B831C E00B879C A42341F0 */ sh $v1, %lo(D_800741F0)($at) -/* 3B8320 E00B87A0 3C03800A */ lui $v1, %hi(D_8009A674) -/* 3B8324 E00B87A4 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 3B8318 E00B8798 3C018007 */ lui $at, %hi(gMatrixListPos) +/* 3B831C E00B879C A42341F0 */ sh $v1, %lo(gMatrixListPos)($at) +/* 3B8320 E00B87A0 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 3B8324 E00B87A4 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 3B8328 E00B87A8 005E1021 */ addu $v0, $v0, $fp /* 3B832C E00B87AC 00621821 */ addu $v1, $v1, $v0 /* 3B8330 E00B87B0 24820008 */ addiu $v0, $a0, 8 @@ -421,8 +421,8 @@ glabel func_E00B8208 /* 3B83E4 E00B8864 AFAA00C4 */ sw $t2, 0xc4($sp) .LE00B8868: /* 3B83E8 E00B8868 3C06D838 */ lui $a2, 0xd838 -/* 3B83EC E00B886C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 3B83F0 E00B8870 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 3B83EC E00B886C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 3B83F0 E00B8870 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 3B83F4 E00B8874 34C60002 */ ori $a2, $a2, 2 /* 3B83F8 E00B8878 8C820000 */ lw $v0, ($a0) /* 3B83FC E00B887C 24050040 */ addiu $a1, $zero, 0x40 diff --git a/asm/nonmatchings/code_3B8BD0/func_E00BA620.s b/asm/nonmatchings/code_3B8BD0/func_E00BA620.s index bc61200c56..53c84c70c4 100644 --- a/asm/nonmatchings/code_3B8BD0/func_E00BA620.s +++ b/asm/nonmatchings/code_3B8BD0/func_E00BA620.s @@ -8,8 +8,8 @@ glabel func_E00BA620 /* 3B91FC E00BA62C 3C07FF10 */ lui $a3, 0xff10 /* 3B9200 E00BA630 34E7013F */ ori $a3, $a3, 0x13f /* 3B9204 E00BA634 0000682D */ daddu $t5, $zero, $zero -/* 3B9208 E00BA638 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 3B920C E00BA63C 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 3B9208 E00BA638 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 3B920C E00BA63C 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 3B9210 E00BA640 0040402D */ daddu $t0, $v0, $zero /* 3B9214 E00BA644 AFB200B8 */ sw $s2, 0xb8($sp) /* 3B9218 E00BA648 3C12FD10 */ lui $s2, 0xfd10 @@ -154,8 +154,8 @@ glabel func_E00BA620 /* 3B9440 E00BA870 27A40020 */ addiu $a0, $sp, 0x20 /* 3B9444 E00BA874 3C130001 */ lui $s3, 1 /* 3B9448 E00BA878 36731630 */ ori $s3, $s3, 0x1630 -/* 3B944C E00BA87C 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 3B9450 E00BA880 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 3B944C E00BA87C 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 3B9450 E00BA880 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 3B9454 E00BA884 8E080000 */ lw $t0, ($s0) /* 3B9458 E00BA888 3C05C2A0 */ lui $a1, 0xc2a0 /* 3B945C E00BA88C 3C03800A */ lui $v1, %hi(D_8009A64C) @@ -226,10 +226,10 @@ glabel func_E00BA620 /* 3B9560 E00BA990 0C080188 */ jal func_E0200620 /* 3B9564 E00BA994 E7A6001C */ swc1 $f6, 0x1c($sp) /* 3B9568 E00BA998 27A40020 */ addiu $a0, $sp, 0x20 -/* 3B956C E00BA99C 3C118007 */ lui $s1, %hi(D_800741F0) -/* 3B9570 E00BA9A0 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 3B9574 E00BA9A4 3C12800A */ lui $s2, %hi(D_8009A674) -/* 3B9578 E00BA9A8 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 3B956C E00BA99C 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 3B9570 E00BA9A0 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 3B9574 E00BA9A4 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 3B9578 E00BA9A8 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 3B957C E00BA9AC 96250000 */ lhu $a1, ($s1) /* 3B9580 E00BA9B0 8E420000 */ lw $v0, ($s2) /* 3B9584 E00BA9B4 00052980 */ sll $a1, $a1, 6 @@ -490,8 +490,8 @@ glabel func_E00BA620 /* 3B9958 E00BAD88 3C06FF10 */ lui $a2, 0xff10 /* 3B995C E00BAD8C 34C6013F */ ori $a2, $a2, 0x13f /* 3B9960 E00BAD90 3C07DA38 */ lui $a3, 0xda38 -/* 3B9964 E00BAD94 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 3B9968 E00BAD98 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 3B9964 E00BAD94 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 3B9968 E00BAD98 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 3B996C E00BAD9C 8CA30000 */ lw $v1, ($a1) /* 3B9970 E00BADA0 3C04800A */ lui $a0, %hi(nuGfxZBuffer) /* 3B9974 E00BADA4 8C84A5DC */ lw $a0, %lo(nuGfxZBuffer)($a0) @@ -522,8 +522,8 @@ glabel func_E00BA620 /* 3B99D8 E00BAE08 AC660010 */ sw $a2, 0x10($v1) /* 3B99DC E00BAE0C AC600014 */ sw $zero, 0x14($v1) /* 3B99E0 E00BAE10 ACA20000 */ sw $v0, ($a1) -/* 3B99E4 E00BAE14 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3B99E8 E00BAE18 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 3B99E4 E00BAE14 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3B99E8 E00BAE18 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3B99EC E00BAE1C 34E70007 */ ori $a3, $a3, 7 /* 3B99F0 E00BAE20 AC670018 */ sw $a3, 0x18($v1) /* 3B99F4 E00BAE24 00042180 */ sll $a0, $a0, 6 @@ -546,6 +546,6 @@ glabel func_E00BA620 /* 3B9A38 E00BAE68 8FB000B0 */ lw $s0, 0xb0($sp) /* 3B9A3C E00BAE6C 03E00008 */ jr $ra /* 3B9A40 E00BAE70 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 3B9A44 E00BAE74 00000000 */ nop -/* 3B9A48 E00BAE78 00000000 */ nop -/* 3B9A4C E00BAE7C 00000000 */ nop +/* 3B9A44 E00BAE74 00000000 */ nop +/* 3B9A48 E00BAE78 00000000 */ nop +/* 3B9A4C E00BAE7C 00000000 */ nop diff --git a/asm/nonmatchings/code_3BA030/func_E00BC374.s b/asm/nonmatchings/code_3BA030/func_E00BC374.s index f66f2e4100..e2c7c2680f 100644 --- a/asm/nonmatchings/code_3BA030/func_E00BC374.s +++ b/asm/nonmatchings/code_3BA030/func_E00BC374.s @@ -11,8 +11,8 @@ glabel func_E00BC374 /* 3BA3BC E00BC38C 3C140001 */ lui $s4, 1 /* 3BA3C0 E00BC390 36941630 */ ori $s4, $s4, 0x1630 /* 3BA3C4 E00BC394 AFB100A4 */ sw $s1, 0xa4($sp) -/* 3BA3C8 E00BC398 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 3BA3CC E00BC39C 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 3BA3C8 E00BC398 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 3BA3CC E00BC39C 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 3BA3D0 E00BC3A0 3C013DCC */ lui $at, 0x3dcc /* 3BA3D4 E00BC3A4 3421CCCD */ ori $at, $at, 0xcccd /* 3BA3D8 E00BC3A8 44810000 */ mtc1 $at, $f0 @@ -56,10 +56,10 @@ glabel func_E00BC374 /* 3BA470 E00BC440 0C080110 */ jal func_E0200440 /* 3BA474 E00BC444 AD020004 */ sw $v0, 4($t0) /* 3BA478 E00BC448 27A40010 */ addiu $a0, $sp, 0x10 -/* 3BA47C E00BC44C 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3BA480 E00BC450 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3BA484 E00BC454 3C12800A */ lui $s2, %hi(D_8009A674) -/* 3BA488 E00BC458 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 3BA47C E00BC44C 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3BA480 E00BC450 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3BA484 E00BC454 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 3BA488 E00BC458 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 3BA48C E00BC45C 96050000 */ lhu $a1, ($s0) /* 3BA490 E00BC460 8E420000 */ lw $v0, ($s2) /* 3BA494 E00BC464 00052980 */ sll $a1, $a1, 6 @@ -193,12 +193,12 @@ glabel func_E00BC374 /* 3BA67C E00BC64C C6A00010 */ lwc1 $f0, 0x10($s5) /* 3BA680 E00BC650 4600C601 */ sub.s $f24, $f24, $f0 /* 3BA684 E00BC654 461EC602 */ mul.s $f24, $f24, $f30 -/* 3BA688 E00BC658 00000000 */ nop +/* 3BA688 E00BC658 00000000 */ nop /* 3BA68C E00BC65C C6B60020 */ lwc1 $f22, 0x20($s5) /* 3BA690 E00BC660 C6A00014 */ lwc1 $f0, 0x14($s5) /* 3BA694 E00BC664 4600B581 */ sub.s $f22, $f22, $f0 /* 3BA698 E00BC668 461EB582 */ mul.s $f22, $f22, $f30 -/* 3BA69C E00BC66C 00000000 */ nop +/* 3BA69C E00BC66C 00000000 */ nop /* 3BA6A0 E00BC670 02538021 */ addu $s0, $s2, $s3 /* 3BA6A4 E00BC674 000417C3 */ sra $v0, $a0, 0x1f /* 3BA6A8 E00BC678 00007010 */ mfhi $t6 @@ -211,61 +211,61 @@ glabel func_E00BC374 /* 3BA6C4 E00BC694 00822023 */ subu $a0, $a0, $v0 /* 3BA6C8 E00BC698 2484FFC4 */ addiu $a0, $a0, -0x3c /* 3BA6CC E00BC69C 4484E000 */ mtc1 $a0, $f28 -/* 3BA6D0 E00BC6A0 00000000 */ nop +/* 3BA6D0 E00BC6A0 00000000 */ nop /* 3BA6D4 E00BC6A4 4680E720 */ cvt.s.w $f28, $f28 /* 3BA6D8 E00BC6A8 92020000 */ lbu $v0, ($s0) /* 3BA6DC E00BC6AC 4482D000 */ mtc1 $v0, $f26 -/* 3BA6E0 E00BC6B0 00000000 */ nop +/* 3BA6E0 E00BC6B0 00000000 */ nop /* 3BA6E4 E00BC6B4 4680D6A0 */ cvt.s.w $f26, $f26 /* 3BA6E8 E00BC6B8 0C080140 */ jal func_E0200500 /* 3BA6EC E00BC6BC 4600E306 */ mov.s $f12, $f28 /* 3BA6F0 E00BC6C0 461A0502 */ mul.s $f20, $f0, $f26 -/* 3BA6F4 E00BC6C4 00000000 */ nop +/* 3BA6F4 E00BC6C4 00000000 */ nop /* 3BA6F8 E00BC6C8 3C01E00C */ lui $at, %hi(D_E00BCE58) /* 3BA6FC E00BC6CC D430CE58 */ ldc1 $f16, %lo(D_E00BCE58)($at) /* 3BA700 E00BC6D0 4600A521 */ cvt.d.s $f20, $f20 /* 3BA704 E00BC6D4 4630A502 */ mul.d $f20, $f20, $f16 -/* 3BA708 E00BC6D8 00000000 */ nop +/* 3BA708 E00BC6D8 00000000 */ nop /* 3BA70C E00BC6DC 4600E306 */ mov.s $f12, $f28 /* 3BA710 E00BC6E0 0C080144 */ jal func_E0200510 /* 3BA714 E00BC6E4 4620A520 */ cvt.s.d $f20, $f20 /* 3BA718 E00BC6E8 461A0002 */ mul.s $f0, $f0, $f26 -/* 3BA71C E00BC6EC 00000000 */ nop +/* 3BA71C E00BC6EC 00000000 */ nop /* 3BA720 E00BC6F0 3C01E00C */ lui $at, %hi(D_E00BCE60) /* 3BA724 E00BC6F4 D430CE60 */ ldc1 $f16, %lo(D_E00BCE60)($at) /* 3BA728 E00BC6F8 46000021 */ cvt.d.s $f0, $f0 /* 3BA72C E00BC6FC 46300002 */ mul.d $f0, $f0, $f16 -/* 3BA730 E00BC700 00000000 */ nop +/* 3BA730 E00BC700 00000000 */ nop /* 3BA734 E00BC704 4614B182 */ mul.s $f6, $f22, $f20 -/* 3BA738 E00BC708 00000000 */ nop +/* 3BA738 E00BC708 00000000 */ nop /* 3BA73C E00BC70C C6A2001C */ lwc1 $f2, 0x1c($s5) /* 3BA740 E00BC710 C6A40010 */ lwc1 $f4, 0x10($s5) /* 3BA744 E00BC714 46041081 */ sub.s $f2, $f2, $f4 /* 3BA748 E00BC718 44935000 */ mtc1 $s3, $f10 -/* 3BA74C E00BC71C 00000000 */ nop +/* 3BA74C E00BC71C 00000000 */ nop /* 3BA750 E00BC720 468052A0 */ cvt.s.w $f10, $f10 /* 3BA754 E00BC724 460A1082 */ mul.s $f2, $f2, $f10 -/* 3BA758 E00BC728 00000000 */ nop +/* 3BA758 E00BC728 00000000 */ nop /* 3BA75C E00BC72C 461E1082 */ mul.s $f2, $f2, $f30 -/* 3BA760 E00BC730 00000000 */ nop +/* 3BA760 E00BC730 00000000 */ nop /* 3BA764 E00BC734 46200020 */ cvt.s.d $f0, $f0 /* 3BA768 E00BC738 4600C202 */ mul.s $f8, $f24, $f0 -/* 3BA76C E00BC73C 00000000 */ nop +/* 3BA76C E00BC73C 00000000 */ nop /* 3BA770 E00BC740 4614C602 */ mul.s $f24, $f24, $f20 -/* 3BA774 E00BC744 00000000 */ nop +/* 3BA774 E00BC744 00000000 */ nop /* 3BA778 E00BC748 46022100 */ add.s $f4, $f4, $f2 /* 3BA77C E00BC74C 46064201 */ sub.s $f8, $f8, $f6 /* 3BA780 E00BC750 46082100 */ add.s $f4, $f4, $f8 /* 3BA784 E00BC754 4600B582 */ mul.s $f22, $f22, $f0 -/* 3BA788 E00BC758 00000000 */ nop +/* 3BA788 E00BC758 00000000 */ nop /* 3BA78C E00BC75C E6240050 */ swc1 $f4, 0x50($s1) /* 3BA790 E00BC760 C6A20020 */ lwc1 $f2, 0x20($s5) /* 3BA794 E00BC764 C6A40014 */ lwc1 $f4, 0x14($s5) /* 3BA798 E00BC768 46041081 */ sub.s $f2, $f2, $f4 /* 3BA79C E00BC76C 460A1082 */ mul.s $f2, $f2, $f10 -/* 3BA7A0 E00BC770 00000000 */ nop +/* 3BA7A0 E00BC770 00000000 */ nop /* 3BA7A4 E00BC774 461E1082 */ mul.s $f2, $f2, $f30 -/* 3BA7A8 E00BC778 00000000 */ nop +/* 3BA7A8 E00BC778 00000000 */ nop /* 3BA7AC E00BC77C 4616C600 */ add.s $f24, $f24, $f22 /* 3BA7B0 E00BC780 46022100 */ add.s $f4, $f4, $f2 /* 3BA7B4 E00BC784 46182100 */ add.s $f4, $f4, $f24 @@ -274,23 +274,23 @@ glabel func_E00BC374 /* 3BA7C0 E00BC790 C6A20018 */ lwc1 $f2, 0x18($s5) /* 3BA7C4 E00BC794 46020001 */ sub.s $f0, $f0, $f2 /* 3BA7C8 E00BC798 460A0002 */ mul.s $f0, $f0, $f10 -/* 3BA7CC E00BC79C 00000000 */ nop +/* 3BA7CC E00BC79C 00000000 */ nop /* 3BA7D0 E00BC7A0 461E0002 */ mul.s $f0, $f0, $f30 -/* 3BA7D4 E00BC7A4 00000000 */ nop +/* 3BA7D4 E00BC7A4 00000000 */ nop /* 3BA7D8 E00BC7A8 46001080 */ add.s $f2, $f2, $f0 /* 3BA7DC E00BC7AC 44808000 */ mtc1 $zero, $f16 -/* 3BA7E0 E00BC7B0 00000000 */ nop +/* 3BA7E0 E00BC7B0 00000000 */ nop /* 3BA7E4 E00BC7B4 46101080 */ add.s $f2, $f2, $f16 /* 3BA7E8 E00BC7B8 E62200B0 */ swc1 $f2, 0xb0($s1) /* 3BA7EC E00BC7BC 9202000C */ lbu $v0, 0xc($s0) /* 3BA7F0 E00BC7C0 3C01E00C */ lui $at, %hi(D_E00BCE68) /* 3BA7F4 E00BC7C4 D422CE68 */ ldc1 $f2, %lo(D_E00BCE68)($at) /* 3BA7F8 E00BC7C8 44820000 */ mtc1 $v0, $f0 -/* 3BA7FC E00BC7CC 00000000 */ nop +/* 3BA7FC E00BC7CC 00000000 */ nop /* 3BA800 E00BC7D0 46800020 */ cvt.s.w $f0, $f0 /* 3BA804 E00BC7D4 46000021 */ cvt.d.s $f0, $f0 /* 3BA808 E00BC7D8 46220002 */ mul.d $f0, $f0, $f2 -/* 3BA80C E00BC7DC 00000000 */ nop +/* 3BA80C E00BC7DC 00000000 */ nop /* 3BA810 E00BC7E0 26730001 */ addiu $s3, $s3, 1 /* 3BA814 E00BC7E4 2A62000C */ slti $v0, $s3, 0xc /* 3BA818 E00BC7E8 46200020 */ cvt.s.d $f0, $f0 @@ -303,8 +303,8 @@ glabel func_E00BC374 /* 3BA834 E00BC804 0260B02D */ daddu $s6, $s3, $zero /* 3BA838 E00BC808 02A0902D */ daddu $s2, $s5, $zero /* 3BA83C E00BC80C 46008706 */ mov.s $f28, $f16 -/* 3BA840 E00BC810 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 3BA844 E00BC814 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 3BA840 E00BC810 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 3BA844 E00BC814 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 3BA848 E00BC818 3C0143B4 */ lui $at, 0x43b4 /* 3BA84C E00BC81C 4481F000 */ mtc1 $at, $f30 /* 3BA850 E00BC820 3C02DE01 */ lui $v0, 0xde01 @@ -343,7 +343,7 @@ glabel func_E00BC374 /* 3BA8CC E00BC89C 3C01C2B4 */ lui $at, 0xc2b4 /* 3BA8D0 E00BC8A0 4481B000 */ mtc1 $at, $f22 /* 3BA8D4 E00BC8A4 0802F25B */ j .LE00BC96C -/* 3BA8D8 E00BC8A8 00000000 */ nop +/* 3BA8D8 E00BC8A8 00000000 */ nop .LE00BC8AC: /* 3BA8DC E00BC8AC 00021080 */ sll $v0, $v0, 2 /* 3BA8E0 E00BC8B0 02A21021 */ addu $v0, $s5, $v0 @@ -371,19 +371,19 @@ glabel func_E00BC374 /* 3BA938 E00BC908 46141101 */ sub.s $f4, $f2, $f20 /* 3BA93C E00BC90C 3C014334 */ lui $at, 0x4334 /* 3BA940 E00BC910 44810000 */ mtc1 $at, $f0 -/* 3BA944 E00BC914 00000000 */ nop +/* 3BA944 E00BC914 00000000 */ nop /* 3BA948 E00BC918 4604003C */ c.lt.s $f0, $f4 -/* 3BA94C E00BC91C 00000000 */ nop +/* 3BA94C E00BC91C 00000000 */ nop /* 3BA950 E00BC920 45000003 */ bc1f .LE00BC930 -/* 3BA954 E00BC924 00000000 */ nop +/* 3BA954 E00BC924 00000000 */ nop /* 3BA958 E00BC928 0802F253 */ j .LE00BC94C /* 3BA95C E00BC92C 461EA500 */ add.s $f20, $f20, $f30 .LE00BC930: /* 3BA960 E00BC930 3C01C334 */ lui $at, 0xc334 /* 3BA964 E00BC934 44810000 */ mtc1 $at, $f0 -/* 3BA968 E00BC938 00000000 */ nop +/* 3BA968 E00BC938 00000000 */ nop /* 3BA96C E00BC93C 4600203C */ c.lt.s $f4, $f0 -/* 3BA970 E00BC940 00000000 */ nop +/* 3BA970 E00BC940 00000000 */ nop /* 3BA974 E00BC944 45030001 */ bc1tl .LE00BC94C /* 3BA978 E00BC948 461E1080 */ add.s $f2, $f2, $f30 .LE00BC94C: @@ -393,77 +393,77 @@ glabel func_E00BC374 /* 3BA988 E00BC958 44800000 */ mtc1 $zero, $f0 /* 3BA98C E00BC95C 4600B0A1 */ cvt.d.s $f2, $f22 /* 3BA990 E00BC960 46201082 */ mul.d $f2, $f2, $f0 -/* 3BA994 E00BC964 00000000 */ nop +/* 3BA994 E00BC964 00000000 */ nop /* 3BA998 E00BC968 462015A0 */ cvt.s.d $f22, $f2 .LE00BC96C: /* 3BA99C E00BC96C C64000E0 */ lwc1 $f0, 0xe0($s2) /* 3BA9A0 E00BC970 C7B00094 */ lwc1 $f16, 0x94($sp) /* 3BA9A4 E00BC974 46008002 */ mul.s $f0, $f16, $f0 -/* 3BA9A8 E00BC978 00000000 */ nop +/* 3BA9A8 E00BC978 00000000 */ nop /* 3BA9AC E00BC97C 4600B306 */ mov.s $f12, $f22 /* 3BA9B0 E00BC980 8FAE0098 */ lw $t6, 0x98($sp) /* 3BA9B4 E00BC984 4600C602 */ mul.s $f24, $f24, $f0 -/* 3BA9B8 E00BC988 00000000 */ nop +/* 3BA9B8 E00BC988 00000000 */ nop /* 3BA9BC E00BC98C 24100080 */ addiu $s0, $zero, 0x80 /* 3BA9C0 E00BC990 020E8023 */ subu $s0, $s0, $t6 /* 3BA9C4 E00BC994 0C080140 */ jal func_E0200500 /* 3BA9C8 E00BC998 00108140 */ sll $s0, $s0, 5 /* 3BA9CC E00BC99C 4600C502 */ mul.s $f20, $f24, $f0 -/* 3BA9D0 E00BC9A0 00000000 */ nop +/* 3BA9D0 E00BC9A0 00000000 */ nop /* 3BA9D4 E00BC9A4 0C080144 */ jal func_E0200510 /* 3BA9D8 E00BC9A8 4600B306 */ mov.s $f12, $f22 /* 3BA9DC E00BC9AC C6420050 */ lwc1 $f2, 0x50($s2) /* 3BA9E0 E00BC9B0 46141080 */ add.s $f2, $f2, $f20 /* 3BA9E4 E00BC9B4 461A1082 */ mul.s $f2, $f2, $f26 -/* 3BA9E8 E00BC9B8 00000000 */ nop +/* 3BA9E8 E00BC9B8 00000000 */ nop /* 3BA9EC E00BC9BC 4600C002 */ mul.s $f0, $f24, $f0 -/* 3BA9F0 E00BC9C0 00000000 */ nop +/* 3BA9F0 E00BC9C0 00000000 */ nop /* 3BA9F4 E00BC9C4 4600140D */ trunc.w.s $f16, $f2 /* 3BA9F8 E00BC9C8 44028000 */ mfc1 $v0, $f16 -/* 3BA9FC E00BC9CC 00000000 */ nop +/* 3BA9FC E00BC9CC 00000000 */ nop /* 3BAA00 E00BC9D0 A6820000 */ sh $v0, ($s4) /* 3BAA04 E00BC9D4 C6420080 */ lwc1 $f2, 0x80($s2) /* 3BAA08 E00BC9D8 46001080 */ add.s $f2, $f2, $f0 /* 3BAA0C E00BC9DC 461A1082 */ mul.s $f2, $f2, $f26 -/* 3BAA10 E00BC9E0 00000000 */ nop +/* 3BAA10 E00BC9E0 00000000 */ nop /* 3BAA14 E00BC9E4 4600140D */ trunc.w.s $f16, $f2 /* 3BAA18 E00BC9E8 44028000 */ mfc1 $v0, $f16 -/* 3BAA1C E00BC9EC 00000000 */ nop +/* 3BAA1C E00BC9EC 00000000 */ nop /* 3BAA20 E00BC9F0 A622FFF4 */ sh $v0, -0xc($s1) /* 3BAA24 E00BC9F4 C64200B0 */ lwc1 $f2, 0xb0($s2) /* 3BAA28 E00BC9F8 461C1080 */ add.s $f2, $f2, $f28 /* 3BAA2C E00BC9FC A630FFFA */ sh $s0, -6($s1) /* 3BAA30 E00BCA00 461A1082 */ mul.s $f2, $f2, $f26 -/* 3BAA34 E00BCA04 00000000 */ nop +/* 3BAA34 E00BCA04 00000000 */ nop /* 3BAA38 E00BCA08 A620FFFC */ sh $zero, -4($s1) /* 3BAA3C E00BCA0C A236FFFE */ sb $s6, -2($s1) /* 3BAA40 E00BCA10 A237FFFF */ sb $s7, -1($s1) /* 3BAA44 E00BCA14 A23E0000 */ sb $fp, ($s1) /* 3BAA48 E00BCA18 4600140D */ trunc.w.s $f16, $f2 /* 3BAA4C E00BCA1C 44028000 */ mfc1 $v0, $f16 -/* 3BAA50 E00BCA20 00000000 */ nop +/* 3BAA50 E00BCA20 00000000 */ nop /* 3BAA54 E00BCA24 A622FFF6 */ sh $v0, -0xa($s1) /* 3BAA58 E00BCA28 C6420050 */ lwc1 $f2, 0x50($s2) /* 3BAA5C E00BCA2C 46141081 */ sub.s $f2, $f2, $f20 /* 3BAA60 E00BCA30 461A1082 */ mul.s $f2, $f2, $f26 -/* 3BAA64 E00BCA34 00000000 */ nop +/* 3BAA64 E00BCA34 00000000 */ nop /* 3BAA68 E00BCA38 26940010 */ addiu $s4, $s4, 0x10 /* 3BAA6C E00BCA3C 4600140D */ trunc.w.s $f16, $f2 /* 3BAA70 E00BCA40 44028000 */ mfc1 $v0, $f16 -/* 3BAA74 E00BCA44 00000000 */ nop +/* 3BAA74 E00BCA44 00000000 */ nop /* 3BAA78 E00BCA48 A6820000 */ sh $v0, ($s4) /* 3BAA7C E00BCA4C C6420080 */ lwc1 $f2, 0x80($s2) /* 3BAA80 E00BCA50 46001081 */ sub.s $f2, $f2, $f0 /* 3BAA84 E00BCA54 26730001 */ addiu $s3, $s3, 1 /* 3BAA88 E00BCA58 461A1082 */ mul.s $f2, $f2, $f26 -/* 3BAA8C E00BCA5C 00000000 */ nop +/* 3BAA8C E00BCA5C 00000000 */ nop /* 3BAA90 E00BCA60 8FAE0098 */ lw $t6, 0x98($sp) /* 3BAA94 E00BCA64 26310010 */ addiu $s1, $s1, 0x10 /* 3BAA98 E00BCA68 25CE000C */ addiu $t6, $t6, 0xc /* 3BAA9C E00BCA6C AFAE0098 */ sw $t6, 0x98($sp) /* 3BAAA0 E00BCA70 4600140D */ trunc.w.s $f16, $f2 /* 3BAAA4 E00BCA74 44028000 */ mfc1 $v0, $f16 -/* 3BAAA8 E00BCA78 00000000 */ nop +/* 3BAAA8 E00BCA78 00000000 */ nop /* 3BAAAC E00BCA7C A622FFF4 */ sh $v0, -0xc($s1) /* 3BAAB0 E00BCA80 C64000B0 */ lwc1 $f0, 0xb0($s2) /* 3BAAB4 E00BCA84 26940010 */ addiu $s4, $s4, 0x10 @@ -475,14 +475,14 @@ glabel func_E00BC374 /* 3BAACC E00BCA9C A236FFFE */ sb $s6, -2($s1) /* 3BAAD0 E00BCAA0 26D60032 */ addiu $s6, $s6, 0x32 /* 3BAAD4 E00BCAA4 461A0002 */ mul.s $f0, $f0, $f26 -/* 3BAAD8 E00BCAA8 00000000 */ nop +/* 3BAAD8 E00BCAA8 00000000 */ nop /* 3BAADC E00BCAAC 26520004 */ addiu $s2, $s2, 4 /* 3BAAE0 E00BCAB0 24020400 */ addiu $v0, $zero, 0x400 /* 3BAAE4 E00BCAB4 A630FFFA */ sh $s0, -6($s1) /* 3BAAE8 E00BCAB8 A622FFFC */ sh $v0, -4($s1) /* 3BAAEC E00BCABC 4600040D */ trunc.w.s $f16, $f0 /* 3BAAF0 E00BCAC0 44028000 */ mfc1 $v0, $f16 -/* 3BAAF4 E00BCAC4 00000000 */ nop +/* 3BAAF4 E00BCAC4 00000000 */ nop /* 3BAAF8 E00BCAC8 A622FFF6 */ sh $v0, -0xa($s1) /* 3BAAFC E00BCACC 2A62000C */ slti $v0, $s3, 0xc /* 3BAB00 E00BCAD0 1440FF60 */ bnez $v0, .LE00BC854 @@ -490,8 +490,8 @@ glabel func_E00BC374 /* 3BAB08 E00BCAD8 0260382D */ daddu $a3, $s3, $zero /* 3BAB0C E00BCADC 3C08D9DF */ lui $t0, 0xd9df /* 3BAB10 E00BCAE0 3508FFFF */ ori $t0, $t0, 0xffff -/* 3BAB14 E00BCAE4 3C09800A */ lui $t1, %hi(D_8009A66C) -/* 3BAB18 E00BCAE8 2529A66C */ addiu $t1, $t1, %lo(D_8009A66C) +/* 3BAB14 E00BCAE4 3C09800A */ lui $t1, %hi(gMasterGfxPos) +/* 3BAB18 E00BCAE8 2529A66C */ addiu $t1, $t1, %lo(gMasterGfxPos) /* 3BAB1C E00BCAEC 00071040 */ sll $v0, $a3, 1 /* 3BAB20 E00BCAF0 0000982D */ daddu $s3, $zero, $zero /* 3BAB24 E00BCAF4 304400FF */ andi $a0, $v0, 0xff @@ -546,8 +546,8 @@ glabel func_E00BC374 /* 3BABE4 E00BCBB4 ACC40004 */ sw $a0, 4($a2) .LE00BCBB8: /* 3BABE8 E00BCBB8 3C05D838 */ lui $a1, 0xd838 -/* 3BABEC E00BCBBC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 3BABF0 E00BCBC0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 3BABEC E00BCBBC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 3BABF0 E00BCBC0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 3BABF4 E00BCBC4 8C620000 */ lw $v0, ($v1) /* 3BABF8 E00BCBC8 34A50002 */ ori $a1, $a1, 2 /* 3BABFC E00BCBCC 0040202D */ daddu $a0, $v0, $zero @@ -574,4 +574,4 @@ glabel func_E00BC374 /* 3BAC50 E00BCC20 D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 3BAC54 E00BCC24 03E00008 */ jr $ra /* 3BAC58 E00BCC28 27BD00F8 */ addiu $sp, $sp, 0xf8 -/* 3BAC5C E00BCC2C 00000000 */ nop +/* 3BAC5C E00BCC2C 00000000 */ nop diff --git a/asm/nonmatchings/code_3BBF60/func_E00BE5BC.s b/asm/nonmatchings/code_3BBF60/func_E00BE5BC.s index 57f44bfde1..d96bd5e56a 100644 --- a/asm/nonmatchings/code_3BBF60/func_E00BE5BC.s +++ b/asm/nonmatchings/code_3BBF60/func_E00BE5BC.s @@ -11,8 +11,8 @@ glabel func_E00BE5BC /* 3BC534 E00BE5D4 3C110001 */ lui $s1, 1 /* 3BC538 E00BE5D8 36311630 */ ori $s1, $s1, 0x1630 /* 3BC53C E00BE5DC AFB300A4 */ sw $s3, 0xa4($sp) -/* 3BC540 E00BE5E0 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 3BC544 E00BE5E4 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 3BC540 E00BE5E0 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 3BC544 E00BE5E4 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 3BC548 E00BE5E8 AFBF00BC */ sw $ra, 0xbc($sp) /* 3BC54C E00BE5EC AFBE00B8 */ sw $fp, 0xb8($sp) /* 3BC550 E00BE5F0 AFB700B4 */ sw $s7, 0xb4($sp) @@ -49,7 +49,7 @@ glabel func_E00BE5BC /* 3BC5CC E00BE66C 3C038000 */ lui $v1, 0x8000 /* 3BC5D0 E00BE670 8D820010 */ lw $v0, 0x10($t4) /* 3BC5D4 E00BE674 449E2000 */ mtc1 $fp, $f4 -/* 3BC5D8 E00BE678 00000000 */ nop +/* 3BC5D8 E00BE678 00000000 */ nop /* 3BC5DC E00BE67C 46802120 */ cvt.s.w $f4, $f4 /* 3BC5E0 E00BE680 8C42001C */ lw $v0, 0x1c($v0) /* 3BC5E4 E00BE684 44062000 */ mfc1 $a2, $f4 @@ -80,10 +80,10 @@ glabel func_E00BE5BC /* 3BC648 E00BE6E8 0C080114 */ jal func_E0200450 /* 3BC64C E00BE6EC 00A0302D */ daddu $a2, $a1, $zero /* 3BC650 E00BE6F0 27A40010 */ addiu $a0, $sp, 0x10 -/* 3BC654 E00BE6F4 3C158007 */ lui $s5, %hi(D_800741F0) -/* 3BC658 E00BE6F8 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) -/* 3BC65C E00BE6FC 3C17800A */ lui $s7, %hi(D_8009A674) -/* 3BC660 E00BE700 26F7A674 */ addiu $s7, $s7, %lo(D_8009A674) +/* 3BC654 E00BE6F4 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 3BC658 E00BE6F8 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) +/* 3BC65C E00BE6FC 3C17800A */ lui $s7, %hi(gDisplayContext) +/* 3BC660 E00BE700 26F7A674 */ addiu $s7, $s7, %lo(gDisplayContext) /* 3BC664 E00BE704 96A50000 */ lhu $a1, ($s5) /* 3BC668 E00BE708 8EE20000 */ lw $v0, ($s7) /* 3BC66C E00BE70C 00052980 */ sll $a1, $a1, 6 @@ -318,8 +318,8 @@ glabel func_E00BE5BC /* 3BC9EC E00BEA8C 26100038 */ addiu $s0, $s0, 0x38 .LE00BEA90: /* 3BC9F0 E00BEA90 3C05D838 */ lui $a1, 0xd838 -/* 3BC9F4 E00BEA94 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 3BC9F8 E00BEA98 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 3BC9F4 E00BEA94 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 3BC9F8 E00BEA98 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 3BC9FC E00BEA9C 8C620000 */ lw $v0, ($v1) /* 3BCA00 E00BEAA0 34A50002 */ ori $a1, $a1, 2 /* 3BCA04 E00BEAA4 0040202D */ daddu $a0, $v0, $zero @@ -340,4 +340,4 @@ glabel func_E00BE5BC /* 3BCA40 E00BEAE0 8FB00098 */ lw $s0, 0x98($sp) /* 3BCA44 E00BEAE4 03E00008 */ jr $ra /* 3BCA48 E00BEAE8 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 3BCA4C E00BEAEC 00000000 */ nop +/* 3BCA4C E00BEAEC 00000000 */ nop diff --git a/asm/nonmatchings/code_3BCD60/func_E00C0760.s b/asm/nonmatchings/code_3BCD60/func_E00C0760.s index 53a82f8fce..80b0ffe71d 100644 --- a/asm/nonmatchings/code_3BCD60/func_E00C0760.s +++ b/asm/nonmatchings/code_3BCD60/func_E00C0760.s @@ -8,8 +8,8 @@ glabel func_E00C0760 /* 3BD4CC E00C076C 34C60024 */ ori $a2, $a2, 0x24 /* 3BD4D0 E00C0770 27A40018 */ addiu $a0, $sp, 0x18 /* 3BD4D4 E00C0774 AFB1009C */ sw $s1, 0x9c($sp) -/* 3BD4D8 E00C0778 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 3BD4DC E00C077C 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 3BD4D8 E00C0778 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 3BD4DC E00C077C 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 3BD4E0 E00C0780 AFB500AC */ sw $s5, 0xac($sp) /* 3BD4E4 E00C0784 3C150001 */ lui $s5, 1 /* 3BD4E8 E00C0788 3C02E700 */ lui $v0, 0xe700 @@ -51,10 +51,10 @@ glabel func_E00C0760 /* 3BD578 E00C0818 0C080114 */ jal func_E0200450 /* 3BD57C E00C081C 00A0302D */ daddu $a2, $a1, $zero /* 3BD580 E00C0820 27A40018 */ addiu $a0, $sp, 0x18 -/* 3BD584 E00C0824 3C138007 */ lui $s3, %hi(D_800741F0) -/* 3BD588 E00C0828 267341F0 */ addiu $s3, $s3, %lo(D_800741F0) -/* 3BD58C E00C082C 3C14800A */ lui $s4, %hi(D_8009A674) -/* 3BD590 E00C0830 2694A674 */ addiu $s4, $s4, %lo(D_8009A674) +/* 3BD584 E00C0824 3C138007 */ lui $s3, %hi(gMatrixListPos) +/* 3BD588 E00C0828 267341F0 */ addiu $s3, $s3, %lo(gMatrixListPos) +/* 3BD58C E00C082C 3C14800A */ lui $s4, %hi(gDisplayContext) +/* 3BD590 E00C0830 2694A674 */ addiu $s4, $s4, %lo(gDisplayContext) /* 3BD594 E00C0834 96650000 */ lhu $a1, ($s3) /* 3BD598 E00C0838 8E820000 */ lw $v0, ($s4) /* 3BD59C E00C083C 00052980 */ sll $a1, $a1, 6 @@ -173,4 +173,4 @@ glabel func_E00C0760 /* 3BD760 E00C0A00 8FB00098 */ lw $s0, 0x98($sp) /* 3BD764 E00C0A04 03E00008 */ jr $ra /* 3BD768 E00C0A08 27BD00B8 */ addiu $sp, $sp, 0xb8 -/* 3BD76C E00C0A0C 00000000 */ nop +/* 3BD76C E00C0A0C 00000000 */ nop diff --git a/asm/nonmatchings/code_3C11D0/func_E00C221C.s b/asm/nonmatchings/code_3C11D0/func_E00C221C.s index ad682e75fa..ab6c733804 100644 --- a/asm/nonmatchings/code_3C11D0/func_E00C221C.s +++ b/asm/nonmatchings/code_3C11D0/func_E00C221C.s @@ -10,8 +10,8 @@ glabel func_E00C221C /* 3C1400 E00C2230 AFB300A4 */ sw $s3, 0xa4($sp) /* 3C1404 E00C2234 3C130001 */ lui $s3, 1 /* 3C1408 E00C2238 AFB400A8 */ sw $s4, 0xa8($sp) -/* 3C140C E00C223C 3C14800A */ lui $s4, %hi(D_8009A66C) -/* 3C1410 E00C2240 2694A66C */ addiu $s4, $s4, %lo(D_8009A66C) +/* 3C140C E00C223C 3C14800A */ lui $s4, %hi(gMasterGfxPos) +/* 3C1410 E00C2240 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) /* 3C1414 E00C2244 AFBF00B8 */ sw $ra, 0xb8($sp) /* 3C1418 E00C2248 AFB700B4 */ sw $s7, 0xb4($sp) /* 3C141C E00C224C AFB600B0 */ sw $s6, 0xb0($sp) @@ -69,10 +69,10 @@ glabel func_E00C221C /* 3C14EC E00C231C 0C080114 */ jal func_E0200450 /* 3C14F0 E00C2320 00A0302D */ daddu $a2, $a1, $zero /* 3C14F4 E00C2324 27A40010 */ addiu $a0, $sp, 0x10 -/* 3C14F8 E00C2328 3C118007 */ lui $s1, %hi(D_800741F0) -/* 3C14FC E00C232C 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 3C1500 E00C2330 3C12800A */ lui $s2, %hi(D_8009A674) -/* 3C1504 E00C2334 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 3C14F8 E00C2328 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 3C14FC E00C232C 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 3C1500 E00C2330 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 3C1504 E00C2334 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 3C1508 E00C2338 96250000 */ lhu $a1, ($s1) /* 3C150C E00C233C 8E420000 */ lw $v0, ($s2) /* 3C1510 E00C2340 00052980 */ sll $a1, $a1, 6 @@ -177,21 +177,21 @@ glabel func_E00C221C /* 3C168C E00C24BC 3421CCCD */ ori $at, $at, 0xcccd /* 3C1690 E00C24C0 44811000 */ mtc1 $at, $f2 /* 3C1694 E00C24C4 448C0000 */ mtc1 $t4, $f0 -/* 3C1698 E00C24C8 00000000 */ nop +/* 3C1698 E00C24C8 00000000 */ nop /* 3C169C E00C24CC 46800020 */ cvt.s.w $f0, $f0 /* 3C16A0 E00C24D0 46020102 */ mul.s $f4, $f0, $f2 -/* 3C16A4 E00C24D4 00000000 */ nop +/* 3C16A4 E00C24D4 00000000 */ nop /* 3C16A8 E00C24D8 3C013F80 */ lui $at, 0x3f80 /* 3C16AC E00C24DC 44811000 */ mtc1 $at, $f2 -/* 3C16B0 E00C24E0 00000000 */ nop +/* 3C16B0 E00C24E0 00000000 */ nop /* 3C16B4 E00C24E4 46041081 */ sub.s $f2, $f2, $f4 /* 3C16B8 E00C24E8 C7A00090 */ lwc1 $f0, 0x90($sp) /* 3C16BC E00C24EC 46800020 */ cvt.s.w $f0, $f0 /* 3C16C0 E00C24F0 46020002 */ mul.s $f0, $f0, $f2 -/* 3C16C4 E00C24F4 00000000 */ nop +/* 3C16C4 E00C24F4 00000000 */ nop /* 3C16C8 E00C24F8 46000000 */ add.s $f0, $f0, $f0 /* 3C16CC E00C24FC 4600603C */ c.lt.s $f12, $f0 -/* 3C16D0 E00C2500 00000000 */ nop +/* 3C16D0 E00C2500 00000000 */ nop /* 3C16D4 E00C2504 45030001 */ bc1tl .LE00C250C /* 3C16D8 E00C2508 46006006 */ mov.s $f0, $f12 .LE00C250C: @@ -220,7 +220,7 @@ glabel func_E00C221C /* 3C1730 E00C2560 46060001 */ sub.s $f0, $f0, $f6 /* 3C1734 E00C2564 4600038D */ trunc.w.s $f14, $f0 /* 3C1738 E00C2568 44027000 */ mfc1 $v0, $f14 -/* 3C173C E00C256C 00000000 */ nop +/* 3C173C E00C256C 00000000 */ nop /* 3C1740 E00C2570 00541025 */ or $v0, $v0, $s4 /* 3C1744 E00C2574 3C05F548 */ lui $a1, 0xf548 .LE00C2578: @@ -238,7 +238,7 @@ glabel func_E00C221C /* 3C1774 E00C25A4 3C020900 */ lui $v0, 0x900 /* 3C1778 E00C25A8 24422020 */ addiu $v0, $v0, 0x2020 /* 3C177C E00C25AC 460A2002 */ mul.s $f0, $f4, $f10 -/* 3C1780 E00C25B0 00000000 */ nop +/* 3C1780 E00C25B0 00000000 */ nop /* 3C1784 E00C25B4 0060202D */ daddu $a0, $v1, $zero /* 3C1788 E00C25B8 24630008 */ addiu $v1, $v1, 8 /* 3C178C E00C25BC AD230000 */ sw $v1, ($t1) @@ -277,12 +277,12 @@ glabel func_E00C221C /* 3C1810 E00C2640 AD220000 */ sw $v0, ($t1) /* 3C1814 E00C2644 AC650028 */ sw $a1, 0x28($v1) /* 3C1818 E00C2648 46080002 */ mul.s $f0, $f0, $f8 -/* 3C181C E00C264C 00000000 */ nop +/* 3C181C E00C264C 00000000 */ nop /* 3C1820 E00C2650 AC64002C */ sw $a0, 0x2c($v1) /* 3C1824 E00C2654 24630038 */ addiu $v1, $v1, 0x38 /* 3C1828 E00C2658 0040502D */ daddu $t2, $v0, $zero /* 3C182C E00C265C 4600303E */ c.le.s $f6, $f0 -/* 3C1830 E00C2660 00000000 */ nop +/* 3C1830 E00C2660 00000000 */ nop /* 3C1834 E00C2664 45010005 */ bc1t .LE00C267C /* 3C1838 E00C2668 AD230000 */ sw $v1, ($t1) /* 3C183C E00C266C 4600038D */ trunc.w.s $f14, $f0 @@ -293,7 +293,7 @@ glabel func_E00C221C /* 3C184C E00C267C 46060001 */ sub.s $f0, $f0, $f6 /* 3C1850 E00C2680 4600038D */ trunc.w.s $f14, $f0 /* 3C1854 E00C2684 44027000 */ mfc1 $v0, $f14 -/* 3C1858 E00C2688 00000000 */ nop +/* 3C1858 E00C2688 00000000 */ nop /* 3C185C E00C268C 00541025 */ or $v0, $v0, $s4 /* 3C1860 E00C2690 3C04007D */ lui $a0, 0x7d .LE00C2694: @@ -313,7 +313,7 @@ glabel func_E00C221C /* 3C1898 E00C26C8 3C020900 */ lui $v0, 0x900 /* 3C189C E00C26CC 24420000 */ addiu $v0, $v0, 0 /* 3C18A0 E00C26D0 460A2002 */ mul.s $f0, $f4, $f10 -/* 3C18A4 E00C26D4 00000000 */ nop +/* 3C18A4 E00C26D4 00000000 */ nop /* 3C18A8 E00C26D8 AD440004 */ sw $a0, 4($t2) /* 3C18AC E00C26DC 0060202D */ daddu $a0, $v1, $zero /* 3C18B0 E00C26E0 24630008 */ addiu $v1, $v1, 8 @@ -353,12 +353,12 @@ glabel func_E00C221C /* 3C1938 E00C2768 AD220000 */ sw $v0, ($t1) /* 3C193C E00C276C AC650028 */ sw $a1, 0x28($v1) /* 3C1940 E00C2770 46080002 */ mul.s $f0, $f0, $f8 -/* 3C1944 E00C2774 00000000 */ nop +/* 3C1944 E00C2774 00000000 */ nop /* 3C1948 E00C2778 AC64002C */ sw $a0, 0x2c($v1) /* 3C194C E00C277C 24630038 */ addiu $v1, $v1, 0x38 /* 3C1950 E00C2780 0040202D */ daddu $a0, $v0, $zero /* 3C1954 E00C2784 4600303E */ c.le.s $f6, $f0 -/* 3C1958 E00C2788 00000000 */ nop +/* 3C1958 E00C2788 00000000 */ nop /* 3C195C E00C278C 45010005 */ bc1t .LE00C27A4 /* 3C1960 E00C2790 AD230000 */ sw $v1, ($t1) /* 3C1964 E00C2794 4600038D */ trunc.w.s $f14, $f0 @@ -369,7 +369,7 @@ glabel func_E00C221C /* 3C1974 E00C27A4 46060001 */ sub.s $f0, $f0, $f6 /* 3C1978 E00C27A8 4600038D */ trunc.w.s $f14, $f0 /* 3C197C E00C27AC 44037000 */ mfc1 $v1, $f14 -/* 3C1980 E00C27B0 00000000 */ nop +/* 3C1980 E00C27B0 00000000 */ nop /* 3C1984 E00C27B4 00741825 */ or $v1, $v1, $s4 /* 3C1988 E00C27B8 3C02017D */ lui $v0, 0x17d .LE00C27BC: @@ -385,7 +385,7 @@ glabel func_E00C221C /* 3C19B0 E00C27E0 00220821 */ addu $at, $at, $v0 /* 3C19B4 E00C27E4 8C2229A8 */ lw $v0, %lo(D_E00C29A8)($at) /* 3C19B8 E00C27E8 00400008 */ jr $v0 -/* 3C19BC E00C27EC 00000000 */ nop +/* 3C19BC E00C27EC 00000000 */ nop /* 3C19C0 E00C27F0 3C040600 */ lui $a0, 0x600 /* 3C19C4 E00C27F4 8D220000 */ lw $v0, ($t1) /* 3C19C8 E00C27F8 34840204 */ ori $a0, $a0, 0x204 @@ -468,8 +468,8 @@ glabel func_E00C221C /* 3C1AF4 E00C2924 1440FEE0 */ bnez $v0, .LE00C24A8 /* 3C1AF8 E00C2928 AC600004 */ sw $zero, 4($v1) /* 3C1AFC E00C292C 3C05D838 */ lui $a1, 0xd838 -/* 3C1B00 E00C2930 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 3C1B04 E00C2934 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 3C1B00 E00C2930 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 3C1B04 E00C2934 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 3C1B08 E00C2938 8C620000 */ lw $v0, ($v1) /* 3C1B0C E00C293C 34A50002 */ ori $a1, $a1, 2 /* 3C1B10 E00C2940 0040202D */ daddu $a0, $v0, $zero @@ -489,6 +489,6 @@ glabel func_E00C221C /* 3C1B48 E00C2978 8FB00098 */ lw $s0, 0x98($sp) /* 3C1B4C E00C297C 03E00008 */ jr $ra /* 3C1B50 E00C2980 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 3C1B54 E00C2984 00000000 */ nop -/* 3C1B58 E00C2988 00000000 */ nop -/* 3C1B5C E00C298C 00000000 */ nop +/* 3C1B54 E00C2984 00000000 */ nop +/* 3C1B58 E00C2988 00000000 */ nop +/* 3C1B5C E00C298C 00000000 */ nop diff --git a/asm/nonmatchings/code_3CADF0/func_E00C4308.s b/asm/nonmatchings/code_3CADF0/func_E00C4308.s index f55d487e65..410162e790 100644 --- a/asm/nonmatchings/code_3CADF0/func_E00C4308.s +++ b/asm/nonmatchings/code_3CADF0/func_E00C4308.s @@ -12,8 +12,8 @@ glabel func_E00C4308 /* 3CB114 E00C4324 AFB600C8 */ sw $s6, 0xc8($sp) /* 3CB118 E00C4328 0000B02D */ daddu $s6, $zero, $zero /* 3CB11C E00C432C AFB200B8 */ sw $s2, 0xb8($sp) -/* 3CB120 E00C4330 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 3CB124 E00C4334 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 3CB120 E00C4330 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 3CB124 E00C4334 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 3CB128 E00C4338 AFB500C4 */ sw $s5, 0xc4($sp) /* 3CB12C E00C433C 02C0A82D */ daddu $s5, $s6, $zero /* 3CB130 E00C4340 AFBF00D4 */ sw $ra, 0xd4($sp) @@ -71,10 +71,10 @@ glabel func_E00C4308 /* 3CB200 E00C4410 0C080114 */ jal func_E0200450 /* 3CB204 E00C4414 00A0302D */ daddu $a2, $a1, $zero /* 3CB208 E00C4418 27A40020 */ addiu $a0, $sp, 0x20 -/* 3CB20C E00C441C 3C118007 */ lui $s1, %hi(D_800741F0) -/* 3CB210 E00C4420 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 3CB214 E00C4424 3C13800A */ lui $s3, %hi(D_8009A674) -/* 3CB218 E00C4428 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* 3CB20C E00C441C 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 3CB210 E00C4420 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 3CB214 E00C4424 3C13800A */ lui $s3, %hi(gDisplayContext) +/* 3CB218 E00C4428 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* 3CB21C E00C442C 96250000 */ lhu $a1, ($s1) /* 3CB220 E00C4430 8E620000 */ lw $v0, ($s3) /* 3CB224 E00C4434 8FAF00A8 */ lw $t7, 0xa8($sp) @@ -133,7 +133,7 @@ glabel func_E00C4308 .LE00C4508: /* 3CB2F8 E00C4508 00168140 */ sll $s0, $s6, 5 /* 3CB2FC E00C450C 44976000 */ mtc1 $s7, $f12 -/* 3CB300 E00C4510 00000000 */ nop +/* 3CB300 E00C4510 00000000 */ nop /* 3CB304 E00C4514 46806320 */ cvt.s.w $f12, $f12 /* 3CB308 E00C4518 8FAF00A4 */ lw $t7, 0xa4($sp) /* 3CB30C E00C451C C7D40030 */ lwc1 $f20, 0x30($fp) @@ -141,13 +141,13 @@ glabel func_E00C4308 /* 3CB314 E00C4524 01F08021 */ addu $s0, $t7, $s0 /* 3CB318 E00C4528 3C0143FA */ lui $at, 0x43fa /* 3CB31C E00C452C 44811000 */ mtc1 $at, $f2 -/* 3CB320 E00C4530 00000000 */ nop +/* 3CB320 E00C4530 00000000 */ nop /* 3CB324 E00C4534 46020002 */ mul.s $f0, $f0, $f2 -/* 3CB328 E00C4538 00000000 */ nop +/* 3CB328 E00C4538 00000000 */ nop /* 3CB32C E00C453C 46140002 */ mul.s $f0, $f0, $f20 -/* 3CB330 E00C4540 00000000 */ nop +/* 3CB330 E00C4540 00000000 */ nop /* 3CB334 E00C4544 44946000 */ mtc1 $s4, $f12 -/* 3CB338 E00C4548 00000000 */ nop +/* 3CB338 E00C4548 00000000 */ nop /* 3CB33C E00C454C 46806320 */ cvt.s.w $f12, $f12 /* 3CB340 E00C4550 4600010D */ trunc.w.s $f4, $f0 /* 3CB344 E00C4554 44112000 */ mfc1 $s1, $f4 @@ -157,20 +157,20 @@ glabel func_E00C4308 /* 3CB354 E00C4564 44811000 */ mtc1 $at, $f2 /* 3CB358 E00C4568 26F7003C */ addiu $s7, $s7, 0x3c /* 3CB35C E00C456C 46020002 */ mul.s $f0, $f0, $f2 -/* 3CB360 E00C4570 00000000 */ nop +/* 3CB360 E00C4570 00000000 */ nop /* 3CB364 E00C4574 001619C0 */ sll $v1, $s6, 7 /* 3CB368 E00C4578 26D60001 */ addiu $s6, $s6, 1 /* 3CB36C E00C457C 2622F380 */ addiu $v0, $s1, -0xc80 /* 3CB370 E00C4580 26310C80 */ addiu $s1, $s1, 0xc80 /* 3CB374 E00C4584 46140002 */ mul.s $f0, $f0, $f20 -/* 3CB378 E00C4588 00000000 */ nop +/* 3CB378 E00C4588 00000000 */ nop /* 3CB37C E00C458C A6020000 */ sh $v0, ($s0) /* 3CB380 E00C4590 A6000004 */ sh $zero, 4($s0) /* 3CB384 E00C4594 A6000008 */ sh $zero, 8($s0) /* 3CB388 E00C4598 A603000A */ sh $v1, 0xa($s0) /* 3CB38C E00C459C 4600010D */ trunc.w.s $f4, $f0 /* 3CB390 E00C45A0 44022000 */ mfc1 $v0, $f4 -/* 3CB394 E00C45A4 00000000 */ nop +/* 3CB394 E00C45A4 00000000 */ nop /* 3CB398 E00C45A8 02A21021 */ addu $v0, $s5, $v0 /* 3CB39C E00C45AC 2442F448 */ addiu $v0, $v0, -0xbb8 /* 3CB3A0 E00C45B0 A6020002 */ sh $v0, 2($s0) @@ -188,8 +188,8 @@ glabel func_E00C4308 /* 3CB3D0 E00C45E0 3C130001 */ lui $s3, 1 /* 3CB3D4 E00C45E4 36731630 */ ori $s3, $s3, 0x1630 /* 3CB3D8 E00C45E8 0000B02D */ daddu $s6, $zero, $zero -/* 3CB3DC E00C45EC 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 3CB3E0 E00C45F0 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 3CB3DC E00C45EC 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 3CB3E0 E00C45F0 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 3CB3E4 E00C45F4 3C013C23 */ lui $at, 0x3c23 /* 3CB3E8 E00C45F8 3421D70A */ ori $at, $at, 0xd70a /* 3CB3EC E00C45FC 44810000 */ mtc1 $at, $f0 @@ -206,10 +206,10 @@ glabel func_E00C4308 /* 3CB418 E00C4628 0C080110 */ jal func_E0200440 /* 3CB41C E00C462C 00A0382D */ daddu $a3, $a1, $zero /* 3CB420 E00C4630 27A40020 */ addiu $a0, $sp, 0x20 -/* 3CB424 E00C4634 3C118007 */ lui $s1, %hi(D_800741F0) -/* 3CB428 E00C4638 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 3CB42C E00C463C 3C12800A */ lui $s2, %hi(D_8009A674) -/* 3CB430 E00C4640 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 3CB424 E00C4634 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 3CB428 E00C4638 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 3CB42C E00C463C 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 3CB430 E00C4640 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 3CB434 E00C4644 96250000 */ lhu $a1, ($s1) /* 3CB438 E00C4648 8E420000 */ lw $v0, ($s2) /* 3CB43C E00C464C 00052980 */ sll $a1, $a1, 6 @@ -275,7 +275,7 @@ glabel func_E00C4308 /* 3CB51C E00C472C AC820000 */ sw $v0, ($a0) .LE00C4730: /* 3CB520 E00C4730 14A00003 */ bnez $a1, .LE00C4740 -/* 3CB524 E00C4734 00000000 */ nop +/* 3CB524 E00C4734 00000000 */ nop /* 3CB528 E00C4738 080311DB */ j .LE00C476C /* 3CB52C E00C473C AC8D0004 */ sw $t5, 4($a0) .LE00C4740: @@ -303,14 +303,14 @@ glabel func_E00C4308 /* 3CB57C E00C478C 0000B02D */ daddu $s6, $zero, $zero /* 3CB580 E00C4790 3C17E00C */ lui $s7, %hi(D_E00C49D0) /* 3CB584 E00C4794 26F749D0 */ addiu $s7, $s7, %lo(D_E00C49D0) -/* 3CB588 E00C4798 3C14800A */ lui $s4, %hi(D_8009A674) -/* 3CB58C E00C479C 2694A674 */ addiu $s4, $s4, %lo(D_8009A674) -/* 3CB590 E00C47A0 3C138007 */ lui $s3, %hi(D_800741F0) -/* 3CB594 E00C47A4 267341F0 */ addiu $s3, $s3, %lo(D_800741F0) +/* 3CB588 E00C4798 3C14800A */ lui $s4, %hi(gDisplayContext) +/* 3CB58C E00C479C 2694A674 */ addiu $s4, $s4, %lo(gDisplayContext) +/* 3CB590 E00C47A0 3C138007 */ lui $s3, %hi(gMatrixListPos) +/* 3CB594 E00C47A4 267341F0 */ addiu $s3, $s3, %lo(gMatrixListPos) /* 3CB598 E00C47A8 3C120001 */ lui $s2, 1 /* 3CB59C E00C47AC 36521630 */ ori $s2, $s2, 0x1630 -/* 3CB5A0 E00C47B0 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 3CB5A4 E00C47B4 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 3CB5A0 E00C47B0 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 3CB5A4 E00C47B4 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 3CB5A8 E00C47B8 0040882D */ daddu $s1, $v0, $zero /* 3CB5AC E00C47BC 8E220000 */ lw $v0, ($s1) /* 3CB5B0 E00C47C0 03C0802D */ daddu $s0, $fp, $zero @@ -338,10 +338,10 @@ glabel func_E00C4308 /* 3CB600 E00C4810 3C01E00C */ lui $at, %hi(D_E00C4A98) /* 3CB604 E00C4814 D4224A98 */ ldc1 $f2, %lo(D_E00C4A98)($at) /* 3CB608 E00C4818 44820000 */ mtc1 $v0, $f0 -/* 3CB60C E00C481C 00000000 */ nop +/* 3CB60C E00C481C 00000000 */ nop /* 3CB610 E00C4820 46800021 */ cvt.d.w $f0, $f0 /* 3CB614 E00C4824 46220002 */ mul.d $f0, $f0, $f2 -/* 3CB618 E00C4828 00000000 */ nop +/* 3CB618 E00C4828 00000000 */ nop /* 3CB61C E00C482C 46200020 */ cvt.s.d $f0, $f0 /* 3CB620 E00C4830 E7A00010 */ swc1 $f0, 0x10($sp) /* 3CB624 E00C4834 C6000034 */ lwc1 $f0, 0x34($s0) @@ -426,8 +426,8 @@ glabel func_E00C4308 /* 3CB760 E00C4970 2AC2000A */ slti $v0, $s6, 0xa /* 3CB764 E00C4974 1440FF9E */ bnez $v0, .LE00C47F0 /* 3CB768 E00C4978 AC830004 */ sw $v1, 4($a0) -/* 3CB76C E00C497C 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 3CB770 E00C4980 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 3CB76C E00C497C 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 3CB770 E00C4980 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 3CB774 E00C4984 8C430000 */ lw $v1, ($v0) /* 3CB778 E00C4988 0060202D */ daddu $a0, $v1, $zero /* 3CB77C E00C498C 24630008 */ addiu $v1, $v1, 8 diff --git a/asm/nonmatchings/code_3CC9E0/func_E00C67B0.s b/asm/nonmatchings/code_3CC9E0/func_E00C67B0.s index a822b5bc7d..f7e5e9f87b 100644 --- a/asm/nonmatchings/code_3CC9E0/func_E00C67B0.s +++ b/asm/nonmatchings/code_3CC9E0/func_E00C67B0.s @@ -42,8 +42,8 @@ glabel func_E00C67B0 /* 3CD224 E00C6844 114000FD */ beqz $t2, .LE00C6C3C /* 3CD228 E00C6848 3C02E700 */ lui $v0, 0xe700 /* 3CD22C E00C684C 3C05DB06 */ lui $a1, 0xdb06 -/* 3CD230 E00C6850 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 3CD234 E00C6854 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 3CD230 E00C6850 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 3CD234 E00C6854 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 3CD238 E00C6858 34A50024 */ ori $a1, $a1, 0x24 /* 3CD23C E00C685C 8D040000 */ lw $a0, ($t0) /* 3CD240 E00C6860 0080182D */ daddu $v1, $a0, $zero @@ -105,10 +105,10 @@ glabel func_E00C67B0 /* 3CD320 E00C6940 184000BE */ blez $v0, .LE00C6C3C /* 3CD324 E00C6944 AD040000 */ sw $a0, ($t0) /* 3CD328 E00C6948 27B50058 */ addiu $s5, $sp, 0x58 -/* 3CD32C E00C694C 3C1E800A */ lui $fp, %hi(D_8009A674) -/* 3CD330 E00C6950 27DEA674 */ addiu $fp, $fp, %lo(D_8009A674) -/* 3CD334 E00C6954 3C178007 */ lui $s7, %hi(D_800741F0) -/* 3CD338 E00C6958 26F741F0 */ addiu $s7, $s7, %lo(D_800741F0) +/* 3CD32C E00C694C 3C1E800A */ lui $fp, %hi(gDisplayContext) +/* 3CD330 E00C6950 27DEA674 */ addiu $fp, $fp, %lo(gDisplayContext) +/* 3CD334 E00C6954 3C178007 */ lui $s7, %hi(gMatrixListPos) +/* 3CD338 E00C6958 26F741F0 */ addiu $s7, $s7, %lo(gMatrixListPos) /* 3CD33C E00C695C 3C140001 */ lui $s4, 1 /* 3CD340 E00C6960 36941630 */ ori $s4, $s4, 0x1630 /* 3CD344 E00C6964 0100982D */ daddu $s3, $t0, $zero @@ -147,7 +147,7 @@ glabel func_E00C67B0 /* 3CD3C4 E00C69E4 E640FFE0 */ swc1 $f0, -0x20($s2) /* 3CD3C8 E00C69E8 C642FFD8 */ lwc1 $f2, -0x28($s2) /* 3CD3CC E00C69EC 4616103C */ c.lt.s $f2, $f22 -/* 3CD3D0 E00C69F0 00000000 */ nop +/* 3CD3D0 E00C69F0 00000000 */ nop /* 3CD3D4 E00C69F4 45000003 */ bc1f .LE00C6A04 /* 3CD3D8 E00C69F8 E640FFE4 */ swc1 $f0, -0x1c($s2) /* 3CD3DC E00C69FC 461A1000 */ add.s $f0, $f2, $f26 @@ -155,19 +155,19 @@ glabel func_E00C67B0 .LE00C6A04: /* 3CD3E4 E00C6A04 C640FFDC */ lwc1 $f0, -0x24($s2) /* 3CD3E8 E00C6A08 4600D03C */ c.lt.s $f26, $f0 -/* 3CD3EC E00C6A0C 00000000 */ nop +/* 3CD3EC E00C6A0C 00000000 */ nop /* 3CD3F0 E00C6A10 45000003 */ bc1f .LE00C6A20 -/* 3CD3F4 E00C6A14 00000000 */ nop +/* 3CD3F4 E00C6A14 00000000 */ nop /* 3CD3F8 E00C6A18 461A0001 */ sub.s $f0, $f0, $f26 /* 3CD3FC E00C6A1C E640FFDC */ swc1 $f0, -0x24($s2) .LE00C6A20: /* 3CD400 E00C6A20 C642FFD8 */ lwc1 $f2, -0x28($s2) /* 3CD404 E00C6A24 461E1082 */ mul.s $f2, $f2, $f30 -/* 3CD408 E00C6A28 00000000 */ nop +/* 3CD408 E00C6A28 00000000 */ nop /* 3CD40C E00C6A2C 27A40018 */ addiu $a0, $sp, 0x18 /* 3CD410 E00C6A30 C640FFDC */ lwc1 $f0, -0x24($s2) /* 3CD414 E00C6A34 461E0002 */ mul.s $f0, $f0, $f30 -/* 3CD418 E00C6A38 00000000 */ nop +/* 3CD418 E00C6A38 00000000 */ nop /* 3CD41C E00C6A3C 8E45FF90 */ lw $a1, -0x70($s2) /* 3CD420 E00C6A40 8E46FF94 */ lw $a2, -0x6c($s2) /* 3CD424 E00C6A44 8E47FF98 */ lw $a3, -0x68($s2) @@ -315,6 +315,6 @@ glabel func_E00C67B0 /* 3CD658 E00C6C78 D7B400D0 */ ldc1 $f20, 0xd0($sp) /* 3CD65C E00C6C7C 03E00008 */ jr $ra /* 3CD660 E00C6C80 27BD0100 */ addiu $sp, $sp, 0x100 -/* 3CD664 E00C6C84 00000000 */ nop -/* 3CD668 E00C6C88 00000000 */ nop -/* 3CD66C E00C6C8C 00000000 */ nop +/* 3CD664 E00C6C84 00000000 */ nop +/* 3CD668 E00C6C88 00000000 */ nop +/* 3CD66C E00C6C8C 00000000 */ nop diff --git a/asm/nonmatchings/code_3CF3A0/func_E00C8454.s b/asm/nonmatchings/code_3CF3A0/func_E00C8454.s index 3da24428ba..f6d8a02e89 100644 --- a/asm/nonmatchings/code_3CF3A0/func_E00C8454.s +++ b/asm/nonmatchings/code_3CF3A0/func_E00C8454.s @@ -7,8 +7,8 @@ glabel func_E00C8454 /* 3CF7FC E00C845C 3C07DB06 */ lui $a3, 0xdb06 /* 3CF800 E00C8460 34E70024 */ ori $a3, $a3, 0x24 /* 3CF804 E00C8464 AFB300A4 */ sw $s3, 0xa4($sp) -/* 3CF808 E00C8468 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 3CF80C E00C846C 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 3CF808 E00C8468 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 3CF80C E00C846C 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 3CF810 E00C8470 27A40018 */ addiu $a0, $sp, 0x18 /* 3CF814 E00C8474 AFBF00B8 */ sw $ra, 0xb8($sp) /* 3CF818 E00C8478 AFB700B4 */ sw $s7, 0xb4($sp) @@ -40,7 +40,7 @@ glabel func_E00C8454 /* 3CF880 E00C84E0 3C038000 */ lui $v1, 0x8000 /* 3CF884 E00C84E4 4600A521 */ cvt.d.s $f20, $f20 /* 3CF888 E00C84E8 4620A502 */ mul.d $f20, $f20, $f0 -/* 3CF88C E00C84EC 00000000 */ nop +/* 3CF88C E00C84EC 00000000 */ nop /* 3CF890 E00C84F0 00431021 */ addu $v0, $v0, $v1 /* 3CF894 E00C84F4 3C03800B */ lui $v1, %hi(gCameras) /* 3CF898 E00C84F8 24631D80 */ addiu $v1, $v1, %lo(gCameras) @@ -62,11 +62,11 @@ glabel func_E00C8454 /* 3CF8D8 E00C8538 4620A520 */ cvt.s.d $f20, $f20 /* 3CF8DC E00C853C C6400058 */ lwc1 $f0, 0x58($s2) /* 3CF8E0 E00C8540 4600A002 */ mul.s $f0, $f20, $f0 -/* 3CF8E4 E00C8544 00000000 */ nop +/* 3CF8E4 E00C8544 00000000 */ nop /* 3CF8E8 E00C8548 44050000 */ mfc1 $a1, $f0 /* 3CF8EC E00C854C C640005C */ lwc1 $f0, 0x5c($s2) /* 3CF8F0 E00C8550 4600A002 */ mul.s $f0, $f20, $f0 -/* 3CF8F4 E00C8554 00000000 */ nop +/* 3CF8F4 E00C8554 00000000 */ nop /* 3CF8F8 E00C8558 3C170001 */ lui $s7, 1 /* 3CF8FC E00C855C 27B00058 */ addiu $s0, $sp, 0x58 /* 3CF900 E00C8560 4407A000 */ mfc1 $a3, $f20 @@ -92,10 +92,10 @@ glabel func_E00C8454 /* 3CF950 E00C85B0 0C080114 */ jal func_E0200450 /* 3CF954 E00C85B4 00A0302D */ daddu $a2, $a1, $zero /* 3CF958 E00C85B8 27A40018 */ addiu $a0, $sp, 0x18 -/* 3CF95C E00C85BC 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3CF960 E00C85C0 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3CF964 E00C85C4 3C14800A */ lui $s4, %hi(D_8009A674) -/* 3CF968 E00C85C8 2694A674 */ addiu $s4, $s4, %lo(D_8009A674) +/* 3CF95C E00C85BC 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3CF960 E00C85C0 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3CF964 E00C85C4 3C14800A */ lui $s4, %hi(gDisplayContext) +/* 3CF968 E00C85C8 2694A674 */ addiu $s4, $s4, %lo(gDisplayContext) /* 3CF96C E00C85CC 96050000 */ lhu $a1, ($s0) /* 3CF970 E00C85D0 8E820000 */ lw $v0, ($s4) /* 3CF974 E00C85D4 00052980 */ sll $a1, $a1, 6 @@ -174,6 +174,6 @@ glabel func_E00C8454 /* 3CFA98 E00C86F8 D7B400C0 */ ldc1 $f20, 0xc0($sp) /* 3CFA9C E00C86FC 03E00008 */ jr $ra /* 3CFAA0 E00C8700 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* 3CFAA4 E00C8704 00000000 */ nop -/* 3CFAA8 E00C8708 00000000 */ nop -/* 3CFAAC E00C870C 00000000 */ nop +/* 3CFAA4 E00C8704 00000000 */ nop +/* 3CFAA8 E00C8708 00000000 */ nop +/* 3CFAAC E00C870C 00000000 */ nop diff --git a/asm/nonmatchings/code_3D0500/func_E00CA4CC.s b/asm/nonmatchings/code_3D0500/func_E00CA4CC.s index 12f0cd1cec..21826cb24b 100644 --- a/asm/nonmatchings/code_3D0500/func_E00CA4CC.s +++ b/asm/nonmatchings/code_3D0500/func_E00CA4CC.s @@ -12,8 +12,8 @@ glabel func_E00CA4CC /* 3D09E8 E00CA4E8 44800000 */ mtc1 $zero, $f0 /* 3D09EC E00CA4EC 36521630 */ ori $s2, $s2, 0x1630 /* 3D09F0 E00CA4F0 AFB3007C */ sw $s3, 0x7c($sp) -/* 3D09F4 E00CA4F4 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 3D09F8 E00CA4F8 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 3D09F4 E00CA4F4 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 3D09F8 E00CA4F8 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 3D09FC E00CA4FC AFBF0094 */ sw $ra, 0x94($sp) /* 3D0A00 E00CA500 AFBE0090 */ sw $fp, 0x90($sp) /* 3D0A04 E00CA504 AFB7008C */ sw $s7, 0x8c($sp) @@ -56,10 +56,10 @@ glabel func_E00CA4CC /* 3D0A98 E00CA598 0C080108 */ jal func_E0200420 /* 3D0A9C E00CA59C AD020004 */ sw $v0, 4($t0) /* 3D0AA0 E00CA5A0 27A40010 */ addiu $a0, $sp, 0x10 -/* 3D0AA4 E00CA5A4 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3D0AA8 E00CA5A8 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3D0AAC E00CA5AC 3C11800A */ lui $s1, %hi(D_8009A674) -/* 3D0AB0 E00CA5B0 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 3D0AA4 E00CA5A4 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3D0AA8 E00CA5A8 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3D0AAC E00CA5AC 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 3D0AB0 E00CA5B0 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 3D0AB4 E00CA5B4 96050000 */ lhu $a1, ($s0) /* 3D0AB8 E00CA5B8 8E220000 */ lw $v0, ($s1) /* 3D0ABC E00CA5BC 00052980 */ sll $a1, $a1, 6 @@ -188,7 +188,7 @@ glabel func_E00CA4CC /* 3D0C94 E00CA794 17C10004 */ bne $fp, $at, .LE00CA7A8 /* 3D0C98 E00CA798 3C018000 */ lui $at, 0x8000 /* 3D0C9C E00CA79C 15610002 */ bne $t3, $at, .LE00CA7A8 -/* 3D0CA0 E00CA7A0 00000000 */ nop +/* 3D0CA0 E00CA7A0 00000000 */ nop /* 3D0CA4 E00CA7A4 0006000D */ break 6 .LE00CA7A8: /* 3D0CA8 E00CA7A8 00002812 */ mflo $a1 @@ -210,18 +210,18 @@ glabel func_E00CA4CC /* 3D0CE8 E00CA7E8 00531023 */ subu $v0, $v0, $s3 /* 3D0CEC E00CA7EC 00021040 */ sll $v0, $v0, 1 /* 3D0CF0 E00CA7F0 44856000 */ mtc1 $a1, $f12 -/* 3D0CF4 E00CA7F4 00000000 */ nop +/* 3D0CF4 E00CA7F4 00000000 */ nop /* 3D0CF8 E00CA7F8 46806320 */ cvt.s.w $f12, $f12 /* 3D0CFC E00CA7FC 0C080140 */ jal func_E0200500 /* 3D0D00 E00CA800 00829823 */ subu $s3, $a0, $v0 /* 3D0D04 E00CA804 3C01437F */ lui $at, 0x437f /* 3D0D08 E00CA808 44811000 */ mtc1 $at, $f2 -/* 3D0D0C E00CA80C 00000000 */ nop +/* 3D0D0C E00CA80C 00000000 */ nop /* 3D0D10 E00CA810 46020002 */ mul.s $f0, $f0, $f2 -/* 3D0D14 E00CA814 00000000 */ nop +/* 3D0D14 E00CA814 00000000 */ nop /* 3D0D18 E00CA818 4600018D */ trunc.w.s $f6, $f0 /* 3D0D1C E00CA81C 44173000 */ mfc1 $s7, $f6 -/* 3D0D20 E00CA820 00000000 */ nop +/* 3D0D20 E00CA820 00000000 */ nop /* 3D0D24 E00CA824 2AE200C9 */ slti $v0, $s7, 0xc9 /* 3D0D28 E00CA828 50400001 */ beql $v0, $zero, .LE00CA830 /* 3D0D2C E00CA82C 241700C8 */ addiu $s7, $zero, 0xc8 @@ -289,11 +289,11 @@ glabel func_E00CA4CC /* 3D0E10 E00CA910 46146081 */ sub.s $f2, $f12, $f20 /* 3D0E14 E00CA914 3C014334 */ lui $at, 0x4334 /* 3D0E18 E00CA918 44810000 */ mtc1 $at, $f0 -/* 3D0E1C E00CA91C 00000000 */ nop +/* 3D0E1C E00CA91C 00000000 */ nop /* 3D0E20 E00CA920 4602003C */ c.lt.s $f0, $f2 -/* 3D0E24 E00CA924 00000000 */ nop +/* 3D0E24 E00CA924 00000000 */ nop /* 3D0E28 E00CA928 45000005 */ bc1f .LE00CA940 -/* 3D0E2C E00CA92C 00000000 */ nop +/* 3D0E2C E00CA92C 00000000 */ nop /* 3D0E30 E00CA930 3C0143B4 */ lui $at, 0x43b4 /* 3D0E34 E00CA934 44813000 */ mtc1 $at, $f6 /* 3D0E38 E00CA938 08032A5B */ j .LE00CA96C @@ -301,14 +301,14 @@ glabel func_E00CA4CC .LE00CA940: /* 3D0E40 E00CA940 3C01C334 */ lui $at, 0xc334 /* 3D0E44 E00CA944 44810000 */ mtc1 $at, $f0 -/* 3D0E48 E00CA948 00000000 */ nop +/* 3D0E48 E00CA948 00000000 */ nop /* 3D0E4C E00CA94C 4600103C */ c.lt.s $f2, $f0 -/* 3D0E50 E00CA950 00000000 */ nop +/* 3D0E50 E00CA950 00000000 */ nop /* 3D0E54 E00CA954 45020006 */ bc1fl .LE00CA970 /* 3D0E58 E00CA958 460CA780 */ add.s $f30, $f20, $f12 /* 3D0E5C E00CA95C 3C0143B4 */ lui $at, 0x43b4 /* 3D0E60 E00CA960 44813000 */ mtc1 $at, $f6 -/* 3D0E64 E00CA964 00000000 */ nop +/* 3D0E64 E00CA964 00000000 */ nop /* 3D0E68 E00CA968 46066300 */ add.s $f12, $f12, $f6 .LE00CA96C: /* 3D0E6C E00CA96C 460CA780 */ add.s $f30, $f20, $f12 @@ -318,7 +318,7 @@ glabel func_E00CA4CC /* 3D0E78 E00CA978 44801000 */ mtc1 $zero, $f2 /* 3D0E7C E00CA97C 4600F021 */ cvt.d.s $f0, $f30 /* 3D0E80 E00CA980 46220002 */ mul.d $f0, $f0, $f2 -/* 3D0E84 E00CA984 00000000 */ nop +/* 3D0E84 E00CA984 00000000 */ nop /* 3D0E88 E00CA988 462007A0 */ cvt.s.d $f30, $f0 .LE00CA98C: /* 3D0E8C E00CA98C 00131080 */ sll $v0, $s3, 2 @@ -334,33 +334,33 @@ glabel func_E00CA4CC /* 3D0EB4 E00CA9B4 01621023 */ subu $v0, $t3, $v0 /* 3D0EB8 E00CA9B8 00021080 */ sll $v0, $v0, 2 /* 3D0EBC E00CA9BC 44826000 */ mtc1 $v0, $f12 -/* 3D0EC0 E00CA9C0 00000000 */ nop +/* 3D0EC0 E00CA9C0 00000000 */ nop /* 3D0EC4 E00CA9C4 46806320 */ cvt.s.w $f12, $f12 /* 3D0EC8 E00CA9C8 0C080140 */ jal func_E0200500 /* 3D0ECC E00CA9CC 01638823 */ subu $s1, $t3, $v1 /* 3D0ED0 E00CA9D0 3C014040 */ lui $at, 0x4040 /* 3D0ED4 E00CA9D4 44811000 */ mtc1 $at, $f2 -/* 3D0ED8 E00CA9D8 00000000 */ nop +/* 3D0ED8 E00CA9D8 00000000 */ nop /* 3D0EDC E00CA9DC 46020002 */ mul.s $f0, $f0, $f2 -/* 3D0EE0 E00CA9E0 00000000 */ nop +/* 3D0EE0 E00CA9E0 00000000 */ nop /* 3D0EE4 E00CA9E4 3C014180 */ lui $at, 0x4180 /* 3D0EE8 E00CA9E8 44811000 */ mtc1 $at, $f2 -/* 3D0EEC E00CA9EC 00000000 */ nop +/* 3D0EEC E00CA9EC 00000000 */ nop /* 3D0EF0 E00CA9F0 46020000 */ add.s $f0, $f0, $f2 /* 3D0EF4 E00CA9F4 44911000 */ mtc1 $s1, $f2 -/* 3D0EF8 E00CA9F8 00000000 */ nop +/* 3D0EF8 E00CA9F8 00000000 */ nop /* 3D0EFC E00CA9FC 468010A0 */ cvt.s.w $f2, $f2 /* 3D0F00 E00CAA00 46020580 */ add.s $f22, $f0, $f2 /* 3D0F04 E00CAA04 C7A60058 */ lwc1 $f6, 0x58($sp) /* 3D0F08 E00CAA08 8FAB0054 */ lw $t3, 0x54($sp) /* 3D0F0C E00CAA0C 4606B582 */ mul.s $f22, $f22, $f6 -/* 3D0F10 E00CAA10 00000000 */ nop +/* 3D0F10 E00CAA10 00000000 */ nop /* 3D0F14 E00CAA14 C60002AC */ lwc1 $f0, 0x2ac($s0) /* 3D0F18 E00CAA18 3C0141C0 */ lui $at, 0x41c0 /* 3D0F1C E00CAA1C 44813000 */ mtc1 $at, $f6 -/* 3D0F20 E00CAA20 00000000 */ nop +/* 3D0F20 E00CAA20 00000000 */ nop /* 3D0F24 E00CAA24 46060002 */ mul.s $f0, $f0, $f6 -/* 3D0F28 E00CAA28 00000000 */ nop +/* 3D0F28 E00CAA28 00000000 */ nop /* 3D0F2C E00CAA2C C7A20064 */ lwc1 $f2, 0x64($sp) /* 3D0F30 E00CAA30 468010A0 */ cvt.s.w $f2, $f2 /* 3D0F34 E00CAA34 46020000 */ add.s $f0, $f0, $f2 @@ -375,37 +375,37 @@ glabel func_E00CA4CC /* 3D0F58 E00CAA58 00021080 */ sll $v0, $v0, 2 /* 3D0F5C E00CAA5C 02028823 */ subu $s1, $s0, $v0 /* 3D0F60 E00CAA60 06210022 */ bgez $s1, .LE00CAAEC -/* 3D0F64 E00CAA64 00000000 */ nop +/* 3D0F64 E00CAA64 00000000 */ nop /* 3D0F68 E00CAA68 44910000 */ mtc1 $s1, $f0 -/* 3D0F6C E00CAA6C 00000000 */ nop +/* 3D0F6C E00CAA6C 00000000 */ nop /* 3D0F70 E00CAA70 46800020 */ cvt.s.w $f0, $f0 /* 3D0F74 E00CAA74 3C01E00D */ lui $at, %hi(D_E00CACC0) /* 3D0F78 E00CAA78 D422ACC0 */ ldc1 $f2, %lo(D_E00CACC0)($at) /* 3D0F7C E00CAA7C 46000021 */ cvt.d.s $f0, $f0 /* 3D0F80 E00CAA80 46220002 */ mul.d $f0, $f0, $f2 -/* 3D0F84 E00CAA84 00000000 */ nop +/* 3D0F84 E00CAA84 00000000 */ nop /* 3D0F88 E00CAA88 3C01E00D */ lui $at, %hi(D_E00CACC8) /* 3D0F8C E00CAA8C D426ACC8 */ ldc1 $f6, %lo(D_E00CACC8)($at) /* 3D0F90 E00CAA90 46260000 */ add.d $f0, $f0, $f6 /* 3D0F94 E00CAA94 4620018D */ trunc.w.d $f6, $f0 /* 3D0F98 E00CAA98 44103000 */ mfc1 $s0, $f6 -/* 3D0F9C E00CAA9C 00000000 */ nop +/* 3D0F9C E00CAA9C 00000000 */ nop /* 3D0FA0 E00CAAA0 06010012 */ bgez $s0, .LE00CAAEC /* 3D0FA4 E00CAAA4 0000882D */ daddu $s1, $zero, $zero /* 3D0FA8 E00CAAA8 44900000 */ mtc1 $s0, $f0 -/* 3D0FAC E00CAAAC 00000000 */ nop +/* 3D0FAC E00CAAAC 00000000 */ nop /* 3D0FB0 E00CAAB0 46800020 */ cvt.s.w $f0, $f0 /* 3D0FB4 E00CAAB4 3C01E00D */ lui $at, %hi(D_E00CACD0) /* 3D0FB8 E00CAAB8 D422ACD0 */ ldc1 $f2, %lo(D_E00CACD0)($at) /* 3D0FBC E00CAABC 46000021 */ cvt.d.s $f0, $f0 /* 3D0FC0 E00CAAC0 46220002 */ mul.d $f0, $f0, $f2 -/* 3D0FC4 E00CAAC4 00000000 */ nop +/* 3D0FC4 E00CAAC4 00000000 */ nop /* 3D0FC8 E00CAAC8 3C01E00D */ lui $at, %hi(D_E00CACD8) /* 3D0FCC E00CAACC D426ACD8 */ ldc1 $f6, %lo(D_E00CACD8)($at) /* 3D0FD0 E00CAAD0 46260000 */ add.d $f0, $f0, $f6 /* 3D0FD4 E00CAAD4 4620018D */ trunc.w.d $f6, $f0 /* 3D0FD8 E00CAAD8 44133000 */ mfc1 $s3, $f6 -/* 3D0FDC E00CAADC 00000000 */ nop +/* 3D0FDC E00CAADC 00000000 */ nop /* 3D0FE0 E00CAAE0 06610002 */ bgez $s3, .LE00CAAEC /* 3D0FE4 E00CAAE4 0220802D */ daddu $s0, $s1, $zero /* 3D0FE8 E00CAAE8 0220982D */ daddu $s3, $s1, $zero @@ -413,11 +413,11 @@ glabel func_E00CA4CC /* 3D0FEC E00CAAEC 0C080140 */ jal func_E0200500 /* 3D0FF0 E00CAAF0 4600F306 */ mov.s $f12, $f30 /* 3D0FF4 E00CAAF4 4600B502 */ mul.s $f20, $f22, $f0 -/* 3D0FF8 E00CAAF8 00000000 */ nop +/* 3D0FF8 E00CAAF8 00000000 */ nop /* 3D0FFC E00CAAFC 0C080144 */ jal func_E0200510 /* 3D1000 E00CAB00 4600F306 */ mov.s $f12, $f30 /* 3D1004 E00CAB04 4600B002 */ mul.s $f0, $f22, $f0 -/* 3D1008 E00CAB08 00000000 */ nop +/* 3D1008 E00CAB08 00000000 */ nop /* 3D100C E00CAB0C 24020400 */ addiu $v0, $zero, 0x400 /* 3D1010 E00CAB10 8FAB0068 */ lw $t3, 0x68($sp) /* 3D1014 E00CAB14 44803000 */ mtc1 $zero, $f6 @@ -439,20 +439,20 @@ glabel func_E00CA4CC /* 3D1054 E00CAB54 4600D001 */ sub.s $f0, $f26, $f0 /* 3D1058 E00CAB58 4600218D */ trunc.w.s $f6, $f4 /* 3D105C E00CAB5C 44023000 */ mfc1 $v0, $f6 -/* 3D1060 E00CAB60 00000000 */ nop +/* 3D1060 E00CAB60 00000000 */ nop /* 3D1064 E00CAB64 A6420000 */ sh $v0, ($s2) /* 3D1068 E00CAB68 4600118D */ trunc.w.s $f6, $f2 /* 3D106C E00CAB6C 44023000 */ mfc1 $v0, $f6 -/* 3D1070 E00CAB70 00000000 */ nop +/* 3D1070 E00CAB70 00000000 */ nop /* 3D1074 E00CAB74 A6420002 */ sh $v0, 2($s2) /* 3D1078 E00CAB78 26520010 */ addiu $s2, $s2, 0x10 /* 3D107C E00CAB7C 4600A18D */ trunc.w.s $f6, $f20 /* 3D1080 E00CAB80 44023000 */ mfc1 $v0, $f6 -/* 3D1084 E00CAB84 00000000 */ nop +/* 3D1084 E00CAB84 00000000 */ nop /* 3D1088 E00CAB88 A6420000 */ sh $v0, ($s2) /* 3D108C E00CAB8C 4600018D */ trunc.w.s $f6, $f0 /* 3D1090 E00CAB90 44023000 */ mfc1 $v0, $f6 -/* 3D1094 E00CAB94 00000000 */ nop +/* 3D1094 E00CAB94 00000000 */ nop /* 3D1098 E00CAB98 A6420002 */ sh $v0, 2($s2) /* 3D109C E00CAB9C A6430004 */ sh $v1, 4($s2) /* 3D10A0 E00CABA0 A6550008 */ sh $s5, 8($s2) @@ -465,13 +465,13 @@ glabel func_E00CA4CC .LE00CABBC: /* 3D10BC E00CABBC 2A82001E */ slti $v0, $s4, 0x1e /* 3D10C0 E00CABC0 1440FEEF */ bnez $v0, .LE00CA780 -/* 3D10C4 E00CABC4 00000000 */ nop +/* 3D10C4 E00CABC4 00000000 */ nop /* 3D10C8 E00CABC8 8FB40060 */ lw $s4, 0x60($sp) /* 3D10CC E00CABCC 2A82001D */ slti $v0, $s4, 0x1d /* 3D10D0 E00CABD0 10400019 */ beqz $v0, .LE00CAC38 /* 3D10D4 E00CABD4 3C050002 */ lui $a1, 2 -/* 3D10D8 E00CABD8 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 3D10DC E00CABDC 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 3D10D8 E00CABD8 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 3D10DC E00CABDC 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 3D10E0 E00CABE0 3C080100 */ lui $t0, 0x100 /* 3D10E4 E00CABE4 35084008 */ ori $t0, $t0, 0x4008 /* 3D10E8 E00CABE8 3C070600 */ lui $a3, 0x600 @@ -497,8 +497,8 @@ glabel func_E00CA4CC /* 3D1134 E00CAC34 AC650004 */ sw $a1, 4($v1) .LE00CAC38: /* 3D1138 E00CAC38 3C05D838 */ lui $a1, 0xd838 -/* 3D113C E00CAC3C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 3D1140 E00CAC40 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 3D113C E00CAC3C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 3D1140 E00CAC40 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 3D1144 E00CAC44 8C620000 */ lw $v0, ($v1) /* 3D1148 E00CAC48 34A50002 */ ori $a1, $a1, 2 /* 3D114C E00CAC4C 0040202D */ daddu $a0, $v0, $zero @@ -525,4 +525,4 @@ glabel func_E00CA4CC /* 3D11A0 E00CACA0 D7B40098 */ ldc1 $f20, 0x98($sp) /* 3D11A4 E00CACA4 03E00008 */ jr $ra /* 3D11A8 E00CACA8 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* 3D11AC E00CACAC 00000000 */ nop +/* 3D11AC E00CACAC 00000000 */ nop diff --git a/asm/nonmatchings/code_3D1690/func_E00CC9D0.s b/asm/nonmatchings/code_3D1690/func_E00CC9D0.s index d868d00937..88569005f9 100644 --- a/asm/nonmatchings/code_3D1690/func_E00CC9D0.s +++ b/asm/nonmatchings/code_3D1690/func_E00CC9D0.s @@ -15,19 +15,19 @@ glabel func_E00CC9D0 /* 3D2088 E00CC9F8 27A20058 */ addiu $v0, $sp, 0x58 /* 3D208C E00CC9FC AFB300AC */ sw $s3, 0xac($sp) /* 3D2090 E00CCA00 0040982D */ daddu $s3, $v0, $zero -/* 3D2094 E00CCA04 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3D2098 E00CCA08 2442A674 */ addiu $v0, $v0, %lo(D_8009A674) +/* 3D2094 E00CCA04 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3D2098 E00CCA08 2442A674 */ addiu $v0, $v0, %lo(gDisplayContext) /* 3D209C E00CCA0C AFBE00C0 */ sw $fp, 0xc0($sp) /* 3D20A0 E00CCA10 0040F02D */ daddu $fp, $v0, $zero -/* 3D20A4 E00CCA14 3C028007 */ lui $v0, %hi(D_800741F0) -/* 3D20A8 E00CCA18 244241F0 */ addiu $v0, $v0, %lo(D_800741F0) +/* 3D20A4 E00CCA14 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* 3D20A8 E00CCA18 244241F0 */ addiu $v0, $v0, %lo(gMatrixListPos) /* 3D20AC E00CCA1C AFB500B4 */ sw $s5, 0xb4($sp) /* 3D20B0 E00CCA20 0040A82D */ daddu $s5, $v0, $zero /* 3D20B4 E00CCA24 AFB700BC */ sw $s7, 0xbc($sp) /* 3D20B8 E00CCA28 3C170001 */ lui $s7, 1 /* 3D20BC E00CCA2C 36F71630 */ ori $s7, $s7, 0x1630 -/* 3D20C0 E00CCA30 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 3D20C4 E00CCA34 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 3D20C0 E00CCA30 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 3D20C4 E00CCA34 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 3D20C8 E00CCA38 AFB400B0 */ sw $s4, 0xb0($sp) /* 3D20CC E00CCA3C 0040A02D */ daddu $s4, $v0, $zero /* 3D20D0 E00CCA40 3C08800B */ lui $t0, %hi(gCameras) @@ -235,8 +235,8 @@ glabel func_E00CC9D0 /* 3D23F0 E00CCD60 1440FF9D */ bnez $v0, .LE00CCBD8 /* 3D23F4 E00CCD64 26520004 */ addiu $s2, $s2, 4 /* 3D23F8 E00CCD68 3C05D838 */ lui $a1, 0xd838 -/* 3D23FC E00CCD6C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 3D2400 E00CCD70 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 3D23FC E00CCD6C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 3D2400 E00CCD70 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 3D2404 E00CCD74 8C620000 */ lw $v0, ($v1) /* 3D2408 E00CCD78 34A50002 */ ori $a1, $a1, 2 /* 3D240C E00CCD7C 0040202D */ daddu $a0, $v0, $zero @@ -259,4 +259,4 @@ glabel func_E00CC9D0 /* 3D2450 E00CCDC0 D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 3D2454 E00CCDC4 03E00008 */ jr $ra /* 3D2458 E00CCDC8 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 3D245C E00CCDCC 00000000 */ nop +/* 3D245C E00CCDCC 00000000 */ nop diff --git a/asm/nonmatchings/code_3D2AC0/func_E00CE478.s b/asm/nonmatchings/code_3D2AC0/func_E00CE478.s index 6d0fdd1ef2..2c6c117e02 100644 --- a/asm/nonmatchings/code_3D2AC0/func_E00CE478.s +++ b/asm/nonmatchings/code_3D2AC0/func_E00CE478.s @@ -19,8 +19,8 @@ glabel func_E00CE478 /* 3D2F70 E00CE4B0 AFB500DC */ sw $s5, 0xdc($sp) /* 3D2F74 E00CE4B4 0280A82D */ daddu $s5, $s4, $zero /* 3D2F78 E00CE4B8 AFB100CC */ sw $s1, 0xcc($sp) -/* 3D2F7C E00CE4BC 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 3D2F80 E00CE4C0 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 3D2F7C E00CE4BC 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 3D2F80 E00CE4C0 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 3D2F84 E00CE4C4 AFBF00EC */ sw $ra, 0xec($sp) /* 3D2F88 E00CE4C8 AFB600E0 */ sw $s6, 0xe0($sp) /* 3D2F8C E00CE4CC AFB200D0 */ sw $s2, 0xd0($sp) @@ -57,13 +57,13 @@ glabel func_E00CE478 /* 3D3008 E00CE548 3C088000 */ lui $t0, 0x8000 /* 3D300C E00CE54C AE220000 */ sw $v0, ($s1) /* 3D3010 E00CE550 46040002 */ mul.s $f0, $f0, $f4 -/* 3D3014 E00CE554 00000000 */ nop +/* 3D3014 E00CE554 00000000 */ nop /* 3D3018 E00CE558 AC6B0000 */ sw $t3, ($v1) /* 3D301C E00CE55C 8D420010 */ lw $v0, 0x10($t2) /* 3D3020 E00CE560 00094843 */ sra $t1, $t1, 1 /* 3D3024 E00CE564 8C42001C */ lw $v0, 0x1c($v0) /* 3D3028 E00CE568 46041082 */ mul.s $f2, $f2, $f4 -/* 3D302C E00CE56C 00000000 */ nop +/* 3D302C E00CE56C 00000000 */ nop /* 3D3030 E00CE570 00481021 */ addu $v0, $v0, $t0 /* 3D3034 E00CE574 AC620004 */ sw $v0, 4($v1) /* 3D3038 E00CE578 AFA900A4 */ sw $t1, 0xa4($sp) @@ -74,10 +74,10 @@ glabel func_E00CE478 /* 3D304C E00CE58C 0C080108 */ jal func_E0200420 /* 3D3050 E00CE590 00A0382D */ daddu $a3, $a1, $zero /* 3D3054 E00CE594 27A40020 */ addiu $a0, $sp, 0x20 -/* 3D3058 E00CE598 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3D305C E00CE59C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3D3060 E00CE5A0 3C12800A */ lui $s2, %hi(D_8009A674) -/* 3D3064 E00CE5A4 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 3D3058 E00CE598 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3D305C E00CE59C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3D3060 E00CE5A0 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 3D3064 E00CE5A4 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 3D3068 E00CE5A8 96050000 */ lhu $a1, ($s0) /* 3D306C E00CE5AC 8E420000 */ lw $v0, ($s2) /* 3D3070 E00CE5B0 00052980 */ sll $a1, $a1, 6 @@ -117,14 +117,14 @@ glabel func_E00CE478 /* 3D30F8 E00CE638 00141100 */ sll $v0, $s4, 4 .LE00CE63C: /* 3D30FC E00CE63C 4495A000 */ mtc1 $s5, $f20 -/* 3D3100 E00CE640 00000000 */ nop +/* 3D3100 E00CE640 00000000 */ nop /* 3D3104 E00CE644 4680A520 */ cvt.s.w $f20, $f20 /* 3D3108 E00CE648 8FAC00AC */ lw $t4, 0xac($sp) /* 3D310C E00CE64C 4600A306 */ mov.s $f12, $f20 /* 3D3110 E00CE650 0C080144 */ jal func_E0200510 /* 3D3114 E00CE654 01828021 */ addu $s0, $t4, $v0 /* 3D3118 E00CE658 46160002 */ mul.s $f0, $f0, $f22 -/* 3D311C E00CE65C 00000000 */ nop +/* 3D311C E00CE65C 00000000 */ nop /* 3D3120 E00CE660 4600A306 */ mov.s $f12, $f20 /* 3D3124 E00CE664 26B50018 */ addiu $s5, $s5, 0x18 /* 3D3128 E00CE668 A6000002 */ sh $zero, 2($s0) @@ -133,7 +133,7 @@ glabel func_E00CE478 /* 3D3134 E00CE674 0C080140 */ jal func_E0200500 /* 3D3138 E00CE678 A6020000 */ sh $v0, ($s0) /* 3D313C E00CE67C 46160002 */ mul.s $f0, $f0, $f22 -/* 3D3140 E00CE680 00000000 */ nop +/* 3D3140 E00CE680 00000000 */ nop /* 3D3144 E00CE684 4600A306 */ mov.s $f12, $f20 /* 3D3148 E00CE688 001411C0 */ sll $v0, $s4, 7 /* 3D314C E00CE68C A6020008 */ sh $v0, 8($s0) @@ -143,7 +143,7 @@ glabel func_E00CE478 /* 3D315C E00CE69C 0C080144 */ jal func_E0200510 /* 3D3160 E00CE6A0 A6020004 */ sh $v0, 4($s0) /* 3D3164 E00CE6A4 46160002 */ mul.s $f0, $f0, $f22 -/* 3D3168 E00CE6A8 00000000 */ nop +/* 3D3168 E00CE6A8 00000000 */ nop /* 3D316C E00CE6AC 8FAC00AC */ lw $t4, 0xac($sp) /* 3D3170 E00CE6B0 4600A306 */ mov.s $f12, $f20 /* 3D3174 E00CE6B4 01978021 */ addu $s0, $t4, $s7 @@ -154,20 +154,20 @@ glabel func_E00CE478 /* 3D3188 E00CE6C8 0C080140 */ jal func_E0200500 /* 3D318C E00CE6CC A6020000 */ sh $v0, ($s0) /* 3D3190 E00CE6D0 46160002 */ mul.s $f0, $f0, $f22 -/* 3D3194 E00CE6D4 00000000 */ nop +/* 3D3194 E00CE6D4 00000000 */ nop /* 3D3198 E00CE6D8 00141240 */ sll $v0, $s4, 9 /* 3D319C E00CE6DC 26940001 */ addiu $s4, $s4, 1 /* 3D31A0 E00CE6E0 A6020008 */ sh $v0, 8($s0) /* 3D31A4 E00CE6E4 A61E000A */ sh $fp, 0xa($s0) /* 3D31A8 E00CE6E8 4600018D */ trunc.w.s $f6, $f0 /* 3D31AC E00CE6EC 44023000 */ mfc1 $v0, $f6 -/* 3D31B0 E00CE6F0 00000000 */ nop +/* 3D31B0 E00CE6F0 00000000 */ nop /* 3D31B4 E00CE6F4 A6020004 */ sh $v0, 4($s0) /* 3D31B8 E00CE6F8 2A820010 */ slti $v0, $s4, 0x10 /* 3D31BC E00CE6FC 1440FFCF */ bnez $v0, .LE00CE63C /* 3D31C0 E00CE700 00141100 */ sll $v0, $s4, 4 -/* 3D31C4 E00CE704 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 3D31C8 E00CE708 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 3D31C4 E00CE704 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 3D31C8 E00CE708 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 3D31CC E00CE70C 0040402D */ daddu $t0, $v0, $zero /* 3D31D0 E00CE710 8D030000 */ lw $v1, ($t0) /* 3D31D4 E00CE714 0000A02D */ daddu $s4, $zero, $zero @@ -213,12 +213,12 @@ glabel func_E00CE478 /* 3D3270 E00CE7B0 36101630 */ ori $s0, $s0, 0x1630 /* 3D3274 E00CE7B4 0000A02D */ daddu $s4, $zero, $zero /* 3D3278 E00CE7B8 27B30060 */ addiu $s3, $sp, 0x60 -/* 3D327C E00CE7BC 3C028007 */ lui $v0, %hi(D_800741F0) -/* 3D3280 E00CE7C0 244241F0 */ addiu $v0, $v0, %lo(D_800741F0) +/* 3D327C E00CE7BC 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* 3D3280 E00CE7C0 244241F0 */ addiu $v0, $v0, %lo(gMatrixListPos) /* 3D3284 E00CE7C4 0040B82D */ daddu $s7, $v0, $zero /* 3D3288 E00CE7C8 3C1E0001 */ lui $fp, 1 -/* 3D328C E00CE7CC 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 3D3290 E00CE7D0 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 3D328C E00CE7CC 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 3D3290 E00CE7D0 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 3D3294 E00CE7D4 0040A82D */ daddu $s5, $v0, $zero /* 3D3298 E00CE7D8 3C0CD838 */ lui $t4, 0xd838 /* 3D329C E00CE7DC 358C0002 */ ori $t4, $t4, 2 @@ -240,8 +240,8 @@ glabel func_E00CE478 /* 3D32DC E00CE81C 00A0382D */ daddu $a3, $a1, $zero /* 3D32E0 E00CE820 27A40020 */ addiu $a0, $sp, 0x20 /* 3D32E4 E00CE824 96E50000 */ lhu $a1, ($s7) -/* 3D32E8 E00CE828 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3D32EC E00CE82C 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 3D32E8 E00CE828 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3D32EC E00CE82C 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3D32F0 E00CE830 00052980 */ sll $a1, $a1, 6 /* 3D32F4 E00CE834 00B02821 */ addu $a1, $a1, $s0 /* 3D32F8 E00CE838 0C080118 */ jal func_E0200460 @@ -263,8 +263,8 @@ glabel func_E00CE478 /* 3D3338 E00CE878 3042FFFF */ andi $v0, $v0, 0xffff /* 3D333C E00CE87C 00021180 */ sll $v0, $v0, 6 /* 3D3340 E00CE880 A6E30000 */ sh $v1, ($s7) -/* 3D3344 E00CE884 3C03800A */ lui $v1, %hi(D_8009A674) -/* 3D3348 E00CE888 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 3D3344 E00CE884 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 3D3348 E00CE888 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 3D334C E00CE88C 00501021 */ addu $v0, $v0, $s0 /* 3D3350 E00CE890 00621821 */ addu $v1, $v1, $v0 /* 3D3354 E00CE894 AC830004 */ sw $v1, 4($a0) @@ -279,15 +279,15 @@ glabel func_E00CE478 /* 3D3374 E00CE8B4 E7A60010 */ swc1 $f6, 0x10($sp) /* 3D3378 E00CE8B8 C6400038 */ lwc1 $f0, 0x38($s2) /* 3D337C E00CE8BC 461A0002 */ mul.s $f0, $f0, $f26 -/* 3D3380 E00CE8C0 00000000 */ nop +/* 3D3380 E00CE8C0 00000000 */ nop /* 3D3384 E00CE8C4 E7A00014 */ swc1 $f0, 0x14($sp) /* 3D3388 E00CE8C8 C6400058 */ lwc1 $f0, 0x58($s2) /* 3D338C E00CE8CC 461A0002 */ mul.s $f0, $f0, $f26 -/* 3D3390 E00CE8D0 00000000 */ nop +/* 3D3390 E00CE8D0 00000000 */ nop /* 3D3394 E00CE8D4 E7A00018 */ swc1 $f0, 0x18($sp) /* 3D3398 E00CE8D8 C6400078 */ lwc1 $f0, 0x78($s2) /* 3D339C E00CE8DC 461A0002 */ mul.s $f0, $f0, $f26 -/* 3D33A0 E00CE8E0 00000000 */ nop +/* 3D33A0 E00CE8E0 00000000 */ nop /* 3D33A4 E00CE8E4 4405F000 */ mfc1 $a1, $f30 /* 3D33A8 E00CE8E8 4406F000 */ mfc1 $a2, $f30 /* 3D33AC E00CE8EC E7A0001C */ swc1 $f0, 0x1c($sp) @@ -298,7 +298,7 @@ glabel func_E00CE478 /* 3D33C0 E00CE900 00006012 */ mflo $t4 /* 3D33C4 E00CE904 C6C00138 */ lwc1 $f0, 0x138($s6) /* 3D33C8 E00CE908 448CE000 */ mtc1 $t4, $f28 -/* 3D33CC E00CE90C 00000000 */ nop +/* 3D33CC E00CE90C 00000000 */ nop /* 3D33D0 E00CE910 4680E720 */ cvt.s.w $f28, $f28 /* 3D33D4 E00CE914 461C0000 */ add.s $f0, $f0, $f28 /* 3D33D8 E00CE918 3C06BCF5 */ lui $a2, 0xbcf5 @@ -320,7 +320,7 @@ glabel func_E00CE478 /* 3D3418 E00CE958 C7A600B8 */ lwc1 $f6, 0xb8($sp) /* 3D341C E00CE95C 29820010 */ slti $v0, $t4, 0x10 /* 3D3420 E00CE960 46060102 */ mul.s $f4, $f0, $f6 -/* 3D3424 E00CE964 00000000 */ nop +/* 3D3424 E00CE964 00000000 */ nop /* 3D3428 E00CE968 1040000C */ beqz $v0, .LE00CE99C /* 3D342C E00CE96C 2402007F */ addiu $v0, $zero, 0x7f /* 3D3430 E00CE970 8FAC00A4 */ lw $t4, 0xa4($sp) @@ -329,10 +329,10 @@ glabel func_E00CE478 /* 3D343C E00CE97C 44811000 */ mtc1 $at, $f2 /* 3D3440 E00CE980 004C1023 */ subu $v0, $v0, $t4 /* 3D3444 E00CE984 44820000 */ mtc1 $v0, $f0 -/* 3D3448 E00CE988 00000000 */ nop +/* 3D3448 E00CE988 00000000 */ nop /* 3D344C E00CE98C 46800020 */ cvt.s.w $f0, $f0 /* 3D3450 E00CE990 46020002 */ mul.s $f0, $f0, $f2 -/* 3D3454 E00CE994 00000000 */ nop +/* 3D3454 E00CE994 00000000 */ nop /* 3D3458 E00CE998 46002100 */ add.s $f4, $f4, $f0 .LE00CE99C: /* 3D345C E00CE99C 0260202D */ daddu $a0, $s3, $zero @@ -346,16 +346,16 @@ glabel func_E00CE478 /* 3D347C E00CE9BC 00A0302D */ daddu $a2, $a1, $zero /* 3D3480 E00CE9C0 C65400F8 */ lwc1 $f20, 0xf8($s2) /* 3D3484 E00CE9C4 461AA502 */ mul.s $f20, $f20, $f26 -/* 3D3488 E00CE9C8 00000000 */ nop +/* 3D3488 E00CE9C8 00000000 */ nop /* 3D348C E00CE9CC C65600B8 */ lwc1 $f22, 0xb8($s2) /* 3D3490 E00CE9D0 0C080140 */ jal func_E0200500 /* 3D3494 E00CE9D4 4600B306 */ mov.s $f12, $f22 /* 3D3498 E00CE9D8 4600A602 */ mul.s $f24, $f20, $f0 -/* 3D349C E00CE9DC 00000000 */ nop +/* 3D349C E00CE9DC 00000000 */ nop /* 3D34A0 E00CE9E0 0C080144 */ jal func_E0200510 /* 3D34A4 E00CE9E4 4600B306 */ mov.s $f12, $f22 /* 3D34A8 E00CE9E8 4600A502 */ mul.s $f20, $f20, $f0 -/* 3D34AC E00CE9EC 00000000 */ nop +/* 3D34AC E00CE9EC 00000000 */ nop /* 3D34B0 E00CE9F0 4406F000 */ mfc1 $a2, $f30 /* 3D34B4 E00CE9F4 4407A000 */ mfc1 $a3, $f20 /* 3D34B8 E00CE9F8 4405C000 */ mfc1 $a1, $f24 @@ -367,8 +367,8 @@ glabel func_E00CE478 /* 3D34D0 E00CEA10 00A0302D */ daddu $a2, $a1, $zero /* 3D34D4 E00CEA14 27A40020 */ addiu $a0, $sp, 0x20 /* 3D34D8 E00CEA18 96E50000 */ lhu $a1, ($s7) -/* 3D34DC E00CEA1C 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3D34E0 E00CEA20 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 3D34DC E00CEA1C 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3D34E0 E00CEA20 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3D34E4 E00CEA24 00052980 */ sll $a1, $a1, 6 /* 3D34E8 E00CEA28 00BE2821 */ addu $a1, $a1, $fp /* 3D34EC E00CEA2C 0C080118 */ jal func_E0200460 @@ -377,8 +377,8 @@ glabel func_E00CE478 /* 3D34F8 E00CEA38 34A50020 */ ori $a1, $a1, 0x20 /* 3D34FC E00CEA3C 8EA80000 */ lw $t0, ($s5) /* 3D3500 E00CEA40 96E70000 */ lhu $a3, ($s7) -/* 3D3504 E00CEA44 3C03800A */ lui $v1, %hi(D_8009A674) -/* 3D3508 E00CEA48 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 3D3504 E00CEA44 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 3D3508 E00CEA48 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 3D350C E00CEA4C 0100202D */ daddu $a0, $t0, $zero /* 3D3510 E00CEA50 25080008 */ addiu $t0, $t0, 8 /* 3D3514 E00CEA54 3C0CDA38 */ lui $t4, 0xda38 @@ -403,11 +403,11 @@ glabel func_E00CE478 /* 3D3560 E00CEAA0 E7A60010 */ swc1 $f6, 0x10($sp) /* 3D3564 E00CEAA4 C6000038 */ lwc1 $f0, 0x38($s0) /* 3D3568 E00CEAA8 461A0002 */ mul.s $f0, $f0, $f26 -/* 3D356C E00CEAAC 00000000 */ nop +/* 3D356C E00CEAAC 00000000 */ nop /* 3D3570 E00CEAB0 E7A00014 */ swc1 $f0, 0x14($sp) /* 3D3574 E00CEAB4 C6000058 */ lwc1 $f0, 0x58($s0) /* 3D3578 E00CEAB8 461A0002 */ mul.s $f0, $f0, $f26 -/* 3D357C E00CEABC 00000000 */ nop +/* 3D357C E00CEABC 00000000 */ nop /* 3D3580 E00CEAC0 4406F000 */ mfc1 $a2, $f30 /* 3D3584 E00CEAC4 27A40020 */ addiu $a0, $sp, 0x20 /* 3D3588 E00CEAC8 24E70001 */ addiu $a3, $a3, 1 @@ -415,7 +415,7 @@ glabel func_E00CE478 /* 3D3590 E00CEAD0 C6000078 */ lwc1 $f0, 0x78($s0) /* 3D3594 E00CEAD4 4405F000 */ mfc1 $a1, $f30 /* 3D3598 E00CEAD8 461A0002 */ mul.s $f0, $f0, $f26 -/* 3D359C E00CEADC 00000000 */ nop +/* 3D359C E00CEADC 00000000 */ nop /* 3D35A0 E00CEAE0 25020008 */ addiu $v0, $t0, 8 /* 3D35A4 E00CEAE4 AEA80000 */ sw $t0, ($s5) /* 3D35A8 E00CEAE8 A6E70000 */ sh $a3, ($s7) @@ -441,7 +441,7 @@ glabel func_E00CE478 /* 3D35F8 E00CEB38 C6000098 */ lwc1 $f0, 0x98($s0) /* 3D35FC E00CEB3C C7A600B8 */ lwc1 $f6, 0xb8($sp) /* 3D3600 E00CEB40 46060002 */ mul.s $f0, $f0, $f6 -/* 3D3604 E00CEB44 00000000 */ nop +/* 3D3604 E00CEB44 00000000 */ nop /* 3D3608 E00CEB48 0260202D */ daddu $a0, $s3, $zero /* 3D360C E00CEB4C 44050000 */ mfc1 $a1, $f0 /* 3D3610 E00CEB50 44063000 */ mfc1 $a2, $f6 @@ -453,15 +453,15 @@ glabel func_E00CE478 /* 3D3628 E00CEB68 00A0302D */ daddu $a2, $a1, $zero /* 3D362C E00CEB6C C65400F8 */ lwc1 $f20, 0xf8($s2) /* 3D3630 E00CEB70 461AA502 */ mul.s $f20, $f20, $f26 -/* 3D3634 E00CEB74 00000000 */ nop +/* 3D3634 E00CEB74 00000000 */ nop /* 3D3638 E00CEB78 0C080140 */ jal func_E0200500 /* 3D363C E00CEB7C C64C00B8 */ lwc1 $f12, 0xb8($s2) /* 3D3640 E00CEB80 4600A582 */ mul.s $f22, $f20, $f0 -/* 3D3644 E00CEB84 00000000 */ nop +/* 3D3644 E00CEB84 00000000 */ nop /* 3D3648 E00CEB88 0C080144 */ jal func_E0200510 /* 3D364C E00CEB8C C64C00B8 */ lwc1 $f12, 0xb8($s2) /* 3D3650 E00CEB90 4600A502 */ mul.s $f20, $f20, $f0 -/* 3D3654 E00CEB94 00000000 */ nop +/* 3D3654 E00CEB94 00000000 */ nop /* 3D3658 E00CEB98 4406F000 */ mfc1 $a2, $f30 /* 3D365C E00CEB9C 4407A000 */ mfc1 $a3, $f20 /* 3D3660 E00CEBA0 4405B000 */ mfc1 $a1, $f22 @@ -473,8 +473,8 @@ glabel func_E00CE478 /* 3D3678 E00CEBB8 00A0302D */ daddu $a2, $a1, $zero /* 3D367C E00CEBBC 27A40020 */ addiu $a0, $sp, 0x20 /* 3D3680 E00CEBC0 96E50000 */ lhu $a1, ($s7) -/* 3D3684 E00CEBC4 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3D3688 E00CEBC8 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 3D3684 E00CEBC4 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3D3688 E00CEBC8 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3D368C E00CEBCC 00052980 */ sll $a1, $a1, 6 /* 3D3690 E00CEBD0 00BE2821 */ addu $a1, $a1, $fp /* 3D3694 E00CEBD4 0C080118 */ jal func_E0200460 @@ -495,8 +495,8 @@ glabel func_E00CE478 /* 3D36D0 E00CEC10 AEA40000 */ sw $a0, ($s5) /* 3D36D4 E00CEC14 ACEC0000 */ sw $t4, ($a3) /* 3D36D8 E00CEC18 A6E20000 */ sh $v0, ($s7) -/* 3D36DC E00CEC1C 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3D36E0 E00CEC20 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 3D36DC E00CEC1C 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3D36E0 E00CEC20 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3D36E4 E00CEC24 007E1821 */ addu $v1, $v1, $fp /* 3D36E8 E00CEC28 00431021 */ addu $v0, $v0, $v1 /* 3D36EC E00CEC2C ACE20004 */ sw $v0, 4($a3) @@ -555,8 +555,8 @@ glabel func_E00CE478 /* 3D37C0 E00CED00 3C05D9FF */ lui $a1, 0xd9ff /* 3D37C4 E00CED04 34A5F9FF */ ori $a1, $a1, 0xf9ff /* 3D37C8 E00CED08 3C09D838 */ lui $t1, 0xd838 -/* 3D37CC E00CED0C 3C07800A */ lui $a3, %hi(D_8009A66C) -/* 3D37D0 E00CED10 24E7A66C */ addiu $a3, $a3, %lo(D_8009A66C) +/* 3D37CC E00CED0C 3C07800A */ lui $a3, %hi(gMasterGfxPos) +/* 3D37D0 E00CED10 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) /* 3D37D4 E00CED14 35290002 */ ori $t1, $t1, 2 /* 3D37D8 E00CED18 8CE40000 */ lw $a0, ($a3) /* 3D37DC E00CED1C 3C02DF00 */ lui $v0, 0xdf00 @@ -635,4 +635,4 @@ glabel func_E00CE478 /* 3D3900 E00CEE40 D7B400F0 */ ldc1 $f20, 0xf0($sp) /* 3D3904 E00CEE44 03E00008 */ jr $ra /* 3D3908 E00CEE48 27BD0120 */ addiu $sp, $sp, 0x120 -/* 3D390C E00CEE4C 00000000 */ nop +/* 3D390C E00CEE4C 00000000 */ nop diff --git a/asm/nonmatchings/code_3D3E20/func_E00D048C.s b/asm/nonmatchings/code_3D3E20/func_E00D048C.s index a64625dffe..906b269763 100644 --- a/asm/nonmatchings/code_3D3E20/func_E00D048C.s +++ b/asm/nonmatchings/code_3D3E20/func_E00D048C.s @@ -10,8 +10,8 @@ glabel func_E00D048C /* 3D42C0 E00D04A0 AFB000D8 */ sw $s0, 0xd8($sp) /* 3D42C4 E00D04A4 3C100001 */ lui $s0, 1 /* 3D42C8 E00D04A8 AFB300E4 */ sw $s3, 0xe4($sp) -/* 3D42CC E00D04AC 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 3D42D0 E00D04B0 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 3D42CC E00D04AC 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 3D42D0 E00D04B0 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 3D42D4 E00D04B4 36101630 */ ori $s0, $s0, 0x1630 /* 3D42D8 E00D04B8 AFBF00FC */ sw $ra, 0xfc($sp) /* 3D42DC E00D04BC AFBE00F8 */ sw $fp, 0xf8($sp) @@ -50,7 +50,7 @@ glabel func_E00D048C /* 3D4360 E00D0540 AFAD00A4 */ sw $t5, 0xa4($sp) /* 3D4364 E00D0544 922D0051 */ lbu $t5, 0x51($s1) /* 3D4368 E00D0548 46202102 */ mul.d $f4, $f4, $f0 -/* 3D436C E00D054C 00000000 */ nop +/* 3D436C E00D054C 00000000 */ nop /* 3D4370 E00D0550 AFAD00A8 */ sw $t5, 0xa8($sp) /* 3D4374 E00D0554 922D0052 */ lbu $t5, 0x52($s1) /* 3D4378 E00D0558 3C02E700 */ lui $v0, 0xe700 @@ -60,7 +60,7 @@ glabel func_E00D048C /* 3D4388 E00D0568 AFAD00B0 */ sw $t5, 0xb0($sp) /* 3D438C E00D056C 922D0054 */ lbu $t5, 0x54($s1) /* 3D4390 E00D0570 46203182 */ mul.d $f6, $f6, $f0 -/* 3D4394 E00D0574 00000000 */ nop +/* 3D4394 E00D0574 00000000 */ nop /* 3D4398 E00D0578 AFAD00B4 */ sw $t5, 0xb4($sp) /* 3D439C E00D057C 922D0055 */ lbu $t5, 0x55($s1) /* 3D43A0 E00D0580 46004221 */ cvt.d.s $f8, $f8 @@ -70,7 +70,7 @@ glabel func_E00D048C /* 3D43B0 E00D0590 ACC70000 */ sw $a3, ($a2) /* 3D43B4 E00D0594 8FAD0128 */ lw $t5, 0x128($sp) /* 3D43B8 E00D0598 46204202 */ mul.d $f8, $f8, $f0 -/* 3D43BC E00D059C 00000000 */ nop +/* 3D43BC E00D059C 00000000 */ nop /* 3D43C0 E00D05A0 8DA20010 */ lw $v0, 0x10($t5) /* 3D43C4 E00D05A4 4407A000 */ mfc1 $a3, $f20 /* 3D43C8 E00D05A8 8C43001C */ lw $v1, 0x1c($v0) @@ -111,10 +111,10 @@ glabel func_E00D048C /* 3D4454 E00D0634 0C080180 */ jal func_E0200600 /* 3D4458 E00D0638 E7A0001C */ swc1 $f0, 0x1c($sp) /* 3D445C E00D063C 27A40020 */ addiu $a0, $sp, 0x20 -/* 3D4460 E00D0640 3C158007 */ lui $s5, %hi(D_800741F0) -/* 3D4464 E00D0644 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) -/* 3D4468 E00D0648 3C16800A */ lui $s6, %hi(D_8009A674) -/* 3D446C E00D064C 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) +/* 3D4460 E00D0640 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 3D4464 E00D0644 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) +/* 3D4468 E00D0648 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 3D446C E00D064C 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) /* 3D4470 E00D0650 96A50000 */ lhu $a1, ($s5) /* 3D4474 E00D0654 8EC20000 */ lw $v0, ($s6) /* 3D4478 E00D0658 00052980 */ sll $a1, $a1, 6 @@ -169,7 +169,7 @@ glabel func_E00D048C .LE00D071C: /* 3D453C E00D071C 8E020008 */ lw $v0, 8($s0) /* 3D4540 E00D0720 04400078 */ bltz $v0, .LE00D0904 -/* 3D4544 E00D0724 00000000 */ nop +/* 3D4544 E00D0724 00000000 */ nop /* 3D4548 E00D0728 8E05FFC0 */ lw $a1, -0x40($s0) /* 3D454C E00D072C 8E06FFC4 */ lw $a2, -0x3c($s0) /* 3D4550 E00D0730 8E07FFC8 */ lw $a3, -0x38($s0) @@ -187,15 +187,15 @@ glabel func_E00D048C /* 3D4580 E00D0760 00A0302D */ daddu $a2, $a1, $zero /* 3D4584 E00D0764 C600FFD8 */ lwc1 $f0, -0x28($s0) /* 3D4588 E00D0768 461C0002 */ mul.s $f0, $f0, $f28 -/* 3D458C E00D076C 00000000 */ nop +/* 3D458C E00D076C 00000000 */ nop /* 3D4590 E00D0770 44050000 */ mfc1 $a1, $f0 /* 3D4594 E00D0774 C600FFDC */ lwc1 $f0, -0x24($s0) /* 3D4598 E00D0778 461A0002 */ mul.s $f0, $f0, $f26 -/* 3D459C E00D077C 00000000 */ nop +/* 3D459C E00D077C 00000000 */ nop /* 3D45A0 E00D0780 44060000 */ mfc1 $a2, $f0 /* 3D45A4 E00D0784 C600FFE0 */ lwc1 $f0, -0x20($s0) /* 3D45A8 E00D0788 46180002 */ mul.s $f0, $f0, $f24 -/* 3D45AC E00D078C 00000000 */ nop +/* 3D45AC E00D078C 00000000 */ nop /* 3D45B0 E00D0790 44070000 */ mfc1 $a3, $f0 /* 3D45B4 E00D0794 0C080110 */ jal func_E0200440 /* 3D45B8 E00D0798 0240202D */ daddu $a0, $s2, $zero @@ -215,8 +215,8 @@ glabel func_E00D048C /* 3D45F0 E00D07D0 00A0302D */ daddu $a2, $a1, $zero /* 3D45F4 E00D07D4 27A40020 */ addiu $a0, $sp, 0x20 /* 3D45F8 E00D07D8 96C50000 */ lhu $a1, ($s6) -/* 3D45FC E00D07DC 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3D4600 E00D07E0 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 3D45FC E00D07DC 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3D4600 E00D07E0 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3D4604 E00D07E4 00052980 */ sll $a1, $a1, 6 /* 3D4608 E00D07E8 00B52821 */ addu $a1, $a1, $s5 /* 3D460C E00D07EC 0C080118 */ jal func_E0200460 @@ -233,7 +233,7 @@ glabel func_E00D048C /* 3D4638 E00D0818 24630008 */ addiu $v1, $v1, 8 /* 3D463C E00D081C 4600030D */ trunc.w.s $f12, $f0 /* 3D4640 E00D0820 44026000 */ mfc1 $v0, $f12 -/* 3D4644 E00D0824 00000000 */ nop +/* 3D4644 E00D0824 00000000 */ nop /* 3D4648 E00D0828 30420FFF */ andi $v0, $v0, 0xfff /* 3D464C E00D082C 005E1025 */ or $v0, $v0, $fp /* 3D4650 E00D0830 AE630000 */ sw $v1, ($s3) @@ -253,7 +253,7 @@ glabel func_E00D048C /* 3D4688 E00D0868 AE620000 */ sw $v0, ($s3) /* 3D468C E00D086C 4600030D */ trunc.w.s $f12, $f0 /* 3D4690 E00D0870 44026000 */ mfc1 $v0, $f12 -/* 3D4694 E00D0874 00000000 */ nop +/* 3D4694 E00D0874 00000000 */ nop /* 3D4698 E00D0878 2442007C */ addiu $v0, $v0, 0x7c /* 3D469C E00D087C 30420FFF */ andi $v0, $v0, 0xfff /* 3D46A0 E00D0880 00461025 */ or $v0, $v0, $a2 @@ -263,15 +263,15 @@ glabel func_E00D048C /* 3D46B0 E00D0890 AE620000 */ sw $v0, ($s3) /* 3D46B4 E00D0894 4600030D */ trunc.w.s $f12, $f0 /* 3D46B8 E00D0898 44026000 */ mfc1 $v0, $f12 -/* 3D46BC E00D089C 00000000 */ nop +/* 3D46BC E00D089C 00000000 */ nop /* 3D46C0 E00D08A0 30420FFF */ andi $v0, $v0, 0xfff /* 3D46C4 E00D08A4 005E1025 */ or $v0, $v0, $fp /* 3D46C8 E00D08A8 AC620000 */ sw $v0, ($v1) /* 3D46CC E00D08AC C6000000 */ lwc1 $f0, ($s0) /* 3D46D0 E00D08B0 3C02DA38 */ lui $v0, 0xda38 /* 3D46D4 E00D08B4 AC620008 */ sw $v0, 8($v1) -/* 3D46D8 E00D08B8 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3D46DC E00D08BC 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 3D46D8 E00D08B8 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3D46DC E00D08BC 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3D46E0 E00D08C0 3C0D0900 */ lui $t5, 0x900 /* 3D46E4 E00D08C4 25AD0940 */ addiu $t5, $t5, 0x940 /* 3D46E8 E00D08C8 AC6D0014 */ sw $t5, 0x14($v1) @@ -284,7 +284,7 @@ glabel func_E00D048C /* 3D4704 E00D08E4 AC62001C */ sw $v0, 0x1c($v1) /* 3D4708 E00D08E8 4600030D */ trunc.w.s $f12, $f0 /* 3D470C E00D08EC 44026000 */ mfc1 $v0, $f12 -/* 3D4710 E00D08F0 00000000 */ nop +/* 3D4710 E00D08F0 00000000 */ nop /* 3D4714 E00D08F4 2442007C */ addiu $v0, $v0, 0x7c /* 3D4718 E00D08F8 30420FFF */ andi $v0, $v0, 0xfff /* 3D471C E00D08FC 00481025 */ or $v0, $v0, $t0 @@ -299,8 +299,8 @@ glabel func_E00D048C .LE00D091C: /* 3D473C E00D091C 3C0AD9FF */ lui $t2, 0xd9ff /* 3D4740 E00D0920 354AF9FF */ ori $t2, $t2, 0xf9ff -/* 3D4744 E00D0924 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 3D4748 E00D0928 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 3D4744 E00D0924 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 3D4748 E00D0928 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 3D474C E00D092C 3C02DF00 */ lui $v0, 0xdf00 /* 3D4750 E00D0930 8CA30000 */ lw $v1, ($a1) /* 3D4754 E00D0934 3C09FA00 */ lui $t1, 0xfa00 @@ -420,5 +420,5 @@ glabel func_E00D048C /* 3D491C E00D0AFC D7B40100 */ ldc1 $f20, 0x100($sp) /* 3D4920 E00D0B00 03E00008 */ jr $ra /* 3D4924 E00D0B04 27BD0128 */ addiu $sp, $sp, 0x128 -/* 3D4928 E00D0B08 00000000 */ nop -/* 3D492C E00D0B0C 00000000 */ nop +/* 3D4928 E00D0B08 00000000 */ nop +/* 3D492C E00D0B0C 00000000 */ nop diff --git a/asm/nonmatchings/code_3D4970/func_E00D2284.s b/asm/nonmatchings/code_3D4970/func_E00D2284.s index 49e389d168..1ad90556d7 100644 --- a/asm/nonmatchings/code_3D4970/func_E00D2284.s +++ b/asm/nonmatchings/code_3D4970/func_E00D2284.s @@ -10,8 +10,8 @@ glabel func_E00D2284 /* 3D4C08 E00D2298 AFB600A8 */ sw $s6, 0xa8($sp) /* 3D4C0C E00D229C 3C160001 */ lui $s6, 1 /* 3D4C10 E00D22A0 AFB3009C */ sw $s3, 0x9c($sp) -/* 3D4C14 E00D22A4 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 3D4C18 E00D22A8 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 3D4C14 E00D22A4 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 3D4C18 E00D22A8 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 3D4C1C E00D22AC 36D61630 */ ori $s6, $s6, 0x1630 /* 3D4C20 E00D22B0 AFBF00AC */ sw $ra, 0xac($sp) /* 3D4C24 E00D22B4 AFB500A4 */ sw $s5, 0xa4($sp) @@ -38,7 +38,7 @@ glabel func_E00D2284 /* 3D4C78 E00D2308 8C62001C */ lw $v0, 0x1c($v1) /* 3D4C7C E00D230C 3C038000 */ lui $v1, 0x8000 /* 3D4C80 E00D2310 4600A502 */ mul.s $f20, $f20, $f0 -/* 3D4C84 E00D2314 00000000 */ nop +/* 3D4C84 E00D2314 00000000 */ nop /* 3D4C88 E00D2318 00431021 */ addu $v0, $v0, $v1 /* 3D4C8C E00D231C 3C03800B */ lui $v1, %hi(gCameras) /* 3D4C90 E00D2320 24631D80 */ addiu $v1, $v1, %lo(gCameras) @@ -68,10 +68,10 @@ glabel func_E00D2284 /* 3D4CF0 E00D2380 0C080114 */ jal func_E0200450 /* 3D4CF4 E00D2384 00A0302D */ daddu $a2, $a1, $zero /* 3D4CF8 E00D2388 27A40010 */ addiu $a0, $sp, 0x10 -/* 3D4CFC E00D238C 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3D4D00 E00D2390 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3D4D04 E00D2394 3C14800A */ lui $s4, %hi(D_8009A674) -/* 3D4D08 E00D2398 2694A674 */ addiu $s4, $s4, %lo(D_8009A674) +/* 3D4CFC E00D238C 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3D4D00 E00D2390 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3D4D04 E00D2394 3C14800A */ lui $s4, %hi(gDisplayContext) +/* 3D4D08 E00D2398 2694A674 */ addiu $s4, $s4, %lo(gDisplayContext) /* 3D4D0C E00D239C 96050000 */ lhu $a1, ($s0) /* 3D4D10 E00D23A0 8E820000 */ lw $v0, ($s4) /* 3D4D14 E00D23A4 00052980 */ sll $a1, $a1, 6 @@ -160,4 +160,4 @@ glabel func_E00D2284 /* 3D4E60 E00D24F0 D7B400B0 */ ldc1 $f20, 0xb0($sp) /* 3D4E64 E00D24F4 03E00008 */ jr $ra /* 3D4E68 E00D24F8 27BD00B8 */ addiu $sp, $sp, 0xb8 -/* 3D4E6C E00D24FC 00000000 */ nop +/* 3D4E6C E00D24FC 00000000 */ nop diff --git a/asm/nonmatchings/code_3D5020/func_E00D6980.s b/asm/nonmatchings/code_3D5020/func_E00D6980.s index adb5912e6c..1a7be8f4f8 100644 --- a/asm/nonmatchings/code_3D5020/func_E00D6980.s +++ b/asm/nonmatchings/code_3D5020/func_E00D6980.s @@ -5,8 +5,8 @@ glabel func_E00D6980 /* 3D59A0 E00D6980 27BDFF08 */ addiu $sp, $sp, -0xf8 /* 3D59A4 E00D6984 3C08DB06 */ lui $t0, 0xdb06 /* 3D59A8 E00D6988 AFB200B8 */ sw $s2, 0xb8($sp) -/* 3D59AC E00D698C 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 3D59B0 E00D6990 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 3D59AC E00D698C 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 3D59B0 E00D6990 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 3D59B4 E00D6994 AFBF00D4 */ sw $ra, 0xd4($sp) /* 3D59B8 E00D6998 AFBE00D0 */ sw $fp, 0xd0($sp) /* 3D59BC E00D699C AFB700CC */ sw $s7, 0xcc($sp) @@ -49,7 +49,7 @@ glabel func_E00D6980 /* 3D5A50 E00D6A30 3C088000 */ lui $t0, 0x8000 /* 3D5A54 E00D6A34 8D220010 */ lw $v0, 0x10($t1) /* 3D5A58 E00D6A38 46020002 */ mul.s $f0, $f0, $f2 -/* 3D5A5C E00D6A3C 00000000 */ nop +/* 3D5A5C E00D6A3C 00000000 */ nop /* 3D5A60 E00D6A40 8C42001C */ lw $v0, 0x1c($v0) /* 3D5A64 E00D6A44 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 3D5A68 E00D6A48 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) @@ -83,10 +83,10 @@ glabel func_E00D6980 /* 3D5AD8 E00D6AB8 0C080180 */ jal func_E0200600 /* 3D5ADC E00D6ABC E7A0001C */ swc1 $f0, 0x1c($sp) /* 3D5AE0 E00D6AC0 27A40020 */ addiu $a0, $sp, 0x20 -/* 3D5AE4 E00D6AC4 3C158007 */ lui $s5, %hi(D_800741F0) -/* 3D5AE8 E00D6AC8 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) -/* 3D5AEC E00D6ACC 3C17800A */ lui $s7, %hi(D_8009A674) -/* 3D5AF0 E00D6AD0 26F7A674 */ addiu $s7, $s7, %lo(D_8009A674) +/* 3D5AE4 E00D6AC4 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 3D5AE8 E00D6AC8 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) +/* 3D5AEC E00D6ACC 3C17800A */ lui $s7, %hi(gDisplayContext) +/* 3D5AF0 E00D6AD0 26F7A674 */ addiu $s7, $s7, %lo(gDisplayContext) /* 3D5AF4 E00D6AD4 96A50000 */ lhu $a1, ($s5) /* 3D5AF8 E00D6AD8 8EE20000 */ lw $v0, ($s7) /* 3D5AFC E00D6ADC 00052980 */ sll $a1, $a1, 6 @@ -219,7 +219,7 @@ glabel func_E00D6980 /* 3D5CF4 E00D6CD4 3C020900 */ lui $v0, 0x900 /* 3D5CF8 E00D6CD8 24420688 */ addiu $v0, $v0, 0x688 /* 3D5CFC E00D6CDC 10620005 */ beq $v1, $v0, .LE00D6CF4 -/* 3D5D00 E00D6CE0 00000000 */ nop +/* 3D5D00 E00D6CE0 00000000 */ nop /* 3D5D04 E00D6CE4 3C020900 */ lui $v0, 0x900 /* 3D5D08 E00D6CE8 24420808 */ addiu $v0, $v0, 0x808 /* 3D5D0C E00D6CEC 14620006 */ bne $v1, $v0, .LE00D6D08 @@ -283,8 +283,8 @@ glabel func_E00D6980 /* 3D5DE8 E00D6DC8 AE640000 */ sw $a0, ($s3) .LE00D6DCC: /* 3D5DEC E00D6DCC 3C05D838 */ lui $a1, 0xd838 -/* 3D5DF0 E00D6DD0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 3D5DF4 E00D6DD4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 3D5DF0 E00D6DD0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 3D5DF4 E00D6DD4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 3D5DF8 E00D6DD8 8C620000 */ lw $v0, ($v1) /* 3D5DFC E00D6DDC 34A50002 */ ori $a1, $a1, 2 /* 3D5E00 E00D6DE0 0040202D */ daddu $a0, $v0, $zero @@ -309,5 +309,5 @@ glabel func_E00D6980 /* 3D5E4C E00D6E2C D7B400D8 */ ldc1 $f20, 0xd8($sp) /* 3D5E50 E00D6E30 03E00008 */ jr $ra /* 3D5E54 E00D6E34 27BD00F8 */ addiu $sp, $sp, 0xf8 -/* 3D5E58 E00D6E38 00000000 */ nop -/* 3D5E5C E00D6E3C 00000000 */ nop +/* 3D5E58 E00D6E38 00000000 */ nop +/* 3D5E5C E00D6E3C 00000000 */ nop diff --git a/asm/nonmatchings/code_3D67C0/func_E00D8288.s b/asm/nonmatchings/code_3D67C0/func_E00D8288.s index a0d3a3f004..58636786dc 100644 --- a/asm/nonmatchings/code_3D67C0/func_E00D8288.s +++ b/asm/nonmatchings/code_3D67C0/func_E00D8288.s @@ -32,8 +32,8 @@ glabel func_E00D8288 /* 3D6A98 E00D82D8 50400001 */ beql $v0, $zero, .LE00D82E0 /* 3D6A9C E00D82DC 240700EF */ addiu $a3, $zero, 0xef .LE00D82E0: -/* 3D6AA0 E00D82E0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 3D6AA4 E00D82E4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 3D6AA0 E00D82E0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 3D6AA4 E00D82E4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 3D6AA8 E00D82E8 30C403FF */ andi $a0, $a2, 0x3ff /* 3D6AAC E00D82EC 8C620000 */ lw $v0, ($v1) /* 3D6AB0 E00D82F0 00042380 */ sll $a0, $a0, 0xe diff --git a/asm/nonmatchings/code_3D67C0/func_E00D8334.s b/asm/nonmatchings/code_3D67C0/func_E00D8334.s index 4798b432cd..9a08671171 100644 --- a/asm/nonmatchings/code_3D67C0/func_E00D8334.s +++ b/asm/nonmatchings/code_3D67C0/func_E00D8334.s @@ -21,12 +21,12 @@ glabel func_E00D8334 /* 3D6B34 E00D8374 3C01437F */ lui $at, 0x437f /* 3D6B38 E00D8378 44811000 */ mtc1 $at, $f2 /* 3D6B3C E00D837C 44820000 */ mtc1 $v0, $f0 -/* 3D6B40 E00D8380 00000000 */ nop +/* 3D6B40 E00D8380 00000000 */ nop /* 3D6B44 E00D8384 46800020 */ cvt.s.w $f0, $f0 /* 3D6B48 E00D8388 90820035 */ lbu $v0, 0x35($a0) /* 3D6B4C E00D838C 46020103 */ div.s $f4, $f0, $f2 /* 3D6B50 E00D8390 44820000 */ mtc1 $v0, $f0 -/* 3D6B54 E00D8394 00000000 */ nop +/* 3D6B54 E00D8394 00000000 */ nop /* 3D6B58 E00D8398 46800020 */ cvt.s.w $f0, $f0 /* 3D6B5C E00D839C 8C820034 */ lw $v0, 0x34($a0) /* 3D6B60 E00D83A0 00431024 */ and $v0, $v0, $v1 @@ -60,11 +60,11 @@ glabel func_E00D8334 /* 3D6BD0 E00D8410 0280202D */ daddu $a0, $s4, $zero /* 3D6BD4 E00D8414 24D30004 */ addiu $s3, $a2, 4 /* 3D6BD8 E00D8418 0260282D */ daddu $a1, $s3, $zero -/* 3D6BDC E00D841C 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 3D6BE0 E00D8420 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 3D6BDC E00D841C 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 3D6BE0 E00D8420 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 3D6BE4 E00D8424 3C02E700 */ lui $v0, 0xe700 /* 3D6BE8 E00D8428 44940000 */ mtc1 $s4, $f0 -/* 3D6BEC E00D842C 00000000 */ nop +/* 3D6BEC E00D842C 00000000 */ nop /* 3D6BF0 E00D8430 46800020 */ cvt.s.w $f0, $f0 /* 3D6BF4 E00D8434 8FB20058 */ lw $s2, 0x58($sp) /* 3D6BF8 E00D8438 8D030000 */ lw $v1, ($t0) @@ -129,11 +129,11 @@ glabel func_E00D8334 /* 3D6CE4 E00D8524 00461021 */ addu $v0, $v0, $a2 /* 3D6CE8 E00D8528 00021043 */ sra $v0, $v0, 1 /* 3D6CEC E00D852C 4482A000 */ mtc1 $v0, $f20 -/* 3D6CF0 E00D8530 00000000 */ nop +/* 3D6CF0 E00D8530 00000000 */ nop /* 3D6CF4 E00D8534 4680A520 */ cvt.s.w $f20, $f20 /* 3D6CF8 E00D8538 24620058 */ addiu $v0, $v1, 0x58 /* 3D6CFC E00D853C 4604A502 */ mul.s $f20, $f20, $f4 -/* 3D6D00 E00D8540 00000000 */ nop +/* 3D6D00 E00D8540 00000000 */ nop /* 3D6D04 E00D8544 AD020000 */ sw $v0, ($t0) /* 3D6D08 E00D8548 3C02FA00 */ lui $v0, 0xfa00 /* 3D6D0C E00D854C AC620050 */ sw $v0, 0x50($v1) @@ -147,7 +147,7 @@ glabel func_E00D8334 /* 3D6D2C E00D856C AC770054 */ sw $s7, 0x54($v1) /* 3D6D30 E00D8570 0260282D */ daddu $a1, $s3, $zero /* 3D6D34 E00D8574 44910000 */ mtc1 $s1, $f0 -/* 3D6D38 E00D8578 00000000 */ nop +/* 3D6D38 E00D8578 00000000 */ nop /* 3D6D3C E00D857C 46800020 */ cvt.s.w $f0, $f0 /* 3D6D40 E00D8580 46140001 */ sub.s $f0, $f0, $f20 /* 3D6D44 E00D8584 0220302D */ daddu $a2, $s1, $zero @@ -156,13 +156,13 @@ glabel func_E00D8334 /* 3D6D50 E00D8590 0C0360A2 */ jal func_E00D8288 /* 3D6D54 E00D8594 0240382D */ daddu $a3, $s2, $zero /* 3D6D58 E00D8598 4490A000 */ mtc1 $s0, $f20 -/* 3D6D5C E00D859C 00000000 */ nop +/* 3D6D5C E00D859C 00000000 */ nop /* 3D6D60 E00D85A0 4680A520 */ cvt.s.w $f20, $f20 /* 3D6D64 E00D85A4 4616A502 */ mul.s $f20, $f20, $f22 -/* 3D6D68 E00D85A8 00000000 */ nop +/* 3D6D68 E00D85A8 00000000 */ nop /* 3D6D6C E00D85AC 0280202D */ daddu $a0, $s4, $zero /* 3D6D70 E00D85B0 44930000 */ mtc1 $s3, $f0 -/* 3D6D74 E00D85B4 00000000 */ nop +/* 3D6D74 E00D85B4 00000000 */ nop /* 3D6D78 E00D85B8 46800020 */ cvt.s.w $f0, $f0 /* 3D6D7C E00D85BC 46140000 */ add.s $f0, $f0, $f20 /* 3D6D80 E00D85C0 0260282D */ daddu $a1, $s3, $zero @@ -172,7 +172,7 @@ glabel func_E00D8334 /* 3D6D90 E00D85D0 0220302D */ daddu $a2, $s1, $zero /* 3D6D94 E00D85D4 0280202D */ daddu $a0, $s4, $zero /* 3D6D98 E00D85D8 44920000 */ mtc1 $s2, $f0 -/* 3D6D9C E00D85DC 00000000 */ nop +/* 3D6D9C E00D85DC 00000000 */ nop /* 3D6DA0 E00D85E0 46800020 */ cvt.s.w $f0, $f0 /* 3D6DA4 E00D85E4 46140001 */ sub.s $f0, $f0, $f20 /* 3D6DA8 E00D85E8 0220302D */ daddu $a2, $s1, $zero diff --git a/asm/nonmatchings/code_3D67C0/func_E00D8630.s b/asm/nonmatchings/code_3D67C0/func_E00D8630.s index 69c2480c5d..9836bd14a1 100644 --- a/asm/nonmatchings/code_3D67C0/func_E00D8630.s +++ b/asm/nonmatchings/code_3D67C0/func_E00D8630.s @@ -4,8 +4,8 @@ glabel func_E00D8630 /* 3D6DF0 E00D8630 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 3D6DF4 E00D8634 3C07DB06 */ lui $a3, 0xdb06 -/* 3D6DF8 E00D8638 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 3D6DFC E00D863C 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 3D6DF8 E00D8638 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 3D6DFC E00D863C 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 3D6E00 E00D8640 34E70024 */ ori $a3, $a3, 0x24 /* 3D6E04 E00D8644 3C02E700 */ lui $v0, 0xe700 /* 3D6E08 E00D8648 AFBF0050 */ sw $ra, 0x50($sp) @@ -28,24 +28,24 @@ glabel func_E00D8630 /* 3D6E4C E00D868C C502001C */ lwc1 $f2, 0x1c($t0) /* 3D6E50 E00D8690 24A50008 */ addiu $a1, $a1, 8 /* 3D6E54 E00D8694 46001032 */ c.eq.s $f2, $f0 -/* 3D6E58 E00D8698 00000000 */ nop +/* 3D6E58 E00D8698 00000000 */ nop /* 3D6E5C E00D869C 45000012 */ bc1f .LE00D86E8 /* 3D6E60 E00D86A0 ACC50000 */ sw $a1, ($a2) /* 3D6E64 E00D86A4 C5000020 */ lwc1 $f0, 0x20($t0) /* 3D6E68 E00D86A8 44801000 */ mtc1 $zero, $f2 -/* 3D6E6C E00D86AC 00000000 */ nop +/* 3D6E6C E00D86AC 00000000 */ nop /* 3D6E70 E00D86B0 46020032 */ c.eq.s $f0, $f2 -/* 3D6E74 E00D86B4 00000000 */ nop +/* 3D6E74 E00D86B4 00000000 */ nop /* 3D6E78 E00D86B8 4500000B */ bc1f .LE00D86E8 -/* 3D6E7C E00D86BC 00000000 */ nop +/* 3D6E7C E00D86BC 00000000 */ nop /* 3D6E80 E00D86C0 C5000024 */ lwc1 $f0, 0x24($t0) /* 3D6E84 E00D86C4 46020032 */ c.eq.s $f0, $f2 -/* 3D6E88 E00D86C8 00000000 */ nop +/* 3D6E88 E00D86C8 00000000 */ nop /* 3D6E8C E00D86CC 45000006 */ bc1f .LE00D86E8 -/* 3D6E90 E00D86D0 00000000 */ nop +/* 3D6E90 E00D86D0 00000000 */ nop /* 3D6E94 E00D86D4 C5000028 */ lwc1 $f0, 0x28($t0) /* 3D6E98 E00D86D8 46020032 */ c.eq.s $f0, $f2 -/* 3D6E9C E00D86DC 00000000 */ nop +/* 3D6E9C E00D86DC 00000000 */ nop /* 3D6EA0 E00D86E0 45030001 */ bc1tl .LE00D86E8 /* 3D6EA4 E00D86E4 0000202D */ daddu $a0, $zero, $zero .LE00D86E8: @@ -98,8 +98,8 @@ glabel func_E00D8630 /* 3D6F60 E00D87A0 44076000 */ mfc1 $a3, $f12 /* 3D6F64 E00D87A4 0C080190 */ jal func_E0200640 /* 3D6F68 E00D87A8 E7A60034 */ swc1 $f6, 0x34($sp) -/* 3D6F6C E00D87AC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 3D6F70 E00D87B0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 3D6F6C E00D87AC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 3D6F70 E00D87B0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 3D6F74 E00D87B4 8C620000 */ lw $v0, ($v1) /* 3D6F78 E00D87B8 0040202D */ daddu $a0, $v0, $zero /* 3D6F7C E00D87BC 24420008 */ addiu $v0, $v0, 8 @@ -110,4 +110,4 @@ glabel func_E00D8630 /* 3D6F90 E00D87D0 8FBF0050 */ lw $ra, 0x50($sp) /* 3D6F94 E00D87D4 03E00008 */ jr $ra /* 3D6F98 E00D87D8 27BD0058 */ addiu $sp, $sp, 0x58 -/* 3D6F9C E00D87DC 00000000 */ nop +/* 3D6F9C E00D87DC 00000000 */ nop diff --git a/asm/nonmatchings/code_3D7240/func_E00DA230.s b/asm/nonmatchings/code_3D7240/func_E00DA230.s index 89885100cf..7a4ada5403 100644 --- a/asm/nonmatchings/code_3D7240/func_E00DA230.s +++ b/asm/nonmatchings/code_3D7240/func_E00DA230.s @@ -10,8 +10,8 @@ glabel func_E00DA230 /* 3D7484 E00DA244 AFB600A8 */ sw $s6, 0xa8($sp) /* 3D7488 E00DA248 3C160001 */ lui $s6, 1 /* 3D748C E00DA24C AFB3009C */ sw $s3, 0x9c($sp) -/* 3D7490 E00DA250 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 3D7494 E00DA254 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 3D7490 E00DA250 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 3D7494 E00DA254 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 3D7498 E00DA258 36D61630 */ ori $s6, $s6, 0x1630 /* 3D749C E00DA25C AFBF00AC */ sw $ra, 0xac($sp) /* 3D74A0 E00DA260 AFB500A4 */ sw $s5, 0xa4($sp) @@ -38,7 +38,7 @@ glabel func_E00DA230 /* 3D74F4 E00DA2B4 8C62001C */ lw $v0, 0x1c($v1) /* 3D74F8 E00DA2B8 3C038000 */ lui $v1, 0x8000 /* 3D74FC E00DA2BC 4600A502 */ mul.s $f20, $f20, $f0 -/* 3D7500 E00DA2C0 00000000 */ nop +/* 3D7500 E00DA2C0 00000000 */ nop /* 3D7504 E00DA2C4 00431021 */ addu $v0, $v0, $v1 /* 3D7508 E00DA2C8 3C03800B */ lui $v1, %hi(gCameras) /* 3D750C E00DA2CC 24631D80 */ addiu $v1, $v1, %lo(gCameras) @@ -68,10 +68,10 @@ glabel func_E00DA230 /* 3D756C E00DA32C 0C080114 */ jal func_E0200450 /* 3D7570 E00DA330 00A0302D */ daddu $a2, $a1, $zero /* 3D7574 E00DA334 27A40010 */ addiu $a0, $sp, 0x10 -/* 3D7578 E00DA338 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3D757C E00DA33C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3D7580 E00DA340 3C14800A */ lui $s4, %hi(D_8009A674) -/* 3D7584 E00DA344 2694A674 */ addiu $s4, $s4, %lo(D_8009A674) +/* 3D7578 E00DA338 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3D757C E00DA33C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3D7580 E00DA340 3C14800A */ lui $s4, %hi(gDisplayContext) +/* 3D7584 E00DA344 2694A674 */ addiu $s4, $s4, %lo(gDisplayContext) /* 3D7588 E00DA348 96050000 */ lhu $a1, ($s0) /* 3D758C E00DA34C 8E820000 */ lw $v0, ($s4) /* 3D7590 E00DA350 00052980 */ sll $a1, $a1, 6 @@ -180,5 +180,5 @@ glabel func_E00DA230 /* 3D772C E00DA4EC D7B400B0 */ ldc1 $f20, 0xb0($sp) /* 3D7730 E00DA4F0 03E00008 */ jr $ra /* 3D7734 E00DA4F4 27BD00B8 */ addiu $sp, $sp, 0xb8 -/* 3D7738 E00DA4F8 00000000 */ nop -/* 3D773C E00DA4FC 00000000 */ nop +/* 3D7738 E00DA4F8 00000000 */ nop +/* 3D773C E00DA4FC 00000000 */ nop diff --git a/asm/nonmatchings/code_3D7A70/func_E00DC304.s b/asm/nonmatchings/code_3D7A70/func_E00DC304.s index fd5df43e53..c37eb39a80 100644 --- a/asm/nonmatchings/code_3D7A70/func_E00DC304.s +++ b/asm/nonmatchings/code_3D7A70/func_E00DC304.s @@ -8,8 +8,8 @@ glabel func_E00DC304 /* 3D7D80 E00DC310 34E70024 */ ori $a3, $a3, 0x24 /* 3D7D84 E00DC314 27A40018 */ addiu $a0, $sp, 0x18 /* 3D7D88 E00DC318 AFB400B0 */ sw $s4, 0xb0($sp) -/* 3D7D8C E00DC31C 3C14800A */ lui $s4, %hi(D_8009A66C) -/* 3D7D90 E00DC320 2694A66C */ addiu $s4, $s4, %lo(D_8009A66C) +/* 3D7D8C E00DC31C 3C14800A */ lui $s4, %hi(gMasterGfxPos) +/* 3D7D90 E00DC320 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) /* 3D7D94 E00DC324 AFBF00C4 */ sw $ra, 0xc4($sp) /* 3D7D98 E00DC328 AFBE00C0 */ sw $fp, 0xc0($sp) /* 3D7D9C E00DC32C AFB700BC */ sw $s7, 0xbc($sp) @@ -38,13 +38,13 @@ glabel func_E00DC304 /* 3D7DF8 E00DC388 ACA70000 */ sw $a3, ($a1) /* 3D7DFC E00DC38C 8CC30010 */ lw $v1, 0x10($a2) /* 3D7E00 E00DC390 46001082 */ mul.s $f2, $f2, $f0 -/* 3D7E04 E00DC394 00000000 */ nop +/* 3D7E04 E00DC394 00000000 */ nop /* 3D7E08 E00DC398 24A20008 */ addiu $v0, $a1, 8 /* 3D7E0C E00DC39C AE820000 */ sw $v0, ($s4) /* 3D7E10 E00DC3A0 8C62001C */ lw $v0, 0x1c($v1) /* 3D7E14 E00DC3A4 3C038000 */ lui $v1, 0x8000 /* 3D7E18 E00DC3A8 46002102 */ mul.s $f4, $f4, $f0 -/* 3D7E1C E00DC3AC 00000000 */ nop +/* 3D7E1C E00DC3AC 00000000 */ nop /* 3D7E20 E00DC3B0 00431021 */ addu $v0, $v0, $v1 /* 3D7E24 E00DC3B4 3C03800B */ lui $v1, %hi(gCameras) /* 3D7E28 E00DC3B8 24631D80 */ addiu $v1, $v1, %lo(gCameras) @@ -92,10 +92,10 @@ glabel func_E00DC304 /* 3D7ED0 E00DC460 0C080114 */ jal func_E0200450 /* 3D7ED4 E00DC464 00A0302D */ daddu $a2, $a1, $zero /* 3D7ED8 E00DC468 27A40018 */ addiu $a0, $sp, 0x18 -/* 3D7EDC E00DC46C 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3D7EE0 E00DC470 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3D7EE4 E00DC474 3C15800A */ lui $s5, %hi(D_8009A674) -/* 3D7EE8 E00DC478 26B5A674 */ addiu $s5, $s5, %lo(D_8009A674) +/* 3D7EDC E00DC46C 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3D7EE0 E00DC470 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3D7EE4 E00DC474 3C15800A */ lui $s5, %hi(gDisplayContext) +/* 3D7EE8 E00DC478 26B5A674 */ addiu $s5, $s5, %lo(gDisplayContext) /* 3D7EEC E00DC47C 96050000 */ lhu $a1, ($s0) /* 3D7EF0 E00DC480 8EA20000 */ lw $v0, ($s5) /* 3D7EF4 E00DC484 00052980 */ sll $a1, $a1, 6 @@ -207,5 +207,5 @@ glabel func_E00DC304 /* 3D809C E00DC62C 8FB000A0 */ lw $s0, 0xa0($sp) /* 3D80A0 E00DC630 03E00008 */ jr $ra /* 3D80A4 E00DC634 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* 3D80A8 E00DC638 00000000 */ nop -/* 3D80AC E00DC63C 00000000 */ nop +/* 3D80A8 E00DC638 00000000 */ nop +/* 3D80AC E00DC63C 00000000 */ nop diff --git a/asm/nonmatchings/code_3D8720/func_E00DE2A8.s b/asm/nonmatchings/code_3D8720/func_E00DE2A8.s index cdd5064350..075a25c135 100644 --- a/asm/nonmatchings/code_3D8720/func_E00DE2A8.s +++ b/asm/nonmatchings/code_3D8720/func_E00DE2A8.s @@ -10,8 +10,8 @@ glabel func_E00DE2A8 /* 3D89DC E00DE2BC AFB400B0 */ sw $s4, 0xb0($sp) /* 3D89E0 E00DE2C0 3C140001 */ lui $s4, 1 /* 3D89E4 E00DE2C4 AFB200A8 */ sw $s2, 0xa8($sp) -/* 3D89E8 E00DE2C8 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 3D89EC E00DE2CC 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 3D89E8 E00DE2C8 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 3D89EC E00DE2CC 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 3D89F0 E00DE2D0 36941630 */ ori $s4, $s4, 0x1630 /* 3D89F4 E00DE2D4 AFBF00C4 */ sw $ra, 0xc4($sp) /* 3D89F8 E00DE2D8 AFBE00C0 */ sw $fp, 0xc0($sp) @@ -67,10 +67,10 @@ glabel func_E00DE2A8 /* 3D8AC0 E00DE3A0 0C080114 */ jal func_E0200450 /* 3D8AC4 E00DE3A4 00A0302D */ daddu $a2, $a1, $zero /* 3D8AC8 E00DE3A8 27A40020 */ addiu $a0, $sp, 0x20 -/* 3D8ACC E00DE3AC 3C118007 */ lui $s1, %hi(D_800741F0) -/* 3D8AD0 E00DE3B0 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 3D8AD4 E00DE3B4 3C13800A */ lui $s3, %hi(D_8009A674) -/* 3D8AD8 E00DE3B8 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* 3D8ACC E00DE3AC 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 3D8AD0 E00DE3B0 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 3D8AD4 E00DE3B4 3C13800A */ lui $s3, %hi(gDisplayContext) +/* 3D8AD8 E00DE3B8 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* 3D8ADC E00DE3BC 96250000 */ lhu $a1, ($s1) /* 3D8AE0 E00DE3C0 8E620000 */ lw $v0, ($s3) /* 3D8AE4 E00DE3C4 00052980 */ sll $a1, $a1, 6 @@ -82,7 +82,7 @@ glabel func_E00DE2A8 /* 3D8AFC E00DE3DC 3C06DA38 */ lui $a2, 0xda38 /* 3D8B00 E00DE3E0 34C60001 */ ori $a2, $a2, 1 /* 3D8B04 E00DE3E4 44950000 */ mtc1 $s5, $f0 -/* 3D8B08 E00DE3E8 00000000 */ nop +/* 3D8B08 E00DE3E8 00000000 */ nop /* 3D8B0C E00DE3EC 46800021 */ cvt.d.w $f0, $f0 /* 3D8B10 E00DE3F0 8E440000 */ lw $a0, ($s2) /* 3D8B14 E00DE3F4 96220000 */ lhu $v0, ($s1) @@ -99,7 +99,7 @@ glabel func_E00DE2A8 /* 3D8B40 E00DE420 00541021 */ addu $v0, $v0, $s4 /* 3D8B44 E00DE424 2487000C */ addiu $a3, $a0, 0xc /* 3D8B48 E00DE428 46220002 */ mul.d $f0, $f0, $f2 -/* 3D8B4C E00DE42C 00000000 */ nop +/* 3D8B4C E00DE42C 00000000 */ nop /* 3D8B50 E00DE430 A6230000 */ sh $v1, ($s1) /* 3D8B54 E00DE434 8E630000 */ lw $v1, ($s3) /* 3D8B58 E00DE438 3C0141E0 */ lui $at, 0x41e0 @@ -124,7 +124,7 @@ glabel func_E00DE2A8 /* 3D8BA4 E00DE484 00822025 */ or $a0, $a0, $v0 /* 3D8BA8 E00DE488 00031A00 */ sll $v1, $v1, 8 /* 3D8BAC E00DE48C 4620103E */ c.le.d $f2, $f0 -/* 3D8BB0 E00DE490 00000000 */ nop +/* 3D8BB0 E00DE490 00000000 */ nop /* 3D8BB4 E00DE494 45010005 */ bc1t .LE00DE4AC /* 3D8BB8 E00DE498 00832025 */ or $a0, $a0, $v1 /* 3D8BBC E00DE49C 4620010D */ trunc.w.d $f4, $f0 @@ -141,8 +141,8 @@ glabel func_E00DE2A8 .LE00DE4C4: /* 3D8BE4 E00DE4C4 34A51A01 */ ori $a1, $a1, 0x1a01 /* 3D8BE8 E00DE4C8 03C0302D */ daddu $a2, $fp, $zero -/* 3D8BEC E00DE4CC 3C14800A */ lui $s4, %hi(D_8009A66C) -/* 3D8BF0 E00DE4D0 2694A66C */ addiu $s4, $s4, %lo(D_8009A66C) +/* 3D8BEC E00DE4CC 3C14800A */ lui $s4, %hi(gMasterGfxPos) +/* 3D8BF0 E00DE4D0 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) /* 3D8BF4 E00DE4D4 304200FF */ andi $v0, $v0, 0xff /* 3D8BF8 E00DE4D8 8E830000 */ lw $v1, ($s4) /* 3D8BFC E00DE4DC 00821025 */ or $v0, $a0, $v0 @@ -178,7 +178,7 @@ glabel func_E00DE2A8 /* 3D8C70 E00DE550 9042E96C */ lbu $v0, %lo(D_E00DE96C)($v0) /* 3D8C74 E00DE554 44801000 */ mtc1 $zero, $f2 /* 3D8C78 E00DE558 44820000 */ mtc1 $v0, $f0 -/* 3D8C7C E00DE55C 00000000 */ nop +/* 3D8C7C E00DE55C 00000000 */ nop /* 3D8C80 E00DE560 46800020 */ cvt.s.w $f0, $f0 /* 3D8C84 E00DE564 46000007 */ neg.s $f0, $f0 /* 3D8C88 E00DE568 44070000 */ mfc1 $a3, $f0 @@ -191,26 +191,26 @@ glabel func_E00DE2A8 /* 3D8CA4 E00DE584 44810000 */ mtc1 $at, $f0 /* 3D8CA8 E00DE588 00A0302D */ daddu $a2, $a1, $zero /* 3D8CAC E00DE58C 44821000 */ mtc1 $v0, $f2 -/* 3D8CB0 E00DE590 00000000 */ nop +/* 3D8CB0 E00DE590 00000000 */ nop /* 3D8CB4 E00DE594 468010A0 */ cvt.s.w $f2, $f2 /* 3D8CB8 E00DE598 3C02E00E */ lui $v0, %hi(D_E00DE858) /* 3D8CBC E00DE59C 00501021 */ addu $v0, $v0, $s0 /* 3D8CC0 E00DE5A0 8042E858 */ lb $v0, %lo(D_E00DE858)($v0) /* 3D8CC4 E00DE5A4 46001082 */ mul.s $f2, $f2, $f0 -/* 3D8CC8 E00DE5A8 00000000 */ nop +/* 3D8CC8 E00DE5A8 00000000 */ nop /* 3D8CCC E00DE5AC AFA50018 */ sw $a1, 0x18($sp) /* 3D8CD0 E00DE5B0 AFA5001C */ sw $a1, 0x1c($sp) /* 3D8CD4 E00DE5B4 44820000 */ mtc1 $v0, $f0 -/* 3D8CD8 E00DE5B8 00000000 */ nop +/* 3D8CD8 E00DE5B8 00000000 */ nop /* 3D8CDC E00DE5BC 46800020 */ cvt.s.w $f0, $f0 /* 3D8CE0 E00DE5C0 E7A00014 */ swc1 $f0, 0x14($sp) /* 3D8CE4 E00DE5C4 0C080180 */ jal func_E0200600 /* 3D8CE8 E00DE5C8 E7A20010 */ swc1 $f2, 0x10($sp) /* 3D8CEC E00DE5CC 27A40020 */ addiu $a0, $sp, 0x20 -/* 3D8CF0 E00DE5D0 3C118007 */ lui $s1, %hi(D_800741F0) -/* 3D8CF4 E00DE5D4 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 3D8CF8 E00DE5D8 3C12800A */ lui $s2, %hi(D_8009A674) -/* 3D8CFC E00DE5DC 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 3D8CF0 E00DE5D0 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 3D8CF4 E00DE5D4 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 3D8CF8 E00DE5D8 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 3D8CFC E00DE5DC 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 3D8D00 E00DE5E0 96250000 */ lhu $a1, ($s1) /* 3D8D04 E00DE5E4 8E420000 */ lw $v0, ($s2) /* 3D8D08 E00DE5E8 00052980 */ sll $a1, $a1, 6 @@ -238,27 +238,27 @@ glabel func_E00DE2A8 /* 3D8D60 E00DE640 3C0140A0 */ lui $at, 0x40a0 /* 3D8D64 E00DE644 44811000 */ mtc1 $at, $f2 /* 3D8D68 E00DE648 44820000 */ mtc1 $v0, $f0 -/* 3D8D6C E00DE64C 00000000 */ nop +/* 3D8D6C E00DE64C 00000000 */ nop /* 3D8D70 E00DE650 46800020 */ cvt.s.w $f0, $f0 /* 3D8D74 E00DE654 46020002 */ mul.s $f0, $f0, $f2 -/* 3D8D78 E00DE658 00000000 */ nop +/* 3D8D78 E00DE658 00000000 */ nop /* 3D8D7C E00DE65C 3C013B80 */ lui $at, 0x3b80 /* 3D8D80 E00DE660 44811000 */ mtc1 $at, $f2 -/* 3D8D84 E00DE664 00000000 */ nop +/* 3D8D84 E00DE664 00000000 */ nop /* 3D8D88 E00DE668 46020002 */ mul.s $f0, $f0, $f2 -/* 3D8D8C E00DE66C 00000000 */ nop +/* 3D8D8C E00DE66C 00000000 */ nop /* 3D8D90 E00DE670 4600010D */ trunc.w.s $f4, $f0 /* 3D8D94 E00DE674 44082000 */ mfc1 $t0, $f4 -/* 3D8D98 E00DE678 00000000 */ nop +/* 3D8D98 E00DE678 00000000 */ nop /* 3D8D9C E00DE67C 44881000 */ mtc1 $t0, $f2 -/* 3D8DA0 E00DE680 00000000 */ nop +/* 3D8DA0 E00DE680 00000000 */ nop /* 3D8DA4 E00DE684 468010A0 */ cvt.s.w $f2, $f2 /* 3D8DA8 E00DE688 46020001 */ sub.s $f0, $f0, $f2 /* 3D8DAC E00DE68C 3C014380 */ lui $at, 0x4380 /* 3D8DB0 E00DE690 44811000 */ mtc1 $at, $f2 -/* 3D8DB4 E00DE694 00000000 */ nop +/* 3D8DB4 E00DE694 00000000 */ nop /* 3D8DB8 E00DE698 46020002 */ mul.s $f0, $f0, $f2 -/* 3D8DBC E00DE69C 00000000 */ nop +/* 3D8DBC E00DE69C 00000000 */ nop /* 3D8DC0 E00DE6A0 29020004 */ slti $v0, $t0, 4 /* 3D8DC4 E00DE6A4 38430001 */ xori $v1, $v0, 1 /* 3D8DC8 E00DE6A8 29020005 */ slti $v0, $t0, 5 @@ -282,8 +282,8 @@ glabel func_E00DE2A8 /* 3D8E0C E00DE6EC ACA30000 */ sw $v1, ($a1) .LE00DE6F0: /* 3D8E10 E00DE6F0 ACA20004 */ sw $v0, 4($a1) -/* 3D8E14 E00DE6F4 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 3D8E18 E00DE6F8 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 3D8E14 E00DE6F4 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 3D8E18 E00DE6F8 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 3D8E1C E00DE6FC 8CC50000 */ lw $a1, ($a2) /* 3D8E20 E00DE700 3C02FB00 */ lui $v0, 0xfb00 /* 3D8E24 E00DE704 00A0382D */ daddu $a3, $a1, $zero @@ -317,8 +317,8 @@ glabel func_E00DE2A8 .LE00DE774: /* 3D8E94 E00DE774 34C60002 */ ori $a2, $a2, 2 /* 3D8E98 E00DE778 3C07E300 */ lui $a3, 0xe300 -/* 3D8E9C E00DE77C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 3D8EA0 E00DE780 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 3D8E9C E00DE77C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 3D8EA0 E00DE780 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 3D8EA4 E00DE784 34E71A01 */ ori $a3, $a3, 0x1a01 /* 3D8EA8 E00DE788 8C820000 */ lw $v0, ($a0) /* 3D8EAC E00DE78C 24050040 */ addiu $a1, $zero, 0x40 @@ -353,4 +353,4 @@ glabel func_E00DE2A8 /* 3D8F20 E00DE800 8FB000A0 */ lw $s0, 0xa0($sp) /* 3D8F24 E00DE804 03E00008 */ jr $ra /* 3D8F28 E00DE808 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* 3D8F2C E00DE80C 00000000 */ nop +/* 3D8F2C E00DE80C 00000000 */ nop diff --git a/asm/nonmatchings/code_3DB460/func_E00E0600.s b/asm/nonmatchings/code_3DB460/func_E00E0600.s index fd2908ed37..9c40bf44bf 100644 --- a/asm/nonmatchings/code_3DB460/func_E00E0600.s +++ b/asm/nonmatchings/code_3DB460/func_E00E0600.s @@ -14,8 +14,8 @@ glabel func_E00E0600 /* 3DBA84 E00E0624 AFB500A4 */ sw $s5, 0xa4($sp) /* 3DBA88 E00E0628 24150001 */ addiu $s5, $zero, 1 /* 3DBA8C E00E062C AFB600A8 */ sw $s6, 0xa8($sp) -/* 3DBA90 E00E0630 3C16800A */ lui $s6, %hi(D_8009A66C) -/* 3DBA94 E00E0634 26D6A66C */ addiu $s6, $s6, %lo(D_8009A66C) +/* 3DBA90 E00E0630 3C16800A */ lui $s6, %hi(gMasterGfxPos) +/* 3DBA94 E00E0634 26D6A66C */ addiu $s6, $s6, %lo(gMasterGfxPos) /* 3DBA98 E00E0638 AFBF00B4 */ sw $ra, 0xb4($sp) /* 3DBA9C E00E063C AFB700AC */ sw $s7, 0xac($sp) /* 3DBAA0 E00E0640 AFB400A0 */ sw $s4, 0xa0($sp) @@ -66,10 +66,10 @@ glabel func_E00E0600 /* 3DBB54 E00E06F4 0C080114 */ jal func_E0200450 /* 3DBB58 E00E06F8 00A0302D */ daddu $a2, $a1, $zero /* 3DBB5C E00E06FC 27A40010 */ addiu $a0, $sp, 0x10 -/* 3DBB60 E00E0700 3C118007 */ lui $s1, %hi(D_800741F0) -/* 3DBB64 E00E0704 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 3DBB68 E00E0708 3C17800A */ lui $s7, %hi(D_8009A674) -/* 3DBB6C E00E070C 26F7A674 */ addiu $s7, $s7, %lo(D_8009A674) +/* 3DBB60 E00E0700 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 3DBB64 E00E0704 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 3DBB68 E00E0708 3C17800A */ lui $s7, %hi(gDisplayContext) +/* 3DBB6C E00E070C 26F7A674 */ addiu $s7, $s7, %lo(gDisplayContext) /* 3DBB70 E00E0710 96250000 */ lhu $a1, ($s1) /* 3DBB74 E00E0714 8EE20000 */ lw $v0, ($s7) /* 3DBB78 E00E0718 00052980 */ sll $a1, $a1, 6 @@ -207,14 +207,14 @@ glabel func_E00E0600 /* 3DBD80 E00E0920 AE220000 */ sw $v0, ($s1) /* 3DBD84 E00E0924 4600010D */ trunc.w.s $f4, $f0 /* 3DBD88 E00E0928 44032000 */ mfc1 $v1, $f4 -/* 3DBD8C E00E092C 00000000 */ nop +/* 3DBD8C E00E092C 00000000 */ nop /* 3DBD90 E00E0930 00031880 */ sll $v1, $v1, 2 /* 3DBD94 E00E0934 30630FFF */ andi $v1, $v1, 0xfff /* 3DBD98 E00E0938 C6000000 */ lwc1 $f0, ($s0) /* 3DBD9C E00E093C 00031B00 */ sll $v1, $v1, 0xc /* 3DBDA0 E00E0940 4600010D */ trunc.w.s $f4, $f0 /* 3DBDA4 E00E0944 44022000 */ mfc1 $v0, $f4 -/* 3DBDA8 E00E0948 00000000 */ nop +/* 3DBDA8 E00E0948 00000000 */ nop /* 3DBDAC E00E094C 00021080 */ sll $v0, $v0, 2 /* 3DBDB0 E00E0950 30420FFF */ andi $v0, $v0, 0xfff /* 3DBDB4 E00E0954 00561025 */ or $v0, $v0, $s6 @@ -226,14 +226,14 @@ glabel func_E00E0600 /* 3DBDCC E00E096C ACC20010 */ sw $v0, 0x10($a2) /* 3DBDD0 E00E0970 4600010D */ trunc.w.s $f4, $f0 /* 3DBDD4 E00E0974 44032000 */ mfc1 $v1, $f4 -/* 3DBDD8 E00E0978 00000000 */ nop +/* 3DBDD8 E00E0978 00000000 */ nop /* 3DBDDC E00E097C 2463000F */ addiu $v1, $v1, 0xf /* 3DBDE0 E00E0980 00031880 */ sll $v1, $v1, 2 /* 3DBDE4 E00E0984 30630FFF */ andi $v1, $v1, 0xfff /* 3DBDE8 E00E0988 00031B00 */ sll $v1, $v1, 0xc /* 3DBDEC E00E098C 4600110D */ trunc.w.s $f4, $f2 /* 3DBDF0 E00E0990 44022000 */ mfc1 $v0, $f4 -/* 3DBDF4 E00E0994 00000000 */ nop +/* 3DBDF4 E00E0994 00000000 */ nop /* 3DBDF8 E00E0998 2442000F */ addiu $v0, $v0, 0xf /* 3DBDFC E00E099C 00021080 */ sll $v0, $v0, 2 /* 3DBE00 E00E09A0 30420FFF */ andi $v0, $v0, 0xfff @@ -256,8 +256,8 @@ glabel func_E00E0600 /* 3DBE40 E00E09E0 26100070 */ addiu $s0, $s0, 0x70 .LE00E09E4: /* 3DBE44 E00E09E4 3C05D838 */ lui $a1, 0xd838 -/* 3DBE48 E00E09E8 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 3DBE4C E00E09EC 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 3DBE48 E00E09E8 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 3DBE4C E00E09EC 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 3DBE50 E00E09F0 8C620000 */ lw $v0, ($v1) /* 3DBE54 E00E09F4 34A50002 */ ori $a1, $a1, 2 /* 3DBE58 E00E09F8 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_3DC310/func_E00E2218.s b/asm/nonmatchings/code_3DC310/func_E00E2218.s index a05372f81f..76eef0d4f4 100644 --- a/asm/nonmatchings/code_3DC310/func_E00E2218.s +++ b/asm/nonmatchings/code_3DC310/func_E00E2218.s @@ -9,14 +9,14 @@ glabel func_E00E2218 /* 3DC538 E00E2228 27A40020 */ addiu $a0, $sp, 0x20 /* 3DC53C E00E222C AFB300BC */ sw $s3, 0xbc($sp) /* 3DC540 E00E2230 3C130001 */ lui $s3, 1 -/* 3DC544 E00E2234 3C028007 */ lui $v0, %hi(D_800741F0) -/* 3DC548 E00E2238 244241F0 */ addiu $v0, $v0, %lo(D_800741F0) +/* 3DC544 E00E2234 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* 3DC548 E00E2238 244241F0 */ addiu $v0, $v0, %lo(gMatrixListPos) /* 3DC54C E00E223C AFB700CC */ sw $s7, 0xcc($sp) /* 3DC550 E00E2240 0040B82D */ daddu $s7, $v0, $zero /* 3DC554 E00E2244 3C0F0001 */ lui $t7, 1 /* 3DC558 E00E2248 35EF1630 */ ori $t7, $t7, 0x1630 -/* 3DC55C E00E224C 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 3DC560 E00E2250 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 3DC55C E00E224C 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 3DC560 E00E2250 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 3DC564 E00E2254 AFB600C8 */ sw $s6, 0xc8($sp) /* 3DC568 E00E2258 0040B02D */ daddu $s6, $v0, $zero /* 3DC56C E00E225C AFBF00D4 */ sw $ra, 0xd4($sp) @@ -77,8 +77,8 @@ glabel func_E00E2218 /* 3DC648 E00E2338 00A0302D */ daddu $a2, $a1, $zero /* 3DC64C E00E233C 27A40020 */ addiu $a0, $sp, 0x20 /* 3DC650 E00E2340 96E50000 */ lhu $a1, ($s7) -/* 3DC654 E00E2344 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3DC658 E00E2348 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 3DC654 E00E2344 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3DC658 E00E2348 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3DC65C E00E234C 00052980 */ sll $a1, $a1, 6 /* 3DC660 E00E2350 00B32821 */ addu $a1, $a1, $s3 /* 3DC664 E00E2354 0C080118 */ jal func_E0200460 @@ -105,8 +105,8 @@ glabel func_E00E2218 /* 3DC6B8 E00E23A8 4406B000 */ mfc1 $a2, $f22 /* 3DC6BC E00E23AC 00531021 */ addu $v0, $v0, $s3 /* 3DC6C0 E00E23B0 A6E30000 */ sh $v1, ($s7) -/* 3DC6C4 E00E23B4 3C03800A */ lui $v1, %hi(D_8009A674) -/* 3DC6C8 E00E23B8 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 3DC6C4 E00E23B4 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 3DC6C8 E00E23B8 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 3DC6CC E00E23BC 4407A000 */ mfc1 $a3, $f20 /* 3DC6D0 E00E23C0 00621821 */ addu $v1, $v1, $v0 /* 3DC6D4 E00E23C4 25020008 */ addiu $v0, $t0, 8 @@ -177,7 +177,7 @@ glabel func_E00E2218 /* 3DC7D8 E00E24C8 3C01E00E */ lui $at, %hi(D_E00E2A30) /* 3DC7DC E00E24CC D4202A30 */ ldc1 $f0, %lo(D_E00E2A30)($at) /* 3DC7E0 E00E24D0 44906000 */ mtc1 $s0, $f12 -/* 3DC7E4 E00E24D4 00000000 */ nop +/* 3DC7E4 E00E24D4 00000000 */ nop /* 3DC7E8 E00E24D8 46806321 */ cvt.d.w $f12, $f12 /* 3DC7EC E00E24DC 46206300 */ add.d $f12, $f12, $f0 /* 3DC7F0 E00E24E0 0000A02D */ daddu $s4, $zero, $zero @@ -188,7 +188,7 @@ glabel func_E00E2218 /* 3DC804 E00E24F4 3C1E0900 */ lui $fp, 0x900 /* 3DC808 E00E24F8 27DE10A8 */ addiu $fp, $fp, 0x10a8 /* 3DC80C E00E24FC 46020002 */ mul.s $f0, $f0, $f2 -/* 3DC810 E00E2500 00000000 */ nop +/* 3DC810 E00E2500 00000000 */ nop /* 3DC814 E00E2504 24110002 */ addiu $s1, $zero, 2 /* 3DC818 E00E2508 4405A000 */ mfc1 $a1, $f20 /* 3DC81C E00E250C 4407A000 */ mfc1 $a3, $f20 @@ -207,8 +207,8 @@ glabel func_E00E2218 /* 3DC850 E00E2540 00A0302D */ daddu $a2, $a1, $zero /* 3DC854 E00E2544 27A40020 */ addiu $a0, $sp, 0x20 /* 3DC858 E00E2548 96E50000 */ lhu $a1, ($s7) -/* 3DC85C E00E254C 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3DC860 E00E2550 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 3DC85C E00E254C 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3DC860 E00E2550 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3DC864 E00E2554 00052980 */ sll $a1, $a1, 6 /* 3DC868 E00E2558 00B32821 */ addu $a1, $a1, $s3 /* 3DC86C E00E255C 0C080118 */ jal func_E0200460 @@ -225,8 +225,8 @@ glabel func_E00E2218 /* 3DC898 E00E2588 3042FFFF */ andi $v0, $v0, 0xffff /* 3DC89C E00E258C 00021180 */ sll $v0, $v0, 6 /* 3DC8A0 E00E2590 A6E30000 */ sh $v1, ($s7) -/* 3DC8A4 E00E2594 3C03800A */ lui $v1, %hi(D_8009A674) -/* 3DC8A8 E00E2598 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 3DC8A4 E00E2594 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 3DC8A8 E00E2598 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 3DC8AC E00E259C 00531021 */ addu $v0, $v0, $s3 /* 3DC8B0 E00E25A0 00621821 */ addu $v1, $v1, $v0 /* 3DC8B4 E00E25A4 AC830004 */ sw $v1, 4($a0) @@ -235,24 +235,24 @@ glabel func_E00E2218 /* 3DC8BC E00E25AC 000F10C0 */ sll $v0, $t7, 3 /* 3DC8C0 E00E25B0 02021021 */ addu $v0, $s0, $v0 /* 3DC8C4 E00E25B4 44826000 */ mtc1 $v0, $f12 -/* 3DC8C8 E00E25B8 00000000 */ nop +/* 3DC8C8 E00E25B8 00000000 */ nop /* 3DC8CC E00E25BC 46806320 */ cvt.s.w $f12, $f12 /* 3DC8D0 E00E25C0 0C080140 */ jal func_E0200500 /* 3DC8D4 E00E25C4 26100030 */ addiu $s0, $s0, 0x30 /* 3DC8D8 E00E25C8 44941000 */ mtc1 $s4, $f2 -/* 3DC8DC E00E25CC 00000000 */ nop +/* 3DC8DC E00E25CC 00000000 */ nop /* 3DC8E0 E00E25D0 468010A0 */ cvt.s.w $f2, $f2 /* 3DC8E4 E00E25D4 3C01E00E */ lui $at, %hi(D_E00E2A38) /* 3DC8E8 E00E25D8 D4242A38 */ ldc1 $f4, %lo(D_E00E2A38)($at) /* 3DC8EC E00E25DC 460010A1 */ cvt.d.s $f2, $f2 /* 3DC8F0 E00E25E0 46241082 */ mul.d $f2, $f2, $f4 -/* 3DC8F4 E00E25E4 00000000 */ nop +/* 3DC8F4 E00E25E4 00000000 */ nop /* 3DC8F8 E00E25E8 27A40020 */ addiu $a0, $sp, 0x20 /* 3DC8FC E00E25EC 3C0141F0 */ lui $at, 0x41f0 /* 3DC900 E00E25F0 44812000 */ mtc1 $at, $f4 -/* 3DC904 E00E25F4 00000000 */ nop +/* 3DC904 E00E25F4 00000000 */ nop /* 3DC908 E00E25F8 46040002 */ mul.s $f0, $f0, $f4 -/* 3DC90C E00E25FC 00000000 */ nop +/* 3DC90C E00E25FC 00000000 */ nop /* 3DC910 E00E2600 4405A000 */ mfc1 $a1, $f20 /* 3DC914 E00E2604 3C0740C0 */ lui $a3, 0x40c0 /* 3DC918 E00E2608 26940001 */ addiu $s4, $s4, 1 @@ -271,8 +271,8 @@ glabel func_E00E2218 /* 3DC94C E00E263C E7A20010 */ swc1 $f2, 0x10($sp) /* 3DC950 E00E2640 27A40020 */ addiu $a0, $sp, 0x20 /* 3DC954 E00E2644 96E50000 */ lhu $a1, ($s7) -/* 3DC958 E00E2648 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3DC95C E00E264C 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 3DC958 E00E2648 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3DC95C E00E264C 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 3DC960 E00E2650 8FAF00A8 */ lw $t7, 0xa8($sp) /* 3DC964 E00E2654 00052980 */ sll $a1, $a1, 6 /* 3DC968 E00E2658 00AF2821 */ addu $a1, $a1, $t7 @@ -288,8 +288,8 @@ glabel func_E00E2218 /* 3DC990 E00E2680 00C83025 */ or $a2, $a2, $t0 /* 3DC994 E00E2684 8EC40000 */ lw $a0, ($s6) /* 3DC998 E00E2688 96E50000 */ lhu $a1, ($s7) -/* 3DC99C E00E268C 3C03800A */ lui $v1, %hi(D_8009A674) -/* 3DC9A0 E00E2690 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 3DC99C E00E268C 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 3DC9A0 E00E2690 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 3DC9A4 E00E2694 0080382D */ daddu $a3, $a0, $zero /* 3DC9A8 E00E2698 24840008 */ addiu $a0, $a0, 8 /* 3DC9AC E00E269C ACE20000 */ sw $v0, ($a3) @@ -310,8 +310,8 @@ glabel func_E00E2218 /* 3DC9E8 E00E26D8 1440FFB3 */ bnez $v0, .LE00E25A8 /* 3DC9EC E00E26DC AC860000 */ sw $a2, ($a0) /* 3DC9F0 E00E26E0 0000A02D */ daddu $s4, $zero, $zero -/* 3DC9F4 E00E26E4 3C0B800A */ lui $t3, %hi(D_8009A66C) -/* 3DC9F8 E00E26E8 256BA66C */ addiu $t3, $t3, %lo(D_8009A66C) +/* 3DC9F4 E00E26E4 3C0B800A */ lui $t3, %hi(gMasterGfxPos) +/* 3DC9F8 E00E26E8 256BA66C */ addiu $t3, $t3, %lo(gMasterGfxPos) /* 3DC9FC E00E26EC 3C0A0600 */ lui $t2, 0x600 /* 3DCA00 E00E26F0 24090001 */ addiu $t1, $zero, 1 /* 3DCA04 E00E26F4 3C0E0606 */ lui $t6, 0x606 @@ -349,7 +349,7 @@ glabel func_E00E2218 /* 3DCA74 E00E2764 AC820000 */ sw $v0, ($a0) .LE00E2768: /* 3DCA78 E00E2768 14A00003 */ bnez $a1, .LE00E2778 -/* 3DCA7C E00E276C 00000000 */ nop +/* 3DCA7C E00E276C 00000000 */ nop /* 3DCA80 E00E2770 080389E9 */ j .LE00E27A4 /* 3DCA84 E00E2774 AC8D0004 */ sw $t5, 4($a0) .LE00E2778: @@ -375,14 +375,14 @@ glabel func_E00E2218 /* 3DCACC E00E27BC 3C03D838 */ lui $v1, 0xd838 /* 3DCAD0 E00E27C0 34630002 */ ori $v1, $v1, 2 /* 3DCAD4 E00E27C4 0000A02D */ daddu $s4, $zero, $zero -/* 3DCAD8 E00E27C8 3C1E800A */ lui $fp, %hi(D_8009A674) -/* 3DCADC E00E27CC 27DEA674 */ addiu $fp, $fp, %lo(D_8009A674) -/* 3DCAE0 E00E27D0 3C178007 */ lui $s7, %hi(D_800741F0) -/* 3DCAE4 E00E27D4 26F741F0 */ addiu $s7, $s7, %lo(D_800741F0) +/* 3DCAD8 E00E27C8 3C1E800A */ lui $fp, %hi(gDisplayContext) +/* 3DCADC E00E27CC 27DEA674 */ addiu $fp, $fp, %lo(gDisplayContext) +/* 3DCAE0 E00E27D0 3C178007 */ lui $s7, %hi(gMatrixListPos) +/* 3DCAE4 E00E27D4 26F741F0 */ addiu $s7, $s7, %lo(gMatrixListPos) /* 3DCAE8 E00E27D8 3C160001 */ lui $s6, 1 /* 3DCAEC E00E27DC 36D61630 */ ori $s6, $s6, 0x1630 -/* 3DCAF0 E00E27E0 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 3DCAF4 E00E27E4 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 3DCAF0 E00E27E0 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 3DCAF4 E00E27E4 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 3DCAF8 E00E27E8 0040902D */ daddu $s2, $v0, $zero /* 3DCAFC E00E27EC 2413FEE6 */ addiu $s3, $zero, -0x11a /* 3DCB00 E00E27F0 8FB000A0 */ lw $s0, 0xa0($sp) @@ -404,7 +404,7 @@ glabel func_E00E2218 /* 3DCB3C E00E282C 34427879 */ ori $v0, $v0, 0x7879 /* 3DCB40 E00E2830 27A40020 */ addiu $a0, $sp, 0x20 /* 3DCB44 E00E2834 44933000 */ mtc1 $s3, $f6 -/* 3DCB48 E00E2838 00000000 */ nop +/* 3DCB48 E00E2838 00000000 */ nop /* 3DCB4C E00E283C 468031A0 */ cvt.s.w $f6, $f6 /* 3DCB50 E00E2840 26730024 */ addiu $s3, $s3, 0x24 /* 3DCB54 E00E2844 26940001 */ addiu $s4, $s4, 1 @@ -491,8 +491,8 @@ glabel func_E00E2218 /* 3DCC98 E00E2988 AC88001C */ sw $t0, 0x1c($a0) /* 3DCC9C E00E298C 1440FFA6 */ bnez $v0, .LE00E2828 /* 3DCCA0 E00E2990 AC830004 */ sw $v1, 4($a0) -/* 3DCCA4 E00E2994 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 3DCCA8 E00E2998 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 3DCCA4 E00E2994 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 3DCCA8 E00E2998 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 3DCCAC E00E299C 8C430000 */ lw $v1, ($v0) /* 3DCCB0 E00E29A0 0060202D */ daddu $a0, $v1, $zero /* 3DCCB4 E00E29A4 24630008 */ addiu $v1, $v1, 8 @@ -513,4 +513,4 @@ glabel func_E00E2218 /* 3DCCF0 E00E29E0 D7B400D8 */ ldc1 $f20, 0xd8($sp) /* 3DCCF4 E00E29E4 03E00008 */ jr $ra /* 3DCCF8 E00E29E8 27BD00E8 */ addiu $sp, $sp, 0xe8 -/* 3DCCFC E00E29EC 00000000 */ nop +/* 3DCCFC E00E29EC 00000000 */ nop diff --git a/asm/nonmatchings/code_3DE000/func_E00E495C.s b/asm/nonmatchings/code_3DE000/func_E00E495C.s index 97618dd327..ca4da6531f 100644 --- a/asm/nonmatchings/code_3DE000/func_E00E495C.s +++ b/asm/nonmatchings/code_3DE000/func_E00E495C.s @@ -9,8 +9,8 @@ glabel func_E00E495C /* 3DE96C E00E496C 34A50024 */ ori $a1, $a1, 0x24 /* 3DE970 E00E4970 AFB200A8 */ sw $s2, 0xa8($sp) /* 3DE974 E00E4974 24120001 */ addiu $s2, $zero, 1 -/* 3DE978 E00E4978 3C09800A */ lui $t1, %hi(D_8009A66C) -/* 3DE97C E00E497C 2529A66C */ addiu $t1, $t1, %lo(D_8009A66C) +/* 3DE978 E00E4978 3C09800A */ lui $t1, %hi(gMasterGfxPos) +/* 3DE97C E00E497C 2529A66C */ addiu $t1, $t1, %lo(gMasterGfxPos) /* 3DE980 E00E4980 3C02E700 */ lui $v0, 0xe700 /* 3DE984 E00E4984 AFBF00C4 */ sw $ra, 0xc4($sp) /* 3DE988 E00E4988 AFBE00C0 */ sw $fp, 0xc0($sp) @@ -48,7 +48,7 @@ glabel func_E00E495C /* 3DEA08 E00E4A08 AC820008 */ sw $v0, 8($a0) /* 3DEA0C E00E4A0C 3C028000 */ lui $v0, 0x8000 /* 3DEA10 E00E4A10 46041502 */ mul.s $f20, $f2, $f4 -/* 3DEA14 E00E4A14 00000000 */ nop +/* 3DEA14 E00E4A14 00000000 */ nop /* 3DEA18 E00E4A18 00621821 */ addu $v1, $v1, $v0 /* 3DEA1C E00E4A1C AC830004 */ sw $v1, 4($a0) /* 3DEA20 E00E4A20 9102004B */ lbu $v0, 0x4b($t0) @@ -75,10 +75,10 @@ glabel func_E00E495C /* 3DEA74 E00E4A74 0242102A */ slt $v0, $s2, $v0 /* 3DEA78 E00E4A78 104000B6 */ beqz $v0, .LE00E4D54 /* 3DEA7C E00E4A7C 25080064 */ addiu $t0, $t0, 0x64 -/* 3DEA80 E00E4A80 3C16800A */ lui $s6, %hi(D_8009A674) -/* 3DEA84 E00E4A84 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) -/* 3DEA88 E00E4A88 3C158007 */ lui $s5, %hi(D_800741F0) -/* 3DEA8C E00E4A8C 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) +/* 3DEA80 E00E4A80 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 3DEA84 E00E4A84 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) +/* 3DEA88 E00E4A88 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 3DEA8C E00E4A8C 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) /* 3DEA90 E00E4A90 3C130001 */ lui $s3, 1 /* 3DEA94 E00E4A94 36731630 */ ori $s3, $s3, 0x1630 /* 3DEA98 E00E4A98 0120882D */ daddu $s1, $t1, $zero @@ -105,7 +105,7 @@ glabel func_E00E495C /* 3DEAE8 E00E4AE8 000218C0 */ sll $v1, $v0, 3 /* 3DEAEC E00E4AEC 00431021 */ addu $v0, $v0, $v1 /* 3DEAF0 E00E4AF0 46140002 */ mul.s $f0, $f0, $f20 -/* 3DEAF4 E00E4AF4 00000000 */ nop +/* 3DEAF4 E00E4AF4 00000000 */ nop /* 3DEAF8 E00E4AF8 000210C0 */ sll $v0, $v0, 3 /* 3DEAFC E00E4AFC 004A1021 */ addu $v0, $v0, $t2 /* 3DEB00 E00E4B00 C442006C */ lwc1 $f2, 0x6c($v0) @@ -155,7 +155,7 @@ glabel func_E00E495C /* 3DEBB0 E00E4BB0 C600FFE4 */ lwc1 $f0, -0x1c($s0) /* 3DEBB4 E00E4BB4 46800020 */ cvt.s.w $f0, $f0 /* 3DEBB8 E00E4BB8 4600A002 */ mul.s $f0, $f20, $f0 -/* 3DEBBC E00E4BBC 00000000 */ nop +/* 3DEBBC E00E4BBC 00000000 */ nop /* 3DEBC0 E00E4BC0 9203FFDB */ lbu $v1, -0x25($s0) /* 3DEBC4 E00E4BC4 9204FFDF */ lbu $a0, -0x21($s0) /* 3DEBC8 E00E4BC8 9202FFE3 */ lbu $v0, -0x1d($s0) @@ -164,7 +164,7 @@ glabel func_E00E495C /* 3DEBD4 E00E4BD4 00641825 */ or $v1, $v1, $a0 /* 3DEBD8 E00E4BD8 00021200 */ sll $v0, $v0, 8 /* 3DEBDC E00E4BDC 4600B03E */ c.le.s $f22, $f0 -/* 3DEBE0 E00E4BE0 00000000 */ nop +/* 3DEBE0 E00E4BE0 00000000 */ nop /* 3DEBE4 E00E4BE4 45010005 */ bc1t .LE00E4BFC /* 3DEBE8 E00E4BE8 00621825 */ or $v1, $v1, $v0 /* 3DEBEC E00E4BEC 4600018D */ trunc.w.s $f6, $f0 @@ -176,7 +176,7 @@ glabel func_E00E495C /* 3DEC00 E00E4C00 3C028000 */ lui $v0, 0x8000 /* 3DEC04 E00E4C04 4600018D */ trunc.w.s $f6, $f0 /* 3DEC08 E00E4C08 44043000 */ mfc1 $a0, $f6 -/* 3DEC0C E00E4C0C 00000000 */ nop +/* 3DEC0C E00E4C0C 00000000 */ nop /* 3DEC10 E00E4C10 00822025 */ or $a0, $a0, $v0 /* 3DEC14 E00E4C14 308200FF */ andi $v0, $a0, 0xff .LE00E4C18: @@ -188,7 +188,7 @@ glabel func_E00E495C /* 3DEC2C E00E4C2C 00C0282D */ daddu $a1, $a2, $zero /* 3DEC30 E00E4C30 4600018D */ trunc.w.s $f6, $f0 /* 3DEC34 E00E4C34 44043000 */ mfc1 $a0, $f6 -/* 3DEC38 E00E4C38 00000000 */ nop +/* 3DEC38 E00E4C38 00000000 */ nop /* 3DEC3C E00E4C3C 00042080 */ sll $a0, $a0, 2 /* 3DEC40 E00E4C40 30840FFF */ andi $a0, $a0, 0xfff /* 3DEC44 E00E4C44 00042300 */ sll $a0, $a0, 0xc @@ -196,7 +196,7 @@ glabel func_E00E495C /* 3DEC4C E00E4C4C 24C60008 */ addiu $a2, $a2, 8 /* 3DEC50 E00E4C50 4600018D */ trunc.w.s $f6, $f0 /* 3DEC54 E00E4C54 44023000 */ mfc1 $v0, $f6 -/* 3DEC58 E00E4C58 00000000 */ nop +/* 3DEC58 E00E4C58 00000000 */ nop /* 3DEC5C E00E4C5C 00021080 */ sll $v0, $v0, 2 /* 3DEC60 E00E4C60 30420FFF */ andi $v0, $v0, 0xfff /* 3DEC64 E00E4C64 00431025 */ or $v0, $v0, $v1 @@ -207,7 +207,7 @@ glabel func_E00E495C /* 3DEC78 E00E4C78 AE260000 */ sw $a2, ($s1) /* 3DEC7C E00E4C7C 4600018D */ trunc.w.s $f6, $f0 /* 3DEC80 E00E4C80 44043000 */ mfc1 $a0, $f6 -/* 3DEC84 E00E4C84 00000000 */ nop +/* 3DEC84 E00E4C84 00000000 */ nop /* 3DEC88 E00E4C88 2484000F */ addiu $a0, $a0, 0xf /* 3DEC8C E00E4C8C 00042080 */ sll $a0, $a0, 2 /* 3DEC90 E00E4C90 30840FFF */ andi $a0, $a0, 0xfff @@ -215,7 +215,7 @@ glabel func_E00E495C /* 3DEC98 E00E4C98 00042300 */ sll $a0, $a0, 0xc /* 3DEC9C E00E4C9C 4600018D */ trunc.w.s $f6, $f0 /* 3DECA0 E00E4CA0 44023000 */ mfc1 $v0, $f6 -/* 3DECA4 E00E4CA4 00000000 */ nop +/* 3DECA4 E00E4CA4 00000000 */ nop /* 3DECA8 E00E4CA8 2442000F */ addiu $v0, $v0, 0xf /* 3DECAC E00E4CAC 00021080 */ sll $v0, $v0, 2 /* 3DECB0 E00E4CB0 30420FFF */ andi $v0, $v0, 0xfff diff --git a/asm/nonmatchings/code_3E0930/func_E00E6524.s b/asm/nonmatchings/code_3E0930/func_E00E6524.s index 9f325c8713..f01ac5cd49 100644 --- a/asm/nonmatchings/code_3E0930/func_E00E6524.s +++ b/asm/nonmatchings/code_3E0930/func_E00E6524.s @@ -12,8 +12,8 @@ glabel func_E00E6524 /* 3E0E70 E00E6540 3C120001 */ lui $s2, 1 /* 3E0E74 E00E6544 36521630 */ ori $s2, $s2, 0x1630 /* 3E0E78 E00E6548 AFB600C0 */ sw $s6, 0xc0($sp) -/* 3E0E7C E00E654C 3C16800A */ lui $s6, %hi(D_8009A66C) -/* 3E0E80 E00E6550 26D6A66C */ addiu $s6, $s6, %lo(D_8009A66C) +/* 3E0E7C E00E654C 3C16800A */ lui $s6, %hi(gMasterGfxPos) +/* 3E0E80 E00E6550 26D6A66C */ addiu $s6, $s6, %lo(gMasterGfxPos) /* 3E0E84 E00E6554 AFBF00CC */ sw $ra, 0xcc($sp) /* 3E0E88 E00E6558 AFB700C4 */ sw $s7, 0xc4($sp) /* 3E0E8C E00E655C AFB500BC */ sw $s5, 0xbc($sp) @@ -70,10 +70,10 @@ glabel func_E00E6524 /* 3E0F58 E00E6628 0C080114 */ jal func_E0200450 /* 3E0F5C E00E662C 00A0302D */ daddu $a2, $a1, $zero /* 3E0F60 E00E6630 27A40020 */ addiu $a0, $sp, 0x20 -/* 3E0F64 E00E6634 3C118007 */ lui $s1, %hi(D_800741F0) -/* 3E0F68 E00E6638 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 3E0F6C E00E663C 3C17800A */ lui $s7, %hi(D_8009A674) -/* 3E0F70 E00E6640 26F7A674 */ addiu $s7, $s7, %lo(D_8009A674) +/* 3E0F64 E00E6634 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 3E0F68 E00E6638 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 3E0F6C E00E663C 3C17800A */ lui $s7, %hi(gDisplayContext) +/* 3E0F70 E00E6640 26F7A674 */ addiu $s7, $s7, %lo(gDisplayContext) /* 3E0F74 E00E6644 96250000 */ lhu $a1, ($s1) /* 3E0F78 E00E6648 8EE20000 */ lw $v0, ($s7) /* 3E0F7C E00E664C 00052980 */ sll $a1, $a1, 6 @@ -194,8 +194,8 @@ glabel func_E00E6524 /* 3E1140 E00E6810 26730038 */ addiu $s3, $s3, 0x38 .LE00E6814: /* 3E1144 E00E6814 3C05D838 */ lui $a1, 0xd838 -/* 3E1148 E00E6818 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 3E114C E00E681C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 3E1148 E00E6818 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 3E114C E00E681C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 3E1150 E00E6820 8C620000 */ lw $v0, ($v1) /* 3E1154 E00E6824 34A50002 */ ori $a1, $a1, 2 /* 3E1158 E00E6828 0040202D */ daddu $a0, $v0, $zero @@ -217,6 +217,6 @@ glabel func_E00E6524 /* 3E1198 E00E6868 D7B400D0 */ ldc1 $f20, 0xd0($sp) /* 3E119C E00E686C 03E00008 */ jr $ra /* 3E11A0 E00E6870 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 3E11A4 E00E6874 00000000 */ nop -/* 3E11A8 E00E6878 00000000 */ nop -/* 3E11AC E00E687C 00000000 */ nop +/* 3E11A4 E00E6874 00000000 */ nop +/* 3E11A8 E00E6878 00000000 */ nop +/* 3E11AC E00E687C 00000000 */ nop diff --git a/asm/nonmatchings/code_3E1690/func_E00E83BC.s b/asm/nonmatchings/code_3E1690/func_E00E83BC.s index 2119504687..cce4d9e646 100644 --- a/asm/nonmatchings/code_3E1690/func_E00E83BC.s +++ b/asm/nonmatchings/code_3E1690/func_E00E83BC.s @@ -10,8 +10,8 @@ glabel func_E00E83BC /* 3E1A60 E00E83D0 AFB600A8 */ sw $s6, 0xa8($sp) /* 3E1A64 E00E83D4 3C160001 */ lui $s6, 1 /* 3E1A68 E00E83D8 AFB3009C */ sw $s3, 0x9c($sp) -/* 3E1A6C E00E83DC 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 3E1A70 E00E83E0 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 3E1A6C E00E83DC 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 3E1A70 E00E83E0 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 3E1A74 E00E83E4 36D61630 */ ori $s6, $s6, 0x1630 /* 3E1A78 E00E83E8 AFBF00AC */ sw $ra, 0xac($sp) /* 3E1A7C E00E83EC AFB500A4 */ sw $s5, 0xa4($sp) @@ -63,10 +63,10 @@ glabel func_E00E83BC /* 3E1B34 E00E84A4 0C080114 */ jal func_E0200450 /* 3E1B38 E00E84A8 00A0302D */ daddu $a2, $a1, $zero /* 3E1B3C E00E84AC 27A40010 */ addiu $a0, $sp, 0x10 -/* 3E1B40 E00E84B0 3C118007 */ lui $s1, %hi(D_800741F0) -/* 3E1B44 E00E84B4 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 3E1B48 E00E84B8 3C14800A */ lui $s4, %hi(D_8009A674) -/* 3E1B4C E00E84BC 2694A674 */ addiu $s4, $s4, %lo(D_8009A674) +/* 3E1B40 E00E84B0 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 3E1B44 E00E84B4 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 3E1B48 E00E84B8 3C14800A */ lui $s4, %hi(gDisplayContext) +/* 3E1B4C E00E84BC 2694A674 */ addiu $s4, $s4, %lo(gDisplayContext) /* 3E1B50 E00E84C0 96250000 */ lhu $a1, ($s1) /* 3E1B54 E00E84C4 8E820000 */ lw $v0, ($s4) /* 3E1B58 E00E84C8 00052980 */ sll $a1, $a1, 6 @@ -156,6 +156,6 @@ glabel func_E00E83BC /* 3E1CA8 E00E8618 8FB00090 */ lw $s0, 0x90($sp) /* 3E1CAC E00E861C 03E00008 */ jr $ra /* 3E1CB0 E00E8620 27BD00B0 */ addiu $sp, $sp, 0xb0 -/* 3E1CB4 E00E8624 00000000 */ nop -/* 3E1CB8 E00E8628 00000000 */ nop -/* 3E1CBC E00E862C 00000000 */ nop +/* 3E1CB4 E00E8624 00000000 */ nop +/* 3E1CB8 E00E8628 00000000 */ nop +/* 3E1CBC E00E862C 00000000 */ nop diff --git a/asm/nonmatchings/code_3E1EE0/func_E00EA66C.s b/asm/nonmatchings/code_3E1EE0/func_E00EA66C.s index 01a1ab30cf..2e1eb35ed9 100644 --- a/asm/nonmatchings/code_3E1EE0/func_E00EA66C.s +++ b/asm/nonmatchings/code_3E1EE0/func_E00EA66C.s @@ -7,8 +7,8 @@ glabel func_E00EA66C /* 3E2554 E00EA674 3C07DB06 */ lui $a3, 0xdb06 /* 3E2558 E00EA678 34E70024 */ ori $a3, $a3, 0x24 /* 3E255C E00EA67C AFB400B0 */ sw $s4, 0xb0($sp) -/* 3E2560 E00EA680 3C14800A */ lui $s4, %hi(D_8009A66C) -/* 3E2564 E00EA684 2694A66C */ addiu $s4, $s4, %lo(D_8009A66C) +/* 3E2560 E00EA680 3C14800A */ lui $s4, %hi(gMasterGfxPos) +/* 3E2564 E00EA684 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) /* 3E2568 E00EA688 AFBF00C4 */ sw $ra, 0xc4($sp) /* 3E256C E00EA68C AFBE00C0 */ sw $fp, 0xc0($sp) /* 3E2570 E00EA690 AFB700BC */ sw $s7, 0xbc($sp) @@ -31,26 +31,26 @@ glabel func_E00EA66C /* 3E25B4 E00EA6D4 C6620040 */ lwc1 $f2, 0x40($s3) /* 3E25B8 E00EA6D8 3C02E700 */ lui $v0, 0xe700 /* 3E25BC E00EA6DC 46001082 */ mul.s $f2, $f2, $f0 -/* 3E25C0 E00EA6E0 00000000 */ nop +/* 3E25C0 E00EA6E0 00000000 */ nop /* 3E25C4 E00EA6E4 3C08800B */ lui $t0, %hi(gCameras) /* 3E25C8 E00EA6E8 25081D80 */ addiu $t0, $t0, %lo(gCameras) /* 3E25CC E00EA6EC C6640044 */ lwc1 $f4, 0x44($s3) /* 3E25D0 E00EA6F0 C6660050 */ lwc1 $f6, 0x50($s3) /* 3E25D4 E00EA6F4 C6680054 */ lwc1 $f8, 0x54($s3) /* 3E25D8 E00EA6F8 46002102 */ mul.s $f4, $f4, $f0 -/* 3E25DC E00EA6FC 00000000 */ nop +/* 3E25DC E00EA6FC 00000000 */ nop /* 3E25E0 E00EA700 ACA20000 */ sw $v0, ($a1) /* 3E25E4 E00EA704 24620008 */ addiu $v0, $v1, 8 /* 3E25E8 E00EA708 ACA00004 */ sw $zero, 4($a1) /* 3E25EC E00EA70C AE820000 */ sw $v0, ($s4) /* 3E25F0 E00EA710 46003182 */ mul.s $f6, $f6, $f0 -/* 3E25F4 E00EA714 00000000 */ nop +/* 3E25F4 E00EA714 00000000 */ nop /* 3E25F8 E00EA718 AC670000 */ sw $a3, ($v1) /* 3E25FC E00EA71C 8CC20010 */ lw $v0, 0x10($a2) /* 3E2600 E00EA720 3C058000 */ lui $a1, 0x8000 /* 3E2604 E00EA724 8C42001C */ lw $v0, 0x1c($v0) /* 3E2608 E00EA728 46004202 */ mul.s $f8, $f8, $f0 -/* 3E260C E00EA72C 00000000 */ nop +/* 3E260C E00EA72C 00000000 */ nop /* 3E2610 E00EA730 00451021 */ addu $v0, $v0, $a1 /* 3E2614 E00EA734 AC620004 */ sw $v0, 4($v1) /* 3E2618 E00EA738 8E650004 */ lw $a1, 4($s3) @@ -106,10 +106,10 @@ glabel func_E00EA66C .LE00EA800: /* 3E26E0 E00EA800 36521630 */ ori $s2, $s2, 0x1630 /* 3E26E4 E00EA804 27A40018 */ addiu $a0, $sp, 0x18 -/* 3E26E8 E00EA808 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3E26EC E00EA80C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3E26F0 E00EA810 3C11800A */ lui $s1, %hi(D_8009A674) -/* 3E26F4 E00EA814 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 3E26E8 E00EA808 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3E26EC E00EA80C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3E26F0 E00EA810 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 3E26F4 E00EA814 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 3E26F8 E00EA818 96050000 */ lhu $a1, ($s0) /* 3E26FC E00EA81C 8E220000 */ lw $v0, ($s1) /* 3E2700 E00EA820 00052980 */ sll $a1, $a1, 6 @@ -250,5 +250,5 @@ glabel func_E00EA66C /* 3E291C E00EAA3C 8FB000A0 */ lw $s0, 0xa0($sp) /* 3E2920 E00EAA40 03E00008 */ jr $ra /* 3E2924 E00EAA44 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* 3E2928 E00EAA48 00000000 */ nop -/* 3E292C E00EAA4C 00000000 */ nop +/* 3E2928 E00EAA48 00000000 */ nop +/* 3E292C E00EAA4C 00000000 */ nop diff --git a/asm/nonmatchings/code_3E43A0/func_E010A4E8.s b/asm/nonmatchings/code_3E43A0/func_E010A4E8.s index 0147de3d76..fb6f41cf9c 100644 --- a/asm/nonmatchings/code_3E43A0/func_E010A4E8.s +++ b/asm/nonmatchings/code_3E43A0/func_E010A4E8.s @@ -60,7 +60,7 @@ glabel func_E010A4E8 /* 3E4964 E010A5C4 C6000000 */ lwc1 $f0, ($s0) /* 3E4968 E010A5C8 46800021 */ cvt.d.w $f0, $f0 /* 3E496C E010A5CC 46220002 */ mul.d $f0, $f0, $f2 -/* 3E4970 E010A5D0 00000000 */ nop +/* 3E4970 E010A5D0 00000000 */ nop /* 3E4974 E010A5D4 0080282D */ daddu $a1, $a0, $zero /* 3E4978 E010A5D8 24060136 */ addiu $a2, $zero, 0x136 /* 3E497C E010A5DC 240700E6 */ addiu $a3, $zero, 0xe6 @@ -80,8 +80,8 @@ glabel func_E010A4E8 /* 3E49B0 E010A610 AC730000 */ sw $s3, ($v1) .LE010A614: /* 3E49B4 E010A614 3C04DB06 */ lui $a0, 0xdb06 -/* 3E49B8 E010A618 3C07800A */ lui $a3, %hi(D_8009A66C) -/* 3E49BC E010A61C 24E7A66C */ addiu $a3, $a3, %lo(D_8009A66C) +/* 3E49B8 E010A618 3C07800A */ lui $a3, %hi(gMasterGfxPos) +/* 3E49BC E010A61C 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) /* 3E49C0 E010A620 34840024 */ ori $a0, $a0, 0x24 /* 3E49C4 E010A624 8CE50000 */ lw $a1, ($a3) /* 3E49C8 E010A628 3C02E700 */ lui $v0, 0xe700 @@ -191,15 +191,15 @@ glabel func_E010A4E8 .LE010A7C4: /* 3E4B64 E010A7C4 1AE00129 */ blez $s7, .LE010AC6C /* 3E4B68 E010A7C8 26930001 */ addiu $s3, $s4, 1 -/* 3E4B6C E010A7CC 3C16800A */ lui $s6, %hi(D_8009A66C) -/* 3E4B70 E010A7D0 26D6A66C */ addiu $s6, $s6, %lo(D_8009A66C) +/* 3E4B6C E010A7CC 3C16800A */ lui $s6, %hi(gMasterGfxPos) +/* 3E4B70 E010A7D0 26D6A66C */ addiu $s6, $s6, %lo(gMasterGfxPos) /* 3E4B74 E010A7D4 0220802D */ daddu $s0, $s1, $zero /* 3E4B78 E010A7D8 3C013F80 */ lui $at, 0x3f80 /* 3E4B7C E010A7DC 4481E000 */ mtc1 $at, $f28 .LE010A7E0: /* 3E4B80 E010A7E0 24020001 */ addiu $v0, $zero, 1 /* 3E4B84 E010A7E4 17C20030 */ bne $fp, $v0, .LE010A8A8 -/* 3E4B88 E010A7E8 00000000 */ nop +/* 3E4B88 E010A7E8 00000000 */ nop /* 3E4B8C E010A7EC 0C080138 */ jal func_E02004E0 /* 3E4B90 E010A7F0 24040010 */ addiu $a0, $zero, 0x10 /* 3E4B94 E010A7F4 28420006 */ slti $v0, $v0, 6 @@ -208,38 +208,38 @@ glabel func_E010A4E8 /* 3E4BA0 E010A800 82830000 */ lb $v1, ($s4) /* 3E4BA4 E010A804 C7AE005C */ lwc1 $f14, 0x5c($sp) /* 3E4BA8 E010A808 44832000 */ mtc1 $v1, $f4 -/* 3E4BAC E010A80C 00000000 */ nop +/* 3E4BAC E010A80C 00000000 */ nop /* 3E4BB0 E010A810 46802120 */ cvt.s.w $f4, $f4 /* 3E4BB4 E010A814 460E2102 */ mul.s $f4, $f4, $f14 -/* 3E4BB8 E010A818 00000000 */ nop +/* 3E4BB8 E010A818 00000000 */ nop /* 3E4BBC E010A81C 82620001 */ lb $v0, 1($s3) /* 3E4BC0 E010A820 C7AE0058 */ lwc1 $f14, 0x58($sp) /* 3E4BC4 E010A824 44823000 */ mtc1 $v0, $f6 -/* 3E4BC8 E010A828 00000000 */ nop +/* 3E4BC8 E010A828 00000000 */ nop /* 3E4BCC E010A82C 468031A0 */ cvt.s.w $f6, $f6 /* 3E4BD0 E010A830 460E3002 */ mul.s $f0, $f6, $f14 -/* 3E4BD4 E010A834 00000000 */ nop +/* 3E4BD4 E010A834 00000000 */ nop /* 3E4BD8 E010A838 82620000 */ lb $v0, ($s3) /* 3E4BDC E010A83C 44821000 */ mtc1 $v0, $f2 -/* 3E4BE0 E010A840 00000000 */ nop +/* 3E4BE0 E010A840 00000000 */ nop /* 3E4BE4 E010A844 468010A0 */ cvt.s.w $f2, $f2 /* 3E4BE8 E010A848 461E1082 */ mul.s $f2, $f2, $f30 -/* 3E4BEC E010A84C 00000000 */ nop +/* 3E4BEC E010A84C 00000000 */ nop /* 3E4BF0 E010A850 46002100 */ add.s $f4, $f4, $f0 /* 3E4BF4 E010A854 00031823 */ negu $v1, $v1 /* 3E4BF8 E010A858 44830000 */ mtc1 $v1, $f0 -/* 3E4BFC E010A85C 00000000 */ nop +/* 3E4BFC E010A85C 00000000 */ nop /* 3E4C00 E010A860 46800020 */ cvt.s.w $f0, $f0 /* 3E4C04 E010A864 460E0002 */ mul.s $f0, $f0, $f14 -/* 3E4C08 E010A868 00000000 */ nop +/* 3E4C08 E010A868 00000000 */ nop /* 3E4C0C E010A86C C7AE005C */ lwc1 $f14, 0x5c($sp) /* 3E4C10 E010A870 460E3182 */ mul.s $f6, $f6, $f14 -/* 3E4C14 E010A874 00000000 */ nop +/* 3E4C14 E010A874 00000000 */ nop /* 3E4C18 E010A878 461E2102 */ mul.s $f4, $f4, $f30 -/* 3E4C1C E010A87C 00000000 */ nop +/* 3E4C1C E010A87C 00000000 */ nop /* 3E4C20 E010A880 46060000 */ add.s $f0, $f0, $f6 /* 3E4C24 E010A884 461E0002 */ mul.s $f0, $f0, $f30 -/* 3E4C28 E010A888 00000000 */ nop +/* 3E4C28 E010A888 00000000 */ nop /* 3E4C2C E010A88C C7AE0064 */ lwc1 $f14, 0x64($sp) /* 3E4C30 E010A890 460E1680 */ add.s $f26, $f2, $f14 /* 3E4C34 E010A894 C7AE0060 */ lwc1 $f14, 0x60($sp) @@ -254,41 +254,41 @@ glabel func_E010A4E8 .LE010A8B4: /* 3E4C54 E010A8B4 C7AE0018 */ lwc1 $f14, 0x18($sp) /* 3E4C58 E010A8B8 46187182 */ mul.s $f6, $f14, $f24 -/* 3E4C5C E010A8BC 00000000 */ nop +/* 3E4C5C E010A8BC 00000000 */ nop /* 3E4C60 E010A8C0 C7AE0028 */ lwc1 $f14, 0x28($sp) /* 3E4C64 E010A8C4 461A7402 */ mul.s $f16, $f14, $f26 -/* 3E4C68 E010A8C8 00000000 */ nop +/* 3E4C68 E010A8C8 00000000 */ nop /* 3E4C6C E010A8CC C7AE0038 */ lwc1 $f14, 0x38($sp) /* 3E4C70 E010A8D0 46047482 */ mul.s $f18, $f14, $f4 -/* 3E4C74 E010A8D4 00000000 */ nop +/* 3E4C74 E010A8D4 00000000 */ nop /* 3E4C78 E010A8D8 C7AE001C */ lwc1 $f14, 0x1c($sp) /* 3E4C7C E010A8DC 46187202 */ mul.s $f8, $f14, $f24 -/* 3E4C80 E010A8E0 00000000 */ nop +/* 3E4C80 E010A8E0 00000000 */ nop /* 3E4C84 E010A8E4 C7AE002C */ lwc1 $f14, 0x2c($sp) /* 3E4C88 E010A8E8 461A7302 */ mul.s $f12, $f14, $f26 -/* 3E4C8C E010A8EC 00000000 */ nop +/* 3E4C8C E010A8EC 00000000 */ nop /* 3E4C90 E010A8F0 C7AE003C */ lwc1 $f14, 0x3c($sp) /* 3E4C94 E010A8F4 46047502 */ mul.s $f20, $f14, $f4 -/* 3E4C98 E010A8F8 00000000 */ nop +/* 3E4C98 E010A8F8 00000000 */ nop /* 3E4C9C E010A8FC C7AE0020 */ lwc1 $f14, 0x20($sp) /* 3E4CA0 E010A900 46187282 */ mul.s $f10, $f14, $f24 -/* 3E4CA4 E010A904 00000000 */ nop +/* 3E4CA4 E010A904 00000000 */ nop /* 3E4CA8 E010A908 C7AE0030 */ lwc1 $f14, 0x30($sp) /* 3E4CAC E010A90C 461A7382 */ mul.s $f14, $f14, $f26 -/* 3E4CB0 E010A910 00000000 */ nop +/* 3E4CB0 E010A910 00000000 */ nop /* 3E4CB4 E010A914 E7AE0070 */ swc1 $f14, 0x70($sp) /* 3E4CB8 E010A918 C7AE0040 */ lwc1 $f14, 0x40($sp) /* 3E4CBC E010A91C 46047582 */ mul.s $f22, $f14, $f4 -/* 3E4CC0 E010A920 00000000 */ nop +/* 3E4CC0 E010A920 00000000 */ nop /* 3E4CC4 E010A924 C7AE0024 */ lwc1 $f14, 0x24($sp) /* 3E4CC8 E010A928 46187002 */ mul.s $f0, $f14, $f24 -/* 3E4CCC E010A92C 00000000 */ nop +/* 3E4CCC E010A92C 00000000 */ nop /* 3E4CD0 E010A930 C7AE0034 */ lwc1 $f14, 0x34($sp) /* 3E4CD4 E010A934 461A7082 */ mul.s $f2, $f14, $f26 -/* 3E4CD8 E010A938 00000000 */ nop +/* 3E4CD8 E010A938 00000000 */ nop /* 3E4CDC E010A93C C7AE0044 */ lwc1 $f14, 0x44($sp) /* 3E4CE0 E010A940 46047102 */ mul.s $f4, $f14, $f4 -/* 3E4CE4 E010A944 00000000 */ nop +/* 3E4CE4 E010A944 00000000 */ nop /* 3E4CE8 E010A948 46103180 */ add.s $f6, $f6, $f16 /* 3E4CEC E010A94C 46123180 */ add.s $f6, $f6, $f18 /* 3E4CF0 E010A950 460C4200 */ add.s $f8, $f8, $f12 @@ -305,79 +305,79 @@ glabel func_E010A4E8 /* 3E4D1C E010A97C 460E4200 */ add.s $f8, $f8, $f14 /* 3E4D20 E010A980 46165280 */ add.s $f10, $f10, $f22 /* 3E4D24 E010A984 44807000 */ mtc1 $zero, $f14 -/* 3E4D28 E010A988 00000000 */ nop +/* 3E4D28 E010A988 00000000 */ nop /* 3E4D2C E010A98C 460E1032 */ c.eq.s $f2, $f14 /* 3E4D30 E010A990 C7AE0050 */ lwc1 $f14, 0x50($sp) /* 3E4D34 E010A994 450100AF */ bc1t .LE010AC54 /* 3E4D38 E010A998 460E5000 */ add.s $f0, $f10, $f14 /* 3E4D3C E010A99C 4602E083 */ div.s $f2, $f28, $f2 /* 3E4D40 E010A9A0 46022602 */ mul.s $f24, $f4, $f2 -/* 3E4D44 E010A9A4 00000000 */ nop +/* 3E4D44 E010A9A4 00000000 */ nop /* 3E4D48 E010A9A8 46020102 */ mul.s $f4, $f0, $f2 -/* 3E4D4C E010A9AC 00000000 */ nop +/* 3E4D4C E010A9AC 00000000 */ nop /* 3E4D50 E010A9B0 46004007 */ neg.s $f0, $f8 /* 3E4D54 E010A9B4 46020682 */ mul.s $f26, $f0, $f2 -/* 3E4D58 E010A9B8 00000000 */ nop +/* 3E4D58 E010A9B8 00000000 */ nop /* 3E4D5C E010A9BC 3C01BF80 */ lui $at, 0xbf80 /* 3E4D60 E010A9C0 44817000 */ mtc1 $at, $f14 -/* 3E4D64 E010A9C4 00000000 */ nop +/* 3E4D64 E010A9C4 00000000 */ nop /* 3E4D68 E010A9C8 460E203E */ c.le.s $f4, $f14 -/* 3E4D6C E010A9CC 00000000 */ nop +/* 3E4D6C E010A9CC 00000000 */ nop /* 3E4D70 E010A9D0 450300A1 */ bc1tl .LE010AC58 /* 3E4D74 E010A9D4 26100004 */ addiu $s0, $s0, 4 /* 3E4D78 E010A9D8 460EC03E */ c.le.s $f24, $f14 -/* 3E4D7C E010A9DC 00000000 */ nop +/* 3E4D7C E010A9DC 00000000 */ nop /* 3E4D80 E010A9E0 4503009D */ bc1tl .LE010AC58 /* 3E4D84 E010A9E4 26100004 */ addiu $s0, $s0, 4 /* 3E4D88 E010A9E8 4618E03E */ c.le.s $f28, $f24 -/* 3E4D8C E010A9EC 00000000 */ nop +/* 3E4D8C E010A9EC 00000000 */ nop /* 3E4D90 E010A9F0 45030099 */ bc1tl .LE010AC58 /* 3E4D94 E010A9F4 26100004 */ addiu $s0, $s0, 4 /* 3E4D98 E010A9F8 460ED03E */ c.le.s $f26, $f14 -/* 3E4D9C E010A9FC 00000000 */ nop +/* 3E4D9C E010A9FC 00000000 */ nop /* 3E4DA0 E010AA00 45030095 */ bc1tl .LE010AC58 /* 3E4DA4 E010AA04 26100004 */ addiu $s0, $s0, 4 /* 3E4DA8 E010AA08 461AE03E */ c.le.s $f28, $f26 -/* 3E4DAC E010AA0C 00000000 */ nop +/* 3E4DAC E010AA0C 00000000 */ nop /* 3E4DB0 E010AA10 45030091 */ bc1tl .LE010AC58 /* 3E4DB4 E010AA14 26100004 */ addiu $s0, $s0, 4 /* 3E4DB8 E010AA18 8642000A */ lh $v0, 0xa($s2) /* 3E4DBC E010AA1C 461CC000 */ add.s $f0, $f24, $f28 /* 3E4DC0 E010AA20 44821000 */ mtc1 $v0, $f2 -/* 3E4DC4 E010AA24 00000000 */ nop +/* 3E4DC4 E010AA24 00000000 */ nop /* 3E4DC8 E010AA28 468010A0 */ cvt.s.w $f2, $f2 /* 3E4DCC E010AA2C 46020002 */ mul.s $f0, $f0, $f2 -/* 3E4DD0 E010AA30 00000000 */ nop +/* 3E4DD0 E010AA30 00000000 */ nop /* 3E4DD4 E010AA34 3C013FE0 */ lui $at, 0x3fe0 /* 3E4DD8 E010AA38 44817800 */ mtc1 $at, $f15 /* 3E4DDC E010AA3C 44807000 */ mtc1 $zero, $f14 /* 3E4DE0 E010AA40 46000021 */ cvt.d.s $f0, $f0 /* 3E4DE4 E010AA44 462E0002 */ mul.d $f0, $f0, $f14 -/* 3E4DE8 E010AA48 00000000 */ nop +/* 3E4DE8 E010AA48 00000000 */ nop /* 3E4DEC E010AA4C 8642000C */ lh $v0, 0xc($s2) /* 3E4DF0 E010AA50 461CD080 */ add.s $f2, $f26, $f28 /* 3E4DF4 E010AA54 44822000 */ mtc1 $v0, $f4 -/* 3E4DF8 E010AA58 00000000 */ nop +/* 3E4DF8 E010AA58 00000000 */ nop /* 3E4DFC E010AA5C 46802120 */ cvt.s.w $f4, $f4 /* 3E4E00 E010AA60 46041082 */ mul.s $f2, $f2, $f4 -/* 3E4E04 E010AA64 00000000 */ nop +/* 3E4E04 E010AA64 00000000 */ nop /* 3E4E08 E010AA68 460010A1 */ cvt.d.s $f2, $f2 /* 3E4E0C E010AA6C 462E1082 */ mul.d $f2, $f2, $f14 -/* 3E4E10 E010AA70 00000000 */ nop +/* 3E4E10 E010AA70 00000000 */ nop /* 3E4E14 E010AA74 8642000E */ lh $v0, 0xe($s2) /* 3E4E18 E010AA78 46200620 */ cvt.s.d $f24, $f0 /* 3E4E1C E010AA7C 44820000 */ mtc1 $v0, $f0 -/* 3E4E20 E010AA80 00000000 */ nop +/* 3E4E20 E010AA80 00000000 */ nop /* 3E4E24 E010AA84 46800020 */ cvt.s.w $f0, $f0 /* 3E4E28 E010AA88 4600C600 */ add.s $f24, $f24, $f0 /* 3E4E2C E010AA8C 3C014080 */ lui $at, 0x4080 /* 3E4E30 E010AA90 44812000 */ mtc1 $at, $f4 -/* 3E4E34 E010AA94 00000000 */ nop +/* 3E4E34 E010AA94 00000000 */ nop /* 3E4E38 E010AA98 4604C602 */ mul.s $f24, $f24, $f4 -/* 3E4E3C E010AA9C 00000000 */ nop +/* 3E4E3C E010AA9C 00000000 */ nop /* 3E4E40 E010AAA0 86420010 */ lh $v0, 0x10($s2) /* 3E4E44 E010AAA4 44820000 */ mtc1 $v0, $f0 -/* 3E4E48 E010AAA8 00000000 */ nop +/* 3E4E48 E010AAA8 00000000 */ nop /* 3E4E4C E010AAAC 46800020 */ cvt.s.w $f0, $f0 /* 3E4E50 E010AAB0 462016A0 */ cvt.s.d $f26, $f2 /* 3E4E54 E010AAB4 4600D680 */ add.s $f26, $f26, $f0 @@ -388,10 +388,10 @@ glabel func_E010A4E8 /* 3E4E68 E010AAC8 24820008 */ addiu $v0, $a0, 8 /* 3E4E6C E010AACC AEC20000 */ sw $v0, ($s6) /* 3E4E70 E010AAD0 4604D682 */ mul.s $f26, $f26, $f4 -/* 3E4E74 E010AAD4 00000000 */ nop +/* 3E4E74 E010AAD4 00000000 */ nop /* 3E4E78 E010AAD8 4600038D */ trunc.w.s $f14, $f0 /* 3E4E7C E010AADC 44027000 */ mfc1 $v0, $f14 -/* 3E4E80 E010AAE0 00000000 */ nop +/* 3E4E80 E010AAE0 00000000 */ nop /* 3E4E84 E010AAE4 00021400 */ sll $v0, $v0, 0x10 /* 3E4E88 E010AAE8 00021403 */ sra $v0, $v0, 0x10 /* 3E4E8C E010AAEC 18400005 */ blez $v0, .LE010AB04 @@ -405,11 +405,11 @@ glabel func_E010A4E8 .LE010AB08: /* 3E4EA8 E010AB08 3C014100 */ lui $at, 0x4100 /* 3E4EAC E010AB0C 44810000 */ mtc1 $at, $f0 -/* 3E4EB0 E010AB10 00000000 */ nop +/* 3E4EB0 E010AB10 00000000 */ nop /* 3E4EB4 E010AB14 4600D000 */ add.s $f0, $f26, $f0 /* 3E4EB8 E010AB18 4600038D */ trunc.w.s $f14, $f0 /* 3E4EBC E010AB1C 44027000 */ mfc1 $v0, $f14 -/* 3E4EC0 E010AB20 00000000 */ nop +/* 3E4EC0 E010AB20 00000000 */ nop /* 3E4EC4 E010AB24 00021400 */ sll $v0, $v0, 0x10 /* 3E4EC8 E010AB28 00021403 */ sra $v0, $v0, 0x10 /* 3E4ECC E010AB2C 18400004 */ blez $v0, .LE010AB40 @@ -420,7 +420,7 @@ glabel func_E010A4E8 .LE010AB40: /* 3E4EE0 E010AB40 4600C38D */ trunc.w.s $f14, $f24 /* 3E4EE4 E010AB44 44027000 */ mfc1 $v0, $f14 -/* 3E4EE8 E010AB48 00000000 */ nop +/* 3E4EE8 E010AB48 00000000 */ nop /* 3E4EEC E010AB4C 00021400 */ sll $v0, $v0, 0x10 /* 3E4EF0 E010AB50 00021403 */ sra $v0, $v0, 0x10 /* 3E4EF4 E010AB54 18400004 */ blez $v0, .LE010AB68 @@ -433,7 +433,7 @@ glabel func_E010A4E8 .LE010AB6C: /* 3E4F0C E010AB6C 4600D38D */ trunc.w.s $f14, $f26 /* 3E4F10 E010AB70 44027000 */ mfc1 $v0, $f14 -/* 3E4F14 E010AB74 00000000 */ nop +/* 3E4F14 E010AB74 00000000 */ nop /* 3E4F18 E010AB78 00021400 */ sll $v0, $v0, 0x10 /* 3E4F1C E010AB7C 00021403 */ sra $v0, $v0, 0x10 /* 3E4F20 E010AB80 18400004 */ blez $v0, .LE010AB94 @@ -450,7 +450,7 @@ glabel func_E010A4E8 /* 3E4F48 E010ABA8 AC620000 */ sw $v0, ($v1) /* 3E4F4C E010ABAC 4600C38D */ trunc.w.s $f14, $f24 /* 3E4F50 E010ABB0 44027000 */ mfc1 $v0, $f14 -/* 3E4F54 E010ABB4 00000000 */ nop +/* 3E4F54 E010ABB4 00000000 */ nop /* 3E4F58 E010ABB8 00021400 */ sll $v0, $v0, 0x10 /* 3E4F5C E010ABBC 00021403 */ sra $v0, $v0, 0x10 /* 3E4F60 E010ABC0 04410008 */ bgez $v0, .LE010ABE4 @@ -467,14 +467,14 @@ glabel func_E010A4E8 /* 3E4F84 E010ABE4 3C050080 */ lui $a1, 0x80 .LE010ABE8: /* 3E4F88 E010ABE8 44807000 */ mtc1 $zero, $f14 -/* 3E4F8C E010ABEC 00000000 */ nop +/* 3E4F8C E010ABEC 00000000 */ nop /* 3E4F90 E010ABF0 460ED03C */ c.lt.s $f26, $f14 -/* 3E4F94 E010ABF4 00000000 */ nop +/* 3E4F94 E010ABF4 00000000 */ nop /* 3E4F98 E010ABF8 4500000C */ bc1f .LE010AC2C /* 3E4F9C E010ABFC 34A20080 */ ori $v0, $a1, 0x80 /* 3E4FA0 E010AC00 4600D38D */ trunc.w.s $f14, $f26 /* 3E4FA4 E010AC04 44027000 */ mfc1 $v0, $f14 -/* 3E4FA8 E010AC08 00000000 */ nop +/* 3E4FA8 E010AC08 00000000 */ nop /* 3E4FAC E010AC0C 00021400 */ sll $v0, $v0, 0x10 /* 3E4FB0 E010AC10 00022243 */ sra $a0, $v0, 9 /* 3E4FB4 E010AC14 5C800001 */ bgtzl $a0, .LE010AC1C @@ -522,6 +522,6 @@ glabel func_E010A4E8 /* 3E5048 E010ACA8 D7B400A0 */ ldc1 $f20, 0xa0($sp) /* 3E504C E010ACAC 03E00008 */ jr $ra /* 3E5050 E010ACB0 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* 3E5054 E010ACB4 00000000 */ nop -/* 3E5058 E010ACB8 00000000 */ nop -/* 3E505C E010ACBC 00000000 */ nop +/* 3E5054 E010ACB4 00000000 */ nop +/* 3E5058 E010ACB8 00000000 */ nop +/* 3E505C E010ACBC 00000000 */ nop diff --git a/asm/nonmatchings/code_3E54C0/func_E010C39C.s b/asm/nonmatchings/code_3E54C0/func_E010C39C.s index dcf5b45371..d9101d41d5 100644 --- a/asm/nonmatchings/code_3E54C0/func_E010C39C.s +++ b/asm/nonmatchings/code_3E54C0/func_E010C39C.s @@ -8,16 +8,16 @@ glabel func_E010C39C /* 3E5868 E010C3A8 AFB300B4 */ sw $s3, 0xb4($sp) /* 3E586C E010C3AC 0000982D */ daddu $s3, $zero, $zero /* 3E5870 E010C3B0 AFB700C4 */ sw $s7, 0xc4($sp) -/* 3E5874 E010C3B4 3C17800A */ lui $s7, %hi(D_8009A674) -/* 3E5878 E010C3B8 26F7A674 */ addiu $s7, $s7, %lo(D_8009A674) +/* 3E5874 E010C3B4 3C17800A */ lui $s7, %hi(gDisplayContext) +/* 3E5878 E010C3B8 26F7A674 */ addiu $s7, $s7, %lo(gDisplayContext) /* 3E587C E010C3BC AFB500BC */ sw $s5, 0xbc($sp) -/* 3E5880 E010C3C0 3C158007 */ lui $s5, %hi(D_800741F0) -/* 3E5884 E010C3C4 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) +/* 3E5880 E010C3C0 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 3E5884 E010C3C4 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) /* 3E5888 E010C3C8 AFB400B8 */ sw $s4, 0xb8($sp) /* 3E588C E010C3CC 3C140001 */ lui $s4, 1 /* 3E5890 E010C3D0 36941630 */ ori $s4, $s4, 0x1630 -/* 3E5894 E010C3D4 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 3E5898 E010C3D8 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 3E5894 E010C3D4 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 3E5898 E010C3D8 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 3E589C E010C3DC AFB000A8 */ sw $s0, 0xa8($sp) /* 3E58A0 E010C3E0 0040802D */ daddu $s0, $v0, $zero /* 3E58A4 E010C3E4 AFB600C0 */ sw $s6, 0xc0($sp) @@ -74,7 +74,7 @@ glabel func_E010C39C /* 3E596C E010C4AC 10400056 */ beqz $v0, .LE010C608 /* 3E5970 E010C4B0 30820002 */ andi $v0, $a0, 2 /* 3E5974 E010C4B4 10400005 */ beqz $v0, .LE010C4CC -/* 3E5978 E010C4B8 00000000 */ nop +/* 3E5978 E010C4B8 00000000 */ nop /* 3E597C E010C4BC C4660010 */ lwc1 $f6, 0x10($v1) /* 3E5980 E010C4C0 C4640014 */ lwc1 $f4, 0x14($v1) /* 3E5984 E010C4C4 08043136 */ j .LE010C4D8 @@ -86,7 +86,7 @@ glabel func_E010C39C .LE010C4D8: /* 3E5998 E010C4D8 C640000C */ lwc1 $f0, 0xc($s2) /* 3E599C E010C4DC 4602003C */ c.lt.s $f0, $f2 -/* 3E59A0 E010C4E0 00000000 */ nop +/* 3E59A0 E010C4E0 00000000 */ nop /* 3E59A4 E010C4E4 45030049 */ bc1tl .LE010C60C /* 3E59A8 E010C4E8 26730001 */ addiu $s3, $s3, 1 /* 3E59AC E010C4EC 4405A000 */ mfc1 $a1, $f20 @@ -174,11 +174,11 @@ glabel func_E010C39C /* 3E5AEC E010C62C 44801000 */ mtc1 $zero, $f2 /* 3E5AF0 E010C630 00431023 */ subu $v0, $v0, $v1 /* 3E5AF4 E010C634 44820000 */ mtc1 $v0, $f0 -/* 3E5AF8 E010C638 00000000 */ nop +/* 3E5AF8 E010C638 00000000 */ nop /* 3E5AFC E010C63C 46800020 */ cvt.s.w $f0, $f0 /* 3E5B00 E010C640 46000021 */ cvt.d.s $f0, $f0 /* 3E5B04 E010C644 46220002 */ mul.d $f0, $f0, $f2 -/* 3E5B08 E010C648 00000000 */ nop +/* 3E5B08 E010C648 00000000 */ nop /* 3E5B0C E010C64C 3C110001 */ lui $s1, 1 /* 3E5B10 E010C650 36311630 */ ori $s1, $s1, 0x1630 /* 3E5B14 E010C654 0000982D */ daddu $s3, $zero, $zero @@ -190,20 +190,20 @@ glabel func_E010C39C /* 3E5B2C E010C66C 46240003 */ div.d $f0, $f0, $f4 /* 3E5B30 E010C670 46201081 */ sub.d $f2, $f2, $f0 /* 3E5B34 E010C674 8E47000C */ lw $a3, 0xc($s2) -/* 3E5B38 E010C678 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3E5B3C E010C67C 2442A674 */ addiu $v0, $v0, %lo(D_8009A674) +/* 3E5B38 E010C678 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3E5B3C E010C67C 2442A674 */ addiu $v0, $v0, %lo(gDisplayContext) /* 3E5B40 E010C680 462010A0 */ cvt.s.d $f2, $f2 /* 3E5B44 E010C684 44061000 */ mfc1 $a2, $f2 /* 3E5B48 E010C688 0C080108 */ jal func_E0200420 /* 3E5B4C E010C68C 0040B82D */ daddu $s7, $v0, $zero -/* 3E5B50 E010C690 3C028007 */ lui $v0, %hi(D_800741F0) -/* 3E5B54 E010C694 244241F0 */ addiu $v0, $v0, %lo(D_800741F0) +/* 3E5B50 E010C690 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* 3E5B54 E010C694 244241F0 */ addiu $v0, $v0, %lo(gMatrixListPos) /* 3E5B58 E010C698 C6400038 */ lwc1 $f0, 0x38($s2) /* 3E5B5C E010C69C 3C01E011 */ lui $at, %hi(D_E010CA68) /* 3E5B60 E010C6A0 D422CA68 */ ldc1 $f2, %lo(D_E010CA68)($at) /* 3E5B64 E010C6A4 46000021 */ cvt.d.s $f0, $f0 /* 3E5B68 E010C6A8 46220002 */ mul.d $f0, $f0, $f2 -/* 3E5B6C E010C6AC 00000000 */ nop +/* 3E5B6C E010C6AC 00000000 */ nop /* 3E5B70 E010C6B0 0040A02D */ daddu $s4, $v0, $zero /* 3E5B74 E010C6B4 3C160001 */ lui $s6, 1 /* 3E5B78 E010C6B8 36D61630 */ ori $s6, $s6, 0x1630 @@ -234,8 +234,8 @@ glabel func_E010C39C /* 3E5BDC E010C71C 34C60001 */ ori $a2, $a2, 1 /* 3E5BE0 E010C720 3C09D838 */ lui $t1, 0xd838 /* 3E5BE4 E010C724 35290002 */ ori $t1, $t1, 2 -/* 3E5BE8 E010C728 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 3E5BEC E010C72C 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 3E5BE8 E010C728 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 3E5BEC E010C72C 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 3E5BF0 E010C730 0040802D */ daddu $s0, $v0, $zero /* 3E5BF4 E010C734 8C440000 */ lw $a0, ($v0) /* 3E5BF8 E010C738 96820000 */ lhu $v0, ($s4) @@ -319,7 +319,7 @@ glabel func_E010C39C /* 3E5D2C E010C86C 10400056 */ beqz $v0, .LE010C9C8 /* 3E5D30 E010C870 30820002 */ andi $v0, $a0, 2 /* 3E5D34 E010C874 10400005 */ beqz $v0, .LE010C88C -/* 3E5D38 E010C878 00000000 */ nop +/* 3E5D38 E010C878 00000000 */ nop /* 3E5D3C E010C87C C4660010 */ lwc1 $f6, 0x10($v1) /* 3E5D40 E010C880 C4640014 */ lwc1 $f4, 0x14($v1) /* 3E5D44 E010C884 08043226 */ j .LE010C898 @@ -331,7 +331,7 @@ glabel func_E010C39C .LE010C898: /* 3E5D58 E010C898 C640000C */ lwc1 $f0, 0xc($s2) /* 3E5D5C E010C89C 4600103E */ c.le.s $f2, $f0 -/* 3E5D60 E010C8A0 00000000 */ nop +/* 3E5D60 E010C8A0 00000000 */ nop /* 3E5D64 E010C8A4 45030049 */ bc1tl .LE010C9CC /* 3E5D68 E010C8A8 26730001 */ addiu $s3, $s3, 1 /* 3E5D6C E010C8AC 4405A000 */ mfc1 $a1, $f20 @@ -424,4 +424,4 @@ glabel func_E010C39C /* 3E5EC0 E010CA00 D7B400D0 */ ldc1 $f20, 0xd0($sp) /* 3E5EC4 E010CA04 03E00008 */ jr $ra /* 3E5EC8 E010CA08 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 3E5ECC E010CA0C 00000000 */ nop +/* 3E5ECC E010CA0C 00000000 */ nop diff --git a/asm/nonmatchings/code_3EB4E0/func_E010E000.s b/asm/nonmatchings/code_3EB4E0/func_E010E000.s index 34891d2324..7b1621f16c 100644 --- a/asm/nonmatchings/code_3EB4E0/func_E010E000.s +++ b/asm/nonmatchings/code_3EB4E0/func_E010E000.s @@ -12,12 +12,12 @@ glabel func_E010E000 /* 3EB4F8 E010E018 C4840014 */ lwc1 $f4, 0x14($a0) .LE010E01C: /* 3EB4FC E010E01C 10C000C1 */ beqz $a2, .LE010E324 -/* 3EB500 E010E020 00000000 */ nop +/* 3EB500 E010E020 00000000 */ nop /* 3EB504 E010E024 8CC20000 */ lw $v0, ($a2) /* 3EB508 E010E028 104000B5 */ beqz $v0, .LE010E300 /* 3EB50C E010E02C 00035080 */ sll $t2, $v1, 2 -/* 3EB510 E010E030 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 3EB514 E010E034 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 3EB510 E010E030 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 3EB514 E010E034 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 3EB518 E010E038 3C014080 */ lui $at, 0x4080 /* 3EB51C E010E03C 44814000 */ mtc1 $at, $f8 /* 3EB520 E010E040 24C70006 */ addiu $a3, $a2, 6 @@ -49,25 +49,25 @@ glabel func_E010E000 /* 3EB584 E010E0A4 AC820004 */ sw $v0, 4($a0) /* 3EB588 E010E0A8 84E2FFFE */ lh $v0, -2($a3) /* 3EB58C E010E0AC 44821000 */ mtc1 $v0, $f2 -/* 3EB590 E010E0B0 00000000 */ nop +/* 3EB590 E010E0B0 00000000 */ nop /* 3EB594 E010E0B4 468010A0 */ cvt.s.w $f2, $f2 /* 3EB598 E010E0B8 46023080 */ add.s $f2, $f6, $f2 /* 3EB59C E010E0BC 84E20002 */ lh $v0, 2($a3) /* 3EB5A0 E010E0C0 44820000 */ mtc1 $v0, $f0 -/* 3EB5A4 E010E0C4 00000000 */ nop +/* 3EB5A4 E010E0C4 00000000 */ nop /* 3EB5A8 E010E0C8 46800020 */ cvt.s.w $f0, $f0 /* 3EB5AC E010E0CC 46001080 */ add.s $f2, $f2, $f0 /* 3EB5B0 E010E0D0 AD040000 */ sw $a0, ($t0) /* 3EB5B4 E010E0D4 24820008 */ addiu $v0, $a0, 8 /* 3EB5B8 E010E0D8 46081082 */ mul.s $f2, $f2, $f8 -/* 3EB5BC E010E0DC 00000000 */ nop +/* 3EB5BC E010E0DC 00000000 */ nop /* 3EB5C0 E010E0E0 24840010 */ addiu $a0, $a0, 0x10 /* 3EB5C4 E010E0E4 AD020000 */ sw $v0, ($t0) /* 3EB5C8 E010E0E8 AD040000 */ sw $a0, ($t0) /* 3EB5CC E010E0EC 0040202D */ daddu $a0, $v0, $zero /* 3EB5D0 E010E0F0 4600128D */ trunc.w.s $f10, $f2 /* 3EB5D4 E010E0F4 44025000 */ mfc1 $v0, $f10 -/* 3EB5D8 E010E0F8 00000000 */ nop +/* 3EB5D8 E010E0F8 00000000 */ nop /* 3EB5DC E010E0FC 00021400 */ sll $v0, $v0, 0x10 /* 3EB5E0 E010E100 00021403 */ sra $v0, $v0, 0x10 /* 3EB5E4 E010E104 18400005 */ blez $v0, .LE010E11C @@ -81,19 +81,19 @@ glabel func_E010E000 .LE010E120: /* 3EB600 E010E120 84E20000 */ lh $v0, ($a3) /* 3EB604 E010E124 44820000 */ mtc1 $v0, $f0 -/* 3EB608 E010E128 00000000 */ nop +/* 3EB608 E010E128 00000000 */ nop /* 3EB60C E010E12C 46800020 */ cvt.s.w $f0, $f0 /* 3EB610 E010E130 84E20004 */ lh $v0, 4($a3) /* 3EB614 E010E134 46002000 */ add.s $f0, $f4, $f0 /* 3EB618 E010E138 44821000 */ mtc1 $v0, $f2 -/* 3EB61C E010E13C 00000000 */ nop +/* 3EB61C E010E13C 00000000 */ nop /* 3EB620 E010E140 468010A0 */ cvt.s.w $f2, $f2 /* 3EB624 E010E144 46020000 */ add.s $f0, $f0, $f2 /* 3EB628 E010E148 46080002 */ mul.s $f0, $f0, $f8 -/* 3EB62C E010E14C 00000000 */ nop +/* 3EB62C E010E14C 00000000 */ nop /* 3EB630 E010E150 4600028D */ trunc.w.s $f10, $f0 /* 3EB634 E010E154 44025000 */ mfc1 $v0, $f10 -/* 3EB638 E010E158 00000000 */ nop +/* 3EB638 E010E158 00000000 */ nop /* 3EB63C E010E15C 00021400 */ sll $v0, $v0, 0x10 /* 3EB640 E010E160 00021403 */ sra $v0, $v0, 0x10 /* 3EB644 E010E164 18400002 */ blez $v0, .LE010E170 @@ -103,14 +103,14 @@ glabel func_E010E000 /* 3EB650 E010E170 AC830000 */ sw $v1, ($a0) /* 3EB654 E010E174 84E2FFFE */ lh $v0, -2($a3) /* 3EB658 E010E178 44820000 */ mtc1 $v0, $f0 -/* 3EB65C E010E17C 00000000 */ nop +/* 3EB65C E010E17C 00000000 */ nop /* 3EB660 E010E180 46800020 */ cvt.s.w $f0, $f0 /* 3EB664 E010E184 46003000 */ add.s $f0, $f6, $f0 /* 3EB668 E010E188 46080002 */ mul.s $f0, $f0, $f8 -/* 3EB66C E010E18C 00000000 */ nop +/* 3EB66C E010E18C 00000000 */ nop /* 3EB670 E010E190 4600028D */ trunc.w.s $f10, $f0 /* 3EB674 E010E194 44025000 */ mfc1 $v0, $f10 -/* 3EB678 E010E198 00000000 */ nop +/* 3EB678 E010E198 00000000 */ nop /* 3EB67C E010E19C 00021400 */ sll $v0, $v0, 0x10 /* 3EB680 E010E1A0 00021403 */ sra $v0, $v0, 0x10 /* 3EB684 E010E1A4 18400004 */ blez $v0, .LE010E1B8 @@ -123,14 +123,14 @@ glabel func_E010E000 .LE010E1BC: /* 3EB69C E010E1BC 84E20000 */ lh $v0, ($a3) /* 3EB6A0 E010E1C0 44820000 */ mtc1 $v0, $f0 -/* 3EB6A4 E010E1C4 00000000 */ nop +/* 3EB6A4 E010E1C4 00000000 */ nop /* 3EB6A8 E010E1C8 46800020 */ cvt.s.w $f0, $f0 /* 3EB6AC E010E1CC 46002000 */ add.s $f0, $f4, $f0 /* 3EB6B0 E010E1D0 46080002 */ mul.s $f0, $f0, $f8 -/* 3EB6B4 E010E1D4 00000000 */ nop +/* 3EB6B4 E010E1D4 00000000 */ nop /* 3EB6B8 E010E1D8 4600028D */ trunc.w.s $f10, $f0 /* 3EB6BC E010E1DC 44025000 */ mfc1 $v0, $f10 -/* 3EB6C0 E010E1E0 00000000 */ nop +/* 3EB6C0 E010E1E0 00000000 */ nop /* 3EB6C4 E010E1E4 00021400 */ sll $v0, $v0, 0x10 /* 3EB6C8 E010E1E8 00021403 */ sra $v0, $v0, 0x10 /* 3EB6CC E010E1EC 18400003 */ blez $v0, .LE010E1FC @@ -145,16 +145,16 @@ glabel func_E010E000 /* 3EB6EC E010E20C AC820000 */ sw $v0, ($a0) /* 3EB6F0 E010E210 84E2FFFE */ lh $v0, -2($a3) /* 3EB6F4 E010E214 44820000 */ mtc1 $v0, $f0 -/* 3EB6F8 E010E218 00000000 */ nop +/* 3EB6F8 E010E218 00000000 */ nop /* 3EB6FC E010E21C 46800020 */ cvt.s.w $f0, $f0 /* 3EB700 E010E220 46003000 */ add.s $f0, $f6, $f0 /* 3EB704 E010E224 46080002 */ mul.s $f0, $f0, $f8 -/* 3EB708 E010E228 00000000 */ nop +/* 3EB708 E010E228 00000000 */ nop /* 3EB70C E010E22C 24630008 */ addiu $v1, $v1, 8 /* 3EB710 E010E230 24890004 */ addiu $t1, $a0, 4 /* 3EB714 E010E234 4600028D */ trunc.w.s $f10, $f0 /* 3EB718 E010E238 44025000 */ mfc1 $v0, $f10 -/* 3EB71C E010E23C 00000000 */ nop +/* 3EB71C E010E23C 00000000 */ nop /* 3EB720 E010E240 00021400 */ sll $v0, $v0, 0x10 /* 3EB724 E010E244 00021403 */ sra $v0, $v0, 0x10 /* 3EB728 E010E248 04410007 */ bgez $v0, .LE010E268 @@ -171,20 +171,20 @@ glabel func_E010E000 .LE010E26C: /* 3EB74C E010E26C 84E20000 */ lh $v0, ($a3) /* 3EB750 E010E270 44820000 */ mtc1 $v0, $f0 -/* 3EB754 E010E274 00000000 */ nop +/* 3EB754 E010E274 00000000 */ nop /* 3EB758 E010E278 46800020 */ cvt.s.w $f0, $f0 /* 3EB75C E010E27C 46002000 */ add.s $f0, $f4, $f0 /* 3EB760 E010E280 46080082 */ mul.s $f2, $f0, $f8 -/* 3EB764 E010E284 00000000 */ nop +/* 3EB764 E010E284 00000000 */ nop /* 3EB768 E010E288 44800000 */ mtc1 $zero, $f0 -/* 3EB76C E010E28C 00000000 */ nop +/* 3EB76C E010E28C 00000000 */ nop /* 3EB770 E010E290 4600103C */ c.lt.s $f2, $f0 -/* 3EB774 E010E294 00000000 */ nop +/* 3EB774 E010E294 00000000 */ nop /* 3EB778 E010E298 4500000C */ bc1f .LE010E2CC /* 3EB77C E010E29C 3C050400 */ lui $a1, 0x400 /* 3EB780 E010E2A0 4600128D */ trunc.w.s $f10, $f2 /* 3EB784 E010E2A4 44025000 */ mfc1 $v0, $f10 -/* 3EB788 E010E2A8 00000000 */ nop +/* 3EB788 E010E2A8 00000000 */ nop /* 3EB78C E010E2AC 00021400 */ sll $v0, $v0, 0x10 /* 3EB790 E010E2B0 00021343 */ sra $v0, $v0, 0xd /* 3EB794 E010E2B4 5C400001 */ bgtzl $v0, .LE010E2BC @@ -209,8 +209,8 @@ glabel func_E010E000 /* 3EB7D8 E010E2F8 1440FF52 */ bnez $v0, .LE010E044 /* 3EB7DC E010E2FC AD040000 */ sw $a0, ($t0) .LE010E300: -/* 3EB7E0 E010E300 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 3EB7E4 E010E304 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 3EB7E0 E010E300 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 3EB7E4 E010E304 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 3EB7E8 E010E308 8C620000 */ lw $v0, ($v1) /* 3EB7EC E010E30C 0040202D */ daddu $a0, $v0, $zero /* 3EB7F0 E010E310 24420008 */ addiu $v0, $v0, 8 @@ -220,4 +220,4 @@ glabel func_E010E000 /* 3EB800 E010E320 AC800004 */ sw $zero, 4($a0) .LE010E324: /* 3EB804 E010E324 03E00008 */ jr $ra -/* 3EB808 E010E328 00000000 */ nop +/* 3EB808 E010E328 00000000 */ nop diff --git a/asm/nonmatchings/code_3EB4E0/func_E010E558.s b/asm/nonmatchings/code_3EB4E0/func_E010E558.s index 573f3f2168..88e3080a08 100644 --- a/asm/nonmatchings/code_3EB4E0/func_E010E558.s +++ b/asm/nonmatchings/code_3EB4E0/func_E010E558.s @@ -4,8 +4,8 @@ glabel func_E010E558 /* 3EBA38 E010E558 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 3EBA3C E010E55C 3C07DB06 */ lui $a3, 0xdb06 -/* 3EBA40 E010E560 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 3EBA44 E010E564 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 3EBA40 E010E560 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 3EBA44 E010E564 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 3EBA48 E010E568 34E70024 */ ori $a3, $a3, 0x24 /* 3EBA4C E010E56C AFBF0024 */ sw $ra, 0x24($sp) /* 3EBA50 E010E570 AFB20020 */ sw $s2, 0x20($sp) @@ -36,7 +36,7 @@ glabel func_E010E558 /* 3EBAB4 E010E5D4 00220821 */ addu $at, $at, $v0 /* 3EBAB8 E010E5D8 8C22E930 */ lw $v0, %lo(D_E010E930)($at) /* 3EBABC E010E5DC 00400008 */ jr $v0 -/* 3EBAC0 E010E5E0 00000000 */ nop +/* 3EBAC0 E010E5E0 00000000 */ nop /* 3EBAC4 E010E5E4 3C06E011 */ lui $a2, %hi(D_E010E7FC) /* 3EBAC8 E010E5E8 24C6E7FC */ addiu $a2, $a2, %lo(D_E010E7FC) /* 3EBACC E010E5EC 3C04E011 */ lui $a0, %hi(D_E010E868) @@ -64,8 +64,8 @@ glabel func_E010E558 /* 3EBB1C E010E63C 0200202D */ daddu $a0, $s0, $zero .LE010E640: /* 3EBB20 E010E640 0000282D */ daddu $a1, $zero, $zero -/* 3EBB24 E010E644 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 3EBB28 E010E648 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 3EBB24 E010E644 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 3EBB28 E010E648 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 3EBB2C E010E64C 8E490000 */ lw $t1, ($s2) /* 3EBB30 E010E650 3C02FA00 */ lui $v0, 0xfa00 /* 3EBB34 E010E654 0120502D */ daddu $t2, $t1, $zero @@ -129,6 +129,6 @@ glabel func_E010E558 /* 3EBC18 E010E738 8FB00018 */ lw $s0, 0x18($sp) /* 3EBC1C E010E73C 03E00008 */ jr $ra /* 3EBC20 E010E740 27BD0028 */ addiu $sp, $sp, 0x28 -/* 3EBC24 E010E744 00000000 */ nop -/* 3EBC28 E010E748 00000000 */ nop -/* 3EBC2C E010E74C 00000000 */ nop +/* 3EBC24 E010E744 00000000 */ nop +/* 3EBC28 E010E748 00000000 */ nop +/* 3EBC2C E010E74C 00000000 */ nop diff --git a/asm/nonmatchings/code_3F83F0/func_E01103EC.s b/asm/nonmatchings/code_3F83F0/func_E01103EC.s index 7121aecf75..2352bcd090 100644 --- a/asm/nonmatchings/code_3F83F0/func_E01103EC.s +++ b/asm/nonmatchings/code_3F83F0/func_E01103EC.s @@ -7,8 +7,8 @@ glabel func_E01103EC /* 3F87E4 E01103F4 3C09DB06 */ lui $t1, 0xdb06 /* 3F87E8 E01103F8 35290024 */ ori $t1, $t1, 0x24 /* 3F87EC E01103FC AFB500B4 */ sw $s5, 0xb4($sp) -/* 3F87F0 E0110400 3C15800A */ lui $s5, %hi(D_8009A66C) -/* 3F87F4 E0110404 26B5A66C */ addiu $s5, $s5, %lo(D_8009A66C) +/* 3F87F0 E0110400 3C15800A */ lui $s5, %hi(gMasterGfxPos) +/* 3F87F4 E0110404 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) /* 3F87F8 E0110408 3C02E700 */ lui $v0, 0xe700 /* 3F87FC E011040C AFBF00BC */ sw $ra, 0xbc($sp) /* 3F8800 E0110410 AFB600B8 */ sw $s6, 0xb8($sp) @@ -65,10 +65,10 @@ glabel func_E01103EC /* 3F88CC E01104DC 0C080180 */ jal func_E0200600 /* 3F88D0 E01104E0 E7A0001C */ swc1 $f0, 0x1c($sp) /* 3F88D4 E01104E4 27A40020 */ addiu $a0, $sp, 0x20 -/* 3F88D8 E01104E8 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3F88DC E01104EC 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3F88E0 E01104F0 3C11800A */ lui $s1, %hi(D_8009A674) -/* 3F88E4 E01104F4 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 3F88D8 E01104E8 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3F88DC E01104EC 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3F88E0 E01104F0 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 3F88E4 E01104F4 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 3F88E8 E01104F8 96050000 */ lhu $a1, ($s0) /* 3F88EC E01104FC 8E220000 */ lw $v0, ($s1) /* 3F88F0 E0110500 00052980 */ sll $a1, $a1, 6 @@ -150,14 +150,14 @@ glabel func_E01103EC /* 3F8A20 E0110630 C6800044 */ lwc1 $f0, 0x44($s4) /* 3F8A24 E0110634 001319C0 */ sll $v1, $s3, 7 /* 3F8A28 E0110638 46040082 */ mul.s $f2, $f0, $f4 -/* 3F8A2C E011063C 00000000 */ nop +/* 3F8A2C E011063C 00000000 */ nop /* 3F8A30 E0110640 3463007C */ ori $v1, $v1, 0x7c /* 3F8A34 E0110644 30630FFF */ andi $v1, $v1, 0xfff /* 3F8A38 E0110648 00031B00 */ sll $v1, $v1, 0xc /* 3F8A3C E011064C AD2C0018 */ sw $t4, 0x18($t1) /* 3F8A40 E0110650 4600118D */ trunc.w.s $f6, $f2 /* 3F8A44 E0110654 44043000 */ mfc1 $a0, $f6 -/* 3F8A48 E0110658 00000000 */ nop +/* 3F8A48 E0110658 00000000 */ nop /* 3F8A4C E011065C 000411C0 */ sll $v0, $a0, 7 /* 3F8A50 E0110660 30420FFF */ andi $v0, $v0, 0xfff /* 3F8A54 E0110664 00461025 */ or $v0, $v0, $a2 @@ -191,10 +191,10 @@ glabel func_E01103EC /* 3F8AC4 E01106D4 AD220020 */ sw $v0, 0x20($t1) /* 3F8AC8 E01106D8 4600018D */ trunc.w.s $f6, $f0 /* 3F8ACC E01106DC 44023000 */ mfc1 $v0, $f6 -/* 3F8AD0 E01106E0 00000000 */ nop +/* 3F8AD0 E01106E0 00000000 */ nop /* 3F8AD4 E01106E4 00021080 */ sll $v0, $v0, 2 /* 3F8AD8 E01106E8 44820000 */ mtc1 $v0, $f0 -/* 3F8ADC E01106EC 00000000 */ nop +/* 3F8ADC E01106EC 00000000 */ nop /* 3F8AE0 E01106F0 46800020 */ cvt.s.w $f0, $f0 /* 3F8AE4 E01106F4 32C200FF */ andi $v0, $s6, 0xff /* 3F8AE8 E01106F8 46001081 */ sub.s $f2, $f2, $f0 @@ -214,14 +214,14 @@ glabel func_E01103EC /* 3F8B20 E0110730 AD2B0028 */ sw $t3, 0x28($t1) /* 3F8B24 E0110734 00021600 */ sll $v0, $v0, 0x18 /* 3F8B28 E0110738 46001082 */ mul.s $f2, $f2, $f0 -/* 3F8B2C E011073C 00000000 */ nop +/* 3F8B2C E011073C 00000000 */ nop /* 3F8B30 E0110740 00031C00 */ sll $v1, $v1, 0x10 /* 3F8B34 E0110744 00431025 */ or $v0, $v0, $v1 /* 3F8B38 E0110748 00042200 */ sll $a0, $a0, 8 /* 3F8B3C E011074C 00441025 */ or $v0, $v0, $a0 /* 3F8B40 E0110750 4600118D */ trunc.w.s $f6, $f2 /* 3F8B44 E0110754 440A3000 */ mfc1 $t2, $f6 -/* 3F8B48 E0110758 00000000 */ nop +/* 3F8B48 E0110758 00000000 */ nop /* 3F8B4C E011075C 314300FF */ andi $v1, $t2, 0xff /* 3F8B50 E0110760 00431025 */ or $v0, $v0, $v1 /* 3F8B54 E0110764 AD220024 */ sw $v0, 0x24($t1) @@ -239,11 +239,11 @@ glabel func_E01103EC /* 3F8B84 E0110794 AD270030 */ sw $a3, 0x30($t1) /* 3F8B88 E0110798 C6800044 */ lwc1 $f0, 0x44($s4) /* 3F8B8C E011079C 46040002 */ mul.s $f0, $f0, $f4 -/* 3F8B90 E01107A0 00000000 */ nop +/* 3F8B90 E01107A0 00000000 */ nop /* 3F8B94 E01107A4 24020003 */ addiu $v0, $zero, 3 /* 3F8B98 E01107A8 4600018D */ trunc.w.s $f6, $f0 /* 3F8B9C E01107AC 44033000 */ mfc1 $v1, $f6 -/* 3F8BA0 E01107B0 00000000 */ nop +/* 3F8BA0 E01107B0 00000000 */ nop /* 3F8BA4 E01107B4 14620028 */ bne $v1, $v0, .LE0110858 /* 3F8BA8 E01107B8 3C05D838 */ lui $a1, 0xd838 /* 3F8BAC E01107BC 3C088080 */ lui $t0, 0x8080 @@ -287,8 +287,8 @@ glabel func_E01103EC .LE0110854: /* 3F8C44 E0110854 3C05D838 */ lui $a1, 0xd838 .LE0110858: -/* 3F8C48 E0110858 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 3F8C4C E011085C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 3F8C48 E0110858 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 3F8C4C E011085C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 3F8C50 E0110860 8C620000 */ lw $v0, ($v1) /* 3F8C54 E0110864 34A50002 */ ori $a1, $a1, 2 /* 3F8C58 E0110868 0040202D */ daddu $a0, $v0, $zero @@ -308,4 +308,4 @@ glabel func_E01103EC /* 3F8C90 E01108A0 D7B400C0 */ ldc1 $f20, 0xc0($sp) /* 3F8C94 E01108A4 03E00008 */ jr $ra /* 3F8C98 E01108A8 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* 3F8C9C E01108AC 00000000 */ nop +/* 3F8C9C E01108AC 00000000 */ nop diff --git a/asm/nonmatchings/code_3F9E50/func_E0112330.s b/asm/nonmatchings/code_3F9E50/func_E0112330.s index 24adbb1af1..382ad9d47b 100644 --- a/asm/nonmatchings/code_3F9E50/func_E0112330.s +++ b/asm/nonmatchings/code_3F9E50/func_E0112330.s @@ -23,7 +23,7 @@ glabel func_E0112330 /* 3FA1C8 E0112378 00230821 */ addu $at, $at, $v1 /* 3FA1CC E011237C C4261DEC */ lwc1 $f6, %lo(D_800B1DEC)($at) /* 3FA1D0 E0112380 080448E3 */ j .LE011238C -/* 3FA1D4 E0112384 00000000 */ nop +/* 3FA1D4 E0112384 00000000 */ nop .LE0112388: /* 3FA1D8 E0112388 44803000 */ mtc1 $zero, $f6 .LE011238C: @@ -72,10 +72,10 @@ glabel func_E0112330 /* 3FA284 E0112434 0C080114 */ jal func_E0200450 /* 3FA288 E0112438 00A0302D */ daddu $a2, $a1, $zero /* 3FA28C E011243C 27A40020 */ addiu $a0, $sp, 0x20 -/* 3FA290 E0112440 3C108007 */ lui $s0, %hi(D_800741F0) -/* 3FA294 E0112444 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 3FA298 E0112448 3C11800A */ lui $s1, %hi(D_8009A674) -/* 3FA29C E011244C 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 3FA290 E0112440 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 3FA294 E0112444 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 3FA298 E0112448 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 3FA29C E011244C 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 3FA2A0 E0112450 96050000 */ lhu $a1, ($s0) /* 3FA2A4 E0112454 8E220000 */ lw $v0, ($s1) /* 3FA2A8 E0112458 00052980 */ sll $a1, $a1, 6 @@ -83,8 +83,8 @@ glabel func_E0112330 /* 3FA2B0 E0112460 0C080118 */ jal func_E0200460 /* 3FA2B4 E0112464 00452821 */ addu $a1, $v0, $a1 /* 3FA2B8 E0112468 3C05DA38 */ lui $a1, 0xda38 -/* 3FA2BC E011246C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 3FA2C0 E0112470 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 3FA2BC E011246C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 3FA2C0 E0112470 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 3FA2C4 E0112474 34A50002 */ ori $a1, $a1, 2 /* 3FA2C8 E0112478 8C830000 */ lw $v1, ($a0) /* 3FA2CC E011247C 96020000 */ lhu $v0, ($s0) diff --git a/asm/nonmatchings/code_3F9E50/func_E01124CC.s b/asm/nonmatchings/code_3F9E50/func_E01124CC.s index 788b2531d7..b5995cb8bd 100644 --- a/asm/nonmatchings/code_3F9E50/func_E01124CC.s +++ b/asm/nonmatchings/code_3F9E50/func_E01124CC.s @@ -5,8 +5,8 @@ glabel func_E01124CC /* 3FA31C E01124CC 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 3FA320 E01124D0 3C06DB06 */ lui $a2, 0xdb06 /* 3FA324 E01124D4 AFB00010 */ sw $s0, 0x10($sp) -/* 3FA328 E01124D8 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 3FA32C E01124DC 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 3FA328 E01124D8 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 3FA32C E01124DC 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 3FA330 E01124E0 34C60024 */ ori $a2, $a2, 0x24 /* 3FA334 E01124E4 AFB3001C */ sw $s3, 0x1c($sp) /* 3FA338 E01124E8 3C13E700 */ lui $s3, 0xe700 @@ -91,4 +91,4 @@ glabel func_E01124CC /* 3FA470 E0112620 8FB00010 */ lw $s0, 0x10($sp) /* 3FA474 E0112624 03E00008 */ jr $ra /* 3FA478 E0112628 27BD0028 */ addiu $sp, $sp, 0x28 -/* 3FA47C E011262C 00000000 */ nop +/* 3FA47C E011262C 00000000 */ nop diff --git a/asm/nonmatchings/code_3FEAE0/func_E0114388.s b/asm/nonmatchings/code_3FEAE0/func_E0114388.s index 09e5881d98..ae7a1d2110 100644 --- a/asm/nonmatchings/code_3FEAE0/func_E0114388.s +++ b/asm/nonmatchings/code_3FEAE0/func_E0114388.s @@ -11,18 +11,18 @@ glabel func_E0114388 /* 3FEE80 E01143A0 3529030A */ ori $t1, $t1, 0x30a /* 3FEE84 E01143A4 AFB3006C */ sw $s3, 0x6c($sp) /* 3FEE88 E01143A8 0000982D */ daddu $s3, $zero, $zero -/* 3FEE8C E01143AC 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3FEE90 E01143B0 2442A674 */ addiu $v0, $v0, %lo(D_8009A674) +/* 3FEE8C E01143AC 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 3FEE90 E01143B0 2442A674 */ addiu $v0, $v0, %lo(gDisplayContext) /* 3FEE94 E01143B4 AFBE0080 */ sw $fp, 0x80($sp) /* 3FEE98 E01143B8 0040F02D */ daddu $fp, $v0, $zero /* 3FEE9C E01143BC AFB7007C */ sw $s7, 0x7c($sp) -/* 3FEEA0 E01143C0 3C178007 */ lui $s7, %hi(D_800741F0) -/* 3FEEA4 E01143C4 26F741F0 */ addiu $s7, $s7, %lo(D_800741F0) +/* 3FEEA0 E01143C0 3C178007 */ lui $s7, %hi(gMatrixListPos) +/* 3FEEA4 E01143C4 26F741F0 */ addiu $s7, $s7, %lo(gMatrixListPos) /* 3FEEA8 E01143C8 AFB60078 */ sw $s6, 0x78($sp) /* 3FEEAC E01143CC 3C160001 */ lui $s6, 1 /* 3FEEB0 E01143D0 36D61630 */ ori $s6, $s6, 0x1630 -/* 3FEEB4 E01143D4 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 3FEEB8 E01143D8 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 3FEEB4 E01143D4 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 3FEEB8 E01143D8 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 3FEEBC E01143DC AFB20068 */ sw $s2, 0x68($sp) /* 3FEEC0 E01143E0 0040902D */ daddu $s2, $v0, $zero /* 3FEEC4 E01143E4 3C02E700 */ lui $v0, 0xe700 @@ -135,14 +135,14 @@ glabel func_E0114388 /* 3FF06C E011458C 1040001B */ beqz $v0, .LE01145FC /* 3FF070 E0114590 3C07D838 */ lui $a3, 0xd838 /* 3FF074 E0114594 44946000 */ mtc1 $s4, $f12 -/* 3FF078 E0114598 00000000 */ nop +/* 3FF078 E0114598 00000000 */ nop /* 3FF07C E011459C 0C080140 */ jal func_E0200500 /* 3FF080 E01145A0 46806320 */ cvt.s.w $f12, $f12 /* 3FF084 E01145A4 3C01427C */ lui $at, 0x427c /* 3FF088 E01145A8 44811000 */ mtc1 $at, $f2 /* 3FF08C E01145AC 8E420000 */ lw $v0, ($s2) /* 3FF090 E01145B0 46020002 */ mul.s $f0, $f0, $f2 -/* 3FF094 E01145B4 00000000 */ nop +/* 3FF094 E01145B4 00000000 */ nop /* 3FF098 E01145B8 0040282D */ daddu $a1, $v0, $zero /* 3FF09C E01145BC 24420008 */ addiu $v0, $v0, 8 /* 3FF0A0 E01145C0 AE420000 */ sw $v0, ($s2) @@ -151,7 +151,7 @@ glabel func_E0114388 /* 3FF0AC E01145CC ACA20000 */ sw $v0, ($a1) /* 3FF0B0 E01145D0 4600018D */ trunc.w.s $f6, $f0 /* 3FF0B4 E01145D4 44023000 */ mfc1 $v0, $f6 -/* 3FF0B8 E01145D8 00000000 */ nop +/* 3FF0B8 E01145D8 00000000 */ nop /* 3FF0BC E01145DC 304200FF */ andi $v0, $v0, 0xff /* 3FF0C0 E01145E0 00022600 */ sll $a0, $v0, 0x18 /* 3FF0C4 E01145E4 00021C00 */ sll $v1, $v0, 0x10 diff --git a/asm/nonmatchings/code_402640/func_E01166E8.s b/asm/nonmatchings/code_402640/func_E01166E8.s index 273e6837c5..b3d3255df0 100644 --- a/asm/nonmatchings/code_402640/func_E01166E8.s +++ b/asm/nonmatchings/code_402640/func_E01166E8.s @@ -23,7 +23,7 @@ glabel func_E01166E8 /* 402D70 E0116730 00230821 */ addu $at, $at, $v1 /* 402D74 E0116734 C4261DEC */ lwc1 $f6, %lo(D_800B1DEC)($at) /* 402D78 E0116738 080459D1 */ j .LE0116744 -/* 402D7C E011673C 00000000 */ nop +/* 402D7C E011673C 00000000 */ nop .LE0116740: /* 402D80 E0116740 44803000 */ mtc1 $zero, $f6 .LE0116744: @@ -72,10 +72,10 @@ glabel func_E01166E8 /* 402E2C E01167EC 0C080114 */ jal func_E0200450 /* 402E30 E01167F0 00A0302D */ daddu $a2, $a1, $zero /* 402E34 E01167F4 27A40020 */ addiu $a0, $sp, 0x20 -/* 402E38 E01167F8 3C108007 */ lui $s0, %hi(D_800741F0) -/* 402E3C E01167FC 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 402E40 E0116800 3C11800A */ lui $s1, %hi(D_8009A674) -/* 402E44 E0116804 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 402E38 E01167F8 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 402E3C E01167FC 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 402E40 E0116800 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 402E44 E0116804 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 402E48 E0116808 96050000 */ lhu $a1, ($s0) /* 402E4C E011680C 8E220000 */ lw $v0, ($s1) /* 402E50 E0116810 00052980 */ sll $a1, $a1, 6 @@ -83,8 +83,8 @@ glabel func_E01166E8 /* 402E58 E0116818 0C080118 */ jal func_E0200460 /* 402E5C E011681C 00452821 */ addu $a1, $v0, $a1 /* 402E60 E0116820 3C05DA38 */ lui $a1, 0xda38 -/* 402E64 E0116824 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 402E68 E0116828 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 402E64 E0116824 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 402E68 E0116828 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 402E6C E011682C 34A50002 */ ori $a1, $a1, 2 /* 402E70 E0116830 8C830000 */ lw $v1, ($a0) /* 402E74 E0116834 96020000 */ lhu $v0, ($s0) diff --git a/asm/nonmatchings/code_402640/func_E0116884.s b/asm/nonmatchings/code_402640/func_E0116884.s index 5841e418b6..ef61ca727b 100644 --- a/asm/nonmatchings/code_402640/func_E0116884.s +++ b/asm/nonmatchings/code_402640/func_E0116884.s @@ -9,8 +9,8 @@ glabel func_E0116884 /* 402ED4 E0116894 34A50024 */ ori $a1, $a1, 0x24 /* 402ED8 E0116898 AFB3001C */ sw $s3, 0x1c($sp) /* 402EDC E011689C 24130001 */ addiu $s3, $zero, 1 -/* 402EE0 E01168A0 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 402EE4 E01168A4 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 402EE0 E01168A0 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 402EE4 E01168A4 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 402EE8 E01168A8 3C03E700 */ lui $v1, 0xe700 /* 402EEC E01168AC AFBF0034 */ sw $ra, 0x34($sp) /* 402EF0 E01168B0 AFBE0030 */ sw $fp, 0x30($sp) @@ -77,18 +77,18 @@ glabel func_E0116884 /* 402FE0 E01169A0 3C014080 */ lui $at, 0x4080 /* 402FE4 E01169A4 44810000 */ mtc1 $at, $f0 /* 402FE8 E01169A8 449E1000 */ mtc1 $fp, $f2 -/* 402FEC E01169AC 00000000 */ nop +/* 402FEC E01169AC 00000000 */ nop /* 402FF0 E01169B0 468010A0 */ cvt.s.w $f2, $f2 /* 402FF4 E01169B4 46001082 */ mul.s $f2, $f2, $f0 -/* 402FF8 E01169B8 00000000 */ nop +/* 402FF8 E01169B8 00000000 */ nop /* 402FFC E01169BC 3C0142C8 */ lui $at, 0x42c8 /* 403000 E01169C0 44813000 */ mtc1 $at, $f6 -/* 403004 E01169C4 00000000 */ nop +/* 403004 E01169C4 00000000 */ nop /* 403008 E01169C8 46061182 */ mul.s $f6, $f2, $f6 -/* 40300C E01169CC 00000000 */ nop +/* 40300C E01169CC 00000000 */ nop /* 403010 E01169D0 460031A1 */ cvt.d.s $f6, $f6 /* 403014 E01169D4 46343182 */ mul.d $f6, $f6, $f20 -/* 403018 E01169D8 00000000 */ nop +/* 403018 E01169D8 00000000 */ nop /* 40301C E01169DC 8E260000 */ lw $a2, ($s1) /* 403020 E01169E0 3C014220 */ lui $at, 0x4220 /* 403024 E01169E4 44812000 */ mtc1 $at, $f4 @@ -99,7 +99,7 @@ glabel func_E0116884 /* 403038 E01169F8 AE260000 */ sw $a2, ($s1) /* 40303C E01169FC AC820000 */ sw $v0, ($a0) /* 403040 E0116A00 46041102 */ mul.s $f4, $f2, $f4 -/* 403044 E0116A04 00000000 */ nop +/* 403044 E0116A04 00000000 */ nop /* 403048 E0116A08 9203FFFF */ lbu $v1, -1($s0) /* 40304C E0116A0C 3C014348 */ lui $at, 0x4348 /* 403050 E0116A10 44810000 */ mtc1 $at, $f0 @@ -107,7 +107,7 @@ glabel func_E0116884 /* 403058 E0116A18 AE220000 */ sw $v0, ($s1) /* 40305C E0116A1C 46002121 */ cvt.d.s $f4, $f4 /* 403060 E0116A20 46342102 */ mul.d $f4, $f4, $f20 -/* 403064 E0116A24 00000000 */ nop +/* 403064 E0116A24 00000000 */ nop /* 403068 E0116A28 AC830004 */ sw $v1, 4($a0) /* 40306C E0116A2C ACD60000 */ sw $s6, ($a2) /* 403070 E0116A30 92030001 */ lbu $v1, 1($s0) @@ -116,14 +116,14 @@ glabel func_E0116884 /* 40307C E0116A3C 24C20010 */ addiu $v0, $a2, 0x10 /* 403080 E0116A40 AE220000 */ sw $v0, ($s1) /* 403084 E0116A44 46001002 */ mul.s $f0, $f2, $f0 -/* 403088 E0116A48 00000000 */ nop +/* 403088 E0116A48 00000000 */ nop /* 40308C E0116A4C 24C20018 */ addiu $v0, $a2, 0x18 /* 403090 E0116A50 ACD40008 */ sw $s4, 8($a2) /* 403094 E0116A54 AE220000 */ sw $v0, ($s1) /* 403098 E0116A58 00031E00 */ sll $v1, $v1, 0x18 /* 40309C E0116A5C 46000021 */ cvt.d.s $f0, $f0 /* 4030A0 E0116A60 46340002 */ mul.d $f0, $f0, $f20 -/* 4030A4 E0116A64 00000000 */ nop +/* 4030A4 E0116A64 00000000 */ nop /* 4030A8 E0116A68 00042400 */ sll $a0, $a0, 0x10 /* 4030AC E0116A6C 00641825 */ or $v1, $v1, $a0 /* 4030B0 E0116A70 00052A00 */ sll $a1, $a1, 8 @@ -133,14 +133,14 @@ glabel func_E0116884 /* 4030C0 E0116A80 3C03E011 */ lui $v1, %hi(D_E0116C6C) /* 4030C4 E0116A84 8C636C6C */ lw $v1, %lo(D_E0116C6C)($v1) /* 4030C8 E0116A88 46081082 */ mul.s $f2, $f2, $f8 -/* 4030CC E0116A8C 00000000 */ nop +/* 4030CC E0116A8C 00000000 */ nop /* 4030D0 E0116A90 24C20020 */ addiu $v0, $a2, 0x20 /* 4030D4 E0116A94 AE220000 */ sw $v0, ($s1) /* 4030D8 E0116A98 ACD40020 */ sw $s4, 0x20($a2) /* 4030DC E0116A9C ACC3000C */ sw $v1, 0xc($a2) /* 4030E0 E0116AA0 460010A1 */ cvt.d.s $f2, $f2 /* 4030E4 E0116AA4 46341082 */ mul.d $f2, $f2, $f20 -/* 4030E8 E0116AA8 00000000 */ nop +/* 4030E8 E0116AA8 00000000 */ nop /* 4030EC E0116AAC 4620328D */ trunc.w.d $f10, $f6 /* 4030F0 E0116AB0 44075000 */ mfc1 $a3, $f10 /* 4030F4 E0116AB4 4620228D */ trunc.w.d $f10, $f4 @@ -252,5 +252,5 @@ glabel func_E0116884 /* 40328C E0116C4C D7B40038 */ ldc1 $f20, 0x38($sp) /* 403290 E0116C50 03E00008 */ jr $ra /* 403294 E0116C54 27BD0040 */ addiu $sp, $sp, 0x40 -/* 403298 E0116C58 00000000 */ nop -/* 40329C E0116C5C 00000000 */ nop +/* 403298 E0116C58 00000000 */ nop +/* 40329C E0116C5C 00000000 */ nop diff --git a/asm/nonmatchings/code_403400/func_E011849C.s b/asm/nonmatchings/code_403400/func_E011849C.s index f7c60a8cc8..fe4a1b33c2 100644 --- a/asm/nonmatchings/code_403400/func_E011849C.s +++ b/asm/nonmatchings/code_403400/func_E011849C.s @@ -6,8 +6,8 @@ glabel func_E011849C /* 4038A0 E01184A0 AFB700BC */ sw $s7, 0xbc($sp) /* 4038A4 E01184A4 0080B82D */ daddu $s7, $a0, $zero /* 4038A8 E01184A8 3C05DB06 */ lui $a1, 0xdb06 -/* 4038AC E01184AC 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 4038B0 E01184B0 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 4038AC E01184AC 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 4038B0 E01184B0 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 4038B4 E01184B4 34A50024 */ ori $a1, $a1, 0x24 /* 4038B8 E01184B8 3C02E700 */ lui $v0, 0xe700 /* 4038BC E01184BC AFBF00C4 */ sw $ra, 0xc4($sp) @@ -48,10 +48,10 @@ glabel func_E011849C /* 403948 E0118548 ACC40000 */ sw $a0, ($a2) /* 40394C E011854C 4480A000 */ mtc1 $zero, $f20 /* 403950 E0118550 27B40060 */ addiu $s4, $sp, 0x60 -/* 403954 E0118554 3C16800A */ lui $s6, %hi(D_8009A674) -/* 403958 E0118558 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) -/* 40395C E011855C 3C158007 */ lui $s5, %hi(D_800741F0) -/* 403960 E0118560 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) +/* 403954 E0118554 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 403958 E0118558 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) +/* 40395C E011855C 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 403960 E0118560 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) /* 403964 E0118564 3C130001 */ lui $s3, 1 /* 403968 E0118568 36731630 */ ori $s3, $s3, 0x1630 /* 40396C E011856C 00C0902D */ daddu $s2, $a2, $zero @@ -71,7 +71,7 @@ glabel func_E011849C /* 4039A0 E01185A0 46000021 */ cvt.d.s $f0, $f0 /* 4039A4 E01185A4 00021080 */ sll $v0, $v0, 2 /* 4039A8 E01185A8 46220002 */ mul.d $f0, $f0, $f2 -/* 4039AC E01185AC 00000000 */ nop +/* 4039AC E01185AC 00000000 */ nop /* 4039B0 E01185B0 00431023 */ subu $v0, $v0, $v1 /* 4039B4 E01185B4 000218C0 */ sll $v1, $v0, 3 /* 4039B8 E01185B8 00431021 */ addu $v0, $v0, $v1 @@ -179,8 +179,8 @@ glabel func_E011849C /* 403B50 E0118750 1440FF88 */ bnez $v0, .LE0118574 /* 403B54 E0118754 AE440000 */ sw $a0, ($s2) .LE0118758: -/* 403B58 E0118758 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 403B5C E011875C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 403B58 E0118758 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 403B5C E011875C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 403B60 E0118760 8C620000 */ lw $v0, ($v1) /* 403B64 E0118764 0040202D */ daddu $a0, $v0, $zero /* 403B68 E0118768 24420008 */ addiu $v0, $v0, 8 diff --git a/asm/nonmatchings/code_404220/func_E011A3BC.s b/asm/nonmatchings/code_404220/func_E011A3BC.s index 6c24b7a93c..6f4a2db08e 100644 --- a/asm/nonmatchings/code_404220/func_E011A3BC.s +++ b/asm/nonmatchings/code_404220/func_E011A3BC.s @@ -14,8 +14,8 @@ glabel func_E011A3BC /* 404600 E011A3E0 3C08FCFF */ lui $t0, 0xfcff /* 404604 E011A3E4 3508FFFF */ ori $t0, $t0, 0xffff /* 404608 E011A3E8 3C06FFFC */ lui $a2, 0xfffc -/* 40460C E011A3EC 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 404610 E011A3F0 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 40460C E011A3EC 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 404610 E011A3F0 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 404614 E011A3F4 8C820000 */ lw $v0, ($a0) /* 404618 E011A3F8 34C6F279 */ ori $a2, $a2, 0xf279 /* 40461C E011A3FC 0040182D */ daddu $v1, $v0, $zero @@ -35,8 +35,8 @@ glabel func_E011A3BC /* 404650 E011A430 3C08FCFF */ lui $t0, 0xfcff /* 404654 E011A434 3508B3FF */ ori $t0, $t0, 0xb3ff /* 404658 E011A438 3C06FF64 */ lui $a2, 0xff64 -/* 40465C E011A43C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 404660 E011A440 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 40465C E011A43C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 404660 E011A440 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 404664 E011A444 8C820000 */ lw $v0, ($a0) /* 404668 E011A448 34C6FE7F */ ori $a2, $a2, 0xfe7f /* 40466C E011A44C 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/code_404220/func_E011A48C.s b/asm/nonmatchings/code_404220/func_E011A48C.s index a51fce7e32..6540bd2118 100644 --- a/asm/nonmatchings/code_404220/func_E011A48C.s +++ b/asm/nonmatchings/code_404220/func_E011A48C.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_E011A48C -/* 4046AC E011A48C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 4046B0 E011A490 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 4046AC E011A48C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 4046B0 E011A490 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 4046B4 E011A494 44872000 */ mtc1 $a3, $f4 /* 4046B8 E011A498 8C670000 */ lw $a3, ($v1) /* 4046BC E011A49C 24E20008 */ addiu $v0, $a3, 8 @@ -46,8 +46,8 @@ glabel func_E011A48C /* 404740 E011A520 00621025 */ or $v0, $v1, $v0 /* 404744 E011A524 ACE20004 */ sw $v0, 4($a3) .LE011A528: -/* 404748 E011A528 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 40474C E011A52C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 404748 E011A528 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 40474C E011A52C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 404750 E011A530 8C620000 */ lw $v0, ($v1) /* 404754 E011A534 0040202D */ daddu $a0, $v0, $zero /* 404758 E011A538 24420008 */ addiu $v0, $v0, 8 @@ -58,7 +58,7 @@ glabel func_E011A48C /* 40476C E011A54C 24840004 */ addiu $a0, $a0, 4 /* 404770 E011A550 4600218D */ trunc.w.s $f6, $f4 /* 404774 E011A554 44023000 */ mfc1 $v0, $f6 -/* 404778 E011A558 00000000 */ nop +/* 404778 E011A558 00000000 */ nop /* 40477C E011A55C 00021400 */ sll $v0, $v0, 0x10 /* 404780 E011A560 00021403 */ sra $v0, $v0, 0x10 /* 404784 E011A564 04410007 */ bgez $v0, .LE011A584 @@ -88,7 +88,7 @@ glabel func_E011A48C /* 4047D0 E011A5B0 46002007 */ neg.s $f0, $f4 /* 4047D4 E011A5B4 4600018D */ trunc.w.s $f6, $f0 /* 4047D8 E011A5B8 44023000 */ mfc1 $v0, $f6 -/* 4047DC E011A5BC 00000000 */ nop +/* 4047DC E011A5BC 00000000 */ nop /* 4047E0 E011A5C0 00021400 */ sll $v0, $v0, 0x10 /* 4047E4 E011A5C4 00021C03 */ sra $v1, $v0, 0x10 /* 4047E8 E011A5C8 0461000C */ bgez $v1, .LE011A5FC @@ -119,8 +119,8 @@ glabel func_E011A48C /* 404840 E011A620 00C21025 */ or $v0, $a2, $v0 .LE011A624: /* 404844 E011A624 AC820000 */ sw $v0, ($a0) -/* 404848 E011A628 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 40484C E011A62C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 404848 E011A628 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 40484C E011A62C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 404850 E011A630 8C620000 */ lw $v0, ($v1) /* 404854 E011A634 3C014F00 */ lui $at, 0x4f00 /* 404858 E011A638 44810000 */ mtc1 $at, $f0 @@ -130,42 +130,42 @@ glabel func_E011A48C /* 404868 E011A648 3C02F100 */ lui $v0, 0xf100 /* 40486C E011A64C AC820000 */ sw $v0, ($a0) /* 404870 E011A650 4604003E */ c.le.s $f0, $f4 -/* 404874 E011A654 00000000 */ nop +/* 404874 E011A654 00000000 */ nop /* 404878 E011A658 45010005 */ bc1t .LE011A670 /* 40487C E011A65C 24840004 */ addiu $a0, $a0, 4 /* 404880 E011A660 4600218D */ trunc.w.s $f6, $f4 /* 404884 E011A664 44033000 */ mfc1 $v1, $f6 /* 404888 E011A668 080469A2 */ j .LE011A688 -/* 40488C E011A66C 00000000 */ nop +/* 40488C E011A66C 00000000 */ nop .LE011A670: /* 404890 E011A670 46002001 */ sub.s $f0, $f4, $f0 /* 404894 E011A674 3C028000 */ lui $v0, 0x8000 /* 404898 E011A678 4600018D */ trunc.w.s $f6, $f0 /* 40489C E011A67C 44033000 */ mfc1 $v1, $f6 -/* 4048A0 E011A680 00000000 */ nop +/* 4048A0 E011A680 00000000 */ nop /* 4048A4 E011A684 00621825 */ or $v1, $v1, $v0 .LE011A688: /* 4048A8 E011A688 3C014F00 */ lui $at, 0x4f00 /* 4048AC E011A68C 44811000 */ mtc1 $at, $f2 /* 4048B0 E011A690 46002007 */ neg.s $f0, $f4 /* 4048B4 E011A694 4600103E */ c.le.s $f2, $f0 -/* 4048B8 E011A698 00000000 */ nop +/* 4048B8 E011A698 00000000 */ nop /* 4048BC E011A69C 45010005 */ bc1t .LE011A6B4 /* 4048C0 E011A6A0 00033400 */ sll $a2, $v1, 0x10 /* 4048C4 E011A6A4 4600018D */ trunc.w.s $f6, $f0 /* 4048C8 E011A6A8 44073000 */ mfc1 $a3, $f6 /* 4048CC E011A6AC 080469B3 */ j .LE011A6CC -/* 4048D0 E011A6B0 00000000 */ nop +/* 4048D0 E011A6B0 00000000 */ nop .LE011A6B4: /* 4048D4 E011A6B4 46020001 */ sub.s $f0, $f0, $f2 /* 4048D8 E011A6B8 3C028000 */ lui $v0, 0x8000 /* 4048DC E011A6BC 4600018D */ trunc.w.s $f6, $f0 /* 4048E0 E011A6C0 44073000 */ mfc1 $a3, $f6 -/* 4048E4 E011A6C4 00000000 */ nop +/* 4048E4 E011A6C4 00000000 */ nop /* 4048E8 E011A6C8 00E23825 */ or $a3, $a3, $v0 .LE011A6CC: -/* 4048EC E011A6CC 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 4048F0 E011A6D0 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 4048EC E011A6CC 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 4048F0 E011A6D0 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 4048F4 E011A6D4 30E2FFFF */ andi $v0, $a3, 0xffff /* 4048F8 E011A6D8 8CA30000 */ lw $v1, ($a1) /* 4048FC E011A6DC 00C21025 */ or $v0, $a2, $v0 diff --git a/asm/nonmatchings/code_404220/func_E011A700.s b/asm/nonmatchings/code_404220/func_E011A700.s index 9c06e3b11f..4b0ae8a795 100644 --- a/asm/nonmatchings/code_404220/func_E011A700.s +++ b/asm/nonmatchings/code_404220/func_E011A700.s @@ -34,8 +34,8 @@ glabel func_E011A700 /* 404994 E011A774 3C05DB06 */ lui $a1, 0xdb06 /* 404998 E011A778 34A50024 */ ori $a1, $a1, 0x24 /* 40499C E011A77C 0000902D */ daddu $s2, $zero, $zero -/* 4049A0 E011A780 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 4049A4 E011A784 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 4049A0 E011A780 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 4049A4 E011A784 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 4049A8 E011A788 0040982D */ daddu $s3, $v0, $zero /* 4049AC E011A78C 3C14D700 */ lui $s4, 0xd700 /* 4049B0 E011A790 36941002 */ ori $s4, $s4, 0x1002 @@ -95,8 +95,8 @@ glabel func_E011A700 /* 404A80 E011A860 3C05E300 */ lui $a1, 0xe300 /* 404A84 E011A864 34A51001 */ ori $a1, $a1, 0x1001 /* 404A88 E011A868 0000902D */ daddu $s2, $zero, $zero -/* 404A8C E011A86C 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 404A90 E011A870 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 404A8C E011A86C 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 404A90 E011A870 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 404A94 E011A874 0040A82D */ daddu $s5, $v0, $zero /* 404A98 E011A878 2416000C */ addiu $s6, $zero, 0xc /* 404A9C E011A87C 24130014 */ addiu $s3, $zero, 0x14 @@ -133,7 +133,7 @@ glabel func_E011A700 /* 404B10 E011A8F0 24110009 */ addiu $s1, $zero, 9 .LE011A8F4: /* 404B14 E011A8F4 0C0468EF */ jal func_E011A3BC -/* 404B18 E011A8F8 00000000 */ nop +/* 404B18 E011A8F8 00000000 */ nop /* 404B1C E011A8FC 86030006 */ lh $v1, 6($s0) /* 404B20 E011A900 2402000A */ addiu $v0, $zero, 0xa /* 404B24 E011A904 10620006 */ beq $v1, $v0, .LE011A920 @@ -170,19 +170,19 @@ glabel func_E011A700 /* 404B94 E011A974 AC640004 */ sw $a0, 4($v1) /* 404B98 E011A978 80420000 */ lb $v0, ($v0) /* 404B9C E011A97C 44820000 */ mtc1 $v0, $f0 -/* 404BA0 E011A980 00000000 */ nop +/* 404BA0 E011A980 00000000 */ nop /* 404BA4 E011A984 46800020 */ cvt.s.w $f0, $f0 /* 404BA8 E011A988 46160102 */ mul.s $f4, $f0, $f22 -/* 404BAC E011A98C 00000000 */ nop +/* 404BAC E011A98C 00000000 */ nop /* 404BB0 E011A990 3C013F80 */ lui $at, 0x3f80 /* 404BB4 E011A994 44810000 */ mtc1 $at, $f0 -/* 404BB8 E011A998 00000000 */ nop +/* 404BB8 E011A998 00000000 */ nop /* 404BBC E011A99C 46002001 */ sub.s $f0, $f4, $f0 /* 404BC0 E011A9A0 3C014180 */ lui $at, 0x4180 /* 404BC4 E011A9A4 44811000 */ mtc1 $at, $f2 /* 404BC8 E011A9A8 46000007 */ neg.s $f0, $f0 /* 404BCC E011A9AC 46020002 */ mul.s $f0, $f0, $f2 -/* 404BD0 E011A9B0 00000000 */ nop +/* 404BD0 E011A9B0 00000000 */ nop /* 404BD4 E011A9B4 3C013FE0 */ lui $at, 0x3fe0 /* 404BD8 E011A9B8 44811800 */ mtc1 $at, $f3 /* 404BDC E011A9BC 44801000 */ mtc1 $zero, $f2 @@ -192,14 +192,14 @@ glabel func_E011A700 /* 404BEC E011A9CC 44072000 */ mfc1 $a3, $f4 /* 404BF0 E011A9D0 4620018D */ trunc.w.d $f6, $f0 /* 404BF4 E011A9D4 44043000 */ mfc1 $a0, $f6 -/* 404BF8 E011A9D8 00000000 */ nop +/* 404BF8 E011A9D8 00000000 */ nop /* 404BFC E011A9DC 00931021 */ addu $v0, $a0, $s3 /* 404C00 E011A9E0 44821000 */ mtc1 $v0, $f2 -/* 404C04 E011A9E4 00000000 */ nop +/* 404C04 E011A9E4 00000000 */ nop /* 404C08 E011A9E8 468010A0 */ cvt.s.w $f2, $f2 /* 404C0C E011A9EC 24820032 */ addiu $v0, $a0, 0x32 /* 404C10 E011A9F0 44820000 */ mtc1 $v0, $f0 -/* 404C14 E011A9F4 00000000 */ nop +/* 404C14 E011A9F4 00000000 */ nop /* 404C18 E011A9F8 46800020 */ cvt.s.w $f0, $f0 /* 404C1C E011A9FC 4600118D */ trunc.w.s $f6, $f2 /* 404C20 E011AA00 44043000 */ mfc1 $a0, $f6 @@ -234,16 +234,16 @@ glabel func_E011A700 /* 404C8C E011AA6C 00022023 */ negu $a0, $v0 /* 404C90 E011AA70 00531021 */ addu $v0, $v0, $s3 /* 404C94 E011AA74 44830000 */ mtc1 $v1, $f0 -/* 404C98 E011AA78 00000000 */ nop +/* 404C98 E011AA78 00000000 */ nop /* 404C9C E011AA7C 46800020 */ cvt.s.w $f0, $f0 /* 404CA0 E011AA80 46160102 */ mul.s $f4, $f0, $f22 -/* 404CA4 E011AA84 00000000 */ nop +/* 404CA4 E011AA84 00000000 */ nop /* 404CA8 E011AA88 44821000 */ mtc1 $v0, $f2 -/* 404CAC E011AA8C 00000000 */ nop +/* 404CAC E011AA8C 00000000 */ nop /* 404CB0 E011AA90 468010A0 */ cvt.s.w $f2, $f2 /* 404CB4 E011AA94 24820032 */ addiu $v0, $a0, 0x32 /* 404CB8 E011AA98 44820000 */ mtc1 $v0, $f0 -/* 404CBC E011AA9C 00000000 */ nop +/* 404CBC E011AA9C 00000000 */ nop /* 404CC0 E011AAA0 46800020 */ cvt.s.w $f0, $f0 /* 404CC4 E011AAA4 4600118D */ trunc.w.s $f6, $f2 /* 404CC8 E011AAA8 44043000 */ mfc1 $a0, $f6 @@ -260,33 +260,33 @@ glabel func_E011A700 /* 404CEC E011AACC 2A420003 */ slti $v0, $s2, 3 /* 404CF0 E011AAD0 1440FF7B */ bnez $v0, .LE011A8C0 /* 404CF4 E011AAD4 26D6000A */ addiu $s6, $s6, 0xa -/* 404CF8 E011AAD8 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 404CFC E011AADC 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 404CF8 E011AAD8 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 404CFC E011AADC 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 404D00 E011AAE0 86E2000E */ lh $v0, 0xe($s7) /* 404D04 E011AAE4 3C014080 */ lui $at, 0x4080 /* 404D08 E011AAE8 44812000 */ mtc1 $at, $f4 /* 404D0C E011AAEC 44821000 */ mtc1 $v0, $f2 -/* 404D10 E011AAF0 00000000 */ nop +/* 404D10 E011AAF0 00000000 */ nop /* 404D14 E011AAF4 468010A0 */ cvt.s.w $f2, $f2 /* 404D18 E011AAF8 46041082 */ mul.s $f2, $f2, $f4 -/* 404D1C E011AAFC 00000000 */ nop +/* 404D1C E011AAFC 00000000 */ nop /* 404D20 E011AB00 3C04ED00 */ lui $a0, 0xed00 /* 404D24 E011AB04 86E20010 */ lh $v0, 0x10($s7) /* 404D28 E011AB08 8CC50000 */ lw $a1, ($a2) /* 404D2C E011AB0C 44820000 */ mtc1 $v0, $f0 -/* 404D30 E011AB10 00000000 */ nop +/* 404D30 E011AB10 00000000 */ nop /* 404D34 E011AB14 46800020 */ cvt.s.w $f0, $f0 /* 404D38 E011AB18 46040002 */ mul.s $f0, $f0, $f4 -/* 404D3C E011AB1C 00000000 */ nop +/* 404D3C E011AB1C 00000000 */ nop /* 404D40 E011AB20 00A0382D */ daddu $a3, $a1, $zero /* 404D44 E011AB24 4600118D */ trunc.w.s $f6, $f2 /* 404D48 E011AB28 44023000 */ mfc1 $v0, $f6 -/* 404D4C E011AB2C 00000000 */ nop +/* 404D4C E011AB2C 00000000 */ nop /* 404D50 E011AB30 30420FFF */ andi $v0, $v0, 0xfff /* 404D54 E011AB34 00021300 */ sll $v0, $v0, 0xc /* 404D58 E011AB38 4600018D */ trunc.w.s $f6, $f0 /* 404D5C E011AB3C 44033000 */ mfc1 $v1, $f6 -/* 404D60 E011AB40 00000000 */ nop +/* 404D60 E011AB40 00000000 */ nop /* 404D64 E011AB44 30630FFF */ andi $v1, $v1, 0xfff /* 404D68 E011AB48 00641825 */ or $v1, $v1, $a0 /* 404D6C E011AB4C 00431025 */ or $v0, $v0, $v1 @@ -296,29 +296,29 @@ glabel func_E011A700 /* 404D7C E011AB5C 24A50008 */ addiu $a1, $a1, 8 /* 404D80 E011AB60 00431021 */ addu $v0, $v0, $v1 /* 404D84 E011AB64 44821000 */ mtc1 $v0, $f2 -/* 404D88 E011AB68 00000000 */ nop +/* 404D88 E011AB68 00000000 */ nop /* 404D8C E011AB6C 468010A0 */ cvt.s.w $f2, $f2 /* 404D90 E011AB70 86E20010 */ lh $v0, 0x10($s7) /* 404D94 E011AB74 86E3000C */ lh $v1, 0xc($s7) /* 404D98 E011AB78 46041082 */ mul.s $f2, $f2, $f4 -/* 404D9C E011AB7C 00000000 */ nop +/* 404D9C E011AB7C 00000000 */ nop /* 404DA0 E011AB80 ACC50000 */ sw $a1, ($a2) /* 404DA4 E011AB84 00431021 */ addu $v0, $v0, $v1 /* 404DA8 E011AB88 44820000 */ mtc1 $v0, $f0 -/* 404DAC E011AB8C 00000000 */ nop +/* 404DAC E011AB8C 00000000 */ nop /* 404DB0 E011AB90 46800020 */ cvt.s.w $f0, $f0 /* 404DB4 E011AB94 24A20008 */ addiu $v0, $a1, 8 /* 404DB8 E011AB98 46040002 */ mul.s $f0, $f0, $f4 -/* 404DBC E011AB9C 00000000 */ nop +/* 404DBC E011AB9C 00000000 */ nop /* 404DC0 E011ABA0 ACC20000 */ sw $v0, ($a2) /* 404DC4 E011ABA4 4600118D */ trunc.w.s $f6, $f2 /* 404DC8 E011ABA8 44023000 */ mfc1 $v0, $f6 -/* 404DCC E011ABAC 00000000 */ nop +/* 404DCC E011ABAC 00000000 */ nop /* 404DD0 E011ABB0 30420FFF */ andi $v0, $v0, 0xfff /* 404DD4 E011ABB4 00021300 */ sll $v0, $v0, 0xc /* 404DD8 E011ABB8 4600018D */ trunc.w.s $f6, $f0 /* 404DDC E011ABBC 44033000 */ mfc1 $v1, $f6 -/* 404DE0 E011ABC0 00000000 */ nop +/* 404DE0 E011ABC0 00000000 */ nop /* 404DE4 E011ABC4 30630FFF */ andi $v1, $v1, 0xfff /* 404DE8 E011ABC8 00431025 */ or $v0, $v0, $v1 /* 404DEC E011ABCC ACE20004 */ sw $v0, 4($a3) @@ -340,6 +340,6 @@ glabel func_E011A700 /* 404E28 E011AC08 D7B40038 */ ldc1 $f20, 0x38($sp) /* 404E2C E011AC0C 03E00008 */ jr $ra /* 404E30 E011AC10 27BD0048 */ addiu $sp, $sp, 0x48 -/* 404E34 E011AC14 00000000 */ nop -/* 404E38 E011AC18 00000000 */ nop -/* 404E3C E011AC1C 00000000 */ nop +/* 404E34 E011AC14 00000000 */ nop +/* 404E38 E011AC18 00000000 */ nop +/* 404E3C E011AC1C 00000000 */ nop diff --git a/asm/nonmatchings/code_406B40/func_E011C1C4.s b/asm/nonmatchings/code_406B40/func_E011C1C4.s index 4b1ccc39a6..7070463de5 100644 --- a/asm/nonmatchings/code_406B40/func_E011C1C4.s +++ b/asm/nonmatchings/code_406B40/func_E011C1C4.s @@ -8,8 +8,8 @@ glabel func_E011C1C4 /* 406D10 E011C1D0 34E70024 */ ori $a3, $a3, 0x24 /* 406D14 E011C1D4 27A40018 */ addiu $a0, $sp, 0x18 /* 406D18 E011C1D8 AFB200A0 */ sw $s2, 0xa0($sp) -/* 406D1C E011C1DC 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 406D20 E011C1E0 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 406D1C E011C1DC 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 406D20 E011C1E0 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 406D24 E011C1E4 AFB500AC */ sw $s5, 0xac($sp) /* 406D28 E011C1E8 AFBF00B4 */ sw $ra, 0xb4($sp) /* 406D2C E011C1EC AFB600B0 */ sw $s6, 0xb0($sp) @@ -89,10 +89,10 @@ glabel func_E011C1C4 /* 406E54 E011C314 0C080114 */ jal func_E0200450 /* 406E58 E011C318 00A0302D */ daddu $a2, $a1, $zero /* 406E5C E011C31C 27A40018 */ addiu $a0, $sp, 0x18 -/* 406E60 E011C320 3C108007 */ lui $s0, %hi(D_800741F0) -/* 406E64 E011C324 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 406E68 E011C328 3C13800A */ lui $s3, %hi(D_8009A674) -/* 406E6C E011C32C 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* 406E60 E011C320 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 406E64 E011C324 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 406E68 E011C328 3C13800A */ lui $s3, %hi(gDisplayContext) +/* 406E6C E011C32C 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* 406E70 E011C330 96050000 */ lhu $a1, ($s0) /* 406E74 E011C334 8E620000 */ lw $v0, ($s3) /* 406E78 E011C338 00052980 */ sll $a1, $a1, 6 @@ -139,7 +139,7 @@ glabel func_E011C1C4 /* 406F1C E011C3DC 10620007 */ beq $v1, $v0, .LE011C3FC /* 406F20 E011C3E0 28620002 */ slti $v0, $v1, 2 /* 406F24 E011C3E4 10400015 */ beqz $v0, .LE011C43C -/* 406F28 E011C3E8 00000000 */ nop +/* 406F28 E011C3E8 00000000 */ nop /* 406F2C E011C3EC 14600013 */ bnez $v1, .LE011C43C /* 406F30 E011C3F0 0000282D */ daddu $a1, $zero, $zero /* 406F34 E011C3F4 0804711B */ j .LE011C46C @@ -176,8 +176,8 @@ glabel func_E011C1C4 /* 406FA4 E011C464 8C450000 */ lw $a1, ($v0) /* 406FA8 E011C468 3C07D838 */ lui $a3, 0xd838 .LE011C46C: -/* 406FAC E011C46C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 406FB0 E011C470 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 406FAC E011C46C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 406FB0 E011C470 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 406FB4 E011C474 34E70002 */ ori $a3, $a3, 2 /* 406FB8 E011C478 8C830000 */ lw $v1, ($a0) /* 406FBC E011C47C 3C02DE00 */ lui $v0, 0xde00 @@ -211,5 +211,5 @@ glabel func_E011C1C4 /* 40702C E011C4EC D7B400B8 */ ldc1 $f20, 0xb8($sp) /* 407030 E011C4F0 03E00008 */ jr $ra /* 407034 E011C4F4 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 407038 E011C4F8 00000000 */ nop -/* 40703C E011C4FC 00000000 */ nop +/* 407038 E011C4F8 00000000 */ nop +/* 40703C E011C4FC 00000000 */ nop diff --git a/asm/nonmatchings/code_409990/func_E011E578.s b/asm/nonmatchings/code_409990/func_E011E578.s index 519d56887a..e01309d0f7 100644 --- a/asm/nonmatchings/code_409990/func_E011E578.s +++ b/asm/nonmatchings/code_409990/func_E011E578.s @@ -11,8 +11,8 @@ glabel func_E011E578 /* 409F20 E011E590 3C150001 */ lui $s5, 1 /* 409F24 E011E594 36B51630 */ ori $s5, $s5, 0x1630 /* 409F28 E011E598 AFB3009C */ sw $s3, 0x9c($sp) -/* 409F2C E011E59C 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 409F30 E011E5A0 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 409F2C E011E59C 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 409F30 E011E5A0 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 409F34 E011E5A4 3C02E700 */ lui $v0, 0xe700 /* 409F38 E011E5A8 AFBF00AC */ sw $ra, 0xac($sp) /* 409F3C E011E5AC AFB600A8 */ sw $s6, 0xa8($sp) @@ -63,10 +63,10 @@ glabel func_E011E578 /* 409FF0 E011E660 0C080114 */ jal func_E0200450 /* 409FF4 E011E664 00A0302D */ daddu $a2, $a1, $zero /* 409FF8 E011E668 27A40010 */ addiu $a0, $sp, 0x10 -/* 409FFC E011E66C 3C118007 */ lui $s1, %hi(D_800741F0) -/* 40A000 E011E670 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 40A004 E011E674 3C14800A */ lui $s4, %hi(D_8009A674) -/* 40A008 E011E678 2694A674 */ addiu $s4, $s4, %lo(D_8009A674) +/* 409FFC E011E66C 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 40A000 E011E670 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 40A004 E011E674 3C14800A */ lui $s4, %hi(gDisplayContext) +/* 40A008 E011E678 2694A674 */ addiu $s4, $s4, %lo(gDisplayContext) /* 40A00C E011E67C 96250000 */ lhu $a1, ($s1) /* 40A010 E011E680 8E820000 */ lw $v0, ($s4) /* 40A014 E011E684 00052980 */ sll $a1, $a1, 6 @@ -158,5 +158,5 @@ glabel func_E011E578 /* 40A16C E011E7DC 8FB00090 */ lw $s0, 0x90($sp) /* 40A170 E011E7E0 03E00008 */ jr $ra /* 40A174 E011E7E4 27BD00B0 */ addiu $sp, $sp, 0xb0 -/* 40A178 E011E7E8 00000000 */ nop -/* 40A17C E011E7EC 00000000 */ nop +/* 40A178 E011E7E8 00000000 */ nop +/* 40A17C E011E7EC 00000000 */ nop diff --git a/asm/nonmatchings/code_40B3F0/func_E01203E4.s b/asm/nonmatchings/code_40B3F0/func_E01203E4.s index 0c8d33d0d6..ca980b694a 100644 --- a/asm/nonmatchings/code_40B3F0/func_E01203E4.s +++ b/asm/nonmatchings/code_40B3F0/func_E01203E4.s @@ -16,8 +16,8 @@ glabel func_E01203E4 /* 40B800 E0120410 8E870000 */ lw $a3, ($s4) /* 40B804 E0120414 12A000D1 */ beqz $s5, .LE012075C /* 40B808 E0120418 3C06DB06 */ lui $a2, 0xdb06 -/* 40B80C E012041C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 40B810 E0120420 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 40B80C E012041C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 40B810 E0120420 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 40B814 E0120424 34C60024 */ ori $a2, $a2, 0x24 /* 40B818 E0120428 8C640000 */ lw $a0, ($v1) /* 40B81C E012042C 3C02E700 */ lui $v0, 0xe700 @@ -60,10 +60,10 @@ glabel func_E01203E4 /* 40B8A8 E01204B8 3C130001 */ lui $s3, 1 /* 40B8AC E01204BC 36731630 */ ori $s3, $s3, 0x1630 /* 40B8B0 E01204C0 27A40020 */ addiu $a0, $sp, 0x20 -/* 40B8B4 E01204C4 3C118007 */ lui $s1, %hi(D_800741F0) -/* 40B8B8 E01204C8 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 40B8BC E01204CC 3C12800A */ lui $s2, %hi(D_8009A674) -/* 40B8C0 E01204D0 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 40B8B4 E01204C4 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 40B8B8 E01204C8 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 40B8BC E01204CC 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 40B8C0 E01204D0 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 40B8C4 E01204D4 96250000 */ lhu $a1, ($s1) /* 40B8C8 E01204D8 8E420000 */ lw $v0, ($s2) /* 40B8CC E01204DC 00052980 */ sll $a1, $a1, 6 @@ -73,8 +73,8 @@ glabel func_E01203E4 /* 40B8DC E01204EC 3C09DA38 */ lui $t1, 0xda38 /* 40B8E0 E01204F0 35290007 */ ori $t1, $t1, 7 /* 40B8E4 E01204F4 27A40020 */ addiu $a0, $sp, 0x20 -/* 40B8E8 E01204F8 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 40B8EC E01204FC 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 40B8E8 E01204F8 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 40B8EC E01204FC 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 40B8F0 E0120500 44800000 */ mtc1 $zero, $f0 /* 40B8F4 E0120504 8E030000 */ lw $v1, ($s0) /* 40B8F8 E0120508 96220000 */ lhu $v0, ($s1) @@ -173,14 +173,14 @@ glabel func_E01203E4 /* 40BA68 E0120678 256B0001 */ addiu $t3, $t3, 1 /* 40BA6C E012067C 0080282D */ daddu $a1, $a0, $zero /* 40BA70 E0120680 46020002 */ mul.s $f0, $f0, $f2 -/* 40BA74 E0120684 00000000 */ nop +/* 40BA74 E0120684 00000000 */ nop /* 40BA78 E0120688 24840008 */ addiu $a0, $a0, 8 /* 40BA7C E012068C 24820008 */ addiu $v0, $a0, 8 /* 40BA80 E0120690 AE040000 */ sw $a0, ($s0) /* 40BA84 E0120694 AE020000 */ sw $v0, ($s0) /* 40BA88 E0120698 4600020D */ trunc.w.s $f8, $f0 /* 40BA8C E012069C 44034000 */ mfc1 $v1, $f8 -/* 40BA90 E01206A0 00000000 */ nop +/* 40BA90 E01206A0 00000000 */ nop /* 40BA94 E01206A4 00691821 */ addu $v1, $v1, $t1 /* 40BA98 E01206A8 30620FFF */ andi $v0, $v1, 0xfff /* 40BA9C E01206AC 00021300 */ sll $v0, $v0, 0xc @@ -200,8 +200,8 @@ glabel func_E01203E4 /* 40BAD4 E01206E4 2529002C */ addiu $t1, $t1, 0x2c /* 40BAD8 E01206E8 3C02D838 */ lui $v0, 0xd838 /* 40BADC E01206EC 34420002 */ ori $v0, $v0, 2 -/* 40BAE0 E01206F0 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 40BAE4 E01206F4 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 40BAE0 E01206F0 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 40BAE4 E01206F4 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 40BAE8 E01206F8 8CA40000 */ lw $a0, ($a1) /* 40BAEC E01206FC 3C06DA38 */ lui $a2, 0xda38 /* 40BAF0 E0120700 0080182D */ daddu $v1, $a0, $zero @@ -214,8 +214,8 @@ glabel func_E01203E4 /* 40BB0C E012071C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* 40BB10 E0120720 24820008 */ addiu $v0, $a0, 8 /* 40BB14 E0120724 ACA20000 */ sw $v0, ($a1) -/* 40BB18 E0120728 3C02800A */ lui $v0, %hi(D_8009A674) -/* 40BB1C E012072C 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 40BB18 E0120728 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 40BB1C E012072C 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 40BB20 E0120730 34C60007 */ ori $a2, $a2, 7 /* 40BB24 E0120734 AC860000 */ sw $a2, ($a0) /* 40BB28 E0120738 00031980 */ sll $v1, $v1, 6 diff --git a/asm/nonmatchings/code_40C5A0/func_E012270C.s b/asm/nonmatchings/code_40C5A0/func_E012270C.s index dcff523f05..de7c2d8c94 100644 --- a/asm/nonmatchings/code_40C5A0/func_E012270C.s +++ b/asm/nonmatchings/code_40C5A0/func_E012270C.s @@ -12,16 +12,16 @@ glabel func_E012270C /* 40CCC8 E0122728 36101630 */ ori $s0, $s0, 0x1630 /* 40CCCC E012272C AFB40070 */ sw $s4, 0x70($sp) /* 40CCD0 E0122730 0000A02D */ daddu $s4, $zero, $zero -/* 40CCD4 E0122734 3C02800A */ lui $v0, %hi(D_8009A674) -/* 40CCD8 E0122738 2442A674 */ addiu $v0, $v0, %lo(D_8009A674) +/* 40CCD4 E0122734 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 40CCD8 E0122738 2442A674 */ addiu $v0, $v0, %lo(gDisplayContext) /* 40CCDC E012273C AFBE0080 */ sw $fp, 0x80($sp) /* 40CCE0 E0122740 0040F02D */ daddu $fp, $v0, $zero -/* 40CCE4 E0122744 3C028007 */ lui $v0, %hi(D_800741F0) -/* 40CCE8 E0122748 244241F0 */ addiu $v0, $v0, %lo(D_800741F0) +/* 40CCE4 E0122744 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* 40CCE8 E0122748 244241F0 */ addiu $v0, $v0, %lo(gMatrixListPos) /* 40CCEC E012274C AFB50074 */ sw $s5, 0x74($sp) /* 40CCF0 E0122750 0040A82D */ daddu $s5, $v0, $zero -/* 40CCF4 E0122754 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 40CCF8 E0122758 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 40CCF4 E0122754 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 40CCF8 E0122758 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 40CCFC E012275C AFB3006C */ sw $s3, 0x6c($sp) /* 40CD00 E0122760 0040982D */ daddu $s3, $v0, $zero /* 40CD04 E0122764 AFBF0084 */ sw $ra, 0x84($sp) @@ -131,7 +131,7 @@ glabel func_E012270C .LE0122900: /* 40CEA0 E0122900 C6400040 */ lwc1 $f0, 0x40($s2) /* 40CEA4 E0122904 46140032 */ c.eq.s $f0, $f20 -/* 40CEA8 E0122908 00000000 */ nop +/* 40CEA8 E0122908 00000000 */ nop /* 40CEAC E012290C 45010041 */ bc1t .LE0122A14 /* 40CEB0 E0122910 00148080 */ sll $s0, $s4, 2 /* 40CEB4 E0122914 8E420050 */ lw $v0, 0x50($s2) @@ -205,8 +205,8 @@ glabel func_E012270C /* 40CFBC E0122A1C 1440FFB3 */ bnez $v0, .LE01228EC /* 40CFC0 E0122A20 26520004 */ addiu $s2, $s2, 4 /* 40CFC4 E0122A24 3C05D838 */ lui $a1, 0xd838 -/* 40CFC8 E0122A28 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 40CFCC E0122A2C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 40CFC8 E0122A28 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 40CFCC E0122A2C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 40CFD0 E0122A30 8C620000 */ lw $v0, ($v1) /* 40CFD4 E0122A34 34A50002 */ ori $a1, $a1, 2 /* 40CFD8 E0122A38 0040202D */ daddu $a0, $v0, $zero @@ -242,7 +242,7 @@ glabel func_E012270C /* 40D048 E0122AA8 24020005 */ addiu $v0, $zero, 5 .LE0122AAC: /* 40D04C E0122AAC 1462000A */ bne $v1, $v0, .LE0122AD8 -/* 40D050 E0122AB0 00000000 */ nop +/* 40D050 E0122AB0 00000000 */ nop /* 40D054 E0122AB4 8E230074 */ lw $v1, 0x74($s1) /* 40D058 E0122AB8 18600007 */ blez $v1, .LE0122AD8 /* 40D05C E0122ABC 28620009 */ slti $v0, $v1, 9 @@ -255,8 +255,8 @@ glabel func_E012270C .LE0122AD8: /* 40D078 E0122AD8 18E00014 */ blez $a3, .LE0122B2C /* 40D07C E0122ADC 3C06D0D0 */ lui $a2, 0xd0d0 -/* 40D080 E0122AE0 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 40D084 E0122AE4 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 40D080 E0122AE0 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 40D084 E0122AE4 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 40D088 E0122AE8 34C6D000 */ ori $a2, $a2, 0xd000 /* 40D08C E0122AEC 8CA30000 */ lw $v1, ($a1) /* 40D090 E0122AF0 3C02FA00 */ lui $v0, 0xfa00 @@ -275,8 +275,8 @@ glabel func_E012270C /* 40D0C4 E0122B24 ACA20000 */ sw $v0, ($a1) /* 40D0C8 E0122B28 AC640004 */ sw $a0, 4($v1) .LE0122B2C: -/* 40D0CC E0122B2C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 40D0D0 E0122B30 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 40D0CC E0122B2C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 40D0D0 E0122B30 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) .LE0122B34: /* 40D0D4 E0122B34 8C620000 */ lw $v0, ($v1) /* 40D0D8 E0122B38 0040202D */ daddu $a0, $v0, $zero @@ -298,6 +298,6 @@ glabel func_E012270C /* 40D118 E0122B78 D7B40088 */ ldc1 $f20, 0x88($sp) /* 40D11C E0122B7C 03E00008 */ jr $ra /* 40D120 E0122B80 27BD0090 */ addiu $sp, $sp, 0x90 -/* 40D124 E0122B84 00000000 */ nop -/* 40D128 E0122B88 00000000 */ nop -/* 40D12C E0122B8C 00000000 */ nop +/* 40D124 E0122B84 00000000 */ nop +/* 40D128 E0122B88 00000000 */ nop +/* 40D12C E0122B8C 00000000 */ nop diff --git a/asm/nonmatchings/code_412730/func_E01244C4.s b/asm/nonmatchings/code_412730/func_E01244C4.s index 6ab82993a9..0f6ced915a 100644 --- a/asm/nonmatchings/code_412730/func_E01244C4.s +++ b/asm/nonmatchings/code_412730/func_E01244C4.s @@ -12,8 +12,8 @@ glabel func_E01244C4 /* 412C10 E01244E0 AFB300EC */ sw $s3, 0xec($sp) /* 412C14 E01244E4 0000982D */ daddu $s3, $zero, $zero /* 412C18 E01244E8 AFB400F0 */ sw $s4, 0xf0($sp) -/* 412C1C E01244EC 3C14800A */ lui $s4, %hi(D_8009A66C) -/* 412C20 E01244F0 2694A66C */ addiu $s4, $s4, %lo(D_8009A66C) +/* 412C1C E01244EC 3C14800A */ lui $s4, %hi(gMasterGfxPos) +/* 412C20 E01244F0 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) /* 412C24 E01244F4 3C02E700 */ lui $v0, 0xe700 /* 412C28 E01244F8 AFBF0104 */ sw $ra, 0x104($sp) /* 412C2C E01244FC AFBE0100 */ sw $fp, 0x100($sp) @@ -95,8 +95,8 @@ glabel func_E01244C4 /* 412D5C E012462C 18400083 */ blez $v0, .LE012483C /* 412D60 E0124630 4600A606 */ mov.s $f24, $f20 /* 412D64 E0124634 0240B02D */ daddu $s6, $s2, $zero -/* 412D68 E0124638 3C178007 */ lui $s7, %hi(D_800741F0) -/* 412D6C E012463C 26F741F0 */ addiu $s7, $s7, %lo(D_800741F0) +/* 412D68 E0124638 3C178007 */ lui $s7, %hi(gMatrixListPos) +/* 412D6C E012463C 26F741F0 */ addiu $s7, $s7, %lo(gMatrixListPos) /* 412D70 E0124640 3C150001 */ lui $s5, 1 /* 412D74 E0124644 36B51630 */ ori $s5, $s5, 0x1630 /* 412D78 E0124648 0280902D */ daddu $s2, $s4, $zero @@ -108,7 +108,7 @@ glabel func_E01244C4 .LE0124660: /* 412D90 E0124660 8E340004 */ lw $s4, 4($s1) /* 412D94 E0124664 0680006E */ bltz $s4, .LE0124820 -/* 412D98 E0124668 00000000 */ nop +/* 412D98 E0124668 00000000 */ nop /* 412D9C E012466C 8E25FFE0 */ lw $a1, -0x20($s1) /* 412DA0 E0124670 8E26FFE4 */ lw $a2, -0x1c($s1) /* 412DA4 E0124674 8E27FFE8 */ lw $a3, -0x18($s1) @@ -124,8 +124,8 @@ glabel func_E01244C4 /* 412DCC E012469C E7A00058 */ swc1 $f0, 0x58($sp) /* 412DD0 E01246A0 27A40018 */ addiu $a0, $sp, 0x18 /* 412DD4 E01246A4 96E50000 */ lhu $a1, ($s7) -/* 412DD8 E01246A8 3C02800A */ lui $v0, %hi(D_8009A674) -/* 412DDC E01246AC 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 412DD8 E01246A8 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 412DDC E01246AC 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 412DE0 E01246B0 00052980 */ sll $a1, $a1, 6 /* 412DE4 E01246B4 00B52821 */ addu $a1, $a1, $s5 /* 412DE8 E01246B8 0C080118 */ jal func_E0200460 @@ -137,27 +137,27 @@ glabel func_E01244C4 .LE01246D0: /* 412E00 E01246D0 92020000 */ lbu $v0, ($s0) /* 412E04 E01246D4 44822000 */ mtc1 $v0, $f4 -/* 412E08 E01246D8 00000000 */ nop +/* 412E08 E01246D8 00000000 */ nop /* 412E0C E01246DC 46802120 */ cvt.s.w $f4, $f4 /* 412E10 E01246E0 46162102 */ mul.s $f4, $f4, $f22 -/* 412E14 E01246E4 00000000 */ nop +/* 412E14 E01246E4 00000000 */ nop /* 412E18 E01246E8 26100001 */ addiu $s0, $s0, 1 /* 412E1C E01246EC 92020000 */ lbu $v0, ($s0) /* 412E20 E01246F0 44821000 */ mtc1 $v0, $f2 -/* 412E24 E01246F4 00000000 */ nop +/* 412E24 E01246F4 00000000 */ nop /* 412E28 E01246F8 468010A0 */ cvt.s.w $f2, $f2 /* 412E2C E01246FC 46181082 */ mul.s $f2, $f2, $f24 -/* 412E30 E0124700 00000000 */ nop +/* 412E30 E0124700 00000000 */ nop /* 412E34 E0124704 26100001 */ addiu $s0, $s0, 1 /* 412E38 E0124708 92020000 */ lbu $v0, ($s0) /* 412E3C E012470C 44820000 */ mtc1 $v0, $f0 -/* 412E40 E0124710 00000000 */ nop +/* 412E40 E0124710 00000000 */ nop /* 412E44 E0124714 46800020 */ cvt.s.w $f0, $f0 /* 412E48 E0124718 46140002 */ mul.s $f0, $f0, $f20 -/* 412E4C E012471C 00000000 */ nop +/* 412E4C E012471C 00000000 */ nop /* 412E50 E0124720 4600218D */ trunc.w.s $f6, $f4 /* 412E54 E0124724 44033000 */ mfc1 $v1, $f6 -/* 412E58 E0124728 00000000 */ nop +/* 412E58 E0124728 00000000 */ nop /* 412E5C E012472C 28620100 */ slti $v0, $v1, 0x100 /* 412E60 E0124730 4600118D */ trunc.w.s $f6, $f2 /* 412E64 E0124734 44073000 */ mfc1 $a3, $f6 @@ -203,8 +203,8 @@ glabel func_E01244C4 /* 412EF8 E01247C8 3042FFFF */ andi $v0, $v0, 0xffff /* 412EFC E01247CC 00021180 */ sll $v0, $v0, 6 /* 412F00 E01247D0 A6E30000 */ sh $v1, ($s7) -/* 412F04 E01247D4 3C03800A */ lui $v1, %hi(D_8009A674) -/* 412F08 E01247D8 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 412F04 E01247D4 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 412F08 E01247D8 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 412F0C E01247DC 00551021 */ addu $v0, $v0, $s5 /* 412F10 E01247E0 00621821 */ addu $v1, $v1, $v0 /* 412F14 E01247E4 24820010 */ addiu $v0, $a0, 0x10 @@ -231,8 +231,8 @@ glabel func_E01244C4 /* 412F64 E0124834 1440FF8A */ bnez $v0, .LE0124660 /* 412F68 E0124838 2631002C */ addiu $s1, $s1, 0x2c .LE012483C: -/* 412F6C E012483C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 412F70 E0124840 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 412F6C E012483C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 412F70 E0124840 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 412F74 E0124844 8C620000 */ lw $v0, ($v1) /* 412F78 E0124848 0040202D */ daddu $a0, $v0, $zero /* 412F7C E012484C 24420008 */ addiu $v0, $v0, 8 @@ -255,4 +255,4 @@ glabel func_E01244C4 /* 412FC0 E0124890 D7B40108 */ ldc1 $f20, 0x108($sp) /* 412FC4 E0124894 03E00008 */ jr $ra /* 412FC8 E0124898 27BD0120 */ addiu $sp, $sp, 0x120 -/* 412FCC E012489C 00000000 */ nop +/* 412FCC E012489C 00000000 */ nop diff --git a/asm/nonmatchings/code_413360/func_E01264EC.s b/asm/nonmatchings/code_413360/func_E01264EC.s index 8bf75ae100..5b70a6b86d 100644 --- a/asm/nonmatchings/code_413360/func_E01264EC.s +++ b/asm/nonmatchings/code_413360/func_E01264EC.s @@ -97,8 +97,8 @@ glabel func_E01264EC /* 413980 E0126620 0000A82D */ daddu $s5, $zero, $zero .LE0126624: /* 413984 E0126624 3C05DB06 */ lui $a1, 0xdb06 -/* 413988 E0126628 3C14800A */ lui $s4, %hi(D_8009A66C) -/* 41398C E012662C 2694A66C */ addiu $s4, $s4, %lo(D_8009A66C) +/* 413988 E0126628 3C14800A */ lui $s4, %hi(gMasterGfxPos) +/* 41398C E012662C 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) /* 413990 E0126630 34A50024 */ ori $a1, $a1, 0x24 /* 413994 E0126634 8E840000 */ lw $a0, ($s4) /* 413998 E0126638 3C02E700 */ lui $v0, 0xe700 @@ -134,7 +134,7 @@ glabel func_E01264EC /* 413A10 E01266B0 00431021 */ addu $v0, $v0, $v1 /* 413A14 E01266B4 00021080 */ sll $v0, $v0, 2 /* 413A18 E01266B8 46220002 */ mul.d $f0, $f0, $f2 -/* 413A1C E01266BC 00000000 */ nop +/* 413A1C E01266BC 00000000 */ nop /* 413A20 E01266C0 00431023 */ subu $v0, $v0, $v1 /* 413A24 E01266C4 000218C0 */ sll $v1, $v0, 3 /* 413A28 E01266C8 00431021 */ addu $v0, $v0, $v1 @@ -175,10 +175,10 @@ glabel func_E01264EC /* 413AB4 E0126754 0C080114 */ jal func_E0200450 /* 413AB8 E0126758 00A0302D */ daddu $a2, $a1, $zero /* 413ABC E012675C 27A40020 */ addiu $a0, $sp, 0x20 -/* 413AC0 E0126760 3C108007 */ lui $s0, %hi(D_800741F0) -/* 413AC4 E0126764 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 413AC8 E0126768 3C11800A */ lui $s1, %hi(D_8009A674) -/* 413ACC E012676C 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 413AC0 E0126760 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 413AC4 E0126764 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 413AC8 E0126768 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 413ACC E012676C 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 413AD0 E0126770 96050000 */ lhu $a1, ($s0) /* 413AD4 E0126774 8E220000 */ lw $v0, ($s1) /* 413AD8 E0126778 00052980 */ sll $a1, $a1, 6 @@ -218,8 +218,8 @@ glabel func_E01264EC /* 413B58 E01267F8 AE820000 */ sw $v0, ($s4) /* 413B5C E01267FC ACC40000 */ sw $a0, ($a2) /* 413B60 E0126800 ACC30004 */ sw $v1, 4($a2) -/* 413B64 E0126804 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 413B68 E0126808 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 413B64 E0126804 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 413B68 E0126808 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 413B6C E012680C 3C02FA00 */ lui $v0, 0xfa00 /* 413B70 E0126810 00161E00 */ sll $v1, $s6, 0x18 /* 413B74 E0126814 00152843 */ sra $a1, $s5, 1 @@ -279,7 +279,7 @@ glabel func_E01264EC /* 413C48 E01268E8 00431021 */ addu $v0, $v0, $v1 /* 413C4C E01268EC 00021080 */ sll $v0, $v0, 2 /* 413C50 E01268F0 46220002 */ mul.d $f0, $f0, $f2 -/* 413C54 E01268F4 00000000 */ nop +/* 413C54 E01268F4 00000000 */ nop /* 413C58 E01268F8 00431023 */ subu $v0, $v0, $v1 /* 413C5C E01268FC 000218C0 */ sll $v1, $v0, 3 /* 413C60 E0126900 00431021 */ addu $v0, $v0, $v1 @@ -320,10 +320,10 @@ glabel func_E01264EC /* 413CEC E012698C 0C080114 */ jal func_E0200450 /* 413CF0 E0126990 00A0302D */ daddu $a2, $a1, $zero /* 413CF4 E0126994 27A40020 */ addiu $a0, $sp, 0x20 -/* 413CF8 E0126998 3C108007 */ lui $s0, %hi(D_800741F0) -/* 413CFC E012699C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 413D00 E01269A0 3C11800A */ lui $s1, %hi(D_8009A674) -/* 413D04 E01269A4 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 413CF8 E0126998 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 413CFC E012699C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 413D00 E01269A0 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 413D04 E01269A4 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 413D08 E01269A8 96050000 */ lhu $a1, ($s0) /* 413D0C E01269AC 8E220000 */ lw $v0, ($s1) /* 413D10 E01269B0 00052980 */ sll $a1, $a1, 6 @@ -331,8 +331,8 @@ glabel func_E01264EC /* 413D18 E01269B8 0C080118 */ jal func_E0200460 /* 413D1C E01269BC 00452821 */ addu $a1, $v0, $a1 /* 413D20 E01269C0 3C03DA38 */ lui $v1, 0xda38 -/* 413D24 E01269C4 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 413D28 E01269C8 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 413D24 E01269C4 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 413D28 E01269C8 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 413D2C E01269CC 34630002 */ ori $v1, $v1, 2 /* 413D30 E01269D0 8CC50000 */ lw $a1, ($a2) /* 413D34 E01269D4 96020000 */ lhu $v0, ($s0) @@ -365,8 +365,8 @@ glabel func_E01264EC /* 413D98 E0126A38 ACC20000 */ sw $v0, ($a2) /* 413D9C E0126A3C ACA40000 */ sw $a0, ($a1) /* 413DA0 E0126A40 ACA30004 */ sw $v1, 4($a1) -/* 413DA4 E0126A44 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 413DA8 E0126A48 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 413DA4 E0126A44 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 413DA8 E0126A48 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 413DAC E0126A4C 8CA30000 */ lw $v1, ($a1) /* 413DB0 E0126A50 3C02DE00 */ lui $v0, 0xde00 /* 413DB4 E0126A54 0060202D */ daddu $a0, $v1, $zero @@ -382,16 +382,16 @@ glabel func_E01264EC /* 413DD8 E0126A78 3C06E200 */ lui $a2, 0xe200 /* 413DDC E0126A7C 34C6001C */ ori $a2, $a2, 0x1c /* 413DE0 E0126A80 3C050050 */ lui $a1, 0x50 -/* 413DE4 E0126A84 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 413DE8 E0126A88 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 413DE4 E0126A84 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 413DE8 E0126A88 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 413DEC E0126A8C 8C820000 */ lw $v0, ($a0) /* 413DF0 E0126A90 08049AAC */ j .LE0126AB0 /* 413DF4 E0126A94 34A541C8 */ ori $a1, $a1, 0x41c8 .LE0126A98: /* 413DF8 E0126A98 34C6001C */ ori $a2, $a2, 0x1c /* 413DFC E0126A9C 3C050050 */ lui $a1, 0x50 -/* 413E00 E0126AA0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 413E04 E0126AA4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 413E00 E0126AA0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 413E04 E0126AA4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 413E08 E0126AA8 8C820000 */ lw $v0, ($a0) /* 413E0C E0126AAC 34A549D8 */ ori $a1, $a1, 0x49d8 .LE0126AB0: @@ -400,8 +400,8 @@ glabel func_E01264EC /* 413E18 E0126AB8 AC820000 */ sw $v0, ($a0) /* 413E1C E0126ABC AC660000 */ sw $a2, ($v1) /* 413E20 E0126AC0 AC650004 */ sw $a1, 4($v1) -/* 413E24 E0126AC4 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 413E28 E0126AC8 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 413E24 E0126AC4 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 413E28 E0126AC8 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 413E2C E0126ACC 3C02FA00 */ lui $v0, 0xfa00 /* 413E30 E0126AD0 8CA40000 */ lw $a0, ($a1) /* 413E34 E0126AD4 00161E00 */ sll $v1, $s6, 0x18 @@ -462,4 +462,4 @@ glabel func_E01264EC /* 413F10 E0126BB0 D7B400D8 */ ldc1 $f20, 0xd8($sp) /* 413F14 E0126BB4 03E00008 */ jr $ra /* 413F18 E0126BB8 27BD00E0 */ addiu $sp, $sp, 0xe0 -/* 413F1C E0126BBC 00000000 */ nop +/* 413F1C E0126BBC 00000000 */ nop diff --git a/asm/nonmatchings/code_414BA0/func_E01281E0.s b/asm/nonmatchings/code_414BA0/func_E01281E0.s index eff3469430..fcd9ff0c84 100644 --- a/asm/nonmatchings/code_414BA0/func_E01281E0.s +++ b/asm/nonmatchings/code_414BA0/func_E01281E0.s @@ -10,8 +10,8 @@ glabel func_E01281E0 /* 414D94 E01281F4 AFB700AC */ sw $s7, 0xac($sp) /* 414D98 E01281F8 3C170001 */ lui $s7, 1 /* 414D9C E01281FC AFB3009C */ sw $s3, 0x9c($sp) -/* 414DA0 E0128200 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 414DA4 E0128204 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 414DA0 E0128200 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 414DA4 E0128204 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 414DA8 E0128208 36F71630 */ ori $s7, $s7, 0x1630 /* 414DAC E012820C AFBF00B0 */ sw $ra, 0xb0($sp) /* 414DB0 E0128210 AFB600A8 */ sw $s6, 0xa8($sp) @@ -65,10 +65,10 @@ glabel func_E01281E0 /* 414E70 E01282D0 0C080114 */ jal func_E0200450 /* 414E74 E01282D4 00A0302D */ daddu $a2, $a1, $zero /* 414E78 E01282D8 27A40010 */ addiu $a0, $sp, 0x10 -/* 414E7C E01282DC 3C118007 */ lui $s1, %hi(D_800741F0) -/* 414E80 E01282E0 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 414E84 E01282E4 3C15800A */ lui $s5, %hi(D_8009A674) -/* 414E88 E01282E8 26B5A674 */ addiu $s5, $s5, %lo(D_8009A674) +/* 414E7C E01282DC 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 414E80 E01282E0 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 414E84 E01282E4 3C15800A */ lui $s5, %hi(gDisplayContext) +/* 414E88 E01282E8 26B5A674 */ addiu $s5, $s5, %lo(gDisplayContext) /* 414E8C E01282EC 96250000 */ lhu $a1, ($s1) /* 414E90 E01282F0 8EA20000 */ lw $v0, ($s5) /* 414E94 E01282F4 00052980 */ sll $a1, $a1, 6 diff --git a/asm/nonmatchings/code_415D90/func_802A3C98.s b/asm/nonmatchings/code_415D90/func_802A3C98.s index be1dd32eba..43efe023cb 100644 --- a/asm/nonmatchings/code_415D90/func_802A3C98.s +++ b/asm/nonmatchings/code_415D90/func_802A3C98.s @@ -27,7 +27,7 @@ glabel func_802A3C98 /* 418A80 802A3CF0 00220821 */ addu $at, $at, $v0 /* 418A84 802A3CF4 8C22B8C0 */ lw $v0, %lo(D_802AB8C0)($at) /* 418A88 802A3CF8 00400008 */ jr $v0 -/* 418A8C 802A3CFC 00000000 */ nop +/* 418A8C 802A3CFC 00000000 */ nop /* 418A90 802A3D00 3C03802B */ lui $v1, %hi(D_802AD10C) /* 418A94 802A3D04 8063D10C */ lb $v1, %lo(D_802AD10C)($v1) /* 418A98 802A3D08 3C08802B */ lui $t0, %hi(D_802AD110) @@ -42,20 +42,20 @@ glabel func_802A3C98 /* 418ABC 802A3D2C 00438821 */ addu $s1, $v0, $v1 /* 418AC0 802A3D30 02281023 */ subu $v0, $s1, $t0 /* 418AC4 802A3D34 44820000 */ mtc1 $v0, $f0 -/* 418AC8 802A3D38 00000000 */ nop +/* 418AC8 802A3D38 00000000 */ nop /* 418ACC 802A3D3C 46800021 */ cvt.d.w $f0, $f0 /* 418AD0 802A3D40 46220002 */ mul.d $f0, $f0, $f2 -/* 418AD4 802A3D44 00000000 */ nop +/* 418AD4 802A3D44 00000000 */ nop /* 418AD8 802A3D48 4620018D */ trunc.w.d $f6, $f0 /* 418ADC 802A3D4C 44023000 */ mfc1 $v0, $f6 -/* 418AE0 802A3D50 00000000 */ nop +/* 418AE0 802A3D50 00000000 */ nop /* 418AE4 802A3D54 14400002 */ bnez $v0, .L802A3D60 /* 418AE8 802A3D58 01024021 */ addu $t0, $t0, $v0 /* 418AEC 802A3D5C 0220402D */ daddu $t0, $s1, $zero .L802A3D60: /* 418AF0 802A3D60 0000982D */ daddu $s3, $zero, $zero -/* 418AF4 802A3D64 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 418AF8 802A3D68 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 418AF4 802A3D64 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 418AF8 802A3D68 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 418AFC 802A3D6C 3C05802B */ lui $a1, %hi(D_802AD110) /* 418B00 802A3D70 24A5D110 */ addiu $a1, $a1, %lo(D_802AD110) /* 418B04 802A3D74 8FA9004C */ lw $t1, 0x4c($sp) @@ -66,7 +66,7 @@ glabel func_802A3C98 /* 418B18 802A3D88 44812000 */ mtc1 $at, $f4 /* 418B1C 802A3D8C 25350002 */ addiu $s5, $t1, 2 /* 418B20 802A3D90 44951000 */ mtc1 $s5, $f2 -/* 418B24 802A3D94 00000000 */ nop +/* 418B24 802A3D94 00000000 */ nop /* 418B28 802A3D98 468010A0 */ cvt.s.w $f2, $f2 /* 418B2C 802A3D9C 00031040 */ sll $v0, $v1, 1 /* 418B30 802A3DA0 00431021 */ addu $v0, $v0, $v1 @@ -76,17 +76,17 @@ glabel func_802A3C98 /* 418B40 802A3DB0 0080382D */ daddu $a3, $a0, $zero /* 418B44 802A3DB4 8FA90050 */ lw $t1, 0x50($sp) /* 418B48 802A3DB8 46041082 */ mul.s $f2, $f2, $f4 -/* 418B4C 802A3DBC 00000000 */ nop +/* 418B4C 802A3DBC 00000000 */ nop /* 418B50 802A3DC0 25310012 */ addiu $s1, $t1, 0x12 /* 418B54 802A3DC4 8FA9004C */ lw $t1, 0x4c($sp) /* 418B58 802A3DC8 24840008 */ addiu $a0, $a0, 8 /* 418B5C 802A3DCC A4A80000 */ sh $t0, ($a1) /* 418B60 802A3DD0 02224021 */ addu $t0, $s1, $v0 /* 418B64 802A3DD4 44910000 */ mtc1 $s1, $f0 -/* 418B68 802A3DD8 00000000 */ nop +/* 418B68 802A3DD8 00000000 */ nop /* 418B6C 802A3DDC 46800020 */ cvt.s.w $f0, $f0 /* 418B70 802A3DE0 46040002 */ mul.s $f0, $f0, $f4 -/* 418B74 802A3DE4 00000000 */ nop +/* 418B74 802A3DE4 00000000 */ nop /* 418B78 802A3DE8 84A20000 */ lh $v0, ($a1) /* 418B7C 802A3DEC 2535001F */ addiu $s5, $t1, 0x1f /* 418B80 802A3DF0 8FA90050 */ lw $t1, 0x50($sp) @@ -95,39 +95,39 @@ glabel func_802A3C98 /* 418B8C 802A3DFC 01228821 */ addu $s1, $t1, $v0 /* 418B90 802A3E00 4600118D */ trunc.w.s $f6, $f2 /* 418B94 802A3E04 44033000 */ mfc1 $v1, $f6 -/* 418B98 802A3E08 00000000 */ nop +/* 418B98 802A3E08 00000000 */ nop /* 418B9C 802A3E0C 30630FFF */ andi $v1, $v1, 0xfff /* 418BA0 802A3E10 00031B00 */ sll $v1, $v1, 0xc /* 418BA4 802A3E14 4600018D */ trunc.w.s $f6, $f0 /* 418BA8 802A3E18 44043000 */ mfc1 $a0, $f6 -/* 418BAC 802A3E1C 00000000 */ nop +/* 418BAC 802A3E1C 00000000 */ nop /* 418BB0 802A3E20 30840FFF */ andi $a0, $a0, 0xfff /* 418BB4 802A3E24 8FA9004C */ lw $t1, 0x4c($sp) /* 418BB8 802A3E28 44880000 */ mtc1 $t0, $f0 -/* 418BBC 802A3E2C 00000000 */ nop +/* 418BBC 802A3E2C 00000000 */ nop /* 418BC0 802A3E30 46800020 */ cvt.s.w $f0, $f0 /* 418BC4 802A3E34 25220099 */ addiu $v0, $t1, 0x99 /* 418BC8 802A3E38 44821000 */ mtc1 $v0, $f2 -/* 418BCC 802A3E3C 00000000 */ nop +/* 418BCC 802A3E3C 00000000 */ nop /* 418BD0 802A3E40 468010A0 */ cvt.s.w $f2, $f2 /* 418BD4 802A3E44 46041082 */ mul.s $f2, $f2, $f4 -/* 418BD8 802A3E48 00000000 */ nop +/* 418BD8 802A3E48 00000000 */ nop /* 418BDC 802A3E4C 3C02ED00 */ lui $v0, 0xed00 /* 418BE0 802A3E50 00822025 */ or $a0, $a0, $v0 /* 418BE4 802A3E54 00641825 */ or $v1, $v1, $a0 /* 418BE8 802A3E58 3C04802B */ lui $a0, %hi(D_802AD4A4) /* 418BEC 802A3E5C 8C84D4A4 */ lw $a0, %lo(D_802AD4A4)($a0) /* 418BF0 802A3E60 46040002 */ mul.s $f0, $f0, $f4 -/* 418BF4 802A3E64 00000000 */ nop +/* 418BF4 802A3E64 00000000 */ nop /* 418BF8 802A3E68 ACE30000 */ sw $v1, ($a3) /* 418BFC 802A3E6C 4600118D */ trunc.w.s $f6, $f2 /* 418C00 802A3E70 44023000 */ mfc1 $v0, $f6 -/* 418C04 802A3E74 00000000 */ nop +/* 418C04 802A3E74 00000000 */ nop /* 418C08 802A3E78 30420FFF */ andi $v0, $v0, 0xfff /* 418C0C 802A3E7C 00021300 */ sll $v0, $v0, 0xc /* 418C10 802A3E80 4600018D */ trunc.w.s $f6, $f0 /* 418C14 802A3E84 44033000 */ mfc1 $v1, $f6 -/* 418C18 802A3E88 00000000 */ nop +/* 418C18 802A3E88 00000000 */ nop /* 418C1C 802A3E8C 30630FFF */ andi $v1, $v1, 0xfff /* 418C20 802A3E90 00431025 */ or $v0, $v0, $v1 /* 418C24 802A3E94 188000BC */ blez $a0, .L802A4188 @@ -191,27 +191,27 @@ glabel func_802A3C98 /* 418CFC 802A3F6C 3C02802B */ lui $v0, %hi(D_802AD4A0) /* 418D00 802A3F70 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) /* 418D04 802A3F74 14400015 */ bnez $v0, .L802A3FCC -/* 418D08 802A3F78 00000000 */ nop +/* 418D08 802A3F78 00000000 */ nop /* 418D0C 802A3F7C 3C02802B */ lui $v0, %hi(D_802AD109) /* 418D10 802A3F80 8042D109 */ lb $v0, %lo(D_802AD109)($v0) /* 418D14 802A3F84 16620025 */ bne $s3, $v0, .L802A401C /* 418D18 802A3F88 00131080 */ sll $v0, $s3, 2 /* 418D1C 802A3F8C 12400007 */ beqz $s2, .L802A3FAC -/* 418D20 802A3F90 00000000 */ nop +/* 418D20 802A3F90 00000000 */ nop /* 418D24 802A3F94 8E820000 */ lw $v0, ($s4) /* 418D28 802A3F98 00021080 */ sll $v0, $v0, 2 /* 418D2C 802A3F9C 00561021 */ addu $v0, $v0, $s6 /* 418D30 802A3FA0 8C420000 */ lw $v0, ($v0) /* 418D34 802A3FA4 1C400005 */ bgtz $v0, .L802A3FBC -/* 418D38 802A3FA8 00000000 */ nop +/* 418D38 802A3FA8 00000000 */ nop .L802A3FAC: /* 418D3C 802A3FAC 0C03A674 */ jal status_menu_stop_blinking_fp -/* 418D40 802A3FB0 00000000 */ nop +/* 418D40 802A3FB0 00000000 */ nop /* 418D44 802A3FB4 080A9007 */ j .L802A401C /* 418D48 802A3FB8 00131080 */ sll $v0, $s3, 2 .L802A3FBC: /* 418D4C 802A3FBC 0C03A663 */ jal status_menu_start_blinking_fp -/* 418D50 802A3FC0 00000000 */ nop +/* 418D50 802A3FC0 00000000 */ nop /* 418D54 802A3FC4 080A9007 */ j .L802A401C /* 418D58 802A3FC8 00131080 */ sll $v0, $s3, 2 .L802A3FCC: @@ -220,7 +220,7 @@ glabel func_802A3C98 /* 418D64 802A3FD4 16620011 */ bne $s3, $v0, .L802A401C /* 418D68 802A3FD8 00131080 */ sll $v0, $s3, 2 /* 418D6C 802A3FDC 12400007 */ beqz $s2, .L802A3FFC -/* 418D70 802A3FE0 00000000 */ nop +/* 418D70 802A3FE0 00000000 */ nop /* 418D74 802A3FE4 8E820000 */ lw $v0, ($s4) /* 418D78 802A3FE8 00021880 */ sll $v1, $v0, 2 /* 418D7C 802A3FEC 00761021 */ addu $v0, $v1, $s6 @@ -229,13 +229,13 @@ glabel func_802A3C98 /* 418D88 802A3FF8 007E1021 */ addu $v0, $v1, $fp .L802A3FFC: /* 418D8C 802A3FFC 0C03A6A5 */ jal status_menu_stop_blinking_sp -/* 418D90 802A4000 00000000 */ nop +/* 418D90 802A4000 00000000 */ nop /* 418D94 802A4004 080A9007 */ j .L802A401C /* 418D98 802A4008 00131080 */ sll $v0, $s3, 2 .L802A400C: /* 418D9C 802A400C 8C440000 */ lw $a0, ($v0) /* 418DA0 802A4010 0C03A6AE */ jal status_menu_start_blinking_sp_bars -/* 418DA4 802A4014 00000000 */ nop +/* 418DA4 802A4014 00000000 */ nop /* 418DA8 802A4018 00131080 */ sll $v0, $s3, 2 .L802A401C: /* 418DAC 802A401C 3C03802B */ lui $v1, %hi(D_802AD3E0) @@ -246,7 +246,7 @@ glabel func_802A3C98 /* 418DC0 802A4030 10620005 */ beq $v1, $v0, .L802A4048 /* 418DC4 802A4034 24080038 */ addiu $t0, $zero, 0x38 /* 418DC8 802A4038 080A9013 */ j .L802A404C -/* 418DCC 802A403C 00000000 */ nop +/* 418DCC 802A403C 00000000 */ nop .L802A4040: /* 418DD0 802A4040 080A9013 */ j .L802A404C /* 418DD4 802A4044 2408000A */ addiu $t0, $zero, 0xa @@ -401,11 +401,11 @@ glabel func_802A3C98 /* 418FF4 802A4264 00438821 */ addu $s1, $v0, $v1 /* 418FF8 802A4268 02281023 */ subu $v0, $s1, $t0 /* 418FFC 802A426C 44820000 */ mtc1 $v0, $f0 -/* 419000 802A4270 00000000 */ nop +/* 419000 802A4270 00000000 */ nop /* 419004 802A4274 46800021 */ cvt.d.w $f0, $f0 /* 419008 802A4278 4620018D */ trunc.w.d $f6, $f0 /* 41900C 802A427C 44023000 */ mfc1 $v0, $f6 -/* 419010 802A4280 00000000 */ nop +/* 419010 802A4280 00000000 */ nop /* 419014 802A4284 14400002 */ bnez $v0, .L802A4290 /* 419018 802A4288 01024021 */ addu $t0, $t0, $v0 /* 41901C 802A428C 0220402D */ daddu $t0, $s1, $zero @@ -432,7 +432,7 @@ glabel func_802A3C98 /* 41906C 802A42DC 3C02802B */ lui $v0, %hi(D_802AD10C) /* 419070 802A42E0 8042D10C */ lb $v0, %lo(D_802AD10C)($v0) /* 419074 802A42E4 1840000E */ blez $v0, .L802A4320 -/* 419078 802A42E8 00000000 */ nop +/* 419078 802A42E8 00000000 */ nop /* 41907C 802A42EC 8FA9004C */ lw $t1, 0x4c($sp) /* 419080 802A42F0 3C10802B */ lui $s0, %hi(D_802AD11C) /* 419084 802A42F4 8E10D11C */ lw $s0, %lo(D_802AD11C)($s0) @@ -453,7 +453,7 @@ glabel func_802A3C98 /* 4190BC 802A432C 8C63D4A4 */ lw $v1, %lo(D_802AD4A4)($v1) /* 4190C0 802A4330 0043102A */ slt $v0, $v0, $v1 /* 4190C4 802A4334 1040000E */ beqz $v0, .L802A4370 -/* 4190C8 802A4338 00000000 */ nop +/* 4190C8 802A4338 00000000 */ nop /* 4190CC 802A433C 8FA9004C */ lw $t1, 0x4c($sp) /* 4190D0 802A4340 3C10802B */ lui $s0, %hi(D_802AD120) /* 4190D4 802A4344 8E10D120 */ lw $s0, %lo(D_802AD120)($s0) @@ -472,18 +472,18 @@ glabel func_802A3C98 /* 419104 802A4374 8063D108 */ lb $v1, %lo(D_802AD108)($v1) /* 419108 802A4378 2402FFFF */ addiu $v0, $zero, -1 /* 41910C 802A437C 1462000B */ bne $v1, $v0, .L802A43AC -/* 419110 802A4380 00000000 */ nop +/* 419110 802A4380 00000000 */ nop /* 419114 802A4384 3C02802B */ lui $v0, %hi(D_802AD4A0) /* 419118 802A4388 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) /* 41911C 802A438C 14400005 */ bnez $v0, .L802A43A4 -/* 419120 802A4390 00000000 */ nop +/* 419120 802A4390 00000000 */ nop /* 419124 802A4394 0C03A674 */ jal status_menu_stop_blinking_fp -/* 419128 802A4398 00000000 */ nop +/* 419128 802A4398 00000000 */ nop /* 41912C 802A439C 080A90EB */ j .L802A43AC -/* 419130 802A43A0 00000000 */ nop +/* 419130 802A43A0 00000000 */ nop .L802A43A4: /* 419134 802A43A4 0C03A6A5 */ jal status_menu_stop_blinking_sp -/* 419138 802A43A8 00000000 */ nop +/* 419138 802A43A8 00000000 */ nop .L802A43AC: /* 41913C 802A43AC 8FBF0044 */ lw $ra, 0x44($sp) /* 419140 802A43B0 8FBE0040 */ lw $fp, 0x40($sp) diff --git a/asm/nonmatchings/code_415D90/func_802A5290.s b/asm/nonmatchings/code_415D90/func_802A5290.s index d304baa363..d6b8652784 100644 --- a/asm/nonmatchings/code_415D90/func_802A5290.s +++ b/asm/nonmatchings/code_415D90/func_802A5290.s @@ -27,7 +27,7 @@ glabel func_802A5290 /* 41A078 802A52E8 00220821 */ addu $at, $at, $v0 /* 41A07C 802A52EC 8C22BAA8 */ lw $v0, %lo(D_802ABAA8)($at) /* 41A080 802A52F0 00400008 */ jr $v0 -/* 41A084 802A52F4 00000000 */ nop +/* 41A084 802A52F4 00000000 */ nop /* 41A088 802A52F8 3C03802B */ lui $v1, %hi(D_802AD608) /* 41A08C 802A52FC 8063D608 */ lb $v1, %lo(D_802AD608)($v1) /* 41A090 802A5300 3C08802B */ lui $t0, %hi(D_802AD60C) @@ -42,26 +42,26 @@ glabel func_802A5290 /* 41A0B4 802A5324 00438821 */ addu $s1, $v0, $v1 /* 41A0B8 802A5328 02281023 */ subu $v0, $s1, $t0 /* 41A0BC 802A532C 44820000 */ mtc1 $v0, $f0 -/* 41A0C0 802A5330 00000000 */ nop +/* 41A0C0 802A5330 00000000 */ nop /* 41A0C4 802A5334 46800021 */ cvt.d.w $f0, $f0 /* 41A0C8 802A5338 46220002 */ mul.d $f0, $f0, $f2 -/* 41A0CC 802A533C 00000000 */ nop +/* 41A0CC 802A533C 00000000 */ nop /* 41A0D0 802A5340 4620018D */ trunc.w.d $f6, $f0 /* 41A0D4 802A5344 44023000 */ mfc1 $v0, $f6 -/* 41A0D8 802A5348 00000000 */ nop +/* 41A0D8 802A5348 00000000 */ nop /* 41A0DC 802A534C 14400002 */ bnez $v0, .L802A5358 /* 41A0E0 802A5350 01024021 */ addu $t0, $t0, $v0 /* 41A0E4 802A5354 0220402D */ daddu $t0, $s1, $zero .L802A5358: /* 41A0E8 802A5358 26F50004 */ addiu $s5, $s7, 4 /* 41A0EC 802A535C 44951000 */ mtc1 $s5, $f2 -/* 41A0F0 802A5360 00000000 */ nop +/* 41A0F0 802A5360 00000000 */ nop /* 41A0F4 802A5364 468010A0 */ cvt.s.w $f2, $f2 /* 41A0F8 802A5368 26F50021 */ addiu $s5, $s7, 0x21 /* 41A0FC 802A536C 0000B02D */ daddu $s6, $zero, $zero /* 41A100 802A5370 02C0982D */ daddu $s3, $s6, $zero -/* 41A104 802A5374 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 41A108 802A5378 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 41A104 802A5374 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 41A108 802A5378 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 41A10C 802A537C 8FA90048 */ lw $t1, 0x48($sp) /* 41A110 802A5380 8CC40000 */ lw $a0, ($a2) /* 41A114 802A5384 3C03802B */ lui $v1, %hi(D_802AD60A) @@ -79,52 +79,52 @@ glabel func_802A5290 /* 41A144 802A53B4 24420001 */ addiu $v0, $v0, 1 /* 41A148 802A53B8 02224021 */ addu $t0, $s1, $v0 /* 41A14C 802A53BC 46041082 */ mul.s $f2, $f2, $f4 -/* 41A150 802A53C0 00000000 */ nop +/* 41A150 802A53C0 00000000 */ nop /* 41A154 802A53C4 0080382D */ daddu $a3, $a0, $zero /* 41A158 802A53C8 24840008 */ addiu $a0, $a0, 8 /* 41A15C 802A53CC 44910000 */ mtc1 $s1, $f0 -/* 41A160 802A53D0 00000000 */ nop +/* 41A160 802A53D0 00000000 */ nop /* 41A164 802A53D4 46800020 */ cvt.s.w $f0, $f0 /* 41A168 802A53D8 84A20000 */ lh $v0, ($a1) /* 41A16C 802A53DC 46040002 */ mul.s $f0, $f0, $f4 -/* 41A170 802A53E0 00000000 */ nop +/* 41A170 802A53E0 00000000 */ nop /* 41A174 802A53E4 ACC40000 */ sw $a0, ($a2) /* 41A178 802A53E8 24420013 */ addiu $v0, $v0, 0x13 /* 41A17C 802A53EC 01228821 */ addu $s1, $t1, $v0 /* 41A180 802A53F0 26E2008E */ addiu $v0, $s7, 0x8e /* 41A184 802A53F4 4600118D */ trunc.w.s $f6, $f2 /* 41A188 802A53F8 44033000 */ mfc1 $v1, $f6 -/* 41A18C 802A53FC 00000000 */ nop +/* 41A18C 802A53FC 00000000 */ nop /* 41A190 802A5400 30630FFF */ andi $v1, $v1, 0xfff /* 41A194 802A5404 00031B00 */ sll $v1, $v1, 0xc /* 41A198 802A5408 4600018D */ trunc.w.s $f6, $f0 /* 41A19C 802A540C 44043000 */ mfc1 $a0, $f6 -/* 41A1A0 802A5410 00000000 */ nop +/* 41A1A0 802A5410 00000000 */ nop /* 41A1A4 802A5414 30840FFF */ andi $a0, $a0, 0xfff /* 41A1A8 802A5418 44821000 */ mtc1 $v0, $f2 -/* 41A1AC 802A541C 00000000 */ nop +/* 41A1AC 802A541C 00000000 */ nop /* 41A1B0 802A5420 468010A0 */ cvt.s.w $f2, $f2 /* 41A1B4 802A5424 3C02ED00 */ lui $v0, 0xed00 /* 41A1B8 802A5428 46041082 */ mul.s $f2, $f2, $f4 -/* 41A1BC 802A542C 00000000 */ nop +/* 41A1BC 802A542C 00000000 */ nop /* 41A1C0 802A5430 00822025 */ or $a0, $a0, $v0 /* 41A1C4 802A5434 00641825 */ or $v1, $v1, $a0 /* 41A1C8 802A5438 44880000 */ mtc1 $t0, $f0 -/* 41A1CC 802A543C 00000000 */ nop +/* 41A1CC 802A543C 00000000 */ nop /* 41A1D0 802A5440 46800020 */ cvt.s.w $f0, $f0 /* 41A1D4 802A5444 3C04802B */ lui $a0, %hi(D_802AD66C) /* 41A1D8 802A5448 8C84D66C */ lw $a0, %lo(D_802AD66C)($a0) /* 41A1DC 802A544C 46040002 */ mul.s $f0, $f0, $f4 -/* 41A1E0 802A5450 00000000 */ nop +/* 41A1E0 802A5450 00000000 */ nop /* 41A1E4 802A5454 ACE30000 */ sw $v1, ($a3) /* 41A1E8 802A5458 4600118D */ trunc.w.s $f6, $f2 /* 41A1EC 802A545C 44023000 */ mfc1 $v0, $f6 -/* 41A1F0 802A5460 00000000 */ nop +/* 41A1F0 802A5460 00000000 */ nop /* 41A1F4 802A5464 30420FFF */ andi $v0, $v0, 0xfff /* 41A1F8 802A5468 00021300 */ sll $v0, $v0, 0xc /* 41A1FC 802A546C 4600018D */ trunc.w.s $f6, $f0 /* 41A200 802A5470 44033000 */ mfc1 $v1, $f6 -/* 41A204 802A5474 00000000 */ nop +/* 41A204 802A5474 00000000 */ nop /* 41A208 802A5478 30630FFF */ andi $v1, $v1, 0xfff /* 41A20C 802A547C 00431025 */ or $v0, $v0, $v1 /* 41A210 802A5480 18800028 */ blez $a0, .L802A5524 @@ -140,7 +140,7 @@ glabel func_802A5290 /* 41A234 802A54A4 3C10802B */ lui $s0, %hi(D_802AD614) /* 41A238 802A54A8 8210D614 */ lb $s0, %lo(D_802AD614)($s0) /* 41A23C 802A54AC 14490005 */ bne $v0, $t1, .L802A54C4 -/* 41A240 802A54B0 00000000 */ nop +/* 41A240 802A54B0 00000000 */ nop /* 41A244 802A54B4 0C03A752 */ jal is_ability_active /* 41A248 802A54B8 2404001A */ addiu $a0, $zero, 0x1a /* 41A24C 802A54BC 54400001 */ bnel $v0, $zero, .L802A54C4 @@ -217,11 +217,11 @@ glabel func_802A5290 /* 41A354 802A55C4 00438821 */ addu $s1, $v0, $v1 /* 41A358 802A55C8 02281023 */ subu $v0, $s1, $t0 /* 41A35C 802A55CC 44820000 */ mtc1 $v0, $f0 -/* 41A360 802A55D0 00000000 */ nop +/* 41A360 802A55D0 00000000 */ nop /* 41A364 802A55D4 46800021 */ cvt.d.w $f0, $f0 /* 41A368 802A55D8 4620018D */ trunc.w.d $f6, $f0 /* 41A36C 802A55DC 44023000 */ mfc1 $v0, $f6 -/* 41A370 802A55E0 00000000 */ nop +/* 41A370 802A55E0 00000000 */ nop /* 41A374 802A55E4 10400003 */ beqz $v0, .L802A55F4 /* 41A378 802A55E8 26F5000A */ addiu $s5, $s7, 0xa /* 41A37C 802A55EC 080A957E */ j .L802A55F8 diff --git a/asm/nonmatchings/code_42e0_len_1f60/func_8002A904.s b/asm/nonmatchings/code_42e0_len_1f60/func_8002A904.s index 48634f2025..de049ad7dd 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/func_8002A904.s +++ b/asm/nonmatchings/code_42e0_len_1f60/func_8002A904.s @@ -6,8 +6,8 @@ glabel func_8002A904 /* 5D08 8002A908 0080602D */ daddu $t4, $a0, $zero /* 5D0C 8002A90C 00A0682D */ daddu $t5, $a1, $zero /* 5D10 8002A910 00E0582D */ daddu $t3, $a3, $zero -/* 5D14 8002A914 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 5D18 8002A918 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 5D14 8002A914 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 5D18 8002A918 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 5D1C 8002A91C 3C02E700 */ lui $v0, 0xe700 /* 5D20 8002A920 AFB00000 */ sw $s0, ($sp) /* 5D24 8002A924 8D070000 */ lw $a3, ($t0) @@ -65,8 +65,8 @@ glabel func_8002A904 /* 5DEC 8002A9EC 3C0AFCFF */ lui $t2, 0xfcff /* 5DF0 8002A9F0 354AFFFF */ ori $t2, $t2, 0xffff /* 5DF4 8002A9F4 3C08FFFC */ lui $t0, 0xfffc -/* 5DF8 8002A9F8 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 5DFC 8002A9FC 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 5DF8 8002A9F8 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 5DFC 8002A9FC 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 5E00 8002AA00 3508F279 */ ori $t0, $t0, 0xf279 /* 5E04 8002AA04 3C02FA00 */ lui $v0, 0xfa00 /* 5E08 8002AA08 8CC50000 */ lw $a1, ($a2) diff --git a/asm/nonmatchings/code_6e40_len_500/render_curtains.s b/asm/nonmatchings/code_6e40_len_500/render_curtains.s index f25d1d306b..7d1c437295 100644 --- a/asm/nonmatchings/code_6e40_len_500/render_curtains.s +++ b/asm/nonmatchings/code_6e40_len_500/render_curtains.s @@ -17,15 +17,15 @@ glabel render_curtains /* 6EB0 8002BAB0 F7B40080 */ sdc1 $f20, 0x80($sp) /* 6EB4 8002BAB4 C6440000 */ lwc1 $f4, ($s2) /* 6EB8 8002BAB8 46040032 */ c.eq.s $f0, $f4 -/* 6EBC 8002BABC 00000000 */ nop +/* 6EBC 8002BABC 00000000 */ nop /* 6EC0 8002BAC0 4501000B */ bc1t .L8002BAF0 -/* 6EC4 8002BAC4 00000000 */ nop +/* 6EC4 8002BAC4 00000000 */ nop /* 6EC8 8002BAC8 46040001 */ sub.s $f0, $f0, $f4 /* 6ECC 8002BACC 3C018009 */ lui $at, %hi(D_80097E00) /* 6ED0 8002BAD0 D4227E00 */ ldc1 $f2, %lo(D_80097E00)($at) /* 6ED4 8002BAD4 46000021 */ cvt.d.s $f0, $f0 /* 6ED8 8002BAD8 46220002 */ mul.d $f0, $f0, $f2 -/* 6EDC 8002BADC 00000000 */ nop +/* 6EDC 8002BADC 00000000 */ nop /* 6EE0 8002BAE0 460020A1 */ cvt.d.s $f2, $f4 /* 6EE4 8002BAE4 46201080 */ add.d $f2, $f2, $f0 /* 6EE8 8002BAE8 462010A0 */ cvt.s.d $f2, $f2 @@ -37,15 +37,15 @@ glabel render_curtains /* 6EFC 8002BAFC C420BA9C */ lwc1 $f0, %lo(gCurtainFadeGoal)($at) /* 6F00 8002BB00 C6640000 */ lwc1 $f4, ($s3) /* 6F04 8002BB04 46040032 */ c.eq.s $f0, $f4 -/* 6F08 8002BB08 00000000 */ nop +/* 6F08 8002BB08 00000000 */ nop /* 6F0C 8002BB0C 4501000B */ bc1t .L8002BB3C -/* 6F10 8002BB10 00000000 */ nop +/* 6F10 8002BB10 00000000 */ nop /* 6F14 8002BB14 46040001 */ sub.s $f0, $f0, $f4 /* 6F18 8002BB18 3C018009 */ lui $at, %hi(D_80097E08) /* 6F1C 8002BB1C D4227E08 */ ldc1 $f2, %lo(D_80097E08)($at) /* 6F20 8002BB20 46000021 */ cvt.d.s $f0, $f0 /* 6F24 8002BB24 46220002 */ mul.d $f0, $f0, $f2 -/* 6F28 8002BB28 00000000 */ nop +/* 6F28 8002BB28 00000000 */ nop /* 6F2C 8002BB2C 460020A1 */ cvt.d.s $f2, $f4 /* 6F30 8002BB30 46201080 */ add.d $f2, $f2, $f0 /* 6F34 8002BB34 462010A0 */ cvt.s.d $f2, $f2 @@ -56,12 +56,12 @@ glabel render_curtains /* 6F44 8002BB44 D4227E10 */ ldc1 $f2, %lo(D_80097E10)($at) /* 6F48 8002BB48 46000021 */ cvt.d.s $f0, $f0 /* 6F4C 8002BB4C 4622003C */ c.lt.d $f0, $f2 -/* 6F50 8002BB50 00000000 */ nop +/* 6F50 8002BB50 00000000 */ nop /* 6F54 8002BB54 45000087 */ bc1f .L8002BD74 /* 6F58 8002BB58 3C03FF10 */ lui $v1, 0xff10 /* 6F5C 8002BB5C 3463013F */ ori $v1, $v1, 0x13f -/* 6F60 8002BB60 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 6F64 8002BB64 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 6F60 8002BB60 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 6F64 8002BB64 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 6F68 8002BB68 3C15E700 */ lui $s5, 0xe700 /* 6F6C 8002BB6C 8E300000 */ lw $s0, ($s1) /* 6F70 8002BB70 3C04800A */ lui $a0, %hi(D_8009A64C) @@ -121,7 +121,7 @@ glabel render_curtains /* 7048 8002BC48 AC640000 */ sw $a0, ($v1) /* 704C 8002BC4C 46200120 */ cvt.s.d $f4, $f0 /* 7050 8002BC50 4614203C */ c.lt.s $f4, $f20 -/* 7054 8002BC54 00000000 */ nop +/* 7054 8002BC54 00000000 */ nop /* 7058 8002BC58 45000002 */ bc1f .L8002BC64 /* 705C 8002BC5C AC700004 */ sw $s0, 4($v1) /* 7060 8002BC60 4600A106 */ mov.s $f4, $f20 @@ -132,7 +132,7 @@ glabel render_curtains /* 7070 8002BC70 44050000 */ mfc1 $a1, $f0 /* 7074 8002BC74 46002021 */ cvt.d.s $f0, $f4 /* 7078 8002BC78 46220002 */ mul.d $f0, $f0, $f2 -/* 707C 8002BC7C 00000000 */ nop +/* 707C 8002BC7C 00000000 */ nop /* 7080 8002BC80 27A40020 */ addiu $a0, $sp, 0x20 /* 7084 8002BC84 3C01C3A0 */ lui $at, 0xc3a0 /* 7088 8002BC88 44811000 */ mtc1 $at, $f2 @@ -175,7 +175,7 @@ glabel render_curtains /* 711C 8002BD1C AE220000 */ sw $v0, ($s1) /* 7120 8002BD20 24020040 */ addiu $v0, $zero, 0x40 /* 7124 8002BD24 46001082 */ mul.s $f2, $f2, $f0 -/* 7128 8002BD28 00000000 */ nop +/* 7128 8002BD28 00000000 */ nop /* 712C 8002BD2C ACA20014 */ sw $v0, 0x14($a1) /* 7130 8002BD30 24A20020 */ addiu $v0, $a1, 0x20 /* 7134 8002BD34 ACA40010 */ sw $a0, 0x10($a1) @@ -185,7 +185,7 @@ glabel render_curtains /* 7144 8002BD44 ACA0001C */ sw $zero, 0x1c($a1) /* 7148 8002BD48 4600018D */ trunc.w.s $f6, $f0 /* 714C 8002BD4C 44023000 */ mfc1 $v0, $f6 -/* 7150 8002BD50 00000000 */ nop +/* 7150 8002BD50 00000000 */ nop /* 7154 8002BD54 304200FF */ andi $v0, $v0, 0xff /* 7158 8002BD58 00021E00 */ sll $v1, $v0, 0x18 /* 715C 8002BD5C 00022400 */ sll $a0, $v0, 0x10 @@ -198,9 +198,9 @@ glabel render_curtains /* 7174 8002BD74 3C02800A */ lui $v0, %hi(gCurtainDrawCallback) /* 7178 8002BD78 8C42BAA0 */ lw $v0, %lo(gCurtainDrawCallback)($v0) /* 717C 8002BD7C 10400003 */ beqz $v0, .L8002BD8C -/* 7180 8002BD80 00000000 */ nop +/* 7180 8002BD80 00000000 */ nop /* 7184 8002BD84 0040F809 */ jalr $v0 -/* 7188 8002BD88 00000000 */ nop +/* 7188 8002BD88 00000000 */ nop .L8002BD8C: /* 718C 8002BD8C 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 7190 8002BD90 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) @@ -208,25 +208,25 @@ glabel render_curtains /* 7198 8002BD98 90420073 */ lbu $v0, 0x73($v0) /* 719C 8002BD9C 30420001 */ andi $v0, $v0, 1 /* 71A0 8002BDA0 14400044 */ bnez $v0, .L8002BEB4 -/* 71A4 8002BDA4 00000000 */ nop +/* 71A4 8002BDA4 00000000 */ nop /* 71A8 8002BDA8 0C00CD4A */ jal get_game_mode -/* 71AC 8002BDAC 00000000 */ nop +/* 71AC 8002BDAC 00000000 */ nop /* 71B0 8002BDB0 00021400 */ sll $v0, $v0, 0x10 /* 71B4 8002BDB4 00021403 */ sra $v0, $v0, 0x10 /* 71B8 8002BDB8 24030010 */ addiu $v1, $zero, 0x10 /* 71BC 8002BDBC 1043000C */ beq $v0, $v1, .L8002BDF0 -/* 71C0 8002BDC0 00000000 */ nop +/* 71C0 8002BDC0 00000000 */ nop /* 71C4 8002BDC4 0C00CD4A */ jal get_game_mode -/* 71C8 8002BDC8 00000000 */ nop +/* 71C8 8002BDC8 00000000 */ nop /* 71CC 8002BDCC 00021400 */ sll $v0, $v0, 0x10 /* 71D0 8002BDD0 00021403 */ sra $v0, $v0, 0x10 /* 71D4 8002BDD4 24030002 */ addiu $v1, $zero, 2 /* 71D8 8002BDD8 10430005 */ beq $v0, $v1, .L8002BDF0 -/* 71DC 8002BDDC 00000000 */ nop +/* 71DC 8002BDDC 00000000 */ nop /* 71E0 8002BDE0 8E020000 */ lw $v0, ($s0) /* 71E4 8002BDE4 80420071 */ lb $v0, 0x71($v0) /* 71E8 8002BDE8 10400032 */ beqz $v0, .L8002BEB4 -/* 71EC 8002BDEC 00000000 */ nop +/* 71EC 8002BDEC 00000000 */ nop .L8002BDF0: /* 71F0 8002BDF0 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 71F4 8002BDF4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) @@ -247,8 +247,8 @@ glabel render_curtains /* 7230 8002BE30 240800FF */ addiu $t0, $zero, 0xff .L8002BE34: /* 7234 8002BE34 3C07FF20 */ lui $a3, 0xff20 -/* 7238 8002BE38 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 723C 8002BE3C 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 7238 8002BE38 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 723C 8002BE3C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 7240 8002BE40 34E71000 */ ori $a3, $a3, 0x1000 /* 7244 8002BE44 3C06DE00 */ lui $a2, 0xde00 /* 7248 8002BE48 8C830000 */ lw $v1, ($a0) diff --git a/asm/nonmatchings/code_72C5B0/func_802A123C_72C7EC.s b/asm/nonmatchings/code_72C5B0/func_802A123C_72C7EC.s index 948f576509..91de923e0f 100644 --- a/asm/nonmatchings/code_72C5B0/func_802A123C_72C7EC.s +++ b/asm/nonmatchings/code_72C5B0/func_802A123C_72C7EC.s @@ -47,8 +47,8 @@ glabel func_802A123C_72C7EC /* 72C894 802A12E4 3C1451EB */ lui $s4, 0x51eb /* 72C898 802A12E8 3694851F */ ori $s4, $s4, 0x851f /* 72C89C 802A12EC 0220982D */ daddu $s3, $s1, $zero -/* 72C8A0 802A12F0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 72C8A4 802A12F4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 72C8A0 802A12F0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 72C8A4 802A12F4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 72C8A8 802A12F8 8C820000 */ lw $v0, ($a0) /* 72C8AC 802A12FC 3C12802A */ lui $s2, %hi(D_802A25C8) /* 72C8B0 802A1300 265225C8 */ addiu $s2, $s2, %lo(D_802A25C8) diff --git a/asm/nonmatchings/code_731300/func_802A123C_73153C.s b/asm/nonmatchings/code_731300/func_802A123C_73153C.s index dac9a0f22f..c602f27f4f 100644 --- a/asm/nonmatchings/code_731300/func_802A123C_73153C.s +++ b/asm/nonmatchings/code_731300/func_802A123C_73153C.s @@ -47,8 +47,8 @@ glabel func_802A123C_73153C /* 7315E4 802A12E4 3C1451EB */ lui $s4, 0x51eb /* 7315E8 802A12E8 3694851F */ ori $s4, $s4, 0x851f /* 7315EC 802A12EC 0220982D */ daddu $s3, $s1, $zero -/* 7315F0 802A12F0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 7315F4 802A12F4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 7315F0 802A12F0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 7315F4 802A12F4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 7315F8 802A12F8 8C820000 */ lw $v0, ($a0) /* 7315FC 802A12FC 3C12802A */ lui $s2, %hi(D_802A2DD8) /* 731600 802A1300 26522DD8 */ addiu $s2, $s2, %lo(D_802A2DD8) diff --git a/asm/nonmatchings/code_80850_len_3060/update_status_menu.s b/asm/nonmatchings/code_80850_len_3060/update_status_menu.s index 4d5a6eefba..f1d78477d7 100644 --- a/asm/nonmatchings/code_80850_len_3060/update_status_menu.s +++ b/asm/nonmatchings/code_80850_len_3060/update_status_menu.s @@ -22,10 +22,10 @@ glabel update_status_menu /* 815A8 800E80F8 3C118011 */ lui $s1, %hi(gPlayerStatus) /* 815AC 800E80FC 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) /* 815B0 800E8100 04410469 */ bgez $v0, .L800E92A8 -/* 815B4 800E8104 00000000 */ nop +/* 815B4 800E8104 00000000 */ nop /* 815B8 800E8108 80620071 */ lb $v0, 0x71($v1) /* 815BC 800E810C 14400466 */ bnez $v0, .L800E92A8 -/* 815C0 800E8110 00000000 */ nop +/* 815C0 800E8110 00000000 */ nop /* 815C4 800E8114 9062007E */ lbu $v0, 0x7e($v1) /* 815C8 800E8118 30420001 */ andi $v0, $v0, 1 /* 815CC 800E811C 14400462 */ bnez $v0, .L800E92A8 @@ -35,18 +35,18 @@ glabel update_status_menu /* 815DC 800E812C 34A50180 */ ori $a1, $a1, 0x180 /* 815E0 800E8130 28420060 */ slti $v0, $v0, 0x60 /* 815E4 800E8134 1040045C */ beqz $v0, .L800E92A8 -/* 815E8 800E8138 00000000 */ nop +/* 815E8 800E8138 00000000 */ nop /* 815EC 800E813C 8E020000 */ lw $v0, ($s0) /* 815F0 800E8140 80420070 */ lb $v0, 0x70($v0) /* 815F4 800E8144 14400008 */ bnez $v0, .L800E8168 -/* 815F8 800E8148 00000000 */ nop +/* 815F8 800E8148 00000000 */ nop /* 815FC 800E814C 3C038011 */ lui $v1, %hi(gPlayerData+0xC) /* 81600 800E8150 8463F29C */ lh $v1, %lo(gPlayerData+0xC)($v1) /* 81604 800E8154 86620040 */ lh $v0, 0x40($s3) /* 81608 800E8158 10620007 */ beq $v1, $v0, .L800E8178 /* 8160C 800E815C 00628023 */ subu $s0, $v1, $v0 /* 81610 800E8160 0C03A67D */ jal status_menu_start_blinking_coins -/* 81614 800E8164 00000000 */ nop +/* 81614 800E8164 00000000 */ nop .L800E8168: /* 81618 800E8168 3C038011 */ lui $v1, %hi(gPlayerData+0xC) /* 8161C 800E816C 8463F29C */ lh $v1, %lo(gPlayerData+0xC)($v1) @@ -76,7 +76,7 @@ glabel update_status_menu /* 81670 800E81C0 A6620040 */ sh $v0, 0x40($s3) /* 81674 800E81C4 82620044 */ lb $v0, 0x44($s3) /* 81678 800E81C8 14400009 */ bnez $v0, .L800E81F0 -/* 8167C 800E81CC 00000000 */ nop +/* 8167C 800E81CC 00000000 */ nop /* 81680 800E81D0 8262003A */ lb $v0, 0x3a($s3) /* 81684 800E81D4 10400005 */ beqz $v0, .L800E81EC /* 81688 800E81D8 24020046 */ addiu $v0, $zero, 0x46 @@ -91,10 +91,10 @@ glabel update_status_menu /* 816A4 800E81F4 3C028011 */ lui $v0, %hi(gPlayerData+0x5) /* 816A8 800E81F8 8042F295 */ lb $v0, %lo(gPlayerData+0x5)($v0) /* 816AC 800E81FC 1062000C */ beq $v1, $v0, .L800E8230 -/* 816B0 800E8200 00000000 */ nop +/* 816B0 800E8200 00000000 */ nop /* 816B4 800E8204 82620044 */ lb $v0, 0x44($s3) /* 816B8 800E8208 14400009 */ bnez $v0, .L800E8230 -/* 816BC 800E820C 00000000 */ nop +/* 816BC 800E820C 00000000 */ nop /* 816C0 800E8210 8262003A */ lb $v0, 0x3a($s3) /* 816C4 800E8214 10400005 */ beqz $v0, .L800E822C /* 816C8 800E8218 24020046 */ addiu $v0, $zero, 0x46 @@ -109,10 +109,10 @@ glabel update_status_menu /* 816E4 800E8234 3C028011 */ lui $v0, %hi(gPlayerData+0x290) /* 816E8 800E8238 8442F520 */ lh $v0, %lo(gPlayerData+0x290)($v0) /* 816EC 800E823C 1062000C */ beq $v1, $v0, .L800E8270 -/* 816F0 800E8240 00000000 */ nop +/* 816F0 800E8240 00000000 */ nop /* 816F4 800E8244 82620044 */ lb $v0, 0x44($s3) /* 816F8 800E8248 14400009 */ bnez $v0, .L800E8270 -/* 816FC 800E824C 00000000 */ nop +/* 816FC 800E824C 00000000 */ nop /* 81700 800E8250 8262003A */ lb $v0, 0x3a($s3) /* 81704 800E8254 10400005 */ beqz $v0, .L800E826C /* 81708 800E8258 24020046 */ addiu $v0, $zero, 0x46 @@ -127,16 +127,16 @@ glabel update_status_menu /* 81724 800E8274 3C038011 */ lui $v1, %hi(gPlayerData+0x2) /* 81728 800E8278 8063F292 */ lb $v1, %lo(gPlayerData+0x2)($v1) /* 8172C 800E827C 1083002E */ beq $a0, $v1, .L800E8338 -/* 81730 800E8280 00000000 */ nop +/* 81730 800E8280 00000000 */ nop /* 81734 800E8284 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 81738 800E8288 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 8173C 800E828C 80420070 */ lb $v0, 0x70($v0) /* 81740 800E8290 14400005 */ bnez $v0, .L800E82A8 /* 81744 800E8294 0064102A */ slt $v0, $v1, $a0 /* 81748 800E8298 10400003 */ beqz $v0, .L800E82A8 -/* 8174C 800E829C 00000000 */ nop +/* 8174C 800E829C 00000000 */ nop /* 81750 800E82A0 0C03A648 */ jal status_menu_start_blinking_hp -/* 81754 800E82A4 00000000 */ nop +/* 81754 800E82A4 00000000 */ nop .L800E82A8: /* 81758 800E82A8 8262003D */ lb $v0, 0x3d($s3) /* 8175C 800E82AC 3C038011 */ lui $v1, %hi(gPlayerData+0x2) @@ -147,7 +147,7 @@ glabel update_status_menu /* 81770 800E82C0 86620036 */ lh $v0, 0x36($s3) /* 81774 800E82C4 28420012 */ slti $v0, $v0, 0x12 /* 81778 800E82C8 1440000C */ bnez $v0, .L800E82FC -/* 8177C 800E82CC 00000000 */ nop +/* 8177C 800E82CC 00000000 */ nop /* 81780 800E82D0 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 81784 800E82D4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 81788 800E82D8 94420134 */ lhu $v0, 0x134($v0) @@ -158,7 +158,7 @@ glabel update_status_menu /* 8179C 800E82EC 0C05272D */ jal play_sound /* 817A0 800E82F0 24040213 */ addiu $a0, $zero, 0x213 /* 817A4 800E82F4 0803A0CE */ j .L800E8338 -/* 817A8 800E82F8 00000000 */ nop +/* 817A8 800E82F8 00000000 */ nop .L800E82FC: /* 817AC 800E82FC 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 817B0 800E8300 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) @@ -181,16 +181,16 @@ glabel update_status_menu /* 817EC 800E833C 3C038011 */ lui $v1, %hi(gPlayerData+0x5) /* 817F0 800E8340 8063F295 */ lb $v1, %lo(gPlayerData+0x5)($v1) /* 817F4 800E8344 1083002E */ beq $a0, $v1, .L800E8400 -/* 817F8 800E8348 00000000 */ nop +/* 817F8 800E8348 00000000 */ nop /* 817FC 800E834C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 81800 800E8350 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 81804 800E8354 80420070 */ lb $v0, 0x70($v0) /* 81808 800E8358 14400005 */ bnez $v0, .L800E8370 /* 8180C 800E835C 0064102A */ slt $v0, $v1, $a0 /* 81810 800E8360 10400003 */ beqz $v0, .L800E8370 -/* 81814 800E8364 00000000 */ nop +/* 81814 800E8364 00000000 */ nop /* 81818 800E8368 0C03A663 */ jal status_menu_start_blinking_fp -/* 8181C 800E836C 00000000 */ nop +/* 8181C 800E836C 00000000 */ nop .L800E8370: /* 81820 800E8370 8262003E */ lb $v0, 0x3e($s3) /* 81824 800E8374 3C038011 */ lui $v1, %hi(gPlayerData+0x5) @@ -201,7 +201,7 @@ glabel update_status_menu /* 81838 800E8388 86620036 */ lh $v0, 0x36($s3) /* 8183C 800E838C 28420012 */ slti $v0, $v0, 0x12 /* 81840 800E8390 1440000C */ bnez $v0, .L800E83C4 -/* 81844 800E8394 00000000 */ nop +/* 81844 800E8394 00000000 */ nop /* 81848 800E8398 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 8184C 800E839C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 81850 800E83A0 94420134 */ lhu $v0, 0x134($v0) @@ -212,7 +212,7 @@ glabel update_status_menu /* 81864 800E83B4 0C05272D */ jal play_sound /* 81868 800E83B8 24040217 */ addiu $a0, $zero, 0x217 /* 8186C 800E83BC 0803A100 */ j .L800E8400 -/* 81870 800E83C0 00000000 */ nop +/* 81870 800E83C0 00000000 */ nop .L800E83C4: /* 81874 800E83C4 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 81878 800E83C8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) @@ -250,7 +250,7 @@ glabel update_status_menu /* 818F0 800E8440 5460000E */ bnel $v1, $zero, .L800E847C /* 818F4 800E8444 A6620048 */ sh $v0, 0x48($s3) /* 818F8 800E8448 0803A11F */ j .L800E847C -/* 818FC 800E844C 00000000 */ nop +/* 818FC 800E844C 00000000 */ nop .L800E8450: /* 81900 800E8450 2462FFF6 */ addiu $v0, $v1, -0xa /* 81904 800E8454 A6620048 */ sh $v0, 0x48($s3) @@ -266,13 +266,13 @@ glabel update_status_menu .L800E847C: /* 8192C 800E847C 82620047 */ lb $v0, 0x47($s3) /* 81930 800E8480 14400389 */ bnez $v0, .L800E92A8 -/* 81934 800E8484 00000000 */ nop +/* 81934 800E8484 00000000 */ nop /* 81938 800E8488 82620046 */ lb $v0, 0x46($s3) /* 8193C 800E848C 1040000A */ beqz $v0, .L800E84B8 -/* 81940 800E8490 00000000 */ nop +/* 81940 800E8490 00000000 */ nop /* 81944 800E8494 8262003A */ lb $v0, 0x3a($s3) /* 81948 800E8498 10400007 */ beqz $v0, .L800E84B8 -/* 8194C 800E849C 00000000 */ nop +/* 8194C 800E849C 00000000 */ nop /* 81950 800E84A0 82220015 */ lb $v0, 0x15($s1) /* 81954 800E84A4 14400004 */ bnez $v0, .L800E84B8 /* 81958 800E84A8 2402002A */ addiu $v0, $zero, 0x2a @@ -302,7 +302,7 @@ glabel update_status_menu /* 819B0 800E8500 A6620036 */ sh $v0, 0x36($s3) /* 819B4 800E8504 8262003B */ lb $v0, 0x3b($s3) /* 819B8 800E8508 10400004 */ beqz $v0, .L800E851C -/* 819BC 800E850C 00000000 */ nop +/* 819BC 800E850C 00000000 */ nop /* 819C0 800E8510 822200B4 */ lb $v0, 0xb4($s1) /* 819C4 800E8514 54400001 */ bnel $v0, $zero, .L800E851C /* 819C8 800E8518 A6600038 */ sh $zero, 0x38($s3) @@ -319,7 +319,7 @@ glabel update_status_menu /* 819EC 800E853C 3C08ED03 */ lui $t0, 0xed03 /* 819F0 800E8540 8262003B */ lb $v0, 0x3b($s3) /* 819F4 800E8544 10400004 */ beqz $v0, .L800E8558 -/* 819F8 800E8548 00000000 */ nop +/* 819F8 800E8548 00000000 */ nop /* 819FC 800E854C 822200B4 */ lb $v0, 0xb4($s1) /* 81A00 800E8550 10400033 */ beqz $v0, .L800E8620 /* 81A04 800E8554 35080050 */ ori $t0, $t0, 0x50 @@ -352,7 +352,7 @@ glabel update_status_menu /* 81A68 800E85B8 8E220000 */ lw $v0, ($s1) /* 81A6C 800E85BC 30423000 */ andi $v0, $v0, 0x3000 /* 81A70 800E85C0 10400003 */ beqz $v0, .L800E85D0 -/* 81A74 800E85C4 00000000 */ nop +/* 81A74 800E85C4 00000000 */ nop /* 81A78 800E85C8 0803A177 */ j .L800E85DC /* 81A7C 800E85CC A6600038 */ sh $zero, 0x38($s3) .L800E85D0: @@ -383,8 +383,8 @@ glabel update_status_menu /* 81AD0 800E8620 3C07004D */ lui $a3, 0x4d /* 81AD4 800E8624 34E70370 */ ori $a3, $a3, 0x370 /* 81AD8 800E8628 0000202D */ daddu $a0, $zero, $zero -/* 81ADC 800E862C 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 81AE0 800E8630 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 81ADC 800E862C 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 81AE0 800E8630 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 81AE4 800E8634 24050005 */ addiu $a1, $zero, 5 /* 81AE8 800E8638 241200FF */ addiu $s2, $zero, 0xff /* 81AEC 800E863C 24110140 */ addiu $s1, $zero, 0x140 @@ -448,9 +448,9 @@ glabel update_status_menu /* 81BD4 800E8724 A262004C */ sb $v0, 0x4c($s3) /* 81BD8 800E8728 00021600 */ sll $v0, $v0, 0x18 /* 81BDC 800E872C 14400003 */ bnez $v0, .L800E873C -/* 81BE0 800E8730 00000000 */ nop +/* 81BE0 800E8730 00000000 */ nop /* 81BE4 800E8734 0C03A659 */ jal status_menu_stop_blinking_hp -/* 81BE8 800E8738 00000000 */ nop +/* 81BE8 800E8738 00000000 */ nop .L800E873C: /* 81BEC 800E873C 8262004A */ lb $v0, 0x4a($s3) /* 81BF0 800E8740 1040000C */ beqz $v0, .L800E8774 @@ -469,7 +469,7 @@ glabel update_status_menu /* 81C20 800E8770 A262004B */ sb $v0, 0x4b($s3) .L800E8774: /* 81C24 800E8774 12C0001D */ beqz $s6, .L800E87EC -/* 81C28 800E8778 00000000 */ nop +/* 81C28 800E8778 00000000 */ nop /* 81C2C 800E877C 8E720000 */ lw $s2, ($s3) /* 81C30 800E8780 86650034 */ lh $a1, 0x34($s3) /* 81C34 800E8784 86660036 */ lh $a2, 0x36($s3) @@ -506,9 +506,9 @@ glabel update_status_menu /* 81CAC 800E87FC A262004F */ sb $v0, 0x4f($s3) /* 81CB0 800E8800 00021600 */ sll $v0, $v0, 0x18 /* 81CB4 800E8804 14400003 */ bnez $v0, .L800E8814 -/* 81CB8 800E8808 00000000 */ nop +/* 81CB8 800E8808 00000000 */ nop /* 81CBC 800E880C 0C03A674 */ jal status_menu_stop_blinking_fp -/* 81CC0 800E8810 00000000 */ nop +/* 81CC0 800E8810 00000000 */ nop .L800E8814: /* 81CC4 800E8814 8262004D */ lb $v0, 0x4d($s3) /* 81CC8 800E8818 1040000C */ beqz $v0, .L800E884C @@ -527,7 +527,7 @@ glabel update_status_menu /* 81CF8 800E8848 A262004E */ sb $v0, 0x4e($s3) .L800E884C: /* 81CFC 800E884C 12C0001D */ beqz $s6, .L800E88C4 -/* 81D00 800E8850 00000000 */ nop +/* 81D00 800E8850 00000000 */ nop /* 81D04 800E8854 8E720008 */ lw $s2, 8($s3) /* 81D08 800E8858 86650034 */ lh $a1, 0x34($s3) /* 81D0C 800E885C 86660036 */ lh $a2, 0x36($s3) @@ -561,7 +561,7 @@ glabel update_status_menu /* 81D78 800E88C8 8042F299 */ lb $v0, %lo(gPlayerData+0x9)($v0) /* 81D7C 800E88CC 2842001B */ slti $v0, $v0, 0x1b /* 81D80 800E88D0 14400003 */ bnez $v0, .L800E88E0 -/* 81D84 800E88D4 00000000 */ nop +/* 81D84 800E88D4 00000000 */ nop /* 81D88 800E88D8 3C018011 */ lui $at, %hi(gPlayerData+0x10) /* 81D8C 800E88DC A020F2A0 */ sb $zero, %lo(gPlayerData+0x10)($at) .L800E88E0: @@ -581,7 +581,7 @@ glabel update_status_menu /* 81DC0 800E8910 A2620053 */ sb $v0, 0x53($s3) .L800E8914: /* 81DC4 800E8914 12C0001D */ beqz $s6, .L800E898C -/* 81DC8 800E8918 00000000 */ nop +/* 81DC8 800E8918 00000000 */ nop /* 81DCC 800E891C 8E720018 */ lw $s2, 0x18($s3) /* 81DD0 800E8920 86650034 */ lh $a1, 0x34($s3) /* 81DD4 800E8924 86660036 */ lh $a2, 0x36($s3) @@ -618,9 +618,9 @@ glabel update_status_menu /* 81E4C 800E899C A2620056 */ sb $v0, 0x56($s3) /* 81E50 800E89A0 00021600 */ sll $v0, $v0, 0x18 /* 81E54 800E89A4 14400003 */ bnez $v0, .L800E89B4 -/* 81E58 800E89A8 00000000 */ nop +/* 81E58 800E89A8 00000000 */ nop /* 81E5C 800E89AC 0C03A68E */ jal status_menu_stop_blinking_coins -/* 81E60 800E89B0 00000000 */ nop +/* 81E60 800E89B0 00000000 */ nop .L800E89B4: /* 81E64 800E89B4 82620054 */ lb $v0, 0x54($s3) /* 81E68 800E89B8 1040000C */ beqz $v0, .L800E89EC @@ -639,7 +639,7 @@ glabel update_status_menu /* 81E98 800E89E8 A2620055 */ sb $v0, 0x55($s3) .L800E89EC: /* 81E9C 800E89EC 12C0001C */ beqz $s6, .L800E8A60 -/* 81EA0 800E89F0 00000000 */ nop +/* 81EA0 800E89F0 00000000 */ nop /* 81EA4 800E89F4 8E720010 */ lw $s2, 0x10($s3) /* 81EA8 800E89F8 86650034 */ lh $a1, 0x34($s3) /* 81EAC 800E89FC 86660036 */ lh $a2, 0x36($s3) @@ -675,7 +675,7 @@ glabel update_status_menu /* 81F20 800E8A70 82630051 */ lb $v1, 0x51($s3) /* 81F24 800E8A74 28620006 */ slti $v0, $v1, 6 /* 81F28 800E8A78 14400005 */ bnez $v0, .L800E8A90 -/* 81F2C 800E8A7C 00000000 */ nop +/* 81F2C 800E8A7C 00000000 */ nop /* 81F30 800E8A80 28620009 */ slti $v0, $v1, 9 /* 81F34 800E8A84 50400002 */ beql $v0, $zero, .L800E8A90 /* 81F38 800E8A88 A2600051 */ sb $zero, 0x51($s3) @@ -710,7 +710,7 @@ glabel update_status_menu /* 81F9C 800E8AEC 82630057 */ lb $v1, 0x57($s3) /* 81FA0 800E8AF0 24020001 */ addiu $v0, $zero, 1 /* 81FA4 800E8AF4 1462002B */ bne $v1, $v0, .L800E8BA4 -/* 81FA8 800E8AF8 00000000 */ nop +/* 81FA8 800E8AF8 00000000 */ nop /* 81FAC 800E8AFC 3C038011 */ lui $v1, %hi(gPlayerData+0x290) /* 81FB0 800E8B00 8463F520 */ lh $v1, %lo(gPlayerData+0x290)($v1) /* 81FB4 800E8B04 04610002 */ bgez $v1, .L800E8B10 @@ -738,7 +738,7 @@ glabel update_status_menu /* 82004 800E8B54 00541021 */ addu $v0, $v0, $s4 /* 82008 800E8B58 00430018 */ mult $v0, $v1 /* 8200C 800E8B5C 44950000 */ mtc1 $s5, $f0 -/* 82010 800E8B60 00000000 */ nop +/* 82010 800E8B60 00000000 */ nop /* 82014 800E8B64 46800020 */ cvt.s.w $f0, $f0 /* 82018 800E8B68 000217C3 */ sra $v0, $v0, 0x1f /* 8201C 800E8B6C 44060000 */ mfc1 $a2, $f0 @@ -748,7 +748,7 @@ glabel update_status_menu /* 8202C 800E8B7C 00621823 */ subu $v1, $v1, $v0 /* 82030 800E8B80 03C31821 */ addu $v1, $fp, $v1 /* 82034 800E8B84 44830000 */ mtc1 $v1, $f0 -/* 82038 800E8B88 00000000 */ nop +/* 82038 800E8B88 00000000 */ nop /* 8203C 800E8B8C 46800020 */ cvt.s.w $f0, $f0 /* 82040 800E8B90 44050000 */ mfc1 $a1, $f0 /* 82044 800E8B94 0C03C32C */ jal func_800F0CB0 @@ -867,7 +867,7 @@ glabel update_status_menu /* 821D8 800E8D28 26100001 */ addiu $s0, $s0, 1 /* 821DC 800E8D2C 8FA90054 */ lw $t1, 0x54($sp) /* 821E0 800E8D30 112000B9 */ beqz $t1, .L800E9018 -/* 821E4 800E8D34 00000000 */ nop +/* 821E4 800E8D34 00000000 */ nop /* 821E8 800E8D38 26100001 */ addiu $s0, $s0, 1 .L800E8D3C: /* 821EC 800E8D3C 0240202D */ daddu $a0, $s2, $zero @@ -895,7 +895,7 @@ glabel update_status_menu /* 82244 800E8D94 26100001 */ addiu $s0, $s0, 1 /* 82248 800E8D98 8FA90054 */ lw $t1, 0x54($sp) /* 8224C 800E8D9C 1120009E */ beqz $t1, .L800E9018 -/* 82250 800E8DA0 00000000 */ nop +/* 82250 800E8DA0 00000000 */ nop /* 82254 800E8DA4 26100001 */ addiu $s0, $s0, 1 .L800E8DA8: /* 82258 800E8DA8 0240202D */ daddu $a0, $s2, $zero @@ -917,7 +917,7 @@ glabel update_status_menu /* 82298 800E8DE8 26100001 */ addiu $s0, $s0, 1 /* 8229C 800E8DEC 8FA90054 */ lw $t1, 0x54($sp) /* 822A0 800E8DF0 11200089 */ beqz $t1, .L800E9018 -/* 822A4 800E8DF4 00000000 */ nop +/* 822A4 800E8DF4 00000000 */ nop /* 822A8 800E8DF8 26100001 */ addiu $s0, $s0, 1 .L800E8DFC: /* 822AC 800E8DFC 0240202D */ daddu $a0, $s2, $zero @@ -939,7 +939,7 @@ glabel update_status_menu /* 822EC 800E8E3C 26100001 */ addiu $s0, $s0, 1 /* 822F0 800E8E40 8FA90054 */ lw $t1, 0x54($sp) /* 822F4 800E8E44 11200074 */ beqz $t1, .L800E9018 -/* 822F8 800E8E48 00000000 */ nop +/* 822F8 800E8E48 00000000 */ nop /* 822FC 800E8E4C 26100001 */ addiu $s0, $s0, 1 .L800E8E50: /* 82300 800E8E50 0240202D */ daddu $a0, $s2, $zero @@ -961,7 +961,7 @@ glabel update_status_menu /* 82340 800E8E90 26100001 */ addiu $s0, $s0, 1 /* 82344 800E8E94 8FA90054 */ lw $t1, 0x54($sp) /* 82348 800E8E98 1120005F */ beqz $t1, .L800E9018 -/* 8234C 800E8E9C 00000000 */ nop +/* 8234C 800E8E9C 00000000 */ nop /* 82350 800E8EA0 26100001 */ addiu $s0, $s0, 1 .L800E8EA4: /* 82354 800E8EA4 0240202D */ daddu $a0, $s2, $zero @@ -983,7 +983,7 @@ glabel update_status_menu /* 82394 800E8EE4 26100001 */ addiu $s0, $s0, 1 /* 82398 800E8EE8 8FA90054 */ lw $t1, 0x54($sp) /* 8239C 800E8EEC 1120004A */ beqz $t1, .L800E9018 -/* 823A0 800E8EF0 00000000 */ nop +/* 823A0 800E8EF0 00000000 */ nop /* 823A4 800E8EF4 26100001 */ addiu $s0, $s0, 1 .L800E8EF8: /* 823A8 800E8EF8 0240202D */ daddu $a0, $s2, $zero @@ -1005,7 +1005,7 @@ glabel update_status_menu /* 823E8 800E8F38 26100001 */ addiu $s0, $s0, 1 /* 823EC 800E8F3C 8FA90054 */ lw $t1, 0x54($sp) /* 823F0 800E8F40 11200035 */ beqz $t1, .L800E9018 -/* 823F4 800E8F44 00000000 */ nop +/* 823F4 800E8F44 00000000 */ nop /* 823F8 800E8F48 26100001 */ addiu $s0, $s0, 1 .L800E8F4C: /* 823FC 800E8F4C 0240202D */ daddu $a0, $s2, $zero @@ -1027,7 +1027,7 @@ glabel update_status_menu /* 8243C 800E8F8C 26100001 */ addiu $s0, $s0, 1 /* 82440 800E8F90 8FA90054 */ lw $t1, 0x54($sp) /* 82444 800E8F94 11200020 */ beqz $t1, .L800E9018 -/* 82448 800E8F98 00000000 */ nop +/* 82448 800E8F98 00000000 */ nop /* 8244C 800E8F9C 26100001 */ addiu $s0, $s0, 1 .L800E8FA0: /* 82450 800E8FA0 0240202D */ daddu $a0, $s2, $zero @@ -1059,7 +1059,7 @@ glabel update_status_menu /* 824B8 800E9008 0214102A */ slt $v0, $s0, $s4 /* 824BC 800E900C 8FA90054 */ lw $t1, 0x54($sp) /* 824C0 800E9010 1520FF41 */ bnez $t1, .L800E8D18 -/* 824C4 800E9014 00000000 */ nop +/* 824C4 800E9014 00000000 */ nop .L800E9018: /* 824C8 800E9018 3C16800F */ lui $s6, %hi(D_800F7FE8) /* 824CC 800E901C 26D67FE8 */ addiu $s6, $s6, %lo(D_800F7FE8) @@ -1075,7 +1075,7 @@ glabel update_status_menu .L800E9044: /* 824F4 800E9044 0214102A */ slt $v0, $s0, $s4 /* 824F8 800E9048 10400093 */ beqz $v0, .L800E9298 -/* 824FC 800E904C 00000000 */ nop +/* 824FC 800E904C 00000000 */ nop /* 82500 800E9050 16200012 */ bnez $s1, .L800E909C /* 82504 800E9054 24020001 */ addiu $v0, $zero, 1 /* 82508 800E9058 26100001 */ addiu $s0, $s0, 1 @@ -1232,9 +1232,9 @@ glabel update_status_menu /* 82744 800E9294 26730014 */ addiu $s3, $s3, 0x14 .L800E9298: /* 82748 800E9298 0C03C360 */ jal func_800F0D80 -/* 8274C 800E929C 00000000 */ nop +/* 8274C 800E929C 00000000 */ nop /* 82750 800E92A0 0C03C40B */ jal func_800F102C -/* 82754 800E92A4 00000000 */ nop +/* 82754 800E92A4 00000000 */ nop .L800E92A8: /* 82758 800E92A8 8FBF008C */ lw $ra, 0x8c($sp) /* 8275C 800E92AC 8FBE0088 */ lw $fp, 0x88($sp) diff --git a/asm/nonmatchings/code_8560/render_frame.s b/asm/nonmatchings/code_8560/render_frame.s index 73773e36f6..a92a3e3806 100644 --- a/asm/nonmatchings/code_8560/render_frame.s +++ b/asm/nonmatchings/code_8560/render_frame.s @@ -21,7 +21,7 @@ glabel render_frame /* 8B7C 8002D77C 3C01800A */ lui $at, %hi(D_8009A634) /* 8B80 8002D780 A420A634 */ sh $zero, %lo(D_8009A634)($at) /* 8B84 8002D784 0C0459A6 */ jal func_80116698 -/* 8B88 8002D788 00000000 */ nop +/* 8B88 8002D788 00000000 */ nop .L8002D78C: /* 8B8C 8002D78C 8FAB0070 */ lw $t3, 0x70($sp) /* 8B90 8002D790 11600003 */ beqz $t3, .L8002D7A0 @@ -39,8 +39,8 @@ glabel render_frame /* 8BBC 8002D7BC 0162102A */ slt $v0, $t3, $v0 /* 8BC0 8002D7C0 104001BD */ beqz $v0, .L8002DEB8 /* 8BC4 8002D7C4 000B1880 */ sll $v1, $t3, 2 -/* 8BC8 8002D7C8 3C17800A */ lui $s7, %hi(D_8009A66C) -/* 8BCC 8002D7CC 26F7A66C */ addiu $s7, $s7, %lo(D_8009A66C) +/* 8BC8 8002D7C8 3C17800A */ lui $s7, %hi(gMasterGfxPos) +/* 8BCC 8002D7CC 26F7A66C */ addiu $s7, $s7, %lo(gMasterGfxPos) /* 8BD0 8002D7D0 3C02800B */ lui $v0, %hi(gCameras) /* 8BD4 8002D7D4 24421D80 */ addiu $v0, $v0, %lo(gCameras) /* 8BD8 8002D7D8 006B1821 */ addu $v1, $v1, $t3 @@ -60,7 +60,7 @@ glabel render_frame /* 8C0C 8002D80C 104001A0 */ beqz $v0, .L8002DE90 /* 8C10 8002D810 30420082 */ andi $v0, $v0, 0x82 /* 8C14 8002D814 1440019E */ bnez $v0, .L8002DE90 -/* 8C18 8002D818 00000000 */ nop +/* 8C18 8002D818 00000000 */ nop /* 8C1C 8002D81C 8EC201FC */ lw $v0, 0x1fc($s6) /* 8C20 8002D820 97AB0022 */ lhu $t3, 0x22($sp) /* 8C24 8002D824 3C01800A */ lui $at, %hi(D_8009A634) @@ -207,20 +207,20 @@ glabel render_frame /* 8E34 8002DA34 AEE20000 */ sw $v0, ($s7) /* 8E38 8002DA38 26A20068 */ addiu $v0, $s5, 0x68 /* 8E3C 8002DA3C 44981000 */ mtc1 $t8, $f2 -/* 8E40 8002DA40 00000000 */ nop +/* 8E40 8002DA40 00000000 */ nop /* 8E44 8002DA44 468010A0 */ cvt.s.w $f2, $f2 /* 8E48 8002DA48 46161082 */ mul.s $f2, $f2, $f22 -/* 8E4C 8002DA4C 00000000 */ nop +/* 8E4C 8002DA4C 00000000 */ nop /* 8E50 8002DA50 AEAA0058 */ sw $t2, 0x58($s5) /* 8E54 8002DA54 AEA9005C */ sw $t1, 0x5c($s5) /* 8E58 8002DA58 AEE20000 */ sw $v0, ($s7) /* 8E5C 8002DA5C 26A20070 */ addiu $v0, $s5, 0x70 /* 8E60 8002DA60 44990000 */ mtc1 $t9, $f0 -/* 8E64 8002DA64 00000000 */ nop +/* 8E64 8002DA64 00000000 */ nop /* 8E68 8002DA68 46800020 */ cvt.s.w $f0, $f0 /* 8E6C 8002DA6C 8FAB0028 */ lw $t3, 0x28($sp) /* 8E70 8002DA70 46160002 */ mul.s $f0, $f0, $f22 -/* 8E74 8002DA74 00000000 */ nop +/* 8E74 8002DA74 00000000 */ nop /* 8E78 8002DA78 AEAB0060 */ sw $t3, 0x60($s5) /* 8E7C 8002DA7C AEA00064 */ sw $zero, 0x64($s5) /* 8E80 8002DA80 AEE20000 */ sw $v0, ($s7) @@ -233,33 +233,33 @@ glabel render_frame /* 8E9C 8002DA9C AEAE0074 */ sw $t6, 0x74($s5) /* 8EA0 8002DAA0 4600110D */ trunc.w.s $f4, $f2 /* 8EA4 8002DAA4 44042000 */ mfc1 $a0, $f4 -/* 8EA8 8002DAA8 00000000 */ nop +/* 8EA8 8002DAA8 00000000 */ nop /* 8EAC 8002DAAC 30840FFF */ andi $a0, $a0, 0xfff /* 8EB0 8002DAB0 00042300 */ sll $a0, $a0, 0xc /* 8EB4 8002DAB4 4600010D */ trunc.w.s $f4, $f0 /* 8EB8 8002DAB8 44032000 */ mfc1 $v1, $f4 /* 8EBC 8002DABC 449E1000 */ mtc1 $fp, $f2 -/* 8EC0 8002DAC0 00000000 */ nop +/* 8EC0 8002DAC0 00000000 */ nop /* 8EC4 8002DAC4 468010A0 */ cvt.s.w $f2, $f2 /* 8EC8 8002DAC8 46161082 */ mul.s $f2, $f2, $f22 -/* 8ECC 8002DACC 00000000 */ nop +/* 8ECC 8002DACC 00000000 */ nop /* 8ED0 8002DAD0 30630FFF */ andi $v1, $v1, 0xfff /* 8ED4 8002DAD4 00621825 */ or $v1, $v1, $v0 /* 8ED8 8002DAD8 00832025 */ or $a0, $a0, $v1 /* 8EDC 8002DADC 44940000 */ mtc1 $s4, $f0 -/* 8EE0 8002DAE0 00000000 */ nop +/* 8EE0 8002DAE0 00000000 */ nop /* 8EE4 8002DAE4 46800020 */ cvt.s.w $f0, $f0 /* 8EE8 8002DAE8 46160002 */ mul.s $f0, $f0, $f22 -/* 8EEC 8002DAEC 00000000 */ nop +/* 8EEC 8002DAEC 00000000 */ nop /* 8EF0 8002DAF0 AEA40020 */ sw $a0, 0x20($s5) /* 8EF4 8002DAF4 4600110D */ trunc.w.s $f4, $f2 /* 8EF8 8002DAF8 44032000 */ mfc1 $v1, $f4 -/* 8EFC 8002DAFC 00000000 */ nop +/* 8EFC 8002DAFC 00000000 */ nop /* 8F00 8002DB00 30630FFF */ andi $v1, $v1, 0xfff /* 8F04 8002DB04 00031B00 */ sll $v1, $v1, 0xc /* 8F08 8002DB08 4600010D */ trunc.w.s $f4, $f0 /* 8F0C 8002DB0C 44022000 */ mfc1 $v0, $f4 -/* 8F10 8002DB10 00000000 */ nop +/* 8F10 8002DB10 00000000 */ nop /* 8F14 8002DB14 30420FFF */ andi $v0, $v0, 0xfff /* 8F18 8002DB18 00621825 */ or $v1, $v1, $v0 /* 8F1C 8002DB1C 26A20080 */ addiu $v0, $s5, 0x80 @@ -317,8 +317,8 @@ glabel render_frame /* 8FE8 8002DBE8 26C400D4 */ addiu $a0, $s6, 0xd4 /* 8FEC 8002DBEC 3C05800A */ lui $a1, %hi(D_8009A634) /* 8FF0 8002DBF0 84A5A634 */ lh $a1, %lo(D_8009A634)($a1) -/* 8FF4 8002DBF4 3C02800A */ lui $v0, %hi(D_8009A674) -/* 8FF8 8002DBF8 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 8FF4 8002DBF4 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 8FF8 8002DBF8 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 8FFC 8002DBFC 00052980 */ sll $a1, $a1, 6 /* 9000 8002DC00 24A50030 */ addiu $a1, $a1, 0x30 /* 9004 8002DC04 0C019D40 */ jal guMtxF2L @@ -332,8 +332,8 @@ glabel render_frame /* 9024 8002DC24 24420008 */ addiu $v0, $v0, 8 /* 9028 8002DC28 00031980 */ sll $v1, $v1, 6 /* 902C 8002DC2C AEE20000 */ sw $v0, ($s7) -/* 9030 8002DC30 3C02800A */ lui $v0, %hi(D_8009A674) -/* 9034 8002DC34 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 9030 8002DC30 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 9034 8002DC34 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 9038 8002DC38 24630030 */ addiu $v1, $v1, 0x30 /* 903C 8002DC3C AC850000 */ sw $a1, ($a0) /* 9040 8002DC40 00431021 */ addu $v0, $v0, $v1 @@ -341,13 +341,13 @@ glabel render_frame /* 9048 8002DC48 3C0A0001 */ lui $t2, 1 .L8002DC4C: /* 904C 8002DC4C 354A1630 */ ori $t2, $t2, 0x1630 -/* 9050 8002DC50 3C098007 */ lui $t1, %hi(D_800741F0) -/* 9054 8002DC54 252941F0 */ addiu $t1, $t1, %lo(D_800741F0) +/* 9050 8002DC50 3C098007 */ lui $t1, %hi(gMatrixListPos) +/* 9054 8002DC54 252941F0 */ addiu $t1, $t1, %lo(gMatrixListPos) /* 9058 8002DC58 4406A000 */ mfc1 $a2, $f20 /* 905C 8002DC5C 95280000 */ lhu $t0, ($t1) /* 9060 8002DC60 4407C000 */ mfc1 $a3, $f24 -/* 9064 8002DC64 3C03800A */ lui $v1, %hi(D_8009A674) -/* 9068 8002DC68 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 9064 8002DC64 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 9068 8002DC68 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 906C 8002DC6C C6C00084 */ lwc1 $f0, 0x84($s6) /* 9070 8002DC70 3104FFFF */ andi $a0, $t0, 0xffff /* 9074 8002DC74 00042180 */ sll $a0, $a0, 6 @@ -387,31 +387,31 @@ glabel render_frame /* 90FC 8002DCFC 10620019 */ beq $v1, $v0, .L8002DD64 /* 9100 8002DD00 30820200 */ andi $v0, $a0, 0x200 /* 9104 8002DD04 14400003 */ bnez $v0, .L8002DD14 -/* 9108 8002DD08 00000000 */ nop +/* 9108 8002DD08 00000000 */ nop /* 910C 8002DD0C 0C043FAD */ jal render_entities -/* 9110 8002DD10 00000000 */ nop +/* 9110 8002DD10 00000000 */ nop .L8002DD14: /* 9114 8002DD14 96C20000 */ lhu $v0, ($s6) /* 9118 8002DD18 30420400 */ andi $v0, $v0, 0x400 /* 911C 8002DD1C 14400003 */ bnez $v0, .L8002DD2C -/* 9120 8002DD20 00000000 */ nop +/* 9120 8002DD20 00000000 */ nop /* 9124 8002DD24 0C045AE4 */ jal render_models -/* 9128 8002DD28 00000000 */ nop +/* 9128 8002DD28 00000000 */ nop .L8002DD2C: /* 912C 8002DD2C 0C03844E */ jal render_player -/* 9130 8002DD30 00000000 */ nop +/* 9130 8002DD30 00000000 */ nop /* 9134 8002DD34 0C00E9FC */ jal render_npcs -/* 9138 8002DD38 00000000 */ nop +/* 9138 8002DD38 00000000 */ nop /* 913C 8002DD3C 0C048D1C */ jal render_dynamic_entities -/* 9140 8002DD40 00000000 */ nop +/* 9140 8002DD40 00000000 */ nop /* 9144 8002DD44 0C0167BD */ jal render_effects -/* 9148 8002DD48 00000000 */ nop +/* 9148 8002DD48 00000000 */ nop /* 914C 8002DD4C 0C04766E */ jal func_8011D9B8 -/* 9150 8002DD50 00000000 */ nop +/* 9150 8002DD50 00000000 */ nop /* 9154 8002DD54 0C050DAD */ jal render_menu_icons -/* 9158 8002DD58 00000000 */ nop +/* 9158 8002DD58 00000000 */ nop /* 915C 8002DD5C 0800B788 */ j .L8002DE20 -/* 9160 8002DD60 00000000 */ nop +/* 9160 8002DD60 00000000 */ nop .L8002DD64: /* 9164 8002DD64 26D000D4 */ addiu $s0, $s6, 0xd4 /* 9168 8002DD68 4405A000 */ mfc1 $a1, $f20 @@ -430,8 +430,8 @@ glabel render_frame /* 919C 8002DD9C 0200202D */ daddu $a0, $s0, $zero /* 91A0 8002DDA0 3C05800A */ lui $a1, %hi(D_8009A634) /* 91A4 8002DDA4 84A5A634 */ lh $a1, %lo(D_8009A634)($a1) -/* 91A8 8002DDA8 3C02800A */ lui $v0, %hi(D_8009A674) -/* 91AC 8002DDAC 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 91A8 8002DDA8 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 91AC 8002DDAC 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 91B0 8002DDB0 00052980 */ sll $a1, $a1, 6 /* 91B4 8002DDB4 24A50030 */ addiu $a1, $a1, 0x30 /* 91B8 8002DDB8 0C019D40 */ jal guMtxF2L @@ -445,22 +445,22 @@ glabel render_frame /* 91D8 8002DDD8 24420008 */ addiu $v0, $v0, 8 /* 91DC 8002DDDC 00031980 */ sll $v1, $v1, 6 /* 91E0 8002DDE0 AEE20000 */ sw $v0, ($s7) -/* 91E4 8002DDE4 3C02800A */ lui $v0, %hi(D_8009A674) -/* 91E8 8002DDE8 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* 91E4 8002DDE4 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 91E8 8002DDE8 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* 91EC 8002DDEC 24630030 */ addiu $v1, $v1, 0x30 /* 91F0 8002DDF0 AC850000 */ sw $a1, ($a0) /* 91F4 8002DDF4 00431021 */ addu $v0, $v0, $v1 /* 91F8 8002DDF8 0C050DAD */ jal render_menu_icons /* 91FC 8002DDFC AC820004 */ sw $v0, 4($a0) /* 9200 8002DE00 0C04CB95 */ jal render_item_entities -/* 9204 8002DE04 00000000 */ nop +/* 9204 8002DE04 00000000 */ nop /* 9208 8002DE08 0800B788 */ j .L8002DE20 -/* 920C 8002DE0C 00000000 */ nop +/* 920C 8002DE0C 00000000 */ nop .L8002DE10: /* 9210 8002DE10 0C048D1C */ jal render_dynamic_entities -/* 9214 8002DE14 00000000 */ nop +/* 9214 8002DE14 00000000 */ nop /* 9218 8002DE18 0C04766E */ jal func_8011D9B8 -/* 921C 8002DE1C 00000000 */ nop +/* 921C 8002DE1C 00000000 */ nop .L8002DE20: /* 9220 8002DE20 8EC20200 */ lw $v0, 0x200($s6) /* 9224 8002DE24 10400004 */ beqz $v0, .L8002DE38 diff --git a/asm/nonmatchings/code_8560/update_cameras.s b/asm/nonmatchings/code_8560/update_cameras.s index 7c694853e8..70abac3647 100644 --- a/asm/nonmatchings/code_8560/update_cameras.s +++ b/asm/nonmatchings/code_8560/update_cameras.s @@ -40,38 +40,38 @@ glabel update_cameras /* 8888 8002D488 00220821 */ addu $at, $at, $v0 /* 888C 8002D48C 8C2281E0 */ lw $v0, %lo(D_800981E0)($at) /* 8890 8002D490 00400008 */ jr $v0 -/* 8894 8002D494 00000000 */ nop +/* 8894 8002D494 00000000 */ nop /* 8898 8002D498 0C00C525 */ jal do_camera_type_3 /* 889C 8002D49C 0200202D */ daddu $a0, $s0, $zero /* 88A0 8002D4A0 0800B540 */ j .L8002D500 -/* 88A4 8002D4A4 00000000 */ nop +/* 88A4 8002D4A4 00000000 */ nop /* 88A8 8002D4A8 0C00BE14 */ jal do_camera_type_0 /* 88AC 8002D4AC 0200202D */ daddu $a0, $s0, $zero /* 88B0 8002D4B0 0800B540 */ j .L8002D500 -/* 88B4 8002D4B4 00000000 */ nop +/* 88B4 8002D4B4 00000000 */ nop /* 88B8 8002D4B8 0C00BCA4 */ jal do_camera_type_1 /* 88BC 8002D4BC 0200202D */ daddu $a0, $s0, $zero /* 88C0 8002D4C0 0800B540 */ j .L8002D500 -/* 88C4 8002D4C4 00000000 */ nop +/* 88C4 8002D4C4 00000000 */ nop /* 88C8 8002D4C8 0C00BB3E */ jal do_camera_type_2 /* 88CC 8002D4CC 0200202D */ daddu $a0, $s0, $zero /* 88D0 8002D4D0 0800B540 */ j .L8002D500 -/* 88D4 8002D4D4 00000000 */ nop +/* 88D4 8002D4D4 00000000 */ nop /* 88D8 8002D4D8 0C00BA44 */ jal do_camera_type_4 /* 88DC 8002D4DC 0200202D */ daddu $a0, $s0, $zero /* 88E0 8002D4E0 0800B540 */ j .L8002D500 -/* 88E4 8002D4E4 00000000 */ nop +/* 88E4 8002D4E4 00000000 */ nop /* 88E8 8002D4E8 0C00C000 */ jal do_camera_type_5 /* 88EC 8002D4EC 0200202D */ daddu $a0, $s0, $zero /* 88F0 8002D4F0 0800B540 */ j .L8002D500 -/* 88F4 8002D4F4 00000000 */ nop +/* 88F4 8002D4F4 00000000 */ nop .L8002D4F8: /* 88F8 8002D4F8 0C00BE64 */ jal do_camera_type_6 /* 88FC 8002D4FC 0200202D */ daddu $a0, $s0, $zero .L8002D500: /* 8900 8002D500 C6000044 */ lwc1 $f0, 0x44($s0) -/* 8904 8002D504 3C05800A */ lui $a1, %hi(D_8009A674) -/* 8908 8002D508 8CA5A674 */ lw $a1, %lo(D_8009A674)($a1) +/* 8904 8002D504 3C05800A */ lui $a1, %hi(gDisplayContext) +/* 8908 8002D508 8CA5A674 */ lw $a1, %lo(gDisplayContext)($a1) /* 890C 8002D50C E7A00010 */ swc1 $f0, 0x10($sp) /* 8910 8002D510 C6000048 */ lwc1 $f0, 0x48($s0) /* 8914 8002D514 E7A00014 */ swc1 $f0, 0x14($sp) @@ -103,20 +103,20 @@ glabel update_cameras /* 8978 8002D578 86020012 */ lh $v0, 0x12($s0) /* 897C 8002D57C 8603000C */ lh $v1, 0xc($s0) /* 8980 8002D580 44820000 */ mtc1 $v0, $f0 -/* 8984 8002D584 00000000 */ nop +/* 8984 8002D584 00000000 */ nop /* 8988 8002D588 46800020 */ cvt.s.w $f0, $f0 /* 898C 8002D58C E7A00010 */ swc1 $f0, 0x10($sp) /* 8990 8002D590 86020014 */ lh $v0, 0x14($s0) /* 8994 8002D594 44871000 */ mtc1 $a3, $f2 -/* 8998 8002D598 00000000 */ nop +/* 8998 8002D598 00000000 */ nop /* 899C 8002D59C 468010A0 */ cvt.s.w $f2, $f2 /* 89A0 8002D5A0 E7B60018 */ swc1 $f22, 0x18($sp) /* 89A4 8002D5A4 44820000 */ mtc1 $v0, $f0 -/* 89A8 8002D5A8 00000000 */ nop +/* 89A8 8002D5A8 00000000 */ nop /* 89AC 8002D5AC 46800020 */ cvt.s.w $f0, $f0 /* 89B0 8002D5B0 E7A00014 */ swc1 $f0, 0x14($sp) /* 89B4 8002D5B4 44830000 */ mtc1 $v1, $f0 -/* 89B8 8002D5B8 00000000 */ nop +/* 89B8 8002D5B8 00000000 */ nop /* 89BC 8002D5BC 46800020 */ cvt.s.w $f0, $f0 /* 89C0 8002D5C0 46001083 */ div.s $f2, $f2, $f0 /* 89C4 8002D5C4 8E060018 */ lw $a2, 0x18($s0) @@ -148,23 +148,23 @@ glabel update_cameras .L8002D624: /* 8A24 8002D624 8602000A */ lh $v0, 0xa($s0) /* 8A28 8002D628 44822000 */ mtc1 $v0, $f4 -/* 8A2C 8002D62C 00000000 */ nop +/* 8A2C 8002D62C 00000000 */ nop /* 8A30 8002D630 46802120 */ cvt.s.w $f4, $f4 /* 8A34 8002D634 46002187 */ neg.s $f6, $f4 /* 8A38 8002D638 460031A1 */ cvt.d.s $f6, $f6 /* 8A3C 8002D63C 46343182 */ mul.d $f6, $f6, $f20 -/* 8A40 8002D640 00000000 */ nop +/* 8A40 8002D640 00000000 */ nop /* 8A44 8002D644 46002121 */ cvt.d.s $f4, $f4 /* 8A48 8002D648 46342102 */ mul.d $f4, $f4, $f20 -/* 8A4C 8002D64C 00000000 */ nop +/* 8A4C 8002D64C 00000000 */ nop /* 8A50 8002D650 8602000C */ lh $v0, 0xc($s0) /* 8A54 8002D654 44820000 */ mtc1 $v0, $f0 -/* 8A58 8002D658 00000000 */ nop +/* 8A58 8002D658 00000000 */ nop /* 8A5C 8002D65C 46800020 */ cvt.s.w $f0, $f0 /* 8A60 8002D660 46000087 */ neg.s $f2, $f0 /* 8A64 8002D664 460010A1 */ cvt.d.s $f2, $f2 /* 8A68 8002D668 46341082 */ mul.d $f2, $f2, $f20 -/* 8A6C 8002D66C 00000000 */ nop +/* 8A6C 8002D66C 00000000 */ nop /* 8A70 8002D670 3C01C47A */ lui $at, 0xc47a /* 8A74 8002D674 44814000 */ mtc1 $at, $f8 /* 8A78 8002D678 3C01447A */ lui $at, 0x447a @@ -173,7 +173,7 @@ glabel update_cameras /* 8A84 8002D684 E7A80014 */ swc1 $f8, 0x14($sp) /* 8A88 8002D688 46000021 */ cvt.d.s $f0, $f0 /* 8A8C 8002D68C 46340002 */ mul.d $f0, $f0, $f20 -/* 8A90 8002D690 00000000 */ nop +/* 8A90 8002D690 00000000 */ nop /* 8A94 8002D694 E7AA0018 */ swc1 $f10, 0x18($sp) /* 8A98 8002D698 462031A0 */ cvt.s.d $f6, $f6 /* 8A9C 8002D69C 46202120 */ cvt.s.d $f4, $f4 diff --git a/asm/nonmatchings/code_8a160_len_700/func_800F102C.s b/asm/nonmatchings/code_8a160_len_700/func_800F102C.s index f1d02c1ace..068038ff45 100644 --- a/asm/nonmatchings/code_8a160_len_700/func_800F102C.s +++ b/asm/nonmatchings/code_8a160_len_700/func_800F102C.s @@ -15,12 +15,12 @@ glabel func_800F102C /* 8A504 800F1054 0000B82D */ daddu $s7, $zero, $zero /* 8A508 800F1058 AFB600B8 */ sw $s6, 0xb8($sp) /* 8A50C 800F105C 27B60060 */ addiu $s6, $sp, 0x60 -/* 8A510 800F1060 3C02800A */ lui $v0, %hi(D_8009A674) -/* 8A514 800F1064 2442A674 */ addiu $v0, $v0, %lo(D_8009A674) +/* 8A510 800F1060 3C02800A */ lui $v0, %hi(gDisplayContext) +/* 8A514 800F1064 2442A674 */ addiu $v0, $v0, %lo(gDisplayContext) /* 8A518 800F1068 AFBE00C0 */ sw $fp, 0xc0($sp) /* 8A51C 800F106C 0040F02D */ daddu $fp, $v0, $zero -/* 8A520 800F1070 3C028007 */ lui $v0, %hi(D_800741F0) -/* 8A524 800F1074 244241F0 */ addiu $v0, $v0, %lo(D_800741F0) +/* 8A520 800F1070 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* 8A524 800F1074 244241F0 */ addiu $v0, $v0, %lo(gMatrixListPos) /* 8A528 800F1078 AFB300AC */ sw $s3, 0xac($sp) /* 8A52C 800F107C 0040982D */ daddu $s3, $v0, $zero /* 8A530 800F1080 AFB500B4 */ sw $s5, 0xb4($sp) @@ -29,8 +29,8 @@ glabel func_800F102C /* 8A53C 800F108C AFB400B0 */ sw $s4, 0xb0($sp) /* 8A540 800F1090 02E0A02D */ daddu $s4, $s7, $zero /* 8A544 800F1094 AFB000A0 */ sw $s0, 0xa0($sp) -/* 8A548 800F1098 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 8A54C 800F109C 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 8A548 800F1098 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 8A54C 800F109C 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 8A550 800F10A0 3C02E700 */ lui $v0, 0xe700 /* 8A554 800F10A4 AFBF00C4 */ sw $ra, 0xc4($sp) /* 8A558 800F10A8 AFB200A8 */ sw $s2, 0xa8($sp) @@ -120,8 +120,8 @@ glabel func_800F102C /* 8A6A4 800F11F4 26F70001 */ addiu $s7, $s7, 1 /* 8A6A8 800F11F8 C4740018 */ lwc1 $f20, 0x18($v1) /* 8A6AC 800F11FC 24120001 */ addiu $s2, $zero, 1 -/* 8A6B0 800F1200 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 8A6B4 800F1204 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 8A6B0 800F1200 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 8A6B4 800F1204 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 8A6B8 800F1208 24700022 */ addiu $s0, $v1, 0x22 .L800F120C: /* 8A6BC 800F120C 82020001 */ lb $v0, 1($s0) @@ -134,12 +134,12 @@ glabel func_800F102C /* 8A6D8 800F1228 4406B000 */ mfc1 $a2, $f22 /* 8A6DC 800F122C 94430134 */ lhu $v1, 0x134($v0) /* 8A6E0 800F1230 46140002 */ mul.s $f0, $f0, $f20 -/* 8A6E4 800F1234 00000000 */ nop +/* 8A6E4 800F1234 00000000 */ nop /* 8A6E8 800F1238 00031080 */ sll $v0, $v1, 2 /* 8A6EC 800F123C 00431021 */ addu $v0, $v0, $v1 /* 8A6F0 800F1240 00021040 */ sll $v0, $v0, 1 /* 8A6F4 800F1244 44823000 */ mtc1 $v0, $f6 -/* 8A6F8 800F1248 00000000 */ nop +/* 8A6F8 800F1248 00000000 */ nop /* 8A6FC 800F124C 468031A0 */ cvt.s.w $f6, $f6 /* 8A700 800F1250 44073000 */ mfc1 $a3, $f6 /* 8A704 800F1254 E7A00010 */ swc1 $f0, 0x10($sp) @@ -228,6 +228,6 @@ glabel func_800F102C /* 8A848 800F1398 D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 8A84C 800F139C 03E00008 */ jr $ra /* 8A850 800F13A0 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 8A854 800F13A4 00000000 */ nop -/* 8A858 800F13A8 00000000 */ nop -/* 8A85C 800F13AC 00000000 */ nop +/* 8A854 800F13A4 00000000 */ nop +/* 8A858 800F13A8 00000000 */ nop +/* 8A85C 800F13AC 00000000 */ nop diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s index 35dc7b81ea..eb9b0634a4 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s @@ -30,28 +30,28 @@ glabel func_800F3680 /* 8CB94 800F36E4 104003CC */ beqz $v0, .L800F4618 /* 8CB98 800F36E8 2862FFF8 */ slti $v0, $v1, -8 /* 8CB9C 800F36EC 0803CDCC */ j .L800F3730 -/* 8CBA0 800F36F0 00000000 */ nop +/* 8CBA0 800F36F0 00000000 */ nop .L800F36F4: /* 8CBA4 800F36F4 10620010 */ beq $v1, $v0, .L800F3738 -/* 8CBA8 800F36F8 00000000 */ nop +/* 8CBA8 800F36F8 00000000 */ nop /* 8CBAC 800F36FC 0803D186 */ j .L800F4618 -/* 8CBB0 800F3700 00000000 */ nop +/* 8CBB0 800F3700 00000000 */ nop .L800F3704: /* 8CBB4 800F3704 10400007 */ beqz $v0, .L800F3724 /* 8CBB8 800F3708 2862001E */ slti $v0, $v1, 0x1e /* 8CBBC 800F370C 1040000A */ beqz $v0, .L800F3738 /* 8CBC0 800F3710 24020014 */ addiu $v0, $zero, 0x14 /* 8CBC4 800F3714 10620008 */ beq $v1, $v0, .L800F3738 -/* 8CBC8 800F3718 00000000 */ nop +/* 8CBC8 800F3718 00000000 */ nop /* 8CBCC 800F371C 0803D186 */ j .L800F4618 -/* 8CBD0 800F3720 00000000 */ nop +/* 8CBD0 800F3720 00000000 */ nop .L800F3724: /* 8CBD4 800F3724 2862006A */ slti $v0, $v1, 0x6a /* 8CBD8 800F3728 104003BB */ beqz $v0, .L800F4618 /* 8CBDC 800F372C 28620064 */ slti $v0, $v1, 0x64 .L800F3730: /* 8CBE0 800F3730 144003B9 */ bnez $v0, .L800F4618 -/* 8CBE4 800F3734 00000000 */ nop +/* 8CBE4 800F3734 00000000 */ nop .L800F3738: /* 8CBE8 800F3738 8FAA005C */ lw $t2, 0x5c($sp) /* 8CBEC 800F373C 8FAB0060 */ lw $t3, 0x60($sp) @@ -75,14 +75,14 @@ glabel func_800F3680 /* 8CC34 800F3784 44811800 */ mtc1 $at, $f3 /* 8CC38 800F3788 44801000 */ mtc1 $zero, $f2 /* 8CC3C 800F378C 44840000 */ mtc1 $a0, $f0 -/* 8CC40 800F3790 00000000 */ nop +/* 8CC40 800F3790 00000000 */ nop /* 8CC44 800F3794 46800021 */ cvt.d.w $f0, $f0 /* 8CC48 800F3798 46220002 */ mul.d $f0, $f0, $f2 -/* 8CC4C 800F379C 00000000 */ nop +/* 8CC4C 800F379C 00000000 */ nop /* 8CC50 800F37A0 4620018D */ trunc.w.d $f6, $f0 /* 8CC54 800F37A4 44043000 */ mfc1 $a0, $f6 /* 8CC58 800F37A8 0803CDF8 */ j .L800F37E0 -/* 8CC5C 800F37AC 00000000 */ nop +/* 8CC5C 800F37AC 00000000 */ nop .L800F37B0: /* 8CC60 800F37B0 3C031B4E */ lui $v1, 0x1b4e /* 8CC64 800F37B4 346381B5 */ ori $v1, $v1, 0x81b5 @@ -135,98 +135,98 @@ glabel func_800F3680 /* 8CD18 800F3868 00220821 */ addu $at, $at, $v0 /* 8CD1C 800F386C 8C22C790 */ lw $v0, %lo(D_8010C790)($at) /* 8CD20 800F3870 00400008 */ jr $v0 -/* 8CD24 800F3874 00000000 */ nop -/* 8CD28 800F3878 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 8CD2C 800F387C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 8CD24 800F3874 00000000 */ nop +/* 8CD28 800F3878 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 8CD2C 800F387C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 8CD30 800F3880 C7A20020 */ lwc1 $f2, 0x20($sp) /* 8CD34 800F3884 468010A0 */ cvt.s.w $f2, $f2 /* 8CD38 800F3888 44910000 */ mtc1 $s1, $f0 -/* 8CD3C 800F388C 00000000 */ nop +/* 8CD3C 800F388C 00000000 */ nop /* 8CD40 800F3890 46800020 */ cvt.s.w $f0, $f0 /* 8CD44 800F3894 3C014080 */ lui $at, 0x4080 /* 8CD48 800F3898 44812000 */ mtc1 $at, $f4 /* 8CD4C 800F389C 8C620000 */ lw $v0, ($v1) /* 8CD50 800F38A0 46041082 */ mul.s $f2, $f2, $f4 -/* 8CD54 800F38A4 00000000 */ nop +/* 8CD54 800F38A4 00000000 */ nop /* 8CD58 800F38A8 0040282D */ daddu $a1, $v0, $zero /* 8CD5C 800F38AC 24420008 */ addiu $v0, $v0, 8 /* 8CD60 800F38B0 AC620000 */ sw $v0, ($v1) /* 8CD64 800F38B4 8FAB0020 */ lw $t3, 0x20($sp) /* 8CD68 800F38B8 46040002 */ mul.s $f0, $f0, $f4 -/* 8CD6C 800F38BC 00000000 */ nop +/* 8CD6C 800F38BC 00000000 */ nop /* 8CD70 800F38C0 0803CE59 */ j .L800F3964 /* 8CD74 800F38C4 25620070 */ addiu $v0, $t3, 0x70 -/* 8CD78 800F38C8 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 8CD7C 800F38CC 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 8CD78 800F38C8 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 8CD7C 800F38CC 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 8CD80 800F38D0 C7A20020 */ lwc1 $f2, 0x20($sp) /* 8CD84 800F38D4 468010A0 */ cvt.s.w $f2, $f2 /* 8CD88 800F38D8 44910000 */ mtc1 $s1, $f0 -/* 8CD8C 800F38DC 00000000 */ nop +/* 8CD8C 800F38DC 00000000 */ nop /* 8CD90 800F38E0 46800020 */ cvt.s.w $f0, $f0 /* 8CD94 800F38E4 3C014080 */ lui $at, 0x4080 /* 8CD98 800F38E8 44812000 */ mtc1 $at, $f4 /* 8CD9C 800F38EC 8C620000 */ lw $v0, ($v1) /* 8CDA0 800F38F0 46041082 */ mul.s $f2, $f2, $f4 -/* 8CDA4 800F38F4 00000000 */ nop +/* 8CDA4 800F38F4 00000000 */ nop /* 8CDA8 800F38F8 0040282D */ daddu $a1, $v0, $zero /* 8CDAC 800F38FC 24420008 */ addiu $v0, $v0, 8 /* 8CDB0 800F3900 AC620000 */ sw $v0, ($v1) /* 8CDB4 800F3904 8FAB0020 */ lw $t3, 0x20($sp) /* 8CDB8 800F3908 46040002 */ mul.s $f0, $f0, $f4 -/* 8CDBC 800F390C 00000000 */ nop +/* 8CDBC 800F390C 00000000 */ nop /* 8CDC0 800F3910 0803CE59 */ j .L800F3964 /* 8CDC4 800F3914 2562005A */ addiu $v0, $t3, 0x5a -/* 8CDC8 800F3918 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 8CDCC 800F391C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 8CDC8 800F3918 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 8CDCC 800F391C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 8CDD0 800F3920 C7A20020 */ lwc1 $f2, 0x20($sp) /* 8CDD4 800F3924 468010A0 */ cvt.s.w $f2, $f2 /* 8CDD8 800F3928 44910000 */ mtc1 $s1, $f0 -/* 8CDDC 800F392C 00000000 */ nop +/* 8CDDC 800F392C 00000000 */ nop /* 8CDE0 800F3930 46800020 */ cvt.s.w $f0, $f0 /* 8CDE4 800F3934 3C014080 */ lui $at, 0x4080 /* 8CDE8 800F3938 44812000 */ mtc1 $at, $f4 /* 8CDEC 800F393C 8C620000 */ lw $v0, ($v1) /* 8CDF0 800F3940 46041082 */ mul.s $f2, $f2, $f4 -/* 8CDF4 800F3944 00000000 */ nop +/* 8CDF4 800F3944 00000000 */ nop /* 8CDF8 800F3948 0040282D */ daddu $a1, $v0, $zero /* 8CDFC 800F394C 24420008 */ addiu $v0, $v0, 8 /* 8CE00 800F3950 AC620000 */ sw $v0, ($v1) /* 8CE04 800F3954 8FAB0020 */ lw $t3, 0x20($sp) /* 8CE08 800F3958 46040002 */ mul.s $f0, $f0, $f4 -/* 8CE0C 800F395C 00000000 */ nop +/* 8CE0C 800F395C 00000000 */ nop /* 8CE10 800F3960 256200A0 */ addiu $v0, $t3, 0xa0 .L800F3964: /* 8CE14 800F3964 4600118D */ trunc.w.s $f6, $f2 /* 8CE18 800F3968 44033000 */ mfc1 $v1, $f6 -/* 8CE1C 800F396C 00000000 */ nop +/* 8CE1C 800F396C 00000000 */ nop /* 8CE20 800F3970 30630FFF */ andi $v1, $v1, 0xfff /* 8CE24 800F3974 00031B00 */ sll $v1, $v1, 0xc /* 8CE28 800F3978 4600018D */ trunc.w.s $f6, $f0 /* 8CE2C 800F397C 44043000 */ mfc1 $a0, $f6 -/* 8CE30 800F3980 00000000 */ nop +/* 8CE30 800F3980 00000000 */ nop /* 8CE34 800F3984 30840FFF */ andi $a0, $a0, 0xfff /* 8CE38 800F3988 44821000 */ mtc1 $v0, $f2 -/* 8CE3C 800F398C 00000000 */ nop +/* 8CE3C 800F398C 00000000 */ nop /* 8CE40 800F3990 468010A0 */ cvt.s.w $f2, $f2 /* 8CE44 800F3994 46041082 */ mul.s $f2, $f2, $f4 -/* 8CE48 800F3998 00000000 */ nop +/* 8CE48 800F3998 00000000 */ nop /* 8CE4C 800F399C 3C02ED00 */ lui $v0, 0xed00 /* 8CE50 800F39A0 00822025 */ or $a0, $a0, $v0 /* 8CE54 800F39A4 00641825 */ or $v1, $v1, $a0 /* 8CE58 800F39A8 44880000 */ mtc1 $t0, $f0 -/* 8CE5C 800F39AC 00000000 */ nop +/* 8CE5C 800F39AC 00000000 */ nop /* 8CE60 800F39B0 46800020 */ cvt.s.w $f0, $f0 /* 8CE64 800F39B4 46040002 */ mul.s $f0, $f0, $f4 -/* 8CE68 800F39B8 00000000 */ nop +/* 8CE68 800F39B8 00000000 */ nop /* 8CE6C 800F39BC ACA30000 */ sw $v1, ($a1) /* 8CE70 800F39C0 4600118D */ trunc.w.s $f6, $f2 /* 8CE74 800F39C4 44023000 */ mfc1 $v0, $f6 -/* 8CE78 800F39C8 00000000 */ nop +/* 8CE78 800F39C8 00000000 */ nop /* 8CE7C 800F39CC 30420FFF */ andi $v0, $v0, 0xfff /* 8CE80 800F39D0 00021300 */ sll $v0, $v0, 0xc /* 8CE84 800F39D4 4600018D */ trunc.w.s $f6, $f0 /* 8CE88 800F39D8 44033000 */ mfc1 $v1, $f6 -/* 8CE8C 800F39DC 00000000 */ nop +/* 8CE8C 800F39DC 00000000 */ nop /* 8CE90 800F39E0 30630FFF */ andi $v1, $v1, 0xfff /* 8CE94 800F39E4 00431025 */ or $v0, $v0, $v1 /* 8CE98 800F39E8 ACA20004 */ sw $v0, 4($a1) @@ -261,7 +261,7 @@ glabel func_800F3680 /* 8CF04 800F3A54 8C420324 */ lw $v0, 0x324($v0) /* 8CF08 800F3A58 0062182A */ slt $v1, $v1, $v0 /* 8CF0C 800F3A5C 10600003 */ beqz $v1, .L800F3A6C -/* 8CF10 800F3A60 00000000 */ nop +/* 8CF10 800F3A60 00000000 */ nop /* 8CF14 800F3A64 0C0511F8 */ jal draw_icon_2 /* 8CF18 800F3A68 0200202D */ daddu $a0, $s0, $zero .L800F3A6C: @@ -283,7 +283,7 @@ glabel func_800F3680 /* 8CF58 800F3AA8 8042D654 */ lb $v0, %lo(D_8010D654)($v0) /* 8CF5C 800F3AAC 28420002 */ slti $v0, $v0, 2 /* 8CF60 800F3AB0 10400003 */ beqz $v0, .L800F3AC0 -/* 8CF64 800F3AB4 00000000 */ nop +/* 8CF64 800F3AB4 00000000 */ nop /* 8CF68 800F3AB8 0140882D */ daddu $s1, $t2, $zero /* 8CF6C 800F3ABC 25080001 */ addiu $t0, $t0, 1 .L800F3AC0: @@ -291,40 +291,40 @@ glabel func_800F3680 /* 8CF74 800F3AC4 468010A0 */ cvt.s.w $f2, $f2 /* 8CF78 800F3AC8 3C014080 */ lui $at, 0x4080 /* 8CF7C 800F3ACC 44812000 */ mtc1 $at, $f4 -/* 8CF80 800F3AD0 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 8CF84 800F3AD4 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 8CF80 800F3AD0 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 8CF84 800F3AD4 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 8CF88 800F3AD8 46041082 */ mul.s $f2, $f2, $f4 -/* 8CF8C 800F3ADC 00000000 */ nop +/* 8CF8C 800F3ADC 00000000 */ nop /* 8CF90 800F3AE0 44910000 */ mtc1 $s1, $f0 -/* 8CF94 800F3AE4 00000000 */ nop +/* 8CF94 800F3AE4 00000000 */ nop /* 8CF98 800F3AE8 46800020 */ cvt.s.w $f0, $f0 /* 8CF9C 800F3AEC 8CC50000 */ lw $a1, ($a2) /* 8CFA0 800F3AF0 3C04ED00 */ lui $a0, 0xed00 /* 8CFA4 800F3AF4 00A0382D */ daddu $a3, $a1, $zero /* 8CFA8 800F3AF8 46040002 */ mul.s $f0, $f0, $f4 -/* 8CFAC 800F3AFC 00000000 */ nop +/* 8CFAC 800F3AFC 00000000 */ nop /* 8CFB0 800F3B00 24A50008 */ addiu $a1, $a1, 8 /* 8CFB4 800F3B04 4600118D */ trunc.w.s $f6, $f2 /* 8CFB8 800F3B08 44023000 */ mfc1 $v0, $f6 -/* 8CFBC 800F3B0C 00000000 */ nop +/* 8CFBC 800F3B0C 00000000 */ nop /* 8CFC0 800F3B10 30420FFF */ andi $v0, $v0, 0xfff /* 8CFC4 800F3B14 00021300 */ sll $v0, $v0, 0xc /* 8CFC8 800F3B18 4600018D */ trunc.w.s $f6, $f0 /* 8CFCC 800F3B1C 44033000 */ mfc1 $v1, $f6 -/* 8CFD0 800F3B20 00000000 */ nop +/* 8CFD0 800F3B20 00000000 */ nop /* 8CFD4 800F3B24 30630FFF */ andi $v1, $v1, 0xfff /* 8CFD8 800F3B28 00641825 */ or $v1, $v1, $a0 /* 8CFDC 800F3B2C 00431025 */ or $v0, $v0, $v1 /* 8CFE0 800F3B30 3C048011 */ lui $a0, %hi(D_8010D69C) /* 8CFE4 800F3B34 8C84D69C */ lw $a0, %lo(D_8010D69C)($a0) /* 8CFE8 800F3B38 44880000 */ mtc1 $t0, $f0 -/* 8CFEC 800F3B3C 00000000 */ nop +/* 8CFEC 800F3B3C 00000000 */ nop /* 8CFF0 800F3B40 46800020 */ cvt.s.w $f0, $f0 /* 8CFF4 800F3B44 ACE20000 */ sw $v0, ($a3) /* 8CFF8 800F3B48 8FAB0020 */ lw $t3, 0x20($sp) /* 8CFFC 800F3B4C 8C820318 */ lw $v0, 0x318($a0) /* 8D000 800F3B50 46040002 */ mul.s $f0, $f0, $f4 -/* 8D004 800F3B54 00000000 */ nop +/* 8D004 800F3B54 00000000 */ nop /* 8D008 800F3B58 AFA00024 */ sw $zero, 0x24($sp) /* 8D00C 800F3B5C 00021040 */ sll $v0, $v0, 1 /* 8D010 800F3B60 3C018011 */ lui $at, %hi(D_801098BC) @@ -333,12 +333,12 @@ glabel func_800F3680 /* 8D01C 800F3B6C 8FAA0060 */ lw $t2, 0x60($sp) /* 8D020 800F3B70 01621021 */ addu $v0, $t3, $v0 /* 8D024 800F3B74 44821000 */ mtc1 $v0, $f2 -/* 8D028 800F3B78 00000000 */ nop +/* 8D028 800F3B78 00000000 */ nop /* 8D02C 800F3B7C 468010A0 */ cvt.s.w $f2, $f2 /* 8D030 800F3B80 3C028011 */ lui $v0, %hi(D_8010D658) /* 8D034 800F3B84 8442D658 */ lh $v0, %lo(D_8010D658)($v0) /* 8D038 800F3B88 46041082 */ mul.s $f2, $f2, $f4 -/* 8D03C 800F3B8C 00000000 */ nop +/* 8D03C 800F3B8C 00000000 */ nop /* 8D040 800F3B90 ACC50000 */ sw $a1, ($a2) /* 8D044 800F3B94 8FAB005C */ lw $t3, 0x5c($sp) /* 8D048 800F3B98 01424821 */ addu $t1, $t2, $v0 @@ -346,12 +346,12 @@ glabel func_800F3680 /* 8D050 800F3BA0 AFAB0020 */ sw $t3, 0x20($sp) /* 8D054 800F3BA4 4600118D */ trunc.w.s $f6, $f2 /* 8D058 800F3BA8 44023000 */ mfc1 $v0, $f6 -/* 8D05C 800F3BAC 00000000 */ nop +/* 8D05C 800F3BAC 00000000 */ nop /* 8D060 800F3BB0 30420FFF */ andi $v0, $v0, 0xfff /* 8D064 800F3BB4 00021300 */ sll $v0, $v0, 0xc /* 8D068 800F3BB8 4600018D */ trunc.w.s $f6, $f0 /* 8D06C 800F3BBC 44033000 */ mfc1 $v1, $f6 -/* 8D070 800F3BC0 00000000 */ nop +/* 8D070 800F3BC0 00000000 */ nop /* 8D074 800F3BC4 30630FFF */ andi $v1, $v1, 0xfff /* 8D078 800F3BC8 00431025 */ or $v0, $v0, $v1 /* 8D07C 800F3BCC ACE20004 */ sw $v0, 4($a3) @@ -372,7 +372,7 @@ glabel func_800F3680 /* 8D0B0 800F3C00 2542FFFF */ addiu $v0, $t2, -1 /* 8D0B4 800F3C04 0242102A */ slt $v0, $s2, $v0 /* 8D0B8 800F3C08 14400007 */ bnez $v0, .L800F3C28 -/* 8D0BC 800F3C0C 00000000 */ nop +/* 8D0BC 800F3C0C 00000000 */ nop /* 8D0C0 800F3C10 3C028011 */ lui $v0, %hi(D_8010D656) /* 8D0C4 800F3C14 8042D656 */ lb $v0, %lo(D_8010D656)($v0) /* 8D0C8 800F3C18 01421021 */ addu $v0, $t2, $v0 @@ -407,7 +407,7 @@ glabel func_800F3680 /* 8D12C 800F3C7C 00220821 */ addu $at, $at, $v0 /* 8D130 800F3C80 8C22C7C8 */ lw $v0, %lo(D_8010C7C8)($at) /* 8D134 800F3C84 00400008 */ jr $v0 -/* 8D138 800F3C88 00000000 */ nop +/* 8D138 800F3C88 00000000 */ nop /* 8D13C 800F3C8C 3C078011 */ lui $a3, %hi(D_8010D650) /* 8D140 800F3C90 8CE7D650 */ lw $a3, %lo(D_8010D650)($a3) /* 8D144 800F3C94 3C028011 */ lui $v0, %hi(D_8010D69C) @@ -495,7 +495,7 @@ glabel func_800F3680 /* 8D280 800F3DD0 AFAA0014 */ sw $t2, 0x14($sp) .L800F3DD4: /* 8D284 800F3DD4 0C04993B */ jal draw_string -/* 8D288 800F3DD8 00000000 */ nop +/* 8D288 800F3DD8 00000000 */ nop .L800F3DDC: /* 8D28C 800F3DDC 3C048011 */ lui $a0, %hi(D_8010D69C) /* 8D290 800F3DE0 8C84D69C */ lw $a0, %lo(D_8010D69C)($a0) @@ -536,7 +536,7 @@ glabel func_800F3680 /* 8D30C 800F3E5C 3C108011 */ lui $s0, %hi(D_8010D668) /* 8D310 800F3E60 8E10D668 */ lw $s0, %lo(D_8010D668)($s0) /* 8D314 800F3E64 10400003 */ beqz $v0, .L800F3E74 -/* 8D318 800F3E68 00000000 */ nop +/* 8D318 800F3E68 00000000 */ nop /* 8D31C 800F3E6C 0803CF9E */ j .L800F3E78 /* 8D320 800F3E70 8E850000 */ lw $a1, ($s4) .L800F3E74: @@ -560,7 +560,7 @@ glabel func_800F3680 /* 8D360 800F3EB0 01772821 */ addu $a1, $t3, $s7 .L800F3EB4: /* 8D364 800F3EB4 0C051261 */ jal set_icon_render_pos -/* 8D368 800F3EB8 00000000 */ nop +/* 8D368 800F3EB8 00000000 */ nop /* 8D36C 800F3EBC 3C028011 */ lui $v0, %hi(D_8010D69C) /* 8D370 800F3EC0 8C42D69C */ lw $v0, %lo(D_8010D69C)($v0) /* 8D374 800F3EC4 005E1021 */ addu $v0, $v0, $fp @@ -650,7 +650,7 @@ glabel func_800F3680 /* 8D4A0 800F3FF0 00220821 */ addu $at, $at, $v0 /* 8D4A4 800F3FF4 8C22C800 */ lw $v0, %lo(D_8010C800)($at) /* 8D4A8 800F3FF8 00400008 */ jr $v0 -/* 8D4AC 800F3FFC 00000000 */ nop +/* 8D4AC 800F3FFC 00000000 */ nop /* 8D4B0 800F4000 3C028011 */ lui $v0, %hi(D_8010D69C) /* 8D4B4 800F4004 8C42D69C */ lw $v0, %lo(D_8010D69C)($v0) /* 8D4B8 800F4008 8C420324 */ lw $v0, 0x324($v0) @@ -661,7 +661,7 @@ glabel func_800F3680 /* 8D4CC 800F401C 0253102A */ slt $v0, $s2, $s3 .L800F4020: /* 8D4D0 800F4020 14400008 */ bnez $v0, .L800F4044 -/* 8D4D4 800F4024 00000000 */ nop +/* 8D4D4 800F4024 00000000 */ nop /* 8D4D8 800F4028 3C028011 */ lui $v0, %hi(D_8010D656) /* 8D4DC 800F402C 8042D656 */ lb $v0, %lo(D_8010D656)($v0) /* 8D4E0 800F4030 8FAA0028 */ lw $t2, 0x28($sp) @@ -700,7 +700,7 @@ glabel func_800F3680 /* 8D55C 800F40AC 0C0511F8 */ jal draw_icon_2 /* 8D560 800F40B0 0200202D */ daddu $a0, $s0, $zero /* 8D564 800F40B4 16400003 */ bnez $s2, .L800F40C4 -/* 8D568 800F40B8 00000000 */ nop +/* 8D568 800F40B8 00000000 */ nop /* 8D56C 800F40BC 8FAA0024 */ lw $t2, 0x24($sp) /* 8D570 800F40C0 022A8821 */ addu $s1, $s1, $t2 .L800F40C4: @@ -712,7 +712,7 @@ glabel func_800F3680 /* 8D588 800F40D8 1440FFD1 */ bnez $v0, .L800F4020 /* 8D58C 800F40DC 0253102A */ slt $v0, $s2, $s3 /* 8D590 800F40E0 0803D0AC */ j .L800F42B0 -/* 8D594 800F40E4 00000000 */ nop +/* 8D594 800F40E4 00000000 */ nop /* 8D598 800F40E8 3C028011 */ lui $v0, %hi(D_8010D69C) /* 8D59C 800F40EC 8C42D69C */ lw $v0, %lo(D_8010D69C)($v0) /* 8D5A0 800F40F0 8C420324 */ lw $v0, 0x324($v0) @@ -723,7 +723,7 @@ glabel func_800F3680 /* 8D5B4 800F4104 0253102A */ slt $v0, $s2, $s3 .L800F4108: /* 8D5B8 800F4108 14400008 */ bnez $v0, .L800F412C -/* 8D5BC 800F410C 00000000 */ nop +/* 8D5BC 800F410C 00000000 */ nop /* 8D5C0 800F4110 3C028011 */ lui $v0, %hi(D_8010D656) /* 8D5C4 800F4114 8042D656 */ lb $v0, %lo(D_8010D656)($v0) /* 8D5C8 800F4118 8FAA0028 */ lw $t2, 0x28($sp) @@ -762,7 +762,7 @@ glabel func_800F3680 /* 8D644 800F4194 0C0511F8 */ jal draw_icon_2 /* 8D648 800F4198 0200202D */ daddu $a0, $s0, $zero /* 8D64C 800F419C 16400003 */ bnez $s2, .L800F41AC -/* 8D650 800F41A0 00000000 */ nop +/* 8D650 800F41A0 00000000 */ nop /* 8D654 800F41A4 8FAA0024 */ lw $t2, 0x24($sp) /* 8D658 800F41A8 022A8821 */ addu $s1, $s1, $t2 .L800F41AC: @@ -774,7 +774,7 @@ glabel func_800F3680 /* 8D670 800F41C0 1440FFD1 */ bnez $v0, .L800F4108 /* 8D674 800F41C4 0253102A */ slt $v0, $s2, $s3 /* 8D678 800F41C8 0803D0AC */ j .L800F42B0 -/* 8D67C 800F41CC 00000000 */ nop +/* 8D67C 800F41CC 00000000 */ nop /* 8D680 800F41D0 3C028011 */ lui $v0, %hi(D_8010D69C) /* 8D684 800F41D4 8C42D69C */ lw $v0, %lo(D_8010D69C)($v0) /* 8D688 800F41D8 8C420324 */ lw $v0, 0x324($v0) @@ -785,7 +785,7 @@ glabel func_800F3680 /* 8D69C 800F41EC 0253102A */ slt $v0, $s2, $s3 .L800F41F0: /* 8D6A0 800F41F0 14400008 */ bnez $v0, .L800F4214 -/* 8D6A4 800F41F4 00000000 */ nop +/* 8D6A4 800F41F4 00000000 */ nop /* 8D6A8 800F41F8 3C028011 */ lui $v0, %hi(D_8010D656) /* 8D6AC 800F41FC 8042D656 */ lb $v0, %lo(D_8010D656)($v0) /* 8D6B0 800F4200 8FAA0028 */ lw $t2, 0x28($sp) @@ -824,7 +824,7 @@ glabel func_800F3680 /* 8D72C 800F427C 0C0511F8 */ jal draw_icon_2 /* 8D730 800F4280 0200202D */ daddu $a0, $s0, $zero /* 8D734 800F4284 16400003 */ bnez $s2, .L800F4294 -/* 8D738 800F4288 00000000 */ nop +/* 8D738 800F4288 00000000 */ nop /* 8D73C 800F428C 8FAA0024 */ lw $t2, 0x24($sp) /* 8D740 800F4290 022A8821 */ addu $s1, $s1, $t2 .L800F4294: @@ -895,78 +895,78 @@ glabel func_800F3680 /* 8D838 800F4388 00220821 */ addu $at, $at, $v0 /* 8D83C 800F438C 8C22C838 */ lw $v0, %lo(D_8010C838)($at) /* 8D840 800F4390 00400008 */ jr $v0 -/* 8D844 800F4394 00000000 */ nop -/* 8D848 800F4398 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 8D84C 800F439C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 8D844 800F4394 00000000 */ nop +/* 8D848 800F4398 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 8D84C 800F439C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 8D850 800F43A0 C7A20020 */ lwc1 $f2, 0x20($sp) /* 8D854 800F43A4 468010A0 */ cvt.s.w $f2, $f2 /* 8D858 800F43A8 44910000 */ mtc1 $s1, $f0 -/* 8D85C 800F43AC 00000000 */ nop +/* 8D85C 800F43AC 00000000 */ nop /* 8D860 800F43B0 46800020 */ cvt.s.w $f0, $f0 /* 8D864 800F43B4 3C014080 */ lui $at, 0x4080 /* 8D868 800F43B8 44812000 */ mtc1 $at, $f4 /* 8D86C 800F43BC 8C620000 */ lw $v0, ($v1) /* 8D870 800F43C0 46041082 */ mul.s $f2, $f2, $f4 -/* 8D874 800F43C4 00000000 */ nop +/* 8D874 800F43C4 00000000 */ nop /* 8D878 800F43C8 0040282D */ daddu $a1, $v0, $zero /* 8D87C 800F43CC 24420008 */ addiu $v0, $v0, 8 /* 8D880 800F43D0 AC620000 */ sw $v0, ($v1) /* 8D884 800F43D4 8FAB0020 */ lw $t3, 0x20($sp) /* 8D888 800F43D8 46040002 */ mul.s $f0, $f0, $f4 -/* 8D88C 800F43DC 00000000 */ nop +/* 8D88C 800F43DC 00000000 */ nop /* 8D890 800F43E0 0803D10D */ j .L800F4434 /* 8D894 800F43E4 25620070 */ addiu $v0, $t3, 0x70 -/* 8D898 800F43E8 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 8D89C 800F43EC 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 8D898 800F43E8 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 8D89C 800F43EC 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 8D8A0 800F43F0 C7A20020 */ lwc1 $f2, 0x20($sp) /* 8D8A4 800F43F4 468010A0 */ cvt.s.w $f2, $f2 /* 8D8A8 800F43F8 44910000 */ mtc1 $s1, $f0 -/* 8D8AC 800F43FC 00000000 */ nop +/* 8D8AC 800F43FC 00000000 */ nop /* 8D8B0 800F4400 46800020 */ cvt.s.w $f0, $f0 /* 8D8B4 800F4404 3C014080 */ lui $at, 0x4080 /* 8D8B8 800F4408 44812000 */ mtc1 $at, $f4 /* 8D8BC 800F440C 8C620000 */ lw $v0, ($v1) /* 8D8C0 800F4410 46041082 */ mul.s $f2, $f2, $f4 -/* 8D8C4 800F4414 00000000 */ nop +/* 8D8C4 800F4414 00000000 */ nop /* 8D8C8 800F4418 0040282D */ daddu $a1, $v0, $zero /* 8D8CC 800F441C 24420008 */ addiu $v0, $v0, 8 /* 8D8D0 800F4420 AC620000 */ sw $v0, ($v1) /* 8D8D4 800F4424 8FAB0020 */ lw $t3, 0x20($sp) /* 8D8D8 800F4428 46040002 */ mul.s $f0, $f0, $f4 -/* 8D8DC 800F442C 00000000 */ nop +/* 8D8DC 800F442C 00000000 */ nop /* 8D8E0 800F4430 25620064 */ addiu $v0, $t3, 0x64 .L800F4434: /* 8D8E4 800F4434 4600118D */ trunc.w.s $f6, $f2 /* 8D8E8 800F4438 44033000 */ mfc1 $v1, $f6 -/* 8D8EC 800F443C 00000000 */ nop +/* 8D8EC 800F443C 00000000 */ nop /* 8D8F0 800F4440 30630FFF */ andi $v1, $v1, 0xfff /* 8D8F4 800F4444 00031B00 */ sll $v1, $v1, 0xc /* 8D8F8 800F4448 4600018D */ trunc.w.s $f6, $f0 /* 8D8FC 800F444C 44043000 */ mfc1 $a0, $f6 -/* 8D900 800F4450 00000000 */ nop +/* 8D900 800F4450 00000000 */ nop /* 8D904 800F4454 30840FFF */ andi $a0, $a0, 0xfff /* 8D908 800F4458 44821000 */ mtc1 $v0, $f2 -/* 8D90C 800F445C 00000000 */ nop +/* 8D90C 800F445C 00000000 */ nop /* 8D910 800F4460 468010A0 */ cvt.s.w $f2, $f2 /* 8D914 800F4464 46041082 */ mul.s $f2, $f2, $f4 -/* 8D918 800F4468 00000000 */ nop +/* 8D918 800F4468 00000000 */ nop /* 8D91C 800F446C 3C02ED00 */ lui $v0, 0xed00 /* 8D920 800F4470 00822025 */ or $a0, $a0, $v0 /* 8D924 800F4474 00641825 */ or $v1, $v1, $a0 /* 8D928 800F4478 44880000 */ mtc1 $t0, $f0 -/* 8D92C 800F447C 00000000 */ nop +/* 8D92C 800F447C 00000000 */ nop /* 8D930 800F4480 46800020 */ cvt.s.w $f0, $f0 /* 8D934 800F4484 46040002 */ mul.s $f0, $f0, $f4 -/* 8D938 800F4488 00000000 */ nop +/* 8D938 800F4488 00000000 */ nop /* 8D93C 800F448C ACA30000 */ sw $v1, ($a1) /* 8D940 800F4490 4600118D */ trunc.w.s $f6, $f2 /* 8D944 800F4494 44023000 */ mfc1 $v0, $f6 -/* 8D948 800F4498 00000000 */ nop +/* 8D948 800F4498 00000000 */ nop /* 8D94C 800F449C 30420FFF */ andi $v0, $v0, 0xfff /* 8D950 800F44A0 00021300 */ sll $v0, $v0, 0xc /* 8D954 800F44A4 4600018D */ trunc.w.s $f6, $f0 /* 8D958 800F44A8 44033000 */ mfc1 $v1, $f6 -/* 8D95C 800F44AC 00000000 */ nop +/* 8D95C 800F44AC 00000000 */ nop /* 8D960 800F44B0 30630FFF */ andi $v1, $v1, 0xfff /* 8D964 800F44B4 00431025 */ or $v0, $v0, $v1 /* 8D968 800F44B8 ACA20004 */ sw $v0, 4($a1) @@ -982,7 +982,7 @@ glabel func_800F3680 /* 8D98C 800F44DC 00220821 */ addu $at, $at, $v0 /* 8D990 800F44E0 8C22C870 */ lw $v0, %lo(D_8010C870)($at) /* 8D994 800F44E4 00400008 */ jr $v0 -/* 8D998 800F44E8 00000000 */ nop +/* 8D998 800F44E8 00000000 */ nop /* 8D99C 800F44EC 0803D150 */ j .L800F4540 /* 8D9A0 800F44F0 240B0023 */ addiu $t3, $zero, 0x23 /* 8D9A4 800F44F4 240A0023 */ addiu $t2, $zero, 0x23 @@ -1011,7 +1011,7 @@ glabel func_800F3680 /* 8D9F4 800F4544 3C028011 */ lui $v0, %hi(D_8010D654) /* 8D9F8 800F4548 8042D654 */ lb $v0, %lo(D_8010D654)($v0) /* 8D9FC 800F454C 18400012 */ blez $v0, .L800F4598 -/* 8DA00 800F4550 00000000 */ nop +/* 8DA00 800F4550 00000000 */ nop /* 8DA04 800F4554 8FAA005C */ lw $t2, 0x5c($sp) /* 8DA08 800F4558 8FAB0024 */ lw $t3, 0x24($sp) /* 8DA0C 800F455C 3C108011 */ lui $s0, %hi(D_8010D670) @@ -1037,7 +1037,7 @@ glabel func_800F3680 /* 8DA58 800F45A8 8C420324 */ lw $v0, 0x324($v0) /* 8DA5C 800F45AC 0062182A */ slt $v1, $v1, $v0 /* 8DA60 800F45B0 10600019 */ beqz $v1, .L800F4618 -/* 8DA64 800F45B4 00000000 */ nop +/* 8DA64 800F45B4 00000000 */ nop /* 8DA68 800F45B8 8FAB005C */ lw $t3, 0x5c($sp) /* 8DA6C 800F45BC 8FAA0024 */ lw $t2, 0x24($sp) /* 8DA70 800F45C0 3C038011 */ lui $v1, %hi(D_8010D68F) diff --git a/asm/nonmatchings/code_8e790_len_2850/draw_box.s b/asm/nonmatchings/code_8e790_len_2850/draw_box.s index ae786ce415..5e01c54421 100644 --- a/asm/nonmatchings/code_8e790_len_2850/draw_box.s +++ b/asm/nonmatchings/code_8e790_len_2850/draw_box.s @@ -217,7 +217,7 @@ glabel draw_box /* 8EAB0 800F5600 24020001 */ addiu $v0, $zero, 1 /* 8EAB4 800F5604 93B900E7 */ lbu $t9, 0xe7($sp) /* 8EAB8 800F5608 13200938 */ beqz $t9, .L800F7AEC -/* 8EABC 800F560C 00000000 */ nop +/* 8EABC 800F560C 00000000 */ nop /* 8EAC0 800F5610 8FAE01F8 */ lw $t6, 0x1f8($sp) /* 8EAC4 800F5614 29C2FD01 */ slti $v0, $t6, -0x2ff /* 8EAC8 800F5618 14400934 */ bnez $v0, .L800F7AEC @@ -246,9 +246,9 @@ glabel draw_box /* 8EB24 800F5674 1040091D */ beqz $v0, .L800F7AEC /* 8EB28 800F5678 24020001 */ addiu $v0, $zero, 1 /* 8EB2C 800F567C 1880091B */ blez $a0, .L800F7AEC -/* 8EB30 800F5680 00000000 */ nop +/* 8EB30 800F5680 00000000 */ nop /* 8EB34 800F5684 1C600003 */ bgtz $v1, .L800F5694 -/* 8EB38 800F5688 00000000 */ nop +/* 8EB38 800F5688 00000000 */ nop .L800F568C: /* 8EB3C 800F568C 0803DEBB */ j .L800F7AEC /* 8EB40 800F5690 24020001 */ addiu $v0, $zero, 1 @@ -276,8 +276,8 @@ glabel draw_box /* 8EB8C 800F56DC 3C06E200 */ lui $a2, 0xe200 /* 8EB90 800F56E0 34C6001C */ ori $a2, $a2, 0x1c /* 8EB94 800F56E4 3C058410 */ lui $a1, 0x8410 -/* 8EB98 800F56E8 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 8EB9C 800F56EC 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 8EB98 800F56E8 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 8EB9C 800F56EC 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 8EBA0 800F56F0 8D070000 */ lw $a3, ($t0) /* 8EBA4 800F56F4 3C02E700 */ lui $v0, 0xe700 /* 8EBA8 800F56F8 00E0182D */ daddu $v1, $a3, $zero @@ -355,8 +355,8 @@ glabel draw_box .L800F5804: /* 8ECB4 800F5804 3C03E300 */ lui $v1, 0xe300 .L800F5808: -/* 8ECB8 800F5808 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 8ECBC 800F580C 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 8ECB8 800F5808 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 8ECBC 800F580C 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 8ECC0 800F5810 8E680000 */ lw $t0, ($s3) /* 8ECC4 800F5814 34631201 */ ori $v1, $v1, 0x1201 /* 8ECC8 800F5818 25020010 */ addiu $v0, $t0, 0x10 @@ -392,10 +392,10 @@ glabel draw_box /* 8ED40 800F5890 0C0187CC */ jal guFrustumF /* 8ED44 800F5894 E7B4001C */ swc1 $f20, 0x1c($sp) /* 8ED48 800F5898 27A40020 */ addiu $a0, $sp, 0x20 -/* 8ED4C 800F589C 3C108007 */ lui $s0, %hi(D_800741F0) -/* 8ED50 800F58A0 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 8ED54 800F58A4 3C11800A */ lui $s1, %hi(D_8009A674) -/* 8ED58 800F58A8 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 8ED4C 800F589C 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 8ED50 800F58A0 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 8ED54 800F58A4 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 8ED58 800F58A8 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 8ED5C 800F58AC 96050000 */ lhu $a1, ($s0) /* 8ED60 800F58B0 8E220000 */ lw $v0, ($s1) /* 8ED64 800F58B4 00052980 */ sll $a1, $a1, 6 @@ -437,7 +437,7 @@ glabel draw_box /* 8EDF4 800F5944 00021043 */ sra $v0, $v0, 1 /* 8EDF8 800F5948 01C21021 */ addu $v0, $t6, $v0 /* 8EDFC 800F594C 44820000 */ mtc1 $v0, $f0 -/* 8EE00 800F5950 00000000 */ nop +/* 8EE00 800F5950 00000000 */ nop /* 8EE04 800F5954 46800020 */ cvt.s.w $f0, $f0 /* 8EE08 800F5958 000F17C2 */ srl $v0, $t7, 0x1f /* 8EE0C 800F595C 01E21021 */ addu $v0, $t7, $v0 @@ -445,7 +445,7 @@ glabel draw_box /* 8EE14 800F5964 02421021 */ addu $v0, $s2, $v0 /* 8EE18 800F5968 E7A00014 */ swc1 $f0, 0x14($sp) /* 8EE1C 800F596C 44820000 */ mtc1 $v0, $f0 -/* 8EE20 800F5970 00000000 */ nop +/* 8EE20 800F5970 00000000 */ nop /* 8EE24 800F5974 46800020 */ cvt.s.w $f0, $f0 /* 8EE28 800F5978 E7A00018 */ swc1 $f0, 0x18($sp) /* 8EE2C 800F597C C7A00200 */ lwc1 $f0, 0x200($sp) @@ -453,13 +453,13 @@ glabel draw_box /* 8EE34 800F5984 0C018FC4 */ jal guPositionF /* 8EE38 800F5988 E7A0001C */ swc1 $f0, 0x1c($sp) /* 8EE3C 800F598C 4614B032 */ c.eq.s $f22, $f20 -/* 8EE40 800F5990 00000000 */ nop +/* 8EE40 800F5990 00000000 */ nop /* 8EE44 800F5994 45000005 */ bc1f .L800F59AC /* 8EE48 800F5998 27B00060 */ addiu $s0, $sp, 0x60 /* 8EE4C 800F599C 4614C032 */ c.eq.s $f24, $f20 -/* 8EE50 800F59A0 00000000 */ nop +/* 8EE50 800F59A0 00000000 */ nop /* 8EE54 800F59A4 4501000A */ bc1t .L800F59D0 -/* 8EE58 800F59A8 00000000 */ nop +/* 8EE58 800F59A8 00000000 */ nop .L800F59AC: /* 8EE5C 800F59AC 4405B000 */ mfc1 $a1, $f22 /* 8EE60 800F59B0 4406C000 */ mfc1 $a2, $f24 @@ -481,7 +481,7 @@ glabel draw_box /* 8EE9C 800F59EC 00431021 */ addu $v0, $v0, $v1 /* 8EEA0 800F59F0 00021043 */ sra $v0, $v0, 1 /* 8EEA4 800F59F4 44823000 */ mtc1 $v0, $f6 -/* 8EEA8 800F59F8 00000000 */ nop +/* 8EEA8 800F59F8 00000000 */ nop /* 8EEAC 800F59FC 468031A0 */ cvt.s.w $f6, $f6 /* 8EEB0 800F5A00 8FA20238 */ lw $v0, 0x238($sp) /* 8EEB4 800F5A04 44053000 */ mfc1 $a1, $f6 @@ -490,7 +490,7 @@ glabel draw_box /* 8EEC0 800F5A10 00431021 */ addu $v0, $v0, $v1 /* 8EEC4 800F5A14 00021043 */ sra $v0, $v0, 1 /* 8EEC8 800F5A18 44823000 */ mtc1 $v0, $f6 -/* 8EECC 800F5A1C 00000000 */ nop +/* 8EECC 800F5A1C 00000000 */ nop /* 8EED0 800F5A20 468031A0 */ cvt.s.w $f6, $f6 /* 8EED4 800F5A24 44063000 */ mfc1 $a2, $f6 /* 8EED8 800F5A28 0C019E40 */ jal guTranslateF @@ -538,8 +538,8 @@ glabel draw_box /* 8EF70 800F5AC0 0C019D80 */ jal guMtxCatF /* 8EF74 800F5AC4 0080302D */ daddu $a2, $a0, $zero /* 8EF78 800F5AC8 3C03D9FD */ lui $v1, 0xd9fd -/* 8EF7C 800F5ACC 3C13800A */ lui $s3, %hi(D_8009A66C) -/* 8EF80 800F5AD0 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* 8EF7C 800F5ACC 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* 8EF80 800F5AD0 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* 8EF84 800F5AD4 8E640000 */ lw $a0, ($s3) /* 8EF88 800F5AD8 3463F9FF */ ori $v1, $v1, 0xf9ff /* 8EF8C 800F5ADC 0080102D */ daddu $v0, $a0, $zero @@ -561,10 +561,10 @@ glabel draw_box /* 8EFC8 800F5B18 3C120001 */ lui $s2, 1 /* 8EFCC 800F5B1C 36521630 */ ori $s2, $s2, 0x1630 /* 8EFD0 800F5B20 27A40020 */ addiu $a0, $sp, 0x20 -/* 8EFD4 800F5B24 3C108007 */ lui $s0, %hi(D_800741F0) -/* 8EFD8 800F5B28 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 8EFDC 800F5B2C 3C11800A */ lui $s1, %hi(D_8009A674) -/* 8EFE0 800F5B30 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 8EFD4 800F5B24 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 8EFD8 800F5B28 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 8EFDC 800F5B2C 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 8EFE0 800F5B30 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 8EFE4 800F5B34 96050000 */ lhu $a1, ($s0) /* 8EFE8 800F5B38 8E220000 */ lw $v0, ($s1) /* 8EFEC 800F5B3C 00052980 */ sll $a1, $a1, 6 @@ -616,8 +616,8 @@ glabel draw_box /* 8F09C 800F5BEC 3C05E300 */ lui $a1, 0xe300 /* 8F0A0 800F5BF0 34A50D01 */ ori $a1, $a1, 0xd01 /* 8F0A4 800F5BF4 3C06E300 */ lui $a2, 0xe300 -/* 8F0A8 800F5BF8 3C0B800A */ lui $t3, %hi(D_8009A66C) -/* 8F0AC 800F5BFC 256BA66C */ addiu $t3, $t3, %lo(D_8009A66C) +/* 8F0A8 800F5BF8 3C0B800A */ lui $t3, %hi(gMasterGfxPos) +/* 8F0AC 800F5BFC 256BA66C */ addiu $t3, $t3, %lo(gMasterGfxPos) /* 8F0B0 800F5C00 8D6A0000 */ lw $t2, ($t3) /* 8F0B4 800F5C04 34C60F00 */ ori $a2, $a2, 0xf00 /* 8F0B8 800F5C08 0140182D */ daddu $v1, $t2, $zero @@ -670,7 +670,7 @@ glabel draw_box /* 8F174 800F5CC4 AD420024 */ sw $v0, 0x24($t2) /* 8F178 800F5CC8 8FAF0138 */ lw $t7, 0x138($sp) /* 8F17C 800F5CCC 11E0012E */ beqz $t7, .L800F6188 -/* 8F180 800F5CD0 00000000 */ nop +/* 8F180 800F5CD0 00000000 */ nop /* 8F184 800F5CD4 92820004 */ lbu $v0, 4($s4) /* 8F188 800F5CD8 3043000F */ andi $v1, $v0, 0xf /* 8F18C 800F5CDC 24020001 */ addiu $v0, $zero, 1 @@ -681,14 +681,14 @@ glabel draw_box /* 8F1A0 800F5CF0 10600009 */ beqz $v1, .L800F5D18 /* 8F1A4 800F5CF4 25420030 */ addiu $v0, $t2, 0x30 /* 8F1A8 800F5CF8 0803D80F */ j .L800F603C -/* 8F1AC 800F5CFC 00000000 */ nop +/* 8F1AC 800F5CFC 00000000 */ nop .L800F5D00: /* 8F1B0 800F5D00 1062006D */ beq $v1, $v0, .L800F5EB8 /* 8F1B4 800F5D04 24020003 */ addiu $v0, $zero, 3 /* 8F1B8 800F5D08 1062008D */ beq $v1, $v0, .L800F5F40 /* 8F1BC 800F5D0C 25420030 */ addiu $v0, $t2, 0x30 /* 8F1C0 800F5D10 0803D80F */ j .L800F603C -/* 8F1C4 800F5D14 00000000 */ nop +/* 8F1C4 800F5D14 00000000 */ nop .L800F5D18: /* 8F1C8 800F5D18 00152042 */ srl $a0, $s5, 1 /* 8F1CC 800F5D1C AD620000 */ sw $v0, ($t3) @@ -900,8 +900,8 @@ glabel draw_box /* 8F4F0 800F6040 32420002 */ andi $v0, $s2, 2 /* 8F4F4 800F6044 1040002E */ beqz $v0, .L800F6100 /* 8F4F8 800F6048 240801FF */ addiu $t0, $zero, 0x1ff -/* 8F4FC 800F604C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 8F500 800F6050 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 8F4FC 800F604C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 8F500 800F6050 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 8F504 800F6054 3C06F200 */ lui $a2, 0xf200 /* 8F508 800F6058 8C820000 */ lw $v0, ($a0) /* 8F50C 800F605C 3C038007 */ lui $v1, %hi(gGameStatusPtr) @@ -946,8 +946,8 @@ glabel draw_box /* 8F5A8 800F60F8 0803D862 */ j .L800F6188 /* 8F5AC 800F60FC AD240004 */ sw $a0, 4($t1) .L800F6100: -/* 8F5B0 800F6100 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 8F5B4 800F6104 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 8F5B0 800F6100 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 8F5B4 800F6104 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 8F5B8 800F6108 8C620000 */ lw $v0, ($v1) /* 8F5BC 800F610C 3C06F200 */ lui $a2, 0xf200 /* 8F5C0 800F6110 0040382D */ daddu $a3, $v0, $zero @@ -984,8 +984,8 @@ glabel draw_box /* 8F638 800F6188 8FB9013C */ lw $t9, 0x13c($sp) /* 8F63C 800F618C 132003C4 */ beqz $t9, .L800F70A0 /* 8F640 800F6190 0000682D */ daddu $t5, $zero, $zero -/* 8F644 800F6194 3C0C800A */ lui $t4, %hi(D_8009A66C) -/* 8F648 800F6198 258CA66C */ addiu $t4, $t4, %lo(D_8009A66C) +/* 8F644 800F6194 3C0C800A */ lui $t4, %hi(gMasterGfxPos) +/* 8F648 800F6198 258CA66C */ addiu $t4, $t4, %lo(gMasterGfxPos) /* 8F64C 800F619C 240F01FF */ addiu $t7, $zero, 0x1ff /* 8F650 800F61A0 31F40100 */ andi $s4, $t7, 0x100 /* 8F654 800F61A4 3C120708 */ lui $s2, 0x708 @@ -1124,7 +1124,7 @@ glabel draw_box /* 8F85C 800F63AC 11D900E6 */ beq $t6, $t9, .L800F6748 /* 8F860 800F63B0 240E0002 */ addiu $t6, $zero, 2 /* 8F864 800F63B4 0803DA1C */ j .L800F6870 -/* 8F868 800F63B8 00000000 */ nop +/* 8F868 800F63B8 00000000 */ nop .L800F63BC: /* 8F86C 800F63BC 000A2842 */ srl $a1, $t2, 1 /* 8F870 800F63C0 24A2FFFF */ addiu $v0, $a1, -1 @@ -1440,13 +1440,13 @@ glabel draw_box /* 8FD30 800F6880 11AF0008 */ beq $t5, $t7, .L800F68A4 /* 8FD34 800F6884 3C0EF200 */ lui $t6, 0xf200 /* 8FD38 800F6888 0803DA6C */ j .L800F69B0 -/* 8FD3C 800F688C 00000000 */ nop +/* 8FD3C 800F688C 00000000 */ nop .L800F6890: /* 8FD40 800F6890 24120003 */ addiu $s2, $zero, 3 /* 8FD44 800F6894 11B2002E */ beq $t5, $s2, .L800F6950 /* 8FD48 800F6898 3C0EF200 */ lui $t6, 0xf200 /* 8FD4C 800F689C 0803DA6C */ j .L800F69B0 -/* 8FD50 800F68A0 00000000 */ nop +/* 8FD50 800F68A0 00000000 */ nop .L800F68A4: /* 8FD54 800F68A4 8D820000 */ lw $v0, ($t4) /* 8FD58 800F68A8 0040182D */ daddu $v1, $v0, $zero @@ -1680,16 +1680,16 @@ glabel draw_box /* 900BC 800F6C0C 10400005 */ beqz $v0, .L800F6C24 /* 900C0 800F6C10 24190002 */ addiu $t9, $zero, 2 /* 900C4 800F6C14 11A00009 */ beqz $t5, .L800F6C3C -/* 900C8 800F6C18 00000000 */ nop +/* 900C8 800F6C18 00000000 */ nop /* 900CC 800F6C1C 0803DC1C */ j .L800F7070 -/* 900D0 800F6C20 00000000 */ nop +/* 900D0 800F6C20 00000000 */ nop .L800F6C24: /* 900D4 800F6C24 11B90082 */ beq $t5, $t9, .L800F6E30 /* 900D8 800F6C28 240E0003 */ addiu $t6, $zero, 3 /* 900DC 800F6C2C 11AE00C3 */ beq $t5, $t6, .L800F6F3C -/* 900E0 800F6C30 00000000 */ nop +/* 900E0 800F6C30 00000000 */ nop /* 900E4 800F6C34 0803DC1C */ j .L800F7070 -/* 900E8 800F6C38 00000000 */ nop +/* 900E8 800F6C38 00000000 */ nop .L800F6C3C: /* 900EC 800F6C3C 8D830000 */ lw $v1, ($t4) /* 900F0 800F6C40 24620008 */ addiu $v0, $v1, 8 @@ -1900,7 +1900,7 @@ glabel draw_box /* 903AC 800F6EFC 8FB20168 */ lw $s2, 0x168($sp) /* 903B0 800F6F00 00121080 */ sll $v0, $s2, 2 /* 903B4 800F6F04 0441000A */ bgez $v0, .L800F6F30 -/* 903B8 800F6F08 00000000 */ nop +/* 903B8 800F6F08 00000000 */ nop /* 903BC 800F6F0C 8FB90174 */ lw $t9, 0x174($sp) /* 903C0 800F6F10 001911C3 */ sra $v0, $t9, 7 /* 903C4 800F6F14 5C400001 */ bgtzl $v0, .L800F6F1C @@ -1979,7 +1979,7 @@ glabel draw_box /* 904BC 800F700C 8FB90168 */ lw $t9, 0x168($sp) /* 904C0 800F7010 00191080 */ sll $v0, $t9, 2 /* 904C4 800F7014 0441000A */ bgez $v0, .L800F7040 -/* 904C8 800F7018 00000000 */ nop +/* 904C8 800F7018 00000000 */ nop /* 904CC 800F701C 8FAE0174 */ lw $t6, 0x174($sp) /* 904D0 800F7020 000E11C3 */ sra $v0, $t6, 7 /* 904D4 800F7024 5C400001 */ bgtzl $v0, .L800F702C @@ -2026,8 +2026,8 @@ glabel draw_box /* 90560 800F70B0 3C070100 */ lui $a3, 0x100 /* 90564 800F70B4 34E74008 */ ori $a3, $a3, 0x4008 /* 90568 800F70B8 3C080600 */ lui $t0, 0x600 -/* 9056C 800F70BC 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 90570 800F70C0 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 9056C 800F70BC 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 90570 800F70C0 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 90574 800F70C4 8FAF0204 */ lw $t7, 0x204($sp) /* 90578 800F70C8 8CC50000 */ lw $a1, ($a2) /* 9057C 800F70CC 000F2023 */ negu $a0, $t7 @@ -2078,8 +2078,8 @@ glabel draw_box /* 90630 800F7180 0803DCBA */ j .L800F72E8 /* 90634 800F7184 ACA20004 */ sw $v0, 4($a1) .L800F7188: -/* 90638 800F7188 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 9063C 800F718C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 90638 800F7188 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 9063C 800F718C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 90640 800F7190 8C640000 */ lw $a0, ($v1) /* 90644 800F7194 24820008 */ addiu $v0, $a0, 8 /* 90648 800F7198 AC620000 */ sw $v0, ($v1) @@ -2128,8 +2128,8 @@ glabel draw_box /* 906E0 800F7230 00821025 */ or $v0, $a0, $v0 /* 906E4 800F7234 AC620000 */ sw $v0, ($v1) .L800F7238: -/* 906E8 800F7238 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 906EC 800F723C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 906E8 800F7238 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 906EC 800F723C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 906F0 800F7240 8C620000 */ lw $v0, ($v1) /* 906F4 800F7244 0040202D */ daddu $a0, $v0, $zero /* 906F8 800F7248 24420008 */ addiu $v0, $v0, 8 @@ -2167,8 +2167,8 @@ glabel draw_box /* 90768 800F72B8 AC820000 */ sw $v0, ($a0) /* 9076C 800F72BC 3C050400 */ lui $a1, 0x400 .L800F72C0: -/* 90770 800F72C0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 90774 800F72C4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 90770 800F72C0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 90774 800F72C4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 90778 800F72C8 8C620000 */ lw $v0, ($v1) /* 9077C 800F72CC 34A50400 */ ori $a1, $a1, 0x400 /* 90780 800F72D0 0040202D */ daddu $a0, $v0, $zero @@ -2178,8 +2178,8 @@ glabel draw_box /* 90790 800F72E0 AC820000 */ sw $v0, ($a0) /* 90794 800F72E4 AC850004 */ sw $a1, 4($a0) .L800F72E8: -/* 90798 800F72E8 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 9079C 800F72EC 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 90798 800F72E8 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 9079C 800F72EC 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 907A0 800F72F0 8C620000 */ lw $v0, ($v1) /* 907A4 800F72F4 0040202D */ daddu $a0, $v0, $zero /* 907A8 800F72F8 24420008 */ addiu $v0, $v0, 8 @@ -2191,8 +2191,8 @@ glabel draw_box .L800F7310: /* 907C0 800F7310 37390C00 */ ori $t9, $t9, 0xc00 /* 907C4 800F7314 3C0EE300 */ lui $t6, 0xe300 -/* 907C8 800F7318 3C18800A */ lui $t8, %hi(D_8009A66C) -/* 907CC 800F731C 2718A66C */ addiu $t8, $t8, %lo(D_8009A66C) +/* 907C8 800F7318 3C18800A */ lui $t8, %hi(gMasterGfxPos) +/* 907CC 800F731C 2718A66C */ addiu $t8, $t8, %lo(gMasterGfxPos) /* 907D0 800F7320 AFB9017C */ sw $t9, 0x17c($sp) /* 907D4 800F7324 8F020000 */ lw $v0, ($t8) /* 907D8 800F7328 35CE0A01 */ ori $t6, $t6, 0xa01 @@ -2208,9 +2208,9 @@ glabel draw_box /* 90800 800F7350 AC400004 */ sw $zero, 4($v0) /* 90804 800F7354 8FAF0228 */ lw $t7, 0x228($sp) /* 90808 800F7358 11E001CC */ beqz $t7, .L800F7A8C -/* 9080C 800F735C 00000000 */ nop +/* 9080C 800F735C 00000000 */ nop /* 90810 800F7360 13C001BE */ beqz $fp, .L800F7A5C -/* 90814 800F7364 00000000 */ nop +/* 90814 800F7364 00000000 */ nop /* 90818 800F7368 8FAE0204 */ lw $t6, 0x204($sp) /* 9081C 800F736C 8FAF0208 */ lw $t7, 0x208($sp) /* 90820 800F7370 01CF0018 */ mult $t6, $t7 @@ -2306,7 +2306,7 @@ glabel draw_box /* 90988 800F74D8 468010A0 */ cvt.s.w $f2, $f2 /* 9098C 800F74DC 25220040 */ addiu $v0, $t1, 0x40 /* 90990 800F74E0 46041082 */ mul.s $f2, $f2, $f4 -/* 90994 800F74E4 00000000 */ nop +/* 90994 800F74E4 00000000 */ nop /* 90998 800F74E8 AF020000 */ sw $v0, ($t8) /* 9099C 800F74EC 8FAE0180 */ lw $t6, 0x180($sp) /* 909A0 800F74F0 AD20003C */ sw $zero, 0x3c($t1) @@ -2314,35 +2314,35 @@ glabel draw_box /* 909A8 800F74F8 C7A00208 */ lwc1 $f0, 0x208($sp) /* 909AC 800F74FC 46800020 */ cvt.s.w $f0, $f0 /* 909B0 800F7500 46040002 */ mul.s $f0, $f0, $f4 -/* 909B4 800F7504 00000000 */ nop +/* 909B4 800F7504 00000000 */ nop /* 909B8 800F7508 4600118D */ trunc.w.s $f6, $f2 /* 909BC 800F750C 44033000 */ mfc1 $v1, $f6 -/* 909C0 800F7510 00000000 */ nop +/* 909C0 800F7510 00000000 */ nop /* 909C4 800F7514 30630FFF */ andi $v1, $v1, 0xfff /* 909C8 800F7518 00031B00 */ sll $v1, $v1, 0xc /* 909CC 800F751C C7A20184 */ lwc1 $f2, 0x184($sp) /* 909D0 800F7520 468010A0 */ cvt.s.w $f2, $f2 /* 909D4 800F7524 46041082 */ mul.s $f2, $f2, $f4 -/* 909D8 800F7528 00000000 */ nop +/* 909D8 800F7528 00000000 */ nop /* 909DC 800F752C 4600018D */ trunc.w.s $f6, $f0 /* 909E0 800F7530 44023000 */ mfc1 $v0, $f6 -/* 909E4 800F7534 00000000 */ nop +/* 909E4 800F7534 00000000 */ nop /* 909E8 800F7538 30420FFF */ andi $v0, $v0, 0xfff /* 909EC 800F753C 00621825 */ or $v1, $v1, $v0 /* 909F0 800F7540 448A0000 */ mtc1 $t2, $f0 -/* 909F4 800F7544 00000000 */ nop +/* 909F4 800F7544 00000000 */ nop /* 909F8 800F7548 46800020 */ cvt.s.w $f0, $f0 /* 909FC 800F754C 46040002 */ mul.s $f0, $f0, $f4 -/* 90A00 800F7550 00000000 */ nop +/* 90A00 800F7550 00000000 */ nop /* 90A04 800F7554 AD230004 */ sw $v1, 4($t1) /* 90A08 800F7558 4600118D */ trunc.w.s $f6, $f2 /* 90A0C 800F755C 44023000 */ mfc1 $v0, $f6 -/* 90A10 800F7560 00000000 */ nop +/* 90A10 800F7560 00000000 */ nop /* 90A14 800F7564 30420FFF */ andi $v0, $v0, 0xfff /* 90A18 800F7568 00021300 */ sll $v0, $v0, 0xc /* 90A1C 800F756C 4600018D */ trunc.w.s $f6, $f0 /* 90A20 800F7570 44033000 */ mfc1 $v1, $f6 -/* 90A24 800F7574 00000000 */ nop +/* 90A24 800F7574 00000000 */ nop /* 90A28 800F7578 30630FFF */ andi $v1, $v1, 0xfff /* 90A2C 800F757C 00431025 */ or $v0, $v0, $v1 /* 90A30 800F7580 AD220034 */ sw $v0, 0x34($t1) @@ -2463,16 +2463,16 @@ glabel draw_box /* 90BFC 800F774C 00431021 */ addu $v0, $v0, $v1 /* 90C00 800F7750 00021043 */ sra $v0, $v0, 1 /* 90C04 800F7754 44823000 */ mtc1 $v0, $f6 -/* 90C08 800F7758 00000000 */ nop +/* 90C08 800F7758 00000000 */ nop /* 90C0C 800F775C 468031A0 */ cvt.s.w $f6, $f6 /* 90C10 800F7760 44063000 */ mfc1 $a2, $f6 /* 90C14 800F7764 0C019E40 */ jal guTranslateF /* 90C18 800F7768 00A0382D */ daddu $a3, $a1, $zero /* 90C1C 800F776C 0200202D */ daddu $a0, $s0, $zero -/* 90C20 800F7770 3C108007 */ lui $s0, %hi(D_800741F0) -/* 90C24 800F7774 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 90C28 800F7778 3C11800A */ lui $s1, %hi(D_8009A674) -/* 90C2C 800F777C 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 90C20 800F7770 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 90C24 800F7774 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 90C28 800F7778 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 90C2C 800F777C 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 90C30 800F7780 96050000 */ lhu $a1, ($s0) /* 90C34 800F7784 8E220000 */ lw $v0, ($s1) /* 90C38 800F7788 8FAE0190 */ lw $t6, 0x190($sp) @@ -2657,7 +2657,7 @@ glabel draw_box /* 90EFC 800F7A4C 1440FF92 */ bnez $v0, .L800F7898 /* 90F00 800F7A50 AC6B0050 */ sw $t3, 0x50($v1) /* 90F04 800F7A54 0803DEA3 */ j .L800F7A8C -/* 90F08 800F7A58 00000000 */ nop +/* 90F08 800F7A58 00000000 */ nop .L800F7A5C: /* 90F0C 800F7A5C 93A200E7 */ lbu $v0, 0xe7($sp) /* 90F10 800F7A60 8FA4022C */ lw $a0, 0x22c($sp) @@ -2676,8 +2676,8 @@ glabel draw_box /* 90F40 800F7A90 3C03D838 */ lui $v1, 0xd838 /* 90F44 800F7A94 34630002 */ ori $v1, $v1, 2 /* 90F48 800F7A98 3C06E300 */ lui $a2, 0xe300 -/* 90F4C 800F7A9C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 90F50 800F7AA0 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 90F4C 800F7A9C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 90F50 800F7AA0 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 90F54 800F7AA4 8C820000 */ lw $v0, ($a0) /* 90F58 800F7AA8 34C60C00 */ ori $a2, $a2, 0xc00 /* 90F5C 800F7AAC 0040282D */ daddu $a1, $v0, $zero @@ -2713,5 +2713,5 @@ glabel draw_box /* 90FCC 800F7B1C D7B401D8 */ ldc1 $f20, 0x1d8($sp) /* 90FD0 800F7B20 03E00008 */ jr $ra /* 90FD4 800F7B24 27BD01F0 */ addiu $sp, $sp, 0x1f0 -/* 90FD8 800F7B28 00000000 */ nop -/* 90FDC 800F7B2C 00000000 */ nop +/* 90FD8 800F7B28 00000000 */ nop +/* 90FDC 800F7B2C 00000000 */ nop diff --git a/asm/nonmatchings/code_B9D60/_draw_message_box.s b/asm/nonmatchings/code_B9D60/_draw_message_box.s index f9fc6677a5..4d5911bb63 100644 --- a/asm/nonmatchings/code_B9D60/_draw_message_box.s +++ b/asm/nonmatchings/code_B9D60/_draw_message_box.s @@ -35,12 +35,12 @@ glabel _draw_message_box /* C3380 8012CC80 44801000 */ mtc1 $zero, $f2 /* C3384 8012CC84 4600B021 */ cvt.d.s $f0, $f22 /* C3388 8012CC88 46220032 */ c.eq.d $f0, $f2 -/* C338C 8012CC8C 00000000 */ nop +/* C338C 8012CC8C 00000000 */ nop /* C3390 8012CC90 45000019 */ bc1f .L8012CCF8 /* C3394 8012CC94 27A40020 */ addiu $a0, $sp, 0x20 /* C3398 8012CC98 4600A021 */ cvt.d.s $f0, $f20 /* C339C 8012CC9C 46220032 */ c.eq.d $f0, $f2 -/* C33A0 8012CCA0 00000000 */ nop +/* C33A0 8012CCA0 00000000 */ nop /* C33A4 8012CCA4 45000013 */ bc1f .L8012CCF4 /* C33A8 8012CCA8 24040020 */ addiu $a0, $zero, 0x20 /* C33AC 8012CCAC 24050080 */ addiu $a1, $zero, 0x80 @@ -67,14 +67,14 @@ glabel _draw_message_box /* C33F8 8012CCF8 00111400 */ sll $v0, $s1, 0x10 /* C33FC 8012CCFC 00021403 */ sra $v0, $v0, 0x10 /* C3400 8012CD00 44822000 */ mtc1 $v0, $f4 -/* C3404 8012CD04 00000000 */ nop +/* C3404 8012CD04 00000000 */ nop /* C3408 8012CD08 46802120 */ cvt.s.w $f4, $f4 /* C340C 8012CD0C 00121400 */ sll $v0, $s2, 0x10 /* C3410 8012CD10 00021403 */ sra $v0, $v0, 0x10 /* C3414 8012CD14 00021023 */ negu $v0, $v0 /* C3418 8012CD18 44052000 */ mfc1 $a1, $f4 /* C341C 8012CD1C 44822000 */ mtc1 $v0, $f4 -/* C3420 8012CD20 00000000 */ nop +/* C3420 8012CD20 00000000 */ nop /* C3424 8012CD24 46802120 */ cvt.s.w $f4, $f4 /* C3428 8012CD28 0000382D */ daddu $a3, $zero, $zero /* C342C 8012CD2C 3C038015 */ lui $v1, %hi(D_8014C3C0) @@ -114,12 +114,12 @@ glabel _draw_message_box /* C34B4 8012CDB4 44801000 */ mtc1 $zero, $f2 /* C34B8 8012CDB8 4600B021 */ cvt.d.s $f0, $f22 /* C34BC 8012CDBC 46220032 */ c.eq.d $f0, $f2 -/* C34C0 8012CDC0 00000000 */ nop +/* C34C0 8012CDC0 00000000 */ nop /* C34C4 8012CDC4 45000007 */ bc1f .L8012CDE4 /* C34C8 8012CDC8 27B00060 */ addiu $s0, $sp, 0x60 /* C34CC 8012CDCC 4600A021 */ cvt.d.s $f0, $f20 /* C34D0 8012CDD0 46220032 */ c.eq.d $f0, $f2 -/* C34D4 8012CDD4 00000000 */ nop +/* C34D4 8012CDD4 00000000 */ nop /* C34D8 8012CDD8 4501000C */ bc1t .L8012CE0C /* C34DC 8012CDDC 3C120001 */ lui $s2, 1 /* C34E0 8012CDE0 27B00060 */ addiu $s0, $sp, 0x60 @@ -137,10 +137,10 @@ glabel _draw_message_box .L8012CE0C: /* C350C 8012CE0C 36521630 */ ori $s2, $s2, 0x1630 /* C3510 8012CE10 27A40020 */ addiu $a0, $sp, 0x20 -/* C3514 8012CE14 3C108007 */ lui $s0, %hi(D_800741F0) -/* C3518 8012CE18 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* C351C 8012CE1C 3C11800A */ lui $s1, %hi(D_8009A674) -/* C3520 8012CE20 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* C3514 8012CE14 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* C3518 8012CE18 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* C351C 8012CE1C 3C11800A */ lui $s1, %hi(gDisplayContext) +/* C3520 8012CE20 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* C3524 8012CE24 96050000 */ lhu $a1, ($s0) /* C3528 8012CE28 8E220000 */ lw $v0, ($s1) /* C352C 8012CE2C 00052980 */ sll $a1, $a1, 6 @@ -162,8 +162,8 @@ glabel _draw_message_box /* C356C 8012CE6C 3C0AD700 */ lui $t2, 0xd700 /* C3570 8012CE70 354A0002 */ ori $t2, $t2, 2 /* C3574 8012CE74 3C0BE300 */ lui $t3, 0xe300 -/* C3578 8012CE78 3C0D800A */ lui $t5, %hi(D_8009A66C) -/* C357C 8012CE7C 25ADA66C */ addiu $t5, $t5, %lo(D_8009A66C) +/* C3578 8012CE78 3C0D800A */ lui $t5, %hi(gMasterGfxPos) +/* C357C 8012CE7C 25ADA66C */ addiu $t5, $t5, %lo(gMasterGfxPos) /* C3580 8012CE80 356B0C00 */ ori $t3, $t3, 0xc00 /* C3584 8012CE84 8DAC0000 */ lw $t4, ($t5) /* C3588 8012CE88 96020000 */ lhu $v0, ($s0) @@ -243,8 +243,8 @@ glabel _draw_message_box /* C36A8 8012CFA8 3C08FCFF */ lui $t0, 0xfcff /* C36AC 8012CFAC 3508FFFF */ ori $t0, $t0, 0xffff /* C36B0 8012CFB0 3C06FFFC */ lui $a2, 0xfffc -/* C36B4 8012CFB4 3C04800A */ lui $a0, %hi(D_8009A66C) -/* C36B8 8012CFB8 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* C36B4 8012CFB4 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* C36B8 8012CFB8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* C36BC 8012CFBC 8C820000 */ lw $v0, ($a0) /* C36C0 8012CFC0 34C6F279 */ ori $a2, $a2, 0xf279 /* C36C4 8012CFC4 0040182D */ daddu $v1, $v0, $zero @@ -266,8 +266,8 @@ glabel _draw_message_box /* C3700 8012D000 3C07FF2C */ lui $a3, 0xff2c /* C3704 8012D004 34E7FE7F */ ori $a3, $a3, 0xfe7f /* C3708 8012D008 3C052020 */ lui $a1, 0x2020 -/* C370C 8012D00C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* C3710 8012D010 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* C370C 8012D00C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* C3710 8012D010 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* C3714 8012D014 34A52000 */ ori $a1, $a1, 0x2000 /* C3718 8012D018 8C820000 */ lw $v0, ($a0) /* C371C 8012D01C 01452825 */ or $a1, $t2, $a1 @@ -325,8 +325,8 @@ glabel _draw_message_box /* C37E8 8012D0E8 3C140001 */ lui $s4, 1 /* C37EC 8012D0EC 36948030 */ ori $s4, $s4, 0x8030 /* C37F0 8012D0F0 3C180001 */ lui $t8, 1 -/* C37F4 8012D0F4 3C04800A */ lui $a0, %hi(D_8009A66C) -/* C37F8 8012D0F8 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* C37F4 8012D0F4 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* C37F8 8012D0F8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* C37FC 8012D0FC 3718C0FC */ ori $t8, $t8, 0xc0fc /* C3800 8012D100 8C820000 */ lw $v0, ($a0) /* C3804 8012D104 3C08E600 */ lui $t0, 0xe600 diff --git a/asm/nonmatchings/code_B9D60/appendGfx_item_entity.s b/asm/nonmatchings/code_B9D60/appendGfx_item_entity.s index 012eb9b6c9..71e3d3d6b0 100644 --- a/asm/nonmatchings/code_B9D60/appendGfx_item_entity.s +++ b/asm/nonmatchings/code_B9D60/appendGfx_item_entity.s @@ -26,7 +26,7 @@ glabel appendGfx_item_entity /* C88F8 801321F8 00540018 */ mult $v0, $s4 /* C88FC 801321FC 00001012 */ mflo $v0 /* C8900 80132200 34638081 */ ori $v1, $v1, 0x8081 -/* C8904 80132204 00000000 */ nop +/* C8904 80132204 00000000 */ nop /* C8908 80132208 00430018 */ mult $v0, $v1 /* C890C 8013220C 00001810 */ mfhi $v1 /* C8910 80132210 00621821 */ addu $v1, $v1, $v0 @@ -70,11 +70,11 @@ glabel appendGfx_item_entity /* C899C 8013229C 10620003 */ beq $v1, $v0, .L801322AC /* C89A0 801322A0 24020156 */ addiu $v0, $zero, 0x156 /* C89A4 801322A4 14620005 */ bne $v1, $v0, .L801322BC -/* C89A8 801322A8 00000000 */ nop +/* C89A8 801322A8 00000000 */ nop .L801322AC: /* C89AC 801322AC 3C013F80 */ lui $at, 0x3f80 /* C89B0 801322B0 44810000 */ mtc1 $at, $f0 -/* C89B4 801322B4 00000000 */ nop +/* C89B4 801322B4 00000000 */ nop /* C89B8 801322B8 E6600030 */ swc1 $f0, 0x30($s3) .L801322BC: /* C89BC 801322BC 3C03800A */ lui $v1, %hi(D_8009A634) @@ -97,7 +97,7 @@ glabel appendGfx_item_entity /* C8A00 80132300 0240202D */ daddu $a0, $s2, $zero /* C8A04 80132304 C664000C */ lwc1 $f4, 0xc($s3) /* C8A08 80132308 44901000 */ mtc1 $s0, $f2 -/* C8A0C 8013230C 00000000 */ nop +/* C8A0C 8013230C 00000000 */ nop /* C8A10 80132310 468010A0 */ cvt.s.w $f2, $f2 /* C8A14 80132314 46022100 */ add.s $f4, $f4, $f2 /* C8A18 80132318 8E650008 */ lw $a1, 8($s3) @@ -138,10 +138,10 @@ glabel appendGfx_item_entity /* C8AA0 801323A0 34421630 */ ori $v0, $v0, 0x1630 /* C8AA4 801323A4 27A70018 */ addiu $a3, $sp, 0x18 /* C8AA8 801323A8 0240282D */ daddu $a1, $s2, $zero -/* C8AAC 801323AC 3C038007 */ lui $v1, %hi(D_800741F0) -/* C8AB0 801323B0 946341F0 */ lhu $v1, %lo(D_800741F0)($v1) -/* C8AB4 801323B4 3C04800A */ lui $a0, %hi(D_8009A674) -/* C8AB8 801323B8 8C84A674 */ lw $a0, %lo(D_8009A674)($a0) +/* C8AAC 801323AC 3C038007 */ lui $v1, %hi(gMatrixListPos) +/* C8AB0 801323B0 946341F0 */ lhu $v1, %lo(gMatrixListPos)($v1) +/* C8AB4 801323B4 3C04800A */ lui $a0, %hi(gDisplayContext) +/* C8AB8 801323B8 8C84A674 */ lw $a0, %lo(gDisplayContext)($a0) /* C8ABC 801323BC 00031980 */ sll $v1, $v1, 6 /* C8AC0 801323C0 00832021 */ addu $a0, $a0, $v1 /* C8AC4 801323C4 00822021 */ addu $a0, $a0, $v0 @@ -160,11 +160,11 @@ glabel appendGfx_item_entity /* C8AF4 801323F4 3C02DA38 */ lui $v0, 0xda38 /* C8AF8 801323F8 34420002 */ ori $v0, $v0, 2 /* C8AFC 801323FC 3C050001 */ lui $a1, 1 -/* C8B00 80132400 3C09800A */ lui $t1, %hi(D_8009A66C) -/* C8B04 80132404 2529A66C */ addiu $t1, $t1, %lo(D_8009A66C) +/* C8B00 80132400 3C09800A */ lui $t1, %hi(gMasterGfxPos) +/* C8B04 80132404 2529A66C */ addiu $t1, $t1, %lo(gMasterGfxPos) /* C8B08 80132408 34A51630 */ ori $a1, $a1, 0x1630 -/* C8B0C 8013240C 3C078007 */ lui $a3, %hi(D_800741F0) -/* C8B10 80132410 24E741F0 */ addiu $a3, $a3, %lo(D_800741F0) +/* C8B0C 8013240C 3C078007 */ lui $a3, %hi(gMatrixListPos) +/* C8B10 80132410 24E741F0 */ addiu $a3, $a3, %lo(gMatrixListPos) /* C8B14 80132414 8D280000 */ lw $t0, ($t1) /* C8B18 80132418 94E40000 */ lhu $a0, ($a3) /* C8B1C 8013241C 0100302D */ daddu $a2, $t0, $zero @@ -174,8 +174,8 @@ glabel appendGfx_item_entity /* C8B2C 8013242C 00651821 */ addu $v1, $v1, $a1 /* C8B30 80132430 AD280000 */ sw $t0, ($t1) /* C8B34 80132434 ACC20000 */ sw $v0, ($a2) -/* C8B38 80132438 3C02800A */ lui $v0, %hi(D_8009A674) -/* C8B3C 8013243C 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* C8B38 80132438 3C02800A */ lui $v0, %hi(gDisplayContext) +/* C8B3C 8013243C 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* C8B40 80132440 3C058015 */ lui $a1, %hi(D_80151328) /* C8B44 80132444 8CA51328 */ lw $a1, %lo(D_80151328)($a1) /* C8B48 80132448 00431021 */ addu $v0, $v0, $v1 @@ -202,8 +202,8 @@ glabel appendGfx_item_entity /* C8B98 80132498 AD020004 */ sw $v0, 4($t0) .L8013249C: /* C8B9C 8013249C 3C03D9FD */ lui $v1, 0xd9fd -/* C8BA0 801324A0 3C08800A */ lui $t0, %hi(D_8009A66C) -/* C8BA4 801324A4 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* C8BA0 801324A0 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* C8BA4 801324A4 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* C8BA8 801324A8 8D070000 */ lw $a3, ($t0) /* C8BAC 801324AC 3463F9FF */ ori $v1, $v1, 0xf9ff /* C8BB0 801324B0 00E0102D */ daddu $v0, $a3, $zero @@ -222,7 +222,7 @@ glabel appendGfx_item_entity /* C8BE4 801324E4 3C030808 */ lui $v1, 0x808 /* C8BE8 801324E8 00431024 */ and $v0, $v0, $v1 /* C8BEC 801324EC 10400025 */ beqz $v0, .L80132584 -/* C8BF0 801324F0 00000000 */ nop +/* C8BF0 801324F0 00000000 */ nop /* C8BF4 801324F4 3C028015 */ lui $v0, %hi(D_80151328) /* C8BF8 801324F8 8C421328 */ lw $v0, %lo(D_80151328)($v0) /* C8BFC 801324FC 94420000 */ lhu $v0, ($v0) @@ -268,8 +268,8 @@ glabel appendGfx_item_entity /* C8C94 80132594 3C05F500 */ lui $a1, 0xf500 /* C8C98 80132598 34A50100 */ ori $a1, $a1, 0x100 /* C8C9C 8013259C 3C060703 */ lui $a2, 0x703 -/* C8CA0 801325A0 3C0F800A */ lui $t7, %hi(D_8009A66C) -/* C8CA4 801325A4 25EFA66C */ addiu $t7, $t7, %lo(D_8009A66C) +/* C8CA0 801325A0 3C0F800A */ lui $t7, %hi(gMasterGfxPos) +/* C8CA4 801325A4 25EFA66C */ addiu $t7, $t7, %lo(gMasterGfxPos) /* C8CA8 801325A8 34C6C000 */ ori $a2, $a2, 0xc000 /* C8CAC 801325AC 3C02FD10 */ lui $v0, 0xfd10 /* C8CB0 801325B0 8DEE0000 */ lw $t6, ($t7) @@ -397,7 +397,7 @@ glabel appendGfx_item_entity /* C8E98 80132798 0C052479 */ jal func_801491E4 /* C8E9C 8013279C AFB40014 */ sw $s4, 0x14($sp) /* C8EA0 801327A0 0804CA27 */ j .L8013289C -/* C8EA4 801327A4 00000000 */ nop +/* C8EA4 801327A4 00000000 */ nop .L801327A8: /* C8EA8 801327A8 0000282D */ daddu $a1, $zero, $zero /* C8EAC 801327AC 00A0302D */ daddu $a2, $a1, $zero @@ -408,7 +408,7 @@ glabel appendGfx_item_entity /* C8EC0 801327C0 0C052479 */ jal func_801491E4 /* C8EC4 801327C4 AFA20014 */ sw $v0, 0x14($sp) /* C8EC8 801327C8 0804CA27 */ j .L8013289C -/* C8ECC 801327CC 00000000 */ nop +/* C8ECC 801327CC 00000000 */ nop .L801327D0: /* C8ED0 801327D0 3C03FD48 */ lui $v1, 0xfd48 /* C8ED4 801327D4 3463000B */ ori $v1, $v1, 0xb @@ -462,8 +462,8 @@ glabel appendGfx_item_entity /* C8F94 80132894 ADC6005C */ sw $a2, 0x5c($t6) /* C8F98 80132898 ADC3002C */ sw $v1, 0x2c($t6) .L8013289C: -/* C8F9C 8013289C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* C8FA0 801328A0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* C8F9C 8013289C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* C8FA0 801328A0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* C8FA4 801328A4 8C620000 */ lw $v0, ($v1) /* C8FA8 801328A8 0040202D */ daddu $a0, $v0, $zero /* C8FAC 801328AC 24420008 */ addiu $v0, $v0, 8 @@ -477,8 +477,8 @@ glabel appendGfx_item_entity .L801328CC: /* C8FCC 801328CC 34A50100 */ ori $a1, $a1, 0x100 /* C8FD0 801328D0 3C060703 */ lui $a2, 0x703 -/* C8FD4 801328D4 3C0F800A */ lui $t7, %hi(D_8009A66C) -/* C8FD8 801328D8 25EFA66C */ addiu $t7, $t7, %lo(D_8009A66C) +/* C8FD4 801328D4 3C0F800A */ lui $t7, %hi(gMasterGfxPos) +/* C8FD8 801328D8 25EFA66C */ addiu $t7, $t7, %lo(gMasterGfxPos) /* C8FDC 801328DC 34C6C000 */ ori $a2, $a2, 0xc000 /* C8FE0 801328E0 3C02FD10 */ lui $v0, 0xfd10 /* C8FE4 801328E4 8DEE0000 */ lw $t6, ($t7) @@ -606,7 +606,7 @@ glabel appendGfx_item_entity /* C91CC 80132ACC 0C052479 */ jal func_801491E4 /* C91D0 80132AD0 AFB40014 */ sw $s4, 0x14($sp) /* C91D4 80132AD4 0804CAF4 */ j .L80132BD0 -/* C91D8 80132AD8 00000000 */ nop +/* C91D8 80132AD8 00000000 */ nop .L80132ADC: /* C91DC 80132ADC 0000282D */ daddu $a1, $zero, $zero /* C91E0 80132AE0 00A0302D */ daddu $a2, $a1, $zero @@ -617,7 +617,7 @@ glabel appendGfx_item_entity /* C91F4 80132AF4 0C052479 */ jal func_801491E4 /* C91F8 80132AF8 AFA20014 */ sw $v0, 0x14($sp) /* C91FC 80132AFC 0804CAF4 */ j .L80132BD0 -/* C9200 80132B00 00000000 */ nop +/* C9200 80132B00 00000000 */ nop .L80132B04: /* C9204 80132B04 3C03FD48 */ lui $v1, 0xfd48 /* C9208 80132B08 3463000F */ ori $v1, $v1, 0xf @@ -671,8 +671,8 @@ glabel appendGfx_item_entity /* C92C8 80132BC8 ADC6005C */ sw $a2, 0x5c($t6) /* C92CC 80132BCC ADC3002C */ sw $v1, 0x2c($t6) .L80132BD0: -/* C92D0 80132BD0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* C92D4 80132BD4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* C92D0 80132BD0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* C92D4 80132BD4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* C92D8 80132BD8 8C620000 */ lw $v0, ($v1) /* C92DC 80132BDC 0040202D */ daddu $a0, $v0, $zero /* C92E0 80132BE0 24420008 */ addiu $v0, $v0, 8 @@ -684,8 +684,8 @@ glabel appendGfx_item_entity /* C92F8 80132BF8 AC820004 */ sw $v0, 4($a0) .L80132BFC: /* C92FC 80132BFC 3C03D838 */ lui $v1, 0xd838 -/* C9300 80132C00 3C04800A */ lui $a0, %hi(D_8009A66C) -/* C9304 80132C04 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* C9300 80132C00 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* C9304 80132C04 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* C9308 80132C08 8C820000 */ lw $v0, ($a0) /* C930C 80132C0C 34630002 */ ori $v1, $v1, 2 /* C9310 80132C10 0040282D */ daddu $a1, $v0, $zero @@ -702,7 +702,7 @@ glabel appendGfx_item_entity /* C933C 80132C3C 86630018 */ lh $v1, 0x18($s3) /* C9340 80132C40 24020157 */ addiu $v0, $zero, 0x157 /* C9344 80132C44 14620003 */ bne $v1, $v0, .L80132C54 -/* C9348 80132C48 00000000 */ nop +/* C9348 80132C48 00000000 */ nop /* C934C 80132C4C 0C04C2C3 */ jal draw_coin_sparkles /* C9350 80132C50 0260202D */ daddu $a0, $s3, $zero .L80132C54: diff --git a/asm/nonmatchings/code_B9D60/draw_coin_sparkles.s b/asm/nonmatchings/code_B9D60/draw_coin_sparkles.s index a4dc28b01d..2422bca40b 100644 --- a/asm/nonmatchings/code_B9D60/draw_coin_sparkles.s +++ b/asm/nonmatchings/code_B9D60/draw_coin_sparkles.s @@ -38,15 +38,15 @@ glabel draw_coin_sparkles /* C7290 80130B90 3C028015 */ lui $v0, %hi(D_80155D8E) /* C7294 80130B94 84425D8E */ lh $v0, %lo(D_80155D8E)($v0) /* C7298 80130B98 4483C000 */ mtc1 $v1, $f24 -/* C729C 80130B9C 00000000 */ nop +/* C729C 80130B9C 00000000 */ nop /* C72A0 80130BA0 4680C620 */ cvt.s.w $f24, $f24 /* C72A4 80130BA4 3C038015 */ lui $v1, %hi(D_80155D90) /* C72A8 80130BA8 84635D90 */ lh $v1, %lo(D_80155D90)($v1) /* C72AC 80130BAC 4482A000 */ mtc1 $v0, $f20 -/* C72B0 80130BB0 00000000 */ nop +/* C72B0 80130BB0 00000000 */ nop /* C72B4 80130BB4 4680A520 */ cvt.s.w $f20, $f20 /* C72B8 80130BB8 4483B000 */ mtc1 $v1, $f22 -/* C72BC 80130BBC 00000000 */ nop +/* C72BC 80130BBC 00000000 */ nop /* C72C0 80130BC0 4680B5A0 */ cvt.s.w $f22, $f22 /* C72C4 80130BC4 0C00A6C9 */ jal clamp_angle /* C72C8 80130BC8 46006301 */ sub.s $f12, $f12, $f0 @@ -84,10 +84,10 @@ glabel draw_coin_sparkles /* C7348 80130C48 0C019D80 */ jal guMtxCatF /* C734C 80130C4C 0220302D */ daddu $a2, $s1, $zero /* C7350 80130C50 0220202D */ daddu $a0, $s1, $zero -/* C7354 80130C54 3C138007 */ lui $s3, %hi(D_800741F0) -/* C7358 80130C58 267341F0 */ addiu $s3, $s3, %lo(D_800741F0) -/* C735C 80130C5C 3C14800A */ lui $s4, %hi(D_8009A674) -/* C7360 80130C60 2694A674 */ addiu $s4, $s4, %lo(D_8009A674) +/* C7354 80130C54 3C138007 */ lui $s3, %hi(gMatrixListPos) +/* C7358 80130C58 267341F0 */ addiu $s3, $s3, %lo(gMatrixListPos) +/* C735C 80130C5C 3C14800A */ lui $s4, %hi(gDisplayContext) +/* C7360 80130C60 2694A674 */ addiu $s4, $s4, %lo(gDisplayContext) /* C7364 80130C64 96650000 */ lhu $a1, ($s3) /* C7368 80130C68 8E820000 */ lw $v0, ($s4) /* C736C 80130C6C 00052980 */ sll $a1, $a1, 6 @@ -131,8 +131,8 @@ glabel draw_coin_sparkles /* C7404 80130D04 3C0AE200 */ lui $t2, 0xe200 /* C7408 80130D08 354A1E01 */ ori $t2, $t2, 0x1e01 /* C740C 80130D0C 0000202D */ daddu $a0, $zero, $zero -/* C7410 80130D10 3C10800A */ lui $s0, %hi(D_8009A66C) -/* C7414 80130D14 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* C7410 80130D10 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* C7414 80130D14 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* C7418 80130D18 AFAA013C */ sw $t2, 0x13c($sp) /* C741C 80130D1C 8E030000 */ lw $v1, ($s0) /* C7420 80130D20 96620000 */ lhu $v0, ($s3) diff --git a/asm/nonmatchings/code_B9D60/draw_digit.s b/asm/nonmatchings/code_B9D60/draw_digit.s index 2d97456df6..1b18856b77 100644 --- a/asm/nonmatchings/code_B9D60/draw_digit.s +++ b/asm/nonmatchings/code_B9D60/draw_digit.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel draw_digit -/* BDBC0 801274C0 3C0A800A */ lui $t2, %hi(D_8009A66C) -/* BDBC4 801274C4 254AA66C */ addiu $t2, $t2, %lo(D_8009A66C) +/* BDBC0 801274C0 3C0A800A */ lui $t2, %hi(gMasterGfxPos) +/* BDBC4 801274C4 254AA66C */ addiu $t2, $t2, %lo(gMasterGfxPos) /* BDBC8 801274C8 3C028015 */ lui $v0, %hi(D_8014C340) /* BDBCC 801274CC 2442C340 */ addiu $v0, $v0, %lo(D_8014C340) /* BDBD0 801274D0 00054880 */ sll $t1, $a1, 2 diff --git a/asm/nonmatchings/code_B9D60/draw_number.s b/asm/nonmatchings/code_B9D60/draw_number.s index 2100874227..7a0eab5850 100644 --- a/asm/nonmatchings/code_B9D60/draw_number.s +++ b/asm/nonmatchings/code_B9D60/draw_number.s @@ -50,8 +50,8 @@ glabel draw_number /* BDE48 80127748 1440FFF4 */ bnez $v0, .L8012771C /* BDE4C 8012774C 00B01021 */ addu $v0, $a1, $s0 .L80127750: -/* BDE50 80127750 3C03800A */ lui $v1, %hi(D_8009A66C) -/* BDE54 80127754 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* BDE50 80127750 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* BDE54 80127754 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* BDE58 80127758 0240302D */ daddu $a2, $s2, $zero /* BDE5C 8012775C 8C620000 */ lw $v0, ($v1) /* BDE60 80127760 0040202D */ daddu $a0, $v0, $zero @@ -131,11 +131,11 @@ glabel draw_number /* BDF68 80127868 32220004 */ andi $v0, $s1, 4 .L8012786C: /* BDF6C 8012786C 10400038 */ beqz $v0, .L80127950 -/* BDF70 80127870 00000000 */ nop +/* BDF70 80127870 00000000 */ nop /* BDF74 80127874 1A600036 */ blez $s3, .L80127950 /* BDF78 80127878 0000802D */ daddu $s0, $zero, $zero -/* BDF7C 8012787C 3C11800A */ lui $s1, %hi(D_8009A66C) -/* BDF80 80127880 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* BDF7C 8012787C 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* BDF80 80127880 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* BDF84 80127884 3C12E700 */ lui $s2, 0xe700 /* BDF88 80127888 3C16E200 */ lui $s6, 0xe200 /* BDF8C 8012788C 36D6001C */ ori $s6, $s6, 0x1c @@ -199,8 +199,8 @@ glabel draw_number /* BE06C 8012796C 3C08FCFF */ lui $t0, 0xfcff /* BE070 80127970 3508FFFF */ ori $t0, $t0, 0xffff /* BE074 80127974 3C06FFFC */ lui $a2, 0xfffc -/* BE078 80127978 3C04800A */ lui $a0, %hi(D_8009A66C) -/* BE07C 8012797C 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* BE078 80127978 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* BE07C 8012797C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* BE080 80127980 8C820000 */ lw $v0, ($a0) /* BE084 80127984 34C6F279 */ ori $a2, $a2, 0xf279 /* BE088 80127988 0040182D */ daddu $v1, $v0, $zero @@ -220,8 +220,8 @@ glabel draw_number /* BE0BC 801279BC 3C08FCFF */ lui $t0, 0xfcff /* BE0C0 801279C0 3508B3FF */ ori $t0, $t0, 0xb3ff /* BE0C4 801279C4 3C06FF64 */ lui $a2, 0xff64 -/* BE0C8 801279C8 3C04800A */ lui $a0, %hi(D_8009A66C) -/* BE0CC 801279CC 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* BE0C8 801279C8 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* BE0CC 801279CC 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* BE0D0 801279D0 8C830000 */ lw $v1, ($a0) /* BE0D4 801279D4 34C6FE7F */ ori $a2, $a2, 0xfe7f /* BE0D8 801279D8 0060102D */ daddu $v0, $v1, $zero @@ -246,8 +246,8 @@ glabel draw_number /* BE120 80127A20 34E70100 */ ori $a3, $a3, 0x100 /* BE124 80127A24 3C080703 */ lui $t0, 0x703 /* BE128 80127A28 3508C000 */ ori $t0, $t0, 0xc000 -/* BE12C 80127A2C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* BE130 80127A30 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* BE12C 80127A2C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* BE130 80127A30 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* BE134 80127A34 0000802D */ daddu $s0, $zero, $zero /* BE138 80127A38 8C830000 */ lw $v1, ($a0) /* BE13C 80127A3C 3C02FD10 */ lui $v0, 0xfd10 @@ -309,8 +309,8 @@ glabel draw_number /* BE214 80127B14 1440FFF0 */ bnez $v0, .L80127AD8 /* BE218 80127B18 26310004 */ addiu $s1, $s1, 4 .L80127B1C: -/* BE21C 80127B1C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* BE220 80127B20 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* BE21C 80127B1C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* BE220 80127B20 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* BE224 80127B24 8C620000 */ lw $v0, ($v1) /* BE228 80127B28 0040202D */ daddu $a0, $v0, $zero /* BE22C 80127B2C 24420008 */ addiu $v0, $v0, 8 diff --git a/asm/nonmatchings/code_B9D60/func_80126790.s b/asm/nonmatchings/code_B9D60/func_80126790.s index 3a45c861dc..924e04ef04 100644 --- a/asm/nonmatchings/code_B9D60/func_80126790.s +++ b/asm/nonmatchings/code_B9D60/func_80126790.s @@ -8,8 +8,8 @@ glabel func_80126790 /* BCE9C 8012679C F7BC00E0 */ sdc1 $f28, 0xe0($sp) /* BCEA0 801267A0 3C013F80 */ lui $at, 0x3f80 /* BCEA4 801267A4 4481E000 */ mtc1 $at, $f28 -/* BCEA8 801267A8 3C05800A */ lui $a1, %hi(D_8009A66C) -/* BCEAC 801267AC 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* BCEA8 801267A8 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* BCEAC 801267AC 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* BCEB0 801267B0 F7B600C8 */ sdc1 $f22, 0xc8($sp) /* BCEB4 801267B4 3C01437F */ lui $at, 0x437f /* BCEB8 801267B8 4481B000 */ mtc1 $at, $f22 @@ -58,7 +58,7 @@ glabel func_80126790 /* BCF64 80126864 00220821 */ addu $at, $at, $v0 /* BCF68 80126868 8C2206F8 */ lw $v0, %lo(D_801506F8)($at) /* BCF6C 8012686C 00400008 */ jr $v0 -/* BCF70 80126870 00000000 */ nop +/* BCF70 80126870 00000000 */ nop /* BCF74 80126874 24020001 */ addiu $v0, $zero, 1 /* BCF78 80126878 A620047E */ sh $zero, 0x47e($s1) /* BCF7C 8012687C A6200480 */ sh $zero, 0x480($s1) @@ -67,11 +67,11 @@ glabel func_80126790 /* BCF88 80126888 3C018015 */ lui $at, %hi(D_80150710) /* BCF8C 8012688C D4220710 */ ldc1 $f2, %lo(D_80150710)($at) /* BCF90 80126890 44820000 */ mtc1 $v0, $f0 -/* BCF94 80126894 00000000 */ nop +/* BCF94 80126894 00000000 */ nop /* BCF98 80126898 46800020 */ cvt.s.w $f0, $f0 /* BCF9C 8012689C 46000021 */ cvt.d.s $f0, $f0 /* BCFA0 801268A0 46220002 */ mul.d $f0, $f0, $f2 -/* BCFA4 801268A4 00000000 */ nop +/* BCFA4 801268A4 00000000 */ nop /* BCFA8 801268A8 9622047E */ lhu $v0, 0x47e($s1) /* BCFAC 801268AC 3C013FE0 */ lui $at, 0x3fe0 /* BCFB0 801268B0 44811800 */ mtc1 $at, $f3 @@ -169,8 +169,8 @@ glabel func_80126790 .L80126A18: /* BD118 80126A18 A222047C */ sb $v0, 0x47c($s1) .L80126A1C: -/* BD11C 80126A1C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* BD120 80126A20 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* BD11C 80126A1C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* BD120 80126A20 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* BD124 80126A24 8C620000 */ lw $v0, ($v1) /* BD128 80126A28 3C014F00 */ lui $at, 0x4f00 /* BD12C 80126A2C 44810000 */ mtc1 $at, $f0 @@ -180,7 +180,7 @@ glabel func_80126790 /* BD13C 80126A3C 3C02FA00 */ lui $v0, 0xfa00 /* BD140 80126A40 AC820000 */ sw $v0, ($a0) /* BD144 80126A44 4618003E */ c.le.s $f0, $f24 -/* BD148 80126A48 00000000 */ nop +/* BD148 80126A48 00000000 */ nop /* BD14C 80126A4C 45010005 */ bc1t .L80126A64 /* BD150 80126A50 24840004 */ addiu $a0, $a0, 4 /* BD154 80126A54 4600C18D */ trunc.w.s $f6, $f24 @@ -192,25 +192,25 @@ glabel func_80126790 /* BD168 80126A68 3C028000 */ lui $v0, 0x8000 /* BD16C 80126A6C 4600018D */ trunc.w.s $f6, $f0 /* BD170 80126A70 44033000 */ mfc1 $v1, $f6 -/* BD174 80126A74 00000000 */ nop +/* BD174 80126A74 00000000 */ nop /* BD178 80126A78 00621825 */ or $v1, $v1, $v0 /* BD17C 80126A7C 3C014F00 */ lui $at, 0x4f00 /* BD180 80126A80 44810000 */ mtc1 $at, $f0 /* BD184 80126A84 00032E00 */ sll $a1, $v1, 0x18 .L80126A88: /* BD188 80126A88 4616003E */ c.le.s $f0, $f22 -/* BD18C 80126A8C 00000000 */ nop +/* BD18C 80126A8C 00000000 */ nop /* BD190 80126A90 45030005 */ bc1tl .L80126AA8 /* BD194 80126A94 4600B001 */ sub.s $f0, $f22, $f0 /* BD198 80126A98 4600B18D */ trunc.w.s $f6, $f22 /* BD19C 80126A9C 44033000 */ mfc1 $v1, $f6 /* BD1A0 80126AA0 08049AAF */ j .L80126ABC -/* BD1A4 80126AA4 00000000 */ nop +/* BD1A4 80126AA4 00000000 */ nop .L80126AA8: /* BD1A8 80126AA8 3C028000 */ lui $v0, 0x8000 /* BD1AC 80126AAC 4600018D */ trunc.w.s $f6, $f0 /* BD1B0 80126AB0 44033000 */ mfc1 $v1, $f6 -/* BD1B4 80126AB4 00000000 */ nop +/* BD1B4 80126AB4 00000000 */ nop /* BD1B8 80126AB8 00621825 */ or $v1, $v1, $v0 .L80126ABC: /* BD1BC 80126ABC 3C014F00 */ lui $at, 0x4f00 @@ -218,7 +218,7 @@ glabel func_80126790 /* BD1C4 80126AC4 306200FF */ andi $v0, $v1, 0xff /* BD1C8 80126AC8 00021400 */ sll $v0, $v0, 0x10 /* BD1CC 80126ACC 4604003E */ c.le.s $f0, $f4 -/* BD1D0 80126AD0 00000000 */ nop +/* BD1D0 80126AD0 00000000 */ nop /* BD1D4 80126AD4 45010005 */ bc1t .L80126AEC /* BD1D8 80126AD8 00A22825 */ or $a1, $a1, $v0 /* BD1DC 80126ADC 4600218D */ trunc.w.s $f6, $f4 @@ -230,7 +230,7 @@ glabel func_80126790 /* BD1F0 80126AF0 3C028000 */ lui $v0, 0x8000 /* BD1F4 80126AF4 4600018D */ trunc.w.s $f6, $f0 /* BD1F8 80126AF8 44033000 */ mfc1 $v1, $f6 -/* BD1FC 80126AFC 00000000 */ nop +/* BD1FC 80126AFC 00000000 */ nop /* BD200 80126B00 00621825 */ or $v1, $v1, $v0 /* BD204 80126B04 306200FF */ andi $v0, $v1, 0xff .L80126B08: @@ -242,7 +242,7 @@ glabel func_80126790 /* BD21C 80126B1C 2442FFFE */ addiu $v0, $v0, -2 /* BD220 80126B20 2C420003 */ sltiu $v0, $v0, 3 /* BD224 80126B24 10400010 */ beqz $v0, .L80126B68 -/* BD228 80126B28 00000000 */ nop +/* BD228 80126B28 00000000 */ nop /* BD22C 80126B2C 0C00A4F5 */ jal cosine /* BD230 80126B30 86240480 */ lh $a0, 0x480($s1) /* BD234 80126B34 96230480 */ lhu $v1, 0x480($s1) @@ -254,7 +254,7 @@ glabel func_80126790 /* BD24C 80126B4C 00021403 */ sra $v0, $v0, 0x10 /* BD250 80126B50 28420168 */ slti $v0, $v0, 0x168 /* BD254 80126B54 46020682 */ mul.s $f26, $f0, $f2 -/* BD258 80126B58 00000000 */ nop +/* BD258 80126B58 00000000 */ nop /* BD25C 80126B5C 14400002 */ bnez $v0, .L80126B68 /* BD260 80126B60 2462FEA7 */ addiu $v0, $v1, -0x159 /* BD264 80126B64 A6220480 */ sh $v0, 0x480($s1) @@ -263,7 +263,7 @@ glabel func_80126790 /* BD26C 80126B6C 4480A000 */ mtc1 $zero, $f20 /* BD270 80126B70 2442000C */ addiu $v0, $v0, 0xc /* BD274 80126B74 44823000 */ mtc1 $v0, $f6 -/* BD278 80126B78 00000000 */ nop +/* BD278 80126B78 00000000 */ nop /* BD27C 80126B7C 468031A0 */ cvt.s.w $f6, $f6 /* BD280 80126B80 44053000 */ mfc1 $a1, $f6 /* BD284 80126B84 96220484 */ lhu $v0, 0x484($s1) @@ -271,7 +271,7 @@ glabel func_80126790 /* BD28C 80126B8C 2442000C */ addiu $v0, $v0, 0xc /* BD290 80126B90 00021023 */ negu $v0, $v0 /* BD294 80126B94 44823000 */ mtc1 $v0, $f6 -/* BD298 80126B98 00000000 */ nop +/* BD298 80126B98 00000000 */ nop /* BD29C 80126B9C 468031A0 */ cvt.s.w $f6, $f6 /* BD2A0 80126BA0 44063000 */ mfc1 $a2, $f6 /* BD2A4 80126BA4 0C019E40 */ jal guTranslateF @@ -280,7 +280,7 @@ glabel func_80126790 /* BD2B0 80126BB0 44801800 */ mtc1 $zero, $f3 /* BD2B4 80126BB4 4600D021 */ cvt.d.s $f0, $f26 /* BD2B8 80126BB8 46220032 */ c.eq.d $f0, $f2 -/* BD2BC 80126BBC 00000000 */ nop +/* BD2BC 80126BBC 00000000 */ nop /* BD2C0 80126BC0 4501000D */ bc1t .L80126BF8 /* BD2C4 80126BC4 27B00058 */ addiu $s0, $sp, 0x58 /* BD2C8 80126BC8 0200202D */ daddu $a0, $s0, $zero @@ -301,7 +301,7 @@ glabel func_80126790 /* BD300 80126C00 44801000 */ mtc1 $zero, $f2 /* BD304 80126C04 4600E021 */ cvt.d.s $f0, $f28 /* BD308 80126C08 46220032 */ c.eq.d $f0, $f2 -/* BD30C 80126C0C 00000000 */ nop +/* BD30C 80126C0C 00000000 */ nop /* BD310 80126C10 4501000C */ bc1t .L80126C44 /* BD314 80126C14 3C120001 */ lui $s2, 1 /* BD318 80126C18 27B00058 */ addiu $s0, $sp, 0x58 @@ -318,10 +318,10 @@ glabel func_80126790 .L80126C44: /* BD344 80126C44 36521630 */ ori $s2, $s2, 0x1630 /* BD348 80126C48 27A40018 */ addiu $a0, $sp, 0x18 -/* BD34C 80126C4C 3C108007 */ lui $s0, %hi(D_800741F0) -/* BD350 80126C50 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* BD354 80126C54 3C11800A */ lui $s1, %hi(D_8009A674) -/* BD358 80126C58 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* BD34C 80126C4C 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* BD350 80126C50 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* BD354 80126C54 3C11800A */ lui $s1, %hi(gDisplayContext) +/* BD358 80126C58 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* BD35C 80126C5C 96050000 */ lhu $a1, ($s0) /* BD360 80126C60 8E220000 */ lw $v0, ($s1) /* BD364 80126C64 00052980 */ sll $a1, $a1, 6 @@ -361,8 +361,8 @@ glabel func_80126790 /* BD3EC 80126CEC 3C190600 */ lui $t9, 0x600 /* BD3F0 80126CF0 37390402 */ ori $t9, $t9, 0x402 /* BD3F4 80126CF4 3C180002 */ lui $t8, 2 -/* BD3F8 80126CF8 3C05800A */ lui $a1, %hi(D_8009A66C) -/* BD3FC 80126CFC 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* BD3F8 80126CF8 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* BD3FC 80126CFC 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* BD400 80126D00 37180406 */ ori $t8, $t8, 0x406 /* BD404 80126D04 8CA20000 */ lw $v0, ($a1) /* BD408 80126D08 96030000 */ lhu $v1, ($s0) diff --git a/asm/nonmatchings/code_B9D60/func_80126F78.s b/asm/nonmatchings/code_B9D60/func_80126F78.s index 33a8cbed0c..e3a7a47747 100644 --- a/asm/nonmatchings/code_B9D60/func_80126F78.s +++ b/asm/nonmatchings/code_B9D60/func_80126F78.s @@ -38,7 +38,7 @@ glabel func_80126F78 /* BD6FC 80126FFC 3C030002 */ lui $v1, 2 /* BD700 80127000 00431024 */ and $v0, $v0, $v1 /* BD704 80127004 1040000F */ beqz $v0, .L80127044 -/* BD708 80127008 00000000 */ nop +/* BD708 80127008 00000000 */ nop .L8012700C: /* BD70C 8012700C 920304EE */ lbu $v1, 0x4ee($s0) /* BD710 80127010 86020456 */ lh $v0, 0x456($s0) @@ -64,7 +64,7 @@ glabel func_80126F78 /* BD75C 8012705C 920504EC */ lbu $a1, 0x4ec($s0) /* BD760 80127060 8604045C */ lh $a0, 0x45c($s0) /* BD764 80127064 44820000 */ mtc1 $v0, $f0 -/* BD768 80127068 00000000 */ nop +/* BD768 80127068 00000000 */ nop /* BD76C 8012706C 46800021 */ cvt.d.w $f0, $f0 /* BD770 80127070 00063040 */ sll $a2, $a2, 1 /* BD774 80127074 02063021 */ addu $a2, $s0, $a2 @@ -86,10 +86,10 @@ glabel func_80126F78 /* BD7B4 801270B4 00621821 */ addu $v1, $v1, $v0 /* BD7B8 801270B8 00671823 */ subu $v1, $v1, $a3 /* BD7BC 801270BC 44833000 */ mtc1 $v1, $f6 -/* BD7C0 801270C0 00000000 */ nop +/* BD7C0 801270C0 00000000 */ nop /* BD7C4 801270C4 468031A0 */ cvt.s.w $f6, $f6 /* BD7C8 801270C8 46003182 */ mul.s $f6, $f6, $f0 -/* BD7CC 801270CC 00000000 */ nop +/* BD7CC 801270CC 00000000 */ nop /* BD7D0 801270D0 86020458 */ lh $v0, 0x458($s0) /* BD7D4 801270D4 94C304DC */ lhu $v1, 0x4dc($a2) /* BD7D8 801270D8 00441021 */ addu $v0, $v0, $a0 @@ -98,16 +98,16 @@ glabel func_80126F78 /* BD7E4 801270E4 00441021 */ addu $v0, $v0, $a0 /* BD7E8 801270E8 00431023 */ subu $v0, $v0, $v1 /* BD7EC 801270EC 44822000 */ mtc1 $v0, $f4 -/* BD7F0 801270F0 00000000 */ nop +/* BD7F0 801270F0 00000000 */ nop /* BD7F4 801270F4 46802120 */ cvt.s.w $f4, $f4 /* BD7F8 801270F8 46002102 */ mul.s $f4, $f4, $f0 -/* BD7FC 801270FC 00000000 */ nop +/* BD7FC 801270FC 00000000 */ nop /* BD800 80127100 44871000 */ mtc1 $a3, $f2 -/* BD804 80127104 00000000 */ nop +/* BD804 80127104 00000000 */ nop /* BD808 80127108 468010A0 */ cvt.s.w $f2, $f2 /* BD80C 8012710C 46061080 */ add.s $f2, $f2, $f6 /* BD810 80127110 44830000 */ mtc1 $v1, $f0 -/* BD814 80127114 00000000 */ nop +/* BD814 80127114 00000000 */ nop /* BD818 80127118 46800020 */ cvt.s.w $f0, $f0 /* BD81C 8012711C 46040000 */ add.s $f0, $f0, $f4 /* BD820 80127120 4600120D */ trunc.w.s $f8, $f2 @@ -132,17 +132,17 @@ glabel func_80126F78 /* BD868 80127168 3C013FE0 */ lui $at, 0x3fe0 /* BD86C 8012716C 44811800 */ mtc1 $at, $f3 /* BD870 80127170 44801000 */ mtc1 $zero, $f2 -/* BD874 80127174 00000000 */ nop +/* BD874 80127174 00000000 */ nop /* BD878 80127178 46220002 */ mul.d $f0, $f0, $f2 -/* BD87C 8012717C 00000000 */ nop +/* BD87C 8012717C 00000000 */ nop /* BD880 80127180 3C018015 */ lui $at, %hi(D_80150718) /* BD884 80127184 D4220718 */ ldc1 $f2, %lo(D_80150718)($at) /* BD888 80127188 46220002 */ mul.d $f0, $f0, $f2 -/* BD88C 8012718C 00000000 */ nop +/* BD88C 8012718C 00000000 */ nop /* BD890 80127190 26B50001 */ addiu $s5, $s5, 1 /* BD894 80127194 8E0204FC */ lw $v0, 0x4fc($s0) /* BD898 80127198 44941000 */ mtc1 $s4, $f2 -/* BD89C 8012719C 00000000 */ nop +/* BD89C 8012719C 00000000 */ nop /* BD8A0 801271A0 468010A1 */ cvt.d.w $f2, $f2 /* BD8A4 801271A4 46201080 */ add.d $f2, $f2, $f0 /* BD8A8 801271A8 3C030002 */ lui $v1, 2 @@ -156,51 +156,51 @@ glabel func_80126F78 /* BD8C8 801271C8 44811800 */ mtc1 $at, $f3 /* BD8CC 801271CC 44801000 */ mtc1 $zero, $f2 /* BD8D0 801271D0 44820000 */ mtc1 $v0, $f0 -/* BD8D4 801271D4 00000000 */ nop +/* BD8D4 801271D4 00000000 */ nop /* BD8D8 801271D8 46800021 */ cvt.d.w $f0, $f0 /* BD8DC 801271DC 46220002 */ mul.d $f0, $f0, $f2 -/* BD8E0 801271E0 00000000 */ nop +/* BD8E0 801271E0 00000000 */ nop /* BD8E4 801271E4 3C018015 */ lui $at, %hi(D_80150720) /* BD8E8 801271E8 D4220720 */ ldc1 $f2, %lo(D_80150720)($at) /* BD8EC 801271EC 46201001 */ sub.d $f0, $f2, $f0 /* BD8F0 801271F0 3C0141E0 */ lui $at, 0x41e0 /* BD8F4 801271F4 44811800 */ mtc1 $at, $f3 /* BD8F8 801271F8 44801000 */ mtc1 $zero, $f2 -/* BD8FC 801271FC 00000000 */ nop +/* BD8FC 801271FC 00000000 */ nop /* BD900 80127200 4620103E */ c.le.d $f2, $f0 -/* BD904 80127204 00000000 */ nop +/* BD904 80127204 00000000 */ nop /* BD908 80127208 45030005 */ bc1tl .L80127220 /* BD90C 8012720C 46220001 */ sub.d $f0, $f0, $f2 /* BD910 80127210 4620020D */ trunc.w.d $f8, $f0 /* BD914 80127214 44034000 */ mfc1 $v1, $f8 /* BD918 80127218 08049C8D */ j .L80127234 -/* BD91C 8012721C 00000000 */ nop +/* BD91C 8012721C 00000000 */ nop .L80127220: /* BD920 80127220 3C028000 */ lui $v0, 0x8000 /* BD924 80127224 4620020D */ trunc.w.d $f8, $f0 /* BD928 80127228 44034000 */ mfc1 $v1, $f8 -/* BD92C 8012722C 00000000 */ nop +/* BD92C 8012722C 00000000 */ nop /* BD930 80127230 00621825 */ or $v1, $v1, $v0 .L80127234: /* BD934 80127234 92020512 */ lbu $v0, 0x512($s0) /* BD938 80127238 3C018015 */ lui $at, %hi(D_80150728) /* BD93C 8012723C D4220728 */ ldc1 $f2, %lo(D_80150728)($at) /* BD940 80127240 44820000 */ mtc1 $v0, $f0 -/* BD944 80127244 00000000 */ nop +/* BD944 80127244 00000000 */ nop /* BD948 80127248 46800021 */ cvt.d.w $f0, $f0 /* BD94C 8012724C 46220002 */ mul.d $f0, $f0, $f2 -/* BD950 80127250 00000000 */ nop +/* BD950 80127250 00000000 */ nop /* BD954 80127254 3C014052 */ lui $at, 0x4052 /* BD958 80127258 44811800 */ mtc1 $at, $f3 /* BD95C 8012725C 44801000 */ mtc1 $zero, $f2 -/* BD960 80127260 00000000 */ nop +/* BD960 80127260 00000000 */ nop /* BD964 80127264 46201001 */ sub.d $f0, $f2, $f0 /* BD968 80127268 3C0141E0 */ lui $at, 0x41e0 /* BD96C 8012726C 44811800 */ mtc1 $at, $f3 /* BD970 80127270 44801000 */ mtc1 $zero, $f2 -/* BD974 80127274 00000000 */ nop +/* BD974 80127274 00000000 */ nop /* BD978 80127278 4620103E */ c.le.d $f2, $f0 -/* BD97C 8012727C 00000000 */ nop +/* BD97C 8012727C 00000000 */ nop /* BD980 80127280 45010005 */ bc1t .L80127298 /* BD984 80127284 0060B82D */ daddu $s7, $v1, $zero /* BD988 80127288 4620020D */ trunc.w.d $f8, $f0 @@ -212,7 +212,7 @@ glabel func_80126F78 /* BD99C 8012729C 3C028000 */ lui $v0, 0x8000 /* BD9A0 801272A0 4620020D */ trunc.w.d $f8, $f0 /* BD9A4 801272A4 44034000 */ mfc1 $v1, $f8 -/* BD9A8 801272A8 00000000 */ nop +/* BD9A8 801272A8 00000000 */ nop /* BD9AC 801272AC 00621825 */ or $v1, $v1, $v0 /* BD9B0 801272B0 0060B02D */ daddu $s6, $v1, $zero .L801272B4: @@ -237,8 +237,8 @@ glabel func_80126F78 /* BD9FC 801272FC 0240202D */ daddu $a0, $s2, $zero /* BDA00 80127300 24050010 */ addiu $a1, $zero, 0x10 /* BDA04 80127304 00A0302D */ daddu $a2, $a1, $zero -/* BDA08 80127308 3C08800A */ lui $t0, %hi(D_8009A66C) -/* BDA0C 8012730C 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* BDA08 80127308 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* BDA0C 8012730C 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* BDA10 80127310 24070002 */ addiu $a3, $zero, 2 /* BDA14 80127314 3C09E700 */ lui $t1, 0xe700 /* BDA18 80127318 8D030000 */ lw $v1, ($t0) diff --git a/asm/nonmatchings/code_B9D60/func_80127D90.s b/asm/nonmatchings/code_B9D60/func_80127D90.s index f094e25c0a..87c7d78ba2 100644 --- a/asm/nonmatchings/code_B9D60/func_80127D90.s +++ b/asm/nonmatchings/code_B9D60/func_80127D90.s @@ -17,8 +17,8 @@ glabel func_80127D90 /* BE4C0 80127DC0 93B2015B */ lbu $s2, 0x15b($sp) /* BE4C4 80127DC4 27C30010 */ addiu $v1, $fp, 0x10 /* BE4C8 80127DC8 AFB300F4 */ sw $s3, 0xf4($sp) -/* BE4CC 80127DCC 3C13800A */ lui $s3, %hi(D_8009A66C) -/* BE4D0 80127DD0 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* BE4CC 80127DCC 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* BE4D0 80127DD0 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* BE4D4 80127DD4 AFBF010C */ sw $ra, 0x10c($sp) /* BE4D8 80127DD8 AFB70104 */ sw $s7, 0x104($sp) /* BE4DC 80127DDC AFB60100 */ sw $s6, 0x100($sp) @@ -42,7 +42,7 @@ glabel func_80127D90 /* BE524 80127E24 10620003 */ beq $v1, $v0, .L80127E34 /* BE528 80127E28 A7A70076 */ sh $a3, 0x76($sp) /* BE52C 80127E2C 0C04B0B8 */ jal func_8012C2E0 -/* BE530 80127E30 00000000 */ nop +/* BE530 80127E30 00000000 */ nop .L80127E34: /* BE534 80127E34 8E040000 */ lw $a0, ($s0) /* BE538 80127E38 94820034 */ lhu $v0, 0x34($a0) @@ -52,7 +52,7 @@ glabel func_80127D90 /* BE548 80127E48 A4820034 */ sh $v0, 0x34($a0) /* BE54C 80127E4C 32220001 */ andi $v0, $s1, 1 /* BE550 80127E50 10400003 */ beqz $v0, .L80127E60 -/* BE554 80127E54 00000000 */ nop +/* BE554 80127E54 00000000 */ nop /* BE558 80127E58 325200FF */ andi $s2, $s2, 0xff /* BE55C 80127E5C A7B2008E */ sh $s2, 0x8e($sp) .L80127E60: @@ -141,7 +141,7 @@ glabel func_80127D90 /* BE69C 80127F9C 00220821 */ addu $at, $at, $v0 /* BE6A0 80127FA0 8C220730 */ lw $v0, %lo(D_80150730)($at) /* BE6A4 80127FA4 00400008 */ jr $v0 -/* BE6A8 80127FA8 00000000 */ nop +/* BE6A8 80127FA8 00000000 */ nop /* BE6AC 80127FAC 3C048015 */ lui $a0, %hi(D_80155D74) /* BE6B0 80127FB0 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* BE6B4 80127FB4 9482003C */ lhu $v0, 0x3c($a0) @@ -153,24 +153,24 @@ glabel func_80127D90 /* BE6CC 80127FCC 90420003 */ lbu $v0, 3($v0) /* BE6D0 80127FD0 C4820014 */ lwc1 $f2, 0x14($a0) /* BE6D4 80127FD4 44820000 */ mtc1 $v0, $f0 -/* BE6D8 80127FD8 00000000 */ nop +/* BE6D8 80127FD8 00000000 */ nop /* BE6DC 80127FDC 46800020 */ cvt.s.w $f0, $f0 /* BE6E0 80127FE0 93C20508 */ lbu $v0, 0x508($fp) /* BE6E4 80127FE4 46001082 */ mul.s $f2, $f2, $f0 -/* BE6E8 80127FE8 00000000 */ nop +/* BE6E8 80127FE8 00000000 */ nop /* BE6EC 80127FEC 00021040 */ sll $v0, $v0, 1 /* BE6F0 80127FF0 3C01802F */ lui $at, %hi(D_802EB644) /* BE6F4 80127FF4 00220821 */ addu $at, $at, $v0 /* BE6F8 80127FF8 8422B644 */ lh $v0, %lo(D_802EB644)($at) /* BE6FC 80127FFC 44820000 */ mtc1 $v0, $f0 -/* BE700 80128000 00000000 */ nop +/* BE700 80128000 00000000 */ nop /* BE704 80128004 46800020 */ cvt.s.w $f0, $f0 /* BE708 80128008 46001080 */ add.s $f2, $f2, $f0 /* BE70C 8012800C 94850034 */ lhu $a1, 0x34($a0) /* BE710 80128010 94820044 */ lhu $v0, 0x44($a0) /* BE714 80128014 4600130D */ trunc.w.s $f12, $f2 /* BE718 80128018 44036000 */ mfc1 $v1, $f12 -/* BE71C 8012801C 00000000 */ nop +/* BE71C 8012801C 00000000 */ nop /* BE720 80128020 00431021 */ addu $v0, $v0, $v1 /* BE724 80128024 A4820044 */ sh $v0, 0x44($a0) /* BE728 80128028 30A20040 */ andi $v0, $a1, 0x40 @@ -217,14 +217,14 @@ glabel func_80127D90 /* BE7CC 801280CC 00220821 */ addu $at, $at, $v0 /* BE7D0 801280D0 8C220770 */ lw $v0, %lo(D_80150770)($at) /* BE7D4 801280D4 00400008 */ jr $v0 -/* BE7D8 801280D8 00000000 */ nop +/* BE7D8 801280D8 00000000 */ nop /* BE7DC 801280DC 93C204F8 */ lbu $v0, 0x4f8($fp) /* BE7E0 801280E0 24190002 */ addiu $t9, $zero, 2 /* BE7E4 801280E4 14590008 */ bne $v0, $t9, .L80128108 -/* BE7E8 801280E8 00000000 */ nop +/* BE7E8 801280E8 00000000 */ nop /* BE7EC 801280EC 93C20509 */ lbu $v0, 0x509($fp) /* BE7F0 801280F0 14400005 */ bnez $v0, .L80128108 -/* BE7F4 801280F4 00000000 */ nop +/* BE7F4 801280F4 00000000 */ nop /* BE7F8 801280F8 97C2050A */ lhu $v0, 0x50a($fp) /* BE7FC 801280FC 97C3050C */ lhu $v1, 0x50c($fp) /* BE800 80128100 A7C2050E */ sh $v0, 0x50e($fp) @@ -236,11 +236,11 @@ glabel func_80127D90 /* BE814 80128114 44806000 */ mtc1 $zero, $f12 /* BE818 80128118 97D6050E */ lhu $s6, 0x50e($fp) /* BE81C 8012811C 44820000 */ mtc1 $v0, $f0 -/* BE820 80128120 00000000 */ nop +/* BE820 80128120 00000000 */ nop /* BE824 80128124 46800020 */ cvt.s.w $f0, $f0 /* BE828 80128128 46000021 */ cvt.d.s $f0, $f0 /* BE82C 8012812C 462C0002 */ mul.d $f0, $f0, $f12 -/* BE830 80128130 00000000 */ nop +/* BE830 80128130 00000000 */ nop /* BE834 80128134 97D50510 */ lhu $s5, 0x510($fp) /* BE838 80128138 3C058015 */ lui $a1, %hi(D_80155D74) /* BE83C 8012813C 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) @@ -248,15 +248,15 @@ glabel func_80127D90 /* BE844 80128144 97C20516 */ lhu $v0, 0x516($fp) /* BE848 80128148 87C4045C */ lh $a0, 0x45c($fp) /* BE84C 8012814C 44822000 */ mtc1 $v0, $f4 -/* BE850 80128150 00000000 */ nop +/* BE850 80128150 00000000 */ nop /* BE854 80128154 46802120 */ cvt.s.w $f4, $f4 /* BE858 80128158 46002121 */ cvt.d.s $f4, $f4 /* BE85C 8012815C 462C2102 */ mul.d $f4, $f4, $f12 -/* BE860 80128160 00000000 */ nop +/* BE860 80128160 00000000 */ nop /* BE864 80128164 2418000A */ addiu $t8, $zero, 0xa /* BE868 80128168 94A20034 */ lhu $v0, 0x34($a1) /* BE86C 8012816C 44831000 */ mtc1 $v1, $f2 -/* BE870 80128170 00000000 */ nop +/* BE870 80128170 00000000 */ nop /* BE874 80128174 468010A1 */ cvt.d.w $f2, $f2 /* BE878 80128178 A4B8004A */ sh $t8, 0x4a($a1) /* BE87C 8012817C 34420010 */ ori $v0, $v0, 0x10 @@ -265,7 +265,7 @@ glabel func_80127D90 /* BE888 80128188 46201080 */ add.d $f2, $f2, $f0 /* BE88C 8012818C 2442FFFF */ addiu $v0, $v0, -1 /* BE890 80128190 44840000 */ mtc1 $a0, $f0 -/* BE894 80128194 00000000 */ nop +/* BE894 80128194 00000000 */ nop /* BE898 80128198 46800021 */ cvt.d.w $f0, $f0 /* BE89C 8012819C 46240000 */ add.d $f0, $f0, $f4 /* BE8A0 801281A0 2C420003 */ sltiu $v0, $v0, 3 @@ -303,13 +303,13 @@ glabel func_80127D90 /* BE91C 8012821C 10780008 */ beq $v1, $t8, .L80128240 /* BE920 80128220 24120020 */ addiu $s2, $zero, 0x20 /* BE924 80128224 0804A0A1 */ j .L80128284 -/* BE928 80128228 00000000 */ nop +/* BE928 80128228 00000000 */ nop .L8012822C: /* BE92C 8012822C 24190003 */ addiu $t9, $zero, 3 /* BE930 80128230 1079000F */ beq $v1, $t9, .L80128270 /* BE934 80128234 24120020 */ addiu $s2, $zero, 0x20 /* BE938 80128238 0804A0A1 */ j .L80128284 -/* BE93C 8012823C 00000000 */ nop +/* BE93C 8012823C 00000000 */ nop .L80128240: /* BE940 80128240 24120018 */ addiu $s2, $zero, 0x18 /* BE944 80128244 24020012 */ addiu $v0, $zero, 0x12 @@ -447,13 +447,13 @@ glabel func_80127D90 /* BEB1C 8012841C 00151400 */ sll $v0, $s5, 0x10 /* BEB20 80128420 00021403 */ sra $v0, $v0, 0x10 /* BEB24 80128424 44826000 */ mtc1 $v0, $f12 -/* BEB28 80128428 00000000 */ nop +/* BEB28 80128428 00000000 */ nop /* BEB2C 8012842C 46806320 */ cvt.s.w $f12, $f12 /* BEB30 80128430 00131400 */ sll $v0, $s3, 0x10 /* BEB34 80128434 00021403 */ sra $v0, $v0, 0x10 /* BEB38 80128438 44056000 */ mfc1 $a1, $f12 /* BEB3C 8012843C 44826000 */ mtc1 $v0, $f12 -/* BEB40 80128440 00000000 */ nop +/* BEB40 80128440 00000000 */ nop /* BEB44 80128444 46806320 */ cvt.s.w $f12, $f12 /* BEB48 80128448 93C70509 */ lbu $a3, 0x509($fp) /* BEB4C 8012844C 44066000 */ mfc1 $a2, $f12 @@ -465,13 +465,13 @@ glabel func_80127D90 /* BEB64 80128464 00161400 */ sll $v0, $s6, 0x10 /* BEB68 80128468 00021403 */ sra $v0, $v0, 0x10 /* BEB6C 8012846C 44826000 */ mtc1 $v0, $f12 -/* BEB70 80128470 00000000 */ nop +/* BEB70 80128470 00000000 */ nop /* BEB74 80128474 46806320 */ cvt.s.w $f12, $f12 /* BEB78 80128478 00141400 */ sll $v0, $s4, 0x10 /* BEB7C 8012847C 00021403 */ sra $v0, $v0, 0x10 /* BEB80 80128480 44056000 */ mfc1 $a1, $f12 /* BEB84 80128484 44826000 */ mtc1 $v0, $f12 -/* BEB88 80128488 00000000 */ nop +/* BEB88 80128488 00000000 */ nop /* BEB8C 8012848C 46806320 */ cvt.s.w $f12, $f12 /* BEB90 80128490 93C70509 */ lbu $a3, 0x509($fp) /* BEB94 80128494 44066000 */ mfc1 $a2, $f12 @@ -481,25 +481,25 @@ glabel func_80127D90 /* BEBA4 801284A4 97C20514 */ lhu $v0, 0x514($fp) /* BEBA8 801284A8 C7AC00BC */ lwc1 $f12, 0xbc($sp) /* BEBAC 801284AC 44822000 */ mtc1 $v0, $f4 -/* BEBB0 801284B0 00000000 */ nop +/* BEBB0 801284B0 00000000 */ nop /* BEBB4 801284B4 46802120 */ cvt.s.w $f4, $f4 /* BEBB8 801284B8 460C2102 */ mul.s $f4, $f4, $f12 -/* BEBBC 801284BC 00000000 */ nop +/* BEBBC 801284BC 00000000 */ nop /* BEBC0 801284C0 3C013FE0 */ lui $at, 0x3fe0 /* BEBC4 801284C4 44816800 */ mtc1 $at, $f13 /* BEBC8 801284C8 44806000 */ mtc1 $zero, $f12 /* BEBCC 801284CC 46002121 */ cvt.d.s $f4, $f4 /* BEBD0 801284D0 462C2102 */ mul.d $f4, $f4, $f12 -/* BEBD4 801284D4 00000000 */ nop +/* BEBD4 801284D4 00000000 */ nop /* BEBD8 801284D8 97C20516 */ lhu $v0, 0x516($fp) /* BEBDC 801284DC 44821000 */ mtc1 $v0, $f2 -/* BEBE0 801284E0 00000000 */ nop +/* BEBE0 801284E0 00000000 */ nop /* BEBE4 801284E4 468010A0 */ cvt.s.w $f2, $f2 /* BEBE8 801284E8 461E1082 */ mul.s $f2, $f2, $f30 -/* BEBEC 801284EC 00000000 */ nop +/* BEBEC 801284EC 00000000 */ nop /* BEBF0 801284F0 460010A1 */ cvt.d.s $f2, $f2 /* BEBF4 801284F4 462C1082 */ mul.d $f2, $f2, $f12 -/* BEBF8 801284F8 00000000 */ nop +/* BEBF8 801284F8 00000000 */ nop /* BEBFC 801284FC 46000021 */ cvt.d.s $f0, $f0 /* BEC00 80128500 46240001 */ sub.d $f0, $f0, $f4 /* BEC04 80128504 4600A121 */ cvt.d.s $f4, $f20 @@ -517,13 +517,13 @@ glabel func_80127D90 /* BEC34 80128534 E7AC0018 */ swc1 $f12, 0x18($sp) /* BEC38 80128538 4600C30D */ trunc.w.s $f12, $f24 /* BEC3C 8012853C 44026000 */ mfc1 $v0, $f12 -/* BEC40 80128540 00000000 */ nop +/* BEC40 80128540 00000000 */ nop /* BEC44 80128544 00021400 */ sll $v0, $v0, 0x10 /* BEC48 80128548 00022C03 */ sra $a1, $v0, 0x10 /* BEC4C 8012854C 462026A0 */ cvt.s.d $f26, $f4 /* BEC50 80128550 4600D30D */ trunc.w.s $f12, $f26 /* BEC54 80128554 44026000 */ mfc1 $v0, $f12 -/* BEC58 80128558 00000000 */ nop +/* BEC58 80128558 00000000 */ nop /* BEC5C 8012855C 00021400 */ sll $v0, $v0, 0x10 /* BEC60 80128560 00023403 */ sra $a2, $v0, 0x10 /* BEC64 80128564 00101400 */ sll $v0, $s0, 0x10 @@ -538,7 +538,7 @@ glabel func_80127D90 /* BEC84 80128584 3C028000 */ lui $v0, 0x8000 /* BEC88 80128588 4600030D */ trunc.w.s $f12, $f0 /* BEC8C 8012858C 44036000 */ mfc1 $v1, $f12 -/* BEC90 80128590 00000000 */ nop +/* BEC90 80128590 00000000 */ nop /* BEC94 80128594 00621825 */ or $v1, $v1, $v0 /* BEC98 80128598 03C0202D */ daddu $a0, $fp, $zero .L8012859C: @@ -582,30 +582,30 @@ glabel func_80127D90 /* BED2C 8012862C 97C20514 */ lhu $v0, 0x514($fp) /* BED30 80128630 C7AC00BC */ lwc1 $f12, 0xbc($sp) /* BED34 80128634 44821000 */ mtc1 $v0, $f2 -/* BED38 80128638 00000000 */ nop +/* BED38 80128638 00000000 */ nop /* BED3C 8012863C 468010A0 */ cvt.s.w $f2, $f2 /* BED40 80128640 460C1082 */ mul.s $f2, $f2, $f12 -/* BED44 80128644 00000000 */ nop +/* BED44 80128644 00000000 */ nop /* BED48 80128648 3C013FE0 */ lui $at, 0x3fe0 /* BED4C 8012864C 44816800 */ mtc1 $at, $f13 /* BED50 80128650 44806000 */ mtc1 $zero, $f12 /* BED54 80128654 460010A1 */ cvt.d.s $f2, $f2 /* BED58 80128658 462C1082 */ mul.d $f2, $f2, $f12 -/* BED5C 8012865C 00000000 */ nop +/* BED5C 8012865C 00000000 */ nop /* BED60 80128660 97C20516 */ lhu $v0, 0x516($fp) /* BED64 80128664 46000786 */ mov.s $f30, $f0 /* BED68 80128668 44820000 */ mtc1 $v0, $f0 -/* BED6C 8012866C 00000000 */ nop +/* BED6C 8012866C 00000000 */ nop /* BED70 80128670 46800020 */ cvt.s.w $f0, $f0 /* BED74 80128674 461E0002 */ mul.s $f0, $f0, $f30 -/* BED78 80128678 00000000 */ nop +/* BED78 80128678 00000000 */ nop /* BED7C 8012867C 46000021 */ cvt.d.s $f0, $f0 /* BED80 80128680 462C0002 */ mul.d $f0, $f0, $f12 -/* BED84 80128684 00000000 */ nop +/* BED84 80128684 00000000 */ nop /* BED88 80128688 00141400 */ sll $v0, $s4, 0x10 /* BED8C 8012868C 00021403 */ sra $v0, $v0, 0x10 /* BED90 80128690 4482B000 */ mtc1 $v0, $f22 -/* BED94 80128694 00000000 */ nop +/* BED94 80128694 00000000 */ nop /* BED98 80128698 4680B5A0 */ cvt.s.w $f22, $f22 /* BED9C 8012869C 4600B5A1 */ cvt.d.s $f22, $f22 /* BEDA0 801286A0 4622B181 */ sub.d $f6, $f22, $f2 @@ -613,7 +613,7 @@ glabel func_80127D90 /* BEDA8 801286A8 00021403 */ sra $v0, $v0, 0x10 /* BEDAC 801286AC 4622B580 */ add.d $f22, $f22, $f2 /* BEDB0 801286B0 4482A000 */ mtc1 $v0, $f20 -/* BEDB4 801286B4 00000000 */ nop +/* BEDB4 801286B4 00000000 */ nop /* BEDB8 801286B8 4680A520 */ cvt.s.w $f20, $f20 /* BEDBC 801286BC 4600A521 */ cvt.d.s $f20, $f20 /* BEDC0 801286C0 4620A101 */ sub.d $f4, $f20, $f0 @@ -638,35 +638,35 @@ glabel func_80127D90 /* BEE0C 8012870C D42007B0 */ ldc1 $f0, %lo(D_801507B0)($at) /* BEE10 80128710 4600E1A1 */ cvt.d.s $f6, $f28 /* BEE14 80128714 46203182 */ mul.d $f6, $f6, $f0 -/* BEE18 80128718 00000000 */ nop +/* BEE18 80128718 00000000 */ nop /* BEE1C 8012871C 3C028015 */ lui $v0, %hi(D_80155D74) /* BEE20 80128720 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* BEE24 80128724 4600E30D */ trunc.w.s $f12, $f28 /* BEE28 80128728 44046000 */ mfc1 $a0, $f12 -/* BEE2C 8012872C 00000000 */ nop +/* BEE2C 8012872C 00000000 */ nop /* BEE30 80128730 A7A400AE */ sh $a0, 0xae($sp) /* BEE34 80128734 84430046 */ lh $v1, 0x46($v0) /* BEE38 80128738 3C014F00 */ lui $at, 0x4f00 /* BEE3C 8012873C 44814000 */ mtc1 $at, $f8 /* BEE40 80128740 44831000 */ mtc1 $v1, $f2 -/* BEE44 80128744 00000000 */ nop +/* BEE44 80128744 00000000 */ nop /* BEE48 80128748 468010A0 */ cvt.s.w $f2, $f2 /* BEE4C 8012874C 84430048 */ lh $v1, 0x48($v0) /* BEE50 80128750 4602C080 */ add.s $f2, $f24, $f2 /* BEE54 80128754 44832000 */ mtc1 $v1, $f4 -/* BEE58 80128758 00000000 */ nop +/* BEE58 80128758 00000000 */ nop /* BEE5C 8012875C 46802120 */ cvt.s.w $f4, $f4 /* BEE60 80128760 84430046 */ lh $v1, 0x46($v0) /* BEE64 80128764 4604D100 */ add.s $f4, $f26, $f4 /* BEE68 80128768 44830000 */ mtc1 $v1, $f0 -/* BEE6C 8012876C 00000000 */ nop +/* BEE6C 8012876C 00000000 */ nop /* BEE70 80128770 46800020 */ cvt.s.w $f0, $f0 /* BEE74 80128774 84430048 */ lh $v1, 0x48($v0) /* BEE78 80128778 4600B581 */ sub.s $f22, $f22, $f0 /* BEE7C 8012877C 4600130D */ trunc.w.s $f12, $f2 /* BEE80 80128780 E44C0000 */ swc1 $f12, ($v0) /* BEE84 80128784 44830000 */ mtc1 $v1, $f0 -/* BEE88 80128788 00000000 */ nop +/* BEE88 80128788 00000000 */ nop /* BEE8C 8012878C 46800020 */ cvt.s.w $f0, $f0 /* BEE90 80128790 4600A501 */ sub.s $f20, $f20, $f0 /* BEE94 80128794 4600230D */ trunc.w.s $f12, $f4 @@ -683,16 +683,16 @@ glabel func_80127D90 /* BEEC0 801287C0 E7AC0018 */ swc1 $f12, 0x18($sp) /* BEEC4 801287C4 4620330D */ trunc.w.d $f12, $f6 /* BEEC8 801287C8 44186000 */ mfc1 $t8, $f12 -/* BEECC 801287CC 00000000 */ nop +/* BEECC 801287CC 00000000 */ nop /* BEED0 801287D0 A7B8008E */ sh $t8, 0x8e($sp) /* BEED4 801287D4 4600C30D */ trunc.w.s $f12, $f24 /* BEED8 801287D8 44026000 */ mfc1 $v0, $f12 -/* BEEDC 801287DC 00000000 */ nop +/* BEEDC 801287DC 00000000 */ nop /* BEEE0 801287E0 00021400 */ sll $v0, $v0, 0x10 /* BEEE4 801287E4 00022C03 */ sra $a1, $v0, 0x10 /* BEEE8 801287E8 4600D30D */ trunc.w.s $f12, $f26 /* BEEEC 801287EC 44026000 */ mfc1 $v0, $f12 -/* BEEF0 801287F0 00000000 */ nop +/* BEEF0 801287F0 00000000 */ nop /* BEEF4 801287F4 00021400 */ sll $v0, $v0, 0x10 /* BEEF8 801287F8 00023403 */ sra $a2, $v0, 0x10 /* BEEFC 801287FC 00101400 */ sll $v0, $s0, 0x10 @@ -705,7 +705,7 @@ glabel func_80127D90 /* BEF14 80128814 3C028000 */ lui $v0, 0x8000 /* BEF18 80128818 4600030D */ trunc.w.s $f12, $f0 /* BEF1C 8012881C 44036000 */ mfc1 $v1, $f12 -/* BEF20 80128820 00000000 */ nop +/* BEF20 80128820 00000000 */ nop /* BEF24 80128824 00621825 */ or $v1, $v1, $v0 .L80128828: /* BEF28 80128828 03C0202D */ daddu $a0, $fp, $zero @@ -717,7 +717,7 @@ glabel func_80127D90 /* BEF40 80128840 93C20512 */ lbu $v0, 0x512($fp) /* BEF44 80128844 2C420005 */ sltiu $v0, $v0, 5 /* BEF48 80128848 14400037 */ bnez $v0, .L80128928 -/* BEF4C 8012884C 00000000 */ nop +/* BEF4C 8012884C 00000000 */ nop /* BEF50 80128850 8FC204FC */ lw $v0, 0x4fc($fp) /* BEF54 80128854 34420001 */ ori $v0, $v0, 1 /* BEF58 80128858 0804A24A */ j .L80128928 @@ -741,24 +741,24 @@ glabel func_80127D90 /* BEF9C 8012889C 00021403 */ sra $v0, $v0, 0x10 /* BEFA0 801288A0 00431021 */ addu $v0, $v0, $v1 /* BEFA4 801288A4 4482C000 */ mtc1 $v0, $f24 -/* BEFA8 801288A8 00000000 */ nop +/* BEFA8 801288A8 00000000 */ nop /* BEFAC 801288AC 4680C620 */ cvt.s.w $f24, $f24 /* BEFB0 801288B0 00191400 */ sll $v0, $t9, 0x10 /* BEFB4 801288B4 00021403 */ sra $v0, $v0, 0x10 /* BEFB8 801288B8 00451021 */ addu $v0, $v0, $a1 /* BEFBC 801288BC 4482D000 */ mtc1 $v0, $f26 -/* BEFC0 801288C0 00000000 */ nop +/* BEFC0 801288C0 00000000 */ nop /* BEFC4 801288C4 4680D6A0 */ cvt.s.w $f26, $f26 /* BEFC8 801288C8 E7AC0018 */ swc1 $f12, 0x18($sp) /* BEFCC 801288CC E7AC001C */ swc1 $f12, 0x1c($sp) /* BEFD0 801288D0 4600C30D */ trunc.w.s $f12, $f24 /* BEFD4 801288D4 44056000 */ mfc1 $a1, $f12 -/* BEFD8 801288D8 00000000 */ nop +/* BEFD8 801288D8 00000000 */ nop /* BEFDC 801288DC 00052C00 */ sll $a1, $a1, 0x10 /* BEFE0 801288E0 00052C03 */ sra $a1, $a1, 0x10 /* BEFE4 801288E4 4600D30D */ trunc.w.s $f12, $f26 /* BEFE8 801288E8 44066000 */ mfc1 $a2, $f12 -/* BEFEC 801288EC 00000000 */ nop +/* BEFEC 801288EC 00000000 */ nop /* BEFF0 801288F0 00063400 */ sll $a2, $a2, 0x10 /* BEFF4 801288F4 0C04B302 */ jal _draw_message_box /* BEFF8 801288F8 00063403 */ sra $a2, $a2, 0x10 @@ -766,11 +766,11 @@ glabel func_80127D90 /* BF000 80128900 2442FFEC */ addiu $v0, $v0, -0x14 /* BF004 80128904 2C420119 */ sltiu $v0, $v0, 0x119 /* BF008 80128908 10400007 */ beqz $v0, .L80128928 -/* BF00C 8012890C 00000000 */ nop +/* BF00C 8012890C 00000000 */ nop /* BF010 80128910 97C20510 */ lhu $v0, 0x510($fp) /* BF014 80128914 2C4200DD */ sltiu $v0, $v0, 0xdd /* BF018 80128918 10400003 */ beqz $v0, .L80128928 -/* BF01C 8012891C 00000000 */ nop +/* BF01C 8012891C 00000000 */ nop /* BF020 80128920 0C04B4F7 */ jal func_8012D3DC /* BF024 80128924 03C0202D */ daddu $a0, $fp, $zero .L80128928: @@ -824,44 +824,44 @@ glabel func_80127D90 /* BF0E0 801289E0 3C018015 */ lui $at, %hi(D_801507B8) /* BF0E4 801289E4 D42207B8 */ ldc1 $f2, %lo(D_801507B8)($at) /* BF0E8 801289E8 44820000 */ mtc1 $v0, $f0 -/* BF0EC 801289EC 00000000 */ nop +/* BF0EC 801289EC 00000000 */ nop /* BF0F0 801289F0 46800020 */ cvt.s.w $f0, $f0 /* BF0F4 801289F4 46000021 */ cvt.d.s $f0, $f0 /* BF0F8 801289F8 46220002 */ mul.d $f0, $f0, $f2 -/* BF0FC 801289FC 00000000 */ nop +/* BF0FC 801289FC 00000000 */ nop /* BF100 80128A00 3C018015 */ lui $at, %hi(D_801507C0) /* BF104 80128A04 D42207C0 */ ldc1 $f2, %lo(D_801507C0)($at) /* BF108 80128A08 46220000 */ add.d $f0, $f0, $f2 /* BF10C 80128A0C 44922000 */ mtc1 $s2, $f4 -/* BF110 80128A10 00000000 */ nop +/* BF110 80128A10 00000000 */ nop /* BF114 80128A14 46802120 */ cvt.s.w $f4, $f4 /* BF118 80128A18 462002A0 */ cvt.s.d $f10, $f0 /* BF11C 80128A1C 460A2102 */ mul.s $f4, $f4, $f10 -/* BF120 80128A20 00000000 */ nop +/* BF120 80128A20 00000000 */ nop /* BF124 80128A24 3C013FE0 */ lui $at, 0x3fe0 /* BF128 80128A28 44816800 */ mtc1 $at, $f13 /* BF12C 80128A2C 44806000 */ mtc1 $zero, $f12 /* BF130 80128A30 46002121 */ cvt.d.s $f4, $f4 /* BF134 80128A34 462C2002 */ mul.d $f0, $f4, $f12 -/* BF138 80128A38 00000000 */ nop +/* BF138 80128A38 00000000 */ nop /* BF13C 80128A3C 44933000 */ mtc1 $s3, $f6 -/* BF140 80128A40 00000000 */ nop +/* BF140 80128A40 00000000 */ nop /* BF144 80128A44 468031A0 */ cvt.s.w $f6, $f6 /* BF148 80128A48 460A3182 */ mul.s $f6, $f6, $f10 -/* BF14C 80128A4C 00000000 */ nop +/* BF14C 80128A4C 00000000 */ nop /* BF150 80128A50 87C3045A */ lh $v1, 0x45a($fp) /* BF154 80128A54 001217C2 */ srl $v0, $s2, 0x1f /* BF158 80128A58 02421021 */ addu $v0, $s2, $v0 /* BF15C 80128A5C 460031A1 */ cvt.d.s $f6, $f6 /* BF160 80128A60 462C3202 */ mul.d $f8, $f6, $f12 -/* BF164 80128A64 00000000 */ nop +/* BF164 80128A64 00000000 */ nop /* BF168 80128A68 00021043 */ sra $v0, $v0, 1 /* BF16C 80128A6C 00621821 */ addu $v1, $v1, $v0 /* BF170 80128A70 001317C2 */ srl $v0, $s3, 0x1f /* BF174 80128A74 02621021 */ addu $v0, $s3, $v0 /* BF178 80128A78 00021043 */ sra $v0, $v0, 1 /* BF17C 80128A7C 44831000 */ mtc1 $v1, $f2 -/* BF180 80128A80 00000000 */ nop +/* BF180 80128A80 00000000 */ nop /* BF184 80128A84 468010A0 */ cvt.s.w $f2, $f2 /* BF188 80128A88 87C3045C */ lh $v1, 0x45c($fp) /* BF18C 80128A8C 462C2100 */ add.d $f4, $f4, $f12 @@ -869,7 +869,7 @@ glabel func_80127D90 /* BF194 80128A94 00621821 */ addu $v1, $v1, $v0 /* BF198 80128A98 46201081 */ sub.d $f2, $f2, $f0 /* BF19C 80128A9C 44830000 */ mtc1 $v1, $f0 -/* BF1A0 80128AA0 00000000 */ nop +/* BF1A0 80128AA0 00000000 */ nop /* BF1A4 80128AA4 46800020 */ cvt.s.w $f0, $f0 /* BF1A8 80128AA8 46000021 */ cvt.d.s $f0, $f0 /* BF1AC 80128AAC 46280001 */ sub.d $f0, $f0, $f8 @@ -903,13 +903,13 @@ glabel func_80127D90 /* BF214 80128B14 D42207C8 */ ldc1 $f2, %lo(D_801507C8)($at) /* BF218 80128B18 46005021 */ cvt.d.s $f0, $f10 /* BF21C 80128B1C 46220002 */ mul.d $f0, $f0, $f2 -/* BF220 80128B20 00000000 */ nop +/* BF220 80128B20 00000000 */ nop /* BF224 80128B24 3C0141E0 */ lui $at, 0x41e0 /* BF228 80128B28 44811800 */ mtc1 $at, $f3 /* BF22C 80128B2C 44801000 */ mtc1 $zero, $f2 -/* BF230 80128B30 00000000 */ nop +/* BF230 80128B30 00000000 */ nop /* BF234 80128B34 4620103E */ c.le.d $f2, $f0 -/* BF238 80128B38 00000000 */ nop +/* BF238 80128B38 00000000 */ nop /* BF23C 80128B3C 45030005 */ bc1tl .L80128B54 /* BF240 80128B40 46220001 */ sub.d $f0, $f0, $f2 /* BF244 80128B44 4620030D */ trunc.w.d $f12, $f0 @@ -920,17 +920,17 @@ glabel func_80127D90 /* BF254 80128B54 3C028000 */ lui $v0, 0x8000 /* BF258 80128B58 4620030D */ trunc.w.d $f12, $f0 /* BF25C 80128B5C 44036000 */ mfc1 $v1, $f12 -/* BF260 80128B60 00000000 */ nop +/* BF260 80128B60 00000000 */ nop /* BF264 80128B64 00621825 */ or $v1, $v1, $v0 /* BF268 80128B68 306200FF */ andi $v0, $v1, 0xff .L80128B6C: /* BF26C 80128B6C 3C018015 */ lui $at, %hi(D_801507D0) /* BF270 80128B70 D42207D0 */ ldc1 $f2, %lo(D_801507D0)($at) /* BF274 80128B74 44820000 */ mtc1 $v0, $f0 -/* BF278 80128B78 00000000 */ nop +/* BF278 80128B78 00000000 */ nop /* BF27C 80128B7C 46800021 */ cvt.d.w $f0, $f0 /* BF280 80128B80 46220002 */ mul.d $f0, $f0, $f2 -/* BF284 80128B84 00000000 */ nop +/* BF284 80128B84 00000000 */ nop /* BF288 80128B88 4620030D */ trunc.w.d $f12, $f0 /* BF28C 80128B8C 44186000 */ mfc1 $t8, $f12 /* BF290 80128B90 0804A323 */ j .L80128C8C @@ -945,7 +945,7 @@ glabel func_80127D90 /* BF2B0 80128BB0 304200FF */ andi $v0, $v0, 0xff /* BF2B4 80128BB4 2C420005 */ sltiu $v0, $v0, 5 /* BF2B8 80128BB8 14400004 */ bnez $v0, .L80128BCC -/* BF2BC 80128BBC 00000000 */ nop +/* BF2BC 80128BBC 00000000 */ nop /* BF2C0 80128BC0 8FC204FC */ lw $v0, 0x4fc($fp) /* BF2C4 80128BC4 34420001 */ ori $v0, $v0, 1 /* BF2C8 80128BC8 AFC204FC */ sw $v0, 0x4fc($fp) @@ -961,14 +961,14 @@ glabel func_80127D90 /* BF2EC 80128BEC 0002A027 */ nor $s4, $zero, $v0 /* BF2F0 80128BF0 328200FF */ andi $v0, $s4, 0xff /* BF2F4 80128BF4 44820000 */ mtc1 $v0, $f0 -/* BF2F8 80128BF8 00000000 */ nop +/* BF2F8 80128BF8 00000000 */ nop /* BF2FC 80128BFC 46800021 */ cvt.d.w $f0, $f0 /* BF300 80128C00 46220002 */ mul.d $f0, $f0, $f2 -/* BF304 80128C04 00000000 */ nop +/* BF304 80128C04 00000000 */ nop /* BF308 80128C08 24150001 */ addiu $s5, $zero, 1 /* BF30C 80128C0C 4620030D */ trunc.w.d $f12, $f0 /* BF310 80128C10 44036000 */ mfc1 $v1, $f12 -/* BF314 80128C14 00000000 */ nop +/* BF314 80128C14 00000000 */ nop /* BF318 80128C18 00031400 */ sll $v0, $v1, 0x10 /* BF31C 80128C1C 00021403 */ sra $v0, $v0, 0x10 /* BF320 80128C20 28420020 */ slti $v0, $v0, 0x20 @@ -1888,7 +1888,7 @@ glabel func_80127D90 /* C0130 80129A30 0C03D4B8 */ jal draw_box /* C0134 80129A34 AFA30018 */ sw $v1, 0x18($sp) /* C0138 80129A38 0804A6B3 */ j .L80129ACC -/* C013C 80129A3C 00000000 */ nop +/* C013C 80129A3C 00000000 */ nop /* C0140 80129A40 3C048015 */ lui $a0, %hi(D_80155D74) /* C0144 80129A44 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* C0148 80129A48 2402003C */ addiu $v0, $zero, 0x3c @@ -1926,9 +1926,9 @@ glabel func_80127D90 /* C01C8 80129AC8 A7C20484 */ sh $v0, 0x484($fp) .L80129ACC: /* C01CC 80129ACC 0C04B0B8 */ jal func_8012C2E0 -/* C01D0 80129AD0 00000000 */ nop +/* C01D0 80129AD0 00000000 */ nop /* C01D4 80129AD4 0804AAD1 */ j .L8012AB44 -/* C01D8 80129AD8 00000000 */ nop +/* C01D8 80129AD8 00000000 */ nop /* C01DC 80129ADC 93C304F8 */ lbu $v1, 0x4f8($fp) /* C01E0 80129AE0 2402000C */ addiu $v0, $zero, 0xc /* C01E4 80129AE4 1462000A */ bne $v1, $v0, .L80129B10 @@ -1944,7 +1944,7 @@ glabel func_80127D90 /* C020C 80129B0C A7B80080 */ sh $t8, 0x80($sp) .L80129B10: /* C0210 80129B10 14620033 */ bne $v1, $v0, .L80129BE0 -/* C0214 80129B14 00000000 */ nop +/* C0214 80129B14 00000000 */ nop /* C0218 80129B18 93C50487 */ lbu $a1, 0x487($fp) /* C021C 80129B1C 00051040 */ sll $v0, $a1, 1 /* C0220 80129B20 03C21021 */ addu $v0, $fp, $v0 @@ -1973,7 +1973,7 @@ glabel func_80127D90 .L80129B78: /* C0278 80129B78 0083102B */ sltu $v0, $a0, $v1 /* C027C 80129B7C 14400018 */ bnez $v0, .L80129BE0 -/* C0280 80129B80 00000000 */ nop +/* C0280 80129B80 00000000 */ nop /* C0284 80129B84 93C3053C */ lbu $v1, 0x53c($fp) /* C0288 80129B88 2C620002 */ sltiu $v0, $v1, 2 /* C028C 80129B8C 14400014 */ bnez $v0, .L80129BE0 @@ -2024,7 +2024,7 @@ glabel func_80127D90 /* C0334 80129C34 00220821 */ addu $at, $at, $v0 /* C0338 80129C38 8C2207E0 */ lw $v0, %lo(D_801507E0)($at) /* C033C 80129C3C 00400008 */ jr $v0 -/* C0340 80129C40 00000000 */ nop +/* C0340 80129C40 00000000 */ nop /* C0344 80129C44 3C048015 */ lui $a0, %hi(D_80155D74) /* C0348 80129C48 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* C034C 80129C4C 8C820020 */ lw $v0, 0x20($a0) @@ -2082,13 +2082,13 @@ glabel func_80127D90 /* C041C 80129D1C 44812000 */ mtc1 $at, $f4 /* C0420 80129D20 3043000F */ andi $v1, $v0, 0xf /* C0424 80129D24 44830000 */ mtc1 $v1, $f0 -/* C0428 80129D28 00000000 */ nop +/* C0428 80129D28 00000000 */ nop /* C042C 80129D2C 46800020 */ cvt.s.w $f0, $f0 /* C0430 80129D30 46040002 */ mul.s $f0, $f0, $f4 -/* C0434 80129D34 00000000 */ nop +/* C0434 80129D34 00000000 */ nop /* C0438 80129D38 00021102 */ srl $v0, $v0, 4 /* C043C 80129D3C 44821000 */ mtc1 $v0, $f2 -/* C0440 80129D40 00000000 */ nop +/* C0440 80129D40 00000000 */ nop /* C0444 80129D44 468010A0 */ cvt.s.w $f2, $f2 /* C0448 80129D48 8C820020 */ lw $v0, 0x20($a0) /* C044C 80129D4C 8C83004C */ lw $v1, 0x4c($a0) @@ -2099,15 +2099,15 @@ glabel func_80127D90 /* C0460 80129D60 00021902 */ srl $v1, $v0, 4 /* C0464 80129D64 3042000F */ andi $v0, $v0, 0xf /* C0468 80129D68 44820000 */ mtc1 $v0, $f0 -/* C046C 80129D6C 00000000 */ nop +/* C046C 80129D6C 00000000 */ nop /* C0470 80129D70 46800020 */ cvt.s.w $f0, $f0 /* C0474 80129D74 46040002 */ mul.s $f0, $f0, $f4 -/* C0478 80129D78 00000000 */ nop +/* C0478 80129D78 00000000 */ nop /* C047C 80129D7C 3C013FF0 */ lui $at, 0x3ff0 /* C0480 80129D80 44816800 */ mtc1 $at, $f13 /* C0484 80129D84 44806000 */ mtc1 $zero, $f12 /* C0488 80129D88 44831000 */ mtc1 $v1, $f2 -/* C048C 80129D8C 00000000 */ nop +/* C048C 80129D8C 00000000 */ nop /* C0490 80129D90 468010A0 */ cvt.s.w $f2, $f2 /* C0494 80129D94 8C820020 */ lw $v0, 0x20($a0) /* C0498 80129D98 C4840010 */ lwc1 $f4, 0x10($a0) @@ -2121,9 +2121,9 @@ glabel func_80127D90 /* C04B8 80129DB8 46001006 */ mov.s $f0, $f2 /* C04BC 80129DBC 46000021 */ cvt.d.s $f0, $f0 /* C04C0 80129DC0 4620603C */ c.lt.d $f12, $f0 -/* C04C4 80129DC4 00000000 */ nop +/* C04C4 80129DC4 00000000 */ nop /* C04C8 80129DC8 4500000A */ bc1f .L80129DF4 -/* C04CC 80129DCC 00000000 */ nop +/* C04CC 80129DCC 00000000 */ nop .L80129DD0: /* C04D0 80129DD0 3C02E300 */ lui $v0, 0xe300 /* C04D4 80129DD4 8EE30000 */ lw $v1, ($s7) @@ -2136,13 +2136,13 @@ glabel func_80127D90 /* C04F0 80129DF0 AC800004 */ sw $zero, 4($a0) .L80129DF4: /* C04F4 80129DF4 462C203C */ c.lt.d $f4, $f12 -/* C04F8 80129DF8 00000000 */ nop +/* C04F8 80129DF8 00000000 */ nop /* C04FC 80129DFC 45010005 */ bc1t .L80129E14 /* C0500 80129E00 3C04E300 */ lui $a0, 0xe300 /* C0504 80129E04 462C003C */ c.lt.d $f0, $f12 -/* C0508 80129E08 00000000 */ nop +/* C0508 80129E08 00000000 */ nop /* C050C 80129E0C 45000858 */ bc1f .L8012BF70 -/* C0510 80129E10 00000000 */ nop +/* C0510 80129E10 00000000 */ nop .L80129E14: /* C0514 80129E14 8EE20000 */ lw $v0, ($s7) /* C0518 80129E18 34841201 */ ori $a0, $a0, 0x1201 @@ -2250,14 +2250,14 @@ glabel func_80127D90 /* C06AC 80129FAC 00021C03 */ sra $v1, $v0, 0x10 /* C06B0 80129FB0 286200FF */ slti $v0, $v1, 0xff /* C06B4 80129FB4 1040000A */ beqz $v0, .L80129FE0 -/* C06B8 80129FB8 00000000 */ nop +/* C06B8 80129FB8 00000000 */ nop /* C06BC 80129FBC 3C018015 */ lui $at, %hi(D_80150860) /* C06C0 80129FC0 D4220860 */ ldc1 $f2, %lo(D_80150860)($at) /* C06C4 80129FC4 44830000 */ mtc1 $v1, $f0 -/* C06C8 80129FC8 00000000 */ nop +/* C06C8 80129FC8 00000000 */ nop /* C06CC 80129FCC 46800021 */ cvt.d.w $f0, $f0 /* C06D0 80129FD0 46220002 */ mul.d $f0, $f0, $f2 -/* C06D4 80129FD4 00000000 */ nop +/* C06D4 80129FD4 00000000 */ nop /* C06D8 80129FD8 4620030D */ trunc.w.d $f12, $f0 /* C06DC 80129FDC 440D6000 */ mfc1 $t5, $f12 .L80129FE0: @@ -2324,14 +2324,14 @@ glabel func_80127D90 /* C07D0 8012A0D0 00021C03 */ sra $v1, $v0, 0x10 /* C07D4 8012A0D4 286200FF */ slti $v0, $v1, 0xff /* C07D8 8012A0D8 1040000A */ beqz $v0, .L8012A104 -/* C07DC 8012A0DC 00000000 */ nop +/* C07DC 8012A0DC 00000000 */ nop /* C07E0 8012A0E0 3C018015 */ lui $at, %hi(D_80150868) /* C07E4 8012A0E4 D4220868 */ ldc1 $f2, %lo(D_80150868)($at) /* C07E8 8012A0E8 44830000 */ mtc1 $v1, $f0 -/* C07EC 8012A0EC 00000000 */ nop +/* C07EC 8012A0EC 00000000 */ nop /* C07F0 8012A0F0 46800021 */ cvt.d.w $f0, $f0 /* C07F4 8012A0F4 46220002 */ mul.d $f0, $f0, $f2 -/* C07F8 8012A0F8 00000000 */ nop +/* C07F8 8012A0F8 00000000 */ nop /* C07FC 8012A0FC 4620030D */ trunc.w.d $f12, $f0 /* C0800 8012A100 44106000 */ mfc1 $s0, $f12 .L8012A104: @@ -2348,7 +2348,7 @@ glabel func_80127D90 /* C082C 8012A12C 0C0B7A76 */ jal func_802DE9D8 /* C0830 8012A130 00A22825 */ or $a1, $a1, $v0 /* C0834 8012A134 104000FA */ beqz $v0, .L8012A520 -/* C0838 8012A138 00000000 */ nop +/* C0838 8012A138 00000000 */ nop /* C083C 8012A13C 3C058015 */ lui $a1, %hi(D_80155D74) /* C0840 8012A140 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) /* C0844 8012A144 97C6045A */ lhu $a2, 0x45a($fp) @@ -2408,20 +2408,20 @@ glabel func_80127D90 /* C091C 8012A21C 3C028015 */ lui $v0, %hi(D_8015131C) /* C0920 8012A220 8C42131C */ lw $v0, %lo(D_8015131C)($v0) /* C0924 8012A224 10400127 */ beqz $v0, .L8012A6C4 -/* C0928 8012A228 00000000 */ nop +/* C0928 8012A228 00000000 */ nop /* C092C 8012A22C 97AB008E */ lhu $t3, 0x8e($sp) /* C0930 8012A230 000B1400 */ sll $v0, $t3, 0x10 /* C0934 8012A234 00021C03 */ sra $v1, $v0, 0x10 /* C0938 8012A238 286200FF */ slti $v0, $v1, 0xff /* C093C 8012A23C 1040000A */ beqz $v0, .L8012A268 -/* C0940 8012A240 00000000 */ nop +/* C0940 8012A240 00000000 */ nop /* C0944 8012A244 3C018015 */ lui $at, %hi(D_80150870) /* C0948 8012A248 D4220870 */ ldc1 $f2, %lo(D_80150870)($at) /* C094C 8012A24C 44830000 */ mtc1 $v1, $f0 -/* C0950 8012A250 00000000 */ nop +/* C0950 8012A250 00000000 */ nop /* C0954 8012A254 46800021 */ cvt.d.w $f0, $f0 /* C0958 8012A258 46220002 */ mul.d $f0, $f0, $f2 -/* C095C 8012A25C 00000000 */ nop +/* C095C 8012A25C 00000000 */ nop /* C0960 8012A260 4620030D */ trunc.w.d $f12, $f0 /* C0964 8012A264 440B6000 */ mfc1 $t3, $f12 .L8012A268: @@ -2494,7 +2494,7 @@ glabel func_80127D90 /* C0A70 8012A370 84830474 */ lh $v1, 0x474($a0) /* C0A74 8012A374 2402FFFF */ addiu $v0, $zero, -1 /* C0A78 8012A378 14620003 */ bne $v1, $v0, .L8012A388 -/* C0A7C 8012A37C 00000000 */ nop +/* C0A7C 8012A37C 00000000 */ nop /* C0A80 8012A380 90A20003 */ lbu $v0, 3($a1) /* C0A84 8012A384 A4820474 */ sh $v0, 0x474($a0) .L8012A388: @@ -2522,17 +2522,17 @@ glabel func_80127D90 /* C0AD0 8012A3D0 9062FFFF */ lbu $v0, -1($v1) /* C0AD4 8012A3D4 241900FF */ addiu $t9, $zero, 0xff /* C0AD8 8012A3D8 1459000D */ bne $v0, $t9, .L8012A410 -/* C0ADC 8012A3DC 00000000 */ nop +/* C0ADC 8012A3DC 00000000 */ nop /* C0AE0 8012A3E0 90620000 */ lbu $v0, ($v1) /* C0AE4 8012A3E4 144A000A */ bne $v0, $t2, .L8012A410 -/* C0AE8 8012A3E8 00000000 */ nop +/* C0AE8 8012A3E8 00000000 */ nop /* C0AEC 8012A3EC 90620001 */ lbu $v0, 1($v1) /* C0AF0 8012A3F0 14470007 */ bne $v0, $a3, .L8012A410 -/* C0AF4 8012A3F4 00000000 */ nop +/* C0AF4 8012A3F4 00000000 */ nop /* C0AF8 8012A3F8 90630002 */ lbu $v1, 2($v1) /* C0AFC 8012A3FC 90A20470 */ lbu $v0, 0x470($a1) /* C0B00 8012A400 1062002A */ beq $v1, $v0, .L8012A4AC -/* C0B04 8012A404 00000000 */ nop +/* C0B04 8012A404 00000000 */ nop /* C0B08 8012A408 0804A929 */ j .L8012A4A4 /* C0B0C 8012A40C 24840004 */ addiu $a0, $a0, 4 .L8012A410: @@ -2546,10 +2546,10 @@ glabel func_80127D90 /* C0B2C 8012A42C 24840001 */ addiu $a0, $a0, 1 /* C0B30 8012A430 90620001 */ lbu $v0, 1($v1) /* C0B34 8012A434 1449000D */ bne $v0, $t1, .L8012A46C -/* C0B38 8012A438 00000000 */ nop +/* C0B38 8012A438 00000000 */ nop /* C0B3C 8012A43C 90620002 */ lbu $v0, 2($v1) /* C0B40 8012A440 1447000A */ bne $v0, $a3, .L8012A46C -/* C0B44 8012A444 00000000 */ nop +/* C0B44 8012A444 00000000 */ nop /* C0B48 8012A448 84C20474 */ lh $v0, 0x474($a2) /* C0B4C 8012A44C 14400017 */ bnez $v0, .L8012A4AC /* C0B50 8012A450 24840001 */ addiu $a0, $a0, 1 @@ -2558,7 +2558,7 @@ glabel func_80127D90 /* C0B5C 8012A45C 3C028015 */ lui $v0, %hi(D_80155D74) /* C0B60 8012A460 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C0B64 8012A464 0804A8EF */ j .L8012A3BC -/* C0B68 8012A468 00000000 */ nop +/* C0B68 8012A468 00000000 */ nop .L8012A46C: /* C0B6C 8012A46C 3C028015 */ lui $v0, %hi(D_80155D74) /* C0B70 8012A470 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) @@ -2592,18 +2592,18 @@ glabel func_80127D90 /* C0BD8 8012A4D8 10620008 */ beq $v1, $v0, .L8012A4FC /* C0BDC 8012A4DC 00071040 */ sll $v0, $a3, 1 /* C0BE0 8012A4E0 0804AFDC */ j .L8012BF70 -/* C0BE4 8012A4E4 00000000 */ nop +/* C0BE4 8012A4E4 00000000 */ nop .L8012A4E8: /* C0BE8 8012A4E8 24020013 */ addiu $v0, $zero, 0x13 /* C0BEC 8012A4EC 10620015 */ beq $v1, $v0, .L8012A544 /* C0BF0 8012A4F0 24820002 */ addiu $v0, $a0, 2 /* C0BF4 8012A4F4 0804AFDC */ j .L8012BF70 -/* C0BF8 8012A4F8 00000000 */ nop +/* C0BF8 8012A4F8 00000000 */ nop .L8012A4FC: /* C0BFC 8012A4FC 03C21821 */ addu $v1, $fp, $v0 /* C0C00 8012A500 84620474 */ lh $v0, 0x474($v1) /* C0C04 8012A504 14400006 */ bnez $v0, .L8012A520 -/* C0C08 8012A508 00000000 */ nop +/* C0C08 8012A508 00000000 */ nop /* C0C0C 8012A50C 90C20003 */ lbu $v0, 3($a2) /* C0C10 8012A510 10400002 */ beqz $v0, .L8012A51C /* C0C14 8012A514 2402FFFE */ addiu $v0, $zero, -2 @@ -2692,9 +2692,9 @@ glabel func_80127D90 /* C0D4C 8012A64C 0804AAD1 */ j .L8012AB44 /* C0D50 8012A650 A082002B */ sb $v0, 0x2b($a0) /* C0D54 8012A654 0C04B0B8 */ jal func_8012C2E0 -/* C0D58 8012A658 00000000 */ nop +/* C0D58 8012A658 00000000 */ nop /* C0D5C 8012A65C 0804A9B1 */ j .L8012A6C4 -/* C0D60 8012A660 00000000 */ nop +/* C0D60 8012A660 00000000 */ nop /* C0D64 8012A664 3C028015 */ lui $v0, %hi(D_80155D74) /* C0D68 8012A668 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C0D6C 8012A66C 94440042 */ lhu $a0, 0x42($v0) @@ -2747,7 +2747,7 @@ glabel func_80127D90 /* C0E24 8012A724 00220821 */ addu $at, $at, $v0 /* C0E28 8012A728 8C220878 */ lw $v0, %lo(D_80150878)($at) /* C0E2C 8012A72C 00400008 */ jr $v0 -/* C0E30 8012A730 00000000 */ nop +/* C0E30 8012A730 00000000 */ nop /* C0E34 8012A734 3C028015 */ lui $v0, %hi(D_80155D74) /* C0E38 8012A738 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C0E3C 8012A73C 8C430038 */ lw $v1, 0x38($v0) @@ -2902,7 +2902,7 @@ glabel func_80127D90 /* C1088 8012A988 00220821 */ addu $at, $at, $v0 /* C108C 8012A98C 8C2208B8 */ lw $v0, %lo(D_801508B8)($at) /* C1090 8012A990 00400008 */ jr $v0 -/* C1094 8012A994 00000000 */ nop +/* C1094 8012A994 00000000 */ nop /* C1098 8012A998 3C028015 */ lui $v0, %hi(D_80155D74) /* C109C 8012A99C 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C10A0 8012A9A0 8C430038 */ lw $v1, 0x38($v0) @@ -2999,7 +2999,7 @@ glabel func_80127D90 /* C1200 8012AB00 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C1204 8012AB04 9062002E */ lbu $v0, 0x2e($v1) /* C1208 8012AB08 14590006 */ bne $v0, $t9, .L8012AB24 -/* C120C 8012AB0C 00000000 */ nop +/* C120C 8012AB0C 00000000 */ nop /* C1210 8012AB10 97C20514 */ lhu $v0, 0x514($fp) /* C1214 8012AB14 00021042 */ srl $v0, $v0, 1 /* C1218 8012AB18 A062002E */ sb $v0, 0x2e($v1) @@ -3072,7 +3072,7 @@ glabel func_80127D90 /* C1304 8012AC04 94820034 */ lhu $v0, 0x34($a0) /* C1308 8012AC08 30420040 */ andi $v0, $v0, 0x40 /* C130C 8012AC0C 10400007 */ beqz $v0, .L8012AC2C -/* C1310 8012AC10 00000000 */ nop +/* C1310 8012AC10 00000000 */ nop /* C1314 8012AC14 97C2045A */ lhu $v0, 0x45a($fp) /* C1318 8012AC18 97B80066 */ lhu $t8, 0x66($sp) /* C131C 8012AC1C 94830042 */ lhu $v1, 0x42($a0) @@ -3129,46 +3129,46 @@ glabel func_80127D90 /* C13E0 8012ACE0 00032C03 */ sra $a1, $v1, 0x10 /* C13E4 8012ACE4 00A2102A */ slt $v0, $a1, $v0 /* C13E8 8012ACE8 10400480 */ beqz $v0, .L8012BEEC -/* C13EC 8012ACEC 00000000 */ nop +/* C13EC 8012ACEC 00000000 */ nop /* C13F0 8012ACF0 90E20008 */ lbu $v0, 8($a3) /* C13F4 8012ACF4 C4C00010 */ lwc1 $f0, 0x10($a2) /* C13F8 8012ACF8 44821000 */ mtc1 $v0, $f2 -/* C13FC 8012ACFC 00000000 */ nop +/* C13FC 8012ACFC 00000000 */ nop /* C1400 8012AD00 468010A0 */ cvt.s.w $f2, $f2 /* C1404 8012AD04 46020002 */ mul.s $f0, $f0, $f2 -/* C1408 8012AD08 00000000 */ nop +/* C1408 8012AD08 00000000 */ nop /* C140C 8012AD0C 8CC30000 */ lw $v1, ($a2) /* C1410 8012AD10 4600030D */ trunc.w.s $f12, $f0 /* C1414 8012AD14 44026000 */ mfc1 $v0, $f12 -/* C1418 8012AD18 00000000 */ nop +/* C1418 8012AD18 00000000 */ nop /* C141C 8012AD1C 00821021 */ addu $v0, $a0, $v0 /* C1420 8012AD20 0062182A */ slt $v1, $v1, $v0 /* C1424 8012AD24 10600471 */ beqz $v1, .L8012BEEC -/* C1428 8012AD28 00000000 */ nop +/* C1428 8012AD28 00000000 */ nop /* C142C 8012AD2C 91020003 */ lbu $v0, 3($t0) /* C1430 8012AD30 C4C20014 */ lwc1 $f2, 0x14($a2) /* C1434 8012AD34 44820000 */ mtc1 $v0, $f0 -/* C1438 8012AD38 00000000 */ nop +/* C1438 8012AD38 00000000 */ nop /* C143C 8012AD3C 46800020 */ cvt.s.w $f0, $f0 /* C1440 8012AD40 93C20508 */ lbu $v0, 0x508($fp) /* C1444 8012AD44 46001082 */ mul.s $f2, $f2, $f0 -/* C1448 8012AD48 00000000 */ nop +/* C1448 8012AD48 00000000 */ nop /* C144C 8012AD4C 00021040 */ sll $v0, $v0, 1 /* C1450 8012AD50 3C01802F */ lui $at, %hi(D_802EB644) /* C1454 8012AD54 00220821 */ addu $at, $at, $v0 /* C1458 8012AD58 8422B644 */ lh $v0, %lo(D_802EB644)($at) /* C145C 8012AD5C 44820000 */ mtc1 $v0, $f0 -/* C1460 8012AD60 00000000 */ nop +/* C1460 8012AD60 00000000 */ nop /* C1464 8012AD64 46800020 */ cvt.s.w $f0, $f0 /* C1468 8012AD68 46001080 */ add.s $f2, $f2, $f0 /* C146C 8012AD6C 8CC30008 */ lw $v1, 8($a2) /* C1470 8012AD70 4600130D */ trunc.w.s $f12, $f2 /* C1474 8012AD74 44026000 */ mfc1 $v0, $f12 -/* C1478 8012AD78 00000000 */ nop +/* C1478 8012AD78 00000000 */ nop /* C147C 8012AD7C 00A21021 */ addu $v0, $a1, $v0 /* C1480 8012AD80 0062182A */ slt $v1, $v1, $v0 /* C1484 8012AD84 10600459 */ beqz $v1, .L8012BEEC -/* C1488 8012AD88 00000000 */ nop +/* C1488 8012AD88 00000000 */ nop /* C148C 8012AD8C 97B2008E */ lhu $s2, 0x8e($sp) /* C1490 8012AD90 8CC50038 */ lw $a1, 0x38($a2) /* C1494 8012AD94 94D9004A */ lhu $t9, 0x4a($a2) @@ -3176,24 +3176,24 @@ glabel func_80127D90 /* C149C 8012AD9C 1040000B */ beqz $v0, .L8012ADCC /* C14A0 8012ADA0 A7B900A6 */ sh $t9, 0xa6($sp) /* C14A4 8012ADA4 44890000 */ mtc1 $t1, $f0 -/* C14A8 8012ADA8 00000000 */ nop +/* C14A8 8012ADA8 00000000 */ nop /* C14AC 8012ADAC 46800020 */ cvt.s.w $f0, $f0 /* C14B0 8012ADB0 3C018015 */ lui $at, %hi(D_801508F8) /* C14B4 8012ADB4 D42208F8 */ ldc1 $f2, %lo(D_801508F8)($at) /* C14B8 8012ADB8 46000021 */ cvt.d.s $f0, $f0 /* C14BC 8012ADBC 46220002 */ mul.d $f0, $f0, $f2 -/* C14C0 8012ADC0 00000000 */ nop +/* C14C0 8012ADC0 00000000 */ nop /* C14C4 8012ADC4 4620030D */ trunc.w.d $f12, $f0 /* C14C8 8012ADC8 44126000 */ mfc1 $s2, $f12 .L8012ADCC: /* C14CC 8012ADCC 93C204F8 */ lbu $v0, 0x4f8($fp) /* C14D0 8012ADD0 24190007 */ addiu $t9, $zero, 7 /* C14D4 8012ADD4 14590018 */ bne $v0, $t9, .L8012AE38 -/* C14D8 8012ADD8 00000000 */ nop +/* C14D8 8012ADD8 00000000 */ nop /* C14DC 8012ADDC 94C20034 */ lhu $v0, 0x34($a2) /* C14E0 8012ADE0 30420020 */ andi $v0, $v0, 0x20 /* C14E4 8012ADE4 10400014 */ beqz $v0, .L8012AE38 -/* C14E8 8012ADE8 00000000 */ nop +/* C14E8 8012ADE8 00000000 */ nop /* C14EC 8012ADEC 90C3002D */ lbu $v1, 0x2d($a2) /* C14F0 8012ADF0 93C204E8 */ lbu $v0, 0x4e8($fp) /* C14F4 8012ADF4 14620004 */ bne $v1, $v0, .L8012AE08 @@ -3220,7 +3220,7 @@ glabel func_80127D90 /* C1540 8012AE40 8C420038 */ lw $v0, 0x38($v0) /* C1544 8012AE44 30420001 */ andi $v0, $v0, 1 /* C1548 8012AE48 10400011 */ beqz $v0, .L8012AE90 -/* C154C 8012AE4C 00000000 */ nop +/* C154C 8012AE4C 00000000 */ nop /* C1550 8012AE50 0C00A67F */ jal rand_int /* C1554 8012AE54 24042710 */ addiu $a0, $zero, 0x2710 /* C1558 8012AE58 00021FC2 */ srl $v1, $v0, 0x1f @@ -3243,7 +3243,7 @@ glabel func_80127D90 /* C1598 8012AE98 8C820038 */ lw $v0, 0x38($a0) /* C159C 8012AE9C 30420002 */ andi $v0, $v0, 2 /* C15A0 8012AEA0 10400063 */ beqz $v0, .L8012B030 -/* C15A4 8012AEA4 00000000 */ nop +/* C15A4 8012AEA4 00000000 */ nop /* C15A8 8012AEA8 C4820010 */ lwc1 $f2, 0x10($a0) /* C15AC 8012AEAC 3C013FF0 */ lui $at, 0x3ff0 /* C15B0 8012AEB0 44816800 */ mtc1 $at, $f13 @@ -3253,24 +3253,24 @@ glabel func_80127D90 /* C15C0 8012AEC0 3C014014 */ lui $at, 0x4014 /* C15C4 8012AEC4 44812800 */ mtc1 $at, $f5 /* C15C8 8012AEC8 44802000 */ mtc1 $zero, $f4 -/* C15CC 8012AECC 00000000 */ nop +/* C15CC 8012AECC 00000000 */ nop /* C15D0 8012AED0 46241102 */ mul.d $f4, $f2, $f4 -/* C15D4 8012AED4 00000000 */ nop +/* C15D4 8012AED4 00000000 */ nop /* C15D8 8012AED8 3C01402E */ lui $at, 0x402e /* C15DC 8012AEDC 44810800 */ mtc1 $at, $f1 /* C15E0 8012AEE0 44800000 */ mtc1 $zero, $f0 -/* C15E4 8012AEE4 00000000 */ nop +/* C15E4 8012AEE4 00000000 */ nop /* C15E8 8012AEE8 46201082 */ mul.d $f2, $f2, $f0 -/* C15EC 8012AEEC 00000000 */ nop +/* C15EC 8012AEEC 00000000 */ nop /* C15F0 8012AEF0 3C014034 */ lui $at, 0x4034 /* C15F4 8012AEF4 44810800 */ mtc1 $at, $f1 /* C15F8 8012AEF8 44800000 */ mtc1 $zero, $f0 -/* C15FC 8012AEFC 00000000 */ nop +/* C15FC 8012AEFC 00000000 */ nop /* C1600 8012AF00 46240001 */ sub.d $f0, $f0, $f4 /* C1604 8012AF04 97C30452 */ lhu $v1, 0x452($fp) /* C1608 8012AF08 4620030D */ trunc.w.d $f12, $f0 /* C160C 8012AF0C 44026000 */ mfc1 $v0, $f12 -/* C1610 8012AF10 00000000 */ nop +/* C1610 8012AF10 00000000 */ nop /* C1614 8012AF14 00620018 */ mult $v1, $v0 /* C1618 8012AF18 3C018015 */ lui $at, %hi(D_80150900) /* C161C 8012AF1C D4200900 */ ldc1 $f0, %lo(D_80150900)($at) @@ -3279,7 +3279,7 @@ glabel func_80127D90 /* C1628 8012AF28 8C830030 */ lw $v1, 0x30($a0) /* C162C 8012AF2C 4620030D */ trunc.w.d $f12, $f0 /* C1630 8012AF30 44026000 */ mfc1 $v0, $f12 -/* C1634 8012AF34 00000000 */ nop +/* C1634 8012AF34 00000000 */ nop /* C1638 8012AF38 00620018 */ mult $v1, $v0 /* C163C 8012AF3C 00001812 */ mflo $v1 /* C1640 8012AF40 00A38023 */ subu $s0, $a1, $v1 @@ -3299,11 +3299,11 @@ glabel func_80127D90 /* C1678 8012AF78 46341080 */ add.d $f2, $f2, $f20 /* C167C 8012AF7C 46000021 */ cvt.d.s $f0, $f0 /* C1680 8012AF80 46220002 */ mul.d $f0, $f0, $f2 -/* C1684 8012AF84 00000000 */ nop +/* C1684 8012AF84 00000000 */ nop /* C1688 8012AF88 3C018015 */ lui $at, %hi(D_80150910) /* C168C 8012AF8C D4240910 */ ldc1 $f4, %lo(D_80150910)($at) /* C1690 8012AF90 44901000 */ mtc1 $s0, $f2 -/* C1694 8012AF94 00000000 */ nop +/* C1694 8012AF94 00000000 */ nop /* C1698 8012AF98 468010A1 */ cvt.d.w $f2, $f2 /* C169C 8012AF9C 46241080 */ add.d $f2, $f2, $f4 /* C16A0 8012AFA0 3C018015 */ lui $at, %hi(D_80150918) @@ -3312,7 +3312,7 @@ glabel func_80127D90 /* C16AC 8012AFAC 46241080 */ add.d $f2, $f2, $f4 /* C16B0 8012AFB0 00021403 */ sra $v0, $v0, 0x10 /* C16B4 8012AFB4 44822000 */ mtc1 $v0, $f4 -/* C16B8 8012AFB8 00000000 */ nop +/* C16B8 8012AFB8 00000000 */ nop /* C16BC 8012AFBC 46802121 */ cvt.d.w $f4, $f4 /* C16C0 8012AFC0 4620130D */ trunc.w.d $f12, $f2 /* C16C4 8012AFC4 44046000 */ mfc1 $a0, $f12 @@ -3333,11 +3333,11 @@ glabel func_80127D90 /* C1700 8012B000 46341080 */ add.d $f2, $f2, $f20 /* C1704 8012B004 46000021 */ cvt.d.s $f0, $f0 /* C1708 8012B008 46220002 */ mul.d $f0, $f0, $f2 -/* C170C 8012B00C 00000000 */ nop +/* C170C 8012B00C 00000000 */ nop /* C1710 8012B010 00131400 */ sll $v0, $s3, 0x10 /* C1714 8012B014 00021403 */ sra $v0, $v0, 0x10 /* C1718 8012B018 44821000 */ mtc1 $v0, $f2 -/* C171C 8012B01C 00000000 */ nop +/* C171C 8012B01C 00000000 */ nop /* C1720 8012B020 468010A1 */ cvt.d.w $f2, $f2 /* C1724 8012B024 46201080 */ add.d $f2, $f2, $f0 /* C1728 8012B028 4620130D */ trunc.w.d $f12, $f2 @@ -3348,7 +3348,7 @@ glabel func_80127D90 /* C1738 8012B038 8C620038 */ lw $v0, 0x38($v1) /* C173C 8012B03C 30420200 */ andi $v0, $v0, 0x200 /* C1740 8012B040 1040005A */ beqz $v0, .L8012B1AC -/* C1744 8012B044 00000000 */ nop +/* C1744 8012B044 00000000 */ nop /* C1748 8012B048 C4620010 */ lwc1 $f2, 0x10($v1) /* C174C 8012B04C 3C013FF0 */ lui $at, 0x3ff0 /* C1750 8012B050 44816800 */ mtc1 $at, $f13 @@ -3358,20 +3358,20 @@ glabel func_80127D90 /* C1760 8012B060 3C014014 */ lui $at, 0x4014 /* C1764 8012B064 44810800 */ mtc1 $at, $f1 /* C1768 8012B068 44800000 */ mtc1 $zero, $f0 -/* C176C 8012B06C 00000000 */ nop +/* C176C 8012B06C 00000000 */ nop /* C1770 8012B070 46201082 */ mul.d $f2, $f2, $f0 -/* C1774 8012B074 00000000 */ nop +/* C1774 8012B074 00000000 */ nop /* C1778 8012B078 3C014034 */ lui $at, 0x4034 /* C177C 8012B07C 44810800 */ mtc1 $at, $f1 /* C1780 8012B080 44800000 */ mtc1 $zero, $f0 -/* C1784 8012B084 00000000 */ nop +/* C1784 8012B084 00000000 */ nop /* C1788 8012B088 46220001 */ sub.d $f0, $f0, $f2 /* C178C 8012B08C 3C028015 */ lui $v0, %hi(D_801512E4) /* C1790 8012B090 944212E4 */ lhu $v0, %lo(D_801512E4)($v0) /* C1794 8012B094 8C630030 */ lw $v1, 0x30($v1) /* C1798 8012B098 4620030D */ trunc.w.d $f12, $f0 /* C179C 8012B09C 44046000 */ mfc1 $a0, $f12 -/* C17A0 8012B0A0 00000000 */ nop +/* C17A0 8012B0A0 00000000 */ nop /* C17A4 8012B0A4 00440018 */ mult $v0, $a0 /* C17A8 8012B0A8 00031040 */ sll $v0, $v1, 1 /* C17AC 8012B0AC 00431021 */ addu $v0, $v0, $v1 @@ -3395,11 +3395,11 @@ glabel func_80127D90 /* C17F4 8012B0F4 46341080 */ add.d $f2, $f2, $f20 /* C17F8 8012B0F8 46000021 */ cvt.d.s $f0, $f0 /* C17FC 8012B0FC 46220002 */ mul.d $f0, $f0, $f2 -/* C1800 8012B100 00000000 */ nop +/* C1800 8012B100 00000000 */ nop /* C1804 8012B104 3C018015 */ lui $at, %hi(D_80150928) /* C1808 8012B108 D4240928 */ ldc1 $f4, %lo(D_80150928)($at) /* C180C 8012B10C 44901000 */ mtc1 $s0, $f2 -/* C1810 8012B110 00000000 */ nop +/* C1810 8012B110 00000000 */ nop /* C1814 8012B114 468010A1 */ cvt.d.w $f2, $f2 /* C1818 8012B118 46241080 */ add.d $f2, $f2, $f4 /* C181C 8012B11C 3C018015 */ lui $at, %hi(D_80150930) @@ -3408,7 +3408,7 @@ glabel func_80127D90 /* C1828 8012B128 46241080 */ add.d $f2, $f2, $f4 /* C182C 8012B12C 00021403 */ sra $v0, $v0, 0x10 /* C1830 8012B130 44822000 */ mtc1 $v0, $f4 -/* C1834 8012B134 00000000 */ nop +/* C1834 8012B134 00000000 */ nop /* C1838 8012B138 46802121 */ cvt.d.w $f4, $f4 /* C183C 8012B13C 4620130D */ trunc.w.d $f12, $f2 /* C1840 8012B140 44046000 */ mfc1 $a0, $f12 @@ -3429,11 +3429,11 @@ glabel func_80127D90 /* C187C 8012B17C 46341080 */ add.d $f2, $f2, $f20 /* C1880 8012B180 46000021 */ cvt.d.s $f0, $f0 /* C1884 8012B184 46220002 */ mul.d $f0, $f0, $f2 -/* C1888 8012B188 00000000 */ nop +/* C1888 8012B188 00000000 */ nop /* C188C 8012B18C 00131400 */ sll $v0, $s3, 0x10 /* C1890 8012B190 00021403 */ sra $v0, $v0, 0x10 /* C1894 8012B194 44821000 */ mtc1 $v0, $f2 -/* C1898 8012B198 00000000 */ nop +/* C1898 8012B198 00000000 */ nop /* C189C 8012B19C 468010A1 */ cvt.d.w $f2, $f2 /* C18A0 8012B1A0 46201080 */ add.d $f2, $f2, $f0 /* C18A4 8012B1A4 4620130D */ trunc.w.d $f12, $f2 @@ -3509,7 +3509,7 @@ glabel func_80127D90 /* C19A8 8012B2A8 00121400 */ sll $v0, $s2, 0x10 /* C19AC 8012B2AC 00021403 */ sra $v0, $v0, 0x10 /* C19B0 8012B2B0 44820000 */ mtc1 $v0, $f0 -/* C19B4 8012B2B4 00000000 */ nop +/* C19B4 8012B2B4 00000000 */ nop /* C19B8 8012B2B8 46800021 */ cvt.d.w $f0, $f0 /* C19BC 8012B2BC 24020020 */ addiu $v0, $zero, 0x20 /* C19C0 8012B2C0 8EE30000 */ lw $v1, ($s7) @@ -3521,10 +3521,10 @@ glabel func_80127D90 /* C19D8 8012B2D8 97B900B6 */ lhu $t9, 0xb6($sp) /* C19DC 8012B2DC 46220003 */ div.d $f0, $f0, $f2 /* C19E0 8012B2E0 44992000 */ mtc1 $t9, $f4 -/* C19E4 8012B2E4 00000000 */ nop +/* C19E4 8012B2E4 00000000 */ nop /* C19E8 8012B2E8 46802121 */ cvt.d.w $f4, $f4 /* C19EC 8012B2EC 46202102 */ mul.d $f4, $f4, $f0 -/* C19F0 8012B2F0 00000000 */ nop +/* C19F0 8012B2F0 00000000 */ nop /* C19F4 8012B2F4 AC820004 */ sw $v0, 4($a0) /* C19F8 8012B2F8 24620008 */ addiu $v0, $v1, 8 /* C19FC 8012B2FC AC850000 */ sw $a1, ($a0) @@ -3555,7 +3555,7 @@ glabel func_80127D90 /* C1A58 8012B358 00021403 */ sra $v0, $v0, 0x10 /* C1A5C 8012B35C 284200FF */ slti $v0, $v0, 0xff /* C1A60 8012B360 10400005 */ beqz $v0, .L8012B378 -/* C1A64 8012B364 00000000 */ nop +/* C1A64 8012B364 00000000 */ nop /* C1A68 8012B368 8EE20000 */ lw $v0, ($s7) /* C1A6C 8012B36C 0040182D */ daddu $v1, $v0, $zero /* C1A70 8012B370 0804AD09 */ j .L8012B424 @@ -3653,7 +3653,7 @@ glabel func_80127D90 /* C1BC4 8012B4C4 00121400 */ sll $v0, $s2, 0x10 .L8012B4C8: /* C1BC8 8012B4C8 18400288 */ blez $v0, .L8012BEEC -/* C1BCC 8012B4CC 00000000 */ nop +/* C1BCC 8012B4CC 00000000 */ nop /* C1BD0 8012B4D0 3C068015 */ lui $a2, %hi(D_80155D74) /* C1BD4 8012B4D4 8CC65D74 */ lw $a2, %lo(D_80155D74)($a2) /* C1BD8 8012B4D8 8CC30038 */ lw $v1, 0x38($a2) @@ -3665,13 +3665,13 @@ glabel func_80127D90 /* C1BF0 8012B4F0 00621821 */ addu $v1, $v1, $v0 /* C1BF4 8012B4F4 90650001 */ lbu $a1, 1($v1) /* C1BF8 8012B4F8 10A401B8 */ beq $a1, $a0, .L8012BBDC -/* C1BFC 8012B4FC 00000000 */ nop +/* C1BFC 8012B4FC 00000000 */ nop /* C1C00 8012B500 90620002 */ lbu $v0, 2($v1) /* C1C04 8012B504 104401B5 */ beq $v0, $a0, .L8012BBDC -/* C1C08 8012B508 00000000 */ nop +/* C1C08 8012B508 00000000 */ nop /* C1C0C 8012B50C 90620003 */ lbu $v0, 3($v1) /* C1C10 8012B510 104401B2 */ beq $v0, $a0, .L8012BBDC -/* C1C14 8012B514 00000000 */ nop +/* C1C14 8012B514 00000000 */ nop /* C1C18 8012B518 90620004 */ lbu $v0, 4($v1) /* C1C1C 8012B51C 104401AF */ beq $v0, $a0, .L8012BBDC /* C1C20 8012B520 240200FB */ addiu $v0, $zero, 0xfb @@ -3685,11 +3685,11 @@ glabel func_80127D90 /* C1C40 8012B540 D4280940 */ ldc1 $f8, %lo(D_80150940)($at) /* C1C44 8012B544 460031A1 */ cvt.d.s $f6, $f6 /* C1C48 8012B548 46283182 */ mul.d $f6, $f6, $f8 -/* C1C4C 8012B54C 00000000 */ nop +/* C1C4C 8012B54C 00000000 */ nop /* C1C50 8012B550 C4C00010 */ lwc1 $f0, 0x10($a2) /* C1C54 8012B554 46000021 */ cvt.d.s $f0, $f0 /* C1C58 8012B558 46280002 */ mul.d $f0, $f0, $f8 -/* C1C5C 8012B55C 00000000 */ nop +/* C1C5C 8012B55C 00000000 */ nop /* C1C60 8012B560 3C014018 */ lui $at, 0x4018 /* C1C64 8012B564 44812800 */ mtc1 $at, $f5 /* C1C68 8012B568 44802000 */ mtc1 $zero, $f4 @@ -3697,19 +3697,19 @@ glabel func_80127D90 /* C1C70 8012B570 460030A1 */ cvt.d.s $f2, $f6 /* C1C74 8012B574 46281083 */ div.d $f2, $f2, $f8 /* C1C78 8012B578 46241082 */ mul.d $f2, $f2, $f4 -/* C1C7C 8012B57C 00000000 */ nop +/* C1C7C 8012B57C 00000000 */ nop /* C1C80 8012B580 00021403 */ sra $v0, $v0, 0x10 /* C1C84 8012B584 46200020 */ cvt.s.d $f0, $f0 /* C1C88 8012B588 E4C00018 */ swc1 $f0, 0x18($a2) /* C1C8C 8012B58C 46201220 */ cvt.s.d $f8, $f2 /* C1C90 8012B590 44821000 */ mtc1 $v0, $f2 -/* C1C94 8012B594 00000000 */ nop +/* C1C94 8012B594 00000000 */ nop /* C1C98 8012B598 468010A0 */ cvt.s.w $f2, $f2 /* C1C9C 8012B59C 00131400 */ sll $v0, $s3, 0x10 /* C1CA0 8012B5A0 46081081 */ sub.s $f2, $f2, $f8 /* C1CA4 8012B5A4 00021403 */ sra $v0, $v0, 0x10 /* C1CA8 8012B5A8 44820000 */ mtc1 $v0, $f0 -/* C1CAC 8012B5AC 00000000 */ nop +/* C1CAC 8012B5AC 00000000 */ nop /* C1CB0 8012B5B0 46800020 */ cvt.s.w $f0, $f0 /* C1CB4 8012B5B4 46080001 */ sub.s $f0, $f0, $f8 /* C1CB8 8012B5B8 0804ADC5 */ j .L8012B714 @@ -3732,11 +3732,11 @@ glabel func_80127D90 /* C1CF8 8012B5F8 D4280948 */ ldc1 $f8, %lo(D_80150948)($at) /* C1CFC 8012B5FC 460031A1 */ cvt.d.s $f6, $f6 /* C1D00 8012B600 46283182 */ mul.d $f6, $f6, $f8 -/* C1D04 8012B604 00000000 */ nop +/* C1D04 8012B604 00000000 */ nop /* C1D08 8012B608 C4800010 */ lwc1 $f0, 0x10($a0) /* C1D0C 8012B60C 46000021 */ cvt.d.s $f0, $f0 /* C1D10 8012B610 46280002 */ mul.d $f0, $f0, $f8 -/* C1D14 8012B614 00000000 */ nop +/* C1D14 8012B614 00000000 */ nop /* C1D18 8012B618 3C014008 */ lui $at, 0x4008 /* C1D1C 8012B61C 44812800 */ mtc1 $at, $f5 /* C1D20 8012B620 44802000 */ mtc1 $zero, $f4 @@ -3744,19 +3744,19 @@ glabel func_80127D90 /* C1D28 8012B628 460030A1 */ cvt.d.s $f2, $f6 /* C1D2C 8012B62C 46281083 */ div.d $f2, $f2, $f8 /* C1D30 8012B630 46241082 */ mul.d $f2, $f2, $f4 -/* C1D34 8012B634 00000000 */ nop +/* C1D34 8012B634 00000000 */ nop /* C1D38 8012B638 00021403 */ sra $v0, $v0, 0x10 /* C1D3C 8012B63C 46200020 */ cvt.s.d $f0, $f0 /* C1D40 8012B640 E4800018 */ swc1 $f0, 0x18($a0) /* C1D44 8012B644 46201220 */ cvt.s.d $f8, $f2 /* C1D48 8012B648 44821000 */ mtc1 $v0, $f2 -/* C1D4C 8012B64C 00000000 */ nop +/* C1D4C 8012B64C 00000000 */ nop /* C1D50 8012B650 468010A0 */ cvt.s.w $f2, $f2 /* C1D54 8012B654 00131400 */ sll $v0, $s3, 0x10 /* C1D58 8012B658 46081081 */ sub.s $f2, $f2, $f8 /* C1D5C 8012B65C 00021403 */ sra $v0, $v0, 0x10 /* C1D60 8012B660 44820000 */ mtc1 $v0, $f0 -/* C1D64 8012B664 00000000 */ nop +/* C1D64 8012B664 00000000 */ nop /* C1D68 8012B668 46800020 */ cvt.s.w $f0, $f0 /* C1D6C 8012B66C 46080001 */ sub.s $f0, $f0, $f8 /* C1D70 8012B670 0804ADC5 */ j .L8012B714 @@ -3777,11 +3777,11 @@ glabel func_80127D90 /* C1DA8 8012B6A8 D4260950 */ ldc1 $f6, %lo(D_80150950)($at) /* C1DAC 8012B6AC 46002121 */ cvt.d.s $f4, $f4 /* C1DB0 8012B6B0 46262102 */ mul.d $f4, $f4, $f6 -/* C1DB4 8012B6B4 00000000 */ nop +/* C1DB4 8012B6B4 00000000 */ nop /* C1DB8 8012B6B8 C4820010 */ lwc1 $f2, 0x10($a0) /* C1DBC 8012B6BC 460010A1 */ cvt.d.s $f2, $f2 /* C1DC0 8012B6C0 46261082 */ mul.d $f2, $f2, $f6 -/* C1DC4 8012B6C4 00000000 */ nop +/* C1DC4 8012B6C4 00000000 */ nop /* C1DC8 8012B6C8 00021403 */ sra $v0, $v0, 0x10 /* C1DCC 8012B6CC 46202120 */ cvt.s.d $f4, $f4 /* C1DD0 8012B6D0 46002021 */ cvt.d.s $f0, $f4 @@ -3790,14 +3790,14 @@ glabel func_80127D90 /* C1DDC 8012B6DC E4820018 */ swc1 $f2, 0x18($a0) /* C1DE0 8012B6E0 46200000 */ add.d $f0, $f0, $f0 /* C1DE4 8012B6E4 44821000 */ mtc1 $v0, $f2 -/* C1DE8 8012B6E8 00000000 */ nop +/* C1DE8 8012B6E8 00000000 */ nop /* C1DEC 8012B6EC 468010A0 */ cvt.s.w $f2, $f2 /* C1DF0 8012B6F0 00131400 */ sll $v0, $s3, 0x10 /* C1DF4 8012B6F4 46200220 */ cvt.s.d $f8, $f0 /* C1DF8 8012B6F8 46081081 */ sub.s $f2, $f2, $f8 /* C1DFC 8012B6FC 00021403 */ sra $v0, $v0, 0x10 /* C1E00 8012B700 44820000 */ mtc1 $v0, $f0 -/* C1E04 8012B704 00000000 */ nop +/* C1E04 8012B704 00000000 */ nop /* C1E08 8012B708 46800020 */ cvt.s.w $f0, $f0 /* C1E0C 8012B70C 46080001 */ sub.s $f0, $f0, $f8 /* C1E10 8012B710 E484001C */ swc1 $f4, 0x1c($a0) @@ -3807,7 +3807,7 @@ glabel func_80127D90 /* C1E1C 8012B71C 4600030D */ trunc.w.s $f12, $f0 /* C1E20 8012B720 44136000 */ mfc1 $s3, $f12 /* C1E24 8012B724 0804AEF7 */ j .L8012BBDC -/* C1E28 8012B728 00000000 */ nop +/* C1E28 8012B728 00000000 */ nop .L8012B72C: /* C1E2C 8012B72C 30621000 */ andi $v0, $v1, 0x1000 /* C1E30 8012B730 10400060 */ beqz $v0, .L8012B8B4 @@ -3817,13 +3817,13 @@ glabel func_80127D90 /* C1E40 8012B740 00621821 */ addu $v1, $v1, $v0 /* C1E44 8012B744 90650001 */ lbu $a1, 1($v1) /* C1E48 8012B748 10A40124 */ beq $a1, $a0, .L8012BBDC -/* C1E4C 8012B74C 00000000 */ nop +/* C1E4C 8012B74C 00000000 */ nop /* C1E50 8012B750 90620002 */ lbu $v0, 2($v1) /* C1E54 8012B754 10440121 */ beq $v0, $a0, .L8012BBDC -/* C1E58 8012B758 00000000 */ nop +/* C1E58 8012B758 00000000 */ nop /* C1E5C 8012B75C 90620003 */ lbu $v0, 3($v1) /* C1E60 8012B760 1044011E */ beq $v0, $a0, .L8012BBDC -/* C1E64 8012B764 00000000 */ nop +/* C1E64 8012B764 00000000 */ nop /* C1E68 8012B768 90620004 */ lbu $v0, 4($v1) /* C1E6C 8012B76C 1044011B */ beq $v0, $a0, .L8012BBDC /* C1E70 8012B770 240200FB */ addiu $v0, $zero, 0xfb @@ -3831,17 +3831,17 @@ glabel func_80127D90 /* C1E78 8012B778 24020004 */ addiu $v0, $zero, 4 /* C1E7C 8012B77C 93C304F8 */ lbu $v1, 0x4f8($fp) /* C1E80 8012B780 14620012 */ bne $v1, $v0, .L8012B7CC -/* C1E84 8012B784 00000000 */ nop +/* C1E84 8012B784 00000000 */ nop /* C1E88 8012B788 C4C00010 */ lwc1 $f0, 0x10($a2) /* C1E8C 8012B78C 3C018015 */ lui $at, %hi(D_80150958) /* C1E90 8012B790 D4240958 */ ldc1 $f4, %lo(D_80150958)($at) /* C1E94 8012B794 46000021 */ cvt.d.s $f0, $f0 /* C1E98 8012B798 46240002 */ mul.d $f0, $f0, $f4 -/* C1E9C 8012B79C 00000000 */ nop +/* C1E9C 8012B79C 00000000 */ nop /* C1EA0 8012B7A0 C4C20014 */ lwc1 $f2, 0x14($a2) /* C1EA4 8012B7A4 460010A1 */ cvt.d.s $f2, $f2 /* C1EA8 8012B7A8 46241082 */ mul.d $f2, $f2, $f4 -/* C1EAC 8012B7AC 00000000 */ nop +/* C1EAC 8012B7AC 00000000 */ nop /* C1EB0 8012B7B0 26310005 */ addiu $s1, $s1, 5 /* C1EB4 8012B7B4 26730005 */ addiu $s3, $s3, 5 /* C1EB8 8012B7B8 46200020 */ cvt.s.d $f0, $f0 @@ -3861,18 +3861,18 @@ glabel func_80127D90 /* C1EEC 8012B7EC 24020004 */ addiu $v0, $zero, 4 /* C1EF0 8012B7F0 93C304F8 */ lbu $v1, 0x4f8($fp) /* C1EF4 8012B7F4 14620013 */ bne $v1, $v0, .L8012B844 -/* C1EF8 8012B7F8 00000000 */ nop +/* C1EF8 8012B7F8 00000000 */ nop /* C1EFC 8012B7FC C4820010 */ lwc1 $f2, 0x10($a0) /* C1F00 8012B800 3C013FE0 */ lui $at, 0x3fe0 /* C1F04 8012B804 44816800 */ mtc1 $at, $f13 /* C1F08 8012B808 44806000 */ mtc1 $zero, $f12 /* C1F0C 8012B80C 460010A1 */ cvt.d.s $f2, $f2 /* C1F10 8012B810 462C1082 */ mul.d $f2, $f2, $f12 -/* C1F14 8012B814 00000000 */ nop +/* C1F14 8012B814 00000000 */ nop /* C1F18 8012B818 C4800014 */ lwc1 $f0, 0x14($a0) /* C1F1C 8012B81C 46000021 */ cvt.d.s $f0, $f0 /* C1F20 8012B820 462C0002 */ mul.d $f0, $f0, $f12 -/* C1F24 8012B824 00000000 */ nop +/* C1F24 8012B824 00000000 */ nop /* C1F28 8012B828 26310003 */ addiu $s1, $s1, 3 /* C1F2C 8012B82C 26730003 */ addiu $s3, $s3, 3 /* C1F30 8012B830 462010A0 */ cvt.s.d $f2, $f2 @@ -3890,18 +3890,18 @@ glabel func_80127D90 /* C1F5C 8012B85C 24020004 */ addiu $v0, $zero, 4 /* C1F60 8012B860 93C304F8 */ lbu $v1, 0x4f8($fp) /* C1F64 8012B864 146200DD */ bne $v1, $v0, .L8012BBDC -/* C1F68 8012B868 00000000 */ nop +/* C1F68 8012B868 00000000 */ nop /* C1F6C 8012B86C C4800010 */ lwc1 $f0, 0x10($a0) /* C1F70 8012B870 3C013FE8 */ lui $at, 0x3fe8 /* C1F74 8012B874 44812800 */ mtc1 $at, $f5 /* C1F78 8012B878 44802000 */ mtc1 $zero, $f4 /* C1F7C 8012B87C 46000021 */ cvt.d.s $f0, $f0 /* C1F80 8012B880 46240002 */ mul.d $f0, $f0, $f4 -/* C1F84 8012B884 00000000 */ nop +/* C1F84 8012B884 00000000 */ nop /* C1F88 8012B888 C4820014 */ lwc1 $f2, 0x14($a0) /* C1F8C 8012B88C 460010A1 */ cvt.d.s $f2, $f2 /* C1F90 8012B890 46241082 */ mul.d $f2, $f2, $f4 -/* C1F94 8012B894 00000000 */ nop +/* C1F94 8012B894 00000000 */ nop /* C1F98 8012B898 26310002 */ addiu $s1, $s1, 2 /* C1F9C 8012B89C 26730002 */ addiu $s3, $s3, 2 /* C1FA0 8012B8A0 46200020 */ cvt.s.d $f0, $f0 @@ -3935,44 +3935,44 @@ glabel func_80127D90 /* C200C 8012B90C 00641821 */ addu $v1, $v1, $a0 /* C2010 8012B910 00431023 */ subu $v0, $v0, $v1 /* C2014 8012B914 44824000 */ mtc1 $v0, $f8 -/* C2018 8012B918 00000000 */ nop +/* C2018 8012B918 00000000 */ nop /* C201C 8012B91C 46804220 */ cvt.s.w $f8, $f8 /* C2020 8012B920 46004021 */ cvt.d.s $f0, $f8 /* C2024 8012B924 46220003 */ div.d $f0, $f0, $f2 /* C2028 8012B928 46200220 */ cvt.s.d $f8, $f0 /* C202C 8012B92C 46004021 */ cvt.d.s $f0, $f8 /* C2030 8012B930 462C0002 */ mul.d $f0, $f0, $f12 -/* C2034 8012B934 00000000 */ nop +/* C2034 8012B934 00000000 */ nop /* C2038 8012B938 3C013FF0 */ lui $at, 0x3ff0 /* C203C 8012B93C 44816800 */ mtc1 $at, $f13 /* C2040 8012B940 44806000 */ mtc1 $zero, $f12 -/* C2044 8012B944 00000000 */ nop +/* C2044 8012B944 00000000 */ nop /* C2048 8012B948 462C0000 */ add.d $f0, $f0, $f12 /* C204C 8012B94C 3C013FD0 */ lui $at, 0x3fd0 /* C2050 8012B950 44811800 */ mtc1 $at, $f3 /* C2054 8012B954 44801000 */ mtc1 $zero, $f2 -/* C2058 8012B958 00000000 */ nop +/* C2058 8012B958 00000000 */ nop /* C205C 8012B95C 46220001 */ sub.d $f0, $f0, $f2 /* C2060 8012B960 46200220 */ cvt.s.d $f8, $f0 /* C2064 8012B964 460040A1 */ cvt.d.s $f2, $f8 /* C2068 8012B968 4622603C */ c.lt.d $f12, $f2 -/* C206C 8012B96C 00000000 */ nop +/* C206C 8012B96C 00000000 */ nop /* C2070 8012B970 4500006D */ bc1f .L8012BB28 /* C2074 8012B974 00111400 */ sll $v0, $s1, 0x10 /* C2078 8012B978 3C014020 */ lui $at, 0x4020 /* C207C 8012B97C 44812800 */ mtc1 $at, $f5 /* C2080 8012B980 44802000 */ mtc1 $zero, $f4 -/* C2084 8012B984 00000000 */ nop +/* C2084 8012B984 00000000 */ nop /* C2088 8012B988 46241102 */ mul.d $f4, $f2, $f4 -/* C208C 8012B98C 00000000 */ nop +/* C208C 8012B98C 00000000 */ nop /* C2090 8012B990 3C038015 */ lui $v1, %hi(D_80155D74) /* C2094 8012B994 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C2098 8012B998 C4600010 */ lwc1 $f0, 0x10($v1) /* C209C 8012B99C 46080002 */ mul.s $f0, $f0, $f8 -/* C20A0 8012B9A0 00000000 */ nop +/* C20A0 8012B9A0 00000000 */ nop /* C20A4 8012B9A4 C4660014 */ lwc1 $f6, 0x14($v1) /* C20A8 8012B9A8 46083182 */ mul.s $f6, $f6, $f8 -/* C20AC 8012B9AC 00000000 */ nop +/* C20AC 8012B9AC 00000000 */ nop /* C20B0 8012B9B0 E4600018 */ swc1 $f0, 0x18($v1) /* C20B4 8012B9B4 3C014021 */ lui $at, 0x4021 /* C20B8 8012B9B8 44810800 */ mtc1 $at, $f1 @@ -3980,13 +3980,13 @@ glabel func_80127D90 /* C20C0 8012B9C0 00021403 */ sra $v0, $v0, 0x10 /* C20C4 8012B9C4 46202101 */ sub.d $f4, $f4, $f0 /* C20C8 8012B9C8 44821000 */ mtc1 $v0, $f2 -/* C20CC 8012B9CC 00000000 */ nop +/* C20CC 8012B9CC 00000000 */ nop /* C20D0 8012B9D0 468010A1 */ cvt.d.w $f2, $f2 /* C20D4 8012B9D4 00131400 */ sll $v0, $s3, 0x10 /* C20D8 8012B9D8 46241081 */ sub.d $f2, $f2, $f4 /* C20DC 8012B9DC 00021403 */ sra $v0, $v0, 0x10 /* C20E0 8012B9E0 44820000 */ mtc1 $v0, $f0 -/* C20E4 8012B9E4 00000000 */ nop +/* C20E4 8012B9E4 00000000 */ nop /* C20E8 8012B9E8 46800021 */ cvt.d.w $f0, $f0 /* C20EC 8012B9EC 46240001 */ sub.d $f0, $f0, $f4 /* C20F0 8012B9F0 4620130D */ trunc.w.d $f12, $f2 @@ -4022,32 +4022,32 @@ glabel func_80127D90 /* C2164 8012BA64 44801000 */ mtc1 $zero, $f2 /* C2168 8012BA68 46000021 */ cvt.d.s $f0, $f0 /* C216C 8012BA6C 46220002 */ mul.d $f0, $f0, $f2 -/* C2170 8012BA70 00000000 */ nop +/* C2170 8012BA70 00000000 */ nop /* C2174 8012BA74 3C013FF0 */ lui $at, 0x3ff0 /* C2178 8012BA78 44816800 */ mtc1 $at, $f13 /* C217C 8012BA7C 44806000 */ mtc1 $zero, $f12 -/* C2180 8012BA80 00000000 */ nop +/* C2180 8012BA80 00000000 */ nop /* C2184 8012BA84 462C0000 */ add.d $f0, $f0, $f12 /* C2188 8012BA88 46200220 */ cvt.s.d $f8, $f0 /* C218C 8012BA8C 460040A1 */ cvt.d.s $f2, $f8 /* C2190 8012BA90 4622603C */ c.lt.d $f12, $f2 -/* C2194 8012BA94 00000000 */ nop +/* C2194 8012BA94 00000000 */ nop /* C2198 8012BA98 45000023 */ bc1f .L8012BB28 /* C219C 8012BA9C 00111400 */ sll $v0, $s1, 0x10 /* C21A0 8012BAA0 3C014020 */ lui $at, 0x4020 /* C21A4 8012BAA4 44812800 */ mtc1 $at, $f5 /* C21A8 8012BAA8 44802000 */ mtc1 $zero, $f4 -/* C21AC 8012BAAC 00000000 */ nop +/* C21AC 8012BAAC 00000000 */ nop /* C21B0 8012BAB0 46241102 */ mul.d $f4, $f2, $f4 -/* C21B4 8012BAB4 00000000 */ nop +/* C21B4 8012BAB4 00000000 */ nop /* C21B8 8012BAB8 3C038015 */ lui $v1, %hi(D_80155D74) /* C21BC 8012BABC 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C21C0 8012BAC0 C4600010 */ lwc1 $f0, 0x10($v1) /* C21C4 8012BAC4 46080002 */ mul.s $f0, $f0, $f8 -/* C21C8 8012BAC8 00000000 */ nop +/* C21C8 8012BAC8 00000000 */ nop /* C21CC 8012BACC C4660014 */ lwc1 $f6, 0x14($v1) /* C21D0 8012BAD0 46083182 */ mul.s $f6, $f6, $f8 -/* C21D4 8012BAD4 00000000 */ nop +/* C21D4 8012BAD4 00000000 */ nop /* C21D8 8012BAD8 E4600018 */ swc1 $f0, 0x18($v1) /* C21DC 8012BADC 3C014021 */ lui $at, 0x4021 /* C21E0 8012BAE0 44810800 */ mtc1 $at, $f1 @@ -4055,13 +4055,13 @@ glabel func_80127D90 /* C21E8 8012BAE8 00021403 */ sra $v0, $v0, 0x10 /* C21EC 8012BAEC 46202101 */ sub.d $f4, $f4, $f0 /* C21F0 8012BAF0 44821000 */ mtc1 $v0, $f2 -/* C21F4 8012BAF4 00000000 */ nop +/* C21F4 8012BAF4 00000000 */ nop /* C21F8 8012BAF8 468010A1 */ cvt.d.w $f2, $f2 /* C21FC 8012BAFC 00131400 */ sll $v0, $s3, 0x10 /* C2200 8012BB00 46241081 */ sub.d $f2, $f2, $f4 /* C2204 8012BB04 00021403 */ sra $v0, $v0, 0x10 /* C2208 8012BB08 44820000 */ mtc1 $v0, $f0 -/* C220C 8012BB0C 00000000 */ nop +/* C220C 8012BB0C 00000000 */ nop /* C2210 8012BB10 46800021 */ cvt.d.w $f0, $f0 /* C2214 8012BB14 46240001 */ sub.d $f0, $f0, $f4 /* C2218 8012BB18 4620130D */ trunc.w.d $f12, $f2 @@ -4070,29 +4070,29 @@ glabel func_80127D90 /* C2224 8012BB24 E466001C */ swc1 $f6, 0x1c($v1) .L8012BB28: /* C2228 8012BB28 462C103C */ c.lt.d $f2, $f12 -/* C222C 8012BB2C 00000000 */ nop +/* C222C 8012BB2C 00000000 */ nop /* C2230 8012BB30 4500002A */ bc1f .L8012BBDC /* C2234 8012BB34 00111400 */ sll $v0, $s1, 0x10 /* C2238 8012BB38 3C014030 */ lui $at, 0x4030 /* C223C 8012BB3C 44810800 */ mtc1 $at, $f1 /* C2240 8012BB40 44800000 */ mtc1 $zero, $f0 -/* C2244 8012BB44 00000000 */ nop +/* C2244 8012BB44 00000000 */ nop /* C2248 8012BB48 46201002 */ mul.d $f0, $f2, $f0 -/* C224C 8012BB4C 00000000 */ nop +/* C224C 8012BB4C 00000000 */ nop /* C2250 8012BB50 3C013FE0 */ lui $at, 0x3fe0 /* C2254 8012BB54 44816800 */ mtc1 $at, $f13 /* C2258 8012BB58 44806000 */ mtc1 $zero, $f12 -/* C225C 8012BB5C 00000000 */ nop +/* C225C 8012BB5C 00000000 */ nop /* C2260 8012BB60 462C0002 */ mul.d $f0, $f0, $f12 -/* C2264 8012BB64 00000000 */ nop +/* C2264 8012BB64 00000000 */ nop /* C2268 8012BB68 3C038015 */ lui $v1, %hi(D_80155D74) /* C226C 8012BB6C 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C2270 8012BB70 C4620010 */ lwc1 $f2, 0x10($v1) /* C2274 8012BB74 46081082 */ mul.s $f2, $f2, $f8 -/* C2278 8012BB78 00000000 */ nop +/* C2278 8012BB78 00000000 */ nop /* C227C 8012BB7C C4660014 */ lwc1 $f6, 0x14($v1) /* C2280 8012BB80 46083182 */ mul.s $f6, $f6, $f8 -/* C2284 8012BB84 00000000 */ nop +/* C2284 8012BB84 00000000 */ nop /* C2288 8012BB88 E4620018 */ swc1 $f2, 0x18($v1) /* C228C 8012BB8C 3C014020 */ lui $at, 0x4020 /* C2290 8012BB90 44811800 */ mtc1 $at, $f3 @@ -4100,13 +4100,13 @@ glabel func_80127D90 /* C2298 8012BB98 00021403 */ sra $v0, $v0, 0x10 /* C229C 8012BB9C 46201081 */ sub.d $f2, $f2, $f0 /* C22A0 8012BBA0 44822000 */ mtc1 $v0, $f4 -/* C22A4 8012BBA4 00000000 */ nop +/* C22A4 8012BBA4 00000000 */ nop /* C22A8 8012BBA8 46802121 */ cvt.d.w $f4, $f4 /* C22AC 8012BBAC 00131400 */ sll $v0, $s3, 0x10 /* C22B0 8012BBB0 46222100 */ add.d $f4, $f4, $f2 /* C22B4 8012BBB4 00021403 */ sra $v0, $v0, 0x10 /* C22B8 8012BBB8 44820000 */ mtc1 $v0, $f0 -/* C22BC 8012BBBC 00000000 */ nop +/* C22BC 8012BBBC 00000000 */ nop /* C22C0 8012BBC0 46800021 */ cvt.d.w $f0, $f0 /* C22C4 8012BBC4 46220000 */ add.d $f0, $f0, $f2 /* C22C8 8012BBC8 E466001C */ swc1 $f6, 0x1c($v1) @@ -4120,12 +4120,12 @@ glabel func_80127D90 /* C22E0 8012BBE0 2442FFF5 */ addiu $v0, $v0, -0xb /* C22E4 8012BBE4 2C420002 */ sltiu $v0, $v0, 2 /* C22E8 8012BBE8 10400020 */ beqz $v0, .L8012BC6C -/* C22EC 8012BBEC 00000000 */ nop +/* C22EC 8012BBEC 00000000 */ nop /* C22F0 8012BBF0 93C20508 */ lbu $v0, 0x508($fp) /* C22F4 8012BBF4 2442FFFF */ addiu $v0, $v0, -1 /* C22F8 8012BBF8 2C420004 */ sltiu $v0, $v0, 4 /* C22FC 8012BBFC 1040001B */ beqz $v0, .L8012BC6C -/* C2300 8012BC00 00000000 */ nop +/* C2300 8012BC00 00000000 */ nop /* C2304 8012BC04 97B900A6 */ lhu $t9, 0xa6($sp) /* C2308 8012BC08 00191400 */ sll $v0, $t9, 0x10 /* C230C 8012BC0C 00021C03 */ sra $v1, $v0, 0x10 @@ -4136,7 +4136,7 @@ glabel func_80127D90 /* C2320 8012BC20 00220821 */ addu $at, $at, $v0 /* C2324 8012BC24 8C220960 */ lw $v0, %lo(D_80150960)($at) /* C2328 8012BC28 00400008 */ jr $v0 -/* C232C 8012BC2C 00000000 */ nop +/* C232C 8012BC2C 00000000 */ nop /* C2330 8012BC30 24180040 */ addiu $t8, $zero, 0x40 /* C2334 8012BC34 0804AF1B */ j .L8012BC6C /* C2338 8012BC38 A7B800A6 */ sh $t8, 0xa6($sp) @@ -4304,7 +4304,7 @@ glabel func_80127D90 /* C25A0 8012BEA0 1440FFD4 */ bnez $v0, .L8012BDF4 /* C25A4 8012BEA4 00168403 */ sra $s0, $s6, 0x10 /* C25A8 8012BEA8 0804AFBB */ j .L8012BEEC -/* C25AC 8012BEAC 00000000 */ nop +/* C25AC 8012BEAC 00000000 */ nop .L8012BEB0: /* C25B0 8012BEB0 03C0202D */ daddu $a0, $fp, $zero /* C25B4 8012BEB4 97B800A6 */ lhu $t8, 0xa6($sp) @@ -4348,7 +4348,7 @@ glabel func_80127D90 /* C2644 8012BF44 8C670010 */ lw $a3, 0x10($v1) .L8012BF48: /* C2648 8012BF48 0C04977D */ jal get_char_width -/* C264C 8012BF4C 00000000 */ nop +/* C264C 8012BF4C 00000000 */ nop /* C2650 8012BF50 3C058015 */ lui $a1, %hi(D_80155D74) /* C2654 8012BF54 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) /* C2658 8012BF58 94A30042 */ lhu $v1, 0x42($a1) @@ -4361,7 +4361,7 @@ glabel func_80127D90 .L8012BF70: /* C2670 8012BF70 97A20080 */ lhu $v0, 0x80($sp) /* C2674 8012BF74 1040EFFE */ beqz $v0, .L80127F70 -/* C2678 8012BF78 00000000 */ nop +/* C2678 8012BF78 00000000 */ nop /* C267C 8012BF7C 97C2052C */ lhu $v0, 0x52c($fp) /* C2680 8012BF80 104000BA */ beqz $v0, .L8012C26C /* C2684 8012BF84 0000302D */ daddu $a2, $zero, $zero @@ -4381,7 +4381,7 @@ glabel func_80127D90 /* C26BC 8012BFBC 10820050 */ beq $a0, $v0, .L8012C100 /* C26C0 8012BFC0 00101400 */ sll $v0, $s0, 0x10 /* C26C4 8012BFC4 0804B064 */ j .L8012C190 -/* C26C8 8012BFC8 00000000 */ nop +/* C26C8 8012BFC8 00000000 */ nop .L8012BFCC: /* C26CC 8012BFCC 54800001 */ bnel $a0, $zero, .L8012BFD4 /* C26D0 8012BFD0 24060001 */ addiu $a2, $zero, 1 @@ -4395,12 +4395,12 @@ glabel func_80127D90 /* C26EC 8012BFEC 10600007 */ beqz $v1, .L8012C00C /* C26F0 8012BFF0 00101400 */ sll $v0, $s0, 0x10 /* C26F4 8012BFF4 0804B064 */ j .L8012C190 -/* C26F8 8012BFF8 00000000 */ nop +/* C26F8 8012BFF8 00000000 */ nop .L8012BFFC: /* C26FC 8012BFFC 10620031 */ beq $v1, $v0, .L8012C0C4 /* C2700 8012C000 00101400 */ sll $v0, $s0, 0x10 /* C2704 8012C004 0804B064 */ j .L8012C190 -/* C2708 8012C008 00000000 */ nop +/* C2708 8012C008 00000000 */ nop .L8012C00C: /* C270C 8012C00C 97C30534 */ lhu $v1, 0x534($fp) /* C2710 8012C010 93C40532 */ lbu $a0, 0x532($fp) @@ -4428,25 +4428,25 @@ glabel func_80127D90 /* C2764 8012C064 00181400 */ sll $v0, $t8, 0x10 /* C2768 8012C068 00021403 */ sra $v0, $v0, 0x10 /* C276C 8012C06C 44821000 */ mtc1 $v0, $f2 -/* C2770 8012C070 00000000 */ nop +/* C2770 8012C070 00000000 */ nop /* C2774 8012C074 468010A0 */ cvt.s.w $f2, $f2 /* C2778 8012C078 460010A1 */ cvt.d.s $f2, $f2 /* C277C 8012C07C 93C20531 */ lbu $v0, 0x531($fp) /* C2780 8012C080 46201083 */ div.d $f2, $f2, $f0 /* C2784 8012C084 44820000 */ mtc1 $v0, $f0 -/* C2788 8012C088 00000000 */ nop +/* C2788 8012C088 00000000 */ nop /* C278C 8012C08C 46800020 */ cvt.s.w $f0, $f0 /* C2790 8012C090 46000021 */ cvt.d.s $f0, $f0 /* C2794 8012C094 46201002 */ mul.d $f0, $f2, $f0 -/* C2798 8012C098 00000000 */ nop +/* C2798 8012C098 00000000 */ nop /* C279C 8012C09C 3C0141E0 */ lui $at, 0x41e0 /* C27A0 8012C0A0 44811800 */ mtc1 $at, $f3 /* C27A4 8012C0A4 44801000 */ mtc1 $zero, $f2 -/* C27A8 8012C0A8 00000000 */ nop +/* C27A8 8012C0A8 00000000 */ nop /* C27AC 8012C0AC 4620103E */ c.le.d $f2, $f0 -/* C27B0 8012C0B0 00000000 */ nop +/* C27B0 8012C0B0 00000000 */ nop /* C27B4 8012C0B4 4500002B */ bc1f .L8012C164 -/* C27B8 8012C0B8 00000000 */ nop +/* C27B8 8012C0B8 00000000 */ nop /* C27BC 8012C0BC 0804B05D */ j .L8012C174 /* C27C0 8012C0C0 46220001 */ sub.d $f0, $f0, $f2 .L8012C0C4: @@ -4472,23 +4472,23 @@ glabel func_80127D90 /* C280C 8012C10C 00191400 */ sll $v0, $t9, 0x10 /* C2810 8012C110 00021403 */ sra $v0, $v0, 0x10 /* C2814 8012C114 44821000 */ mtc1 $v0, $f2 -/* C2818 8012C118 00000000 */ nop +/* C2818 8012C118 00000000 */ nop /* C281C 8012C11C 468010A0 */ cvt.s.w $f2, $f2 /* C2820 8012C120 460010A1 */ cvt.d.s $f2, $f2 /* C2824 8012C124 93C20531 */ lbu $v0, 0x531($fp) /* C2828 8012C128 46201083 */ div.d $f2, $f2, $f0 /* C282C 8012C12C 44820000 */ mtc1 $v0, $f0 -/* C2830 8012C130 00000000 */ nop +/* C2830 8012C130 00000000 */ nop /* C2834 8012C134 46800020 */ cvt.s.w $f0, $f0 /* C2838 8012C138 46000021 */ cvt.d.s $f0, $f0 /* C283C 8012C13C 46201002 */ mul.d $f0, $f2, $f0 -/* C2840 8012C140 00000000 */ nop +/* C2840 8012C140 00000000 */ nop /* C2844 8012C144 3C0141E0 */ lui $at, 0x41e0 /* C2848 8012C148 44811800 */ mtc1 $at, $f3 /* C284C 8012C14C 44801000 */ mtc1 $zero, $f2 -/* C2850 8012C150 00000000 */ nop +/* C2850 8012C150 00000000 */ nop /* C2854 8012C154 4620103E */ c.le.d $f2, $f0 -/* C2858 8012C158 00000000 */ nop +/* C2858 8012C158 00000000 */ nop /* C285C 8012C15C 45030005 */ bc1tl .L8012C174 /* C2860 8012C160 46220001 */ sub.d $f0, $f0, $f2 .L8012C164: @@ -4500,14 +4500,14 @@ glabel func_80127D90 /* C2874 8012C174 3C028000 */ lui $v0, 0x8000 /* C2878 8012C178 4620030D */ trunc.w.d $f12, $f0 /* C287C 8012C17C 44036000 */ mfc1 $v1, $f12 -/* C2880 8012C180 00000000 */ nop +/* C2880 8012C180 00000000 */ nop /* C2884 8012C184 00621825 */ or $v1, $v1, $v0 /* C2888 8012C188 307000FF */ andi $s0, $v1, 0xff .L8012C18C: /* C288C 8012C18C 00101400 */ sll $v0, $s0, 0x10 .L8012C190: /* C2890 8012C190 18400036 */ blez $v0, .L8012C26C -/* C2894 8012C194 00000000 */ nop +/* C2894 8012C194 00000000 */ nop .L8012C198: /* C2898 8012C198 00C0102D */ daddu $v0, $a2, $zero /* C289C 8012C19C 1040001E */ beqz $v0, .L8012C218 @@ -4564,8 +4564,8 @@ glabel func_80127D90 /* C2964 8012C264 0C04BA68 */ jal func_8012E9A0 /* C2968 8012C268 8E27000C */ lw $a3, 0xc($s1) .L8012C26C: -/* C296C 8012C26C 3C02800A */ lui $v0, %hi(D_8009A66C) -/* C2970 8012C270 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* C296C 8012C26C 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* C2970 8012C270 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* C2974 8012C274 8C430000 */ lw $v1, ($v0) /* C2978 8012C278 0060202D */ daddu $a0, $v1, $zero /* C297C 8012C27C 24630008 */ addiu $v1, $v1, 8 diff --git a/asm/nonmatchings/code_B9D60/func_8012C2E0.s b/asm/nonmatchings/code_B9D60/func_8012C2E0.s index ac78ec1325..59c480941e 100644 --- a/asm/nonmatchings/code_B9D60/func_8012C2E0.s +++ b/asm/nonmatchings/code_B9D60/func_8012C2E0.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8012C2E0 -/* C29E0 8012C2E0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* C29E4 8012C2E4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* C29E0 8012C2E0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* C29E4 8012C2E4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* C29E8 8012C2E8 8C820000 */ lw $v0, ($a0) /* C29EC 8012C2EC 3C03E700 */ lui $v1, 0xe700 /* C29F0 8012C2F0 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/code_B9D60/func_8012C324.s b/asm/nonmatchings/code_B9D60/func_8012C324.s index 31db88d626..0d1c80e926 100644 --- a/asm/nonmatchings/code_B9D60/func_8012C324.s +++ b/asm/nonmatchings/code_B9D60/func_8012C324.s @@ -23,27 +23,27 @@ glabel func_8012C324 /* C2A6C 8012C36C 91220000 */ lbu $v0, ($t1) /* C2A70 8012C370 8D4B0004 */ lw $t3, 4($t2) /* C2A74 8012C374 44822000 */ mtc1 $v0, $f4 -/* C2A78 8012C378 00000000 */ nop +/* C2A78 8012C378 00000000 */ nop /* C2A7C 8012C37C 46802120 */ cvt.s.w $f4, $f4 /* C2A80 8012C380 46043102 */ mul.s $f4, $f6, $f4 -/* C2A84 8012C384 00000000 */ nop +/* C2A84 8012C384 00000000 */ nop /* C2A88 8012C388 954C003E */ lhu $t4, 0x3e($t2) /* C2A8C 8012C38C 91220001 */ lbu $v0, 1($t1) /* C2A90 8012C390 8D470008 */ lw $a3, 8($t2) /* C2A94 8012C394 44820000 */ mtc1 $v0, $f0 -/* C2A98 8012C398 00000000 */ nop +/* C2A98 8012C398 00000000 */ nop /* C2A9C 8012C39C 46800020 */ cvt.s.w $f0, $f0 /* C2AA0 8012C3A0 46001082 */ mul.s $f2, $f2, $f0 -/* C2AA4 8012C3A4 00000000 */ nop +/* C2AA4 8012C3A4 00000000 */ nop /* C2AA8 8012C3A8 8D48000C */ lw $t0, 0xc($t2) /* C2AAC 8012C3AC 8D450000 */ lw $a1, ($t2) /* C2AB0 8012C3B0 4600220D */ trunc.w.s $f8, $f4 /* C2AB4 8012C3B4 44024000 */ mfc1 $v0, $f8 -/* C2AB8 8012C3B8 00000000 */ nop +/* C2AB8 8012C3B8 00000000 */ nop /* C2ABC 8012C3BC 00C26821 */ addu $t5, $a2, $v0 /* C2AC0 8012C3C0 4600120D */ trunc.w.s $f8, $f2 /* C2AC4 8012C3C4 44024000 */ mfc1 $v0, $f8 -/* C2AC8 8012C3C8 00000000 */ nop +/* C2AC8 8012C3C8 00000000 */ nop /* C2ACC 8012C3CC 00627021 */ addu $t6, $v1, $v0 /* C2AD0 8012C3D0 00CB102A */ slt $v0, $a2, $t3 /* C2AD4 8012C3D4 1040016D */ beqz $v0, .L8012C98C @@ -60,7 +60,7 @@ glabel func_8012C324 /* C2B00 8012C400 00021023 */ negu $v0, $v0 .L8012C404: /* C2B04 8012C404 44820000 */ mtc1 $v0, $f0 -/* C2B08 8012C408 00000000 */ nop +/* C2B08 8012C408 00000000 */ nop /* C2B0C 8012C40C 46800020 */ cvt.s.w $f0, $f0 /* C2B10 8012C410 46060103 */ div.s $f4, $f0, $f6 /* C2B14 8012C414 3C013FE0 */ lui $at, 0x3fe0 @@ -71,9 +71,9 @@ glabel func_8012C324 /* C2B28 8012C428 3C014040 */ lui $at, 0x4040 /* C2B2C 8012C42C 44811800 */ mtc1 $at, $f3 /* C2B30 8012C430 44801000 */ mtc1 $zero, $f2 -/* C2B34 8012C434 00000000 */ nop +/* C2B34 8012C434 00000000 */ nop /* C2B38 8012C438 46220002 */ mul.d $f0, $f0, $f2 -/* C2B3C 8012C43C 00000000 */ nop +/* C2B3C 8012C43C 00000000 */ nop /* C2B40 8012C440 46200020 */ cvt.s.d $f0, $f0 /* C2B44 8012C444 4600020D */ trunc.w.s $f8, $f0 /* C2B48 8012C448 44104000 */ mfc1 $s0, $f8 @@ -98,14 +98,14 @@ glabel func_8012C324 /* C2B88 8012C488 00021023 */ negu $v0, $v0 .L8012C48C: /* C2B8C 8012C48C 44822000 */ mtc1 $v0, $f4 -/* C2B90 8012C490 00000000 */ nop +/* C2B90 8012C490 00000000 */ nop /* C2B94 8012C494 46802120 */ cvt.s.w $f4, $f4 /* C2B98 8012C498 C542001C */ lwc1 $f2, 0x1c($t2) /* C2B9C 8012C49C 3C014200 */ lui $at, 0x4200 /* C2BA0 8012C4A0 44810000 */ mtc1 $at, $f0 /* C2BA4 8012C4A4 46022103 */ div.s $f4, $f4, $f2 /* C2BA8 8012C4A8 46002002 */ mul.s $f0, $f4, $f0 -/* C2BAC 8012C4AC 00000000 */ nop +/* C2BAC 8012C4AC 00000000 */ nop /* C2BB0 8012C4B0 4600020D */ trunc.w.s $f8, $f0 /* C2BB4 8012C4B4 44184000 */ mfc1 $t8, $f8 /* C2BB8 8012C4B8 0804B131 */ j .L8012C4C4 @@ -129,11 +129,11 @@ glabel func_8012C324 /* C2BF0 8012C4F0 44813000 */ mtc1 $at, $f6 /* C2BF4 8012C4F4 46041103 */ div.s $f4, $f2, $f4 /* C2BF8 8012C4F8 46062102 */ mul.s $f4, $f4, $f6 -/* C2BFC 8012C4FC 00000000 */ nop +/* C2BFC 8012C4FC 00000000 */ nop /* C2C00 8012C500 C540001C */ lwc1 $f0, 0x1c($t2) /* C2C04 8012C504 46001083 */ div.s $f2, $f2, $f0 /* C2C08 8012C508 46061082 */ mul.s $f2, $f2, $f6 -/* C2C0C 8012C50C 00000000 */ nop +/* C2C0C 8012C50C 00000000 */ nop /* C2C10 8012C510 95440034 */ lhu $a0, 0x34($t2) /* C2C14 8012C514 30820011 */ andi $v0, $a0, 0x11 /* C2C18 8012C518 4600220D */ trunc.w.s $f8, $f4 @@ -146,8 +146,8 @@ glabel func_8012C324 /* C2C34 8012C534 34E70100 */ ori $a3, $a3, 0x100 /* C2C38 8012C538 3C080703 */ lui $t0, 0x703 /* C2C3C 8012C53C 3508C000 */ ori $t0, $t0, 0xc000 -/* C2C40 8012C540 3C05800A */ lui $a1, %hi(D_8009A66C) -/* C2C44 8012C544 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* C2C40 8012C540 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* C2C44 8012C544 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* C2C48 8012C548 8CA30000 */ lw $v1, ($a1) /* C2C4C 8012C54C A5420034 */ sh $v0, 0x34($t2) /* C2C50 8012C550 3C02FD10 */ lui $v0, 0xfd10 @@ -189,13 +189,13 @@ glabel func_8012C324 /* C2CDC 8012C5DC 91220000 */ lbu $v0, ($t1) /* C2CE0 8012C5E0 2C420010 */ sltiu $v0, $v0, 0x10 /* C2CE4 8012C5E4 1440006B */ bnez $v0, .L8012C794 -/* C2CE8 8012C5E8 00000000 */ nop +/* C2CE8 8012C5E8 00000000 */ nop /* C2CEC 8012C5EC 91220000 */ lbu $v0, ($t1) /* C2CF0 8012C5F0 3042000F */ andi $v0, $v0, 0xf /* C2CF4 8012C5F4 14400067 */ bnez $v0, .L8012C794 /* C2CF8 8012C5F8 3C02FD50 */ lui $v0, 0xfd50 -/* C2CFC 8012C5FC 3C06800A */ lui $a2, %hi(D_8009A66C) -/* C2D00 8012C600 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* C2CFC 8012C5FC 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* C2D00 8012C600 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* C2D04 8012C604 8CC40000 */ lw $a0, ($a2) /* C2D08 8012C608 0080382D */ daddu $a3, $a0, $zero /* C2D0C 8012C60C 24840008 */ addiu $a0, $a0, 8 @@ -256,7 +256,7 @@ glabel func_8012C324 /* C2DDC 8012C6DC 14810004 */ bne $a0, $at, .L8012C6F0 /* C2DE0 8012C6E0 3C018000 */ lui $at, 0x8000 /* C2DE4 8012C6E4 15010002 */ bne $t0, $at, .L8012C6F0 -/* C2DE8 8012C6E8 00000000 */ nop +/* C2DE8 8012C6E8 00000000 */ nop /* C2DEC 8012C6EC 0006000D */ break 6 .L8012C6F0: /* C2DF0 8012C6F0 00001012 */ mflo $v0 @@ -265,8 +265,8 @@ glabel func_8012C324 .L8012C6FC: /* C2DFC 8012C6FC 00A81025 */ or $v0, $a1, $t0 .L8012C700: -/* C2E00 8012C700 3C05800A */ lui $a1, %hi(D_8009A66C) -/* C2E04 8012C704 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* C2E00 8012C700 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* C2E04 8012C704 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* C2E08 8012C708 8CA40000 */ lw $a0, ($a1) /* C2E0C 8012C70C ACC20000 */ sw $v0, ($a2) /* C2E10 8012C710 3C02E700 */ lui $v0, 0xe700 @@ -303,8 +303,8 @@ glabel func_8012C324 /* C2E8C 8012C78C 0804B23D */ j .L8012C8F4 /* C2E90 8012C790 AC83000C */ sw $v1, 0xc($a0) .L8012C794: -/* C2E94 8012C794 3C06800A */ lui $a2, %hi(D_8009A66C) -/* C2E98 8012C798 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* C2E94 8012C794 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* C2E98 8012C798 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* C2E9C 8012C79C 8CC50000 */ lw $a1, ($a2) /* C2EA0 8012C7A0 00A0382D */ daddu $a3, $a1, $zero /* C2EA4 8012C7A4 24A50008 */ addiu $a1, $a1, 8 @@ -392,8 +392,8 @@ glabel func_8012C324 /* C2FEC 8012C8EC 00621825 */ or $v1, $v1, $v0 /* C2FF0 8012C8F0 ACA3002C */ sw $v1, 0x2c($a1) .L8012C8F4: -/* C2FF4 8012C8F4 3C06800A */ lui $a2, %hi(D_8009A66C) -/* C2FF8 8012C8F8 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* C2FF4 8012C8F4 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* C2FF8 8012C8F8 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* C2FFC 8012C8FC 000D1080 */ sll $v0, $t5, 2 /* C3000 8012C900 30420FFF */ andi $v0, $v0, 0xfff /* C3004 8012C904 00021300 */ sll $v0, $v0, 0xc diff --git a/asm/nonmatchings/code_B9D60/func_8012CA08.s b/asm/nonmatchings/code_B9D60/func_8012CA08.s index f3ab3c71bd..4d24ba8f65 100644 --- a/asm/nonmatchings/code_B9D60/func_8012CA08.s +++ b/asm/nonmatchings/code_B9D60/func_8012CA08.s @@ -4,8 +4,8 @@ glabel func_8012CA08 /* C3108 8012CA08 0080502D */ daddu $t2, $a0, $zero /* C310C 8012CA0C 00A0582D */ daddu $t3, $a1, $zero -/* C3110 8012CA10 3C09800A */ lui $t1, %hi(D_8009A66C) -/* C3114 8012CA14 2529A66C */ addiu $t1, $t1, %lo(D_8009A66C) +/* C3110 8012CA10 3C09800A */ lui $t1, %hi(gMasterGfxPos) +/* C3114 8012CA14 2529A66C */ addiu $t1, $t1, %lo(gMasterGfxPos) /* C3118 8012CA18 3C02E700 */ lui $v0, 0xe700 /* C311C 8012CA1C 8D280000 */ lw $t0, ($t1) /* C3120 8012CA20 97AF0012 */ lhu $t7, 0x12($sp) @@ -51,8 +51,8 @@ glabel func_8012CA08 /* C31B8 8012CAB8 3C06E200 */ lui $a2, 0xe200 /* C31BC 8012CABC 34C6001C */ ori $a2, $a2, 0x1c /* C31C0 8012CAC0 3C050F0A */ lui $a1, 0xf0a -/* C31C4 8012CAC4 3C09800A */ lui $t1, %hi(D_8009A66C) -/* C31C8 8012CAC8 2529A66C */ addiu $t1, $t1, %lo(D_8009A66C) +/* C31C4 8012CAC4 3C09800A */ lui $t1, %hi(gMasterGfxPos) +/* C31C8 8012CAC8 2529A66C */ addiu $t1, $t1, %lo(gMasterGfxPos) /* C31CC 8012CACC 34A57008 */ ori $a1, $a1, 0x7008 /* C31D0 8012CAD0 3C02FA00 */ lui $v0, 0xfa00 /* C31D4 8012CAD4 8D280000 */ lw $t0, ($t1) @@ -125,8 +125,8 @@ glabel func_8012CA08 /* C32D8 8012CBD8 AD02001C */ sw $v0, 0x1c($t0) .L8012CBDC: /* C32DC 8012CBDC 3C05FFFC */ lui $a1, 0xfffc -/* C32E0 8012CBE0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* C32E4 8012CBE4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* C32E0 8012CBE0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* C32E4 8012CBE4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* C32E8 8012CBE8 8C820000 */ lw $v0, ($a0) /* C32EC 8012CBEC 34A5F279 */ ori $a1, $a1, 0xf279 /* C32F0 8012CBF0 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/code_B9D60/func_8012D3DC.s b/asm/nonmatchings/code_B9D60/func_8012D3DC.s index d536e22d2e..f9c6884741 100644 --- a/asm/nonmatchings/code_B9D60/func_8012D3DC.s +++ b/asm/nonmatchings/code_B9D60/func_8012D3DC.s @@ -34,7 +34,7 @@ glabel func_8012D3DC /* C3B50 8012D450 24020003 */ addiu $v0, $zero, 3 /* C3B54 8012D454 9223053C */ lbu $v1, 0x53c($s1) /* C3B58 8012D458 14620005 */ bne $v1, $v0, .L8012D470 -/* C3B5C 8012D45C 00000000 */ nop +/* C3B5C 8012D45C 00000000 */ nop .L8012D460: /* C3B60 8012D460 96220516 */ lhu $v0, 0x516($s1) /* C3B64 8012D464 00821021 */ addu $v0, $a0, $v0 @@ -63,26 +63,26 @@ glabel func_8012D3DC /* C3BB0 8012D4B0 30A200FF */ andi $v0, $a1, 0xff .L8012D4B4: /* C3BB4 8012D4B4 10400056 */ beqz $v0, .L8012D610 -/* C3BB8 8012D4B8 00000000 */ nop +/* C3BB8 8012D4B8 00000000 */ nop /* C3BBC 8012D4BC 96220514 */ lhu $v0, 0x514($s1) /* C3BC0 8012D4C0 3C018015 */ lui $at, %hi(D_80150A08) /* C3BC4 8012D4C4 D4200A08 */ ldc1 $f0, %lo(D_80150A08)($at) /* C3BC8 8012D4C8 44821000 */ mtc1 $v0, $f2 -/* C3BCC 8012D4CC 00000000 */ nop +/* C3BCC 8012D4CC 00000000 */ nop /* C3BD0 8012D4D0 468010A0 */ cvt.s.w $f2, $f2 /* C3BD4 8012D4D4 460010A1 */ cvt.d.s $f2, $f2 /* C3BD8 8012D4D8 46201082 */ mul.d $f2, $f2, $f0 -/* C3BDC 8012D4DC 00000000 */ nop +/* C3BDC 8012D4DC 00000000 */ nop /* C3BE0 8012D4E0 00061400 */ sll $v0, $a2, 0x10 /* C3BE4 8012D4E4 00022403 */ sra $a0, $v0, 0x10 /* C3BE8 8012D4E8 44840000 */ mtc1 $a0, $f0 -/* C3BEC 8012D4EC 00000000 */ nop +/* C3BEC 8012D4EC 00000000 */ nop /* C3BF0 8012D4F0 46800021 */ cvt.d.w $f0, $f0 /* C3BF4 8012D4F4 46220000 */ add.d $f0, $f0, $f2 /* C3BF8 8012D4F8 9623050E */ lhu $v1, 0x50e($s1) /* C3BFC 8012D4FC 4620010D */ trunc.w.d $f4, $f0 /* C3C00 8012D500 44022000 */ mfc1 $v0, $f4 -/* C3C04 8012D504 00000000 */ nop +/* C3C04 8012D504 00000000 */ nop /* C3C08 8012D508 0040902D */ daddu $s2, $v0, $zero /* C3C0C 8012D50C 00021400 */ sll $v0, $v0, 0x10 /* C3C10 8012D510 00021403 */ sra $v0, $v0, 0x10 @@ -90,7 +90,7 @@ glabel func_8012D3DC /* C3C18 8012D518 10600090 */ beqz $v1, .L8012D75C /* C3C1C 8012D51C 00141400 */ sll $v0, $s4, 0x10 /* C3C20 8012D520 4484D000 */ mtc1 $a0, $f26 -/* C3C24 8012D524 00000000 */ nop +/* C3C24 8012D524 00000000 */ nop /* C3C28 8012D528 4680D6A0 */ cvt.s.w $f26, $f26 /* C3C2C 8012D52C 00029C03 */ sra $s3, $v0, 0x10 /* C3C30 8012D530 3C013F33 */ lui $at, 0x3f33 @@ -103,37 +103,37 @@ glabel func_8012D3DC .L8012D54C: /* C3C4C 8012D54C 96220514 */ lhu $v0, 0x514($s1) /* C3C50 8012D550 44820000 */ mtc1 $v0, $f0 -/* C3C54 8012D554 00000000 */ nop +/* C3C54 8012D554 00000000 */ nop /* C3C58 8012D558 46800020 */ cvt.s.w $f0, $f0 /* C3C5C 8012D55C 46140002 */ mul.s $f0, $f0, $f20 -/* C3C60 8012D560 00000000 */ nop +/* C3C60 8012D560 00000000 */ nop /* C3C64 8012D564 44932000 */ mtc1 $s3, $f4 -/* C3C68 8012D568 00000000 */ nop +/* C3C68 8012D568 00000000 */ nop /* C3C6C 8012D56C 46802120 */ cvt.s.w $f4, $f4 /* C3C70 8012D570 44072000 */ mfc1 $a3, $f4 /* C3C74 8012D574 9622050E */ lhu $v0, 0x50e($s1) /* C3C78 8012D578 4600D000 */ add.s $f0, $f26, $f0 /* C3C7C 8012D57C 96230510 */ lhu $v1, 0x510($s1) /* C3C80 8012D580 44826000 */ mtc1 $v0, $f12 -/* C3C84 8012D584 00000000 */ nop +/* C3C84 8012D584 00000000 */ nop /* C3C88 8012D588 46806320 */ cvt.s.w $f12, $f12 /* C3C8C 8012D58C 4600010D */ trunc.w.s $f4, $f0 /* C3C90 8012D590 44022000 */ mfc1 $v0, $f4 -/* C3C94 8012D594 00000000 */ nop +/* C3C94 8012D594 00000000 */ nop /* C3C98 8012D598 0040902D */ daddu $s2, $v0, $zero /* C3C9C 8012D59C 00021400 */ sll $v0, $v0, 0x10 /* C3CA0 8012D5A0 00021403 */ sra $v0, $v0, 0x10 /* C3CA4 8012D5A4 44822000 */ mtc1 $v0, $f4 -/* C3CA8 8012D5A8 00000000 */ nop +/* C3CA8 8012D5A8 00000000 */ nop /* C3CAC 8012D5AC 46802120 */ cvt.s.w $f4, $f4 /* C3CB0 8012D5B0 44062000 */ mfc1 $a2, $f4 /* C3CB4 8012D5B4 44837000 */ mtc1 $v1, $f14 -/* C3CB8 8012D5B8 00000000 */ nop +/* C3CB8 8012D5B8 00000000 */ nop /* C3CBC 8012D5BC 0C00A720 */ jal atan2 /* C3CC0 8012D5C0 468073A0 */ cvt.s.w $f14, $f14 /* C3CC4 8012D5C4 4600010D */ trunc.w.s $f4, $f0 /* C3CC8 8012D5C8 44102000 */ mfc1 $s0, $f4 -/* C3CCC 8012D5CC 00000000 */ nop +/* C3CCC 8012D5CC 00000000 */ nop /* C3CD0 8012D5D0 06010002 */ bgez $s0, .L8012D5DC /* C3CD4 8012D5D4 0200102D */ daddu $v0, $s0, $zero /* C3CD8 8012D5D8 00021023 */ negu $v0, $v0 @@ -146,31 +146,31 @@ glabel func_8012D3DC /* C3CF0 8012D5F0 46200520 */ cvt.s.d $f20, $f0 /* C3CF4 8012D5F4 4600A021 */ cvt.d.s $f0, $f20 /* C3CF8 8012D5F8 4620B03E */ c.le.d $f22, $f0 -/* C3CFC 8012D5FC 00000000 */ nop +/* C3CFC 8012D5FC 00000000 */ nop /* C3D00 8012D600 45000058 */ bc1f .L8012D764 /* C3D04 8012D604 00021403 */ sra $v0, $v0, 0x10 /* C3D08 8012D608 0804B553 */ j .L8012D54C -/* C3D0C 8012D60C 00000000 */ nop +/* C3D0C 8012D60C 00000000 */ nop .L8012D610: /* C3D10 8012D610 96220514 */ lhu $v0, 0x514($s1) /* C3D14 8012D614 3C018015 */ lui $at, %hi(D_80150A20) /* C3D18 8012D618 D4200A20 */ ldc1 $f0, %lo(D_80150A20)($at) /* C3D1C 8012D61C 44821000 */ mtc1 $v0, $f2 -/* C3D20 8012D620 00000000 */ nop +/* C3D20 8012D620 00000000 */ nop /* C3D24 8012D624 468010A0 */ cvt.s.w $f2, $f2 /* C3D28 8012D628 460010A1 */ cvt.d.s $f2, $f2 /* C3D2C 8012D62C 46201082 */ mul.d $f2, $f2, $f0 -/* C3D30 8012D630 00000000 */ nop +/* C3D30 8012D630 00000000 */ nop /* C3D34 8012D634 00061400 */ sll $v0, $a2, 0x10 /* C3D38 8012D638 00022403 */ sra $a0, $v0, 0x10 /* C3D3C 8012D63C 44840000 */ mtc1 $a0, $f0 -/* C3D40 8012D640 00000000 */ nop +/* C3D40 8012D640 00000000 */ nop /* C3D44 8012D644 46800021 */ cvt.d.w $f0, $f0 /* C3D48 8012D648 46220000 */ add.d $f0, $f0, $f2 /* C3D4C 8012D64C 9623050E */ lhu $v1, 0x50e($s1) /* C3D50 8012D650 4620010D */ trunc.w.d $f4, $f0 /* C3D54 8012D654 44022000 */ mfc1 $v0, $f4 -/* C3D58 8012D658 00000000 */ nop +/* C3D58 8012D658 00000000 */ nop /* C3D5C 8012D65C 0040902D */ daddu $s2, $v0, $zero /* C3D60 8012D660 00021400 */ sll $v0, $v0, 0x10 /* C3D64 8012D664 00021403 */ sra $v0, $v0, 0x10 @@ -178,7 +178,7 @@ glabel func_8012D3DC /* C3D6C 8012D66C 1040003B */ beqz $v0, .L8012D75C /* C3D70 8012D670 00141400 */ sll $v0, $s4, 0x10 /* C3D74 8012D674 4484D000 */ mtc1 $a0, $f26 -/* C3D78 8012D678 00000000 */ nop +/* C3D78 8012D678 00000000 */ nop /* C3D7C 8012D67C 4680D6A0 */ cvt.s.w $f26, $f26 /* C3D80 8012D680 00029C03 */ sra $s3, $v0, 0x10 /* C3D84 8012D684 3C013E99 */ lui $at, 0x3e99 @@ -191,37 +191,37 @@ glabel func_8012D3DC .L8012D6A0: /* C3DA0 8012D6A0 96220514 */ lhu $v0, 0x514($s1) /* C3DA4 8012D6A4 44820000 */ mtc1 $v0, $f0 -/* C3DA8 8012D6A8 00000000 */ nop +/* C3DA8 8012D6A8 00000000 */ nop /* C3DAC 8012D6AC 46800020 */ cvt.s.w $f0, $f0 /* C3DB0 8012D6B0 46140002 */ mul.s $f0, $f0, $f20 -/* C3DB4 8012D6B4 00000000 */ nop +/* C3DB4 8012D6B4 00000000 */ nop /* C3DB8 8012D6B8 44932000 */ mtc1 $s3, $f4 -/* C3DBC 8012D6BC 00000000 */ nop +/* C3DBC 8012D6BC 00000000 */ nop /* C3DC0 8012D6C0 46802120 */ cvt.s.w $f4, $f4 /* C3DC4 8012D6C4 44072000 */ mfc1 $a3, $f4 /* C3DC8 8012D6C8 9622050E */ lhu $v0, 0x50e($s1) /* C3DCC 8012D6CC 4600D000 */ add.s $f0, $f26, $f0 /* C3DD0 8012D6D0 96230510 */ lhu $v1, 0x510($s1) /* C3DD4 8012D6D4 44826000 */ mtc1 $v0, $f12 -/* C3DD8 8012D6D8 00000000 */ nop +/* C3DD8 8012D6D8 00000000 */ nop /* C3DDC 8012D6DC 46806320 */ cvt.s.w $f12, $f12 /* C3DE0 8012D6E0 4600010D */ trunc.w.s $f4, $f0 /* C3DE4 8012D6E4 44022000 */ mfc1 $v0, $f4 -/* C3DE8 8012D6E8 00000000 */ nop +/* C3DE8 8012D6E8 00000000 */ nop /* C3DEC 8012D6EC 0040902D */ daddu $s2, $v0, $zero /* C3DF0 8012D6F0 00021400 */ sll $v0, $v0, 0x10 /* C3DF4 8012D6F4 00021403 */ sra $v0, $v0, 0x10 /* C3DF8 8012D6F8 44822000 */ mtc1 $v0, $f4 -/* C3DFC 8012D6FC 00000000 */ nop +/* C3DFC 8012D6FC 00000000 */ nop /* C3E00 8012D700 46802120 */ cvt.s.w $f4, $f4 /* C3E04 8012D704 44062000 */ mfc1 $a2, $f4 /* C3E08 8012D708 44837000 */ mtc1 $v1, $f14 -/* C3E0C 8012D70C 00000000 */ nop +/* C3E0C 8012D70C 00000000 */ nop /* C3E10 8012D710 0C00A720 */ jal atan2 /* C3E14 8012D714 468073A0 */ cvt.s.w $f14, $f14 /* C3E18 8012D718 4600010D */ trunc.w.s $f4, $f0 /* C3E1C 8012D71C 44102000 */ mfc1 $s0, $f4 -/* C3E20 8012D720 00000000 */ nop +/* C3E20 8012D720 00000000 */ nop /* C3E24 8012D724 06010002 */ bgez $s0, .L8012D730 /* C3E28 8012D728 0200102D */ daddu $v0, $s0, $zero /* C3E2C 8012D72C 00021023 */ negu $v0, $v0 @@ -234,31 +234,31 @@ glabel func_8012D3DC /* C3E44 8012D744 46200520 */ cvt.s.d $f20, $f0 /* C3E48 8012D748 4600A021 */ cvt.d.s $f0, $f20 /* C3E4C 8012D74C 4636003E */ c.le.d $f0, $f22 -/* C3E50 8012D750 00000000 */ nop +/* C3E50 8012D750 00000000 */ nop /* C3E54 8012D754 4501FFD2 */ bc1t .L8012D6A0 -/* C3E58 8012D758 00000000 */ nop +/* C3E58 8012D758 00000000 */ nop .L8012D75C: /* C3E5C 8012D75C 00121400 */ sll $v0, $s2, 0x10 .L8012D760: /* C3E60 8012D760 00021403 */ sra $v0, $v0, 0x10 .L8012D764: /* C3E64 8012D764 4482C000 */ mtc1 $v0, $f24 -/* C3E68 8012D768 00000000 */ nop +/* C3E68 8012D768 00000000 */ nop /* C3E6C 8012D76C 4680C620 */ cvt.s.w $f24, $f24 /* C3E70 8012D770 00141400 */ sll $v0, $s4, 0x10 /* C3E74 8012D774 0002B403 */ sra $s6, $v0, 0x10 /* C3E78 8012D778 4496B000 */ mtc1 $s6, $f22 -/* C3E7C 8012D77C 00000000 */ nop +/* C3E7C 8012D77C 00000000 */ nop /* C3E80 8012D780 4680B5A0 */ cvt.s.w $f22, $f22 /* C3E84 8012D784 4406C000 */ mfc1 $a2, $f24 /* C3E88 8012D788 4407B000 */ mfc1 $a3, $f22 /* C3E8C 8012D78C 8622050A */ lh $v0, 0x50a($s1) /* C3E90 8012D790 8623050C */ lh $v1, 0x50c($s1) /* C3E94 8012D794 44826000 */ mtc1 $v0, $f12 -/* C3E98 8012D798 00000000 */ nop +/* C3E98 8012D798 00000000 */ nop /* C3E9C 8012D79C 46806320 */ cvt.s.w $f12, $f12 /* C3EA0 8012D7A0 44837000 */ mtc1 $v1, $f14 -/* C3EA4 8012D7A4 00000000 */ nop +/* C3EA4 8012D7A4 00000000 */ nop /* C3EA8 8012D7A8 468073A0 */ cvt.s.w $f14, $f14 /* C3EAC 8012D7AC 0C00A7B5 */ jal dist2D /* C3EB0 8012D7B0 2655FFF7 */ addiu $s5, $s2, -9 @@ -272,8 +272,8 @@ glabel func_8012D3DC /* C3ED0 8012D7D0 50400001 */ beql $v0, $zero, .L8012D7D8 /* C3ED4 8012D7D4 24170019 */ addiu $s7, $zero, 0x19 .L8012D7D8: -/* C3ED8 8012D7D8 3C028007 */ lui $v0, %hi(D_800741F4) -/* C3EDC 8012D7DC 8C4241F4 */ lw $v0, %lo(D_800741F4)($v0) +/* C3ED8 8012D7D8 3C028007 */ lui $v0, %hi(gCurrentDisplayContextIndex) +/* C3EDC 8012D7DC 8C4241F4 */ lw $v0, %lo(gCurrentDisplayContextIndex)($v0) /* C3EE0 8012D7E0 3C1E8015 */ lui $fp, %hi(D_8014C4C0) /* C3EE4 8012D7E4 27DEC4C0 */ addiu $fp, $fp, %lo(D_8014C4C0) /* C3EE8 8012D7E8 10400003 */ beqz $v0, .L8012D7F8 @@ -284,18 +284,18 @@ glabel func_8012D3DC /* C3EF8 8012D7F8 8622050A */ lh $v0, 0x50a($s1) /* C3EFC 8012D7FC 8623050C */ lh $v1, 0x50c($s1) /* C3F00 8012D800 44822000 */ mtc1 $v0, $f4 -/* C3F04 8012D804 00000000 */ nop +/* C3F04 8012D804 00000000 */ nop /* C3F08 8012D808 46802120 */ cvt.s.w $f4, $f4 /* C3F0C 8012D80C 44062000 */ mfc1 $a2, $f4 /* C3F10 8012D810 44832000 */ mtc1 $v1, $f4 -/* C3F14 8012D814 00000000 */ nop +/* C3F14 8012D814 00000000 */ nop /* C3F18 8012D818 46802120 */ cvt.s.w $f4, $f4 /* C3F1C 8012D81C 44072000 */ mfc1 $a3, $f4 /* C3F20 8012D820 0C00A720 */ jal atan2 /* C3F24 8012D824 4600B386 */ mov.s $f14, $f22 /* C3F28 8012D828 4600010D */ trunc.w.s $f4, $f0 /* C3F2C 8012D82C 44102000 */ mfc1 $s0, $f4 -/* C3F30 8012D830 00000000 */ nop +/* C3F30 8012D830 00000000 */ nop /* C3F34 8012D834 2610FF4C */ addiu $s0, $s0, -0xb4 /* C3F38 8012D838 06010002 */ bgez $s0, .L8012D844 /* C3F3C 8012D83C 0200102D */ daddu $v0, $s0, $zero @@ -341,8 +341,8 @@ glabel func_8012D3DC /* C3FD8 8012D8D8 3718C03C */ ori $t8, $t8, 0xc03c /* C3FDC 8012D8DC 27A40010 */ addiu $a0, $sp, 0x10 /* C3FE0 8012D8E0 3C140001 */ lui $s4, 1 -/* C3FE4 8012D8E4 3C10800A */ lui $s0, %hi(D_8009A66C) -/* C3FE8 8012D8E8 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* C3FE4 8012D8E4 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* C3FE8 8012D8E8 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* C3FEC 8012D8EC 36941630 */ ori $s4, $s4, 0x1630 /* C3FF0 8012D8F0 AFB9005C */ sw $t9, 0x5c($sp) /* C3FF4 8012D8F4 8E030000 */ lw $v1, ($s0) @@ -361,16 +361,16 @@ glabel func_8012D3DC /* C4028 8012D928 24620010 */ addiu $v0, $v1, 0x10 /* C402C 8012D92C 44051000 */ mfc1 $a1, $f2 /* C4030 8012D930 44971000 */ mtc1 $s7, $f2 -/* C4034 8012D934 00000000 */ nop +/* C4034 8012D934 00000000 */ nop /* C4038 8012D938 468010A0 */ cvt.s.w $f2, $f2 /* C403C 8012D93C 46141502 */ mul.s $f20, $f2, $f20 -/* C4040 8012D940 00000000 */ nop +/* C4040 8012D940 00000000 */ nop /* C4044 8012D944 AE020000 */ sw $v0, ($s0) /* C4048 8012D948 24620018 */ addiu $v0, $v1, 0x18 /* C404C 8012D94C AE020000 */ sw $v0, ($s0) /* C4050 8012D950 24620020 */ addiu $v0, $v1, 0x20 /* C4054 8012D954 46001082 */ mul.s $f2, $f2, $f0 -/* C4058 8012D958 00000000 */ nop +/* C4058 8012D958 00000000 */ nop /* C405C 8012D95C AE020000 */ sw $v0, ($s0) /* C4060 8012D960 24620028 */ addiu $v0, $v1, 0x28 /* C4064 8012D964 AE020000 */ sw $v0, ($s0) @@ -385,7 +385,7 @@ glabel func_8012D3DC /* C4088 8012D988 44082000 */ mfc1 $t0, $f4 /* C408C 8012D98C 4600110D */ trunc.w.s $f4, $f2 /* C4090 8012D990 44022000 */ mfc1 $v0, $f4 -/* C4094 8012D994 00000000 */ nop +/* C4094 8012D994 00000000 */ nop /* C4098 8012D998 00021400 */ sll $v0, $v0, 0x10 /* C409C 8012D99C 00021403 */ sra $v0, $v0, 0x10 /* C40A0 8012D9A0 00021023 */ negu $v0, $v0 @@ -440,10 +440,10 @@ glabel func_8012D3DC /* C4164 8012DA64 0C019E40 */ jal guTranslateF /* C4168 8012DA68 AC780054 */ sw $t8, 0x54($v1) /* C416C 8012DA6C 27A40010 */ addiu $a0, $sp, 0x10 -/* C4170 8012DA70 3C118007 */ lui $s1, %hi(D_800741F0) -/* C4174 8012DA74 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* C4178 8012DA78 3C12800A */ lui $s2, %hi(D_8009A674) -/* C417C 8012DA7C 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* C4170 8012DA70 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* C4174 8012DA74 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* C4178 8012DA78 3C12800A */ lui $s2, %hi(gDisplayContext) +/* C417C 8012DA7C 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* C4180 8012DA80 96250000 */ lhu $a1, ($s1) /* C4184 8012DA84 8E420000 */ lw $v0, ($s2) /* C4188 8012DA88 00052980 */ sll $a1, $a1, 6 diff --git a/asm/nonmatchings/code_B9D60/func_8012DB58.s b/asm/nonmatchings/code_B9D60/func_8012DB58.s index 882ab9ff4f..7e49a687e8 100644 --- a/asm/nonmatchings/code_B9D60/func_8012DB58.s +++ b/asm/nonmatchings/code_B9D60/func_8012DB58.s @@ -19,7 +19,7 @@ glabel func_8012DB58 /* C4290 8012DB90 00E0802D */ daddu $s0, $a3, $zero /* C4294 8012DB94 2A020010 */ slti $v0, $s0, 0x10 /* C4298 8012DB98 1440034B */ bnez $v0, .L8012E8C8 -/* C429C 8012DB9C 00000000 */ nop +/* C429C 8012DB9C 00000000 */ nop /* C42A0 8012DBA0 12600005 */ beqz $s3, .L8012DBB8 /* C42A4 8012DBA4 3C03E300 */ lui $v1, 0xe300 /* C42A8 8012DBA8 15800004 */ bnez $t4, .L8012DBBC @@ -40,8 +40,8 @@ glabel func_8012DB58 /* C42DC 8012DBDC 3C08E300 */ lui $t0, 0xe300 /* C42E0 8012DBE0 35081A01 */ ori $t0, $t0, 0x1a01 /* C42E4 8012DBE4 3C18E300 */ lui $t8, 0xe300 -/* C42E8 8012DBE8 3C0B800A */ lui $t3, %hi(D_8009A66C) -/* C42EC 8012DBEC 256BA66C */ addiu $t3, $t3, %lo(D_8009A66C) +/* C42E8 8012DBE8 3C0B800A */ lui $t3, %hi(gMasterGfxPos) +/* C42EC 8012DBEC 256BA66C */ addiu $t3, $t3, %lo(gMasterGfxPos) /* C42F0 8012DBF0 37181201 */ ori $t8, $t8, 0x1201 /* C42F4 8012DBF4 8D690000 */ lw $t1, ($t3) /* C42F8 8012DBF8 3C0FE700 */ lui $t7, 0xe700 @@ -90,7 +90,7 @@ glabel func_8012DB58 /* C43A0 8012DCA0 1242005D */ beq $s2, $v0, .L8012DE18 /* C43A4 8012DCA4 2B220020 */ slti $v0, $t9, 0x20 /* C43A8 8012DCA8 0804B88C */ j .L8012E230 -/* C43AC 8012DCAC 00000000 */ nop +/* C43AC 8012DCAC 00000000 */ nop .L8012DCB0: /* C43B0 8012DCB0 3C02802F */ lui $v0, %hi(D_802EC3F8) /* C43B4 8012DCB4 9442C3F8 */ lhu $v0, %lo(D_802EC3F8)($v0) @@ -120,8 +120,8 @@ glabel func_8012DB58 /* C4410 8012DD10 3C06E200 */ lui $a2, 0xe200 /* C4414 8012DD14 34C6001C */ ori $a2, $a2, 0x1c /* C4418 8012DD18 3C050F0A */ lui $a1, 0xf0a -/* C441C 8012DD1C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* C4420 8012DD20 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* C441C 8012DD1C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* C4420 8012DD20 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* C4424 8012DD24 8C820000 */ lw $v0, ($a0) /* C4428 8012DD28 34A54000 */ ori $a1, $a1, 0x4000 /* C442C 8012DD2C 0040182D */ daddu $v1, $v0, $zero @@ -133,8 +133,8 @@ glabel func_8012DB58 /* C4440 8012DD40 3C04FCFF */ lui $a0, 0xfcff /* C4444 8012DD44 3484FFFF */ ori $a0, $a0, 0xffff /* C4448 8012DD48 3C03FFFD */ lui $v1, 0xfffd -/* C444C 8012DD4C 3C06800A */ lui $a2, %hi(D_8009A66C) -/* C4450 8012DD50 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* C444C 8012DD4C 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* C4450 8012DD50 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* C4454 8012DD54 8CC50000 */ lw $a1, ($a2) /* C4458 8012DD58 3463F6FB */ ori $v1, $v1, 0xf6fb /* C445C 8012DD5C 00A0102D */ daddu $v0, $a1, $zero @@ -245,8 +245,8 @@ glabel func_8012DB58 /* C45E0 8012DEE0 3C060001 */ lui $a2, 1 /* C45E4 8012DEE4 34C68060 */ ori $a2, $a2, 0x8060 /* C45E8 8012DEE8 3C08000F */ lui $t0, 0xf -/* C45EC 8012DEEC 3C0A800A */ lui $t2, %hi(D_8009A66C) -/* C45F0 8012DEF0 254AA66C */ addiu $t2, $t2, %lo(D_8009A66C) +/* C45EC 8012DEEC 3C0A800A */ lui $t2, %hi(gMasterGfxPos) +/* C45F0 8012DEF0 254AA66C */ addiu $t2, $t2, %lo(gMasterGfxPos) /* C45F4 8012DEF4 3508C0FC */ ori $t0, $t0, 0xc0fc /* C45F8 8012DEF8 8D490000 */ lw $t1, ($t2) /* C45FC 8012DEFC 3C02FD90 */ lui $v0, 0xfd90 @@ -334,8 +334,8 @@ glabel func_8012DB58 /* C4730 8012E030 00621025 */ or $v0, $v1, $v0 /* C4734 8012E034 AC820000 */ sw $v0, ($a0) .L8012E038: -/* C4738 8012E038 3C03800A */ lui $v1, %hi(D_8009A66C) -/* C473C 8012E03C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* C4738 8012E038 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* C473C 8012E03C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* C4740 8012E040 8C620000 */ lw $v0, ($v1) /* C4744 8012E044 0040202D */ daddu $a0, $v0, $zero /* C4748 8012E048 24420008 */ addiu $v0, $v0, 8 @@ -420,8 +420,8 @@ glabel func_8012DB58 /* C485C 8012E15C 00621025 */ or $v0, $v1, $v0 /* C4860 8012E160 AC820000 */ sw $v0, ($a0) .L8012E164: -/* C4864 8012E164 3C03800A */ lui $v1, %hi(D_8009A66C) -/* C4868 8012E168 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* C4864 8012E164 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* C4868 8012E168 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* C486C 8012E16C 8C620000 */ lw $v0, ($v1) /* C4870 8012E170 0040202D */ daddu $a0, $v0, $zero /* C4874 8012E174 24420008 */ addiu $v0, $v0, 8 @@ -466,8 +466,8 @@ glabel func_8012DB58 /* C48F8 8012E1F8 00A21025 */ or $v0, $a1, $v0 /* C48FC 8012E1FC AC820000 */ sw $v0, ($a0) /* C4900 8012E200 3C050400 */ lui $a1, 0x400 -/* C4904 8012E204 3C03800A */ lui $v1, %hi(D_8009A66C) -/* C4908 8012E208 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* C4904 8012E204 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* C4908 8012E208 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* C490C 8012E20C 8C620000 */ lw $v0, ($v1) /* C4910 8012E210 34A50400 */ ori $a1, $a1, 0x400 /* C4914 8012E214 0040202D */ daddu $a0, $v0, $zero @@ -715,8 +715,8 @@ glabel func_8012DB58 /* C4C94 8012E594 3C0B0703 */ lui $t3, 0x703 /* C4C98 8012E598 356BC000 */ ori $t3, $t3, 0xc000 /* C4C9C 8012E59C 0000702D */ daddu $t6, $zero, $zero -/* C4CA0 8012E5A0 3C02800A */ lui $v0, %hi(D_8009A66C) -/* C4CA4 8012E5A4 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* C4CA0 8012E5A0 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* C4CA4 8012E5A4 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* C4CA8 8012E5A8 0040602D */ daddu $t4, $v0, $zero /* C4CAC 8012E5AC 27AD0040 */ addiu $t5, $sp, 0x40 /* C4CB0 8012E5B0 03A0782D */ daddu $t7, $sp, $zero @@ -917,8 +917,8 @@ glabel func_8012DB58 /* C4F84 8012E884 1440FF87 */ bnez $v0, .L8012E6A4 /* C4F88 8012E888 25EF0004 */ addiu $t7, $t7, 4 /* C4F8C 8012E88C 3C06E300 */ lui $a2, 0xe300 -/* C4F90 8012E890 3C04800A */ lui $a0, %hi(D_8009A66C) -/* C4F94 8012E894 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* C4F90 8012E890 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* C4F94 8012E894 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* C4F98 8012E898 34C61001 */ ori $a2, $a2, 0x1001 /* C4F9C 8012E89C 8C820000 */ lw $v0, ($a0) /* C4FA0 8012E8A0 3C03E700 */ lui $v1, 0xe700 diff --git a/asm/nonmatchings/code_B9D60/func_8012E9A0.s b/asm/nonmatchings/code_B9D60/func_8012E9A0.s index cfd8617f7e..1249ebaf90 100644 --- a/asm/nonmatchings/code_B9D60/func_8012E9A0.s +++ b/asm/nonmatchings/code_B9D60/func_8012E9A0.s @@ -16,8 +16,8 @@ glabel func_8012E9A0 /* C50CC 8012E9CC 3C06E300 */ lui $a2, 0xe300 /* C50D0 8012E9D0 34C61201 */ ori $a2, $a2, 0x1201 /* C50D4 8012E9D4 3C07E300 */ lui $a3, 0xe300 -/* C50D8 8012E9D8 3C09800A */ lui $t1, %hi(D_8009A66C) -/* C50DC 8012E9DC 2529A66C */ addiu $t1, $t1, %lo(D_8009A66C) +/* C50D8 8012E9D8 3C09800A */ lui $t1, %hi(gMasterGfxPos) +/* C50DC 8012E9DC 2529A66C */ addiu $t1, $t1, %lo(gMasterGfxPos) /* C50E0 8012E9E0 34E70C00 */ ori $a3, $a3, 0xc00 /* C50E4 8012E9E4 3C02E700 */ lui $v0, 0xe700 /* C50E8 8012E9E8 AFBF0040 */ sw $ra, 0x40($sp) @@ -99,8 +99,8 @@ glabel func_8012E9A0 /* C520C 8012EB0C 16020034 */ bne $s0, $v0, .L8012EBE0 /* C5210 8012EB10 3C05E300 */ lui $a1, 0xe300 /* C5214 8012EB14 3C02E300 */ lui $v0, 0xe300 -/* C5218 8012EB18 3C06800A */ lui $a2, %hi(D_8009A66C) -/* C521C 8012EB1C 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* C5218 8012EB18 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* C521C 8012EB1C 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* C5220 8012EB20 8CC50000 */ lw $a1, ($a2) /* C5224 8012EB24 34421001 */ ori $v0, $v0, 0x1001 /* C5228 8012EB28 00A0182D */ daddu $v1, $a1, $zero @@ -152,8 +152,8 @@ glabel func_8012E9A0 /* C52D8 8012EBD8 0804BB01 */ j .L8012EC04 /* C52DC 8012EBDC ACA0002C */ sw $zero, 0x2c($a1) .L8012EBE0: -/* C52E0 8012EBE0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* C52E4 8012EBE4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* C52E0 8012EBE0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* C52E4 8012EBE4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* C52E8 8012EBE8 8C820000 */ lw $v0, ($a0) /* C52EC 8012EBEC 34A51001 */ ori $a1, $a1, 0x1001 /* C52F0 8012EBF0 0040182D */ daddu $v1, $v0, $zero @@ -182,8 +182,8 @@ glabel func_8012E9A0 /* C5348 8012EC48 AFB90010 */ sw $t9, 0x10($sp) /* C534C 8012EC4C 0C04BB25 */ jal func_8012EC94 /* C5350 8012EC50 AFA20028 */ sw $v0, 0x28($sp) -/* C5354 8012EC54 3C04800A */ lui $a0, %hi(D_8009A66C) -/* C5358 8012EC58 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* C5354 8012EC54 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* C5358 8012EC58 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* C535C 8012EC5C 8C830000 */ lw $v1, ($a0) /* C5360 8012EC60 0060282D */ daddu $a1, $v1, $zero /* C5364 8012EC64 24630008 */ addiu $v1, $v1, 8 diff --git a/asm/nonmatchings/code_B9D60/func_8012EC94.s b/asm/nonmatchings/code_B9D60/func_8012EC94.s index 1ef48de5d4..aacb5f7bdd 100644 --- a/asm/nonmatchings/code_B9D60/func_8012EC94.s +++ b/asm/nonmatchings/code_B9D60/func_8012EC94.s @@ -67,8 +67,8 @@ glabel func_8012EC94 /* C5484 8012ED84 018B6021 */ addu $t4, $t4, $t3 /* C5488 8012ED88 8FB50088 */ lw $s5, 0x88($sp) /* C548C 8012ED8C 8FB60088 */ lw $s6, 0x88($sp) -/* C5490 8012ED90 3C08800A */ lui $t0, %hi(D_8009A66C) -/* C5494 8012ED94 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* C5490 8012ED90 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* C5494 8012ED94 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* C5498 8012ED98 A3A00020 */ sb $zero, 0x20($sp) /* C549C 8012ED9C AFA90024 */ sw $t1, 0x24($sp) /* C54A0 8012EDA0 AFAC0034 */ sw $t4, 0x34($sp) @@ -114,7 +114,7 @@ glabel func_8012EC94 /* C5534 8012EE34 87A2000A */ lh $v0, 0xa($sp) /* C5538 8012EE38 004E102A */ slt $v0, $v0, $t6 /* C553C 8012EE3C 1040000A */ beqz $v0, .L8012EE68 -/* C5540 8012EE40 00000000 */ nop +/* C5540 8012EE40 00000000 */ nop /* C5544 8012EE44 97B50016 */ lhu $s5, 0x16($sp) /* C5548 8012EE48 97B6001A */ lhu $s6, 0x1a($sp) /* C554C 8012EE4C 00151400 */ sll $v0, $s5, 0x10 @@ -224,7 +224,7 @@ glabel func_8012EC94 /* C56C8 8012EFC8 01421021 */ addu $v0, $t2, $v0 /* C56CC 8012EFCC 0062182A */ slt $v1, $v1, $v0 /* C56D0 8012EFD0 14600008 */ bnez $v1, .L8012EFF4 -/* C56D4 8012EFD4 00000000 */ nop +/* C56D4 8012EFD4 00000000 */ nop /* C56D8 8012EFD8 240D0001 */ addiu $t5, $zero, 1 /* C56DC 8012EFDC 8FB50034 */ lw $s5, 0x34($sp) /* C56E0 8012EFE0 97B60036 */ lhu $s6, 0x36($sp) @@ -240,7 +240,7 @@ glabel func_8012EC94 /* C5704 8012F004 24420001 */ addiu $v0, $v0, 1 /* C5708 8012F008 0055102B */ sltu $v0, $v0, $s5 /* C570C 8012F00C 14400006 */ bnez $v0, .L8012F028 -/* C5710 8012F010 00000000 */ nop +/* C5710 8012F010 00000000 */ nop /* C5714 8012F014 240D0001 */ addiu $t5, $zero, 1 /* C5718 8012F018 97B6003A */ lhu $s6, 0x3a($sp) /* C571C 8012F01C 97B5003E */ lhu $s5, 0x3e($sp) diff --git a/asm/nonmatchings/code_B9D60/func_8012F500.s b/asm/nonmatchings/code_B9D60/func_8012F500.s index ac0f157b7d..f83d3a9182 100644 --- a/asm/nonmatchings/code_B9D60/func_8012F500.s +++ b/asm/nonmatchings/code_B9D60/func_8012F500.s @@ -31,12 +31,12 @@ glabel func_8012F500 /* C5C68 8012F568 A3B50028 */ sb $s5, 0x28($sp) /* C5C6C 8012F56C 97B5009E */ lhu $s5, 0x9e($sp) /* C5C70 8012F570 4622003C */ c.lt.d $f0, $f2 -/* C5C74 8012F574 00000000 */ nop +/* C5C74 8012F574 00000000 */ nop /* C5C78 8012F578 45010046 */ bc1t .L8012F694 /* C5C7C 8012F57C A7B50036 */ sh $s5, 0x36($sp) /* C5C80 8012F580 460051A1 */ cvt.d.s $f6, $f10 /* C5C84 8012F584 4622303C */ c.lt.d $f6, $f2 -/* C5C88 8012F588 00000000 */ nop +/* C5C88 8012F588 00000000 */ nop /* C5C8C 8012F58C 45030214 */ bc1tl .L8012FDE0 /* C5C90 8012F590 0000102D */ daddu $v0, $zero, $zero /* C5C94 8012F594 00021400 */ sll $v0, $v0, 0x10 @@ -54,26 +54,26 @@ glabel func_8012F500 /* C5CC4 8012F5C4 10400206 */ beqz $v0, .L8012FDE0 /* C5CC8 8012F5C8 0000102D */ daddu $v0, $zero, $zero /* C5CCC 8012F5CC 44931000 */ mtc1 $s3, $f2 -/* C5CD0 8012F5D0 00000000 */ nop +/* C5CD0 8012F5D0 00000000 */ nop /* C5CD4 8012F5D4 468010A1 */ cvt.d.w $f2, $f2 /* C5CD8 8012F5D8 44852000 */ mtc1 $a1, $f4 -/* C5CDC 8012F5DC 00000000 */ nop +/* C5CDC 8012F5DC 00000000 */ nop /* C5CE0 8012F5E0 46802120 */ cvt.s.w $f4, $f4 /* C5CE4 8012F5E4 06630007 */ bgezl $s3, .L8012F604 /* C5CE8 8012F5E8 46201020 */ cvt.s.d $f0, $f2 /* C5CEC 8012F5EC 3C0141F0 */ lui $at, 0x41f0 /* C5CF0 8012F5F0 44810800 */ mtc1 $at, $f1 /* C5CF4 8012F5F4 44800000 */ mtc1 $zero, $f0 -/* C5CF8 8012F5F8 00000000 */ nop +/* C5CF8 8012F5F8 00000000 */ nop /* C5CFC 8012F5FC 46201080 */ add.d $f2, $f2, $f0 /* C5D00 8012F600 46201020 */ cvt.s.d $f0, $f2 .L8012F604: /* C5D04 8012F604 46080002 */ mul.s $f0, $f0, $f8 -/* C5D08 8012F608 00000000 */ nop +/* C5D08 8012F608 00000000 */ nop /* C5D0C 8012F60C 46002000 */ add.s $f0, $f4, $f0 /* C5D10 8012F610 4600050D */ trunc.w.s $f20, $f0 /* C5D14 8012F614 4402A000 */ mfc1 $v0, $f20 -/* C5D18 8012F618 00000000 */ nop +/* C5D18 8012F618 00000000 */ nop /* C5D1C 8012F61C 00021400 */ sll $v0, $v0, 0x10 /* C5D20 8012F620 00021403 */ sra $v0, $v0, 0x10 /* C5D24 8012F624 00C2102A */ slt $v0, $a2, $v0 @@ -83,23 +83,23 @@ glabel func_8012F500 /* C5D34 8012F634 468010A1 */ cvt.d.w $f2, $f2 /* C5D38 8012F638 8FB50080 */ lw $s5, 0x80($sp) /* C5D3C 8012F63C 44842000 */ mtc1 $a0, $f4 -/* C5D40 8012F640 00000000 */ nop +/* C5D40 8012F640 00000000 */ nop /* C5D44 8012F644 46802120 */ cvt.s.w $f4, $f4 /* C5D48 8012F648 06A30007 */ bgezl $s5, .L8012F668 /* C5D4C 8012F64C 46201020 */ cvt.s.d $f0, $f2 /* C5D50 8012F650 3C0141F0 */ lui $at, 0x41f0 /* C5D54 8012F654 44810800 */ mtc1 $at, $f1 /* C5D58 8012F658 44800000 */ mtc1 $zero, $f0 -/* C5D5C 8012F65C 00000000 */ nop +/* C5D5C 8012F65C 00000000 */ nop /* C5D60 8012F660 46201080 */ add.d $f2, $f2, $f0 /* C5D64 8012F664 46201020 */ cvt.s.d $f0, $f2 .L8012F668: /* C5D68 8012F668 460A0002 */ mul.s $f0, $f0, $f10 -/* C5D6C 8012F66C 00000000 */ nop +/* C5D6C 8012F66C 00000000 */ nop /* C5D70 8012F670 46002000 */ add.s $f0, $f4, $f0 /* C5D74 8012F674 4600050D */ trunc.w.s $f20, $f0 /* C5D78 8012F678 4402A000 */ mfc1 $v0, $f20 -/* C5D7C 8012F67C 00000000 */ nop +/* C5D7C 8012F67C 00000000 */ nop /* C5D80 8012F680 00021400 */ sll $v0, $v0, 0x10 /* C5D84 8012F684 00021403 */ sra $v0, $v0, 0x10 /* C5D88 8012F688 0062102A */ slt $v0, $v1, $v0 @@ -120,7 +120,7 @@ glabel func_8012F500 /* C5DB8 8012F6B8 44802000 */ mtc1 $zero, $f4 /* C5DBC 8012F6BC 00E0A02D */ daddu $s4, $a3, $zero /* C5DC0 8012F6C0 46243102 */ mul.d $f4, $f6, $f4 -/* C5DC4 8012F6C4 00000000 */ nop +/* C5DC4 8012F6C4 00000000 */ nop /* C5DC8 8012F6C8 00A0802D */ daddu $s0, $a1, $zero /* C5DCC 8012F6CC 3C014200 */ lui $at, 0x4200 /* C5DD0 8012F6D0 44817000 */ mtc1 $at, $f14 @@ -135,14 +135,14 @@ glabel func_8012F500 /* C5DF4 8012F6F4 44813000 */ mtc1 $at, $f6 /* C5DF8 8012F6F8 46081003 */ div.s $f0, $f2, $f8 /* C5DFC 8012F6FC 46060002 */ mul.s $f0, $f0, $f6 -/* C5E00 8012F700 00000000 */ nop +/* C5E00 8012F700 00000000 */ nop /* C5E04 8012F704 3C014280 */ lui $at, 0x4280 /* C5E08 8012F708 44818000 */ mtc1 $at, $f16 /* C5E0C 8012F70C 00C0502D */ daddu $t2, $a2, $zero /* C5E10 8012F710 AFA2003C */ sw $v0, 0x3c($sp) /* C5E14 8012F714 460A1083 */ div.s $f2, $f2, $f10 /* C5E18 8012F718 46061082 */ mul.s $f2, $f2, $f6 -/* C5E1C 8012F71C 00000000 */ nop +/* C5E1C 8012F71C 00000000 */ nop /* C5E20 8012F720 AFA00004 */ sw $zero, 4($sp) /* C5E24 8012F724 AFB70014 */ sw $s7, 0x14($sp) /* C5E28 8012F728 4600050D */ trunc.w.s $f20, $f0 @@ -162,26 +162,26 @@ glabel func_8012F500 /* C5E5C 8012F75C AFA2000C */ sw $v0, 0xc($sp) /* C5E60 8012F760 4620050D */ trunc.w.d $f20, $f0 /* C5E64 8012F764 4402A000 */ mfc1 $v0, $f20 -/* C5E68 8012F768 00000000 */ nop +/* C5E68 8012F768 00000000 */ nop /* C5E6C 8012F76C AFA2001C */ sw $v0, 0x1c($sp) /* C5E70 8012F770 01C2102A */ slt $v0, $t6, $v0 /* C5E74 8012F774 14400014 */ bnez $v0, .L8012F7C8 /* C5E78 8012F778 0000902D */ daddu $s2, $zero, $zero /* C5E7C 8012F77C 460E5082 */ mul.s $f2, $f10, $f14 -/* C5E80 8012F780 00000000 */ nop +/* C5E80 8012F780 00000000 */ nop .L8012F784: /* C5E84 8012F784 8FA40004 */ lw $a0, 4($sp) /* C5E88 8012F788 8FA2001C */ lw $v0, 0x1c($sp) /* C5E8C 8012F78C 24830020 */ addiu $v1, $a0, 0x20 /* C5E90 8012F790 44820000 */ mtc1 $v0, $f0 -/* C5E94 8012F794 00000000 */ nop +/* C5E94 8012F794 00000000 */ nop /* C5E98 8012F798 46800020 */ cvt.s.w $f0, $f0 /* C5E9C 8012F79C 46020000 */ add.s $f0, $f0, $f2 /* C5EA0 8012F7A0 AFA30004 */ sw $v1, 4($sp) /* C5EA4 8012F7A4 AFA20014 */ sw $v0, 0x14($sp) /* C5EA8 8012F7A8 4600050D */ trunc.w.s $f20, $f0 /* C5EAC 8012F7AC 4402A000 */ mfc1 $v0, $f20 -/* C5EB0 8012F7B0 00000000 */ nop +/* C5EB0 8012F7B0 00000000 */ nop /* C5EB4 8012F7B4 AFA2001C */ sw $v0, 0x1c($sp) /* C5EB8 8012F7B8 004E102A */ slt $v0, $v0, $t6 /* C5EBC 8012F7BC 1440FFF1 */ bnez $v0, .L8012F784 @@ -191,12 +191,12 @@ glabel func_8012F500 /* C5EC8 8012F7C8 8FA20014 */ lw $v0, 0x14($sp) /* C5ECC 8012F7CC 004E102A */ slt $v0, $v0, $t6 /* C5ED0 8012F7D0 10400009 */ beqz $v0, .L8012F7F8 -/* C5ED4 8012F7D4 00000000 */ nop +/* C5ED4 8012F7D4 00000000 */ nop /* C5ED8 8012F7D8 C7A0003C */ lwc1 $f0, 0x3c($sp) /* C5EDC 8012F7DC 46800020 */ cvt.s.w $f0, $f0 /* C5EE0 8012F7E0 460A0003 */ div.s $f0, $f0, $f10 /* C5EE4 8012F7E4 460E0002 */ mul.s $f0, $f0, $f14 -/* C5EE8 8012F7E8 00000000 */ nop +/* C5EE8 8012F7E8 00000000 */ nop /* C5EEC 8012F7EC AFAE0014 */ sw $t6, 0x14($sp) /* C5EF0 8012F7F0 4600050D */ trunc.w.s $f20, $f0 /* C5EF4 8012F7F4 4412A000 */ mfc1 $s2, $f20 @@ -208,18 +208,18 @@ glabel func_8012F500 /* C5F08 8012F808 14400014 */ bnez $v0, .L8012F85C /* C5F0C 8012F80C 26A3FFFF */ addiu $v1, $s5, -1 /* C5F10 8012F810 44830000 */ mtc1 $v1, $f0 -/* C5F14 8012F814 00000000 */ nop +/* C5F14 8012F814 00000000 */ nop /* C5F18 8012F818 46800020 */ cvt.s.w $f0, $f0 /* C5F1C 8012F81C 460A0002 */ mul.s $f0, $f0, $f10 -/* C5F20 8012F820 00000000 */ nop +/* C5F20 8012F820 00000000 */ nop /* C5F24 8012F824 4600050D */ trunc.w.s $f20, $f0 /* C5F28 8012F828 4402A000 */ mfc1 $v0, $f20 -/* C5F2C 8012F82C 00000000 */ nop +/* C5F2C 8012F82C 00000000 */ nop /* C5F30 8012F830 00021400 */ sll $v0, $v0, 0x10 /* C5F34 8012F834 00021403 */ sra $v0, $v0, 0x10 /* C5F38 8012F838 02E21021 */ addu $v0, $s7, $v0 /* C5F3C 8012F83C 44820000 */ mtc1 $v0, $f0 -/* C5F40 8012F840 00000000 */ nop +/* C5F40 8012F840 00000000 */ nop /* C5F44 8012F844 46800020 */ cvt.s.w $f0, $f0 /* C5F48 8012F848 460A0000 */ add.s $f0, $f0, $f10 /* C5F4C 8012F84C AFA3000C */ sw $v1, 0xc($sp) @@ -241,8 +241,8 @@ glabel func_8012F500 /* C5F84 8012F884 0040B02D */ daddu $s6, $v0, $zero /* C5F88 8012F888 0016B023 */ negu $s6, $s6 .L8012F88C: -/* C5F8C 8012F88C 3C08800A */ lui $t0, %hi(D_8009A66C) -/* C5F90 8012F890 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* C5F8C 8012F88C 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* C5F90 8012F890 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* C5F94 8012F894 46004021 */ cvt.d.s $f0, $f8 /* C5F98 8012F898 266CFFFF */ addiu $t4, $s3, -1 /* C5F9C 8012F89C 3C11F510 */ lui $s1, 0xf510 @@ -250,7 +250,7 @@ glabel func_8012F500 /* C5FA4 8012F8A4 93AF0028 */ lbu $t7, 0x28($sp) /* C5FA8 8012F8A8 93B50027 */ lbu $s5, 0x27($sp) /* C5FAC 8012F8AC 46320002 */ mul.d $f0, $f0, $f18 -/* C5FB0 8012F8B0 00000000 */ nop +/* C5FB0 8012F8B0 00000000 */ nop /* C5FB4 8012F8B4 AFA00000 */ sw $zero, ($sp) /* C5FB8 8012F8B8 AFB00010 */ sw $s0, 0x10($sp) /* C5FBC 8012F8BC 0142C021 */ addu $t8, $t2, $v0 @@ -268,26 +268,26 @@ glabel func_8012F500 /* C5FE8 8012F8E8 AFA20008 */ sw $v0, 8($sp) /* C5FEC 8012F8EC 4620050D */ trunc.w.d $f20, $f0 /* C5FF0 8012F8F0 4402A000 */ mfc1 $v0, $f20 -/* C5FF4 8012F8F4 00000000 */ nop +/* C5FF4 8012F8F4 00000000 */ nop /* C5FF8 8012F8F8 AFA20018 */ sw $v0, 0x18($sp) /* C5FFC 8012F8FC 0142102A */ slt $v0, $t2, $v0 /* C6000 8012F900 14400014 */ bnez $v0, .L8012F954 /* C6004 8012F904 0000682D */ daddu $t5, $zero, $zero /* C6008 8012F908 46104082 */ mul.s $f2, $f8, $f16 -/* C600C 8012F90C 00000000 */ nop +/* C600C 8012F90C 00000000 */ nop .L8012F910: /* C6010 8012F910 8FA40000 */ lw $a0, ($sp) /* C6014 8012F914 8FA30018 */ lw $v1, 0x18($sp) /* C6018 8012F918 24820040 */ addiu $v0, $a0, 0x40 /* C601C 8012F91C 44830000 */ mtc1 $v1, $f0 -/* C6020 8012F920 00000000 */ nop +/* C6020 8012F920 00000000 */ nop /* C6024 8012F924 46800020 */ cvt.s.w $f0, $f0 /* C6028 8012F928 46020000 */ add.s $f0, $f0, $f2 /* C602C 8012F92C AFA20000 */ sw $v0, ($sp) /* C6030 8012F930 AFA30010 */ sw $v1, 0x10($sp) /* C6034 8012F934 4600050D */ trunc.w.s $f20, $f0 /* C6038 8012F938 4402A000 */ mfc1 $v0, $f20 -/* C603C 8012F93C 00000000 */ nop +/* C603C 8012F93C 00000000 */ nop /* C6040 8012F940 AFA20018 */ sw $v0, 0x18($sp) /* C6044 8012F944 004A102A */ slt $v0, $v0, $t2 /* C6048 8012F948 1440FFF1 */ bnez $v0, .L8012F910 @@ -297,13 +297,13 @@ glabel func_8012F500 /* C6054 8012F954 8FA20010 */ lw $v0, 0x10($sp) /* C6058 8012F958 004A102A */ slt $v0, $v0, $t2 /* C605C 8012F95C 1040000A */ beqz $v0, .L8012F988 -/* C6060 8012F960 00000000 */ nop +/* C6060 8012F960 00000000 */ nop /* C6064 8012F964 44960000 */ mtc1 $s6, $f0 -/* C6068 8012F968 00000000 */ nop +/* C6068 8012F968 00000000 */ nop /* C606C 8012F96C 46800020 */ cvt.s.w $f0, $f0 /* C6070 8012F970 46080003 */ div.s $f0, $f0, $f8 /* C6074 8012F974 460E0002 */ mul.s $f0, $f0, $f14 -/* C6078 8012F978 00000000 */ nop +/* C6078 8012F978 00000000 */ nop /* C607C 8012F97C AFAA0010 */ sw $t2, 0x10($sp) /* C6080 8012F980 4600050D */ trunc.w.s $f20, $f0 /* C6084 8012F984 440DA000 */ mfc1 $t5, $f20 @@ -312,20 +312,20 @@ glabel func_8012F500 /* C608C 8012F98C 24420001 */ addiu $v0, $v0, 1 /* C6090 8012F990 0053102B */ sltu $v0, $v0, $s3 /* C6094 8012F994 14400016 */ bnez $v0, .L8012F9F0 -/* C6098 8012F998 00000000 */ nop +/* C6098 8012F998 00000000 */ nop /* C609C 8012F99C 448C0000 */ mtc1 $t4, $f0 -/* C60A0 8012F9A0 00000000 */ nop +/* C60A0 8012F9A0 00000000 */ nop /* C60A4 8012F9A4 46800020 */ cvt.s.w $f0, $f0 /* C60A8 8012F9A8 46080002 */ mul.s $f0, $f0, $f8 -/* C60AC 8012F9AC 00000000 */ nop +/* C60AC 8012F9AC 00000000 */ nop /* C60B0 8012F9B0 4600050D */ trunc.w.s $f20, $f0 /* C60B4 8012F9B4 4402A000 */ mfc1 $v0, $f20 -/* C60B8 8012F9B8 00000000 */ nop +/* C60B8 8012F9B8 00000000 */ nop /* C60BC 8012F9BC 00021400 */ sll $v0, $v0, 0x10 /* C60C0 8012F9C0 00021403 */ sra $v0, $v0, 0x10 /* C60C4 8012F9C4 02021021 */ addu $v0, $s0, $v0 /* C60C8 8012F9C8 44820000 */ mtc1 $v0, $f0 -/* C60CC 8012F9CC 00000000 */ nop +/* C60CC 8012F9CC 00000000 */ nop /* C60D0 8012F9D0 46800020 */ cvt.s.w $f0, $f0 /* C60D4 8012F9D4 46080000 */ add.s $f0, $f0, $f8 /* C60D8 8012F9D8 46000021 */ cvt.d.s $f0, $f0 diff --git a/asm/nonmatchings/code_B9D60/func_8012FE78.s b/asm/nonmatchings/code_B9D60/func_8012FE78.s index c6df0bf3b6..7849eedfd4 100644 --- a/asm/nonmatchings/code_B9D60/func_8012FE78.s +++ b/asm/nonmatchings/code_B9D60/func_8012FE78.s @@ -39,7 +39,7 @@ glabel func_8012FE78 /* C6600 8012FF00 A7B7005E */ sh $s7, 0x5e($sp) /* C6604 8012FF04 4600A021 */ cvt.d.s $f0, $f20 /* C6608 8012FF08 4622003C */ c.lt.d $f0, $f2 -/* C660C 8012FF0C 00000000 */ nop +/* C660C 8012FF0C 00000000 */ nop /* C6610 8012FF10 450302A9 */ bc1tl .L801309B8 /* C6614 8012FF14 0000102D */ daddu $v0, $zero, $zero /* C6618 8012FF18 00021400 */ sll $v0, $v0, 0x10 @@ -57,52 +57,52 @@ glabel func_8012FE78 /* C6648 8012FF48 1040029B */ beqz $v0, .L801309B8 /* C664C 8012FF4C 0000102D */ daddu $v0, $zero, $zero /* C6650 8012FF50 44941000 */ mtc1 $s4, $f2 -/* C6654 8012FF54 00000000 */ nop +/* C6654 8012FF54 00000000 */ nop /* C6658 8012FF58 468010A1 */ cvt.d.w $f2, $f2 /* C665C 8012FF5C 44832000 */ mtc1 $v1, $f4 -/* C6660 8012FF60 00000000 */ nop +/* C6660 8012FF60 00000000 */ nop /* C6664 8012FF64 46802120 */ cvt.s.w $f4, $f4 /* C6668 8012FF68 06830007 */ bgezl $s4, .L8012FF88 /* C666C 8012FF6C 46201020 */ cvt.s.d $f0, $f2 /* C6670 8012FF70 3C0141F0 */ lui $at, 0x41f0 /* C6674 8012FF74 44810800 */ mtc1 $at, $f1 /* C6678 8012FF78 44800000 */ mtc1 $zero, $f0 -/* C667C 8012FF7C 00000000 */ nop +/* C667C 8012FF7C 00000000 */ nop /* C6680 8012FF80 46201080 */ add.d $f2, $f2, $f0 /* C6684 8012FF84 46201020 */ cvt.s.d $f0, $f2 .L8012FF88: /* C6688 8012FF88 46160002 */ mul.s $f0, $f0, $f22 -/* C668C 8012FF8C 00000000 */ nop +/* C668C 8012FF8C 00000000 */ nop /* C6690 8012FF90 46002000 */ add.s $f0, $f4, $f0 /* C6694 8012FF94 4600020D */ trunc.w.s $f8, $f0 /* C6698 8012FF98 44024000 */ mfc1 $v0, $f8 -/* C669C 8012FF9C 00000000 */ nop +/* C669C 8012FF9C 00000000 */ nop /* C66A0 8012FFA0 00021400 */ sll $v0, $v0, 0x10 /* C66A4 8012FFA4 00021403 */ sra $v0, $v0, 0x10 /* C66A8 8012FFA8 00A2102A */ slt $v0, $a1, $v0 /* C66AC 8012FFAC 10400282 */ beqz $v0, .L801309B8 /* C66B0 8012FFB0 0000102D */ daddu $v0, $zero, $zero /* C66B4 8012FFB4 44931000 */ mtc1 $s3, $f2 -/* C66B8 8012FFB8 00000000 */ nop +/* C66B8 8012FFB8 00000000 */ nop /* C66BC 8012FFBC 468010A1 */ cvt.d.w $f2, $f2 /* C66C0 8012FFC0 44842000 */ mtc1 $a0, $f4 -/* C66C4 8012FFC4 00000000 */ nop +/* C66C4 8012FFC4 00000000 */ nop /* C66C8 8012FFC8 46802120 */ cvt.s.w $f4, $f4 /* C66CC 8012FFCC 06630007 */ bgezl $s3, .L8012FFEC /* C66D0 8012FFD0 46201020 */ cvt.s.d $f0, $f2 /* C66D4 8012FFD4 3C0141F0 */ lui $at, 0x41f0 /* C66D8 8012FFD8 44810800 */ mtc1 $at, $f1 /* C66DC 8012FFDC 44800000 */ mtc1 $zero, $f0 -/* C66E0 8012FFE0 00000000 */ nop +/* C66E0 8012FFE0 00000000 */ nop /* C66E4 8012FFE4 46201080 */ add.d $f2, $f2, $f0 /* C66E8 8012FFE8 46201020 */ cvt.s.d $f0, $f2 .L8012FFEC: /* C66EC 8012FFEC 46140002 */ mul.s $f0, $f0, $f20 -/* C66F0 8012FFF0 00000000 */ nop +/* C66F0 8012FFF0 00000000 */ nop /* C66F4 8012FFF4 46002000 */ add.s $f0, $f4, $f0 /* C66F8 8012FFF8 4600020D */ trunc.w.s $f8, $f0 /* C66FC 8012FFFC 44024000 */ mfc1 $v0, $f8 -/* C6700 80130000 00000000 */ nop +/* C6700 80130000 00000000 */ nop /* C6704 80130004 00021400 */ sll $v0, $v0, 0x10 /* C6708 80130008 00021403 */ sra $v0, $v0, 0x10 /* C670C 8013000C 00C2102A */ slt $v0, $a2, $v0 @@ -121,7 +121,7 @@ glabel func_8012FE78 /* C6740 80130040 1062000A */ beq $v1, $v0, .L8013006C /* C6744 80130044 0000102D */ daddu $v0, $zero, $zero /* C6748 80130048 0804C26E */ j .L801309B8 -/* C674C 8013004C 00000000 */ nop +/* C674C 8013004C 00000000 */ nop .L80130050: /* C6750 80130050 1462000D */ bne $v1, $v0, .L80130088 /* C6754 80130054 24020002 */ addiu $v0, $zero, 2 @@ -138,7 +138,7 @@ glabel func_8012FE78 /* C6778 80130078 1062000A */ beq $v1, $v0, .L801300A4 /* C677C 8013007C 0000102D */ daddu $v0, $zero, $zero /* C6780 80130080 0804C26E */ j .L801309B8 -/* C6784 80130084 00000000 */ nop +/* C6784 80130084 00000000 */ nop .L80130088: /* C6788 80130088 14620008 */ bne $v1, $v0, .L801300AC /* C678C 8013008C 24020003 */ addiu $v0, $zero, 3 @@ -169,10 +169,10 @@ glabel func_8012FE78 /* C67E0 801300E0 44812000 */ mtc1 $at, $f4 /* C67E4 801300E4 46160083 */ div.s $f2, $f0, $f22 /* C67E8 801300E8 46041082 */ mul.s $f2, $f2, $f4 -/* C67EC 801300EC 00000000 */ nop +/* C67EC 801300EC 00000000 */ nop /* C67F0 801300F0 46140003 */ div.s $f0, $f0, $f20 /* C67F4 801300F4 46040002 */ mul.s $f0, $f0, $f4 -/* C67F8 801300F8 00000000 */ nop +/* C67F8 801300F8 00000000 */ nop /* C67FC 801300FC 4600120D */ trunc.w.s $f8, $f2 /* C6800 80130100 E7A8004C */ swc1 $f8, 0x4c($sp) /* C6804 80130104 4600020D */ trunc.w.s $f8, $f0 @@ -184,7 +184,7 @@ glabel func_8012FE78 /* C681C 8013011C 0260882D */ daddu $s1, $s3, $zero /* C6820 80130120 2C620002 */ sltiu $v0, $v1, 2 /* C6824 80130124 10400003 */ beqz $v0, .L80130134 -/* C6828 80130128 00000000 */ nop +/* C6828 80130128 00000000 */ nop .L8013012C: /* C682C 8013012C 0804C26E */ j .L801309B8 /* C6830 80130130 0000102D */ daddu $v0, $zero, $zero @@ -194,17 +194,17 @@ glabel func_8012FE78 /* C683C 8013013C 44801000 */ mtc1 $zero, $f2 /* C6840 80130140 4600A021 */ cvt.d.s $f0, $f20 /* C6844 80130144 4622003E */ c.le.d $f0, $f2 -/* C6848 80130148 00000000 */ nop +/* C6848 80130148 00000000 */ nop /* C684C 8013014C 45000003 */ bc1f .L8013015C -/* C6850 80130150 00000000 */ nop +/* C6850 80130150 00000000 */ nop /* C6854 80130154 0804C068 */ j .L801301A0 /* C6858 80130158 A7A00048 */ sh $zero, 0x48($sp) .L8013015C: /* C685C 8013015C 3C014F00 */ lui $at, 0x4f00 /* C6860 80130160 44810000 */ mtc1 $at, $f0 -/* C6864 80130164 00000000 */ nop +/* C6864 80130164 00000000 */ nop /* C6868 80130168 4614003E */ c.le.s $f0, $f20 -/* C686C 8013016C 00000000 */ nop +/* C686C 8013016C 00000000 */ nop /* C6870 80130170 45030005 */ bc1tl .L80130188 /* C6874 80130174 4600A001 */ sub.s $f0, $f20, $f0 /* C6878 80130178 4600A20D */ trunc.w.s $f8, $f20 @@ -215,7 +215,7 @@ glabel func_8012FE78 /* C6888 80130188 3C028000 */ lui $v0, 0x8000 /* C688C 8013018C 4600020D */ trunc.w.s $f8, $f0 /* C6890 80130190 44034000 */ mfc1 $v1, $f8 -/* C6894 80130194 00000000 */ nop +/* C6894 80130194 00000000 */ nop /* C6898 80130198 00621825 */ or $v1, $v1, $v0 /* C689C 8013019C A7A30048 */ sh $v1, 0x48($sp) .L801301A0: @@ -231,8 +231,8 @@ glabel func_8012FE78 /* C68C4 801301C4 32A3FFFF */ andi $v1, $s5, 0xffff /* C68C8 801301C8 01437821 */ addu $t7, $t2, $v1 /* C68CC 801301CC 33D8FFFF */ andi $t8, $fp, 0xffff -/* C68D0 801301D0 3C07800A */ lui $a3, %hi(D_8009A66C) -/* C68D4 801301D4 24E7A66C */ addiu $a3, $a3, %lo(D_8009A66C) +/* C68D0 801301D0 3C07800A */ lui $a3, %hi(gMasterGfxPos) +/* C68D4 801301D4 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) /* C68D8 801301D8 3C1EF508 */ lui $fp, 0xf508 /* C68DC 801301DC 3042000F */ andi $v0, $v0, 0xf /* C68E0 801301E0 00021380 */ sll $v0, $v0, 0xe @@ -244,12 +244,12 @@ glabel func_8012FE78 /* C68F8 801301F8 2697FFFF */ addiu $s7, $s4, -1 /* C68FC 801301FC 3229FFFF */ andi $t1, $s1, 0xffff /* C6900 80130200 44890000 */ mtc1 $t1, $f0 -/* C6904 80130204 00000000 */ nop +/* C6904 80130204 00000000 */ nop /* C6908 80130208 46800020 */ cvt.s.w $f0, $f0 /* C690C 8013020C 97A3005E */ lhu $v1, 0x5e($sp) /* C6910 80130210 93AE0030 */ lbu $t6, 0x30($sp) /* C6914 80130214 46140182 */ mul.s $f6, $f0, $f20 -/* C6918 80130218 00000000 */ nop +/* C6918 80130218 00000000 */ nop /* C691C 8013021C AFB7005C */ sw $s7, 0x5c($sp) /* C6920 80130220 AFA00010 */ sw $zero, 0x10($sp) /* C6924 80130224 AFA00014 */ sw $zero, 0x14($sp) @@ -273,7 +273,7 @@ glabel func_8012FE78 /* C696C 8013026C AFA20024 */ sw $v0, 0x24($sp) .L80130270: /* C6970 80130270 44941000 */ mtc1 $s4, $f2 -/* C6974 80130274 00000000 */ nop +/* C6974 80130274 00000000 */ nop /* C6978 80130278 468010A1 */ cvt.d.w $f2, $f2 /* C697C 8013027C C7A00024 */ lwc1 $f0, 0x24($sp) /* C6980 80130280 46800020 */ cvt.s.w $f0, $f0 @@ -293,17 +293,17 @@ glabel func_8012FE78 /* C69B8 801302B8 3C0141F0 */ lui $at, 0x41f0 /* C69BC 801302BC 44810800 */ mtc1 $at, $f1 /* C69C0 801302C0 44800000 */ mtc1 $zero, $f0 -/* C69C4 801302C4 00000000 */ nop +/* C69C4 801302C4 00000000 */ nop /* C69C8 801302C8 46201080 */ add.d $f2, $f2, $f0 .L801302CC: /* C69CC 801302CC 46201020 */ cvt.s.d $f0, $f2 /* C69D0 801302D0 46160002 */ mul.s $f0, $f0, $f22 -/* C69D4 801302D4 00000000 */ nop +/* C69D4 801302D4 00000000 */ nop /* C69D8 801302D8 46002000 */ add.s $f0, $f4, $f0 /* C69DC 801302DC 0000882D */ daddu $s1, $zero, $zero /* C69E0 801302E0 4600020D */ trunc.w.s $f8, $f0 /* C69E4 801302E4 44024000 */ mfc1 $v0, $f8 -/* C69E8 801302E8 00000000 */ nop +/* C69E8 801302E8 00000000 */ nop /* C69EC 801302EC 00021400 */ sll $v0, $v0, 0x10 /* C69F0 801302F0 00021403 */ sra $v0, $v0, 0x10 /* C69F4 801302F4 AFA20028 */ sw $v0, 0x28($sp) @@ -311,23 +311,23 @@ glabel func_8012FE78 /* C69FC 801302FC 14400018 */ bnez $v0, .L80130360 /* C6A00 80130300 0220802D */ daddu $s0, $s1, $zero /* C6A04 80130304 44890000 */ mtc1 $t1, $f0 -/* C6A08 80130308 00000000 */ nop +/* C6A08 80130308 00000000 */ nop /* C6A0C 8013030C 46800020 */ cvt.s.w $f0, $f0 /* C6A10 80130310 46140082 */ mul.s $f2, $f0, $f20 -/* C6A14 80130314 00000000 */ nop +/* C6A14 80130314 00000000 */ nop .L80130318: /* C6A18 80130318 8FA20014 */ lw $v0, 0x14($sp) /* C6A1C 8013031C 8FA3002C */ lw $v1, 0x2c($sp) /* C6A20 80130320 00492021 */ addu $a0, $v0, $t1 /* C6A24 80130324 44830000 */ mtc1 $v1, $f0 -/* C6A28 80130328 00000000 */ nop +/* C6A28 80130328 00000000 */ nop /* C6A2C 8013032C 46800020 */ cvt.s.w $f0, $f0 /* C6A30 80130330 46020000 */ add.s $f0, $f0, $f2 /* C6A34 80130334 AFA40014 */ sw $a0, 0x14($sp) /* C6A38 80130338 AFA30024 */ sw $v1, 0x24($sp) /* C6A3C 8013033C 4600020D */ trunc.w.s $f8, $f0 /* C6A40 80130340 44024000 */ mfc1 $v0, $f8 -/* C6A44 80130344 00000000 */ nop +/* C6A44 80130344 00000000 */ nop /* C6A48 80130348 AFA2002C */ sw $v0, 0x2c($sp) /* C6A4C 8013034C 004A102A */ slt $v0, $v0, $t2 /* C6A50 80130350 1440FFF1 */ bnez $v0, .L80130318 @@ -338,7 +338,7 @@ glabel func_8012FE78 /* C6A60 80130360 8FA20024 */ lw $v0, 0x24($sp) /* C6A64 80130364 004A102A */ slt $v0, $v0, $t2 /* C6A68 80130368 10400012 */ beqz $v0, .L801303B4 -/* C6A6C 8013036C 00000000 */ nop +/* C6A6C 8013036C 00000000 */ nop /* C6A70 80130370 97B70046 */ lhu $s7, 0x46($sp) /* C6A74 80130374 00171400 */ sll $v0, $s7, 0x10 /* C6A78 80130378 00021403 */ sra $v0, $v0, 0x10 @@ -347,13 +347,13 @@ glabel func_8012FE78 /* C6A84 80130384 00021023 */ negu $v0, $v0 .L80130388: /* C6A88 80130388 44821000 */ mtc1 $v0, $f2 -/* C6A8C 8013038C 00000000 */ nop +/* C6A8C 8013038C 00000000 */ nop /* C6A90 80130390 468010A0 */ cvt.s.w $f2, $f2 /* C6A94 80130394 3C014200 */ lui $at, 0x4200 /* C6A98 80130398 44810000 */ mtc1 $at, $f0 /* C6A9C 8013039C 46141083 */ div.s $f2, $f2, $f20 /* C6AA0 801303A0 46001002 */ mul.s $f0, $f2, $f0 -/* C6AA4 801303A4 00000000 */ nop +/* C6AA4 801303A4 00000000 */ nop /* C6AA8 801303A8 AFAA0024 */ sw $t2, 0x24($sp) /* C6AAC 801303AC 4600020D */ trunc.w.s $f8, $f0 /* C6AB0 801303B0 44114000 */ mfc1 $s1, $f8 @@ -368,24 +368,24 @@ glabel func_8012FE78 /* C6ACC 801303CC 10400015 */ beqz $v0, .L80130424 /* C6AD0 801303D0 2662FFFF */ addiu $v0, $s3, -1 /* C6AD4 801303D4 44931000 */ mtc1 $s3, $f2 -/* C6AD8 801303D8 00000000 */ nop +/* C6AD8 801303D8 00000000 */ nop /* C6ADC 801303DC 468010A1 */ cvt.d.w $f2, $f2 /* C6AE0 801303E0 06610006 */ bgez $s3, .L801303FC /* C6AE4 801303E4 AFA2001C */ sw $v0, 0x1c($sp) /* C6AE8 801303E8 3C0141F0 */ lui $at, 0x41f0 /* C6AEC 801303EC 44810800 */ mtc1 $at, $f1 /* C6AF0 801303F0 44800000 */ mtc1 $zero, $f0 -/* C6AF4 801303F4 00000000 */ nop +/* C6AF4 801303F4 00000000 */ nop /* C6AF8 801303F8 46201080 */ add.d $f2, $f2, $f0 .L801303FC: /* C6AFC 801303FC 46201020 */ cvt.s.d $f0, $f2 /* C6B00 80130400 46140002 */ mul.s $f0, $f0, $f20 -/* C6B04 80130404 00000000 */ nop +/* C6B04 80130404 00000000 */ nop /* C6B08 80130408 240B0001 */ addiu $t3, $zero, 1 /* C6B0C 8013040C 8FA20024 */ lw $v0, 0x24($sp) /* C6B10 80130410 4600020D */ trunc.w.s $f8, $f0 /* C6B14 80130414 44034000 */ mfc1 $v1, $f8 -/* C6B18 80130418 00000000 */ nop +/* C6B18 80130418 00000000 */ nop /* C6B1C 8013041C 00431021 */ addu $v0, $v0, $v1 /* C6B20 80130420 AFA2002C */ sw $v0, 0x2c($sp) .L80130424: @@ -405,7 +405,7 @@ glabel func_8012FE78 /* C6B50 80130450 8FA20020 */ lw $v0, 0x20($sp) /* C6B54 80130454 0058102A */ slt $v0, $v0, $t8 /* C6B58 80130458 10400012 */ beqz $v0, .L801304A4 -/* C6B5C 8013045C 00000000 */ nop +/* C6B5C 8013045C 00000000 */ nop /* C6B60 80130460 97B7003E */ lhu $s7, 0x3e($sp) /* C6B64 80130464 00171400 */ sll $v0, $s7, 0x10 /* C6B68 80130468 00021403 */ sra $v0, $v0, 0x10 @@ -414,13 +414,13 @@ glabel func_8012FE78 /* C6B74 80130474 00021023 */ negu $v0, $v0 .L80130478: /* C6B78 80130478 44821000 */ mtc1 $v0, $f2 -/* C6B7C 8013047C 00000000 */ nop +/* C6B7C 8013047C 00000000 */ nop /* C6B80 80130480 468010A0 */ cvt.s.w $f2, $f2 /* C6B84 80130484 3C014200 */ lui $at, 0x4200 /* C6B88 80130488 44810000 */ mtc1 $at, $f0 /* C6B8C 8013048C 46161083 */ div.s $f2, $f2, $f22 /* C6B90 80130490 46001002 */ mul.s $f0, $f2, $f0 -/* C6B94 80130494 00000000 */ nop +/* C6B94 80130494 00000000 */ nop /* C6B98 80130498 AFB80020 */ sw $t8, 0x20($sp) /* C6B9C 8013049C 4600020D */ trunc.w.s $f8, $f0 /* C6BA0 801304A0 44104000 */ mfc1 $s0, $f8 @@ -744,10 +744,10 @@ glabel func_8012FE78 /* C7074 80130974 24020001 */ addiu $v0, $zero, 1 /* C7078 80130978 97A30048 */ lhu $v1, 0x48($sp) /* C707C 8013097C 44830000 */ mtc1 $v1, $f0 -/* C7080 80130980 00000000 */ nop +/* C7080 80130980 00000000 */ nop /* C7084 80130984 46800020 */ cvt.s.w $f0, $f0 /* C7088 80130988 46140002 */ mul.s $f0, $f0, $f20 -/* C708C 8013098C 00000000 */ nop +/* C708C 8013098C 00000000 */ nop /* C7090 80130990 C7A2002C */ lwc1 $f2, 0x2c($sp) /* C7094 80130994 468010A0 */ cvt.s.w $f2, $f2 /* C7098 80130998 8FA20014 */ lw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_B9D60/render_item_entities.s b/asm/nonmatchings/code_B9D60/render_item_entities.s index 0b03692c57..520e905e7d 100644 --- a/asm/nonmatchings/code_B9D60/render_item_entities.s +++ b/asm/nonmatchings/code_B9D60/render_item_entities.s @@ -10,8 +10,8 @@ glabel render_item_entities /* C9568 80132E68 AFB50134 */ sw $s5, 0x134($sp) /* C956C 80132E6C 27B50098 */ addiu $s5, $sp, 0x98 /* C9570 80132E70 AFB10124 */ sw $s1, 0x124($sp) -/* C9574 80132E74 3C11800A */ lui $s1, %hi(D_8009A66C) -/* C9578 80132E78 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* C9574 80132E74 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* C9578 80132E78 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* C957C 80132E7C AFBE0140 */ sw $fp, 0x140($sp) /* C9580 80132E80 3C1EE600 */ lui $fp, 0xe600 /* C9584 80132E84 AFB7013C */ sw $s7, 0x13c($sp) @@ -52,7 +52,7 @@ glabel render_item_entities /* C9608 80132F08 10620003 */ beq $v1, $v0, .L80132F18 /* C960C 80132F0C 24020156 */ addiu $v0, $zero, 0x156 /* C9610 80132F10 14620005 */ bne $v1, $v0, .L80132F28 -/* C9614 80132F14 00000000 */ nop +/* C9614 80132F14 00000000 */ nop .L80132F18: /* C9618 80132F18 3C013F80 */ lui $at, 0x3f80 /* C961C 80132F1C 44810000 */ mtc1 $at, $f0 @@ -79,7 +79,7 @@ glabel render_item_entities /* C966C 80132F6C 0280202D */ daddu $a0, $s4, $zero /* C9670 80132F70 C642000C */ lwc1 $f2, 0xc($s2) /* C9674 80132F74 44902000 */ mtc1 $s0, $f4 -/* C9678 80132F78 00000000 */ nop +/* C9678 80132F78 00000000 */ nop /* C967C 80132F7C 46802120 */ cvt.s.w $f4, $f4 /* C9680 80132F80 46001087 */ neg.s $f2, $f2 /* C9684 80132F84 46041081 */ sub.s $f2, $f2, $f4 @@ -119,10 +119,10 @@ glabel render_item_entities /* C9708 80133008 3C020001 */ lui $v0, 1 /* C970C 8013300C 34421630 */ ori $v0, $v0, 0x1630 /* C9710 80133010 27A50018 */ addiu $a1, $sp, 0x18 -/* C9714 80133014 3C038007 */ lui $v1, %hi(D_800741F0) -/* C9718 80133018 946341F0 */ lhu $v1, %lo(D_800741F0)($v1) -/* C971C 8013301C 3C04800A */ lui $a0, %hi(D_8009A674) -/* C9720 80133020 8C84A674 */ lw $a0, %lo(D_8009A674)($a0) +/* C9714 80133014 3C038007 */ lui $v1, %hi(gMatrixListPos) +/* C9718 80133018 946341F0 */ lhu $v1, %lo(gMatrixListPos)($v1) +/* C971C 8013301C 3C04800A */ lui $a0, %hi(gDisplayContext) +/* C9720 80133020 8C84A674 */ lw $a0, %lo(gDisplayContext)($a0) /* C9724 80133024 00031980 */ sll $v1, $v1, 6 /* C9728 80133028 00832021 */ addu $a0, $a0, $v1 /* C972C 8013302C 00822021 */ addu $a0, $a0, $v0 @@ -142,8 +142,8 @@ glabel render_item_entities /* C9760 80133060 34420002 */ ori $v0, $v0, 2 /* C9764 80133064 3C040001 */ lui $a0, 1 /* C9768 80133068 34841630 */ ori $a0, $a0, 0x1630 -/* C976C 8013306C 3C078007 */ lui $a3, %hi(D_800741F0) -/* C9770 80133070 24E741F0 */ addiu $a3, $a3, %lo(D_800741F0) +/* C976C 8013306C 3C078007 */ lui $a3, %hi(gMatrixListPos) +/* C9770 80133070 24E741F0 */ addiu $a3, $a3, %lo(gMatrixListPos) /* C9774 80133074 8E280000 */ lw $t0, ($s1) /* C9778 80133078 94E50000 */ lhu $a1, ($a3) /* C977C 8013307C 0100302D */ daddu $a2, $t0, $zero @@ -153,8 +153,8 @@ glabel render_item_entities /* C978C 8013308C 00641821 */ addu $v1, $v1, $a0 /* C9790 80133090 AE280000 */ sw $t0, ($s1) /* C9794 80133094 ACC20000 */ sw $v0, ($a2) -/* C9798 80133098 3C02800A */ lui $v0, %hi(D_8009A674) -/* C979C 8013309C 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* C9798 80133098 3C02800A */ lui $v0, %hi(gDisplayContext) +/* C979C 8013309C 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* C97A0 801330A0 3C048015 */ lui $a0, %hi(D_80151328) /* C97A4 801330A4 8C841328 */ lw $a0, %lo(D_80151328)($a0) /* C97A8 801330A8 00431021 */ addu $v0, $v0, $v1 @@ -207,7 +207,7 @@ glabel render_item_entities /* C985C 8013315C 00500018 */ mult $v0, $s0 /* C9860 80133160 00001012 */ mflo $v0 /* C9864 80133164 34638081 */ ori $v1, $v1, 0x8081 -/* C9868 80133168 00000000 */ nop +/* C9868 80133168 00000000 */ nop /* C986C 8013316C 00430018 */ mult $v0, $v1 /* C9870 80133170 00001810 */ mfhi $v1 /* C9874 80133174 00621821 */ addu $v1, $v1, $v0 @@ -241,7 +241,7 @@ glabel render_item_entities /* C98DC 801331DC 3C0E0808 */ lui $t6, 0x808 /* C98E0 801331E0 004E1024 */ and $v0, $v0, $t6 /* C98E4 801331E4 10400029 */ beqz $v0, .L8013328C -/* C98E8 801331E8 00000000 */ nop +/* C98E8 801331E8 00000000 */ nop /* C98EC 801331EC 3C028015 */ lui $v0, %hi(D_80151328) /* C98F0 801331F0 8C421328 */ lw $v0, %lo(D_80151328)($v0) /* C98F4 801331F4 94420000 */ lhu $v0, ($v0) @@ -414,7 +414,7 @@ glabel render_item_entities /* C9B88 80133488 0C052479 */ jal func_801491E4 /* C9B8C 8013348C AFB00014 */ sw $s0, 0x14($sp) /* C9B90 80133490 0804CD62 */ j .L80133588 -/* C9B94 80133494 00000000 */ nop +/* C9B94 80133494 00000000 */ nop .L80133498: /* C9B98 80133498 27A40058 */ addiu $a0, $sp, 0x58 /* C9B9C 8013349C 0000282D */ daddu $a1, $zero, $zero @@ -426,7 +426,7 @@ glabel render_item_entities /* C9BB4 801334B4 0C052479 */ jal func_801491E4 /* C9BB8 801334B8 AFA20014 */ sw $v0, 0x14($sp) /* C9BBC 801334BC 0804CD62 */ j .L80133588 -/* C9BC0 801334C0 00000000 */ nop +/* C9BC0 801334C0 00000000 */ nop .L801334C4: /* C9BC4 801334C4 3C03FD48 */ lui $v1, 0xfd48 /* C9BC8 801334C8 3463000B */ ori $v1, $v1, 0xb @@ -613,7 +613,7 @@ glabel render_item_entities /* C9E94 80133794 0C052479 */ jal func_801491E4 /* C9E98 80133798 AFB00014 */ sw $s0, 0x14($sp) /* C9E9C 8013379C 0804CE25 */ j .L80133894 -/* C9EA0 801337A0 00000000 */ nop +/* C9EA0 801337A0 00000000 */ nop .L801337A4: /* C9EA4 801337A4 27A40058 */ addiu $a0, $sp, 0x58 /* C9EA8 801337A8 0000282D */ daddu $a1, $zero, $zero @@ -625,7 +625,7 @@ glabel render_item_entities /* C9EC0 801337C0 0C052479 */ jal func_801491E4 /* C9EC4 801337C4 AFA20014 */ sw $v0, 0x14($sp) /* C9EC8 801337C8 0804CE25 */ j .L80133894 -/* C9ECC 801337CC 00000000 */ nop +/* C9ECC 801337CC 00000000 */ nop .L801337D0: /* C9ED0 801337D0 3C03FD48 */ lui $v1, 0xfd48 /* C9ED4 801337D4 3463000F */ ori $v1, $v1, 0xf @@ -705,7 +705,7 @@ glabel render_item_entities .L801338F0: /* C9FF0 801338F0 2AC20100 */ slti $v0, $s6, 0x100 /* C9FF4 801338F4 1440FD6C */ bnez $v0, .L80132EA8 -/* C9FF8 801338F8 00000000 */ nop +/* C9FF8 801338F8 00000000 */ nop /* C9FFC 801338FC 8FBF0144 */ lw $ra, 0x144($sp) /* CA000 80133900 8FBE0140 */ lw $fp, 0x140($sp) /* CA004 80133904 8FB7013C */ lw $s7, 0x13c($sp) diff --git a/asm/nonmatchings/code_B9D60/render_messages.s b/asm/nonmatchings/code_B9D60/render_messages.s index b844b06d3a..f382f19add 100644 --- a/asm/nonmatchings/code_B9D60/render_messages.s +++ b/asm/nonmatchings/code_B9D60/render_messages.s @@ -6,13 +6,13 @@ glabel render_messages /* BA908 80124208 AFB10024 */ sw $s1, 0x24($sp) /* BA90C 8012420C 0000882D */ daddu $s1, $zero, $zero /* BA910 80124210 AFB00020 */ sw $s0, 0x20($sp) -/* BA914 80124214 3C10800A */ lui $s0, %hi(D_8009A66C) -/* BA918 80124218 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* BA914 80124214 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* BA918 80124218 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* BA91C 8012421C 3C058015 */ lui $a1, %hi(D_80154C30) /* BA920 80124220 24A54C30 */ addiu $a1, $a1, %lo(D_80154C30) /* BA924 80124224 44803000 */ mtc1 $zero, $f6 -/* BA928 80124228 3C028007 */ lui $v0, %hi(D_800741F4) -/* BA92C 8012422C 8C4241F4 */ lw $v0, %lo(D_800741F4)($v0) +/* BA928 80124228 3C028007 */ lui $v0, %hi(gCurrentDisplayContextIndex) +/* BA92C 8012422C 8C4241F4 */ lw $v0, %lo(gCurrentDisplayContextIndex)($v0) /* BA930 80124230 3C038015 */ lui $v1, %hi(D_80155CA0) /* BA934 80124234 24635CA0 */ addiu $v1, $v1, %lo(D_80155CA0) /* BA938 80124238 AFBF002C */ sw $ra, 0x2c($sp) @@ -143,7 +143,7 @@ glabel render_messages /* BAB0C 8012440C 26310001 */ addiu $s1, $s1, 1 /* BAB10 80124410 2A220003 */ slti $v0, $s1, 3 /* BAB14 80124414 1440FFD4 */ bnez $v0, .L80124368 -/* BAB18 80124418 00000000 */ nop +/* BAB18 80124418 00000000 */ nop /* BAB1C 8012441C 8FBF002C */ lw $ra, 0x2c($sp) /* BAB20 80124420 8FB20028 */ lw $s2, 0x28($sp) /* BAB24 80124424 8FB10024 */ lw $s1, 0x24($sp) diff --git a/asm/nonmatchings/code_E20110/func_802B71E8_E202F8.s b/asm/nonmatchings/code_E20110/func_802B71E8_E202F8.s index a847debe49..834837d4ff 100644 --- a/asm/nonmatchings/code_E20110/func_802B71E8_E202F8.s +++ b/asm/nonmatchings/code_E20110/func_802B71E8_E202F8.s @@ -63,10 +63,10 @@ glabel func_802B71E8_E202F8 /* E203E0 802B72D0 0C019D80 */ jal guMtxCatF /* E203E4 802B72D4 0220302D */ daddu $a2, $s1, $zero /* E203E8 802B72D8 0220202D */ daddu $a0, $s1, $zero -/* E203EC 802B72DC 3C108007 */ lui $s0, %hi(D_800741F0) -/* E203F0 802B72E0 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* E203F4 802B72E4 3C13800A */ lui $s3, %hi(D_8009A674) -/* E203F8 802B72E8 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* E203EC 802B72DC 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* E203F0 802B72E0 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* E203F4 802B72E4 3C13800A */ lui $s3, %hi(gDisplayContext) +/* E203F8 802B72E8 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* E203FC 802B72EC 96050000 */ lhu $a1, ($s0) /* E20400 802B72F0 8E620000 */ lw $v0, ($s3) /* E20404 802B72F4 00052980 */ sll $a1, $a1, 6 @@ -78,8 +78,8 @@ glabel func_802B71E8_E202F8 /* E2041C 802B730C 0000202D */ daddu $a0, $zero, $zero /* E20420 802B7310 0080282D */ daddu $a1, $a0, $zero /* E20424 802B7314 0080302D */ daddu $a2, $a0, $zero -/* E20428 802B7318 3C12800A */ lui $s2, %hi(D_8009A66C) -/* E2042C 802B731C 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* E20428 802B7318 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* E2042C 802B731C 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* E20430 802B7320 0080382D */ daddu $a3, $a0, $zero /* E20434 802B7324 8E480000 */ lw $t0, ($s2) /* E20438 802B7328 96020000 */ lhu $v0, ($s0) diff --git a/asm/nonmatchings/code_E225B0/func_802B7000_E225B0.s b/asm/nonmatchings/code_E225B0/func_802B7000_E225B0.s index 60691104cf..f83dcf18e2 100644 --- a/asm/nonmatchings/code_E225B0/func_802B7000_E225B0.s +++ b/asm/nonmatchings/code_E225B0/func_802B7000_E225B0.s @@ -58,10 +58,10 @@ glabel func_802B7000_E225B0 /* E22684 802B70D4 0C019D80 */ jal guMtxCatF /* E22688 802B70D8 0200302D */ daddu $a2, $s0, $zero /* E2268C 802B70DC 0200202D */ daddu $a0, $s0, $zero -/* E22690 802B70E0 3C108007 */ lui $s0, %hi(D_800741F0) -/* E22694 802B70E4 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* E22698 802B70E8 3C11800A */ lui $s1, %hi(D_8009A674) -/* E2269C 802B70EC 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* E22690 802B70E0 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* E22694 802B70E4 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* E22698 802B70E8 3C11800A */ lui $s1, %hi(gDisplayContext) +/* E2269C 802B70EC 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* E226A0 802B70F0 96050000 */ lhu $a1, ($s0) /* E226A4 802B70F4 8E220000 */ lw $v0, ($s1) /* E226A8 802B70F8 00052980 */ sll $a1, $a1, 6 @@ -69,8 +69,8 @@ glabel func_802B7000_E225B0 /* E226B0 802B7100 0C019D40 */ jal guMtxF2L /* E226B4 802B7104 00452821 */ addu $a1, $v0, $a1 /* E226B8 802B7108 3C03DA38 */ lui $v1, 0xda38 -/* E226BC 802B710C 3C05800A */ lui $a1, %hi(D_8009A66C) -/* E226C0 802B7110 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* E226BC 802B710C 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* E226C0 802B7110 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* E226C4 802B7114 34630002 */ ori $v1, $v1, 2 /* E226C8 802B7118 8CA40000 */ lw $a0, ($a1) /* E226CC 802B711C 96020000 */ lhu $v0, ($s0) @@ -121,7 +121,7 @@ glabel func_802B7000_E225B0 /* E2277C 802B71CC 00220821 */ addu $at, $at, $v0 /* E22780 802B71D0 8C227C80 */ lw $v0, %lo(D_802B7C80)($at) /* E22784 802B71D4 00400008 */ jr $v0 -/* E22788 802B71D8 00000000 */ nop +/* E22788 802B71D8 00000000 */ nop /* E2278C 802B71DC 3C02802B */ lui $v0, %hi(D_802B7BA0) /* E22790 802B71E0 24427BA0 */ addiu $v0, $v0, %lo(D_802B7BA0) /* E22794 802B71E4 080ADC82 */ j .L802B7208 @@ -163,8 +163,8 @@ glabel func_802B7000_E225B0 /* E22820 802B7270 0C04EBDC */ jal func_8013AF70 /* E22824 802B7274 A3B000B0 */ sb $s0, 0xb0($sp) /* E22828 802B7278 3C05D838 */ lui $a1, 0xd838 -/* E2282C 802B727C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* E22830 802B7280 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* E2282C 802B727C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* E22830 802B7280 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* E22834 802B7284 8C620000 */ lw $v0, ($v1) /* E22838 802B7288 34A50002 */ ori $a1, $a1, 2 /* E2283C 802B728C 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_F5750/func_802D2D30.s b/asm/nonmatchings/code_F5750/func_802D2D30.s index 8d2b3be483..b67656a03d 100644 --- a/asm/nonmatchings/code_F5750/func_802D2D30.s +++ b/asm/nonmatchings/code_F5750/func_802D2D30.s @@ -6,8 +6,8 @@ glabel func_802D2D30 /* F76E4 802D2D34 0080602D */ daddu $t4, $a0, $zero /* F76E8 802D2D38 00A0682D */ daddu $t5, $a1, $zero /* F76EC 802D2D3C 00E0582D */ daddu $t3, $a3, $zero -/* F76F0 802D2D40 3C08800A */ lui $t0, %hi(D_8009A66C) -/* F76F4 802D2D44 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* F76F0 802D2D40 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* F76F4 802D2D44 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* F76F8 802D2D48 3C02E700 */ lui $v0, 0xe700 /* F76FC 802D2D4C AFB00000 */ sw $s0, ($sp) /* F7700 802D2D50 8D070000 */ lw $a3, ($t0) @@ -58,8 +58,8 @@ glabel func_802D2D30 /* F77AC 802D2DFC 3C0AFCFF */ lui $t2, 0xfcff /* F77B0 802D2E00 354AFFFF */ ori $t2, $t2, 0xffff /* F77B4 802D2E04 3C08FFFC */ lui $t0, 0xfffc -/* F77B8 802D2E08 3C06800A */ lui $a2, %hi(D_8009A66C) -/* F77BC 802D2E0C 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* F77B8 802D2E08 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* F77BC 802D2E0C 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* F77C0 802D2E10 3508F279 */ ori $t0, $t0, 0xf279 /* F77C4 802D2E14 3C02FA00 */ lui $v0, 0xfa00 /* F77C8 802D2E18 8CC50000 */ lw $a1, ($a2) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s b/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s index 07d5eba7b0..024a48b7a5 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s @@ -20,8 +20,8 @@ glabel appendGfx_model /* A97CC 801130CC 96D80000 */ lhu $t8, ($s6) /* A97D0 801130D0 92C200A8 */ lbu $v0, 0xa8($s6) /* A97D4 801130D4 8ECF0008 */ lw $t7, 8($s6) -/* A97D8 801130D8 3C10800A */ lui $s0, %hi(D_8009A66C) -/* A97DC 801130DC 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* A97D8 801130D8 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* A97DC 801130DC 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* A97E0 801130E0 10400010 */ beqz $v0, .L80113124 /* A97E4 801130E4 AFAF0028 */ sw $t7, 0x28($sp) /* A97E8 801130E8 92C300A8 */ lbu $v1, 0xa8($s6) @@ -51,7 +51,7 @@ glabel appendGfx_model /* A983C 8011313C 13C00004 */ beqz $fp, .L80113150 /* A9840 80113140 2FC20004 */ sltiu $v0, $fp, 4 /* A9844 80113144 10400002 */ beqz $v0, .L80113150 -/* A9848 80113148 00000000 */ nop +/* A9848 80113148 00000000 */ nop /* A984C 8011314C 24130002 */ addiu $s3, $zero, 2 .L80113150: /* A9850 80113150 16400005 */ bnez $s2, .L80113168 @@ -59,7 +59,7 @@ glabel appendGfx_model /* A9858 80113158 00021603 */ sra $v0, $v0, 0x18 /* A985C 8011315C 28420011 */ slti $v0, $v0, 0x11 /* A9860 80113160 1040000B */ beqz $v0, .L80113190 -/* A9864 80113164 00000000 */ nop +/* A9864 80113164 00000000 */ nop .L80113168: /* A9868 80113168 3C028015 */ lui $v0, %hi(D_80153264) /* A986C 8011316C 8C423264 */ lw $v0, %lo(D_80153264)($v0) @@ -67,7 +67,7 @@ glabel appendGfx_model /* A9874 80113174 10400006 */ beqz $v0, .L80113190 /* A9878 80113178 33020040 */ andi $v0, $t8, 0x40 /* A987C 8011317C 14400004 */ bnez $v0, .L80113190 -/* A9880 80113180 00000000 */ nop +/* A9880 80113180 00000000 */ nop /* A9884 80113184 24130003 */ addiu $s3, $zero, 3 /* A9888 80113188 24150001 */ addiu $s5, $zero, 1 /* A988C 8011318C AFB50044 */ sw $s5, 0x44($sp) @@ -82,13 +82,13 @@ glabel appendGfx_model /* A98AC 801131AC 50620008 */ beql $v1, $v0, .L801131D0 /* A98B0 801131B0 26730003 */ addiu $s3, $s3, 3 /* A98B4 801131B4 08044CF5 */ j .L801133D4 -/* A98B8 801131B8 00000000 */ nop +/* A98B8 801131B8 00000000 */ nop .L801131BC: /* A98BC 801131BC 24020003 */ addiu $v0, $zero, 3 /* A98C0 801131C0 5062005C */ beql $v1, $v0, .L80113334 /* A98C4 801131C4 24130002 */ addiu $s3, $zero, 2 /* A98C8 801131C8 08044CF5 */ j .L801133D4 -/* A98CC 801131CC 00000000 */ nop +/* A98CC 801131CC 00000000 */ nop .L801131D0: /* A98D0 801131D0 24190002 */ addiu $t9, $zero, 2 /* A98D4 801131D4 08044CF5 */ j .L801133D4 @@ -113,7 +113,7 @@ glabel appendGfx_model /* A9918 80113218 14610004 */ bne $v1, $at, .L8011322C /* A991C 8011321C 3C018000 */ lui $at, 0x8000 /* A9920 80113220 14E10002 */ bne $a3, $at, .L8011322C -/* A9924 80113224 00000000 */ nop +/* A9924 80113224 00000000 */ nop /* A9928 80113228 0006000D */ break 6 .L8011322C: /* A992C 8011322C 00003812 */ mflo $a3 @@ -131,7 +131,7 @@ glabel appendGfx_model /* A9958 80113258 14610004 */ bne $v1, $at, .L8011326C /* A995C 8011325C 3C018000 */ lui $at, 0x8000 /* A9960 80113260 14A10002 */ bne $a1, $at, .L8011326C -/* A9964 80113264 00000000 */ nop +/* A9964 80113264 00000000 */ nop /* A9968 80113268 0006000D */ break 6 .L8011326C: /* A996C 8011326C 00002812 */ mflo $a1 @@ -237,7 +237,7 @@ glabel appendGfx_model /* A9AF4 801133F4 AE020000 */ sw $v0, ($s0) /* A9AF8 801133F8 8C6E0004 */ lw $t6, 4($v1) /* A9AFC 801133FC 11C00172 */ beqz $t6, .L801139C8 -/* A9B00 80113400 00000000 */ nop +/* A9B00 80113400 00000000 */ nop /* A9B04 80113404 8C630008 */ lw $v1, 8($v1) /* A9B08 80113408 2C620008 */ sltiu $v0, $v1, 8 /* A9B0C 8011340C 1040016E */ beqz $v0, .L801139C8 @@ -246,7 +246,7 @@ glabel appendGfx_model /* A9B18 80113418 00220821 */ addu $at, $at, $v0 /* A9B1C 8011341C 8C22F990 */ lw $v0, %lo(D_8014F990)($at) /* A9B20 80113420 00400008 */ jr $v0 -/* A9B24 80113424 00000000 */ nop +/* A9B24 80113424 00000000 */ nop /* A9B28 80113428 3C06DC08 */ lui $a2, 0xdc08 /* A9B2C 8011342C 34C6060A */ ori $a2, $a2, 0x60a /* A9B30 80113430 3C07DC08 */ lui $a3, 0xdc08 @@ -645,7 +645,7 @@ glabel appendGfx_model /* AA14C 80113A4C 0200282D */ daddu $a1, $s0, $zero /* AA150 80113A50 8FB80040 */ lw $t8, 0x40($sp) /* AA154 80113A54 08044EBF */ j .L80113AFC -/* AA158 80113A58 00000000 */ nop +/* AA158 80113A58 00000000 */ nop .L80113A5C: /* AA15C 80113A5C 8E030000 */ lw $v1, ($s0) /* AA160 80113A60 3C02DE00 */ lui $v0, 0xde00 @@ -764,7 +764,7 @@ glabel appendGfx_model /* AA304 80113C04 00220821 */ addu $at, $at, $v0 /* AA308 80113C08 8C22F9B0 */ lw $v0, %lo(D_8014F9B0)($at) /* AA30C 80113C0C 00400008 */ jr $v0 -/* AA310 80113C10 00000000 */ nop +/* AA310 80113C10 00000000 */ nop /* AA314 80113C14 2682FFFF */ addiu $v0, $s4, -1 /* AA318 80113C18 00021600 */ sll $v0, $v0, 0x18 /* AA31C 80113C1C 00021E03 */ sra $v1, $v0, 0x18 @@ -775,7 +775,7 @@ glabel appendGfx_model /* AA330 80113C30 00220821 */ addu $at, $at, $v0 /* AA334 80113C34 8C22F9E0 */ lw $v0, %lo(D_8014F9E0)($at) /* AA338 80113C38 00400008 */ jr $v0 -/* AA33C 80113C3C 00000000 */ nop +/* AA33C 80113C3C 00000000 */ nop /* AA340 80113C40 08045199 */ j .L80114664 /* AA344 80113C44 24050001 */ addiu $a1, $zero, 1 /* AA348 80113C48 08045199 */ j .L80114664 @@ -825,7 +825,7 @@ glabel appendGfx_model /* AA3F4 80113CF4 00220821 */ addu $at, $at, $v0 /* AA3F8 80113CF8 8C22FAA0 */ lw $v0, %lo(D_8014FAA0)($at) /* AA3FC 80113CFC 00400008 */ jr $v0 -/* AA400 80113D00 00000000 */ nop +/* AA400 80113D00 00000000 */ nop /* AA404 80113D04 08045199 */ j .L80114664 /* AA408 80113D08 24050011 */ addiu $a1, $zero, 0x11 /* AA40C 80113D0C 08045199 */ j .L80114664 @@ -873,7 +873,7 @@ glabel appendGfx_model /* AA4B0 80113DB0 00220821 */ addu $at, $at, $v0 /* AA4B4 80113DB4 8C22FB60 */ lw $v0, %lo(D_8014FB60)($at) /* AA4B8 80113DB8 00400008 */ jr $v0 -/* AA4BC 80113DBC 00000000 */ nop +/* AA4BC 80113DBC 00000000 */ nop /* AA4C0 80113DC0 08044F93 */ j .L80113E4C /* AA4C4 80113DC4 24050020 */ addiu $a1, $zero, 0x20 /* AA4C8 80113DC8 08044F93 */ j .L80113E4C @@ -959,7 +959,7 @@ glabel appendGfx_model /* AA5FC 80113EFC 14610004 */ bne $v1, $at, .L80113F10 /* AA600 80113F00 3C018000 */ lui $at, 0x8000 /* AA604 80113F04 14C10002 */ bne $a2, $at, .L80113F10 -/* AA608 80113F08 00000000 */ nop +/* AA608 80113F08 00000000 */ nop /* AA60C 80113F0C 0006000D */ break 6 .L80113F10: /* AA610 80113F10 00003012 */ mflo $a2 @@ -974,7 +974,7 @@ glabel appendGfx_model /* AA630 80113F30 14610004 */ bne $v1, $at, .L80113F44 /* AA634 80113F34 3C018000 */ lui $at, 0x8000 /* AA638 80113F38 14410002 */ bne $v0, $at, .L80113F44 -/* AA63C 80113F3C 00000000 */ nop +/* AA63C 80113F3C 00000000 */ nop /* AA640 80113F40 0006000D */ break 6 .L80113F44: /* AA644 80113F44 00001012 */ mflo $v0 @@ -1008,156 +1008,156 @@ glabel appendGfx_model /* AA6B4 80113FB4 00220821 */ addu $at, $at, $v0 /* AA6B8 80113FB8 8C22FC20 */ lw $v0, %lo(D_8014FC20)($at) /* AA6BC 80113FBC 00400008 */ jr $v0 -/* AA6C0 80113FC0 00000000 */ nop +/* AA6C0 80113FC0 00000000 */ nop /* AA6C4 80113FC4 3C06E200 */ lui $a2, 0xe200 /* AA6C8 80113FC8 34C6001C */ ori $a2, $a2, 0x1c /* AA6CC 80113FCC 3C058411 */ lui $a1, 0x8411 -/* AA6D0 80113FD0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AA6D4 80113FD4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AA6D0 80113FD0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AA6D4 80113FD4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AA6D8 80113FD8 8C820000 */ lw $v0, ($a0) /* AA6DC 80113FDC 08045088 */ j .L80114220 /* AA6E0 80113FE0 34A52078 */ ori $a1, $a1, 0x2078 /* AA6E4 80113FE4 3C06E200 */ lui $a2, 0xe200 /* AA6E8 80113FE8 34C6001C */ ori $a2, $a2, 0x1c /* AA6EC 80113FEC 3C058411 */ lui $a1, 0x8411 -/* AA6F0 80113FF0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AA6F4 80113FF4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AA6F0 80113FF0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AA6F4 80113FF4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AA6F8 80113FF8 8C820000 */ lw $v0, ($a0) /* AA6FC 80113FFC 08045088 */ j .L80114220 /* AA700 80114000 34A52230 */ ori $a1, $a1, 0x2230 /* AA704 80114004 3C06E200 */ lui $a2, 0xe200 /* AA708 80114008 34C6001C */ ori $a2, $a2, 0x1c /* AA70C 8011400C 3C058411 */ lui $a1, 0x8411 -/* AA710 80114010 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AA714 80114014 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AA710 80114010 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AA714 80114014 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AA718 80114018 8C820000 */ lw $v0, ($a0) /* AA71C 8011401C 08045088 */ j .L80114220 /* AA720 80114020 34A52D58 */ ori $a1, $a1, 0x2d58 /* AA724 80114024 3C06E200 */ lui $a2, 0xe200 /* AA728 80114028 34C6001C */ ori $a2, $a2, 0x1c /* AA72C 8011402C 3C058411 */ lui $a1, 0x8411 -/* AA730 80114030 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AA734 80114034 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AA730 80114030 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AA734 80114034 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AA738 80114038 8C820000 */ lw $v0, ($a0) /* AA73C 8011403C 08045088 */ j .L80114220 /* AA740 80114040 34A52E10 */ ori $a1, $a1, 0x2e10 /* AA744 80114044 3C06E200 */ lui $a2, 0xe200 /* AA748 80114048 34C6001C */ ori $a2, $a2, 0x1c /* AA74C 8011404C 3C058411 */ lui $a1, 0x8411 -/* AA750 80114050 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AA754 80114054 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AA750 80114050 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AA754 80114054 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AA758 80114058 8C820000 */ lw $v0, ($a0) /* AA75C 8011405C 08045088 */ j .L80114220 /* AA760 80114060 34A52478 */ ori $a1, $a1, 0x2478 /* AA764 80114064 3C06E200 */ lui $a2, 0xe200 /* AA768 80114068 34C6001C */ ori $a2, $a2, 0x1c /* AA76C 8011406C 3C058411 */ lui $a1, 0x8411 -/* AA770 80114070 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AA774 80114074 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AA770 80114070 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AA774 80114074 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AA778 80114078 8C820000 */ lw $v0, ($a0) /* AA77C 8011407C 08045088 */ j .L80114220 /* AA780 80114080 34A53078 */ ori $a1, $a1, 0x3078 /* AA784 80114084 3C06E200 */ lui $a2, 0xe200 /* AA788 80114088 34C6001C */ ori $a2, $a2, 0x1c /* AA78C 8011408C 3C058411 */ lui $a1, 0x8411 -/* AA790 80114090 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AA794 80114094 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AA790 80114090 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AA794 80114094 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AA798 80114098 8C820000 */ lw $v0, ($a0) /* AA79C 8011409C 08045088 */ j .L80114220 /* AA7A0 801140A0 34A53078 */ ori $a1, $a1, 0x3078 /* AA7A4 801140A4 3C06E200 */ lui $a2, 0xe200 /* AA7A8 801140A8 34C6001C */ ori $a2, $a2, 0x1c /* AA7AC 801140AC 3C058410 */ lui $a1, 0x8410 -/* AA7B0 801140B0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AA7B4 801140B4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AA7B0 801140B0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AA7B4 801140B4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AA7B8 801140B8 8C820000 */ lw $v0, ($a0) /* AA7BC 801140BC 08045088 */ j .L80114220 /* AA7C0 801140C0 34A549D8 */ ori $a1, $a1, 0x49d8 /* AA7C4 801140C4 3C06E200 */ lui $a2, 0xe200 /* AA7C8 801140C8 34C6001C */ ori $a2, $a2, 0x1c /* AA7CC 801140CC 3C058410 */ lui $a1, 0x8410 -/* AA7D0 801140D0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AA7D4 801140D4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AA7D0 801140D0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AA7D4 801140D4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AA7D8 801140D8 8C820000 */ lw $v0, ($a0) /* AA7DC 801140DC 08045088 */ j .L80114220 /* AA7E0 801140E0 34A549D8 */ ori $a1, $a1, 0x49d8 /* AA7E4 801140E4 3C06E200 */ lui $a2, 0xe200 /* AA7E8 801140E8 34C6001C */ ori $a2, $a2, 0x1c /* AA7EC 801140EC 3C058410 */ lui $a1, 0x8410 -/* AA7F0 801140F0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AA7F4 801140F4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AA7F0 801140F0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AA7F4 801140F4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AA7F8 801140F8 8C820000 */ lw $v0, ($a0) /* AA7FC 801140FC 08045088 */ j .L80114220 /* AA800 80114100 34A549D8 */ ori $a1, $a1, 0x49d8 /* AA804 80114104 3C06E200 */ lui $a2, 0xe200 /* AA808 80114108 34C6001C */ ori $a2, $a2, 0x1c /* AA80C 8011410C 3C058410 */ lui $a1, 0x8410 -/* AA810 80114110 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AA814 80114114 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AA810 80114110 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AA814 80114114 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AA818 80114118 8C820000 */ lw $v0, ($a0) /* AA81C 8011411C 08045088 */ j .L80114220 /* AA820 80114120 34A54A50 */ ori $a1, $a1, 0x4a50 /* AA824 80114124 3C06E200 */ lui $a2, 0xe200 /* AA828 80114128 34C6001C */ ori $a2, $a2, 0x1c /* AA82C 8011412C 3C058410 */ lui $a1, 0x8410 -/* AA830 80114130 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AA834 80114134 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AA830 80114130 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AA834 80114134 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AA838 80114138 8C820000 */ lw $v0, ($a0) /* AA83C 8011413C 08045088 */ j .L80114220 /* AA840 80114140 34A54DD8 */ ori $a1, $a1, 0x4dd8 /* AA844 80114144 3C06E200 */ lui $a2, 0xe200 /* AA848 80114148 34C6001C */ ori $a2, $a2, 0x1c /* AA84C 8011414C 3C058410 */ lui $a1, 0x8410 -/* AA850 80114150 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AA854 80114154 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AA850 80114150 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AA854 80114154 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AA858 80114158 8C820000 */ lw $v0, ($a0) /* AA85C 8011415C 08045088 */ j .L80114220 /* AA860 80114160 34A54DD8 */ ori $a1, $a1, 0x4dd8 /* AA864 80114164 3C06E200 */ lui $a2, 0xe200 /* AA868 80114168 34C6001C */ ori $a2, $a2, 0x1c /* AA86C 8011416C 3C058410 */ lui $a1, 0x8410 -/* AA870 80114170 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AA874 80114174 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AA870 80114170 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AA874 80114174 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AA878 80114178 8C820000 */ lw $v0, ($a0) /* AA87C 8011417C 08045088 */ j .L80114220 /* AA880 80114180 34A545D8 */ ori $a1, $a1, 0x45d8 /* AA884 80114184 3C06E200 */ lui $a2, 0xe200 /* AA888 80114188 34C6001C */ ori $a2, $a2, 0x1c /* AA88C 8011418C 3C058411 */ lui $a1, 0x8411 -/* AA890 80114190 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AA894 80114194 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AA890 80114190 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AA894 80114194 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AA898 80114198 8C820000 */ lw $v0, ($a0) /* AA89C 8011419C 08045088 */ j .L80114220 /* AA8A0 801141A0 34A52048 */ ori $a1, $a1, 0x2048 /* AA8A4 801141A4 3C06E200 */ lui $a2, 0xe200 /* AA8A8 801141A8 34C6001C */ ori $a2, $a2, 0x1c /* AA8AC 801141AC 3C058411 */ lui $a1, 0x8411 -/* AA8B0 801141B0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AA8B4 801141B4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AA8B0 801141B0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AA8B4 801141B4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AA8B8 801141B8 8C820000 */ lw $v0, ($a0) /* AA8BC 801141BC 08045088 */ j .L80114220 /* AA8C0 801141C0 34A53048 */ ori $a1, $a1, 0x3048 /* AA8C4 801141C4 3C06E200 */ lui $a2, 0xe200 /* AA8C8 801141C8 34C6001C */ ori $a2, $a2, 0x1c /* AA8CC 801141CC 3C058410 */ lui $a1, 0x8410 -/* AA8D0 801141D0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AA8D4 801141D4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AA8D0 801141D0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AA8D4 801141D4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AA8D8 801141D8 8C820000 */ lw $v0, ($a0) /* AA8DC 801141DC 08045088 */ j .L80114220 /* AA8E0 801141E0 34A541C8 */ ori $a1, $a1, 0x41c8 /* AA8E4 801141E4 3C06E200 */ lui $a2, 0xe200 /* AA8E8 801141E8 34C6001C */ ori $a2, $a2, 0x1c /* AA8EC 801141EC 3C058410 */ lui $a1, 0x8410 -/* AA8F0 801141F0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AA8F4 801141F4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AA8F0 801141F0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AA8F4 801141F4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AA8F8 801141F8 8C820000 */ lw $v0, ($a0) /* AA8FC 801141FC 08045088 */ j .L80114220 /* AA900 80114200 34A54B50 */ ori $a1, $a1, 0x4b50 /* AA904 80114204 3C06E200 */ lui $a2, 0xe200 /* AA908 80114208 34C6001C */ ori $a2, $a2, 0x1c /* AA90C 8011420C 3C058410 */ lui $a1, 0x8410 -/* AA910 80114210 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AA914 80114214 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AA910 80114210 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AA914 80114214 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AA918 80114218 8C820000 */ lw $v0, ($a0) /* AA91C 8011421C 34A54340 */ ori $a1, $a1, 0x4340 .L80114220: @@ -1225,7 +1225,7 @@ glabel appendGfx_model /* AAA10 80114310 00220821 */ addu $at, $at, $v0 /* AAA14 80114314 8C22FCE0 */ lw $v0, %lo(D_8014FCE0)($at) /* AAA18 80114318 00400008 */ jr $v0 -/* AAA1C 8011431C 00000000 */ nop +/* AAA1C 8011431C 00000000 */ nop /* AAA20 80114320 080450EB */ j .L801143AC /* AAA24 80114324 24050020 */ addiu $a1, $zero, 0x20 /* AAA28 80114328 080450EB */ j .L801143AC @@ -1321,7 +1321,7 @@ glabel appendGfx_model /* AAB84 80114484 14610004 */ bne $v1, $at, .L80114498 /* AAB88 80114488 3C018000 */ lui $at, 0x8000 /* AAB8C 8011448C 15210002 */ bne $t1, $at, .L80114498 -/* AAB90 80114490 00000000 */ nop +/* AAB90 80114490 00000000 */ nop /* AAB94 80114494 0006000D */ break 6 .L80114498: /* AAB98 80114498 00004812 */ mflo $t1 @@ -1336,12 +1336,12 @@ glabel appendGfx_model /* AABB8 801144B8 14610004 */ bne $v1, $at, .L801144CC /* AABBC 801144BC 3C018000 */ lui $at, 0x8000 /* AABC0 801144C0 14C10002 */ bne $a2, $at, .L801144CC -/* AABC4 801144C4 00000000 */ nop +/* AABC4 801144C4 00000000 */ nop /* AABC8 801144C8 0006000D */ break 6 .L801144CC: /* AABCC 801144CC 00003012 */ mflo $a2 /* AABD0 801144D0 8D420004 */ lw $v0, 4($t2) -/* AABD4 801144D4 00000000 */ nop +/* AABD4 801144D4 00000000 */ nop /* AABD8 801144D8 00470018 */ mult $v0, $a3 /* AABDC 801144DC 00001812 */ mflo $v1 /* AABE0 801144E0 3C028015 */ lui $v0, %hi(D_8014B74D) @@ -1349,16 +1349,16 @@ glabel appendGfx_model /* AABE8 801144E8 00450018 */ mult $v0, $a1 /* AABEC 801144EC 00004012 */ mflo $t0 /* AABF0 801144F0 00684021 */ addu $t0, $v1, $t0 -/* AABF4 801144F4 00000000 */ nop +/* AABF4 801144F4 00000000 */ nop /* AABF8 801144F8 010C0018 */ mult $t0, $t4 /* AABFC 801144FC 256B0008 */ addiu $t3, $t3, 8 /* AAC00 80114500 AE0B0000 */ sw $t3, ($s0) /* AAC04 80114504 0000A010 */ mfhi $s4 /* AAC08 80114508 8D430008 */ lw $v1, 8($t2) -/* AAC0C 8011450C 00000000 */ nop +/* AAC0C 8011450C 00000000 */ nop /* AAC10 80114510 00670018 */ mult $v1, $a3 -/* AAC14 80114514 3C04800A */ lui $a0, %hi(D_8009A66C) -/* AAC18 80114518 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* AAC14 80114514 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* AAC18 80114518 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AAC1C 8011451C 00008812 */ mflo $s1 /* AAC20 80114520 3C038015 */ lui $v1, %hi(D_8014B74E) /* AAC24 80114524 9063B74E */ lbu $v1, %lo(D_8014B74E)($v1) @@ -1369,7 +1369,7 @@ glabel appendGfx_model /* AAC38 80114538 AC820000 */ sw $v0, ($a0) /* AAC3C 8011453C 00009812 */ mflo $s3 /* AAC40 80114540 8D43000C */ lw $v1, 0xc($t2) -/* AAC44 80114544 00000000 */ nop +/* AAC44 80114544 00000000 */ nop /* AAC48 80114548 00670018 */ mult $v1, $a3 /* AAC4C 8011454C 8E020000 */ lw $v0, ($s0) /* AAC50 80114550 3C04F800 */ lui $a0, 0xf800 @@ -1429,7 +1429,7 @@ glabel appendGfx_model /* AAD28 80114628 00220821 */ addu $at, $at, $v0 /* AAD2C 8011462C 8C22FDA0 */ lw $v0, %lo(D_8014FDA0)($at) /* AAD30 80114630 00400008 */ jr $v0 -/* AAD34 80114634 00000000 */ nop +/* AAD34 80114634 00000000 */ nop /* AAD38 80114638 08045199 */ j .L80114664 /* AAD3C 8011463C 24050021 */ addiu $a1, $zero, 0x21 /* AAD40 80114640 08045199 */ j .L80114664 @@ -1499,7 +1499,7 @@ glabel appendGfx_model /* AAE28 80114728 33020010 */ andi $v0, $t8, 0x10 .L8011472C: /* AAE2C 8011472C 10400018 */ beqz $v0, .L80114790 -/* AAE30 80114730 00000000 */ nop +/* AAE30 80114730 00000000 */ nop /* AAE34 80114734 92C200A5 */ lbu $v0, 0xa5($s6) /* AAE38 80114738 3C038015 */ lui $v1, %hi(gCurrentModelSpecialDlsPtr) /* AAE3C 8011473C 246312E8 */ addiu $v1, $v1, %lo(gCurrentModelSpecialDlsPtr) @@ -1512,7 +1512,7 @@ glabel appendGfx_model /* AAE58 80114758 00C21021 */ addu $v0, $a2, $v0 /* AAE5C 8011475C 8C420000 */ lw $v0, ($v0) /* AAE60 80114760 1040000B */ beqz $v0, .L80114790 -/* AAE64 80114764 00000000 */ nop +/* AAE64 80114764 00000000 */ nop /* AAE68 80114768 8E040000 */ lw $a0, ($s0) /* AAE6C 8011476C 8C620000 */ lw $v0, ($v1) /* AAE70 80114770 3C03DE00 */ lui $v1, 0xde00 @@ -1724,7 +1724,7 @@ glabel appendGfx_model /* AB184 80114A84 33020010 */ andi $v0, $t8, 0x10 .L80114A88: /* AB188 80114A88 10400016 */ beqz $v0, .L80114AE4 -/* AB18C 80114A8C 00000000 */ nop +/* AB18C 80114A8C 00000000 */ nop /* AB190 80114A90 97B50036 */ lhu $s5, 0x36($sp) /* AB194 80114A94 3C078015 */ lui $a3, %hi(gCurrentModelSpecialDlsPtr) /* AB198 80114A98 24E712E8 */ addiu $a3, $a3, %lo(gCurrentModelSpecialDlsPtr) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FD98.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FD98.s index 04ad22db4f..e5aa6c6bdb 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FD98.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FD98.s @@ -13,8 +13,8 @@ glabel func_8010FD98 /* A64B8 8010FDB8 3C08FC12 */ lui $t0, 0xfc12 /* A64BC 8010FDBC 35081824 */ ori $t0, $t0, 0x1824 /* A64C0 8010FDC0 3C06FF33 */ lui $a2, 0xff33 -/* A64C4 8010FDC4 3C04800A */ lui $a0, %hi(D_8009A66C) -/* A64C8 8010FDC8 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* A64C4 8010FDC4 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* A64C8 8010FDC8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* A64CC 8010FDCC 8C820000 */ lw $v0, ($a0) /* A64D0 8010FDD0 34C6FFFF */ ori $a2, $a2, 0xffff /* A64D4 8010FDD4 0040182D */ daddu $v1, $v0, $zero @@ -30,8 +30,8 @@ glabel func_8010FD98 .L8010FDFC: /* A64FC 8010FDFC 34C6B3FF */ ori $a2, $a2, 0xb3ff /* A6500 8010FE00 3C05FF2C */ lui $a1, 0xff2c -/* A6504 8010FE04 3C04800A */ lui $a0, %hi(D_8009A66C) -/* A6508 8010FE08 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* A6504 8010FE04 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* A6508 8010FE08 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* A650C 8010FE0C 8C820000 */ lw $v0, ($a0) /* A6510 8010FE10 34A5FE7F */ ori $a1, $a1, 0xfe7f /* A6514 8010FE14 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FE68.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FE68.s index e3c4af78db..86fad9687c 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FE68.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FE68.s @@ -5,8 +5,8 @@ glabel func_8010FE68 /* A6568 8010FE68 3C07FCFF */ lui $a3, 0xfcff /* A656C 8010FE6C 34E7B3FF */ ori $a3, $a3, 0xb3ff /* A6570 8010FE70 3C06FF2F */ lui $a2, 0xff2f -/* A6574 8010FE74 3C05800A */ lui $a1, %hi(D_8009A66C) -/* A6578 8010FE78 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* A6574 8010FE74 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* A6578 8010FE78 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* A657C 8010FE7C 34C6FFFF */ ori $a2, $a2, 0xffff /* A6580 8010FE80 8CA20000 */ lw $v0, ($a1) /* A6584 8010FE84 308400FF */ andi $a0, $a0, 0xff diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80116698.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80116698.s index 6d3f2bd255..c8fbfeddec 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80116698.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80116698.s @@ -6,8 +6,8 @@ glabel func_80116698 /* ACD9C 8011669C AFB200C0 */ sw $s2, 0xc0($sp) /* ACDA0 801166A0 0000902D */ daddu $s2, $zero, $zero /* ACDA4 801166A4 AFB300C4 */ sw $s3, 0xc4($sp) -/* ACDA8 801166A8 3C138007 */ lui $s3, %hi(D_800741F0) -/* ACDAC 801166AC 267341F0 */ addiu $s3, $s3, %lo(D_800741F0) +/* ACDA8 801166A8 3C138007 */ lui $s3, %hi(gMatrixListPos) +/* ACDAC 801166AC 267341F0 */ addiu $s3, $s3, %lo(gMatrixListPos) /* ACDB0 801166B0 AFB400C8 */ sw $s4, 0xc8($sp) /* ACDB4 801166B4 3C140001 */ lui $s4, 1 /* ACDB8 801166B8 F7B400D8 */ sdc1 $f20, 0xd8($sp) @@ -41,7 +41,7 @@ glabel func_80116698 /* ACE24 80116724 A20200A7 */ sb $v0, 0xa7($s0) /* ACE28 80116728 304200FF */ andi $v0, $v0, 0xff /* ACE2C 8011672C 1440000F */ bnez $v0, .L8011676C -/* ACE30 80116730 00000000 */ nop +/* ACE30 80116730 00000000 */ nop /* ACE34 80116734 8E020010 */ lw $v0, 0x10($s0) /* ACE38 80116738 26030018 */ addiu $v1, $s0, 0x18 /* ACE3C 8011673C 24440040 */ addiu $a0, $v0, 0x40 @@ -60,8 +60,8 @@ glabel func_80116698 .L8011676C: /* ACE6C 8011676C 96620000 */ lhu $v0, ($s3) /* ACE70 80116770 8E110010 */ lw $s1, 0x10($s0) -/* ACE74 80116774 3C04800A */ lui $a0, %hi(D_8009A674) -/* ACE78 80116778 8C84A674 */ lw $a0, %lo(D_8009A674)($a0) +/* ACE74 80116774 3C04800A */ lui $a0, %hi(gDisplayContext) +/* ACE78 80116778 8C84A674 */ lw $a0, %lo(gDisplayContext)($a0) /* ACE7C 8011677C 3043FFFF */ andi $v1, $v0, 0xffff /* ACE80 80116780 00031980 */ sll $v1, $v1, 6 /* ACE84 80116784 00741821 */ addu $v1, $v1, $s4 @@ -94,8 +94,8 @@ glabel func_80116698 /* ACEE4 801167E4 A20200A7 */ sb $v0, 0xa7($s0) /* ACEE8 801167E8 3062EFFF */ andi $v0, $v1, 0xefff /* ACEEC 801167EC 96640000 */ lhu $a0, ($s3) -/* ACEF0 801167F0 3C03800A */ lui $v1, %hi(D_8009A674) -/* ACEF4 801167F4 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* ACEF0 801167F0 3C03800A */ lui $v1, %hi(gDisplayContext) +/* ACEF4 801167F4 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* ACEF8 801167F8 8E050004 */ lw $a1, 4($s0) /* ACEFC 801167FC A6020000 */ sh $v0, ($s0) /* ACF00 80116800 3082FFFF */ andi $v0, $a0, 0xffff @@ -108,7 +108,7 @@ glabel func_80116698 /* ACF1C 8011681C 96020000 */ lhu $v0, ($s0) /* ACF20 80116820 30420008 */ andi $v0, $v0, 8 /* ACF24 80116824 10400003 */ beqz $v0, .L80116834 -/* ACF28 80116828 00000000 */ nop +/* ACF28 80116828 00000000 */ nop .L8011682C: /* ACF2C 8011682C 08045A14 */ j .L80116850 /* ACF30 80116830 26040058 */ addiu $a0, $s0, 0x58 @@ -133,17 +133,17 @@ glabel func_80116698 /* ACF74 80116874 C440002C */ lwc1 $f0, 0x2c($v0) /* ACF78 80116878 46003180 */ add.s $f6, $f6, $f0 /* ACF7C 8011687C 46143182 */ mul.s $f6, $f6, $f20 -/* ACF80 80116880 00000000 */ nop +/* ACF80 80116880 00000000 */ nop /* ACF84 80116884 C4440014 */ lwc1 $f4, 0x14($v0) /* ACF88 80116888 C4400038 */ lwc1 $f0, 0x38($v0) /* ACF8C 8011688C 46002100 */ add.s $f4, $f4, $f0 /* ACF90 80116890 46142102 */ mul.s $f4, $f4, $f20 -/* ACF94 80116894 00000000 */ nop +/* ACF94 80116894 00000000 */ nop /* ACF98 80116898 C4420020 */ lwc1 $f2, 0x20($v0) /* ACF9C 8011689C C4400044 */ lwc1 $f0, 0x44($v0) /* ACFA0 801168A0 46001080 */ add.s $f2, $f2, $f0 /* ACFA4 801168A4 46141082 */ mul.s $f2, $f2, $f20 -/* ACFA8 801168A8 00000000 */ nop +/* ACFA8 801168A8 00000000 */ nop /* ACFAC 801168AC 0220202D */ daddu $a0, $s1, $zero /* ACFB0 801168B0 44053000 */ mfc1 $a1, $f6 /* ACFB4 801168B4 44062000 */ mfc1 $a2, $f4 @@ -175,8 +175,8 @@ glabel func_80116698 /* AD014 80116914 1440FF70 */ bnez $v0, .L801166D8 /* AD018 80116918 3C150001 */ lui $s5, 1 /* AD01C 8011691C 0000902D */ daddu $s2, $zero, $zero -/* AD020 80116920 3C148007 */ lui $s4, %hi(D_800741F0) -/* AD024 80116924 269441F0 */ addiu $s4, $s4, %lo(D_800741F0) +/* AD020 80116920 3C148007 */ lui $s4, %hi(gMatrixListPos) +/* AD024 80116924 269441F0 */ addiu $s4, $s4, %lo(gMatrixListPos) /* AD028 80116928 36B51630 */ ori $s5, $s5, 0x1630 /* AD02C 8011692C 27B30060 */ addiu $s3, $sp, 0x60 /* AD030 80116930 3C013F00 */ lui $at, 0x3f00 @@ -204,7 +204,7 @@ glabel func_80116698 /* AD084 80116984 A202009F */ sb $v0, 0x9f($s0) /* AD088 80116988 304200FF */ andi $v0, $v0, 0xff /* AD08C 8011698C 1440000F */ bnez $v0, .L801169CC -/* AD090 80116990 00000000 */ nop +/* AD090 80116990 00000000 */ nop /* AD094 80116994 8E02000C */ lw $v0, 0xc($s0) /* AD098 80116998 26030010 */ addiu $v1, $s0, 0x10 /* AD09C 8011699C 24440040 */ addiu $a0, $v0, 0x40 @@ -223,8 +223,8 @@ glabel func_80116698 .L801169CC: /* AD0CC 801169CC 96820000 */ lhu $v0, ($s4) /* AD0D0 801169D0 8E11000C */ lw $s1, 0xc($s0) -/* AD0D4 801169D4 3C04800A */ lui $a0, %hi(D_8009A674) -/* AD0D8 801169D8 8C84A674 */ lw $a0, %lo(D_8009A674)($a0) +/* AD0D4 801169D4 3C04800A */ lui $a0, %hi(gDisplayContext) +/* AD0D8 801169D8 8C84A674 */ lw $a0, %lo(gDisplayContext)($a0) /* AD0DC 801169DC 3043FFFF */ andi $v1, $v0, 0xffff /* AD0E0 801169E0 00031980 */ sll $v1, $v1, 6 /* AD0E4 801169E4 00751821 */ addu $v1, $v1, $s5 @@ -257,8 +257,8 @@ glabel func_80116698 /* AD144 80116A44 A202009F */ sb $v0, 0x9f($s0) /* AD148 80116A48 3062EFFF */ andi $v0, $v1, 0xefff /* AD14C 80116A4C 96840000 */ lhu $a0, ($s4) -/* AD150 80116A50 3C03800A */ lui $v1, %hi(D_8009A674) -/* AD154 80116A54 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* AD150 80116A50 3C03800A */ lui $v1, %hi(gDisplayContext) +/* AD154 80116A54 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* AD158 80116A58 8E050004 */ lw $a1, 4($s0) /* AD15C 80116A5C A6020000 */ sh $v0, ($s0) /* AD160 80116A60 3082FFFF */ andi $v0, $a0, 0xffff @@ -291,17 +291,17 @@ glabel func_80116698 /* AD1C4 80116AC4 C440002C */ lwc1 $f0, 0x2c($v0) /* AD1C8 80116AC8 46003180 */ add.s $f6, $f6, $f0 /* AD1CC 80116ACC 46143182 */ mul.s $f6, $f6, $f20 -/* AD1D0 80116AD0 00000000 */ nop +/* AD1D0 80116AD0 00000000 */ nop /* AD1D4 80116AD4 C4440014 */ lwc1 $f4, 0x14($v0) /* AD1D8 80116AD8 C4400038 */ lwc1 $f0, 0x38($v0) /* AD1DC 80116ADC 46002100 */ add.s $f4, $f4, $f0 /* AD1E0 80116AE0 46142102 */ mul.s $f4, $f4, $f20 -/* AD1E4 80116AE4 00000000 */ nop +/* AD1E4 80116AE4 00000000 */ nop /* AD1E8 80116AE8 C4420020 */ lwc1 $f2, 0x20($v0) /* AD1EC 80116AEC C4400044 */ lwc1 $f0, 0x44($v0) /* AD1F0 80116AF0 46001080 */ add.s $f2, $f2, $f0 /* AD1F4 80116AF4 46141082 */ mul.s $f2, $f2, $f20 -/* AD1F8 80116AF8 00000000 */ nop +/* AD1F8 80116AF8 00000000 */ nop /* AD1FC 80116AFC 0220202D */ daddu $a0, $s1, $zero /* AD200 80116B00 44053000 */ mfc1 $a1, $f6 /* AD204 80116B04 44062000 */ mfc1 $a2, $f4 @@ -328,9 +328,9 @@ glabel func_80116698 .L80116B54: /* AD254 80116B54 2A420004 */ slti $v0, $s2, 4 /* AD258 80116B58 1440FF77 */ bnez $v0, .L80116938 -/* AD25C 80116B5C 00000000 */ nop +/* AD25C 80116B5C 00000000 */ nop /* AD260 80116B60 0C046F3B */ jal func_8011BCEC -/* AD264 80116B64 00000000 */ nop +/* AD264 80116B64 00000000 */ nop /* AD268 80116B68 8FBF00D0 */ lw $ra, 0xd0($sp) /* AD26C 80116B6C 8FB500CC */ lw $s5, 0xcc($sp) /* AD270 80116B70 8FB400C8 */ lw $s4, 0xc8($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80117E74.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80117E74.s index 3b46c00247..a92b136b83 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80117E74.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80117E74.s @@ -6,8 +6,8 @@ glabel func_80117E74 /* AE578 80117E78 AFB20018 */ sw $s2, 0x18($sp) /* AE57C 80117E7C 0080902D */ daddu $s2, $a0, $zero /* AE580 80117E80 AFB3001C */ sw $s3, 0x1c($sp) -/* AE584 80117E84 3C13800A */ lui $s3, %hi(D_8009A66C) -/* AE588 80117E88 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* AE584 80117E84 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* AE588 80117E88 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* AE58C 80117E8C AFBF0020 */ sw $ra, 0x20($sp) /* AE590 80117E90 AFB10014 */ sw $s1, 0x14($sp) /* AE594 80117E94 12400056 */ beqz $s2, .L80117FF0 @@ -19,10 +19,10 @@ glabel func_80117E74 /* AE5AC 80117EAC 0C0456C3 */ jal get_model_property /* AE5B0 80117EB0 24050060 */ addiu $a1, $zero, 0x60 /* AE5B4 80117EB4 10400011 */ beqz $v0, .L80117EFC -/* AE5B8 80117EB8 00000000 */ nop +/* AE5B8 80117EB8 00000000 */ nop /* AE5BC 80117EBC 8C420008 */ lw $v0, 8($v0) /* AE5C0 80117EC0 1040000E */ beqz $v0, .L80117EFC -/* AE5C4 80117EC4 00000000 */ nop +/* AE5C4 80117EC4 00000000 */ nop /* AE5C8 80117EC8 3C108015 */ lui $s0, %hi(D_8015336C) /* AE5CC 80117ECC 2610336C */ addiu $s0, $s0, %lo(D_8015336C) /* AE5D0 80117ED0 0C046B4C */ jal get_model_from_list_index @@ -31,20 +31,20 @@ glabel func_80117E74 /* AE5DC 80117EDC 94820000 */ lhu $v0, ($a0) /* AE5E0 80117EE0 30420002 */ andi $v0, $v0, 2 /* AE5E4 80117EE4 1440003F */ bnez $v0, .L80117FE4 -/* AE5E8 80117EE8 00000000 */ nop +/* AE5E8 80117EE8 00000000 */ nop /* AE5EC 80117EEC 0C045F25 */ jal appendGfx_model_group -/* AE5F0 80117EF0 00000000 */ nop +/* AE5F0 80117EF0 00000000 */ nop /* AE5F4 80117EF4 08045FF9 */ j .L80117FE4 -/* AE5F8 80117EF8 00000000 */ nop +/* AE5F8 80117EF8 00000000 */ nop .L80117EFC: /* AE5FC 80117EFC 8E430000 */ lw $v1, ($s2) /* AE600 80117F00 24020002 */ addiu $v0, $zero, 2 .L80117F04: /* AE604 80117F04 1062002C */ beq $v1, $v0, .L80117FB8 -/* AE608 80117F08 00000000 */ nop +/* AE608 80117F08 00000000 */ nop /* AE60C 80117F0C 8E420010 */ lw $v0, 0x10($s2) /* AE610 80117F10 10400037 */ beqz $v0, .L80117FF0 -/* AE614 80117F14 00000000 */ nop +/* AE614 80117F14 00000000 */ nop /* AE618 80117F18 8C420000 */ lw $v0, ($v0) /* AE61C 80117F1C 10400009 */ beqz $v0, .L80117F44 /* AE620 80117F20 3C02DA38 */ lui $v0, 0xda38 @@ -60,7 +60,7 @@ glabel func_80117E74 /* AE644 80117F44 8E420010 */ lw $v0, 0x10($s2) /* AE648 80117F48 8C51000C */ lw $s1, 0xc($v0) /* AE64C 80117F4C 1220000E */ beqz $s1, .L80117F88 -/* AE650 80117F50 00000000 */ nop +/* AE650 80117F50 00000000 */ nop /* AE654 80117F54 1A20000C */ blez $s1, .L80117F88 /* AE658 80117F58 0000802D */ daddu $s0, $zero, $zero .L80117F5C: @@ -73,7 +73,7 @@ glabel func_80117E74 /* AE674 80117F74 26100001 */ addiu $s0, $s0, 1 /* AE678 80117F78 0211102A */ slt $v0, $s0, $s1 /* AE67C 80117F7C 1440FFF7 */ bnez $v0, .L80117F5C -/* AE680 80117F80 00000000 */ nop +/* AE680 80117F80 00000000 */ nop /* AE684 80117F84 8E420010 */ lw $v0, 0x10($s2) .L80117F88: /* AE688 80117F88 8C420000 */ lw $v0, ($v0) @@ -97,9 +97,9 @@ glabel func_80117E74 /* AE6CC 80117FCC 94820000 */ lhu $v0, ($a0) /* AE6D0 80117FD0 30420002 */ andi $v0, $v0, 2 /* AE6D4 80117FD4 14400003 */ bnez $v0, .L80117FE4 -/* AE6D8 80117FD8 00000000 */ nop +/* AE6D8 80117FD8 00000000 */ nop /* AE6DC 80117FDC 0C044C24 */ jal appendGfx_model -/* AE6E0 80117FE0 00000000 */ nop +/* AE6E0 80117FE0 00000000 */ nop .L80117FE4: /* AE6E4 80117FE4 96020000 */ lhu $v0, ($s0) /* AE6E8 80117FE8 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011800C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011800C.s index 94212acfdb..994be5ea89 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011800C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011800C.s @@ -7,8 +7,8 @@ glabel func_8011800C /* AE714 80118014 AFB10014 */ sw $s1, 0x14($sp) /* AE718 80118018 00A0882D */ daddu $s1, $a1, $zero /* AE71C 8011801C AFB00010 */ sw $s0, 0x10($sp) -/* AE720 80118020 3C10800A */ lui $s0, %hi(D_8009A66C) -/* AE724 80118024 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* AE720 80118020 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* AE724 80118024 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* AE728 80118028 AFBF001C */ sw $ra, 0x1c($sp) /* AE72C 8011802C AFB20018 */ sw $s2, 0x18($sp) /* AE730 80118030 94A20000 */ lhu $v0, ($a1) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCEC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCEC.s index 240ff26b3e..0d7eaa8ed8 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCEC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCEC.s @@ -8,8 +8,8 @@ glabel func_8011BCEC /* B23F8 8011BCF8 AFB50024 */ sw $s5, 0x24($sp) /* B23FC 8011BCFC 3C158015 */ lui $s5, %hi(D_801512B8) /* B2400 8011BD00 26B512B8 */ addiu $s5, $s5, %lo(D_801512B8) -/* B2404 8011BD04 3C02800A */ lui $v0, %hi(D_8009A66C) -/* B2408 8011BD08 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* B2404 8011BD04 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* B2408 8011BD08 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* B240C 8011BD0C AFB20018 */ sw $s2, 0x18($sp) /* B2410 8011BD10 0040902D */ daddu $s2, $v0, $zero /* B2414 8011BD14 AFBF0028 */ sw $ra, 0x28($sp) @@ -66,8 +66,8 @@ glabel func_8011BCEC /* B24D4 8011BDD4 2A220010 */ slti $v0, $s1, 0x10 /* B24D8 8011BDD8 1440FFD9 */ bnez $v0, .L8011BD40 /* B24DC 8011BDDC 3C02DE01 */ lui $v0, 0xde01 -/* B24E0 8011BDE0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B24E4 8011BDE4 8C63A66C */ lw $v1, %lo(D_8009A66C)($v1) +/* B24E0 8011BDE0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B24E4 8011BDE4 8C63A66C */ lw $v1, %lo(gMasterGfxPos)($v1) /* B24E8 8011BDE8 AE620000 */ sw $v0, ($s3) /* B24EC 8011BDEC AE630004 */ sw $v1, 4($s3) /* B24F0 8011BDF0 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C80C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C80C.s index c6e9f71a43..dfd9cd6181 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C80C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C80C.s @@ -56,9 +56,9 @@ glabel func_8011C80C /* B2FD8 8011C8D8 27C400D4 */ addiu $a0, $fp, 0xd4 /* B2FDC 8011C8DC C7A00034 */ lwc1 $f0, 0x34($sp) /* B2FE0 8011C8E0 44809000 */ mtc1 $zero, $f18 -/* B2FE4 8011C8E4 00000000 */ nop +/* B2FE4 8011C8E4 00000000 */ nop /* B2FE8 8011C8E8 46120032 */ c.eq.s $f0, $f18 -/* B2FEC 8011C8EC 00000000 */ nop +/* B2FEC 8011C8EC 00000000 */ nop /* B2FF0 8011C8F0 45000004 */ bc1f .L8011C904 /* B2FF4 8011C8F4 24020001 */ addiu $v0, $zero, 1 /* B2FF8 8011C8F8 E6120000 */ swc1 $f18, ($s0) @@ -68,37 +68,37 @@ glabel func_8011C80C /* B3004 8011C904 C7AC0030 */ lwc1 $f12, 0x30($sp) /* B3008 8011C908 4600A383 */ div.s $f14, $f20, $f0 /* B300C 8011C90C 460E6302 */ mul.s $f12, $f12, $f14 -/* B3010 8011C910 00000000 */ nop +/* B3010 8011C910 00000000 */ nop /* B3014 8011C914 46146080 */ add.s $f2, $f12, $f20 /* B3018 8011C918 3C013FE0 */ lui $at, 0x3fe0 /* B301C 8011C91C 44814800 */ mtc1 $at, $f9 /* B3020 8011C920 44804000 */ mtc1 $zero, $f8 /* B3024 8011C924 460010A1 */ cvt.d.s $f2, $f2 /* B3028 8011C928 46281082 */ mul.d $f2, $f2, $f8 -/* B302C 8011C92C 00000000 */ nop +/* B302C 8011C92C 00000000 */ nop /* B3030 8011C930 C7B00028 */ lwc1 $f16, 0x28($sp) /* B3034 8011C934 460E8402 */ mul.s $f16, $f16, $f14 -/* B3038 8011C938 00000000 */ nop +/* B3038 8011C938 00000000 */ nop /* B303C 8011C93C 87C2000A */ lh $v0, 0xa($fp) /* B3040 8011C940 44820000 */ mtc1 $v0, $f0 -/* B3044 8011C944 00000000 */ nop +/* B3044 8011C944 00000000 */ nop /* B3048 8011C948 46800020 */ cvt.s.w $f0, $f0 /* B304C 8011C94C 46008102 */ mul.s $f4, $f16, $f0 -/* B3050 8011C950 00000000 */ nop +/* B3050 8011C950 00000000 */ nop /* B3054 8011C954 46002100 */ add.s $f4, $f4, $f0 /* B3058 8011C958 46002121 */ cvt.d.s $f4, $f4 /* B305C 8011C95C 46282102 */ mul.d $f4, $f4, $f8 -/* B3060 8011C960 00000000 */ nop +/* B3060 8011C960 00000000 */ nop /* B3064 8011C964 C7A6002C */ lwc1 $f6, 0x2c($sp) /* B3068 8011C968 46007007 */ neg.s $f0, $f14 /* B306C 8011C96C 46003182 */ mul.s $f6, $f6, $f0 -/* B3070 8011C970 00000000 */ nop +/* B3070 8011C970 00000000 */ nop /* B3074 8011C974 87C2000C */ lh $v0, 0xc($fp) /* B3078 8011C978 44825000 */ mtc1 $v0, $f10 -/* B307C 8011C97C 00000000 */ nop +/* B307C 8011C97C 00000000 */ nop /* B3080 8011C980 468052A0 */ cvt.s.w $f10, $f10 /* B3084 8011C984 460A3002 */ mul.s $f0, $f6, $f10 -/* B3088 8011C988 00000000 */ nop +/* B3088 8011C988 00000000 */ nop /* B308C 8011C98C E7AE0034 */ swc1 $f14, 0x34($sp) /* B3090 8011C990 E7B00028 */ swc1 $f16, 0x28($sp) /* B3094 8011C994 E7AC0030 */ swc1 $f12, 0x30($sp) @@ -107,18 +107,18 @@ glabel func_8011C80C /* B30A0 8011C9A0 462010A0 */ cvt.s.d $f2, $f2 /* B30A4 8011C9A4 46000021 */ cvt.d.s $f0, $f0 /* B30A8 8011C9A8 46280002 */ mul.d $f0, $f0, $f8 -/* B30AC 8011C9AC 00000000 */ nop +/* B30AC 8011C9AC 00000000 */ nop /* B30B0 8011C9B0 E7A20030 */ swc1 $f2, 0x30($sp) /* B30B4 8011C9B4 87C2000E */ lh $v0, 0xe($fp) /* B30B8 8011C9B8 44821000 */ mtc1 $v0, $f2 -/* B30BC 8011C9BC 00000000 */ nop +/* B30BC 8011C9BC 00000000 */ nop /* B30C0 8011C9C0 468010A0 */ cvt.s.w $f2, $f2 /* B30C4 8011C9C4 46202120 */ cvt.s.d $f4, $f4 /* B30C8 8011C9C8 E7A40028 */ swc1 $f4, 0x28($sp) /* B30CC 8011C9CC 87C20010 */ lh $v0, 0x10($fp) /* B30D0 8011C9D0 46022100 */ add.s $f4, $f4, $f2 /* B30D4 8011C9D4 44821000 */ mtc1 $v0, $f2 -/* B30D8 8011C9D8 00000000 */ nop +/* B30D8 8011C9D8 00000000 */ nop /* B30DC 8011C9DC 468010A0 */ cvt.s.w $f2, $f2 /* B30E0 8011C9E0 4600258D */ trunc.w.s $f22, $f4 /* B30E4 8011C9E4 4402B000 */ mfc1 $v0, $f22 @@ -127,24 +127,24 @@ glabel func_8011C80C /* B30F0 8011C9F0 46020080 */ add.s $f2, $f0, $f2 /* B30F4 8011C9F4 E7A0002C */ swc1 $f0, 0x2c($sp) /* B30F8 8011C9F8 44820000 */ mtc1 $v0, $f0 -/* B30FC 8011C9FC 00000000 */ nop +/* B30FC 8011C9FC 00000000 */ nop /* B3100 8011CA00 46800020 */ cvt.s.w $f0, $f0 /* B3104 8011CA04 E7A2002C */ swc1 $f2, 0x2c($sp) /* B3108 8011CA08 E6000000 */ swc1 $f0, ($s0) /* B310C 8011CA0C C7A0002C */ lwc1 $f0, 0x2c($sp) /* B3110 8011CA10 4600058D */ trunc.w.s $f22, $f0 /* B3114 8011CA14 4402B000 */ mfc1 $v0, $f22 -/* B3118 8011CA18 00000000 */ nop +/* B3118 8011CA18 00000000 */ nop /* B311C 8011CA1C 44820000 */ mtc1 $v0, $f0 -/* B3120 8011CA20 00000000 */ nop +/* B3120 8011CA20 00000000 */ nop /* B3124 8011CA24 46800020 */ cvt.s.w $f0, $f0 /* B3128 8011CA28 E6200000 */ swc1 $f0, ($s1) /* B312C 8011CA2C 8FA8007C */ lw $t0, 0x7c($sp) /* B3130 8011CA30 05010008 */ bgez $t0, .L8011CA54 -/* B3134 8011CA34 00000000 */ nop +/* B3134 8011CA34 00000000 */ nop /* B3138 8011CA38 C7A00030 */ lwc1 $f0, 0x30($sp) /* B313C 8011CA3C 4600903C */ c.lt.s $f18, $f0 -/* B3140 8011CA40 00000000 */ nop +/* B3140 8011CA40 00000000 */ nop /* B3144 8011CA44 4501014F */ bc1t .L8011CF84 /* B3148 8011CA48 0000102D */ daddu $v0, $zero, $zero /* B314C 8011CA4C 080473E1 */ j .L8011CF84 @@ -152,34 +152,34 @@ glabel func_8011C80C .L8011CA54: /* B3154 8011CA54 C7A40028 */ lwc1 $f4, 0x28($sp) /* B3158 8011CA58 4604903E */ c.le.s $f18, $f4 -/* B315C 8011CA5C 00000000 */ nop +/* B315C 8011CA5C 00000000 */ nop /* B3160 8011CA60 45000140 */ bc1f .L8011CF64 -/* B3164 8011CA64 00000000 */ nop +/* B3164 8011CA64 00000000 */ nop /* B3168 8011CA68 C7A2002C */ lwc1 $f2, 0x2c($sp) /* B316C 8011CA6C 4602903E */ c.le.s $f18, $f2 -/* B3170 8011CA70 00000000 */ nop +/* B3170 8011CA70 00000000 */ nop /* B3174 8011CA74 4500013B */ bc1f .L8011CF64 -/* B3178 8011CA78 00000000 */ nop +/* B3178 8011CA78 00000000 */ nop /* B317C 8011CA7C 3C0143A0 */ lui $at, 0x43a0 /* B3180 8011CA80 44810000 */ mtc1 $at, $f0 -/* B3184 8011CA84 00000000 */ nop +/* B3184 8011CA84 00000000 */ nop /* B3188 8011CA88 4600203C */ c.lt.s $f4, $f0 -/* B318C 8011CA8C 00000000 */ nop +/* B318C 8011CA8C 00000000 */ nop /* B3190 8011CA90 45000134 */ bc1f .L8011CF64 -/* B3194 8011CA94 00000000 */ nop +/* B3194 8011CA94 00000000 */ nop /* B3198 8011CA98 3C014370 */ lui $at, 0x4370 /* B319C 8011CA9C 44810000 */ mtc1 $at, $f0 -/* B31A0 8011CAA0 00000000 */ nop +/* B31A0 8011CAA0 00000000 */ nop /* B31A4 8011CAA4 4600103C */ c.lt.s $f2, $f0 -/* B31A8 8011CAA8 00000000 */ nop +/* B31A8 8011CAA8 00000000 */ nop /* B31AC 8011CAAC 4500012D */ bc1f .L8011CF64 /* B31B0 8011CAB0 3C05FD10 */ lui $a1, 0xfd10 -/* B31B4 8011CAB4 3C11800A */ lui $s1, %hi(D_8009A66C) -/* B31B8 8011CAB8 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* B31B4 8011CAB4 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* B31B8 8011CAB8 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* B31BC 8011CABC 34A5013F */ ori $a1, $a1, 0x13f /* B31C0 8011CAC0 4600158D */ trunc.w.s $f22, $f2 /* B31C4 8011CAC4 4402B000 */ mfc1 $v0, $f22 -/* B31C8 8011CAC8 00000000 */ nop +/* B31C8 8011CAC8 00000000 */ nop /* B31CC 8011CACC 00022080 */ sll $a0, $v0, 2 /* B31D0 8011CAD0 00822021 */ addu $a0, $a0, $v0 /* B31D4 8011CAD4 000421C0 */ sll $a0, $a0, 7 @@ -250,7 +250,7 @@ glabel func_8011C80C /* B32D8 8011CBD8 3C02F400 */ lui $v0, 0xf400 /* B32DC 8011CBDC 4600058D */ trunc.w.s $f22, $f0 /* B32E0 8011CBE0 4405B000 */ mfc1 $a1, $f22 -/* B32E4 8011CBE4 00000000 */ nop +/* B32E4 8011CBE4 00000000 */ nop /* B32E8 8011CBE8 00052080 */ sll $a0, $a1, 2 /* B32EC 8011CBEC 30840FFF */ andi $a0, $a0, 0xfff /* B32F0 8011CBF0 00042300 */ sll $a0, $a0, 0xc @@ -347,7 +347,7 @@ glabel func_8011C80C /* B345C 8011CD5C C7A0007C */ lwc1 $f0, 0x7c($sp) /* B3460 8011CD60 46800020 */ cvt.s.w $f0, $f0 /* B3464 8011CD64 46140002 */ mul.s $f0, $f0, $f20 -/* B3468 8011CD68 00000000 */ nop +/* B3468 8011CD68 00000000 */ nop /* B346C 8011CD6C 00052D40 */ sll $a1, $a1, 0x15 /* B3470 8011CD70 260200A8 */ addiu $v0, $s0, 0xa8 /* B3474 8011CD74 AE05009C */ sw $a1, 0x9c($s0) @@ -358,17 +358,17 @@ glabel func_8011C80C /* B3488 8011CD88 37390400 */ ori $t9, $t9, 0x400 /* B348C 8011CD8C 25030001 */ addiu $v1, $t0, 1 /* B3490 8011CD90 44830000 */ mtc1 $v1, $f0 -/* B3494 8011CD94 00000000 */ nop +/* B3494 8011CD94 00000000 */ nop /* B3498 8011CD98 46800020 */ cvt.s.w $f0, $f0 /* B349C 8011CD9C 46140002 */ mul.s $f0, $f0, $f20 -/* B34A0 8011CDA0 00000000 */ nop +/* B34A0 8011CDA0 00000000 */ nop /* B34A4 8011CDA4 30420FFF */ andi $v0, $v0, 0xfff /* B34A8 8011CDA8 00021300 */ sll $v0, $v0, 0xc /* B34AC 8011CDAC 00521025 */ or $v0, $v0, $s2 /* B34B0 8011CDB0 AE020088 */ sw $v0, 0x88($s0) /* B34B4 8011CDB4 4600058D */ trunc.w.s $f22, $f0 /* B34B8 8011CDB8 4402B000 */ mfc1 $v0, $f22 -/* B34BC 8011CDBC 00000000 */ nop +/* B34BC 8011CDBC 00000000 */ nop /* B34C0 8011CDC0 30420FFF */ andi $v0, $v0, 0xfff /* B34C4 8011CDC4 00021300 */ sll $v0, $v0, 0xc /* B34C8 8011CDC8 34420004 */ ori $v0, $v0, 4 @@ -393,25 +393,25 @@ glabel func_8011C80C /* B3514 8011CE14 AC400004 */ sw $zero, 4($v0) /* B3518 8011CE18 87C2000E */ lh $v0, 0xe($fp) /* B351C 8011CE1C 44820000 */ mtc1 $v0, $f0 -/* B3520 8011CE20 00000000 */ nop +/* B3520 8011CE20 00000000 */ nop /* B3524 8011CE24 46800020 */ cvt.s.w $f0, $f0 /* B3528 8011CE28 46140002 */ mul.s $f0, $f0, $f20 -/* B352C 8011CE2C 00000000 */ nop +/* B352C 8011CE2C 00000000 */ nop /* B3530 8011CE30 87C20010 */ lh $v0, 0x10($fp) /* B3534 8011CE34 44821000 */ mtc1 $v0, $f2 -/* B3538 8011CE38 00000000 */ nop +/* B3538 8011CE38 00000000 */ nop /* B353C 8011CE3C 468010A0 */ cvt.s.w $f2, $f2 /* B3540 8011CE40 46141082 */ mul.s $f2, $f2, $f20 -/* B3544 8011CE44 00000000 */ nop +/* B3544 8011CE44 00000000 */ nop /* B3548 8011CE48 24840008 */ addiu $a0, $a0, 8 /* B354C 8011CE4C 4600058D */ trunc.w.s $f22, $f0 /* B3550 8011CE50 4403B000 */ mfc1 $v1, $f22 -/* B3554 8011CE54 00000000 */ nop +/* B3554 8011CE54 00000000 */ nop /* B3558 8011CE58 30630FFF */ andi $v1, $v1, 0xfff /* B355C 8011CE5C 00031B00 */ sll $v1, $v1, 0xc /* B3560 8011CE60 4600158D */ trunc.w.s $f22, $f2 /* B3564 8011CE64 4402B000 */ mfc1 $v0, $f22 -/* B3568 8011CE68 00000000 */ nop +/* B3568 8011CE68 00000000 */ nop /* B356C 8011CE6C 30420FFF */ andi $v0, $v0, 0xfff /* B3570 8011CE70 00521025 */ or $v0, $v0, $s2 /* B3574 8011CE74 00621825 */ or $v1, $v1, $v0 @@ -420,27 +420,27 @@ glabel func_8011C80C /* B3580 8011CE80 87C3000A */ lh $v1, 0xa($fp) /* B3584 8011CE84 00431021 */ addu $v0, $v0, $v1 /* B3588 8011CE88 44821000 */ mtc1 $v0, $f2 -/* B358C 8011CE8C 00000000 */ nop +/* B358C 8011CE8C 00000000 */ nop /* B3590 8011CE90 468010A0 */ cvt.s.w $f2, $f2 /* B3594 8011CE94 46141082 */ mul.s $f2, $f2, $f20 -/* B3598 8011CE98 00000000 */ nop +/* B3598 8011CE98 00000000 */ nop /* B359C 8011CE9C 87C20010 */ lh $v0, 0x10($fp) /* B35A0 8011CEA0 87C3000C */ lh $v1, 0xc($fp) /* B35A4 8011CEA4 00431021 */ addu $v0, $v0, $v1 /* B35A8 8011CEA8 44820000 */ mtc1 $v0, $f0 -/* B35AC 8011CEAC 00000000 */ nop +/* B35AC 8011CEAC 00000000 */ nop /* B35B0 8011CEB0 46800020 */ cvt.s.w $f0, $f0 /* B35B4 8011CEB4 46140002 */ mul.s $f0, $f0, $f20 -/* B35B8 8011CEB8 00000000 */ nop +/* B35B8 8011CEB8 00000000 */ nop /* B35BC 8011CEBC AE240000 */ sw $a0, ($s1) /* B35C0 8011CEC0 4600158D */ trunc.w.s $f22, $f2 /* B35C4 8011CEC4 4402B000 */ mfc1 $v0, $f22 -/* B35C8 8011CEC8 00000000 */ nop +/* B35C8 8011CEC8 00000000 */ nop /* B35CC 8011CECC 30420FFF */ andi $v0, $v0, 0xfff /* B35D0 8011CED0 00021300 */ sll $v0, $v0, 0xc /* B35D4 8011CED4 4600058D */ trunc.w.s $f22, $f0 /* B35D8 8011CED8 4403B000 */ mfc1 $v1, $f22 -/* B35DC 8011CEDC 00000000 */ nop +/* B35DC 8011CEDC 00000000 */ nop /* B35E0 8011CEE0 30630FFF */ andi $v1, $v1, 0xfff /* B35E4 8011CEE4 00431025 */ or $v0, $v0, $v1 /* B35E8 8011CEE8 AC820004 */ sw $v0, 4($a0) @@ -462,7 +462,7 @@ glabel func_8011C80C /* B3628 8011CF28 000318C0 */ sll $v1, $v1, 3 /* B362C 8011CF2C 00641821 */ addu $v1, $v1, $a0 /* B3630 8011CF30 46001082 */ mul.s $f2, $f2, $f0 -/* B3634 8011CF34 00000000 */ nop +/* B3634 8011CF34 00000000 */ nop /* B3638 8011CF38 8C640000 */ lw $a0, ($v1) /* B363C 8011CF3C 8C630004 */ lw $v1, 4($v1) /* B3640 8011CF40 00821004 */ sllv $v0, $v0, $a0 @@ -470,16 +470,16 @@ glabel func_8011C80C /* B3648 8011CF48 000210C2 */ srl $v0, $v0, 3 /* B364C 8011CF4C 4600158D */ trunc.w.s $f22, $f2 /* B3650 8011CF50 4403B000 */ mfc1 $v1, $f22 -/* B3654 8011CF54 00000000 */ nop +/* B3654 8011CF54 00000000 */ nop /* B3658 8011CF58 0043102B */ sltu $v0, $v0, $v1 /* B365C 8011CF5C 14400009 */ bnez $v0, .L8011CF84 /* B3660 8011CF60 0000102D */ daddu $v0, $zero, $zero .L8011CF64: /* B3664 8011CF64 C7A20030 */ lwc1 $f2, 0x30($sp) /* B3668 8011CF68 44800000 */ mtc1 $zero, $f0 -/* B366C 8011CF6C 00000000 */ nop +/* B366C 8011CF6C 00000000 */ nop /* B3670 8011CF70 4602003C */ c.lt.s $f0, $f2 -/* B3674 8011CF74 00000000 */ nop +/* B3674 8011CF74 00000000 */ nop /* B3678 8011CF78 45010002 */ bc1t .L8011CF84 /* B367C 8011CF7C 24020001 */ addiu $v0, $zero, 1 .L8011CF80: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011CFBC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011CFBC.s index 93453f825b..4840d823dd 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011CFBC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011CFBC.s @@ -51,9 +51,9 @@ glabel func_8011CFBC /* B3774 8011D074 E7B40010 */ swc1 $f20, 0x10($sp) /* B3778 8011D078 C7A00034 */ lwc1 $f0, 0x34($sp) /* B377C 8011D07C 44809000 */ mtc1 $zero, $f18 -/* B3780 8011D080 00000000 */ nop +/* B3780 8011D080 00000000 */ nop /* B3784 8011D084 46120032 */ c.eq.s $f0, $f18 -/* B3788 8011D088 00000000 */ nop +/* B3788 8011D088 00000000 */ nop /* B378C 8011D08C 45000004 */ bc1f .L8011D0A0 /* B3790 8011D090 24020001 */ addiu $v0, $zero, 1 /* B3794 8011D094 E6120000 */ swc1 $f18, ($s0) @@ -63,37 +63,37 @@ glabel func_8011CFBC /* B37A0 8011D0A0 C7AC0030 */ lwc1 $f12, 0x30($sp) /* B37A4 8011D0A4 4600A383 */ div.s $f14, $f20, $f0 /* B37A8 8011D0A8 460E6302 */ mul.s $f12, $f12, $f14 -/* B37AC 8011D0AC 00000000 */ nop +/* B37AC 8011D0AC 00000000 */ nop /* B37B0 8011D0B0 46146080 */ add.s $f2, $f12, $f20 /* B37B4 8011D0B4 3C013FE0 */ lui $at, 0x3fe0 /* B37B8 8011D0B8 44814800 */ mtc1 $at, $f9 /* B37BC 8011D0BC 44804000 */ mtc1 $zero, $f8 /* B37C0 8011D0C0 460010A1 */ cvt.d.s $f2, $f2 /* B37C4 8011D0C4 46281082 */ mul.d $f2, $f2, $f8 -/* B37C8 8011D0C8 00000000 */ nop +/* B37C8 8011D0C8 00000000 */ nop /* B37CC 8011D0CC C7B00028 */ lwc1 $f16, 0x28($sp) /* B37D0 8011D0D0 460E8402 */ mul.s $f16, $f16, $f14 -/* B37D4 8011D0D4 00000000 */ nop +/* B37D4 8011D0D4 00000000 */ nop /* B37D8 8011D0D8 87C2000A */ lh $v0, 0xa($fp) /* B37DC 8011D0DC 44820000 */ mtc1 $v0, $f0 -/* B37E0 8011D0E0 00000000 */ nop +/* B37E0 8011D0E0 00000000 */ nop /* B37E4 8011D0E4 46800020 */ cvt.s.w $f0, $f0 /* B37E8 8011D0E8 46008102 */ mul.s $f4, $f16, $f0 -/* B37EC 8011D0EC 00000000 */ nop +/* B37EC 8011D0EC 00000000 */ nop /* B37F0 8011D0F0 46002100 */ add.s $f4, $f4, $f0 /* B37F4 8011D0F4 46002121 */ cvt.d.s $f4, $f4 /* B37F8 8011D0F8 46282102 */ mul.d $f4, $f4, $f8 -/* B37FC 8011D0FC 00000000 */ nop +/* B37FC 8011D0FC 00000000 */ nop /* B3800 8011D100 C7A6002C */ lwc1 $f6, 0x2c($sp) /* B3804 8011D104 46007007 */ neg.s $f0, $f14 /* B3808 8011D108 46003182 */ mul.s $f6, $f6, $f0 -/* B380C 8011D10C 00000000 */ nop +/* B380C 8011D10C 00000000 */ nop /* B3810 8011D110 87C2000C */ lh $v0, 0xc($fp) /* B3814 8011D114 44825000 */ mtc1 $v0, $f10 -/* B3818 8011D118 00000000 */ nop +/* B3818 8011D118 00000000 */ nop /* B381C 8011D11C 468052A0 */ cvt.s.w $f10, $f10 /* B3820 8011D120 460A3002 */ mul.s $f0, $f6, $f10 -/* B3824 8011D124 00000000 */ nop +/* B3824 8011D124 00000000 */ nop /* B3828 8011D128 E7AE0034 */ swc1 $f14, 0x34($sp) /* B382C 8011D12C E7B00028 */ swc1 $f16, 0x28($sp) /* B3830 8011D130 E7AC0030 */ swc1 $f12, 0x30($sp) @@ -102,18 +102,18 @@ glabel func_8011CFBC /* B383C 8011D13C 462010A0 */ cvt.s.d $f2, $f2 /* B3840 8011D140 46000021 */ cvt.d.s $f0, $f0 /* B3844 8011D144 46280002 */ mul.d $f0, $f0, $f8 -/* B3848 8011D148 00000000 */ nop +/* B3848 8011D148 00000000 */ nop /* B384C 8011D14C E7A20030 */ swc1 $f2, 0x30($sp) /* B3850 8011D150 87C2000E */ lh $v0, 0xe($fp) /* B3854 8011D154 44821000 */ mtc1 $v0, $f2 -/* B3858 8011D158 00000000 */ nop +/* B3858 8011D158 00000000 */ nop /* B385C 8011D15C 468010A0 */ cvt.s.w $f2, $f2 /* B3860 8011D160 46202120 */ cvt.s.d $f4, $f4 /* B3864 8011D164 E7A40028 */ swc1 $f4, 0x28($sp) /* B3868 8011D168 87C20010 */ lh $v0, 0x10($fp) /* B386C 8011D16C 46022100 */ add.s $f4, $f4, $f2 /* B3870 8011D170 44821000 */ mtc1 $v0, $f2 -/* B3874 8011D174 00000000 */ nop +/* B3874 8011D174 00000000 */ nop /* B3878 8011D178 468010A0 */ cvt.s.w $f2, $f2 /* B387C 8011D17C 46200020 */ cvt.s.d $f0, $f0 /* B3880 8011D180 46020080 */ add.s $f2, $f0, $f2 @@ -129,38 +129,38 @@ glabel func_8011CFBC /* B38A8 8011D1A8 C7A00030 */ lwc1 $f0, 0x30($sp) /* B38AC 8011D1AC 4600903C */ c.lt.s $f18, $f0 /* B38B0 8011D1B0 080475BA */ j .L8011D6E8 -/* B38B4 8011D1B4 00000000 */ nop +/* B38B4 8011D1B4 00000000 */ nop .L8011D1B8: /* B38B8 8011D1B8 C7A40028 */ lwc1 $f4, 0x28($sp) /* B38BC 8011D1BC 4604903E */ c.le.s $f18, $f4 -/* B38C0 8011D1C0 00000000 */ nop +/* B38C0 8011D1C0 00000000 */ nop /* B38C4 8011D1C4 45000143 */ bc1f .L8011D6D4 -/* B38C8 8011D1C8 00000000 */ nop +/* B38C8 8011D1C8 00000000 */ nop /* B38CC 8011D1CC C7A2002C */ lwc1 $f2, 0x2c($sp) /* B38D0 8011D1D0 4602903E */ c.le.s $f18, $f2 -/* B38D4 8011D1D4 00000000 */ nop +/* B38D4 8011D1D4 00000000 */ nop /* B38D8 8011D1D8 4500013E */ bc1f .L8011D6D4 -/* B38DC 8011D1DC 00000000 */ nop +/* B38DC 8011D1DC 00000000 */ nop /* B38E0 8011D1E0 3C0143A0 */ lui $at, 0x43a0 /* B38E4 8011D1E4 44810000 */ mtc1 $at, $f0 -/* B38E8 8011D1E8 00000000 */ nop +/* B38E8 8011D1E8 00000000 */ nop /* B38EC 8011D1EC 4600203C */ c.lt.s $f4, $f0 -/* B38F0 8011D1F0 00000000 */ nop +/* B38F0 8011D1F0 00000000 */ nop /* B38F4 8011D1F4 45000137 */ bc1f .L8011D6D4 -/* B38F8 8011D1F8 00000000 */ nop +/* B38F8 8011D1F8 00000000 */ nop /* B38FC 8011D1FC 3C014370 */ lui $at, 0x4370 /* B3900 8011D200 44810000 */ mtc1 $at, $f0 -/* B3904 8011D204 00000000 */ nop +/* B3904 8011D204 00000000 */ nop /* B3908 8011D208 4600103C */ c.lt.s $f2, $f0 -/* B390C 8011D20C 00000000 */ nop +/* B390C 8011D20C 00000000 */ nop /* B3910 8011D210 45000130 */ bc1f .L8011D6D4 /* B3914 8011D214 3C05FD10 */ lui $a1, 0xfd10 -/* B3918 8011D218 3C11800A */ lui $s1, %hi(D_8009A66C) -/* B391C 8011D21C 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* B3918 8011D218 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* B391C 8011D21C 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* B3920 8011D220 34A5013F */ ori $a1, $a1, 0x13f /* B3924 8011D224 4600158D */ trunc.w.s $f22, $f2 /* B3928 8011D228 4402B000 */ mfc1 $v0, $f22 -/* B392C 8011D22C 00000000 */ nop +/* B392C 8011D22C 00000000 */ nop /* B3930 8011D230 00022080 */ sll $a0, $v0, 2 /* B3934 8011D234 00822021 */ addu $a0, $a0, $v0 /* B3938 8011D238 000421C0 */ sll $a0, $a0, 7 @@ -232,7 +232,7 @@ glabel func_8011CFBC /* B3A40 8011D340 3C02F400 */ lui $v0, 0xf400 /* B3A44 8011D344 4600058D */ trunc.w.s $f22, $f0 /* B3A48 8011D348 4405B000 */ mfc1 $a1, $f22 -/* B3A4C 8011D34C 00000000 */ nop +/* B3A4C 8011D34C 00000000 */ nop /* B3A50 8011D350 00052080 */ sll $a0, $a1, 2 /* B3A54 8011D354 30840FFF */ andi $a0, $a0, 0xfff /* B3A58 8011D358 00042300 */ sll $a0, $a0, 0xc @@ -334,7 +334,7 @@ glabel func_8011CFBC /* B3BD8 8011D4D8 C7A00084 */ lwc1 $f0, 0x84($sp) /* B3BDC 8011D4DC 46800020 */ cvt.s.w $f0, $f0 /* B3BE0 8011D4E0 46140002 */ mul.s $f0, $f0, $f20 -/* B3BE4 8011D4E4 00000000 */ nop +/* B3BE4 8011D4E4 00000000 */ nop /* B3BE8 8011D4E8 00052D40 */ sll $a1, $a1, 0x15 /* B3BEC 8011D4EC 260200A8 */ addiu $v0, $s0, 0xa8 /* B3BF0 8011D4F0 AE05009C */ sw $a1, 0x9c($s0) @@ -342,17 +342,17 @@ glabel func_8011CFBC /* B3BF8 8011D4F8 4600058D */ trunc.w.s $f22, $f0 /* B3BFC 8011D4FC 4402B000 */ mfc1 $v0, $f22 /* B3C00 8011D500 44830000 */ mtc1 $v1, $f0 -/* B3C04 8011D504 00000000 */ nop +/* B3C04 8011D504 00000000 */ nop /* B3C08 8011D508 46800020 */ cvt.s.w $f0, $f0 /* B3C0C 8011D50C 46140002 */ mul.s $f0, $f0, $f20 -/* B3C10 8011D510 00000000 */ nop +/* B3C10 8011D510 00000000 */ nop /* B3C14 8011D514 30420FFF */ andi $v0, $v0, 0xfff /* B3C18 8011D518 00021300 */ sll $v0, $v0, 0xc /* B3C1C 8011D51C 00521025 */ or $v0, $v0, $s2 /* B3C20 8011D520 AE020088 */ sw $v0, 0x88($s0) /* B3C24 8011D524 4600058D */ trunc.w.s $f22, $f0 /* B3C28 8011D528 4402B000 */ mfc1 $v0, $f22 -/* B3C2C 8011D52C 00000000 */ nop +/* B3C2C 8011D52C 00000000 */ nop /* B3C30 8011D530 30420FFF */ andi $v0, $v0, 0xfff /* B3C34 8011D534 00021300 */ sll $v0, $v0, 0xc /* B3C38 8011D538 34420004 */ ori $v0, $v0, 4 @@ -377,25 +377,25 @@ glabel func_8011CFBC /* B3C84 8011D584 AC400004 */ sw $zero, 4($v0) /* B3C88 8011D588 87C2000E */ lh $v0, 0xe($fp) /* B3C8C 8011D58C 44820000 */ mtc1 $v0, $f0 -/* B3C90 8011D590 00000000 */ nop +/* B3C90 8011D590 00000000 */ nop /* B3C94 8011D594 46800020 */ cvt.s.w $f0, $f0 /* B3C98 8011D598 46140002 */ mul.s $f0, $f0, $f20 -/* B3C9C 8011D59C 00000000 */ nop +/* B3C9C 8011D59C 00000000 */ nop /* B3CA0 8011D5A0 87C20010 */ lh $v0, 0x10($fp) /* B3CA4 8011D5A4 44821000 */ mtc1 $v0, $f2 -/* B3CA8 8011D5A8 00000000 */ nop +/* B3CA8 8011D5A8 00000000 */ nop /* B3CAC 8011D5AC 468010A0 */ cvt.s.w $f2, $f2 /* B3CB0 8011D5B0 46141082 */ mul.s $f2, $f2, $f20 -/* B3CB4 8011D5B4 00000000 */ nop +/* B3CB4 8011D5B4 00000000 */ nop /* B3CB8 8011D5B8 24840008 */ addiu $a0, $a0, 8 /* B3CBC 8011D5BC 4600058D */ trunc.w.s $f22, $f0 /* B3CC0 8011D5C0 4403B000 */ mfc1 $v1, $f22 -/* B3CC4 8011D5C4 00000000 */ nop +/* B3CC4 8011D5C4 00000000 */ nop /* B3CC8 8011D5C8 30630FFF */ andi $v1, $v1, 0xfff /* B3CCC 8011D5CC 00031B00 */ sll $v1, $v1, 0xc /* B3CD0 8011D5D0 4600158D */ trunc.w.s $f22, $f2 /* B3CD4 8011D5D4 4402B000 */ mfc1 $v0, $f22 -/* B3CD8 8011D5D8 00000000 */ nop +/* B3CD8 8011D5D8 00000000 */ nop /* B3CDC 8011D5DC 30420FFF */ andi $v0, $v0, 0xfff /* B3CE0 8011D5E0 00521025 */ or $v0, $v0, $s2 /* B3CE4 8011D5E4 00621825 */ or $v1, $v1, $v0 @@ -404,27 +404,27 @@ glabel func_8011CFBC /* B3CF0 8011D5F0 87C3000A */ lh $v1, 0xa($fp) /* B3CF4 8011D5F4 00431021 */ addu $v0, $v0, $v1 /* B3CF8 8011D5F8 44821000 */ mtc1 $v0, $f2 -/* B3CFC 8011D5FC 00000000 */ nop +/* B3CFC 8011D5FC 00000000 */ nop /* B3D00 8011D600 468010A0 */ cvt.s.w $f2, $f2 /* B3D04 8011D604 46141082 */ mul.s $f2, $f2, $f20 -/* B3D08 8011D608 00000000 */ nop +/* B3D08 8011D608 00000000 */ nop /* B3D0C 8011D60C 87C20010 */ lh $v0, 0x10($fp) /* B3D10 8011D610 87C3000C */ lh $v1, 0xc($fp) /* B3D14 8011D614 00431021 */ addu $v0, $v0, $v1 /* B3D18 8011D618 44820000 */ mtc1 $v0, $f0 -/* B3D1C 8011D61C 00000000 */ nop +/* B3D1C 8011D61C 00000000 */ nop /* B3D20 8011D620 46800020 */ cvt.s.w $f0, $f0 /* B3D24 8011D624 46140002 */ mul.s $f0, $f0, $f20 -/* B3D28 8011D628 00000000 */ nop +/* B3D28 8011D628 00000000 */ nop /* B3D2C 8011D62C AE240000 */ sw $a0, ($s1) /* B3D30 8011D630 4600158D */ trunc.w.s $f22, $f2 /* B3D34 8011D634 4402B000 */ mfc1 $v0, $f22 -/* B3D38 8011D638 00000000 */ nop +/* B3D38 8011D638 00000000 */ nop /* B3D3C 8011D63C 30420FFF */ andi $v0, $v0, 0xfff /* B3D40 8011D640 00021300 */ sll $v0, $v0, 0xc /* B3D44 8011D644 4600058D */ trunc.w.s $f22, $f0 /* B3D48 8011D648 4403B000 */ mfc1 $v1, $f22 -/* B3D4C 8011D64C 00000000 */ nop +/* B3D4C 8011D64C 00000000 */ nop /* B3D50 8011D650 30630FFF */ andi $v1, $v1, 0xfff /* B3D54 8011D654 00431025 */ or $v0, $v0, $v1 /* B3D58 8011D658 AC820004 */ sw $v0, 4($a0) @@ -446,7 +446,7 @@ glabel func_8011CFBC /* B3D98 8011D698 000318C0 */ sll $v1, $v1, 3 /* B3D9C 8011D69C 00641821 */ addu $v1, $v1, $a0 /* B3DA0 8011D6A0 46001082 */ mul.s $f2, $f2, $f0 -/* B3DA4 8011D6A4 00000000 */ nop +/* B3DA4 8011D6A4 00000000 */ nop /* B3DA8 8011D6A8 8C640000 */ lw $a0, ($v1) /* B3DAC 8011D6AC 8C630004 */ lw $v1, 4($v1) /* B3DB0 8011D6B0 00821004 */ sllv $v0, $v0, $a0 @@ -454,7 +454,7 @@ glabel func_8011CFBC /* B3DB8 8011D6B8 000210C2 */ srl $v0, $v0, 3 /* B3DBC 8011D6BC 4600158D */ trunc.w.s $f22, $f2 /* B3DC0 8011D6C0 4403B000 */ mfc1 $v1, $f22 -/* B3DC4 8011D6C4 00000000 */ nop +/* B3DC4 8011D6C4 00000000 */ nop /* B3DC8 8011D6C8 0043102B */ sltu $v0, $v0, $v1 /* B3DCC 8011D6CC 14400009 */ bnez $v0, .L8011D6F4 /* B3DD0 8011D6D0 0000102D */ daddu $v0, $zero, $zero @@ -463,10 +463,10 @@ glabel func_8011CFBC /* B3DD8 8011D6D8 44800000 */ mtc1 $zero, $f0 /* B3DDC 8011D6DC 24020001 */ addiu $v0, $zero, 1 /* B3DE0 8011D6E0 4602003C */ c.lt.s $f0, $f2 -/* B3DE4 8011D6E4 00000000 */ nop +/* B3DE4 8011D6E4 00000000 */ nop .L8011D6E8: /* B3DE8 8011D6E8 45010002 */ bc1t .L8011D6F4 -/* B3DEC 8011D6EC 00000000 */ nop +/* B3DEC 8011D6EC 00000000 */ nop .L8011D6F0: /* B3DF0 8011D6F0 0000102D */ daddu $v0, $zero, $zero .L8011D6F4: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D72C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D72C.s index 6b960d2ef8..b9a5e49457 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D72C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D72C.s @@ -27,8 +27,8 @@ glabel func_8011D72C /* B3E80 8011D780 24420010 */ addiu $v0, $v0, 0x10 /* B3E84 8011D784 1444FFF6 */ bne $v0, $a0, .L8011D760 /* B3E88 8011D788 24630010 */ addiu $v1, $v1, 0x10 -/* B3E8C 8011D78C 3C10800A */ lui $s0, %hi(D_8009A66C) -/* B3E90 8011D790 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* B3E8C 8011D78C 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* B3E90 8011D790 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* B3E94 8011D794 8E420000 */ lw $v0, ($s2) /* B3E98 8011D798 8E110000 */ lw $s1, ($s0) /* B3E9C 8011D79C 50510001 */ beql $v0, $s1, .L8011D7A4 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D9B8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D9B8.s index 1653f97509..9e65c7719a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D9B8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D9B8.s @@ -147,7 +147,7 @@ glabel func_8011D9B8 /* B42B8 8011DBB8 8E020004 */ lw $v0, 4($s0) /* B42BC 8011DBBC 0162102A */ slt $v0, $t3, $v0 /* B42C0 8011DBC0 1440001E */ bnez $v0, .L8011DC3C -/* B42C4 8011DBC4 00000000 */ nop +/* B42C4 8011DBC4 00000000 */ nop /* B42C8 8011DBC8 26650001 */ addiu $a1, $s3, 1 /* B42CC 8011DBCC 00B5102A */ slt $v0, $a1, $s5 /* B42D0 8011DBD0 10400016 */ beqz $v0, .L8011DC2C @@ -206,10 +206,10 @@ glabel func_8011D9B8 /* B4390 8011DC90 0C019DF0 */ jal guScaleF /* B4394 8011DC94 00A0382D */ daddu $a3, $a1, $zero /* B4398 8011DC98 0200202D */ daddu $a0, $s0, $zero -/* B439C 8011DC9C 3C108007 */ lui $s0, %hi(D_800741F0) -/* B43A0 8011DCA0 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* B43A4 8011DCA4 3C11800A */ lui $s1, %hi(D_8009A674) -/* B43A8 8011DCA8 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* B439C 8011DC9C 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* B43A0 8011DCA0 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* B43A4 8011DCA4 3C11800A */ lui $s1, %hi(gDisplayContext) +/* B43A8 8011DCA8 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* B43AC 8011DCAC 96050000 */ lhu $a1, ($s0) /* B43B0 8011DCB0 8E220000 */ lw $v0, ($s1) /* B43B4 8011DCB4 00052980 */ sll $a1, $a1, 6 @@ -226,8 +226,8 @@ glabel func_8011D9B8 /* B43E0 8011DCE0 00521021 */ addu $v0, $v0, $s2 /* B43E4 8011DCE4 1AA00050 */ blez $s5, .L8011DE28 /* B43E8 8011DCE8 0062B821 */ addu $s7, $v1, $v0 -/* B43EC 8011DCEC 3C11800A */ lui $s1, %hi(D_8009A66C) -/* B43F0 8011DCF0 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* B43EC 8011DCEC 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* B43F0 8011DCF0 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* B43F4 8011DCF4 3C12DE00 */ lui $s2, 0xde00 /* B43F8 8011DCF8 00131080 */ sll $v0, $s3, 2 .L8011DCFC: @@ -239,7 +239,7 @@ glabel func_8011D9B8 /* B4410 8011DD10 8E03000C */ lw $v1, 0xc($s0) /* B4414 8011DD14 30420002 */ andi $v0, $v0, 2 /* B4418 8011DD18 10400004 */ beqz $v0, .L8011DD2C -/* B441C 8011DD1C 00000000 */ nop +/* B441C 8011DD1C 00000000 */ nop /* B4420 8011DD20 8E360000 */ lw $s6, ($s1) /* B4424 8011DD24 26C20008 */ addiu $v0, $s6, 8 /* B4428 8011DD28 AE220000 */ sw $v0, ($s1) @@ -280,8 +280,8 @@ glabel func_8011D9B8 /* B44B0 8011DDB0 24620020 */ addiu $v0, $v1, 0x20 /* B44B4 8011DDB4 AC720010 */ sw $s2, 0x10($v1) /* B44B8 8011DDB8 AE220000 */ sw $v0, ($s1) -/* B44BC 8011DDBC 3C02800A */ lui $v0, %hi(D_8009A674) -/* B44C0 8011DDC0 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* B44BC 8011DDBC 3C02800A */ lui $v0, %hi(gDisplayContext) +/* B44C0 8011DDC0 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* B44C4 8011DDC4 34C60007 */ ori $a2, $a2, 7 /* B44C8 8011DDC8 AC660018 */ sw $a2, 0x18($v1) /* B44CC 8011DDCC 00042180 */ sll $a0, $a0, 6 @@ -293,7 +293,7 @@ glabel func_8011D9B8 /* B44E0 8011DDE0 1440FFC6 */ bnez $v0, .L8011DCFC /* B44E4 8011DDE4 00131080 */ sll $v0, $s3, 2 /* B44E8 8011DDE8 0804778A */ j .L8011DE28 -/* B44EC 8011DDEC 00000000 */ nop +/* B44EC 8011DDEC 00000000 */ nop .L8011DDF0: /* B44F0 8011DDF0 1AA0000D */ blez $s5, .L8011DE28 /* B44F4 8011DDF4 0000982D */ daddu $s3, $zero, $zero @@ -309,7 +309,7 @@ glabel func_8011D9B8 /* B4518 8011DE18 26730001 */ addiu $s3, $s3, 1 /* B451C 8011DE1C 0275102A */ slt $v0, $s3, $s5 /* B4520 8011DE20 1440FFF6 */ bnez $v0, .L8011DDFC -/* B4524 8011DE24 00000000 */ nop +/* B4524 8011DE24 00000000 */ nop .L8011DE28: /* B4528 8011DE28 3C038015 */ lui $v1, %hi(D_801533AC) /* B452C 8011DE2C 246333AC */ addiu $v1, $v1, %lo(D_801533AC) @@ -334,4 +334,4 @@ glabel func_8011D9B8 /* B4570 8011DE70 8FB00450 */ lw $s0, 0x450($sp) /* B4574 8011DE74 03E00008 */ jr $ra /* B4578 8011DE78 27BD0478 */ addiu $sp, $sp, 0x478 -/* B457C 8011DE7C 00000000 */ nop +/* B457C 8011DE7C 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s index a4dac1b940..bff90b594b 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s @@ -9,8 +9,8 @@ glabel func_8011F4D4 /* B5BE4 8011F4E4 8E0200D8 */ lw $v0, 0xd8($s0) /* B5BE8 8011F4E8 10400013 */ beqz $v0, .L8011F538 /* B5BEC 8011F4EC 3C020001 */ lui $v0, 1 -/* B5BF0 8011F4F0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* B5BF4 8011F4F4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* B5BF0 8011F4F0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* B5BF4 8011F4F4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* B5BF8 8011F4F8 8C830000 */ lw $v1, ($a0) /* B5BFC 8011F4FC 3C028015 */ lui $v0, %hi(D_80153A60) /* B5C00 8011F500 8C423A60 */ lw $v0, %lo(D_80153A60)($v0) @@ -31,10 +31,10 @@ glabel func_8011F4D4 /* B5C38 8011F538 34421630 */ ori $v0, $v0, 0x1630 /* B5C3C 8011F53C 26050098 */ addiu $a1, $s0, 0x98 /* B5C40 8011F540 260600D8 */ addiu $a2, $s0, 0xd8 -/* B5C44 8011F544 3C038007 */ lui $v1, %hi(D_800741F0) -/* B5C48 8011F548 946341F0 */ lhu $v1, %lo(D_800741F0)($v1) -/* B5C4C 8011F54C 3C04800A */ lui $a0, %hi(D_8009A674) -/* B5C50 8011F550 8C84A674 */ lw $a0, %lo(D_8009A674)($a0) +/* B5C44 8011F544 3C038007 */ lui $v1, %hi(gMatrixListPos) +/* B5C48 8011F548 946341F0 */ lhu $v1, %lo(gMatrixListPos)($v1) +/* B5C4C 8011F54C 3C04800A */ lui $a0, %hi(gDisplayContext) +/* B5C50 8011F550 8C84A674 */ lw $a0, %lo(gDisplayContext)($a0) /* B5C54 8011F554 00031980 */ sll $v1, $v1, 6 /* B5C58 8011F558 00832021 */ addu $a0, $a0, $v1 /* B5C5C 8011F55C 00822021 */ addu $a0, $a0, $v0 @@ -53,11 +53,11 @@ glabel func_8011F4D4 /* B5C8C 8011F58C 3C07DA38 */ lui $a3, 0xda38 /* B5C90 8011F590 34E70002 */ ori $a3, $a3, 2 /* B5C94 8011F594 3C080001 */ lui $t0, 1 -/* B5C98 8011F598 3C05800A */ lui $a1, %hi(D_8009A66C) -/* B5C9C 8011F59C 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* B5C98 8011F598 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* B5C9C 8011F59C 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* B5CA0 8011F5A0 35081630 */ ori $t0, $t0, 0x1630 -/* B5CA4 8011F5A4 3C048007 */ lui $a0, %hi(D_800741F0) -/* B5CA8 8011F5A8 248441F0 */ addiu $a0, $a0, %lo(D_800741F0) +/* B5CA4 8011F5A4 3C048007 */ lui $a0, %hi(gMatrixListPos) +/* B5CA8 8011F5A8 248441F0 */ addiu $a0, $a0, %lo(gMatrixListPos) /* B5CAC 8011F5AC 8CA20000 */ lw $v0, ($a1) /* B5CB0 8011F5B0 94830000 */ lhu $v1, ($a0) /* B5CB4 8011F5B4 0040302D */ daddu $a2, $v0, $zero @@ -69,8 +69,8 @@ glabel func_8011F4D4 /* B5CCC 8011F5CC 00681821 */ addu $v1, $v1, $t0 /* B5CD0 8011F5D0 ACC70000 */ sw $a3, ($a2) /* B5CD4 8011F5D4 A4820000 */ sh $v0, ($a0) -/* B5CD8 8011F5D8 3C02800A */ lui $v0, %hi(D_8009A674) -/* B5CDC 8011F5DC 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* B5CD8 8011F5D8 3C02800A */ lui $v0, %hi(gDisplayContext) +/* B5CDC 8011F5DC 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* B5CE0 8011F5E0 3C048015 */ lui $a0, %hi(D_80153A44) /* B5CE4 8011F5E4 8C843A44 */ lw $a0, %lo(D_80153A44)($a0) /* B5CE8 8011F5E8 00431021 */ addu $v0, $v0, $v1 @@ -81,7 +81,7 @@ glabel func_8011F4D4 /* B5CFC 8011F5FC 10820063 */ beq $a0, $v0, .L8011F78C /* B5D00 8011F600 27A40010 */ addiu $a0, $sp, 0x10 /* B5D04 8011F604 08047E80 */ j .L8011FA00 -/* B5D08 8011F608 00000000 */ nop +/* B5D08 8011F608 00000000 */ nop .L8011F60C: /* B5D0C 8011F60C 92020004 */ lbu $v0, 4($s0) /* B5D10 8011F610 2442FFFF */ addiu $v0, $v0, -1 @@ -94,9 +94,9 @@ glabel func_8011F4D4 /* B5D2C 8011F62C 00220821 */ addu $at, $at, $v0 /* B5D30 8011F630 8C22FEE0 */ lw $v0, %lo(D_8014FEE0)($at) /* B5D34 8011F634 00400008 */ jr $v0 -/* B5D38 8011F638 00000000 */ nop -/* B5D3C 8011F63C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B5D40 8011F640 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B5D38 8011F638 00000000 */ nop +/* B5D3C 8011F63C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B5D40 8011F640 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5D44 8011F644 8C620000 */ lw $v0, ($v1) /* B5D48 8011F648 0040202D */ daddu $a0, $v0, $zero /* B5D4C 8011F64C 24420008 */ addiu $v0, $v0, 8 @@ -107,8 +107,8 @@ glabel func_8011F4D4 /* B5D60 8011F660 2442B7F8 */ addiu $v0, $v0, %lo(D_8014B7F8) /* B5D64 8011F664 08047E7F */ j .L8011F9FC /* B5D68 8011F668 AC820004 */ sw $v0, 4($a0) -/* B5D6C 8011F66C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B5D70 8011F670 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B5D6C 8011F66C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B5D70 8011F670 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5D74 8011F674 8C620000 */ lw $v0, ($v1) /* B5D78 8011F678 0040202D */ daddu $a0, $v0, $zero /* B5D7C 8011F67C 24420008 */ addiu $v0, $v0, 8 @@ -119,8 +119,8 @@ glabel func_8011F4D4 /* B5D90 8011F690 2442B820 */ addiu $v0, $v0, %lo(D_8014B820) /* B5D94 8011F694 08047E7F */ j .L8011F9FC /* B5D98 8011F698 AC820004 */ sw $v0, 4($a0) -/* B5D9C 8011F69C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B5DA0 8011F6A0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B5D9C 8011F69C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B5DA0 8011F6A0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5DA4 8011F6A4 8C620000 */ lw $v0, ($v1) /* B5DA8 8011F6A8 0040202D */ daddu $a0, $v0, $zero /* B5DAC 8011F6AC 24420008 */ addiu $v0, $v0, 8 @@ -131,8 +131,8 @@ glabel func_8011F4D4 /* B5DC0 8011F6C0 2442B848 */ addiu $v0, $v0, %lo(D_8014B848) /* B5DC4 8011F6C4 08047E7F */ j .L8011F9FC /* B5DC8 8011F6C8 AC820004 */ sw $v0, 4($a0) -/* B5DCC 8011F6CC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B5DD0 8011F6D0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B5DCC 8011F6CC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B5DD0 8011F6D0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5DD4 8011F6D4 8C620000 */ lw $v0, ($v1) /* B5DD8 8011F6D8 0040202D */ daddu $a0, $v0, $zero /* B5DDC 8011F6DC 24420008 */ addiu $v0, $v0, 8 @@ -143,8 +143,8 @@ glabel func_8011F4D4 /* B5DF0 8011F6F0 2442B870 */ addiu $v0, $v0, %lo(D_8014B870) /* B5DF4 8011F6F4 08047E7F */ j .L8011F9FC /* B5DF8 8011F6F8 AC820004 */ sw $v0, 4($a0) -/* B5DFC 8011F6FC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B5E00 8011F700 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B5DFC 8011F6FC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B5E00 8011F700 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5E04 8011F704 8C620000 */ lw $v0, ($v1) /* B5E08 8011F708 0040202D */ daddu $a0, $v0, $zero /* B5E0C 8011F70C 24420008 */ addiu $v0, $v0, 8 @@ -155,8 +155,8 @@ glabel func_8011F4D4 /* B5E20 8011F720 2442B898 */ addiu $v0, $v0, %lo(D_8014B898) /* B5E24 8011F724 08047E7F */ j .L8011F9FC /* B5E28 8011F728 AC820004 */ sw $v0, 4($a0) -/* B5E2C 8011F72C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B5E30 8011F730 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B5E2C 8011F72C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B5E30 8011F730 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5E34 8011F734 8C620000 */ lw $v0, ($v1) /* B5E38 8011F738 0040202D */ daddu $a0, $v0, $zero /* B5E3C 8011F73C 24420008 */ addiu $v0, $v0, 8 @@ -167,8 +167,8 @@ glabel func_8011F4D4 /* B5E50 8011F750 2442B8C0 */ addiu $v0, $v0, %lo(D_8014B8C0) /* B5E54 8011F754 08047E7F */ j .L8011F9FC /* B5E58 8011F758 AC820004 */ sw $v0, 4($a0) -/* B5E5C 8011F75C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B5E60 8011F760 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B5E5C 8011F75C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B5E60 8011F760 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5E64 8011F764 8C620000 */ lw $v0, ($v1) /* B5E68 8011F768 0040202D */ daddu $a0, $v0, $zero /* B5E6C 8011F76C 24420008 */ addiu $v0, $v0, 8 @@ -191,9 +191,9 @@ glabel func_8011F4D4 /* B5EAC 8011F7AC 00220821 */ addu $at, $at, $v0 /* B5EB0 8011F7B0 8C22FF78 */ lw $v0, %lo(D_8014FF78)($at) /* B5EB4 8011F7B4 00400008 */ jr $v0 -/* B5EB8 8011F7B8 00000000 */ nop -/* B5EBC 8011F7BC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B5EC0 8011F7C0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B5EB8 8011F7B8 00000000 */ nop +/* B5EBC 8011F7BC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B5EC0 8011F7C0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5EC4 8011F7C4 8C620000 */ lw $v0, ($v1) /* B5EC8 8011F7C8 0040202D */ daddu $a0, $v0, $zero /* B5ECC 8011F7CC 24420008 */ addiu $v0, $v0, 8 @@ -204,8 +204,8 @@ glabel func_8011F4D4 /* B5EE0 8011F7E0 2442BE78 */ addiu $v0, $v0, %lo(D_8014BE78) /* B5EE4 8011F7E4 08047E42 */ j .L8011F908 /* B5EE8 8011F7E8 AC820004 */ sw $v0, 4($a0) -/* B5EEC 8011F7EC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B5EF0 8011F7F0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B5EEC 8011F7EC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B5EF0 8011F7F0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5EF4 8011F7F4 8C620000 */ lw $v0, ($v1) /* B5EF8 8011F7F8 0040202D */ daddu $a0, $v0, $zero /* B5EFC 8011F7FC 24420008 */ addiu $v0, $v0, 8 @@ -216,8 +216,8 @@ glabel func_8011F4D4 /* B5F10 8011F810 2442BEA0 */ addiu $v0, $v0, %lo(D_8014BEA0) /* B5F14 8011F814 08047E42 */ j .L8011F908 /* B5F18 8011F818 AC820004 */ sw $v0, 4($a0) -/* B5F1C 8011F81C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B5F20 8011F820 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B5F1C 8011F81C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B5F20 8011F820 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5F24 8011F824 8C620000 */ lw $v0, ($v1) /* B5F28 8011F828 0040202D */ daddu $a0, $v0, $zero /* B5F2C 8011F82C 24420008 */ addiu $v0, $v0, 8 @@ -228,8 +228,8 @@ glabel func_8011F4D4 /* B5F40 8011F840 2442BEC8 */ addiu $v0, $v0, %lo(D_8014BEC8) /* B5F44 8011F844 08047E42 */ j .L8011F908 /* B5F48 8011F848 AC820004 */ sw $v0, 4($a0) -/* B5F4C 8011F84C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B5F50 8011F850 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B5F4C 8011F84C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B5F50 8011F850 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5F54 8011F854 8C620000 */ lw $v0, ($v1) /* B5F58 8011F858 0040202D */ daddu $a0, $v0, $zero /* B5F5C 8011F85C 24420008 */ addiu $v0, $v0, 8 @@ -240,8 +240,8 @@ glabel func_8011F4D4 /* B5F70 8011F870 2442BEF0 */ addiu $v0, $v0, %lo(D_8014BEF0) /* B5F74 8011F874 08047E42 */ j .L8011F908 /* B5F78 8011F878 AC820004 */ sw $v0, 4($a0) -/* B5F7C 8011F87C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B5F80 8011F880 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B5F7C 8011F87C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B5F80 8011F880 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5F84 8011F884 8C620000 */ lw $v0, ($v1) /* B5F88 8011F888 0040202D */ daddu $a0, $v0, $zero /* B5F8C 8011F88C 24420008 */ addiu $v0, $v0, 8 @@ -252,8 +252,8 @@ glabel func_8011F4D4 /* B5FA0 8011F8A0 2442BF18 */ addiu $v0, $v0, %lo(D_8014BF18) /* B5FA4 8011F8A4 08047E42 */ j .L8011F908 /* B5FA8 8011F8A8 AC820004 */ sw $v0, 4($a0) -/* B5FAC 8011F8AC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B5FB0 8011F8B0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B5FAC 8011F8AC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B5FB0 8011F8B0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5FB4 8011F8B4 8C620000 */ lw $v0, ($v1) /* B5FB8 8011F8B8 0040202D */ daddu $a0, $v0, $zero /* B5FBC 8011F8BC 24420008 */ addiu $v0, $v0, 8 @@ -264,8 +264,8 @@ glabel func_8011F4D4 /* B5FD0 8011F8D0 2442BF40 */ addiu $v0, $v0, %lo(D_8014BF40) /* B5FD4 8011F8D4 08047E42 */ j .L8011F908 /* B5FD8 8011F8D8 AC820004 */ sw $v0, 4($a0) -/* B5FDC 8011F8DC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B5FE0 8011F8E0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B5FDC 8011F8DC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B5FE0 8011F8E0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5FE4 8011F8E4 8C620000 */ lw $v0, ($v1) /* B5FE8 8011F8E8 0040202D */ daddu $a0, $v0, $zero /* B5FEC 8011F8EC 24420008 */ addiu $v0, $v0, 8 @@ -291,7 +291,7 @@ glabel func_8011F4D4 /* B6034 8011F934 14410004 */ bne $v0, $at, .L8011F948 /* B6038 8011F938 3C018000 */ lui $at, 0x8000 /* B603C 8011F93C 14E10002 */ bne $a3, $at, .L8011F948 -/* B6040 8011F940 00000000 */ nop +/* B6040 8011F940 00000000 */ nop /* B6044 8011F944 0006000D */ break 6 .L8011F948: /* B6048 8011F948 00003812 */ mflo $a3 @@ -306,12 +306,12 @@ glabel func_8011F4D4 /* B6068 8011F968 14410004 */ bne $v0, $at, .L8011F97C /* B606C 8011F96C 3C018000 */ lui $at, 0x8000 /* B6070 8011F970 14A10002 */ bne $a1, $at, .L8011F97C -/* B6074 8011F974 00000000 */ nop +/* B6074 8011F974 00000000 */ nop /* B6078 8011F978 0006000D */ break 6 .L8011F97C: /* B607C 8011F97C 00002812 */ mflo $a1 -/* B6080 8011F980 3C08800A */ lui $t0, %hi(D_8009A66C) -/* B6084 8011F984 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* B6080 8011F980 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* B6084 8011F984 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* B6088 8011F988 8D060000 */ lw $a2, ($t0) /* B608C 8011F98C 00C0482D */ daddu $t1, $a2, $zero /* B6090 8011F990 24C60008 */ addiu $a2, $a2, 8 @@ -351,8 +351,8 @@ glabel func_8011F4D4 /* B6110 8011FA10 0C047E95 */ jal func_8011FA54 /* B6114 8011FA14 27A60010 */ addiu $a2, $sp, 0x10 /* B6118 8011FA18 3C05D838 */ lui $a1, 0xd838 -/* B611C 8011FA1C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B6120 8011FA20 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B611C 8011FA1C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B6120 8011FA20 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B6124 8011FA24 8C620000 */ lw $v0, ($v1) /* B6128 8011FA28 34A50002 */ ori $a1, $a1, 2 /* B612C 8011FA2C 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FA54.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FA54.s index 9a6565be62..a1301527ba 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FA54.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FA54.s @@ -40,7 +40,7 @@ glabel func_8011FA54 /* B61D8 8011FAD8 1440FFF2 */ bnez $v0, .L8011FAA4 /* B61DC 8011FADC 26100004 */ addiu $s0, $s0, 4 /* B61E0 8011FAE0 08047FD1 */ j .L8011FF44 -/* B61E4 8011FAE4 00000000 */ nop +/* B61E4 8011FAE4 00000000 */ nop .L8011FAE8: /* B61E8 8011FAE8 26D000B4 */ addiu $s0, $s6, 0xb4 /* B61EC 8011FAEC 0200202D */ daddu $a0, $s0, $zero @@ -50,10 +50,10 @@ glabel func_8011FA54 /* B61FC 8011FAFC 3C120001 */ lui $s2, 1 /* B6200 8011FB00 36521630 */ ori $s2, $s2, 0x1630 /* B6204 8011FB04 0200202D */ daddu $a0, $s0, $zero -/* B6208 8011FB08 3C108007 */ lui $s0, %hi(D_800741F0) -/* B620C 8011FB0C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* B6210 8011FB10 3C11800A */ lui $s1, %hi(D_8009A674) -/* B6214 8011FB14 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* B6208 8011FB08 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* B620C 8011FB0C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* B6210 8011FB10 3C11800A */ lui $s1, %hi(gDisplayContext) +/* B6214 8011FB14 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* B6218 8011FB18 96050000 */ lhu $a1, ($s0) /* B621C 8011FB1C 8E220000 */ lw $v0, ($s1) /* B6220 8011FB20 00052980 */ sll $a1, $a1, 6 @@ -67,8 +67,8 @@ glabel func_8011FA54 /* B6240 8011FB40 3C06E300 */ lui $a2, 0xe300 /* B6244 8011FB44 34C61001 */ ori $a2, $a2, 0x1001 /* B6248 8011FB48 3C07D9FD */ lui $a3, 0xd9fd -/* B624C 8011FB4C 3C09800A */ lui $t1, %hi(D_8009A66C) -/* B6250 8011FB50 2529A66C */ addiu $t1, $t1, %lo(D_8009A66C) +/* B624C 8011FB4C 3C09800A */ lui $t1, %hi(gMasterGfxPos) +/* B6250 8011FB50 2529A66C */ addiu $t1, $t1, %lo(gMasterGfxPos) /* B6254 8011FB54 34E7FFFF */ ori $a3, $a3, 0xffff /* B6258 8011FB58 8D280000 */ lw $t0, ($t1) /* B625C 8011FB5C 96020000 */ lhu $v0, ($s0) @@ -144,8 +144,8 @@ glabel func_8011FA54 /* B636C 8011FC6C AC640000 */ sw $a0, ($v1) /* B6370 8011FC70 AC620004 */ sw $v0, 4($v1) .L8011FC74: -/* B6374 8011FC74 3C10800A */ lui $s0, %hi(D_8009A66C) -/* B6378 8011FC78 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* B6374 8011FC74 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* B6378 8011FC78 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* B637C 8011FC7C 8E020000 */ lw $v0, ($s0) /* B6380 8011FC80 3C11E700 */ lui $s1, 0xe700 /* B6384 8011FC84 0040182D */ daddu $v1, $v0, $zero @@ -158,7 +158,7 @@ glabel func_8011FA54 /* B63A0 8011FCA0 AE020000 */ sw $v0, ($s0) /* B63A4 8011FCA4 8D4402D8 */ lw $a0, 0x2d8($t2) /* B63A8 8011FCA8 0060F809 */ jalr $v1 -/* B63AC 8011FCAC 00000000 */ nop +/* B63AC 8011FCAC 00000000 */ nop .L8011FCB0: /* B63B0 8011FCB0 8E040000 */ lw $a0, ($s0) /* B63B4 8011FCB4 0080102D */ daddu $v0, $a0, $zero @@ -208,10 +208,10 @@ glabel func_8011FA54 /* B6454 8011FD54 28620060 */ slti $v0, $v1, 0x60 .L8011FD58: /* B6458 8011FD58 14400003 */ bnez $v0, .L8011FD68 -/* B645C 8011FD5C 00000000 */ nop +/* B645C 8011FD5C 00000000 */ nop .L8011FD60: /* B6460 8011FD60 08047F58 */ j .L8011FD60 -/* B6464 8011FD64 00000000 */ nop +/* B6464 8011FD64 00000000 */ nop .L8011FD68: /* B6468 8011FD68 0C00AB0A */ jal general_heap_malloc /* B646C 8011FD6C 000420C0 */ sll $a0, $a0, 3 @@ -220,7 +220,7 @@ glabel func_8011FA54 /* B6478 8011FD78 AEF30004 */ sw $s3, 4($s7) .L8011FD7C: /* B647C 8011FD7C 08047F5F */ j .L8011FD7C -/* B6480 8011FD80 00000000 */ nop +/* B6480 8011FD80 00000000 */ nop .L8011FD84: /* B6484 8011FD84 0000A82D */ daddu $s5, $zero, $zero /* B6488 8011FD88 24020003 */ addiu $v0, $zero, 3 @@ -305,8 +305,8 @@ glabel func_8011FA54 /* B65B0 8011FEB0 1462FFC0 */ bne $v1, $v0, .L8011FDB4 /* B65B4 8011FEB4 26940001 */ addiu $s4, $s4, 1 .L8011FEB8: -/* B65B8 8011FEB8 3C05800A */ lui $a1, %hi(D_8009A66C) -/* B65BC 8011FEBC 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* B65B8 8011FEB8 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* B65BC 8011FEBC 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* B65C0 8011FEC0 0260202D */ daddu $a0, $s3, $zero /* B65C4 8011FEC4 8CA30000 */ lw $v1, ($a1) /* B65C8 8011FEC8 3C02DF00 */ lui $v0, 0xdf00 @@ -321,8 +321,8 @@ glabel func_8011FA54 /* B65EC 8011FEEC AC820004 */ sw $v0, 4($a0) .L8011FEF0: /* B65F0 8011FEF0 0000882D */ daddu $s1, $zero, $zero -/* B65F4 8011FEF4 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B65F8 8011FEF8 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B65F4 8011FEF4 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B65F8 8011FEF8 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B65FC 8011FEFC 8C620000 */ lw $v0, ($v1) /* B6600 8011FF00 02C0802D */ daddu $s0, $s6, $zero /* B6604 8011FF04 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s index 24f00f17a4..359646fdef 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s @@ -8,10 +8,10 @@ glabel func_80121184 /* B7890 80121190 3C020001 */ lui $v0, 1 /* B7894 80121194 34421630 */ ori $v0, $v0, 0x1630 /* B7898 80121198 26450018 */ addiu $a1, $s2, 0x18 -/* B789C 8012119C 3C038007 */ lui $v1, %hi(D_800741F0) -/* B78A0 801211A0 946341F0 */ lhu $v1, %lo(D_800741F0)($v1) -/* B78A4 801211A4 3C04800A */ lui $a0, %hi(D_8009A674) -/* B78A8 801211A8 8C84A674 */ lw $a0, %lo(D_8009A674)($a0) +/* B789C 8012119C 3C038007 */ lui $v1, %hi(gMatrixListPos) +/* B78A0 801211A0 946341F0 */ lhu $v1, %lo(gMatrixListPos)($v1) +/* B78A4 801211A4 3C04800A */ lui $a0, %hi(gDisplayContext) +/* B78A8 801211A8 8C84A674 */ lw $a0, %lo(gDisplayContext)($a0) /* B78AC 801211AC 26460058 */ addiu $a2, $s2, 0x58 /* B78B0 801211B0 AFBF00F4 */ sw $ra, 0xf4($sp) /* B78B4 801211B4 AFB100EC */ sw $s1, 0xec($sp) @@ -34,11 +34,11 @@ glabel func_80121184 /* B78F4 801211F4 3C02DA38 */ lui $v0, 0xda38 /* B78F8 801211F8 34420002 */ ori $v0, $v0, 2 /* B78FC 801211FC 3C070001 */ lui $a3, 1 -/* B7900 80121200 3C0D800A */ lui $t5, %hi(D_8009A66C) -/* B7904 80121204 25ADA66C */ addiu $t5, $t5, %lo(D_8009A66C) +/* B7900 80121200 3C0D800A */ lui $t5, %hi(gMasterGfxPos) +/* B7904 80121204 25ADA66C */ addiu $t5, $t5, %lo(gMasterGfxPos) /* B7908 80121208 34E71630 */ ori $a3, $a3, 0x1630 -/* B790C 8012120C 3C068007 */ lui $a2, %hi(D_800741F0) -/* B7910 80121210 24C641F0 */ addiu $a2, $a2, %lo(D_800741F0) +/* B790C 8012120C 3C068007 */ lui $a2, %hi(gMatrixListPos) +/* B7910 80121210 24C641F0 */ addiu $a2, $a2, %lo(gMatrixListPos) /* B7914 80121214 8DAC0000 */ lw $t4, ($t5) /* B7918 80121218 94C40000 */ lhu $a0, ($a2) /* B791C 8012121C 0180282D */ daddu $a1, $t4, $zero @@ -47,8 +47,8 @@ glabel func_80121184 /* B7928 80121228 ACA20000 */ sw $v0, ($a1) /* B792C 8012122C 3082FFFF */ andi $v0, $a0, 0xffff /* B7930 80121230 00021180 */ sll $v0, $v0, 6 -/* B7934 80121234 3C03800A */ lui $v1, %hi(D_8009A674) -/* B7938 80121238 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* B7934 80121234 3C03800A */ lui $v1, %hi(gDisplayContext) +/* B7938 80121238 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* B793C 8012123C 00471021 */ addu $v0, $v0, $a3 /* B7940 80121240 00621821 */ addu $v1, $v1, $v0 /* B7944 80121244 ACA30004 */ sw $v1, 4($a1) @@ -113,7 +113,7 @@ glabel func_80121184 /* B7A2C 8012132C 112200C3 */ beq $t1, $v0, .L8012163C /* B7A30 80121330 3C02D9FD */ lui $v0, %hi(D_D9FCFFFF) /* B7A34 80121334 0804862C */ j .L801218B0 -/* B7A38 80121338 00000000 */ nop +/* B7A38 80121338 00000000 */ nop .L8012133C: /* B7A3C 8012133C 92420004 */ lbu $v0, 4($s2) /* B7A40 80121340 2442FFFF */ addiu $v0, $v0, %lo(D_D9FCFFFF) @@ -126,9 +126,9 @@ glabel func_80121184 /* B7A5C 8012135C 00220821 */ addu $at, $at, $v0 /* B7A60 80121360 8C2200D0 */ lw $v0, %lo(D_801500D0)($at) /* B7A64 80121364 00400008 */ jr $v0 -/* B7A68 80121368 00000000 */ nop -/* B7A6C 8012136C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7A70 80121370 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7A68 80121368 00000000 */ nop +/* B7A6C 8012136C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7A70 80121370 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7A74 80121374 8C620000 */ lw $v0, ($v1) /* B7A78 80121378 0040202D */ daddu $a0, $v0, $zero /* B7A7C 8012137C 24420008 */ addiu $v0, $v0, 8 @@ -139,8 +139,8 @@ glabel func_80121184 /* B7A90 80121390 2442B7F8 */ addiu $v0, $v0, %lo(D_8014B7F8) /* B7A94 80121394 0804862B */ j .L801218AC /* B7A98 80121398 AC820004 */ sw $v0, 4($a0) -/* B7A9C 8012139C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7AA0 801213A0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7A9C 8012139C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7AA0 801213A0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7AA4 801213A4 8C620000 */ lw $v0, ($v1) /* B7AA8 801213A8 0040202D */ daddu $a0, $v0, $zero /* B7AAC 801213AC 24420008 */ addiu $v0, $v0, 8 @@ -151,8 +151,8 @@ glabel func_80121184 /* B7AC0 801213C0 2442B820 */ addiu $v0, $v0, %lo(D_8014B820) /* B7AC4 801213C4 0804862B */ j .L801218AC /* B7AC8 801213C8 AC820004 */ sw $v0, 4($a0) -/* B7ACC 801213CC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7AD0 801213D0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7ACC 801213CC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7AD0 801213D0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7AD4 801213D4 8C620000 */ lw $v0, ($v1) /* B7AD8 801213D8 0040202D */ daddu $a0, $v0, $zero /* B7ADC 801213DC 24420008 */ addiu $v0, $v0, 8 @@ -163,8 +163,8 @@ glabel func_80121184 /* B7AF0 801213F0 2442B848 */ addiu $v0, $v0, %lo(D_8014B848) /* B7AF4 801213F4 0804862B */ j .L801218AC /* B7AF8 801213F8 AC820004 */ sw $v0, 4($a0) -/* B7AFC 801213FC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7B00 80121400 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7AFC 801213FC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7B00 80121400 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7B04 80121404 8C620000 */ lw $v0, ($v1) /* B7B08 80121408 0040202D */ daddu $a0, $v0, $zero /* B7B0C 8012140C 24420008 */ addiu $v0, $v0, 8 @@ -175,8 +175,8 @@ glabel func_80121184 /* B7B20 80121420 2442B870 */ addiu $v0, $v0, %lo(D_8014B870) /* B7B24 80121424 0804862B */ j .L801218AC /* B7B28 80121428 AC820004 */ sw $v0, 4($a0) -/* B7B2C 8012142C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7B30 80121430 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7B2C 8012142C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7B30 80121430 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7B34 80121434 8C620000 */ lw $v0, ($v1) /* B7B38 80121438 0040202D */ daddu $a0, $v0, $zero /* B7B3C 8012143C 24420008 */ addiu $v0, $v0, 8 @@ -187,8 +187,8 @@ glabel func_80121184 /* B7B50 80121450 2442B898 */ addiu $v0, $v0, %lo(D_8014B898) /* B7B54 80121454 0804862B */ j .L801218AC /* B7B58 80121458 AC820004 */ sw $v0, 4($a0) -/* B7B5C 8012145C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7B60 80121460 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7B5C 8012145C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7B60 80121460 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7B64 80121464 8C620000 */ lw $v0, ($v1) /* B7B68 80121468 0040202D */ daddu $a0, $v0, $zero /* B7B6C 8012146C 24420008 */ addiu $v0, $v0, 8 @@ -199,8 +199,8 @@ glabel func_80121184 /* B7B80 80121480 2442B9B0 */ addiu $v0, $v0, %lo(D_8014B9B0) /* B7B84 80121484 0804862B */ j .L801218AC /* B7B88 80121488 AC820004 */ sw $v0, 4($a0) -/* B7B8C 8012148C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7B90 80121490 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7B8C 8012148C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7B90 80121490 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7B94 80121494 8C620000 */ lw $v0, ($v1) /* B7B98 80121498 0040202D */ daddu $a0, $v0, $zero /* B7B9C 8012149C 24420008 */ addiu $v0, $v0, 8 @@ -211,8 +211,8 @@ glabel func_80121184 /* B7BB0 801214B0 2442B8C0 */ addiu $v0, $v0, %lo(D_8014B8C0) /* B7BB4 801214B4 0804862B */ j .L801218AC /* B7BB8 801214B8 AC820004 */ sw $v0, 4($a0) -/* B7BBC 801214BC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7BC0 801214C0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7BBC 801214BC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7BC0 801214C0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7BC4 801214C4 8C620000 */ lw $v0, ($v1) /* B7BC8 801214C8 0040202D */ daddu $a0, $v0, $zero /* B7BCC 801214CC 24420008 */ addiu $v0, $v0, 8 @@ -223,8 +223,8 @@ glabel func_80121184 /* B7BE0 801214E0 2442B9D8 */ addiu $v0, $v0, %lo(D_8014B9D8) /* B7BE4 801214E4 0804862B */ j .L801218AC /* B7BE8 801214E8 AC820004 */ sw $v0, 4($a0) -/* B7BEC 801214EC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7BF0 801214F0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7BEC 801214EC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7BF0 801214F0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7BF4 801214F4 8C620000 */ lw $v0, ($v1) /* B7BF8 801214F8 0040202D */ daddu $a0, $v0, $zero /* B7BFC 801214FC 24420008 */ addiu $v0, $v0, 8 @@ -235,8 +235,8 @@ glabel func_80121184 /* B7C10 80121510 2442B8E8 */ addiu $v0, $v0, %lo(D_8014B8E8) /* B7C14 80121514 0804862B */ j .L801218AC /* B7C18 80121518 AC820004 */ sw $v0, 4($a0) -/* B7C1C 8012151C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7C20 80121520 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7C1C 8012151C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7C20 80121520 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7C24 80121524 8C620000 */ lw $v0, ($v1) /* B7C28 80121528 0040202D */ daddu $a0, $v0, $zero /* B7C2C 8012152C 24420008 */ addiu $v0, $v0, 8 @@ -247,8 +247,8 @@ glabel func_80121184 /* B7C40 80121540 2442BA00 */ addiu $v0, $v0, %lo(D_8014BA00) /* B7C44 80121544 0804862B */ j .L801218AC /* B7C48 80121548 AC820004 */ sw $v0, 4($a0) -/* B7C4C 8012154C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7C50 80121550 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7C4C 8012154C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7C50 80121550 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7C54 80121554 8C620000 */ lw $v0, ($v1) /* B7C58 80121558 0040202D */ daddu $a0, $v0, $zero /* B7C5C 8012155C 24420008 */ addiu $v0, $v0, 8 @@ -259,8 +259,8 @@ glabel func_80121184 /* B7C70 80121570 2442B988 */ addiu $v0, $v0, %lo(D_8014B988) /* B7C74 80121574 0804862B */ j .L801218AC /* B7C78 80121578 AC820004 */ sw $v0, 4($a0) -/* B7C7C 8012157C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7C80 80121580 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7C7C 8012157C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7C80 80121580 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7C84 80121584 8C620000 */ lw $v0, ($v1) /* B7C88 80121588 0040202D */ daddu $a0, $v0, $zero /* B7C8C 8012158C 24420008 */ addiu $v0, $v0, 8 @@ -271,8 +271,8 @@ glabel func_80121184 /* B7CA0 801215A0 2442BA48 */ addiu $v0, $v0, %lo(D_8014BA48) /* B7CA4 801215A4 0804862B */ j .L801218AC /* B7CA8 801215A8 AC820004 */ sw $v0, 4($a0) -/* B7CAC 801215AC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7CB0 801215B0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7CAC 801215AC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7CB0 801215B0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7CB4 801215B4 8C620000 */ lw $v0, ($v1) /* B7CB8 801215B8 0040202D */ daddu $a0, $v0, $zero /* B7CBC 801215BC 24420008 */ addiu $v0, $v0, 8 @@ -283,8 +283,8 @@ glabel func_80121184 /* B7CD0 801215D0 2442BA70 */ addiu $v0, $v0, %lo(D_8014BA70) /* B7CD4 801215D4 0804862B */ j .L801218AC /* B7CD8 801215D8 AC820004 */ sw $v0, 4($a0) -/* B7CDC 801215DC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7CE0 801215E0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7CDC 801215DC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7CE0 801215E0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7CE4 801215E4 8C620000 */ lw $v0, ($v1) /* B7CE8 801215E8 0040202D */ daddu $a0, $v0, $zero /* B7CEC 801215EC 24420008 */ addiu $v0, $v0, 8 @@ -295,8 +295,8 @@ glabel func_80121184 /* B7D00 80121600 2442BA98 */ addiu $v0, $v0, %lo(D_8014BA98) /* B7D04 80121604 0804862B */ j .L801218AC /* B7D08 80121608 AC820004 */ sw $v0, 4($a0) -/* B7D0C 8012160C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7D10 80121610 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7D0C 8012160C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7D10 80121610 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7D14 80121614 8C620000 */ lw $v0, ($v1) /* B7D18 80121618 0040202D */ daddu $a0, $v0, $zero /* B7D1C 8012161C 24420008 */ addiu $v0, $v0, 8 @@ -319,9 +319,9 @@ glabel func_80121184 /* B7D5C 8012165C 00220821 */ addu $at, $at, $v0 /* B7D60 80121660 8C220188 */ lw $v0, %lo(D_80150188)($at) /* B7D64 80121664 00400008 */ jr $v0 -/* B7D68 80121668 00000000 */ nop -/* B7D6C 8012166C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7D70 80121670 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7D68 80121668 00000000 */ nop +/* B7D6C 8012166C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7D70 80121670 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7D74 80121674 8C620000 */ lw $v0, ($v1) /* B7D78 80121678 0040202D */ daddu $a0, $v0, $zero /* B7D7C 8012167C 24420008 */ addiu $v0, $v0, 8 @@ -332,8 +332,8 @@ glabel func_80121184 /* B7D90 80121690 2442BE78 */ addiu $v0, $v0, %lo(D_8014BE78) /* B7D94 80121694 080485EE */ j .L801217B8 /* B7D98 80121698 AC820004 */ sw $v0, 4($a0) -/* B7D9C 8012169C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7DA0 801216A0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7D9C 8012169C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7DA0 801216A0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7DA4 801216A4 8C620000 */ lw $v0, ($v1) /* B7DA8 801216A8 0040202D */ daddu $a0, $v0, $zero /* B7DAC 801216AC 24420008 */ addiu $v0, $v0, 8 @@ -344,8 +344,8 @@ glabel func_80121184 /* B7DC0 801216C0 2442BEA0 */ addiu $v0, $v0, %lo(D_8014BEA0) /* B7DC4 801216C4 080485EE */ j .L801217B8 /* B7DC8 801216C8 AC820004 */ sw $v0, 4($a0) -/* B7DCC 801216CC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7DD0 801216D0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7DCC 801216CC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7DD0 801216D0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7DD4 801216D4 8C620000 */ lw $v0, ($v1) /* B7DD8 801216D8 0040202D */ daddu $a0, $v0, $zero /* B7DDC 801216DC 24420008 */ addiu $v0, $v0, 8 @@ -356,8 +356,8 @@ glabel func_80121184 /* B7DF0 801216F0 2442BEC8 */ addiu $v0, $v0, %lo(D_8014BEC8) /* B7DF4 801216F4 080485EE */ j .L801217B8 /* B7DF8 801216F8 AC820004 */ sw $v0, 4($a0) -/* B7DFC 801216FC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7E00 80121700 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7DFC 801216FC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7E00 80121700 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7E04 80121704 8C620000 */ lw $v0, ($v1) /* B7E08 80121708 0040202D */ daddu $a0, $v0, $zero /* B7E0C 8012170C 24420008 */ addiu $v0, $v0, 8 @@ -368,8 +368,8 @@ glabel func_80121184 /* B7E20 80121720 2442BEF0 */ addiu $v0, $v0, %lo(D_8014BEF0) /* B7E24 80121724 080485EE */ j .L801217B8 /* B7E28 80121728 AC820004 */ sw $v0, 4($a0) -/* B7E2C 8012172C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7E30 80121730 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7E2C 8012172C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7E30 80121730 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7E34 80121734 8C620000 */ lw $v0, ($v1) /* B7E38 80121738 0040202D */ daddu $a0, $v0, $zero /* B7E3C 8012173C 24420008 */ addiu $v0, $v0, 8 @@ -380,8 +380,8 @@ glabel func_80121184 /* B7E50 80121750 2442BF18 */ addiu $v0, $v0, %lo(D_8014BF18) /* B7E54 80121754 080485EE */ j .L801217B8 /* B7E58 80121758 AC820004 */ sw $v0, 4($a0) -/* B7E5C 8012175C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7E60 80121760 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7E5C 8012175C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7E60 80121760 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7E64 80121764 8C620000 */ lw $v0, ($v1) /* B7E68 80121768 0040202D */ daddu $a0, $v0, $zero /* B7E6C 8012176C 24420008 */ addiu $v0, $v0, 8 @@ -392,8 +392,8 @@ glabel func_80121184 /* B7E80 80121780 2442BF40 */ addiu $v0, $v0, %lo(D_8014BF40) /* B7E84 80121784 080485EE */ j .L801217B8 /* B7E88 80121788 AC820004 */ sw $v0, 4($a0) -/* B7E8C 8012178C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B7E90 80121790 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B7E8C 8012178C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B7E90 80121790 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7E94 80121794 8C620000 */ lw $v0, ($v1) /* B7E98 80121798 0040202D */ daddu $a0, $v0, $zero /* B7E9C 8012179C 24420008 */ addiu $v0, $v0, 8 @@ -419,7 +419,7 @@ glabel func_80121184 /* B7EE4 801217E4 14410004 */ bne $v0, $at, .L801217F8 /* B7EE8 801217E8 3C018000 */ lui $at, 0x8000 /* B7EEC 801217EC 14E10002 */ bne $a3, $at, .L801217F8 -/* B7EF0 801217F0 00000000 */ nop +/* B7EF0 801217F0 00000000 */ nop /* B7EF4 801217F4 0006000D */ break 6 .L801217F8: /* B7EF8 801217F8 00003812 */ mflo $a3 @@ -434,12 +434,12 @@ glabel func_80121184 /* B7F18 80121818 14410004 */ bne $v0, $at, .L8012182C /* B7F1C 8012181C 3C018000 */ lui $at, 0x8000 /* B7F20 80121820 14A10002 */ bne $a1, $at, .L8012182C -/* B7F24 80121824 00000000 */ nop +/* B7F24 80121824 00000000 */ nop /* B7F28 80121828 0006000D */ break 6 .L8012182C: /* B7F2C 8012182C 00002812 */ mflo $a1 -/* B7F30 80121830 3C08800A */ lui $t0, %hi(D_8009A66C) -/* B7F34 80121834 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* B7F30 80121830 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* B7F34 80121834 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* B7F38 80121838 8D060000 */ lw $a2, ($t0) /* B7F3C 8012183C 00C0482D */ daddu $t1, $a2, $zero /* B7F40 80121840 24C60008 */ addiu $a2, $a2, 8 @@ -472,8 +472,8 @@ glabel func_80121184 .L801218AC: /* B7FAC 801218AC 3C02D9FD */ lui $v0, 0xd9fd .L801218B0: -/* B7FB0 801218B0 3C06800A */ lui $a2, %hi(D_8009A66C) -/* B7FB4 801218B4 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* B7FB0 801218B0 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* B7FB4 801218B4 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* B7FB8 801218B8 3442FFFF */ ori $v0, $v0, 0xffff /* B7FBC 801218BC 8CC50000 */ lw $a1, ($a2) /* B7FC0 801218C0 3C048015 */ lui $a0, %hi(D_80154378) @@ -508,9 +508,9 @@ glabel func_80121184 .L8012192C: /* B802C 8012192C 8E42005C */ lw $v0, 0x5c($s2) /* B8030 80121930 10400012 */ beqz $v0, .L8012197C -/* B8034 80121934 00000000 */ nop -/* B8038 80121938 3C04800A */ lui $a0, %hi(D_8009A66C) -/* B803C 8012193C 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* B8034 80121934 00000000 */ nop +/* B8038 80121938 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* B803C 8012193C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* B8040 80121940 8C830000 */ lw $v1, ($a0) /* B8044 80121944 3C028015 */ lui $v0, %hi(D_80154374) /* B8048 80121948 8C424374 */ lw $v0, %lo(D_80154374)($v0) @@ -527,8 +527,8 @@ glabel func_80121184 /* B8074 80121974 00431021 */ addu $v0, $v0, $v1 /* B8078 80121978 ACA20004 */ sw $v0, 4($a1) .L8012197C: -/* B807C 8012197C 3C10800A */ lui $s0, %hi(D_8009A66C) -/* B8080 80121980 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* B807C 8012197C 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* B8080 80121980 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* B8084 80121984 8E020000 */ lw $v0, ($s0) /* B8088 80121988 3C11E700 */ lui $s1, 0xe700 /* B808C 8012198C 0040182D */ daddu $v1, $v0, $zero @@ -540,7 +540,7 @@ glabel func_80121184 /* B80A4 801219A4 AE020000 */ sw $v0, ($s0) /* B80A8 801219A8 8E440064 */ lw $a0, 0x64($s2) /* B80AC 801219AC 0060F809 */ jalr $v1 -/* B80B0 801219B0 00000000 */ nop +/* B80B0 801219B0 00000000 */ nop .L801219B4: /* B80B4 801219B4 3C05D838 */ lui $a1, 0xd838 /* B80B8 801219B8 8E020000 */ lw $v0, ($s0) @@ -585,10 +585,10 @@ glabel func_80121184 /* B8154 80121A54 3C040001 */ lui $a0, 1 /* B8158 80121A58 34841630 */ ori $a0, $a0, 0x1630 /* B815C 80121A5C 26450058 */ addiu $a1, $s2, 0x58 -/* B8160 80121A60 3C028007 */ lui $v0, %hi(D_800741F0) -/* B8164 80121A64 944241F0 */ lhu $v0, %lo(D_800741F0)($v0) -/* B8168 80121A68 3C03800A */ lui $v1, %hi(D_8009A674) -/* B816C 80121A6C 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* B8160 80121A60 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* B8164 80121A64 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) +/* B8168 80121A68 3C03800A */ lui $v1, %hi(gDisplayContext) +/* B816C 80121A6C 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* B8170 80121A70 00021180 */ sll $v0, $v0, 6 /* B8174 80121A74 00621821 */ addu $v1, $v1, $v0 /* B8178 80121A78 00641821 */ addu $v1, $v1, $a0 @@ -607,11 +607,11 @@ glabel func_80121184 /* B81A8 80121AA8 3C03DA38 */ lui $v1, 0xda38 /* B81AC 80121AAC 34630002 */ ori $v1, $v1, 2 /* B81B0 80121AB0 3C080001 */ lui $t0, 1 -/* B81B4 80121AB4 3C06800A */ lui $a2, %hi(D_8009A66C) -/* B81B8 80121AB8 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* B81B4 80121AB4 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* B81B8 80121AB8 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* B81BC 80121ABC 35081630 */ ori $t0, $t0, 0x1630 -/* B81C0 80121AC0 3C058007 */ lui $a1, %hi(D_800741F0) -/* B81C4 80121AC4 24A541F0 */ addiu $a1, $a1, %lo(D_800741F0) +/* B81C0 80121AC0 3C058007 */ lui $a1, %hi(gMatrixListPos) +/* B81C4 80121AC4 24A541F0 */ addiu $a1, $a1, %lo(gMatrixListPos) /* B81C8 80121AC8 8CC40000 */ lw $a0, ($a2) /* B81CC 80121ACC 94A20000 */ lhu $v0, ($a1) /* B81D0 80121AD0 0080382D */ daddu $a3, $a0, $zero @@ -622,8 +622,8 @@ glabel func_80121184 /* B81E4 80121AE4 3042FFFF */ andi $v0, $v0, 0xffff /* B81E8 80121AE8 00021180 */ sll $v0, $v0, 6 /* B81EC 80121AEC A4A30000 */ sh $v1, ($a1) -/* B81F0 80121AF0 3C03800A */ lui $v1, %hi(D_8009A674) -/* B81F4 80121AF4 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* B81F0 80121AF0 3C03800A */ lui $v1, %hi(gDisplayContext) +/* B81F4 80121AF4 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* B81F8 80121AF8 00481021 */ addu $v0, $v0, $t0 /* B81FC 80121AFC 00621821 */ addu $v1, $v1, $v0 /* B8200 80121B00 3C02DE00 */ lui $v0, 0xde00 @@ -729,8 +729,8 @@ glabel func_80121184 /* B838C 80121C8C 0200382D */ daddu $a3, $s0, $zero .L80121C90: /* B8390 80121C90 3C03D838 */ lui $v1, 0xd838 -/* B8394 80121C94 3C04800A */ lui $a0, %hi(D_8009A66C) -/* B8398 80121C98 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* B8394 80121C94 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* B8398 80121C98 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* B839C 80121C9C 8C820000 */ lw $v0, ($a0) /* B83A0 80121CA0 34630002 */ ori $v1, $v1, 2 /* B83A4 80121CA4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s index 27b4ae80c9..e907275cf5 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s @@ -15,7 +15,7 @@ glabel func_80122288 /* B89B0 801222B0 00822021 */ addu $a0, $a0, $v0 /* B89B4 801222B4 8C920000 */ lw $s2, ($a0) /* B89B8 801222B8 124002AA */ beqz $s2, .L80122D64 -/* B89BC 801222BC 00000000 */ nop +/* B89BC 801222BC 00000000 */ nop /* B89C0 801222C0 8E430000 */ lw $v1, ($s2) /* B89C4 801222C4 106002A7 */ beqz $v1, .L80122D64 /* B89C8 801222C8 30620100 */ andi $v0, $v1, 0x100 @@ -43,10 +43,10 @@ glabel func_80122288 /* B8A1C 8012231C 3C020001 */ lui $v0, 1 /* B8A20 80122320 34421630 */ ori $v0, $v0, 0x1630 /* B8A24 80122324 26450018 */ addiu $a1, $s2, 0x18 -/* B8A28 80122328 3C038007 */ lui $v1, %hi(D_800741F0) -/* B8A2C 8012232C 946341F0 */ lhu $v1, %lo(D_800741F0)($v1) -/* B8A30 80122330 3C04800A */ lui $a0, %hi(D_8009A674) -/* B8A34 80122334 8C84A674 */ lw $a0, %lo(D_8009A674)($a0) +/* B8A28 80122328 3C038007 */ lui $v1, %hi(gMatrixListPos) +/* B8A2C 8012232C 946341F0 */ lhu $v1, %lo(gMatrixListPos)($v1) +/* B8A30 80122330 3C04800A */ lui $a0, %hi(gDisplayContext) +/* B8A34 80122334 8C84A674 */ lw $a0, %lo(gDisplayContext)($a0) /* B8A38 80122338 26460058 */ addiu $a2, $s2, 0x58 /* B8A3C 8012233C AE40005C */ sw $zero, 0x5c($s2) /* B8A40 80122340 00031980 */ sll $v1, $v1, 6 @@ -67,11 +67,11 @@ glabel func_80122288 /* B8A78 80122378 3C02DA38 */ lui $v0, 0xda38 /* B8A7C 8012237C 34420002 */ ori $v0, $v0, 2 /* B8A80 80122380 3C070001 */ lui $a3, 1 -/* B8A84 80122384 3C0D800A */ lui $t5, %hi(D_8009A66C) -/* B8A88 80122388 25ADA66C */ addiu $t5, $t5, %lo(D_8009A66C) +/* B8A84 80122384 3C0D800A */ lui $t5, %hi(gMasterGfxPos) +/* B8A88 80122388 25ADA66C */ addiu $t5, $t5, %lo(gMasterGfxPos) /* B8A8C 8012238C 34E71630 */ ori $a3, $a3, 0x1630 -/* B8A90 80122390 3C068007 */ lui $a2, %hi(D_800741F0) -/* B8A94 80122394 24C641F0 */ addiu $a2, $a2, %lo(D_800741F0) +/* B8A90 80122390 3C068007 */ lui $a2, %hi(gMatrixListPos) +/* B8A94 80122394 24C641F0 */ addiu $a2, $a2, %lo(gMatrixListPos) /* B8A98 80122398 8DAC0000 */ lw $t4, ($t5) /* B8A9C 8012239C 94C40000 */ lhu $a0, ($a2) /* B8AA0 801223A0 0180282D */ daddu $a1, $t4, $zero @@ -80,8 +80,8 @@ glabel func_80122288 /* B8AAC 801223AC ACA20000 */ sw $v0, ($a1) /* B8AB0 801223B0 3082FFFF */ andi $v0, $a0, 0xffff /* B8AB4 801223B4 00021180 */ sll $v0, $v0, 6 -/* B8AB8 801223B8 3C03800A */ lui $v1, %hi(D_8009A674) -/* B8ABC 801223BC 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* B8AB8 801223B8 3C03800A */ lui $v1, %hi(gDisplayContext) +/* B8ABC 801223BC 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* B8AC0 801223C0 00471021 */ addu $v0, $v0, $a3 /* B8AC4 801223C4 00621821 */ addu $v1, $v1, $v0 /* B8AC8 801223C8 ACA30004 */ sw $v1, 4($a1) @@ -102,7 +102,7 @@ glabel func_80122288 /* B8B00 80122400 106200C3 */ beq $v1, $v0, .L80122710 /* B8B04 80122404 3C02D9FD */ lui $v0, %hi(D_D9FCFFFF) /* B8B08 80122408 08048A61 */ j .L80122984 -/* B8B0C 8012240C 00000000 */ nop +/* B8B0C 8012240C 00000000 */ nop .L80122410: /* B8B10 80122410 92420004 */ lbu $v0, 4($s2) /* B8B14 80122414 2442FFFF */ addiu $v0, $v0, %lo(D_D9FCFFFF) @@ -115,9 +115,9 @@ glabel func_80122288 /* B8B30 80122430 00220821 */ addu $at, $at, $v0 /* B8B34 80122434 8C220220 */ lw $v0, %lo(D_80150220)($at) /* B8B38 80122438 00400008 */ jr $v0 -/* B8B3C 8012243C 00000000 */ nop -/* B8B40 80122440 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8B44 80122444 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8B3C 8012243C 00000000 */ nop +/* B8B40 80122440 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8B44 80122444 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8B48 80122448 8C620000 */ lw $v0, ($v1) /* B8B4C 8012244C 0040202D */ daddu $a0, $v0, $zero /* B8B50 80122450 24420008 */ addiu $v0, $v0, 8 @@ -128,8 +128,8 @@ glabel func_80122288 /* B8B64 80122464 2442B7F8 */ addiu $v0, $v0, %lo(D_8014B7F8) /* B8B68 80122468 08048A60 */ j .L80122980 /* B8B6C 8012246C AC820004 */ sw $v0, 4($a0) -/* B8B70 80122470 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8B74 80122474 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8B70 80122470 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8B74 80122474 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8B78 80122478 8C620000 */ lw $v0, ($v1) /* B8B7C 8012247C 0040202D */ daddu $a0, $v0, $zero /* B8B80 80122480 24420008 */ addiu $v0, $v0, 8 @@ -140,8 +140,8 @@ glabel func_80122288 /* B8B94 80122494 2442B820 */ addiu $v0, $v0, %lo(D_8014B820) /* B8B98 80122498 08048A60 */ j .L80122980 /* B8B9C 8012249C AC820004 */ sw $v0, 4($a0) -/* B8BA0 801224A0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8BA4 801224A4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8BA0 801224A0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8BA4 801224A4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8BA8 801224A8 8C620000 */ lw $v0, ($v1) /* B8BAC 801224AC 0040202D */ daddu $a0, $v0, $zero /* B8BB0 801224B0 24420008 */ addiu $v0, $v0, 8 @@ -152,8 +152,8 @@ glabel func_80122288 /* B8BC4 801224C4 2442B848 */ addiu $v0, $v0, %lo(D_8014B848) /* B8BC8 801224C8 08048A60 */ j .L80122980 /* B8BCC 801224CC AC820004 */ sw $v0, 4($a0) -/* B8BD0 801224D0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8BD4 801224D4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8BD0 801224D0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8BD4 801224D4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8BD8 801224D8 8C620000 */ lw $v0, ($v1) /* B8BDC 801224DC 0040202D */ daddu $a0, $v0, $zero /* B8BE0 801224E0 24420008 */ addiu $v0, $v0, 8 @@ -164,8 +164,8 @@ glabel func_80122288 /* B8BF4 801224F4 2442B870 */ addiu $v0, $v0, %lo(D_8014B870) /* B8BF8 801224F8 08048A60 */ j .L80122980 /* B8BFC 801224FC AC820004 */ sw $v0, 4($a0) -/* B8C00 80122500 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8C04 80122504 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8C00 80122500 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8C04 80122504 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8C08 80122508 8C620000 */ lw $v0, ($v1) /* B8C0C 8012250C 0040202D */ daddu $a0, $v0, $zero /* B8C10 80122510 24420008 */ addiu $v0, $v0, 8 @@ -176,8 +176,8 @@ glabel func_80122288 /* B8C24 80122524 2442B898 */ addiu $v0, $v0, %lo(D_8014B898) /* B8C28 80122528 08048A60 */ j .L80122980 /* B8C2C 8012252C AC820004 */ sw $v0, 4($a0) -/* B8C30 80122530 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8C34 80122534 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8C30 80122530 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8C34 80122534 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8C38 80122538 8C620000 */ lw $v0, ($v1) /* B8C3C 8012253C 0040202D */ daddu $a0, $v0, $zero /* B8C40 80122540 24420008 */ addiu $v0, $v0, 8 @@ -188,8 +188,8 @@ glabel func_80122288 /* B8C54 80122554 2442B9B0 */ addiu $v0, $v0, %lo(D_8014B9B0) /* B8C58 80122558 08048A60 */ j .L80122980 /* B8C5C 8012255C AC820004 */ sw $v0, 4($a0) -/* B8C60 80122560 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8C64 80122564 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8C60 80122560 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8C64 80122564 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8C68 80122568 8C620000 */ lw $v0, ($v1) /* B8C6C 8012256C 0040202D */ daddu $a0, $v0, $zero /* B8C70 80122570 24420008 */ addiu $v0, $v0, 8 @@ -200,8 +200,8 @@ glabel func_80122288 /* B8C84 80122584 2442B8C0 */ addiu $v0, $v0, %lo(D_8014B8C0) /* B8C88 80122588 08048A60 */ j .L80122980 /* B8C8C 8012258C AC820004 */ sw $v0, 4($a0) -/* B8C90 80122590 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8C94 80122594 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8C90 80122590 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8C94 80122594 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8C98 80122598 8C620000 */ lw $v0, ($v1) /* B8C9C 8012259C 0040202D */ daddu $a0, $v0, $zero /* B8CA0 801225A0 24420008 */ addiu $v0, $v0, 8 @@ -212,8 +212,8 @@ glabel func_80122288 /* B8CB4 801225B4 2442B9D8 */ addiu $v0, $v0, %lo(D_8014B9D8) /* B8CB8 801225B8 08048A60 */ j .L80122980 /* B8CBC 801225BC AC820004 */ sw $v0, 4($a0) -/* B8CC0 801225C0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8CC4 801225C4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8CC0 801225C0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8CC4 801225C4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8CC8 801225C8 8C620000 */ lw $v0, ($v1) /* B8CCC 801225CC 0040202D */ daddu $a0, $v0, $zero /* B8CD0 801225D0 24420008 */ addiu $v0, $v0, 8 @@ -224,8 +224,8 @@ glabel func_80122288 /* B8CE4 801225E4 2442B8E8 */ addiu $v0, $v0, %lo(D_8014B8E8) /* B8CE8 801225E8 08048A60 */ j .L80122980 /* B8CEC 801225EC AC820004 */ sw $v0, 4($a0) -/* B8CF0 801225F0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8CF4 801225F4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8CF0 801225F0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8CF4 801225F4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8CF8 801225F8 8C620000 */ lw $v0, ($v1) /* B8CFC 801225FC 0040202D */ daddu $a0, $v0, $zero /* B8D00 80122600 24420008 */ addiu $v0, $v0, 8 @@ -236,8 +236,8 @@ glabel func_80122288 /* B8D14 80122614 2442BA00 */ addiu $v0, $v0, %lo(D_8014BA00) /* B8D18 80122618 08048A60 */ j .L80122980 /* B8D1C 8012261C AC820004 */ sw $v0, 4($a0) -/* B8D20 80122620 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8D24 80122624 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8D20 80122620 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8D24 80122624 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8D28 80122628 8C620000 */ lw $v0, ($v1) /* B8D2C 8012262C 0040202D */ daddu $a0, $v0, $zero /* B8D30 80122630 24420008 */ addiu $v0, $v0, 8 @@ -248,8 +248,8 @@ glabel func_80122288 /* B8D44 80122644 2442B988 */ addiu $v0, $v0, %lo(D_8014B988) /* B8D48 80122648 08048A60 */ j .L80122980 /* B8D4C 8012264C AC820004 */ sw $v0, 4($a0) -/* B8D50 80122650 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8D54 80122654 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8D50 80122650 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8D54 80122654 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8D58 80122658 8C620000 */ lw $v0, ($v1) /* B8D5C 8012265C 0040202D */ daddu $a0, $v0, $zero /* B8D60 80122660 24420008 */ addiu $v0, $v0, 8 @@ -260,8 +260,8 @@ glabel func_80122288 /* B8D74 80122674 2442BA48 */ addiu $v0, $v0, %lo(D_8014BA48) /* B8D78 80122678 08048A60 */ j .L80122980 /* B8D7C 8012267C AC820004 */ sw $v0, 4($a0) -/* B8D80 80122680 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8D84 80122684 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8D80 80122680 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8D84 80122684 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8D88 80122688 8C620000 */ lw $v0, ($v1) /* B8D8C 8012268C 0040202D */ daddu $a0, $v0, $zero /* B8D90 80122690 24420008 */ addiu $v0, $v0, 8 @@ -272,8 +272,8 @@ glabel func_80122288 /* B8DA4 801226A4 2442BA70 */ addiu $v0, $v0, %lo(D_8014BA70) /* B8DA8 801226A8 08048A60 */ j .L80122980 /* B8DAC 801226AC AC820004 */ sw $v0, 4($a0) -/* B8DB0 801226B0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8DB4 801226B4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8DB0 801226B0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8DB4 801226B4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8DB8 801226B8 8C620000 */ lw $v0, ($v1) /* B8DBC 801226BC 0040202D */ daddu $a0, $v0, $zero /* B8DC0 801226C0 24420008 */ addiu $v0, $v0, 8 @@ -284,8 +284,8 @@ glabel func_80122288 /* B8DD4 801226D4 2442BA98 */ addiu $v0, $v0, %lo(D_8014BA98) /* B8DD8 801226D8 08048A60 */ j .L80122980 /* B8DDC 801226DC AC820004 */ sw $v0, 4($a0) -/* B8DE0 801226E0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8DE4 801226E4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8DE0 801226E0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8DE4 801226E4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8DE8 801226E8 8C620000 */ lw $v0, ($v1) /* B8DEC 801226EC 0040202D */ daddu $a0, $v0, $zero /* B8DF0 801226F0 24420008 */ addiu $v0, $v0, 8 @@ -308,9 +308,9 @@ glabel func_80122288 /* B8E30 80122730 00220821 */ addu $at, $at, $v0 /* B8E34 80122734 8C2202D8 */ lw $v0, %lo(D_801502D8)($at) /* B8E38 80122738 00400008 */ jr $v0 -/* B8E3C 8012273C 00000000 */ nop -/* B8E40 80122740 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8E44 80122744 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8E3C 8012273C 00000000 */ nop +/* B8E40 80122740 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8E44 80122744 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8E48 80122748 8C620000 */ lw $v0, ($v1) /* B8E4C 8012274C 0040202D */ daddu $a0, $v0, $zero /* B8E50 80122750 24420008 */ addiu $v0, $v0, 8 @@ -321,8 +321,8 @@ glabel func_80122288 /* B8E64 80122764 2442BE78 */ addiu $v0, $v0, %lo(D_8014BE78) /* B8E68 80122768 08048A23 */ j .L8012288C /* B8E6C 8012276C AC820004 */ sw $v0, 4($a0) -/* B8E70 80122770 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8E74 80122774 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8E70 80122770 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8E74 80122774 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8E78 80122778 8C620000 */ lw $v0, ($v1) /* B8E7C 8012277C 0040202D */ daddu $a0, $v0, $zero /* B8E80 80122780 24420008 */ addiu $v0, $v0, 8 @@ -333,8 +333,8 @@ glabel func_80122288 /* B8E94 80122794 2442BEA0 */ addiu $v0, $v0, %lo(D_8014BEA0) /* B8E98 80122798 08048A23 */ j .L8012288C /* B8E9C 8012279C AC820004 */ sw $v0, 4($a0) -/* B8EA0 801227A0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8EA4 801227A4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8EA0 801227A0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8EA4 801227A4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8EA8 801227A8 8C620000 */ lw $v0, ($v1) /* B8EAC 801227AC 0040202D */ daddu $a0, $v0, $zero /* B8EB0 801227B0 24420008 */ addiu $v0, $v0, 8 @@ -345,8 +345,8 @@ glabel func_80122288 /* B8EC4 801227C4 2442BEC8 */ addiu $v0, $v0, %lo(D_8014BEC8) /* B8EC8 801227C8 08048A23 */ j .L8012288C /* B8ECC 801227CC AC820004 */ sw $v0, 4($a0) -/* B8ED0 801227D0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8ED4 801227D4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8ED0 801227D0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8ED4 801227D4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8ED8 801227D8 8C620000 */ lw $v0, ($v1) /* B8EDC 801227DC 0040202D */ daddu $a0, $v0, $zero /* B8EE0 801227E0 24420008 */ addiu $v0, $v0, 8 @@ -357,8 +357,8 @@ glabel func_80122288 /* B8EF4 801227F4 2442BEF0 */ addiu $v0, $v0, %lo(D_8014BEF0) /* B8EF8 801227F8 08048A23 */ j .L8012288C /* B8EFC 801227FC AC820004 */ sw $v0, 4($a0) -/* B8F00 80122800 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8F04 80122804 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8F00 80122800 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8F04 80122804 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8F08 80122808 8C620000 */ lw $v0, ($v1) /* B8F0C 8012280C 0040202D */ daddu $a0, $v0, $zero /* B8F10 80122810 24420008 */ addiu $v0, $v0, 8 @@ -369,8 +369,8 @@ glabel func_80122288 /* B8F24 80122824 2442BF18 */ addiu $v0, $v0, %lo(D_8014BF18) /* B8F28 80122828 08048A23 */ j .L8012288C /* B8F2C 8012282C AC820004 */ sw $v0, 4($a0) -/* B8F30 80122830 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8F34 80122834 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8F30 80122830 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8F34 80122834 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8F38 80122838 8C620000 */ lw $v0, ($v1) /* B8F3C 8012283C 0040202D */ daddu $a0, $v0, $zero /* B8F40 80122840 24420008 */ addiu $v0, $v0, 8 @@ -381,8 +381,8 @@ glabel func_80122288 /* B8F54 80122854 2442BF40 */ addiu $v0, $v0, %lo(D_8014BF40) /* B8F58 80122858 08048A23 */ j .L8012288C /* B8F5C 8012285C AC820004 */ sw $v0, 4($a0) -/* B8F60 80122860 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B8F64 80122864 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B8F60 80122860 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B8F64 80122864 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8F68 80122868 8C620000 */ lw $v0, ($v1) /* B8F6C 8012286C 0040202D */ daddu $a0, $v0, $zero /* B8F70 80122870 24420008 */ addiu $v0, $v0, 8 @@ -408,7 +408,7 @@ glabel func_80122288 /* B8FB8 801228B8 14410004 */ bne $v0, $at, .L801228CC /* B8FBC 801228BC 3C018000 */ lui $at, 0x8000 /* B8FC0 801228C0 14E10002 */ bne $a3, $at, .L801228CC -/* B8FC4 801228C4 00000000 */ nop +/* B8FC4 801228C4 00000000 */ nop /* B8FC8 801228C8 0006000D */ break 6 .L801228CC: /* B8FCC 801228CC 00003812 */ mflo $a3 @@ -423,12 +423,12 @@ glabel func_80122288 /* B8FEC 801228EC 14410004 */ bne $v0, $at, .L80122900 /* B8FF0 801228F0 3C018000 */ lui $at, 0x8000 /* B8FF4 801228F4 14A10002 */ bne $a1, $at, .L80122900 -/* B8FF8 801228F8 00000000 */ nop +/* B8FF8 801228F8 00000000 */ nop /* B8FFC 801228FC 0006000D */ break 6 .L80122900: /* B9000 80122900 00002812 */ mflo $a1 -/* B9004 80122904 3C08800A */ lui $t0, %hi(D_8009A66C) -/* B9008 80122908 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* B9004 80122904 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* B9008 80122908 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* B900C 8012290C 8D060000 */ lw $a2, ($t0) /* B9010 80122910 00C0482D */ daddu $t1, $a2, $zero /* B9014 80122914 24C60008 */ addiu $a2, $a2, 8 @@ -461,8 +461,8 @@ glabel func_80122288 .L80122980: /* B9080 80122980 3C02D9FD */ lui $v0, 0xd9fd .L80122984: -/* B9084 80122984 3C06800A */ lui $a2, %hi(D_8009A66C) -/* B9088 80122988 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* B9084 80122984 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* B9088 80122988 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* B908C 8012298C 3442FFFF */ ori $v0, $v0, 0xffff /* B9090 80122990 8CC50000 */ lw $a1, ($a2) /* B9094 80122994 3C048015 */ lui $a0, %hi(D_80154378) @@ -498,8 +498,8 @@ glabel func_80122288 /* B9100 80122A00 8E42005C */ lw $v0, 0x5c($s2) /* B9104 80122A04 10400012 */ beqz $v0, .L80122A50 /* B9108 80122A08 3C07D838 */ lui $a3, 0xd838 -/* B910C 80122A0C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* B9110 80122A10 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* B910C 80122A0C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* B9110 80122A10 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* B9114 80122A14 8C830000 */ lw $v1, ($a0) /* B9118 80122A18 3C028015 */ lui $v0, %hi(D_80154374) /* B911C 80122A1C 8C424374 */ lw $v0, %lo(D_80154374)($v0) @@ -516,8 +516,8 @@ glabel func_80122288 /* B9148 80122A48 00431021 */ addu $v0, $v0, $v1 /* B914C 80122A4C ACA20004 */ sw $v0, 4($a1) .L80122A50: -/* B9150 80122A50 3C05800A */ lui $a1, %hi(D_8009A66C) -/* B9154 80122A54 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* B9150 80122A50 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* B9154 80122A54 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* B9158 80122A58 34E70002 */ ori $a3, $a3, 2 /* B915C 80122A5C 8CA20000 */ lw $v0, ($a1) /* B9160 80122A60 3C03DE00 */ lui $v1, 0xde00 @@ -557,10 +557,10 @@ glabel func_80122288 /* B91E8 80122AE8 3C040001 */ lui $a0, 1 /* B91EC 80122AEC 34841630 */ ori $a0, $a0, 0x1630 /* B91F0 80122AF0 26450058 */ addiu $a1, $s2, 0x58 -/* B91F4 80122AF4 3C028007 */ lui $v0, %hi(D_800741F0) -/* B91F8 80122AF8 944241F0 */ lhu $v0, %lo(D_800741F0)($v0) -/* B91FC 80122AFC 3C03800A */ lui $v1, %hi(D_8009A674) -/* B9200 80122B00 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* B91F4 80122AF4 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* B91F8 80122AF8 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) +/* B91FC 80122AFC 3C03800A */ lui $v1, %hi(gDisplayContext) +/* B9200 80122B00 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* B9204 80122B04 00021180 */ sll $v0, $v0, 6 /* B9208 80122B08 00621821 */ addu $v1, $v1, $v0 /* B920C 80122B0C 00641821 */ addu $v1, $v1, $a0 @@ -579,11 +579,11 @@ glabel func_80122288 /* B923C 80122B3C 3C03DA38 */ lui $v1, 0xda38 /* B9240 80122B40 34630002 */ ori $v1, $v1, 2 /* B9244 80122B44 3C080001 */ lui $t0, 1 -/* B9248 80122B48 3C06800A */ lui $a2, %hi(D_8009A66C) -/* B924C 80122B4C 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* B9248 80122B48 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* B924C 80122B4C 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* B9250 80122B50 35081630 */ ori $t0, $t0, 0x1630 -/* B9254 80122B54 3C058007 */ lui $a1, %hi(D_800741F0) -/* B9258 80122B58 24A541F0 */ addiu $a1, $a1, %lo(D_800741F0) +/* B9254 80122B54 3C058007 */ lui $a1, %hi(gMatrixListPos) +/* B9258 80122B58 24A541F0 */ addiu $a1, $a1, %lo(gMatrixListPos) /* B925C 80122B5C 8CC40000 */ lw $a0, ($a2) /* B9260 80122B60 94A20000 */ lhu $v0, ($a1) /* B9264 80122B64 0080382D */ daddu $a3, $a0, $zero @@ -594,8 +594,8 @@ glabel func_80122288 /* B9278 80122B78 3042FFFF */ andi $v0, $v0, 0xffff /* B927C 80122B7C 00021180 */ sll $v0, $v0, 6 /* B9280 80122B80 A4A30000 */ sh $v1, ($a1) -/* B9284 80122B84 3C03800A */ lui $v1, %hi(D_8009A674) -/* B9288 80122B88 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* B9284 80122B84 3C03800A */ lui $v1, %hi(gDisplayContext) +/* B9288 80122B88 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* B928C 80122B8C 00481021 */ addu $v0, $v0, $t0 /* B9290 80122B90 00621821 */ addu $v1, $v1, $v0 /* B9294 80122B94 3C02DE00 */ lui $v0, 0xde00 @@ -701,8 +701,8 @@ glabel func_80122288 /* B9420 80122D20 0200382D */ daddu $a3, $s0, $zero .L80122D24: /* B9424 80122D24 3C03D838 */ lui $v1, 0xd838 -/* B9428 80122D28 3C04800A */ lui $a0, %hi(D_8009A66C) -/* B942C 80122D2C 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* B9428 80122D28 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* B942C 80122D2C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* B9430 80122D30 8C820000 */ lw $v0, ($a0) /* B9434 80122D34 34630002 */ ori $v1, $v1, 2 /* B9438 80122D38 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s b/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s index b74ea39b2c..5e53af357b 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s @@ -35,10 +35,10 @@ glabel func_80136A80 /* CD1F8 80136AF8 00431021 */ addu $v0, $v0, $v1 /* CD1FC 80136AFC 000210C0 */ sll $v0, $v0, 3 /* CD200 80136B00 00444821 */ addu $t1, $v0, $a0 -/* CD204 80136B04 3C03800A */ lui $v1, %hi(D_8009A674) -/* CD208 80136B08 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* CD204 80136B04 3C03800A */ lui $v1, %hi(gDisplayContext) +/* CD208 80136B08 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* CD20C 80136B0C 4600C032 */ c.eq.s $f24, $f0 -/* CD210 80136B10 00000000 */ nop +/* CD210 80136B10 00000000 */ nop /* CD214 80136B14 4501048B */ bc1t .L80137D44 /* CD218 80136B18 0065F021 */ addu $fp, $v1, $a1 /* CD21C 80136B1C 10C0000A */ beqz $a2, .L80136B48 @@ -67,15 +67,15 @@ glabel func_80136A80 /* CD270 80136B70 10620070 */ beq $v1, $v0, .L80136D34 /* CD274 80136B74 3C04E300 */ lui $a0, 0xe300 /* CD278 80136B78 0804DBCA */ j .L80136F28 -/* CD27C 80136B7C 00000000 */ nop +/* CD27C 80136B7C 00000000 */ nop .L80136B80: /* CD280 80136B80 3C04E300 */ lui $a0, 0xe300 /* CD284 80136B84 34841801 */ ori $a0, $a0, 0x1801 /* CD288 80136B88 3C05E300 */ lui $a1, 0xe300 /* CD28C 80136B8C 34A51A01 */ ori $a1, $a1, 0x1a01 /* CD290 80136B90 3C06E300 */ lui $a2, 0xe300 -/* CD294 80136B94 3C08800A */ lui $t0, %hi(D_8009A66C) -/* CD298 80136B98 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* CD294 80136B94 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* CD298 80136B98 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* CD29C 80136B9C 34C60A01 */ ori $a2, $a2, 0xa01 /* CD2A0 80136BA0 3C02E700 */ lui $v0, 0xe700 /* CD2A4 80136BA4 8D070000 */ lw $a3, ($t0) @@ -118,8 +118,8 @@ glabel func_80136A80 /* CD330 80136C30 3C06FCFF */ lui $a2, 0xfcff /* CD334 80136C34 34C6FFFF */ ori $a2, $a2, 0xffff /* CD338 80136C38 3C05FFFD */ lui $a1, 0xfffd -/* CD33C 80136C3C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* CD340 80136C40 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* CD33C 80136C3C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* CD340 80136C40 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* CD344 80136C44 34A5F6FB */ ori $a1, $a1, 0xf6fb /* CD348 80136C48 8C830000 */ lw $v1, ($a0) /* CD34C 80136C4C 3C014F00 */ lui $at, 0x4f00 @@ -139,7 +139,7 @@ glabel func_80136A80 /* CD384 80136C84 00431025 */ or $v0, $v0, $v1 /* CD388 80136C88 00151A00 */ sll $v1, $s5, 8 /* CD38C 80136C8C 4618003E */ c.le.s $f0, $f24 -/* CD390 80136C90 00000000 */ nop +/* CD390 80136C90 00000000 */ nop /* CD394 80136C94 45010005 */ bc1t .L80136CAC /* CD398 80136C98 00434825 */ or $t1, $v0, $v1 /* CD39C 80136C9C 4600C20D */ trunc.w.s $f8, $f24 @@ -151,7 +151,7 @@ glabel func_80136A80 /* CD3B0 80136CB0 3C028000 */ lui $v0, 0x8000 /* CD3B4 80136CB4 4600020D */ trunc.w.s $f8, $f0 /* CD3B8 80136CB8 44054000 */ mfc1 $a1, $f8 -/* CD3BC 80136CBC 00000000 */ nop +/* CD3BC 80136CBC 00000000 */ nop /* CD3C0 80136CC0 00A22825 */ or $a1, $a1, $v0 /* CD3C4 80136CC4 3C060050 */ lui $a2, 0x50 .L80136CC8: @@ -160,8 +160,8 @@ glabel func_80136A80 /* CD3D0 80136CD0 34E7C3BC */ ori $a3, $a3, 0xc3bc /* CD3D4 80136CD4 3C08E300 */ lui $t0, 0xe300 /* CD3D8 80136CD8 35081801 */ ori $t0, $t0, 0x1801 -/* CD3DC 80136CDC 3C04800A */ lui $a0, %hi(D_8009A66C) -/* CD3E0 80136CE0 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* CD3DC 80136CDC 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* CD3E0 80136CE0 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* CD3E4 80136CE4 30A200FF */ andi $v0, $a1, 0xff /* CD3E8 80136CE8 8C830000 */ lw $v1, ($a0) /* CD3EC 80136CEC 01221025 */ or $v0, $t1, $v0 @@ -187,8 +187,8 @@ glabel func_80136A80 /* CD438 80136D38 3C05E300 */ lui $a1, 0xe300 /* CD43C 80136D3C 34A51A01 */ ori $a1, $a1, 0x1a01 /* CD440 80136D40 3C06E300 */ lui $a2, 0xe300 -/* CD444 80136D44 3C08800A */ lui $t0, %hi(D_8009A66C) -/* CD448 80136D48 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* CD444 80136D44 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* CD448 80136D48 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* CD44C 80136D4C 34C60A01 */ ori $a2, $a2, 0xa01 /* CD450 80136D50 3C02E700 */ lui $v0, 0xe700 /* CD454 80136D54 8D070000 */ lw $a3, ($t0) @@ -231,8 +231,8 @@ glabel func_80136A80 /* CD4E0 80136DE0 3C06FCFF */ lui $a2, 0xfcff /* CD4E4 80136DE4 34C6FFFF */ ori $a2, $a2, 0xffff /* CD4E8 80136DE8 3C05FFFD */ lui $a1, 0xfffd -/* CD4EC 80136DEC 3C04800A */ lui $a0, %hi(D_8009A66C) -/* CD4F0 80136DF0 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* CD4EC 80136DEC 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* CD4F0 80136DF0 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* CD4F4 80136DF4 34A5F6FB */ ori $a1, $a1, 0xf6fb /* CD4F8 80136DF8 8C830000 */ lw $v1, ($a0) /* CD4FC 80136DFC 3C014F00 */ lui $at, 0x4f00 @@ -252,7 +252,7 @@ glabel func_80136A80 /* CD534 80136E34 00431025 */ or $v0, $v0, $v1 /* CD538 80136E38 00151A00 */ sll $v1, $s5, 8 /* CD53C 80136E3C 4618003E */ c.le.s $f0, $f24 -/* CD540 80136E40 00000000 */ nop +/* CD540 80136E40 00000000 */ nop /* CD544 80136E44 45010005 */ bc1t .L80136E5C /* CD548 80136E48 00431825 */ or $v1, $v0, $v1 /* CD54C 80136E4C 4600C20D */ trunc.w.s $f8, $f24 @@ -264,15 +264,15 @@ glabel func_80136A80 /* CD560 80136E60 3C028000 */ lui $v0, 0x8000 /* CD564 80136E64 4600020D */ trunc.w.s $f8, $f0 /* CD568 80136E68 44104000 */ mfc1 $s0, $f8 -/* CD56C 80136E6C 00000000 */ nop +/* CD56C 80136E6C 00000000 */ nop /* CD570 80136E70 02028025 */ or $s0, $s0, $v0 /* CD574 80136E74 3C040050 */ lui $a0, 0x50 .L80136E78: /* CD578 80136E78 348403C0 */ ori $a0, $a0, 0x3c0 /* CD57C 80136E7C 3C07E300 */ lui $a3, 0xe300 /* CD580 80136E80 34E71801 */ ori $a3, $a3, 0x1801 -/* CD584 80136E84 3C06800A */ lui $a2, %hi(D_8009A66C) -/* CD588 80136E88 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* CD584 80136E84 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* CD588 80136E88 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* CD58C 80136E8C 320200FF */ andi $v0, $s0, 0xff /* CD590 80136E90 8CC50000 */ lw $a1, ($a2) /* CD594 80136E94 00621025 */ or $v0, $v1, $v0 @@ -313,8 +313,8 @@ glabel func_80136A80 /* CD620 80136F20 0804DF50 */ j .L80137D40 /* CD624 80136F24 00441025 */ or $v0, $v0, $a0 .L80136F28: -/* CD628 80136F28 3C108007 */ lui $s0, %hi(D_800741F0) -/* CD62C 80136F2C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) +/* CD628 80136F28 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* CD62C 80136F2C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) /* CD630 80136F30 44800000 */ mtc1 $zero, $f0 /* CD634 80136F34 3C0643A0 */ lui $a2, 0x43a0 /* CD638 80136F38 96040000 */ lhu $a0, ($s0) @@ -336,8 +336,8 @@ glabel func_80136A80 /* CD678 80136F78 0C018E90 */ jal guOrtho /* CD67C 80136F7C E7A00010 */ swc1 $f0, 0x10($sp) /* CD680 80136F80 3C06DA38 */ lui $a2, 0xda38 -/* CD684 80136F84 3C04800A */ lui $a0, %hi(D_8009A66C) -/* CD688 80136F88 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* CD684 80136F84 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* CD688 80136F88 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* CD68C 80136F8C 34C60007 */ ori $a2, $a2, 7 /* CD690 80136F90 8C830000 */ lw $v1, ($a0) /* CD694 80136F94 96020000 */ lhu $v0, ($s0) @@ -360,14 +360,14 @@ glabel func_80136A80 /* CD6D8 80136FD8 00220821 */ addu $at, $at, $v0 /* CD6DC 80136FDC 8C220EA0 */ lw $v0, %lo(D_80150EA0)($at) /* CD6E0 80136FE0 00400008 */ jr $v0 -/* CD6E4 80136FE4 00000000 */ nop +/* CD6E4 80136FE4 00000000 */ nop /* CD6E8 80136FE8 240400A0 */ addiu $a0, $zero, 0xa0 /* CD6EC 80136FEC 24050078 */ addiu $a1, $zero, 0x78 /* CD6F0 80136FF0 0260382D */ daddu $a3, $s3, $zero -/* CD6F4 80136FF4 3C03800A */ lui $v1, %hi(D_8009A66C) -/* CD6F8 80136FF8 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* CD6F4 80136FF4 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* CD6F8 80136FF8 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* CD6FC 80136FFC 461CC002 */ mul.s $f0, $f24, $f28 -/* CD700 80137000 00000000 */ nop +/* CD700 80137000 00000000 */ nop /* CD704 80137004 8C620000 */ lw $v0, ($v1) /* CD708 80137008 4406C000 */ mfc1 $a2, $f24 /* CD70C 8013700C 3C01437F */ lui $at, 0x437f @@ -388,10 +388,10 @@ glabel func_80136A80 /* CD748 80137048 AFA3001C */ sw $v1, 0x1c($sp) /* CD74C 8013704C 240400A0 */ addiu $a0, $zero, 0xa0 /* CD750 80137050 24050078 */ addiu $a1, $zero, 0x78 -/* CD754 80137054 3C03800A */ lui $v1, %hi(D_8009A66C) -/* CD758 80137058 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* CD754 80137054 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* CD758 80137058 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* CD75C 8013705C 461CC002 */ mul.s $f0, $f24, $f28 -/* CD760 80137060 00000000 */ nop +/* CD760 80137060 00000000 */ nop /* CD764 80137064 8C620000 */ lw $v0, ($v1) /* CD768 80137068 4406C000 */ mfc1 $a2, $f24 /* CD76C 8013706C 3C01437F */ lui $at, 0x437f @@ -408,10 +408,10 @@ glabel func_80136A80 /* CD798 80137098 240400A0 */ addiu $a0, $zero, 0xa0 /* CD79C 8013709C 24050078 */ addiu $a1, $zero, 0x78 /* CD7A0 801370A0 0260382D */ daddu $a3, $s3, $zero -/* CD7A4 801370A4 3C03800A */ lui $v1, %hi(D_8009A66C) -/* CD7A8 801370A8 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* CD7A4 801370A4 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* CD7A8 801370A8 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* CD7AC 801370AC 461CC002 */ mul.s $f0, $f24, $f28 -/* CD7B0 801370B0 00000000 */ nop +/* CD7B0 801370B0 00000000 */ nop /* CD7B4 801370B4 8C620000 */ lw $v0, ($v1) /* CD7B8 801370B8 4406C000 */ mfc1 $a2, $f24 /* CD7BC 801370BC 3C01437F */ lui $at, 0x437f @@ -433,10 +433,10 @@ glabel func_80136A80 /* CD7FC 801370FC 240400A0 */ addiu $a0, $zero, 0xa0 /* CD800 80137100 24050078 */ addiu $a1, $zero, 0x78 /* CD804 80137104 0260382D */ daddu $a3, $s3, $zero -/* CD808 80137108 3C03800A */ lui $v1, %hi(D_8009A66C) -/* CD80C 8013710C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* CD808 80137108 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* CD80C 8013710C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* CD810 80137110 461CC002 */ mul.s $f0, $f24, $f28 -/* CD814 80137114 00000000 */ nop +/* CD814 80137114 00000000 */ nop /* CD818 80137118 8C620000 */ lw $v0, ($v1) /* CD81C 8013711C 4406C000 */ mfc1 $a2, $f24 /* CD820 80137120 3C01437F */ lui $at, 0x437f @@ -464,8 +464,8 @@ glabel func_80136A80 /* CD870 80137170 0220202D */ daddu $a0, $s1, $zero /* CD874 80137174 0240282D */ daddu $a1, $s2, $zero /* CD878 80137178 0000382D */ daddu $a3, $zero, $zero -/* CD87C 8013717C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* CD880 80137180 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* CD87C 8013717C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* CD880 80137180 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* CD884 80137184 8C620000 */ lw $v0, ($v1) /* CD888 80137188 4406C000 */ mfc1 $a2, $f24 /* CD88C 8013718C 0040402D */ daddu $t0, $v0, $zero @@ -488,8 +488,8 @@ glabel func_80136A80 /* CD8D0 801371D0 0220202D */ daddu $a0, $s1, $zero /* CD8D4 801371D4 0240282D */ daddu $a1, $s2, $zero /* CD8D8 801371D8 0000382D */ daddu $a3, $zero, $zero -/* CD8DC 801371DC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* CD8E0 801371E0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* CD8DC 801371DC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* CD8E0 801371E0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* CD8E4 801371E4 8C620000 */ lw $v0, ($v1) /* CD8E8 801371E8 4406C000 */ mfc1 $a2, $f24 /* CD8EC 801371EC 0040402D */ daddu $t0, $v0, $zero @@ -514,8 +514,8 @@ glabel func_80136A80 /* CD938 80137238 36940001 */ ori $s4, $s4, 1 /* CD93C 8013723C 3C16D838 */ lui $s6, 0xd838 /* CD940 80137240 36D60002 */ ori $s6, $s6, 2 -/* CD944 80137244 3C118007 */ lui $s1, %hi(D_800741F0) -/* CD948 80137248 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) +/* CD944 80137244 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* CD948 80137248 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) /* CD94C 8013724C 4600C20D */ trunc.w.s $f8, $f24 /* CD950 80137250 44104000 */ mfc1 $s0, $f8 /* CD954 80137254 96240000 */ lhu $a0, ($s1) @@ -528,12 +528,12 @@ glabel func_80136A80 /* CD970 80137270 4407B000 */ mfc1 $a3, $f22 /* CD974 80137274 0C019E08 */ jal guTranslate /* CD978 80137278 03C42021 */ addu $a0, $fp, $a0 -/* CD97C 8013727C 3C12800A */ lui $s2, %hi(D_8009A66C) -/* CD980 80137280 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* CD97C 8013727C 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* CD980 80137280 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* CD984 80137284 00108400 */ sll $s0, $s0, 0x10 /* CD988 80137288 00108403 */ sra $s0, $s0, 0x10 /* CD98C 8013728C 4490C000 */ mtc1 $s0, $f24 -/* CD990 80137290 00000000 */ nop +/* CD990 80137290 00000000 */ nop /* CD994 80137294 4680C620 */ cvt.s.w $f24, $f24 /* CD998 80137298 3C013F80 */ lui $at, 0x3f80 /* CD99C 8013729C 4481D000 */ mtc1 $at, $f26 @@ -553,7 +553,7 @@ glabel func_80136A80 /* CD9D4 801372D4 3042FFFF */ andi $v0, $v0, 0xffff /* CD9D8 801372D8 4600A521 */ cvt.d.s $f20, $f20 /* CD9DC 801372DC 4620A502 */ mul.d $f20, $f20, $f0 -/* CD9E0 801372E0 00000000 */ nop +/* CD9E0 801372E0 00000000 */ nop /* CD9E4 801372E4 00021180 */ sll $v0, $v0, 6 /* CD9E8 801372E8 03C21021 */ addu $v0, $fp, $v0 /* CD9EC 801372EC A6230000 */ sh $v1, ($s1) @@ -579,7 +579,7 @@ glabel func_80136A80 /* CDA3C 8013733C 00021180 */ sll $v0, $v0, 6 /* CDA40 80137340 03C21021 */ addu $v0, $fp, $v0 /* CDA44 80137344 4600C602 */ mul.s $f24, $f24, $f0 -/* CDA48 80137348 00000000 */ nop +/* CDA48 80137348 00000000 */ nop /* CDA4C 8013734C AC940000 */ sw $s4, ($a0) /* CDA50 80137350 A6230000 */ sh $v1, ($s1) /* CDA54 80137354 AC820004 */ sw $v0, 4($a0) @@ -713,27 +713,27 @@ glabel func_80136A80 /* CDC54 80137554 0804DF40 */ j .L80137D00 /* CDC58 80137558 AC90000C */ sw $s0, 0xc($a0) /* CDC5C 8013755C 44914000 */ mtc1 $s1, $f8 -/* CDC60 80137560 00000000 */ nop +/* CDC60 80137560 00000000 */ nop /* CDC64 80137564 46804220 */ cvt.s.w $f8, $f8 /* CDC68 80137568 241300F0 */ addiu $s3, $zero, 0xf0 /* CDC6C 8013756C 02721023 */ subu $v0, $s3, $s2 /* CDC70 80137570 44054000 */ mfc1 $a1, $f8 /* CDC74 80137574 44824000 */ mtc1 $v0, $f8 -/* CDC78 80137578 00000000 */ nop +/* CDC78 80137578 00000000 */ nop /* CDC7C 8013757C 46804220 */ cvt.s.w $f8, $f8 /* CDC80 80137580 3C15DA38 */ lui $s5, 0xda38 /* CDC84 80137584 36B50002 */ ori $s5, $s5, 2 /* CDC88 80137588 3C14DA38 */ lui $s4, 0xda38 /* CDC8C 8013758C 36940001 */ ori $s4, $s4, 1 /* CDC90 80137590 3C0BD838 */ lui $t3, 0xd838 -/* CDC94 80137594 3C12800A */ lui $s2, %hi(D_8009A66C) -/* CDC98 80137598 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* CDC94 80137594 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* CDC98 80137598 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* CDC9C 8013759C 356B0002 */ ori $t3, $t3, 2 /* CDCA0 801375A0 44064000 */ mfc1 $a2, $f8 /* CDCA4 801375A4 8E420000 */ lw $v0, ($s2) /* CDCA8 801375A8 4480B000 */ mtc1 $zero, $f22 -/* CDCAC 801375AC 3C118007 */ lui $s1, %hi(D_800741F0) -/* CDCB0 801375B0 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) +/* CDCAC 801375AC 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* CDCB0 801375B0 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) /* CDCB4 801375B4 AFAB0024 */ sw $t3, 0x24($sp) /* CDCB8 801375B8 96240000 */ lhu $a0, ($s1) /* CDCBC 801375BC 0040182D */ daddu $v1, $v0, $zero @@ -751,7 +751,7 @@ glabel func_80136A80 /* CDCEC 801375EC 00108400 */ sll $s0, $s0, 0x10 /* CDCF0 801375F0 00108403 */ sra $s0, $s0, 0x10 /* CDCF4 801375F4 4490A000 */ mtc1 $s0, $f20 -/* CDCF8 801375F8 00000000 */ nop +/* CDCF8 801375F8 00000000 */ nop /* CDCFC 801375FC 4680A520 */ cvt.s.w $f20, $f20 /* CDD00 80137600 3C013F80 */ lui $at, 0x3f80 /* CDD04 80137604 4481C000 */ mtc1 $at, $f24 @@ -771,7 +771,7 @@ glabel func_80136A80 /* CDD3C 8013763C 3042FFFF */ andi $v0, $v0, 0xffff /* CDD40 80137640 4600A521 */ cvt.d.s $f20, $f20 /* CDD44 80137644 4620A502 */ mul.d $f20, $f20, $f0 -/* CDD48 80137648 00000000 */ nop +/* CDD48 80137648 00000000 */ nop /* CDD4C 8013764C 00021180 */ sll $v0, $v0, 6 /* CDD50 80137650 03C21021 */ addu $v0, $fp, $v0 /* CDD54 80137654 A6230000 */ sh $v1, ($s1) @@ -786,7 +786,7 @@ glabel func_80136A80 /* CDD78 80137678 03C42021 */ addu $a0, $fp, $a0 /* CDD7C 8013767C 00108023 */ negu $s0, $s0 /* CDD80 80137680 4490D000 */ mtc1 $s0, $f26 -/* CDD84 80137684 00000000 */ nop +/* CDD84 80137684 00000000 */ nop /* CDD88 80137688 4680D6A0 */ cvt.s.w $f26, $f26 /* CDD8C 8013768C 8E430000 */ lw $v1, ($s2) /* CDD90 80137690 4405D000 */ mfc1 $a1, $f26 @@ -809,12 +809,12 @@ glabel func_80136A80 /* CDDD4 801376D4 0C019F20 */ jal guRotate /* CDDD8 801376D8 E7B80010 */ swc1 $f24, 0x10($sp) /* CDDDC 801376DC 44964000 */ mtc1 $s6, $f8 -/* CDDE0 801376E0 00000000 */ nop +/* CDDE0 801376E0 00000000 */ nop /* CDDE4 801376E4 46804220 */ cvt.s.w $f8, $f8 /* CDDE8 801376E8 02779823 */ subu $s3, $s3, $s7 /* CDDEC 801376EC 44054000 */ mfc1 $a1, $f8 /* CDDF0 801376F0 44934000 */ mtc1 $s3, $f8 -/* CDDF4 801376F4 00000000 */ nop +/* CDDF4 801376F4 00000000 */ nop /* CDDF8 801376F8 46804220 */ cvt.s.w $f8, $f8 /* CDDFC 801376FC 3C16DE00 */ lui $s6, 0xde00 /* CDE00 80137700 3C138015 */ lui $s3, %hi(D_8014E8F0) @@ -944,13 +944,13 @@ glabel func_80136A80 /* CDFEC 801378EC 3C028000 */ lui $v0, 0x8000 /* CDFF0 801378F0 4600020D */ trunc.w.s $f8, $f0 /* CDFF4 801378F4 44074000 */ mfc1 $a3, $f8 -/* CDFF8 801378F8 00000000 */ nop +/* CDFF8 801378F8 00000000 */ nop /* CDFFC 801378FC 00E23825 */ or $a3, $a3, $v0 /* CE000 80137900 3C06D838 */ lui $a2, 0xd838 .L80137904: /* CE004 80137904 34C60002 */ ori $a2, $a2, 2 -/* CE008 80137908 3C04800A */ lui $a0, %hi(D_8009A66C) -/* CE00C 8013790C 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* CE008 80137908 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* CE00C 8013790C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* CE010 80137910 8C830000 */ lw $v1, ($a0) /* CE014 80137914 30E200FF */ andi $v0, $a3, 0xff /* CE018 80137918 ACA20000 */ sw $v0, ($a1) @@ -969,22 +969,22 @@ glabel func_80136A80 /* CE04C 8013794C 0804DF40 */ j .L80137D00 /* CE050 80137950 AC620004 */ sw $v0, 4($v1) /* CE054 80137954 44914000 */ mtc1 $s1, $f8 -/* CE058 80137958 00000000 */ nop +/* CE058 80137958 00000000 */ nop /* CE05C 8013795C 46804220 */ cvt.s.w $f8, $f8 /* CE060 80137960 240200F0 */ addiu $v0, $zero, 0xf0 /* CE064 80137964 00521023 */ subu $v0, $v0, $s2 /* CE068 80137968 44054000 */ mfc1 $a1, $f8 /* CE06C 8013796C 44824000 */ mtc1 $v0, $f8 -/* CE070 80137970 00000000 */ nop +/* CE070 80137970 00000000 */ nop /* CE074 80137974 46804220 */ cvt.s.w $f8, $f8 /* CE078 80137978 3C15DA38 */ lui $s5, 0xda38 /* CE07C 8013797C 36B50002 */ ori $s5, $s5, 2 /* CE080 80137980 3C13DA38 */ lui $s3, 0xda38 -/* CE084 80137984 3C12800A */ lui $s2, %hi(D_8009A66C) -/* CE088 80137988 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* CE084 80137984 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* CE088 80137988 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* CE08C 8013798C 36730001 */ ori $s3, $s3, 1 -/* CE090 80137990 3C118007 */ lui $s1, %hi(D_800741F0) -/* CE094 80137994 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) +/* CE090 80137990 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* CE094 80137994 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) /* CE098 80137998 3C14FA00 */ lui $s4, 0xfa00 /* CE09C 8013799C 44064000 */ mfc1 $a2, $f8 /* CE0A0 801379A0 4600C20D */ trunc.w.s $f8, $f24 @@ -1004,7 +1004,7 @@ glabel func_80136A80 /* CE0D8 801379D8 00108400 */ sll $s0, $s0, 0x10 /* CE0DC 801379DC 00108403 */ sra $s0, $s0, 0x10 /* CE0E0 801379E0 44900000 */ mtc1 $s0, $f0 -/* CE0E4 801379E4 00000000 */ nop +/* CE0E4 801379E4 00000000 */ nop /* CE0E8 801379E8 46800020 */ cvt.s.w $f0, $f0 /* CE0EC 801379EC 3C013F80 */ lui $at, 0x3f80 /* CE0F0 801379F0 4481A000 */ mtc1 $at, $f20 @@ -1024,7 +1024,7 @@ glabel func_80136A80 /* CE128 80137A28 3042FFFF */ andi $v0, $v0, 0xffff /* CE12C 80137A2C 46000021 */ cvt.d.s $f0, $f0 /* CE130 80137A30 46220002 */ mul.d $f0, $f0, $f2 -/* CE134 80137A34 00000000 */ nop +/* CE134 80137A34 00000000 */ nop /* CE138 80137A38 00021180 */ sll $v0, $v0, 6 /* CE13C 80137A3C 03C21021 */ addu $v0, $fp, $v0 /* CE140 80137A40 A6230000 */ sh $v1, ($s1) @@ -1039,7 +1039,7 @@ glabel func_80136A80 /* CE164 80137A64 00A0302D */ daddu $a2, $a1, $zero /* CE168 80137A68 00108023 */ negu $s0, $s0 /* CE16C 80137A6C 44900000 */ mtc1 $s0, $f0 -/* CE170 80137A70 00000000 */ nop +/* CE170 80137A70 00000000 */ nop /* CE174 80137A74 46800020 */ cvt.s.w $f0, $f0 /* CE178 80137A78 46000021 */ cvt.d.s $f0, $f0 /* CE17C 80137A7C 8E420000 */ lw $v0, ($s2) @@ -1055,7 +1055,7 @@ glabel func_80136A80 /* CE1A4 80137AA4 24620001 */ addiu $v0, $v1, 1 /* CE1A8 80137AA8 3063FFFF */ andi $v1, $v1, 0xffff /* CE1AC 80137AAC 46220002 */ mul.d $f0, $f0, $f2 -/* CE1B0 80137AB0 00000000 */ nop +/* CE1B0 80137AB0 00000000 */ nop /* CE1B4 80137AB4 00031980 */ sll $v1, $v1, 6 /* CE1B8 80137AB8 ACB30000 */ sw $s3, ($a1) /* CE1BC 80137ABC A6220000 */ sh $v0, ($s1) @@ -1130,13 +1130,13 @@ glabel func_80136A80 /* CE2CC 80137BCC 3C028000 */ lui $v0, 0x8000 /* CE2D0 80137BD0 4600020D */ trunc.w.s $f8, $f0 /* CE2D4 80137BD4 44074000 */ mfc1 $a3, $f8 -/* CE2D8 80137BD8 00000000 */ nop +/* CE2D8 80137BD8 00000000 */ nop /* CE2DC 80137BDC 00E23825 */ or $a3, $a3, $v0 /* CE2E0 80137BE0 3C06D838 */ lui $a2, 0xd838 .L80137BE4: /* CE2E4 80137BE4 34C60002 */ ori $a2, $a2, 2 -/* CE2E8 80137BE8 3C04800A */ lui $a0, %hi(D_8009A66C) -/* CE2EC 80137BEC 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* CE2E8 80137BE8 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* CE2EC 80137BEC 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* CE2F0 80137BF0 8C830000 */ lw $v1, ($a0) /* CE2F4 80137BF4 30E200FF */ andi $v0, $a3, 0xff /* CE2F8 80137BF8 ACA20000 */ sw $v0, ($a1) @@ -1167,7 +1167,7 @@ glabel func_80136A80 /* CE358 80137C58 00021400 */ sll $v0, $v0, 0x10 /* CE35C 80137C5C 00021403 */ sra $v0, $v0, 0x10 /* CE360 80137C60 44820000 */ mtc1 $v0, $f0 -/* CE364 80137C64 00000000 */ nop +/* CE364 80137C64 00000000 */ nop /* CE368 80137C68 46800020 */ cvt.s.w $f0, $f0 /* CE36C 80137C6C E7A00010 */ swc1 $f0, 0x10($sp) /* CE370 80137C70 0000202D */ daddu $a0, $zero, $zero @@ -1193,8 +1193,8 @@ glabel func_80136A80 /* CE3C0 80137CC0 0220282D */ daddu $a1, $s1, $zero /* CE3C4 80137CC4 0240302D */ daddu $a2, $s2, $zero .L80137CC8: -/* CE3C8 80137CC8 3C03800A */ lui $v1, %hi(D_8009A66C) -/* CE3CC 80137CCC 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* CE3C8 80137CC8 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* CE3CC 80137CCC 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* CE3D0 80137CD0 8C620000 */ lw $v0, ($v1) /* CE3D4 80137CD4 4407E000 */ mfc1 $a3, $f28 /* CE3D8 80137CD8 0040402D */ daddu $t0, $v0, $zero @@ -1210,8 +1210,8 @@ glabel func_80136A80 .L80137D00: /* CE400 80137D00 3C06DA38 */ lui $a2, 0xda38 .L80137D04: -/* CE404 80137D04 3C04800A */ lui $a0, %hi(D_8009A66C) -/* CE408 80137D08 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* CE404 80137D04 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* CE408 80137D08 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* CE40C 80137D0C 34C60007 */ ori $a2, $a2, 7 /* CE410 80137D10 8C820000 */ lw $v0, ($a0) /* CE414 80137D14 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -1220,8 +1220,8 @@ glabel func_80136A80 /* CE420 80137D20 24420008 */ addiu $v0, $v0, 8 /* CE424 80137D24 00031980 */ sll $v1, $v1, 6 /* CE428 80137D28 AC820000 */ sw $v0, ($a0) -/* CE42C 80137D2C 3C02800A */ lui $v0, %hi(D_8009A674) -/* CE430 80137D30 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* CE42C 80137D2C 3C02800A */ lui $v0, %hi(gDisplayContext) +/* CE430 80137D30 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* CE434 80137D34 24630030 */ addiu $v1, $v1, 0x30 /* CE438 80137D38 ACA60000 */ sw $a2, ($a1) /* CE43C 80137D3C 00431021 */ addu $v0, $v0, $v1 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138740.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138740.s index c707bfce33..70752c2fdb 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138740.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138740.s @@ -60,7 +60,7 @@ glabel func_80138740 .L80138814: /* CEF14 80138814 8C820000 */ lw $v0, ($a0) /* CEF18 80138818 1446000B */ bne $v0, $a2, .L80138848 -/* CEF1C 8013881C 00000000 */ nop +/* CEF1C 8013881C 00000000 */ nop /* CEF20 80138820 8CE30000 */ lw $v1, ($a3) /* CEF24 80138824 02431021 */ addu $v0, $s2, $v1 /* CEF28 80138828 2442FFFF */ addiu $v0, $v0, -1 @@ -105,8 +105,8 @@ glabel func_80138740 /* CEFB8 801388B8 3C10E300 */ lui $s0, 0xe300 /* CEFBC 801388BC 36100D01 */ ori $s0, $s0, 0xd01 /* CEFC0 801388C0 3C11E300 */ lui $s1, 0xe300 -/* CEFC4 801388C4 3C04800A */ lui $a0, %hi(D_8009A66C) -/* CEFC8 801388C8 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* CEFC4 801388C4 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* CEFC8 801388C8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* CEFCC 801388CC 36310F00 */ ori $s1, $s1, 0xf00 /* CEFD0 801388D0 8C820000 */ lw $v0, ($a0) /* CEFD4 801388D4 3C014F00 */ lui $at, 0x4f00 @@ -164,7 +164,7 @@ glabel func_80138740 /* CF0A4 801389A4 3C03FA00 */ lui $v1, 0xfa00 /* CF0A8 801389A8 24440054 */ addiu $a0, $v0, 0x54 /* CF0AC 801389AC 4600103E */ c.le.s $f2, $f0 -/* CF0B0 801389B0 00000000 */ nop +/* CF0B0 801389B0 00000000 */ nop /* CF0B4 801389B4 45010005 */ bc1t .L801389CC /* CF0B8 801389B8 AC430050 */ sw $v1, 0x50($v0) /* CF0BC 801389BC 4600010D */ trunc.w.s $f4, $f0 @@ -176,7 +176,7 @@ glabel func_80138740 /* CF0D0 801389D0 3C028000 */ lui $v0, 0x8000 /* CF0D4 801389D4 4600010D */ trunc.w.s $f4, $f0 /* CF0D8 801389D8 44032000 */ mfc1 $v1, $f4 -/* CF0DC 801389DC 00000000 */ nop +/* CF0DC 801389DC 00000000 */ nop /* CF0E0 801389E0 00621825 */ or $v1, $v1, $v0 /* CF0E4 801389E4 2402FF00 */ addiu $v0, $zero, -0x100 .L801389E8: @@ -184,8 +184,8 @@ glabel func_80138740 /* CF0EC 801389EC AC820000 */ sw $v0, ($a0) /* CF0F0 801389F0 1AE0006D */ blez $s7, .L80138BA8 /* CF0F4 801389F4 0000902D */ daddu $s2, $zero, $zero -/* CF0F8 801389F8 3C11800A */ lui $s1, %hi(D_8009A66C) -/* CF0FC 801389FC 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* CF0F8 801389F8 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* CF0FC 801389FC 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* CF100 80138A00 02951023 */ subu $v0, $s4, $s5 /* CF104 80138A04 00021040 */ sll $v0, $v0, 1 /* CF108 80138A08 24420007 */ addiu $v0, $v0, 7 @@ -298,8 +298,8 @@ glabel func_80138740 /* CF2AC 80138BAC 1320006A */ beqz $t9, .L80138D58 /* CF2B0 80138BB0 3C03FD10 */ lui $v1, 0xfd10 /* CF2B4 80138BB4 3463013F */ ori $v1, $v1, 0x13f -/* CF2B8 80138BB8 3C10800A */ lui $s0, %hi(D_8009A66C) -/* CF2BC 80138BBC 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* CF2B8 80138BB8 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* CF2BC 80138BBC 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* CF2C0 80138BC0 8E020000 */ lw $v0, ($s0) /* CF2C4 80138BC4 0300202D */ daddu $a0, $t8, $zero /* CF2C8 80138BC8 0040882D */ daddu $s1, $v0, $zero diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s index 30353dbe67..0c0a0d0e21 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s @@ -37,21 +37,21 @@ glabel func_80138E54 /* CF5D4 80138ED4 00431021 */ addu $v0, $v0, $v1 /* CF5D8 80138ED8 000210C0 */ sll $v0, $v0, 3 /* CF5DC 80138EDC 4600C032 */ c.eq.s $f24, $f0 -/* CF5E0 80138EE0 00000000 */ nop +/* CF5E0 80138EE0 00000000 */ nop /* CF5E4 80138EE4 450103F8 */ bc1t .L80139EC8 /* CF5E8 80138EE8 0044F021 */ addu $fp, $v0, $a0 /* CF5EC 80138EEC 8FAD0088 */ lw $t5, 0x88($sp) /* CF5F0 80138EF0 15A00011 */ bnez $t5, .L80138F38 -/* CF5F4 80138EF4 00000000 */ nop +/* CF5F4 80138EF4 00000000 */ nop /* CF5F8 80138EF8 3C01437F */ lui $at, 0x437f /* CF5FC 80138EFC 44812000 */ mtc1 $at, $f4 -/* CF600 80138F00 00000000 */ nop +/* CF600 80138F00 00000000 */ nop /* CF604 80138F04 46182001 */ sub.s $f0, $f4, $f24 /* CF608 80138F08 3C014120 */ lui $at, 0x4120 /* CF60C 80138F0C 44811000 */ mtc1 $at, $f2 -/* CF610 80138F10 00000000 */ nop +/* CF610 80138F10 00000000 */ nop /* CF614 80138F14 46020002 */ mul.s $f0, $f0, $f2 -/* CF618 80138F18 00000000 */ nop +/* CF618 80138F18 00000000 */ nop /* CF61C 80138F1C 3C018015 */ lui $at, %hi(D_80150F80) /* CF620 80138F20 D4220F80 */ ldc1 $f2, %lo(D_80150F80)($at) /* CF624 80138F24 46040003 */ div.s $f0, $f0, $f4 @@ -75,30 +75,30 @@ glabel func_80138E54 /* CF668 80138F68 46184101 */ sub.s $f4, $f8, $f24 /* CF66C 80138F6C 006D1823 */ subu $v1, $v1, $t5 /* CF670 80138F70 44831000 */ mtc1 $v1, $f2 -/* CF674 80138F74 00000000 */ nop +/* CF674 80138F74 00000000 */ nop /* CF678 80138F78 468010A0 */ cvt.s.w $f2, $f2 /* CF67C 80138F7C 46062182 */ mul.s $f6, $f4, $f6 -/* CF680 80138F80 00000000 */ nop +/* CF680 80138F80 00000000 */ nop /* CF684 80138F84 00042400 */ sll $a0, $a0, 0x10 /* CF688 80138F88 00041403 */ sra $v0, $a0, 0x10 /* CF68C 80138F8C 000427C2 */ srl $a0, $a0, 0x1f /* CF690 80138F90 00441021 */ addu $v0, $v0, $a0 /* CF694 80138F94 46041082 */ mul.s $f2, $f2, $f4 -/* CF698 80138F98 00000000 */ nop +/* CF698 80138F98 00000000 */ nop /* CF69C 80138F9C 8FAD0090 */ lw $t5, 0x90($sp) /* CF6A0 80138FA0 00021043 */ sra $v0, $v0, 1 /* CF6A4 80138FA4 004D1023 */ subu $v0, $v0, $t5 /* CF6A8 80138FA8 44820000 */ mtc1 $v0, $f0 -/* CF6AC 80138FAC 00000000 */ nop +/* CF6AC 80138FAC 00000000 */ nop /* CF6B0 80138FB0 46800020 */ cvt.s.w $f0, $f0 /* CF6B4 80138FB4 46040002 */ mul.s $f0, $f0, $f4 -/* CF6B8 80138FB8 00000000 */ nop +/* CF6B8 80138FB8 00000000 */ nop /* CF6BC 80138FBC C7A4008C */ lwc1 $f4, 0x8c($sp) /* CF6C0 80138FC0 46802120 */ cvt.s.w $f4, $f4 /* CF6C4 80138FC4 46081083 */ div.s $f2, $f2, $f8 /* CF6C8 80138FC8 46022100 */ add.s $f4, $f4, $f2 /* CF6CC 80138FCC 448D1000 */ mtc1 $t5, $f2 -/* CF6D0 80138FD0 00000000 */ nop +/* CF6D0 80138FD0 00000000 */ nop /* CF6D4 80138FD4 468010A0 */ cvt.s.w $f2, $f2 /* CF6D8 80138FD8 46080003 */ div.s $f0, $f0, $f8 /* CF6DC 80138FDC 46001080 */ add.s $f2, $f2, $f0 @@ -114,14 +114,14 @@ glabel func_80138E54 /* CF700 80139000 3C110001 */ lui $s1, 1 /* CF704 80139004 36311630 */ ori $s1, $s1, 0x1630 /* CF708 80139008 0000982D */ daddu $s3, $zero, $zero -/* CF70C 8013900C 3C02800A */ lui $v0, %hi(D_8009A66C) -/* CF710 80139010 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* CF70C 8013900C 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* CF710 80139010 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* CF714 80139014 0040902D */ daddu $s2, $v0, $zero -/* CF718 80139018 3C02800A */ lui $v0, %hi(D_8009A674) -/* CF71C 8013901C 2442A674 */ addiu $v0, $v0, %lo(D_8009A674) +/* CF718 80139018 3C02800A */ lui $v0, %hi(gDisplayContext) +/* CF71C 8013901C 2442A674 */ addiu $v0, $v0, %lo(gDisplayContext) /* CF720 80139020 0040B02D */ daddu $s6, $v0, $zero -/* CF724 80139024 3C028007 */ lui $v0, %hi(D_800741F0) -/* CF728 80139028 244241F0 */ addiu $v0, $v0, %lo(D_800741F0) +/* CF724 80139024 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* CF728 80139028 244241F0 */ addiu $v0, $v0, %lo(gMatrixListPos) /* CF72C 8013902C 0040A02D */ daddu $s4, $v0, $zero /* CF730 80139030 3C150001 */ lui $s5, 1 /* CF734 80139034 36B51630 */ ori $s5, $s5, 0x1630 @@ -281,7 +281,7 @@ glabel func_80138E54 /* CF998 80139298 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* CF99C 8013929C 94420134 */ lhu $v0, 0x134($v0) /* CF9A0 801392A0 44826000 */ mtc1 $v0, $f12 -/* CF9A4 801392A4 00000000 */ nop +/* CF9A4 801392A4 00000000 */ nop /* CF9A8 801392A8 0C00A8BB */ jal sin_deg /* CF9AC 801392AC 46806320 */ cvt.s.w $f12, $f12 /* CF9B0 801392B0 3C018015 */ lui $at, %hi(D_80150F90) @@ -295,7 +295,7 @@ glabel func_80138E54 /* CF9CC 801392CC 00021040 */ sll $v0, $v0, 1 /* CF9D0 801392D0 00571021 */ addu $v0, $v0, $s7 /* CF9D4 801392D4 44826000 */ mtc1 $v0, $f12 -/* CF9D8 801392D8 00000000 */ nop +/* CF9D8 801392D8 00000000 */ nop /* CF9DC 801392DC 0C00A8BB */ jal sin_deg /* CF9E0 801392E0 46806320 */ cvt.s.w $f12, $f12 /* CF9E4 801392E4 3C018015 */ lui $at, %hi(D_80150F98) @@ -303,7 +303,7 @@ glabel func_80138E54 /* CF9EC 801392EC 46000021 */ cvt.d.s $f0, $f0 .L801392F0: /* CF9F0 801392F0 46220002 */ mul.d $f0, $f0, $f2 -/* CF9F4 801392F4 00000000 */ nop +/* CF9F4 801392F4 00000000 */ nop /* CF9F8 801392F8 4620D001 */ sub.d $f0, $f26, $f0 /* CF9FC 801392FC 44801000 */ mtc1 $zero, $f2 /* CFA00 80139300 2A020100 */ slti $v0, $s0, 0x100 @@ -399,8 +399,8 @@ glabel func_80138E54 /* CFB64 80139464 3C06FF88 */ lui $a2, 0xff88 /* CFB68 80139468 34C6003F */ ori $a2, $a2, 0x3f /* CFB6C 8013946C 0000982D */ daddu $s3, $zero, $zero -/* CFB70 80139470 3C02800A */ lui $v0, %hi(D_8009A66C) -/* CFB74 80139474 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* CFB70 80139470 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* CFB74 80139474 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* CFB78 80139478 0040882D */ daddu $s1, $v0, $zero /* CFB7C 8013947C 3C14F518 */ lui $s4, 0xf518 /* CFB80 80139480 36942000 */ ori $s4, $s4, 0x2000 @@ -528,8 +528,8 @@ glabel func_80138E54 /* CFD64 80139664 36940A01 */ ori $s4, $s4, 0xa01 /* CFD68 80139668 3C15E200 */ lui $s5, 0xe200 /* CFD6C 8013966C 36B5001C */ ori $s5, $s5, 0x1c -/* CFD70 80139670 3C16800A */ lui $s6, %hi(D_8009A66C) -/* CFD74 80139674 26D6A66C */ addiu $s6, $s6, %lo(D_8009A66C) +/* CFD70 80139670 3C16800A */ lui $s6, %hi(gMasterGfxPos) +/* CFD74 80139674 26D6A66C */ addiu $s6, $s6, %lo(gMasterGfxPos) /* CFD78 80139678 3C13800A */ lui $s3, %hi(nuGfxZBuffer) /* CFD7C 8013967C 2673A5DC */ addiu $s3, $s3, %lo(nuGfxZBuffer) /* CFD80 80139680 8EC20000 */ lw $v0, ($s6) @@ -698,14 +698,14 @@ glabel func_80138E54 /* D0000 80139900 AD23002C */ sw $v1, 0x2c($t1) /* D0004 80139904 3C013F00 */ lui $at, 0x3f00 /* D0008 80139908 44810000 */ mtc1 $at, $f0 -/* D000C 8013990C 00000000 */ nop +/* D000C 8013990C 00000000 */ nop /* D0010 80139910 4600C602 */ mul.s $f24, $f24, $f0 -/* D0014 80139914 00000000 */ nop -/* D0018 80139918 3C03800A */ lui $v1, %hi(D_8009A66C) -/* D001C 8013991C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* D0014 80139914 00000000 */ nop +/* D0018 80139918 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* D001C 8013991C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* D0020 80139920 8C620000 */ lw $v0, ($v1) /* D0024 80139924 4600C002 */ mul.s $f0, $f24, $f0 -/* D0028 80139928 00000000 */ nop +/* D0028 80139928 00000000 */ nop /* D002C 8013992C 3C01437F */ lui $at, 0x437f /* D0030 80139930 44811000 */ mtc1 $at, $f2 /* D0034 80139934 3C014F00 */ lui $at, 0x4f00 @@ -713,34 +713,34 @@ glabel func_80138E54 /* D003C 8013993C 0040202D */ daddu $a0, $v0, $zero /* D0040 80139940 24420008 */ addiu $v0, $v0, 8 /* D0044 80139944 461E0002 */ mul.s $f0, $f0, $f30 -/* D0048 80139948 00000000 */ nop +/* D0048 80139948 00000000 */ nop /* D004C 8013994C AC620000 */ sw $v0, ($v1) /* D0050 80139950 3C02FA00 */ lui $v0, 0xfa00 /* D0054 80139954 AC820000 */ sw $v0, ($a0) /* D0058 80139958 46020003 */ div.s $f0, $f0, $f2 /* D005C 8013995C 4600203E */ c.le.s $f4, $f0 -/* D0060 80139960 00000000 */ nop +/* D0060 80139960 00000000 */ nop /* D0064 80139964 45010005 */ bc1t .L8013997C /* D0068 80139968 24840004 */ addiu $a0, $a0, 4 /* D006C 8013996C 4600028D */ trunc.w.s $f10, $f0 /* D0070 80139970 44065000 */ mfc1 $a2, $f10 /* D0074 80139974 0804E665 */ j .L80139994 -/* D0078 80139978 00000000 */ nop +/* D0078 80139978 00000000 */ nop .L8013997C: /* D007C 8013997C 46040001 */ sub.s $f0, $f0, $f4 /* D0080 80139980 3C028000 */ lui $v0, 0x8000 /* D0084 80139984 4600028D */ trunc.w.s $f10, $f0 /* D0088 80139988 44065000 */ mfc1 $a2, $f10 -/* D008C 8013998C 00000000 */ nop +/* D008C 8013998C 00000000 */ nop /* D0090 80139990 00C23025 */ or $a2, $a2, $v0 .L80139994: -/* D0094 80139994 3C05800A */ lui $a1, %hi(D_8009A66C) -/* D0098 80139998 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* D0094 80139994 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* D0098 80139998 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* D009C 8013999C 3C013F00 */ lui $at, 0x3f00 /* D00A0 801399A0 44810000 */ mtc1 $at, $f0 /* D00A4 801399A4 8CA30000 */ lw $v1, ($a1) /* D00A8 801399A8 4600C002 */ mul.s $f0, $f24, $f0 -/* D00AC 801399AC 00000000 */ nop +/* D00AC 801399AC 00000000 */ nop /* D00B0 801399B0 3C01437F */ lui $at, 0x437f /* D00B4 801399B4 44811000 */ mtc1 $at, $f2 /* D00B8 801399B8 30C200FF */ andi $v0, $a2, 0xff @@ -751,13 +751,13 @@ glabel func_80138E54 /* D00CC 801399CC 44812000 */ mtc1 $at, $f4 /* D00D0 801399D0 0060202D */ daddu $a0, $v1, $zero /* D00D4 801399D4 461E0002 */ mul.s $f0, $f0, $f30 -/* D00D8 801399D8 00000000 */ nop +/* D00D8 801399D8 00000000 */ nop /* D00DC 801399DC 24630008 */ addiu $v1, $v1, 8 /* D00E0 801399E0 ACA30000 */ sw $v1, ($a1) /* D00E4 801399E4 AC820000 */ sw $v0, ($a0) /* D00E8 801399E8 46020003 */ div.s $f0, $f0, $f2 /* D00EC 801399EC 4600203E */ c.le.s $f4, $f0 -/* D00F0 801399F0 00000000 */ nop +/* D00F0 801399F0 00000000 */ nop /* D00F4 801399F4 45010005 */ bc1t .L80139A0C /* D00F8 801399F8 24840004 */ addiu $a0, $a0, 4 /* D00FC 801399FC 4600028D */ trunc.w.s $f10, $f0 @@ -769,7 +769,7 @@ glabel func_80138E54 /* D0110 80139A10 3C028000 */ lui $v0, 0x8000 /* D0114 80139A14 4600028D */ trunc.w.s $f10, $f0 /* D0118 80139A18 44035000 */ mfc1 $v1, $f10 -/* D011C 80139A1C 00000000 */ nop +/* D011C 80139A1C 00000000 */ nop /* D0120 80139A20 00621825 */ or $v1, $v1, $v0 /* D0124 80139A24 2402FF00 */ addiu $v0, $zero, -0x100 .L80139A28: @@ -777,9 +777,9 @@ glabel func_80138E54 /* D012C 80139A2C AC820000 */ sw $v0, ($a0) /* D0130 80139A30 8FAD0088 */ lw $t5, 0x88($sp) /* D0134 80139A34 15A00091 */ bnez $t5, .L80139C7C -/* D0138 80139A38 00000000 */ nop -/* D013C 80139A3C 3C06800A */ lui $a2, %hi(D_8009A66C) -/* D0140 80139A40 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* D0138 80139A38 00000000 */ nop +/* D013C 80139A3C 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* D0140 80139A40 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* D0144 80139A44 8CC50000 */ lw $a1, ($a2) /* D0148 80139A48 87C3000E */ lh $v1, 0xe($fp) /* D014C 80139A4C 87C2000A */ lh $v0, 0xa($fp) @@ -810,11 +810,11 @@ glabel func_80138E54 /* D01B0 80139AB0 30630FFF */ andi $v1, $v1, 0xfff /* D01B4 80139AB4 004D1023 */ subu $v0, $v0, $t5 /* D01B8 80139AB8 44820000 */ mtc1 $v0, $f0 -/* D01BC 80139ABC 00000000 */ nop +/* D01BC 80139ABC 00000000 */ nop /* D01C0 80139AC0 46800020 */ cvt.s.w $f0, $f0 /* D01C4 80139AC4 00031B00 */ sll $v1, $v1, 0xc /* D01C8 80139AC8 46020002 */ mul.s $f0, $f0, $f2 -/* D01CC 80139ACC 00000000 */ nop +/* D01CC 80139ACC 00000000 */ nop /* D01D0 80139AD0 87C20010 */ lh $v0, 0x10($fp) /* D01D4 80139AD4 3C014180 */ lui $at, 0x4180 /* D01D8 80139AD8 44811000 */ mtc1 $at, $f2 @@ -832,7 +832,7 @@ glabel func_80138E54 /* D0208 80139B08 44811000 */ mtc1 $at, $f2 /* D020C 80139B0C 24A70004 */ addiu $a3, $a1, 4 /* D0210 80139B10 4600103E */ c.le.s $f2, $f0 -/* D0214 80139B14 00000000 */ nop +/* D0214 80139B14 00000000 */ nop /* D0218 80139B18 45010005 */ bc1t .L80139B30 /* D021C 80139B1C ACA20000 */ sw $v0, ($a1) /* D0220 80139B20 4600028D */ trunc.w.s $f10, $f0 @@ -844,7 +844,7 @@ glabel func_80138E54 /* D0234 80139B34 3C028000 */ lui $v0, 0x8000 /* D0238 80139B38 4600028D */ trunc.w.s $f10, $f0 /* D023C 80139B3C 44035000 */ mfc1 $v1, $f10 -/* D0240 80139B40 00000000 */ nop +/* D0240 80139B40 00000000 */ nop /* D0244 80139B44 00621825 */ or $v1, $v1, $v0 /* D0248 80139B48 24020013 */ addiu $v0, $zero, 0x13 .L80139B4C: @@ -853,39 +853,39 @@ glabel func_80138E54 /* D0254 80139B54 44811000 */ mtc1 $at, $f2 /* D0258 80139B58 004D1023 */ subu $v0, $v0, $t5 /* D025C 80139B5C 44820000 */ mtc1 $v0, $f0 -/* D0260 80139B60 00000000 */ nop +/* D0260 80139B60 00000000 */ nop /* D0264 80139B64 46800020 */ cvt.s.w $f0, $f0 /* D0268 80139B68 46020002 */ mul.s $f0, $f0, $f2 -/* D026C 80139B6C 00000000 */ nop +/* D026C 80139B6C 00000000 */ nop /* D0270 80139B70 3C014180 */ lui $at, 0x4180 /* D0274 80139B74 44811000 */ mtc1 $at, $f2 /* D0278 80139B78 46160003 */ div.s $f0, $f0, $f22 /* D027C 80139B7C 46020000 */ add.s $f0, $f0, $f2 /* D0280 80139B80 3C014480 */ lui $at, 0x4480 /* D0284 80139B84 44811000 */ mtc1 $at, $f2 -/* D0288 80139B88 00000000 */ nop +/* D0288 80139B88 00000000 */ nop /* D028C 80139B8C 46020000 */ add.s $f0, $f0, $f2 /* D0290 80139B90 3C014F00 */ lui $at, 0x4f00 /* D0294 80139B94 44811000 */ mtc1 $at, $f2 -/* D0298 80139B98 00000000 */ nop +/* D0298 80139B98 00000000 */ nop /* D029C 80139B9C 4600103E */ c.le.s $f2, $f0 -/* D02A0 80139BA0 00000000 */ nop +/* D02A0 80139BA0 00000000 */ nop /* D02A4 80139BA4 45010005 */ bc1t .L80139BBC /* D02A8 80139BA8 00033400 */ sll $a2, $v1, 0x10 /* D02AC 80139BAC 4600028D */ trunc.w.s $f10, $f0 /* D02B0 80139BB0 44045000 */ mfc1 $a0, $f10 /* D02B4 80139BB4 0804E6F5 */ j .L80139BD4 -/* D02B8 80139BB8 00000000 */ nop +/* D02B8 80139BB8 00000000 */ nop .L80139BBC: /* D02BC 80139BBC 46020001 */ sub.s $f0, $f0, $f2 /* D02C0 80139BC0 3C028000 */ lui $v0, 0x8000 /* D02C4 80139BC4 4600028D */ trunc.w.s $f10, $f0 /* D02C8 80139BC8 44045000 */ mfc1 $a0, $f10 -/* D02CC 80139BCC 00000000 */ nop +/* D02CC 80139BCC 00000000 */ nop /* D02D0 80139BD0 00822025 */ or $a0, $a0, $v0 .L80139BD4: -/* D02D4 80139BD4 3C05800A */ lui $a1, %hi(D_8009A66C) -/* D02D8 80139BD8 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* D02D4 80139BD4 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* D02D8 80139BD8 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* D02DC 80139BDC 3082FFFF */ andi $v0, $a0, 0xffff /* D02E0 80139BE0 8CA30000 */ lw $v1, ($a1) /* D02E4 80139BE4 00C21025 */ or $v0, $a2, $v0 @@ -901,7 +901,7 @@ glabel func_80138E54 /* D030C 80139C0C ACA30000 */ sw $v1, ($a1) /* D0310 80139C10 AC820000 */ sw $v0, ($a0) /* D0314 80139C14 4600103E */ c.le.s $f2, $f0 -/* D0318 80139C18 00000000 */ nop +/* D0318 80139C18 00000000 */ nop /* D031C 80139C1C 45010005 */ bc1t .L80139C34 /* D0320 80139C20 24840004 */ addiu $a0, $a0, 4 /* D0324 80139C24 4600028D */ trunc.w.s $f10, $f0 @@ -913,7 +913,7 @@ glabel func_80138E54 /* D0338 80139C38 3C028000 */ lui $v0, 0x8000 /* D033C 80139C3C 4600028D */ trunc.w.s $f10, $f0 /* D0340 80139C40 44035000 */ mfc1 $v1, $f10 -/* D0344 80139C44 00000000 */ nop +/* D0344 80139C44 00000000 */ nop /* D0348 80139C48 00621825 */ or $v1, $v1, $v0 /* D034C 80139C4C 00032C00 */ sll $a1, $v1, 0x10 .L80139C50: @@ -923,14 +923,14 @@ glabel func_80138E54 /* D035C 80139C5C 44811000 */ mtc1 $at, $f2 /* D0360 80139C60 46160003 */ div.s $f0, $f0, $f22 /* D0364 80139C64 4600103E */ c.le.s $f2, $f0 -/* D0368 80139C68 00000000 */ nop +/* D0368 80139C68 00000000 */ nop /* D036C 80139C6C 4500008A */ bc1f .L80139E98 -/* D0370 80139C70 00000000 */ nop +/* D0370 80139C70 00000000 */ nop /* D0374 80139C74 0804E7AA */ j .L80139EA8 /* D0378 80139C78 46020001 */ sub.s $f0, $f0, $f2 .L80139C7C: -/* D037C 80139C7C 3C06800A */ lui $a2, %hi(D_8009A66C) -/* D0380 80139C80 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* D037C 80139C7C 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* D0380 80139C80 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* D0384 80139C84 8CC50000 */ lw $a1, ($a2) /* D0388 80139C88 87C3000E */ lh $v1, 0xe($fp) /* D038C 80139C8C 87C2000A */ lh $v0, 0xa($fp) @@ -964,11 +964,11 @@ glabel func_80138E54 /* D03FC 80139CFC 00042080 */ sll $a0, $a0, 2 /* D0400 80139D00 004D1023 */ subu $v0, $v0, $t5 /* D0404 80139D04 44820000 */ mtc1 $v0, $f0 -/* D0408 80139D08 00000000 */ nop +/* D0408 80139D08 00000000 */ nop /* D040C 80139D0C 46800020 */ cvt.s.w $f0, $f0 /* D0410 80139D10 30840FFF */ andi $a0, $a0, 0xfff /* D0414 80139D14 46020002 */ mul.s $f0, $f0, $f2 -/* D0418 80139D18 00000000 */ nop +/* D0418 80139D18 00000000 */ nop /* D041C 80139D1C 00641825 */ or $v1, $v1, $a0 /* D0420 80139D20 3C014480 */ lui $at, 0x4480 /* D0424 80139D24 44811000 */ mtc1 $at, $f2 @@ -980,7 +980,7 @@ glabel func_80138E54 /* D043C 80139D3C 44811000 */ mtc1 $at, $f2 /* D0440 80139D40 24A70004 */ addiu $a3, $a1, 4 /* D0444 80139D44 4600103E */ c.le.s $f2, $f0 -/* D0448 80139D48 00000000 */ nop +/* D0448 80139D48 00000000 */ nop /* D044C 80139D4C 45010005 */ bc1t .L80139D64 /* D0450 80139D50 ACA20000 */ sw $v0, ($a1) /* D0454 80139D54 4600028D */ trunc.w.s $f10, $f0 @@ -992,7 +992,7 @@ glabel func_80138E54 /* D0468 80139D68 3C028000 */ lui $v0, 0x8000 /* D046C 80139D6C 4600028D */ trunc.w.s $f10, $f0 /* D0470 80139D70 44035000 */ mfc1 $v1, $f10 -/* D0474 80139D74 00000000 */ nop +/* D0474 80139D74 00000000 */ nop /* D0478 80139D78 00621825 */ or $v1, $v1, $v0 /* D047C 80139D7C 24020020 */ addiu $v0, $zero, 0x20 .L80139D80: @@ -1001,35 +1001,35 @@ glabel func_80138E54 /* D0488 80139D88 44811000 */ mtc1 $at, $f2 /* D048C 80139D8C 004D1023 */ subu $v0, $v0, $t5 /* D0490 80139D90 44820000 */ mtc1 $v0, $f0 -/* D0494 80139D94 00000000 */ nop +/* D0494 80139D94 00000000 */ nop /* D0498 80139D98 46800020 */ cvt.s.w $f0, $f0 /* D049C 80139D9C 46020002 */ mul.s $f0, $f0, $f2 -/* D04A0 80139DA0 00000000 */ nop +/* D04A0 80139DA0 00000000 */ nop /* D04A4 80139DA4 3C014480 */ lui $at, 0x4480 /* D04A8 80139DA8 44811000 */ mtc1 $at, $f2 /* D04AC 80139DAC 46160003 */ div.s $f0, $f0, $f22 /* D04B0 80139DB0 46020000 */ add.s $f0, $f0, $f2 /* D04B4 80139DB4 3C014F00 */ lui $at, 0x4f00 /* D04B8 80139DB8 44811000 */ mtc1 $at, $f2 -/* D04BC 80139DBC 00000000 */ nop +/* D04BC 80139DBC 00000000 */ nop /* D04C0 80139DC0 4600103E */ c.le.s $f2, $f0 -/* D04C4 80139DC4 00000000 */ nop +/* D04C4 80139DC4 00000000 */ nop /* D04C8 80139DC8 45010005 */ bc1t .L80139DE0 /* D04CC 80139DCC 00033400 */ sll $a2, $v1, 0x10 /* D04D0 80139DD0 4600028D */ trunc.w.s $f10, $f0 /* D04D4 80139DD4 44045000 */ mfc1 $a0, $f10 /* D04D8 80139DD8 0804E77E */ j .L80139DF8 -/* D04DC 80139DDC 00000000 */ nop +/* D04DC 80139DDC 00000000 */ nop .L80139DE0: /* D04E0 80139DE0 46020001 */ sub.s $f0, $f0, $f2 /* D04E4 80139DE4 3C028000 */ lui $v0, 0x8000 /* D04E8 80139DE8 4600028D */ trunc.w.s $f10, $f0 /* D04EC 80139DEC 44045000 */ mfc1 $a0, $f10 -/* D04F0 80139DF0 00000000 */ nop +/* D04F0 80139DF0 00000000 */ nop /* D04F4 80139DF4 00822025 */ or $a0, $a0, $v0 .L80139DF8: -/* D04F8 80139DF8 3C05800A */ lui $a1, %hi(D_8009A66C) -/* D04FC 80139DFC 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* D04F8 80139DF8 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* D04FC 80139DFC 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* D0500 80139E00 3082FFFF */ andi $v0, $a0, 0xffff /* D0504 80139E04 8CA30000 */ lw $v1, ($a1) /* D0508 80139E08 00C21025 */ or $v0, $a2, $v0 @@ -1045,7 +1045,7 @@ glabel func_80138E54 /* D0530 80139E30 ACA30000 */ sw $v1, ($a1) /* D0534 80139E34 AC820000 */ sw $v0, ($a0) /* D0538 80139E38 4600103E */ c.le.s $f2, $f0 -/* D053C 80139E3C 00000000 */ nop +/* D053C 80139E3C 00000000 */ nop /* D0540 80139E40 45010005 */ bc1t .L80139E58 /* D0544 80139E44 24840004 */ addiu $a0, $a0, 4 /* D0548 80139E48 4600028D */ trunc.w.s $f10, $f0 @@ -1057,7 +1057,7 @@ glabel func_80138E54 /* D055C 80139E5C 3C028000 */ lui $v0, 0x8000 /* D0560 80139E60 4600028D */ trunc.w.s $f10, $f0 /* D0564 80139E64 44035000 */ mfc1 $v1, $f10 -/* D0568 80139E68 00000000 */ nop +/* D0568 80139E68 00000000 */ nop /* D056C 80139E6C 00621825 */ or $v1, $v1, $v0 /* D0570 80139E70 00032C00 */ sll $a1, $v1, 0x10 .L80139E74: @@ -1067,7 +1067,7 @@ glabel func_80138E54 /* D0580 80139E80 44811000 */ mtc1 $at, $f2 /* D0584 80139E84 46160003 */ div.s $f0, $f0, $f22 /* D0588 80139E88 4600103E */ c.le.s $f2, $f0 -/* D058C 80139E8C 00000000 */ nop +/* D058C 80139E8C 00000000 */ nop /* D0590 80139E90 45030005 */ bc1tl .L80139EA8 /* D0594 80139E94 46020001 */ sub.s $f0, $f0, $f2 .L80139E98: @@ -1079,7 +1079,7 @@ glabel func_80138E54 /* D05A8 80139EA8 3C028000 */ lui $v0, 0x8000 /* D05AC 80139EAC 4600028D */ trunc.w.s $f10, $f0 /* D05B0 80139EB0 44035000 */ mfc1 $v1, $f10 -/* D05B4 80139EB4 00000000 */ nop +/* D05B4 80139EB4 00000000 */ nop /* D05B8 80139EB8 00621825 */ or $v1, $v1, $v0 /* D05BC 80139EBC 3062FFFF */ andi $v0, $v1, 0xffff .L80139EC0: diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80139F10.s b/asm/nonmatchings/code_cd180_len_38f0/func_80139F10.s index 3dba9a80fe..68a4e9d9c8 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80139F10.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80139F10.s @@ -35,26 +35,26 @@ glabel func_80139F10 /* D0684 80139F84 0120702D */ daddu $t6, $t1, $zero .L80139F88: /* D0688 80139F88 44800000 */ mtc1 $zero, $f0 -/* D068C 80139F8C 00000000 */ nop +/* D068C 80139F8C 00000000 */ nop /* D0690 80139F90 46004032 */ c.eq.s $f8, $f0 -/* D0694 80139F94 00000000 */ nop +/* D0694 80139F94 00000000 */ nop /* D0698 80139F98 450100F0 */ bc1t .L8013A35C /* D069C 80139F9C 3C04ED00 */ lui $a0, 0xed00 /* D06A0 80139FA0 3C014080 */ lui $at, 0x4080 /* D06A4 80139FA4 44812000 */ mtc1 $at, $f4 /* D06A8 80139FA8 44891000 */ mtc1 $t1, $f2 -/* D06AC 80139FAC 00000000 */ nop +/* D06AC 80139FAC 00000000 */ nop /* D06B0 80139FB0 468010A0 */ cvt.s.w $f2, $f2 /* D06B4 80139FB4 46041082 */ mul.s $f2, $f2, $f4 -/* D06B8 80139FB8 00000000 */ nop -/* D06BC 80139FBC 3C08800A */ lui $t0, %hi(D_8009A66C) -/* D06C0 80139FC0 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* D06B8 80139FB8 00000000 */ nop +/* D06BC 80139FBC 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* D06C0 80139FC0 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* D06C4 80139FC4 448A0000 */ mtc1 $t2, $f0 -/* D06C8 80139FC8 00000000 */ nop +/* D06C8 80139FC8 00000000 */ nop /* D06CC 80139FCC 46800020 */ cvt.s.w $f0, $f0 /* D06D0 80139FD0 8D060000 */ lw $a2, ($t0) /* D06D4 80139FD4 46040002 */ mul.s $f0, $f0, $f4 -/* D06D8 80139FD8 00000000 */ nop +/* D06D8 80139FD8 00000000 */ nop /* D06DC 80139FDC 3C01437F */ lui $at, 0x437f /* D06E0 80139FE0 44813000 */ mtc1 $at, $f6 /* D06E4 80139FE4 00C0282D */ daddu $a1, $a2, $zero @@ -63,33 +63,33 @@ glabel func_80139F10 /* D06F0 80139FF0 46064032 */ c.eq.s $f8, $f6 /* D06F4 80139FF4 4600128D */ trunc.w.s $f10, $f2 /* D06F8 80139FF8 44025000 */ mfc1 $v0, $f10 -/* D06FC 80139FFC 00000000 */ nop +/* D06FC 80139FFC 00000000 */ nop /* D0700 8013A000 30420FFF */ andi $v0, $v0, 0xfff /* D0704 8013A004 00021300 */ sll $v0, $v0, 0xc /* D0708 8013A008 4600028D */ trunc.w.s $f10, $f0 /* D070C 8013A00C 44035000 */ mfc1 $v1, $f10 /* D0710 8013A010 448B1000 */ mtc1 $t3, $f2 -/* D0714 8013A014 00000000 */ nop +/* D0714 8013A014 00000000 */ nop /* D0718 8013A018 468010A0 */ cvt.s.w $f2, $f2 /* D071C 8013A01C 46041082 */ mul.s $f2, $f2, $f4 -/* D0720 8013A020 00000000 */ nop +/* D0720 8013A020 00000000 */ nop /* D0724 8013A024 30630FFF */ andi $v1, $v1, 0xfff /* D0728 8013A028 00641825 */ or $v1, $v1, $a0 /* D072C 8013A02C 00431025 */ or $v0, $v0, $v1 /* D0730 8013A030 448C0000 */ mtc1 $t4, $f0 -/* D0734 8013A034 00000000 */ nop +/* D0734 8013A034 00000000 */ nop /* D0738 8013A038 46800020 */ cvt.s.w $f0, $f0 /* D073C 8013A03C 46040002 */ mul.s $f0, $f0, $f4 -/* D0740 8013A040 00000000 */ nop +/* D0740 8013A040 00000000 */ nop /* D0744 8013A044 ACA20000 */ sw $v0, ($a1) /* D0748 8013A048 4600128D */ trunc.w.s $f10, $f2 /* D074C 8013A04C 44025000 */ mfc1 $v0, $f10 -/* D0750 8013A050 00000000 */ nop +/* D0750 8013A050 00000000 */ nop /* D0754 8013A054 30420FFF */ andi $v0, $v0, 0xfff /* D0758 8013A058 00021300 */ sll $v0, $v0, 0xc /* D075C 8013A05C 4600028D */ trunc.w.s $f10, $f0 /* D0760 8013A060 44035000 */ mfc1 $v1, $f10 -/* D0764 8013A064 00000000 */ nop +/* D0764 8013A064 00000000 */ nop /* D0768 8013A068 30630FFF */ andi $v1, $v1, 0xfff /* D076C 8013A06C 00431025 */ or $v0, $v0, $v1 /* D0770 8013A070 45000009 */ bc1f .L8013A098 @@ -122,7 +122,7 @@ glabel func_80139F10 /* D07D8 8013A0D8 00621825 */ or $v1, $v1, $v0 /* D07DC 8013A0DC 8FA20014 */ lw $v0, 0x14($sp) /* D07E0 8013A0E0 46020002 */ mul.s $f0, $f0, $f2 -/* D07E4 8013A0E4 00000000 */ nop +/* D07E4 8013A0E4 00000000 */ nop /* D07E8 8013A0E8 304200FF */ andi $v0, $v0, 0xff /* D07EC 8013A0EC 00021200 */ sll $v0, $v0, 8 /* D07F0 8013A0F0 00621825 */ or $v1, $v1, $v0 @@ -153,10 +153,10 @@ glabel func_80139F10 /* D0854 8013A154 46220000 */ add.d $f0, $f0, $f2 /* D0858 8013A158 01AF2023 */ subu $a0, $t5, $t7 /* D085C 8013A15C 44841000 */ mtc1 $a0, $f2 -/* D0860 8013A160 00000000 */ nop +/* D0860 8013A160 00000000 */ nop /* D0864 8013A164 468010A0 */ cvt.s.w $f2, $f2 /* D0868 8013A168 46041082 */ mul.s $f2, $f2, $f4 -/* D086C 8013A16C 00000000 */ nop +/* D086C 8013A16C 00000000 */ nop /* D0870 8013A170 00431025 */ or $v0, $v0, $v1 /* D0874 8013A174 ACA20004 */ sw $v0, 4($a1) /* D0878 8013A178 46200120 */ cvt.s.d $f4, $f0 @@ -173,7 +173,7 @@ glabel func_80139F10 /* D08A4 8013A1A4 44811000 */ mtc1 $at, $f2 /* D08A8 8013A1A8 3C02E100 */ lui $v0, 0xe100 /* D08AC 8013A1AC 4600103E */ c.le.s $f2, $f0 -/* D08B0 8013A1B0 00000000 */ nop +/* D08B0 8013A1B0 00000000 */ nop /* D08B4 8013A1B4 45010005 */ bc1t .L8013A1CC /* D08B8 8013A1B8 ACA20008 */ sw $v0, 8($a1) /* D08BC 8013A1BC 4600028D */ trunc.w.s $f10, $f0 @@ -185,46 +185,46 @@ glabel func_80139F10 /* D08D0 8013A1D0 3C028000 */ lui $v0, 0x8000 /* D08D4 8013A1D4 4600028D */ trunc.w.s $f10, $f0 /* D08D8 8013A1D8 44035000 */ mfc1 $v1, $f10 -/* D08DC 8013A1DC 00000000 */ nop +/* D08DC 8013A1DC 00000000 */ nop /* D08E0 8013A1E0 00621825 */ or $v1, $v1, $v0 /* D08E4 8013A1E4 01D81023 */ subu $v0, $t6, $t8 .L8013A1E8: /* D08E8 8013A1E8 3C014200 */ lui $at, 0x4200 /* D08EC 8013A1EC 44811000 */ mtc1 $at, $f2 /* D08F0 8013A1F0 44820000 */ mtc1 $v0, $f0 -/* D08F4 8013A1F4 00000000 */ nop +/* D08F4 8013A1F4 00000000 */ nop /* D08F8 8013A1F8 46800020 */ cvt.s.w $f0, $f0 /* D08FC 8013A1FC 46020002 */ mul.s $f0, $f0, $f2 -/* D0900 8013A200 00000000 */ nop +/* D0900 8013A200 00000000 */ nop /* D0904 8013A204 3C014180 */ lui $at, 0x4180 /* D0908 8013A208 44811000 */ mtc1 $at, $f2 /* D090C 8013A20C 46040003 */ div.s $f0, $f0, $f4 /* D0910 8013A210 46020000 */ add.s $f0, $f0, $f2 /* D0914 8013A214 3C014480 */ lui $at, 0x4480 /* D0918 8013A218 44811000 */ mtc1 $at, $f2 -/* D091C 8013A21C 00000000 */ nop +/* D091C 8013A21C 00000000 */ nop /* D0920 8013A220 46020000 */ add.s $f0, $f0, $f2 /* D0924 8013A224 3C014F00 */ lui $at, 0x4f00 /* D0928 8013A228 44811000 */ mtc1 $at, $f2 -/* D092C 8013A22C 00000000 */ nop +/* D092C 8013A22C 00000000 */ nop /* D0930 8013A230 4600103E */ c.le.s $f2, $f0 -/* D0934 8013A234 00000000 */ nop +/* D0934 8013A234 00000000 */ nop /* D0938 8013A238 45010005 */ bc1t .L8013A250 /* D093C 8013A23C 00033400 */ sll $a2, $v1, 0x10 /* D0940 8013A240 4600028D */ trunc.w.s $f10, $f0 /* D0944 8013A244 44045000 */ mfc1 $a0, $f10 /* D0948 8013A248 0804E89A */ j .L8013A268 -/* D094C 8013A24C 00000000 */ nop +/* D094C 8013A24C 00000000 */ nop .L8013A250: /* D0950 8013A250 46020001 */ sub.s $f0, $f0, $f2 /* D0954 8013A254 3C028000 */ lui $v0, 0x8000 /* D0958 8013A258 4600028D */ trunc.w.s $f10, $f0 /* D095C 8013A25C 44045000 */ mfc1 $a0, $f10 -/* D0960 8013A260 00000000 */ nop +/* D0960 8013A260 00000000 */ nop /* D0964 8013A264 00822025 */ or $a0, $a0, $v0 .L8013A268: -/* D0968 8013A268 3C05800A */ lui $a1, %hi(D_8009A66C) -/* D096C 8013A26C 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* D0968 8013A268 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* D096C 8013A26C 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* D0970 8013A270 3082FFFF */ andi $v0, $a0, 0xffff /* D0974 8013A274 8CA30000 */ lw $v1, ($a1) /* D0978 8013A278 00C21025 */ or $v0, $a2, $v0 @@ -240,7 +240,7 @@ glabel func_80139F10 /* D09A0 8013A2A0 ACA30000 */ sw $v1, ($a1) /* D09A4 8013A2A4 AC820000 */ sw $v0, ($a0) /* D09A8 8013A2A8 4600103E */ c.le.s $f2, $f0 -/* D09AC 8013A2AC 00000000 */ nop +/* D09AC 8013A2AC 00000000 */ nop /* D09B0 8013A2B0 45010005 */ bc1t .L8013A2C8 /* D09B4 8013A2B4 24840004 */ addiu $a0, $a0, 4 /* D09B8 8013A2B8 4600028D */ trunc.w.s $f10, $f0 @@ -252,7 +252,7 @@ glabel func_80139F10 /* D09CC 8013A2CC 3C028000 */ lui $v0, 0x8000 /* D09D0 8013A2D0 4600028D */ trunc.w.s $f10, $f0 /* D09D4 8013A2D4 44035000 */ mfc1 $v1, $f10 -/* D09D8 8013A2D8 00000000 */ nop +/* D09D8 8013A2D8 00000000 */ nop /* D09DC 8013A2DC 00621825 */ or $v1, $v1, $v0 /* D09E0 8013A2E0 00033C00 */ sll $a3, $v1, 0x10 .L8013A2E4: @@ -262,22 +262,22 @@ glabel func_80139F10 /* D09F0 8013A2F0 44811000 */ mtc1 $at, $f2 /* D09F4 8013A2F4 46040003 */ div.s $f0, $f0, $f4 /* D09F8 8013A2F8 4600103E */ c.le.s $f2, $f0 -/* D09FC 8013A2FC 00000000 */ nop +/* D09FC 8013A2FC 00000000 */ nop /* D0A00 8013A300 45030005 */ bc1tl .L8013A318 /* D0A04 8013A304 46020001 */ sub.s $f0, $f0, $f2 /* D0A08 8013A308 4600028D */ trunc.w.s $f10, $f0 /* D0A0C 8013A30C 44065000 */ mfc1 $a2, $f10 /* D0A10 8013A310 0804E8CB */ j .L8013A32C -/* D0A14 8013A314 00000000 */ nop +/* D0A14 8013A314 00000000 */ nop .L8013A318: /* D0A18 8013A318 3C028000 */ lui $v0, 0x8000 /* D0A1C 8013A31C 4600028D */ trunc.w.s $f10, $f0 /* D0A20 8013A320 44065000 */ mfc1 $a2, $f10 -/* D0A24 8013A324 00000000 */ nop +/* D0A24 8013A324 00000000 */ nop /* D0A28 8013A328 00C23025 */ or $a2, $a2, $v0 .L8013A32C: -/* D0A2C 8013A32C 3C05800A */ lui $a1, %hi(D_8009A66C) -/* D0A30 8013A330 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* D0A2C 8013A32C 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* D0A30 8013A330 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* D0A34 8013A334 30C2FFFF */ andi $v0, $a2, 0xffff /* D0A38 8013A338 8CA30000 */ lw $v1, ($a1) /* D0A3C 8013A33C 00E21025 */ or $v0, $a3, $v0 @@ -290,7 +290,7 @@ glabel func_80139F10 /* D0A58 8013A358 AC800004 */ sw $zero, 4($a0) .L8013A35C: /* D0A5C 8013A35C 03E00008 */ jr $ra -/* D0A60 8013A360 00000000 */ nop -/* D0A64 8013A364 00000000 */ nop -/* D0A68 8013A368 00000000 */ nop -/* D0A6C 8013A36C 00000000 */ nop +/* D0A60 8013A360 00000000 */ nop +/* D0A64 8013A364 00000000 */ nop +/* D0A68 8013A368 00000000 */ nop +/* D0A6C 8013A36C 00000000 */ nop diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A37C.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A37C.s index 3b1008f65f..5c2eaaf353 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A37C.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A37C.s @@ -75,8 +75,8 @@ glabel func_8013A37C /* D0B84 8013A484 2A220008 */ slti $v0, $s1, 8 /* D0B88 8013A488 1440FFFA */ bnez $v0, .L8013A474 /* D0B8C 8013A48C 24630008 */ addiu $v1, $v1, 8 -/* D0B90 8013A490 3C028007 */ lui $v0, %hi(D_800741F4) -/* D0B94 8013A494 8C4241F4 */ lw $v0, %lo(D_800741F4)($v0) +/* D0B90 8013A490 3C028007 */ lui $v0, %hi(gCurrentDisplayContextIndex) +/* D0B94 8013A494 8C4241F4 */ lw $v0, %lo(gCurrentDisplayContextIndex)($v0) /* D0B98 8013A498 8FBF001C */ lw $ra, 0x1c($sp) /* D0B9C 8013A49C 8FB20018 */ lw $s2, 0x18($sp) /* D0BA0 8013A4A0 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s index 98ba5d0ec6..64482b54e8 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8013A4D0 -/* D0BD0 8013A4D0 3C028007 */ lui $v0, %hi(D_800741F4) -/* D0BD4 8013A4D4 8C4241F4 */ lw $v0, %lo(D_800741F4)($v0) +/* D0BD0 8013A4D0 3C028007 */ lui $v0, %hi(gCurrentDisplayContextIndex) +/* D0BD4 8013A4D4 8C4241F4 */ lw $v0, %lo(gCurrentDisplayContextIndex)($v0) /* D0BD8 8013A4D8 27BDFFD8 */ addiu $sp, $sp, -0x28 /* D0BDC 8013A4DC AFB00010 */ sw $s0, 0x10($sp) /* D0BE0 8013A4E0 3C108015 */ lui $s0, %hi(D_80156954) @@ -40,9 +40,9 @@ glabel func_8013A4D0 /* D0C58 8013A558 26310001 */ addiu $s1, $s1, 1 /* D0C5C 8013A55C 80820005 */ lb $v0, 5($a0) /* D0C60 8013A560 10520003 */ beq $v0, $s2, .L8013A570 -/* D0C64 8013A564 00000000 */ nop +/* D0C64 8013A564 00000000 */ nop /* D0C68 8013A568 0C04EA4F */ jal func_8013A93C -/* D0C6C 8013A56C 00000000 */ nop +/* D0C6C 8013A56C 00000000 */ nop .L8013A570: /* D0C70 8013A570 2A22005A */ slti $v0, $s1, 0x5a /* D0C74 8013A574 1440FFF2 */ bnez $v0, .L8013A540 @@ -67,9 +67,9 @@ glabel func_8013A4D0 /* D0CBC 8013A5BC 10540009 */ beq $v0, $s4, .L8013A5E4 /* D0CC0 8013A5C0 26310001 */ addiu $s1, $s1, 1 /* D0CC4 8013A5C4 10530007 */ beq $v0, $s3, .L8013A5E4 -/* D0CC8 8013A5C8 00000000 */ nop +/* D0CC8 8013A5C8 00000000 */ nop /* D0CCC 8013A5CC 0C00AB1E */ jal general_heap_free -/* D0CD0 8013A5D0 00000000 */ nop +/* D0CD0 8013A5D0 00000000 */ nop /* D0CD4 8013A5D4 8E420000 */ lw $v0, ($s2) /* D0CD8 8013A5D8 02021021 */ addu $v0, $s0, $v0 /* D0CDC 8013A5DC AC40005C */ sw $zero, 0x5c($v0) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s index 26577fdbd0..901b8e41dd 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s @@ -8,8 +8,8 @@ glabel func_8013B1B0 /* D18BC 8013B1BC AFB3001C */ sw $s3, 0x1c($sp) /* D18C0 8013B1C0 00A0982D */ daddu $s3, $a1, $zero /* D18C4 8013B1C4 0000482D */ daddu $t1, $zero, $zero -/* D18C8 8013B1C8 3C05800A */ lui $a1, %hi(D_8009A66C) -/* D18CC 8013B1CC 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* D18C8 8013B1C8 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* D18CC 8013B1CC 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* D18D0 8013B1D0 3C03E700 */ lui $v1, 0xe700 /* D18D4 8013B1D4 AFBF0020 */ sw $ra, 0x20($sp) /* D18D8 8013B1D8 AFB10014 */ sw $s1, 0x14($sp) @@ -91,7 +91,7 @@ glabel func_8013B1B0 /* D19F8 8013B2F8 90430024 */ lbu $v1, 0x24($v0) /* D19FC 8013B2FC 0120102D */ daddu $v0, $t1, $zero /* D1A00 8013B300 44830000 */ mtc1 $v1, $f0 -/* D1A04 8013B304 00000000 */ nop +/* D1A04 8013B304 00000000 */ nop /* D1A08 8013B308 46800020 */ cvt.s.w $f0, $f0 /* D1A0C 8013B30C 46000021 */ cvt.d.s $f0, $f0 /* D1A10 8013B310 46220003 */ div.d $f0, $f0, $f2 @@ -109,7 +109,7 @@ glabel func_8013B1B0 /* D1A40 8013B340 00220821 */ addu $at, $at, $v0 /* D1A44 8013B344 8C221058 */ lw $v0, %lo(D_80151058)($at) /* D1A48 8013B348 00400008 */ jr $v0 -/* D1A4C 8013B34C 00000000 */ nop +/* D1A4C 8013B34C 00000000 */ nop /* D1A50 8013B350 0804ECD9 */ j .L8013B364 /* D1A54 8013B354 240A0002 */ addiu $t2, $zero, 2 /* D1A58 8013B358 0804ECD9 */ j .L8013B364 @@ -120,7 +120,7 @@ glabel func_8013B1B0 /* D1A68 8013B368 C6400038 */ lwc1 $f0, 0x38($s2) /* D1A6C 8013B36C 46800020 */ cvt.s.w $f0, $f0 /* D1A70 8013B370 46020002 */ mul.s $f0, $f0, $f2 -/* D1A74 8013B374 00000000 */ nop +/* D1A74 8013B374 00000000 */ nop /* D1A78 8013B378 34E74B40 */ ori $a3, $a3, 0x4b40 /* D1A7C 8013B37C 3C060010 */ lui $a2, 0x10 /* D1A80 8013B380 34C64B40 */ ori $a2, $a2, 0x4b40 @@ -143,8 +143,8 @@ glabel func_8013B1B0 /* D1ABC 8013B3BC 30420040 */ andi $v0, $v0, 0x40 /* D1AC0 8013B3C0 1040000B */ beqz $v0, .L8013B3F0 /* D1AC4 8013B3C4 3C05D9FF */ lui $a1, 0xd9ff -/* D1AC8 8013B3C8 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D1ACC 8013B3CC 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D1AC8 8013B3C8 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D1ACC 8013B3CC 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D1AD0 8013B3D0 8C820000 */ lw $v0, ($a0) /* D1AD4 8013B3D4 34A5FFFE */ ori $a1, $a1, 0xfffe /* D1AD8 8013B3D8 0040182D */ daddu $v1, $v0, $zero @@ -154,8 +154,8 @@ glabel func_8013B1B0 /* D1AE8 8013B3E8 0804ED0D */ j .L8013B434 /* D1AEC 8013B3EC AC600004 */ sw $zero, 4($v1) .L8013B3F0: -/* D1AF0 8013B3F0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* D1AF4 8013B3F4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* D1AF0 8013B3F0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* D1AF4 8013B3F4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* D1AF8 8013B3F8 8C620000 */ lw $v0, ($v1) /* D1AFC 8013B3FC 34A5FFFF */ ori $a1, $a1, 0xffff /* D1B00 8013B400 0040202D */ daddu $a0, $v0, $zero @@ -174,8 +174,8 @@ glabel func_8013B1B0 /* D1B30 8013B430 34C60030 */ ori $a2, $a2, 0x30 .L8013B434: /* D1B34 8013B434 3C05E200 */ lui $a1, 0xe200 -/* D1B38 8013B438 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D1B3C 8013B43C 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D1B38 8013B438 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D1B3C 8013B43C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D1B40 8013B440 8C820000 */ lw $v0, ($a0) /* D1B44 8013B444 34A5001C */ ori $a1, $a1, 0x1c /* D1B48 8013B448 AE460078 */ sw $a2, 0x78($s2) @@ -192,10 +192,10 @@ glabel func_8013B1B0 /* D1B74 8013B474 00220821 */ addu $at, $at, $v0 /* D1B78 8013B478 8C221088 */ lw $v0, %lo(D_80151088)($at) /* D1B7C 8013B47C 00400008 */ jr $v0 -/* D1B80 8013B480 00000000 */ nop +/* D1B80 8013B480 00000000 */ nop /* D1B84 8013B484 3C02FC11 */ lui $v0, 0xfc11 -/* D1B88 8013B488 3C03800A */ lui $v1, %hi(D_8009A66C) -/* D1B8C 8013B48C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* D1B88 8013B488 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* D1B8C 8013B48C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* D1B90 8013B490 8C650000 */ lw $a1, ($v1) /* D1B94 8013B494 3442FE23 */ ori $v0, $v0, 0xfe23 /* D1B98 8013B498 00A0202D */ daddu $a0, $a1, $zero @@ -209,8 +209,8 @@ glabel func_8013B1B0 /* D1BB8 8013B4B8 3C06FCFF */ lui $a2, 0xfcff /* D1BBC 8013B4BC 34C697FF */ ori $a2, $a2, 0x97ff /* D1BC0 8013B4C0 3C05FF2C */ lui $a1, 0xff2c -/* D1BC4 8013B4C4 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D1BC8 8013B4C8 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D1BC4 8013B4C4 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D1BC8 8013B4C8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D1BCC 8013B4CC 8C820000 */ lw $v0, ($a0) /* D1BD0 8013B4D0 34A5FE7F */ ori $a1, $a1, 0xfe7f /* D1BD4 8013B4D4 0040182D */ daddu $v1, $v0, $zero @@ -228,8 +228,8 @@ glabel func_8013B1B0 /* D1C04 8013B504 3C06FC11 */ lui $a2, 0xfc11 /* D1C08 8013B508 34C69623 */ ori $a2, $a2, 0x9623 /* D1C0C 8013B50C 3C04FF2F */ lui $a0, 0xff2f -/* D1C10 8013B510 3C03800A */ lui $v1, %hi(D_8009A66C) -/* D1C14 8013B514 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* D1C10 8013B510 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* D1C14 8013B514 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* D1C18 8013B518 8C650000 */ lw $a1, ($v1) /* D1C1C 8013B51C 3484FFFF */ ori $a0, $a0, 0xffff /* D1C20 8013B520 00A0102D */ daddu $v0, $a1, $zero @@ -259,8 +259,8 @@ glabel func_8013B1B0 /* D1C80 8013B580 3C06FC60 */ lui $a2, 0xfc60 /* D1C84 8013B584 34C696C1 */ ori $a2, $a2, 0x96c1 /* D1C88 8013B588 3C04FF2D */ lui $a0, 0xff2d -/* D1C8C 8013B58C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* D1C90 8013B590 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* D1C8C 8013B58C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* D1C90 8013B590 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* D1C94 8013B594 8C650000 */ lw $a1, ($v1) /* D1C98 8013B598 3484FEFF */ ori $a0, $a0, 0xfeff /* D1C9C 8013B59C 00A0102D */ daddu $v0, $a1, $zero @@ -289,8 +289,8 @@ glabel func_8013B1B0 /* D1CF8 8013B5F8 3C060020 */ lui $a2, 0x20 /* D1CFC 8013B5FC 34C60004 */ ori $a2, $a2, 4 /* D1D00 8013B600 3C08D9FD */ lui $t0, 0xd9fd -/* D1D04 8013B604 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D1D08 8013B608 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D1D04 8013B604 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D1D08 8013B608 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D1D0C 8013B60C 8C820000 */ lw $v0, ($a0) /* D1D10 8013B610 3508FFFF */ ori $t0, $t0, 0xffff /* D1D14 8013B614 0040282D */ daddu $a1, $v0, $zero @@ -333,8 +333,8 @@ glabel func_8013B1B0 /* D1DA4 8013B6A4 3C060020 */ lui $a2, 0x20 /* D1DA8 8013B6A8 34C60004 */ ori $a2, $a2, 4 /* D1DAC 8013B6AC 3C09D9FD */ lui $t1, 0xd9fd -/* D1DB0 8013B6B0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D1DB4 8013B6B4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D1DB0 8013B6B0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D1DB4 8013B6B4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D1DB8 8013B6B8 8C820000 */ lw $v0, ($a0) /* D1DBC 8013B6BC 3529FFFF */ ori $t1, $t1, 0xffff /* D1DC0 8013B6C0 0040182D */ daddu $v1, $v0, $zero @@ -359,8 +359,8 @@ glabel func_8013B1B0 /* D1E0C 8013B70C 3C06D9FF */ lui $a2, 0xd9ff /* D1E10 8013B710 34C6FFFF */ ori $a2, $a2, 0xffff /* D1E14 8013B714 3C050022 */ lui $a1, 0x22 -/* D1E18 8013B718 3C11800A */ lui $s1, %hi(D_8009A66C) -/* D1E1C 8013B71C 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* D1E18 8013B718 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* D1E1C 8013B71C 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* D1E20 8013B720 8E230000 */ lw $v1, ($s1) /* D1E24 8013B724 34A50004 */ ori $a1, $a1, 4 /* D1E28 8013B728 0060202D */ daddu $a0, $v1, $zero @@ -388,23 +388,23 @@ glabel func_8013B1B0 /* D1E80 8013B780 AE230000 */ sw $v1, ($s1) /* D1E84 8013B784 4600018D */ trunc.w.s $f6, $f0 /* D1E88 8013B788 44043000 */ mfc1 $a0, $f6 -/* D1E8C 8013B78C 00000000 */ nop +/* D1E8C 8013B78C 00000000 */ nop /* D1E90 8013B790 00042400 */ sll $a0, $a0, 0x10 /* D1E94 8013B794 0C00A4F5 */ jal cosine /* D1E98 8013B798 00042403 */ sra $a0, $a0, 0x10 /* D1E9C 8013B79C C604006C */ lwc1 $f4, 0x6c($s0) /* D1EA0 8013B7A0 3C0142B4 */ lui $at, 0x42b4 /* D1EA4 8013B7A4 44811000 */ mtc1 $at, $f2 -/* D1EA8 8013B7A8 00000000 */ nop +/* D1EA8 8013B7A8 00000000 */ nop /* D1EAC 8013B7AC 46022100 */ add.s $f4, $f4, $f2 /* D1EB0 8013B7B0 3C0142F0 */ lui $at, 0x42f0 /* D1EB4 8013B7B4 4481A000 */ mtc1 $at, $f20 -/* D1EB8 8013B7B8 00000000 */ nop +/* D1EB8 8013B7B8 00000000 */ nop /* D1EBC 8013B7BC 46140002 */ mul.s $f0, $f0, $f20 -/* D1EC0 8013B7C0 00000000 */ nop +/* D1EC0 8013B7C0 00000000 */ nop /* D1EC4 8013B7C4 4600218D */ trunc.w.s $f6, $f4 /* D1EC8 8013B7C8 44043000 */ mfc1 $a0, $f6 -/* D1ECC 8013B7CC 00000000 */ nop +/* D1ECC 8013B7CC 00000000 */ nop /* D1ED0 8013B7D0 00042400 */ sll $a0, $a0, 0x10 /* D1ED4 8013B7D4 4600018D */ trunc.w.s $f6, $f0 /* D1ED8 8013B7D8 44103000 */ mfc1 $s0, $f6 @@ -423,7 +423,7 @@ glabel func_8013B1B0 /* D1F0C 8013B80C 2484EE18 */ addiu $a0, $a0, %lo(D_8014EE18) /* D1F10 8013B810 8E230000 */ lw $v1, ($s1) /* D1F14 8013B814 46140002 */ mul.s $f0, $f0, $f20 -/* D1F18 8013B818 00000000 */ nop +/* D1F18 8013B818 00000000 */ nop /* D1F1C 8013B81C A0820010 */ sb $v0, 0x10($a0) /* D1F20 8013B820 A0900020 */ sb $s0, 0x20($a0) /* D1F24 8013B824 0060282D */ daddu $a1, $v1, $zero @@ -437,7 +437,7 @@ glabel func_8013B1B0 /* D1F44 8013B844 AE220000 */ sw $v0, ($s1) /* D1F48 8013B848 4600018D */ trunc.w.s $f6, $f0 /* D1F4C 8013B84C 44023000 */ mfc1 $v0, $f6 -/* D1F50 8013B850 00000000 */ nop +/* D1F50 8013B850 00000000 */ nop /* D1F54 8013B854 A0820012 */ sb $v0, 0x12($a0) /* D1F58 8013B858 00021600 */ sll $v0, $v0, 0x18 /* D1F5C 8013B85C 00021603 */ sra $v0, $v0, 0x18 @@ -462,8 +462,8 @@ glabel func_8013B1B0 /* D1FA8 8013B8A8 3C06FC71 */ lui $a2, 0xfc71 /* D1FAC 8013B8AC 34C696E3 */ ori $a2, $a2, 0x96e3 /* D1FB0 8013B8B0 3C04332C */ lui $a0, 0x332c -/* D1FB4 8013B8B4 3C03800A */ lui $v1, %hi(D_8009A66C) -/* D1FB8 8013B8B8 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* D1FB4 8013B8B4 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* D1FB8 8013B8B8 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* D1FBC 8013B8BC 8C650000 */ lw $a1, ($v1) /* D1FC0 8013B8C0 3484FE7F */ ori $a0, $a0, 0xfe7f /* D1FC4 8013B8C4 00A0102D */ daddu $v0, $a1, $zero @@ -479,7 +479,7 @@ glabel func_8013B1B0 /* D1FEC 8013B8EC ACA20000 */ sw $v0, ($a1) /* D1FF0 8013B8F0 92430033 */ lbu $v1, 0x33($s2) /* D1FF4 8013B8F4 46020002 */ mul.s $f0, $f0, $f2 -/* D1FF8 8013B8F8 00000000 */ nop +/* D1FF8 8013B8F8 00000000 */ nop /* D1FFC 8013B8FC 00031600 */ sll $v0, $v1, 0x18 /* D2000 8013B900 00032400 */ sll $a0, $v1, 0x10 /* D2004 8013B904 00441025 */ or $v0, $v0, $a0 @@ -497,8 +497,8 @@ glabel func_8013B1B0 /* D2030 8013B930 3C05FF2C */ lui $a1, 0xff2c /* D2034 8013B934 34A5FE7F */ ori $a1, $a1, 0xfe7f /* D2038 8013B938 3C07E200 */ lui $a3, 0xe200 -/* D203C 8013B93C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D2040 8013B940 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D203C 8013B93C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D2040 8013B940 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D2044 8013B944 8C830000 */ lw $v1, ($a0) /* D2048 8013B948 34E71E01 */ ori $a3, $a3, 0x1e01 /* D204C 8013B94C 0060102D */ daddu $v0, $v1, $zero @@ -514,20 +514,20 @@ glabel func_8013B1B0 /* D2074 8013B974 AC620000 */ sw $v0, ($v1) /* D2078 8013B978 24620010 */ addiu $v0, $v1, 0x10 /* D207C 8013B97C 46020002 */ mul.s $f0, $f0, $f2 -/* D2080 8013B980 00000000 */ nop +/* D2080 8013B980 00000000 */ nop /* D2084 8013B984 AC820000 */ sw $v0, ($a0) /* D2088 8013B988 24020003 */ addiu $v0, $zero, 3 /* D208C 8013B98C AC670008 */ sw $a3, 8($v1) /* D2090 8013B990 AC62000C */ sw $v0, 0xc($v1) /* D2094 8013B994 4600018D */ trunc.w.s $f6, $f0 /* D2098 8013B998 44083000 */ mfc1 $t0, $f6 -/* D209C 8013B99C 00000000 */ nop +/* D209C 8013B99C 00000000 */ nop /* D20A0 8013B9A0 310200FF */ andi $v0, $t0, 0xff /* D20A4 8013B9A4 0804EEDA */ j .L8013BB68 /* D20A8 8013B9A8 AC620004 */ sw $v0, 4($v1) .L8013B9AC: /* D20AC 8013B9AC 1462006E */ bne $v1, $v0, .L8013BB68 -/* D20B0 8013B9B0 00000000 */ nop +/* D20B0 8013B9B0 00000000 */ nop /* D20B4 8013B9B4 8E4A0038 */ lw $t2, 0x38($s2) /* D20B8 8013B9B8 8E420030 */ lw $v0, 0x30($s2) /* D20BC 8013B9BC 01424821 */ addu $t1, $t2, $v0 @@ -542,15 +542,15 @@ glabel func_8013B1B0 /* D20DC 8013B9DC 3C07E300 */ lui $a3, 0xe300 /* D20E0 8013B9E0 34E71A01 */ ori $a3, $a3, 0x1a01 /* D20E4 8013B9E4 3C08E200 */ lui $t0, 0xe200 -/* D20E8 8013B9E8 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D20EC 8013B9EC 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D20E8 8013B9E8 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D20EC 8013B9EC 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D20F0 8013B9F0 35081E01 */ ori $t0, $t0, 0x1e01 /* D20F4 8013B9F4 448A0000 */ mtc1 $t2, $f0 -/* D20F8 8013B9F8 00000000 */ nop +/* D20F8 8013B9F8 00000000 */ nop /* D20FC 8013B9FC 46800020 */ cvt.s.w $f0, $f0 /* D2100 8013BA00 8C820000 */ lw $v0, ($a0) /* D2104 8013BA04 46020002 */ mul.s $f0, $f0, $f2 -/* D2108 8013BA08 00000000 */ nop +/* D2108 8013BA08 00000000 */ nop /* D210C 8013BA0C 0040182D */ daddu $v1, $v0, $zero /* D2110 8013BA10 24420008 */ addiu $v0, $v0, 8 /* D2114 8013BA14 AC820000 */ sw $v0, ($a0) @@ -577,7 +577,7 @@ glabel func_8013B1B0 /* D2168 8013BA68 AC43001C */ sw $v1, 0x1c($v0) /* D216C 8013BA6C 4600018D */ trunc.w.s $f6, $f0 /* D2170 8013BA70 44083000 */ mfc1 $t0, $f6 -/* D2174 8013BA74 00000000 */ nop +/* D2174 8013BA74 00000000 */ nop /* D2178 8013BA78 310300FF */ andi $v1, $t0, 0xff /* D217C 8013BA7C 0804EEDA */ j .L8013BB68 /* D2180 8013BA80 AC430014 */ sw $v1, 0x14($v0) @@ -585,8 +585,8 @@ glabel func_8013B1B0 /* D2188 8013BA88 34C6FFFF */ ori $a2, $a2, 0xffff /* D218C 8013BA8C 3C04FFFD */ lui $a0, 0xfffd .L8013BA90: -/* D2190 8013BA90 3C03800A */ lui $v1, %hi(D_8009A66C) -/* D2194 8013BA94 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* D2190 8013BA90 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* D2194 8013BA94 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* D2198 8013BA98 8C650000 */ lw $a1, ($v1) /* D219C 8013BA9C 3484F2F9 */ ori $a0, $a0, 0xf2f9 /* D21A0 8013BAA0 00A0102D */ daddu $v0, $a1, $zero @@ -614,8 +614,8 @@ glabel func_8013B1B0 /* D21EC 8013BAEC 3C06FCFF */ lui $a2, 0xfcff /* D21F0 8013BAF0 34C6FFFF */ ori $a2, $a2, 0xffff /* D21F4 8013BAF4 3C05FFFC */ lui $a1, 0xfffc -/* D21F8 8013BAF8 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D21FC 8013BAFC 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D21F8 8013BAF8 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D21FC 8013BAFC 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D2200 8013BB00 8C820000 */ lw $v0, ($a0) /* D2204 8013BB04 34A5F279 */ ori $a1, $a1, 0xf279 /* D2208 8013BB08 0040182D */ daddu $v1, $v0, $zero @@ -627,8 +627,8 @@ glabel func_8013B1B0 /* D2220 8013BB20 3C06FCFF */ lui $a2, 0xfcff /* D2224 8013BB24 34C697FF */ ori $a2, $a2, 0x97ff /* D2228 8013BB28 3C05FF2C */ lui $a1, 0xff2c -/* D222C 8013BB2C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D2230 8013BB30 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D222C 8013BB2C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D2230 8013BB30 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D2234 8013BB34 8C820000 */ lw $v0, ($a0) /* D2238 8013BB38 34A5FE7F */ ori $a1, $a1, 0xfe7f /* D223C 8013BB3C 0040182D */ daddu $v1, $v0, $zero @@ -652,28 +652,28 @@ glabel func_8013B1B0 /* D227C 8013BB7C 00220821 */ addu $at, $at, $v0 /* D2280 8013BB80 8C2210D0 */ lw $v0, %lo(D_801510D0)($at) /* D2284 8013BB84 00400008 */ jr $v0 -/* D2288 8013BB88 00000000 */ nop +/* D2288 8013BB88 00000000 */ nop /* D228C 8013BB8C 0240202D */ daddu $a0, $s2, $zero /* D2290 8013BB90 0C04F3EA */ jal func_8013CFA8 /* D2294 8013BB94 0260282D */ daddu $a1, $s3, $zero /* D2298 8013BB98 0804EF01 */ j .L8013BC04 -/* D229C 8013BB9C 00000000 */ nop +/* D229C 8013BB9C 00000000 */ nop /* D22A0 8013BBA0 0240202D */ daddu $a0, $s2, $zero /* D22A4 8013BBA4 0C04F6AD */ jal func_8013DAB4 /* D22A8 8013BBA8 0260282D */ daddu $a1, $s3, $zero /* D22AC 8013BBAC 0804EF01 */ j .L8013BC04 -/* D22B0 8013BBB0 00000000 */ nop +/* D22B0 8013BBB0 00000000 */ nop /* D22B4 8013BBB4 0240202D */ daddu $a0, $s2, $zero /* D22B8 8013BBB8 0C04F8BC */ jal func_8013E2F0 /* D22BC 8013BBBC 0260282D */ daddu $a1, $s3, $zero /* D22C0 8013BBC0 0804EF01 */ j .L8013BC04 -/* D22C4 8013BBC4 00000000 */ nop +/* D22C4 8013BBC4 00000000 */ nop /* D22C8 8013BBC8 0240202D */ daddu $a0, $s2, $zero /* D22CC 8013BBCC 0C04F3EA */ jal func_8013CFA8 /* D22D0 8013BBD0 0260282D */ daddu $a1, $s3, $zero /* D22D4 8013BBD4 0240202D */ daddu $a0, $s2, $zero -/* D22D8 8013BBD8 3C03800A */ lui $v1, %hi(D_8009A66C) -/* D22DC 8013BBDC 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* D22D8 8013BBD8 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* D22DC 8013BBDC 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* D22E0 8013BBE0 8C620000 */ lw $v0, ($v1) /* D22E4 8013BBE4 0260282D */ daddu $a1, $s3, $zero /* D22E8 8013BBE8 0040302D */ daddu $a2, $v0, $zero @@ -684,8 +684,8 @@ glabel func_8013B1B0 /* D22FC 8013BBFC 0C04FA41 */ jal func_8013E904 /* D2300 8013BC00 ACC00004 */ sw $zero, 4($a2) .L8013BC04: -/* D2304 8013BC04 3C06800A */ lui $a2, %hi(D_8009A66C) -/* D2308 8013BC08 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* D2304 8013BC04 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* D2308 8013BC08 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* D230C 8013BC0C 8CC50000 */ lw $a1, ($a2) /* D2310 8013BC10 3C02E700 */ lui $v0, 0xe700 /* D2314 8013BC14 00A0182D */ daddu $v1, $a1, $zero diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s index 2e844e5df7..c618cba805 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s @@ -24,7 +24,7 @@ glabel func_8013C3F0 /* D2B3C 8013C43C AFAD0014 */ sw $t5, 0x14($sp) /* D2B40 8013C440 0040982D */ daddu $s3, $v0, $zero /* D2B44 8013C444 126002CC */ beqz $s3, .L8013CF78 -/* D2B48 8013C448 00000000 */ nop +/* D2B48 8013C448 00000000 */ nop /* D2B4C 8013C44C 8E430014 */ lw $v1, 0x14($s2) /* D2B50 8013C450 30620200 */ andi $v0, $v1, 0x200 /* D2B54 8013C454 1040000C */ beqz $v0, .L8013C488 @@ -33,11 +33,11 @@ glabel func_8013C3F0 /* D2B60 8013C460 AE420014 */ sw $v0, 0x14($s2) /* D2B64 8013C464 30620100 */ andi $v0, $v1, 0x100 /* D2B68 8013C468 10400007 */ beqz $v0, .L8013C488 -/* D2B6C 8013C46C 00000000 */ nop +/* D2B6C 8013C46C 00000000 */ nop /* D2B70 8013C470 9662000C */ lhu $v0, 0xc($s3) /* D2B74 8013C474 2442FFFF */ addiu $v0, $v0, -1 /* D2B78 8013C478 44820000 */ mtc1 $v0, $f0 -/* D2B7C 8013C47C 00000000 */ nop +/* D2B7C 8013C47C 00000000 */ nop /* D2B80 8013C480 46800020 */ cvt.s.w $f0, $f0 /* D2B84 8013C484 E6400040 */ swc1 $f0, 0x40($s2) .L8013C488: @@ -124,16 +124,16 @@ glabel func_8013C3F0 /* D2CB8 8013C5B8 0000502D */ daddu $t2, $zero, $zero .L8013C5BC: /* D2CBC 8013C5BC 44960000 */ mtc1 $s6, $f0 -/* D2CC0 8013C5C0 00000000 */ nop +/* D2CC0 8013C5C0 00000000 */ nop /* D2CC4 8013C5C4 46800020 */ cvt.s.w $f0, $f0 /* D2CC8 8013C5C8 44941000 */ mtc1 $s4, $f2 -/* D2CCC 8013C5CC 00000000 */ nop +/* D2CCC 8013C5CC 00000000 */ nop /* D2CD0 8013C5D0 468010A0 */ cvt.s.w $f2, $f2 /* D2CD4 8013C5D4 96620008 */ lhu $v0, 8($s3) /* D2CD8 8013C5D8 104001EE */ beqz $v0, .L8013CD94 /* D2CDC 8013C5DC 46020103 */ div.s $f4, $f0, $f2 -/* D2CE0 8013C5E0 3C098007 */ lui $t1, %hi(D_800741F4) -/* D2CE4 8013C5E4 252941F4 */ addiu $t1, $t1, %lo(D_800741F4) +/* D2CE0 8013C5E0 3C098007 */ lui $t1, %hi(gCurrentDisplayContextIndex) +/* D2CE4 8013C5E4 252941F4 */ addiu $t1, $t1, %lo(gCurrentDisplayContextIndex) /* D2CE8 8013C5E8 3C0B8015 */ lui $t3, %hi(D_8014EE10) /* D2CEC 8013C5EC 256BEE10 */ addiu $t3, $t3, %lo(D_8014EE10) /* D2CF0 8013C5F0 3C0C8000 */ lui $t4, 0x8000 @@ -151,60 +151,60 @@ glabel func_8013C3F0 /* D2D1C 8013C61C 14620256 */ bne $v1, $v0, .L8013CF78 /* D2D20 8013C620 0282102A */ slt $v0, $s4, $v0 /* D2D24 8013C624 14400108 */ bnez $v0, .L8013CA48 -/* D2D28 8013C628 00000000 */ nop +/* D2D28 8013C628 00000000 */ nop /* D2D2C 8013C62C 9662000E */ lhu $v0, 0xe($s3) /* D2D30 8013C630 30420001 */ andi $v0, $v0, 1 /* D2D34 8013C634 10400039 */ beqz $v0, .L8013C71C -/* D2D38 8013C638 00000000 */ nop +/* D2D38 8013C638 00000000 */ nop /* D2D3C 8013C63C 84C30000 */ lh $v1, ($a2) /* D2D40 8013C640 85020000 */ lh $v0, ($t0) /* D2D44 8013C644 8D240000 */ lw $a0, ($t1) /* D2D48 8013C648 00431023 */ subu $v0, $v0, $v1 /* D2D4C 8013C64C 44821000 */ mtc1 $v0, $f2 -/* D2D50 8013C650 00000000 */ nop +/* D2D50 8013C650 00000000 */ nop /* D2D54 8013C654 468010A0 */ cvt.s.w $f2, $f2 /* D2D58 8013C658 46041082 */ mul.s $f2, $f2, $f4 -/* D2D5C 8013C65C 00000000 */ nop +/* D2D5C 8013C65C 00000000 */ nop /* D2D60 8013C660 00042080 */ sll $a0, $a0, 2 /* D2D64 8013C664 02442021 */ addu $a0, $s2, $a0 /* D2D68 8013C668 44830000 */ mtc1 $v1, $f0 -/* D2D6C 8013C66C 00000000 */ nop +/* D2D6C 8013C66C 00000000 */ nop /* D2D70 8013C670 46800020 */ cvt.s.w $f0, $f0 /* D2D74 8013C674 8C820068 */ lw $v0, 0x68($a0) /* D2D78 8013C678 46020000 */ add.s $f0, $f0, $f2 /* D2D7C 8013C67C 00E21021 */ addu $v0, $a3, $v0 /* D2D80 8013C680 4600028D */ trunc.w.s $f10, $f0 /* D2D84 8013C684 44035000 */ mfc1 $v1, $f10 -/* D2D88 8013C688 00000000 */ nop +/* D2D88 8013C688 00000000 */ nop /* D2D8C 8013C68C A4430000 */ sh $v1, ($v0) /* D2D90 8013C690 84C30002 */ lh $v1, 2($a2) /* D2D94 8013C694 85020002 */ lh $v0, 2($t0) /* D2D98 8013C698 00431023 */ subu $v0, $v0, $v1 /* D2D9C 8013C69C 44820000 */ mtc1 $v0, $f0 -/* D2DA0 8013C6A0 00000000 */ nop +/* D2DA0 8013C6A0 00000000 */ nop /* D2DA4 8013C6A4 46800020 */ cvt.s.w $f0, $f0 /* D2DA8 8013C6A8 46040002 */ mul.s $f0, $f0, $f4 -/* D2DAC 8013C6AC 00000000 */ nop +/* D2DAC 8013C6AC 00000000 */ nop /* D2DB0 8013C6B0 44831000 */ mtc1 $v1, $f2 -/* D2DB4 8013C6B4 00000000 */ nop +/* D2DB4 8013C6B4 00000000 */ nop /* D2DB8 8013C6B8 468010A0 */ cvt.s.w $f2, $f2 /* D2DBC 8013C6BC 8C820068 */ lw $v0, 0x68($a0) /* D2DC0 8013C6C0 46001080 */ add.s $f2, $f2, $f0 /* D2DC4 8013C6C4 00E21021 */ addu $v0, $a3, $v0 /* D2DC8 8013C6C8 4600128D */ trunc.w.s $f10, $f2 /* D2DCC 8013C6CC 44035000 */ mfc1 $v1, $f10 -/* D2DD0 8013C6D0 00000000 */ nop +/* D2DD0 8013C6D0 00000000 */ nop /* D2DD4 8013C6D4 A4430002 */ sh $v1, 2($v0) /* D2DD8 8013C6D8 84C30004 */ lh $v1, 4($a2) /* D2DDC 8013C6DC 85020004 */ lh $v0, 4($t0) /* D2DE0 8013C6E0 00431023 */ subu $v0, $v0, $v1 /* D2DE4 8013C6E4 44820000 */ mtc1 $v0, $f0 -/* D2DE8 8013C6E8 00000000 */ nop +/* D2DE8 8013C6E8 00000000 */ nop /* D2DEC 8013C6EC 46800020 */ cvt.s.w $f0, $f0 /* D2DF0 8013C6F0 46040002 */ mul.s $f0, $f0, $f4 -/* D2DF4 8013C6F4 00000000 */ nop +/* D2DF4 8013C6F4 00000000 */ nop /* D2DF8 8013C6F8 44831000 */ mtc1 $v1, $f2 -/* D2DFC 8013C6FC 00000000 */ nop +/* D2DFC 8013C6FC 00000000 */ nop /* D2E00 8013C700 468010A0 */ cvt.s.w $f2, $f2 /* D2E04 8013C704 8C820068 */ lw $v0, 0x68($a0) /* D2E08 8013C708 46001080 */ add.s $f2, $f2, $f0 @@ -217,31 +217,31 @@ glabel func_8013C3F0 /* D2E20 8013C720 85020000 */ lh $v0, ($t0) /* D2E24 8013C724 00431023 */ subu $v0, $v0, $v1 /* D2E28 8013C728 44821000 */ mtc1 $v0, $f2 -/* D2E2C 8013C72C 00000000 */ nop +/* D2E2C 8013C72C 00000000 */ nop /* D2E30 8013C730 468010A0 */ cvt.s.w $f2, $f2 /* D2E34 8013C734 46041082 */ mul.s $f2, $f2, $f4 -/* D2E38 8013C738 00000000 */ nop +/* D2E38 8013C738 00000000 */ nop /* D2E3C 8013C73C 44830000 */ mtc1 $v1, $f0 -/* D2E40 8013C740 00000000 */ nop +/* D2E40 8013C740 00000000 */ nop /* D2E44 8013C744 46800020 */ cvt.s.w $f0, $f0 /* D2E48 8013C748 46020000 */ add.s $f0, $f0, $f2 /* D2E4C 8013C74C 4600028D */ trunc.w.s $f10, $f0 /* D2E50 8013C750 44025000 */ mfc1 $v0, $f10 -/* D2E54 8013C754 00000000 */ nop +/* D2E54 8013C754 00000000 */ nop /* D2E58 8013C758 00021400 */ sll $v0, $v0, 0x10 /* D2E5C 8013C75C 00021403 */ sra $v0, $v0, 0x10 /* D2E60 8013C760 44821000 */ mtc1 $v0, $f2 -/* D2E64 8013C764 00000000 */ nop +/* D2E64 8013C764 00000000 */ nop /* D2E68 8013C768 468010A1 */ cvt.d.w $f2, $f2 /* D2E6C 8013C76C 46261082 */ mul.d $f2, $f2, $f6 -/* D2E70 8013C770 00000000 */ nop +/* D2E70 8013C770 00000000 */ nop /* D2E74 8013C774 8D650000 */ lw $a1, ($t3) /* D2E78 8013C778 94A20008 */ lhu $v0, 8($a1) /* D2E7C 8013C77C 44820000 */ mtc1 $v0, $f0 -/* D2E80 8013C780 00000000 */ nop +/* D2E80 8013C780 00000000 */ nop /* D2E84 8013C784 46800021 */ cvt.d.w $f0, $f0 /* D2E88 8013C788 46201082 */ mul.d $f2, $f2, $f0 -/* D2E8C 8013C78C 00000000 */ nop +/* D2E8C 8013C78C 00000000 */ nop /* D2E90 8013C790 8D240000 */ lw $a0, ($t1) /* D2E94 8013C794 00042080 */ sll $a0, $a0, 2 /* D2E98 8013C798 02442021 */ addu $a0, $s2, $a0 @@ -249,95 +249,95 @@ glabel func_8013C3F0 /* D2EA0 8013C7A0 00E21021 */ addu $v0, $a3, $v0 /* D2EA4 8013C7A4 4620128D */ trunc.w.d $f10, $f2 /* D2EA8 8013C7A8 44035000 */ mfc1 $v1, $f10 -/* D2EAC 8013C7AC 00000000 */ nop +/* D2EAC 8013C7AC 00000000 */ nop /* D2EB0 8013C7B0 A4430000 */ sh $v1, ($v0) /* D2EB4 8013C7B4 84C30002 */ lh $v1, 2($a2) /* D2EB8 8013C7B8 85020002 */ lh $v0, 2($t0) /* D2EBC 8013C7BC 00431023 */ subu $v0, $v0, $v1 /* D2EC0 8013C7C0 44821000 */ mtc1 $v0, $f2 -/* D2EC4 8013C7C4 00000000 */ nop +/* D2EC4 8013C7C4 00000000 */ nop /* D2EC8 8013C7C8 468010A0 */ cvt.s.w $f2, $f2 /* D2ECC 8013C7CC 46041082 */ mul.s $f2, $f2, $f4 -/* D2ED0 8013C7D0 00000000 */ nop +/* D2ED0 8013C7D0 00000000 */ nop /* D2ED4 8013C7D4 44830000 */ mtc1 $v1, $f0 -/* D2ED8 8013C7D8 00000000 */ nop +/* D2ED8 8013C7D8 00000000 */ nop /* D2EDC 8013C7DC 46800020 */ cvt.s.w $f0, $f0 /* D2EE0 8013C7E0 46020000 */ add.s $f0, $f0, $f2 /* D2EE4 8013C7E4 4600028D */ trunc.w.s $f10, $f0 /* D2EE8 8013C7E8 44025000 */ mfc1 $v0, $f10 -/* D2EEC 8013C7EC 00000000 */ nop +/* D2EEC 8013C7EC 00000000 */ nop /* D2EF0 8013C7F0 00021400 */ sll $v0, $v0, 0x10 /* D2EF4 8013C7F4 00021403 */ sra $v0, $v0, 0x10 /* D2EF8 8013C7F8 44821000 */ mtc1 $v0, $f2 -/* D2EFC 8013C7FC 00000000 */ nop +/* D2EFC 8013C7FC 00000000 */ nop /* D2F00 8013C800 468010A1 */ cvt.d.w $f2, $f2 /* D2F04 8013C804 46261082 */ mul.d $f2, $f2, $f6 -/* D2F08 8013C808 00000000 */ nop +/* D2F08 8013C808 00000000 */ nop /* D2F0C 8013C80C 94A2000A */ lhu $v0, 0xa($a1) /* D2F10 8013C810 44820000 */ mtc1 $v0, $f0 -/* D2F14 8013C814 00000000 */ nop +/* D2F14 8013C814 00000000 */ nop /* D2F18 8013C818 46800021 */ cvt.d.w $f0, $f0 /* D2F1C 8013C81C 46201082 */ mul.d $f2, $f2, $f0 -/* D2F20 8013C820 00000000 */ nop +/* D2F20 8013C820 00000000 */ nop /* D2F24 8013C824 8C820068 */ lw $v0, 0x68($a0) /* D2F28 8013C828 00E21021 */ addu $v0, $a3, $v0 /* D2F2C 8013C82C 4620128D */ trunc.w.d $f10, $f2 /* D2F30 8013C830 44035000 */ mfc1 $v1, $f10 -/* D2F34 8013C834 00000000 */ nop +/* D2F34 8013C834 00000000 */ nop /* D2F38 8013C838 A4430002 */ sh $v1, 2($v0) /* D2F3C 8013C83C 84C30004 */ lh $v1, 4($a2) /* D2F40 8013C840 85020004 */ lh $v0, 4($t0) /* D2F44 8013C844 00431023 */ subu $v0, $v0, $v1 /* D2F48 8013C848 44821000 */ mtc1 $v0, $f2 -/* D2F4C 8013C84C 00000000 */ nop +/* D2F4C 8013C84C 00000000 */ nop /* D2F50 8013C850 468010A0 */ cvt.s.w $f2, $f2 /* D2F54 8013C854 46041082 */ mul.s $f2, $f2, $f4 -/* D2F58 8013C858 00000000 */ nop +/* D2F58 8013C858 00000000 */ nop /* D2F5C 8013C85C 44830000 */ mtc1 $v1, $f0 -/* D2F60 8013C860 00000000 */ nop +/* D2F60 8013C860 00000000 */ nop /* D2F64 8013C864 46800020 */ cvt.s.w $f0, $f0 /* D2F68 8013C868 46020000 */ add.s $f0, $f0, $f2 /* D2F6C 8013C86C 4600028D */ trunc.w.s $f10, $f0 /* D2F70 8013C870 44025000 */ mfc1 $v0, $f10 -/* D2F74 8013C874 00000000 */ nop +/* D2F74 8013C874 00000000 */ nop /* D2F78 8013C878 00021400 */ sll $v0, $v0, 0x10 /* D2F7C 8013C87C 00021403 */ sra $v0, $v0, 0x10 /* D2F80 8013C880 44821000 */ mtc1 $v0, $f2 -/* D2F84 8013C884 00000000 */ nop +/* D2F84 8013C884 00000000 */ nop /* D2F88 8013C888 468010A1 */ cvt.d.w $f2, $f2 /* D2F8C 8013C88C 46261082 */ mul.d $f2, $f2, $f6 -/* D2F90 8013C890 00000000 */ nop +/* D2F90 8013C890 00000000 */ nop /* D2F94 8013C894 94A3000A */ lhu $v1, 0xa($a1) /* D2F98 8013C898 94A20008 */ lhu $v0, 8($a1) /* D2F9C 8013C89C 00431021 */ addu $v0, $v0, $v1 /* D2FA0 8013C8A0 00021043 */ sra $v0, $v0, 1 /* D2FA4 8013C8A4 44820000 */ mtc1 $v0, $f0 -/* D2FA8 8013C8A8 00000000 */ nop +/* D2FA8 8013C8A8 00000000 */ nop /* D2FAC 8013C8AC 46800021 */ cvt.d.w $f0, $f0 /* D2FB0 8013C8B0 46201082 */ mul.d $f2, $f2, $f0 -/* D2FB4 8013C8B4 00000000 */ nop +/* D2FB4 8013C8B4 00000000 */ nop /* D2FB8 8013C8B8 8C820068 */ lw $v0, 0x68($a0) /* D2FBC 8013C8BC 00E21021 */ addu $v0, $a3, $v0 /* D2FC0 8013C8C0 4620128D */ trunc.w.d $f10, $f2 /* D2FC4 8013C8C4 44035000 */ mfc1 $v1, $f10 -/* D2FC8 8013C8C8 00000000 */ nop +/* D2FC8 8013C8C8 00000000 */ nop .L8013C8CC: /* D2FCC 8013C8CC A4430004 */ sh $v1, 4($v0) /* D2FD0 8013C8D0 8E420014 */ lw $v0, 0x14($s2) /* D2FD4 8013C8D4 3042A000 */ andi $v0, $v0, 0xa000 /* D2FD8 8013C8D8 10400040 */ beqz $v0, .L8013C9DC -/* D2FDC 8013C8DC 00000000 */ nop +/* D2FDC 8013C8DC 00000000 */ nop /* D2FE0 8013C8E0 80C30008 */ lb $v1, 8($a2) /* D2FE4 8013C8E4 81020008 */ lb $v0, 8($t0) /* D2FE8 8013C8E8 00431023 */ subu $v0, $v0, $v1 /* D2FEC 8013C8EC 44821000 */ mtc1 $v0, $f2 -/* D2FF0 8013C8F0 00000000 */ nop +/* D2FF0 8013C8F0 00000000 */ nop /* D2FF4 8013C8F4 468010A0 */ cvt.s.w $f2, $f2 /* D2FF8 8013C8F8 46041082 */ mul.s $f2, $f2, $f4 -/* D2FFC 8013C8FC 00000000 */ nop +/* D2FFC 8013C8FC 00000000 */ nop /* D3000 8013C900 8D220000 */ lw $v0, ($t1) /* D3004 8013C904 44830000 */ mtc1 $v1, $f0 -/* D3008 8013C908 00000000 */ nop +/* D3008 8013C908 00000000 */ nop /* D300C 8013C90C 46800020 */ cvt.s.w $f0, $f0 /* D3010 8013C910 00021080 */ sll $v0, $v0, 2 /* D3014 8013C914 02421021 */ addu $v0, $s2, $v0 @@ -346,19 +346,19 @@ glabel func_8013C3F0 /* D3020 8013C920 00E21021 */ addu $v0, $a3, $v0 /* D3024 8013C924 4600028D */ trunc.w.s $f10, $f0 /* D3028 8013C928 44035000 */ mfc1 $v1, $f10 -/* D302C 8013C92C 00000000 */ nop +/* D302C 8013C92C 00000000 */ nop /* D3030 8013C930 A043000C */ sb $v1, 0xc($v0) /* D3034 8013C934 80C30009 */ lb $v1, 9($a2) /* D3038 8013C938 81020009 */ lb $v0, 9($t0) /* D303C 8013C93C 00431023 */ subu $v0, $v0, $v1 /* D3040 8013C940 44821000 */ mtc1 $v0, $f2 -/* D3044 8013C944 00000000 */ nop +/* D3044 8013C944 00000000 */ nop /* D3048 8013C948 468010A0 */ cvt.s.w $f2, $f2 /* D304C 8013C94C 46041082 */ mul.s $f2, $f2, $f4 -/* D3050 8013C950 00000000 */ nop +/* D3050 8013C950 00000000 */ nop /* D3054 8013C954 8D220000 */ lw $v0, ($t1) /* D3058 8013C958 44830000 */ mtc1 $v1, $f0 -/* D305C 8013C95C 00000000 */ nop +/* D305C 8013C95C 00000000 */ nop /* D3060 8013C960 46800020 */ cvt.s.w $f0, $f0 /* D3064 8013C964 00021080 */ sll $v0, $v0, 2 /* D3068 8013C968 02421021 */ addu $v0, $s2, $v0 @@ -367,19 +367,19 @@ glabel func_8013C3F0 /* D3074 8013C974 00E21021 */ addu $v0, $a3, $v0 /* D3078 8013C978 4600028D */ trunc.w.s $f10, $f0 /* D307C 8013C97C 44035000 */ mfc1 $v1, $f10 -/* D3080 8013C980 00000000 */ nop +/* D3080 8013C980 00000000 */ nop /* D3084 8013C984 A043000D */ sb $v1, 0xd($v0) /* D3088 8013C988 80C3000A */ lb $v1, 0xa($a2) /* D308C 8013C98C 8102000A */ lb $v0, 0xa($t0) /* D3090 8013C990 00431023 */ subu $v0, $v0, $v1 /* D3094 8013C994 44821000 */ mtc1 $v0, $f2 -/* D3098 8013C998 00000000 */ nop +/* D3098 8013C998 00000000 */ nop /* D309C 8013C99C 468010A0 */ cvt.s.w $f2, $f2 /* D30A0 8013C9A0 46041082 */ mul.s $f2, $f2, $f4 -/* D30A4 8013C9A4 00000000 */ nop +/* D30A4 8013C9A4 00000000 */ nop /* D30A8 8013C9A8 8D220000 */ lw $v0, ($t1) /* D30AC 8013C9AC 44830000 */ mtc1 $v1, $f0 -/* D30B0 8013C9B0 00000000 */ nop +/* D30B0 8013C9B0 00000000 */ nop /* D30B4 8013C9B4 46800020 */ cvt.s.w $f0, $f0 /* D30B8 8013C9B8 00021080 */ sll $v0, $v0, 2 /* D30BC 8013C9BC 02421021 */ addu $v0, $s2, $v0 @@ -397,10 +397,10 @@ glabel func_8013C3F0 /* D30E8 8013C9E8 D42210F0 */ ldc1 $f2, %lo(D_801510F0)($at) /* D30EC 8013C9EC 00621821 */ addu $v1, $v1, $v0 /* D30F0 8013C9F0 44830000 */ mtc1 $v1, $f0 -/* D30F4 8013C9F4 00000000 */ nop +/* D30F4 8013C9F4 00000000 */ nop /* D30F8 8013C9F8 46800021 */ cvt.d.w $f0, $f0 /* D30FC 8013C9FC 46220002 */ mul.d $f0, $f0, $f2 -/* D3100 8013CA00 00000000 */ nop +/* D3100 8013CA00 00000000 */ nop /* D3104 8013CA04 8D220000 */ lw $v0, ($t1) /* D3108 8013CA08 00021080 */ sll $v0, $v0, 2 /* D310C 8013CA0C 02421021 */ addu $v0, $s2, $v0 @@ -413,7 +413,7 @@ glabel func_8013C3F0 /* D3128 8013CA28 46201001 */ sub.d $f0, $f2, $f0 /* D312C 8013CA2C 2444000D */ addiu $a0, $v0, 0xd /* D3130 8013CA30 4620403E */ c.le.d $f8, $f0 -/* D3134 8013CA34 00000000 */ nop +/* D3134 8013CA34 00000000 */ nop /* D3138 8013CA38 45000086 */ bc1f .L8013CC54 /* D313C 8013CA3C 2442000E */ addiu $v0, $v0, 0xe /* D3140 8013CA40 0804F31A */ j .L8013CC68 @@ -422,7 +422,7 @@ glabel func_8013C3F0 /* D3148 8013CA48 9662000E */ lhu $v0, 0xe($s3) /* D314C 8013CA4C 30420001 */ andi $v0, $v0, 1 /* D3150 8013CA50 10400010 */ beqz $v0, .L8013CA94 -/* D3154 8013CA54 00000000 */ nop +/* D3154 8013CA54 00000000 */ nop /* D3158 8013CA58 8D230000 */ lw $v1, ($t1) /* D315C 8013CA5C 00031880 */ sll $v1, $v1, 2 /* D3160 8013CA60 02431821 */ addu $v1, $s2, $v1 @@ -441,17 +441,17 @@ glabel func_8013C3F0 .L8013CA94: /* D3194 8013CA94 84C20000 */ lh $v0, ($a2) /* D3198 8013CA98 44821000 */ mtc1 $v0, $f2 -/* D319C 8013CA9C 00000000 */ nop +/* D319C 8013CA9C 00000000 */ nop /* D31A0 8013CAA0 468010A1 */ cvt.d.w $f2, $f2 /* D31A4 8013CAA4 46261082 */ mul.d $f2, $f2, $f6 -/* D31A8 8013CAA8 00000000 */ nop +/* D31A8 8013CAA8 00000000 */ nop /* D31AC 8013CAAC 8D650000 */ lw $a1, ($t3) /* D31B0 8013CAB0 94A20008 */ lhu $v0, 8($a1) /* D31B4 8013CAB4 44820000 */ mtc1 $v0, $f0 -/* D31B8 8013CAB8 00000000 */ nop +/* D31B8 8013CAB8 00000000 */ nop /* D31BC 8013CABC 46800021 */ cvt.d.w $f0, $f0 /* D31C0 8013CAC0 46201082 */ mul.d $f2, $f2, $f0 -/* D31C4 8013CAC4 00000000 */ nop +/* D31C4 8013CAC4 00000000 */ nop /* D31C8 8013CAC8 8D240000 */ lw $a0, ($t1) /* D31CC 8013CACC 00042080 */ sll $a0, $a0, 2 /* D31D0 8013CAD0 02442021 */ addu $a0, $s2, $a0 @@ -459,52 +459,52 @@ glabel func_8013C3F0 /* D31D8 8013CAD8 00E21021 */ addu $v0, $a3, $v0 /* D31DC 8013CADC 4620128D */ trunc.w.d $f10, $f2 /* D31E0 8013CAE0 44035000 */ mfc1 $v1, $f10 -/* D31E4 8013CAE4 00000000 */ nop +/* D31E4 8013CAE4 00000000 */ nop /* D31E8 8013CAE8 A4430000 */ sh $v1, ($v0) /* D31EC 8013CAEC 84C20002 */ lh $v0, 2($a2) /* D31F0 8013CAF0 44821000 */ mtc1 $v0, $f2 -/* D31F4 8013CAF4 00000000 */ nop +/* D31F4 8013CAF4 00000000 */ nop /* D31F8 8013CAF8 468010A1 */ cvt.d.w $f2, $f2 /* D31FC 8013CAFC 46261082 */ mul.d $f2, $f2, $f6 -/* D3200 8013CB00 00000000 */ nop +/* D3200 8013CB00 00000000 */ nop /* D3204 8013CB04 94A2000A */ lhu $v0, 0xa($a1) /* D3208 8013CB08 44820000 */ mtc1 $v0, $f0 -/* D320C 8013CB0C 00000000 */ nop +/* D320C 8013CB0C 00000000 */ nop /* D3210 8013CB10 46800021 */ cvt.d.w $f0, $f0 /* D3214 8013CB14 46201082 */ mul.d $f2, $f2, $f0 -/* D3218 8013CB18 00000000 */ nop +/* D3218 8013CB18 00000000 */ nop /* D321C 8013CB1C 8C820068 */ lw $v0, 0x68($a0) /* D3220 8013CB20 00E21021 */ addu $v0, $a3, $v0 /* D3224 8013CB24 4620128D */ trunc.w.d $f10, $f2 /* D3228 8013CB28 44035000 */ mfc1 $v1, $f10 -/* D322C 8013CB2C 00000000 */ nop +/* D322C 8013CB2C 00000000 */ nop /* D3230 8013CB30 A4430002 */ sh $v1, 2($v0) /* D3234 8013CB34 84C20004 */ lh $v0, 4($a2) /* D3238 8013CB38 44821000 */ mtc1 $v0, $f2 -/* D323C 8013CB3C 00000000 */ nop +/* D323C 8013CB3C 00000000 */ nop /* D3240 8013CB40 468010A1 */ cvt.d.w $f2, $f2 /* D3244 8013CB44 46261082 */ mul.d $f2, $f2, $f6 -/* D3248 8013CB48 00000000 */ nop +/* D3248 8013CB48 00000000 */ nop /* D324C 8013CB4C 94A3000A */ lhu $v1, 0xa($a1) /* D3250 8013CB50 94A20008 */ lhu $v0, 8($a1) /* D3254 8013CB54 00431021 */ addu $v0, $v0, $v1 /* D3258 8013CB58 00021043 */ sra $v0, $v0, 1 /* D325C 8013CB5C 44820000 */ mtc1 $v0, $f0 -/* D3260 8013CB60 00000000 */ nop +/* D3260 8013CB60 00000000 */ nop /* D3264 8013CB64 46800021 */ cvt.d.w $f0, $f0 /* D3268 8013CB68 46201082 */ mul.d $f2, $f2, $f0 -/* D326C 8013CB6C 00000000 */ nop +/* D326C 8013CB6C 00000000 */ nop /* D3270 8013CB70 8C820068 */ lw $v0, 0x68($a0) /* D3274 8013CB74 00E21021 */ addu $v0, $a3, $v0 /* D3278 8013CB78 4620128D */ trunc.w.d $f10, $f2 /* D327C 8013CB7C 44035000 */ mfc1 $v1, $f10 -/* D3280 8013CB80 00000000 */ nop +/* D3280 8013CB80 00000000 */ nop .L8013CB84: /* D3284 8013CB84 A4430004 */ sh $v1, 4($v0) /* D3288 8013CB88 8E420014 */ lw $v0, 0x14($s2) /* D328C 8013CB8C 3042A000 */ andi $v0, $v0, 0xa000 /* D3290 8013CB90 10400017 */ beqz $v0, .L8013CBF0 -/* D3294 8013CB94 00000000 */ nop +/* D3294 8013CB94 00000000 */ nop /* D3298 8013CB98 8D220000 */ lw $v0, ($t1) /* D329C 8013CB9C 00021080 */ sll $v0, $v0, 2 /* D32A0 8013CBA0 02421021 */ addu $v0, $s2, $v0 @@ -534,10 +534,10 @@ glabel func_8013C3F0 /* D32FC 8013CBFC D42210F8 */ ldc1 $f2, %lo(D_801510F8)($at) /* D3300 8013CC00 00621821 */ addu $v1, $v1, $v0 /* D3304 8013CC04 44830000 */ mtc1 $v1, $f0 -/* D3308 8013CC08 00000000 */ nop +/* D3308 8013CC08 00000000 */ nop /* D330C 8013CC0C 46800021 */ cvt.d.w $f0, $f0 /* D3310 8013CC10 46220002 */ mul.d $f0, $f0, $f2 -/* D3314 8013CC14 00000000 */ nop +/* D3314 8013CC14 00000000 */ nop /* D3318 8013CC18 8D220000 */ lw $v0, ($t1) /* D331C 8013CC1C 00021080 */ sll $v0, $v0, 2 /* D3320 8013CC20 02421021 */ addu $v0, $s2, $v0 @@ -550,7 +550,7 @@ glabel func_8013C3F0 /* D333C 8013CC3C 46201001 */ sub.d $f0, $f2, $f0 /* D3340 8013CC40 2444000D */ addiu $a0, $v0, 0xd /* D3344 8013CC44 4620403E */ c.le.d $f8, $f0 -/* D3348 8013CC48 00000000 */ nop +/* D3348 8013CC48 00000000 */ nop /* D334C 8013CC4C 45010005 */ bc1t .L8013CC64 /* D3350 8013CC50 2442000E */ addiu $v0, $v0, 0xe .L8013CC54: @@ -563,7 +563,7 @@ glabel func_8013C3F0 .L8013CC68: /* D3368 8013CC68 4620028D */ trunc.w.d $f10, $f0 /* D336C 8013CC6C 44035000 */ mfc1 $v1, $f10 -/* D3370 8013CC70 00000000 */ nop +/* D3370 8013CC70 00000000 */ nop /* D3374 8013CC74 006C1825 */ or $v1, $v1, $t4 /* D3378 8013CC78 A0430000 */ sb $v1, ($v0) .L8013CC7C: @@ -573,7 +573,7 @@ glabel func_8013C3F0 /* D3384 8013CC84 9662000E */ lhu $v0, 0xe($s3) /* D3388 8013CC88 30420001 */ andi $v0, $v0, 1 /* D338C 8013CC8C 1040000E */ beqz $v0, .L8013CCC8 -/* D3390 8013CC90 00000000 */ nop +/* D3390 8013CC90 00000000 */ nop /* D3394 8013CC94 8D240000 */ lw $a0, ($t1) /* D3398 8013CC98 90C20006 */ lbu $v0, 6($a2) /* D339C 8013CC9C 00042080 */ sll $a0, $a0, 2 @@ -590,17 +590,17 @@ glabel func_8013C3F0 .L8013CCC8: /* D33C8 8013CCC8 90C20006 */ lbu $v0, 6($a2) /* D33CC 8013CCCC 44821000 */ mtc1 $v0, $f2 -/* D33D0 8013CCD0 00000000 */ nop +/* D33D0 8013CCD0 00000000 */ nop /* D33D4 8013CCD4 468010A1 */ cvt.d.w $f2, $f2 /* D33D8 8013CCD8 46261082 */ mul.d $f2, $f2, $f6 -/* D33DC 8013CCDC 00000000 */ nop +/* D33DC 8013CCDC 00000000 */ nop /* D33E0 8013CCE0 8D650000 */ lw $a1, ($t3) /* D33E4 8013CCE4 94A20008 */ lhu $v0, 8($a1) /* D33E8 8013CCE8 44820000 */ mtc1 $v0, $f0 -/* D33EC 8013CCEC 00000000 */ nop +/* D33EC 8013CCEC 00000000 */ nop /* D33F0 8013CCF0 46800021 */ cvt.d.w $f0, $f0 /* D33F4 8013CCF4 46201082 */ mul.d $f2, $f2, $f0 -/* D33F8 8013CCF8 00000000 */ nop +/* D33F8 8013CCF8 00000000 */ nop /* D33FC 8013CCFC 8D240000 */ lw $a0, ($t1) /* D3400 8013CD00 00042080 */ sll $a0, $a0, 2 /* D3404 8013CD04 02442021 */ addu $a0, $s2, $a0 @@ -608,27 +608,27 @@ glabel func_8013C3F0 /* D340C 8013CD0C 00E31821 */ addu $v1, $a3, $v1 /* D3410 8013CD10 4620128D */ trunc.w.d $f10, $f2 /* D3414 8013CD14 44025000 */ mfc1 $v0, $f10 -/* D3418 8013CD18 00000000 */ nop +/* D3418 8013CD18 00000000 */ nop /* D341C 8013CD1C 24420100 */ addiu $v0, $v0, 0x100 /* D3420 8013CD20 00021140 */ sll $v0, $v0, 5 /* D3424 8013CD24 A4620008 */ sh $v0, 8($v1) /* D3428 8013CD28 90C20007 */ lbu $v0, 7($a2) /* D342C 8013CD2C 44821000 */ mtc1 $v0, $f2 -/* D3430 8013CD30 00000000 */ nop +/* D3430 8013CD30 00000000 */ nop /* D3434 8013CD34 468010A1 */ cvt.d.w $f2, $f2 /* D3438 8013CD38 46261082 */ mul.d $f2, $f2, $f6 -/* D343C 8013CD3C 00000000 */ nop +/* D343C 8013CD3C 00000000 */ nop /* D3440 8013CD40 94A2000A */ lhu $v0, 0xa($a1) /* D3444 8013CD44 44820000 */ mtc1 $v0, $f0 -/* D3448 8013CD48 00000000 */ nop +/* D3448 8013CD48 00000000 */ nop /* D344C 8013CD4C 46800021 */ cvt.d.w $f0, $f0 /* D3450 8013CD50 46201082 */ mul.d $f2, $f2, $f0 -/* D3454 8013CD54 00000000 */ nop +/* D3454 8013CD54 00000000 */ nop /* D3458 8013CD58 8C830068 */ lw $v1, 0x68($a0) /* D345C 8013CD5C 00E31821 */ addu $v1, $a3, $v1 /* D3460 8013CD60 4620128D */ trunc.w.d $f10, $f2 /* D3464 8013CD64 44025000 */ mfc1 $v0, $f10 -/* D3468 8013CD68 00000000 */ nop +/* D3468 8013CD68 00000000 */ nop .L8013CD6C: /* D346C 8013CD6C 24420100 */ addiu $v0, $v0, 0x100 /* D3470 8013CD70 00021140 */ sll $v0, $v0, 5 @@ -648,13 +648,13 @@ glabel func_8013C3F0 /* D34A4 8013CDA4 0C00AB4B */ jal heap_free /* D34A8 8013CDA8 A642000A */ sh $v0, 0xa($s2) /* D34AC 8013CDAC 12E00003 */ beqz $s7, .L8013CDBC -/* D34B0 8013CDB0 00000000 */ nop +/* D34B0 8013CDB0 00000000 */ nop /* D34B4 8013CDB4 0C00AB4B */ jal heap_free /* D34B8 8013CDB8 02E0202D */ daddu $a0, $s7, $zero .L8013CDBC: /* D34BC 8013CDBC 8FAD0014 */ lw $t5, 0x14($sp) /* D34C0 8013CDC0 11A0006D */ beqz $t5, .L8013CF78 -/* D34C4 8013CDC4 00000000 */ nop +/* D34C4 8013CDC4 00000000 */ nop /* D34C8 8013CDC8 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* D34CC 8013CDCC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* D34D0 8013CDD0 94420134 */ lhu $v0, 0x134($v0) @@ -666,18 +666,18 @@ glabel func_8013C3F0 /* D34E4 8013CDE4 15A10004 */ bne $t5, $at, .L8013CDF8 /* D34E8 8013CDE8 3C018000 */ lui $at, 0x8000 /* D34EC 8013CDEC 14410002 */ bne $v0, $at, .L8013CDF8 -/* D34F0 8013CDF0 00000000 */ nop +/* D34F0 8013CDF0 00000000 */ nop /* D34F4 8013CDF4 0006000D */ break 6 .L8013CDF8: /* D34F8 8013CDF8 00001810 */ mfhi $v1 /* D34FC 8013CDFC 1460005E */ bnez $v1, .L8013CF78 -/* D3500 8013CE00 00000000 */ nop +/* D3500 8013CE00 00000000 */ nop /* D3504 8013CE04 1A800027 */ blez $s4, .L8013CEA4 -/* D3508 8013CE08 00000000 */ nop +/* D3508 8013CE08 00000000 */ nop /* D350C 8013CE0C 26D60001 */ addiu $s6, $s6, 1 /* D3510 8013CE10 02D4102A */ slt $v0, $s6, $s4 /* D3514 8013CE14 14400050 */ bnez $v0, .L8013CF58 -/* D3518 8013CE18 00000000 */ nop +/* D3518 8013CE18 00000000 */ nop /* D351C 8013CE1C 8E430014 */ lw $v1, 0x14($s2) /* D3520 8013CE20 30620100 */ andi $v0, $v1, 0x100 /* D3524 8013CE24 5040000E */ beql $v0, $zero, .L8013CE60 @@ -720,11 +720,11 @@ glabel func_8013C3F0 /* D35A0 8013CEA0 0000B02D */ daddu $s6, $zero, $zero .L8013CEA4: /* D35A4 8013CEA4 0681002C */ bgez $s4, .L8013CF58 -/* D35A8 8013CEA8 00000000 */ nop +/* D35A8 8013CEA8 00000000 */ nop /* D35AC 8013CEAC 8E440014 */ lw $a0, 0x14($s2) /* D35B0 8013CEB0 30820100 */ andi $v0, $a0, 0x100 /* D35B4 8013CEB4 1040000E */ beqz $v0, .L8013CEF0 -/* D35B8 8013CEB8 00000000 */ nop +/* D35B8 8013CEB8 00000000 */ nop /* D35BC 8013CEBC 8FAD0010 */ lw $t5, 0x10($sp) /* D35C0 8013CEC0 022D8823 */ subu $s1, $s1, $t5 /* D35C4 8013CEC4 06210024 */ bgez $s1, .L8013CF58 @@ -756,12 +756,12 @@ glabel func_8013C3F0 /* D3620 8013CF20 14610004 */ bne $v1, $at, .L8013CF34 /* D3624 8013CF24 3C018000 */ lui $at, 0x8000 /* D3628 8013CF28 16210002 */ bne $s1, $at, .L8013CF34 -/* D362C 8013CF2C 00000000 */ nop +/* D362C 8013CF2C 00000000 */ nop /* D3630 8013CF30 0006000D */ break 6 .L8013CF34: /* D3634 8013CF34 00008810 */ mfhi $s1 /* D3638 8013CF38 0804F3D6 */ j .L8013CF58 -/* D363C 8013CF3C 00000000 */ nop +/* D363C 8013CF3C 00000000 */ nop .L8013CF40: /* D3640 8013CF40 10400003 */ beqz $v0, .L8013CF50 /* D3644 8013CF44 34824000 */ ori $v0, $a0, 0x4000 @@ -773,11 +773,11 @@ glabel func_8013C3F0 /* D3654 8013CF54 AE420014 */ sw $v0, 0x14($s2) .L8013CF58: /* D3658 8013CF58 44960000 */ mtc1 $s6, $f0 -/* D365C 8013CF5C 00000000 */ nop +/* D365C 8013CF5C 00000000 */ nop /* D3660 8013CF60 46800020 */ cvt.s.w $f0, $f0 /* D3664 8013CF64 E640003C */ swc1 $f0, 0x3c($s2) /* D3668 8013CF68 44910000 */ mtc1 $s1, $f0 -/* D366C 8013CF6C 00000000 */ nop +/* D366C 8013CF6C 00000000 */ nop /* D3670 8013CF70 46800020 */ cvt.s.w $f0, $f0 /* D3674 8013CF74 E6400040 */ swc1 $f0, 0x40($s2) .L8013CF78: diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s index 479512a00f..837a35a4ad 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s @@ -23,8 +23,8 @@ glabel func_8013CFA8 /* D36F0 8013CFF0 3C06F500 */ lui $a2, 0xf500 /* D36F4 8013CFF4 34C60100 */ ori $a2, $a2, 0x100 /* D36F8 8013CFF8 3C070703 */ lui $a3, 0x703 -/* D36FC 8013CFFC 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D3700 8013D000 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D36FC 8013CFFC 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D3700 8013D000 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D3704 8013D004 8C820000 */ lw $v0, ($a0) /* D3708 8013D008 34E7C000 */ ori $a3, $a3, 0xc000 /* D370C 8013D00C 0040282D */ daddu $a1, $v0, $zero @@ -70,8 +70,8 @@ glabel func_8013CFA8 /* D37A8 8013D0A8 96350008 */ lhu $s5, 8($s1) /* D37AC 8013D0AC 3C180018 */ lui $t8, 0x18 /* D37B0 8013D0B0 24160002 */ addiu $s6, $zero, 2 -/* D37B4 8013D0B4 3C10800A */ lui $s0, %hi(D_8009A66C) -/* D37B8 8013D0B8 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* D37B4 8013D0B4 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* D37B8 8013D0B8 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* D37BC 8013D0BC 3C1EE700 */ lui $fp, 0xe700 /* D37C0 8013D0C0 3C19800B */ lui $t9, %hi(gCameras) /* D37C4 8013D0C4 27391D80 */ addiu $t9, $t9, %lo(gCameras) @@ -249,7 +249,7 @@ glabel func_8013CFA8 /* D3A6C 8013D36C 10620005 */ beq $v1, $v0, .L8013D384 /* D3A70 8013D370 2402000F */ addiu $v0, $zero, 0xf /* D3A74 8013D374 14620004 */ bne $v1, $v0, .L8013D388 -/* D3A78 8013D378 00000000 */ nop +/* D3A78 8013D378 00000000 */ nop .L8013D37C: /* D3A7C 8013D37C 0804F4E2 */ j .L8013D388 /* D3A80 8013D380 8E280038 */ lw $t0, 0x38($s1) @@ -473,7 +473,7 @@ glabel func_8013CFA8 /* D3DBC 8013D6BC AE020000 */ sw $v0, ($s0) /* D3DC0 8013D6C0 92220000 */ lbu $v0, ($s1) /* D3DC4 8013D6C4 1040009C */ beqz $v0, .L8013D938 -/* D3DC8 8013D6C8 00000000 */ nop +/* D3DC8 8013D6C8 00000000 */ nop /* D3DCC 8013D6CC 8E220014 */ lw $v0, 0x14($s1) /* D3DD0 8013D6D0 00581024 */ and $v0, $v0, $t8 /* D3DD4 8013D6D4 10400098 */ beqz $v0, .L8013D938 @@ -528,14 +528,14 @@ glabel func_8013CFA8 /* D3E88 8013D788 10600009 */ beqz $v1, .L8013D7B0 /* D3E8C 8013D78C 2402FFFF */ addiu $v0, $zero, -1 /* D3E90 8013D790 0804F5F3 */ j .L8013D7CC -/* D3E94 8013D794 00000000 */ nop +/* D3E94 8013D794 00000000 */ nop .L8013D798: /* D3E98 8013D798 1062000A */ beq $v1, $v0, .L8013D7C4 /* D3E9C 8013D79C 2402000F */ addiu $v0, $zero, 0xf /* D3EA0 8013D7A0 10620005 */ beq $v1, $v0, .L8013D7B8 /* D3EA4 8013D7A4 2402FFFF */ addiu $v0, $zero, -1 /* D3EA8 8013D7A8 0804F5F3 */ j .L8013D7CC -/* D3EAC 8013D7AC 00000000 */ nop +/* D3EAC 8013D7AC 00000000 */ nop .L8013D7B0: /* D3EB0 8013D7B0 0804F5F2 */ j .L8013D7C8 /* D3EB4 8013D7B4 240900FF */ addiu $t1, $zero, 0xff diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s index 4eeba5407d..7bcf7b9870 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s @@ -23,8 +23,8 @@ glabel func_8013DAB4 /* D41FC 8013DAFC 3C06F500 */ lui $a2, 0xf500 /* D4200 8013DB00 34C60100 */ ori $a2, $a2, 0x100 /* D4204 8013DB04 3C070703 */ lui $a3, 0x703 -/* D4208 8013DB08 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D420C 8013DB0C 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D4208 8013DB08 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D420C 8013DB0C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D4210 8013DB10 8C820000 */ lw $v0, ($a0) /* D4214 8013DB14 34E7C000 */ ori $a3, $a3, 0xc000 /* D4218 8013DB18 0040282D */ daddu $a1, $v0, $zero @@ -71,8 +71,8 @@ glabel func_8013DAB4 /* D42B8 8013DBB8 968E0008 */ lhu $t6, 8($s4) /* D42BC 8013DBBC 104001C0 */ beqz $v0, .L8013E2C0 /* D42C0 8013DBC0 0000A82D */ daddu $s5, $zero, $zero -/* D42C4 8013DBC4 3C10800A */ lui $s0, %hi(D_8009A66C) -/* D42C8 8013DBC8 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* D42C4 8013DBC4 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* D42C8 8013DBC8 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* D42CC 8013DBCC 3C1EF540 */ lui $fp, 0xf540 /* D42D0 8013DBD0 3C17F200 */ lui $s7, 0xf200 .L8013DBD4: @@ -84,7 +84,7 @@ glabel func_8013DAB4 /* D42E4 8013DBE4 02A30018 */ mult $s5, $v1 /* D42E8 8013DBE8 00004012 */ mflo $t0 /* D42EC 8013DBEC 26A20001 */ addiu $v0, $s5, 1 -/* D42F0 8013DBF0 00000000 */ nop +/* D42F0 8013DBF0 00000000 */ nop /* D42F4 8013DBF4 00430018 */ mult $v0, $v1 /* D42F8 8013DBF8 01C81021 */ addu $v0, $t6, $t0 /* D42FC 8013DBFC 00528821 */ addu $s1, $v0, $s2 @@ -296,7 +296,7 @@ glabel func_8013DAB4 /* D4630 8013DF30 10620006 */ beq $v1, $v0, .L8013DF4C /* D4634 8013DF34 00111100 */ sll $v0, $s1, 4 /* D4638 8013DF38 0804F7D4 */ j .L8013DF50 -/* D463C 8013DF3C 00000000 */ nop +/* D463C 8013DF3C 00000000 */ nop .L8013DF40: /* D4640 8013DF40 8E8D0038 */ lw $t5, 0x38($s4) /* D4644 8013DF44 0804F7D4 */ j .L8013DF50 @@ -528,7 +528,7 @@ glabel func_8013DAB4 /* D49B0 8013E2B0 26B50001 */ addiu $s5, $s5, 1 /* D49B4 8013E2B4 02A2102A */ slt $v0, $s5, $v0 /* D49B8 8013E2B8 1440FE46 */ bnez $v0, .L8013DBD4 -/* D49BC 8013E2BC 00000000 */ nop +/* D49BC 8013E2BC 00000000 */ nop .L8013E2C0: /* D49C0 8013E2C0 8FBF004C */ lw $ra, 0x4c($sp) /* D49C4 8013E2C4 8FBE0048 */ lw $fp, 0x48($sp) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s index 9a0c2724db..be5bef5019 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8013E2F0 -/* D49F0 8013E2F0 3C028007 */ lui $v0, %hi(D_800741F4) -/* D49F4 8013E2F4 8C4241F4 */ lw $v0, %lo(D_800741F4)($v0) +/* D49F0 8013E2F0 3C028007 */ lui $v0, %hi(gCurrentDisplayContextIndex) +/* D49F4 8013E2F4 8C4241F4 */ lw $v0, %lo(gCurrentDisplayContextIndex)($v0) /* D49F8 8013E2F8 27BDFFC8 */ addiu $sp, $sp, -0x38 /* D49FC 8013E2FC AFB3002C */ sw $s3, 0x2c($sp) /* D4A00 8013E300 0080982D */ daddu $s3, $a0, $zero @@ -21,10 +21,10 @@ glabel func_8013E2F0 /* D4A30 8013E330 1040016C */ beqz $v0, .L8013E8E4 /* D4A34 8013E334 3C120001 */ lui $s2, 1 /* D4A38 8013E338 36521630 */ ori $s2, $s2, 0x1630 -/* D4A3C 8013E33C 3C108007 */ lui $s0, %hi(D_800741F0) -/* D4A40 8013E340 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* D4A44 8013E344 3C11800A */ lui $s1, %hi(D_8009A674) -/* D4A48 8013E348 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* D4A3C 8013E33C 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* D4A40 8013E340 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* D4A44 8013E344 3C11800A */ lui $s1, %hi(gDisplayContext) +/* D4A48 8013E348 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* D4A4C 8013E34C 3C013DCC */ lui $at, 0x3dcc /* D4A50 8013E350 3421CCCD */ ori $at, $at, 0xcccd /* D4A54 8013E354 44810000 */ mtc1 $at, $f0 @@ -37,8 +37,8 @@ glabel func_8013E2F0 /* D4A70 8013E370 00A0302D */ daddu $a2, $a1, $zero /* D4A74 8013E374 0C019DC0 */ jal guScale /* D4A78 8013E378 00A0382D */ daddu $a3, $a1, $zero -/* D4A7C 8013E37C 3C08800A */ lui $t0, %hi(D_8009A66C) -/* D4A80 8013E380 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* D4A7C 8013E37C 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* D4A80 8013E380 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* D4A84 8013E384 8D070000 */ lw $a3, ($t0) /* D4A88 8013E388 00E0282D */ daddu $a1, $a3, $zero /* D4A8C 8013E38C 24E70008 */ addiu $a3, $a3, 8 @@ -135,8 +135,8 @@ glabel func_8013E2F0 /* D4BF4 8013E4F4 3C0CF510 */ lui $t4, 0xf510 /* D4BF8 8013E4F8 358C0900 */ ori $t4, $t4, 0x900 /* D4BFC 8013E4FC 3C0D020F */ lui $t5, 0x20f -/* D4C00 8013E500 3C07800A */ lui $a3, %hi(D_8009A66C) -/* D4C04 8013E504 24E7A66C */ addiu $a3, $a3, %lo(D_8009A66C) +/* D4C00 8013E500 3C07800A */ lui $a3, %hi(gMasterGfxPos) +/* D4C04 8013E504 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) /* D4C08 8013E508 8CE50000 */ lw $a1, ($a3) /* D4C0C 8013E50C 35ADC000 */ ori $t5, $t5, 0xc000 /* D4C10 8013E510 00A0202D */ daddu $a0, $a1, $zero @@ -248,20 +248,20 @@ glabel func_8013E2F0 /* D4DB8 8013E6B8 10400005 */ beqz $v0, .L8013E6D0 /* D4DBC 8013E6BC 24020007 */ addiu $v0, $zero, 7 /* D4DC0 8013E6C0 1060000D */ beqz $v1, .L8013E6F8 -/* D4DC4 8013E6C4 00000000 */ nop +/* D4DC4 8013E6C4 00000000 */ nop /* D4DC8 8013E6C8 0804F9BE */ j .L8013E6F8 -/* D4DCC 8013E6CC 00000000 */ nop +/* D4DCC 8013E6CC 00000000 */ nop .L8013E6D0: /* D4DD0 8013E6D0 10620008 */ beq $v1, $v0, .L8013E6F4 /* D4DD4 8013E6D4 2402000B */ addiu $v0, $zero, 0xb /* D4DD8 8013E6D8 14620007 */ bne $v1, $v0, .L8013E6F8 -/* D4DDC 8013E6DC 00000000 */ nop +/* D4DDC 8013E6DC 00000000 */ nop /* D4DE0 8013E6E0 0804F9BE */ j .L8013E6F8 /* D4DE4 8013E6E4 240E00FF */ addiu $t6, $zero, 0xff .L8013E6E8: /* D4DE8 8013E6E8 8E6E0038 */ lw $t6, 0x38($s3) /* D4DEC 8013E6EC 0804F9BE */ j .L8013E6F8 -/* D4DF0 8013E6F0 00000000 */ nop +/* D4DF0 8013E6F0 00000000 */ nop .L8013E6F4: /* D4DF4 8013E6F4 240EFFFF */ addiu $t6, $zero, -1 .L8013E6F8: @@ -286,8 +286,8 @@ glabel func_8013E2F0 /* D4E38 8013E738 3C0A000A */ lui $t2, 0xa /* D4E3C 8013E73C 354A0280 */ ori $t2, $t2, 0x280 /* D4E40 8013E740 3C09F240 */ lui $t1, 0xf240 -/* D4E44 8013E744 3C07800A */ lui $a3, %hi(D_8009A66C) -/* D4E48 8013E748 24E7A66C */ addiu $a3, $a3, %lo(D_8009A66C) +/* D4E44 8013E744 3C07800A */ lui $a3, %hi(gMasterGfxPos) +/* D4E48 8013E748 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) /* D4E4C 8013E74C 8CE50000 */ lw $a1, ($a3) /* D4E50 8013E750 35290400 */ ori $t1, $t1, 0x400 /* D4E54 8013E754 00A0202D */ daddu $a0, $a1, $zero @@ -372,15 +372,15 @@ glabel func_8013E2F0 .L8013E890: /* D4F90 8013E890 3C07D838 */ lui $a3, 0xd838 .L8013E894: -/* D4F94 8013E894 3C05800A */ lui $a1, %hi(D_8009A66C) -/* D4F98 8013E898 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* D4F94 8013E894 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* D4F98 8013E898 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* D4F9C 8013E89C 8CA40000 */ lw $a0, ($a1) /* D4FA0 8013E8A0 34E70002 */ ori $a3, $a3, 2 /* D4FA4 8013E8A4 0080302D */ daddu $a2, $a0, $zero /* D4FA8 8013E8A8 24840008 */ addiu $a0, $a0, 8 /* D4FAC 8013E8AC ACA40000 */ sw $a0, ($a1) -/* D4FB0 8013E8B0 3C028007 */ lui $v0, %hi(D_800741F4) -/* D4FB4 8013E8B4 8C4241F4 */ lw $v0, %lo(D_800741F4)($v0) +/* D4FB0 8013E8B0 3C028007 */ lui $v0, %hi(gCurrentDisplayContextIndex) +/* D4FB4 8013E8B4 8C4241F4 */ lw $v0, %lo(gCurrentDisplayContextIndex)($v0) /* D4FB8 8013E8B8 3C03DE00 */ lui $v1, 0xde00 /* D4FBC 8013E8BC ACC30000 */ sw $v1, ($a2) /* D4FC0 8013E8C0 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E904.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E904.s index 116ee2a723..97c0e961be 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E904.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E904.s @@ -22,10 +22,10 @@ glabel func_8013E904 /* D5048 8013E948 9664000A */ lhu $a0, 0xa($s3) /* D504C 8013E94C 0C04BF84 */ jal func_8012FE10 /* D5050 8013E950 0040B02D */ daddu $s6, $v0, $zero -/* D5054 8013E954 3C108007 */ lui $s0, %hi(D_800741F0) -/* D5058 8013E958 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* D505C 8013E95C 3C11800A */ lui $s1, %hi(D_8009A674) -/* D5060 8013E960 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* D5054 8013E954 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* D5058 8013E958 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* D505C 8013E95C 3C11800A */ lui $s1, %hi(gDisplayContext) +/* D5060 8013E960 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* D5064 8013E964 96040000 */ lhu $a0, ($s0) /* D5068 8013E968 3C068015 */ lui $a2, %hi(D_8014EE10) /* D506C 8013E96C 8CC6EE10 */ lw $a2, %lo(D_8014EE10)($a2) @@ -40,14 +40,14 @@ glabel func_8013E904 /* D5090 8013E990 94C50008 */ lhu $a1, 8($a2) /* D5094 8013E994 94C3000A */ lhu $v1, 0xa($a2) /* D5098 8013E998 44850000 */ mtc1 $a1, $f0 -/* D509C 8013E99C 00000000 */ nop +/* D509C 8013E99C 00000000 */ nop /* D50A0 8013E9A0 46800020 */ cvt.s.w $f0, $f0 /* D50A4 8013E9A4 46000021 */ cvt.d.s $f0, $f0 /* D50A8 8013E9A8 46220003 */ div.d $f0, $f0, $f2 /* D50AC 8013E9AC 46200020 */ cvt.s.d $f0, $f0 /* D50B0 8013E9B0 44050000 */ mfc1 $a1, $f0 /* D50B4 8013E9B4 44830000 */ mtc1 $v1, $f0 -/* D50B8 8013E9B8 00000000 */ nop +/* D50B8 8013E9B8 00000000 */ nop /* D50BC 8013E9BC 46800020 */ cvt.s.w $f0, $f0 /* D50C0 8013E9C0 46000021 */ cvt.d.s $f0, $f0 /* D50C4 8013E9C4 46220003 */ div.d $f0, $f0, $f2 @@ -58,8 +58,8 @@ glabel func_8013E904 /* D50D8 8013E9D8 3C06E200 */ lui $a2, 0xe200 /* D50DC 8013E9DC 34C6001C */ ori $a2, $a2, 0x1c /* D50E0 8013E9E0 3C050050 */ lui $a1, 0x50 -/* D50E4 8013E9E4 3C08800A */ lui $t0, %hi(D_8009A66C) -/* D50E8 8013E9E8 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* D50E4 8013E9E4 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* D50E8 8013E9E8 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* D50EC 8013E9EC 8D070000 */ lw $a3, ($t0) /* D50F0 8013E9F0 34A54E50 */ ori $a1, $a1, 0x4e50 /* D50F4 8013E9F4 00E0202D */ daddu $a0, $a3, $zero @@ -116,8 +116,8 @@ glabel func_8013E904 /* D51B8 8013EAB8 34A50100 */ ori $a1, $a1, 0x100 /* D51BC 8013EABC 3C060703 */ lui $a2, 0x703 /* D51C0 8013EAC0 34C6C000 */ ori $a2, $a2, 0xc000 -/* D51C4 8013EAC4 3C07800A */ lui $a3, %hi(D_8009A66C) -/* D51C8 8013EAC8 24E7A66C */ addiu $a3, $a3, %lo(D_8009A66C) +/* D51C4 8013EAC4 3C07800A */ lui $a3, %hi(gMasterGfxPos) +/* D51C8 8013EAC8 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) /* D51CC 8013EACC 3C0BF240 */ lui $t3, 0xf240 /* D51D0 8013EAD0 3C080700 */ lui $t0, 0x700 /* D51D4 8013EAD4 3C0AE600 */ lui $t2, 0xe600 @@ -240,11 +240,11 @@ glabel func_8013E904 /* D53A8 8013ECA8 44064000 */ mfc1 $a2, $f8 /* D53AC 8013ECAC 00031880 */ sll $v1, $v1, 2 /* D53B0 8013ECB0 44831000 */ mtc1 $v1, $f2 -/* D53B4 8013ECB4 00000000 */ nop +/* D53B4 8013ECB4 00000000 */ nop /* D53B8 8013ECB8 468010A0 */ cvt.s.w $f2, $f2 /* D53BC 8013ECBC 00021080 */ sll $v0, $v0, 2 /* D53C0 8013ECC0 44820000 */ mtc1 $v0, $f0 -/* D53C4 8013ECC4 00000000 */ nop +/* D53C4 8013ECC4 00000000 */ nop /* D53C8 8013ECC8 46800020 */ cvt.s.w $f0, $f0 /* D53CC 8013ECCC 30A50FFF */ andi $a1, $a1, 0xfff /* D53D0 8013ECD0 00052B00 */ sll $a1, $a1, 0xc @@ -280,12 +280,12 @@ glabel func_8013E904 /* D5444 8013ED44 14410004 */ bne $v0, $at, .L8013ED58 /* D5448 8013ED48 3C018000 */ lui $at, 0x8000 /* D544C 8013ED4C 14610002 */ bne $v1, $at, .L8013ED58 -/* D5450 8013ED50 00000000 */ nop +/* D5450 8013ED50 00000000 */ nop /* D5454 8013ED54 0006000D */ break 6 .L8013ED58: /* D5458 8013ED58 00001010 */ mfhi $v0 /* D545C 8013ED5C 44820000 */ mtc1 $v0, $f0 -/* D5460 8013ED60 00000000 */ nop +/* D5460 8013ED60 00000000 */ nop /* D5464 8013ED64 46800020 */ cvt.s.w $f0, $f0 /* D5468 8013ED68 E680004C */ swc1 $f0, 0x4c($s4) /* D546C 8013ED6C C6620010 */ lwc1 $f2, 0x10($s3) @@ -304,7 +304,7 @@ glabel func_8013E904 /* D549C 8013ED9C 14410004 */ bne $v0, $at, .L8013EDB0 /* D54A0 8013EDA0 3C018000 */ lui $at, 0x8000 /* D54A4 8013EDA4 14610002 */ bne $v1, $at, .L8013EDB0 -/* D54A8 8013EDA8 00000000 */ nop +/* D54A8 8013EDA8 00000000 */ nop /* D54AC 8013EDAC 0006000D */ break 6 .L8013EDB0: /* D54B0 8013EDB0 00002810 */ mfhi $a1 @@ -322,7 +322,7 @@ glabel func_8013E904 /* D54E0 8013EDE0 ACE20000 */ sw $v0, ($a3) /* D54E4 8013EDE4 24820078 */ addiu $v0, $a0, 0x78 /* D54E8 8013EDE8 44850000 */ mtc1 $a1, $f0 -/* D54EC 8013EDEC 00000000 */ nop +/* D54EC 8013EDEC 00000000 */ nop /* D54F0 8013EDF0 46800020 */ cvt.s.w $f0, $f0 /* D54F4 8013EDF4 E6800050 */ swc1 $f0, 0x50($s4) /* D54F8 8013EDF8 ACE20000 */ sw $v0, ($a3) diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/draw_menu_icon.s b/asm/nonmatchings/code_d5a50_len_5fd0/draw_menu_icon.s index b86d2ad22e..0ede182a19 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/draw_menu_icon.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/draw_menu_icon.s @@ -25,7 +25,7 @@ glabel draw_menu_icon /* DA9E8 801442E8 3C021020 */ lui $v0, 0x1020 /* DA9EC 801442EC 00621024 */ and $v0, $v1, $v0 /* DA9F0 801442F0 14400123 */ bnez $v0, .L80144780 -/* DA9F4 801442F4 00000000 */ nop +/* DA9F4 801442F4 00000000 */ nop /* DA9F8 801442F8 82020045 */ lb $v0, 0x45($s0) /* DA9FC 801442FC 04400120 */ bltz $v0, .L80144780 /* DAA00 80144300 24020001 */ addiu $v0, $zero, 1 @@ -36,8 +36,8 @@ glabel draw_menu_icon /* DAA14 80144314 3C06ED03 */ lui $a2, 0xed03 /* DAA18 80144318 34C60050 */ ori $a2, $a2, 0x50 /* DAA1C 8014431C 3C05004D */ lui $a1, 0x4d -/* DAA20 80144320 3C04800A */ lui $a0, %hi(D_8009A66C) -/* DAA24 80144324 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* DAA20 80144320 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* DAA24 80144324 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* DAA28 80144328 8C820000 */ lw $v0, ($a0) /* DAA2C 8014432C 34A50370 */ ori $a1, $a1, 0x370 /* DAA30 80144330 0040182D */ daddu $v1, $v0, $zero @@ -65,8 +65,8 @@ glabel draw_menu_icon /* DAA84 80144384 3C0EE300 */ lui $t6, 0xe300 /* DAA88 80144388 35CE1A01 */ ori $t6, $t6, 0x1a01 /* DAA8C 8014438C 3C0FD700 */ lui $t7, 0xd700 -/* DAA90 80144390 3C04800A */ lui $a0, %hi(D_8009A66C) -/* DAA94 80144394 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* DAA90 80144390 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* DAA94 80144394 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* DAA98 80144398 35EF0002 */ ori $t7, $t7, 2 /* DAA9C 8014439C 8C820000 */ lw $v0, ($a0) /* DAAA0 801443A0 3C03E700 */ lui $v1, 0xe700 @@ -130,7 +130,7 @@ glabel draw_menu_icon /* DAB84 80144484 3C020010 */ lui $v0, 0x10 /* DAB88 80144488 00621024 */ and $v0, $v1, $v0 /* DAB8C 8014448C 1440000B */ bnez $v0, .L801444BC -/* DAB90 80144490 00000000 */ nop +/* DAB90 80144490 00000000 */ nop /* DAB94 80144494 82040046 */ lb $a0, 0x46($s0) /* DAB98 80144498 3C038015 */ lui $v1, %hi(D_8014EFCC) /* DAB9C 8014449C 2463EFCC */ addiu $v1, $v1, %lo(D_8014EFCC) @@ -151,7 +151,7 @@ glabel draw_menu_icon /* DABD0 801444D0 3C020010 */ lui $v0, 0x10 /* DABD4 801444D4 00621024 */ and $v0, $v1, $v0 /* DABD8 801444D8 1440000C */ bnez $v0, .L8014450C -/* DABDC 801444DC 00000000 */ nop +/* DABDC 801444DC 00000000 */ nop /* DABE0 801444E0 82020045 */ lb $v0, 0x45($s0) /* DABE4 801444E4 3C048015 */ lui $a0, %hi(D_8014EFCC) /* DABE8 801444E8 2484EFCC */ addiu $a0, $a0, %lo(D_8014EFCC) @@ -252,7 +252,7 @@ glabel draw_menu_icon /* DAD44 80144644 44815000 */ mtc1 $at, $f10 /* DAD48 80144648 46000207 */ neg.s $f8, $f0 /* DAD4C 8014464C 46024202 */ mul.s $f8, $f8, $f2 -/* DAD50 80144650 00000000 */ nop +/* DAD50 80144650 00000000 */ nop /* DAD54 80144654 3C014480 */ lui $at, 0x4480 /* DAD58 80144658 44816000 */ mtc1 $at, $f12 /* DAD5C 8014465C 8E020000 */ lw $v0, ($s0) @@ -262,27 +262,27 @@ glabel draw_menu_icon /* DAD6C 8014466C 44127000 */ mfc1 $s2, $f14 /* DAD70 80144670 46003187 */ neg.s $f6, $f6 /* DAD74 80144674 46023182 */ mul.s $f6, $f6, $f2 -/* DAD78 80144678 00000000 */ nop +/* DAD78 80144678 00000000 */ nop /* DAD7C 8014467C 44912000 */ mtc1 $s1, $f4 -/* DAD80 80144680 00000000 */ nop +/* DAD80 80144680 00000000 */ nop /* DAD84 80144684 46802120 */ cvt.s.w $f4, $f4 /* DAD88 80144688 44960000 */ mtc1 $s6, $f0 -/* DAD8C 8014468C 00000000 */ nop +/* DAD8C 8014468C 00000000 */ nop /* DAD90 80144690 46800020 */ cvt.s.w $f0, $f0 /* DAD94 80144694 46002103 */ div.s $f4, $f4, $f0 /* DAD98 80144698 46045103 */ div.s $f4, $f10, $f4 /* DAD9C 8014469C 460C2102 */ mul.s $f4, $f4, $f12 -/* DADA0 801446A0 00000000 */ nop +/* DADA0 801446A0 00000000 */ nop /* DADA4 801446A4 44920000 */ mtc1 $s2, $f0 -/* DADA8 801446A8 00000000 */ nop +/* DADA8 801446A8 00000000 */ nop /* DADAC 801446AC 46800020 */ cvt.s.w $f0, $f0 /* DADB0 801446B0 44951000 */ mtc1 $s5, $f2 -/* DADB4 801446B4 00000000 */ nop +/* DADB4 801446B4 00000000 */ nop /* DADB8 801446B8 468010A0 */ cvt.s.w $f2, $f2 /* DADBC 801446BC 46020003 */ div.s $f0, $f0, $f2 /* DADC0 801446C0 46005003 */ div.s $f0, $f10, $f0 /* DADC4 801446C4 460C0002 */ mul.s $f0, $f0, $f12 -/* DADC8 801446C8 00000000 */ nop +/* DADC8 801446C8 00000000 */ nop /* DADCC 801446CC 00431024 */ and $v0, $v0, $v1 /* DADD0 801446D0 4600438D */ trunc.w.s $f14, $f8 /* DADD4 801446D4 44137000 */ mfc1 $s3, $f14 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F704.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F704.s index dc977485f3..079b6a372d 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F704.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F704.s @@ -25,7 +25,7 @@ glabel func_8013F704 /* D5E50 8013F750 16C10004 */ bne $s6, $at, .L8013F764 /* D5E54 8013F754 3C018000 */ lui $at, 0x8000 /* D5E58 8013F758 15010002 */ bne $t0, $at, .L8013F764 -/* D5E5C 8013F75C 00000000 */ nop +/* D5E5C 8013F75C 00000000 */ nop /* D5E60 8013F760 0006000D */ break 6 .L8013F764: /* D5E64 8013F764 00004012 */ mflo $t0 @@ -42,7 +42,7 @@ glabel func_8013F704 /* D5E8C 8013F78C 16C10004 */ bne $s6, $at, .L8013F7A0 /* D5E90 8013F790 3C018000 */ lui $at, 0x8000 /* D5E94 8013F794 15210002 */ bne $t1, $at, .L8013F7A0 -/* D5E98 8013F798 00000000 */ nop +/* D5E98 8013F798 00000000 */ nop /* D5E9C 8013F79C 0006000D */ break 6 .L8013F7A0: /* D5EA0 8013F7A0 00004812 */ mflo $t1 @@ -156,13 +156,13 @@ glabel func_8013F704 /* D6020 8013F920 1062000B */ beq $v1, $v0, .L8013F950 /* D6024 8013F924 24080003 */ addiu $t0, $zero, 3 /* D6028 8013F928 0804FE55 */ j .L8013F954 -/* D602C 8013F92C 00000000 */ nop +/* D602C 8013F92C 00000000 */ nop .L8013F930: /* D6030 8013F930 24020020 */ addiu $v0, $zero, 0x20 /* D6034 8013F934 10620006 */ beq $v1, $v0, .L8013F950 /* D6038 8013F938 24080005 */ addiu $t0, $zero, 5 /* D603C 8013F93C 0804FE55 */ j .L8013F954 -/* D6040 8013F940 00000000 */ nop +/* D6040 8013F940 00000000 */ nop .L8013F944: /* D6044 8013F944 24160004 */ addiu $s6, $zero, 4 /* D6048 8013F948 0804FE55 */ j .L8013F954 @@ -179,13 +179,13 @@ glabel func_8013F704 /* D606C 8013F96C 12C00060 */ beqz $s6, .L8013FAF0 /* D6070 8013F970 3C06E200 */ lui $a2, 0xe200 /* D6074 8013F974 0804FECD */ j .L8013FB34 -/* D6078 8013F978 00000000 */ nop +/* D6078 8013F978 00000000 */ nop .L8013F97C: /* D607C 8013F97C 8FA80008 */ lw $t0, 8($sp) /* D6080 8013F980 1102005B */ beq $t0, $v0, .L8013FAF0 /* D6084 8013F984 3C06E200 */ lui $a2, 0xe200 /* D6088 8013F988 0804FECD */ j .L8013FB34 -/* D608C 8013F98C 00000000 */ nop +/* D608C 8013F98C 00000000 */ nop .L8013F990: /* D6090 8013F990 8E630000 */ lw $v1, ($s3) /* D6094 8013F994 30620020 */ andi $v0, $v1, 0x20 @@ -196,16 +196,16 @@ glabel func_8013F704 /* D60A8 8013F9A8 3C06E200 */ lui $a2, 0xe200 /* D60AC 8013F9AC 34C6001C */ ori $a2, $a2, 0x1c /* D60B0 8013F9B0 3C050F0A */ lui $a1, 0xf0a -/* D60B4 8013F9B4 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D60B8 8013F9B8 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D60B4 8013F9B4 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D60B8 8013F9B8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D60BC 8013F9BC 8C820000 */ lw $v0, ($a0) /* D60C0 8013F9C0 0804FE89 */ j .L8013FA24 /* D60C4 8013F9C4 34A57008 */ ori $a1, $a1, 0x7008 .L8013F9C8: /* D60C8 8013F9C8 34C6001C */ ori $a2, $a2, 0x1c /* D60CC 8013F9CC 3C050055 */ lui $a1, 0x55 -/* D60D0 8013F9D0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D60D4 8013F9D4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D60D0 8013F9D0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D60D4 8013F9D4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D60D8 8013F9D8 8C820000 */ lw $v0, ($a0) /* D60DC 8013F9DC 0804FE89 */ j .L8013FA24 /* D60E0 8013F9E0 34A53048 */ ori $a1, $a1, 0x3048 @@ -215,16 +215,16 @@ glabel func_8013F704 /* D60EC 8013F9EC 3C06E200 */ lui $a2, 0xe200 /* D60F0 8013F9F0 34C6001C */ ori $a2, $a2, 0x1c /* D60F4 8013F9F4 3C050050 */ lui $a1, 0x50 -/* D60F8 8013F9F8 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D60FC 8013F9FC 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D60F8 8013F9F8 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D60FC 8013F9FC 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D6100 8013FA00 8C820000 */ lw $v0, ($a0) /* D6104 8013FA04 0804FE89 */ j .L8013FA24 /* D6108 8013FA08 34A54340 */ ori $a1, $a1, 0x4340 .L8013FA0C: /* D610C 8013FA0C 34C6001C */ ori $a2, $a2, 0x1c /* D6110 8013FA10 3C050050 */ lui $a1, 0x50 -/* D6114 8013FA14 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D6118 8013FA18 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D6114 8013FA14 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D6118 8013FA18 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D611C 8013FA1C 8C820000 */ lw $v0, ($a0) /* D6120 8013FA20 34A54348 */ ori $a1, $a1, 0x4348 .L8013FA24: @@ -238,8 +238,8 @@ glabel func_8013F704 /* D6140 8013FA40 3C06F500 */ lui $a2, 0xf500 /* D6144 8013FA44 34C60100 */ ori $a2, $a2, 0x100 /* D6148 8013FA48 3C070703 */ lui $a3, 0x703 -/* D614C 8013FA4C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D6150 8013FA50 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D614C 8013FA4C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D6150 8013FA50 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D6154 8013FA54 8C820000 */ lw $v0, ($a0) /* D6158 8013FA58 34E7C000 */ ori $a3, $a3, 0xc000 /* D615C 8013FA5C 0040282D */ daddu $a1, $v0, $zero @@ -284,8 +284,8 @@ glabel func_8013F704 /* D61F4 8013FAF4 3C050050 */ lui $a1, 0x50 /* D61F8 8013FAF8 34A54240 */ ori $a1, $a1, 0x4240 /* D61FC 8013FAFC 3C07E300 */ lui $a3, 0xe300 -/* D6200 8013FB00 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D6204 8013FB04 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D6200 8013FB00 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D6204 8013FB04 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D6208 8013FB08 8C820000 */ lw $v0, ($a0) /* D620C 8013FB0C 34E71001 */ ori $a3, $a3, 0x1001 /* D6210 8013FB10 0040182D */ daddu $v1, $v0, $zero @@ -302,8 +302,8 @@ glabel func_8013F704 /* D6238 8013FB38 30428000 */ andi $v0, $v0, 0x8000 /* D623C 8013FB3C 1040000C */ beqz $v0, .L8013FB70 /* D6240 8013FB40 3C05E300 */ lui $a1, 0xe300 -/* D6244 8013FB44 3C03800A */ lui $v1, %hi(D_8009A66C) -/* D6248 8013FB48 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* D6244 8013FB44 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* D6248 8013FB48 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* D624C 8013FB4C 8C620000 */ lw $v0, ($v1) /* D6250 8013FB50 34A51201 */ ori $a1, $a1, 0x1201 /* D6254 8013FB54 0040202D */ daddu $a0, $v0, $zero @@ -314,8 +314,8 @@ glabel func_8013F704 /* D6268 8013FB68 0804FEE5 */ j .L8013FB94 /* D626C 8013FB6C AC820004 */ sw $v0, 4($a0) .L8013FB70: -/* D6270 8013FB70 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D6274 8013FB74 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D6270 8013FB70 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D6274 8013FB74 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D6278 8013FB78 8C820000 */ lw $v0, ($a0) /* D627C 8013FB7C 34A51201 */ ori $a1, $a1, 0x1201 /* D6280 8013FB80 0040182D */ daddu $v1, $v0, $zero @@ -367,7 +367,7 @@ glabel func_8013F704 /* D6330 8013FC30 44801000 */ mtc1 $zero, $f2 /* D6334 8013FC34 46202003 */ div.d $f0, $f4, $f0 /* D6338 8013FC38 46220002 */ mul.d $f0, $f0, $f2 -/* D633C 8013FC3C 00000000 */ nop +/* D633C 8013FC3C 00000000 */ nop /* D6340 8013FC40 8FA80024 */ lw $t0, 0x24($sp) /* D6344 8013FC44 8FB60004 */ lw $s6, 4($sp) /* D6348 8013FC48 C7A20028 */ lwc1 $f2, 0x28($sp) @@ -384,13 +384,13 @@ glabel func_8013F704 .L8013FC74: /* D6374 8013FC74 8FB6002C */ lw $s6, 0x2c($sp) /* D6378 8013FC78 06C0050D */ bltz $s6, .L801410B0 -/* D637C 8013FC7C 00000000 */ nop +/* D637C 8013FC7C 00000000 */ nop /* D6380 8013FC80 8FA80028 */ lw $t0, 0x28($sp) /* D6384 8013FC84 290200F1 */ slti $v0, $t0, 0xf1 /* D6388 8013FC88 10400509 */ beqz $v0, .L801410B0 /* D638C 8013FC8C 2AC200F0 */ slti $v0, $s6, 0xf0 /* D6390 8013FC90 1440000B */ bnez $v0, .L8013FCC0 -/* D6394 8013FC94 00000000 */ nop +/* D6394 8013FC94 00000000 */ nop /* D6398 8013FC98 8FB60024 */ lw $s6, 0x24($sp) /* D639C 8013FC9C 26C2010F */ addiu $v0, $s6, 0x10f /* D63A0 8013FCA0 8FA80040 */ lw $t0, 0x40($sp) @@ -424,8 +424,8 @@ glabel func_8013F704 /* D6404 8013FD04 AFA80020 */ sw $t0, 0x20($sp) /* D6408 8013FD08 0000602D */ daddu $t4, $zero, $zero .L8013FD0C: -/* D640C 8013FD0C 3C0A800A */ lui $t2, %hi(D_8009A66C) -/* D6410 8013FD10 254AA66C */ addiu $t2, $t2, %lo(D_8009A66C) +/* D640C 8013FD0C 3C0A800A */ lui $t2, %hi(gMasterGfxPos) +/* D6410 8013FD10 254AA66C */ addiu $t2, $t2, %lo(gMasterGfxPos) /* D6414 8013FD14 3C17E700 */ lui $s7, 0xe700 /* D6418 8013FD18 3C040700 */ lui $a0, 0x700 /* D641C 8013FD1C 3C1EE600 */ lui $fp, 0xe600 @@ -479,7 +479,7 @@ glabel func_8013F704 /* D64D8 8013FDD8 44801000 */ mtc1 $zero, $f2 /* D64DC 8013FDDC 46202003 */ div.d $f0, $f4, $f0 /* D64E0 8013FDE0 46220002 */ mul.d $f0, $f0, $f2 -/* D64E4 8013FDE4 00000000 */ nop +/* D64E4 8013FDE4 00000000 */ nop /* D64E8 8013FDE8 8FB60000 */ lw $s6, ($sp) /* D64EC 8013FDEC C7A20030 */ lwc1 $f2, 0x30($sp) /* D64F0 8013FDF0 468010A1 */ cvt.d.w $f2, $f2 @@ -495,7 +495,7 @@ glabel func_8013F704 .L8013FE18: /* D6518 8013FE18 8FB60088 */ lw $s6, 0x88($sp) /* D651C 8013FE1C 06C00490 */ bltz $s6, .L80141060 -/* D6520 8013FE20 00000000 */ nop +/* D6520 8013FE20 00000000 */ nop /* D6524 8013FE24 8FA80030 */ lw $t0, 0x30($sp) /* D6528 8013FE28 29020141 */ slti $v0, $t0, 0x141 /* D652C 8013FE2C 1040048C */ beqz $v0, .L80141060 @@ -515,7 +515,7 @@ glabel func_8013F704 /* D6560 8013FE60 25620001 */ addiu $v0, $t3, 1 /* D6564 8013FE64 0048102A */ slt $v0, $v0, $t0 /* D6568 8013FE68 1440000E */ bnez $v0, .L8013FEA4 -/* D656C 8013FE6C 00000000 */ nop +/* D656C 8013FE6C 00000000 */ nop /* D6570 8013FE70 8FB60064 */ lw $s6, 0x64($sp) /* D6574 8013FE74 16C00005 */ bnez $s6, .L8013FE8C /* D6578 8013FE78 250BFFFF */ addiu $t3, $t0, -1 @@ -540,7 +540,7 @@ glabel func_8013F704 /* D65B8 8013FEB8 AC600004 */ sw $zero, 4($v1) /* D65BC 8013FEBC 8FA8001C */ lw $t0, 0x1c($sp) /* D65C0 8013FEC0 11000004 */ beqz $t0, .L8013FED4 -/* D65C4 8013FEC4 00000000 */ nop +/* D65C4 8013FEC4 00000000 */ nop /* D65C8 8013FEC8 8FB60020 */ lw $s6, 0x20($sp) /* D65CC 8013FECC 0804FFBC */ j .L8013FEF0 /* D65D0 8013FED0 2EC90001 */ sltiu $t1, $s6, 1 @@ -565,12 +565,12 @@ glabel func_8013F704 /* D6610 8013FF10 11000007 */ beqz $t0, .L8013FF30 /* D6614 8013FF14 3C04FCFF */ lui $a0, 0xfcff /* D6618 8013FF18 0805032C */ j .L80140CB0 -/* D661C 8013FF1C 00000000 */ nop +/* D661C 8013FF1C 00000000 */ nop .L8013FF20: /* D6620 8013FF20 11020211 */ beq $t0, $v0, .L80140768 /* D6624 8013FF24 3C04FC11 */ lui $a0, 0xfc11 /* D6628 8013FF28 0805032C */ j .L80140CB0 -/* D662C 8013FF2C 00000000 */ nop +/* D662C 8013FF2C 00000000 */ nop .L8013FF30: /* D6630 8013FF30 3484FFFF */ ori $a0, $a0, 0xffff /* D6634 8013FF34 3C03FFFC */ lui $v1, 0xfffc @@ -835,14 +835,14 @@ glabel func_8013F704 /* D6A1C 8014031C 11200009 */ beqz $t1, .L80140344 /* D6A20 80140320 3C02FD48 */ lui $v0, 0xfd48 /* D6A24 80140324 0805032C */ j .L80140CB0 -/* D6A28 80140328 00000000 */ nop +/* D6A28 80140328 00000000 */ nop .L8014032C: /* D6A2C 8014032C 11220068 */ beq $t1, $v0, .L801404D0 /* D6A30 80140330 24020003 */ addiu $v0, $zero, 3 /* D6A34 80140334 11220098 */ beq $t1, $v0, .L80140598 /* D6A38 80140338 3C02FD48 */ lui $v0, 0xfd48 /* D6A3C 8014033C 0805032C */ j .L80140CB0 -/* D6A40 80140340 00000000 */ nop +/* D6A40 80140340 00000000 */ nop .L80140344: /* D6A44 80140344 8D440000 */ lw $a0, ($t2) /* D6A48 80140348 0080182D */ daddu $v1, $a0, $zero @@ -1153,11 +1153,11 @@ glabel func_8013F704 /* D6EF0 801407F0 1136003A */ beq $t1, $s6, .L801408DC /* D6EF4 801407F4 29220002 */ slti $v0, $t1, 2 /* D6EF8 801407F8 10400005 */ beqz $v0, .L80140810 -/* D6EFC 801407FC 00000000 */ nop +/* D6EFC 801407FC 00000000 */ nop /* D6F00 80140800 1120000A */ beqz $t1, .L8014082C /* D6F04 80140804 24E20010 */ addiu $v0, $a3, 0x10 /* D6F08 80140808 0805032C */ j .L80140CB0 -/* D6F0C 8014080C 00000000 */ nop +/* D6F0C 8014080C 00000000 */ nop .L80140810: /* D6F10 80140810 8FA80008 */ lw $t0, 8($sp) /* D6F14 80140814 1128005E */ beq $t1, $t0, .L80140990 @@ -1165,7 +1165,7 @@ glabel func_8013F704 /* D6F1C 8014081C 11220089 */ beq $t1, $v0, .L80140A44 /* D6F20 80140820 24E20010 */ addiu $v0, $a3, 0x10 /* D6F24 80140824 0805032C */ j .L80140CB0 -/* D6F28 80140828 00000000 */ nop +/* D6F28 80140828 00000000 */ nop .L8014082C: /* D6F2C 8014082C AD420000 */ sw $v0, ($t2) /* D6F30 80140830 3C02FD68 */ lui $v0, 0xfd68 @@ -1469,7 +1469,7 @@ glabel func_8013F704 /* D73B0 80140CB0 8E620000 */ lw $v0, ($s3) /* D73B4 80140CB4 30428000 */ andi $v0, $v0, 0x8000 /* D73B8 80140CB8 10400065 */ beqz $v0, .L80140E50 -/* D73BC 80140CBC 00000000 */ nop +/* D73BC 80140CBC 00000000 */ nop /* D73C0 80140CC0 8D440000 */ lw $a0, ($t2) /* D73C4 80140CC4 24820008 */ addiu $v0, $a0, 8 /* D73C8 80140CC8 AD420000 */ sw $v0, ($t2) @@ -1508,7 +1508,7 @@ glabel func_8013F704 /* D7438 80140D38 AC620000 */ sw $v0, ($v1) /* D743C 80140D3C 8FA80078 */ lw $t0, 0x78($sp) /* D7440 80140D40 19000004 */ blez $t0, .L80140D54 -/* D7444 80140D44 00000000 */ nop +/* D7444 80140D44 00000000 */ nop /* D7448 80140D48 8FB6007C */ lw $s6, 0x7c($sp) /* D744C 80140D4C 00561025 */ or $v0, $v0, $s6 /* D7450 80140D50 AC620000 */ sw $v0, ($v1) @@ -1562,7 +1562,7 @@ glabel func_8013F704 /* D74F8 80140DF8 00081400 */ sll $v0, $t0, 0x10 /* D74FC 80140DFC 00021403 */ sra $v0, $v0, 0x10 /* D7500 80140E00 0441000A */ bgez $v0, .L80140E2C -/* D7504 80140E04 00000000 */ nop +/* D7504 80140E04 00000000 */ nop /* D7508 80140E08 8FA80078 */ lw $t0, 0x78($sp) /* D750C 80140E0C 01020018 */ mult $t0, $v0 /* D7510 80140E10 0000B012 */ mflo $s6 @@ -1623,7 +1623,7 @@ glabel func_8013F704 /* D75C8 80140EC8 AC620000 */ sw $v0, ($v1) /* D75CC 80140ECC 8FB60078 */ lw $s6, 0x78($sp) /* D75D0 80140ED0 1AC00004 */ blez $s6, .L80140EE4 -/* D75D4 80140ED4 00000000 */ nop +/* D75D4 80140ED4 00000000 */ nop /* D75D8 80140ED8 8FA8007C */ lw $t0, 0x7c($sp) /* D75DC 80140EDC 00481025 */ or $v0, $v0, $t0 /* D75E0 80140EE0 AC620000 */ sw $v0, ($v1) @@ -1675,7 +1675,7 @@ glabel func_8013F704 /* D7680 80140F80 00081400 */ sll $v0, $t0, 0x10 /* D7684 80140F84 00021403 */ sra $v0, $v0, 0x10 /* D7688 80140F88 0441000A */ bgez $v0, .L80140FB4 -/* D768C 80140F8C 00000000 */ nop +/* D768C 80140F8C 00000000 */ nop /* D7690 80140F90 8FA80078 */ lw $t0, 0x78($sp) /* D7694 80140F94 01020018 */ mult $t0, $v0 /* D7698 80140F98 0000B012 */ mflo $s6 @@ -1721,7 +1721,7 @@ glabel func_8013F704 /* D7728 80141028 44801000 */ mtc1 $zero, $f2 /* D772C 8014102C 46202003 */ div.d $f0, $f4, $f0 /* D7730 80141030 46220002 */ mul.d $f0, $f0, $f2 -/* D7734 80141034 00000000 */ nop +/* D7734 80141034 00000000 */ nop /* D7738 80141038 8FB60080 */ lw $s6, 0x80($sp) /* D773C 8014103C C7A20030 */ lwc1 $f2, 0x30($sp) /* D7740 80141040 468010A1 */ cvt.d.w $f2, $f2 @@ -1735,7 +1735,7 @@ glabel func_8013F704 .L80141060: /* D7760 80141060 8FB60020 */ lw $s6, 0x20($sp) /* D7764 80141064 16C00012 */ bnez $s6, .L801410B0 -/* D7768 80141068 00000000 */ nop +/* D7768 80141068 00000000 */ nop /* D776C 8014106C C7A20010 */ lwc1 $f2, 0x10($sp) /* D7770 80141070 468010A1 */ cvt.d.w $f2, $f2 /* D7774 80141074 3C014040 */ lui $at, 0x4040 @@ -1743,7 +1743,7 @@ glabel func_8013F704 /* D777C 8014107C 44800000 */ mtc1 $zero, $f0 /* D7780 80141080 46222083 */ div.d $f2, $f4, $f2 /* D7784 80141084 46201082 */ mul.d $f2, $f2, $f0 -/* D7788 80141088 00000000 */ nop +/* D7788 80141088 00000000 */ nop /* D778C 8014108C 8FA80024 */ lw $t0, 0x24($sp) /* D7790 80141090 C7A00028 */ lwc1 $f0, 0x28($sp) /* D7794 80141094 46800021 */ cvt.d.w $f0, $f0 @@ -1754,8 +1754,8 @@ glabel func_8013F704 /* D77A8 801410A8 0804FF08 */ j .L8013FC20 /* D77AC 801410AC E7A60028 */ swc1 $f6, 0x28($sp) .L801410B0: -/* D77B0 801410B0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* D77B4 801410B4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* D77B0 801410B0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* D77B4 801410B4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* D77B8 801410B8 8C620000 */ lw $v0, ($v1) /* D77BC 801410BC 0040202D */ daddu $a0, $v0, $zero /* D77C0 801410C0 24420008 */ addiu $v0, $v0, 8 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s index c7e06dd7df..794810ab39 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s @@ -27,8 +27,8 @@ glabel func_80142210 /* D8964 80142264 3C075021 */ lui $a3, 0x5021 /* D8968 80142268 34E70080 */ ori $a3, $a3, 0x80 /* D896C 8014226C 27A60028 */ addiu $a2, $sp, 0x28 -/* D8970 80142270 3C03800A */ lui $v1, %hi(D_8009A66C) -/* D8974 80142274 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* D8970 80142270 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* D8974 80142274 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* D8978 80142278 8C620000 */ lw $v0, ($v1) /* D897C 8014227C 3C058015 */ lui $a1, %hi(D_80157960) /* D8980 80142280 8CA57960 */ lw $a1, %lo(D_80157960)($a1) @@ -123,14 +123,14 @@ glabel func_80142210 /* D8AC4 801423C4 8C500000 */ lw $s0, ($v0) /* D8AC8 801423C8 8E020004 */ lw $v0, 4($s0) /* D8ACC 801423CC 104000C7 */ beqz $v0, .L801426EC -/* D8AD0 801423D0 00000000 */ nop +/* D8AD0 801423D0 00000000 */ nop /* D8AD4 801423D4 8E030000 */ lw $v1, ($s0) /* D8AD8 801423D8 30620100 */ andi $v0, $v1, 0x100 /* D8ADC 801423DC 1440005B */ bnez $v0, .L8014254C /* D8AE0 801423E0 3C0E0010 */ lui $t6, 0x10 /* D8AE4 801423E4 006E1024 */ and $v0, $v1, $t6 /* D8AE8 801423E8 1440000B */ bnez $v0, .L80142418 -/* D8AEC 801423EC 00000000 */ nop +/* D8AEC 801423EC 00000000 */ nop /* D8AF0 801423F0 82030046 */ lb $v1, 0x46($s0) /* D8AF4 801423F4 3C0E8015 */ lui $t6, %hi(D_8014EFCC) /* D8AF8 801423F8 25CEEFCC */ addiu $t6, $t6, %lo(D_8014EFCC) @@ -151,7 +151,7 @@ glabel func_80142210 /* D8B2C 8014242C 3C0E0010 */ lui $t6, 0x10 /* D8B30 80142430 006E1024 */ and $v0, $v1, $t6 /* D8B34 80142434 1440000C */ bnez $v0, .L80142468 -/* D8B38 80142438 00000000 */ nop +/* D8B38 80142438 00000000 */ nop /* D8B3C 8014243C 82030045 */ lb $v1, 0x45($s0) /* D8B40 80142440 3C0E8015 */ lui $t6, %hi(D_8014EFCC) /* D8B44 80142444 25CEEFCC */ addiu $t6, $t6, %lo(D_8014EFCC) @@ -228,7 +228,7 @@ glabel func_80142210 .L8014254C: /* D8C4C 8014254C 006E1024 */ and $v0, $v1, $t6 /* D8C50 80142550 1440000B */ bnez $v0, .L80142580 -/* D8C54 80142554 00000000 */ nop +/* D8C54 80142554 00000000 */ nop /* D8C58 80142558 82030046 */ lb $v1, 0x46($s0) /* D8C5C 8014255C 3C0E8015 */ lui $t6, %hi(D_8014EFCC) /* D8C60 80142560 25CEEFCC */ addiu $t6, $t6, %lo(D_8014EFCC) @@ -249,7 +249,7 @@ glabel func_80142210 /* D8C94 80142594 44811000 */ mtc1 $at, $f2 /* D8C98 80142598 46000307 */ neg.s $f12, $f0 /* D8C9C 8014259C 46026302 */ mul.s $f12, $f12, $f2 -/* D8CA0 801425A0 00000000 */ nop +/* D8CA0 801425A0 00000000 */ nop /* D8CA4 801425A4 3C013F80 */ lui $at, 0x3f80 /* D8CA8 801425A8 44814000 */ mtc1 $at, $f8 /* D8CAC 801425AC 3C014480 */ lui $at, 0x4480 @@ -260,27 +260,27 @@ glabel func_80142210 /* D8CC0 801425C0 44127000 */ mfc1 $s2, $f14 /* D8CC4 801425C4 46003187 */ neg.s $f6, $f6 /* D8CC8 801425C8 46023182 */ mul.s $f6, $f6, $f2 -/* D8CCC 801425CC 00000000 */ nop +/* D8CCC 801425CC 00000000 */ nop /* D8CD0 801425D0 44912000 */ mtc1 $s1, $f4 -/* D8CD4 801425D4 00000000 */ nop +/* D8CD4 801425D4 00000000 */ nop /* D8CD8 801425D8 46802120 */ cvt.s.w $f4, $f4 /* D8CDC 801425DC 44960000 */ mtc1 $s6, $f0 -/* D8CE0 801425E0 00000000 */ nop +/* D8CE0 801425E0 00000000 */ nop /* D8CE4 801425E4 46800020 */ cvt.s.w $f0, $f0 /* D8CE8 801425E8 46002103 */ div.s $f4, $f4, $f0 /* D8CEC 801425EC 46044103 */ div.s $f4, $f8, $f4 /* D8CF0 801425F0 460A2102 */ mul.s $f4, $f4, $f10 -/* D8CF4 801425F4 00000000 */ nop +/* D8CF4 801425F4 00000000 */ nop /* D8CF8 801425F8 44921000 */ mtc1 $s2, $f2 -/* D8CFC 801425FC 00000000 */ nop +/* D8CFC 801425FC 00000000 */ nop /* D8D00 80142600 468010A0 */ cvt.s.w $f2, $f2 /* D8D04 80142604 44950000 */ mtc1 $s5, $f0 -/* D8D08 80142608 00000000 */ nop +/* D8D08 80142608 00000000 */ nop /* D8D0C 8014260C 46800020 */ cvt.s.w $f0, $f0 /* D8D10 80142610 46001083 */ div.s $f2, $f2, $f0 /* D8D14 80142614 46024083 */ div.s $f2, $f8, $f2 /* D8D18 80142618 460A1082 */ mul.s $f2, $f2, $f10 -/* D8D1C 8014261C 00000000 */ nop +/* D8D1C 8014261C 00000000 */ nop /* D8D20 80142620 8E020000 */ lw $v0, ($s0) /* D8D24 80142624 4600638D */ trunc.w.s $f14, $f12 /* D8D28 80142628 44137000 */ mfc1 $s3, $f14 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s index f1dacbccd8..ac72f3cb31 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s @@ -10,8 +10,8 @@ glabel func_8014271C /* D8E30 80142730 3C071021 */ lui $a3, 0x1021 /* D8E34 80142734 34E70080 */ ori $a3, $a3, 0x80 /* D8E38 80142738 27A60028 */ addiu $a2, $sp, 0x28 -/* D8E3C 8014273C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* D8E40 80142740 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* D8E3C 8014273C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* D8E40 80142740 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* D8E44 80142744 AFBF054C */ sw $ra, 0x54c($sp) /* D8E48 80142748 AFB60540 */ sw $s6, 0x540($sp) /* D8E4C 8014274C AFB5053C */ sw $s5, 0x53c($sp) @@ -118,7 +118,7 @@ glabel func_8014271C /* D8FC0 801428C0 3C0E0010 */ lui $t6, 0x10 /* D8FC4 801428C4 006E1024 */ and $v0, $v1, $t6 /* D8FC8 801428C8 1440000B */ bnez $v0, .L801428F8 -/* D8FCC 801428CC 00000000 */ nop +/* D8FCC 801428CC 00000000 */ nop /* D8FD0 801428D0 82030046 */ lb $v1, 0x46($s0) /* D8FD4 801428D4 3C0E8015 */ lui $t6, %hi(D_8014EFCC) /* D8FD8 801428D8 25CEEFCC */ addiu $t6, $t6, %lo(D_8014EFCC) @@ -139,7 +139,7 @@ glabel func_8014271C /* D900C 8014290C 3C0E0010 */ lui $t6, 0x10 /* D9010 80142910 006E1024 */ and $v0, $v1, $t6 /* D9014 80142914 1440000C */ bnez $v0, .L80142948 -/* D9018 80142918 00000000 */ nop +/* D9018 80142918 00000000 */ nop /* D901C 8014291C 82030045 */ lb $v1, 0x45($s0) /* D9020 80142920 3C0E8015 */ lui $t6, %hi(D_8014EFCC) /* D9024 80142924 25CEEFCC */ addiu $t6, $t6, %lo(D_8014EFCC) @@ -216,7 +216,7 @@ glabel func_8014271C .L80142A2C: /* D912C 80142A2C 006E1024 */ and $v0, $v1, $t6 /* D9130 80142A30 1440000B */ bnez $v0, .L80142A60 -/* D9134 80142A34 00000000 */ nop +/* D9134 80142A34 00000000 */ nop /* D9138 80142A38 82030045 */ lb $v1, 0x45($s0) /* D913C 80142A3C 3C0E8015 */ lui $t6, %hi(D_8014EFCC) /* D9140 80142A40 25CEEFCC */ addiu $t6, $t6, %lo(D_8014EFCC) @@ -237,7 +237,7 @@ glabel func_8014271C /* D9174 80142A74 44811000 */ mtc1 $at, $f2 /* D9178 80142A78 46000307 */ neg.s $f12, $f0 /* D917C 80142A7C 46026302 */ mul.s $f12, $f12, $f2 -/* D9180 80142A80 00000000 */ nop +/* D9180 80142A80 00000000 */ nop /* D9184 80142A84 3C013F80 */ lui $at, 0x3f80 /* D9188 80142A88 44814000 */ mtc1 $at, $f8 /* D918C 80142A8C 3C014480 */ lui $at, 0x4480 @@ -248,27 +248,27 @@ glabel func_8014271C /* D91A0 80142AA0 44127000 */ mfc1 $s2, $f14 /* D91A4 80142AA4 46003187 */ neg.s $f6, $f6 /* D91A8 80142AA8 46023182 */ mul.s $f6, $f6, $f2 -/* D91AC 80142AAC 00000000 */ nop +/* D91AC 80142AAC 00000000 */ nop /* D91B0 80142AB0 44912000 */ mtc1 $s1, $f4 -/* D91B4 80142AB4 00000000 */ nop +/* D91B4 80142AB4 00000000 */ nop /* D91B8 80142AB8 46802120 */ cvt.s.w $f4, $f4 /* D91BC 80142ABC 44960000 */ mtc1 $s6, $f0 -/* D91C0 80142AC0 00000000 */ nop +/* D91C0 80142AC0 00000000 */ nop /* D91C4 80142AC4 46800020 */ cvt.s.w $f0, $f0 /* D91C8 80142AC8 46002103 */ div.s $f4, $f4, $f0 /* D91CC 80142ACC 46044103 */ div.s $f4, $f8, $f4 /* D91D0 80142AD0 460A2102 */ mul.s $f4, $f4, $f10 -/* D91D4 80142AD4 00000000 */ nop +/* D91D4 80142AD4 00000000 */ nop /* D91D8 80142AD8 44921000 */ mtc1 $s2, $f2 -/* D91DC 80142ADC 00000000 */ nop +/* D91DC 80142ADC 00000000 */ nop /* D91E0 80142AE0 468010A0 */ cvt.s.w $f2, $f2 /* D91E4 80142AE4 44950000 */ mtc1 $s5, $f0 -/* D91E8 80142AE8 00000000 */ nop +/* D91E8 80142AE8 00000000 */ nop /* D91EC 80142AEC 46800020 */ cvt.s.w $f0, $f0 /* D91F0 80142AF0 46001083 */ div.s $f2, $f2, $f0 /* D91F4 80142AF4 46024083 */ div.s $f2, $f8, $f2 /* D91F8 80142AF8 460A1082 */ mul.s $f2, $f2, $f10 -/* D91FC 80142AFC 00000000 */ nop +/* D91FC 80142AFC 00000000 */ nop /* D9200 80142B00 8E020000 */ lw $v0, ($s0) /* D9204 80142B04 4600638D */ trunc.w.s $f14, $f12 /* D9208 80142B08 44137000 */ mfc1 $s3, $f14 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s index 9e3c70135a..b07ffa7e2e 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s @@ -60,8 +60,8 @@ glabel func_80143C48 /* DA424 80143D24 36940A01 */ ori $s4, $s4, 0xa01 /* DA428 80143D28 3C15FF10 */ lui $s5, 0xff10 /* DA42C 80143D2C 36B5013F */ ori $s5, $s5, 0x13f -/* DA430 80143D30 3C12800A */ lui $s2, %hi(D_8009A66C) -/* DA434 80143D34 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* DA430 80143D30 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* DA434 80143D34 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* DA438 80143D38 8E500000 */ lw $s0, ($s2) /* DA43C 80143D3C 3C13E700 */ lui $s3, 0xe700 /* DA440 80143D40 3C01800A */ lui $at, %hi(D_8009A634) @@ -206,8 +206,8 @@ glabel func_80143C48 /* DA66C 80143F6C 0C018E44 */ jal guOrthoF /* DA670 80143F70 E7A00014 */ swc1 $f0, 0x14($sp) /* DA674 80143F74 0200202D */ daddu $a0, $s0, $zero -/* DA678 80143F78 3C10800A */ lui $s0, %hi(D_8009A674) -/* DA67C 80143F7C 2610A674 */ addiu $s0, $s0, %lo(D_8009A674) +/* DA678 80143F78 3C10800A */ lui $s0, %hi(gDisplayContext) +/* DA67C 80143F7C 2610A674 */ addiu $s0, $s0, %lo(gDisplayContext) /* DA680 80143F80 3C05800A */ lui $a1, %hi(D_8009A634) /* DA684 80143F84 84A5A634 */ lh $a1, %lo(D_8009A634)($a1) /* DA688 80143F88 8E020000 */ lw $v0, ($s0) @@ -342,7 +342,7 @@ glabel func_80143C48 /* DA888 80144188 00431021 */ addu $v0, $v0, $v1 /* DA88C 8014418C 8C440000 */ lw $a0, ($v0) /* DA890 80144190 10800015 */ beqz $a0, .L801441E8 -/* DA894 80144194 00000000 */ nop +/* DA894 80144194 00000000 */ nop /* DA898 80144198 8C830000 */ lw $v1, ($a0) /* DA89C 8014419C 10600012 */ beqz $v1, .L801441E8 /* DA8A0 801441A0 30620002 */ andi $v0, $v1, 2 @@ -355,14 +355,14 @@ glabel func_80143C48 /* DA8BC 801441BC 1040000A */ beqz $v0, .L801441E8 /* DA8C0 801441C0 30620040 */ andi $v0, $v1, 0x40 /* DA8C4 801441C4 14400008 */ bnez $v0, .L801441E8 -/* DA8C8 801441C8 00000000 */ nop +/* DA8C8 801441C8 00000000 */ nop /* DA8CC 801441CC 80820045 */ lb $v0, 0x45($a0) /* DA8D0 801441D0 04400005 */ bltz $v0, .L801441E8 /* DA8D4 801441D4 30620080 */ andi $v0, $v1, 0x80 /* DA8D8 801441D8 10400003 */ beqz $v0, .L801441E8 -/* DA8DC 801441DC 00000000 */ nop +/* DA8DC 801441DC 00000000 */ nop /* DA8E0 801441E0 0C050AFF */ jal render_menu_icon -/* DA8E4 801441E4 00000000 */ nop +/* DA8E4 801441E4 00000000 */ nop .L801441E8: /* DA8E8 801441E8 8FBF0044 */ lw $ra, 0x44($sp) /* DA8EC 801441EC 8FBE0040 */ lw $fp, 0x40($sp) diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icon.s b/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icon.s index 8ec78e8ad5..70c351169d 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icon.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icon.s @@ -21,8 +21,8 @@ glabel render_menu_icon /* D933C 80142C3C 30428000 */ andi $v0, $v0, 0x8000 /* D9340 80142C40 1040000C */ beqz $v0, .L80142C74 /* D9344 80142C44 3C05E300 */ lui $a1, 0xe300 -/* D9348 80142C48 3C03800A */ lui $v1, %hi(D_8009A66C) -/* D934C 80142C4C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* D9348 80142C48 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* D934C 80142C4C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* D9350 80142C50 8C620000 */ lw $v0, ($v1) /* D9354 80142C54 34A51201 */ ori $a1, $a1, 0x1201 /* D9358 80142C58 0040202D */ daddu $a0, $v0, $zero @@ -33,8 +33,8 @@ glabel render_menu_icon /* D936C 80142C6C 08050B26 */ j .L80142C98 /* D9370 80142C70 AC820004 */ sw $v0, 4($a0) .L80142C74: -/* D9374 80142C74 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D9378 80142C78 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D9374 80142C74 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D9378 80142C78 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D937C 80142C7C 8C820000 */ lw $v0, ($a0) /* D9380 80142C80 34A51201 */ ori $a1, $a1, 0x1201 /* D9384 80142C84 0040182D */ daddu $v1, $v0, $zero @@ -54,7 +54,7 @@ glabel render_menu_icon .L80142CB8: /* D93B8 80142CB8 00621024 */ and $v0, $v1, $v0 /* D93BC 80142CBC 14400011 */ bnez $v0, .L80142D04 -/* D93C0 80142CC0 00000000 */ nop +/* D93C0 80142CC0 00000000 */ nop /* D93C4 80142CC4 82E30046 */ lb $v1, 0x46($s7) /* D93C8 80142CC8 3C048015 */ lui $a0, %hi(D_8014EFCC) /* D93CC 80142CCC 2484EFCC */ addiu $a0, $a0, %lo(D_8014EFCC) @@ -65,20 +65,20 @@ glabel render_menu_icon /* D93E0 80142CE0 84430000 */ lh $v1, ($v0) /* D93E4 80142CE4 84420002 */ lh $v0, 2($v0) /* D93E8 80142CE8 4483C000 */ mtc1 $v1, $f24 -/* D93EC 80142CEC 00000000 */ nop +/* D93EC 80142CEC 00000000 */ nop /* D93F0 80142CF0 4680C620 */ cvt.s.w $f24, $f24 /* D93F4 80142CF4 4482A000 */ mtc1 $v0, $f20 -/* D93F8 80142CF8 00000000 */ nop +/* D93F8 80142CF8 00000000 */ nop /* D93FC 80142CFC 08050B49 */ j .L80142D24 /* D9400 80142D00 4680A520 */ cvt.s.w $f20, $f20 .L80142D04: /* D9404 80142D04 92E2004E */ lbu $v0, 0x4e($s7) /* D9408 80142D08 92E3004F */ lbu $v1, 0x4f($s7) /* D940C 80142D0C 4482C000 */ mtc1 $v0, $f24 -/* D9410 80142D10 00000000 */ nop +/* D9410 80142D10 00000000 */ nop /* D9414 80142D14 4680C620 */ cvt.s.w $f24, $f24 /* D9418 80142D18 4483A000 */ mtc1 $v1, $f20 -/* D941C 80142D1C 00000000 */ nop +/* D941C 80142D1C 00000000 */ nop /* D9420 80142D20 4680A520 */ cvt.s.w $f20, $f20 .L80142D24: /* D9424 80142D24 C6E00028 */ lwc1 $f0, 0x28($s7) @@ -94,7 +94,7 @@ glabel render_menu_icon /* D9448 80142D48 3C030010 */ lui $v1, 0x10 /* D944C 80142D4C 00431024 */ and $v0, $v0, $v1 /* D9450 80142D50 1440000C */ bnez $v0, .L80142D84 -/* D9454 80142D54 00000000 */ nop +/* D9454 80142D54 00000000 */ nop /* D9458 80142D58 82E20046 */ lb $v0, 0x46($s7) /* D945C 80142D5C 3C048015 */ lui $a0, %hi(D_8014EFCC) /* D9460 80142D60 2484EFCC */ addiu $a0, $a0, %lo(D_8014EFCC) @@ -119,12 +119,12 @@ glabel render_menu_icon /* D94A4 80142DA4 87C30028 */ lh $v1, 0x28($fp) /* D94A8 80142DA8 87C2002A */ lh $v0, 0x2a($fp) /* D94AC 80142DAC 44833000 */ mtc1 $v1, $f6 -/* D94B0 80142DB0 00000000 */ nop +/* D94B0 80142DB0 00000000 */ nop /* D94B4 80142DB4 468031A0 */ cvt.s.w $f6, $f6 /* D94B8 80142DB8 00021023 */ negu $v0, $v0 /* D94BC 80142DBC 44053000 */ mfc1 $a1, $f6 /* D94C0 80142DC0 44823000 */ mtc1 $v0, $f6 -/* D94C4 80142DC4 00000000 */ nop +/* D94C4 80142DC4 00000000 */ nop /* D94C8 80142DC8 468031A0 */ cvt.s.w $f6, $f6 /* D94CC 80142DCC 44063000 */ mfc1 $a2, $f6 /* D94D0 80142DD0 0C019E40 */ jal guTranslateF @@ -136,11 +136,11 @@ glabel render_menu_icon /* D94E8 80142DE8 87C3002A */ lh $v1, 0x2a($fp) /* D94EC 80142DEC 00021023 */ negu $v0, $v0 /* D94F0 80142DF0 44823000 */ mtc1 $v0, $f6 -/* D94F4 80142DF4 00000000 */ nop +/* D94F4 80142DF4 00000000 */ nop /* D94F8 80142DF8 468031A0 */ cvt.s.w $f6, $f6 /* D94FC 80142DFC 44053000 */ mfc1 $a1, $f6 /* D9500 80142E00 44833000 */ mtc1 $v1, $f6 -/* D9504 80142E04 00000000 */ nop +/* D9504 80142E04 00000000 */ nop /* D9508 80142E08 468031A0 */ cvt.s.w $f6, $f6 /* D950C 80142E0C 44063000 */ mfc1 $a2, $f6 /* D9510 80142E10 0C019E40 */ jal guTranslateF @@ -155,7 +155,7 @@ glabel render_menu_icon /* D9534 80142E34 00431021 */ addu $v0, $v0, $v1 /* D9538 80142E38 00441021 */ addu $v0, $v0, $a0 /* D953C 80142E3C 44821000 */ mtc1 $v0, $f2 -/* D9540 80142E40 00000000 */ nop +/* D9540 80142E40 00000000 */ nop /* D9544 80142E44 468010A0 */ cvt.s.w $f2, $f2 /* D9548 80142E48 46001080 */ add.s $f2, $f2, $f0 /* D954C 80142E4C 86E2003E */ lh $v0, 0x3e($s7) @@ -167,12 +167,12 @@ glabel render_menu_icon /* D9564 80142E64 00441021 */ addu $v0, $v0, $a0 /* D9568 80142E68 44051000 */ mfc1 $a1, $f2 /* D956C 80142E6C 44821000 */ mtc1 $v0, $f2 -/* D9570 80142E70 00000000 */ nop +/* D9570 80142E70 00000000 */ nop /* D9574 80142E74 468010A0 */ cvt.s.w $f2, $f2 /* D9578 80142E78 82E20044 */ lb $v0, 0x44($s7) /* D957C 80142E7C 46001080 */ add.s $f2, $f2, $f0 /* D9580 80142E80 44820000 */ mtc1 $v0, $f0 -/* D9584 80142E84 00000000 */ nop +/* D9584 80142E84 00000000 */ nop /* D9588 80142E88 46800021 */ cvt.d.w $f0, $f0 /* D958C 80142E8C 46240003 */ div.d $f0, $f0, $f4 /* D9590 80142E90 44061000 */ mfc1 $a2, $f2 @@ -187,16 +187,16 @@ glabel render_menu_icon /* D95B4 80142EB4 0280202D */ daddu $a0, $s4, $zero /* D95B8 80142EB8 C6E20030 */ lwc1 $f2, 0x30($s7) /* D95BC 80142EBC 46181102 */ mul.s $f4, $f2, $f24 -/* D95C0 80142EC0 00000000 */ nop +/* D95C0 80142EC0 00000000 */ nop /* D95C4 80142EC4 46141082 */ mul.s $f2, $f2, $f20 -/* D95C8 80142EC8 00000000 */ nop +/* D95C8 80142EC8 00000000 */ nop /* D95CC 80142ECC C7C0001C */ lwc1 $f0, 0x1c($fp) /* D95D0 80142ED0 46002102 */ mul.s $f4, $f4, $f0 -/* D95D4 80142ED4 00000000 */ nop +/* D95D4 80142ED4 00000000 */ nop /* D95D8 80142ED8 C7C00020 */ lwc1 $f0, 0x20($fp) /* D95DC 80142EDC 3C150001 */ lui $s5, 1 /* D95E0 80142EE0 46001082 */ mul.s $f2, $f2, $f0 -/* D95E4 80142EE4 00000000 */ nop +/* D95E4 80142EE4 00000000 */ nop /* D95E8 80142EE8 36B51630 */ ori $s5, $s5, 0x1630 /* D95EC 80142EEC 27B30260 */ addiu $s3, $sp, 0x260 /* D95F0 80142EF0 8FC70024 */ lw $a3, 0x24($fp) @@ -254,10 +254,10 @@ glabel render_menu_icon /* D96C0 80142FC0 0C019D80 */ jal guMtxCatF /* D96C4 80142FC4 0200302D */ daddu $a2, $s0, $zero /* D96C8 80142FC8 0200202D */ daddu $a0, $s0, $zero -/* D96CC 80142FCC 3C108007 */ lui $s0, %hi(D_800741F0) -/* D96D0 80142FD0 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* D96D4 80142FD4 3C11800A */ lui $s1, %hi(D_8009A674) -/* D96D8 80142FD8 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* D96CC 80142FCC 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* D96D0 80142FD0 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* D96D4 80142FD4 3C11800A */ lui $s1, %hi(gDisplayContext) +/* D96D8 80142FD8 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* D96DC 80142FDC 96050000 */ lhu $a1, ($s0) /* D96E0 80142FE0 8E220000 */ lw $v0, ($s1) /* D96E4 80142FE4 00052980 */ sll $a1, $a1, 6 @@ -266,8 +266,8 @@ glabel render_menu_icon /* D96F0 80142FF0 00452821 */ addu $a1, $v0, $a1 /* D96F4 80142FF4 3C06DA38 */ lui $a2, 0xda38 /* D96F8 80142FF8 34C60002 */ ori $a2, $a2, 2 -/* D96FC 80142FFC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* D9700 80143000 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* D96FC 80142FFC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* D9700 80143000 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* D9704 80143004 0000382D */ daddu $a3, $zero, $zero /* D9708 80143008 8C620000 */ lw $v0, ($v1) /* D970C 8014300C 96040000 */ lhu $a0, ($s0) @@ -313,7 +313,7 @@ glabel render_menu_icon /* D979C 8014309C 10E20052 */ beq $a3, $v0, .L801431E8 /* D97A0 801430A0 3C03D838 */ lui $v1, 0xd838 /* D97A4 801430A4 08050D8F */ j .L8014363C -/* D97A8 801430A8 00000000 */ nop +/* D97A8 801430A8 00000000 */ nop .L801430AC: /* D97AC 801430AC 8EE30000 */ lw $v1, ($s7) /* D97B0 801430B0 3C020002 */ lui $v0, 2 @@ -361,7 +361,7 @@ glabel render_menu_icon /* D984C 8014314C 00A0382D */ daddu $a3, $a1, $zero .L80143150: /* D9850 80143150 0C04EAA7 */ jal func_8013AA9C -/* D9854 80143154 00000000 */ nop +/* D9854 80143154 00000000 */ nop /* D9858 80143158 8EE20010 */ lw $v0, 0x10($s7) /* D985C 8014315C 8FAE02B8 */ lw $t6, 0x2b8($sp) /* D9860 80143160 AFA202A0 */ sw $v0, 0x2a0($sp) @@ -408,8 +408,8 @@ glabel render_menu_icon /* D98F4 801431F4 3529FFFF */ ori $t1, $t1, 0xffff /* D98F8 801431F8 3C078016 */ lui $a3, %hi(D_80159180) /* D98FC 801431FC 24E79180 */ addiu $a3, $a3, %lo(D_80159180) -/* D9900 80143200 3C0C800A */ lui $t4, %hi(D_8009A66C) -/* D9904 80143204 258CA66C */ addiu $t4, $t4, %lo(D_8009A66C) +/* D9900 80143200 3C0C800A */ lui $t4, %hi(gMasterGfxPos) +/* D9904 80143204 258CA66C */ addiu $t4, $t4, %lo(gMasterGfxPos) /* D9908 80143208 3C068015 */ lui $a2, %hi(D_8014F0C8) /* D990C 8014320C 24C6F0C8 */ addiu $a2, $a2, %lo(D_8014F0C8) /* D9910 80143210 8CE50000 */ lw $a1, ($a3) @@ -560,8 +560,8 @@ glabel render_menu_icon /* D9B44 80143444 AD820000 */ sw $v0, ($t4) /* D9B48 80143448 AD640010 */ sw $a0, 0x10($t3) /* D9B4C 8014344C AD630014 */ sw $v1, 0x14($t3) -/* D9B50 80143450 3C03800A */ lui $v1, %hi(D_8009A66C) -/* D9B54 80143454 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* D9B50 80143450 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* D9B54 80143454 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* D9B58 80143458 02C0382D */ daddu $a3, $s6, $zero /* D9B5C 8014345C 3C02FD70 */ lui $v0, 0xfd70 /* D9B60 80143460 8C660000 */ lw $a2, ($v1) @@ -616,7 +616,7 @@ glabel render_menu_icon /* D9C14 80143514 14A10004 */ bne $a1, $at, .L80143528 /* D9C18 80143518 3C018000 */ lui $at, 0x8000 /* D9C1C 8014351C 14610002 */ bne $v1, $at, .L80143528 -/* D9C20 80143520 00000000 */ nop +/* D9C20 80143520 00000000 */ nop /* D9C24 80143524 0006000D */ break 6 .L80143528: /* D9C28 80143528 00001012 */ mflo $v0 @@ -634,8 +634,8 @@ glabel render_menu_icon /* D9C50 80143550 3C080500 */ lui $t0, 0x500 /* D9C54 80143554 35080204 */ ori $t0, $t0, 0x204 /* D9C58 80143558 3C090500 */ lui $t1, 0x500 -/* D9C5C 8014355C 3C05800A */ lui $a1, %hi(D_8009A66C) -/* D9C60 80143560 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* D9C5C 8014355C 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* D9C60 80143560 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* D9C64 80143564 35290406 */ ori $t1, $t1, 0x406 /* D9C68 80143568 8CA40000 */ lw $a0, ($a1) /* D9C6C 8014356C 3C02E700 */ lui $v0, 0xe700 @@ -691,8 +691,8 @@ glabel render_menu_icon /* D9D34 80143634 AC80002C */ sw $zero, 0x2c($a0) /* D9D38 80143638 3C03D838 */ lui $v1, 0xd838 .L8014363C: -/* D9D3C 8014363C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* D9D40 80143640 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* D9D3C 8014363C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* D9D40 80143640 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D9D44 80143644 8C820000 */ lw $v0, ($a0) /* D9D48 80143648 34630002 */ ori $v1, $v1, 2 /* D9D4C 8014364C 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icons.s b/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icons.s index f3e4158a8b..2028e6c2ba 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icons.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icons.s @@ -121,8 +121,8 @@ glabel render_menu_icons /* D9F68 80143868 35EF0A11 */ ori $t7, $t7, 0xa11 /* D9F6C 8014386C 3C0E0008 */ lui $t6, 8 /* D9F70 80143870 35CE2CF0 */ ori $t6, $t6, 0x2cf0 -/* D9F74 80143874 3C05800A */ lui $a1, %hi(D_8009A66C) -/* D9F78 80143878 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* D9F74 80143874 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* D9F78 80143878 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* D9F7C 8014387C 8CA20000 */ lw $v0, ($a1) /* D9F80 80143880 0000882D */ daddu $s1, $zero, $zero /* D9F84 80143884 0040182D */ daddu $v1, $v0, $zero @@ -187,7 +187,7 @@ glabel render_menu_icons /* DA06C 8014396C 26310001 */ addiu $s1, $s1, 1 /* DA070 80143970 0232102A */ slt $v0, $s1, $s2 /* DA074 80143974 1440FFF5 */ bnez $v0, .L8014394C -/* DA078 80143978 00000000 */ nop +/* DA078 80143978 00000000 */ nop .L8014397C: /* DA07C 8014397C 3C03800A */ lui $v1, %hi(D_8009A634) /* DA080 80143980 8463A634 */ lh $v1, %lo(D_8009A634)($v1) @@ -304,8 +304,8 @@ glabel render_menu_icons /* DA21C 80143B1C 35EF0A11 */ ori $t7, $t7, 0xa11 /* DA220 80143B20 3C0E0008 */ lui $t6, 8 /* DA224 80143B24 35CE2CF0 */ ori $t6, $t6, 0x2cf0 -/* DA228 80143B28 3C05800A */ lui $a1, %hi(D_8009A66C) -/* DA22C 80143B2C 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* DA228 80143B28 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* DA22C 80143B2C 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* DA230 80143B30 8CA20000 */ lw $v0, ($a1) /* DA234 80143B34 0000882D */ daddu $s1, $zero, $zero /* DA238 80143B38 0040182D */ daddu $v1, $v0, $zero @@ -370,7 +370,7 @@ glabel render_menu_icons /* DA320 80143C20 26310001 */ addiu $s1, $s1, 1 /* DA324 80143C24 0232102A */ slt $v0, $s1, $s2 /* DA328 80143C28 1440FFF5 */ bnez $v0, .L80143C00 -/* DA32C 80143C2C 00000000 */ nop +/* DA32C 80143C2C 00000000 */ nop .L80143C30: /* DA330 80143C30 8FBF051C */ lw $ra, 0x51c($sp) /* DA334 80143C34 8FB20518 */ lw $s2, 0x518($sp) diff --git a/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s b/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s index 4ea7b7199f..cf06e2a2c5 100644 --- a/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s +++ b/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s @@ -97,7 +97,7 @@ glabel func_80145EC0 /* DC720 80146020 00220821 */ addu $at, $at, $v0 /* DC724 80146024 8C221220 */ lw $v0, %lo(D_80151220)($at) /* DC728 80146028 00400008 */ jr $v0 -/* DC72C 8014602C 00000000 */ nop +/* DC72C 8014602C 00000000 */ nop /* DC730 80146030 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* DC734 80146034 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* DC738 80146038 94620148 */ lhu $v0, 0x148($v1) @@ -124,7 +124,7 @@ glabel func_80145EC0 /* DC78C 8014608C 00470018 */ mult $v0, $a3 /* DC790 80146090 00001812 */ mflo $v1 /* DC794 80146094 93A20028 */ lbu $v0, 0x28($sp) -/* DC798 80146098 00000000 */ nop +/* DC798 80146098 00000000 */ nop /* DC79C 8014609C 00480018 */ mult $v0, $t0 /* DC7A0 801460A0 3C098080 */ lui $t1, 0x8080 /* DC7A4 801460A4 00005012 */ mflo $t2 @@ -133,23 +133,23 @@ glabel func_80145EC0 /* DC7B0 801460B0 00C90018 */ mult $a2, $t1 /* DC7B4 801460B4 00005810 */ mfhi $t3 /* DC7B8 801460B8 8FA2001C */ lw $v0, 0x1c($sp) -/* DC7BC 801460BC 00000000 */ nop +/* DC7BC 801460BC 00000000 */ nop /* DC7C0 801460C0 00470018 */ mult $v0, $a3 /* DC7C4 801460C4 00002012 */ mflo $a0 /* DC7C8 801460C8 93A20029 */ lbu $v0, 0x29($sp) -/* DC7CC 801460CC 00000000 */ nop +/* DC7CC 801460CC 00000000 */ nop /* DC7D0 801460D0 00480018 */ mult $v0, $t0 /* DC7D4 801460D4 00006012 */ mflo $t4 /* DC7D8 801460D8 8FA20020 */ lw $v0, 0x20($sp) -/* DC7DC 801460DC 00000000 */ nop +/* DC7DC 801460DC 00000000 */ nop /* DC7E0 801460E0 00470018 */ mult $v0, $a3 /* DC7E4 801460E4 00005012 */ mflo $t2 /* DC7E8 801460E8 93A2002A */ lbu $v0, 0x2a($sp) -/* DC7EC 801460EC 00000000 */ nop +/* DC7EC 801460EC 00000000 */ nop /* DC7F0 801460F0 00480018 */ mult $v0, $t0 /* DC7F4 801460F4 00002812 */ mflo $a1 /* DC7F8 801460F8 008C2021 */ addu $a0, $a0, $t4 -/* DC7FC 801460FC 00000000 */ nop +/* DC7FC 801460FC 00000000 */ nop /* DC800 80146100 00890018 */ mult $a0, $t1 /* DC804 80146104 00006010 */ mfhi $t4 /* DC808 80146108 3C038007 */ lui $v1, %hi(gGameStatusPtr) @@ -161,7 +161,7 @@ glabel func_80145EC0 /* DC820 80146120 A4620148 */ sh $v0, 0x148($v1) /* DC824 80146124 00005010 */ mfhi $t2 /* DC828 80146128 8FA30024 */ lw $v1, 0x24($sp) -/* DC82C 8014612C 00000000 */ nop +/* DC82C 8014612C 00000000 */ nop /* DC830 80146130 00670018 */ mult $v1, $a3 /* DC834 80146134 01661021 */ addu $v0, $t3, $a2 /* DC838 80146138 000211C3 */ sra $v0, $v0, 7 @@ -202,7 +202,7 @@ glabel func_80145EC0 /* DC8BC 801461BC 94420148 */ lhu $v0, 0x148($v0) /* DC8C0 801461C0 30420002 */ andi $v0, $v0, 2 /* DC8C4 801461C4 10400077 */ beqz $v0, .L801463A4 -/* DC8C8 801461C8 00000000 */ nop +/* DC8C8 801461C8 00000000 */ nop /* DC8CC 801461CC 3C028015 */ lui $v0, %hi(D_801512F0) /* DC8D0 801461D0 8C4212F0 */ lw $v0, %lo(D_801512F0)($v0) /* DC8D4 801461D4 90420000 */ lbu $v0, ($v0) @@ -223,7 +223,7 @@ glabel func_80145EC0 /* DC90C 8014620C 0661FFFD */ bgez $s3, .L80146204 /* DC910 80146210 2442FFFE */ addiu $v0, $v0, -2 /* DC914 80146214 080518E9 */ j .L801463A4 -/* DC918 80146218 00000000 */ nop +/* DC918 80146218 00000000 */ nop .L8014621C: /* DC91C 8014621C 3C148016 */ lui $s4, %hi(D_801593A0) /* DC920 80146220 269493A0 */ addiu $s4, $s4, %lo(D_801593A0) @@ -265,7 +265,7 @@ glabel func_80145EC0 /* DC9AC 801462AC 1440FFDD */ bnez $v0, .L80146224 /* DC9B0 801462B0 26940002 */ addiu $s4, $s4, 2 /* DC9B4 801462B4 080518E9 */ j .L801463A4 -/* DC9B8 801462B8 00000000 */ nop +/* DC9B8 801462B8 00000000 */ nop .L801462BC: /* DC9BC 801462BC 0000982D */ daddu $s3, $zero, $zero /* DC9C0 801462C0 3C058016 */ lui $a1, %hi(D_801593A0) @@ -295,7 +295,7 @@ glabel func_80145EC0 /* DCA1C 8014631C 004A0018 */ mult $v0, $t2 /* DCA20 80146320 00006812 */ mflo $t5 /* DCA24 80146324 00031AC2 */ srl $v1, $v1, 0xb -/* DCA28 80146328 00000000 */ nop +/* DCA28 80146328 00000000 */ nop /* DCA2C 8014632C 00690018 */ mult $v1, $t1 /* DCA30 80146330 00041203 */ sra $v0, $a0, 8 /* DCA34 80146334 01029021 */ addu $s2, $t0, $v0 @@ -341,10 +341,10 @@ glabel func_80145EC0 /* DCAC4 801463C4 46000506 */ mov.s $f20, $f0 /* DCAC8 801463C8 C6A20048 */ lwc1 $f2, 0x48($s5) /* DCACC 801463CC 46020002 */ mul.s $f0, $f0, $f2 -/* DCAD0 801463D0 00000000 */ nop +/* DCAD0 801463D0 00000000 */ nop /* DCAD4 801463D4 C6A20050 */ lwc1 $f2, 0x50($s5) /* DCAD8 801463D8 4602A502 */ mul.s $f20, $f20, $f2 -/* DCADC 801463DC 00000000 */ nop +/* DCADC 801463DC 00000000 */ nop /* DCAE0 801463E0 46140001 */ sub.s $f0, $f0, $f20 /* DCAE4 801463E4 C6A2050C */ lwc1 $f2, 0x50c($s5) /* DCAE8 801463E8 46020000 */ add.s $f0, $f0, $f2 @@ -354,19 +354,19 @@ glabel func_80145EC0 /* DCAF8 801463F8 44811000 */ mtc1 $at, $f2 /* DCAFC 801463FC 46000007 */ neg.s $f0, $f0 /* DCB00 80146400 46020102 */ mul.s $f4, $f0, $f2 -/* DCB04 80146404 00000000 */ nop +/* DCB04 80146404 00000000 */ nop /* DCB08 80146408 8442014E */ lh $v0, 0x14e($v0) /* DCB0C 8014640C 44820000 */ mtc1 $v0, $f0 -/* DCB10 80146410 00000000 */ nop +/* DCB10 80146410 00000000 */ nop /* DCB14 80146414 46800020 */ cvt.s.w $f0, $f0 /* DCB18 80146418 46160002 */ mul.s $f0, $f0, $f22 -/* DCB1C 8014641C 00000000 */ nop +/* DCB1C 8014641C 00000000 */ nop /* DCB20 80146420 3C013C36 */ lui $at, 0x3c36 /* DCB24 80146424 34210B61 */ ori $at, $at, 0xb61 /* DCB28 80146428 44811000 */ mtc1 $at, $f2 -/* DCB2C 8014642C 00000000 */ nop +/* DCB2C 8014642C 00000000 */ nop /* DCB30 80146430 46020002 */ mul.s $f0, $f0, $f2 -/* DCB34 80146434 00000000 */ nop +/* DCB34 80146434 00000000 */ nop /* DCB38 80146438 3C028016 */ lui $v0, %hi(D_801595A0) /* DCB3C 8014643C 244295A0 */ addiu $v0, $v0, %lo(D_801595A0) /* DCB40 80146440 46002100 */ add.s $f4, $f4, $f0 @@ -377,28 +377,28 @@ glabel func_80145EC0 /* DCB54 80146454 44811000 */ mtc1 $at, $f2 /* DCB58 80146458 46000005 */ abs.s $f0, $f0 /* DCB5C 8014645C 4602003C */ c.lt.s $f0, $f2 -/* DCB60 80146460 00000000 */ nop +/* DCB60 80146460 00000000 */ nop /* DCB64 80146464 45020002 */ bc1fl .L80146470 /* DCB68 80146468 E4440000 */ swc1 $f4, ($v0) /* DCB6C 8014646C 46003106 */ mov.s $f4, $f6 .L80146470: /* DCB70 80146470 44801000 */ mtc1 $zero, $f2 -/* DCB74 80146474 00000000 */ nop +/* DCB74 80146474 00000000 */ nop /* DCB78 80146478 4602203C */ c.lt.s $f4, $f2 -/* DCB7C 8014647C 00000000 */ nop +/* DCB7C 8014647C 00000000 */ nop /* DCB80 80146480 4500000D */ bc1f .L801464B8 -/* DCB84 80146484 00000000 */ nop +/* DCB84 80146484 00000000 */ nop /* DCB88 80146488 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* DCB8C 8014648C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* DCB90 80146490 8442014E */ lh $v0, 0x14e($v0) /* DCB94 80146494 00021140 */ sll $v0, $v0, 5 /* DCB98 80146498 44820000 */ mtc1 $v0, $f0 -/* DCB9C 8014649C 00000000 */ nop +/* DCB9C 8014649C 00000000 */ nop /* DCBA0 801464A0 46800020 */ cvt.s.w $f0, $f0 /* DCBA4 801464A4 46002100 */ add.s $f4, $f4, $f0 .L801464A8: /* DCBA8 801464A8 4602203C */ c.lt.s $f4, $f2 -/* DCBAC 801464AC 00000000 */ nop +/* DCBAC 801464AC 00000000 */ nop /* DCBB0 801464B0 4503FFFD */ bc1tl .L801464A8 /* DCBB4 801464B4 46002100 */ add.s $f4, $f4, $f0 .L801464B8: @@ -416,7 +416,7 @@ glabel func_80145EC0 /* DCBE0 801464E0 14610004 */ bne $v1, $at, .L801464F4 /* DCBE4 801464E4 3C018000 */ lui $at, 0x8000 /* DCBE8 801464E8 14410002 */ bne $v0, $at, .L801464F4 -/* DCBEC 801464EC 00000000 */ nop +/* DCBEC 801464EC 00000000 */ nop /* DCBF0 801464F0 0006000D */ break 6 .L801464F4: /* DCBF4 801464F4 00001810 */ mfhi $v1 @@ -432,8 +432,8 @@ glabel func_80145EC0 /* DCC1C 8014651C 3C06E200 */ lui $a2, 0xe200 /* DCC20 80146520 34C6001C */ ori $a2, $a2, 0x1c /* DCC24 80146524 3C07E300 */ lui $a3, 0xe300 -/* DCC28 80146528 3C0D800A */ lui $t5, %hi(D_8009A66C) -/* DCC2C 8014652C 25ADA66C */ addiu $t5, $t5, %lo(D_8009A66C) +/* DCC28 80146528 3C0D800A */ lui $t5, %hi(gMasterGfxPos) +/* DCC2C 8014652C 25ADA66C */ addiu $t5, $t5, %lo(gMasterGfxPos) /* DCC30 80146530 34E71201 */ ori $a3, $a3, 0x1201 /* DCC34 80146534 8DAC0000 */ lw $t4, ($t5) /* DCC38 80146538 3C10E700 */ lui $s0, 0xe700 @@ -572,7 +572,7 @@ glabel func_80145EC0 /* DCE40 80146740 14610004 */ bne $v1, $at, .L80146754 /* DCE44 80146744 3C018000 */ lui $at, 0x8000 /* DCE48 80146748 14410002 */ bne $v0, $at, .L80146754 -/* DCE4C 8014674C 00000000 */ nop +/* DCE4C 8014674C 00000000 */ nop /* DCE50 80146750 0006000D */ break 6 .L80146754: /* DCE54 80146754 00008812 */ mflo $s1 @@ -585,7 +585,7 @@ glabel func_80145EC0 /* DCE6C 8014676C 16210004 */ bne $s1, $at, .L80146780 /* DCE70 80146770 3C018000 */ lui $at, 0x8000 /* DCE74 80146774 14410002 */ bne $v0, $at, .L80146780 -/* DCE78 80146778 00000000 */ nop +/* DCE78 80146778 00000000 */ nop /* DCE7C 8014677C 0006000D */ break 6 .L80146780: /* DCE80 80146780 00007812 */ mflo $t7 @@ -594,8 +594,8 @@ glabel func_80145EC0 /* DCE8C 8014678C AFAF0070 */ sw $t7, 0x70($sp) /* DCE90 80146790 19E00095 */ blez $t7, .L801469E8 /* DCE94 80146794 AFB70038 */ sw $s7, 0x38($sp) -/* DCE98 80146798 3C0A800A */ lui $t2, %hi(D_8009A66C) -/* DCE9C 8014679C 254AA66C */ addiu $t2, $t2, %lo(D_8009A66C) +/* DCE98 80146798 3C0A800A */ lui $t2, %hi(gMasterGfxPos) +/* DCE9C 8014679C 254AA66C */ addiu $t2, $t2, %lo(gMasterGfxPos) /* DCEA0 801467A0 2642FFFF */ addiu $v0, $s2, -1 /* DCEA4 801467A4 30420FFF */ andi $v0, $v0, 0xfff /* DCEA8 801467A8 3C03FD48 */ lui $v1, 0xfd48 @@ -770,8 +770,8 @@ glabel func_80145EC0 /* DD13C 80146A3C 3C090049 */ lui $t1, 0x49 /* DD140 80146A40 3529C000 */ ori $t1, $t1, 0xc000 /* DD144 80146A44 3C0A1000 */ lui $t2, 0x1000 -/* DD148 80146A48 3C07800A */ lui $a3, %hi(D_8009A66C) -/* DD14C 80146A4C 24E7A66C */ addiu $a3, $a3, %lo(D_8009A66C) +/* DD148 80146A48 3C07800A */ lui $a3, %hi(gMasterGfxPos) +/* DD14C 80146A4C 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) /* DD150 80146A50 354A0400 */ ori $t2, $t2, 0x400 /* DD154 80146A54 2642FFFF */ addiu $v0, $s2, -1 /* DD158 80146A58 30420FFF */ andi $v0, $v0, 0xfff @@ -896,7 +896,7 @@ glabel func_80145EC0 /* DD32C 80146C2C 16210004 */ bne $s1, $at, .L80146C40 /* DD330 80146C30 3C018000 */ lui $at, 0x8000 /* DD334 80146C34 14410002 */ bne $v0, $at, .L80146C40 -/* DD338 80146C38 00000000 */ nop +/* DD338 80146C38 00000000 */ nop /* DD33C 80146C3C 0006000D */ break 6 .L80146C40: /* DD340 80146C40 00007812 */ mflo $t7 @@ -913,8 +913,8 @@ glabel func_80145EC0 /* DD36C 80146C6C 0000982D */ daddu $s3, $zero, $zero /* DD370 80146C70 19E000B1 */ blez $t7, .L80146F38 /* DD374 80146C74 E4420000 */ swc1 $f2, ($v0) -/* DD378 80146C78 3C10800A */ lui $s0, %hi(D_8009A66C) -/* DD37C 80146C7C 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* DD378 80146C78 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* DD37C 80146C7C 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* DD380 80146C80 2642FFFF */ addiu $v0, $s2, -1 /* DD384 80146C84 30420FFF */ andi $v0, $v0, 0xfff /* DD388 80146C88 3C03FD48 */ lui $v1, 0xfd48 @@ -939,10 +939,10 @@ glabel func_80145EC0 /* DD3D0 80146CD0 34217744 */ ori $at, $at, 0x7744 /* DD3D4 80146CD4 44810000 */ mtc1 $at, $f0 /* DD3D8 80146CD8 44936000 */ mtc1 $s3, $f12 -/* DD3DC 80146CDC 00000000 */ nop +/* DD3DC 80146CDC 00000000 */ nop /* DD3E0 80146CE0 46806320 */ cvt.s.w $f12, $f12 /* DD3E4 80146CE4 46006302 */ mul.s $f12, $f12, $f0 -/* DD3E8 80146CE8 00000000 */ nop +/* DD3E8 80146CE8 00000000 */ nop /* DD3EC 80146CEC 3C018015 */ lui $at, %hi(D_8014F134) /* DD3F0 80146CF0 C420F134 */ lwc1 $f0, %lo(D_8014F134)($at) /* DD3F4 80146CF4 AFAB0060 */ sw $t3, 0x60($sp) @@ -961,9 +961,9 @@ glabel func_80145EC0 /* DD428 80146D28 8FB9006C */ lw $t9, 0x6c($sp) /* DD42C 80146D2C 85420152 */ lh $v0, 0x152($t2) /* DD430 80146D30 46020082 */ mul.s $f2, $f0, $f2 -/* DD434 80146D34 00000000 */ nop +/* DD434 80146D34 00000000 */ nop /* DD438 80146D38 44820000 */ mtc1 $v0, $f0 -/* DD43C 80146D3C 00000000 */ nop +/* DD43C 80146D3C 00000000 */ nop /* DD440 80146D40 46800020 */ cvt.s.w $f0, $f0 /* DD444 80146D44 3C028015 */ lui $v0, %hi(D_8014F130) /* DD448 80146D48 9442F130 */ lhu $v0, %lo(D_8014F130)($v0) @@ -1094,15 +1094,15 @@ glabel func_80145EC0 .L80146F38: /* DD638 80146F38 8FAF0038 */ lw $t7, 0x38($sp) /* DD63C 80146F3C 11E000A5 */ beqz $t7, .L801471D4 -/* DD640 80146F40 00000000 */ nop +/* DD640 80146F40 00000000 */ nop /* DD644 80146F44 3C013ED6 */ lui $at, 0x3ed6 /* DD648 80146F48 34217744 */ ori $at, $at, 0x7744 /* DD64C 80146F4C 44810000 */ mtc1 $at, $f0 /* DD650 80146F50 44936000 */ mtc1 $s3, $f12 -/* DD654 80146F54 00000000 */ nop +/* DD654 80146F54 00000000 */ nop /* DD658 80146F58 46806320 */ cvt.s.w $f12, $f12 /* DD65C 80146F5C 46006302 */ mul.s $f12, $f12, $f0 -/* DD660 80146F60 00000000 */ nop +/* DD660 80146F60 00000000 */ nop /* DD664 80146F64 3C018015 */ lui $at, %hi(D_8014F134) /* DD668 80146F68 C420F134 */ lwc1 $f0, %lo(D_8014F134)($at) /* DD66C 80146F6C 460C0300 */ add.s $f12, $f0, $f12 @@ -1115,11 +1115,11 @@ glabel func_80145EC0 /* DD688 80146F88 8D4A419C */ lw $t2, %lo(gGameStatusPtr)($t2) /* DD68C 80146F8C 8FB9006C */ lw $t9, 0x6c($sp) /* DD690 80146F90 46020082 */ mul.s $f2, $f0, $f2 -/* DD694 80146F94 00000000 */ nop +/* DD694 80146F94 00000000 */ nop /* DD698 80146F98 85420152 */ lh $v0, 0x152($t2) /* DD69C 80146F9C 85430150 */ lh $v1, 0x150($t2) /* DD6A0 80146FA0 44820000 */ mtc1 $v0, $f0 -/* DD6A4 80146FA4 00000000 */ nop +/* DD6A4 80146FA4 00000000 */ nop /* DD6A8 80146FA8 46800020 */ cvt.s.w $f0, $f0 /* DD6AC 80146FAC 3C028015 */ lui $v0, %hi(D_8014F130) /* DD6B0 80146FB0 9442F130 */ lhu $v0, %lo(D_8014F130)($v0) @@ -1144,8 +1144,8 @@ glabel func_80145EC0 /* DD6F8 80146FF8 3C090049 */ lui $t1, 0x49 /* DD6FC 80146FFC 3529C000 */ ori $t1, $t1, 0xc000 /* DD700 80147000 3C0B1000 */ lui $t3, 0x1000 -/* DD704 80147004 3C08800A */ lui $t0, %hi(D_8009A66C) -/* DD708 80147008 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* DD704 80147004 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* DD708 80147008 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* DD70C 8014700C 356B0400 */ ori $t3, $t3, 0x400 /* DD710 80147010 2642FFFF */ addiu $v0, $s2, -1 /* DD714 80147014 30420FFF */ andi $v0, $v0, 0xfff diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147AC4.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147AC4.s index 7de39e2841..49d380a089 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147AC4.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147AC4.s @@ -56,8 +56,8 @@ glabel func_80147AC4 /* DE284 80147B84 35EF001C */ ori $t7, $t7, 0x1c /* DE288 80147B88 3C12FF10 */ lui $s2, 0xff10 /* DE28C 80147B8C 3652013F */ ori $s2, $s2, 0x13f -/* DE290 80147B90 3C11800A */ lui $s1, %hi(D_8009A66C) -/* DE294 80147B94 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* DE290 80147B90 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* DE294 80147B94 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* DE298 80147B98 3C02D900 */ lui $v0, 0xd900 /* DE29C 80147B9C 8E300000 */ lw $s0, ($s1) /* DE2A0 80147BA0 3C04800A */ lui $a0, %hi(D_8009A64C) diff --git a/asm/nonmatchings/code_de740_len_23f0/func_801489B8.s b/asm/nonmatchings/code_de740_len_23f0/func_801489B8.s index a2296e6679..5243a9b9d8 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_801489B8.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_801489B8.s @@ -31,19 +31,19 @@ glabel func_801489B8 /* DF120 80148A20 24841D80 */ addiu $a0, $a0, %lo(gCameras) /* DF124 80148A24 AFBF003C */ sw $ra, 0x3c($sp) /* DF128 80148A28 4616B002 */ mul.s $f0, $f22, $f22 -/* DF12C 80148A2C 00000000 */ nop +/* DF12C 80148A2C 00000000 */ nop /* DF130 80148A30 AFBE0038 */ sw $fp, 0x38($sp) /* DF134 80148A34 AFB70034 */ sw $s7, 0x34($sp) /* DF138 80148A38 F7BE0068 */ sdc1 $f30, 0x68($sp) /* DF13C 80148A3C F7BA0058 */ sdc1 $f26, 0x58($sp) /* DF140 80148A40 4618C082 */ mul.s $f2, $f24, $f24 -/* DF144 80148A44 00000000 */ nop +/* DF144 80148A44 00000000 */ nop /* DF148 80148A48 AFA50074 */ sw $a1, 0x74($sp) /* DF14C 80148A4C AFA60078 */ sw $a2, 0x78($sp) /* DF150 80148A50 AFA7007C */ sw $a3, 0x7c($sp) /* DF154 80148A54 00031080 */ sll $v0, $v1, 2 /* DF158 80148A58 4614A102 */ mul.s $f4, $f20, $f20 -/* DF15C 80148A5C 00000000 */ nop +/* DF15C 80148A5C 00000000 */ nop /* DF160 80148A60 00431021 */ addu $v0, $v0, $v1 /* DF164 80148A64 00021080 */ sll $v0, $v0, 2 /* DF168 80148A68 00431023 */ subu $v0, $v0, $v1 @@ -57,64 +57,64 @@ glabel func_801489B8 /* DF188 80148A88 44801000 */ mtc1 $zero, $f2 /* DF18C 80148A8C 46006021 */ cvt.d.s $f0, $f12 /* DF190 80148A90 4622003C */ c.lt.d $f0, $f2 -/* DF194 80148A94 00000000 */ nop +/* DF194 80148A94 00000000 */ nop /* DF198 80148A98 45000008 */ bc1f .L80148ABC /* DF19C 80148A9C 0044F021 */ addu $fp, $v0, $a0 /* DF1A0 80148AA0 44900000 */ mtc1 $s0, $f0 -/* DF1A4 80148AA4 00000000 */ nop +/* DF1A4 80148AA4 00000000 */ nop /* DF1A8 80148AA8 46800020 */ cvt.s.w $f0, $f0 /* DF1AC 80148AAC 460C0002 */ mul.s $f0, $f0, $f12 -/* DF1B0 80148AB0 00000000 */ nop +/* DF1B0 80148AB0 00000000 */ nop /* DF1B4 80148AB4 4600028D */ trunc.w.s $f10, $f0 /* DF1B8 80148AB8 44105000 */ mfc1 $s0, $f10 .L80148ABC: /* DF1BC 80148ABC 461C6032 */ c.eq.s $f12, $f28 -/* DF1C0 80148AC0 00000000 */ nop +/* DF1C0 80148AC0 00000000 */ nop /* DF1C4 80148AC4 4501000D */ bc1t .L80148AFC -/* DF1C8 80148AC8 00000000 */ nop +/* DF1C8 80148AC8 00000000 */ nop /* DF1CC 80148ACC 46006084 */ sqrt.s $f2, $f12 /* DF1D0 80148AD0 46021032 */ c.eq.s $f2, $f2 -/* DF1D4 80148AD4 00000000 */ nop +/* DF1D4 80148AD4 00000000 */ nop /* DF1D8 80148AD8 45010004 */ bc1t .L80148AEC -/* DF1DC 80148ADC 00000000 */ nop +/* DF1DC 80148ADC 00000000 */ nop /* DF1E0 80148AE0 0C0187BC */ jal sqrtf -/* DF1E4 80148AE4 00000000 */ nop +/* DF1E4 80148AE4 00000000 */ nop /* DF1E8 80148AE8 46000086 */ mov.s $f2, $f0 .L80148AEC: /* DF1EC 80148AEC 3C013F80 */ lui $at, 0x3f80 /* DF1F0 80148AF0 44810000 */ mtc1 $at, $f0 -/* DF1F4 80148AF4 00000000 */ nop +/* DF1F4 80148AF4 00000000 */ nop /* DF1F8 80148AF8 46020303 */ div.s $f12, $f0, $f2 .L80148AFC: /* DF1FC 80148AFC 460CB582 */ mul.s $f22, $f22, $f12 -/* DF200 80148B00 00000000 */ nop +/* DF200 80148B00 00000000 */ nop /* DF204 80148B04 460CC602 */ mul.s $f24, $f24, $f12 -/* DF208 80148B08 00000000 */ nop +/* DF208 80148B08 00000000 */ nop /* DF20C 80148B0C 460CA502 */ mul.s $f20, $f20, $f12 -/* DF210 80148B10 00000000 */ nop +/* DF210 80148B10 00000000 */ nop /* DF214 80148B14 C6260008 */ lwc1 $f6, 8($s1) /* DF218 80148B18 C7C200DC */ lwc1 $f2, 0xdc($fp) /* DF21C 80148B1C 46003107 */ neg.s $f4, $f6 /* DF220 80148B20 46022082 */ mul.s $f2, $f4, $f2 -/* DF224 80148B24 00000000 */ nop +/* DF224 80148B24 00000000 */ nop /* DF228 80148B28 C6280028 */ lwc1 $f8, 0x28($s1) /* DF22C 80148B2C C7C000FC */ lwc1 $f0, 0xfc($fp) /* DF230 80148B30 46004002 */ mul.s $f0, $f8, $f0 -/* DF234 80148B34 00000000 */ nop +/* DF234 80148B34 00000000 */ nop /* DF238 80148B38 46001080 */ add.s $f2, $f2, $f0 /* DF23C 80148B3C 44800000 */ mtc1 $zero, $f0 /* DF240 80148B40 3C01BF80 */ lui $at, 0xbf80 /* DF244 80148B44 4481F000 */ mtc1 $at, $f30 /* DF248 80148B48 4600103C */ c.lt.s $f2, $f0 -/* DF24C 80148B4C 00000000 */ nop +/* DF24C 80148B4C 00000000 */ nop /* DF250 80148B50 45000004 */ bc1f .L80148B64 -/* DF254 80148B54 00000000 */ nop +/* DF254 80148B54 00000000 */ nop /* DF258 80148B58 3C013F80 */ lui $at, 0x3f80 /* DF25C 80148B5C 4481F000 */ mtc1 $at, $f30 -/* DF260 80148B60 00000000 */ nop +/* DF260 80148B60 00000000 */ nop .L80148B64: /* DF264 80148B64 4600F03C */ c.lt.s $f30, $f0 -/* DF268 80148B68 00000000 */ nop +/* DF268 80148B68 00000000 */ nop /* DF26C 80148B6C 45000004 */ bc1f .L80148B80 /* DF270 80148B70 46003086 */ mov.s $f2, $f6 /* DF274 80148B74 C6200018 */ lwc1 $f0, 0x18($s1) @@ -125,53 +125,53 @@ glabel func_801489B8 /* DF284 80148B84 C6200018 */ lwc1 $f0, 0x18($s1) .L80148B88: /* DF288 80148B88 46161102 */ mul.s $f4, $f2, $f22 -/* DF28C 80148B8C 00000000 */ nop +/* DF28C 80148B8C 00000000 */ nop /* DF290 80148B90 46180002 */ mul.s $f0, $f0, $f24 -/* DF294 80148B94 00000000 */ nop +/* DF294 80148B94 00000000 */ nop /* DF298 80148B98 46144202 */ mul.s $f8, $f8, $f20 -/* DF29C 80148B9C 00000000 */ nop +/* DF29C 80148B9C 00000000 */ nop /* DF2A0 80148BA0 C7C200FC */ lwc1 $f2, 0xfc($fp) /* DF2A4 80148BA4 46001087 */ neg.s $f2, $f2 /* DF2A8 80148BA8 4602B082 */ mul.s $f2, $f22, $f2 -/* DF2AC 80148BAC 00000000 */ nop +/* DF2AC 80148BAC 00000000 */ nop /* DF2B0 80148BB0 C7C600DC */ lwc1 $f6, 0xdc($fp) /* DF2B4 80148BB4 4606A182 */ mul.s $f6, $f20, $f6 -/* DF2B8 80148BB8 00000000 */ nop +/* DF2B8 80148BB8 00000000 */ nop /* DF2BC 80148BBC 46002100 */ add.s $f4, $f4, $f0 /* DF2C0 80148BC0 46082100 */ add.s $f4, $f4, $f8 /* DF2C4 80148BC4 44800000 */ mtc1 $zero, $f0 -/* DF2C8 80148BC8 00000000 */ nop +/* DF2C8 80148BC8 00000000 */ nop /* DF2CC 80148BCC 4604003C */ c.lt.s $f0, $f4 -/* DF2D0 80148BD0 00000000 */ nop +/* DF2D0 80148BD0 00000000 */ nop /* DF2D4 80148BD4 45000007 */ bc1f .L80148BF4 /* DF2D8 80148BD8 46061180 */ add.s $f6, $f2, $f6 /* DF2DC 80148BDC 44900000 */ mtc1 $s0, $f0 -/* DF2E0 80148BE0 00000000 */ nop +/* DF2E0 80148BE0 00000000 */ nop /* DF2E4 80148BE4 46800020 */ cvt.s.w $f0, $f0 /* DF2E8 80148BE8 46060682 */ mul.s $f26, $f0, $f6 /* DF2EC 80148BEC 08052302 */ j .L80148C08 -/* DF2F0 80148BF0 00000000 */ nop +/* DF2F0 80148BF0 00000000 */ nop .L80148BF4: /* DF2F4 80148BF4 44901000 */ mtc1 $s0, $f2 -/* DF2F8 80148BF8 00000000 */ nop +/* DF2F8 80148BF8 00000000 */ nop /* DF2FC 80148BFC 468010A0 */ cvt.s.w $f2, $f2 /* DF300 80148C00 46061682 */ mul.s $f26, $f2, $f6 -/* DF304 80148C04 00000000 */ nop +/* DF304 80148C04 00000000 */ nop .L80148C08: /* DF308 80148C08 4616B002 */ mul.s $f0, $f22, $f22 -/* DF30C 80148C0C 00000000 */ nop +/* DF30C 80148C0C 00000000 */ nop /* DF310 80148C10 4614A082 */ mul.s $f2, $f20, $f20 -/* DF314 80148C14 00000000 */ nop +/* DF314 80148C14 00000000 */ nop /* DF318 80148C18 46020500 */ add.s $f20, $f0, $f2 /* DF31C 80148C1C 44800000 */ mtc1 $zero, $f0 -/* DF320 80148C20 00000000 */ nop +/* DF320 80148C20 00000000 */ nop /* DF324 80148C24 4600A032 */ c.eq.s $f20, $f0 -/* DF328 80148C28 00000000 */ nop +/* DF328 80148C28 00000000 */ nop /* DF32C 80148C2C 45010009 */ bc1t .L80148C54 -/* DF330 80148C30 00000000 */ nop +/* DF330 80148C30 00000000 */ nop /* DF334 80148C34 4600A004 */ sqrt.s $f0, $f20 /* DF338 80148C38 46000032 */ c.eq.s $f0, $f0 -/* DF33C 80148C3C 00000000 */ nop +/* DF33C 80148C3C 00000000 */ nop /* DF340 80148C40 45030004 */ bc1tl .L80148C54 /* DF344 80148C44 46000506 */ mov.s $f20, $f0 /* DF348 80148C48 0C0187BC */ jal sqrtf @@ -181,38 +181,38 @@ glabel func_801489B8 /* DF354 80148C54 C6200004 */ lwc1 $f0, 4($s1) /* DF358 80148C58 46000007 */ neg.s $f0, $f0 /* DF35C 80148C5C 46000002 */ mul.s $f0, $f0, $f0 -/* DF360 80148C60 00000000 */ nop +/* DF360 80148C60 00000000 */ nop /* DF364 80148C64 C6220024 */ lwc1 $f2, 0x24($s1) /* DF368 80148C68 46021082 */ mul.s $f2, $f2, $f2 -/* DF36C 80148C6C 00000000 */ nop +/* DF36C 80148C6C 00000000 */ nop /* DF370 80148C70 46020300 */ add.s $f12, $f0, $f2 /* DF374 80148C74 44800000 */ mtc1 $zero, $f0 /* DF378 80148C78 C6360014 */ lwc1 $f22, 0x14($s1) /* DF37C 80148C7C 46006032 */ c.eq.s $f12, $f0 -/* DF380 80148C80 00000000 */ nop +/* DF380 80148C80 00000000 */ nop /* DF384 80148C84 45010009 */ bc1t .L80148CAC -/* DF388 80148C88 00000000 */ nop +/* DF388 80148C88 00000000 */ nop /* DF38C 80148C8C 46006004 */ sqrt.s $f0, $f12 /* DF390 80148C90 46000032 */ c.eq.s $f0, $f0 -/* DF394 80148C94 00000000 */ nop +/* DF394 80148C94 00000000 */ nop /* DF398 80148C98 45030004 */ bc1tl .L80148CAC /* DF39C 80148C9C 46000306 */ mov.s $f12, $f0 /* DF3A0 80148CA0 0C0187BC */ jal sqrtf -/* DF3A4 80148CA4 00000000 */ nop +/* DF3A4 80148CA4 00000000 */ nop /* DF3A8 80148CA8 46000306 */ mov.s $f12, $f0 .L80148CAC: /* DF3AC 80148CAC 460CA002 */ mul.s $f0, $f20, $f12 -/* DF3B0 80148CB0 00000000 */ nop +/* DF3B0 80148CB0 00000000 */ nop /* DF3B4 80148CB4 4616C082 */ mul.s $f2, $f24, $f22 -/* DF3B8 80148CB8 00000000 */ nop +/* DF3B8 80148CB8 00000000 */ nop /* DF3BC 80148CBC 46020000 */ add.s $f0, $f0, $f2 /* DF3C0 80148CC0 2A620100 */ slti $v0, $s3, 0x100 /* DF3C4 80148CC4 44901000 */ mtc1 $s0, $f2 -/* DF3C8 80148CC8 00000000 */ nop +/* DF3C8 80148CC8 00000000 */ nop /* DF3CC 80148CCC 468010A0 */ cvt.s.w $f2, $f2 /* DF3D0 80148CD0 46000007 */ neg.s $f0, $f0 /* DF3D4 80148CD4 46020702 */ mul.s $f28, $f0, $f2 -/* DF3D8 80148CD8 00000000 */ nop +/* DF3D8 80148CD8 00000000 */ nop /* DF3DC 80148CDC 50400001 */ beql $v0, $zero, .L80148CE4 /* DF3E0 80148CE0 241300FF */ addiu $s3, $zero, 0xff .L80148CE4: @@ -260,8 +260,8 @@ glabel func_801489B8 /* DF474 80148D74 3C0CE404 */ lui $t4, 0xe404 /* DF478 80148D78 358C0004 */ ori $t4, $t4, 4 /* DF47C 80148D7C 3C0E1000 */ lui $t6, 0x1000 -/* DF480 80148D80 3C17800A */ lui $s7, %hi(D_8009A66C) -/* DF484 80148D84 26F7A66C */ addiu $s7, $s7, %lo(D_8009A66C) +/* DF480 80148D80 3C17800A */ lui $s7, %hi(gMasterGfxPos) +/* DF484 80148D84 26F7A66C */ addiu $s7, $s7, %lo(gMasterGfxPos) /* DF488 80148D88 35CE0400 */ ori $t6, $t6, 0x400 /* DF48C 80148D8C 3C05FA00 */ lui $a1, 0xfa00 /* DF490 80148D90 00131E00 */ sll $v1, $s3, 0x18 @@ -376,27 +376,27 @@ glabel func_801489B8 /* DF644 80148F44 87C2000E */ lh $v0, 0xe($fp) /* DF648 80148F48 87C30010 */ lh $v1, 0x10($fp) /* DF64C 80148F4C 44821000 */ mtc1 $v0, $f2 -/* DF650 80148F50 00000000 */ nop +/* DF650 80148F50 00000000 */ nop /* DF654 80148F54 468010A0 */ cvt.s.w $f2, $f2 /* DF658 80148F58 46041082 */ mul.s $f2, $f2, $f4 -/* DF65C 80148F5C 00000000 */ nop +/* DF65C 80148F5C 00000000 */ nop /* DF660 80148F60 25420020 */ addiu $v0, $t2, 0x20 /* DF664 80148F64 44830000 */ mtc1 $v1, $f0 -/* DF668 80148F68 00000000 */ nop +/* DF668 80148F68 00000000 */ nop /* DF66C 80148F6C 46800020 */ cvt.s.w $f0, $f0 /* DF670 80148F70 AEE20000 */ sw $v0, ($s7) /* DF674 80148F74 25420028 */ addiu $v0, $t2, 0x28 /* DF678 80148F78 46040002 */ mul.s $f0, $f0, $f4 -/* DF67C 80148F7C 00000000 */ nop +/* DF67C 80148F7C 00000000 */ nop /* DF680 80148F80 AEE20000 */ sw $v0, ($s7) /* DF684 80148F84 4600128D */ trunc.w.s $f10, $f2 /* DF688 80148F88 44035000 */ mfc1 $v1, $f10 -/* DF68C 80148F8C 00000000 */ nop +/* DF68C 80148F8C 00000000 */ nop /* DF690 80148F90 30630FFF */ andi $v1, $v1, 0xfff /* DF694 80148F94 00031B00 */ sll $v1, $v1, 0xc /* DF698 80148F98 4600028D */ trunc.w.s $f10, $f0 /* DF69C 80148F9C 44025000 */ mfc1 $v0, $f10 -/* DF6A0 80148FA0 00000000 */ nop +/* DF6A0 80148FA0 00000000 */ nop /* DF6A4 80148FA4 30420FFF */ andi $v0, $v0, 0xfff /* DF6A8 80148FA8 00521025 */ or $v0, $v0, $s2 /* DF6AC 80148FAC 00621825 */ or $v1, $v1, $v0 @@ -408,29 +408,29 @@ glabel func_801489B8 /* DF6C4 80148FC4 87C20010 */ lh $v0, 0x10($fp) /* DF6C8 80148FC8 00641821 */ addu $v1, $v1, $a0 /* DF6CC 80148FCC 44831000 */ mtc1 $v1, $f2 -/* DF6D0 80148FD0 00000000 */ nop +/* DF6D0 80148FD0 00000000 */ nop /* DF6D4 80148FD4 468010A0 */ cvt.s.w $f2, $f2 /* DF6D8 80148FD8 25440038 */ addiu $a0, $t2, 0x38 /* DF6DC 80148FDC 87C3000C */ lh $v1, 0xc($fp) /* DF6E0 80148FE0 46041082 */ mul.s $f2, $f2, $f4 -/* DF6E4 80148FE4 00000000 */ nop +/* DF6E4 80148FE4 00000000 */ nop /* DF6E8 80148FE8 AEE40000 */ sw $a0, ($s7) /* DF6EC 80148FEC 00431021 */ addu $v0, $v0, $v1 /* DF6F0 80148FF0 44820000 */ mtc1 $v0, $f0 -/* DF6F4 80148FF4 00000000 */ nop +/* DF6F4 80148FF4 00000000 */ nop /* DF6F8 80148FF8 46800020 */ cvt.s.w $f0, $f0 /* DF6FC 80148FFC 25420040 */ addiu $v0, $t2, 0x40 /* DF700 80149000 46040002 */ mul.s $f0, $f0, $f4 -/* DF704 80149004 00000000 */ nop +/* DF704 80149004 00000000 */ nop /* DF708 80149008 AEE20000 */ sw $v0, ($s7) /* DF70C 8014900C 4600128D */ trunc.w.s $f10, $f2 /* DF710 80149010 44025000 */ mfc1 $v0, $f10 -/* DF714 80149014 00000000 */ nop +/* DF714 80149014 00000000 */ nop /* DF718 80149018 30420FFF */ andi $v0, $v0, 0xfff /* DF71C 8014901C 00021300 */ sll $v0, $v0, 0xc /* DF720 80149020 4600028D */ trunc.w.s $f10, $f0 /* DF724 80149024 44035000 */ mfc1 $v1, $f10 -/* DF728 80149028 00000000 */ nop +/* DF728 80149028 00000000 */ nop /* DF72C 8014902C 30630FFF */ andi $v1, $v1, 0xfff /* DF730 80149030 00431025 */ or $v0, $v0, $v1 /* DF734 80149034 ACA20004 */ sw $v0, 4($a1) @@ -483,11 +483,11 @@ glabel func_801489B8 /* DF7E8 801490E8 AEE20000 */ sw $v0, ($s7) /* DF7EC 801490EC AD440048 */ sw $a0, 0x48($t2) /* DF7F0 801490F0 AD43004C */ sw $v1, 0x4c($t2) -/* DF7F4 801490F4 3C03800A */ lui $v1, %hi(D_8009A66C) -/* DF7F8 801490F8 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* DF7F4 801490F4 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* DF7F8 801490F8 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* DF7FC 801490FC 8C620000 */ lw $v0, ($v1) /* DF800 80149100 461ED002 */ mul.s $f0, $f26, $f30 -/* DF804 80149104 00000000 */ nop +/* DF804 80149104 00000000 */ nop /* DF808 80149108 0040382D */ daddu $a3, $v0, $zero /* DF80C 8014910C 24420008 */ addiu $v0, $v0, 8 /* DF810 80149110 AC620000 */ sw $v0, ($v1) @@ -497,7 +497,7 @@ glabel func_801489B8 /* DF820 80149120 00031880 */ sll $v1, $v1, 2 /* DF824 80149124 4600028D */ trunc.w.s $f10, $f0 /* DF828 80149128 44055000 */ mfc1 $a1, $f10 -/* DF82C 8014912C 00000000 */ nop +/* DF82C 8014912C 00000000 */ nop /* DF830 80149130 00651821 */ addu $v1, $v1, $a1 /* DF834 80149134 30630FFF */ andi $v1, $v1, 0xfff /* DF838 80149138 8FAF0078 */ lw $t7, 0x78($sp) @@ -506,7 +506,7 @@ glabel func_801489B8 /* DF844 80149144 00021080 */ sll $v0, $v0, 2 /* DF848 80149148 4600E28D */ trunc.w.s $f10, $f28 /* DF84C 8014914C 44065000 */ mfc1 $a2, $f10 -/* DF850 80149150 00000000 */ nop +/* DF850 80149150 00000000 */ nop /* DF854 80149154 00461021 */ addu $v0, $v0, $a2 /* DF858 80149158 30420FFF */ andi $v0, $v0, 0xfff /* DF85C 8014915C 00441025 */ or $v0, $v0, $a0 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_801491E4.s b/asm/nonmatchings/code_de740_len_23f0/func_801491E4.s index e6fabd9a6b..7638dc35b7 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_801491E4.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_801491E4.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_801491E4 -/* DF8E4 801491E4 3C06800A */ lui $a2, %hi(D_8009A66C) -/* DF8E8 801491E8 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* DF8E4 801491E4 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* DF8E8 801491E8 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* DF8EC 801491EC 3C02FA00 */ lui $v0, 0xfa00 /* DF8F0 801491F0 8CC50000 */ lw $a1, ($a2) /* DF8F4 801491F4 8FA40014 */ lw $a0, 0x14($sp) @@ -30,4 +30,4 @@ glabel func_801491E4 /* DF940 80149240 ACA40000 */ sw $a0, ($a1) /* DF944 80149244 03E00008 */ jr $ra /* DF948 80149248 ACA30004 */ sw $v1, 4($a1) -/* DF94C 8014924C 00000000 */ nop +/* DF94C 8014924C 00000000 */ nop diff --git a/asm/nonmatchings/code_f270_len_1190/func_800343A4.s b/asm/nonmatchings/code_f270_len_1190/func_800343A4.s index 257867f3cb..7598a18579 100644 --- a/asm/nonmatchings/code_f270_len_1190/func_800343A4.s +++ b/asm/nonmatchings/code_f270_len_1190/func_800343A4.s @@ -14,8 +14,8 @@ glabel func_800343A4 /* F7C8 800343C8 3C0AE739 */ lui $t2, 0xe739 /* F7CC 800343CC 354AE739 */ ori $t2, $t2, 0xe739 /* F7D0 800343D0 3C0BF64F */ lui $t3, 0xf64f -/* F7D4 800343D4 3C04800A */ lui $a0, %hi(D_8009A66C) -/* F7D8 800343D8 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* F7D4 800343D4 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* F7D8 800343D8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* F7DC 800343DC 356BC3BC */ ori $t3, $t3, 0xc3bc /* F7E0 800343E0 AFB50014 */ sw $s5, 0x14($sp) /* F7E4 800343E4 AFB40010 */ sw $s4, 0x10($sp) @@ -66,10 +66,10 @@ glabel func_800343A4 /* F898 80034498 00220821 */ addu $at, $at, $v0 /* F89C 8003449C 8C2282C0 */ lw $v0, %lo(D_800982C0)($at) /* F8A0 800344A0 00400008 */ jr $v0 -/* F8A4 800344A4 00000000 */ nop +/* F8A4 800344A4 00000000 */ nop /* F8A8 800344A8 0000502D */ daddu $t2, $zero, $zero -/* F8AC 800344AC 3C02800A */ lui $v0, %hi(D_8009A66C) -/* F8B0 800344B0 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* F8AC 800344AC 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* F8B0 800344B0 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* F8B4 800344B4 0040482D */ daddu $t1, $v0, $zero /* F8B8 800344B8 3C19FD10 */ lui $t9, 0xfd10 /* F8BC 800344BC 3739007F */ ori $t9, $t9, 0x7f @@ -163,10 +163,10 @@ glabel func_800343A4 /* FA18 80034618 1440FFC2 */ bnez $v0, .L80034524 /* FA1C 8003461C AC60004C */ sw $zero, 0x4c($v1) /* FA20 80034620 0800D248 */ j .L80034920 -/* FA24 80034624 00000000 */ nop +/* FA24 80034624 00000000 */ nop /* FA28 80034628 0000502D */ daddu $t2, $zero, $zero -/* FA2C 8003462C 3C02800A */ lui $v0, %hi(D_8009A66C) -/* FA30 80034630 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* FA2C 8003462C 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* FA30 80034630 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* FA34 80034634 0040482D */ daddu $t1, $v0, $zero /* FA38 80034638 3C19FD10 */ lui $t9, 0xfd10 /* FA3C 8003463C 373900FF */ ori $t9, $t9, 0xff @@ -260,10 +260,10 @@ glabel func_800343A4 /* FB98 80034798 1440FFC2 */ bnez $v0, .L800346A4 /* FB9C 8003479C AC60004C */ sw $zero, 0x4c($v1) /* FBA0 800347A0 0800D248 */ j .L80034920 -/* FBA4 800347A4 00000000 */ nop +/* FBA4 800347A4 00000000 */ nop /* FBA8 800347A8 0000502D */ daddu $t2, $zero, $zero -/* FBAC 800347AC 3C02800A */ lui $v0, %hi(D_8009A66C) -/* FBB0 800347B0 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* FBAC 800347AC 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* FBB0 800347B0 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* FBB4 800347B4 0040482D */ daddu $t1, $v0, $zero /* FBB8 800347B8 3C19FD10 */ lui $t9, 0xfd10 /* FBBC 800347BC 373900FF */ ori $t9, $t9, 0xff diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s index f4d054d335..ce4e83369f 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s @@ -10,8 +10,8 @@ glabel func_802DC008 /* FF10C 802DC01C 3C04F500 */ lui $a0, 0xf500 /* FF110 802DC020 34840100 */ ori $a0, $a0, 0x100 /* FF114 802DC024 3C050703 */ lui $a1, 0x703 -/* FF118 802DC028 3C0C800A */ lui $t4, %hi(D_8009A66C) -/* FF11C 802DC02C 258CA66C */ addiu $t4, $t4, %lo(D_8009A66C) +/* FF118 802DC028 3C0C800A */ lui $t4, %hi(gMasterGfxPos) +/* FF11C 802DC02C 258CA66C */ addiu $t4, $t4, %lo(gMasterGfxPos) /* FF120 802DC030 34A5C000 */ ori $a1, $a1, 0xc000 /* FF124 802DC034 3C02FD10 */ lui $v0, 0xfd10 /* FF128 802DC038 3C0F0700 */ lui $t7, 0x700 @@ -186,16 +186,16 @@ glabel func_802DC008 /* FF3C4 802DC2D4 3C06E200 */ lui $a2, 0xe200 /* FF3C8 802DC2D8 34C6001C */ ori $a2, $a2, 0x1c /* FF3CC 802DC2DC 3C050C19 */ lui $a1, 0xc19 -/* FF3D0 802DC2E0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* FF3D4 802DC2E4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* FF3D0 802DC2E0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* FF3D4 802DC2E4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* FF3D8 802DC2E8 8C820000 */ lw $v0, ($a0) /* FF3DC 802DC2EC 080B70C3 */ j .L802DC30C /* FF3E0 802DC2F0 34A51238 */ ori $a1, $a1, 0x1238 .L802DC2F4: /* FF3E4 802DC2F4 34C6001C */ ori $a2, $a2, 0x1c /* FF3E8 802DC2F8 3C050C18 */ lui $a1, 0xc18 -/* FF3EC 802DC2FC 3C04800A */ lui $a0, %hi(D_8009A66C) -/* FF3F0 802DC300 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* FF3EC 802DC2FC 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* FF3F0 802DC300 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* FF3F4 802DC304 8C820000 */ lw $v0, ($a0) /* FF3F8 802DC308 34A54B50 */ ori $a1, $a1, 0x4b50 .L802DC30C: @@ -209,8 +209,8 @@ glabel func_802DC008 /* FF418 802DC328 3C070100 */ lui $a3, 0x100 /* FF41C 802DC32C 34E74008 */ ori $a3, $a3, 0x4008 /* FF420 802DC330 3C080600 */ lui $t0, 0x600 -/* FF424 802DC334 3C04800A */ lui $a0, %hi(D_8009A66C) -/* FF428 802DC338 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* FF424 802DC334 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* FF428 802DC338 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* FF42C 802DC33C 35080402 */ ori $t0, $t0, 0x402 /* FF430 802DC340 8C820000 */ lw $v0, ($a0) /* FF434 802DC344 3C03FB00 */ lui $v1, 0xfb00 @@ -258,7 +258,7 @@ glabel func_802DC008 /* FF4D0 802DC3E0 0C052071 */ jal func_801481C4 /* FF4D4 802DC3E4 01A0382D */ daddu $a3, $t5, $zero /* FF4D8 802DC3E8 080B71E2 */ j .L802DC788 -/* FF4DC 802DC3EC 00000000 */ nop +/* FF4DC 802DC3EC 00000000 */ nop .L802DC3F0: /* FF4E0 802DC3F0 3C03070A */ lui $v1, 0x70a /* FF4E4 802DC3F4 34630280 */ ori $v1, $v1, 0x280 @@ -310,7 +310,7 @@ glabel func_802DC008 /* FF58C 802DC49C 14A10004 */ bne $a1, $at, .L802DC4B0 /* FF590 802DC4A0 3C018000 */ lui $at, 0x8000 /* FF594 802DC4A4 14610002 */ bne $v1, $at, .L802DC4B0 -/* FF598 802DC4A8 00000000 */ nop +/* FF598 802DC4A8 00000000 */ nop /* FF59C 802DC4AC 0006000D */ break 6 .L802DC4B0: /* FF5A0 802DC4B0 00001012 */ mflo $v0 @@ -324,8 +324,8 @@ glabel func_802DC008 /* FF5B8 802DC4C8 3C05000A */ lui $a1, 0xa /* FF5BC 802DC4CC 34A50280 */ ori $a1, $a1, 0x280 /* FF5C0 802DC4D0 3C04F240 */ lui $a0, 0xf240 -/* FF5C4 802DC4D4 3C07800A */ lui $a3, %hi(D_8009A66C) -/* FF5C8 802DC4D8 24E7A66C */ addiu $a3, $a3, %lo(D_8009A66C) +/* FF5C4 802DC4D4 3C07800A */ lui $a3, %hi(gMasterGfxPos) +/* FF5C8 802DC4D8 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) /* FF5CC 802DC4DC 34840400 */ ori $a0, $a0, 0x400 /* FF5D0 802DC4E0 8CE60000 */ lw $a2, ($a3) /* FF5D4 802DC4E4 3C02E700 */ lui $v0, 0xe700 @@ -401,16 +401,16 @@ glabel func_802DC008 /* FF6E4 802DC5F4 3C06E200 */ lui $a2, 0xe200 /* FF6E8 802DC5F8 34C6001C */ ori $a2, $a2, 0x1c /* FF6EC 802DC5FC 3C050055 */ lui $a1, 0x55 -/* FF6F0 802DC600 3C04800A */ lui $a0, %hi(D_8009A66C) -/* FF6F4 802DC604 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* FF6F0 802DC600 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* FF6F4 802DC604 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* FF6F8 802DC608 8C820000 */ lw $v0, ($a0) /* FF6FC 802DC60C 080B718B */ j .L802DC62C /* FF700 802DC610 34A53238 */ ori $a1, $a1, 0x3238 .L802DC614: /* FF704 802DC614 34C6001C */ ori $a2, $a2, 0x1c /* FF708 802DC618 3C050050 */ lui $a1, 0x50 -/* FF70C 802DC61C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* FF710 802DC620 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* FF70C 802DC61C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* FF710 802DC620 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* FF714 802DC624 8C820000 */ lw $v0, ($a0) /* FF718 802DC628 34A54B50 */ ori $a1, $a1, 0x4b50 .L802DC62C: @@ -426,8 +426,8 @@ glabel func_802DC008 /* FF740 802DC650 3C060100 */ lui $a2, 0x100 /* FF744 802DC654 34C64008 */ ori $a2, $a2, 0x4008 /* FF748 802DC658 3C070600 */ lui $a3, 0x600 -/* FF74C 802DC65C 3C09800A */ lui $t1, %hi(D_8009A66C) -/* FF750 802DC660 2529A66C */ addiu $t1, $t1, %lo(D_8009A66C) +/* FF74C 802DC65C 3C09800A */ lui $t1, %hi(gMasterGfxPos) +/* FF750 802DC660 2529A66C */ addiu $t1, $t1, %lo(gMasterGfxPos) /* FF754 802DC664 34E70402 */ ori $a3, $a3, 0x402 /* FF758 802DC668 8D280000 */ lw $t0, ($t1) /* FF75C 802DC66C 3C02FB00 */ lui $v0, 0xfb00 @@ -479,8 +479,8 @@ glabel func_802DC008 /* FF80C 802DC71C 3C075564 */ lui $a3, 0x5564 /* FF810 802DC720 34E7FE7F */ ori $a3, $a3, 0xfe7f /* FF814 802DC724 3C09E300 */ lui $t1, 0xe300 -/* FF818 802DC728 3C04800A */ lui $a0, %hi(D_8009A66C) -/* FF81C 802DC72C 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* FF818 802DC728 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* FF81C 802DC72C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* FF820 802DC730 35291801 */ ori $t1, $t1, 0x1801 /* FF824 802DC734 8C820000 */ lw $v0, ($a0) /* FF828 802DC738 3C03FB00 */ lui $v1, 0xfb00 @@ -529,8 +529,8 @@ glabel func_802DC008 /* FF8D0 802DC7E0 1462001C */ bne $v1, $v0, .L802DC854 /* FF8D4 802DC7E4 3C05DC08 */ lui $a1, 0xdc08 /* FF8D8 802DC7E8 3C04DC08 */ lui $a0, 0xdc08 -/* FF8DC 802DC7EC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* FF8E0 802DC7F0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* FF8DC 802DC7EC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* FF8E0 802DC7F0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* FF8E4 802DC7F4 8C620000 */ lw $v0, ($v1) /* FF8E8 802DC7F8 34840008 */ ori $a0, $a0, 8 /* FF8EC 802DC7FC 0040282D */ daddu $a1, $v0, $zero @@ -556,8 +556,8 @@ glabel func_802DC008 /* FF93C 802DC84C 080B721F */ j .L802DC87C /* FF940 802DC850 A4A3000A */ sh $v1, 0xa($a1) .L802DC854: -/* FF944 802DC854 3C03800A */ lui $v1, %hi(D_8009A66C) -/* FF948 802DC858 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* FF944 802DC854 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* FF948 802DC858 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* FF94C 802DC85C 8C620000 */ lw $v0, ($v1) /* FF950 802DC860 34A50008 */ ori $a1, $a1, 8 /* FF954 802DC864 0040202D */ daddu $a0, $v0, $zero @@ -571,8 +571,8 @@ glabel func_802DC008 .L802DC880: /* FF970 802DC880 34A54008 */ ori $a1, $a1, 0x4008 /* FF974 802DC884 3C060600 */ lui $a2, 0x600 -/* FF978 802DC888 3C04800A */ lui $a0, %hi(D_8009A66C) -/* FF97C 802DC88C 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* FF978 802DC888 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* FF97C 802DC88C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* FF980 802DC890 8C820000 */ lw $v0, ($a0) /* FF984 802DC894 34C60402 */ ori $a2, $a2, 0x402 /* FF988 802DC898 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s b/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s index 0e198f3de3..f6602ab29a 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s +++ b/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s @@ -36,7 +36,7 @@ glabel spr_appendMDL_component /* FFA60 802DC970 0200282D */ daddu $a1, $s0, $zero /* FFA64 802DC974 C7A20124 */ lwc1 $f2, 0x124($sp) /* FFA68 802DC978 46141032 */ c.eq.s $f2, $f20 -/* FFA6C 802DC97C 00000000 */ nop +/* FFA6C 802DC97C 00000000 */ nop /* FFA70 802DC980 4501000A */ bc1t .L802DC9AC /* FFA74 802DC984 0220202D */ daddu $a0, $s1, $zero /* FFA78 802DC988 44051000 */ mfc1 $a1, $f2 @@ -50,7 +50,7 @@ glabel spr_appendMDL_component /* FFA98 802DC9A8 00A0302D */ daddu $a2, $a1, $zero .L802DC9AC: /* FFA9C 802DC9AC 4614B032 */ c.eq.s $f22, $f20 -/* FFAA0 802DC9B0 00000000 */ nop +/* FFAA0 802DC9B0 00000000 */ nop /* FFAA4 802DC9B4 4501000C */ bc1t .L802DC9E8 /* FFAA8 802DC9B8 0220202D */ daddu $a0, $s1, $zero /* FFAAC 802DC9BC 4405B000 */ mfc1 $a1, $f22 @@ -66,7 +66,7 @@ glabel spr_appendMDL_component /* FFAD4 802DC9E4 00A0302D */ daddu $a2, $a1, $zero .L802DC9E8: /* FFAD8 802DC9E8 4614C032 */ c.eq.s $f24, $f20 -/* FFADC 802DC9EC 00000000 */ nop +/* FFADC 802DC9EC 00000000 */ nop /* FFAE0 802DC9F0 4501000A */ bc1t .L802DCA1C /* FFAE4 802DC9F4 0220202D */ daddu $a0, $s1, $zero /* FFAE8 802DC9F8 4405C000 */ mfc1 $a1, $f24 @@ -81,17 +81,17 @@ glabel spr_appendMDL_component .L802DCA1C: /* FFB0C 802DCA1C 3C013F80 */ lui $at, 0x3f80 /* FFB10 802DCA20 44810000 */ mtc1 $at, $f0 -/* FFB14 802DCA24 00000000 */ nop +/* FFB14 802DCA24 00000000 */ nop /* FFB18 802DCA28 4600D032 */ c.eq.s $f26, $f0 -/* FFB1C 802DCA2C 00000000 */ nop +/* FFB1C 802DCA2C 00000000 */ nop /* FFB20 802DCA30 4500000A */ bc1f .L802DCA5C /* FFB24 802DCA34 27B00060 */ addiu $s0, $sp, 0x60 /* FFB28 802DCA38 4600E032 */ c.eq.s $f28, $f0 -/* FFB2C 802DCA3C 00000000 */ nop +/* FFB2C 802DCA3C 00000000 */ nop /* FFB30 802DCA40 45000006 */ bc1f .L802DCA5C -/* FFB34 802DCA44 00000000 */ nop +/* FFB34 802DCA44 00000000 */ nop /* FFB38 802DCA48 4600F032 */ c.eq.s $f30, $f0 -/* FFB3C 802DCA4C 00000000 */ nop +/* FFB3C 802DCA4C 00000000 */ nop /* FFB40 802DCA50 4501000C */ bc1t .L802DCA84 /* FFB44 802DCA54 3C120001 */ lui $s2, 1 /* FFB48 802DCA58 27B00060 */ addiu $s0, $sp, 0x60 @@ -109,10 +109,10 @@ glabel spr_appendMDL_component .L802DCA84: /* FFB74 802DCA84 36521630 */ ori $s2, $s2, 0x1630 /* FFB78 802DCA88 27A40020 */ addiu $a0, $sp, 0x20 -/* FFB7C 802DCA8C 3C108007 */ lui $s0, %hi(D_800741F0) -/* FFB80 802DCA90 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* FFB84 802DCA94 3C11800A */ lui $s1, %hi(D_8009A674) -/* FFB88 802DCA98 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* FFB7C 802DCA8C 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* FFB80 802DCA90 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* FFB84 802DCA94 3C11800A */ lui $s1, %hi(gDisplayContext) +/* FFB88 802DCA98 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* FFB8C 802DCA9C 96050000 */ lhu $a1, ($s0) /* FFB90 802DCAA0 8E220000 */ lw $v0, ($s1) /* FFB94 802DCAA4 00052980 */ sll $a1, $a1, 6 @@ -120,8 +120,8 @@ glabel spr_appendMDL_component /* FFB9C 802DCAAC 0C019D40 */ jal guMtxF2L /* FFBA0 802DCAB0 00452821 */ addu $a1, $v0, $a1 /* FFBA4 802DCAB4 3C02DA38 */ lui $v0, 0xda38 -/* FFBA8 802DCAB8 3C08800A */ lui $t0, %hi(D_8009A66C) -/* FFBAC 802DCABC 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* FFBA8 802DCAB8 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* FFBAC 802DCABC 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* FFBB0 802DCAC0 34420002 */ ori $v0, $v0, 2 /* FFBB4 802DCAC4 8D070000 */ lw $a3, ($t0) /* FFBB8 802DCAC8 96040000 */ lhu $a0, ($s0) @@ -247,8 +247,8 @@ glabel spr_appendMDL_component /* FFD80 802DCC90 00431024 */ and $v0, $v0, $v1 /* FFD84 802DCC94 AE620000 */ sw $v0, ($s3) .L802DCC98: -/* FFD88 802DCC98 3C03800A */ lui $v1, %hi(D_8009A66C) -/* FFD8C 802DCC9C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* FFD88 802DCC98 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* FFD8C 802DCC9C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* FFD90 802DCCA0 8C620000 */ lw $v0, ($v1) /* FFD94 802DCCA4 34A50002 */ ori $a1, $a1, 2 /* FFD98 802DCCA8 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024190C_96AACC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024190C_96AACC.s index 3a2239eea2..f7e7af9edb 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024190C_96AACC.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024190C_96AACC.s @@ -20,8 +20,8 @@ glabel func_8024190C_96AACC /* 96AB08 80241948 8C820000 */ lw $v0, ($a0) /* 96AB0C 8024194C 10400184 */ beqz $v0, .L80241F60 /* 96AB10 80241950 3C02DE00 */ lui $v0, 0xde00 -/* 96AB14 80241954 3C1E800A */ lui $fp, %hi(D_8009A66C) -/* 96AB18 80241958 27DEA66C */ addiu $fp, $fp, %lo(D_8009A66C) +/* 96AB14 80241954 3C1E800A */ lui $fp, %hi(gMasterGfxPos) +/* 96AB18 80241958 27DEA66C */ addiu $fp, $fp, %lo(gMasterGfxPos) /* 96AB1C 8024195C 8FC80000 */ lw $t0, ($fp) /* 96AB20 80241960 0100182D */ daddu $v1, $t0, $zero /* 96AB24 80241964 25080008 */ addiu $t0, $t0, 8 @@ -79,10 +79,10 @@ glabel func_8024190C_96AACC /* 96ABF0 80241A30 0C019D80 */ jal guMtxCatF /* 96ABF4 80241A34 00A0302D */ daddu $a2, $a1, $zero /* 96ABF8 80241A38 27A40018 */ addiu $a0, $sp, 0x18 -/* 96ABFC 80241A3C 3C108007 */ lui $s0, %hi(D_800741F0) -/* 96AC00 80241A40 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 96AC04 80241A44 3C11800A */ lui $s1, %hi(D_8009A674) -/* 96AC08 80241A48 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 96ABFC 80241A3C 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 96AC00 80241A40 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 96AC04 80241A44 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 96AC08 80241A48 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 96AC0C 80241A4C 96050000 */ lhu $a1, ($s0) /* 96AC10 80241A50 8E220000 */ lw $v0, ($s1) /* 96AC14 80241A54 00052980 */ sll $a1, $a1, 6 @@ -90,8 +90,8 @@ glabel func_8024190C_96AACC /* 96AC1C 80241A5C 0C019D40 */ jal guMtxF2L /* 96AC20 80241A60 00452821 */ addu $a1, $v0, $a1 /* 96AC24 80241A64 3C03DA38 */ lui $v1, 0xda38 -/* 96AC28 80241A68 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 96AC2C 80241A6C 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 96AC28 80241A68 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 96AC2C 80241A6C 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 96AC30 80241A70 34630002 */ ori $v1, $v1, 2 /* 96AC34 80241A74 8CC50000 */ lw $a1, ($a2) /* 96AC38 80241A78 96020000 */ lhu $v0, ($s0) @@ -151,8 +151,8 @@ glabel func_8024190C_96AACC /* 96AD04 80241B44 3C0C000A */ lui $t4, 0xa /* 96AD08 80241B48 358C0280 */ ori $t4, $t4, 0x280 /* 96AD0C 80241B4C 27A40018 */ addiu $a0, $sp, 0x18 -/* 96AD10 80241B50 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 96AD14 80241B54 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 96AD10 80241B50 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 96AD14 80241B54 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 96AD18 80241B58 3C0A0700 */ lui $t2, 0x700 /* 96AD1C 80241B5C 8E050000 */ lw $a1, ($s0) /* 96AD20 80241B60 44800000 */ mtc1 $zero, $f0 @@ -276,16 +276,16 @@ glabel func_8024190C_96AACC /* 96AEF8 80241D38 2442FFE2 */ addiu $v0, $v0, -0x1e /* 96AEFC 80241D3C 00621823 */ subu $v1, $v1, $v0 /* 96AF00 80241D40 44831000 */ mtc1 $v1, $f2 -/* 96AF04 80241D44 00000000 */ nop +/* 96AF04 80241D44 00000000 */ nop /* 96AF08 80241D48 468010A0 */ cvt.s.w $f2, $f2 /* 96AF0C 80241D4C 44051000 */ mfc1 $a1, $f2 /* 96AF10 80241D50 0C019E40 */ jal guTranslateF /* 96AF14 80241D54 00C0382D */ daddu $a3, $a2, $zero /* 96AF18 80241D58 27A40018 */ addiu $a0, $sp, 0x18 -/* 96AF1C 80241D5C 3C118007 */ lui $s1, %hi(D_800741F0) -/* 96AF20 80241D60 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 96AF24 80241D64 3C12800A */ lui $s2, %hi(D_8009A674) -/* 96AF28 80241D68 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 96AF1C 80241D5C 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 96AF20 80241D60 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 96AF24 80241D64 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 96AF28 80241D68 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 96AF2C 80241D6C 96250000 */ lhu $a1, ($s1) /* 96AF30 80241D70 8E420000 */ lw $v0, ($s2) /* 96AF34 80241D74 00052980 */ sll $a1, $a1, 6 @@ -326,8 +326,8 @@ glabel func_8024190C_96AACC /* 96AFC0 80241E00 3C06D838 */ lui $a2, 0xd838 .L80241E04: /* 96AFC4 80241E04 34C60002 */ ori $a2, $a2, 2 -/* 96AFC8 80241E08 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 96AFCC 80241E0C 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 96AFC8 80241E08 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 96AFCC 80241E0C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 96AFD0 80241E10 8C830000 */ lw $v1, ($a0) /* 96AFD4 80241E14 24020001 */ addiu $v0, $zero, 1 /* 96AFD8 80241E18 0060282D */ daddu $a1, $v1, $zero @@ -363,10 +363,10 @@ glabel func_8024190C_96AACC /* 96B04C 80241E8C 0C019D80 */ jal guMtxCatF /* 96B050 80241E90 27A60018 */ addiu $a2, $sp, 0x18 /* 96B054 80241E94 27A40018 */ addiu $a0, $sp, 0x18 -/* 96B058 80241E98 3C108007 */ lui $s0, %hi(D_800741F0) -/* 96B05C 80241E9C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 96B060 80241EA0 3C11800A */ lui $s1, %hi(D_8009A674) -/* 96B064 80241EA4 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 96B058 80241E98 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 96B05C 80241E9C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 96B060 80241EA0 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 96B064 80241EA4 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 96B068 80241EA8 96050000 */ lhu $a1, ($s0) /* 96B06C 80241EAC 8E220000 */ lw $v0, ($s1) /* 96B070 80241EB0 00052980 */ sll $a1, $a1, 6 @@ -445,10 +445,10 @@ glabel func_8024190C_96AACC /* 96B188 80241FC8 0C019D80 */ jal guMtxCatF /* 96B18C 80241FCC 27A60018 */ addiu $a2, $sp, 0x18 /* 96B190 80241FD0 27A40018 */ addiu $a0, $sp, 0x18 -/* 96B194 80241FD4 3C118007 */ lui $s1, %hi(D_800741F0) -/* 96B198 80241FD8 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* 96B19C 80241FDC 3C12800A */ lui $s2, %hi(D_8009A674) -/* 96B1A0 80241FE0 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 96B194 80241FD4 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 96B198 80241FD8 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* 96B19C 80241FDC 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 96B1A0 80241FE0 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 96B1A4 80241FE4 96250000 */ lhu $a1, ($s1) /* 96B1A8 80241FE8 8E420000 */ lw $v0, ($s2) /* 96B1AC 80241FEC 00052980 */ sll $a1, $a1, 6 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240020_DF6A20.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240020_DF6A20.s index 2aa5a69831..958661b374 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240020_DF6A20.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240020_DF6A20.s @@ -30,7 +30,7 @@ glabel func_80240020_DF6A20 /* DF6A84 80240084 0C00A8ED */ jal update_lerp /* DF6A88 80240088 0000202D */ daddu $a0, $zero, $zero /* DF6A8C 8024008C 4600A03C */ c.lt.s $f20, $f0 -/* DF6A90 80240090 00000000 */ nop +/* DF6A90 80240090 00000000 */ nop /* DF6A94 80240094 45000002 */ bc1f .L802400A0 /* DF6A98 80240098 27B10038 */ addiu $s1, $sp, 0x38 /* DF6A9C 8024009C 4600A006 */ mov.s $f0, $f20 @@ -57,10 +57,10 @@ glabel func_80240020_DF6A20 /* DF6AEC 802400EC 4481A800 */ mtc1 $at, $f21 /* DF6AF0 802400F0 4480A000 */ mtc1 $zero, $f20 /* DF6AF4 802400F4 44820000 */ mtc1 $v0, $f0 -/* DF6AF8 802400F8 00000000 */ nop +/* DF6AF8 802400F8 00000000 */ nop /* DF6AFC 802400FC 46800021 */ cvt.d.w $f0, $f0 /* DF6B00 80240100 46340002 */ mul.d $f0, $f0, $f20 -/* DF6B04 80240104 00000000 */ nop +/* DF6B04 80240104 00000000 */ nop /* DF6B08 80240108 36941630 */ ori $s4, $s4, 0x1630 /* DF6B0C 8024010C 4600B0A1 */ cvt.d.s $f2, $f22 /* DF6B10 80240110 27B00048 */ addiu $s0, $sp, 0x48 @@ -73,10 +73,10 @@ glabel func_80240020_DF6A20 /* DF6B2C 8024012C 0C019E40 */ jal guTranslateF /* DF6B30 80240130 0200202D */ daddu $a0, $s0, $zero /* DF6B34 80240134 0200202D */ daddu $a0, $s0, $zero -/* DF6B38 80240138 3C128007 */ lui $s2, %hi(D_800741F0) -/* DF6B3C 8024013C 265241F0 */ addiu $s2, $s2, %lo(D_800741F0) -/* DF6B40 80240140 3C13800A */ lui $s3, %hi(D_8009A674) -/* DF6B44 80240144 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* DF6B38 80240138 3C128007 */ lui $s2, %hi(gMatrixListPos) +/* DF6B3C 8024013C 265241F0 */ addiu $s2, $s2, %lo(gMatrixListPos) +/* DF6B40 80240140 3C13800A */ lui $s3, %hi(gDisplayContext) +/* DF6B44 80240144 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* DF6B48 80240148 96450000 */ lhu $a1, ($s2) /* DF6B4C 8024014C 8E620000 */ lw $v0, ($s3) /* DF6B50 80240150 00052980 */ sll $a1, $a1, 6 @@ -89,8 +89,8 @@ glabel func_80240020_DF6A20 /* DF6B6C 8024016C 27A50020 */ addiu $a1, $sp, 0x20 /* DF6B70 80240170 3C060005 */ lui $a2, 5 /* DF6B74 80240174 34C60040 */ ori $a2, $a2, 0x40 -/* DF6B78 80240178 3C11800A */ lui $s1, %hi(D_8009A66C) -/* DF6B7C 8024017C 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* DF6B78 80240178 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* DF6B7C 8024017C 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* DF6B80 80240180 0200382D */ daddu $a3, $s0, $zero /* DF6B84 80240184 8E220000 */ lw $v0, ($s1) /* DF6B88 80240188 96480000 */ lhu $t0, ($s2) @@ -112,11 +112,11 @@ glabel func_80240020_DF6A20 /* DF6BC8 802401C8 93A90040 */ lbu $t1, 0x40($sp) /* DF6BCC 802401CC 93AA0041 */ lbu $t2, 0x41($sp) /* DF6BD0 802401D0 44820000 */ mtc1 $v0, $f0 -/* DF6BD4 802401D4 00000000 */ nop +/* DF6BD4 802401D4 00000000 */ nop /* DF6BD8 802401D8 46800021 */ cvt.d.w $f0, $f0 /* DF6BDC 802401DC 8FA20038 */ lw $v0, 0x38($sp) /* DF6BE0 802401E0 46340002 */ mul.d $f0, $f0, $f20 -/* DF6BE4 802401E4 00000000 */ nop +/* DF6BE4 802401E4 00000000 */ nop /* DF6BE8 802401E8 A6480000 */ sh $t0, ($s2) /* DF6BEC 802401EC A7A0002E */ sh $zero, 0x2e($sp) /* DF6BF0 802401F0 A3B50030 */ sb $s5, 0x30($sp) diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240270_DF6C70.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240270_DF6C70.s index f50925b902..7c02f3bba8 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240270_DF6C70.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240270_DF6C70.s @@ -29,7 +29,7 @@ glabel func_80240270_DF6C70 /* DF6CD0 802402D0 0C00A8ED */ jal update_lerp /* DF6CD4 802402D4 0000282D */ daddu $a1, $zero, $zero /* DF6CD8 802402D8 4600A03C */ c.lt.s $f20, $f0 -/* DF6CDC 802402DC 00000000 */ nop +/* DF6CDC 802402DC 00000000 */ nop /* DF6CE0 802402E0 45000002 */ bc1f .L802402EC /* DF6CE4 802402E4 27B50038 */ addiu $s5, $sp, 0x38 /* DF6CE8 802402E8 4600A006 */ mov.s $f0, $f20 @@ -94,10 +94,10 @@ glabel func_80240270_DF6C70 /* DF6DBC 802403BC 4481A800 */ mtc1 $at, $f21 /* DF6DC0 802403C0 4480A000 */ mtc1 $zero, $f20 /* DF6DC4 802403C4 44820000 */ mtc1 $v0, $f0 -/* DF6DC8 802403C8 00000000 */ nop +/* DF6DC8 802403C8 00000000 */ nop /* DF6DCC 802403CC 46800021 */ cvt.d.w $f0, $f0 /* DF6DD0 802403D0 46340002 */ mul.d $f0, $f0, $f20 -/* DF6DD4 802403D4 00000000 */ nop +/* DF6DD4 802403D4 00000000 */ nop /* DF6DD8 802403D8 36941630 */ ori $s4, $s4, 0x1630 /* DF6DDC 802403DC 4600B0A1 */ cvt.d.s $f2, $f22 /* DF6DE0 802403E0 46201080 */ add.d $f2, $f2, $f0 @@ -110,10 +110,10 @@ glabel func_80240270_DF6C70 /* DF6DFC 802403FC 0C019E40 */ jal guTranslateF /* DF6E00 80240400 0000382D */ daddu $a3, $zero, $zero /* DF6E04 80240404 0260202D */ daddu $a0, $s3, $zero -/* DF6E08 80240408 3C108007 */ lui $s0, %hi(D_800741F0) -/* DF6E0C 8024040C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* DF6E10 80240410 3C12800A */ lui $s2, %hi(D_8009A674) -/* DF6E14 80240414 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* DF6E08 80240408 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* DF6E0C 8024040C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* DF6E10 80240410 3C12800A */ lui $s2, %hi(gDisplayContext) +/* DF6E14 80240414 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* DF6E18 80240418 96050000 */ lhu $a1, ($s0) /* DF6E1C 8024041C 8E420000 */ lw $v0, ($s2) /* DF6E20 80240420 00052980 */ sll $a1, $a1, 6 @@ -122,8 +122,8 @@ glabel func_80240270_DF6C70 /* DF6E2C 8024042C 00452821 */ addu $a1, $v0, $a1 /* DF6E30 80240430 3C02DA38 */ lui $v0, 0xda38 /* DF6E34 80240434 34420002 */ ori $v0, $v0, 2 -/* DF6E38 80240438 3C11800A */ lui $s1, %hi(D_8009A66C) -/* DF6E3C 8024043C 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* DF6E38 80240438 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* DF6E3C 8024043C 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* DF6E40 80240440 8E240000 */ lw $a0, ($s1) /* DF6E44 80240444 96050000 */ lhu $a1, ($s0) /* DF6E48 80240448 0080302D */ daddu $a2, $a0, $zero @@ -151,10 +151,10 @@ glabel func_80240270_DF6C70 /* DF6EA0 802404A0 92A2000A */ lbu $v0, 0xa($s5) /* DF6EA4 802404A4 0260382D */ daddu $a3, $s3, $zero /* DF6EA8 802404A8 44820000 */ mtc1 $v0, $f0 -/* DF6EAC 802404AC 00000000 */ nop +/* DF6EAC 802404AC 00000000 */ nop /* DF6EB0 802404B0 46800021 */ cvt.d.w $f0, $f0 /* DF6EB4 802404B4 46340002 */ mul.d $f0, $f0, $f20 -/* DF6EB8 802404B8 00000000 */ nop +/* DF6EB8 802404B8 00000000 */ nop /* DF6EBC 802404BC 0000202D */ daddu $a0, $zero, $zero /* DF6EC0 802404C0 3C060005 */ lui $a2, 5 /* DF6EC4 802404C4 34C60040 */ ori $a2, $a2, 0x40 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240540_DF6F40.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240540_DF6F40.s index bfb868c945..b03edbe059 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240540_DF6F40.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240540_DF6F40.s @@ -30,9 +30,9 @@ glabel func_80240540_DF6F40 /* DF6FA4 802405A4 2404000C */ addiu $a0, $zero, 0xc /* DF6FA8 802405A8 3C01437F */ lui $at, 0x437f /* DF6FAC 802405AC 44811000 */ mtc1 $at, $f2 -/* DF6FB0 802405B0 00000000 */ nop +/* DF6FB0 802405B0 00000000 */ nop /* DF6FB4 802405B4 4600103C */ c.lt.s $f2, $f0 -/* DF6FB8 802405B8 00000000 */ nop +/* DF6FB8 802405B8 00000000 */ nop /* DF6FBC 802405BC 45000002 */ bc1f .L802405C8 /* DF6FC0 802405C0 27B10038 */ addiu $s1, $sp, 0x38 /* DF6FC4 802405C4 46001006 */ mov.s $f0, $f2 @@ -61,7 +61,7 @@ glabel func_80240540_DF6F40 /* DF701C 8024061C 4480C000 */ mtc1 $zero, $f24 /* DF7020 80240620 4600A021 */ cvt.d.s $f0, $f20 /* DF7024 80240624 4620C03C */ c.lt.d $f24, $f0 -/* DF7028 80240628 00000000 */ nop +/* DF7028 80240628 00000000 */ nop /* DF702C 8024062C 45000003 */ bc1f .L8024063C /* DF7030 80240630 AFB10010 */ sw $s1, 0x10($sp) /* DF7034 80240634 3C013F80 */ lui $at, 0x3f80 @@ -77,10 +77,10 @@ glabel func_80240540_DF6F40 /* DF7058 80240658 4481D800 */ mtc1 $at, $f27 /* DF705C 8024065C 4480D000 */ mtc1 $zero, $f26 /* DF7060 80240660 44820000 */ mtc1 $v0, $f0 -/* DF7064 80240664 00000000 */ nop +/* DF7064 80240664 00000000 */ nop /* DF7068 80240668 46800021 */ cvt.d.w $f0, $f0 /* DF706C 8024066C 463A0002 */ mul.d $f0, $f0, $f26 -/* DF7070 80240670 00000000 */ nop +/* DF7070 80240670 00000000 */ nop /* DF7074 80240674 4600B0A1 */ cvt.d.s $f2, $f22 /* DF7078 80240678 46201080 */ add.d $f2, $f2, $f0 /* DF707C 8024067C 27B40048 */ addiu $s4, $sp, 0x48 @@ -93,7 +93,7 @@ glabel func_80240540_DF6F40 /* DF7098 80240698 0000382D */ daddu $a3, $zero, $zero /* DF709C 8024069C 4600A021 */ cvt.d.s $f0, $f20 /* DF70A0 802406A0 46380032 */ c.eq.d $f0, $f24 -/* DF70A4 802406A4 00000000 */ nop +/* DF70A4 802406A4 00000000 */ nop /* DF70A8 802406A8 4501000C */ bc1t .L802406DC /* DF70AC 802406AC 3C130001 */ lui $s3, 1 /* DF70B0 802406B0 27B00088 */ addiu $s0, $sp, 0x88 @@ -110,10 +110,10 @@ glabel func_80240540_DF6F40 .L802406DC: /* DF70DC 802406DC 36731630 */ ori $s3, $s3, 0x1630 /* DF70E0 802406E0 0280202D */ daddu $a0, $s4, $zero -/* DF70E4 802406E4 3C118007 */ lui $s1, %hi(D_800741F0) -/* DF70E8 802406E8 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* DF70EC 802406EC 3C12800A */ lui $s2, %hi(D_8009A674) -/* DF70F0 802406F0 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* DF70E4 802406E4 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* DF70E8 802406E8 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* DF70EC 802406EC 3C12800A */ lui $s2, %hi(gDisplayContext) +/* DF70F0 802406F0 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* DF70F4 802406F4 96250000 */ lhu $a1, ($s1) /* DF70F8 802406F8 8E420000 */ lw $v0, ($s2) /* DF70FC 802406FC 00052980 */ sll $a1, $a1, 6 @@ -125,8 +125,8 @@ glabel func_80240540_DF6F40 /* DF7114 80240714 0000202D */ daddu $a0, $zero, $zero /* DF7118 80240718 27A50020 */ addiu $a1, $sp, 0x20 /* DF711C 8024071C 24060040 */ addiu $a2, $zero, 0x40 -/* DF7120 80240720 3C10800A */ lui $s0, %hi(D_8009A66C) -/* DF7124 80240724 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* DF7120 80240720 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* DF7124 80240724 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* DF7128 80240728 0280382D */ daddu $a3, $s4, $zero /* DF712C 8024072C 8E020000 */ lw $v0, ($s0) /* DF7130 80240730 96280000 */ lhu $t0, ($s1) @@ -148,11 +148,11 @@ glabel func_80240540_DF6F40 /* DF7170 80240770 93A90040 */ lbu $t1, 0x40($sp) /* DF7174 80240774 93AA0041 */ lbu $t2, 0x41($sp) /* DF7178 80240778 44820000 */ mtc1 $v0, $f0 -/* DF717C 8024077C 00000000 */ nop +/* DF717C 8024077C 00000000 */ nop /* DF7180 80240780 46800021 */ cvt.d.w $f0, $f0 /* DF7184 80240784 8FA20038 */ lw $v0, 0x38($sp) /* DF7188 80240788 463A0002 */ mul.d $f0, $f0, $f26 -/* DF718C 8024078C 00000000 */ nop +/* DF718C 8024078C 00000000 */ nop /* DF7190 80240790 A6280000 */ sh $t0, ($s1) /* DF7194 80240794 A7A0002E */ sh $zero, 0x2e($sp) /* DF7198 80240798 A3B50030 */ sb $s5, 0x30($sp) diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_8024081C_DF721C.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_8024081C_DF721C.s index 1460707928..06ac5b4f79 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_8024081C_DF721C.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_8024081C_DF721C.s @@ -30,9 +30,9 @@ glabel func_8024081C_DF721C /* DF7280 80240880 2404000C */ addiu $a0, $zero, 0xc /* DF7284 80240884 3C01437F */ lui $at, 0x437f /* DF7288 80240888 44811000 */ mtc1 $at, $f2 -/* DF728C 8024088C 00000000 */ nop +/* DF728C 8024088C 00000000 */ nop /* DF7290 80240890 4600103C */ c.lt.s $f2, $f0 -/* DF7294 80240894 00000000 */ nop +/* DF7294 80240894 00000000 */ nop /* DF7298 80240898 45000002 */ bc1f .L802408A4 /* DF729C 8024089C 27B10038 */ addiu $s1, $sp, 0x38 /* DF72A0 802408A0 46001006 */ mov.s $f0, $f2 @@ -57,7 +57,7 @@ glabel func_8024081C_DF721C /* DF72E8 802408E8 4480B000 */ mtc1 $zero, $f22 /* DF72EC 802408EC 46000506 */ mov.s $f20, $f0 /* DF72F0 802408F0 4614B03E */ c.le.s $f22, $f20 -/* DF72F4 802408F4 00000000 */ nop +/* DF72F4 802408F4 00000000 */ nop /* DF72F8 802408F8 45030001 */ bc1tl .L80240900 /* DF72FC 802408FC 4600B506 */ mov.s $f20, $f22 .L80240900: @@ -72,10 +72,10 @@ glabel func_8024081C_DF721C /* DF7320 80240920 4481D800 */ mtc1 $at, $f27 /* DF7324 80240924 4480D000 */ mtc1 $zero, $f26 /* DF7328 80240928 44820000 */ mtc1 $v0, $f0 -/* DF732C 8024092C 00000000 */ nop +/* DF732C 8024092C 00000000 */ nop /* DF7330 80240930 46800021 */ cvt.d.w $f0, $f0 /* DF7334 80240934 463A0002 */ mul.d $f0, $f0, $f26 -/* DF7338 80240938 00000000 */ nop +/* DF7338 80240938 00000000 */ nop /* DF733C 8024093C 4600C0A1 */ cvt.d.s $f2, $f24 /* DF7340 80240940 27B40048 */ addiu $s4, $sp, 0x48 /* DF7344 80240944 4600E707 */ neg.s $f28, $f28 @@ -87,7 +87,7 @@ glabel func_8024081C_DF721C /* DF735C 8024095C 0C019E40 */ jal guTranslateF /* DF7360 80240960 0280202D */ daddu $a0, $s4, $zero /* DF7364 80240964 4616A032 */ c.eq.s $f20, $f22 -/* DF7368 80240968 00000000 */ nop +/* DF7368 80240968 00000000 */ nop /* DF736C 8024096C 4501000D */ bc1t .L802409A4 /* DF7370 80240970 3C130001 */ lui $s3, 1 /* DF7374 80240974 27B00088 */ addiu $s0, $sp, 0x88 @@ -105,10 +105,10 @@ glabel func_8024081C_DF721C .L802409A4: /* DF73A4 802409A4 36731630 */ ori $s3, $s3, 0x1630 /* DF73A8 802409A8 0280202D */ daddu $a0, $s4, $zero -/* DF73AC 802409AC 3C118007 */ lui $s1, %hi(D_800741F0) -/* DF73B0 802409B0 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* DF73B4 802409B4 3C12800A */ lui $s2, %hi(D_8009A674) -/* DF73B8 802409B8 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* DF73AC 802409AC 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* DF73B0 802409B0 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* DF73B4 802409B4 3C12800A */ lui $s2, %hi(gDisplayContext) +/* DF73B8 802409B8 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* DF73BC 802409BC 96250000 */ lhu $a1, ($s1) /* DF73C0 802409C0 8E420000 */ lw $v0, ($s2) /* DF73C4 802409C4 00052980 */ sll $a1, $a1, 6 @@ -121,8 +121,8 @@ glabel func_8024081C_DF721C /* DF73E0 802409E0 27A50020 */ addiu $a1, $sp, 0x20 /* DF73E4 802409E4 3C060001 */ lui $a2, 1 /* DF73E8 802409E8 34C60040 */ ori $a2, $a2, 0x40 -/* DF73EC 802409EC 3C10800A */ lui $s0, %hi(D_8009A66C) -/* DF73F0 802409F0 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* DF73EC 802409EC 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* DF73F0 802409F0 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* DF73F4 802409F4 0280382D */ daddu $a3, $s4, $zero /* DF73F8 802409F8 8E020000 */ lw $v0, ($s0) /* DF73FC 802409FC 96280000 */ lhu $t0, ($s1) @@ -144,11 +144,11 @@ glabel func_8024081C_DF721C /* DF743C 80240A3C 93A90040 */ lbu $t1, 0x40($sp) /* DF7440 80240A40 93AA0041 */ lbu $t2, 0x41($sp) /* DF7444 80240A44 44820000 */ mtc1 $v0, $f0 -/* DF7448 80240A48 00000000 */ nop +/* DF7448 80240A48 00000000 */ nop /* DF744C 80240A4C 46800021 */ cvt.d.w $f0, $f0 /* DF7450 80240A50 8FA20038 */ lw $v0, 0x38($sp) /* DF7454 80240A54 463A0002 */ mul.d $f0, $f0, $f26 -/* DF7458 80240A58 00000000 */ nop +/* DF7458 80240A58 00000000 */ nop /* DF745C 80240A5C A6280000 */ sh $t0, ($s1) /* DF7460 80240A60 A7A0002E */ sh $zero, 0x2e($sp) /* DF7464 80240A64 A3B50030 */ sb $s5, 0x30($sp) diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240AE8_DF74E8.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240AE8_DF74E8.s index 9071d16612..50af254b5a 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240AE8_DF74E8.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240AE8_DF74E8.s @@ -28,7 +28,7 @@ glabel func_80240AE8_DF74E8 /* DF7544 80240B44 00431021 */ addu $v0, $v0, $v1 /* DF7548 80240B48 2442FFF0 */ addiu $v0, $v0, -0x10 /* DF754C 80240B4C 44822000 */ mtc1 $v0, $f4 -/* DF7550 80240B50 00000000 */ nop +/* DF7550 80240B50 00000000 */ nop /* DF7554 80240B54 46802120 */ cvt.s.w $f4, $f4 /* DF7558 80240B58 8E03006C */ lw $v1, 0x6c($s0) /* DF755C 80240B5C 44052000 */ mfc1 $a1, $f4 @@ -36,7 +36,7 @@ glabel func_80240AE8_DF74E8 /* DF7564 80240B64 8E270018 */ lw $a3, 0x18($s1) /* DF7568 80240B68 2463003C */ addiu $v1, $v1, 0x3c /* DF756C 80240B6C 4483A000 */ mtc1 $v1, $f20 -/* DF7570 80240B70 00000000 */ nop +/* DF7570 80240B70 00000000 */ nop /* DF7574 80240B74 4680A520 */ cvt.s.w $f20, $f20 /* DF7578 80240B78 0C00A8ED */ jal update_lerp /* DF757C 80240B7C 2404000A */ addiu $a0, $zero, 0xa @@ -57,14 +57,14 @@ glabel func_80240AE8_DF74E8 /* DF75B8 80240BB8 46000706 */ mov.s $f28, $f0 /* DF75BC 80240BBC 4480B000 */ mtc1 $zero, $f22 /* DF75C0 80240BC0 080902F9 */ j .L80240BE4 -/* DF75C4 80240BC4 00000000 */ nop +/* DF75C4 80240BC4 00000000 */ nop .L80240BC8: /* DF75C8 80240BC8 00621823 */ subu $v1, $v1, $v0 /* DF75CC 80240BCC 00031080 */ sll $v0, $v1, 2 /* DF75D0 80240BD0 00431021 */ addu $v0, $v0, $v1 /* DF75D4 80240BD4 00021040 */ sll $v0, $v0, 1 /* DF75D8 80240BD8 4482B000 */ mtc1 $v0, $f22 -/* DF75DC 80240BDC 00000000 */ nop +/* DF75DC 80240BDC 00000000 */ nop /* DF75E0 80240BE0 4680B5A0 */ cvt.s.w $f22, $f22 .L80240BE4: /* DF75E4 80240BE4 8E02001C */ lw $v0, 0x1c($s0) @@ -98,9 +98,9 @@ glabel func_80240AE8_DF74E8 /* DF7650 80240C50 0000202D */ daddu $a0, $zero, $zero /* DF7654 80240C54 3C01437F */ lui $at, 0x437f /* DF7658 80240C58 44811000 */ mtc1 $at, $f2 -/* DF765C 80240C5C 00000000 */ nop +/* DF765C 80240C5C 00000000 */ nop /* DF7660 80240C60 4600103C */ c.lt.s $f2, $f0 -/* DF7664 80240C64 00000000 */ nop +/* DF7664 80240C64 00000000 */ nop /* DF7668 80240C68 45030001 */ bc1tl .L80240C70 /* DF766C 80240C6C 46001006 */ mov.s $f0, $f2 .L80240C70: @@ -127,10 +127,10 @@ glabel func_80240AE8_DF74E8 /* DF76BC 80240CBC 4481C800 */ mtc1 $at, $f25 /* DF76C0 80240CC0 4480C000 */ mtc1 $zero, $f24 /* DF76C4 80240CC4 44820000 */ mtc1 $v0, $f0 -/* DF76C8 80240CC8 00000000 */ nop +/* DF76C8 80240CC8 00000000 */ nop /* DF76CC 80240CCC 46800021 */ cvt.d.w $f0, $f0 /* DF76D0 80240CD0 46380002 */ mul.d $f0, $f0, $f24 -/* DF76D4 80240CD4 00000000 */ nop +/* DF76D4 80240CD4 00000000 */ nop /* DF76D8 80240CD8 36941630 */ ori $s4, $s4, 0x1630 /* DF76DC 80240CDC 4600A0A1 */ cvt.d.s $f2, $f20 /* DF76E0 80240CE0 27B10048 */ addiu $s1, $sp, 0x48 @@ -169,10 +169,10 @@ glabel func_80240AE8_DF74E8 /* DF7764 80240D64 0C019D80 */ jal guMtxCatF /* DF7768 80240D68 0220302D */ daddu $a2, $s1, $zero /* DF776C 80240D6C 0220202D */ daddu $a0, $s1, $zero -/* DF7770 80240D70 3C108007 */ lui $s0, %hi(D_800741F0) -/* DF7774 80240D74 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* DF7778 80240D78 3C13800A */ lui $s3, %hi(D_8009A674) -/* DF777C 80240D7C 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* DF7770 80240D70 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* DF7774 80240D74 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* DF7778 80240D78 3C13800A */ lui $s3, %hi(gDisplayContext) +/* DF777C 80240D7C 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* DF7780 80240D80 96050000 */ lhu $a1, ($s0) /* DF7784 80240D84 8E620000 */ lw $v0, ($s3) /* DF7788 80240D88 00052980 */ sll $a1, $a1, 6 @@ -181,8 +181,8 @@ glabel func_80240AE8_DF74E8 /* DF7794 80240D94 00452821 */ addu $a1, $v0, $a1 /* DF7798 80240D98 3C02DA38 */ lui $v0, 0xda38 /* DF779C 80240D9C 34420002 */ ori $v0, $v0, 2 -/* DF77A0 80240DA0 3C12800A */ lui $s2, %hi(D_8009A66C) -/* DF77A4 80240DA4 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* DF77A0 80240DA0 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* DF77A4 80240DA4 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* DF77A8 80240DA8 8E440000 */ lw $a0, ($s2) /* DF77AC 80240DAC 96050000 */ lhu $a1, ($s0) /* DF77B0 80240DB0 0080302D */ daddu $a2, $a0, $zero @@ -209,10 +209,10 @@ glabel func_80240AE8_DF74E8 /* DF7804 80240E04 A7A2002A */ sh $v0, 0x2a($sp) /* DF7808 80240E08 92A2000A */ lbu $v0, 0xa($s5) /* DF780C 80240E0C 44820000 */ mtc1 $v0, $f0 -/* DF7810 80240E10 00000000 */ nop +/* DF7810 80240E10 00000000 */ nop /* DF7814 80240E14 46800021 */ cvt.d.w $f0, $f0 /* DF7818 80240E18 46380002 */ mul.d $f0, $f0, $f24 -/* DF781C 80240E1C 00000000 */ nop +/* DF781C 80240E1C 00000000 */ nop /* DF7820 80240E20 0220382D */ daddu $a3, $s1, $zero /* DF7824 80240E24 0000202D */ daddu $a0, $zero, $zero /* DF7828 80240E28 02C0302D */ daddu $a2, $s6, $zero diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240FEC_DF79EC.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240FEC_DF79EC.s index aaa00fba80..e14d203278 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240FEC_DF79EC.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240FEC_DF79EC.s @@ -35,10 +35,10 @@ glabel func_80240FEC_DF79EC /* DF7A64 80241064 0C019E40 */ jal guTranslateF /* DF7A68 80241068 36B51630 */ ori $s5, $s5, 0x1630 /* DF7A6C 8024106C 0280202D */ daddu $a0, $s4, $zero -/* DF7A70 80241070 3C118007 */ lui $s1, %hi(D_800741F0) -/* DF7A74 80241074 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* DF7A78 80241078 3C12800A */ lui $s2, %hi(D_8009A674) -/* DF7A7C 8024107C 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* DF7A70 80241070 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* DF7A74 80241074 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* DF7A78 80241078 3C12800A */ lui $s2, %hi(gDisplayContext) +/* DF7A7C 8024107C 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* DF7A80 80241080 96250000 */ lhu $a1, ($s1) /* DF7A84 80241084 8E420000 */ lw $v0, ($s2) /* DF7A88 80241088 00052980 */ sll $a1, $a1, 6 @@ -47,8 +47,8 @@ glabel func_80240FEC_DF79EC /* DF7A94 80241094 00452821 */ addu $a1, $v0, $a1 /* DF7A98 80241098 3C02DA38 */ lui $v0, 0xda38 /* DF7A9C 8024109C 34420002 */ ori $v0, $v0, 2 -/* DF7AA0 802410A0 3C13800A */ lui $s3, %hi(D_8009A66C) -/* DF7AA4 802410A4 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* DF7AA0 802410A0 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* DF7AA4 802410A4 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* DF7AA8 802410A8 8E680000 */ lw $t0, ($s3) /* DF7AAC 802410AC 96290000 */ lhu $t1, ($s1) /* DF7AB0 802410B0 0100202D */ daddu $a0, $t0, $zero @@ -86,10 +86,10 @@ glabel func_80240FEC_DF79EC /* DF7B30 80241130 93A90040 */ lbu $t1, 0x40($sp) /* DF7B34 80241134 93AA0041 */ lbu $t2, 0x41($sp) /* DF7B38 80241138 44821000 */ mtc1 $v0, $f2 -/* DF7B3C 8024113C 00000000 */ nop +/* DF7B3C 8024113C 00000000 */ nop /* DF7B40 80241140 468010A1 */ cvt.d.w $f2, $f2 /* DF7B44 80241144 46201082 */ mul.d $f2, $f2, $f0 -/* DF7B48 80241148 00000000 */ nop +/* DF7B48 80241148 00000000 */ nop /* DF7B4C 8024114C A7A0002E */ sh $zero, 0x2e($sp) /* DF7B50 80241150 240200FF */ addiu $v0, $zero, 0xff /* DF7B54 80241154 A3A20030 */ sb $v0, 0x30($sp) diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241294_DF7C94.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241294_DF7C94.s index 725bab9b33..495653aaa0 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241294_DF7C94.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241294_DF7C94.s @@ -50,10 +50,10 @@ glabel func_80241294_DF7C94 /* DF7D48 80241348 4481B800 */ mtc1 $at, $f23 /* DF7D4C 8024134C 4480B000 */ mtc1 $zero, $f22 /* DF7D50 80241350 44820000 */ mtc1 $v0, $f0 -/* DF7D54 80241354 00000000 */ nop +/* DF7D54 80241354 00000000 */ nop /* DF7D58 80241358 46800021 */ cvt.d.w $f0, $f0 /* DF7D5C 8024135C 46360002 */ mul.d $f0, $f0, $f22 -/* DF7D60 80241360 00000000 */ nop +/* DF7D60 80241360 00000000 */ nop /* DF7D64 80241364 36941630 */ ori $s4, $s4, 0x1630 /* DF7D68 80241368 4600A521 */ cvt.d.s $f20, $f20 /* DF7D6C 8024136C 27B00048 */ addiu $s0, $sp, 0x48 @@ -66,10 +66,10 @@ glabel func_80241294_DF7C94 /* DF7D88 80241388 0C019E40 */ jal guTranslateF /* DF7D8C 8024138C 0200202D */ daddu $a0, $s0, $zero /* DF7D90 80241390 0200202D */ daddu $a0, $s0, $zero -/* DF7D94 80241394 3C128007 */ lui $s2, %hi(D_800741F0) -/* DF7D98 80241398 265241F0 */ addiu $s2, $s2, %lo(D_800741F0) -/* DF7D9C 8024139C 3C13800A */ lui $s3, %hi(D_8009A674) -/* DF7DA0 802413A0 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* DF7D94 80241394 3C128007 */ lui $s2, %hi(gMatrixListPos) +/* DF7D98 80241398 265241F0 */ addiu $s2, $s2, %lo(gMatrixListPos) +/* DF7D9C 8024139C 3C13800A */ lui $s3, %hi(gDisplayContext) +/* DF7DA0 802413A0 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* DF7DA4 802413A4 96450000 */ lhu $a1, ($s2) /* DF7DA8 802413A8 8E620000 */ lw $v0, ($s3) /* DF7DAC 802413AC 00052980 */ sll $a1, $a1, 6 @@ -82,8 +82,8 @@ glabel func_80241294_DF7C94 /* DF7DC8 802413C8 27A50020 */ addiu $a1, $sp, 0x20 /* DF7DCC 802413CC 3C060001 */ lui $a2, 1 /* DF7DD0 802413D0 34C60040 */ ori $a2, $a2, 0x40 -/* DF7DD4 802413D4 3C11800A */ lui $s1, %hi(D_8009A66C) -/* DF7DD8 802413D8 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* DF7DD4 802413D4 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* DF7DD8 802413D8 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* DF7DDC 802413DC 0200382D */ daddu $a3, $s0, $zero /* DF7DE0 802413E0 8E220000 */ lw $v0, ($s1) /* DF7DE4 802413E4 96480000 */ lhu $t0, ($s2) @@ -105,11 +105,11 @@ glabel func_80241294_DF7C94 /* DF7E24 80241424 93A90040 */ lbu $t1, 0x40($sp) /* DF7E28 80241428 93AA0041 */ lbu $t2, 0x41($sp) /* DF7E2C 8024142C 44820000 */ mtc1 $v0, $f0 -/* DF7E30 80241430 00000000 */ nop +/* DF7E30 80241430 00000000 */ nop /* DF7E34 80241434 46800021 */ cvt.d.w $f0, $f0 /* DF7E38 80241438 8FA20038 */ lw $v0, 0x38($sp) /* DF7E3C 8024143C 46360002 */ mul.d $f0, $f0, $f22 -/* DF7E40 80241440 00000000 */ nop +/* DF7E40 80241440 00000000 */ nop /* DF7E44 80241444 A6480000 */ sh $t0, ($s2) /* DF7E48 80241448 A7A0002E */ sh $zero, 0x2e($sp) /* DF7E4C 8024144C A3B50030 */ sb $s5, 0x30($sp) diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802414CC_DF7ECC.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802414CC_DF7ECC.s index 305d105ac9..7311d54f96 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802414CC_DF7ECC.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802414CC_DF7ECC.s @@ -63,10 +63,10 @@ glabel func_802414CC_DF7ECC /* DF7FB4 802415B4 4481C800 */ mtc1 $at, $f25 /* DF7FB8 802415B8 4480C000 */ mtc1 $zero, $f24 /* DF7FBC 802415BC 44820000 */ mtc1 $v0, $f0 -/* DF7FC0 802415C0 00000000 */ nop +/* DF7FC0 802415C0 00000000 */ nop /* DF7FC4 802415C4 46800021 */ cvt.d.w $f0, $f0 /* DF7FC8 802415C8 46380002 */ mul.d $f0, $f0, $f24 -/* DF7FCC 802415CC 00000000 */ nop +/* DF7FCC 802415CC 00000000 */ nop /* DF7FD0 802415D0 3C140001 */ lui $s4, 1 /* DF7FD4 802415D4 36941630 */ ori $s4, $s4, 0x1630 /* DF7FD8 802415D8 4600A521 */ cvt.d.s $f20, $f20 @@ -90,10 +90,10 @@ glabel func_802414CC_DF7ECC /* DF8020 80241620 0C019D80 */ jal guMtxCatF /* DF8024 80241624 0220302D */ daddu $a2, $s1, $zero /* DF8028 80241628 0220202D */ daddu $a0, $s1, $zero -/* DF802C 8024162C 3C128007 */ lui $s2, %hi(D_800741F0) -/* DF8030 80241630 265241F0 */ addiu $s2, $s2, %lo(D_800741F0) -/* DF8034 80241634 3C13800A */ lui $s3, %hi(D_8009A674) -/* DF8038 80241638 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* DF802C 8024162C 3C128007 */ lui $s2, %hi(gMatrixListPos) +/* DF8030 80241630 265241F0 */ addiu $s2, $s2, %lo(gMatrixListPos) +/* DF8034 80241634 3C13800A */ lui $s3, %hi(gDisplayContext) +/* DF8038 80241638 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* DF803C 8024163C 96450000 */ lhu $a1, ($s2) /* DF8040 80241640 8E620000 */ lw $v0, ($s3) /* DF8044 80241644 00052980 */ sll $a1, $a1, 6 @@ -105,8 +105,8 @@ glabel func_802414CC_DF7ECC /* DF805C 8024165C 0000202D */ daddu $a0, $zero, $zero /* DF8060 80241660 27A50020 */ addiu $a1, $sp, 0x20 /* DF8064 80241664 24060040 */ addiu $a2, $zero, 0x40 -/* DF8068 80241668 3C10800A */ lui $s0, %hi(D_8009A66C) -/* DF806C 8024166C 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* DF8068 80241668 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* DF806C 8024166C 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* DF8070 80241670 0220382D */ daddu $a3, $s1, $zero /* DF8074 80241674 8E020000 */ lw $v0, ($s0) /* DF8078 80241678 96480000 */ lhu $t0, ($s2) @@ -128,11 +128,11 @@ glabel func_802414CC_DF7ECC /* DF80B8 802416B8 93A90040 */ lbu $t1, 0x40($sp) /* DF80BC 802416BC 93AA0041 */ lbu $t2, 0x41($sp) /* DF80C0 802416C0 44820000 */ mtc1 $v0, $f0 -/* DF80C4 802416C4 00000000 */ nop +/* DF80C4 802416C4 00000000 */ nop /* DF80C8 802416C8 46800021 */ cvt.d.w $f0, $f0 /* DF80CC 802416CC 8FA20038 */ lw $v0, 0x38($sp) /* DF80D0 802416D0 46380002 */ mul.d $f0, $f0, $f24 -/* DF80D4 802416D4 00000000 */ nop +/* DF80D4 802416D4 00000000 */ nop /* DF80D8 802416D8 A6480000 */ sh $t0, ($s2) /* DF80DC 802416DC A7A0002E */ sh $zero, 0x2e($sp) /* DF80E0 802416E0 A3B50030 */ sb $s5, 0x30($sp) diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241768_DF8168.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241768_DF8168.s index f9cee2281b..4d7659e4ec 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241768_DF8168.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241768_DF8168.s @@ -59,10 +59,10 @@ glabel func_80241768_DF8168 /* DF8240 80241840 4481D800 */ mtc1 $at, $f27 /* DF8244 80241844 4480D000 */ mtc1 $zero, $f26 /* DF8248 80241848 44820000 */ mtc1 $v0, $f0 -/* DF824C 8024184C 00000000 */ nop +/* DF824C 8024184C 00000000 */ nop /* DF8250 80241850 46800021 */ cvt.d.w $f0, $f0 /* DF8254 80241854 463A0002 */ mul.d $f0, $f0, $f26 -/* DF8258 80241858 00000000 */ nop +/* DF8258 80241858 00000000 */ nop /* DF825C 8024185C 3C140001 */ lui $s4, 1 /* DF8260 80241860 36941630 */ ori $s4, $s4, 0x1630 /* DF8264 80241864 4600A521 */ cvt.d.s $f20, $f20 @@ -87,10 +87,10 @@ glabel func_80241768_DF8168 /* DF82B0 802418B0 0C019D80 */ jal guMtxCatF /* DF82B4 802418B4 0220302D */ daddu $a2, $s1, $zero /* DF82B8 802418B8 0220202D */ daddu $a0, $s1, $zero -/* DF82BC 802418BC 3C128007 */ lui $s2, %hi(D_800741F0) -/* DF82C0 802418C0 265241F0 */ addiu $s2, $s2, %lo(D_800741F0) -/* DF82C4 802418C4 3C13800A */ lui $s3, %hi(D_8009A674) -/* DF82C8 802418C8 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* DF82BC 802418BC 3C128007 */ lui $s2, %hi(gMatrixListPos) +/* DF82C0 802418C0 265241F0 */ addiu $s2, $s2, %lo(gMatrixListPos) +/* DF82C4 802418C4 3C13800A */ lui $s3, %hi(gDisplayContext) +/* DF82C8 802418C8 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* DF82CC 802418CC 96450000 */ lhu $a1, ($s2) /* DF82D0 802418D0 8E620000 */ lw $v0, ($s3) /* DF82D4 802418D4 00052980 */ sll $a1, $a1, 6 @@ -103,8 +103,8 @@ glabel func_80241768_DF8168 /* DF82F0 802418F0 27A50020 */ addiu $a1, $sp, 0x20 /* DF82F4 802418F4 3C060001 */ lui $a2, 1 /* DF82F8 802418F8 34C60040 */ ori $a2, $a2, 0x40 -/* DF82FC 802418FC 3C10800A */ lui $s0, %hi(D_8009A66C) -/* DF8300 80241900 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* DF82FC 802418FC 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* DF8300 80241900 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* DF8304 80241904 0220382D */ daddu $a3, $s1, $zero /* DF8308 80241908 8E020000 */ lw $v0, ($s0) /* DF830C 8024190C 96480000 */ lhu $t0, ($s2) @@ -126,11 +126,11 @@ glabel func_80241768_DF8168 /* DF834C 8024194C 93A90040 */ lbu $t1, 0x40($sp) /* DF8350 80241950 93AA0041 */ lbu $t2, 0x41($sp) /* DF8354 80241954 44820000 */ mtc1 $v0, $f0 -/* DF8358 80241958 00000000 */ nop +/* DF8358 80241958 00000000 */ nop /* DF835C 8024195C 46800021 */ cvt.d.w $f0, $f0 /* DF8360 80241960 8FA20038 */ lw $v0, 0x38($sp) /* DF8364 80241964 463A0002 */ mul.d $f0, $f0, $f26 -/* DF8368 80241968 00000000 */ nop +/* DF8368 80241968 00000000 */ nop /* DF836C 8024196C A6480000 */ sh $t0, ($s2) /* DF8370 80241970 A7A0002E */ sh $zero, 0x2e($sp) /* DF8374 80241974 A3B50030 */ sb $s5, 0x30($sp) diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802421D8_DF8BD8.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802421D8_DF8BD8.s index 08ec8e4b6f..4e5f540b9b 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802421D8_DF8BD8.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802421D8_DF8BD8.s @@ -8,8 +8,8 @@ glabel func_802421D8_DF8BD8 /* DF8BE4 802421E4 AFB40030 */ sw $s4, 0x30($sp) /* DF8BE8 802421E8 0000A02D */ daddu $s4, $zero, $zero /* DF8BEC 802421EC AFB10024 */ sw $s1, 0x24($sp) -/* DF8BF0 802421F0 3C11800A */ lui $s1, %hi(D_8009A66C) -/* DF8BF4 802421F4 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* DF8BF0 802421F0 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* DF8BF4 802421F4 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* DF8BF8 802421F8 AFB3002C */ sw $s3, 0x2c($sp) /* DF8BFC 802421FC 24130004 */ addiu $s3, $zero, 4 /* DF8C00 80242200 3C028025 */ lui $v0, %hi(D_80250EF0) @@ -19,8 +19,8 @@ glabel func_802421D8_DF8BD8 /* DF8C10 80242210 AFB20028 */ sw $s2, 0x28($sp) /* DF8C14 80242214 AFB00020 */ sw $s0, 0x20($sp) /* DF8C18 80242218 8E230000 */ lw $v1, ($s1) -/* DF8C1C 8024221C 3C108007 */ lui $s0, %hi(D_800741F4) -/* DF8C20 80242220 8E1041F4 */ lw $s0, %lo(D_800741F4)($s0) +/* DF8C1C 8024221C 3C108007 */ lui $s0, %hi(gCurrentDisplayContextIndex) +/* DF8C20 80242220 8E1041F4 */ lw $s0, %lo(gCurrentDisplayContextIndex)($s0) /* DF8C24 80242224 3C158025 */ lui $s5, %hi(D_8024F7E4) /* DF8C28 80242228 8EB5F7E4 */ lw $s5, %lo(D_8024F7E4)($s5) /* DF8C2C 8024222C 44800000 */ mtc1 $zero, $f0 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240030_E05390.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240030_E05390.s index 54c54a7e0b..65aaa65f1b 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240030_E05390.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240030_E05390.s @@ -30,7 +30,7 @@ glabel func_80240030_E05390 /* E053F4 80240094 0C00A8ED */ jal update_lerp /* E053F8 80240098 0000202D */ daddu $a0, $zero, $zero /* E053FC 8024009C 4600A03C */ c.lt.s $f20, $f0 -/* E05400 802400A0 00000000 */ nop +/* E05400 802400A0 00000000 */ nop /* E05404 802400A4 45000002 */ bc1f .L802400B0 /* E05408 802400A8 27B10038 */ addiu $s1, $sp, 0x38 /* E0540C 802400AC 4600A006 */ mov.s $f0, $f20 @@ -57,10 +57,10 @@ glabel func_80240030_E05390 /* E0545C 802400FC 4481A800 */ mtc1 $at, $f21 /* E05460 80240100 4480A000 */ mtc1 $zero, $f20 /* E05464 80240104 44820000 */ mtc1 $v0, $f0 -/* E05468 80240108 00000000 */ nop +/* E05468 80240108 00000000 */ nop /* E0546C 8024010C 46800021 */ cvt.d.w $f0, $f0 /* E05470 80240110 46340002 */ mul.d $f0, $f0, $f20 -/* E05474 80240114 00000000 */ nop +/* E05474 80240114 00000000 */ nop /* E05478 80240118 36941630 */ ori $s4, $s4, 0x1630 /* E0547C 8024011C 4600B0A1 */ cvt.d.s $f2, $f22 /* E05480 80240120 27B00048 */ addiu $s0, $sp, 0x48 @@ -73,10 +73,10 @@ glabel func_80240030_E05390 /* E0549C 8024013C 0C019E40 */ jal guTranslateF /* E054A0 80240140 0200202D */ daddu $a0, $s0, $zero /* E054A4 80240144 0200202D */ daddu $a0, $s0, $zero -/* E054A8 80240148 3C128007 */ lui $s2, %hi(D_800741F0) -/* E054AC 8024014C 265241F0 */ addiu $s2, $s2, %lo(D_800741F0) -/* E054B0 80240150 3C13800A */ lui $s3, %hi(D_8009A674) -/* E054B4 80240154 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* E054A8 80240148 3C128007 */ lui $s2, %hi(gMatrixListPos) +/* E054AC 8024014C 265241F0 */ addiu $s2, $s2, %lo(gMatrixListPos) +/* E054B0 80240150 3C13800A */ lui $s3, %hi(gDisplayContext) +/* E054B4 80240154 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* E054B8 80240158 96450000 */ lhu $a1, ($s2) /* E054BC 8024015C 8E620000 */ lw $v0, ($s3) /* E054C0 80240160 00052980 */ sll $a1, $a1, 6 @@ -89,8 +89,8 @@ glabel func_80240030_E05390 /* E054DC 8024017C 27A50020 */ addiu $a1, $sp, 0x20 /* E054E0 80240180 3C060005 */ lui $a2, 5 /* E054E4 80240184 34C60040 */ ori $a2, $a2, 0x40 -/* E054E8 80240188 3C11800A */ lui $s1, %hi(D_8009A66C) -/* E054EC 8024018C 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* E054E8 80240188 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* E054EC 8024018C 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* E054F0 80240190 0200382D */ daddu $a3, $s0, $zero /* E054F4 80240194 8E220000 */ lw $v0, ($s1) /* E054F8 80240198 96480000 */ lhu $t0, ($s2) @@ -112,11 +112,11 @@ glabel func_80240030_E05390 /* E05538 802401D8 93A90040 */ lbu $t1, 0x40($sp) /* E0553C 802401DC 93AA0041 */ lbu $t2, 0x41($sp) /* E05540 802401E0 44820000 */ mtc1 $v0, $f0 -/* E05544 802401E4 00000000 */ nop +/* E05544 802401E4 00000000 */ nop /* E05548 802401E8 46800021 */ cvt.d.w $f0, $f0 /* E0554C 802401EC 8FA20038 */ lw $v0, 0x38($sp) /* E05550 802401F0 46340002 */ mul.d $f0, $f0, $f20 -/* E05554 802401F4 00000000 */ nop +/* E05554 802401F4 00000000 */ nop /* E05558 802401F8 A6480000 */ sh $t0, ($s2) /* E0555C 802401FC A7A0002E */ sh $zero, 0x2e($sp) /* E05560 80240200 A3B50030 */ sb $s5, 0x30($sp) diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240280_E055E0.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240280_E055E0.s index 931a165d1a..fef8c23be3 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240280_E055E0.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240280_E055E0.s @@ -29,7 +29,7 @@ glabel func_80240280_E055E0 /* E05640 802402E0 0C00A8ED */ jal update_lerp /* E05644 802402E4 0000282D */ daddu $a1, $zero, $zero /* E05648 802402E8 4600A03C */ c.lt.s $f20, $f0 -/* E0564C 802402EC 00000000 */ nop +/* E0564C 802402EC 00000000 */ nop /* E05650 802402F0 45000002 */ bc1f .L802402FC /* E05654 802402F4 27B50038 */ addiu $s5, $sp, 0x38 /* E05658 802402F8 4600A006 */ mov.s $f0, $f20 @@ -94,10 +94,10 @@ glabel func_80240280_E055E0 /* E0572C 802403CC 4481A800 */ mtc1 $at, $f21 /* E05730 802403D0 4480A000 */ mtc1 $zero, $f20 /* E05734 802403D4 44820000 */ mtc1 $v0, $f0 -/* E05738 802403D8 00000000 */ nop +/* E05738 802403D8 00000000 */ nop /* E0573C 802403DC 46800021 */ cvt.d.w $f0, $f0 /* E05740 802403E0 46340002 */ mul.d $f0, $f0, $f20 -/* E05744 802403E4 00000000 */ nop +/* E05744 802403E4 00000000 */ nop /* E05748 802403E8 36941630 */ ori $s4, $s4, 0x1630 /* E0574C 802403EC 4600B0A1 */ cvt.d.s $f2, $f22 /* E05750 802403F0 46201080 */ add.d $f2, $f2, $f0 @@ -110,10 +110,10 @@ glabel func_80240280_E055E0 /* E0576C 8024040C 0C019E40 */ jal guTranslateF /* E05770 80240410 0000382D */ daddu $a3, $zero, $zero /* E05774 80240414 0260202D */ daddu $a0, $s3, $zero -/* E05778 80240418 3C108007 */ lui $s0, %hi(D_800741F0) -/* E0577C 8024041C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* E05780 80240420 3C12800A */ lui $s2, %hi(D_8009A674) -/* E05784 80240424 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* E05778 80240418 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* E0577C 8024041C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* E05780 80240420 3C12800A */ lui $s2, %hi(gDisplayContext) +/* E05784 80240424 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* E05788 80240428 96050000 */ lhu $a1, ($s0) /* E0578C 8024042C 8E420000 */ lw $v0, ($s2) /* E05790 80240430 00052980 */ sll $a1, $a1, 6 @@ -122,8 +122,8 @@ glabel func_80240280_E055E0 /* E0579C 8024043C 00452821 */ addu $a1, $v0, $a1 /* E057A0 80240440 3C02DA38 */ lui $v0, 0xda38 /* E057A4 80240444 34420002 */ ori $v0, $v0, 2 -/* E057A8 80240448 3C11800A */ lui $s1, %hi(D_8009A66C) -/* E057AC 8024044C 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* E057A8 80240448 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* E057AC 8024044C 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* E057B0 80240450 8E240000 */ lw $a0, ($s1) /* E057B4 80240454 96050000 */ lhu $a1, ($s0) /* E057B8 80240458 0080302D */ daddu $a2, $a0, $zero @@ -151,10 +151,10 @@ glabel func_80240280_E055E0 /* E05810 802404B0 92A2000A */ lbu $v0, 0xa($s5) /* E05814 802404B4 0260382D */ daddu $a3, $s3, $zero /* E05818 802404B8 44820000 */ mtc1 $v0, $f0 -/* E0581C 802404BC 00000000 */ nop +/* E0581C 802404BC 00000000 */ nop /* E05820 802404C0 46800021 */ cvt.d.w $f0, $f0 /* E05824 802404C4 46340002 */ mul.d $f0, $f0, $f20 -/* E05828 802404C8 00000000 */ nop +/* E05828 802404C8 00000000 */ nop /* E0582C 802404CC 0000202D */ daddu $a0, $zero, $zero /* E05830 802404D0 3C060005 */ lui $a2, 5 /* E05834 802404D4 34C60040 */ ori $a2, $a2, 0x40 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240550_E058B0.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240550_E058B0.s index 18d2f8c53d..0a86b13573 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240550_E058B0.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240550_E058B0.s @@ -30,9 +30,9 @@ glabel func_80240550_E058B0 /* E05914 802405B4 2404000C */ addiu $a0, $zero, 0xc /* E05918 802405B8 3C01437F */ lui $at, 0x437f /* E0591C 802405BC 44811000 */ mtc1 $at, $f2 -/* E05920 802405C0 00000000 */ nop +/* E05920 802405C0 00000000 */ nop /* E05924 802405C4 4600103C */ c.lt.s $f2, $f0 -/* E05928 802405C8 00000000 */ nop +/* E05928 802405C8 00000000 */ nop /* E0592C 802405CC 45000002 */ bc1f .L802405D8 /* E05930 802405D0 27B10038 */ addiu $s1, $sp, 0x38 /* E05934 802405D4 46001006 */ mov.s $f0, $f2 @@ -61,7 +61,7 @@ glabel func_80240550_E058B0 /* E0598C 8024062C 4480C000 */ mtc1 $zero, $f24 /* E05990 80240630 4600A021 */ cvt.d.s $f0, $f20 /* E05994 80240634 4620C03C */ c.lt.d $f24, $f0 -/* E05998 80240638 00000000 */ nop +/* E05998 80240638 00000000 */ nop /* E0599C 8024063C 45000003 */ bc1f .L8024064C /* E059A0 80240640 AFB10010 */ sw $s1, 0x10($sp) /* E059A4 80240644 3C013F80 */ lui $at, 0x3f80 @@ -77,10 +77,10 @@ glabel func_80240550_E058B0 /* E059C8 80240668 4481D800 */ mtc1 $at, $f27 /* E059CC 8024066C 4480D000 */ mtc1 $zero, $f26 /* E059D0 80240670 44820000 */ mtc1 $v0, $f0 -/* E059D4 80240674 00000000 */ nop +/* E059D4 80240674 00000000 */ nop /* E059D8 80240678 46800021 */ cvt.d.w $f0, $f0 /* E059DC 8024067C 463A0002 */ mul.d $f0, $f0, $f26 -/* E059E0 80240680 00000000 */ nop +/* E059E0 80240680 00000000 */ nop /* E059E4 80240684 4600B0A1 */ cvt.d.s $f2, $f22 /* E059E8 80240688 46201080 */ add.d $f2, $f2, $f0 /* E059EC 8024068C 27B40048 */ addiu $s4, $sp, 0x48 @@ -93,7 +93,7 @@ glabel func_80240550_E058B0 /* E05A08 802406A8 0000382D */ daddu $a3, $zero, $zero /* E05A0C 802406AC 4600A021 */ cvt.d.s $f0, $f20 /* E05A10 802406B0 46380032 */ c.eq.d $f0, $f24 -/* E05A14 802406B4 00000000 */ nop +/* E05A14 802406B4 00000000 */ nop /* E05A18 802406B8 4501000C */ bc1t .L802406EC /* E05A1C 802406BC 3C130001 */ lui $s3, 1 /* E05A20 802406C0 27B00088 */ addiu $s0, $sp, 0x88 @@ -110,10 +110,10 @@ glabel func_80240550_E058B0 .L802406EC: /* E05A4C 802406EC 36731630 */ ori $s3, $s3, 0x1630 /* E05A50 802406F0 0280202D */ daddu $a0, $s4, $zero -/* E05A54 802406F4 3C118007 */ lui $s1, %hi(D_800741F0) -/* E05A58 802406F8 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* E05A5C 802406FC 3C12800A */ lui $s2, %hi(D_8009A674) -/* E05A60 80240700 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* E05A54 802406F4 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* E05A58 802406F8 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* E05A5C 802406FC 3C12800A */ lui $s2, %hi(gDisplayContext) +/* E05A60 80240700 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* E05A64 80240704 96250000 */ lhu $a1, ($s1) /* E05A68 80240708 8E420000 */ lw $v0, ($s2) /* E05A6C 8024070C 00052980 */ sll $a1, $a1, 6 @@ -125,8 +125,8 @@ glabel func_80240550_E058B0 /* E05A84 80240724 0000202D */ daddu $a0, $zero, $zero /* E05A88 80240728 27A50020 */ addiu $a1, $sp, 0x20 /* E05A8C 8024072C 24060040 */ addiu $a2, $zero, 0x40 -/* E05A90 80240730 3C10800A */ lui $s0, %hi(D_8009A66C) -/* E05A94 80240734 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* E05A90 80240730 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* E05A94 80240734 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* E05A98 80240738 0280382D */ daddu $a3, $s4, $zero /* E05A9C 8024073C 8E020000 */ lw $v0, ($s0) /* E05AA0 80240740 96280000 */ lhu $t0, ($s1) @@ -148,11 +148,11 @@ glabel func_80240550_E058B0 /* E05AE0 80240780 93A90040 */ lbu $t1, 0x40($sp) /* E05AE4 80240784 93AA0041 */ lbu $t2, 0x41($sp) /* E05AE8 80240788 44820000 */ mtc1 $v0, $f0 -/* E05AEC 8024078C 00000000 */ nop +/* E05AEC 8024078C 00000000 */ nop /* E05AF0 80240790 46800021 */ cvt.d.w $f0, $f0 /* E05AF4 80240794 8FA20038 */ lw $v0, 0x38($sp) /* E05AF8 80240798 463A0002 */ mul.d $f0, $f0, $f26 -/* E05AFC 8024079C 00000000 */ nop +/* E05AFC 8024079C 00000000 */ nop /* E05B00 802407A0 A6280000 */ sh $t0, ($s1) /* E05B04 802407A4 A7A0002E */ sh $zero, 0x2e($sp) /* E05B08 802407A8 A3B50030 */ sb $s5, 0x30($sp) diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_8024082C_E05B8C.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_8024082C_E05B8C.s index f4270ba2f5..31356b2d53 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_8024082C_E05B8C.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_8024082C_E05B8C.s @@ -30,9 +30,9 @@ glabel func_8024082C_E05B8C /* E05BF0 80240890 2404000C */ addiu $a0, $zero, 0xc /* E05BF4 80240894 3C01437F */ lui $at, 0x437f /* E05BF8 80240898 44811000 */ mtc1 $at, $f2 -/* E05BFC 8024089C 00000000 */ nop +/* E05BFC 8024089C 00000000 */ nop /* E05C00 802408A0 4600103C */ c.lt.s $f2, $f0 -/* E05C04 802408A4 00000000 */ nop +/* E05C04 802408A4 00000000 */ nop /* E05C08 802408A8 45000002 */ bc1f .L802408B4 /* E05C0C 802408AC 27B10038 */ addiu $s1, $sp, 0x38 /* E05C10 802408B0 46001006 */ mov.s $f0, $f2 @@ -57,7 +57,7 @@ glabel func_8024082C_E05B8C /* E05C58 802408F8 4480B000 */ mtc1 $zero, $f22 /* E05C5C 802408FC 46000506 */ mov.s $f20, $f0 /* E05C60 80240900 4614B03E */ c.le.s $f22, $f20 -/* E05C64 80240904 00000000 */ nop +/* E05C64 80240904 00000000 */ nop /* E05C68 80240908 45030001 */ bc1tl .L80240910 /* E05C6C 8024090C 4600B506 */ mov.s $f20, $f22 .L80240910: @@ -72,10 +72,10 @@ glabel func_8024082C_E05B8C /* E05C90 80240930 4481D800 */ mtc1 $at, $f27 /* E05C94 80240934 4480D000 */ mtc1 $zero, $f26 /* E05C98 80240938 44820000 */ mtc1 $v0, $f0 -/* E05C9C 8024093C 00000000 */ nop +/* E05C9C 8024093C 00000000 */ nop /* E05CA0 80240940 46800021 */ cvt.d.w $f0, $f0 /* E05CA4 80240944 463A0002 */ mul.d $f0, $f0, $f26 -/* E05CA8 80240948 00000000 */ nop +/* E05CA8 80240948 00000000 */ nop /* E05CAC 8024094C 4600C0A1 */ cvt.d.s $f2, $f24 /* E05CB0 80240950 27B40048 */ addiu $s4, $sp, 0x48 /* E05CB4 80240954 4600E707 */ neg.s $f28, $f28 @@ -87,7 +87,7 @@ glabel func_8024082C_E05B8C /* E05CCC 8024096C 0C019E40 */ jal guTranslateF /* E05CD0 80240970 0280202D */ daddu $a0, $s4, $zero /* E05CD4 80240974 4616A032 */ c.eq.s $f20, $f22 -/* E05CD8 80240978 00000000 */ nop +/* E05CD8 80240978 00000000 */ nop /* E05CDC 8024097C 4501000D */ bc1t .L802409B4 /* E05CE0 80240980 3C130001 */ lui $s3, 1 /* E05CE4 80240984 27B00088 */ addiu $s0, $sp, 0x88 @@ -105,10 +105,10 @@ glabel func_8024082C_E05B8C .L802409B4: /* E05D14 802409B4 36731630 */ ori $s3, $s3, 0x1630 /* E05D18 802409B8 0280202D */ daddu $a0, $s4, $zero -/* E05D1C 802409BC 3C118007 */ lui $s1, %hi(D_800741F0) -/* E05D20 802409C0 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* E05D24 802409C4 3C12800A */ lui $s2, %hi(D_8009A674) -/* E05D28 802409C8 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* E05D1C 802409BC 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* E05D20 802409C0 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* E05D24 802409C4 3C12800A */ lui $s2, %hi(gDisplayContext) +/* E05D28 802409C8 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* E05D2C 802409CC 96250000 */ lhu $a1, ($s1) /* E05D30 802409D0 8E420000 */ lw $v0, ($s2) /* E05D34 802409D4 00052980 */ sll $a1, $a1, 6 @@ -121,8 +121,8 @@ glabel func_8024082C_E05B8C /* E05D50 802409F0 27A50020 */ addiu $a1, $sp, 0x20 /* E05D54 802409F4 3C060001 */ lui $a2, 1 /* E05D58 802409F8 34C60040 */ ori $a2, $a2, 0x40 -/* E05D5C 802409FC 3C10800A */ lui $s0, %hi(D_8009A66C) -/* E05D60 80240A00 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* E05D5C 802409FC 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* E05D60 80240A00 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* E05D64 80240A04 0280382D */ daddu $a3, $s4, $zero /* E05D68 80240A08 8E020000 */ lw $v0, ($s0) /* E05D6C 80240A0C 96280000 */ lhu $t0, ($s1) @@ -144,11 +144,11 @@ glabel func_8024082C_E05B8C /* E05DAC 80240A4C 93A90040 */ lbu $t1, 0x40($sp) /* E05DB0 80240A50 93AA0041 */ lbu $t2, 0x41($sp) /* E05DB4 80240A54 44820000 */ mtc1 $v0, $f0 -/* E05DB8 80240A58 00000000 */ nop +/* E05DB8 80240A58 00000000 */ nop /* E05DBC 80240A5C 46800021 */ cvt.d.w $f0, $f0 /* E05DC0 80240A60 8FA20038 */ lw $v0, 0x38($sp) /* E05DC4 80240A64 463A0002 */ mul.d $f0, $f0, $f26 -/* E05DC8 80240A68 00000000 */ nop +/* E05DC8 80240A68 00000000 */ nop /* E05DCC 80240A6C A6280000 */ sh $t0, ($s1) /* E05DD0 80240A70 A7A0002E */ sh $zero, 0x2e($sp) /* E05DD4 80240A74 A3B50030 */ sb $s5, 0x30($sp) diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240AF8_E05E58.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240AF8_E05E58.s index 32d654dc01..2c533f7e94 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240AF8_E05E58.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240AF8_E05E58.s @@ -28,7 +28,7 @@ glabel func_80240AF8_E05E58 /* E05EB4 80240B54 00431021 */ addu $v0, $v0, $v1 /* E05EB8 80240B58 2442FFF0 */ addiu $v0, $v0, -0x10 /* E05EBC 80240B5C 44822000 */ mtc1 $v0, $f4 -/* E05EC0 80240B60 00000000 */ nop +/* E05EC0 80240B60 00000000 */ nop /* E05EC4 80240B64 46802120 */ cvt.s.w $f4, $f4 /* E05EC8 80240B68 8E03006C */ lw $v1, 0x6c($s0) /* E05ECC 80240B6C 44052000 */ mfc1 $a1, $f4 @@ -36,7 +36,7 @@ glabel func_80240AF8_E05E58 /* E05ED4 80240B74 8E270018 */ lw $a3, 0x18($s1) /* E05ED8 80240B78 2463003C */ addiu $v1, $v1, 0x3c /* E05EDC 80240B7C 4483A000 */ mtc1 $v1, $f20 -/* E05EE0 80240B80 00000000 */ nop +/* E05EE0 80240B80 00000000 */ nop /* E05EE4 80240B84 4680A520 */ cvt.s.w $f20, $f20 /* E05EE8 80240B88 0C00A8ED */ jal update_lerp /* E05EEC 80240B8C 2404000A */ addiu $a0, $zero, 0xa @@ -57,14 +57,14 @@ glabel func_80240AF8_E05E58 /* E05F28 80240BC8 46000706 */ mov.s $f28, $f0 /* E05F2C 80240BCC 4480B000 */ mtc1 $zero, $f22 /* E05F30 80240BD0 080902FD */ j .L80240BF4 -/* E05F34 80240BD4 00000000 */ nop +/* E05F34 80240BD4 00000000 */ nop .L80240BD8: /* E05F38 80240BD8 00621823 */ subu $v1, $v1, $v0 /* E05F3C 80240BDC 00031080 */ sll $v0, $v1, 2 /* E05F40 80240BE0 00431021 */ addu $v0, $v0, $v1 /* E05F44 80240BE4 00021040 */ sll $v0, $v0, 1 /* E05F48 80240BE8 4482B000 */ mtc1 $v0, $f22 -/* E05F4C 80240BEC 00000000 */ nop +/* E05F4C 80240BEC 00000000 */ nop /* E05F50 80240BF0 4680B5A0 */ cvt.s.w $f22, $f22 .L80240BF4: /* E05F54 80240BF4 8E02001C */ lw $v0, 0x1c($s0) @@ -98,9 +98,9 @@ glabel func_80240AF8_E05E58 /* E05FC0 80240C60 0000202D */ daddu $a0, $zero, $zero /* E05FC4 80240C64 3C01437F */ lui $at, 0x437f /* E05FC8 80240C68 44811000 */ mtc1 $at, $f2 -/* E05FCC 80240C6C 00000000 */ nop +/* E05FCC 80240C6C 00000000 */ nop /* E05FD0 80240C70 4600103C */ c.lt.s $f2, $f0 -/* E05FD4 80240C74 00000000 */ nop +/* E05FD4 80240C74 00000000 */ nop /* E05FD8 80240C78 45030001 */ bc1tl .L80240C80 /* E05FDC 80240C7C 46001006 */ mov.s $f0, $f2 .L80240C80: @@ -127,10 +127,10 @@ glabel func_80240AF8_E05E58 /* E0602C 80240CCC 4481C800 */ mtc1 $at, $f25 /* E06030 80240CD0 4480C000 */ mtc1 $zero, $f24 /* E06034 80240CD4 44820000 */ mtc1 $v0, $f0 -/* E06038 80240CD8 00000000 */ nop +/* E06038 80240CD8 00000000 */ nop /* E0603C 80240CDC 46800021 */ cvt.d.w $f0, $f0 /* E06040 80240CE0 46380002 */ mul.d $f0, $f0, $f24 -/* E06044 80240CE4 00000000 */ nop +/* E06044 80240CE4 00000000 */ nop /* E06048 80240CE8 36941630 */ ori $s4, $s4, 0x1630 /* E0604C 80240CEC 4600A0A1 */ cvt.d.s $f2, $f20 /* E06050 80240CF0 27B10048 */ addiu $s1, $sp, 0x48 @@ -169,10 +169,10 @@ glabel func_80240AF8_E05E58 /* E060D4 80240D74 0C019D80 */ jal guMtxCatF /* E060D8 80240D78 0220302D */ daddu $a2, $s1, $zero /* E060DC 80240D7C 0220202D */ daddu $a0, $s1, $zero -/* E060E0 80240D80 3C108007 */ lui $s0, %hi(D_800741F0) -/* E060E4 80240D84 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* E060E8 80240D88 3C13800A */ lui $s3, %hi(D_8009A674) -/* E060EC 80240D8C 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* E060E0 80240D80 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* E060E4 80240D84 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* E060E8 80240D88 3C13800A */ lui $s3, %hi(gDisplayContext) +/* E060EC 80240D8C 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* E060F0 80240D90 96050000 */ lhu $a1, ($s0) /* E060F4 80240D94 8E620000 */ lw $v0, ($s3) /* E060F8 80240D98 00052980 */ sll $a1, $a1, 6 @@ -181,8 +181,8 @@ glabel func_80240AF8_E05E58 /* E06104 80240DA4 00452821 */ addu $a1, $v0, $a1 /* E06108 80240DA8 3C02DA38 */ lui $v0, 0xda38 /* E0610C 80240DAC 34420002 */ ori $v0, $v0, 2 -/* E06110 80240DB0 3C12800A */ lui $s2, %hi(D_8009A66C) -/* E06114 80240DB4 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* E06110 80240DB0 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* E06114 80240DB4 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* E06118 80240DB8 8E440000 */ lw $a0, ($s2) /* E0611C 80240DBC 96050000 */ lhu $a1, ($s0) /* E06120 80240DC0 0080302D */ daddu $a2, $a0, $zero @@ -209,10 +209,10 @@ glabel func_80240AF8_E05E58 /* E06174 80240E14 A7A2002A */ sh $v0, 0x2a($sp) /* E06178 80240E18 92A2000A */ lbu $v0, 0xa($s5) /* E0617C 80240E1C 44820000 */ mtc1 $v0, $f0 -/* E06180 80240E20 00000000 */ nop +/* E06180 80240E20 00000000 */ nop /* E06184 80240E24 46800021 */ cvt.d.w $f0, $f0 /* E06188 80240E28 46380002 */ mul.d $f0, $f0, $f24 -/* E0618C 80240E2C 00000000 */ nop +/* E0618C 80240E2C 00000000 */ nop /* E06190 80240E30 0220382D */ daddu $a3, $s1, $zero /* E06194 80240E34 0000202D */ daddu $a0, $zero, $zero /* E06198 80240E38 02C0302D */ daddu $a2, $s6, $zero diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240FFC_E0635C.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240FFC_E0635C.s index 57f5a3b053..603075667b 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240FFC_E0635C.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240FFC_E0635C.s @@ -35,10 +35,10 @@ glabel func_80240FFC_E0635C /* E063D4 80241074 0C019E40 */ jal guTranslateF /* E063D8 80241078 36B51630 */ ori $s5, $s5, 0x1630 /* E063DC 8024107C 0280202D */ daddu $a0, $s4, $zero -/* E063E0 80241080 3C118007 */ lui $s1, %hi(D_800741F0) -/* E063E4 80241084 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* E063E8 80241088 3C12800A */ lui $s2, %hi(D_8009A674) -/* E063EC 8024108C 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* E063E0 80241080 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* E063E4 80241084 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* E063E8 80241088 3C12800A */ lui $s2, %hi(gDisplayContext) +/* E063EC 8024108C 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* E063F0 80241090 96250000 */ lhu $a1, ($s1) /* E063F4 80241094 8E420000 */ lw $v0, ($s2) /* E063F8 80241098 00052980 */ sll $a1, $a1, 6 @@ -47,8 +47,8 @@ glabel func_80240FFC_E0635C /* E06404 802410A4 00452821 */ addu $a1, $v0, $a1 /* E06408 802410A8 3C02DA38 */ lui $v0, 0xda38 /* E0640C 802410AC 34420002 */ ori $v0, $v0, 2 -/* E06410 802410B0 3C13800A */ lui $s3, %hi(D_8009A66C) -/* E06414 802410B4 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* E06410 802410B0 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* E06414 802410B4 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* E06418 802410B8 8E680000 */ lw $t0, ($s3) /* E0641C 802410BC 96290000 */ lhu $t1, ($s1) /* E06420 802410C0 0100202D */ daddu $a0, $t0, $zero @@ -86,10 +86,10 @@ glabel func_80240FFC_E0635C /* E064A0 80241140 93A90040 */ lbu $t1, 0x40($sp) /* E064A4 80241144 93AA0041 */ lbu $t2, 0x41($sp) /* E064A8 80241148 44821000 */ mtc1 $v0, $f2 -/* E064AC 8024114C 00000000 */ nop +/* E064AC 8024114C 00000000 */ nop /* E064B0 80241150 468010A1 */ cvt.d.w $f2, $f2 /* E064B4 80241154 46201082 */ mul.d $f2, $f2, $f0 -/* E064B8 80241158 00000000 */ nop +/* E064B8 80241158 00000000 */ nop /* E064BC 8024115C A7A0002E */ sh $zero, 0x2e($sp) /* E064C0 80241160 240200FF */ addiu $v0, $zero, 0xff /* E064C4 80241164 A3A20030 */ sb $v0, 0x30($sp) diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802412A4_E06604.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802412A4_E06604.s index 605424985e..f257f02e9a 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_802412A4_E06604.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_802412A4_E06604.s @@ -50,10 +50,10 @@ glabel func_802412A4_E06604 /* E066B8 80241358 4481B800 */ mtc1 $at, $f23 /* E066BC 8024135C 4480B000 */ mtc1 $zero, $f22 /* E066C0 80241360 44820000 */ mtc1 $v0, $f0 -/* E066C4 80241364 00000000 */ nop +/* E066C4 80241364 00000000 */ nop /* E066C8 80241368 46800021 */ cvt.d.w $f0, $f0 /* E066CC 8024136C 46360002 */ mul.d $f0, $f0, $f22 -/* E066D0 80241370 00000000 */ nop +/* E066D0 80241370 00000000 */ nop /* E066D4 80241374 36941630 */ ori $s4, $s4, 0x1630 /* E066D8 80241378 4600A521 */ cvt.d.s $f20, $f20 /* E066DC 8024137C 27B00048 */ addiu $s0, $sp, 0x48 @@ -66,10 +66,10 @@ glabel func_802412A4_E06604 /* E066F8 80241398 0C019E40 */ jal guTranslateF /* E066FC 8024139C 0200202D */ daddu $a0, $s0, $zero /* E06700 802413A0 0200202D */ daddu $a0, $s0, $zero -/* E06704 802413A4 3C128007 */ lui $s2, %hi(D_800741F0) -/* E06708 802413A8 265241F0 */ addiu $s2, $s2, %lo(D_800741F0) -/* E0670C 802413AC 3C13800A */ lui $s3, %hi(D_8009A674) -/* E06710 802413B0 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* E06704 802413A4 3C128007 */ lui $s2, %hi(gMatrixListPos) +/* E06708 802413A8 265241F0 */ addiu $s2, $s2, %lo(gMatrixListPos) +/* E0670C 802413AC 3C13800A */ lui $s3, %hi(gDisplayContext) +/* E06710 802413B0 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* E06714 802413B4 96450000 */ lhu $a1, ($s2) /* E06718 802413B8 8E620000 */ lw $v0, ($s3) /* E0671C 802413BC 00052980 */ sll $a1, $a1, 6 @@ -82,8 +82,8 @@ glabel func_802412A4_E06604 /* E06738 802413D8 27A50020 */ addiu $a1, $sp, 0x20 /* E0673C 802413DC 3C060001 */ lui $a2, 1 /* E06740 802413E0 34C60040 */ ori $a2, $a2, 0x40 -/* E06744 802413E4 3C11800A */ lui $s1, %hi(D_8009A66C) -/* E06748 802413E8 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* E06744 802413E4 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* E06748 802413E8 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* E0674C 802413EC 0200382D */ daddu $a3, $s0, $zero /* E06750 802413F0 8E220000 */ lw $v0, ($s1) /* E06754 802413F4 96480000 */ lhu $t0, ($s2) @@ -105,11 +105,11 @@ glabel func_802412A4_E06604 /* E06794 80241434 93A90040 */ lbu $t1, 0x40($sp) /* E06798 80241438 93AA0041 */ lbu $t2, 0x41($sp) /* E0679C 8024143C 44820000 */ mtc1 $v0, $f0 -/* E067A0 80241440 00000000 */ nop +/* E067A0 80241440 00000000 */ nop /* E067A4 80241444 46800021 */ cvt.d.w $f0, $f0 /* E067A8 80241448 8FA20038 */ lw $v0, 0x38($sp) /* E067AC 8024144C 46360002 */ mul.d $f0, $f0, $f22 -/* E067B0 80241450 00000000 */ nop +/* E067B0 80241450 00000000 */ nop /* E067B4 80241454 A6480000 */ sh $t0, ($s2) /* E067B8 80241458 A7A0002E */ sh $zero, 0x2e($sp) /* E067BC 8024145C A3B50030 */ sb $s5, 0x30($sp) diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802414DC_E0683C.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802414DC_E0683C.s index f07075c447..17bca3ce59 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_802414DC_E0683C.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_802414DC_E0683C.s @@ -63,10 +63,10 @@ glabel func_802414DC_E0683C /* E06924 802415C4 4481C800 */ mtc1 $at, $f25 /* E06928 802415C8 4480C000 */ mtc1 $zero, $f24 /* E0692C 802415CC 44820000 */ mtc1 $v0, $f0 -/* E06930 802415D0 00000000 */ nop +/* E06930 802415D0 00000000 */ nop /* E06934 802415D4 46800021 */ cvt.d.w $f0, $f0 /* E06938 802415D8 46380002 */ mul.d $f0, $f0, $f24 -/* E0693C 802415DC 00000000 */ nop +/* E0693C 802415DC 00000000 */ nop /* E06940 802415E0 3C140001 */ lui $s4, 1 /* E06944 802415E4 36941630 */ ori $s4, $s4, 0x1630 /* E06948 802415E8 4600A521 */ cvt.d.s $f20, $f20 @@ -90,10 +90,10 @@ glabel func_802414DC_E0683C /* E06990 80241630 0C019D80 */ jal guMtxCatF /* E06994 80241634 0220302D */ daddu $a2, $s1, $zero /* E06998 80241638 0220202D */ daddu $a0, $s1, $zero -/* E0699C 8024163C 3C128007 */ lui $s2, %hi(D_800741F0) -/* E069A0 80241640 265241F0 */ addiu $s2, $s2, %lo(D_800741F0) -/* E069A4 80241644 3C13800A */ lui $s3, %hi(D_8009A674) -/* E069A8 80241648 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* E0699C 8024163C 3C128007 */ lui $s2, %hi(gMatrixListPos) +/* E069A0 80241640 265241F0 */ addiu $s2, $s2, %lo(gMatrixListPos) +/* E069A4 80241644 3C13800A */ lui $s3, %hi(gDisplayContext) +/* E069A8 80241648 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* E069AC 8024164C 96450000 */ lhu $a1, ($s2) /* E069B0 80241650 8E620000 */ lw $v0, ($s3) /* E069B4 80241654 00052980 */ sll $a1, $a1, 6 @@ -105,8 +105,8 @@ glabel func_802414DC_E0683C /* E069CC 8024166C 0000202D */ daddu $a0, $zero, $zero /* E069D0 80241670 27A50020 */ addiu $a1, $sp, 0x20 /* E069D4 80241674 24060040 */ addiu $a2, $zero, 0x40 -/* E069D8 80241678 3C10800A */ lui $s0, %hi(D_8009A66C) -/* E069DC 8024167C 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* E069D8 80241678 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* E069DC 8024167C 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* E069E0 80241680 0220382D */ daddu $a3, $s1, $zero /* E069E4 80241684 8E020000 */ lw $v0, ($s0) /* E069E8 80241688 96480000 */ lhu $t0, ($s2) @@ -128,11 +128,11 @@ glabel func_802414DC_E0683C /* E06A28 802416C8 93A90040 */ lbu $t1, 0x40($sp) /* E06A2C 802416CC 93AA0041 */ lbu $t2, 0x41($sp) /* E06A30 802416D0 44820000 */ mtc1 $v0, $f0 -/* E06A34 802416D4 00000000 */ nop +/* E06A34 802416D4 00000000 */ nop /* E06A38 802416D8 46800021 */ cvt.d.w $f0, $f0 /* E06A3C 802416DC 8FA20038 */ lw $v0, 0x38($sp) /* E06A40 802416E0 46380002 */ mul.d $f0, $f0, $f24 -/* E06A44 802416E4 00000000 */ nop +/* E06A44 802416E4 00000000 */ nop /* E06A48 802416E8 A6480000 */ sh $t0, ($s2) /* E06A4C 802416EC A7A0002E */ sh $zero, 0x2e($sp) /* E06A50 802416F0 A3B50030 */ sb $s5, 0x30($sp) diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80241778_E06AD8.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80241778_E06AD8.s index 5494e7fdf4..398b8e32bd 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80241778_E06AD8.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80241778_E06AD8.s @@ -59,10 +59,10 @@ glabel func_80241778_E06AD8 /* E06BB0 80241850 4481D800 */ mtc1 $at, $f27 /* E06BB4 80241854 4480D000 */ mtc1 $zero, $f26 /* E06BB8 80241858 44820000 */ mtc1 $v0, $f0 -/* E06BBC 8024185C 00000000 */ nop +/* E06BBC 8024185C 00000000 */ nop /* E06BC0 80241860 46800021 */ cvt.d.w $f0, $f0 /* E06BC4 80241864 463A0002 */ mul.d $f0, $f0, $f26 -/* E06BC8 80241868 00000000 */ nop +/* E06BC8 80241868 00000000 */ nop /* E06BCC 8024186C 3C140001 */ lui $s4, 1 /* E06BD0 80241870 36941630 */ ori $s4, $s4, 0x1630 /* E06BD4 80241874 4600A521 */ cvt.d.s $f20, $f20 @@ -87,10 +87,10 @@ glabel func_80241778_E06AD8 /* E06C20 802418C0 0C019D80 */ jal guMtxCatF /* E06C24 802418C4 0220302D */ daddu $a2, $s1, $zero /* E06C28 802418C8 0220202D */ daddu $a0, $s1, $zero -/* E06C2C 802418CC 3C128007 */ lui $s2, %hi(D_800741F0) -/* E06C30 802418D0 265241F0 */ addiu $s2, $s2, %lo(D_800741F0) -/* E06C34 802418D4 3C13800A */ lui $s3, %hi(D_8009A674) -/* E06C38 802418D8 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* E06C2C 802418CC 3C128007 */ lui $s2, %hi(gMatrixListPos) +/* E06C30 802418D0 265241F0 */ addiu $s2, $s2, %lo(gMatrixListPos) +/* E06C34 802418D4 3C13800A */ lui $s3, %hi(gDisplayContext) +/* E06C38 802418D8 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* E06C3C 802418DC 96450000 */ lhu $a1, ($s2) /* E06C40 802418E0 8E620000 */ lw $v0, ($s3) /* E06C44 802418E4 00052980 */ sll $a1, $a1, 6 @@ -103,8 +103,8 @@ glabel func_80241778_E06AD8 /* E06C60 80241900 27A50020 */ addiu $a1, $sp, 0x20 /* E06C64 80241904 3C060001 */ lui $a2, 1 /* E06C68 80241908 34C60040 */ ori $a2, $a2, 0x40 -/* E06C6C 8024190C 3C10800A */ lui $s0, %hi(D_8009A66C) -/* E06C70 80241910 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* E06C6C 8024190C 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* E06C70 80241910 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* E06C74 80241914 0220382D */ daddu $a3, $s1, $zero /* E06C78 80241918 8E020000 */ lw $v0, ($s0) /* E06C7C 8024191C 96480000 */ lhu $t0, ($s2) @@ -126,11 +126,11 @@ glabel func_80241778_E06AD8 /* E06CBC 8024195C 93A90040 */ lbu $t1, 0x40($sp) /* E06CC0 80241960 93AA0041 */ lbu $t2, 0x41($sp) /* E06CC4 80241964 44820000 */ mtc1 $v0, $f0 -/* E06CC8 80241968 00000000 */ nop +/* E06CC8 80241968 00000000 */ nop /* E06CCC 8024196C 46800021 */ cvt.d.w $f0, $f0 /* E06CD0 80241970 8FA20038 */ lw $v0, 0x38($sp) /* E06CD4 80241974 463A0002 */ mul.d $f0, $f0, $f26 -/* E06CD8 80241978 00000000 */ nop +/* E06CD8 80241978 00000000 */ nop /* E06CDC 8024197C A6480000 */ sh $t0, ($s2) /* E06CE0 80241980 A7A0002E */ sh $zero, 0x2e($sp) /* E06CE4 80241984 A3B50030 */ sb $s5, 0x30($sp) diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802421E8_E07548.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802421E8_E07548.s index 565780d2af..dff32b9b2c 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_802421E8_E07548.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_802421E8_E07548.s @@ -8,8 +8,8 @@ glabel func_802421E8_E07548 /* E07554 802421F4 AFB40030 */ sw $s4, 0x30($sp) /* E07558 802421F8 0000A02D */ daddu $s4, $zero, $zero /* E0755C 802421FC AFB10024 */ sw $s1, 0x24($sp) -/* E07560 80242200 3C11800A */ lui $s1, %hi(D_8009A66C) -/* E07564 80242204 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* E07560 80242200 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* E07564 80242204 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* E07568 80242208 AFB3002C */ sw $s3, 0x2c($sp) /* E0756C 8024220C 24130004 */ addiu $s3, $zero, 4 /* E07570 80242210 3C028025 */ lui $v0, %hi(D_8024B9D0) @@ -19,8 +19,8 @@ glabel func_802421E8_E07548 /* E07580 80242220 AFB20028 */ sw $s2, 0x28($sp) /* E07584 80242224 AFB00020 */ sw $s0, 0x20($sp) /* E07588 80242228 8E230000 */ lw $v1, ($s1) -/* E0758C 8024222C 3C108007 */ lui $s0, %hi(D_800741F4) -/* E07590 80242230 8E1041F4 */ lw $s0, %lo(D_800741F4)($s0) +/* E0758C 8024222C 3C108007 */ lui $s0, %hi(gCurrentDisplayContextIndex) +/* E07590 80242230 8E1041F4 */ lw $s0, %lo(gCurrentDisplayContextIndex)($s0) /* E07594 80242234 3C158025 */ lui $s5, %hi(D_8024A2C4) /* E07598 80242238 8EB5A2C4 */ lw $s5, %lo(D_8024A2C4)($s5) /* E0759C 8024223C 44800000 */ mtc1 $zero, $f0 diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C94_E07FF4.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C94_E07FF4.s index 33405160a8..76ffa5e6ae 100644 --- a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C94_E07FF4.s +++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C94_E07FF4.s @@ -5,8 +5,8 @@ glabel func_80242C94_E07FF4 /* E07FF4 80242C94 3C06FC12 */ lui $a2, 0xfc12 /* E07FF8 80242C98 34C64624 */ ori $a2, $a2, 0x4624 /* E07FFC 80242C9C 3C05FF8F */ lui $a1, 0xff8f -/* E08000 80242CA0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* E08004 80242CA4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* E08000 80242CA0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* E08004 80242CA4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* E08008 80242CA8 8C820000 */ lw $v0, ($a0) /* E0800C 80242CAC 34A5FFFF */ ori $a1, $a1, 0xffff /* E08010 80242CB0 0040182D */ daddu $v1, $v0, $zero @@ -22,6 +22,6 @@ glabel func_80242C94_E07FF4 /* E08038 80242CD8 AC430000 */ sw $v1, ($v0) /* E0803C 80242CDC 03E00008 */ jr $ra /* E08040 80242CE0 AC440004 */ sw $a0, 4($v0) -/* E08044 80242CE4 00000000 */ nop -/* E08048 80242CE8 00000000 */ nop -/* E0804C 80242CEC 00000000 */ nop +/* E08044 80242CE4 00000000 */ nop +/* E08048 80242CE8 00000000 */ nop +/* E0804C 80242CEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_802404B0_CB96B0.s b/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_802404B0_CB96B0.s index 1016a9ee53..c042617143 100644 --- a/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_802404B0_CB96B0.s +++ b/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_802404B0_CB96B0.s @@ -23,11 +23,11 @@ glabel func_802404B0_CB96B0 /* CB96F8 802404F8 AC430000 */ sw $v1, ($v0) /* CB96FC 802404FC 02D4102A */ slt $v0, $s6, $s4 /* CB9700 80240500 10400159 */ beqz $v0, .L80240A68 -/* CB9704 80240504 00000000 */ nop +/* CB9704 80240504 00000000 */ nop /* CB9708 80240508 8FAA0054 */ lw $t2, 0x54($sp) /* CB970C 8024050C 0147102A */ slt $v0, $t2, $a3 /* CB9710 80240510 10400155 */ beqz $v0, .L80240A68 -/* CB9714 80240514 00000000 */ nop +/* CB9714 80240514 00000000 */ nop /* CB9718 80240518 06C20002 */ bltzl $s6, .L80240524 /* CB971C 8024051C 0000B02D */ daddu $s6, $zero, $zero /* CB9720 80240520 8FAA0054 */ lw $t2, 0x54($sp) @@ -60,10 +60,10 @@ glabel func_802404B0_CB96B0 /* CB9770 80240570 240700EF */ addiu $a3, $zero, 0xef .L80240574: /* CB9774 80240574 12D4013C */ beq $s6, $s4, .L80240A68 -/* CB9778 80240578 00000000 */ nop +/* CB9778 80240578 00000000 */ nop /* CB977C 8024057C 8FAA0054 */ lw $t2, 0x54($sp) /* CB9780 80240580 11470139 */ beq $t2, $a3, .L80240A68 -/* CB9784 80240584 00000000 */ nop +/* CB9784 80240584 00000000 */ nop /* CB9788 80240588 06C10002 */ bgez $s6, .L80240594 /* CB978C 8024058C 02C0102D */ daddu $v0, $s6, $zero /* CB9790 80240590 26C20003 */ addiu $v0, $s6, 3 @@ -98,8 +98,8 @@ glabel func_802404B0_CB96B0 /* CB97FC 802405FC 00621823 */ subu $v1, $v1, $v0 /* CB9800 80240600 19400097 */ blez $t2, .L80240860 /* CB9804 80240604 AFA30014 */ sw $v1, 0x14($sp) -/* CB9808 80240608 3C13800A */ lui $s3, %hi(D_8009A66C) -/* CB980C 8024060C 2673A66C */ addiu $s3, $s3, %lo(D_8009A66C) +/* CB9808 80240608 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* CB980C 8024060C 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) /* CB9810 80240610 02961023 */ subu $v0, $s4, $s6 /* CB9814 80240614 00021040 */ sll $v0, $v0, 1 /* CB9818 80240618 24420007 */ addiu $v0, $v0, 7 @@ -225,18 +225,18 @@ glabel func_802404B0_CB96B0 /* CB99F0 802407F0 8FAA0020 */ lw $t2, 0x20($sp) /* CB99F4 802407F4 006A1821 */ addu $v1, $v1, $t2 /* CB99F8 802407F8 44836000 */ mtc1 $v1, $f12 -/* CB99FC 802407FC 00000000 */ nop +/* CB99FC 802407FC 00000000 */ nop /* CB9A00 80240800 0C00A8BB */ jal sin_deg /* CB9A04 80240804 46806320 */ cvt.s.w $f12, $f12 /* CB9A08 80240808 3C0143FA */ lui $at, 0x43fa /* CB9A0C 8024080C 44811000 */ mtc1 $at, $f2 -/* CB9A10 80240810 00000000 */ nop +/* CB9A10 80240810 00000000 */ nop /* CB9A14 80240814 46020002 */ mul.s $f0, $f0, $f2 -/* CB9A18 80240818 00000000 */ nop +/* CB9A18 80240818 00000000 */ nop /* CB9A1C 8024081C 3C030400 */ lui $v1, 0x400 /* CB9A20 80240820 4600010D */ trunc.w.s $f4, $f0 /* CB9A24 80240824 44022000 */ mfc1 $v0, $f4 -/* CB9A28 80240828 00000000 */ nop +/* CB9A28 80240828 00000000 */ nop /* CB9A2C 8024082C 2442FE0C */ addiu $v0, $v0, -0x1f4 /* CB9A30 80240830 3042FFFF */ andi $v0, $v0, 0xffff /* CB9A34 80240834 00431025 */ or $v0, $v0, $v1 @@ -268,8 +268,8 @@ glabel func_802404B0_CB96B0 .L80240894: /* CB9A94 80240894 3C05FD10 */ lui $a1, 0xfd10 /* CB9A98 80240898 34A5013F */ ori $a1, $a1, 0x13f -/* CB9A9C 8024089C 3C11800A */ lui $s1, %hi(D_8009A66C) -/* CB9AA0 802408A0 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* CB9A9C 8024089C 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* CB9AA0 802408A0 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* CB9AA4 802408A4 3C02FA00 */ lui $v0, 0xfa00 /* CB9AA8 802408A8 8E300000 */ lw $s0, ($s1) /* CB9AAC 802408AC 8FA40018 */ lw $a0, 0x18($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_80240A98_CB9C98.s b/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_80240A98_CB9C98.s index 0d15951aad..43837c17c8 100644 --- a/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_80240A98_CB9C98.s +++ b/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_80240A98_CB9C98.s @@ -68,16 +68,16 @@ glabel func_80240A98_CB9C98 /* CB9D94 80240B94 C7A60028 */ lwc1 $f6, 0x28($sp) /* CB9D98 80240B98 4600E003 */ div.s $f0, $f28, $f0 /* CB9D9C 80240B9C 46003182 */ mul.s $f6, $f6, $f0 -/* CB9DA0 80240BA0 00000000 */ nop +/* CB9DA0 80240BA0 00000000 */ nop /* CB9DA4 80240BA4 C7A4002C */ lwc1 $f4, 0x2c($sp) /* CB9DA8 80240BA8 46000087 */ neg.s $f2, $f0 /* CB9DAC 80240BAC 46022102 */ mul.s $f4, $f4, $f2 -/* CB9DB0 80240BB0 00000000 */ nop +/* CB9DB0 80240BB0 00000000 */ nop /* CB9DB4 80240BB4 C7A20030 */ lwc1 $f2, 0x30($sp) /* CB9DB8 80240BB8 46001082 */ mul.s $f2, $f2, $f0 -/* CB9DBC 80240BBC 00000000 */ nop +/* CB9DBC 80240BBC 00000000 */ nop /* CB9DC0 80240BC0 44804000 */ mtc1 $zero, $f8 -/* CB9DC4 80240BC4 00000000 */ nop +/* CB9DC4 80240BC4 00000000 */ nop /* CB9DC8 80240BC8 4608003C */ c.lt.s $f0, $f8 /* CB9DCC 80240BCC E7A00034 */ swc1 $f0, 0x34($sp) /* CB9DD0 80240BD0 E7A60028 */ swc1 $f6, 0x28($sp) @@ -108,14 +108,14 @@ glabel func_80240A98_CB9C98 /* CB9E30 80240C30 C7A60028 */ lwc1 $f6, 0x28($sp) /* CB9E34 80240C34 4600E003 */ div.s $f0, $f28, $f0 /* CB9E38 80240C38 46003182 */ mul.s $f6, $f6, $f0 -/* CB9E3C 80240C3C 00000000 */ nop +/* CB9E3C 80240C3C 00000000 */ nop /* CB9E40 80240C40 C7A4002C */ lwc1 $f4, 0x2c($sp) /* CB9E44 80240C44 46000087 */ neg.s $f2, $f0 /* CB9E48 80240C48 46022102 */ mul.s $f4, $f4, $f2 -/* CB9E4C 80240C4C 00000000 */ nop +/* CB9E4C 80240C4C 00000000 */ nop /* CB9E50 80240C50 C7A20030 */ lwc1 $f2, 0x30($sp) /* CB9E54 80240C54 46001082 */ mul.s $f2, $f2, $f0 -/* CB9E58 80240C58 00000000 */ nop +/* CB9E58 80240C58 00000000 */ nop /* CB9E5C 80240C5C 4600A606 */ mov.s $f24, $f20 /* CB9E60 80240C60 44804000 */ mtc1 $zero, $f8 /* CB9E64 80240C64 4600B686 */ mov.s $f26, $f22 @@ -130,23 +130,23 @@ glabel func_80240A98_CB9C98 .L80240C88: /* CB9E88 80240C88 C7A20028 */ lwc1 $f2, 0x28($sp) /* CB9E8C 80240C8C 4614103C */ c.lt.s $f2, $f20 -/* CB9E90 80240C90 00000000 */ nop +/* CB9E90 80240C90 00000000 */ nop /* CB9E94 80240C94 45030001 */ bc1tl .L80240C9C /* CB9E98 80240C98 46001606 */ mov.s $f24, $f2 .L80240C9C: /* CB9E9C 80240C9C C7A0002C */ lwc1 $f0, 0x2c($sp) /* CB9EA0 80240CA0 4616003C */ c.lt.s $f0, $f22 -/* CB9EA4 80240CA4 00000000 */ nop +/* CB9EA4 80240CA4 00000000 */ nop /* CB9EA8 80240CA8 45030001 */ bc1tl .L80240CB0 /* CB9EAC 80240CAC 46000686 */ mov.s $f26, $f0 .L80240CB0: /* CB9EB0 80240CB0 4602A03C */ c.lt.s $f20, $f2 -/* CB9EB4 80240CB4 00000000 */ nop +/* CB9EB4 80240CB4 00000000 */ nop /* CB9EB8 80240CB8 45030001 */ bc1tl .L80240CC0 /* CB9EBC 80240CBC 46001506 */ mov.s $f20, $f2 .L80240CC0: /* CB9EC0 80240CC0 4600B03C */ c.lt.s $f22, $f0 -/* CB9EC4 80240CC4 00000000 */ nop +/* CB9EC4 80240CC4 00000000 */ nop /* CB9EC8 80240CC8 45030001 */ bc1tl .L80240CD0 /* CB9ECC 80240CCC 46000586 */ mov.s $f22, $f0 .L80240CD0: @@ -169,16 +169,16 @@ glabel func_80240A98_CB9C98 /* CB9F10 80240D10 C7A60028 */ lwc1 $f6, 0x28($sp) /* CB9F14 80240D14 4600E003 */ div.s $f0, $f28, $f0 /* CB9F18 80240D18 46003182 */ mul.s $f6, $f6, $f0 -/* CB9F1C 80240D1C 00000000 */ nop +/* CB9F1C 80240D1C 00000000 */ nop /* CB9F20 80240D20 C7A4002C */ lwc1 $f4, 0x2c($sp) /* CB9F24 80240D24 46000087 */ neg.s $f2, $f0 /* CB9F28 80240D28 46022102 */ mul.s $f4, $f4, $f2 -/* CB9F2C 80240D2C 00000000 */ nop +/* CB9F2C 80240D2C 00000000 */ nop /* CB9F30 80240D30 C7A20030 */ lwc1 $f2, 0x30($sp) /* CB9F34 80240D34 46001082 */ mul.s $f2, $f2, $f0 -/* CB9F38 80240D38 00000000 */ nop +/* CB9F38 80240D38 00000000 */ nop /* CB9F3C 80240D3C 44804000 */ mtc1 $zero, $f8 -/* CB9F40 80240D40 00000000 */ nop +/* CB9F40 80240D40 00000000 */ nop /* CB9F44 80240D44 4608003C */ c.lt.s $f0, $f8 /* CB9F48 80240D48 E7A00034 */ swc1 $f0, 0x34($sp) /* CB9F4C 80240D4C E7A60028 */ swc1 $f6, 0x28($sp) @@ -190,23 +190,23 @@ glabel func_80240A98_CB9C98 .L80240D64: /* CB9F64 80240D64 C7A20028 */ lwc1 $f2, 0x28($sp) /* CB9F68 80240D68 4618103C */ c.lt.s $f2, $f24 -/* CB9F6C 80240D6C 00000000 */ nop +/* CB9F6C 80240D6C 00000000 */ nop /* CB9F70 80240D70 45030001 */ bc1tl .L80240D78 /* CB9F74 80240D74 46001606 */ mov.s $f24, $f2 .L80240D78: /* CB9F78 80240D78 C7A0002C */ lwc1 $f0, 0x2c($sp) /* CB9F7C 80240D7C 461A003C */ c.lt.s $f0, $f26 -/* CB9F80 80240D80 00000000 */ nop +/* CB9F80 80240D80 00000000 */ nop /* CB9F84 80240D84 45030001 */ bc1tl .L80240D8C /* CB9F88 80240D88 46000686 */ mov.s $f26, $f0 .L80240D8C: /* CB9F8C 80240D8C 4602A03C */ c.lt.s $f20, $f2 -/* CB9F90 80240D90 00000000 */ nop +/* CB9F90 80240D90 00000000 */ nop /* CB9F94 80240D94 45030001 */ bc1tl .L80240D9C /* CB9F98 80240D98 46001506 */ mov.s $f20, $f2 .L80240D9C: /* CB9F9C 80240D9C 4600B03C */ c.lt.s $f22, $f0 -/* CB9FA0 80240DA0 00000000 */ nop +/* CB9FA0 80240DA0 00000000 */ nop /* CB9FA4 80240DA4 45030001 */ bc1tl .L80240DAC /* CB9FA8 80240DA8 46000586 */ mov.s $f22, $f0 .L80240DAC: @@ -229,16 +229,16 @@ glabel func_80240A98_CB9C98 /* CB9FEC 80240DEC C7A60028 */ lwc1 $f6, 0x28($sp) /* CB9FF0 80240DF0 4600E003 */ div.s $f0, $f28, $f0 /* CB9FF4 80240DF4 46003182 */ mul.s $f6, $f6, $f0 -/* CB9FF8 80240DF8 00000000 */ nop +/* CB9FF8 80240DF8 00000000 */ nop /* CB9FFC 80240DFC C7A4002C */ lwc1 $f4, 0x2c($sp) /* CBA000 80240E00 46000087 */ neg.s $f2, $f0 /* CBA004 80240E04 46022102 */ mul.s $f4, $f4, $f2 -/* CBA008 80240E08 00000000 */ nop +/* CBA008 80240E08 00000000 */ nop /* CBA00C 80240E0C C7A20030 */ lwc1 $f2, 0x30($sp) /* CBA010 80240E10 46001082 */ mul.s $f2, $f2, $f0 -/* CBA014 80240E14 00000000 */ nop +/* CBA014 80240E14 00000000 */ nop /* CBA018 80240E18 44804000 */ mtc1 $zero, $f8 -/* CBA01C 80240E1C 00000000 */ nop +/* CBA01C 80240E1C 00000000 */ nop /* CBA020 80240E20 4608003C */ c.lt.s $f0, $f8 /* CBA024 80240E24 E7A00034 */ swc1 $f0, 0x34($sp) /* CBA028 80240E28 E7A60028 */ swc1 $f6, 0x28($sp) @@ -250,64 +250,64 @@ glabel func_80240A98_CB9C98 .L80240E40: /* CBA040 80240E40 C7A20028 */ lwc1 $f2, 0x28($sp) /* CBA044 80240E44 4618103C */ c.lt.s $f2, $f24 -/* CBA048 80240E48 00000000 */ nop +/* CBA048 80240E48 00000000 */ nop /* CBA04C 80240E4C 45030001 */ bc1tl .L80240E54 /* CBA050 80240E50 46001606 */ mov.s $f24, $f2 .L80240E54: /* CBA054 80240E54 C7A0002C */ lwc1 $f0, 0x2c($sp) /* CBA058 80240E58 461A003C */ c.lt.s $f0, $f26 -/* CBA05C 80240E5C 00000000 */ nop +/* CBA05C 80240E5C 00000000 */ nop /* CBA060 80240E60 45030001 */ bc1tl .L80240E68 /* CBA064 80240E64 46000686 */ mov.s $f26, $f0 .L80240E68: /* CBA068 80240E68 4602A03C */ c.lt.s $f20, $f2 -/* CBA06C 80240E6C 00000000 */ nop +/* CBA06C 80240E6C 00000000 */ nop /* CBA070 80240E70 45030001 */ bc1tl .L80240E78 /* CBA074 80240E74 46001506 */ mov.s $f20, $f2 .L80240E78: /* CBA078 80240E78 4600B03C */ c.lt.s $f22, $f0 -/* CBA07C 80240E7C 00000000 */ nop +/* CBA07C 80240E7C 00000000 */ nop /* CBA080 80240E80 45030001 */ bc1tl .L80240E88 /* CBA084 80240E84 46000586 */ mov.s $f22, $f0 .L80240E88: /* CBA088 80240E88 4614C032 */ c.eq.s $f24, $f20 -/* CBA08C 80240E8C 00000000 */ nop +/* CBA08C 80240E8C 00000000 */ nop /* CBA090 80240E90 45000005 */ bc1f .L80240EA8 -/* CBA094 80240E94 00000000 */ nop +/* CBA094 80240E94 00000000 */ nop /* CBA098 80240E98 4616D032 */ c.eq.s $f26, $f22 -/* CBA09C 80240E9C 00000000 */ nop +/* CBA09C 80240E9C 00000000 */ nop /* CBA0A0 80240EA0 450100CE */ bc1t .L802411DC -/* CBA0A4 80240EA4 00000000 */ nop +/* CBA0A4 80240EA4 00000000 */ nop .L80240EA8: /* CBA0A8 80240EA8 86E2000A */ lh $v0, 0xa($s7) /* CBA0AC 80240EAC 44821000 */ mtc1 $v0, $f2 -/* CBA0B0 80240EB0 00000000 */ nop +/* CBA0B0 80240EB0 00000000 */ nop /* CBA0B4 80240EB4 468010A0 */ cvt.s.w $f2, $f2 /* CBA0B8 80240EB8 4602C002 */ mul.s $f0, $f24, $f2 -/* CBA0BC 80240EBC 00000000 */ nop +/* CBA0BC 80240EBC 00000000 */ nop /* CBA0C0 80240EC0 46020000 */ add.s $f0, $f0, $f2 /* CBA0C4 80240EC4 3C013F00 */ lui $at, 0x3f00 /* CBA0C8 80240EC8 44813000 */ mtc1 $at, $f6 -/* CBA0CC 80240ECC 00000000 */ nop +/* CBA0CC 80240ECC 00000000 */ nop /* CBA0D0 80240ED0 46060602 */ mul.s $f24, $f0, $f6 -/* CBA0D4 80240ED4 00000000 */ nop +/* CBA0D4 80240ED4 00000000 */ nop /* CBA0D8 80240ED8 86E2000C */ lh $v0, 0xc($s7) /* CBA0DC 80240EDC 44822000 */ mtc1 $v0, $f4 -/* CBA0E0 80240EE0 00000000 */ nop +/* CBA0E0 80240EE0 00000000 */ nop /* CBA0E4 80240EE4 46802120 */ cvt.s.w $f4, $f4 /* CBA0E8 80240EE8 4604D002 */ mul.s $f0, $f26, $f4 -/* CBA0EC 80240EEC 00000000 */ nop +/* CBA0EC 80240EEC 00000000 */ nop /* CBA0F0 80240EF0 46040000 */ add.s $f0, $f0, $f4 /* CBA0F4 80240EF4 3C18E300 */ lui $t8, 0xe300 /* CBA0F8 80240EF8 37180A01 */ ori $t8, $t8, 0xa01 /* CBA0FC 80240EFC 46060682 */ mul.s $f26, $f0, $f6 -/* CBA100 80240F00 00000000 */ nop +/* CBA100 80240F00 00000000 */ nop /* CBA104 80240F04 3C14E200 */ lui $s4, 0xe200 /* CBA108 80240F08 3694001C */ ori $s4, $s4, 0x1c /* CBA10C 80240F0C 3C060F0A */ lui $a2, 0xf0a /* CBA110 80240F10 34C64010 */ ori $a2, $a2, 0x4010 /* CBA114 80240F14 4602A002 */ mul.s $f0, $f20, $f2 -/* CBA118 80240F18 00000000 */ nop +/* CBA118 80240F18 00000000 */ nop /* CBA11C 80240F1C 3C13FF10 */ lui $s3, 0xff10 /* CBA120 80240F20 3673013F */ ori $s3, $s3, 0x13f /* CBA124 80240F24 3C15FCFF */ lui $s5, 0xfcff @@ -316,15 +316,15 @@ glabel func_80240A98_CB9C98 /* CBA130 80240F30 3C16E200 */ lui $s6, 0xe200 /* CBA134 80240F34 36D61D00 */ ori $s6, $s6, 0x1d00 /* CBA138 80240F38 46060502 */ mul.s $f20, $f0, $f6 -/* CBA13C 80240F3C 00000000 */ nop +/* CBA13C 80240F3C 00000000 */ nop /* CBA140 80240F40 3C04800A */ lui $a0, %hi(nuGfxZBuffer) /* CBA144 80240F44 8C84A5DC */ lw $a0, %lo(nuGfxZBuffer)($a0) -/* CBA148 80240F48 3C12800A */ lui $s2, %hi(D_8009A66C) -/* CBA14C 80240F4C 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* CBA148 80240F48 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* CBA14C 80240F4C 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* CBA150 80240F50 AFB8003C */ sw $t8, 0x3c($sp) /* CBA154 80240F54 8E510000 */ lw $s1, ($s2) /* CBA158 80240F58 4604B002 */ mul.s $f0, $f22, $f4 -/* CBA15C 80240F5C 00000000 */ nop +/* CBA15C 80240F5C 00000000 */ nop /* CBA160 80240F60 86E3000E */ lh $v1, 0xe($s7) /* CBA164 80240F64 86E50010 */ lh $a1, 0x10($s7) /* CBA168 80240F68 0220102D */ daddu $v0, $s1, $zero @@ -333,17 +333,17 @@ glabel func_80240A98_CB9C98 /* CBA174 80240F74 AE510000 */ sw $s1, ($s2) /* CBA178 80240F78 AC580000 */ sw $t8, ($v0) /* CBA17C 80240F7C 46060582 */ mul.s $f22, $f0, $f6 -/* CBA180 80240F80 00000000 */ nop +/* CBA180 80240F80 00000000 */ nop /* CBA184 80240F84 AC400004 */ sw $zero, 4($v0) /* CBA188 80240F88 26220008 */ addiu $v0, $s1, 8 /* CBA18C 80240F8C AE420000 */ sw $v0, ($s2) /* CBA190 80240F90 44851000 */ mtc1 $a1, $f2 -/* CBA194 80240F94 00000000 */ nop +/* CBA194 80240F94 00000000 */ nop /* CBA198 80240F98 468010A0 */ cvt.s.w $f2, $f2 /* CBA19C 80240F9C 4602D680 */ add.s $f26, $f26, $f2 /* CBA1A0 80240FA0 26220010 */ addiu $v0, $s1, 0x10 /* CBA1A4 80240FA4 44830000 */ mtc1 $v1, $f0 -/* CBA1A8 80240FA8 00000000 */ nop +/* CBA1A8 80240FA8 00000000 */ nop /* CBA1AC 80240FAC 46800020 */ cvt.s.w $f0, $f0 /* CBA1B0 80240FB0 4600C600 */ add.s $f24, $f24, $f0 /* CBA1B4 80240FB4 AE340000 */ sw $s4, ($s1) @@ -503,6 +503,6 @@ glabel func_80240A98_CB9C98 /* CBA418 80241218 D7B40068 */ ldc1 $f20, 0x68($sp) /* CBA41C 8024121C 03E00008 */ jr $ra /* CBA420 80241220 27BD0098 */ addiu $sp, $sp, 0x98 -/* CBA424 80241224 00000000 */ nop -/* CBA428 80241228 00000000 */ nop -/* CBA42C 8024122C 00000000 */ nop +/* CBA424 80241224 00000000 */ nop +/* CBA428 80241228 00000000 */ nop +/* CBA42C 8024122C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240504_CCB814.s b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240504_CCB814.s index 0a935856b6..ff0fd594fc 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240504_CCB814.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240504_CCB814.s @@ -20,7 +20,7 @@ glabel func_80240504_CCB814 /* CCB850 80240540 D4345320 */ ldc1 $f20, %lo(D_80245320)($at) /* CCB854 80240544 46000021 */ cvt.d.s $f0, $f0 /* CCB858 80240548 46340002 */ mul.d $f0, $f0, $f20 -/* CCB85C 8024054C 00000000 */ nop +/* CCB85C 8024054C 00000000 */ nop /* CCB860 80240550 3C018024 */ lui $at, %hi(D_80245328) /* CCB864 80240554 D4365328 */ ldc1 $f22, %lo(D_80245328)($at) /* CCB868 80240558 C6020000 */ lwc1 $f2, ($s0) @@ -33,18 +33,18 @@ glabel func_80240504_CCB814 /* CCB884 80240574 E7A00010 */ swc1 $f0, 0x10($sp) /* CCB888 80240578 46000021 */ cvt.d.s $f0, $f0 /* CCB88C 8024057C 46340002 */ mul.d $f0, $f0, $f20 -/* CCB890 80240580 00000000 */ nop +/* CCB890 80240580 00000000 */ nop /* CCB894 80240584 C6020000 */ lwc1 $f2, ($s0) /* CCB898 80240588 3C014150 */ lui $at, 0x4150 /* CCB89C 8024058C 44816000 */ mtc1 $at, $f12 -/* CCB8A0 80240590 00000000 */ nop +/* CCB8A0 80240590 00000000 */ nop /* CCB8A4 80240594 460C1303 */ div.s $f12, $f2, $f12 /* CCB8A8 80240598 46200020 */ cvt.s.d $f0, $f0 /* CCB8AC 8024059C 0C00A874 */ jal cos_rad /* CCB8B0 802405A0 E7A00014 */ swc1 $f0, 0x14($sp) /* CCB8B4 802405A4 46000021 */ cvt.d.s $f0, $f0 /* CCB8B8 802405A8 46340002 */ mul.d $f0, $f0, $f20 -/* CCB8BC 802405AC 00000000 */ nop +/* CCB8BC 802405AC 00000000 */ nop /* CCB8C0 802405B0 C60C0000 */ lwc1 $f12, ($s0) /* CCB8C4 802405B4 3C0140E0 */ lui $at, 0x40e0 /* CCB8C8 802405B8 44811000 */ mtc1 $at, $f2 @@ -57,7 +57,7 @@ glabel func_80240504_CCB814 /* CCB8E4 802405D4 E7A00018 */ swc1 $f0, 0x18($sp) /* CCB8E8 802405D8 46000021 */ cvt.d.s $f0, $f0 /* CCB8EC 802405DC 46340002 */ mul.d $f0, $f0, $f20 -/* CCB8F0 802405E0 00000000 */ nop +/* CCB8F0 802405E0 00000000 */ nop /* CCB8F4 802405E4 C6020000 */ lwc1 $f2, ($s0) /* CCB8F8 802405E8 3C014160 */ lui $at, 0x4160 /* CCB8FC 802405EC 44816000 */ mtc1 $at, $f12 @@ -68,51 +68,51 @@ glabel func_80240504_CCB814 /* CCB910 80240600 E7A00024 */ swc1 $f0, 0x24($sp) /* CCB914 80240604 46000021 */ cvt.d.s $f0, $f0 /* CCB918 80240608 46340002 */ mul.d $f0, $f0, $f20 -/* CCB91C 8024060C 00000000 */ nop +/* CCB91C 8024060C 00000000 */ nop /* CCB920 80240610 C6020000 */ lwc1 $f2, ($s0) /* CCB924 80240614 3C014170 */ lui $at, 0x4170 /* CCB928 80240618 44816000 */ mtc1 $at, $f12 -/* CCB92C 8024061C 00000000 */ nop +/* CCB92C 8024061C 00000000 */ nop /* CCB930 80240620 460C1303 */ div.s $f12, $f2, $f12 /* CCB934 80240624 46200020 */ cvt.s.d $f0, $f0 /* CCB938 80240628 0C00A874 */ jal cos_rad /* CCB93C 8024062C E7A00020 */ swc1 $f0, 0x20($sp) /* CCB940 80240630 46000021 */ cvt.d.s $f0, $f0 /* CCB944 80240634 46340002 */ mul.d $f0, $f0, $f20 -/* CCB948 80240638 00000000 */ nop +/* CCB948 80240638 00000000 */ nop /* CCB94C 8024063C C60C0000 */ lwc1 $f12, ($s0) /* CCB950 80240640 3C013E80 */ lui $at, 0x3e80 /* CCB954 80240644 44811000 */ mtc1 $at, $f2 -/* CCB958 80240648 00000000 */ nop +/* CCB958 80240648 00000000 */ nop /* CCB95C 8024064C 46026302 */ mul.s $f12, $f12, $f2 -/* CCB960 80240650 00000000 */ nop +/* CCB960 80240650 00000000 */ nop /* CCB964 80240654 3C014000 */ lui $at, 0x4000 /* CCB968 80240658 44811000 */ mtc1 $at, $f2 -/* CCB96C 8024065C 00000000 */ nop +/* CCB96C 8024065C 00000000 */ nop /* CCB970 80240660 46026300 */ add.s $f12, $f12, $f2 /* CCB974 80240664 46200020 */ cvt.s.d $f0, $f0 /* CCB978 80240668 0C00A85B */ jal sin_rad /* CCB97C 8024066C E7A00028 */ swc1 $f0, 0x28($sp) /* CCB980 80240670 46000021 */ cvt.d.s $f0, $f0 /* CCB984 80240674 46340002 */ mul.d $f0, $f0, $f20 -/* CCB988 80240678 00000000 */ nop +/* CCB988 80240678 00000000 */ nop /* CCB98C 8024067C C6020000 */ lwc1 $f2, ($s0) /* CCB990 80240680 3C013D80 */ lui $at, 0x3d80 /* CCB994 80240684 44816000 */ mtc1 $at, $f12 -/* CCB998 80240688 00000000 */ nop +/* CCB998 80240688 00000000 */ nop /* CCB99C 8024068C 460C1302 */ mul.s $f12, $f2, $f12 -/* CCB9A0 80240690 00000000 */ nop +/* CCB9A0 80240690 00000000 */ nop /* CCB9A4 80240694 46360000 */ add.d $f0, $f0, $f22 /* CCB9A8 80240698 46200020 */ cvt.s.d $f0, $f0 /* CCB9AC 8024069C 0C00A85B */ jal sin_rad /* CCB9B0 802406A0 E7A00038 */ swc1 $f0, 0x38($sp) /* CCB9B4 802406A4 46000021 */ cvt.d.s $f0, $f0 /* CCB9B8 802406A8 46340002 */ mul.d $f0, $f0, $f20 -/* CCB9BC 802406AC 00000000 */ nop +/* CCB9BC 802406AC 00000000 */ nop /* CCB9C0 802406B0 C6020000 */ lwc1 $f2, ($s0) /* CCB9C4 802406B4 3C014188 */ lui $at, 0x4188 /* CCB9C8 802406B8 44816000 */ mtc1 $at, $f12 -/* CCB9CC 802406BC 00000000 */ nop +/* CCB9CC 802406BC 00000000 */ nop /* CCB9D0 802406C0 460C1303 */ div.s $f12, $f2, $f12 /* CCB9D4 802406C4 46200020 */ cvt.s.d $f0, $f0 /* CCB9D8 802406C8 0C00A874 */ jal cos_rad @@ -120,13 +120,13 @@ glabel func_80240504_CCB814 /* CCB9E0 802406D0 3C030001 */ lui $v1, 1 /* CCB9E4 802406D4 46000021 */ cvt.d.s $f0, $f0 /* CCB9E8 802406D8 46340002 */ mul.d $f0, $f0, $f20 -/* CCB9EC 802406DC 00000000 */ nop +/* CCB9EC 802406DC 00000000 */ nop /* CCB9F0 802406E0 34631630 */ ori $v1, $v1, 0x1630 /* CCB9F4 802406E4 27A40010 */ addiu $a0, $sp, 0x10 -/* CCB9F8 802406E8 3C058007 */ lui $a1, %hi(D_800741F0) -/* CCB9FC 802406EC 94A541F0 */ lhu $a1, %lo(D_800741F0)($a1) -/* CCBA00 802406F0 3C02800A */ lui $v0, %hi(D_8009A674) -/* CCBA04 802406F4 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) +/* CCB9F8 802406E8 3C058007 */ lui $a1, %hi(gMatrixListPos) +/* CCB9FC 802406EC 94A541F0 */ lhu $a1, %lo(gMatrixListPos)($a1) +/* CCBA00 802406F0 3C02800A */ lui $v0, %hi(gDisplayContext) +/* CCBA04 802406F4 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) /* CCBA08 802406F8 00052980 */ sll $a1, $a1, 6 /* CCBA0C 802406FC 00A32821 */ addu $a1, $a1, $v1 /* CCBA10 80240700 00452821 */ addu $a1, $v0, $a1 @@ -142,11 +142,11 @@ glabel func_80240504_CCB814 /* CCBA38 80240728 34630001 */ ori $v1, $v1, 1 /* CCBA3C 8024072C 3C080001 */ lui $t0, 1 /* CCBA40 80240730 35081630 */ ori $t0, $t0, 0x1630 -/* CCBA44 80240734 3C06800A */ lui $a2, %hi(D_8009A66C) -/* CCBA48 80240738 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* CCBA44 80240734 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* CCBA48 80240738 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* CCBA4C 8024073C 0000202D */ daddu $a0, $zero, $zero -/* CCBA50 80240740 3C058007 */ lui $a1, %hi(D_800741F0) -/* CCBA54 80240744 24A541F0 */ addiu $a1, $a1, %lo(D_800741F0) +/* CCBA50 80240740 3C058007 */ lui $a1, %hi(gMatrixListPos) +/* CCBA54 80240744 24A541F0 */ addiu $a1, $a1, %lo(gMatrixListPos) /* CCBA58 80240748 8CD00000 */ lw $s0, ($a2) /* CCBA5C 8024074C 94A20000 */ lhu $v0, ($a1) /* CCBA60 80240750 0200382D */ daddu $a3, $s0, $zero @@ -157,8 +157,8 @@ glabel func_80240504_CCB814 /* CCBA74 80240764 3042FFFF */ andi $v0, $v0, 0xffff /* CCBA78 80240768 00021180 */ sll $v0, $v0, 6 /* CCBA7C 8024076C A4A30000 */ sh $v1, ($a1) -/* CCBA80 80240770 3C03800A */ lui $v1, %hi(D_8009A674) -/* CCBA84 80240774 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* CCBA80 80240770 3C03800A */ lui $v1, %hi(gDisplayContext) +/* CCBA84 80240774 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* CCBA88 80240778 00481021 */ addu $v0, $v0, $t0 /* CCBA8C 8024077C 00621821 */ addu $v1, $v1, $v0 /* CCBA90 80240780 26020008 */ addiu $v0, $s0, 8 @@ -172,7 +172,7 @@ glabel func_80240504_CCB814 /* CCBAB0 802407A0 C4600000 */ lwc1 $f0, ($v1) /* CCBAB4 802407A4 3C013F80 */ lui $at, 0x3f80 /* CCBAB8 802407A8 44811000 */ mtc1 $at, $f2 -/* CCBABC 802407AC 00000000 */ nop +/* CCBABC 802407AC 00000000 */ nop /* CCBAC0 802407B0 46020000 */ add.s $f0, $f0, $f2 /* CCBAC4 802407B4 AE020004 */ sw $v0, 4($s0) /* CCBAC8 802407B8 E4600000 */ swc1 $f0, ($v1) diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802407D4_CCBAE4.s b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802407D4_CCBAE4.s index 3ef50ac48a..dde828ce07 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802407D4_CCBAE4.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802407D4_CCBAE4.s @@ -42,7 +42,7 @@ glabel func_802407D4_CCBAE4 /* CCBB74 80240864 461A6303 */ div.s $f12, $f12, $f26 /* CCBB78 80240868 46006321 */ cvt.d.s $f12, $f12 /* CCBB7C 8024086C 46386302 */ mul.d $f12, $f12, $f24 -/* CCBB80 80240870 00000000 */ nop +/* CCBB80 80240870 00000000 */ nop /* CCBB84 80240874 0C00A85B */ jal sin_rad /* CCBB88 80240878 46206320 */ cvt.s.d $f12, $f12 /* CCBB8C 8024087C C66C0000 */ lwc1 $f12, ($s3) @@ -50,12 +50,12 @@ glabel func_802407D4_CCBAE4 /* CCBB94 80240884 461A6303 */ div.s $f12, $f12, $f26 /* CCBB98 80240888 46006321 */ cvt.d.s $f12, $f12 /* CCBB9C 8024088C 46386302 */ mul.d $f12, $f12, $f24 -/* CCBBA0 80240890 00000000 */ nop +/* CCBBA0 80240890 00000000 */ nop /* CCBBA4 80240894 3C018024 */ lui $at, %hi(D_80245340) /* CCBBA8 80240898 D4225340 */ ldc1 $f2, %lo(D_80245340)($at) /* CCBBAC 8024089C 46000521 */ cvt.d.s $f20, $f0 /* CCBBB0 802408A0 4622A502 */ mul.d $f20, $f20, $f2 -/* CCBBB4 802408A4 00000000 */ nop +/* CCBBB4 802408A4 00000000 */ nop /* CCBBB8 802408A8 3C018024 */ lui $at, %hi(D_80245348) /* CCBBBC 802408AC D4205348 */ ldc1 $f0, %lo(D_80245348)($at) /* CCBBC0 802408B0 4620A500 */ add.d $f20, $f20, $f0 @@ -64,70 +64,70 @@ glabel func_802407D4_CCBAE4 /* CCBBCC 802408BC 4620A520 */ cvt.s.d $f20, $f20 /* CCBBD0 802408C0 46000021 */ cvt.d.s $f0, $f0 /* CCBBD4 802408C4 46360002 */ mul.d $f0, $f0, $f22 -/* CCBBD8 802408C8 00000000 */ nop +/* CCBBD8 802408C8 00000000 */ nop /* CCBBDC 802408CC 86020000 */ lh $v0, ($s0) /* CCBBE0 802408D0 2442FD98 */ addiu $v0, $v0, -0x268 /* CCBBE4 802408D4 44822000 */ mtc1 $v0, $f4 -/* CCBBE8 802408D8 00000000 */ nop +/* CCBBE8 802408D8 00000000 */ nop /* CCBBEC 802408DC 46802120 */ cvt.s.w $f4, $f4 /* CCBBF0 802408E0 46142102 */ mul.s $f4, $f4, $f20 -/* CCBBF4 802408E4 00000000 */ nop +/* CCBBF4 802408E4 00000000 */ nop /* CCBBF8 802408E8 4620B001 */ sub.d $f0, $f22, $f0 /* CCBBFC 802408EC 3C01C240 */ lui $at, 0xc240 /* CCBC00 802408F0 44813000 */ mtc1 $at, $f6 /* CCBC04 802408F4 46200020 */ cvt.s.d $f0, $f0 /* CCBC08 802408F8 46060182 */ mul.s $f6, $f0, $f6 -/* CCBC0C 802408FC 00000000 */ nop +/* CCBC0C 802408FC 00000000 */ nop /* CCBC10 80240900 3C01441A */ lui $at, 0x441a /* CCBC14 80240904 44811000 */ mtc1 $at, $f2 -/* CCBC18 80240908 00000000 */ nop +/* CCBC18 80240908 00000000 */ nop /* CCBC1C 8024090C 46022100 */ add.s $f4, $f4, $f2 /* CCBC20 80240910 46062100 */ add.s $f4, $f4, $f6 /* CCBC24 80240914 3C0141C8 */ lui $at, 0x41c8 /* CCBC28 80240918 44813000 */ mtc1 $at, $f6 -/* CCBC2C 8024091C 00000000 */ nop +/* CCBC2C 8024091C 00000000 */ nop /* CCBC30 80240920 46060182 */ mul.s $f6, $f0, $f6 -/* CCBC34 80240924 00000000 */ nop +/* CCBC34 80240924 00000000 */ nop /* CCBC38 80240928 4600220D */ trunc.w.s $f8, $f4 /* CCBC3C 8024092C 44024000 */ mfc1 $v0, $f8 -/* CCBC40 80240930 00000000 */ nop +/* CCBC40 80240930 00000000 */ nop /* CCBC44 80240934 A6220000 */ sh $v0, ($s1) /* CCBC48 80240938 86020002 */ lh $v0, 2($s0) /* CCBC4C 8024093C 2442FFD4 */ addiu $v0, $v0, -0x2c /* CCBC50 80240940 44821000 */ mtc1 $v0, $f2 -/* CCBC54 80240944 00000000 */ nop +/* CCBC54 80240944 00000000 */ nop /* CCBC58 80240948 468010A0 */ cvt.s.w $f2, $f2 /* CCBC5C 8024094C 46141082 */ mul.s $f2, $f2, $f20 -/* CCBC60 80240950 00000000 */ nop +/* CCBC60 80240950 00000000 */ nop /* CCBC64 80240954 3C014230 */ lui $at, 0x4230 /* CCBC68 80240958 44812000 */ mtc1 $at, $f4 -/* CCBC6C 8024095C 00000000 */ nop +/* CCBC6C 8024095C 00000000 */ nop /* CCBC70 80240960 46041080 */ add.s $f2, $f2, $f4 /* CCBC74 80240964 46061080 */ add.s $f2, $f2, $f6 /* CCBC78 80240968 3C01C2AE */ lui $at, 0xc2ae /* CCBC7C 8024096C 44812000 */ mtc1 $at, $f4 -/* CCBC80 80240970 00000000 */ nop +/* CCBC80 80240970 00000000 */ nop /* CCBC84 80240974 46040002 */ mul.s $f0, $f0, $f4 -/* CCBC88 80240978 00000000 */ nop +/* CCBC88 80240978 00000000 */ nop /* CCBC8C 8024097C 4600120D */ trunc.w.s $f8, $f2 /* CCBC90 80240980 44024000 */ mfc1 $v0, $f8 -/* CCBC94 80240984 00000000 */ nop +/* CCBC94 80240984 00000000 */ nop /* CCBC98 80240988 A6220002 */ sh $v0, 2($s1) /* CCBC9C 8024098C 86020004 */ lh $v0, 4($s0) /* CCBCA0 80240990 2442FF8F */ addiu $v0, $v0, -0x71 /* CCBCA4 80240994 44821000 */ mtc1 $v0, $f2 -/* CCBCA8 80240998 00000000 */ nop +/* CCBCA8 80240998 00000000 */ nop /* CCBCAC 8024099C 468010A0 */ cvt.s.w $f2, $f2 /* CCBCB0 802409A0 46141082 */ mul.s $f2, $f2, $f20 -/* CCBCB4 802409A4 00000000 */ nop +/* CCBCB4 802409A4 00000000 */ nop /* CCBCB8 802409A8 3C0142E2 */ lui $at, 0x42e2 /* CCBCBC 802409AC 44812000 */ mtc1 $at, $f4 -/* CCBCC0 802409B0 00000000 */ nop +/* CCBCC0 802409B0 00000000 */ nop /* CCBCC4 802409B4 46041080 */ add.s $f2, $f2, $f4 /* CCBCC8 802409B8 46001080 */ add.s $f2, $f2, $f0 /* CCBCCC 802409BC 4600120D */ trunc.w.s $f8, $f2 /* CCBCD0 802409C0 44024000 */ mfc1 $v0, $f8 -/* CCBCD4 802409C4 00000000 */ nop +/* CCBCD4 802409C4 00000000 */ nop /* CCBCD8 802409C8 A6220004 */ sh $v0, 4($s1) .L802409CC: /* CCBCDC 802409CC 8FA20018 */ lw $v0, 0x18($sp) @@ -136,8 +136,8 @@ glabel func_802407D4_CCBAE4 /* CCBCE8 802409D8 1440FF99 */ bnez $v0, .L80240840 /* CCBCEC 802409DC 00122100 */ sll $a0, $s2, 4 .L802409E0: -/* CCBCF0 802409E0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* CCBCF4 802409E4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* CCBCF0 802409E0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* CCBCF4 802409E4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* CCBCF8 802409E8 8C620000 */ lw $v0, ($v1) /* CCBCFC 802409EC 24040001 */ addiu $a0, $zero, 1 /* CCBD00 802409F0 0040802D */ daddu $s0, $v0, $zero @@ -152,7 +152,7 @@ glabel func_802407D4_CCBAE4 /* CCBD24 80240A14 0C0B1EAF */ jal get_variable /* CCBD28 80240A18 AE020004 */ sw $v0, 4($s0) /* CCBD2C 80240A1C 10400017 */ beqz $v0, .L80240A7C -/* CCBD30 80240A20 00000000 */ nop +/* CCBD30 80240A20 00000000 */ nop /* CCBD34 80240A24 3C048024 */ lui $a0, %hi(D_80243B18) /* CCBD38 80240A28 24843B18 */ addiu $a0, $a0, %lo(D_80243B18) /* CCBD3C 80240A2C 8C830000 */ lw $v1, ($a0) @@ -216,6 +216,6 @@ glabel func_802407D4_CCBAE4 /* CCBE08 80240AF8 D7B40038 */ ldc1 $f20, 0x38($sp) /* CCBE0C 80240AFC 03E00008 */ jr $ra /* CCBE10 80240B00 27BD0058 */ addiu $sp, $sp, 0x58 -/* CCBE14 80240B04 00000000 */ nop -/* CCBE18 80240B08 00000000 */ nop -/* CCBE1C 80240B0C 00000000 */ nop +/* CCBE14 80240B04 00000000 */ nop +/* CCBE18 80240B08 00000000 */ nop +/* CCBE1C 80240B0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C930/func_80240C40_A0C930.s b/asm/nonmatchings/world/area_hos/hos_00/A0C930/func_80240C40_A0C930.s index 74615410ea..773cad65a8 100644 --- a/asm/nonmatchings/world/area_hos/hos_00/A0C930/func_80240C40_A0C930.s +++ b/asm/nonmatchings/world/area_hos/hos_00/A0C930/func_80240C40_A0C930.s @@ -19,7 +19,7 @@ glabel func_80240C40_A0C930 /* A0C968 80240C78 AFA20010 */ sw $v0, 0x10($sp) /* A0C96C 80240C7C 4600010D */ trunc.w.s $f4, $f0 /* A0C970 80240C80 44082000 */ mfc1 $t0, $f4 -/* A0C974 80240C84 00000000 */ nop +/* A0C974 80240C84 00000000 */ nop /* A0C978 80240C88 05020001 */ bltzl $t0, .L80240C90 /* A0C97C 80240C8C 0000402D */ daddu $t0, $zero, $zero .L80240C90: @@ -32,8 +32,8 @@ glabel func_80240C40_A0C930 /* A0C994 80240CA4 3C07FCFF */ lui $a3, 0xfcff /* A0C998 80240CA8 34E7C7FF */ ori $a3, $a3, 0xc7ff /* A0C99C 80240CAC 3C06FF8E */ lui $a2, 0xff8e -/* A0C9A0 80240CB0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* A0C9A4 80240CB4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* A0C9A0 80240CB0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* A0C9A4 80240CB4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* A0C9A8 80240CB8 8C820000 */ lw $v0, ($a0) /* A0C9AC 80240CBC 34C67F3F */ ori $a2, $a2, 0x7f3f /* A0C9B0 80240CC0 0040182D */ daddu $v1, $v0, $zero @@ -54,5 +54,5 @@ glabel func_80240C40_A0C930 /* A0C9EC 80240CFC 8FBF0018 */ lw $ra, 0x18($sp) /* A0C9F0 80240D00 03E00008 */ jr $ra /* A0C9F4 80240D04 27BD0020 */ addiu $sp, $sp, 0x20 -/* A0C9F8 80240D08 00000000 */ nop -/* A0C9FC 80240D0C 00000000 */ nop +/* A0C9F8 80240D08 00000000 */ nop +/* A0C9FC 80240D0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240BB8_A11438.s b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240BB8_A11438.s index ba0092bccf..d33ba42179 100644 --- a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240BB8_A11438.s +++ b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240BB8_A11438.s @@ -5,8 +5,8 @@ glabel func_80240BB8_A11438 /* A11438 80240BB8 3C06FC12 */ lui $a2, 0xfc12 /* A1143C 80240BBC 34C61624 */ ori $a2, $a2, 0x1624 /* A11440 80240BC0 3C05FF2F */ lui $a1, 0xff2f -/* A11444 80240BC4 3C04800A */ lui $a0, %hi(D_8009A66C) -/* A11448 80240BC8 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* A11444 80240BC4 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* A11448 80240BC8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* A1144C 80240BCC 8C820000 */ lw $v0, ($a0) /* A11450 80240BD0 34A5FFFF */ ori $a1, $a1, 0xffff /* A11454 80240BD4 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C34_A114B4.s b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C34_A114B4.s index 3aadf0c0f3..20665fb83a 100644 --- a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C34_A114B4.s +++ b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C34_A114B4.s @@ -5,8 +5,8 @@ glabel func_80240C34_A114B4 /* A114B4 80240C34 3C06FC12 */ lui $a2, 0xfc12 /* A114B8 80240C38 34C61624 */ ori $a2, $a2, 0x1624 /* A114BC 80240C3C 3C05FF2F */ lui $a1, 0xff2f -/* A114C0 80240C40 3C04800A */ lui $a0, %hi(D_8009A66C) -/* A114C4 80240C44 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* A114C0 80240C40 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* A114C4 80240C44 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* A114C8 80240C48 8C820000 */ lw $v0, ($a0) /* A114CC 80240C4C 34A5FFFF */ ori $a1, $a1, 0xffff /* A114D0 80240C50 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_8024030C_A1652C.s b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_8024030C_A1652C.s index 290922006a..a2370cb480 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_8024030C_A1652C.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_8024030C_A1652C.s @@ -18,23 +18,23 @@ glabel func_8024030C_A1652C /* A16560 80240340 3C013800 */ lui $at, 0x3800 /* A16564 80240344 44811000 */ mtc1 $at, $f2 /* A16568 80240348 44820000 */ mtc1 $v0, $f0 -/* A1656C 8024034C 00000000 */ nop +/* A1656C 8024034C 00000000 */ nop /* A16570 80240350 46800020 */ cvt.s.w $f0, $f0 /* A16574 80240354 46020002 */ mul.s $f0, $f0, $f2 -/* A16578 80240358 00000000 */ nop +/* A16578 80240358 00000000 */ nop /* A1657C 8024035C 3C013FE0 */ lui $at, 0x3fe0 /* A16580 80240360 44811800 */ mtc1 $at, $f3 /* A16584 80240364 44801000 */ mtc1 $zero, $f2 /* A16588 80240368 46000021 */ cvt.d.s $f0, $f0 /* A1658C 8024036C 46220002 */ mul.d $f0, $f0, $f2 -/* A16590 80240370 00000000 */ nop +/* A16590 80240370 00000000 */ nop /* A16594 80240374 36731630 */ ori $s3, $s3, 0x1630 /* A16598 80240378 46220002 */ mul.d $f0, $f0, $f2 -/* A1659C 8024037C 00000000 */ nop -/* A165A0 80240380 3C12800A */ lui $s2, %hi(D_8009A674) -/* A165A4 80240384 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) -/* A165A8 80240388 3C108007 */ lui $s0, %hi(D_800741F0) -/* A165AC 8024038C 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) +/* A1659C 8024037C 00000000 */ nop +/* A165A0 80240380 3C12800A */ lui $s2, %hi(gDisplayContext) +/* A165A4 80240384 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) +/* A165A8 80240388 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* A165AC 8024038C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) /* A165B0 80240390 96040000 */ lhu $a0, ($s0) /* A165B4 80240394 8E420000 */ lw $v0, ($s2) /* A165B8 80240398 00042180 */ sll $a0, $a0, 6 @@ -52,8 +52,8 @@ glabel func_8024030C_A1652C /* A165E8 802403C8 0C019DC0 */ jal guScale /* A165EC 802403CC 00A0382D */ daddu $a3, $a1, $zero /* A165F0 802403D0 3C05DA38 */ lui $a1, 0xda38 -/* A165F4 802403D4 3C04800A */ lui $a0, %hi(D_8009A66C) -/* A165F8 802403D8 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* A165F4 802403D4 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* A165F8 802403D8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* A165FC 802403DC 34A50001 */ ori $a1, $a1, 1 /* A16600 802403E0 8C830000 */ lw $v1, ($a0) /* A16604 802403E4 96020000 */ lhu $v0, ($s0) diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240434_A16654.s b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240434_A16654.s index fd4953201c..ea8530ec7a 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240434_A16654.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240434_A16654.s @@ -100,8 +100,8 @@ glabel func_80240434_A16654 /* A167C4 802405A4 1440FFB9 */ bnez $v0, .L8024048C /* A167C8 802405A8 02130018 */ mult $s0, $s3 .L802405AC: -/* A167CC 802405AC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* A167D0 802405B0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* A167CC 802405AC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* A167D0 802405B0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* A167D4 802405B4 8C620000 */ lw $v0, ($v1) /* A167D8 802405B8 0000202D */ daddu $a0, $zero, $zero /* A167DC 802405BC 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240610_A16830.s b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240610_A16830.s index ebe806d1d3..7726935905 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240610_A16830.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240610_A16830.s @@ -65,11 +65,11 @@ glabel func_80240610_A16830 /* A16918 802406F8 3C018024 */ lui $at, %hi(pause_tabs_draw_items) /* A1691C 802406FC D4224DE8 */ ldc1 $f2, %lo(pause_tabs_draw_items)($at) /* A16920 80240700 44820000 */ mtc1 $v0, $f0 -/* A16924 80240704 00000000 */ nop +/* A16924 80240704 00000000 */ nop /* A16928 80240708 46800021 */ cvt.d.w $f0, $f0 /* A1692C 8024070C 46220000 */ add.d $f0, $f0, $f2 /* A16930 80240710 4620A03E */ c.le.d $f20, $f0 -/* A16934 80240714 00000000 */ nop +/* A16934 80240714 00000000 */ nop /* A16938 80240718 45030005 */ bc1tl .L80240730 /* A1693C 8024071C 46340001 */ sub.d $f0, $f0, $f20 /* A16940 80240720 4620010D */ trunc.w.d $f4, $f0 @@ -79,7 +79,7 @@ glabel func_80240610_A16830 .L80240730: /* A16950 80240730 4620010D */ trunc.w.d $f4, $f0 /* A16954 80240734 44022000 */ mfc1 $v0, $f4 -/* A16958 80240738 00000000 */ nop +/* A16958 80240738 00000000 */ nop /* A1695C 8024073C 00531025 */ or $v0, $v0, $s3 /* A16960 80240740 A2220000 */ sb $v0, ($s1) .L80240744: @@ -97,11 +97,11 @@ glabel func_80240610_A16830 /* A1698C 8024076C 3C018024 */ lui $at, %hi(D_80244DF0) /* A16990 80240770 D4224DF0 */ ldc1 $f2, %lo(D_80244DF0)($at) /* A16994 80240774 44820000 */ mtc1 $v0, $f0 -/* A16998 80240778 00000000 */ nop +/* A16998 80240778 00000000 */ nop /* A1699C 8024077C 46800021 */ cvt.d.w $f0, $f0 /* A169A0 80240780 46220000 */ add.d $f0, $f0, $f2 /* A169A4 80240784 4620A03E */ c.le.d $f20, $f0 -/* A169A8 80240788 00000000 */ nop +/* A169A8 80240788 00000000 */ nop /* A169AC 8024078C 45030005 */ bc1tl .L802407A4 /* A169B0 80240790 46340001 */ sub.d $f0, $f0, $f20 /* A169B4 80240794 4620010D */ trunc.w.d $f4, $f0 @@ -111,7 +111,7 @@ glabel func_80240610_A16830 .L802407A4: /* A169C4 802407A4 4620010D */ trunc.w.d $f4, $f0 /* A169C8 802407A8 44022000 */ mfc1 $v0, $f4 -/* A169CC 802407AC 00000000 */ nop +/* A169CC 802407AC 00000000 */ nop /* A169D0 802407B0 00531025 */ or $v0, $v0, $s3 /* A169D4 802407B4 A0620000 */ sb $v0, ($v1) .L802407B8: @@ -153,11 +153,11 @@ glabel func_80240610_A16830 /* A16A60 80240840 3C018024 */ lui $at, %hi(D_80244DF8) /* A16A64 80240844 D4224DF8 */ ldc1 $f2, %lo(D_80244DF8)($at) /* A16A68 80240848 44820000 */ mtc1 $v0, $f0 -/* A16A6C 8024084C 00000000 */ nop +/* A16A6C 8024084C 00000000 */ nop /* A16A70 80240850 46800021 */ cvt.d.w $f0, $f0 /* A16A74 80240854 46220000 */ add.d $f0, $f0, $f2 /* A16A78 80240858 4620A03E */ c.le.d $f20, $f0 -/* A16A7C 8024085C 00000000 */ nop +/* A16A7C 8024085C 00000000 */ nop /* A16A80 80240860 45030005 */ bc1tl .L80240878 /* A16A84 80240864 46340001 */ sub.d $f0, $f0, $f20 /* A16A88 80240868 4620010D */ trunc.w.d $f4, $f0 @@ -167,7 +167,7 @@ glabel func_80240610_A16830 .L80240878: /* A16A98 80240878 4620010D */ trunc.w.d $f4, $f0 /* A16A9C 8024087C 44022000 */ mfc1 $v0, $f4 -/* A16AA0 80240880 00000000 */ nop +/* A16AA0 80240880 00000000 */ nop /* A16AA4 80240884 00531025 */ or $v0, $v0, $s3 /* A16AA8 80240888 A0820000 */ sb $v0, ($a0) .L8024088C: @@ -177,8 +177,8 @@ glabel func_80240610_A16830 /* A16AB8 80240898 1440FF75 */ bnez $v0, .L80240670 /* A16ABC 8024089C 02120018 */ mult $s0, $s2 .L802408A0: -/* A16AC0 802408A0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* A16AC4 802408A4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* A16AC0 802408A0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* A16AC4 802408A4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* A16AC8 802408A8 8C620000 */ lw $v0, ($v1) /* A16ACC 802408AC 24040001 */ addiu $a0, $zero, 1 /* A16AD0 802408B0 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240904_A16B24.s b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240904_A16B24.s index de22f52509..2a352594a1 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240904_A16B24.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240904_A16B24.s @@ -65,11 +65,11 @@ glabel func_80240904_A16B24 /* A16C0C 802409EC 3C018024 */ lui $at, %hi(D_80244E00) /* A16C10 802409F0 D4224E00 */ ldc1 $f2, %lo(D_80244E00)($at) /* A16C14 802409F4 44820000 */ mtc1 $v0, $f0 -/* A16C18 802409F8 00000000 */ nop +/* A16C18 802409F8 00000000 */ nop /* A16C1C 802409FC 46800021 */ cvt.d.w $f0, $f0 /* A16C20 80240A00 46220000 */ add.d $f0, $f0, $f2 /* A16C24 80240A04 4620A03E */ c.le.d $f20, $f0 -/* A16C28 80240A08 00000000 */ nop +/* A16C28 80240A08 00000000 */ nop /* A16C2C 80240A0C 45030005 */ bc1tl .L80240A24 /* A16C30 80240A10 46340001 */ sub.d $f0, $f0, $f20 /* A16C34 80240A14 4620010D */ trunc.w.d $f4, $f0 @@ -79,7 +79,7 @@ glabel func_80240904_A16B24 .L80240A24: /* A16C44 80240A24 4620010D */ trunc.w.d $f4, $f0 /* A16C48 80240A28 44022000 */ mfc1 $v0, $f4 -/* A16C4C 80240A2C 00000000 */ nop +/* A16C4C 80240A2C 00000000 */ nop /* A16C50 80240A30 00531025 */ or $v0, $v0, $s3 /* A16C54 80240A34 A2220000 */ sb $v0, ($s1) .L80240A38: @@ -98,11 +98,11 @@ glabel func_80240904_A16B24 /* A16C84 80240A64 44811800 */ mtc1 $at, $f3 /* A16C88 80240A68 44801000 */ mtc1 $zero, $f2 /* A16C8C 80240A6C 44820000 */ mtc1 $v0, $f0 -/* A16C90 80240A70 00000000 */ nop +/* A16C90 80240A70 00000000 */ nop /* A16C94 80240A74 46800021 */ cvt.d.w $f0, $f0 /* A16C98 80240A78 46220000 */ add.d $f0, $f0, $f2 /* A16C9C 80240A7C 4620A03E */ c.le.d $f20, $f0 -/* A16CA0 80240A80 00000000 */ nop +/* A16CA0 80240A80 00000000 */ nop /* A16CA4 80240A84 45030005 */ bc1tl .L80240A9C /* A16CA8 80240A88 46340001 */ sub.d $f0, $f0, $f20 /* A16CAC 80240A8C 4620010D */ trunc.w.d $f4, $f0 @@ -112,7 +112,7 @@ glabel func_80240904_A16B24 .L80240A9C: /* A16CBC 80240A9C 4620010D */ trunc.w.d $f4, $f0 /* A16CC0 80240AA0 44022000 */ mfc1 $v0, $f4 -/* A16CC4 80240AA4 00000000 */ nop +/* A16CC4 80240AA4 00000000 */ nop /* A16CC8 80240AA8 00531025 */ or $v0, $v0, $s3 /* A16CCC 80240AAC A0620000 */ sb $v0, ($v1) .L80240AB0: @@ -154,11 +154,11 @@ glabel func_80240904_A16B24 /* A16D58 80240B38 3C018024 */ lui $at, %hi(D_80244E08) /* A16D5C 80240B3C D4224E08 */ ldc1 $f2, %lo(D_80244E08)($at) /* A16D60 80240B40 44820000 */ mtc1 $v0, $f0 -/* A16D64 80240B44 00000000 */ nop +/* A16D64 80240B44 00000000 */ nop /* A16D68 80240B48 46800021 */ cvt.d.w $f0, $f0 /* A16D6C 80240B4C 46220000 */ add.d $f0, $f0, $f2 /* A16D70 80240B50 4620A03E */ c.le.d $f20, $f0 -/* A16D74 80240B54 00000000 */ nop +/* A16D74 80240B54 00000000 */ nop /* A16D78 80240B58 45030005 */ bc1tl .L80240B70 /* A16D7C 80240B5C 46340001 */ sub.d $f0, $f0, $f20 /* A16D80 80240B60 4620010D */ trunc.w.d $f4, $f0 @@ -168,7 +168,7 @@ glabel func_80240904_A16B24 .L80240B70: /* A16D90 80240B70 4620010D */ trunc.w.d $f4, $f0 /* A16D94 80240B74 44022000 */ mfc1 $v0, $f4 -/* A16D98 80240B78 00000000 */ nop +/* A16D98 80240B78 00000000 */ nop /* A16D9C 80240B7C 00531025 */ or $v0, $v0, $s3 /* A16DA0 80240B80 A0820000 */ sb $v0, ($a0) .L80240B84: @@ -178,8 +178,8 @@ glabel func_80240904_A16B24 /* A16DB0 80240B90 1440FF74 */ bnez $v0, .L80240964 /* A16DB4 80240B94 02120018 */ mult $s0, $s2 .L80240B98: -/* A16DB8 80240B98 3C03800A */ lui $v1, %hi(D_8009A66C) -/* A16DBC 80240B9C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* A16DB8 80240B98 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* A16DBC 80240B9C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* A16DC0 80240BA0 8C620000 */ lw $v0, ($v1) /* A16DC4 80240BA4 24040002 */ addiu $a0, $zero, 2 /* A16DC8 80240BA8 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240BFC_A16E1C.s b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240BFC_A16E1C.s index c13a74d3f5..1f27cfbbf4 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240BFC_A16E1C.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240BFC_A16E1C.s @@ -66,11 +66,11 @@ glabel func_80240BFC_A16E1C /* A16F08 80240CE8 44811800 */ mtc1 $at, $f3 /* A16F0C 80240CEC 44801000 */ mtc1 $zero, $f2 /* A16F10 80240CF0 44820000 */ mtc1 $v0, $f0 -/* A16F14 80240CF4 00000000 */ nop +/* A16F14 80240CF4 00000000 */ nop /* A16F18 80240CF8 46800021 */ cvt.d.w $f0, $f0 /* A16F1C 80240CFC 46220000 */ add.d $f0, $f0, $f2 /* A16F20 80240D00 4620A03E */ c.le.d $f20, $f0 -/* A16F24 80240D04 00000000 */ nop +/* A16F24 80240D04 00000000 */ nop /* A16F28 80240D08 45030005 */ bc1tl .L80240D20 /* A16F2C 80240D0C 46340001 */ sub.d $f0, $f0, $f20 /* A16F30 80240D10 4620010D */ trunc.w.d $f4, $f0 @@ -80,7 +80,7 @@ glabel func_80240BFC_A16E1C .L80240D20: /* A16F40 80240D20 4620010D */ trunc.w.d $f4, $f0 /* A16F44 80240D24 44022000 */ mfc1 $v0, $f4 -/* A16F48 80240D28 00000000 */ nop +/* A16F48 80240D28 00000000 */ nop /* A16F4C 80240D2C 00531025 */ or $v0, $v0, $s3 /* A16F50 80240D30 A2220000 */ sb $v0, ($s1) .L80240D34: @@ -98,11 +98,11 @@ glabel func_80240BFC_A16E1C /* A16F7C 80240D5C 3C018024 */ lui $at, %hi(func_80244E10_805690) /* A16F80 80240D60 D4224E10 */ ldc1 $f2, %lo(func_80244E10_805690)($at) /* A16F84 80240D64 44820000 */ mtc1 $v0, $f0 -/* A16F88 80240D68 00000000 */ nop +/* A16F88 80240D68 00000000 */ nop /* A16F8C 80240D6C 46800021 */ cvt.d.w $f0, $f0 /* A16F90 80240D70 46220000 */ add.d $f0, $f0, $f2 /* A16F94 80240D74 4620A03E */ c.le.d $f20, $f0 -/* A16F98 80240D78 00000000 */ nop +/* A16F98 80240D78 00000000 */ nop /* A16F9C 80240D7C 45030005 */ bc1tl .L80240D94 /* A16FA0 80240D80 46340001 */ sub.d $f0, $f0, $f20 /* A16FA4 80240D84 4620010D */ trunc.w.d $f4, $f0 @@ -112,7 +112,7 @@ glabel func_80240BFC_A16E1C .L80240D94: /* A16FB4 80240D94 4620010D */ trunc.w.d $f4, $f0 /* A16FB8 80240D98 44022000 */ mfc1 $v0, $f4 -/* A16FBC 80240D9C 00000000 */ nop +/* A16FBC 80240D9C 00000000 */ nop /* A16FC0 80240DA0 00531025 */ or $v0, $v0, $s3 /* A16FC4 80240DA4 A0620000 */ sb $v0, ($v1) .L80240DA8: @@ -154,11 +154,11 @@ glabel func_80240BFC_A16E1C /* A17050 80240E30 3C018024 */ lui $at, %hi(D_80244E18) /* A17054 80240E34 D4224E18 */ ldc1 $f2, %lo(D_80244E18)($at) /* A17058 80240E38 44820000 */ mtc1 $v0, $f0 -/* A1705C 80240E3C 00000000 */ nop +/* A1705C 80240E3C 00000000 */ nop /* A17060 80240E40 46800021 */ cvt.d.w $f0, $f0 /* A17064 80240E44 46220000 */ add.d $f0, $f0, $f2 /* A17068 80240E48 4620A03E */ c.le.d $f20, $f0 -/* A1706C 80240E4C 00000000 */ nop +/* A1706C 80240E4C 00000000 */ nop /* A17070 80240E50 45030005 */ bc1tl .L80240E68 /* A17074 80240E54 46340001 */ sub.d $f0, $f0, $f20 /* A17078 80240E58 4620010D */ trunc.w.d $f4, $f0 @@ -168,7 +168,7 @@ glabel func_80240BFC_A16E1C .L80240E68: /* A17088 80240E68 4620010D */ trunc.w.d $f4, $f0 /* A1708C 80240E6C 44022000 */ mfc1 $v0, $f4 -/* A17090 80240E70 00000000 */ nop +/* A17090 80240E70 00000000 */ nop /* A17094 80240E74 00531025 */ or $v0, $v0, $s3 /* A17098 80240E78 A0820000 */ sb $v0, ($a0) .L80240E7C: @@ -178,8 +178,8 @@ glabel func_80240BFC_A16E1C /* A170A8 80240E88 1440FF74 */ bnez $v0, .L80240C5C /* A170AC 80240E8C 02120018 */ mult $s0, $s2 .L80240E90: -/* A170B0 80240E90 3C03800A */ lui $v1, %hi(D_8009A66C) -/* A170B4 80240E94 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* A170B0 80240E90 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* A170B4 80240E94 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* A170B8 80240E98 8C620000 */ lw $v0, ($v1) /* A170BC 80240E9C 24040003 */ addiu $a0, $zero, 3 /* A170C0 80240EA0 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_8024033C_A1B43C.s b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_8024033C_A1B43C.s index 8ce482fb11..8d57e206e6 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_8024033C_A1B43C.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_8024033C_A1B43C.s @@ -19,25 +19,25 @@ glabel func_8024033C_A1B43C /* A1B474 80240374 00021400 */ sll $v0, $v0, 0x10 /* A1B478 80240378 00021403 */ sra $v0, $v0, 0x10 /* A1B47C 8024037C 44821000 */ mtc1 $v0, $f2 -/* A1B480 80240380 00000000 */ nop +/* A1B480 80240380 00000000 */ nop /* A1B484 80240384 468010A0 */ cvt.s.w $f2, $f2 -/* A1B488 80240388 3C12800A */ lui $s2, %hi(D_8009A674) -/* A1B48C 8024038C 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) -/* A1B490 80240390 3C118007 */ lui $s1, %hi(D_800741F0) -/* A1B494 80240394 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) +/* A1B488 80240388 3C12800A */ lui $s2, %hi(gDisplayContext) +/* A1B48C 8024038C 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) +/* A1B490 80240390 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* A1B494 80240394 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) /* A1B498 80240398 3C073F80 */ lui $a3, 0x3f80 /* A1B49C 8024039C 3C013800 */ lui $at, 0x3800 /* A1B4A0 802403A0 44810000 */ mtc1 $at, $f0 /* A1B4A4 802403A4 96240000 */ lhu $a0, ($s1) /* A1B4A8 802403A8 46001082 */ mul.s $f2, $f2, $f0 -/* A1B4AC 802403AC 00000000 */ nop +/* A1B4AC 802403AC 00000000 */ nop /* A1B4B0 802403B0 8E420000 */ lw $v0, ($s2) /* A1B4B4 802403B4 00042180 */ sll $a0, $a0, 6 /* A1B4B8 802403B8 3C014234 */ lui $at, 0x4234 /* A1B4BC 802403BC 44810000 */ mtc1 $at, $f0 /* A1B4C0 802403C0 00932021 */ addu $a0, $a0, $s3 /* A1B4C4 802403C4 46001082 */ mul.s $f2, $f2, $f0 -/* A1B4C8 802403C8 00000000 */ nop +/* A1B4C8 802403C8 00000000 */ nop /* A1B4CC 802403CC 00442021 */ addu $a0, $v0, $a0 /* A1B4D0 802403D0 44800000 */ mtc1 $zero, $f0 /* A1B4D4 802403D4 96020000 */ lhu $v0, ($s0) @@ -52,8 +52,8 @@ glabel func_8024033C_A1B43C /* A1B4F8 802403F8 24040001 */ addiu $a0, $zero, 1 /* A1B4FC 802403FC 27A50018 */ addiu $a1, $sp, 0x18 /* A1B500 80240400 27A6001C */ addiu $a2, $sp, 0x1c -/* A1B504 80240404 3C08800A */ lui $t0, %hi(D_8009A66C) -/* A1B508 80240408 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* A1B504 80240404 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* A1B508 80240408 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* A1B50C 8024040C 27A70020 */ addiu $a3, $sp, 0x20 /* A1B510 80240410 8D030000 */ lw $v1, ($t0) /* A1B514 80240414 96220000 */ lhu $v0, ($s1) @@ -157,8 +157,8 @@ glabel func_8024033C_A1B43C .L80240590: /* A1B690 80240590 3C05D9FF */ lui $a1, 0xd9ff /* A1B694 80240594 34A5F9FF */ ori $a1, $a1, 0xf9ff -/* A1B698 80240598 3C03800A */ lui $v1, %hi(D_8009A66C) -/* A1B69C 8024059C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* A1B698 80240598 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* A1B69C 8024059C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* A1B6A0 802405A0 8C700000 */ lw $s0, ($v1) /* A1B6A4 802405A4 24040001 */ addiu $a0, $zero, 1 /* A1B6A8 802405A8 0200102D */ daddu $v0, $s0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_8024060C_A1B70C.s b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_8024060C_A1B70C.s index b872d57972..9ec2189e2a 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_8024060C_A1B70C.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_8024060C_A1B70C.s @@ -100,8 +100,8 @@ glabel func_8024060C_A1B70C /* A1B87C 8024077C 1440FFB9 */ bnez $v0, .L80240664 /* A1B880 80240780 02130018 */ mult $s0, $s3 .L80240784: -/* A1B884 80240784 3C03800A */ lui $v1, %hi(D_8009A66C) -/* A1B888 80240788 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* A1B884 80240784 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* A1B888 80240788 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* A1B88C 8024078C 8C620000 */ lw $v0, ($v1) /* A1B890 80240790 24040002 */ addiu $a0, $zero, 2 /* A1B894 80240794 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_802407E8_A1B8E8.s b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_802407E8_A1B8E8.s index 30216a0f11..866927bd10 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_802407E8_A1B8E8.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_802407E8_A1B8E8.s @@ -61,8 +61,8 @@ glabel func_802407E8_A1B8E8 /* A1B9C0 802408C0 1480FFDB */ bnez $a0, .L80240830 /* A1B9C4 802408C4 A6430002 */ sh $v1, 2($s2) .L802408C8: -/* A1B9C8 802408C8 3C03800A */ lui $v1, %hi(D_8009A66C) -/* A1B9CC 802408CC 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* A1B9C8 802408C8 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* A1B9CC 802408CC 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* A1B9D0 802408D0 8C620000 */ lw $v0, ($v1) /* A1B9D4 802408D4 0000202D */ daddu $a0, $zero, $zero /* A1B9D8 802408D8 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240928_A1BA28.s b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240928_A1BA28.s index 8ec9ec6768..8e2dfee908 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240928_A1BA28.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240928_A1BA28.s @@ -18,23 +18,23 @@ glabel func_80240928_A1BA28 /* A1BA5C 8024095C 3C013800 */ lui $at, 0x3800 /* A1BA60 80240960 44811000 */ mtc1 $at, $f2 /* A1BA64 80240964 44820000 */ mtc1 $v0, $f0 -/* A1BA68 80240968 00000000 */ nop +/* A1BA68 80240968 00000000 */ nop /* A1BA6C 8024096C 46800020 */ cvt.s.w $f0, $f0 /* A1BA70 80240970 46020002 */ mul.s $f0, $f0, $f2 -/* A1BA74 80240974 00000000 */ nop +/* A1BA74 80240974 00000000 */ nop /* A1BA78 80240978 3C013FE0 */ lui $at, 0x3fe0 /* A1BA7C 8024097C 44811800 */ mtc1 $at, $f3 /* A1BA80 80240980 44801000 */ mtc1 $zero, $f2 /* A1BA84 80240984 46000021 */ cvt.d.s $f0, $f0 /* A1BA88 80240988 46220002 */ mul.d $f0, $f0, $f2 -/* A1BA8C 8024098C 00000000 */ nop +/* A1BA8C 8024098C 00000000 */ nop /* A1BA90 80240990 36731630 */ ori $s3, $s3, 0x1630 /* A1BA94 80240994 46220002 */ mul.d $f0, $f0, $f2 -/* A1BA98 80240998 00000000 */ nop -/* A1BA9C 8024099C 3C12800A */ lui $s2, %hi(D_8009A674) -/* A1BAA0 802409A0 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) -/* A1BAA4 802409A4 3C108007 */ lui $s0, %hi(D_800741F0) -/* A1BAA8 802409A8 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) +/* A1BA98 80240998 00000000 */ nop +/* A1BA9C 8024099C 3C12800A */ lui $s2, %hi(gDisplayContext) +/* A1BAA0 802409A0 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) +/* A1BAA4 802409A4 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* A1BAA8 802409A8 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) /* A1BAAC 802409AC 96040000 */ lhu $a0, ($s0) /* A1BAB0 802409B0 8E420000 */ lw $v0, ($s2) /* A1BAB4 802409B4 00042180 */ sll $a0, $a0, 6 @@ -52,8 +52,8 @@ glabel func_80240928_A1BA28 /* A1BAE4 802409E4 0C019DC0 */ jal guScale /* A1BAE8 802409E8 00A0382D */ daddu $a3, $a1, $zero /* A1BAEC 802409EC 3C05DA38 */ lui $a1, 0xda38 -/* A1BAF0 802409F0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* A1BAF4 802409F4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* A1BAF0 802409F0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* A1BAF4 802409F4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* A1BAF8 802409F8 34A50001 */ ori $a1, $a1, 1 /* A1BAFC 802409FC 8C830000 */ lw $v1, ($a0) /* A1BB00 80240A00 96020000 */ lhu $v0, ($s0) diff --git a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240000_A26ED0.s b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240000_A26ED0.s index 811daf356e..410f33c31b 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240000_A26ED0.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240000_A26ED0.s @@ -14,21 +14,21 @@ glabel func_80240000_A26ED0 /* A26EF4 80240024 3C013D00 */ lui $at, 0x3d00 /* A26EF8 80240028 44810000 */ mtc1 $at, $f0 /* A26EFC 8024002C 44826000 */ mtc1 $v0, $f12 -/* A26F00 80240030 00000000 */ nop +/* A26F00 80240030 00000000 */ nop /* A26F04 80240034 46806320 */ cvt.s.w $f12, $f12 /* A26F08 80240038 46006302 */ mul.s $f12, $f12, $f0 -/* A26F0C 8024003C 00000000 */ nop +/* A26F0C 8024003C 00000000 */ nop /* A26F10 80240040 0C00A85B */ jal sin_rad /* A26F14 80240044 3C130001 */ lui $s3, 1 /* A26F18 80240048 3C013F80 */ lui $at, 0x3f80 /* A26F1C 8024004C 44811000 */ mtc1 $at, $f2 -/* A26F20 80240050 00000000 */ nop +/* A26F20 80240050 00000000 */ nop /* A26F24 80240054 46020000 */ add.s $f0, $f0, $f2 /* A26F28 80240058 3C013E80 */ lui $at, 0x3e80 /* A26F2C 8024005C 44811000 */ mtc1 $at, $f2 -/* A26F30 80240060 00000000 */ nop +/* A26F30 80240060 00000000 */ nop /* A26F34 80240064 46020002 */ mul.s $f0, $f0, $f2 -/* A26F38 80240068 00000000 */ nop +/* A26F38 80240068 00000000 */ nop /* A26F3C 8024006C 3C013FE8 */ lui $at, 0x3fe8 /* A26F40 80240070 44811800 */ mtc1 $at, $f3 /* A26F44 80240074 44801000 */ mtc1 $zero, $f2 @@ -39,12 +39,12 @@ glabel func_80240000_A26ED0 /* A26F58 80240088 46200020 */ cvt.s.d $f0, $f0 /* A26F5C 8024008C 460000A1 */ cvt.d.s $f2, $f0 /* A26F60 80240090 46241082 */ mul.d $f2, $f2, $f4 -/* A26F64 80240094 00000000 */ nop +/* A26F64 80240094 00000000 */ nop /* A26F68 80240098 36731630 */ ori $s3, $s3, 0x1630 -/* A26F6C 8024009C 3C12800A */ lui $s2, %hi(D_8009A674) -/* A26F70 802400A0 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) -/* A26F74 802400A4 3C108007 */ lui $s0, %hi(D_800741F0) -/* A26F78 802400A8 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) +/* A26F6C 8024009C 3C12800A */ lui $s2, %hi(gDisplayContext) +/* A26F70 802400A0 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) +/* A26F74 802400A4 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* A26F78 802400A8 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) /* A26F7C 802400AC 96040000 */ lhu $a0, ($s0) /* A26F80 802400B0 8E420000 */ lw $v0, ($s2) /* A26F84 802400B4 3C013FE0 */ lui $at, 0x3fe0 @@ -60,8 +60,8 @@ glabel func_80240000_A26ED0 /* A26FAC 802400DC 0C019DC0 */ jal guScale /* A26FB0 802400E0 00A0382D */ daddu $a3, $a1, $zero /* A26FB4 802400E4 3C05DA38 */ lui $a1, 0xda38 -/* A26FB8 802400E8 3C04800A */ lui $a0, %hi(D_8009A66C) -/* A26FBC 802400EC 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* A26FB8 802400E8 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* A26FBC 802400EC 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* A26FC0 802400F0 34A50001 */ ori $a1, $a1, 1 /* A26FC4 802400F4 8C820000 */ lw $v0, ($a0) /* A26FC8 802400F8 96030000 */ lhu $v1, ($s0) diff --git a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240154_A27024.s b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240154_A27024.s index 29595191e8..78bf34e703 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240154_A27024.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240154_A27024.s @@ -14,25 +14,25 @@ glabel func_80240154_A27024 /* A27048 80240178 3C013D00 */ lui $at, 0x3d00 /* A2704C 8024017C 44810000 */ mtc1 $at, $f0 /* A27050 80240180 44826000 */ mtc1 $v0, $f12 -/* A27054 80240184 00000000 */ nop +/* A27054 80240184 00000000 */ nop /* A27058 80240188 46806320 */ cvt.s.w $f12, $f12 /* A2705C 8024018C 46006302 */ mul.s $f12, $f12, $f0 -/* A27060 80240190 00000000 */ nop +/* A27060 80240190 00000000 */ nop /* A27064 80240194 0C00A85B */ jal sin_rad /* A27068 80240198 3C120001 */ lui $s2, 1 /* A2706C 8024019C 3C014120 */ lui $at, 0x4120 /* A27070 802401A0 44811000 */ mtc1 $at, $f2 -/* A27074 802401A4 00000000 */ nop +/* A27074 802401A4 00000000 */ nop /* A27078 802401A8 46020502 */ mul.s $f20, $f0, $f2 -/* A2707C 802401AC 00000000 */ nop +/* A2707C 802401AC 00000000 */ nop /* A27080 802401B0 96020000 */ lhu $v0, ($s0) /* A27084 802401B4 3C013E80 */ lui $at, 0x3e80 /* A27088 802401B8 44810000 */ mtc1 $at, $f0 /* A2708C 802401BC 44826000 */ mtc1 $v0, $f12 -/* A27090 802401C0 00000000 */ nop +/* A27090 802401C0 00000000 */ nop /* A27094 802401C4 46806320 */ cvt.s.w $f12, $f12 /* A27098 802401C8 46006302 */ mul.s $f12, $f12, $f0 -/* A2709C 802401CC 00000000 */ nop +/* A2709C 802401CC 00000000 */ nop /* A270A0 802401D0 36521630 */ ori $s2, $s2, 0x1630 /* A270A4 802401D4 3C013FF8 */ lui $at, 0x3ff8 /* A270A8 802401D8 44810800 */ mtc1 $at, $f1 @@ -45,11 +45,11 @@ glabel func_80240154_A27024 /* A270C4 802401F4 44801000 */ mtc1 $zero, $f2 /* A270C8 802401F8 46000021 */ cvt.d.s $f0, $f0 /* A270CC 802401FC 46220002 */ mul.d $f0, $f0, $f2 -/* A270D0 80240200 00000000 */ nop -/* A270D4 80240204 3C108007 */ lui $s0, %hi(D_800741F0) -/* A270D8 80240208 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* A270DC 8024020C 3C11800A */ lui $s1, %hi(D_8009A674) -/* A270E0 80240210 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* A270D0 80240200 00000000 */ nop +/* A270D4 80240204 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* A270D8 80240208 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* A270DC 8024020C 3C11800A */ lui $s1, %hi(gDisplayContext) +/* A270E0 80240210 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* A270E4 80240214 96040000 */ lhu $a0, ($s0) /* A270E8 80240218 8E220000 */ lw $v0, ($s1) /* A270EC 8024021C 00042180 */ sll $a0, $a0, 6 @@ -63,8 +63,8 @@ glabel func_80240154_A27024 /* A2710C 8024023C 0C019E08 */ jal guTranslate /* A27110 80240240 00A0382D */ daddu $a3, $a1, $zero /* A27114 80240244 3C05DA38 */ lui $a1, 0xda38 -/* A27118 80240248 3C04800A */ lui $a0, %hi(D_8009A66C) -/* A2711C 8024024C 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* A27118 80240248 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* A2711C 8024024C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* A27120 80240250 34A50001 */ ori $a1, $a1, 1 /* A27124 80240254 8C830000 */ lw $v1, ($a0) /* A27128 80240258 96020000 */ lhu $v0, ($s0) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243164_A2D3A4.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243164_A2D3A4.s index ceafe370f9..e13b0557b4 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243164_A2D3A4.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243164_A2D3A4.s @@ -22,8 +22,8 @@ glabel func_80243164_A2D3A4 /* A2D3E8 802431A8 AFA50054 */ sw $a1, 0x54($sp) /* A2D3EC 802431AC 1220014B */ beqz $s1, .L802436DC /* A2D3F0 802431B0 AFA60058 */ sw $a2, 0x58($sp) -/* A2D3F4 802431B4 3C06800A */ lui $a2, %hi(D_8009A66C) -/* A2D3F8 802431B8 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* A2D3F4 802431B4 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* A2D3F8 802431B8 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* A2D3FC 802431BC 8CC50000 */ lw $a1, ($a2) /* A2D400 802431C0 3C07E700 */ lui $a3, 0xe700 /* A2D404 802431C4 00A0102D */ daddu $v0, $a1, $zero @@ -93,29 +93,29 @@ glabel func_80243164_A2D3A4 /* A2D4FC 802432BC C7A20014 */ lwc1 $f2, 0x14($sp) /* A2D500 802432C0 3C01437F */ lui $at, 0x437f /* A2D504 802432C4 44812000 */ mtc1 $at, $f4 -/* A2D508 802432C8 00000000 */ nop +/* A2D508 802432C8 00000000 */ nop /* A2D50C 802432CC 46022081 */ sub.s $f2, $f4, $f2 /* A2D510 802432D0 44910000 */ mtc1 $s1, $f0 -/* A2D514 802432D4 00000000 */ nop +/* A2D514 802432D4 00000000 */ nop /* A2D518 802432D8 46800020 */ cvt.s.w $f0, $f0 /* A2D51C 802432DC 46020002 */ mul.s $f0, $f0, $f2 -/* A2D520 802432E0 00000000 */ nop +/* A2D520 802432E0 00000000 */ nop /* A2D524 802432E4 C7A20018 */ lwc1 $f2, 0x18($sp) /* A2D528 802432E8 46022081 */ sub.s $f2, $f4, $f2 /* A2D52C 802432EC 46020002 */ mul.s $f0, $f0, $f2 -/* A2D530 802432F0 00000000 */ nop +/* A2D530 802432F0 00000000 */ nop /* A2D534 802432F4 240200FF */ addiu $v0, $zero, 0xff /* A2D538 802432F8 46040003 */ div.s $f0, $f0, $f4 /* A2D53C 802432FC 46040003 */ div.s $f0, $f0, $f4 /* A2D540 80243300 4600018D */ trunc.w.s $f6, $f0 /* A2D544 80243304 44113000 */ mfc1 $s1, $f6 -/* A2D548 80243308 00000000 */ nop +/* A2D548 80243308 00000000 */ nop /* A2D54C 8024330C 12220013 */ beq $s1, $v0, .L8024335C /* A2D550 80243310 3C06FCFF */ lui $a2, 0xfcff /* A2D554 80243314 34C6B3FF */ ori $a2, $a2, 0xb3ff /* A2D558 80243318 3C05FF64 */ lui $a1, 0xff64 -/* A2D55C 8024331C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* A2D560 80243320 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* A2D55C 8024331C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* A2D560 80243320 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* A2D564 80243324 8C820000 */ lw $v0, ($a0) /* A2D568 80243328 34A5FE7F */ ori $a1, $a1, 0xfe7f /* A2D56C 8024332C 0040182D */ daddu $v1, $v0, $zero @@ -133,8 +133,8 @@ glabel func_80243164_A2D3A4 .L8024335C: /* A2D59C 8024335C 34C6FFFF */ ori $a2, $a2, 0xffff /* A2D5A0 80243360 3C05FFFC */ lui $a1, 0xfffc -/* A2D5A4 80243364 3C04800A */ lui $a0, %hi(D_8009A66C) -/* A2D5A8 80243368 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* A2D5A4 80243364 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* A2D5A8 80243368 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* A2D5AC 8024336C 8C820000 */ lw $v0, ($a0) /* A2D5B0 80243370 34A5F279 */ ori $a1, $a1, 0xf279 /* A2D5B4 80243374 0040182D */ daddu $v1, $v0, $zero @@ -151,7 +151,7 @@ glabel func_80243164_A2D3A4 /* A2D5D8 80243398 16410004 */ bne $s2, $at, .L802433AC /* A2D5DC 8024339C 3C018000 */ lui $at, 0x8000 /* A2D5E0 802433A0 16A10002 */ bne $s5, $at, .L802433AC -/* A2D5E4 802433A4 00000000 */ nop +/* A2D5E4 802433A4 00000000 */ nop /* A2D5E8 802433A8 0006000D */ break 6 .L802433AC: /* A2D5EC 802433AC 00004812 */ mflo $t1 @@ -161,8 +161,8 @@ glabel func_80243164_A2D3A4 /* A2D5FC 802433BC 34E7001C */ ori $a3, $a3, 0x1c /* A2D600 802433C0 3C060050 */ lui $a2, 0x50 /* A2D604 802433C4 34C64340 */ ori $a2, $a2, 0x4340 -/* A2D608 802433C8 3C08800A */ lui $t0, %hi(D_8009A66C) -/* A2D60C 802433CC 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* A2D608 802433C8 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* A2D60C 802433CC 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* A2D610 802433D0 0000582D */ daddu $t3, $zero, $zero /* A2D614 802433D4 8D020000 */ lw $v0, ($t0) /* A2D618 802433D8 3C03ED00 */ lui $v1, 0xed00 @@ -349,7 +349,7 @@ glabel func_80243164_A2D3A4 /* A2D8A4 80243664 16410004 */ bne $s2, $at, .L80243678 /* A2D8A8 80243668 3C018000 */ lui $at, 0x8000 /* A2D8AC 8024366C 16A10002 */ bne $s5, $at, .L80243678 -/* A2D8B0 80243670 00000000 */ nop +/* A2D8B0 80243670 00000000 */ nop /* A2D8B4 80243674 0006000D */ break 6 .L80243678: /* A2D8B8 80243678 00004812 */ mflo $t1 @@ -369,8 +369,8 @@ glabel func_80243164_A2D3A4 /* A2D8F0 802436B0 1440FF74 */ bnez $v0, .L80243484 /* A2D8F4 802436B4 AC640004 */ sw $a0, 4($v1) .L802436B8: -/* A2D8F8 802436B8 3C03800A */ lui $v1, %hi(D_8009A66C) -/* A2D8FC 802436BC 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* A2D8F8 802436B8 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* A2D8FC 802436BC 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* A2D900 802436C0 8C620000 */ lw $v0, ($v1) /* A2D904 802436C4 0040202D */ daddu $a0, $v0, $zero /* A2D908 802436C8 24420008 */ addiu $v0, $v0, 8 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243758_A2D998.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243758_A2D998.s index b87b699205..022d41d28f 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243758_A2D998.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243758_A2D998.s @@ -15,8 +15,8 @@ glabel func_80243758_A2D998 /* A2D9C0 80243780 3C06073F */ lui $a2, 0x73f /* A2D9C4 80243784 34C6C000 */ ori $a2, $a2, 0xc000 /* A2D9C8 80243788 0000502D */ daddu $t2, $zero, $zero -/* A2D9CC 8024378C 3C02800A */ lui $v0, %hi(D_8009A66C) -/* A2D9D0 80243790 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* A2D9CC 8024378C 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* A2D9D0 80243790 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* A2D9D4 80243794 0040402D */ daddu $t0, $v0, $zero /* A2D9D8 80243798 3C0FF548 */ lui $t7, 0xf548 /* A2D9DC 8024379C 35EF4200 */ ori $t7, $t7, 0x4200 @@ -206,8 +206,8 @@ glabel func_80243758_A2D998 /* A2DC90 80243A50 3C070741 */ lui $a3, 0x741 /* A2DC94 80243A54 34E7C000 */ ori $a3, $a3, 0xc000 /* A2DC98 80243A58 3C090041 */ lui $t1, 0x41 -/* A2DC9C 80243A5C 3C05800A */ lui $a1, %hi(D_8009A66C) -/* A2DCA0 80243A60 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* A2DC9C 80243A5C 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* A2DCA0 80243A60 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* A2DCA4 80243A64 8CA40000 */ lw $a0, ($a1) /* A2DCA8 80243A68 3529C000 */ ori $t1, $t1, 0xc000 /* A2DCAC 80243A6C 0080102D */ daddu $v0, $a0, $zero @@ -303,8 +303,8 @@ glabel func_80243758_A2D998 /* A2DE00 80243BC0 00621025 */ or $v0, $v1, $v0 /* A2DE04 80243BC4 ACE20000 */ sw $v0, ($a3) .L80243BC8: -/* A2DE08 80243BC8 3C03800A */ lui $v1, %hi(D_8009A66C) -/* A2DE0C 80243BCC 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* A2DE08 80243BC8 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* A2DE0C 80243BCC 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* A2DE10 80243BD0 8C620000 */ lw $v0, ($v1) /* A2DE14 80243BD4 00053140 */ sll $a2, $a1, 5 /* A2DE18 80243BD8 0040202D */ daddu $a0, $v0, $zero @@ -343,8 +343,8 @@ glabel func_80243758_A2D998 /* A2DE88 80243C48 00621025 */ or $v0, $v1, $v0 /* A2DE8C 80243C4C AC820000 */ sw $v0, ($a0) /* A2DE90 80243C50 3C050400 */ lui $a1, 0x400 -/* A2DE94 80243C54 3C03800A */ lui $v1, %hi(D_8009A66C) -/* A2DE98 80243C58 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* A2DE94 80243C54 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* A2DE98 80243C58 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* A2DE9C 80243C5C 8C620000 */ lw $v0, ($v1) /* A2DEA0 80243C60 34A50400 */ ori $a1, $a1, 0x400 /* A2DEA4 80243C64 0040202D */ daddu $a0, $v0, $zero @@ -354,8 +354,8 @@ glabel func_80243758_A2D998 /* A2DEB4 80243C74 AC820000 */ sw $v0, ($a0) /* A2DEB8 80243C78 AC850004 */ sw $a1, 4($a0) .L80243C7C: -/* A2DEBC 80243C7C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* A2DEC0 80243C80 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* A2DEBC 80243C7C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* A2DEC0 80243C80 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* A2DEC4 80243C84 8C620000 */ lw $v0, ($v1) /* A2DEC8 80243C88 0040202D */ daddu $a0, $v0, $zero /* A2DECC 80243C8C 24420008 */ addiu $v0, $v0, 8 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243CC0_A2DF00.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243CC0_A2DF00.s index 3f5f0bf0b0..2cbbe3ba3a 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243CC0_A2DF00.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243CC0_A2DF00.s @@ -24,8 +24,8 @@ glabel func_80243CC0_A2DF00 /* A2DF4C 80243D0C 0C090DC3 */ jal func_8024370C_A2D94C /* A2DF50 80243D10 84520010 */ lh $s2, 0x10($v0) /* A2DF54 80243D14 3C05FF10 */ lui $a1, 0xff10 -/* A2DF58 80243D18 3C10800A */ lui $s0, %hi(D_8009A66C) -/* A2DF5C 80243D1C 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* A2DF58 80243D18 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* A2DF5C 80243D1C 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* A2DF60 80243D20 34A5013F */ ori $a1, $a1, 0x13f /* A2DF64 80243D24 8E060000 */ lw $a2, ($s0) /* A2DF68 80243D28 3C02DE00 */ lui $v0, 0xde00 @@ -69,9 +69,9 @@ glabel func_80243CC0_A2DF00 /* A2DFFC 80243DBC 27A60014 */ addiu $a2, $sp, 0x14 /* A2E000 80243DC0 C7A20014 */ lwc1 $f2, 0x14($sp) /* A2E004 80243DC4 44800000 */ mtc1 $zero, $f0 -/* A2E008 80243DC8 00000000 */ nop +/* A2E008 80243DC8 00000000 */ nop /* A2E00C 80243DCC 46001032 */ c.eq.s $f2, $f0 -/* A2E010 80243DD0 00000000 */ nop +/* A2E010 80243DD0 00000000 */ nop /* A2E014 80243DD4 45010016 */ bc1t .L80243E30 /* A2E018 80243DD8 3C05FC35 */ lui $a1, 0xfc35 /* A2E01C 80243DDC 34A57E6A */ ori $a1, $a1, 0x7e6a @@ -91,7 +91,7 @@ glabel func_80243CC0_A2DF00 /* A2E054 80243E14 AC620000 */ sw $v0, ($v1) /* A2E058 80243E18 4600110D */ trunc.w.s $f4, $f2 /* A2E05C 80243E1C 44022000 */ mfc1 $v0, $f4 -/* A2E060 80243E20 00000000 */ nop +/* A2E060 80243E20 00000000 */ nop /* A2E064 80243E24 304200FF */ andi $v0, $v0, 0xff /* A2E068 80243E28 00461025 */ or $v0, $v0, $a2 /* A2E06C 80243E2C AC620004 */ sw $v0, 4($v1) @@ -99,7 +99,7 @@ glabel func_80243CC0_A2DF00 /* A2E070 80243E30 8E630000 */ lw $v1, ($s3) /* A2E074 80243E34 84620058 */ lh $v0, 0x58($v1) /* A2E078 80243E38 1440000F */ bnez $v0, .L80243E78 -/* A2E07C 80243E3C 00000000 */ nop +/* A2E07C 80243E3C 00000000 */ nop /* A2E080 80243E40 8C66000C */ lw $a2, 0xc($v1) /* A2E084 80243E44 8C670010 */ lw $a3, 0x10($v1) /* A2E088 80243E48 84640040 */ lh $a0, 0x40($v1) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024564C_A2F88C.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024564C_A2F88C.s index c193a74319..b90b15db14 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024564C_A2F88C.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024564C_A2F88C.s @@ -5,8 +5,8 @@ glabel func_8024564C_A2F88C /* A2F88C 8024564C 3C06FC12 */ lui $a2, 0xfc12 /* A2F890 80245650 34C61624 */ ori $a2, $a2, 0x1624 /* A2F894 80245654 3C05FF2F */ lui $a1, 0xff2f -/* A2F898 80245658 3C04800A */ lui $a0, %hi(D_8009A66C) -/* A2F89C 8024565C 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* A2F898 80245658 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* A2F89C 8024565C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* A2F8A0 80245660 8C820000 */ lw $v0, ($a0) /* A2F8A4 80245664 34A5FFFF */ ori $a1, $a1, 0xffff /* A2F8A8 80245668 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802456C8_A2F908.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802456C8_A2F908.s index 8c1d4dacf7..64ea30739d 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802456C8_A2F908.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802456C8_A2F908.s @@ -5,8 +5,8 @@ glabel func_802456C8_A2F908 /* A2F908 802456C8 3C06FC12 */ lui $a2, 0xfc12 /* A2F90C 802456CC 34C61624 */ ori $a2, $a2, 0x1624 /* A2F910 802456D0 3C05FF2F */ lui $a1, 0xff2f -/* A2F914 802456D4 3C04800A */ lui $a0, %hi(D_8009A66C) -/* A2F918 802456D8 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* A2F914 802456D4 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* A2F918 802456D8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* A2F91C 802456DC 8C820000 */ lw $v0, ($a0) /* A2F920 802456E0 34A5FFFF */ ori $a1, $a1, 0xffff /* A2F924 802456E4 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245744_A2F984.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245744_A2F984.s index f2df52e685..c406ac1f3d 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245744_A2F984.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245744_A2F984.s @@ -5,8 +5,8 @@ glabel func_80245744_A2F984 /* A2F984 80245744 3C06FC12 */ lui $a2, 0xfc12 /* A2F988 80245748 34C61624 */ ori $a2, $a2, 0x1624 /* A2F98C 8024574C 3C05FF2F */ lui $a1, 0xff2f -/* A2F990 80245750 3C04800A */ lui $a0, %hi(D_8009A66C) -/* A2F994 80245754 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* A2F990 80245750 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* A2F994 80245754 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* A2F998 80245758 8C820000 */ lw $v0, ($a0) /* A2F99C 8024575C 34A5FFFF */ ori $a1, $a1, 0xffff /* A2F9A0 80245760 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241610_97F0E0.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241610_97F0E0.s index 140523898a..12eeb3bb21 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241610_97F0E0.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241610_97F0E0.s @@ -5,8 +5,8 @@ glabel func_80241610_97F0E0 /* 97F0E0 80241610 27BDFEF8 */ addiu $sp, $sp, -0x108 /* 97F0E4 80241614 3C02DC08 */ lui $v0, 0xdc08 /* 97F0E8 80241618 AFB700EC */ sw $s7, 0xec($sp) -/* 97F0EC 8024161C 3C17800A */ lui $s7, %hi(D_8009A66C) -/* 97F0F0 80241620 26F7A66C */ addiu $s7, $s7, %lo(D_8009A66C) +/* 97F0EC 8024161C 3C17800A */ lui $s7, %hi(gMasterGfxPos) +/* 97F0F0 80241620 26F7A66C */ addiu $s7, $s7, %lo(gMasterGfxPos) /* 97F0F4 80241624 34420008 */ ori $v0, $v0, 8 /* 97F0F8 80241628 AFBF00F4 */ sw $ra, 0xf4($sp) /* 97F0FC 8024162C AFBE00F0 */ sw $fp, 0xf0($sp) @@ -53,8 +53,8 @@ glabel func_80241610_97F0E0 /* 97F1A0 802416D0 ACA30004 */ sw $v1, 4($a1) .L802416D4: /* 97F1A4 802416D4 3C180001 */ lui $t8, 1 -/* 97F1A8 802416D8 3C12800A */ lui $s2, %hi(D_8009A674) -/* 97F1AC 802416DC 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 97F1A8 802416D8 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 97F1AC 802416DC 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 97F1B0 802416E0 AFB800C8 */ sw $t8, 0xc8($sp) /* 97F1B4 802416E4 8EC50000 */ lw $a1, ($s6) /* 97F1B8 802416E8 8E420000 */ lw $v0, ($s2) @@ -227,8 +227,8 @@ glabel func_80241610_97F0E0 /* 97F454 80241984 0220282D */ daddu $a1, $s1, $zero /* 97F458 80241988 0C019D80 */ jal guMtxCatF /* 97F45C 8024198C 0220302D */ daddu $a2, $s1, $zero -/* 97F460 80241990 3C108007 */ lui $s0, %hi(D_800741F0) -/* 97F464 80241994 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) +/* 97F460 80241990 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 97F464 80241994 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) /* 97F468 80241998 0220202D */ daddu $a0, $s1, $zero /* 97F46C 8024199C 96050000 */ lhu $a1, ($s0) /* 97F470 802419A0 8E420000 */ lw $v0, ($s2) @@ -273,7 +273,7 @@ glabel func_80241610_97F0E0 /* 97F50C 80241A3C AFA30020 */ sw $v1, 0x20($sp) /* 97F510 80241A40 97A30046 */ lhu $v1, 0x46($sp) /* 97F514 80241A44 44880000 */ mtc1 $t0, $f0 -/* 97F518 80241A48 00000000 */ nop +/* 97F518 80241A48 00000000 */ nop /* 97F51C 80241A4C 46800020 */ cvt.s.w $f0, $f0 /* 97F520 80241A50 AFA90024 */ sw $t1, 0x24($sp) /* 97F524 80241A54 E7C0003C */ swc1 $f0, 0x3c($fp) @@ -282,7 +282,7 @@ glabel func_80241610_97F0E0 /* 97F530 80241A60 A7A3002A */ sh $v1, 0x2a($sp) /* 97F534 80241A64 3063FFFF */ andi $v1, $v1, 0xffff /* 97F538 80241A68 44830000 */ mtc1 $v1, $f0 -/* 97F53C 80241A6C 00000000 */ nop +/* 97F53C 80241A6C 00000000 */ nop /* 97F540 80241A70 46800020 */ cvt.s.w $f0, $f0 /* 97F544 80241A74 00021FC2 */ srl $v1, $v0, 0x1f /* 97F548 80241A78 00431021 */ addu $v0, $v0, $v1 diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241610_990DF0.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241610_990DF0.s index 47283cfe22..9bf6dad95d 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241610_990DF0.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241610_990DF0.s @@ -20,8 +20,8 @@ glabel func_80241610_990DF0 /* 990E2C 8024164C 0C0B1EAF */ jal get_variable /* 990E30 80241650 34A50F8A */ ori $a1, $a1, 0xf8a /* 990E34 80241654 3C03DC08 */ lui $v1, 0xdc08 -/* 990E38 80241658 3C1E800A */ lui $fp, %hi(D_8009A66C) -/* 990E3C 8024165C 27DEA66C */ addiu $fp, $fp, %lo(D_8009A66C) +/* 990E38 80241658 3C1E800A */ lui $fp, %hi(gMasterGfxPos) +/* 990E3C 8024165C 27DEA66C */ addiu $fp, $fp, %lo(gMasterGfxPos) /* 990E40 80241660 34630008 */ ori $v1, $v1, 8 /* 990E44 80241664 8FC60000 */ lw $a2, ($fp) /* 990E48 80241668 3C168007 */ lui $s6, %hi(gCurrentCameraID) @@ -56,8 +56,8 @@ glabel func_80241610_990DF0 .L802416DC: /* 990EBC 802416DC 248400D4 */ addiu $a0, $a0, 0xd4 /* 990EC0 802416E0 3C180001 */ lui $t8, 1 -/* 990EC4 802416E4 3C12800A */ lui $s2, %hi(D_8009A674) -/* 990EC8 802416E8 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 990EC4 802416E4 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 990EC8 802416E8 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 990ECC 802416EC AFB800C8 */ sw $t8, 0xc8($sp) /* 990ED0 802416F0 8EC50000 */ lw $a1, ($s6) /* 990ED4 802416F4 8E420000 */ lw $v0, ($s2) @@ -230,8 +230,8 @@ glabel func_80241610_990DF0 /* 991170 80241990 0220282D */ daddu $a1, $s1, $zero /* 991174 80241994 0C019D80 */ jal guMtxCatF /* 991178 80241998 0220302D */ daddu $a2, $s1, $zero -/* 99117C 8024199C 3C108007 */ lui $s0, %hi(D_800741F0) -/* 991180 802419A0 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) +/* 99117C 8024199C 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 991180 802419A0 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) /* 991184 802419A4 0220202D */ daddu $a0, $s1, $zero /* 991188 802419A8 96050000 */ lhu $a1, ($s0) /* 99118C 802419AC 8E420000 */ lw $v0, ($s2) @@ -292,7 +292,7 @@ glabel func_80241610_990DF0 /* 991260 80241A80 A7A20028 */ sh $v0, 0x28($sp) /* 991264 80241A84 3042FFFF */ andi $v0, $v0, 0xffff /* 991268 80241A88 44820000 */ mtc1 $v0, $f0 -/* 99126C 80241A8C 00000000 */ nop +/* 99126C 80241A8C 00000000 */ nop /* 991270 80241A90 46800020 */ cvt.s.w $f0, $f0 /* 991274 80241A94 AFA30020 */ sw $v1, 0x20($sp) /* 991278 80241A98 AFA40024 */ sw $a0, 0x24($sp) @@ -301,7 +301,7 @@ glabel func_80241610_990DF0 /* 991284 80241AA4 A7A2002A */ sh $v0, 0x2a($sp) /* 991288 80241AA8 3042FFFF */ andi $v0, $v0, 0xffff /* 99128C 80241AAC 44820000 */ mtc1 $v0, $f0 -/* 991290 80241AB0 00000000 */ nop +/* 991290 80241AB0 00000000 */ nop /* 991294 80241AB4 46800020 */ cvt.s.w $f0, $f0 /* 991298 80241AB8 E6E00050 */ swc1 $f0, 0x50($s7) /* 99129C 80241ABC 8FA20040 */ lw $v0, 0x40($sp) @@ -339,8 +339,8 @@ glabel func_80241610_990DF0 /* 99131C 80241B3C 0C04EBDC */ jal func_8013AF70 /* 991320 80241B40 27A70048 */ addiu $a3, $sp, 0x48 /* 991324 80241B44 3C05D838 */ lui $a1, 0xd838 -/* 991328 80241B48 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 99132C 80241B4C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 991328 80241B48 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 99132C 80241B4C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 991330 80241B50 8C620000 */ lw $v0, ($v1) /* 991334 80241B54 34A50002 */ ori $a1, $a1, 2 /* 991338 80241B58 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241610_993D40.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241610_993D40.s index 3318107451..75d461160f 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241610_993D40.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241610_993D40.s @@ -5,8 +5,8 @@ glabel func_80241610_993D40 /* 993D40 80241610 27BDFF00 */ addiu $sp, $sp, -0x100 /* 993D44 80241614 3C02DC08 */ lui $v0, 0xdc08 /* 993D48 80241618 AFB700E4 */ sw $s7, 0xe4($sp) -/* 993D4C 8024161C 3C17800A */ lui $s7, %hi(D_8009A66C) -/* 993D50 80241620 26F7A66C */ addiu $s7, $s7, %lo(D_8009A66C) +/* 993D4C 8024161C 3C17800A */ lui $s7, %hi(gMasterGfxPos) +/* 993D50 80241620 26F7A66C */ addiu $s7, $s7, %lo(gMasterGfxPos) /* 993D54 80241624 34420008 */ ori $v0, $v0, 8 /* 993D58 80241628 AFBF00EC */ sw $ra, 0xec($sp) /* 993D5C 8024162C AFBE00E8 */ sw $fp, 0xe8($sp) @@ -53,8 +53,8 @@ glabel func_80241610_993D40 /* 993E00 802416D0 ACA30004 */ sw $v1, 4($a1) .L802416D4: /* 993E04 802416D4 3C180001 */ lui $t8, 1 -/* 993E08 802416D8 3C12800A */ lui $s2, %hi(D_8009A674) -/* 993E0C 802416DC 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 993E08 802416D8 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 993E0C 802416DC 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 993E10 802416E0 AFB800C0 */ sw $t8, 0xc0($sp) /* 993E14 802416E4 8EC50000 */ lw $a1, ($s6) /* 993E18 802416E8 8E420000 */ lw $v0, ($s2) @@ -227,8 +227,8 @@ glabel func_80241610_993D40 /* 9940B4 80241984 0220282D */ daddu $a1, $s1, $zero /* 9940B8 80241988 0C019D80 */ jal guMtxCatF /* 9940BC 8024198C 0220302D */ daddu $a2, $s1, $zero -/* 9940C0 80241990 3C108007 */ lui $s0, %hi(D_800741F0) -/* 9940C4 80241994 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) +/* 9940C0 80241990 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 9940C4 80241994 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) /* 9940C8 80241998 0220202D */ daddu $a0, $s1, $zero /* 9940CC 8024199C 96050000 */ lhu $a1, ($s0) /* 9940D0 802419A0 8E420000 */ lw $v0, ($s2) @@ -274,14 +274,14 @@ glabel func_80241610_993D40 /* 994170 80241A40 AFA80018 */ sw $t0, 0x18($sp) /* 994174 80241A44 97A8003E */ lhu $t0, 0x3e($sp) /* 994178 80241A48 44830000 */ mtc1 $v1, $f0 -/* 99417C 80241A4C 00000000 */ nop +/* 99417C 80241A4C 00000000 */ nop /* 994180 80241A50 46800020 */ cvt.s.w $f0, $f0 /* 994184 80241A54 AFA9001C */ sw $t1, 0x1c($sp) /* 994188 80241A58 E7C00038 */ swc1 $f0, 0x38($fp) /* 99418C 80241A5C 8FA20038 */ lw $v0, 0x38($sp) /* 994190 80241A60 3103FFFF */ andi $v1, $t0, 0xffff /* 994194 80241A64 44830000 */ mtc1 $v1, $f0 -/* 994198 80241A68 00000000 */ nop +/* 994198 80241A68 00000000 */ nop /* 99419C 80241A6C 46800020 */ cvt.s.w $f0, $f0 /* 9941A0 80241A70 00021FC2 */ srl $v1, $v0, 0x1f /* 9941A4 80241A74 00431021 */ addu $v0, $v0, $v1 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240000_90F6B0.s b/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240000_90F6B0.s index 98b3a909fc..354cc2b81d 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240000_90F6B0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240000_90F6B0.s @@ -20,12 +20,12 @@ glabel func_80240000_90F6B0 /* 90F6EC 8024003C 34A50F8F */ ori $a1, $a1, 0xf8f /* 90F6F0 80240040 0040882D */ daddu $s1, $v0, $zero /* 90F6F4 80240044 0000982D */ daddu $s3, $zero, $zero -/* 90F6F8 80240048 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 90F6FC 8024004C 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) -/* 90F700 80240050 3C16800A */ lui $s6, %hi(D_8009A674) -/* 90F704 80240054 26D6A674 */ addiu $s6, $s6, %lo(D_8009A674) -/* 90F708 80240058 3C158007 */ lui $s5, %hi(D_800741F0) -/* 90F70C 8024005C 26B541F0 */ addiu $s5, $s5, %lo(D_800741F0) +/* 90F6F8 80240048 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 90F6FC 8024004C 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) +/* 90F700 80240050 3C16800A */ lui $s6, %hi(gDisplayContext) +/* 90F704 80240054 26D6A674 */ addiu $s6, $s6, %lo(gDisplayContext) +/* 90F708 80240058 3C158007 */ lui $s5, %hi(gMatrixListPos) +/* 90F70C 8024005C 26B541F0 */ addiu $s5, $s5, %lo(gMatrixListPos) /* 90F710 80240060 3C140001 */ lui $s4, 1 /* 90F714 80240064 36941630 */ ori $s4, $s4, 0x1630 /* 90F718 80240068 26300018 */ addiu $s0, $s1, 0x18 @@ -38,7 +38,7 @@ glabel func_80240000_90F6B0 .L80240084: /* 90F734 80240084 C600FFEC */ lwc1 $f0, -0x14($s0) /* 90F738 80240088 4618003C */ c.lt.s $f0, $f24 -/* 90F73C 8024008C 00000000 */ nop +/* 90F73C 8024008C 00000000 */ nop /* 90F740 80240090 4500002F */ bc1f .L80240150 /* 90F744 80240094 24040008 */ addiu $a0, $zero, 8 /* 90F748 80240098 3C0140A0 */ lui $at, 0x40a0 @@ -52,14 +52,14 @@ glabel func_80240000_90F6B0 /* 90F768 802400B8 2404000A */ addiu $a0, $zero, 0xa /* 90F76C 802400BC 2442FFFC */ addiu $v0, $v0, -4 /* 90F770 802400C0 44820000 */ mtc1 $v0, $f0 -/* 90F774 802400C4 00000000 */ nop +/* 90F774 802400C4 00000000 */ nop /* 90F778 802400C8 46800020 */ cvt.s.w $f0, $f0 /* 90F77C 802400CC 46160003 */ div.s $f0, $f0, $f22 /* 90F780 802400D0 0C00A67F */ jal rand_int /* 90F784 802400D4 E6000004 */ swc1 $f0, 4($s0) /* 90F788 802400D8 2404000A */ addiu $a0, $zero, 0xa /* 90F78C 802400DC 44820000 */ mtc1 $v0, $f0 -/* 90F790 802400E0 00000000 */ nop +/* 90F790 802400E0 00000000 */ nop /* 90F794 802400E4 46800020 */ cvt.s.w $f0, $f0 /* 90F798 802400E8 46160003 */ div.s $f0, $f0, $f22 /* 90F79C 802400EC 0C00A67F */ jal rand_int @@ -67,7 +67,7 @@ glabel func_80240000_90F6B0 /* 90F7A4 802400F4 24040014 */ addiu $a0, $zero, 0x14 /* 90F7A8 802400F8 2442001E */ addiu $v0, $v0, 0x1e /* 90F7AC 802400FC 44820000 */ mtc1 $v0, $f0 -/* 90F7B0 80240100 00000000 */ nop +/* 90F7B0 80240100 00000000 */ nop /* 90F7B4 80240104 46800020 */ cvt.s.w $f0, $f0 /* 90F7B8 80240108 3C013F80 */ lui $at, 0x3f80 /* 90F7BC 8024010C 44811000 */ mtc1 $at, $f2 @@ -78,12 +78,12 @@ glabel func_80240000_90F6B0 /* 90F7D0 80240120 24040167 */ addiu $a0, $zero, 0x167 /* 90F7D4 80240124 24420050 */ addiu $v0, $v0, 0x50 /* 90F7D8 80240128 44820000 */ mtc1 $v0, $f0 -/* 90F7DC 8024012C 00000000 */ nop +/* 90F7DC 8024012C 00000000 */ nop /* 90F7E0 80240130 46800020 */ cvt.s.w $f0, $f0 /* 90F7E4 80240134 0C00A67F */ jal rand_int /* 90F7E8 80240138 E600FFF8 */ swc1 $f0, -8($s0) /* 90F7EC 8024013C 44820000 */ mtc1 $v0, $f0 -/* 90F7F0 80240140 00000000 */ nop +/* 90F7F0 80240140 00000000 */ nop /* 90F7F4 80240144 46800020 */ cvt.s.w $f0, $f0 /* 90F7F8 80240148 E600FFFC */ swc1 $f0, -4($s0) /* 90F7FC 8024014C AE000000 */ sw $zero, ($s0) @@ -91,11 +91,11 @@ glabel func_80240000_90F6B0 /* 90F800 80240150 C6040004 */ lwc1 $f4, 4($s0) /* 90F804 80240154 46002121 */ cvt.d.s $f4, $f4 /* 90F808 80240158 46342102 */ mul.d $f4, $f4, $f20 -/* 90F80C 8024015C 00000000 */ nop +/* 90F80C 8024015C 00000000 */ nop /* 90F810 80240160 C602000C */ lwc1 $f2, 0xc($s0) /* 90F814 80240164 460010A1 */ cvt.d.s $f2, $f2 /* 90F818 80240168 46341082 */ mul.d $f2, $f2, $f20 -/* 90F81C 8024016C 00000000 */ nop +/* 90F81C 8024016C 00000000 */ nop /* 90F820 80240170 C6000008 */ lwc1 $f0, 8($s0) /* 90F824 80240174 3C018024 */ lui $at, %hi(D_80246378) /* 90F828 80240178 D4266378 */ ldc1 $f6, %lo(D_80246378)($at) @@ -118,22 +118,22 @@ glabel func_80240000_90F6B0 /* 90F86C 802401BC 46000186 */ mov.s $f6, $f0 /* 90F870 802401C0 3C01437F */ lui $at, 0x437f /* 90F874 802401C4 44810000 */ mtc1 $at, $f0 -/* 90F878 802401C8 00000000 */ nop +/* 90F878 802401C8 00000000 */ nop /* 90F87C 802401CC 46003182 */ mul.s $f6, $f6, $f0 -/* 90F880 802401D0 00000000 */ nop +/* 90F880 802401D0 00000000 */ nop /* 90F884 802401D4 C604FFF0 */ lwc1 $f4, -0x10($s0) /* 90F888 802401D8 C600000C */ lwc1 $f0, 0xc($s0) /* 90F88C 802401DC C602FFF8 */ lwc1 $f2, -8($s0) /* 90F890 802401E0 46002100 */ add.s $f4, $f4, $f0 /* 90F894 802401E4 3C014000 */ lui $at, 0x4000 /* 90F898 802401E8 44810000 */ mtc1 $at, $f0 -/* 90F89C 802401EC 00000000 */ nop +/* 90F89C 802401EC 00000000 */ nop /* 90F8A0 802401F0 46001080 */ add.s $f2, $f2, $f0 /* 90F8A4 802401F4 E604FFF0 */ swc1 $f4, -0x10($s0) /* 90F8A8 802401F8 46183183 */ div.s $f6, $f6, $f24 /* 90F8AC 802401FC 4600320D */ trunc.w.s $f8, $f6 /* 90F8B0 80240200 44064000 */ mfc1 $a2, $f8 -/* 90F8B4 80240204 00000000 */ nop +/* 90F8B4 80240204 00000000 */ nop /* 90F8B8 80240208 04C10002 */ bgez $a2, .L80240214 /* 90F8BC 8024020C E602FFF8 */ swc1 $f2, -8($s0) /* 90F8C0 80240210 0000302D */ daddu $a2, $zero, $zero @@ -209,8 +209,8 @@ glabel func_80240000_90F6B0 /* 90F9D0 80240320 1440FF58 */ bnez $v0, .L80240084 /* 90F9D4 80240324 AC860008 */ sw $a2, 8($a0) /* 90F9D8 80240328 3C05E200 */ lui $a1, 0xe200 -/* 90F9DC 8024032C 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 90F9E0 80240330 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 90F9DC 8024032C 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 90F9E0 80240330 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 90F9E4 80240334 8C820000 */ lw $v0, ($a0) /* 90F9E8 80240338 34A51E01 */ ori $a1, $a1, 0x1e01 /* 90F9EC 8024033C 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802415B0_B21AF0.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802415B0_B21AF0.s index b3c100a3ee..eab24b60c1 100644 --- a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802415B0_B21AF0.s +++ b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802415B0_B21AF0.s @@ -18,8 +18,8 @@ glabel func_802415B0_B21AF0 /* B21B24 802415E4 8FA60018 */ lw $a2, 0x18($sp) /* B21B28 802415E8 0C0904CE */ jal func_80241338_B21878 /* B21B2C 802415EC 0220382D */ daddu $a3, $s1, $zero -/* B21B30 802415F0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B21B34 802415F4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B21B30 802415F0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B21B34 802415F4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B21B38 802415F8 8C620000 */ lw $v0, ($v1) /* B21B3C 802415FC 24040001 */ addiu $a0, $zero, 1 /* B21B40 80241600 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241654_B21B94.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241654_B21B94.s index d58c66004f..2288464518 100644 --- a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241654_B21B94.s +++ b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241654_B21B94.s @@ -18,8 +18,8 @@ glabel func_80241654_B21B94 /* B21BC8 80241688 8FA60018 */ lw $a2, 0x18($sp) /* B21BCC 8024168C 0C0904CE */ jal func_80241338_B21878 /* B21BD0 80241690 0220382D */ daddu $a3, $s1, $zero -/* B21BD4 80241694 3C03800A */ lui $v1, %hi(D_8009A66C) -/* B21BD8 80241698 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* B21BD4 80241694 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* B21BD8 80241698 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B21BDC 8024169C 8C620000 */ lw $v0, ($v1) /* B21BE0 802416A0 24040002 */ addiu $a0, $zero, 2 /* B21BE4 802416A4 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240000_B767B0.s b/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240000_B767B0.s index 61370fd113..d40b8437a0 100644 --- a/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240000_B767B0.s +++ b/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240000_B767B0.s @@ -18,31 +18,31 @@ glabel func_80240000_B767B0 /* B767E4 80240034 3C018024 */ lui $at, %hi(func_80243880_95EA80) /* B767E8 80240038 D4203880 */ ldc1 $f0, %lo(func_80243880_95EA80)($at) /* B767EC 8024003C 44826000 */ mtc1 $v0, $f12 -/* B767F0 80240040 00000000 */ nop +/* B767F0 80240040 00000000 */ nop /* B767F4 80240044 46806320 */ cvt.s.w $f12, $f12 /* B767F8 80240048 46006321 */ cvt.d.s $f12, $f12 /* B767FC 8024004C 46206302 */ mul.d $f12, $f12, $f0 -/* B76800 80240050 00000000 */ nop +/* B76800 80240050 00000000 */ nop /* B76804 80240054 0C00A85B */ jal sin_rad /* B76808 80240058 46206320 */ cvt.s.d $f12, $f12 /* B7680C 8024005C 96220000 */ lhu $v0, ($s1) /* B76810 80240060 3C018024 */ lui $at, %hi(D_80243888) /* B76814 80240064 D4363888 */ ldc1 $f22, %lo(D_80243888)($at) /* B76818 80240068 44826000 */ mtc1 $v0, $f12 -/* B7681C 8024006C 00000000 */ nop +/* B7681C 8024006C 00000000 */ nop /* B76820 80240070 46806320 */ cvt.s.w $f12, $f12 /* B76824 80240074 46006321 */ cvt.d.s $f12, $f12 /* B76828 80240078 46366302 */ mul.d $f12, $f12, $f22 -/* B7682C 8024007C 00000000 */ nop +/* B7682C 8024007C 00000000 */ nop /* B76830 80240080 3C013F80 */ lui $at, 0x3f80 /* B76834 80240084 4481D000 */ mtc1 $at, $f26 -/* B76838 80240088 00000000 */ nop +/* B76838 80240088 00000000 */ nop /* B7683C 8024008C 461A0500 */ add.s $f20, $f0, $f26 /* B76840 80240090 3C018024 */ lui $at, %hi(D_80243890) /* B76844 80240094 D4383890 */ ldc1 $f24, %lo(D_80243890)($at) /* B76848 80240098 4600A521 */ cvt.d.s $f20, $f20 /* B7684C 8024009C 4638A502 */ mul.d $f20, $f20, $f24 -/* B76850 802400A0 00000000 */ nop +/* B76850 802400A0 00000000 */ nop /* B76854 802400A4 3C018024 */ lui $at, %hi(func_80243898) /* B76858 802400A8 D4203898 */ ldc1 $f0, %lo(func_80243898)($at) /* B7685C 802400AC 4620A500 */ add.d $f20, $f20, $f0 @@ -51,18 +51,18 @@ glabel func_80240000_B767B0 /* B76868 802400B8 461A0000 */ add.s $f0, $f0, $f26 /* B7686C 802400BC 46000021 */ cvt.d.s $f0, $f0 /* B76870 802400C0 46360002 */ mul.d $f0, $f0, $f22 -/* B76874 802400C4 00000000 */ nop +/* B76874 802400C4 00000000 */ nop /* B76878 802400C8 4620A500 */ add.d $f20, $f20, $f0 /* B7687C 802400CC 3C130001 */ lui $s3, 1 /* B76880 802400D0 4620A520 */ cvt.s.d $f20, $f20 /* B76884 802400D4 4600A021 */ cvt.d.s $f0, $f20 /* B76888 802400D8 46380002 */ mul.d $f0, $f0, $f24 -/* B7688C 802400DC 00000000 */ nop +/* B7688C 802400DC 00000000 */ nop /* B76890 802400E0 36731630 */ ori $s3, $s3, 0x1630 -/* B76894 802400E4 3C12800A */ lui $s2, %hi(D_8009A674) -/* B76898 802400E8 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) -/* B7689C 802400EC 3C108007 */ lui $s0, %hi(D_800741F0) -/* B768A0 802400F0 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) +/* B76894 802400E4 3C12800A */ lui $s2, %hi(gDisplayContext) +/* B76898 802400E8 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) +/* B7689C 802400EC 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* B768A0 802400F0 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) /* B768A4 802400F4 3C013FE0 */ lui $at, 0x3fe0 /* B768A8 802400F8 44811800 */ mtc1 $at, $f3 /* B768AC 802400FC 44801000 */ mtc1 $zero, $f2 @@ -78,8 +78,8 @@ glabel func_80240000_B767B0 /* B768D4 80240124 0C019DC0 */ jal guScale /* B768D8 80240128 00A0382D */ daddu $a3, $a1, $zero /* B768DC 8024012C 3C05DA38 */ lui $a1, 0xda38 -/* B768E0 80240130 3C04800A */ lui $a0, %hi(D_8009A66C) -/* B768E4 80240134 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* B768E0 80240130 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* B768E4 80240134 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* B768E8 80240138 34A50001 */ ori $a1, $a1, 1 /* B768EC 8024013C 8C820000 */ lw $v0, ($a0) /* B768F0 80240140 96030000 */ lhu $v1, ($s0) diff --git a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240354_8A9D64.s b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240354_8A9D64.s index a6841e372b..6a4e708cba 100644 --- a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240354_8A9D64.s +++ b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240354_8A9D64.s @@ -18,8 +18,8 @@ glabel func_80240354_8A9D64 /* 8A9D98 80240388 8FA60018 */ lw $a2, 0x18($sp) /* 8A9D9C 8024038C 0C090058 */ jal func_80240160_8A9B70 /* 8A9DA0 80240390 96070000 */ lhu $a3, ($s0) -/* 8A9DA4 80240394 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 8A9DA8 80240398 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 8A9DA4 80240394 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 8A9DA8 80240398 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 8A9DAC 8024039C 8C620000 */ lw $v0, ($v1) /* 8A9DB0 802403A0 24040001 */ addiu $a0, $zero, 1 /* 8A9DB4 802403A4 0040882D */ daddu $s1, $v0, $zero diff --git a/asm/nonmatchings/world/area_kgr/kgr_02/8AA5B0/func_80240160_8AA5B0.s b/asm/nonmatchings/world/area_kgr/kgr_02/8AA5B0/func_80240160_8AA5B0.s index c2790dd37b..581f4e27d5 100644 --- a/asm/nonmatchings/world/area_kgr/kgr_02/8AA5B0/func_80240160_8AA5B0.s +++ b/asm/nonmatchings/world/area_kgr/kgr_02/8AA5B0/func_80240160_8AA5B0.s @@ -23,11 +23,11 @@ glabel func_80240160_8AA5B0 /* 8AA5F8 802401A8 AC430000 */ sw $v1, ($v0) /* 8AA5FC 802401AC 02F6102A */ slt $v0, $s7, $s6 /* 8AA600 802401B0 10400152 */ beqz $v0, .L802406FC -/* 8AA604 802401B4 00000000 */ nop +/* 8AA604 802401B4 00000000 */ nop /* 8AA608 802401B8 8FAC0054 */ lw $t4, 0x54($sp) /* 8AA60C 802401BC 0187102A */ slt $v0, $t4, $a3 /* 8AA610 802401C0 1040014E */ beqz $v0, .L802406FC -/* 8AA614 802401C4 00000000 */ nop +/* 8AA614 802401C4 00000000 */ nop /* 8AA618 802401C8 06E20001 */ bltzl $s7, .L802401D0 /* 8AA61C 802401CC 0000B82D */ daddu $s7, $zero, $zero .L802401D0: @@ -60,10 +60,10 @@ glabel func_80240160_8AA5B0 /* 8AA670 80240220 240700EF */ addiu $a3, $zero, 0xef .L80240224: /* 8AA674 80240224 12F60135 */ beq $s7, $s6, .L802406FC -/* 8AA678 80240228 00000000 */ nop +/* 8AA678 80240228 00000000 */ nop /* 8AA67C 8024022C 8FAC0054 */ lw $t4, 0x54($sp) /* 8AA680 80240230 11870132 */ beq $t4, $a3, .L802406FC -/* 8AA684 80240234 00000000 */ nop +/* 8AA684 80240234 00000000 */ nop /* 8AA688 80240238 06E10002 */ bgez $s7, .L80240244 /* 8AA68C 8024023C 02E0102D */ daddu $v0, $s7, $zero /* 8AA690 80240240 26E20003 */ addiu $v0, $s7, 3 @@ -79,8 +79,8 @@ glabel func_80240160_8AA5B0 /* 8AA6B0 80240260 24560004 */ addiu $s6, $v0, 4 /* 8AA6B4 80240264 3C052AAA */ lui $a1, 0x2aaa /* 8AA6B8 80240268 34A5AAAB */ ori $a1, $a1, 0xaaab -/* 8AA6BC 8024026C 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 8AA6C0 80240270 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 8AA6BC 8024026C 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 8AA6C0 80240270 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 8AA6C4 80240274 8CC20000 */ lw $v0, ($a2) /* 8AA6C8 80240278 0000F02D */ daddu $fp, $zero, $zero /* 8AA6CC 8024027C 0040202D */ daddu $a0, $v0, $zero @@ -193,7 +193,7 @@ glabel func_80240160_8AA5B0 /* 8AA874 80240424 8FAC0024 */ lw $t4, 0x24($sp) /* 8AA878 80240428 004C1021 */ addu $v0, $v0, $t4 /* 8AA87C 8024042C 44826000 */ mtc1 $v0, $f12 -/* 8AA880 80240430 00000000 */ nop +/* 8AA880 80240430 00000000 */ nop /* 8AA884 80240434 46806320 */ cvt.s.w $f12, $f12 /* 8AA888 80240438 0C00A8BB */ jal sin_deg /* 8AA88C 8024043C 26520014 */ addiu $s2, $s2, 0x14 @@ -211,7 +211,7 @@ glabel func_80240160_8AA5B0 /* 8AA8BC 8024046C AFAD0024 */ sw $t5, 0x24($sp) /* 8AA8C0 80240470 8E850000 */ lw $a1, ($s4) /* 8AA8C4 80240474 46020002 */ mul.s $f0, $f0, $f2 -/* 8AA8C8 80240478 00000000 */ nop +/* 8AA8C8 80240478 00000000 */ nop /* 8AA8CC 8024047C 00A0202D */ daddu $a0, $a1, $zero /* 8AA8D0 80240480 24A50008 */ addiu $a1, $a1, 8 /* 8AA8D4 80240484 24A20008 */ addiu $v0, $a1, 8 @@ -266,8 +266,8 @@ glabel func_80240160_8AA5B0 /* 8AA994 80240544 1180006D */ beqz $t4, .L802406FC /* 8AA998 80240548 3C03FD10 */ lui $v1, 0xfd10 /* 8AA99C 8024054C 3463013F */ ori $v1, $v1, 0x13f -/* 8AA9A0 80240550 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 8AA9A4 80240554 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 8AA9A0 80240550 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 8AA9A4 80240554 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 8AA9A8 80240558 8E020000 */ lw $v0, ($s0) /* 8AA9AC 8024055C 8FA40018 */ lw $a0, 0x18($sp) /* 8AA9B0 80240560 0040882D */ daddu $s1, $v0, $zero @@ -386,4 +386,4 @@ glabel func_80240160_8AA5B0 /* 8AAB70 80240720 8FB00028 */ lw $s0, 0x28($sp) /* 8AAB74 80240724 03E00008 */ jr $ra /* 8AAB78 80240728 27BD0050 */ addiu $sp, $sp, 0x50 -/* 8AAB7C 8024072C 00000000 */ nop +/* 8AAB7C 8024072C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403F8_ADB298.s b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403F8_ADB298.s index 4475b5a106..315e156a76 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403F8_ADB298.s +++ b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403F8_ADB298.s @@ -9,8 +9,8 @@ glabel func_802403F8_ADB298 /* ADB2A8 80240408 3C060C18 */ lui $a2, 0xc18 /* ADB2AC 8024040C 34C649D8 */ ori $a2, $a2, 0x49d8 /* ADB2B0 80240410 3C08FC11 */ lui $t0, 0xfc11 -/* ADB2B4 80240414 3C04800A */ lui $a0, %hi(D_8009A66C) -/* ADB2B8 80240418 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* ADB2B4 80240414 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* ADB2B8 80240418 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* ADB2BC 8024041C 8C830000 */ lw $v1, ($a0) /* ADB2C0 80240420 350815FF */ ori $t0, $t0, 0x15ff /* ADB2C4 80240424 0060282D */ daddu $a1, $v1, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240310_B06D10.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240310_B06D10.s index e2b84f0a10..5ca5910d92 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240310_B06D10.s +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240310_B06D10.s @@ -46,8 +46,8 @@ glabel func_80240310_B06D10 /* B06DB4 802403B4 27B30040 */ addiu $s3, $sp, 0x40 /* B06DB8 802403B8 0260202D */ daddu $a0, $s3, $zero /* B06DBC 802403BC 3C160001 */ lui $s6, 1 -/* B06DC0 802403C0 3C11800A */ lui $s1, %hi(D_8009A66C) -/* B06DC4 802403C4 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* B06DC0 802403C0 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* B06DC4 802403C4 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* B06DC8 802403C8 36D61630 */ ori $s6, $s6, 0x1630 /* B06DCC 802403CC 3C05E700 */ lui $a1, 0xe700 /* B06DD0 802403D0 8E230000 */ lw $v1, ($s1) @@ -158,10 +158,10 @@ glabel func_80240310_B06D10 /* B06F74 80240574 0C019D80 */ jal guMtxCatF /* B06F78 80240578 0260302D */ daddu $a2, $s3, $zero /* B06F7C 8024057C 0260202D */ daddu $a0, $s3, $zero -/* B06F80 80240580 3C108007 */ lui $s0, %hi(D_800741F0) -/* B06F84 80240584 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* B06F88 80240588 3C14800A */ lui $s4, %hi(D_8009A674) -/* B06F8C 8024058C 2694A674 */ addiu $s4, $s4, %lo(D_8009A674) +/* B06F80 80240580 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* B06F84 80240584 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* B06F88 80240588 3C14800A */ lui $s4, %hi(gDisplayContext) +/* B06F8C 8024058C 2694A674 */ addiu $s4, $s4, %lo(gDisplayContext) /* B06F90 80240590 96050000 */ lhu $a1, ($s0) /* B06F94 80240594 8E820000 */ lw $v0, ($s4) /* B06F98 80240598 00052980 */ sll $a1, $a1, 6 @@ -199,7 +199,7 @@ glabel func_80240310_B06D10 /* B07018 80240618 A7A20020 */ sh $v0, 0x20($sp) /* B0701C 8024061C 3042FFFF */ andi $v0, $v0, 0xffff /* B07020 80240620 44820000 */ mtc1 $v0, $f0 -/* B07024 80240624 00000000 */ nop +/* B07024 80240624 00000000 */ nop /* B07028 80240628 46800020 */ cvt.s.w $f0, $f0 /* B0702C 8024062C AFA30018 */ sw $v1, 0x18($sp) /* B07030 80240630 AFA4001C */ sw $a0, 0x1c($sp) @@ -209,20 +209,20 @@ glabel func_80240310_B06D10 /* B07040 80240640 A7A20022 */ sh $v0, 0x22($sp) /* B07044 80240644 3042FFFF */ andi $v0, $v0, 0xffff /* B07048 80240648 44820000 */ mtc1 $v0, $f0 -/* B0704C 8024064C 00000000 */ nop +/* B0704C 8024064C 00000000 */ nop /* B07050 80240650 46800020 */ cvt.s.w $f0, $f0 /* B07054 80240654 E6400038 */ swc1 $f0, 0x38($s2) /* B07058 80240658 C7A00038 */ lwc1 $f0, 0x38($sp) /* B0705C 8024065C 46800020 */ cvt.s.w $f0, $f0 /* B07060 80240660 46020002 */ mul.s $f0, $f0, $f2 -/* B07064 80240664 00000000 */ nop +/* B07064 80240664 00000000 */ nop /* B07068 80240668 97A3003E */ lhu $v1, 0x3e($sp) /* B0706C 8024066C 240200FF */ addiu $v0, $zero, 0xff /* B07070 80240670 A3A20028 */ sb $v0, 0x28($sp) /* B07074 80240674 A7A30026 */ sh $v1, 0x26($sp) /* B07078 80240678 4600010D */ trunc.w.s $f4, $f0 /* B0707C 8024067C 44022000 */ mfc1 $v0, $f4 -/* B07080 80240680 00000000 */ nop +/* B07080 80240680 00000000 */ nop /* B07084 80240684 00021023 */ negu $v0, $v0 /* B07088 80240688 A7A20024 */ sh $v0, 0x24($sp) /* B0708C 8024068C 8E440000 */ lw $a0, ($s2) diff --git a/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_80240448_B141B8.s b/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_80240448_B141B8.s index 007ea738e4..145a3930d4 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_80240448_B141B8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_80240448_B141B8.s @@ -6,8 +6,8 @@ glabel func_80240448_B141B8 /* B141BC 8024044C 8CC60B00 */ lw $a2, %lo(func_80240B00_900170)($a2) /* B141C0 80240450 18C00011 */ blez $a2, .L80240498 /* B141C4 80240454 3C02FC12 */ lui $v0, 0xfc12 -/* B141C8 80240458 3C04800A */ lui $a0, %hi(D_8009A66C) -/* B141CC 8024045C 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* B141C8 80240458 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* B141CC 8024045C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* B141D0 80240460 8C830000 */ lw $v1, ($a0) /* B141D4 80240464 34427E24 */ ori $v0, $v0, 0x7e24 /* B141D8 80240468 0060282D */ daddu $a1, $v1, $zero @@ -24,4 +24,4 @@ glabel func_80240448_B141B8 /* B14204 80240494 AC620004 */ sw $v0, 4($v1) .L80240498: /* B14208 80240498 03E00008 */ jr $ra -/* B1420C 8024049C 00000000 */ nop +/* B1420C 8024049C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241500_8D2A10.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241500_8D2A10.s index 8a9b2938ab..4fde2a109a 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241500_8D2A10.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241500_8D2A10.s @@ -32,8 +32,8 @@ glabel func_80241500_8D2A10 /* 8D2A7C 8024156C 27B10038 */ addiu $s1, $sp, 0x38 /* 8D2A80 80241570 0220202D */ daddu $a0, $s1, $zero /* 8D2A84 80241574 3C130001 */ lui $s3, 1 -/* 8D2A88 80241578 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 8D2A8C 8024157C 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 8D2A88 80241578 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 8D2A8C 8024157C 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 8D2A90 80241580 36731630 */ ori $s3, $s3, 0x1630 /* 8D2A94 80241584 3C03E700 */ lui $v1, 0xe700 /* 8D2A98 80241588 0040A02D */ daddu $s4, $v0, $zero @@ -81,10 +81,10 @@ glabel func_80241500_8D2A10 /* 8D2B40 80241630 0C019D80 */ jal guMtxCatF /* 8D2B44 80241634 0220302D */ daddu $a2, $s1, $zero /* 8D2B48 80241638 0220202D */ daddu $a0, $s1, $zero -/* 8D2B4C 8024163C 3C108007 */ lui $s0, %hi(D_800741F0) -/* 8D2B50 80241640 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 8D2B54 80241644 3C11800A */ lui $s1, %hi(D_8009A674) -/* 8D2B58 80241648 2631A674 */ addiu $s1, $s1, %lo(D_8009A674) +/* 8D2B4C 8024163C 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 8D2B50 80241640 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 8D2B54 80241644 3C11800A */ lui $s1, %hi(gDisplayContext) +/* 8D2B58 80241648 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) /* 8D2B5C 8024164C 96050000 */ lhu $a1, ($s0) /* 8D2B60 80241650 8E220000 */ lw $v0, ($s1) /* 8D2B64 80241654 00052980 */ sll $a1, $a1, 6 @@ -125,13 +125,13 @@ glabel func_80241500_8D2A10 /* 8D2BF0 802416E0 44801800 */ mtc1 $zero, $f3 /* 8D2BF4 802416E4 46000021 */ cvt.d.s $f0, $f0 /* 8D2BF8 802416E8 46220032 */ c.eq.d $f0, $f2 -/* 8D2BFC 802416EC 00000000 */ nop +/* 8D2BFC 802416EC 00000000 */ nop /* 8D2C00 802416F0 45020008 */ bc1fl .L80241714 /* 8D2C04 802416F4 24172400 */ addiu $s7, $zero, 0x2400 /* 8D2C08 802416F8 C6C00014 */ lwc1 $f0, 0x14($s6) /* 8D2C0C 802416FC 46000021 */ cvt.d.s $f0, $f0 /* 8D2C10 80241700 46220032 */ c.eq.d $f0, $f2 -/* 8D2C14 80241704 00000000 */ nop +/* 8D2C14 80241704 00000000 */ nop /* 8D2C18 80241708 45010003 */ bc1t .L80241718 /* 8D2C1C 8024170C 0000202D */ daddu $a0, $zero, $zero /* 8D2C20 80241710 24172400 */ addiu $s7, $zero, 0x2400 @@ -151,8 +151,8 @@ glabel func_80241500_8D2A10 /* 8D2C50 80241740 0C04EBDC */ jal func_8013AF70 /* 8D2C54 80241744 27A70038 */ addiu $a3, $sp, 0x38 /* 8D2C58 80241748 3C05D838 */ lui $a1, 0xd838 -/* 8D2C5C 8024174C 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 8D2C60 80241750 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 8D2C5C 8024174C 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 8D2C60 80241750 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 8D2C64 80241754 8C620000 */ lw $v0, ($v1) /* 8D2C68 80241758 34A50002 */ ori $a1, $a1, 2 /* 8D2C6C 8024175C 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_802421A0_8EDFC0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_802421A0_8EDFC0.s index d4853a1e45..60b7e264f3 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_802421A0_8EDFC0.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_802421A0_8EDFC0.s @@ -14,11 +14,11 @@ glabel func_802421A0_8EDFC0 /* 8EDFE4 802421C4 AFB20030 */ sw $s2, 0x30($sp) /* 8EDFE8 802421C8 1A00019F */ blez $s0, .L80242848 /* 8EDFEC 802421CC AFB1002C */ sw $s1, 0x2c($sp) -/* 8EDFF0 802421D0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 8EDFF4 802421D4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 8EDFF0 802421D0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 8EDFF4 802421D4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 8EDFF8 802421D8 3C02DE00 */ lui $v0, 0xde00 /* 8EDFFC 802421DC 44900000 */ mtc1 $s0, $f0 -/* 8EE000 802421E0 00000000 */ nop +/* 8EE000 802421E0 00000000 */ nop /* 8EE004 802421E4 46800021 */ cvt.d.w $f0, $f0 /* 8EE008 802421E8 8C830000 */ lw $v1, ($a0) /* 8EE00C 802421EC 3C018025 */ lui $at, %hi(D_80253030) @@ -34,7 +34,7 @@ glabel func_802421A0_8EDFC0 /* 8EE034 80242214 AC820000 */ sw $v0, ($a0) /* 8EE038 80242218 3C02E700 */ lui $v0, 0xe700 /* 8EE03C 8024221C 46220002 */ mul.d $f0, $f0, $f2 -/* 8EE040 80242220 00000000 */ nop +/* 8EE040 80242220 00000000 */ nop /* 8EE044 80242224 AC620000 */ sw $v0, ($v1) /* 8EE048 80242228 24620010 */ addiu $v0, $v1, 0x10 /* 8EE04C 8024222C AC600004 */ sw $zero, 4($v1) @@ -45,7 +45,7 @@ glabel func_802421A0_8EDFC0 /* 8EE060 80242240 44801000 */ mtc1 $zero, $f2 /* 8EE064 80242244 246D000C */ addiu $t5, $v1, 0xc /* 8EE068 80242248 4620103E */ c.le.d $f2, $f0 -/* 8EE06C 8024224C 00000000 */ nop +/* 8EE06C 8024224C 00000000 */ nop /* 8EE070 80242250 45010005 */ bc1t .L80242268 /* 8EE074 80242254 AC620008 */ sw $v0, 8($v1) /* 8EE078 80242258 4620010D */ trunc.w.d $f4, $f0 @@ -57,7 +57,7 @@ glabel func_802421A0_8EDFC0 /* 8EE08C 8024226C 3C028000 */ lui $v0, 0x8000 /* 8EE090 80242270 4620010D */ trunc.w.d $f4, $f0 /* 8EE094 80242274 440C2000 */ mfc1 $t4, $f4 -/* 8EE098 80242278 00000000 */ nop +/* 8EE098 80242278 00000000 */ nop /* 8EE09C 8024227C 01826025 */ or $t4, $t4, $v0 /* 8EE0A0 80242280 3C091078 */ lui $t1, 0x1078 .L80242284: @@ -69,12 +69,12 @@ glabel func_802421A0_8EDFC0 /* 8EE0B8 80242298 2404001E */ addiu $a0, $zero, 0x1e /* 8EE0BC 8024229C 24050028 */ addiu $a1, $zero, 0x28 /* 8EE0C0 802422A0 24060104 */ addiu $a2, $zero, 0x104 -/* 8EE0C4 802422A4 3C08800A */ lui $t0, %hi(D_8009A66C) -/* 8EE0C8 802422A8 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* 8EE0C4 802422A4 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* 8EE0C8 802422A8 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 8EE0CC 802422AC 318200FF */ andi $v0, $t4, 0xff /* 8EE0D0 802422B0 00491025 */ or $v0, $v0, $t1 /* 8EE0D4 802422B4 44901000 */ mtc1 $s0, $f2 -/* 8EE0D8 802422B8 00000000 */ nop +/* 8EE0D8 802422B8 00000000 */ nop /* 8EE0DC 802422BC 468010A1 */ cvt.d.w $f2, $f2 /* 8EE0E0 802422C0 8D030000 */ lw $v1, ($t0) /* 8EE0E4 802422C4 3C018025 */ lui $at, %hi(D_80253038) @@ -90,7 +90,7 @@ glabel func_802421A0_8EDFC0 /* 8EE10C 802422EC AD020000 */ sw $v0, ($t0) /* 8EE110 802422F0 3C02E700 */ lui $v0, 0xe700 /* 8EE114 802422F4 46201082 */ mul.d $f2, $f2, $f0 -/* 8EE118 802422F8 00000000 */ nop +/* 8EE118 802422F8 00000000 */ nop /* 8EE11C 802422FC AC620000 */ sw $v0, ($v1) /* 8EE120 80242300 24020006 */ addiu $v0, $zero, 6 /* 8EE124 80242304 AC600004 */ sw $zero, 4($v1) @@ -229,7 +229,7 @@ glabel func_802421A0_8EDFC0 /* 8EE330 80242510 0C04993B */ jal draw_string /* 8EE334 80242514 AFA20014 */ sw $v0, 0x14($sp) /* 8EE338 80242518 0809097C */ j .L802425F0 -/* 8EE33C 8024251C 00000000 */ nop +/* 8EE33C 8024251C 00000000 */ nop .L80242520: /* 8EE340 80242520 2402FFFF */ addiu $v0, $zero, -1 /* 8EE344 80242524 1482000F */ bne $a0, $v0, .L80242564 @@ -418,7 +418,7 @@ glabel func_802421A0_8EDFC0 /* 8EE60C 802427EC 0C04993B */ jal draw_string /* 8EE610 802427F0 AFB20014 */ sw $s2, 0x14($sp) /* 8EE614 802427F4 08090A12 */ j .L80242848 -/* 8EE618 802427F8 00000000 */ nop +/* 8EE618 802427F8 00000000 */ nop .L802427FC: /* 8EE61C 802427FC 348400F9 */ ori $a0, $a0, 0xf9 /* 8EE620 80242800 0C04991D */ jal get_string_width diff --git a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s index 647076df33..2429fd5e14 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s +++ b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s @@ -4,8 +4,8 @@ glabel func_80240010_8FEE90 /* 8FEE90 80240010 27BDFFF0 */ addiu $sp, $sp, -0x10 /* 8FEE94 80240014 0000482D */ daddu $t1, $zero, $zero -/* 8FEE98 80240018 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 8FEE9C 8024001C 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 8FEE98 80240018 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 8FEE9C 8024001C 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 8FEEA0 80240020 0040402D */ daddu $t0, $v0, $zero /* 8FEEA4 80240024 3C0EFD18 */ lui $t6, 0xfd18 /* 8FEEA8 80240028 35CE00C7 */ ori $t6, $t6, 0xc7 @@ -116,8 +116,8 @@ glabel func_80240010_8FEE90 /* 8FF048 802401C8 29220038 */ slti $v0, $t1, 0x38 /* 8FF04C 802401CC 1440FFC0 */ bnez $v0, .L802400D0 /* 8FF050 802401D0 AC870044 */ sw $a3, 0x44($a0) -/* 8FF054 802401D4 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 8FF058 802401D8 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 8FF054 802401D4 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 8FF058 802401D8 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 8FF05C 802401DC 8C620000 */ lw $v0, ($v1) /* 8FF060 802401E0 0040202D */ daddu $a0, $v0, $zero /* 8FF064 802401E4 24420008 */ addiu $v0, $v0, 8 diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_8024056C_8FFBDC.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_8024056C_8FFBDC.s index f4c84120fb..8ef1f3e8a4 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_8024056C_8FFBDC.s +++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_8024056C_8FFBDC.s @@ -48,16 +48,16 @@ glabel func_8024056C_8FFBDC /* 8FFC84 80240614 50400005 */ beql $v0, $zero, .L8024062C /* 8FFC88 80240618 24020002 */ addiu $v0, $zero, 2 /* 8FFC8C 8024061C 10E00009 */ beqz $a3, .L80240644 -/* 8FFC90 80240620 00000000 */ nop +/* 8FFC90 80240620 00000000 */ nop /* 8FFC94 80240624 080902AE */ j .L80240AB8 -/* 8FFC98 80240628 00000000 */ nop +/* 8FFC98 80240628 00000000 */ nop .L8024062C: /* 8FFC9C 8024062C 10E2000B */ beq $a3, $v0, .L8024065C /* 8FFCA0 80240630 24020003 */ addiu $v0, $zero, 3 /* 8FFCA4 80240634 10E2000A */ beq $a3, $v0, .L80240660 /* 8FFCA8 80240638 24140005 */ addiu $s4, $zero, 5 /* 8FFCAC 8024063C 080902AE */ j .L80240AB8 -/* 8FFCB0 80240640 00000000 */ nop +/* 8FFCB0 80240640 00000000 */ nop .L80240644: /* 8FFCB4 80240644 3C014120 */ lui $at, 0x4120 /* 8FFCB8 80240648 4481C000 */ mtc1 $at, $f24 @@ -95,21 +95,21 @@ glabel func_8024056C_8FFBDC /* 8FFD20 802406B0 C444006C */ lwc1 $f4, 0x6c($v0) /* 8FFD24 802406B4 46002081 */ sub.s $f2, $f4, $f0 /* 8FFD28 802406B8 4602D03C */ c.lt.s $f26, $f2 -/* 8FFD2C 802406BC 00000000 */ nop +/* 8FFD2C 802406BC 00000000 */ nop /* 8FFD30 802406C0 45000003 */ bc1f .L802406D0 -/* 8FFD34 802406C4 00000000 */ nop +/* 8FFD34 802406C4 00000000 */ nop /* 8FFD38 802406C8 080901B8 */ j .L802406E0 /* 8FFD3C 802406CC 46140000 */ add.s $f0, $f0, $f20 .L802406D0: /* 8FFD40 802406D0 4616103C */ c.lt.s $f2, $f22 -/* 8FFD44 802406D4 00000000 */ nop +/* 8FFD44 802406D4 00000000 */ nop /* 8FFD48 802406D8 45030001 */ bc1tl .L802406E0 /* 8FFD4C 802406DC 46142100 */ add.s $f4, $f4, $f20 .L802406E0: /* 8FFD50 802406E0 46040000 */ add.s $f0, $f0, $f4 /* 8FFD54 802406E4 46000021 */ cvt.d.s $f0, $f0 /* 8FFD58 802406E8 46280002 */ mul.d $f0, $f0, $f8 -/* 8FFD5C 802406EC 00000000 */ nop +/* 8FFD5C 802406EC 00000000 */ nop /* 8FFD60 802406F0 46260000 */ add.d $f0, $f0, $f6 /* 8FFD64 802406F4 46200020 */ cvt.s.d $f0, $f0 .L802406F8: @@ -132,8 +132,8 @@ glabel func_8024056C_8FFBDC /* 8FFDA4 80240734 AC2283D0 */ sw $v0, %lo(D_802483D0)($at) /* 8FFDA8 80240738 0000382D */ daddu $a3, $zero, $zero .L8024073C: -/* 8FFDAC 8024073C 3C02800A */ lui $v0, %hi(D_8009A66C) -/* 8FFDB0 80240740 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* 8FFDAC 8024073C 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* 8FFDB0 80240740 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 8FFDB4 80240744 0040402D */ daddu $t0, $v0, $zero /* 8FFDB8 80240748 3C090100 */ lui $t1, 0x100 /* 8FFDBC 8024074C 35294008 */ ori $t1, $t1, 0x4008 @@ -196,15 +196,15 @@ glabel func_8024056C_8FFBDC /* 8FFE9C 8024082C 24900016 */ addiu $s0, $a0, 0x16 .L80240830: /* 8FFEA0 80240830 44911000 */ mtc1 $s1, $f2 -/* 8FFEA4 80240834 00000000 */ nop +/* 8FFEA4 80240834 00000000 */ nop /* 8FFEA8 80240838 468010A0 */ cvt.s.w $f2, $f2 /* 8FFEAC 8024083C 44940000 */ mtc1 $s4, $f0 -/* 8FFEB0 80240840 00000000 */ nop +/* 8FFEB0 80240840 00000000 */ nop /* 8FFEB4 80240844 46800020 */ cvt.s.w $f0, $f0 /* 8FFEB8 80240848 46001082 */ mul.s $f2, $f2, $f0 -/* 8FFEBC 8024084C 00000000 */ nop +/* 8FFEBC 8024084C 00000000 */ nop /* 8FFEC0 80240850 44860000 */ mtc1 $a2, $f0 -/* 8FFEC4 80240854 00000000 */ nop +/* 8FFEC4 80240854 00000000 */ nop /* 8FFEC8 80240858 46800020 */ cvt.s.w $f0, $f0 /* 8FFECC 8024085C C65A0098 */ lwc1 $f26, 0x98($s2) /* 8FFED0 80240860 C65C009C */ lwc1 $f28, 0x9c($s2) @@ -212,9 +212,9 @@ glabel func_8024056C_8FFBDC /* 8FFED8 80240868 46001083 */ div.s $f2, $f2, $f0 /* 8FFEDC 8024086C 4600128D */ trunc.w.s $f10, $f2 /* 8FFEE0 80240870 44045000 */ mfc1 $a0, $f10 -/* 8FFEE4 80240874 00000000 */ nop +/* 8FFEE4 80240874 00000000 */ nop /* 8FFEE8 80240878 44840000 */ mtc1 $a0, $f0 -/* 8FFEEC 8024087C 00000000 */ nop +/* 8FFEEC 8024087C 00000000 */ nop /* 8FFEF0 80240880 46800020 */ cvt.s.w $f0, $f0 /* 8FFEF4 80240884 24830001 */ addiu $v1, $a0, 1 /* 8FFEF8 80240888 0074102A */ slt $v0, $v1, $s4 @@ -234,32 +234,32 @@ glabel func_8024056C_8FFBDC /* 8FFF2C 802408BC 460C2081 */ sub.s $f2, $f4, $f12 /* 8FFF30 802408C0 3C014334 */ lui $at, 0x4334 /* 8FFF34 802408C4 44810000 */ mtc1 $at, $f0 -/* 8FFF38 802408C8 00000000 */ nop +/* 8FFF38 802408C8 00000000 */ nop /* 8FFF3C 802408CC 4602003C */ c.lt.s $f0, $f2 -/* 8FFF40 802408D0 00000000 */ nop +/* 8FFF40 802408D0 00000000 */ nop /* 8FFF44 802408D4 45000006 */ bc1f .L802408F0 -/* 8FFF48 802408D8 00000000 */ nop +/* 8FFF48 802408D8 00000000 */ nop /* 8FFF4C 802408DC 3C0143B4 */ lui $at, 0x43b4 /* 8FFF50 802408E0 44815000 */ mtc1 $at, $f10 -/* 8FFF54 802408E4 00000000 */ nop +/* 8FFF54 802408E4 00000000 */ nop /* 8FFF58 802408E8 460A2101 */ sub.s $f4, $f4, $f10 /* 8FFF5C 802408EC 460C2081 */ sub.s $f2, $f4, $f12 .L802408F0: /* 8FFF60 802408F0 3C01C334 */ lui $at, 0xc334 /* 8FFF64 802408F4 44810000 */ mtc1 $at, $f0 -/* 8FFF68 802408F8 00000000 */ nop +/* 8FFF68 802408F8 00000000 */ nop /* 8FFF6C 802408FC 4600103C */ c.lt.s $f2, $f0 -/* 8FFF70 80240900 00000000 */ nop +/* 8FFF70 80240900 00000000 */ nop /* 8FFF74 80240904 45020006 */ bc1fl .L80240920 /* 8FFF78 80240908 460C2001 */ sub.s $f0, $f4, $f12 /* 8FFF7C 8024090C 3C0143B4 */ lui $at, 0x43b4 /* 8FFF80 80240910 44815000 */ mtc1 $at, $f10 -/* 8FFF84 80240914 00000000 */ nop +/* 8FFF84 80240914 00000000 */ nop /* 8FFF88 80240918 460A2100 */ add.s $f4, $f4, $f10 /* 8FFF8C 8024091C 460C2001 */ sub.s $f0, $f4, $f12 .L80240920: /* 8FFF90 80240920 46060002 */ mul.s $f0, $f0, $f6 -/* 8FFF94 80240924 00000000 */ nop +/* 8FFF94 80240924 00000000 */ nop /* 8FFF98 80240928 460C0580 */ add.s $f22, $f0, $f12 /* 8FFF9C 8024092C 4600B306 */ mov.s $f12, $f22 .L80240930: @@ -269,12 +269,12 @@ glabel func_8024056C_8FFBDC /* 8FFFAC 8024093C 0C00A8BB */ jal sin_deg /* 8FFFB0 80240940 AFA80034 */ sw $t0, 0x34($sp) /* 8FFFB4 80240944 46180502 */ mul.s $f20, $f0, $f24 -/* 8FFFB8 80240948 00000000 */ nop +/* 8FFFB8 80240948 00000000 */ nop /* 8FFFBC 8024094C 0C00A8D4 */ jal cos_deg /* 8FFFC0 80240950 4600B306 */ mov.s $f12, $f22 /* 8FFFC4 80240954 46000007 */ neg.s $f0, $f0 /* 8FFFC8 80240958 46180002 */ mul.s $f0, $f0, $f24 -/* 8FFFCC 8024095C 00000000 */ nop +/* 8FFFCC 8024095C 00000000 */ nop /* 8FFFD0 80240960 4614D100 */ add.s $f4, $f26, $f20 /* 8FFFD4 80240964 4600E080 */ add.s $f2, $f28, $f0 /* 8FFFD8 80240968 4614D501 */ sub.s $f20, $f26, $f20 @@ -283,7 +283,7 @@ glabel func_8024056C_8FFBDC /* 8FFFE4 80240974 4600E001 */ sub.s $f0, $f28, $f0 /* 8FFFE8 80240978 4600228D */ trunc.w.s $f10, $f4 /* 8FFFEC 8024097C 44025000 */ mfc1 $v0, $f10 -/* 8FFFF0 80240980 00000000 */ nop +/* 8FFFF0 80240980 00000000 */ nop /* 8FFFF4 80240984 A6620000 */ sh $v0, ($s3) /* 8FFFF8 80240988 4600128D */ trunc.w.s $f10, $f2 /* 8FFFFC 8024098C 44025000 */ mfc1 $v0, $f10 @@ -304,7 +304,7 @@ glabel func_8024056C_8FFBDC /* 900038 802409C8 A6620000 */ sh $v0, ($s3) /* 90003C 802409CC 4600028D */ trunc.w.s $f10, $f0 /* 900040 802409D0 44025000 */ mfc1 $v0, $f10 -/* 900044 802409D4 00000000 */ nop +/* 900044 802409D4 00000000 */ nop /* 900048 802409D8 A602FFF4 */ sh $v0, -0xc($s0) /* 90004C 802409DC 24020400 */ addiu $v0, $zero, 0x400 /* 900050 802409E0 A603FFF6 */ sh $v1, -0xa($s0) @@ -355,8 +355,8 @@ glabel func_8024056C_8FFBDC /* 9000F8 80240A88 252901E0 */ addiu $t1, $t1, 0x1e0 /* 9000FC 80240A8C 1440FF43 */ bnez $v0, .L8024079C /* 900100 80240A90 AFA90020 */ sw $t1, 0x20($sp) -/* 900104 80240A94 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 900108 80240A98 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 900104 80240A94 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 900108 80240A98 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 90010C 80240A9C 8C620000 */ lw $v0, ($v1) /* 900110 80240AA0 0040202D */ daddu $a0, $v0, $zero /* 900114 80240AA4 24420008 */ addiu $v0, $v0, 8 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240DA4_9087D4.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240DA4_9087D4.s index e45bce9846..368836dd72 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240DA4_9087D4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240DA4_9087D4.s @@ -22,12 +22,12 @@ glabel func_80240DA4_9087D4 /* 908818 80240DE8 00220821 */ addu $at, $at, $v0 /* 90881C 80240DEC 8C2237F0 */ lw $v0, %lo(D_802437F0)($at) /* 908820 80240DF0 00400008 */ jr $v0 -/* 908824 80240DF4 00000000 */ nop +/* 908824 80240DF4 00000000 */ nop /* 908828 80240DF8 8482001E */ lh $v0, 0x1e($a0) /* 90882C 80240DFC 10400036 */ beqz $v0, .L80240ED8 /* 908830 80240E00 24020001 */ addiu $v0, $zero, 1 /* 908834 80240E04 080903B4 */ j .L80240ED0 -/* 908838 80240E08 00000000 */ nop +/* 908838 80240E08 00000000 */ nop /* 90883C 80240E0C 3C048024 */ lui $a0, %hi(D_802417CC) /* 908840 80240E10 248417CC */ addiu $a0, $a0, %lo(D_802417CC) /* 908844 80240E14 3C058024 */ lui $a1, %hi(D_802417D0) @@ -48,17 +48,17 @@ glabel func_80240DA4_9087D4 .L80240E4C: /* 90887C 80240E4C 8C820000 */ lw $v0, ($a0) /* 908880 80240E50 14500021 */ bne $v0, $s0, .L80240ED8 -/* 908884 80240E54 00000000 */ nop +/* 908884 80240E54 00000000 */ nop /* 908888 80240E58 8CA20000 */ lw $v0, ($a1) /* 90888C 80240E5C 1451001E */ bne $v0, $s1, .L80240ED8 /* 908890 80240E60 24020002 */ addiu $v0, $zero, 2 /* 908894 80240E64 080903B4 */ j .L80240ED0 -/* 908898 80240E68 00000000 */ nop +/* 908898 80240E68 00000000 */ nop /* 90889C 80240E6C 8482001E */ lh $v0, 0x1e($a0) /* 9088A0 80240E70 14400019 */ bnez $v0, .L80240ED8 /* 9088A4 80240E74 24020003 */ addiu $v0, $zero, 3 /* 9088A8 80240E78 080903B4 */ j .L80240ED0 -/* 9088AC 80240E7C 00000000 */ nop +/* 9088AC 80240E7C 00000000 */ nop /* 9088B0 80240E80 3C048024 */ lui $a0, %hi(D_802417CC) /* 9088B4 80240E84 248417CC */ addiu $a0, $a0, %lo(D_802417CC) /* 9088B8 80240E88 3C058024 */ lui $a1, %hi(D_802417D0) @@ -77,7 +77,7 @@ glabel func_80240DA4_9087D4 .L80240EB8: /* 9088E8 80240EB8 8C820000 */ lw $v0, ($a0) /* 9088EC 80240EBC 1440000A */ bnez $v0, .L80240EE8 -/* 9088F0 80240EC0 00000000 */ nop +/* 9088F0 80240EC0 00000000 */ nop /* 9088F4 80240EC4 8CA20000 */ lw $v0, ($a1) /* 9088F8 80240EC8 14400003 */ bnez $v0, .L80240ED8 /* 9088FC 80240ECC 24020004 */ addiu $v0, $zero, 4 @@ -88,7 +88,7 @@ glabel func_80240DA4_9087D4 /* 908908 80240ED8 3C028024 */ lui $v0, %hi(D_802417CC) /* 90890C 80240EDC 8C4217CC */ lw $v0, %lo(D_802417CC)($v0) /* 908910 80240EE0 10400074 */ beqz $v0, .L802410B4 -/* 908914 80240EE4 00000000 */ nop +/* 908914 80240EE4 00000000 */ nop .L80240EE8: /* 908918 80240EE8 3C098024 */ lui $t1, %hi(D_802417D0) /* 90891C 80240EEC 8D2917D0 */ lw $t1, %lo(D_802417D0)($t1) @@ -98,29 +98,29 @@ glabel func_80240DA4_9087D4 /* 90892C 80240EFC 44810800 */ mtc1 $at, $f1 /* 908930 80240F00 44800000 */ mtc1 $zero, $f0 /* 908934 80240F04 44902000 */ mtc1 $s0, $f4 -/* 908938 80240F08 00000000 */ nop +/* 908938 80240F08 00000000 */ nop /* 90893C 80240F0C 46802121 */ cvt.d.w $f4, $f4 /* 908940 80240F10 46202102 */ mul.d $f4, $f4, $f0 -/* 908944 80240F14 00000000 */ nop +/* 908944 80240F14 00000000 */ nop /* 908948 80240F18 3C088024 */ lui $t0, %hi(D_802417CC) /* 90894C 80240F1C 8D0817CC */ lw $t0, %lo(D_802417CC)($t0) /* 908950 80240F20 44884000 */ mtc1 $t0, $f8 -/* 908954 80240F24 00000000 */ nop +/* 908954 80240F24 00000000 */ nop /* 908958 80240F28 46804221 */ cvt.d.w $f8, $f8 /* 90895C 80240F2C 46204202 */ mul.d $f8, $f8, $f0 -/* 908960 80240F30 00000000 */ nop +/* 908960 80240F30 00000000 */ nop /* 908964 80240F34 44913000 */ mtc1 $s1, $f6 -/* 908968 80240F38 00000000 */ nop +/* 908968 80240F38 00000000 */ nop /* 90896C 80240F3C 468031A1 */ cvt.d.w $f6, $f6 /* 908970 80240F40 46203182 */ mul.d $f6, $f6, $f0 -/* 908974 80240F44 00000000 */ nop +/* 908974 80240F44 00000000 */ nop /* 908978 80240F48 44895000 */ mtc1 $t1, $f10 -/* 90897C 80240F4C 00000000 */ nop +/* 90897C 80240F4C 00000000 */ nop /* 908980 80240F50 468052A1 */ cvt.d.w $f10, $f10 /* 908984 80240F54 46205282 */ mul.d $f10, $f10, $f0 -/* 908988 80240F58 00000000 */ nop +/* 908988 80240F58 00000000 */ nop /* 90898C 80240F5C 44821000 */ mtc1 $v0, $f2 -/* 908990 80240F60 00000000 */ nop +/* 908990 80240F60 00000000 */ nop /* 908994 80240F64 468010A1 */ cvt.d.w $f2, $f2 /* 908998 80240F68 46241080 */ add.d $f2, $f2, $f4 /* 90899C 80240F6C 46281401 */ sub.d $f16, $f2, $f8 @@ -128,23 +128,23 @@ glabel func_80240DA4_9087D4 /* 9089A4 80240F74 44817000 */ mtc1 $at, $f14 /* 9089A8 80240F78 46208320 */ cvt.s.d $f12, $f16 /* 9089AC 80240F7C 460E6302 */ mul.s $f12, $f12, $f14 -/* 9089B0 80240F80 00000000 */ nop +/* 9089B0 80240F80 00000000 */ nop /* 9089B4 80240F84 24020064 */ addiu $v0, $zero, 0x64 /* 9089B8 80240F88 44820000 */ mtc1 $v0, $f0 -/* 9089BC 80240F8C 00000000 */ nop +/* 9089BC 80240F8C 00000000 */ nop /* 9089C0 80240F90 46800021 */ cvt.d.w $f0, $f0 /* 9089C4 80240F94 46260000 */ add.d $f0, $f0, $f6 /* 9089C8 80240F98 462A0181 */ sub.d $f6, $f0, $f10 /* 9089CC 80240F9C 46203120 */ cvt.s.d $f4, $f6 /* 9089D0 80240FA0 460E2102 */ mul.s $f4, $f4, $f14 -/* 9089D4 80240FA4 00000000 */ nop +/* 9089D4 80240FA4 00000000 */ nop /* 9089D8 80240FA8 46281080 */ add.d $f2, $f2, $f8 /* 9089DC 80240FAC 24040004 */ addiu $a0, $zero, 4 -/* 9089E0 80240FB0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 9089E4 80240FB4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 9089E0 80240FB0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 9089E4 80240FB4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 9089E8 80240FB8 462010A0 */ cvt.s.d $f2, $f2 /* 9089EC 80240FBC 460E1082 */ mul.s $f2, $f2, $f14 -/* 9089F0 80240FC0 00000000 */ nop +/* 9089F0 80240FC0 00000000 */ nop /* 9089F4 80240FC4 3C058024 */ lui $a1, %hi(D_802417D8) /* 9089F8 80240FC8 24A517D8 */ addiu $a1, $a1, %lo(D_802417D8) /* 9089FC 80240FCC 8C620000 */ lw $v0, ($v1) @@ -155,27 +155,27 @@ glabel func_80240DA4_9087D4 /* 908A10 80240FE0 AC620000 */ sw $v0, ($v1) /* 908A14 80240FE4 46200020 */ cvt.s.d $f0, $f0 /* 908A18 80240FE8 460E0002 */ mul.s $f0, $f0, $f14 -/* 908A1C 80240FEC 00000000 */ nop +/* 908A1C 80240FEC 00000000 */ nop /* 908A20 80240FF0 4600648D */ trunc.w.s $f18, $f12 /* 908A24 80240FF4 44039000 */ mfc1 $v1, $f18 -/* 908A28 80240FF8 00000000 */ nop +/* 908A28 80240FF8 00000000 */ nop /* 908A2C 80240FFC 30630FFF */ andi $v1, $v1, 0xfff /* 908A30 80241000 00031B00 */ sll $v1, $v1, 0xc /* 908A34 80241004 4600248D */ trunc.w.s $f18, $f4 /* 908A38 80241008 44029000 */ mfc1 $v0, $f18 -/* 908A3C 8024100C 00000000 */ nop +/* 908A3C 8024100C 00000000 */ nop /* 908A40 80241010 30420FFF */ andi $v0, $v0, 0xfff /* 908A44 80241014 00461025 */ or $v0, $v0, $a2 /* 908A48 80241018 00621825 */ or $v1, $v1, $v0 /* 908A4C 8024101C 4600148D */ trunc.w.s $f18, $f2 /* 908A50 80241020 44029000 */ mfc1 $v0, $f18 -/* 908A54 80241024 00000000 */ nop +/* 908A54 80241024 00000000 */ nop /* 908A58 80241028 30420FFF */ andi $v0, $v0, 0xfff /* 908A5C 8024102C 00021300 */ sll $v0, $v0, 0xc /* 908A60 80241030 ACE30000 */ sw $v1, ($a3) /* 908A64 80241034 4600048D */ trunc.w.s $f18, $f0 /* 908A68 80241038 44039000 */ mfc1 $v1, $f18 -/* 908A6C 8024103C 00000000 */ nop +/* 908A6C 8024103C 00000000 */ nop /* 908A70 80241040 30630FFF */ andi $v1, $v1, 0xfff /* 908A74 80241044 00431025 */ or $v0, $v0, $v1 /* 908A78 80241048 ACE20004 */ sw $v0, 4($a3) @@ -211,5 +211,5 @@ glabel func_80240DA4_9087D4 /* 908AEC 802410BC 8FB00050 */ lw $s0, 0x50($sp) /* 908AF0 802410C0 03E00008 */ jr $ra /* 908AF4 802410C4 27BD0060 */ addiu $sp, $sp, 0x60 -/* 908AF8 802410C8 00000000 */ nop -/* 908AFC 802410CC 00000000 */ nop +/* 908AF8 802410C8 00000000 */ nop +/* 908AFC 802410CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_30/90B9E0/func_80240488_90BB58.s b/asm/nonmatchings/world/area_kmr/kmr_30/90B9E0/func_80240488_90BB58.s index 100256954a..00f19877f7 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_30/90B9E0/func_80240488_90BB58.s +++ b/asm/nonmatchings/world/area_kmr/kmr_30/90B9E0/func_80240488_90BB58.s @@ -5,8 +5,8 @@ glabel func_80240488_90BB58 /* 90BB58 80240488 3C06FC12 */ lui $a2, 0xfc12 /* 90BB5C 8024048C 34C61624 */ ori $a2, $a2, 0x1624 /* 90BB60 80240490 3C05FF2F */ lui $a1, 0xff2f -/* 90BB64 80240494 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 90BB68 80240498 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 90BB64 80240494 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 90BB68 80240498 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 90BB6C 8024049C 8C820000 */ lw $v0, ($a0) /* 90BB70 802404A0 34A5FFFF */ ori $a1, $a1, 0xffff /* 90BB74 802404A4 0040182D */ daddu $v1, $v0, $zero @@ -22,5 +22,5 @@ glabel func_80240488_90BB58 /* 90BB9C 802404CC AC430000 */ sw $v1, ($v0) /* 90BBA0 802404D0 03E00008 */ jr $ra /* 90BBA4 802404D4 AC440004 */ sw $a0, 4($v0) -/* 90BBA8 802404D8 00000000 */ nop -/* 90BBAC 802404DC 00000000 */ nop +/* 90BBA8 802404D8 00000000 */ nop +/* 90BBAC 802404DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C_C8E9DC.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C_C8E9DC.s index bddca0a6e4..6a9edee329 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C_C8E9DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C_C8E9DC.s @@ -48,16 +48,16 @@ glabel func_80240E2C_C8E9DC /* C8EA84 80240ED4 50400005 */ beql $v0, $zero, .L80240EEC /* C8EA88 80240ED8 24020002 */ addiu $v0, $zero, 2 /* C8EA8C 80240EDC 10E00009 */ beqz $a3, .L80240F04 -/* C8EA90 80240EE0 00000000 */ nop +/* C8EA90 80240EE0 00000000 */ nop /* C8EA94 80240EE4 080904DE */ j .L80241378 -/* C8EA98 80240EE8 00000000 */ nop +/* C8EA98 80240EE8 00000000 */ nop .L80240EEC: /* C8EA9C 80240EEC 10E2000B */ beq $a3, $v0, .L80240F1C /* C8EAA0 80240EF0 24020003 */ addiu $v0, $zero, 3 /* C8EAA4 80240EF4 10E2000A */ beq $a3, $v0, .L80240F20 /* C8EAA8 80240EF8 24140005 */ addiu $s4, $zero, 5 /* C8EAAC 80240EFC 080904DE */ j .L80241378 -/* C8EAB0 80240F00 00000000 */ nop +/* C8EAB0 80240F00 00000000 */ nop .L80240F04: /* C8EAB4 80240F04 3C014120 */ lui $at, 0x4120 /* C8EAB8 80240F08 4481C000 */ mtc1 $at, $f24 @@ -95,21 +95,21 @@ glabel func_80240E2C_C8E9DC /* C8EB20 80240F70 C444006C */ lwc1 $f4, 0x6c($v0) /* C8EB24 80240F74 46002081 */ sub.s $f2, $f4, $f0 /* C8EB28 80240F78 4602D03C */ c.lt.s $f26, $f2 -/* C8EB2C 80240F7C 00000000 */ nop +/* C8EB2C 80240F7C 00000000 */ nop /* C8EB30 80240F80 45000003 */ bc1f .L80240F90 -/* C8EB34 80240F84 00000000 */ nop +/* C8EB34 80240F84 00000000 */ nop /* C8EB38 80240F88 080903E8 */ j .L80240FA0 /* C8EB3C 80240F8C 46140000 */ add.s $f0, $f0, $f20 .L80240F90: /* C8EB40 80240F90 4616103C */ c.lt.s $f2, $f22 -/* C8EB44 80240F94 00000000 */ nop +/* C8EB44 80240F94 00000000 */ nop /* C8EB48 80240F98 45030001 */ bc1tl .L80240FA0 /* C8EB4C 80240F9C 46142100 */ add.s $f4, $f4, $f20 .L80240FA0: /* C8EB50 80240FA0 46040000 */ add.s $f0, $f0, $f4 /* C8EB54 80240FA4 46000021 */ cvt.d.s $f0, $f0 /* C8EB58 80240FA8 46280002 */ mul.d $f0, $f0, $f8 -/* C8EB5C 80240FAC 00000000 */ nop +/* C8EB5C 80240FAC 00000000 */ nop /* C8EB60 80240FB0 46260000 */ add.d $f0, $f0, $f6 /* C8EB64 80240FB4 46200020 */ cvt.s.d $f0, $f0 .L80240FB8: @@ -132,8 +132,8 @@ glabel func_80240E2C_C8E9DC /* C8EBA4 80240FF4 AC228380 */ sw $v0, %lo(D_80248380)($at) /* C8EBA8 80240FF8 0000382D */ daddu $a3, $zero, $zero .L80240FFC: -/* C8EBAC 80240FFC 3C02800A */ lui $v0, %hi(D_8009A66C) -/* C8EBB0 80241000 2442A66C */ addiu $v0, $v0, %lo(D_8009A66C) +/* C8EBAC 80240FFC 3C02800A */ lui $v0, %hi(gMasterGfxPos) +/* C8EBB0 80241000 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* C8EBB4 80241004 0040402D */ daddu $t0, $v0, $zero /* C8EBB8 80241008 3C090100 */ lui $t1, 0x100 /* C8EBBC 8024100C 35294008 */ ori $t1, $t1, 0x4008 @@ -196,15 +196,15 @@ glabel func_80240E2C_C8E9DC /* C8EC9C 802410EC 24900016 */ addiu $s0, $a0, 0x16 .L802410F0: /* C8ECA0 802410F0 44911000 */ mtc1 $s1, $f2 -/* C8ECA4 802410F4 00000000 */ nop +/* C8ECA4 802410F4 00000000 */ nop /* C8ECA8 802410F8 468010A0 */ cvt.s.w $f2, $f2 /* C8ECAC 802410FC 44940000 */ mtc1 $s4, $f0 -/* C8ECB0 80241100 00000000 */ nop +/* C8ECB0 80241100 00000000 */ nop /* C8ECB4 80241104 46800020 */ cvt.s.w $f0, $f0 /* C8ECB8 80241108 46001082 */ mul.s $f2, $f2, $f0 -/* C8ECBC 8024110C 00000000 */ nop +/* C8ECBC 8024110C 00000000 */ nop /* C8ECC0 80241110 44860000 */ mtc1 $a2, $f0 -/* C8ECC4 80241114 00000000 */ nop +/* C8ECC4 80241114 00000000 */ nop /* C8ECC8 80241118 46800020 */ cvt.s.w $f0, $f0 /* C8ECCC 8024111C C65A0098 */ lwc1 $f26, 0x98($s2) /* C8ECD0 80241120 C65C009C */ lwc1 $f28, 0x9c($s2) @@ -212,9 +212,9 @@ glabel func_80240E2C_C8E9DC /* C8ECD8 80241128 46001083 */ div.s $f2, $f2, $f0 /* C8ECDC 8024112C 4600128D */ trunc.w.s $f10, $f2 /* C8ECE0 80241130 44045000 */ mfc1 $a0, $f10 -/* C8ECE4 80241134 00000000 */ nop +/* C8ECE4 80241134 00000000 */ nop /* C8ECE8 80241138 44840000 */ mtc1 $a0, $f0 -/* C8ECEC 8024113C 00000000 */ nop +/* C8ECEC 8024113C 00000000 */ nop /* C8ECF0 80241140 46800020 */ cvt.s.w $f0, $f0 /* C8ECF4 80241144 24830001 */ addiu $v1, $a0, 1 /* C8ECF8 80241148 0074102A */ slt $v0, $v1, $s4 @@ -234,32 +234,32 @@ glabel func_80240E2C_C8E9DC /* C8ED2C 8024117C 460C2081 */ sub.s $f2, $f4, $f12 /* C8ED30 80241180 3C014334 */ lui $at, 0x4334 /* C8ED34 80241184 44810000 */ mtc1 $at, $f0 -/* C8ED38 80241188 00000000 */ nop +/* C8ED38 80241188 00000000 */ nop /* C8ED3C 8024118C 4602003C */ c.lt.s $f0, $f2 -/* C8ED40 80241190 00000000 */ nop +/* C8ED40 80241190 00000000 */ nop /* C8ED44 80241194 45000006 */ bc1f .L802411B0 -/* C8ED48 80241198 00000000 */ nop +/* C8ED48 80241198 00000000 */ nop /* C8ED4C 8024119C 3C0143B4 */ lui $at, 0x43b4 /* C8ED50 802411A0 44815000 */ mtc1 $at, $f10 -/* C8ED54 802411A4 00000000 */ nop +/* C8ED54 802411A4 00000000 */ nop /* C8ED58 802411A8 460A2101 */ sub.s $f4, $f4, $f10 /* C8ED5C 802411AC 460C2081 */ sub.s $f2, $f4, $f12 .L802411B0: /* C8ED60 802411B0 3C01C334 */ lui $at, 0xc334 /* C8ED64 802411B4 44810000 */ mtc1 $at, $f0 -/* C8ED68 802411B8 00000000 */ nop +/* C8ED68 802411B8 00000000 */ nop /* C8ED6C 802411BC 4600103C */ c.lt.s $f2, $f0 -/* C8ED70 802411C0 00000000 */ nop +/* C8ED70 802411C0 00000000 */ nop /* C8ED74 802411C4 45020006 */ bc1fl .L802411E0 /* C8ED78 802411C8 460C2001 */ sub.s $f0, $f4, $f12 /* C8ED7C 802411CC 3C0143B4 */ lui $at, 0x43b4 /* C8ED80 802411D0 44815000 */ mtc1 $at, $f10 -/* C8ED84 802411D4 00000000 */ nop +/* C8ED84 802411D4 00000000 */ nop /* C8ED88 802411D8 460A2100 */ add.s $f4, $f4, $f10 /* C8ED8C 802411DC 460C2001 */ sub.s $f0, $f4, $f12 .L802411E0: /* C8ED90 802411E0 46060002 */ mul.s $f0, $f0, $f6 -/* C8ED94 802411E4 00000000 */ nop +/* C8ED94 802411E4 00000000 */ nop /* C8ED98 802411E8 460C0580 */ add.s $f22, $f0, $f12 /* C8ED9C 802411EC 4600B306 */ mov.s $f12, $f22 .L802411F0: @@ -269,12 +269,12 @@ glabel func_80240E2C_C8E9DC /* C8EDAC 802411FC 0C00A8BB */ jal sin_deg /* C8EDB0 80241200 AFA80034 */ sw $t0, 0x34($sp) /* C8EDB4 80241204 46180502 */ mul.s $f20, $f0, $f24 -/* C8EDB8 80241208 00000000 */ nop +/* C8EDB8 80241208 00000000 */ nop /* C8EDBC 8024120C 0C00A8D4 */ jal cos_deg /* C8EDC0 80241210 4600B306 */ mov.s $f12, $f22 /* C8EDC4 80241214 46000007 */ neg.s $f0, $f0 /* C8EDC8 80241218 46180002 */ mul.s $f0, $f0, $f24 -/* C8EDCC 8024121C 00000000 */ nop +/* C8EDCC 8024121C 00000000 */ nop /* C8EDD0 80241220 4614D100 */ add.s $f4, $f26, $f20 /* C8EDD4 80241224 4600E080 */ add.s $f2, $f28, $f0 /* C8EDD8 80241228 4614D501 */ sub.s $f20, $f26, $f20 @@ -283,7 +283,7 @@ glabel func_80240E2C_C8E9DC /* C8EDE4 80241234 4600E001 */ sub.s $f0, $f28, $f0 /* C8EDE8 80241238 4600228D */ trunc.w.s $f10, $f4 /* C8EDEC 8024123C 44025000 */ mfc1 $v0, $f10 -/* C8EDF0 80241240 00000000 */ nop +/* C8EDF0 80241240 00000000 */ nop /* C8EDF4 80241244 A6620000 */ sh $v0, ($s3) /* C8EDF8 80241248 4600128D */ trunc.w.s $f10, $f2 /* C8EDFC 8024124C 44025000 */ mfc1 $v0, $f10 @@ -304,7 +304,7 @@ glabel func_80240E2C_C8E9DC /* C8EE38 80241288 A6620000 */ sh $v0, ($s3) /* C8EE3C 8024128C 4600028D */ trunc.w.s $f10, $f0 /* C8EE40 80241290 44025000 */ mfc1 $v0, $f10 -/* C8EE44 80241294 00000000 */ nop +/* C8EE44 80241294 00000000 */ nop /* C8EE48 80241298 A602FFF4 */ sh $v0, -0xc($s0) /* C8EE4C 8024129C 24020400 */ addiu $v0, $zero, 0x400 /* C8EE50 802412A0 A603FFF6 */ sh $v1, -0xa($s0) @@ -355,8 +355,8 @@ glabel func_80240E2C_C8E9DC /* C8EEF8 80241348 252901E0 */ addiu $t1, $t1, 0x1e0 /* C8EEFC 8024134C 1440FF43 */ bnez $v0, .L8024105C /* C8EF00 80241350 AFA90020 */ sw $t1, 0x20($sp) -/* C8EF04 80241354 3C03800A */ lui $v1, %hi(D_8009A66C) -/* C8EF08 80241358 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* C8EF04 80241354 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* C8EF08 80241358 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* C8EF0C 8024135C 8C620000 */ lw $v0, ($v1) /* C8EF10 80241360 0040202D */ daddu $a0, $v0, $zero /* C8EF14 80241364 24420008 */ addiu $v0, $v0, 8 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802423F0_7ED100.s b/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802423F0_7ED100.s index 7cc7a0ef08..05cf42c6a7 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802423F0_7ED100.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802423F0_7ED100.s @@ -16,8 +16,8 @@ glabel func_802423F0_7ED100 /* 7ED12C 8024241C 3C07FFFD */ lui $a3, 0xfffd /* 7ED130 80242420 34E7FEFF */ ori $a3, $a3, 0xfeff /* 7ED134 80242424 AFB00010 */ sw $s0, 0x10($sp) -/* 7ED138 80242428 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 7ED13C 8024242C 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 7ED138 80242428 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 7ED13C 8024242C 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 7ED140 80242430 240400D6 */ addiu $a0, $zero, 0xd6 /* 7ED144 80242434 24030004 */ addiu $v1, $zero, 4 /* 7ED148 80242438 AFBF0020 */ sw $ra, 0x20($sp) @@ -97,4 +97,4 @@ glabel func_802423F0_7ED100 /* 7ED270 80242560 8FB00010 */ lw $s0, 0x10($sp) /* 7ED274 80242564 03E00008 */ jr $ra /* 7ED278 80242568 27BD0028 */ addiu $sp, $sp, 0x28 -/* 7ED27C 8024256C 00000000 */ nop +/* 7ED27C 8024256C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802403C0_800C40.s b/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802403C0_800C40.s index 73eeab4c8d..a75640265c 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802403C0_800C40.s +++ b/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802403C0_800C40.s @@ -28,8 +28,8 @@ glabel func_802403C0_800C40 /* 800C9C 8024041C C4600040 */ lwc1 $f0, 0x40($v1) /* 800CA0 80240420 E7A00010 */ swc1 $f0, 0x10($sp) /* 800CA4 80240424 C4600044 */ lwc1 $f0, 0x44($v1) -/* 800CA8 80240428 3C10800A */ lui $s0, %hi(D_8009A674) -/* 800CAC 8024042C 2610A674 */ addiu $s0, $s0, %lo(D_8009A674) +/* 800CA8 80240428 3C10800A */ lui $s0, %hi(gDisplayContext) +/* 800CAC 8024042C 2610A674 */ addiu $s0, $s0, %lo(gDisplayContext) /* 800CB0 80240430 E7A00014 */ swc1 $f0, 0x14($sp) /* 800CB4 80240434 C4600048 */ lwc1 $f0, 0x48($v1) /* 800CB8 80240438 27A50090 */ addiu $a1, $sp, 0x90 @@ -71,8 +71,8 @@ glabel func_802403C0_800C40 /* 800D48 802404C8 3C091000 */ lui $t1, 0x1000 /* 800D4C 802404CC 35291000 */ ori $t1, $t1, 0x1000 /* 800D50 802404D0 3C08D9FF */ lui $t0, 0xd9ff -/* 800D54 802404D4 3C06800A */ lui $a2, %hi(D_8009A66C) -/* 800D58 802404D8 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) +/* 800D54 802404D4 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* 800D58 802404D8 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 800D5C 802404DC 3508FFFF */ ori $t0, $t0, 0xffff /* 800D60 802404E0 8CC50000 */ lw $a1, ($a2) /* 800D64 802404E4 8E040000 */ lw $a0, ($s0) diff --git a/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802405E8_800E68.s b/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802405E8_800E68.s index e207450f61..8009a1d9c8 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802405E8_800E68.s +++ b/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802405E8_800E68.s @@ -3,8 +3,8 @@ glabel func_802405E8_800E68 /* 800E68 802405E8 3C05D9FB */ lui $a1, 0xd9fb -/* 800E6C 802405EC 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 800E70 802405F0 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 800E6C 802405EC 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 800E70 802405F0 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 800E74 802405F4 8C820000 */ lw $v0, ($a0) /* 800E78 802405F8 34A5FFFF */ ori $a1, $a1, 0xffff /* 800E7C 802405FC 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_01/800C40/func_80240628_800EA8.s b/asm/nonmatchings/world/area_mac/mac_01/800C40/func_80240628_800EA8.s index 1b9c7b7a75..68d9b3d5be 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/800C40/func_80240628_800EA8.s +++ b/asm/nonmatchings/world/area_mac/mac_01/800C40/func_80240628_800EA8.s @@ -52,98 +52,98 @@ glabel func_80240628_800EA8 /* 800F64 802406E4 C7A00030 */ lwc1 $f0, 0x30($sp) /* 800F68 802406E8 4604A103 */ div.s $f4, $f20, $f4 /* 800F6C 802406EC 46040002 */ mul.s $f0, $f0, $f4 -/* 800F70 802406F0 00000000 */ nop +/* 800F70 802406F0 00000000 */ nop /* 800F74 802406F4 46140000 */ add.s $f0, $f0, $f20 /* 800F78 802406F8 3C013FE0 */ lui $at, 0x3fe0 /* 800F7C 802406FC 44811800 */ mtc1 $at, $f3 /* 800F80 80240700 44801000 */ mtc1 $zero, $f2 /* 800F84 80240704 46000021 */ cvt.d.s $f0, $f0 /* 800F88 80240708 46220002 */ mul.d $f0, $f0, $f2 -/* 800F8C 8024070C 00000000 */ nop +/* 800F8C 8024070C 00000000 */ nop /* 800F90 80240710 C7A20028 */ lwc1 $f2, 0x28($sp) /* 800F94 80240714 46041282 */ mul.s $f10, $f2, $f4 -/* 800F98 80240718 00000000 */ nop +/* 800F98 80240718 00000000 */ nop /* 800F9C 8024071C C7A6002C */ lwc1 $f6, 0x2c($sp) /* 800FA0 80240720 46002087 */ neg.s $f2, $f4 /* 800FA4 80240724 46023182 */ mul.s $f6, $f6, $f2 -/* 800FA8 80240728 00000000 */ nop +/* 800FA8 80240728 00000000 */ nop /* 800FAC 8024072C 44804000 */ mtc1 $zero, $f8 /* 800FB0 80240730 E7A40034 */ swc1 $f4, 0x34($sp) /* 800FB4 80240734 E7AA0028 */ swc1 $f10, 0x28($sp) /* 800FB8 80240738 E7A6002C */ swc1 $f6, 0x2c($sp) /* 800FBC 8024073C 46200020 */ cvt.s.d $f0, $f0 /* 800FC0 80240740 4600403C */ c.lt.s $f8, $f0 -/* 800FC4 80240744 00000000 */ nop +/* 800FC4 80240744 00000000 */ nop /* 800FC8 80240748 450001BD */ bc1f .L80240E40 /* 800FCC 8024074C E7A00030 */ swc1 $f0, 0x30($sp) /* 800FD0 80240750 8603000A */ lh $v1, 0xa($s0) /* 800FD4 80240754 44831000 */ mtc1 $v1, $f2 -/* 800FD8 80240758 00000000 */ nop +/* 800FD8 80240758 00000000 */ nop /* 800FDC 8024075C 468010A0 */ cvt.s.w $f2, $f2 /* 800FE0 80240760 46025002 */ mul.s $f0, $f10, $f2 -/* 800FE4 80240764 00000000 */ nop +/* 800FE4 80240764 00000000 */ nop /* 800FE8 80240768 46020000 */ add.s $f0, $f0, $f2 /* 800FEC 8024076C 3C013F00 */ lui $at, 0x3f00 /* 800FF0 80240770 44812000 */ mtc1 $at, $f4 -/* 800FF4 80240774 00000000 */ nop +/* 800FF4 80240774 00000000 */ nop /* 800FF8 80240778 46040502 */ mul.s $f20, $f0, $f4 -/* 800FFC 8024077C 00000000 */ nop +/* 800FFC 8024077C 00000000 */ nop /* 801000 80240780 8604000C */ lh $a0, 0xc($s0) /* 801004 80240784 44841000 */ mtc1 $a0, $f2 -/* 801008 80240788 00000000 */ nop +/* 801008 80240788 00000000 */ nop /* 80100C 8024078C 468010A0 */ cvt.s.w $f2, $f2 /* 801010 80240790 46023002 */ mul.s $f0, $f6, $f2 -/* 801014 80240794 00000000 */ nop +/* 801014 80240794 00000000 */ nop /* 801018 80240798 46020000 */ add.s $f0, $f0, $f2 /* 80101C 8024079C 46040582 */ mul.s $f22, $f0, $f4 -/* 801020 802407A0 00000000 */ nop +/* 801020 802407A0 00000000 */ nop /* 801024 802407A4 4600A086 */ mov.s $f2, $f20 /* 801028 802407A8 4608A03C */ c.lt.s $f20, $f8 -/* 80102C 802407AC 00000000 */ nop +/* 80102C 802407AC 00000000 */ nop /* 801030 802407B0 45000002 */ bc1f .L802407BC /* 801034 802407B4 4600B106 */ mov.s $f4, $f22 /* 801038 802407B8 46004506 */ mov.s $f20, $f8 .L802407BC: /* 80103C 802407BC 3C014080 */ lui $at, 0x4080 /* 801040 802407C0 44810000 */ mtc1 $at, $f0 -/* 801044 802407C4 00000000 */ nop +/* 801044 802407C4 00000000 */ nop /* 801048 802407C8 4600103C */ c.lt.s $f2, $f0 -/* 80104C 802407CC 00000000 */ nop +/* 80104C 802407CC 00000000 */ nop /* 801050 802407D0 45030001 */ bc1tl .L802407D8 /* 801054 802407D4 46000086 */ mov.s $f2, $f0 .L802407D8: /* 801058 802407D8 4608B03C */ c.lt.s $f22, $f8 -/* 80105C 802407DC 00000000 */ nop +/* 80105C 802407DC 00000000 */ nop /* 801060 802407E0 45030001 */ bc1tl .L802407E8 /* 801064 802407E4 46004586 */ mov.s $f22, $f8 .L802407E8: /* 801068 802407E8 4600203C */ c.lt.s $f4, $f0 -/* 80106C 802407EC 00000000 */ nop +/* 80106C 802407EC 00000000 */ nop /* 801070 802407F0 45030001 */ bc1tl .L802407F8 /* 801074 802407F4 46000106 */ mov.s $f4, $f0 .L802407F8: /* 801078 802407F8 2462FFFC */ addiu $v0, $v1, -4 /* 80107C 802407FC 44820000 */ mtc1 $v0, $f0 -/* 801080 80240800 00000000 */ nop +/* 801080 80240800 00000000 */ nop /* 801084 80240804 46800020 */ cvt.s.w $f0, $f0 /* 801088 80240808 4614003E */ c.le.s $f0, $f20 -/* 80108C 8024080C 00000000 */ nop +/* 80108C 8024080C 00000000 */ nop /* 801090 80240810 45000004 */ bc1f .L80240824 /* 801094 80240814 2462FFFB */ addiu $v0, $v1, -5 /* 801098 80240818 4482A000 */ mtc1 $v0, $f20 -/* 80109C 8024081C 00000000 */ nop +/* 80109C 8024081C 00000000 */ nop /* 8010A0 80240820 4680A520 */ cvt.s.w $f20, $f20 .L80240824: /* 8010A4 80240824 2482FFFC */ addiu $v0, $a0, -4 /* 8010A8 80240828 44820000 */ mtc1 $v0, $f0 -/* 8010AC 8024082C 00000000 */ nop +/* 8010AC 8024082C 00000000 */ nop /* 8010B0 80240830 46800020 */ cvt.s.w $f0, $f0 /* 8010B4 80240834 4616003E */ c.le.s $f0, $f22 -/* 8010B8 80240838 00000000 */ nop +/* 8010B8 80240838 00000000 */ nop /* 8010BC 8024083C 45000004 */ bc1f .L80240850 /* 8010C0 80240840 2482FFFB */ addiu $v0, $a0, -5 /* 8010C4 80240844 4482B000 */ mtc1 $v0, $f22 -/* 8010C8 80240848 00000000 */ nop +/* 8010C8 80240848 00000000 */ nop /* 8010CC 8024084C 4680B5A0 */ cvt.s.w $f22, $f22 .L80240850: /* 8010D0 80240850 3C05E300 */ lui $a1, 0xe300 @@ -156,14 +156,14 @@ glabel func_80240628_800EA8 /* 8010EC 8024086C 3652013F */ ori $s2, $s2, 0x13f /* 8010F0 80240870 3C17FCFF */ lui $s7, 0xfcff /* 8010F4 80240874 36F7FFFF */ ori $s7, $s7, 0xffff -/* 8010F8 80240878 3C14800A */ lui $s4, %hi(D_8009A66C) -/* 8010FC 8024087C 2694A66C */ addiu $s4, $s4, %lo(D_8009A66C) +/* 8010F8 80240878 3C14800A */ lui $s4, %hi(gMasterGfxPos) +/* 8010FC 8024087C 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) /* 801100 80240880 8E910000 */ lw $s1, ($s4) /* 801104 80240884 8602000E */ lh $v0, 0xe($s0) /* 801108 80240888 3C04800A */ lui $a0, %hi(nuGfxZBuffer) /* 80110C 8024088C 8C84A5DC */ lw $a0, %lo(nuGfxZBuffer)($a0) /* 801110 80240890 44820000 */ mtc1 $v0, $f0 -/* 801114 80240894 00000000 */ nop +/* 801114 80240894 00000000 */ nop /* 801118 80240898 46800020 */ cvt.s.w $f0, $f0 /* 80111C 8024089C 0220182D */ daddu $v1, $s1, $zero /* 801120 802408A0 26310008 */ addiu $s1, $s1, 8 @@ -173,7 +173,7 @@ glabel func_80240628_800EA8 /* 801130 802408B0 AC650000 */ sw $a1, ($v1) /* 801134 802408B4 AC600004 */ sw $zero, 4($v1) /* 801138 802408B8 44820000 */ mtc1 $v0, $f0 -/* 80113C 802408BC 00000000 */ nop +/* 80113C 802408BC 00000000 */ nop /* 801140 802408C0 46800020 */ cvt.s.w $f0, $f0 /* 801144 802408C4 26220008 */ addiu $v0, $s1, 8 /* 801148 802408C8 AE820000 */ sw $v0, ($s4) @@ -270,7 +270,7 @@ glabel func_80240628_800EA8 /* 8012B4 80240A34 AE820000 */ sw $v0, ($s4) /* 8012B8 80240A38 26220028 */ addiu $v0, $s1, 0x28 /* 8012BC 80240A3C 4600A102 */ mul.s $f4, $f20, $f0 -/* 8012C0 80240A40 00000000 */ nop +/* 8012C0 80240A40 00000000 */ nop /* 8012C4 80240A44 AE270018 */ sw $a3, 0x18($s1) /* 8012C8 80240A48 AE20001C */ sw $zero, 0x1c($s1) /* 8012CC 80240A4C AE820000 */ sw $v0, ($s4) @@ -278,7 +278,7 @@ glabel func_80240628_800EA8 /* 8012D4 80240A54 AE220024 */ sw $v0, 0x24($s1) /* 8012D8 80240A58 26220030 */ addiu $v0, $s1, 0x30 /* 8012DC 80240A5C 4600B002 */ mul.s $f0, $f22, $f0 -/* 8012E0 80240A60 00000000 */ nop +/* 8012E0 80240A60 00000000 */ nop /* 8012E4 80240A64 AE280020 */ sw $t0, 0x20($s1) /* 8012E8 80240A68 AE820000 */ sw $v0, ($s4) /* 8012EC 80240A6C 26220038 */ addiu $v0, $s1, 0x38 @@ -286,13 +286,13 @@ glabel func_80240628_800EA8 /* 8012F4 80240A74 AE20002C */ sw $zero, 0x2c($s1) /* 8012F8 80240A78 AE820000 */ sw $v0, ($s4) /* 8012FC 80240A7C 46022102 */ mul.s $f4, $f4, $f2 -/* 801300 80240A80 00000000 */ nop +/* 801300 80240A80 00000000 */ nop /* 801304 80240A84 26220040 */ addiu $v0, $s1, 0x40 /* 801308 80240A88 AE2A0030 */ sw $t2, 0x30($s1) /* 80130C 80240A8C AE200034 */ sw $zero, 0x34($s1) /* 801310 80240A90 AE820000 */ sw $v0, ($s4) /* 801314 80240A94 46020002 */ mul.s $f0, $f0, $f2 -/* 801318 80240A98 00000000 */ nop +/* 801318 80240A98 00000000 */ nop /* 80131C 80240A9C 3C014100 */ lui $at, 0x4100 /* 801320 80240AA0 44811000 */ mtc1 $at, $f2 /* 801324 80240AA4 26220048 */ addiu $v0, $s1, 0x48 @@ -428,8 +428,8 @@ glabel func_80240628_800EA8 /* 801518 80240C98 00621025 */ or $v0, $v1, $v0 /* 80151C 80240C9C AC820000 */ sw $v0, ($a0) .L80240CA0: -/* 801520 80240CA0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 801524 80240CA4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 801520 80240CA0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 801524 80240CA4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 801528 80240CA8 8C620000 */ lw $v0, ($v1) /* 80152C 80240CAC 0040202D */ daddu $a0, $v0, $zero /* 801530 80240CB0 24420008 */ addiu $v0, $v0, 8 @@ -483,8 +483,8 @@ glabel func_80240628_800EA8 .L80240D60: /* 8015E0 80240D60 AC820000 */ sw $v0, ($a0) /* 8015E4 80240D64 3C0502BC */ lui $a1, 0x2bc -/* 8015E8 80240D68 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 8015EC 80240D6C 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 8015E8 80240D68 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 8015EC 80240D6C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 8015F0 80240D70 8C620000 */ lw $v0, ($v1) /* 8015F4 80240D74 34A502BC */ ori $a1, $a1, 0x2bc /* 8015F8 80240D78 0040202D */ daddu $a0, $v0, $zero @@ -505,8 +505,8 @@ glabel func_80240628_800EA8 /* 801630 80240DB0 3C08FFFE */ lui $t0, 0xfffe /* 801634 80240DB4 3508793C */ ori $t0, $t0, 0x793c /* 801638 80240DB8 3C0BE300 */ lui $t3, 0xe300 -/* 80163C 80240DBC 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 801640 80240DC0 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 80163C 80240DBC 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 801640 80240DC0 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 801644 80240DC4 356B0C00 */ ori $t3, $t3, 0xc00 /* 801648 80240DC8 8C820000 */ lw $v0, ($a0) /* 80164C 80240DCC 3C03E700 */ lui $v1, 0xe700 @@ -553,5 +553,5 @@ glabel func_80240628_800EA8 /* 8016EC 80240E6C D7B40060 */ ldc1 $f20, 0x60($sp) /* 8016F0 80240E70 03E00008 */ jr $ra /* 8016F4 80240E74 27BD0070 */ addiu $sp, $sp, 0x70 -/* 8016F8 80240E78 00000000 */ nop -/* 8016FC 80240E7C 00000000 */ nop +/* 8016F8 80240E78 00000000 */ nop +/* 8016FC 80240E7C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242FA4_803824.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242FA4_803824.s index 34d779a66f..b1efe94548 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242FA4_803824.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242FA4_803824.s @@ -46,8 +46,8 @@ glabel func_80242FA4_803824 /* 8038C8 80243048 27B30040 */ addiu $s3, $sp, 0x40 /* 8038CC 8024304C 0260202D */ daddu $a0, $s3, $zero /* 8038D0 80243050 3C160001 */ lui $s6, 1 -/* 8038D4 80243054 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 8038D8 80243058 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 8038D4 80243054 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 8038D8 80243058 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 8038DC 8024305C 36D61630 */ ori $s6, $s6, 0x1630 /* 8038E0 80243060 3C05E700 */ lui $a1, 0xe700 /* 8038E4 80243064 8E230000 */ lw $v1, ($s1) @@ -158,10 +158,10 @@ glabel func_80242FA4_803824 /* 803A88 80243208 0C019D80 */ jal guMtxCatF /* 803A8C 8024320C 0260302D */ daddu $a2, $s3, $zero /* 803A90 80243210 0260202D */ daddu $a0, $s3, $zero -/* 803A94 80243214 3C108007 */ lui $s0, %hi(D_800741F0) -/* 803A98 80243218 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 803A9C 8024321C 3C14800A */ lui $s4, %hi(D_8009A674) -/* 803AA0 80243220 2694A674 */ addiu $s4, $s4, %lo(D_8009A674) +/* 803A94 80243214 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 803A98 80243218 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 803A9C 8024321C 3C14800A */ lui $s4, %hi(gDisplayContext) +/* 803AA0 80243220 2694A674 */ addiu $s4, $s4, %lo(gDisplayContext) /* 803AA4 80243224 96050000 */ lhu $a1, ($s0) /* 803AA8 80243228 8E820000 */ lw $v0, ($s4) /* 803AAC 8024322C 00052980 */ sll $a1, $a1, 6 @@ -199,7 +199,7 @@ glabel func_80242FA4_803824 /* 803B2C 802432AC A7A20020 */ sh $v0, 0x20($sp) /* 803B30 802432B0 3042FFFF */ andi $v0, $v0, 0xffff /* 803B34 802432B4 44820000 */ mtc1 $v0, $f0 -/* 803B38 802432B8 00000000 */ nop +/* 803B38 802432B8 00000000 */ nop /* 803B3C 802432BC 46800020 */ cvt.s.w $f0, $f0 /* 803B40 802432C0 AFA30018 */ sw $v1, 0x18($sp) /* 803B44 802432C4 AFA4001C */ sw $a0, 0x1c($sp) @@ -209,20 +209,20 @@ glabel func_80242FA4_803824 /* 803B54 802432D4 A7A20022 */ sh $v0, 0x22($sp) /* 803B58 802432D8 3042FFFF */ andi $v0, $v0, 0xffff /* 803B5C 802432DC 44820000 */ mtc1 $v0, $f0 -/* 803B60 802432E0 00000000 */ nop +/* 803B60 802432E0 00000000 */ nop /* 803B64 802432E4 46800020 */ cvt.s.w $f0, $f0 /* 803B68 802432E8 E6400038 */ swc1 $f0, 0x38($s2) /* 803B6C 802432EC C7A00038 */ lwc1 $f0, 0x38($sp) /* 803B70 802432F0 46800020 */ cvt.s.w $f0, $f0 /* 803B74 802432F4 46020002 */ mul.s $f0, $f0, $f2 -/* 803B78 802432F8 00000000 */ nop +/* 803B78 802432F8 00000000 */ nop /* 803B7C 802432FC 97A3003E */ lhu $v1, 0x3e($sp) /* 803B80 80243300 240200FF */ addiu $v0, $zero, 0xff /* 803B84 80243304 A3A20028 */ sb $v0, 0x28($sp) /* 803B88 80243308 A7A30026 */ sh $v1, 0x26($sp) /* 803B8C 8024330C 4600010D */ trunc.w.s $f4, $f0 /* 803B90 80243310 44022000 */ mfc1 $v0, $f4 -/* 803B94 80243314 00000000 */ nop +/* 803B94 80243314 00000000 */ nop /* 803B98 80243318 00021023 */ negu $v0, $v0 /* 803B9C 8024331C A7A20024 */ sh $v0, 0x24($sp) /* 803BA0 80243320 8E440000 */ lw $a0, ($s2) diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802454B4_805D34.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802454B4_805D34.s index 8159364cee..a486d8d86e 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802454B4_805D34.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802454B4_805D34.s @@ -5,8 +5,8 @@ glabel func_802454B4_805D34 /* 805D34 802454B4 3C06FCFF */ lui $a2, 0xfcff /* 805D38 802454B8 34C6C7FF */ ori $a2, $a2, 0xc7ff /* 805D3C 802454BC 3C05FF8F */ lui $a1, 0xff8f -/* 805D40 802454C0 3C04800A */ lui $a0, %hi(D_8009A66C) -/* 805D44 802454C4 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* 805D40 802454C0 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* 805D44 802454C4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 805D48 802454C8 8C820000 */ lw $v0, ($a0) /* 805D4C 802454CC 34A57FBF */ ori $a1, $a1, 0x7fbf /* 805D50 802454D0 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tabs_draw_stats_805418.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tabs_draw_stats_805418.s index b9cad9f73b..8b4b4169c8 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tabs_draw_stats_805418.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tabs_draw_stats_805418.s @@ -71,8 +71,8 @@ glabel pause_tabs_draw_stats_805418 /* 8054FC 80244C7C 1440FFDB */ bnez $v0, .L80244BEC /* 805500 80244C80 24A50010 */ addiu $a1, $a1, 0x10 .L80244C84: -/* 805504 80244C84 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 805508 80244C88 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 805504 80244C84 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 805508 80244C88 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 80550C 80244C8C 8C620000 */ lw $v0, ($v1) /* 805510 80244C90 0000202D */ daddu $a0, $zero, $zero /* 805514 80244C94 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243800_855970.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243800_855970.s index b5548d018d..4c222846c2 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243800_855970.s +++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243800_855970.s @@ -18,8 +18,8 @@ glabel func_80243800_855970 /* 8559A4 80243834 8FA60018 */ lw $a2, 0x18($sp) /* 8559A8 80243838 0C090D62 */ jal func_80243588_8556F8 /* 8559AC 8024383C 0220382D */ daddu $a3, $s1, $zero -/* 8559B0 80243840 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 8559B4 80243844 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 8559B0 80243840 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 8559B4 80243844 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 8559B8 80243848 8C620000 */ lw $v0, ($v1) /* 8559BC 8024384C 24040001 */ addiu $a0, $zero, 1 /* 8559C0 80243850 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_802438A4_855A14.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_802438A4_855A14.s index b742c28908..d769903ffe 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_802438A4_855A14.s +++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_802438A4_855A14.s @@ -18,8 +18,8 @@ glabel func_802438A4_855A14 /* 855A48 802438D8 8FA60018 */ lw $a2, 0x18($sp) /* 855A4C 802438DC 0C090D62 */ jal func_80243588_8556F8 /* 855A50 802438E0 0220382D */ daddu $a3, $s1, $zero -/* 855A54 802438E4 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 855A58 802438E8 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 855A54 802438E4 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 855A58 802438E8 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 855A5C 802438EC 8C620000 */ lw $v0, ($v1) /* 855A60 802438F0 24040002 */ addiu $a0, $zero, 2 /* 855A64 802438F4 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243F0C_85607C.s b/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243F0C_85607C.s index 2eadb8fc4b..8974c87d28 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243F0C_85607C.s +++ b/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243F0C_85607C.s @@ -28,10 +28,10 @@ glabel func_80243F0C_85607C /* 8560D8 80243F68 4481A000 */ mtc1 $at, $f20 .L80243F6C: /* 8560DC 80243F6C 44910000 */ mtc1 $s1, $f0 -/* 8560E0 80243F70 00000000 */ nop +/* 8560E0 80243F70 00000000 */ nop /* 8560E4 80243F74 46800020 */ cvt.s.w $f0, $f0 /* 8560E8 80243F78 44831000 */ mtc1 $v1, $f2 -/* 8560EC 80243F7C 00000000 */ nop +/* 8560EC 80243F7C 00000000 */ nop /* 8560F0 80243F80 468010A0 */ cvt.s.w $f2, $f2 /* 8560F4 80243F84 46020003 */ div.s $f0, $f0, $f2 /* 8560F8 80243F88 00111900 */ sll $v1, $s1, 4 @@ -42,7 +42,7 @@ glabel func_80243F0C_85607C /* 85610C 80243F9C 00431021 */ addu $v0, $v0, $v1 /* 856110 80243FA0 46006021 */ cvt.d.s $f0, $f12 /* 856114 80243FA4 4620B03C */ c.lt.d $f22, $f0 -/* 856118 80243FA8 00000000 */ nop +/* 856118 80243FA8 00000000 */ nop /* 85611C 80243FAC 45000003 */ bc1f .L80243FBC /* 856120 80243FB0 2450000C */ addiu $s0, $v0, 0xc /* 856124 80243FB4 46360001 */ sub.d $f0, $f0, $f22 @@ -59,9 +59,9 @@ glabel func_80243F0C_85607C /* 85614C 80243FDC AFA20014 */ sw $v0, 0x14($sp) /* 856150 80243FE0 C7A00024 */ lwc1 $f0, 0x24($sp) /* 856154 80243FE4 46180002 */ mul.s $f0, $f0, $f24 -/* 856158 80243FE8 00000000 */ nop +/* 856158 80243FE8 00000000 */ nop /* 85615C 80243FEC 4600A03E */ c.le.s $f20, $f0 -/* 856160 80243FF0 00000000 */ nop +/* 856160 80243FF0 00000000 */ nop /* 856164 80243FF4 45030005 */ bc1tl .L8024400C /* 856168 80243FF8 46140001 */ sub.s $f0, $f0, $f20 /* 85616C 80243FFC 4600018D */ trunc.w.s $f6, $f0 @@ -71,15 +71,15 @@ glabel func_80243F0C_85607C .L8024400C: /* 85617C 8024400C 4600018D */ trunc.w.s $f6, $f0 /* 856180 80244010 44023000 */ mfc1 $v0, $f6 -/* 856184 80244014 00000000 */ nop +/* 856184 80244014 00000000 */ nop /* 856188 80244018 00521025 */ or $v0, $v0, $s2 /* 85618C 8024401C A2020000 */ sb $v0, ($s0) .L80244020: /* 856190 80244020 C7A00028 */ lwc1 $f0, 0x28($sp) /* 856194 80244024 46180002 */ mul.s $f0, $f0, $f24 -/* 856198 80244028 00000000 */ nop +/* 856198 80244028 00000000 */ nop /* 85619C 8024402C 4600A03E */ c.le.s $f20, $f0 -/* 8561A0 80244030 00000000 */ nop +/* 8561A0 80244030 00000000 */ nop /* 8561A4 80244034 45010005 */ bc1t .L8024404C /* 8561A8 80244038 26030001 */ addiu $v1, $s0, 1 /* 8561AC 8024403C 4600018D */ trunc.w.s $f6, $f0 @@ -90,15 +90,15 @@ glabel func_80243F0C_85607C /* 8561BC 8024404C 46140001 */ sub.s $f0, $f0, $f20 /* 8561C0 80244050 4600018D */ trunc.w.s $f6, $f0 /* 8561C4 80244054 44023000 */ mfc1 $v0, $f6 -/* 8561C8 80244058 00000000 */ nop +/* 8561C8 80244058 00000000 */ nop /* 8561CC 8024405C 00521025 */ or $v0, $v0, $s2 /* 8561D0 80244060 A0620000 */ sb $v0, ($v1) .L80244064: /* 8561D4 80244064 C7A0002C */ lwc1 $f0, 0x2c($sp) /* 8561D8 80244068 46180002 */ mul.s $f0, $f0, $f24 -/* 8561DC 8024406C 00000000 */ nop +/* 8561DC 8024406C 00000000 */ nop /* 8561E0 80244070 4600A03E */ c.le.s $f20, $f0 -/* 8561E4 80244074 00000000 */ nop +/* 8561E4 80244074 00000000 */ nop /* 8561E8 80244078 45010005 */ bc1t .L80244090 /* 8561EC 8024407C 26020002 */ addiu $v0, $s0, 2 /* 8561F0 80244080 4600018D */ trunc.w.s $f6, $f0 @@ -109,7 +109,7 @@ glabel func_80243F0C_85607C /* 856200 80244090 46140001 */ sub.s $f0, $f0, $f20 /* 856204 80244094 4600018D */ trunc.w.s $f6, $f0 /* 856208 80244098 44033000 */ mfc1 $v1, $f6 -/* 85620C 8024409C 00000000 */ nop +/* 85620C 8024409C 00000000 */ nop /* 856210 802440A0 00721825 */ or $v1, $v1, $s2 /* 856214 802440A4 A0430000 */ sb $v1, ($v0) .L802440A8: @@ -117,10 +117,10 @@ glabel func_80243F0C_85607C /* 85621C 802440AC 26310001 */ addiu $s1, $s1, 1 /* 856220 802440B0 0223102A */ slt $v0, $s1, $v1 /* 856224 802440B4 1440FFAD */ bnez $v0, .L80243F6C -/* 856228 802440B8 00000000 */ nop +/* 856228 802440B8 00000000 */ nop .L802440BC: -/* 85622C 802440BC 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 856230 802440C0 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 85622C 802440BC 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 856230 802440C0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 856234 802440C4 8C620000 */ lw $v0, ($v1) /* 856238 802440C8 24040003 */ addiu $a0, $zero, 3 /* 85623C 802440CC 0040802D */ daddu $s0, $v0, $zero @@ -143,12 +143,12 @@ glabel func_80243F0C_85607C /* 856280 80244110 46200120 */ cvt.s.d $f4, $f0 /* 856284 80244114 46002021 */ cvt.d.s $f0, $f4 /* 856288 80244118 4620103C */ c.lt.d $f2, $f0 -/* 85628C 8024411C 00000000 */ nop +/* 85628C 8024411C 00000000 */ nop /* 856290 80244120 45000006 */ bc1f .L8024413C /* 856294 80244124 E4640000 */ swc1 $f4, ($v1) /* 856298 80244128 3C013F80 */ lui $at, 0x3f80 /* 85629C 8024412C 44810000 */ mtc1 $at, $f0 -/* 8562A0 80244130 00000000 */ nop +/* 8562A0 80244130 00000000 */ nop /* 8562A4 80244134 46002001 */ sub.s $f0, $f4, $f0 /* 8562A8 80244138 E4600000 */ swc1 $f0, ($v1) .L8024413C: diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_802408D0_865410.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_802408D0_865410.s index e803fbc3c7..9b38ebd8b4 100644 --- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_802408D0_865410.s +++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_802408D0_865410.s @@ -18,8 +18,8 @@ glabel func_802408D0_865410 /* 865444 80240904 8FA60018 */ lw $a2, 0x18($sp) /* 865448 80240908 0C090196 */ jal func_80240658_865198 /* 86544C 8024090C 0220382D */ daddu $a3, $s1, $zero -/* 865450 80240910 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 865454 80240914 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 865450 80240910 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 865454 80240914 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 865458 80240918 8C620000 */ lw $v0, ($v1) /* 86545C 8024091C 24040001 */ addiu $a0, $zero, 1 /* 865460 80240920 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240974_8654B4.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240974_8654B4.s index 3be69534ab..6e671ed645 100644 --- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240974_8654B4.s +++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240974_8654B4.s @@ -18,8 +18,8 @@ glabel func_80240974_8654B4 /* 8654E8 802409A8 8FA60018 */ lw $a2, 0x18($sp) /* 8654EC 802409AC 0C090196 */ jal func_80240658_865198 /* 8654F0 802409B0 0220382D */ daddu $a3, $s1, $zero -/* 8654F4 802409B4 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 8654F8 802409B8 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 8654F4 802409B4 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 8654F8 802409B8 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 8654FC 802409BC 8C620000 */ lw $v0, ($v1) /* 865500 802409C0 24040002 */ addiu $a0, $zero, 2 /* 865504 802409C4 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s index 593f78af18..bd8d401d1f 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s @@ -10,11 +10,11 @@ glabel func_802411E0_E0F980 /* E0F994 802411F4 AFBF0034 */ sw $ra, 0x34($sp) /* E0F998 802411F8 1A4000CB */ blez $s2, .L80241528 /* E0F99C 802411FC AFB00028 */ sw $s0, 0x28($sp) -/* E0F9A0 80241200 3C04800A */ lui $a0, %hi(D_8009A66C) -/* E0F9A4 80241204 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) +/* E0F9A0 80241200 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* E0F9A4 80241204 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* E0F9A8 80241208 3C02DE00 */ lui $v0, 0xde00 /* E0F9AC 8024120C 44920000 */ mtc1 $s2, $f0 -/* E0F9B0 80241210 00000000 */ nop +/* E0F9B0 80241210 00000000 */ nop /* E0F9B4 80241214 46800021 */ cvt.d.w $f0, $f0 /* E0F9B8 80241218 8C830000 */ lw $v1, ($a0) /* E0F9BC 8024121C 3C018024 */ lui $at, %hi(D_80243F90) @@ -30,7 +30,7 @@ glabel func_802411E0_E0F980 /* E0F9E4 80241244 AC820000 */ sw $v0, ($a0) /* E0F9E8 80241248 3C02E700 */ lui $v0, 0xe700 /* E0F9EC 8024124C 46220002 */ mul.d $f0, $f0, $f2 -/* E0F9F0 80241250 00000000 */ nop +/* E0F9F0 80241250 00000000 */ nop /* E0F9F4 80241254 AC620000 */ sw $v0, ($v1) /* E0F9F8 80241258 24620010 */ addiu $v0, $v1, 0x10 /* E0F9FC 8024125C AC600004 */ sw $zero, 4($v1) @@ -41,7 +41,7 @@ glabel func_802411E0_E0F980 /* E0FA10 80241270 44801000 */ mtc1 $zero, $f2 /* E0FA14 80241274 246D000C */ addiu $t5, $v1, 0xc /* E0FA18 80241278 4620103E */ c.le.d $f2, $f0 -/* E0FA1C 8024127C 00000000 */ nop +/* E0FA1C 8024127C 00000000 */ nop /* E0FA20 80241280 45010005 */ bc1t .L80241298 /* E0FA24 80241284 AC620008 */ sw $v0, 8($v1) /* E0FA28 80241288 4620010D */ trunc.w.d $f4, $f0 @@ -53,7 +53,7 @@ glabel func_802411E0_E0F980 /* E0FA3C 8024129C 3C028000 */ lui $v0, 0x8000 /* E0FA40 802412A0 4620010D */ trunc.w.d $f4, $f0 /* E0FA44 802412A4 440C2000 */ mfc1 $t4, $f4 -/* E0FA48 802412A8 00000000 */ nop +/* E0FA48 802412A8 00000000 */ nop /* E0FA4C 802412AC 01826025 */ or $t4, $t4, $v0 /* E0FA50 802412B0 3C091078 */ lui $t1, 0x1078 .L802412B4: @@ -65,12 +65,12 @@ glabel func_802411E0_E0F980 /* E0FA68 802412C8 2404002D */ addiu $a0, $zero, 0x2d /* E0FA6C 802412CC 24050032 */ addiu $a1, $zero, 0x32 /* E0FA70 802412D0 240600E6 */ addiu $a2, $zero, 0xe6 -/* E0FA74 802412D4 3C08800A */ lui $t0, %hi(D_8009A66C) -/* E0FA78 802412D8 2508A66C */ addiu $t0, $t0, %lo(D_8009A66C) +/* E0FA74 802412D4 3C08800A */ lui $t0, %hi(gMasterGfxPos) +/* E0FA78 802412D8 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* E0FA7C 802412DC 318200FF */ andi $v0, $t4, 0xff /* E0FA80 802412E0 00491025 */ or $v0, $v0, $t1 /* E0FA84 802412E4 44921000 */ mtc1 $s2, $f2 -/* E0FA88 802412E8 00000000 */ nop +/* E0FA88 802412E8 00000000 */ nop /* E0FA8C 802412EC 468010A1 */ cvt.d.w $f2, $f2 /* E0FA90 802412F0 8D030000 */ lw $v1, ($t0) /* E0FA94 802412F4 3C018024 */ lui $at, %hi(D_80243F98) @@ -86,7 +86,7 @@ glabel func_802411E0_E0F980 /* E0FABC 8024131C AD020000 */ sw $v0, ($t0) /* E0FAC0 80241320 3C02E700 */ lui $v0, 0xe700 /* E0FAC4 80241324 46201082 */ mul.d $f2, $f2, $f0 -/* E0FAC8 80241328 00000000 */ nop +/* E0FAC8 80241328 00000000 */ nop /* E0FACC 8024132C AC620000 */ sw $v0, ($v1) /* E0FAD0 80241330 24020006 */ addiu $v0, $zero, 6 /* E0FAD4 80241334 AC600004 */ sw $zero, 4($v1) diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_80240070_B9D9D0.s b/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_80240070_B9D9D0.s index 824afbf682..823eeef36a 100644 --- a/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_80240070_B9D9D0.s +++ b/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_80240070_B9D9D0.s @@ -74,8 +74,8 @@ glabel func_80240070_B9D9D0 /* B9DAC4 80240164 3C08E200 */ lui $t0, 0xe200 /* B9DAC8 80240168 3508001C */ ori $t0, $t0, 0x1c /* B9DACC 8024016C 3C07C810 */ lui $a3, 0xc810 -/* B9DAD0 80240170 3C05800A */ lui $a1, %hi(D_8009A66C) -/* B9DAD4 80240174 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* B9DAD0 80240170 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* B9DAD4 80240174 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* B9DAD8 80240178 8CA30000 */ lw $v1, ($a1) /* B9DADC 8024017C 34E74DD8 */ ori $a3, $a3, 0x4dd8 /* B9DAE0 80240180 0060202D */ daddu $a0, $v1, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_802400D8_BAA218.s b/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_802400D8_BAA218.s index 6801a041da..7eb4538b2c 100644 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_802400D8_BAA218.s +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_802400D8_BAA218.s @@ -74,8 +74,8 @@ glabel func_802400D8_BAA218 /* BAA30C 802401CC 3C08E200 */ lui $t0, 0xe200 /* BAA310 802401D0 3508001C */ ori $t0, $t0, 0x1c /* BAA314 802401D4 3C07C810 */ lui $a3, 0xc810 -/* BAA318 802401D8 3C05800A */ lui $a1, %hi(D_8009A66C) -/* BAA31C 802401DC 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* BAA318 802401D8 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* BAA31C 802401DC 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* BAA320 802401E0 8CA30000 */ lw $v1, ($a1) /* BAA324 802401E4 34E74DD8 */ ori $a3, $a3, 0x4dd8 /* BAA328 802401E8 0060202D */ daddu $a0, $v1, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240814_9EE404.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240814_9EE404.s index ae926219b6..89bdd6a08e 100644 --- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240814_9EE404.s +++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240814_9EE404.s @@ -41,15 +41,15 @@ glabel func_80240814_9EE404 /* 9EE494 802408A4 46001080 */ add.s $f2, $f2, $f0 /* 9EE498 802408A8 C440000C */ lwc1 $f0, 0xc($v0) /* 9EE49C 802408AC 4602003C */ c.lt.s $f0, $f2 -/* 9EE4A0 802408B0 00000000 */ nop +/* 9EE4A0 802408B0 00000000 */ nop /* 9EE4A4 802408B4 45000009 */ bc1f .L802408DC /* 9EE4A8 802408B8 E4420010 */ swc1 $f2, 0x10($v0) /* 9EE4AC 802408BC 46020001 */ sub.s $f0, $f0, $f2 /* 9EE4B0 802408C0 3C013F00 */ lui $at, 0x3f00 /* 9EE4B4 802408C4 44811000 */ mtc1 $at, $f2 -/* 9EE4B8 802408C8 00000000 */ nop +/* 9EE4B8 802408C8 00000000 */ nop /* 9EE4BC 802408CC 46020002 */ mul.s $f0, $f0, $f2 -/* 9EE4C0 802408D0 00000000 */ nop +/* 9EE4C0 802408D0 00000000 */ nop /* 9EE4C4 802408D4 46002000 */ add.s $f0, $f4, $f0 /* 9EE4C8 802408D8 E4400014 */ swc1 $f0, 0x14($v0) .L802408DC: @@ -65,11 +65,11 @@ glabel func_80240814_9EE404 /* 9EE4F0 80240900 D4226E28 */ ldc1 $f2, %lo(D_80246E28)($at) /* 9EE4F4 80240904 46000021 */ cvt.d.s $f0, $f0 /* 9EE4F8 80240908 46220002 */ mul.d $f0, $f0, $f2 -/* 9EE4FC 8024090C 00000000 */ nop +/* 9EE4FC 8024090C 00000000 */ nop /* 9EE500 80240910 C4440034 */ lwc1 $f4, 0x34($v0) /* 9EE504 80240914 3C013F80 */ lui $at, 0x3f80 /* 9EE508 80240918 44811000 */ mtc1 $at, $f2 -/* 9EE50C 8024091C 00000000 */ nop +/* 9EE50C 8024091C 00000000 */ nop /* 9EE510 80240920 46022100 */ add.s $f4, $f4, $f2 /* 9EE514 80240924 C442003C */ lwc1 $f2, 0x3c($v0) /* 9EE518 80240928 46023180 */ add.s $f6, $f6, $f2 @@ -86,15 +86,15 @@ glabel func_80240814_9EE404 /* 9EE540 80240950 46040000 */ add.s $f0, $f0, $f4 /* 9EE544 80240954 C442000C */ lwc1 $f2, 0xc($v0) /* 9EE548 80240958 4600103C */ c.lt.s $f2, $f0 -/* 9EE54C 8024095C 00000000 */ nop +/* 9EE54C 8024095C 00000000 */ nop /* 9EE550 80240960 45000009 */ bc1f .L80240988 /* 9EE554 80240964 E4400010 */ swc1 $f0, 0x10($v0) /* 9EE558 80240968 46001001 */ sub.s $f0, $f2, $f0 /* 9EE55C 8024096C 3C013F00 */ lui $at, 0x3f00 /* 9EE560 80240970 44811000 */ mtc1 $at, $f2 -/* 9EE564 80240974 00000000 */ nop +/* 9EE564 80240974 00000000 */ nop /* 9EE568 80240978 46020002 */ mul.s $f0, $f0, $f2 -/* 9EE56C 8024097C 00000000 */ nop +/* 9EE56C 8024097C 00000000 */ nop /* 9EE570 80240980 46002000 */ add.s $f0, $f4, $f0 /* 9EE574 80240984 E4400014 */ swc1 $f0, 0x14($v0) .L80240988: @@ -110,7 +110,7 @@ glabel func_80240814_9EE404 /* 9EE59C 802409AC D4226E30 */ ldc1 $f2, %lo(D_80246E30)($at) /* 9EE5A0 802409B0 46000021 */ cvt.d.s $f0, $f0 /* 9EE5A4 802409B4 46220002 */ mul.d $f0, $f0, $f2 -/* 9EE5A8 802409B8 00000000 */ nop +/* 9EE5A8 802409B8 00000000 */ nop /* 9EE5AC 802409BC 46200020 */ cvt.s.d $f0, $f0 /* 9EE5B0 802409C0 46003180 */ add.s $f6, $f6, $f0 /* 9EE5B4 802409C4 E440001C */ swc1 $f0, 0x1c($v0) @@ -125,16 +125,16 @@ glabel func_80240814_9EE404 /* 9EE5D4 802409E4 44801000 */ mtc1 $zero, $f2 /* 9EE5D8 802409E8 46000021 */ cvt.d.s $f0, $f0 /* 9EE5DC 802409EC 46220002 */ mul.d $f0, $f0, $f2 -/* 9EE5E0 802409F0 00000000 */ nop -/* 9EE5E4 802409F4 3C12800A */ lui $s2, %hi(D_8009A66C) -/* 9EE5E8 802409F8 2652A66C */ addiu $s2, $s2, %lo(D_8009A66C) +/* 9EE5E0 802409F0 00000000 */ nop +/* 9EE5E4 802409F4 3C12800A */ lui $s2, %hi(gMasterGfxPos) +/* 9EE5E8 802409F8 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) /* 9EE5EC 802409FC 36941630 */ ori $s4, $s4, 0x1630 /* 9EE5F0 80240A00 3C02DE00 */ lui $v0, 0xde00 -/* 9EE5F4 80240A04 3C118007 */ lui $s1, %hi(D_800741F0) -/* 9EE5F8 80240A08 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) +/* 9EE5F4 80240A04 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* 9EE5F8 80240A08 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) /* 9EE5FC 80240A0C 8E430000 */ lw $v1, ($s2) -/* 9EE600 80240A10 3C13800A */ lui $s3, %hi(D_8009A674) -/* 9EE604 80240A14 2673A674 */ addiu $s3, $s3, %lo(D_8009A674) +/* 9EE600 80240A10 3C13800A */ lui $s3, %hi(gDisplayContext) +/* 9EE604 80240A14 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) /* 9EE608 80240A18 0060202D */ daddu $a0, $v1, $zero /* 9EE60C 80240A1C 46200020 */ cvt.s.d $f0, $f0 /* 9EE610 80240A20 E6000014 */ swc1 $f0, 0x14($s0) @@ -168,7 +168,7 @@ glabel func_80240814_9EE404 /* 9EE680 80240A90 ACC30004 */ sw $v1, 4($a2) /* 9EE684 80240A94 C61C0020 */ lwc1 $f28, 0x20($s0) /* 9EE688 80240A98 4618E302 */ mul.s $f12, $f28, $f24 -/* 9EE68C 80240A9C 00000000 */ nop +/* 9EE68C 80240A9C 00000000 */ nop /* 9EE690 80240AA0 3C014334 */ lui $at, 0x4334 /* 9EE694 80240AA4 4481A000 */ mtc1 $at, $f20 /* 9EE698 80240AA8 3C014049 */ lui $at, 0x4049 @@ -177,7 +177,7 @@ glabel func_80240814_9EE404 /* 9EE6A4 80240AB4 24840008 */ addiu $a0, $a0, 8 /* 9EE6A8 80240AB8 46146303 */ div.s $f12, $f12, $f20 /* 9EE6AC 80240ABC 46166302 */ mul.s $f12, $f12, $f22 -/* 9EE6B0 80240AC0 00000000 */ nop +/* 9EE6B0 80240AC0 00000000 */ nop /* 9EE6B4 80240AC4 24A50001 */ addiu $a1, $a1, 1 /* 9EE6B8 80240AC8 AE440000 */ sw $a0, ($s2) /* 9EE6BC 80240ACC A6250000 */ sh $a1, ($s1) @@ -186,12 +186,12 @@ glabel func_80240814_9EE404 /* 9EE6C8 80240AD8 24150001 */ addiu $s5, $zero, 1 /* 9EE6CC 80240ADC C60C0020 */ lwc1 $f12, 0x20($s0) /* 9EE6D0 80240AE0 46186302 */ mul.s $f12, $f12, $f24 -/* 9EE6D4 80240AE4 00000000 */ nop +/* 9EE6D4 80240AE4 00000000 */ nop /* 9EE6D8 80240AE8 4600D002 */ mul.s $f0, $f26, $f0 -/* 9EE6DC 80240AEC 00000000 */ nop +/* 9EE6DC 80240AEC 00000000 */ nop /* 9EE6E0 80240AF0 46146303 */ div.s $f12, $f12, $f20 /* 9EE6E4 80240AF4 46166302 */ mul.s $f12, $f12, $f22 -/* 9EE6E8 80240AF8 00000000 */ nop +/* 9EE6E8 80240AF8 00000000 */ nop /* 9EE6EC 80240AFC 0200B02D */ daddu $s6, $s0, $zero /* 9EE6F0 80240B00 C7AE0020 */ lwc1 $f14, 0x20($sp) /* 9EE6F4 80240B04 3C178024 */ lui $s7, %hi(D_80241748) @@ -207,7 +207,7 @@ glabel func_80240814_9EE404 /* 9EE71C 80240B2C 4407E000 */ mfc1 $a3, $f28 /* 9EE720 80240B30 96240000 */ lhu $a0, ($s1) /* 9EE724 80240B34 4600B002 */ mul.s $f0, $f22, $f0 -/* 9EE728 80240B38 00000000 */ nop +/* 9EE728 80240B38 00000000 */ nop /* 9EE72C 80240B3C E7B80014 */ swc1 $f24, 0x14($sp) /* 9EE730 80240B40 E7B60018 */ swc1 $f22, 0x18($sp) /* 9EE734 80240B44 E7B8001C */ swc1 $f24, 0x1c($sp) @@ -239,38 +239,38 @@ glabel func_80240814_9EE404 .L80240BAC: /* 9EE79C 80240BAC C6DC0020 */ lwc1 $f28, 0x20($s6) /* 9EE7A0 80240BB0 4495A000 */ mtc1 $s5, $f20 -/* 9EE7A4 80240BB4 00000000 */ nop +/* 9EE7A4 80240BB4 00000000 */ nop /* 9EE7A8 80240BB8 4680A520 */ cvt.s.w $f20, $f20 /* 9EE7AC 80240BBC 4614E302 */ mul.s $f12, $f28, $f20 -/* 9EE7B0 80240BC0 00000000 */ nop +/* 9EE7B0 80240BC0 00000000 */ nop /* 9EE7B4 80240BC4 3C014334 */ lui $at, 0x4334 /* 9EE7B8 80240BC8 44817000 */ mtc1 $at, $f14 -/* 9EE7BC 80240BCC 00000000 */ nop +/* 9EE7BC 80240BCC 00000000 */ nop /* 9EE7C0 80240BD0 460E6303 */ div.s $f12, $f12, $f14 /* 9EE7C4 80240BD4 3C014049 */ lui $at, 0x4049 /* 9EE7C8 80240BD8 34210FD8 */ ori $at, $at, 0xfd8 /* 9EE7CC 80240BDC 44817000 */ mtc1 $at, $f14 -/* 9EE7D0 80240BE0 00000000 */ nop +/* 9EE7D0 80240BE0 00000000 */ nop /* 9EE7D4 80240BE4 460E6302 */ mul.s $f12, $f12, $f14 -/* 9EE7D8 80240BE8 00000000 */ nop +/* 9EE7D8 80240BE8 00000000 */ nop /* 9EE7DC 80240BEC C6D60010 */ lwc1 $f22, 0x10($s6) /* 9EE7E0 80240BF0 0C00A85B */ jal sin_rad /* 9EE7E4 80240BF4 26B50001 */ addiu $s5, $s5, 1 /* 9EE7E8 80240BF8 C6CC0020 */ lwc1 $f12, 0x20($s6) /* 9EE7EC 80240BFC 46146302 */ mul.s $f12, $f12, $f20 -/* 9EE7F0 80240C00 00000000 */ nop +/* 9EE7F0 80240C00 00000000 */ nop /* 9EE7F4 80240C04 4600B002 */ mul.s $f0, $f22, $f0 -/* 9EE7F8 80240C08 00000000 */ nop +/* 9EE7F8 80240C08 00000000 */ nop /* 9EE7FC 80240C0C 3C014334 */ lui $at, 0x4334 /* 9EE800 80240C10 44817000 */ mtc1 $at, $f14 -/* 9EE804 80240C14 00000000 */ nop +/* 9EE804 80240C14 00000000 */ nop /* 9EE808 80240C18 460E6303 */ div.s $f12, $f12, $f14 /* 9EE80C 80240C1C 3C014049 */ lui $at, 0x4049 /* 9EE810 80240C20 34210FD8 */ ori $at, $at, 0xfd8 /* 9EE814 80240C24 44817000 */ mtc1 $at, $f14 -/* 9EE818 80240C28 00000000 */ nop +/* 9EE818 80240C28 00000000 */ nop /* 9EE81C 80240C2C 460E6302 */ mul.s $f12, $f12, $f14 -/* 9EE820 80240C30 00000000 */ nop +/* 9EE820 80240C30 00000000 */ nop /* 9EE824 80240C34 C7AE0020 */ lwc1 $f14, 0x20($sp) /* 9EE828 80240C38 46007380 */ add.s $f14, $f14, $f0 /* 9EE82C 80240C3C 4600B587 */ neg.s $f22, $f22 @@ -279,7 +279,7 @@ glabel func_80240814_9EE404 /* 9EE838 80240C48 3C090100 */ lui $t1, 0x100 /* 9EE83C 80240C4C 35292004 */ ori $t1, $t1, 0x2004 /* 9EE840 80240C50 4600B002 */ mul.s $f0, $f22, $f0 -/* 9EE844 80240C54 00000000 */ nop +/* 9EE844 80240C54 00000000 */ nop /* 9EE848 80240C58 8E430000 */ lw $v1, ($s2) /* 9EE84C 80240C5C 4405C000 */ mfc1 $a1, $f24 /* 9EE850 80240C60 4406C000 */ mfc1 $a2, $f24 @@ -335,8 +335,8 @@ glabel func_80240814_9EE404 /* 9EE918 80240D28 1440FFA0 */ bnez $v0, .L80240BAC /* 9EE91C 80240D2C AC87000C */ sw $a3, 0xc($a0) /* 9EE920 80240D30 3C03D838 */ lui $v1, 0xd838 -/* 9EE924 80240D34 3C05800A */ lui $a1, %hi(D_8009A66C) -/* 9EE928 80240D38 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) +/* 9EE924 80240D34 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* 9EE928 80240D38 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) /* 9EE92C 80240D3C 8CA20000 */ lw $v0, ($a1) /* 9EE930 80240D40 34630002 */ ori $v1, $v1, 2 /* 9EE934 80240D44 0040202D */ daddu $a0, $v0, $zero @@ -375,7 +375,7 @@ glabel func_80240814_9EE404 .L80240DC8: /* 9EE9B8 80240DC8 8C620044 */ lw $v0, 0x44($v1) /* 9EE9BC 80240DCC 1040000E */ beqz $v0, .L80240E08 -/* 9EE9C0 80240DD0 00000000 */ nop +/* 9EE9C0 80240DD0 00000000 */ nop /* 9EE9C4 80240DD4 3C014080 */ lui $at, 0x4080 /* 9EE9C8 80240DD8 44811000 */ mtc1 $at, $f2 /* 9EE9CC 80240DDC C7AE0020 */ lwc1 $f14, 0x20($sp) diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240000_BD3870.s b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240000_BD3870.s index 34d119d55f..c4997f4d9d 100644 --- a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240000_BD3870.s +++ b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240000_BD3870.s @@ -46,8 +46,8 @@ glabel func_80240000_BD3870 /* BD3914 802400A4 27B30040 */ addiu $s3, $sp, 0x40 /* BD3918 802400A8 0260202D */ daddu $a0, $s3, $zero /* BD391C 802400AC 3C160001 */ lui $s6, 1 -/* BD3920 802400B0 3C11800A */ lui $s1, %hi(D_8009A66C) -/* BD3924 802400B4 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* BD3920 802400B0 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* BD3924 802400B4 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* BD3928 802400B8 36D61630 */ ori $s6, $s6, 0x1630 /* BD392C 802400BC 3C05E700 */ lui $a1, 0xe700 /* BD3930 802400C0 8E230000 */ lw $v1, ($s1) @@ -158,10 +158,10 @@ glabel func_80240000_BD3870 /* BD3AD4 80240264 0C019D80 */ jal guMtxCatF /* BD3AD8 80240268 0260302D */ daddu $a2, $s3, $zero /* BD3ADC 8024026C 0260202D */ daddu $a0, $s3, $zero -/* BD3AE0 80240270 3C108007 */ lui $s0, %hi(D_800741F0) -/* BD3AE4 80240274 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* BD3AE8 80240278 3C14800A */ lui $s4, %hi(D_8009A674) -/* BD3AEC 8024027C 2694A674 */ addiu $s4, $s4, %lo(D_8009A674) +/* BD3AE0 80240270 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* BD3AE4 80240274 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* BD3AE8 80240278 3C14800A */ lui $s4, %hi(gDisplayContext) +/* BD3AEC 8024027C 2694A674 */ addiu $s4, $s4, %lo(gDisplayContext) /* BD3AF0 80240280 96050000 */ lhu $a1, ($s0) /* BD3AF4 80240284 8E820000 */ lw $v0, ($s4) /* BD3AF8 80240288 00052980 */ sll $a1, $a1, 6 @@ -199,7 +199,7 @@ glabel func_80240000_BD3870 /* BD3B78 80240308 A7A20020 */ sh $v0, 0x20($sp) /* BD3B7C 8024030C 3042FFFF */ andi $v0, $v0, 0xffff /* BD3B80 80240310 44820000 */ mtc1 $v0, $f0 -/* BD3B84 80240314 00000000 */ nop +/* BD3B84 80240314 00000000 */ nop /* BD3B88 80240318 46800020 */ cvt.s.w $f0, $f0 /* BD3B8C 8024031C AFA30018 */ sw $v1, 0x18($sp) /* BD3B90 80240320 AFA4001C */ sw $a0, 0x1c($sp) @@ -209,20 +209,20 @@ glabel func_80240000_BD3870 /* BD3BA0 80240330 A7A20022 */ sh $v0, 0x22($sp) /* BD3BA4 80240334 3042FFFF */ andi $v0, $v0, 0xffff /* BD3BA8 80240338 44820000 */ mtc1 $v0, $f0 -/* BD3BAC 8024033C 00000000 */ nop +/* BD3BAC 8024033C 00000000 */ nop /* BD3BB0 80240340 46800020 */ cvt.s.w $f0, $f0 /* BD3BB4 80240344 E6400038 */ swc1 $f0, 0x38($s2) /* BD3BB8 80240348 C7A00038 */ lwc1 $f0, 0x38($sp) /* BD3BBC 8024034C 46800020 */ cvt.s.w $f0, $f0 /* BD3BC0 80240350 46020002 */ mul.s $f0, $f0, $f2 -/* BD3BC4 80240354 00000000 */ nop +/* BD3BC4 80240354 00000000 */ nop /* BD3BC8 80240358 97A3003E */ lhu $v1, 0x3e($sp) /* BD3BCC 8024035C 240200FF */ addiu $v0, $zero, 0xff /* BD3BD0 80240360 A3A20028 */ sb $v0, 0x28($sp) /* BD3BD4 80240364 A7A30026 */ sh $v1, 0x26($sp) /* BD3BD8 80240368 4600010D */ trunc.w.s $f4, $f0 /* BD3BDC 8024036C 44022000 */ mfc1 $v0, $f4 -/* BD3BE0 80240370 00000000 */ nop +/* BD3BE0 80240370 00000000 */ nop /* BD3BE4 80240374 00021023 */ negu $v0, $v0 /* BD3BE8 80240378 A7A20024 */ sh $v0, 0x24($sp) /* BD3BEC 8024037C 8E440000 */ lw $a0, ($s2) diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802410B0_D7DC00.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802410B0_D7DC00.s index 69983bff84..1fba821038 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802410B0_D7DC00.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802410B0_D7DC00.s @@ -35,9 +35,9 @@ glabel func_802410B0_D7DC00 /* D7DC78 80241128 0C0903C8 */ jal func_80240F20_D7DA70 /* D7DC7C 8024112C AFB20010 */ sw $s2, 0x10($sp) /* D7DC80 80241130 12400022 */ beqz $s2, .L802411BC -/* D7DC84 80241134 00000000 */ nop +/* D7DC84 80241134 00000000 */ nop /* D7DC88 80241138 08090464 */ j .L80241190 -/* D7DC8C 8024113C 00000000 */ nop +/* D7DC8C 8024113C 00000000 */ nop .L80241140: /* D7DC90 80241140 00108840 */ sll $s1, $s0, 1 /* D7DC94 80241144 02308821 */ addu $s1, $s1, $s0 @@ -60,8 +60,8 @@ glabel func_802410B0_D7DC00 /* D7DCD8 80241188 0C0903C8 */ jal func_80240F20_D7DA70 /* D7DCDC 8024118C AFA20010 */ sw $v0, 0x10($sp) .L80241190: -/* D7DCE0 80241190 3C03800A */ lui $v1, %hi(D_8009A66C) -/* D7DCE4 80241194 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* D7DCE0 80241190 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* D7DCE4 80241194 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* D7DCE8 80241198 8C620000 */ lw $v0, ($v1) /* D7DCEC 8024119C 0220202D */ daddu $a0, $s1, $zero /* D7DCF0 802411A0 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240020_9AE720.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240020_9AE720.s index 7634dba5bd..12e9dcdd39 100644 --- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240020_9AE720.s +++ b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240020_9AE720.s @@ -38,8 +38,8 @@ glabel func_80240020_9AE720 /* 9AE7A4 802400A4 AFB500D4 */ sw $s5, 0xd4($sp) /* 9AE7A8 802400A8 3C150001 */ lui $s5, 1 /* 9AE7AC 802400AC AFB100C4 */ sw $s1, 0xc4($sp) -/* 9AE7B0 802400B0 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 9AE7B4 802400B4 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 9AE7B0 802400B0 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 9AE7B4 802400B4 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 9AE7B8 802400B8 36B51630 */ ori $s5, $s5, 0x1630 /* 9AE7BC 802400BC AFBF00D8 */ sw $ra, 0xd8($sp) /* 9AE7C0 802400C0 F7B600E8 */ sdc1 $f22, 0xe8($sp) @@ -154,10 +154,10 @@ glabel func_80240020_9AE720 /* 9AE974 80240274 0C019D80 */ jal guMtxCatF /* 9AE978 80240278 0240302D */ daddu $a2, $s2, $zero /* 9AE97C 8024027C 0240202D */ daddu $a0, $s2, $zero -/* 9AE980 80240280 3C108007 */ lui $s0, %hi(D_800741F0) -/* 9AE984 80240284 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 9AE988 80240288 3C12800A */ lui $s2, %hi(D_8009A674) -/* 9AE98C 8024028C 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 9AE980 80240280 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 9AE984 80240284 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 9AE988 80240288 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 9AE98C 8024028C 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 9AE990 80240290 96050000 */ lhu $a1, ($s0) /* 9AE994 80240294 8E420000 */ lw $v0, ($s2) /* 9AE998 80240298 00052980 */ sll $a1, $a1, 6 @@ -232,8 +232,8 @@ glabel func_80240020_9AE720 /* 9AEAA4 802403A4 0C04EBDC */ jal func_8013AF70 /* 9AEAA8 802403A8 A7A20026 */ sh $v0, 0x26($sp) /* 9AEAAC 802403AC 3C05D838 */ lui $a1, 0xd838 -/* 9AEAB0 802403B0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 9AEAB4 802403B4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 9AEAB0 802403B0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 9AEAB4 802403B4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 9AEAB8 802403B8 8C620000 */ lw $v0, ($v1) /* 9AEABC 802403BC 34A50002 */ ori $a1, $a1, 2 /* 9AEAC0 802403C0 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240310_9B1AA0.s b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240310_9B1AA0.s index 4f2ea009c0..245b2852cd 100644 --- a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240310_9B1AA0.s +++ b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240310_9B1AA0.s @@ -38,8 +38,8 @@ glabel func_80240310_9B1AA0 /* 9B1B24 80240394 AFB500D4 */ sw $s5, 0xd4($sp) /* 9B1B28 80240398 3C150001 */ lui $s5, 1 /* 9B1B2C 8024039C AFB100C4 */ sw $s1, 0xc4($sp) -/* 9B1B30 802403A0 3C11800A */ lui $s1, %hi(D_8009A66C) -/* 9B1B34 802403A4 2631A66C */ addiu $s1, $s1, %lo(D_8009A66C) +/* 9B1B30 802403A0 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* 9B1B34 802403A4 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* 9B1B38 802403A8 36B51630 */ ori $s5, $s5, 0x1630 /* 9B1B3C 802403AC AFBF00D8 */ sw $ra, 0xd8($sp) /* 9B1B40 802403B0 F7B600E8 */ sdc1 $f22, 0xe8($sp) @@ -154,10 +154,10 @@ glabel func_80240310_9B1AA0 /* 9B1CF4 80240564 0C019D80 */ jal guMtxCatF /* 9B1CF8 80240568 0240302D */ daddu $a2, $s2, $zero /* 9B1CFC 8024056C 0240202D */ daddu $a0, $s2, $zero -/* 9B1D00 80240570 3C108007 */ lui $s0, %hi(D_800741F0) -/* 9B1D04 80240574 261041F0 */ addiu $s0, $s0, %lo(D_800741F0) -/* 9B1D08 80240578 3C12800A */ lui $s2, %hi(D_8009A674) -/* 9B1D0C 8024057C 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* 9B1D00 80240570 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* 9B1D04 80240574 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* 9B1D08 80240578 3C12800A */ lui $s2, %hi(gDisplayContext) +/* 9B1D0C 8024057C 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* 9B1D10 80240580 96050000 */ lhu $a1, ($s0) /* 9B1D14 80240584 8E420000 */ lw $v0, ($s2) /* 9B1D18 80240588 00052980 */ sll $a1, $a1, 6 @@ -221,7 +221,7 @@ glabel func_80240310_9B1AA0 /* 9B1DF4 80240664 AFA30018 */ sw $v1, 0x18($sp) /* 9B1DF8 80240668 97A3003E */ lhu $v1, 0x3e($sp) /* 9B1DFC 8024066C 44880000 */ mtc1 $t0, $f0 -/* 9B1E00 80240670 00000000 */ nop +/* 9B1E00 80240670 00000000 */ nop /* 9B1E04 80240674 46800020 */ cvt.s.w $f0, $f0 /* 9B1E08 80240678 AFA9001C */ sw $t1, 0x1c($sp) /* 9B1E0C 8024067C E6600038 */ swc1 $f0, 0x38($s3) @@ -230,7 +230,7 @@ glabel func_80240310_9B1AA0 /* 9B1E18 80240688 A7A30022 */ sh $v1, 0x22($sp) /* 9B1E1C 8024068C 3063FFFF */ andi $v1, $v1, 0xffff /* 9B1E20 80240690 44830000 */ mtc1 $v1, $f0 -/* 9B1E24 80240694 00000000 */ nop +/* 9B1E24 80240694 00000000 */ nop /* 9B1E28 80240698 46800020 */ cvt.s.w $f0, $f0 /* 9B1E2C 8024069C 00021FC2 */ srl $v1, $v0, 0x1f /* 9B1E30 802406A0 00431021 */ addu $v0, $v0, $v1 @@ -245,8 +245,8 @@ glabel func_80240310_9B1AA0 /* 9B1E54 802406C4 0C04EBDC */ jal func_8013AF70 /* 9B1E58 802406C8 A7A30026 */ sh $v1, 0x26($sp) /* 9B1E5C 802406CC 3C05D838 */ lui $a1, 0xd838 -/* 9B1E60 802406D0 3C03800A */ lui $v1, %hi(D_8009A66C) -/* 9B1E64 802406D4 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) +/* 9B1E60 802406D0 3C03800A */ lui $v1, %hi(gMasterGfxPos) +/* 9B1E64 802406D4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 9B1E68 802406D8 8C620000 */ lw $v0, ($v1) /* 9B1E6C 802406DC 34A50002 */ ori $a1, $a1, 2 /* 9B1E70 802406E0 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C_B1D89C.s b/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C_B1D89C.s index 5818c3187c..27ff530d23 100644 --- a/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C_B1D89C.s +++ b/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C_B1D89C.s @@ -36,7 +36,7 @@ glabel func_8024013C_B1D89C /* B1D918 802401B8 4480C000 */ mtc1 $zero, $f24 /* B1D91C 802401BC 460005A1 */ cvt.d.s $f22, $f0 /* B1D920 802401C0 4638B582 */ mul.d $f22, $f22, $f24 -/* B1D924 802401C4 00000000 */ nop +/* B1D924 802401C4 00000000 */ nop /* B1D928 802401C8 4638B580 */ add.d $f22, $f22, $f24 /* B1D92C 802401CC C60C0000 */ lwc1 $f12, ($s0) /* B1D930 802401D0 46806320 */ cvt.s.w $f12, $f12 @@ -49,7 +49,7 @@ glabel func_8024013C_B1D89C /* B1D94C 802401EC 0C00A874 */ jal cos_rad /* B1D950 802401F0 46000506 */ mov.s $f20, $f0 /* B1D954 802401F4 4600A502 */ mul.s $f20, $f20, $f0 -/* B1D958 802401F8 00000000 */ nop +/* B1D958 802401F8 00000000 */ nop /* B1D95C 802401FC 3C018024 */ lui $at, %hi(func_80242D00_A96440) /* B1D960 80240200 D4202D00 */ ldc1 $f0, %lo(func_80242D00_A96440)($at) /* B1D964 80240204 4600A521 */ cvt.d.s $f20, $f20 @@ -61,7 +61,7 @@ glabel func_8024013C_B1D89C /* B1D97C 8024021C 4620A520 */ cvt.s.d $f20, $f20 /* B1D980 80240220 46000021 */ cvt.d.s $f0, $f0 /* B1D984 80240224 46380002 */ mul.d $f0, $f0, $f24 -/* B1D988 80240228 00000000 */ nop +/* B1D988 80240228 00000000 */ nop /* B1D98C 8024022C 3C140001 */ lui $s4, 1 /* B1D990 80240230 36941630 */ ori $s4, $s4, 0x1630 /* B1D994 80240234 27B00050 */ addiu $s0, $sp, 0x50 @@ -77,10 +77,10 @@ glabel func_8024013C_B1D89C /* B1D9BC 8024025C 0C019D80 */ jal guMtxCatF /* B1D9C0 80240260 00A0302D */ daddu $a2, $a1, $zero /* B1D9C4 80240264 27A40010 */ addiu $a0, $sp, 0x10 -/* B1D9C8 80240268 3C118007 */ lui $s1, %hi(D_800741F0) -/* B1D9CC 8024026C 263141F0 */ addiu $s1, $s1, %lo(D_800741F0) -/* B1D9D0 80240270 3C12800A */ lui $s2, %hi(D_8009A674) -/* B1D9D4 80240274 2652A674 */ addiu $s2, $s2, %lo(D_8009A674) +/* B1D9C8 80240268 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* B1D9CC 8024026C 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* B1D9D0 80240270 3C12800A */ lui $s2, %hi(gDisplayContext) +/* B1D9D4 80240274 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) /* B1D9D8 80240278 96250000 */ lhu $a1, ($s1) /* B1D9DC 8024027C 8E420000 */ lw $v0, ($s2) /* B1D9E0 80240280 00052980 */ sll $a1, $a1, 6 @@ -100,8 +100,8 @@ glabel func_8024013C_B1D89C /* B1DA18 802402B8 3529001C */ ori $t1, $t1, 0x1c /* B1DA1C 802402BC 3C080055 */ lui $t0, 0x55 /* B1DA20 802402C0 35082078 */ ori $t0, $t0, 0x2078 -/* B1DA24 802402C4 3C10800A */ lui $s0, %hi(D_8009A66C) -/* B1DA28 802402C8 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* B1DA24 802402C4 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* B1DA28 802402C8 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* B1DA2C 802402CC 0200202D */ daddu $a0, $s0, $zero /* B1DA30 802402D0 24050001 */ addiu $a1, $zero, 1 /* B1DA34 802402D4 8E020000 */ lw $v0, ($s0) @@ -160,6 +160,6 @@ glabel func_8024013C_B1D89C /* B1DB08 802403A8 D7B400A8 */ ldc1 $f20, 0xa8($sp) /* B1DB0C 802403AC 03E00008 */ jr $ra /* B1DB10 802403B0 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* B1DB14 802403B4 00000000 */ nop -/* B1DB18 802403B8 00000000 */ nop -/* B1DB1C 802403BC 00000000 */ nop +/* B1DB14 802403B4 00000000 */ nop +/* B1DB18 802403B8 00000000 */ nop +/* B1DB1C 802403BC 00000000 */ nop diff --git a/asm/nonmatchings/world/world/func_80059F94.s b/asm/nonmatchings/world/world/func_80059F94.s index 7093388450..ad1f1877ad 100644 --- a/asm/nonmatchings/world/world/func_80059F94.s +++ b/asm/nonmatchings/world/world/func_80059F94.s @@ -14,8 +14,8 @@ glabel func_80059F94 /* 353B8 80059FB8 3C15800B */ lui $s5, %hi(gCameras) /* 353BC 80059FBC 26B51D80 */ addiu $s5, $s5, %lo(gCameras) /* 353C0 80059FC0 AFB00010 */ sw $s0, 0x10($sp) -/* 353C4 80059FC4 3C10800A */ lui $s0, %hi(D_8009A66C) -/* 353C8 80059FC8 2610A66C */ addiu $s0, $s0, %lo(D_8009A66C) +/* 353C4 80059FC4 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* 353C8 80059FC8 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 353CC 80059FCC AFB40020 */ sw $s4, 0x20($sp) /* 353D0 80059FD0 24140002 */ addiu $s4, $zero, 2 /* 353D4 80059FD4 AFB3001C */ sw $s3, 0x1c($sp) @@ -43,7 +43,7 @@ glabel func_80059F94 /* 35428 8005A028 50400097 */ beql $v0, $zero, .L8005A288 /* 3542C 8005A02C 26520001 */ addiu $s2, $s2, 1 /* 35430 8005A030 08016810 */ j .L8005A040 -/* 35434 8005A034 00000000 */ nop +/* 35434 8005A034 00000000 */ nop .L8005A038: /* 35438 8005A038 54400093 */ bnel $v0, $zero, .L8005A288 /* 3543C 8005A03C 26520001 */ addiu $s2, $s2, 1 @@ -107,28 +107,28 @@ glabel func_80059F94 /* 35520 8005A120 25620028 */ addiu $v0, $t3, 0x28 /* 35524 8005A124 AE020000 */ sw $v0, ($s0) /* 35528 8005A128 44831000 */ mtc1 $v1, $f2 -/* 3552C 8005A12C 00000000 */ nop +/* 3552C 8005A12C 00000000 */ nop /* 35530 8005A130 468010A0 */ cvt.s.w $f2, $f2 /* 35534 8005A134 46141082 */ mul.s $f2, $f2, $f20 -/* 35538 8005A138 00000000 */ nop +/* 35538 8005A138 00000000 */ nop /* 3553C 8005A13C 85830010 */ lh $v1, 0x10($t4) /* 35540 8005A140 25620030 */ addiu $v0, $t3, 0x30 /* 35544 8005A144 AE020000 */ sw $v0, ($s0) /* 35548 8005A148 25620038 */ addiu $v0, $t3, 0x38 /* 3554C 8005A14C 44830000 */ mtc1 $v1, $f0 -/* 35550 8005A150 00000000 */ nop +/* 35550 8005A150 00000000 */ nop /* 35554 8005A154 46800020 */ cvt.s.w $f0, $f0 /* 35558 8005A158 46140002 */ mul.s $f0, $f0, $f20 -/* 3555C 8005A15C 00000000 */ nop +/* 3555C 8005A15C 00000000 */ nop /* 35560 8005A160 AE020000 */ sw $v0, ($s0) /* 35564 8005A164 4600110D */ trunc.w.s $f4, $f2 /* 35568 8005A168 44032000 */ mfc1 $v1, $f4 -/* 3556C 8005A16C 00000000 */ nop +/* 3556C 8005A16C 00000000 */ nop /* 35570 8005A170 30630FFF */ andi $v1, $v1, 0xfff /* 35574 8005A174 00031B00 */ sll $v1, $v1, 0xc /* 35578 8005A178 4600010D */ trunc.w.s $f4, $f0 /* 3557C 8005A17C 44022000 */ mfc1 $v0, $f4 -/* 35580 8005A180 00000000 */ nop +/* 35580 8005A180 00000000 */ nop /* 35584 8005A184 30420FFF */ andi $v0, $v0, 0xfff /* 35588 8005A188 00441025 */ or $v0, $v0, $a0 /* 3558C 8005A18C 00621825 */ or $v1, $v1, $v0 @@ -144,27 +144,27 @@ glabel func_80059F94 /* 355B4 8005A1B4 AD680028 */ sw $t0, 0x28($t3) /* 355B8 8005A1B8 00651821 */ addu $v1, $v1, $a1 /* 355BC 8005A1BC 44831000 */ mtc1 $v1, $f2 -/* 355C0 8005A1C0 00000000 */ nop +/* 355C0 8005A1C0 00000000 */ nop /* 355C4 8005A1C4 468010A0 */ cvt.s.w $f2, $f2 /* 355C8 8005A1C8 46141082 */ mul.s $f2, $f2, $f20 -/* 355CC 8005A1CC 00000000 */ nop +/* 355CC 8005A1CC 00000000 */ nop /* 355D0 8005A1D0 AD74002C */ sw $s4, 0x2c($t3) /* 355D4 8005A1D4 AD690030 */ sw $t1, 0x30($t3) /* 355D8 8005A1D8 00862021 */ addu $a0, $a0, $a2 /* 355DC 8005A1DC 44840000 */ mtc1 $a0, $f0 -/* 355E0 8005A1E0 00000000 */ nop +/* 355E0 8005A1E0 00000000 */ nop /* 355E4 8005A1E4 46800020 */ cvt.s.w $f0, $f0 /* 355E8 8005A1E8 46140002 */ mul.s $f0, $f0, $f20 -/* 355EC 8005A1EC 00000000 */ nop +/* 355EC 8005A1EC 00000000 */ nop /* 355F0 8005A1F0 AD730034 */ sw $s3, 0x34($t3) /* 355F4 8005A1F4 4600110D */ trunc.w.s $f4, $f2 /* 355F8 8005A1F8 44032000 */ mfc1 $v1, $f4 -/* 355FC 8005A1FC 00000000 */ nop +/* 355FC 8005A1FC 00000000 */ nop /* 35600 8005A200 30630FFF */ andi $v1, $v1, 0xfff /* 35604 8005A204 00031B00 */ sll $v1, $v1, 0xc /* 35608 8005A208 4600010D */ trunc.w.s $f4, $f0 /* 3560C 8005A20C 44022000 */ mfc1 $v0, $f4 -/* 35610 8005A210 00000000 */ nop +/* 35610 8005A210 00000000 */ nop /* 35614 8005A214 30420FFF */ andi $v0, $v0, 0xfff /* 35618 8005A218 00621825 */ or $v1, $v1, $v0 /* 3561C 8005A21C AD63001C */ sw $v1, 0x1c($t3) @@ -185,8 +185,8 @@ glabel func_80059F94 /* 35658 8005A258 AE020000 */ sw $v0, ($s0) /* 3565C 8005A25C 000D1180 */ sll $v0, $t5, 6 /* 35660 8005A260 AD630044 */ sw $v1, 0x44($t3) -/* 35664 8005A264 3C03800A */ lui $v1, %hi(D_8009A674) -/* 35668 8005A268 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) +/* 35664 8005A264 3C03800A */ lui $v1, %hi(gDisplayContext) +/* 35668 8005A268 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* 3566C 8005A26C 24420030 */ addiu $v0, $v0, 0x30 /* 35670 8005A270 AD640048 */ sw $a0, 0x48($t3) /* 35674 8005A274 00621821 */ addu $v1, $v1, $v0 diff --git a/include/common_structs.h b/include/common_structs.h index 13a530be37..4d2b737849 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -245,7 +245,7 @@ typedef struct ScriptInstance { /* 0x00C */ Bytecode* ptrReadPos; /* 0x010 */ s8 labelIndices[16]; /* 0x020 */ UNK_PTR labelPositions[16]; - /* 0x060 */ UNK_PTR unk_60; /* unknown pointer; allocated on the heap, free'd in kill_script() */ + /* 0x060 */ UNK_PTR userData; /* unknown pointer; allocated on the heap, free'd in kill_script() */ /* 0x064 */ struct ScriptInstance* blockingParent; /* parent? */ /* 0x068 */ struct ScriptInstance* childScript; /* 0x06C */ struct ScriptInstance* parentScript; /* brother? */ @@ -1586,4 +1586,12 @@ typedef struct { /* 0x1D */ char unk_1D[3]; } UIPanel; // size = 0x20 +typedef struct { + /* 0x00000 */ LookAt lookAt[2]; + /* 0x00030 */ Matrix4s camPerspMatrix[8]; // could only be length 4, unsure + /* 0x00230 */ s32 mainGfx[0x4100]; + /* 0x10630 */ s32 smallGfx[0x400]; // used by func 800269EC + /* 0x11630 */ Matrix4s matrixStack[0x200]; +} DisplayContext; // size = 0x19630 + #endif diff --git a/include/variables.h b/include/variables.h index 918aca0d73..e74e945664 100644 --- a/include/variables.h +++ b/include/variables.h @@ -250,4 +250,10 @@ extern OSThread D_800A4270; // idle thread, id 1 extern OSThread D_800A4420; // id 3 extern s32 D_800B8590; +// gfx +extern DisplayContext* gDisplayContext; +extern Gfx* gMasterGfxPos; +extern u16 gMatrixListPos; +extern u16 gCurrentDisplayContextIndex; + #endif diff --git a/src/code_1b40_len_20b0.c b/src/code_1b40_len_20b0.c index b9cd27006d..28bb9f7440 100644 --- a/src/code_1b40_len_20b0.c +++ b/src/code_1b40_len_20b0.c @@ -2,7 +2,6 @@ extern Gfx D_00074210[]; extern Gfx D_00074230[]; -extern Gfx* D_8009A66C[1]; extern int D_000759B0[]; extern int D_000759B0_end[]; // A55D0 @@ -117,13 +116,13 @@ s32 func_80027190(void) { INCLUDE_ASM(s32, "code_1b40_len_20b0", func_800271A0); /*void func_800271A0(void) { - Gfx *temp = D_8009A66C[0] + 1; + Gfx *temp = gMasterGfxPos[0] + 1; - gSPSegment(D_8009A66C[0], 0x00, 0x00000000); - D_8009A66C[0] = temp; + gSPSegment(gMasterGfxPos[0], 0x00, 0x00000000); + gMasterGfxPos[0] = temp; gSPDisplayList(temp, &D_00074230); - D_8009A66C[0]++; - gSPDisplayList(D_8009A66C[0]++, &D_00074210); + gMasterGfxPos[0]++; + gSPDisplayList(gMasterGfxPos[0]++, &D_00074210); }*/ INCLUDE_ASM(s32, "code_1b40_len_20b0", func_800271FC); diff --git a/src/code_8a160_len_700.c b/src/code_8a160_len_700.c index 895400d048..2da26d300a 100644 --- a/src/code_8a160_len_700.c +++ b/src/code_8a160_len_700.c @@ -19,26 +19,6 @@ typedef struct { extern struct_func_800F0CB0 D_8010D000[]; INCLUDE_ASM(s32, "code_8a160_len_700", func_800F0CB0); -// void func_800F0CB0(s32 arg0, f32 arg1, f32 arg2, f32 arg3) -//{ -// sub_struct_func_800F0CB0 *temp_a1 = &D_8010D000[arg0].unk00[0]; -// s32 temp = 0x39; -// s32 i; -// -// if (arg0 >= 1) { -// return; -// } -// -// temp_a1->unk0 = 1; -// temp_a1->unk8 = arg1; -// temp_a1->unkC = arg2; -// temp_a1->unk18 = arg3; -// temp_a1->unk1 = 0x28; -// temp_a1->unk2 = 0; -// -// for(i = 1; i < temp; i++) -// temp_a1[i].unk7 = (s32)(-(f32) i * 0.0f) - 1; -//} void func_800F0D5C(void) { struct_func_800F0CB0* temp = &D_8010D000[0]; @@ -51,57 +31,4 @@ void func_800F0D5C(void) { INCLUDE_ASM(s32, "code_8a160_len_700", func_800F0D80); -/*extern u16 D_800741F0; -extern Gfx *D_8009A66C; -extern Gfx *D_8009A674; -extern void *D_801096B0; -extern Gfx D_80109710[]; -extern Gfx D_801097D8[];*/ - INCLUDE_ASM(s32, "code_8a160_len_700", func_800F102C); -/*void func_800F102C(void) { - s32 temp_s2; - s32 temp_s7; - u16 *temp_v0 = &D_800741F0; - u16 temp_v0_2; - u16 temp_v1_4; - Gfx *temp_a0; - sub_struct_func_800F0CB0 *temp_v1_3; - void *phi_s0; - s32 phi_s2; - s32 phi_s7; - Mtx mtx; - Mtx mtx2; - - temp_a0 = D_8009A66C; - - gDPPipeSync(temp_a0++); - gSPSegment(temp_a0++, 0x00, 0x00000000); - gDPSetScissor(temp_a0++, G_SC_NON_INTERLACE, 0, 0, 320, 240); - gSPViewport(temp_a0++, &D_801096B0); - guOrthoF(&mtx, 0.0f, 320.0f, 240.0f, 0.0f, -100.0f, 100.0f, 1.0f); - guMtxF2L(&mtx, *(void *)0x8009A674 + (*temp_v0 * 64 + 0x11630)); - gSPMatrix(temp_a0++, (*(void *)0x8009A674 + (temp_v0++ * 64 + 0x11630)), G_MTX_NOPUSH | G_MTX_LOAD | -G_MTX_PROJECTION); gSPDisplayList(temp_a0++, &D_80109710); gDPSetEnvColor(temp_a0++, 0x7F, 0x7F, 0x7F, 0x7F); phi_s7 = -0; do - { - temp_v1_3 = &D_8010D000[phi_s7].unk00[0]; - if (temp_v1_3->unk0 != 0) { - phi_s0 = temp_v1_3 + 0x22; - phi_s2 = 1; - do { - if ((s32) phi_s0->unk1 >= 0) { - guPositionF(&mtx2, 0.0f, 0.0f, (*gGameStatusPtr)->unk134 * 0xA, phi_s0->unk12 * temp_v1_3->unk18, -phi_s0->unk2, phi_s0->unk6, 0.0f); guMtxF2L(&mtx2, *(void *)0x8009A674 + ((*(void *)0x800741F0 << 6) + 0x11630)); - gSPMatrix(temp_a0++, (*(void *)0x8009A674 + (temp_v0++ * 64 + 0x11630)), G_MTX_PUSH | G_MTX_MUL | -G_MTX_MODELVIEW); temp_a0_2->unk0 = (s32) (((0x50 - phi_s0->unk1) & 0xFF) | 0xFA000000); temp_a0_2->unk4 = (?32) -((((phi_s0->unk-3 << 0x18) | (phi_s0->unk-2 << 0x10)) | (phi_s0->unk-1 << 8)) | phi_s0->unk0); gSPDisplayList(temp_a0++, -&D_801097D8); gSPPopMatrix(temp_a0++, G_MTX_MODELVIEW); - } - phi_s2++; - } while(phi_s2 < 0x39); - } - phi_s7++; - } - while(phi_s7 < 1); -}*/ diff --git a/src/code_e79b0_len_1920.c b/src/code_e79b0_len_1920.c index 82e16e2c4a..3a7a01e343 100644 --- a/src/code_e79b0_len_1920.c +++ b/src/code_e79b0_len_1920.c @@ -181,7 +181,7 @@ ScriptInstance* start_script(Bytecode* initialLine, s32 priority, s32 initialSta newScript->ptrNextLine = initialLine; newScript->ptrFirstLine = initialLine; newScript->ptrCurrentLine = initialLine; - newScript->unk_60 = NULL; + newScript->userData = NULL; newScript->blockingParent = NULL; newScript->childScript = NULL; newScript->parentScript = NULL; @@ -258,7 +258,7 @@ ScriptInstance* start_script_in_group(Bytecode* initialLine, u8 priority, u8 ini newScript->ptrNextLine = initialLine; newScript->ptrFirstLine = initialLine; newScript->ptrCurrentLine = initialLine; - newScript->unk_60 = 0; + newScript->userData = 0; newScript->blockingParent = 0; newScript->childScript = 0; newScript->parentScript = 0; @@ -325,7 +325,7 @@ ScriptInstance* func_802C39F8(ScriptInstance* parentScript, Bytecode* nextLine, child->ptrFirstLine = nextLine; child->ptrCurrentLine = nextLine; child->currentOpcode = 0; - child->unk_60 = NULL; + child->userData = NULL; child->blockingParent = NULL; child->parentScript = parentScript; child->childScript = NULL; @@ -384,9 +384,9 @@ ScriptInstance* func_802C3C10(ScriptInstance* script, Bytecode* line, s32 arg2) script->state |= arg2; script->timeScale = 1.0f; - if (script->unk_60 != NULL) { - heap_free(script->unk_60); - script->unk_60 = NULL; + if (script->userData != NULL) { + heap_free(script->userData); + script->userData = NULL; } if (script->childScript != 0) { @@ -485,9 +485,9 @@ void kill_script(ScriptInstance* instanceToKill) { } } - if (instanceToKill->unk_60 != NULL) { - heap_free(instanceToKill->unk_60); - instanceToKill->unk_60 = NULL; + if (instanceToKill->userData != NULL) { + heap_free(instanceToKill->userData); + instanceToKill->userData = NULL; } SCRIPT_FREE(i); diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt index 8cef065e19..0633849592 100644 --- a/tools/symbol_addrs.txt +++ b/tools/symbol_addrs.txt @@ -563,6 +563,8 @@ load_battle = 0x80072C90; setup_demo_player = 0x80072D2C; load_demo_battle = 0x80072E14; gGameStatusPtr = 0x8007419C; +gMatrixListPos = 0x800741F0; +gCurrentDisplayContextIndex = 0x800741F4; gCurrentCameraID = 0x80077410; EnemyNpcHit = 0x80077F70; EnemyNpcDefeat = 0x8007809C; @@ -1947,6 +1949,8 @@ nuGfxDisplay = 0x8009A5F8; gGameState = 0x8009A600; nuGfxTaskSpool = 0x8009A618; carthandle = 0x8009A638; +gMasterGfxPos = 0x8009A66C; +gDisplayContext = 0x8009A674; // size:0x19630 gCurtainScale = 0x8009BA90; gCurtainScaleGoal = 0x8009BA94; gCurtainFade = 0x8009BA98; diff --git a/undefined_syms_auto.txt b/undefined_syms_auto.txt index b59522050f..3af89a642a 100644 --- a/undefined_syms_auto.txt +++ b/undefined_syms_auto.txt @@ -320,9 +320,9 @@ D_8009A658 = 0x8009A658; D_8009A660 = 0x8009A660; D_8009A664 = 0x8009A664; D_8009A668 = 0x8009A668; -D_8009A66C = 0x8009A66C; +gMasterGfxPos = 0x8009A66C; D_8009A670 = 0x8009A670; -D_8009A674 = 0x8009A674; +gDisplayContext = 0x8009A674; D_8009A678 = 0x8009A678; D_8009A680 = 0x8009A680; D_8009A690 = 0x8009A690;